From 6f7cb691af633d6ec116682f08cbdd7641bc31c0 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Fri, 21 Jul 2023 18:10:17 +0200
Subject: [PATCH] remove macro JVET_AD0141_NNPFA_NONOUTPUTPIC
---
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/EncoderLib/EncGOP.cpp | 4 ----
2 files changed, 5 deletions(-)
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 67ae91f283..246c19d069 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 96f79dbacc..a79f00fa6f 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
--
GitLab