diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 9b0dc2bb2a2953fb8c79eaee636866d025027122..6a2816649feea20a3e61063137dd22b542bae5e1 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -63,7 +63,6 @@ -#define JVET_AE0141_NNPFC_BUGFIX_COLOURIZATION 1 // JVET-AE0141: Fix a bug in NNPFC SEI message for colourization #define JVET_AE0128_CONSTRAINT_UPDATE 1 // JVET_AE0128 item 2: Update the constraint on when an NNPFC SEI message shall be a repetition of the first NNPFC SEI message in the CLVS diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp index 3eb447a823bb53543628558b5233d11fd4a13f9c..6f0458243bfd8fa71b6edd500a54e4a8589306fc 100644 --- a/source/Lib/DecoderLib/SEIread.cpp +++ b/source/Lib/DecoderLib/SEIread.cpp @@ -2943,12 +2943,7 @@ void SEIReader::xParseSEINNPostFilterCharacteristics(SEINeuralNetworkPostFilterC if((sei.m_purpose & NNPC_PurposeType::COLOURIZATION) != 0) { -#if JVET_AE0141_NNPFC_BUGFIX_COLOURIZATION CHECK(((sei.m_purpose & NNPC_PurposeType::CHROMA_UPSAMPLING) != 0), "When chromaUpsamplingFlag is not equal to 0, colourizationFlag shall be equal to 0"); -#else - CHECK(((chromaFormatIdc != ChromaFormat::_400) || (sei.m_purpose & NNPC_PurposeType::CHROMA_UPSAMPLING) != 0), - "When ChromaFormatIdc or nnpfc_purpose & 0x02 is not equal to 0, nnpfc_purpose & 0x20 shall be equal to 0"); -#endif sei_read_code(pDecodedMessageOutputStream, 2, val, "nnpfc_out_colour_format_idc"); sei.m_outColourFormatIdc = ChromaFormat(val);