diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index d0d9c9caedc05b26bded3f1f99e9ba80c4b050cb..e0a1acd08087b3ced359d322dd8a2fd02ffb259b 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -72,7 +72,6 @@ -#define JVET_S0081_NON_REFERENCED_PIC 1 // JVET-S0081: exclude non-referenced picture to be used as prevTid0 picture #define JVET_S0162_SUBPIC_MERGE_TOOL 1 // JVET-S0162: Subpicture merging software diff --git a/source/Lib/DecoderLib/DecLib.h b/source/Lib/DecoderLib/DecLib.h index 6effe83bf9de1edf4f81d631f4a4aaf87252238b..5e67e0bffd4be444543d4ceab50a6835974fc73f 100644 --- a/source/Lib/DecoderLib/DecLib.h +++ b/source/Lib/DecoderLib/DecLib.h @@ -294,7 +294,6 @@ protected: void xDecodeSPS( InputNALUnit& nalu ); void xDecodePPS( InputNALUnit& nalu ); void xDecodeAPS(InputNALUnit& nalu); -#if JVET_S0081_NON_REFERENCED_PIC void xUpdatePreviousTid0POC(Slice *pSlice) { if( (pSlice->getTLayer() == 0) && (pSlice->getNalUnitType() != NAL_UNIT_CODED_SLICE_RASL) && (pSlice->getNalUnitType() != NAL_UNIT_CODED_SLICE_RADL) && !pSlice->getPicHeader()->getNonReferencePictureFlag() ) @@ -302,9 +301,6 @@ protected: m_prevTid0POC = pSlice->getPOC(); } } -#else - void xUpdatePreviousTid0POC(Slice *pSlice) { if ((pSlice->getTLayer() == 0) && (pSlice->getNalUnitType()!=NAL_UNIT_CODED_SLICE_RASL) && (pSlice->getNalUnitType()!=NAL_UNIT_CODED_SLICE_RADL)) { m_prevTid0POC = pSlice->getPOC(); } } -#endif void xParsePrefixSEImessages(); void xParsePrefixSEIsForUnknownVCLNal();