From 7e0a90a8d103c79855c0b62a9d26c1d22af0d52b Mon Sep 17 00:00:00 2001 From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de> Date: Fri, 21 Jul 2023 18:09:49 +0200 Subject: [PATCH] remove macro JVET_AD0056_NNPFA_TARGET_ID_CONSTRAINT --- source/Lib/CommonLib/TypeDef.h | 1 - source/Lib/DecoderLib/SEIread.cpp | 4 ---- 2 files changed, 5 deletions(-) diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 06d250262..2db5cc7bd 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 74c17f62c..8881258ae 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; -- GitLab