diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 06d2502626e108315d50e54935c68e412cf1269f..2db5cc7bde6d884a2f5d73e8e9c05720a55712c3 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -61,7 +61,6 @@ -#define JVET_AD0056_NNPFA_TARGET_ID_CONSTRAINT 1 // Remove redundant constraints on nnpfa_target_id #define JVET_AD0388_NNPFA_OUTPUT_FLAG 1 diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp index 74c17f62c60a1a8362a35139bb59c8f34bc29470..8881258aeebe9e99b473550064fabbfb3bed354d 100644 --- a/source/Lib/DecoderLib/SEIread.cpp +++ b/source/Lib/DecoderLib/SEIread.cpp @@ -3275,11 +3275,7 @@ void SEIReader::xParseSEINNPostFilterActivation(SEINeuralNetworkPostFilterActiva sei_read_uvlc( pDecodedMessageOutputStream, val, "nnpfa_target_id" ); sei.m_targetId =val; -#if JVET_AD0056_NNPFA_TARGET_ID_CONSTRAINT CHECK(sei.m_targetId > MAX_NNPFA_ID, "The value of nnpfa_target_id shall be in the range of 0 to 2^32 - 2"); -#else - CHECK((sei.m_targetId >= 256 && sei.m_targetId <= 511) || (sei.m_targetId >= (1<<31) && sei.m_targetId <= MAX_NNPFA_ID), "Reserved nnpfa_target_id value, shall ignore the SEI message"); -#endif sei_read_flag( pDecodedMessageOutputStream, val, "nnpfa_cancel_flag" ); sei.m_cancelFlag = val;