diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 67ae91f283574a2b56d13b9c080a0473aefce1ec..246c19d069ee50249a236d196fb6dd3929cc4684 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -71,7 +71,6 @@ -#define JVET_AD0141_NNPFA_NONOUTPUTPIC 1 //Check that NNPFA is present in pic that is not a non-output picture #define JVET_AD0056_PIC_WIDTH_HEIGHT_CONTRAINTS 1 diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp index 96f79dbacc3105b07eed977d64c892251a1e8986..a79f00fa6f44ff0b921676f8a4f54a93d97b3ddb 100644 --- a/source/Lib/EncoderLib/EncGOP.cpp +++ b/source/Lib/EncoderLib/EncGOP.cpp @@ -1032,9 +1032,7 @@ void EncGOP::xCreatePerPictureSEIMessages (int picInGOP, SEIMessages& seiMessage { SEINeuralNetworkPostFilterActivation *nnpfActivationSEI = new SEINeuralNetworkPostFilterActivation; m_seiEncoder.initSEINeuralNetworkPostFilterActivation(nnpfActivationSEI); -#if JVET_AD0141_NNPFA_NONOUTPUTPIC CHECK(!slice->getPicHeader()->getPicOutputFlag(), "NNPFA SEI Message cannot be associated with picture with ph_pic_output_flag equal to 0") -#endif seiMessages.push_back(nnpfActivationSEI); } #endif @@ -1063,9 +1061,7 @@ void EncGOP::xCreateNNPostFilterActivationSEIMessage(SEIMessages& seiMessages, S { SEINeuralNetworkPostFilterActivation *nnpfActivationSEI = new SEINeuralNetworkPostFilterActivation; m_seiEncoder.initSEINeuralNetworkPostFilterActivation(nnpfActivationSEI); -#if JVET_AD0141_NNPFA_NONOUTPUTPIC CHECK(!slice->getPicHeader()->getPicOutputFlag(), "NNPFA SEI Message cannot be associated with picture with ph_pic_output_flag equal to 0") -#endif seiMessages.push_back(nnpfActivationSEI); } #endif