diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 3efce71b4d33fc8be45a1eefcc8a96cc4fcd0e5a..f33707da78907b3a09514e38d79d06d303eba985 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -50,6 +50,7 @@ #include <assert.h> #include <cassert> + //########### place macros to be removed in next cycle below this line ############### #define JVET_R0042_SUBPIC_CHECK 1 // JVET_R0042: SubPicture types related constraints diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp index 38d0352d3bc8ac3e3f262a13e7a9d548db2fd8be..ff62ccec09beeab3ba07920a928a256e794f34c6 100644 --- a/source/Lib/DecoderLib/DecLib.cpp +++ b/source/Lib/DecoderLib/DecLib.cpp @@ -1976,7 +1976,8 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl "when sps_video_parameter_set_id is equal to 0"); } CHECK((sps->getVPSId() > 0) && (vps == 0), "Invalid VPS"); - if (vps != nullptr && (vps->getIndependentLayerFlag(nalu.m_nuhLayerId) == 0)) + + if( vps != nullptr && !vps->getIndependentLayerFlag( vps->getGeneralLayerIdx( nalu.m_nuhLayerId ) ) ) { bool pocIsSet = false; for(auto auNALit=m_accessUnitPicInfo.begin(); auNALit != m_accessUnitPicInfo.end();auNALit++)