From fd55ac92be28fea4795e422a4dbcc1a9c834a742 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Fri, 21 Jul 2023 18:10:14 +0200
Subject: [PATCH] remove macro JVET_AD0056_NNPFA_TARGET_BASE_FLAG
---
source/App/EncoderApp/EncAppCfg.cpp | 2 --
source/App/EncoderApp/EncAppCfg.h | 2 --
source/Lib/CommonLib/SEI.cpp | 2 --
source/Lib/CommonLib/SEI.h | 4 ----
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/SEIread.cpp | 2 --
source/Lib/EncoderLib/EncCfg.h | 4 ----
source/Lib/EncoderLib/SEIEncoder.cpp | 2 --
source/Lib/EncoderLib/SEIwrite.cpp | 2 --
9 files changed, 21 deletions(-)
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 85b33a53a1..15f25b72b0 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1972,9 +1972,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
#endif
opts.addOptions()("SEINNPostFilterActivationTargetId", m_nnPostFilterSEIActivationTargetId, 0u, "Target id of the Neural Network Post Filter on current picture");
opts.addOptions()("SEINNPostFilterActivationCancelFlag", m_nnPostFilterSEIActivationCancelFlag, false, "Control use of the target neural network post filter established by any previous NNPFA SEI message");
-#if JVET_AD0056_NNPFA_TARGET_BASE_FLAG
opts.addOptions()("SEINNPostFilterActivationTargetBaseFlag", m_nnPostFilterSEIActivationTargetBaseFlag, false, "Specifies that the target NNPF is the base NNPF");
-#endif
opts.addOptions()("SEINNPostFilterActivationPersistenceFlag", m_nnPostFilterSEIActivationPersistenceFlag, false, "Specifies the persistence of the target neural-network post-processing filter for the current layer");
opts.addOptions()("SEINNPostFilterActivationOutputFlag", cfg_nnPostFilterSEIActivationOutputFlagList, cfg_nnPostFilterSEIActivationOutputFlagList, "Specifies a list indicating whether the NNPF-generated picture that corresponds to the input picture having index InpIdx[i] is output or not");
}
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index b0b0864c52..11bff3068f 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -795,9 +795,7 @@ protected:
std::vector<bool> m_nnPostFilterSEICharacteristicsInputPicOutputFlag[MAX_NUM_NN_POST_FILTERS];
bool m_nnPostFilterSEICharacteristicsAbsentInputPicZeroFlag[MAX_NUM_NN_POST_FILTERS];
bool m_nnPostFilterSEIActivationCancelFlag;
-#if JVET_AD0056_NNPFA_TARGET_BASE_FLAG
bool m_nnPostFilterSEIActivationTargetBaseFlag;
-#endif
bool m_nnPostFilterSEIActivationPersistenceFlag;
std::vector<bool> m_nnPostFilterSEIActivationOutputFlag;
diff --git a/source/Lib/CommonLib/SEI.cpp b/source/Lib/CommonLib/SEI.cpp
index 60c5113580..2e4ed66733 100644
--- a/source/Lib/CommonLib/SEI.cpp
+++ b/source/Lib/CommonLib/SEI.cpp
@@ -1125,9 +1125,7 @@ SEINeuralNetworkPostFilterActivation::SEINeuralNetworkPostFilterActivation(
m_targetId = sei.m_targetId;
m_cancelFlag = sei.m_cancelFlag;
m_persistenceFlag = sei.m_persistenceFlag;
-#if JVET_AD0056_NNPFA_TARGET_BASE_FLAG
m_targetBaseFlag = sei.m_targetBaseFlag;
-#endif
m_outputFlag = sei.m_outputFlag;
}
diff --git a/source/Lib/CommonLib/SEI.h b/source/Lib/CommonLib/SEI.h
index dde74fcf84..1391738e0c 100644
--- a/source/Lib/CommonLib/SEI.h
+++ b/source/Lib/CommonLib/SEI.h
@@ -1338,9 +1338,7 @@ public:
SEINeuralNetworkPostFilterActivation()
: m_targetId(0)
, m_cancelFlag(false)
-#if JVET_AD0056_NNPFA_TARGET_BASE_FLAG
, m_targetBaseFlag(false)
-#endif
, m_persistenceFlag(false)
{}
SEINeuralNetworkPostFilterActivation(const SEINeuralNetworkPostFilterActivation& sei);
@@ -1349,9 +1347,7 @@ public:
uint32_t m_targetId;
bool m_cancelFlag;
-#if JVET_AD0056_NNPFA_TARGET_BASE_FLAG
bool m_targetBaseFlag;
-#endif
bool m_persistenceFlag;
std::vector<bool> m_outputFlag;
};
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 898c803dd1..67ae91f283 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -70,7 +70,6 @@
-#define JVET_AD0056_NNPFA_TARGET_BASE_FLAG 1
#define JVET_AD0141_NNPFA_NONOUTPUTPIC 1 //Check that NNPFA is present in pic that is not a non-output picture
diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp
index 6d81b4c139..6dae729221 100644
--- a/source/Lib/DecoderLib/SEIread.cpp
+++ b/source/Lib/DecoderLib/SEIread.cpp
@@ -3247,10 +3247,8 @@ void SEIReader::xParseSEINNPostFilterActivation(SEINeuralNetworkPostFilterActiva
if(!sei.m_cancelFlag)
{
-#if JVET_AD0056_NNPFA_TARGET_BASE_FLAG
sei_read_flag( pDecodedMessageOutputStream, val, "nnpfa_target_base_flag" );
sei.m_targetBaseFlag = val;
-#endif
sei_read_flag( pDecodedMessageOutputStream, val, "nnpfa_persistence_flag" );
sei.m_persistenceFlag = val;
sei_read_uvlc( pDecodedMessageOutputStream, val, "nnpfa_num_output_entries" );
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index de74214353..57225fabf2 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -760,9 +760,7 @@ protected:
#endif
uint32_t m_nnPostFilterSEIActivationTargetId;
bool m_nnPostFilterSEIActivationCancelFlag;
-#if JVET_AD0056_NNPFA_TARGET_BASE_FLAG
bool m_nnPostFilterSEIActivationTargetBaseFlag;
-#endif
bool m_nnPostFilterSEIActivationPersistenceFlag;
std::vector<bool> m_nnPostFilterSEIActivationOutputflag;
@@ -2075,10 +2073,8 @@ public:
uint32_t getNnPostFilterSEIActivationTargetId() const { return m_nnPostFilterSEIActivationTargetId; }
void setNnPostFilterSEIActivationCancelFlag(bool cancelFlag) { m_nnPostFilterSEIActivationCancelFlag = cancelFlag; }
bool getNnPostFilterSEIActivationCancelFlag() const { return m_nnPostFilterSEIActivationCancelFlag;}
-#if JVET_AD0056_NNPFA_TARGET_BASE_FLAG
void setNnPostFilterSEIActivationTargetBaseFlag(bool targetBaseFlag) { m_nnPostFilterSEIActivationTargetBaseFlag = targetBaseFlag; }
bool getNnPostFilterSEIActivationTargetBaseFlag() const { return m_nnPostFilterSEIActivationTargetBaseFlag;}
-#endif
void setNnPostFilterSEIActivationPersistenceFlag(bool persistenceFlag) { m_nnPostFilterSEIActivationPersistenceFlag = persistenceFlag; }
bool getNnPostFilterSEIActivationPersistenceFlag() const { return m_nnPostFilterSEIActivationPersistenceFlag;}
uint32_t getNnPostFilterSEIActivationNumOutputEntries() const { return (uint32_t)m_nnPostFilterSEIActivationOutputflag.size(); }
diff --git a/source/Lib/EncoderLib/SEIEncoder.cpp b/source/Lib/EncoderLib/SEIEncoder.cpp
index 70f670c197..a7d970e45a 100644
--- a/source/Lib/EncoderLib/SEIEncoder.cpp
+++ b/source/Lib/EncoderLib/SEIEncoder.cpp
@@ -1569,9 +1569,7 @@ void SEIEncoder::initSEINeuralNetworkPostFilterActivation(SEINeuralNetworkPostFi
sei->m_cancelFlag = m_pcCfg->getNnPostFilterSEIActivationCancelFlag();
if(!sei->m_cancelFlag)
{
-#if JVET_AD0056_NNPFA_TARGET_BASE_FLAG
sei->m_targetBaseFlag = m_pcCfg->getNnPostFilterSEIActivationTargetBaseFlag();
-#endif
sei->m_persistenceFlag = m_pcCfg->getNnPostFilterSEIActivationPersistenceFlag();
sei->m_outputFlag = m_pcCfg->getNnPostFilterSEIActivationOutputFlag();
}
diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp
index a6d094488a..f197f60324 100644
--- a/source/Lib/EncoderLib/SEIwrite.cpp
+++ b/source/Lib/EncoderLib/SEIwrite.cpp
@@ -1882,9 +1882,7 @@ void SEIWriter::xWriteSEINeuralNetworkPostFilterActivation(const SEINeuralNetwor
xWriteFlag(sei.m_cancelFlag, "nnpfa_cancel_flag");
if(!sei.m_cancelFlag)
{
-#if JVET_AD0056_NNPFA_TARGET_BASE_FLAG
xWriteFlag(sei.m_targetBaseFlag, "nnpfa_target_base_flag");
-#endif
xWriteFlag(sei.m_persistenceFlag, "nnpfa_persistence_flag");
xWriteUvlc((uint32_t)sei.m_outputFlag.size(), "nnpfa_num_output_entries");
for (uint32_t i = 0; i < (uint32_t)sei.m_outputFlag.size(); i++)
--
GitLab