Commit a1b6cab2 authored by Karsten Suehring's avatar Karsten Suehring
Browse files

Merge branch 'clean51' into 'master'

Cleanup: fix return type of PPS::getMixedNaluTypesInPicFlag

See merge request jvet/VVCSoftware_VTM!2011
parents 746af5d0 c31f10b1
......@@ -689,7 +689,7 @@ void Slice::checkRPL(const ReferencePictureList* pRPL0, const ReferencePictureLi
// RefPicList[ 1 ] that is any of the following: A RASL picture with pps_mixed_nalu_types_in_pic_flag is equal to 0
for (int i = 0; i < pcRefPic->numSlices; i++)
{
if (pcRefPic->mixedNaluTypesInPicFlag == 0)
if (!pcRefPic->mixedNaluTypesInPicFlag)
{
CHECK(pcRefPic->slices[i]->getNalUnitType() == NAL_UNIT_CODED_SLICE_RASL, "When the current picture is a RADL picture, there shall be no active entry in RefPicList[ 0 ] or RefPicList[ 1 ] that is a RASL picture with pps_mixed_nalu_types_in_pic_flag is equal to 0");
}
......@@ -1058,7 +1058,7 @@ void Slice::checkLeadingPictureRestrictions(PicList& rcListPic, const PPS& pps)
if(this->getAssociatedIRAPPOC() > this->getPOC())
{
//check this only when pps_mixed_nalu_types_in_pic_flag is equal to 0
if (pps.getMixedNaluTypesInPicFlag() == 0)
if (!pps.getMixedNaluTypesInPicFlag())
{
// Do not check IRAP pictures since they may get a POC lower than their associated IRAP
if (nalUnitType < NAL_UNIT_CODED_SLICE_IDR_W_RADL ||
......@@ -1072,7 +1072,7 @@ void Slice::checkLeadingPictureRestrictions(PicList& rcListPic, const PPS& pps)
if (this->getAssociatedIRAPPOC() <= this->getPOC())
{
if (pps.getMixedNaluTypesInPicFlag() == 0)
if (!pps.getMixedNaluTypesInPicFlag())
{
CHECK(nalUnitType == NAL_UNIT_CODED_SLICE_RASL || nalUnitType == NAL_UNIT_CODED_SLICE_RADL, "When a picture is not a leading picture, it shall not be a RADL or RASL picture.");
}
......
......@@ -2244,7 +2244,7 @@ public:
const Window& getScalingWindow() const { return m_scalingWindow; }
void setScalingWindow( Window& scalingWindow ) { m_scalingWindow = scalingWindow; }
int getMixedNaluTypesInPicFlag() const { return m_mixedNaluTypesInPicFlag; }
bool getMixedNaluTypesInPicFlag() const { return m_mixedNaluTypesInPicFlag; }
void setMixedNaluTypesInPicFlag( const bool flag ) { m_mixedNaluTypesInPicFlag = flag; }
};
......
......@@ -1822,7 +1822,7 @@ void DecLib::xCheckParameterSetConstraints(const int layerId)
CHECK(curLayerChromaFormat != refLayerChromaFormat, "The chroma formats of the current layer and the reference layer are different");
int refLayerBitDepth = m_layerBitDepth[i];
CHECK(curLayerBitDepth != refLayerBitDepth, "The bit-depth of the current layer and the reference layer are different");
if (vps->getMaxTidIlRefPicsPlus1(curLayerIdx, i) == 0 && pps->getMixedNaluTypesInPicFlag() == 1)
if (vps->getMaxTidIlRefPicsPlus1(curLayerIdx, i) == 0 && pps->getMixedNaluTypesInPicFlag())
{
for (int j = 0; j < m_uiSliceSegmentIdx; j++)
{
......@@ -2032,7 +2032,7 @@ bool DecLib::getMixedNaluTypesInPicFlag()
PPS *pps = m_parameterSetManager.getPPS(m_picHeader.getPPSId());
CHECK(pps == 0, "No PPS present");
return pps->getMixedNaluTypesInPicFlag() != 0;
return pps->getMixedNaluTypesInPicFlag();
}
bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDisplay )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment