diff --git a/doc/software-manual.tex b/doc/software-manual.tex
index 8ce4fd456429e090617749a8340d91f024cd391d..03bf64bdfc09ba7d694e4844881eb758188fbb61 100644
--- a/doc/software-manual.tex
+++ b/doc/software-manual.tex
@@ -5715,7 +5715,7 @@ Specifies sii_num_units_in_shutter_interval for single entry.If multiple entries
\Default{false} &
Enables (true) or disables (false) the insertion of the neural network post-filter characteristics SEI message.
\\
- \Option{SEINNPFCSuffixFlag} &
+ \Option{SEINNPFCUseSuffixSEI} &
\Default{false} &
Code NNPFC SEI either as suffix (true) or prefix (false) SEI message.
\\
@@ -6040,7 +6040,7 @@ Specifies sii_num_units_in_shutter_interval for single entry.If multiple entries
\Default{false} &
Enables (true) or disables (false) the insertion of the neural network post-filter activation SEI message.
\\
- \Option{SEINNPostFilterActivationSuffixFlag} &
+ \Option{SEINNPostFilterActivationUseSuffixSEI} &
\Default{false} &
Code NNPFA SEI either as suffix (true) or prefix (false) SEI message.
\\
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index 274f1210c680e10ce1a126055fa8c2b01e7f891d..e285c1af8068566eee817f46b5e8ea51840a9de9 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -1185,7 +1185,7 @@ void EncApp::xInitLibCfg( int layerIdx )
#endif
m_cEncLib.setNNPostFilterSEICharacteristicsEnabled (m_nnPostFilterSEICharacteristicsEnabled);
#if JVET_AD0057_NNPF_SUFFIX_SEI
- m_cEncLib.setNNPostFilterSEICharacteristicsSuffixFlag (m_nnPostFilterSEICharacteristicsSuffixFlag);
+ m_cEncLib.setNNPostFilterSEICharacteristicsUseSuffixSEI (m_nnPostFilterSEICharacteristicsUseSuffixSEI);
#endif
m_cEncLib.setNNPostFilterSEICharacteristicsNumFilters (m_nnPostFilterSEICharacteristicsNumFilters);
for (int i = 0; i < m_nnPostFilterSEICharacteristicsNumFilters; i++)
@@ -1330,7 +1330,7 @@ void EncApp::xInitLibCfg( int layerIdx )
}
m_cEncLib.setNnPostFilterSEIActivationEnabled (m_nnPostFilterSEIActivationEnabled);
#if JVET_AD0057_NNPF_SUFFIX_SEI
- m_cEncLib.setNnPostFilterSEIActivationSuffixFlag (m_nnPostFilterSEIActivationSuffixFlag);
+ m_cEncLib.setNnPostFilterSEIActivationUseSuffixSEI (m_nnPostFilterSEIActivationUseSuffixSEI);
#endif
m_cEncLib.setNnPostFilterSEIActivationTargetId(m_nnPostFilterSEIActivationTargetId);
m_cEncLib.setEntropyCodingSyncEnabledFlag ( m_entropyCodingSyncEnabledFlag );
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index effaa5e061fefdad079fbf2609556481bdec6ed2..2f2ccb9c63dd54ebca6e5a6f2d7904338c82cb6f 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1748,7 +1748,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
opts.addOptions()("SEINNPFCEnabled", m_nnPostFilterSEICharacteristicsEnabled, false, "Control generation of the Neural Network Post Filter Characteristics SEI messages");
#if JVET_AD0057_NNPF_SUFFIX_SEI
- opts.addOptions()("SEINNPFCSuffixFlag", m_nnPostFilterSEICharacteristicsSuffixFlag, false, "Code NNPFC SEI either as suffix (1) or prefix (0) SEI message");
+ opts.addOptions()("SEINNPFCUseSuffixSEI", m_nnPostFilterSEICharacteristicsUseSuffixSEI, false, "Code NNPFC SEI either as suffix (1) or prefix (0) SEI message");
#endif
opts.addOptions()( "SEINNPFCNumFilters", m_nnPostFilterSEICharacteristicsNumFilters, 0, "Specifies the number of Neural Network Post Filter Characteristics SEI messages" );
for (int i = 0; i < MAX_NUM_NN_POST_FILTERS; i++)
@@ -1984,7 +1984,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
opts.addOptions()("SEINNPostFilterActivationEnabled", m_nnPostFilterSEIActivationEnabled, false, "Control use of the Neural Network Post Filter SEI on current picture");
#if JVET_AD0057_NNPF_SUFFIX_SEI
- opts.addOptions()("SEINNPostFilterActivationSuffixFlag", m_nnPostFilterSEIActivationSuffixFlag, false, "Code NNPFA SEI either as suffix (1) or prefix (0) SEI message");
+ opts.addOptions()("SEINNPostFilterActivationUseSuffixSEI", m_nnPostFilterSEIActivationUseSuffixSEI, false, "Code NNPFA SEI either as suffix (1) or prefix (0) SEI message");
#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");
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index 560a8417b9edf606dd5d3b1b79e018b2a36eb635..8caa11d6beb8b63ee60eb4e1f4bea6e3df692392 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -730,7 +730,7 @@ protected:
bool m_nnPostFilterSEICharacteristicsEnabled;
#if JVET_AD0057_NNPF_SUFFIX_SEI
- bool m_nnPostFilterSEICharacteristicsSuffixFlag;
+ bool m_nnPostFilterSEICharacteristicsUseSuffixSEI;
#endif
int m_nnPostFilterSEICharacteristicsNumFilters;
uint32_t m_nnPostFilterSEICharacteristicsId[MAX_NUM_NN_POST_FILTERS];
@@ -792,7 +792,7 @@ protected:
bool m_nnPostFilterSEIActivationEnabled;
#if JVET_AD0057_NNPF_SUFFIX_SEI
- bool m_nnPostFilterSEIActivationSuffixFlag;
+ bool m_nnPostFilterSEIActivationUseSuffixSEI;
#endif
uint32_t m_nnPostFilterSEIActivationTargetId;
uint32_t m_nnPostFilterSEICharacteristicsNumberInputDecodedPicturesMinus1[MAX_NUM_NN_POST_FILTERS];
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index 1e96a4f1afc2be01e955388d92b33b06c71a5d9d..c458960233760c3c0b6175b53b824c52ef6daa73 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -695,7 +695,7 @@ protected:
bool m_nnPostFilterSEICharacteristicsEnabled;
#if JVET_AD0057_NNPF_SUFFIX_SEI
- bool m_nnPostFilterSEICharacteristicsSuffixFlag;
+ bool m_nnPostFilterSEICharacteristicsUseSuffixSEI;
#endif
int m_nnPostFilterSEICharacteristicsNumFilters;
uint32_t m_nnPostFilterSEICharacteristicsId[MAX_NUM_NN_POST_FILTERS];
@@ -763,7 +763,7 @@ protected:
bool m_nnPostFilterSEIActivationEnabled;
#if JVET_AD0057_NNPF_SUFFIX_SEI
- bool m_nnPostFilterSEIActivationSuffixFlag;
+ bool m_nnPostFilterSEIActivationUseSuffixSEI;
#endif
uint32_t m_nnPostFilterSEIActivationTargetId;
bool m_nnPostFilterSEIActivationCancelFlag;
@@ -1939,8 +1939,8 @@ public:
void setNNPostFilterSEICharacteristicsEnabled(bool enabledFlag) { m_nnPostFilterSEICharacteristicsEnabled = enabledFlag; }
bool getNNPostFilterSEICharacteristicsEnabled() const { return m_nnPostFilterSEICharacteristicsEnabled; }
#if JVET_AD0057_NNPF_SUFFIX_SEI
- void setNNPostFilterSEICharacteristicsSuffixFlag(bool suffixFlag) { m_nnPostFilterSEICharacteristicsSuffixFlag = suffixFlag; }
- bool getNNPostFilterSEICharacteristicsSuffixFlag() const { return m_nnPostFilterSEICharacteristicsSuffixFlag; }
+ void setNNPostFilterSEICharacteristicsUseSuffixSEI(bool suffixFlag) { m_nnPostFilterSEICharacteristicsUseSuffixSEI = suffixFlag; }
+ bool getNNPostFilterSEICharacteristicsUseSuffixSEI() const { return m_nnPostFilterSEICharacteristicsUseSuffixSEI; }
#endif
void setNNPostFilterSEICharacteristicsNumFilters(int numFilters) { m_nnPostFilterSEICharacteristicsNumFilters = numFilters; }
int getNNPostFilterSEICharacteristicsNumFilters() const { return m_nnPostFilterSEICharacteristicsNumFilters; }
@@ -2085,8 +2085,8 @@ public:
void setNnPostFilterSEIActivationEnabled(bool enabledFlag) { m_nnPostFilterSEIActivationEnabled = enabledFlag; }
bool getNnPostFilterSEIActivationEnabled() const { return m_nnPostFilterSEIActivationEnabled; }
#if JVET_AD0057_NNPF_SUFFIX_SEI
- void setNnPostFilterSEIActivationSuffixFlag(bool suffixFlag) { m_nnPostFilterSEIActivationSuffixFlag = suffixFlag; }
- bool getNnPostFilterSEIActivationSuffixFlag() const { return m_nnPostFilterSEIActivationSuffixFlag; }
+ void setNnPostFilterSEIActivationUseSuffixSEI(bool suffixFlag) { m_nnPostFilterSEIActivationUseSuffixSEI = suffixFlag; }
+ bool getNnPostFilterSEIActivationUseSuffixSEI() const { return m_nnPostFilterSEIActivationUseSuffixSEI; }
#endif
void setNnPostFilterSEIActivationTargetId(uint32_t targetId) { m_nnPostFilterSEIActivationTargetId = targetId; }
uint32_t getNnPostFilterSEIActivationTargetId() const { return m_nnPostFilterSEIActivationTargetId; }
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index 58b060797cf061a5b8fa9f067b952e09066b1933..445702e4a88ecfdb11747a67d899c6b5546c3754 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -920,7 +920,7 @@ void EncGOP::xCreateIRAPLeadingSEIMessages (SEIMessages& seiMessages, const SPS
seiMessages.push_back(seiShutterInterval);
}
#if JVET_AD0057_NNPF_SUFFIX_SEI
- if (m_pcCfg->getNNPostFilterSEICharacteristicsEnabled() && !m_pcCfg->getNNPostFilterSEICharacteristicsSuffixFlag())
+ if (m_pcCfg->getNNPostFilterSEICharacteristicsEnabled() && !m_pcCfg->getNNPostFilterSEICharacteristicsUseSuffixSEI())
{
xCreateNNPostFilterCharacteristicsSEIMessages(seiMessages);
}
@@ -1023,7 +1023,7 @@ void EncGOP::xCreatePerPictureSEIMessages (int picInGOP, SEIMessages& seiMessage
}
#if JVET_AD0057_NNPF_SUFFIX_SEI
- if (m_pcCfg->getNnPostFilterSEIActivationEnabled() && !m_pcCfg->getNnPostFilterSEIActivationSuffixFlag())
+ if (m_pcCfg->getNnPostFilterSEIActivationEnabled() && !m_pcCfg->getNnPostFilterSEIActivationUseSuffixSEI())
{
xCreateNNPostFilterActivationSEIMessage(seiMessages, slice);
}
@@ -3950,7 +3950,7 @@ void EncGOP::compressGOP(int pocLast, int numPicRcvd, PicList &rcListPic, std::l
}
#if JVET_AD0057_NNPF_SUFFIX_SEI
- if (writePS && m_pcCfg->getNNPostFilterSEICharacteristicsEnabled() && m_pcCfg->getNNPostFilterSEICharacteristicsSuffixFlag())
+ if (writePS && m_pcCfg->getNNPostFilterSEICharacteristicsEnabled() && m_pcCfg->getNNPostFilterSEICharacteristicsUseSuffixSEI())
{
// create NNPostFilterSEICharacteristics SEI as suffix SEI
xCreateNNPostFilterCharacteristicsSEIMessages(trailingSeiMessages);
@@ -4074,7 +4074,7 @@ void EncGOP::compressGOP(int pocLast, int numPicRcvd, PicList &rcListPic, std::l
xCreatePerPictureSEIMessages(gopId, leadingSeiMessages, nestedSeiMessages, pcSlice);
#if JVET_AD0057_NNPF_SUFFIX_SEI
- if (m_pcCfg->getNnPostFilterSEIActivationEnabled() && m_pcCfg->getNnPostFilterSEIActivationSuffixFlag())
+ if (m_pcCfg->getNnPostFilterSEIActivationEnabled() && m_pcCfg->getNnPostFilterSEIActivationUseSuffixSEI())
{
// create NeuralNetworkPostFilterActivation SEI as suffix SEI
xCreateNNPostFilterActivationSEIMessage(trailingSeiMessages, pcSlice);