From 55bed034ace928370f1747d8619fc7b72fbdeb41 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Thu, 19 Jan 2023 01:05:03 +0100
Subject: [PATCH] remove macro JVET_AB0058_NN_FRAME_RATE_UPSAMPLING
---
source/App/EncoderApp/EncApp.cpp | 2 --
source/App/EncoderApp/EncAppCfg.cpp | 6 ------
source/App/EncoderApp/EncAppCfg.h | 2 --
source/Lib/CommonLib/SEI.h | 2 --
source/Lib/CommonLib/TypeDef.h | 3 ---
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, 25 deletions(-)
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index f52818b76..dea266ec2 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -1174,13 +1174,11 @@ void EncApp::xInitLibCfg( int layerIdx )
m_cEncLib.setNNPostFilterSEICharacteristicsPicWidthInLumaSamples (m_nnPostFilterSEICharacteristicsPicWidthInLumaSamples[i], i);
m_cEncLib.setNNPostFilterSEICharacteristicsPicHeightInLumaSamples (m_nnPostFilterSEICharacteristicsPicHeightInLumaSamples[i], i);
}
-#if JVET_AB0058_NN_FRAME_RATE_UPSAMPLING
if (m_cEncLib.getNNPostFilterSEICharacteristicsPurpose(i) == 5)
{
m_cEncLib.setNNPostFilterSEICharacteristicsNumberInputDecodedPicturesMinus2(m_nnPostFilterSEICharacteristicsNumberInputDecodedPicturesMinus2[i], i);
m_cEncLib.setNNPostFilterSEICharacteristicsNumberInterpolatedPictures( m_nnPostFilterSEICharacteristicsNumberInterpolatedPictures[i], i);
}
-#endif
m_cEncLib.setNNPostFilterSEICharacteristicsComponentLastFlag (m_nnPostFilterSEICharacteristicsComponentLastFlag[i], i);
#if M60678_BALLOT_COMMENTS_OF_FI_03
m_cEncLib.setNNPostFilterSEICharacteristicsInpFormatIdc (m_nnPostFilterSEICharacteristicsInpFormatIdc[i], i);
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 80f085ecd..dcc6419f5 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -742,13 +742,11 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
SMultiValueInput<int32_t> cfg_postFilterHintSEIValues(INT32_MIN + 1, INT32_MAX, 1 * 1 * 1, 15 * 15 * 3);
#endif
-#if JVET_AB0058_NN_FRAME_RATE_UPSAMPLING
std::vector<SMultiValueInput<uint32_t>> cfg_nnPostFilterSEICharacteristicsInterpolatedPicturesList;
for (int i = 0; i < MAX_NUM_NN_POST_FILTERS; i++)
{
cfg_nnPostFilterSEICharacteristicsInterpolatedPicturesList.push_back(SMultiValueInput<uint32_t>(0, std::numeric_limits<uint32_t>::max(), 1, 0));
}
-#endif
#if ENABLE_TRACING
string sTracingRule;
@@ -1876,7 +1874,6 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
payloadFilename << "SEINNPostFilterCharacteristicsPayloadFilename" << i;
opts.addOptions()(payloadFilename.str(), m_nnPostFilterSEICharacteristicsPayloadFilename[i], string(""), "Specifies the NNR bitstream in the Neural Network Post Filter Characteristics SEI message");
-#if JVET_AB0058_NN_FRAME_RATE_UPSAMPLING
std::ostringstream numberDecodedInputPics;
numberDecodedInputPics << "SEINNPostFilterCharacteristicsNumberInputDecodedPicsMinusTwo" << i;
opts.addOptions()(numberDecodedInputPics.str(), m_nnPostFilterSEICharacteristicsNumberInputDecodedPicturesMinus2[i], 0u, "Specifies the number of decoded output pictures used as input for the post processing filter");
@@ -1884,7 +1881,6 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
std::ostringstream numberInterpolatedPics;
numberInterpolatedPics << "SEINNPostFilterCharacteristicsNumberInterpolatedPics" << i;
opts.addOptions()(numberInterpolatedPics.str(), cfg_nnPostFilterSEICharacteristicsInterpolatedPicturesList[i], cfg_nnPostFilterSEICharacteristicsInterpolatedPicturesList[i], "Number of pictures to interpolate");
-#endif
opts.addOptions()("SEINNPostFilterActivationEnabled", m_nnPostFilterSEIActivationEnabled, false, "Control use of the Neural Network Post Filter SEI on current picture");
opts.addOptions()("SEINNPostFilterActivationId", m_nnPostFilterSEIActivationId , 0u, "Id of the Neural Network Post Filter on current picture");
@@ -2388,7 +2384,6 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
m_ext360.processOptions(ext360CfgContext);
#endif
-#if JVET_AB0058_NN_FRAME_RATE_UPSAMPLING
for (int i = 0; i < MAX_NUM_NN_POST_FILTERS; ++i)
{
m_nnPostFilterSEICharacteristicsNumberInterpolatedPictures[i] = cfg_nnPostFilterSEICharacteristicsInterpolatedPicturesList[i].values;
@@ -2398,7 +2393,6 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
}
CHECK(m_nnPostFilterSEICharacteristicsNumberInterpolatedPictures[i].size() < m_nnPostFilterSEICharacteristicsNumberInputDecodedPicturesMinus2[i], "Number Interpolated Pictures List must be greater than number of decoder pictures list");
}
-#endif
if (isY4mFileExt(m_inputFileName))
{
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index f6d59f7a1..df4daa5e2 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -765,10 +765,8 @@ protected:
bool m_nnPostFilterSEIActivationEnabled;
uint32_t m_nnPostFilterSEIActivationId;
-#if JVET_AB0058_NN_FRAME_RATE_UPSAMPLING
uint32_t m_nnPostFilterSEICharacteristicsNumberInputDecodedPicturesMinus2[MAX_NUM_NN_POST_FILTERS];
std::vector<uint32_t> m_nnPostFilterSEICharacteristicsNumberInterpolatedPictures[MAX_NUM_NN_POST_FILTERS];
-#endif
bool m_nnPostFilterSEIActivationCancelFlag;
bool m_nnPostFilterSEIActivationPersistenceFlag;
diff --git a/source/Lib/CommonLib/SEI.h b/source/Lib/CommonLib/SEI.h
index a7dd8c6ce..9d3e0db39 100644
--- a/source/Lib/CommonLib/SEI.h
+++ b/source/Lib/CommonLib/SEI.h
@@ -1264,10 +1264,8 @@ public:
uint32_t m_numParametersIdc;
uint32_t m_numKmacOperationsIdc;
uint32_t m_totalKilobyteSize;
-#if JVET_AB0058_NN_FRAME_RATE_UPSAMPLING
uint32_t m_numberInputDecodedPicturesMinus2;
std::vector<uint32_t> m_numberInterpolatedPictures;
-#endif
};
class SEINeuralNetworkPostFilterActivation : public SEI
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 71ff9222c..320d6c62d 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -55,7 +55,6 @@
// clang-format off
//########### place macros to be removed in next cycle below this line ###############
-#define JVET_AB0058_NN_FRAME_RATE_UPSAMPLING 1 // JVET-AB0058: Allow for signalling nn frame rate upsampling
#define JVET_AB0047_MOVE_GATED_SYNTAX_OF_NNPFC_URIS_AFTER_NNPFC_MODEIDC 1
#define JVET_AB0072 1 //Green-MPEG SEI Messaging (JVET-AB0072)
@@ -774,7 +773,6 @@ enum NNPC_PaddingType
FIXED_PADDING = 4
};
-#if JVET_AB0058_NN_FRAME_RATE_UPSAMPLING
enum NNPC_PurposeType
{
UNKONWN = 0,
@@ -784,7 +782,6 @@ enum NNPC_PurposeType
INCREASE_PICT_DIMENSION_WITH_CHROMA_UPSMAPLING = 4,
FRANE_RATE_UPSAMPLING = 5
};
-#endif
enum POST_FILTER_MODE
{
diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp
index 0a8f2114d..4a81aa59a 100644
--- a/source/Lib/DecoderLib/SEIread.cpp
+++ b/source/Lib/DecoderLib/SEIread.cpp
@@ -2724,7 +2724,6 @@ void SEIReader::xParseSEINNPostFilterCharacteristics(SEINeuralNetworkPostFilterC
sei_read_flag(pDecodedMessageOutputStream, val, "nnpfc_pic_height_in_luma_samples");
sei.m_picHeightInLumaSamples = val;
}
-#if JVET_AB0058_NN_FRAME_RATE_UPSAMPLING
if (sei.m_purpose == NNPC_PurposeType::FRANE_RATE_UPSAMPLING)
{
@@ -2737,7 +2736,6 @@ void SEIReader::xParseSEINNPostFilterCharacteristics(SEINeuralNetworkPostFilterC
sei.m_numberInterpolatedPictures[i] = val;
}
}
-#endif
sei_read_flag(pDecodedMessageOutputStream, val, "nnpfc_component_last_flag");
sei.m_componentLastFlag = val;
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index eb2fd6c8e..1226a9569 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -724,10 +724,8 @@ protected:
uint32_t m_nnPostFilterSEICharacteristicsNumParametersIdc[MAX_NUM_NN_POST_FILTERS];
uint32_t m_nnPostFilterSEICharacteristicsNumKmacOperationsIdc[MAX_NUM_NN_POST_FILTERS];
uint32_t m_nnPostFilterSEICharacteristicsTotalKilobyteSize[MAX_NUM_NN_POST_FILTERS];
-#if JVET_AB0058_NN_FRAME_RATE_UPSAMPLING
uint32_t m_nnPostFilterSEICharacteristicsNumberInputDecodedPicturesMinus2[MAX_NUM_NN_POST_FILTERS];
std::vector<uint32_t> m_nnPostFilterSEICharacteristicsNumberInterpolatedPictures[MAX_NUM_NN_POST_FILTERS];
-#endif
bool m_nnPostFilterSEIActivationEnabled;
uint32_t m_nnPostFilterSEIActivationId;
@@ -1958,12 +1956,10 @@ public:
void setNNPostFilterSEICharacteristicsPayloadFilename(std::string payloadFilename, int filterIdx) { m_nnPostFilterSEICharacteristicsPayloadFilename[filterIdx] = payloadFilename; }
std::string getNNPostFilterSEICharacteristicsPayloadFilename(int filterIdx) const { return m_nnPostFilterSEICharacteristicsPayloadFilename[filterIdx]; }
-#if JVET_AB0058_NN_FRAME_RATE_UPSAMPLING
void setNNPostFilterSEICharacteristicsNumberInputDecodedPicturesMinus2(uint32_t value, int filterIdx) { m_nnPostFilterSEICharacteristicsNumberInputDecodedPicturesMinus2[filterIdx] = value; }
uint32_t getNNPostFilterSEICharacteristicsNumberInputDecodedPicturesMinus2(int filterIdx) const { return m_nnPostFilterSEICharacteristicsNumberInputDecodedPicturesMinus2[filterIdx]; }
void setNNPostFilterSEICharacteristicsNumberInterpolatedPictures(std::vector<uint32_t> value, int filterIdx) { m_nnPostFilterSEICharacteristicsNumberInterpolatedPictures[filterIdx] = value; }
const std::vector<uint32_t>& getNNPostFilterSEICharacteristicsNumberInterpolatedPictures(int filterIdx) { return m_nnPostFilterSEICharacteristicsNumberInterpolatedPictures[filterIdx]; }
-#endif
void setNnPostFilterSEIActivationEnabled(bool enabledFlag) { m_nnPostFilterSEIActivationEnabled = enabledFlag; }
bool getNnPostFilterSEIActivationEnabled() const { return m_nnPostFilterSEIActivationEnabled; }
void setNnPostFilterSEIActivationId(uint32_t id) { m_nnPostFilterSEIActivationId = id; }
diff --git a/source/Lib/EncoderLib/SEIEncoder.cpp b/source/Lib/EncoderLib/SEIEncoder.cpp
index 65cc887b5..b2850faf9 100644
--- a/source/Lib/EncoderLib/SEIEncoder.cpp
+++ b/source/Lib/EncoderLib/SEIEncoder.cpp
@@ -1344,13 +1344,11 @@ void SEIEncoder::initSEINeuralNetworkPostFilterCharacteristics(SEINeuralNetworkP
CHECK(!(sei->m_picWidthInLumaSamples >= croppedWidth && sei->m_picWidthInLumaSamples <= croppedWidth * 16 - 1), "m_picWidthInLumaSamples shall be in the range of croppedWidth to croppedWidth * 16 - 1");
CHECK(!(sei->m_picHeightInLumaSamples >= croppedHeight && sei->m_picHeightInLumaSamples <= croppedHeight * 16 - 1), "m_picHeightInLumaSamples shall be in the range of croppedHeight to croppedHeight * 16 - 1");
}
-#if JVET_AB0058_NN_FRAME_RATE_UPSAMPLING
if (sei->m_purpose == NNPC_PurposeType::FRANE_RATE_UPSAMPLING)
{
sei->m_numberInputDecodedPicturesMinus2 = m_pcCfg->getNNPostFilterSEICharacteristicsNumberInputDecodedPicturesMinus2(filterIdx);
sei->m_numberInterpolatedPictures = m_pcCfg->getNNPostFilterSEICharacteristicsNumberInterpolatedPictures(filterIdx);
}
-#endif
sei->m_componentLastFlag = m_pcCfg->getNNPostFilterSEICharacteristicsComponentLastFlag(filterIdx);
#if M60678_BALLOT_COMMENTS_OF_FI_03
diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp
index 5534bd064..c15ce6b62 100644
--- a/source/Lib/EncoderLib/SEIwrite.cpp
+++ b/source/Lib/EncoderLib/SEIwrite.cpp
@@ -1709,7 +1709,6 @@ void SEIWriter::xWriteSEINeuralNetworkPostFilterCharacteristics(const SEINeuralN
xWriteUvlc(sei.m_picWidthInLumaSamples, "nnpfc_pic_width_in_luma_samples");
xWriteUvlc(sei.m_picHeightInLumaSamples, "nnpfc_pic_height_in_luma_samples");
}
-#if JVET_AB0058_NN_FRAME_RATE_UPSAMPLING
if (sei.m_purpose == NNPC_PurposeType::CHROMA_UPSAMPLING)
{
xWriteUvlc(sei.m_numberInputDecodedPicturesMinus2, "nnpfc_number_of_input_pictures_minus2");
@@ -1718,7 +1717,6 @@ void SEIWriter::xWriteSEINeuralNetworkPostFilterCharacteristics(const SEINeuralN
xWriteUvlc(sei.m_numberInterpolatedPictures[i], "nnpfc_interpolated_pictures");
}
}
-#endif
xWriteFlag(sei.m_componentLastFlag, "nnpfc_component_last_flag");
#if M60678_BALLOT_COMMENTS_OF_FI_03
--
GitLab