diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index e3d65ce4d2c56ffe7263da91a7ddf20c8aff394d..7c24843a07ac3063c6bd61699811d2af433270bc 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -51,7 +51,6 @@ #include <cassert> -#define JVET_Q0237_STSA_TID_ZERO_DEPLAYER 1 // JVET-Q0237: STSA picture with TemporalId equal to 0 in a dependent layer #define JVET_Q0798_SPS_NUMBER_MERGE_CANDIDATE 1 // JVET-Q0798: signal the number of merge candidates in SPS diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp index 86545c8e90f24ea9bf985d5201533a6eed0484c1..b043d46fa1da7ae47cf529d2e03150b9eebb5f88 100644 --- a/source/Lib/DecoderLib/DecLib.cpp +++ b/source/Lib/DecoderLib/DecLib.cpp @@ -1797,14 +1797,12 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl VPS *vps = m_parameterSetManager.getVPS(sps->getVPSId()); #endif -#if JVET_Q0237_STSA_TID_ZERO_DEPLAYER if (nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_STSA && vps != nullptr && (vps->getIndependentLayerFlag(nalu.m_nuhLayerId) == 1)) { CHECK(nalu.m_temporalId == 0, "TemporalID of STSA picture shall not be zero in independent layers"); } -#endif #if JVET_Q0044_SLICE_IDX_WITH_SUBPICS int currSubPicIdx = pps->getSubPicIdxFromSubPicId( m_apcSlicePilot->getSliceSubPicId() );