From 2a5d54f9fe3ebe1f98ed5e3545b68a5aa0cef117 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Thu, 19 Jan 2023 01:05:09 +0100
Subject: [PATCH] remove macro M60678_BALLOT_COMMENTS_OF_FI_03
---
source/App/EncoderApp/EncApp.cpp | 16 ----------------
source/App/EncoderApp/EncAppCfg.cpp | 20 --------------------
source/App/EncoderApp/EncAppCfg.h | 8 --------
source/Lib/CommonLib/SEI.h | 16 ----------------
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/SEIread.cpp | 22 ----------------------
source/Lib/EncoderLib/EncCfg.h | 18 ------------------
source/Lib/EncoderLib/SEIEncoder.cpp | 19 -------------------
source/Lib/EncoderLib/SEIwrite.cpp | 18 ------------------
9 files changed, 138 deletions(-)
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index dea266ec2..c5d4ee693 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -1180,33 +1180,17 @@ void EncApp::xInitLibCfg( int layerIdx )
m_cEncLib.setNNPostFilterSEICharacteristicsNumberInterpolatedPictures( m_nnPostFilterSEICharacteristicsNumberInterpolatedPictures[i], i);
}
m_cEncLib.setNNPostFilterSEICharacteristicsComponentLastFlag (m_nnPostFilterSEICharacteristicsComponentLastFlag[i], i);
-#if M60678_BALLOT_COMMENTS_OF_FI_03
m_cEncLib.setNNPostFilterSEICharacteristicsInpFormatIdc (m_nnPostFilterSEICharacteristicsInpFormatIdc[i], i);
if (m_cEncLib.getNNPostFilterSEICharacteristicsInpFormatIdc(i) == 1)
{
m_cEncLib.setNNPostFilterSEICharacteristicsInpTensorBitDepthMinus8 (m_nnPostFilterSEICharacteristicsInpTensorBitDepthMinus8[i], i);
}
-#else
- m_cEncLib.setNNPostFilterSEICharacteristicsInpSampleIdc (m_nnPostFilterSEICharacteristicsInpSampleIdc[i], i);
- if (m_cEncLib.getNNPostFilterSEICharacteristicsInpSampleIdc(i) == 4)
- {
- m_cEncLib.setNNPostFilterSEICharacteristicsInpTensorBitDepthMinus8 (m_nnPostFilterSEICharacteristicsInpTensorBitDepthMinus8[i], i);
- }
-#endif
m_cEncLib.setNNPostFilterSEICharacteristicsInpOrderIdc (m_nnPostFilterSEICharacteristicsInpOrderIdc[i], i);
-#if M60678_BALLOT_COMMENTS_OF_FI_03
m_cEncLib.setNNPostFilterSEICharacteristicsOutFormatIdc (m_nnPostFilterSEICharacteristicsOutFormatIdc[i], i);
if (m_cEncLib.getNNPostFilterSEICharacteristicsOutFormatIdc(i) == 1)
{
m_cEncLib.setNNPostFilterSEICharacteristicsOutTensorBitDepthMinus8 (m_nnPostFilterSEICharacteristicsOutTensorBitDepthMinus8[i], i);
}
-#else
- m_cEncLib.setNNPostFilterSEICharacteristicsOutSampleIdc (m_nnPostFilterSEICharacteristicsOutSampleIdc[i], i);
- if (m_cEncLib.getNNPostFilterSEICharacteristicsOutSampleIdc(i) == 4)
- {
- m_cEncLib.setNNPostFilterSEICharacteristicsOutTensorBitDepthMinus8 (m_nnPostFilterSEICharacteristicsOutTensorBitDepthMinus8[i], i);
- }
-#endif
m_cEncLib.setNNPostFilterSEICharacteristicsOutOrderIdc (m_nnPostFilterSEICharacteristicsOutOrderIdc[i], i);
m_cEncLib.setNNPostFilterSEICharacteristicsConstantPatchSizeFlag ( m_nnPostFilterSEICharacteristicsConstantPatchSizeFlag[i], i);
m_cEncLib.setNNPostFilterSEICharacteristicsPatchWidthMinus1 ( m_nnPostFilterSEICharacteristicsPatchWidthMinus1[i], i);
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index dcc6419f5..c702bd5a7 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1760,15 +1760,9 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
opts.addOptions()(componentLastFlag.str(), m_nnPostFilterSEICharacteristicsComponentLastFlag[i], false, "Specifies the channel component is located in the last dimension for the Neural Network Post Filter Characteristics SEI message");
-#if M60678_BALLOT_COMMENTS_OF_FI_03
std::ostringstream inpFormatIdc;
inpFormatIdc << "SEINNPostFilterCharacteristicsInpFormatIdc" << i;
opts.addOptions()(inpFormatIdc.str(), m_nnPostFilterSEICharacteristicsInpFormatIdc[i], 0u, "Specifies the method of converting an input sample in the the Neural Network Post Filter Characteristics SEI message");
-#else
- std::ostringstream inpSampleIdc;
- inpSampleIdc << "SEINNPostFilterCharacteristicsInpSampleIdc" << i;
- opts.addOptions()(inpSampleIdc.str(), m_nnPostFilterSEICharacteristicsInpSampleIdc[i], 0u, "Specifies the method of converting an input sample in the the Neural Network Post Filter Characteristics SEI message");
-#endif
std::ostringstream auxInpIdc;
auxInpIdc << "SEINNPostFilterCharacteristicsAuxInpIdc" << i;
opts.addOptions()(auxInpIdc.str(), m_nnPostFilterSEICharacteristicsAuxInpIdc[i], 0u, "Specifies the auxillary input index in the Nueral Network Post Filter Characteristics SEI message");
@@ -1792,15 +1786,9 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
inpOrderIdc << "SEINNPostFilterCharacteristicsInpOrderIdc" << i;
opts.addOptions()(inpOrderIdc.str(), m_nnPostFilterSEICharacteristicsInpOrderIdc[i], 0u, "Specifies the method of ordering the input sample arrays in the Neural Network Post Filter Characteristics SEI message");
-#if M60678_BALLOT_COMMENTS_OF_FI_03
std::ostringstream outFormatIdc;
outFormatIdc << "SEINNPostFilterCharacteristicsOutFormatIdc" << i;
opts.addOptions()(outFormatIdc.str(), m_nnPostFilterSEICharacteristicsOutFormatIdc[i], 0u, "Specifies the method of converting an output sample in the the Neural Network Post Filter Characteristics SEI message");
-#else
- std::ostringstream outSampleIdc;
- outSampleIdc << "SEINNPostFilterCharacteristicsOutSampleIdc" << i;
- opts.addOptions()(outSampleIdc.str(), m_nnPostFilterSEICharacteristicsOutSampleIdc[i], 0u, "Specifies the method of converting an output sample in the the Neural Network Post Filter Characteristics SEI message");
-#endif
std::ostringstream outOrderIdc;
outOrderIdc << "SEINNPostFilterCharacteristicsOutOrderIdc" << i;
@@ -4824,20 +4812,12 @@ bool EncAppCfg::xCheckParameter()
xConfirmPara(m_nnPostFilterSEICharacteristicsPurpose[i] > 1023, "SEINNPostFilterCharacteristicsPurpose must be in the range of 0 to 1023");
xConfirmPara(m_nnPostFilterSEICharacteristicsInpTensorBitDepthMinus8[i] > 24, "SEINNPostFilterCharacteristicsInpTensorBitDepthMinus8 must be in the range of 0 to 24");
xConfirmPara(m_nnPostFilterSEICharacteristicsOutTensorBitDepthMinus8[i] > 24, "SEINNPostFilterCharacteristicsOutTensorBitDepthMinus8 must be in the range of 0 to 24");
-#if M60678_BALLOT_COMMENTS_OF_FI_03
xConfirmPara(m_nnPostFilterSEICharacteristicsInpFormatIdc[i] > 255, "SEINNPostFilterCharacteristicsInpFormatIdc must be in the range of 0 to 255");
-#else
- xConfirmPara(m_nnPostFilterSEICharacteristicsInpSampleIdc[i] > 255, "SEINNPostFilterCharacteristicsInpSampleIdc must be in the range of 0 to 255");
-#endif
xConfirmPara(m_nnPostFilterSEICharacteristicsInpOrderIdc[i] > 255, "SEINNPostFilterCharacteristicsInpOrderIdc must be in the range of 0 to 255");
xConfirmPara(m_nnPostFilterSEICharacteristicsColPrimaries[i] > 255, "m_nnPostFilterSEICharacteristicsColPrimaries must in the range 0 to 255");
xConfirmPara(m_nnPostFilterSEICharacteristicsTransCharacteristics[i] > 255, "m_nnPostFilterSEICharacteristicsTransCharacteristics must in the range 0 to 255");
xConfirmPara(m_nnPostFilterSEICharacteristicsMatrixCoeffs[i] > 255, "m_nnPostFilterSEICharacteristicsMatrixCoeffs must in the range 0 to 255");
-#if M60678_BALLOT_COMMENTS_OF_FI_03
xConfirmPara(m_nnPostFilterSEICharacteristicsOutFormatIdc[i] > 255, "SEINNPostFilterCharacteristicsOutFormatIdc must be in the range of 0 to 255");
-#else
- xConfirmPara(m_nnPostFilterSEICharacteristicsOutSampleIdc[i] > 255, "SEINNPostFilterCharacteristicsOutSampleIdc must be in the range of 0 to 255");
-#endif
xConfirmPara(m_nnPostFilterSEICharacteristicsOutOrderIdc[i] > 255, "SEINNPostFilterCharacteristicsOutOrderIdc must be in the range of 0 to 255");
xConfirmPara(m_nnPostFilterSEICharacteristicsPatchWidthMinus1[i] > 32766, "SEINNPostFilterCharacteristicsPatchWidthMinus1 must be in the range of 0 to 32766");
xConfirmPara(m_nnPostFilterSEICharacteristicsPatchHeightMinus1[i] > 32766, "SEINNPostFilterCharacteristicsPatchHeightMinus1 must be in the range of 0 to 32766");
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index df4daa5e2..dfeb5e6c8 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -728,22 +728,14 @@ protected:
uint32_t m_nnPostFilterSEICharacteristicsInpTensorBitDepthMinus8[MAX_NUM_NN_POST_FILTERS];
uint32_t m_nnPostFilterSEICharacteristicsOutTensorBitDepthMinus8[MAX_NUM_NN_POST_FILTERS];
bool m_nnPostFilterSEICharacteristicsComponentLastFlag[MAX_NUM_NN_POST_FILTERS];
-#if M60678_BALLOT_COMMENTS_OF_FI_03
uint32_t m_nnPostFilterSEICharacteristicsInpFormatIdc[MAX_NUM_NN_POST_FILTERS];
-#else
- uint32_t m_nnPostFilterSEICharacteristicsInpSampleIdc[MAX_NUM_NN_POST_FILTERS];
-#endif
uint32_t m_nnPostFilterSEICharacteristicsAuxInpIdc[MAX_NUM_NN_POST_FILTERS];
bool m_nnPostFilterSEICharacteristicsSepColDescriptionFlag[MAX_NUM_NN_POST_FILTERS];
uint32_t m_nnPostFilterSEICharacteristicsColPrimaries[MAX_NUM_NN_POST_FILTERS];
uint32_t m_nnPostFilterSEICharacteristicsTransCharacteristics[MAX_NUM_NN_POST_FILTERS];
uint32_t m_nnPostFilterSEICharacteristicsMatrixCoeffs[MAX_NUM_NN_POST_FILTERS];
uint32_t m_nnPostFilterSEICharacteristicsInpOrderIdc[MAX_NUM_NN_POST_FILTERS];
-#if M60678_BALLOT_COMMENTS_OF_FI_03
uint32_t m_nnPostFilterSEICharacteristicsOutFormatIdc[MAX_NUM_NN_POST_FILTERS];
-#else
- uint32_t m_nnPostFilterSEICharacteristicsOutSampleIdc[MAX_NUM_NN_POST_FILTERS];
-#endif
uint32_t m_nnPostFilterSEICharacteristicsOutOrderIdc[MAX_NUM_NN_POST_FILTERS];
bool m_nnPostFilterSEICharacteristicsConstantPatchSizeFlag[MAX_NUM_NN_POST_FILTERS];
uint32_t m_nnPostFilterSEICharacteristicsPatchWidthMinus1[MAX_NUM_NN_POST_FILTERS];
diff --git a/source/Lib/CommonLib/SEI.h b/source/Lib/CommonLib/SEI.h
index 9d3e0db39..8a13abe28 100644
--- a/source/Lib/CommonLib/SEI.h
+++ b/source/Lib/CommonLib/SEI.h
@@ -1172,22 +1172,14 @@ public:
, m_inpTensorBitDepthMinus8(0)
, m_outTensorBitDepthMinus8(0)
, m_componentLastFlag(false)
-#if M60678_BALLOT_COMMENTS_OF_FI_03
, m_inpFormatIdc(0)
-#else
- , m_inpSampleIdc(0)
-#endif
, m_auxInpIdc(0)
, m_sepColDescriptionFlag(false)
, m_colPrimaries(0)
, m_transCharacteristics(0)
, m_matrixCoeffs(0)
, m_inpOrderIdc(0)
-#if M60678_BALLOT_COMMENTS_OF_FI_03
, m_outFormatIdc(0)
-#else
- , m_outSampleIdc(0)
-#endif
, m_outOrderIdc(0)
, m_constantPatchSizeFlag(false)
, m_patchWidthMinus1(0)
@@ -1229,22 +1221,14 @@ public:
uint32_t m_inpTensorBitDepthMinus8;
uint32_t m_outTensorBitDepthMinus8;
bool m_componentLastFlag;
-#if M60678_BALLOT_COMMENTS_OF_FI_03
uint32_t m_inpFormatIdc;
-#else
- uint32_t m_inpSampleIdc;
-#endif
uint32_t m_auxInpIdc;
bool m_sepColDescriptionFlag;
uint8_t m_colPrimaries;
uint8_t m_transCharacteristics;
uint8_t m_matrixCoeffs;
uint32_t m_inpOrderIdc;
-#if M60678_BALLOT_COMMENTS_OF_FI_03
uint32_t m_outFormatIdc;
-#else
- uint32_t m_outSampleIdc;
-#endif
uint32_t m_outOrderIdc;
bool m_constantPatchSizeFlag;
uint32_t m_patchWidthMinus1;
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 12c5a2dfb..a88652e76 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -56,7 +56,6 @@
//########### place macros to be removed in next cycle below this line ###############
-#define M60678_BALLOT_COMMENTS_OF_FI_03 1 // m60678: Ballot comments of FI_03
#define JVET_AB0070_POST_FILTER_HINT 1 // JVET-AB0070: post-filter hint SEI
diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp
index e0fc1b68b..e9baa86df 100644
--- a/source/Lib/DecoderLib/SEIread.cpp
+++ b/source/Lib/DecoderLib/SEIread.cpp
@@ -2738,7 +2738,6 @@ void SEIReader::xParseSEINNPostFilterCharacteristics(SEINeuralNetworkPostFilterC
sei_read_flag(pDecodedMessageOutputStream, val, "nnpfc_component_last_flag");
sei.m_componentLastFlag = val;
-#if M60678_BALLOT_COMMENTS_OF_FI_03
sei_read_uvlc(pDecodedMessageOutputStream, val, "nnpfc_inp_format_idc");
sei.m_inpFormatIdc = val;
@@ -2747,16 +2746,6 @@ void SEIReader::xParseSEINNPostFilterCharacteristics(SEINeuralNetworkPostFilterC
sei_read_uvlc(pDecodedMessageOutputStream, val, "nnpfc_inp_tensor_bitdepth_minus8");
sei.m_inpTensorBitDepthMinus8 = val;
}
-#else
- sei_read_uvlc(pDecodedMessageOutputStream, val, "nnpfc_inp_sample_idc");
- sei.m_inpSampleIdc = val;
-
- if(sei.m_inpSampleIdc == 4)
- {
- sei_read_uvlc(pDecodedMessageOutputStream, val, "nnpfc_inp_tensor_bitdepth_minus8");
- sei.m_inpTensorBitDepthMinus8 = val;
- }
-#endif
sei_read_uvlc(pDecodedMessageOutputStream, val, "nnpfc_inp_order_idc");
sei.m_inpOrderIdc = val;
sei_read_uvlc(pDecodedMessageOutputStream,val,"nnpfc_aux_inp_idc");
@@ -2774,7 +2763,6 @@ void SEIReader::xParseSEINNPostFilterCharacteristics(SEINeuralNetworkPostFilterC
sei.m_matrixCoeffs = val;
}
-#if M60678_BALLOT_COMMENTS_OF_FI_03
sei_read_uvlc(pDecodedMessageOutputStream, val, "nnpfc_out_format_idc");
sei.m_outFormatIdc = val;
@@ -2783,16 +2771,6 @@ void SEIReader::xParseSEINNPostFilterCharacteristics(SEINeuralNetworkPostFilterC
sei_read_uvlc(pDecodedMessageOutputStream, val, "nnpfc_out_tensor_bitdepth_minus8");
sei.m_outTensorBitDepthMinus8 = val;
}
-#else
- sei_read_uvlc(pDecodedMessageOutputStream, val, "nnpfc_out_sample_idc");
- sei.m_outSampleIdc = val;
-
- if(sei.m_outSampleIdc == 4)
- {
- sei_read_uvlc(pDecodedMessageOutputStream, val, "nnpfc_out_tensor_bitdepth_minus8");
- sei.m_outTensorBitDepthMinus8 = val;
- }
-#endif
sei_read_uvlc(pDecodedMessageOutputStream, val, "nnpfc_out_order_idc");
sei.m_outOrderIdc = val;
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index 1226a9569..988ed46d2 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -690,22 +690,14 @@ protected:
uint32_t m_nnPostFilterSEICharacteristicsInpTensorBitDepthMinus8[MAX_NUM_NN_POST_FILTERS];
uint32_t m_nnPostFilterSEICharacteristicsOutTensorBitDepthMinus8[MAX_NUM_NN_POST_FILTERS];
bool m_nnPostFilterSEICharacteristicsComponentLastFlag[MAX_NUM_NN_POST_FILTERS];
-#if M60678_BALLOT_COMMENTS_OF_FI_03
uint32_t m_nnPostFilterSEICharacteristicsInpFormatIdc[MAX_NUM_NN_POST_FILTERS];
-#else
- uint32_t m_nnPostFilterSEICharacteristicsInpSampleIdc[MAX_NUM_NN_POST_FILTERS];
-#endif
uint32_t m_nnPostFilterSEICharacteristicsAuxInpIdc[MAX_NUM_NN_POST_FILTERS];
bool m_nnPostFilterSEICharacteristicsSepColDescriptionFlag[MAX_NUM_NN_POST_FILTERS];
uint32_t m_nnPostFilterSEICharacteristicsColPrimaries[MAX_NUM_NN_POST_FILTERS];
uint32_t m_nnPostFilterSEICharacteristicsTransCharacteristics[MAX_NUM_NN_POST_FILTERS];
uint32_t m_nnPostFilterSEICharacteristicsMatrixCoeffs[MAX_NUM_NN_POST_FILTERS];
uint32_t m_nnPostFilterSEICharacteristicsInpOrderIdc[MAX_NUM_NN_POST_FILTERS];
-#if M60678_BALLOT_COMMENTS_OF_FI_03
uint32_t m_nnPostFilterSEICharacteristicsOutFormatIdc[MAX_NUM_NN_POST_FILTERS];
-#else
- uint32_t m_nnPostFilterSEICharacteristicsOutSampleIdc[MAX_NUM_NN_POST_FILTERS];
-#endif
uint32_t m_nnPostFilterSEICharacteristicsOutOrderIdc[MAX_NUM_NN_POST_FILTERS];
bool m_nnPostFilterSEICharacteristicsConstantPatchSizeFlag[MAX_NUM_NN_POST_FILTERS];
uint32_t m_nnPostFilterSEICharacteristicsPatchWidthMinus1[MAX_NUM_NN_POST_FILTERS];
@@ -1901,22 +1893,12 @@ public:
uint32_t getNNPostFilterSEICharacteristicsMatrixCoeffs(int filterIdx) const { return m_nnPostFilterSEICharacteristicsMatrixCoeffs[filterIdx]; }
void setNNPostFilterSEICharacteristicsComponentLastFlag(bool componentLastFlag, int filterIdx) { m_nnPostFilterSEICharacteristicsComponentLastFlag[filterIdx] = componentLastFlag; }
bool getNNPostFilterSEICharacteristicsComponentLastFlag(int filterIdx) const { return m_nnPostFilterSEICharacteristicsComponentLastFlag[filterIdx]; }
-#if M60678_BALLOT_COMMENTS_OF_FI_03
void setNNPostFilterSEICharacteristicsInpFormatIdc(uint32_t inpFormatIdc, int filterIdx) { m_nnPostFilterSEICharacteristicsInpFormatIdc[filterIdx] = inpFormatIdc; }
uint32_t getNNPostFilterSEICharacteristicsInpFormatIdc(int filterIdx) const { return m_nnPostFilterSEICharacteristicsInpFormatIdc[filterIdx]; }
-#else
- void setNNPostFilterSEICharacteristicsInpSampleIdc(uint32_t inpSampleIdc, int filterIdx) { m_nnPostFilterSEICharacteristicsInpSampleIdc[filterIdx] = inpSampleIdc; }
- uint32_t getNNPostFilterSEICharacteristicsInpSampleIdc(int filterIdx) const { return m_nnPostFilterSEICharacteristicsInpSampleIdc[filterIdx]; }
-#endif
void setNNPostFilterSEICharacteristicsInpOrderIdc(uint32_t inpOrderIdc, int filterIdx) { m_nnPostFilterSEICharacteristicsInpOrderIdc[filterIdx] = inpOrderIdc; }
uint32_t getNNPostFilterSEICharacteristicsInpOrderIdc(int filterIdx) const { return m_nnPostFilterSEICharacteristicsInpOrderIdc[filterIdx]; }
-#if M60678_BALLOT_COMMENTS_OF_FI_03
void setNNPostFilterSEICharacteristicsOutFormatIdc(uint32_t outFormatIdc, int filterIdx) { m_nnPostFilterSEICharacteristicsOutFormatIdc[filterIdx] = outFormatIdc; }
uint32_t getNNPostFilterSEICharacteristicsOutFormatIdc(int filterIdx) const { return m_nnPostFilterSEICharacteristicsOutFormatIdc[filterIdx]; }
-#else
- void setNNPostFilterSEICharacteristicsOutSampleIdc(uint32_t outSampleIdc, int filterIdx) { m_nnPostFilterSEICharacteristicsOutSampleIdc[filterIdx] = outSampleIdc; }
- uint32_t getNNPostFilterSEICharacteristicsOutSampleIdc(int filterIdx) const { return m_nnPostFilterSEICharacteristicsOutSampleIdc[filterIdx]; }
-#endif
void setNNPostFilterSEICharacteristicsOutOrderIdc(uint32_t outOrderIdc, int filterIdx) { m_nnPostFilterSEICharacteristicsOutOrderIdc[filterIdx] = outOrderIdc; }
uint32_t getNNPostFilterSEICharacteristicsOutOrderIdc(int filterIdx) const { return m_nnPostFilterSEICharacteristicsOutOrderIdc[filterIdx]; }
void setNNPostFilterSEICharacteristicsConstantPatchSizeFlag(bool constantPatchSizeFlag, int filterIdx) { m_nnPostFilterSEICharacteristicsConstantPatchSizeFlag[filterIdx] = constantPatchSizeFlag; }
diff --git a/source/Lib/EncoderLib/SEIEncoder.cpp b/source/Lib/EncoderLib/SEIEncoder.cpp
index ad7236d58..38dfa9f4f 100644
--- a/source/Lib/EncoderLib/SEIEncoder.cpp
+++ b/source/Lib/EncoderLib/SEIEncoder.cpp
@@ -1349,30 +1349,13 @@ void SEIEncoder::initSEINeuralNetworkPostFilterCharacteristics(SEINeuralNetworkP
}
sei->m_componentLastFlag = m_pcCfg->getNNPostFilterSEICharacteristicsComponentLastFlag(filterIdx);
-#if M60678_BALLOT_COMMENTS_OF_FI_03
sei->m_inpFormatIdc = m_pcCfg->getNNPostFilterSEICharacteristicsInpFormatIdc(filterIdx);
if (sei->m_inpFormatIdc == 1)
{
sei->m_outTensorBitDepthMinus8 = m_pcCfg->getNNPostFilterSEICharacteristicsOutTensorBitDepthMinus8(filterIdx);
}
-#else
- sei->m_inpSampleIdc = m_pcCfg->getNNPostFilterSEICharacteristicsInpSampleIdc(filterIdx);
-
- if(sei->m_inpSampleIdc == 4)
- {
- sei->m_inpTensorBitDepthMinus8 = m_pcCfg->getNNPostFilterSEICharacteristicsInpTensorBitDepthMinus8(filterIdx);
- }
-#endif
sei->m_inpOrderIdc = m_pcCfg->getNNPostFilterSEICharacteristicsInpOrderIdc(filterIdx);
-#if !M60678_BALLOT_COMMENTS_OF_FI_03
- sei->m_outSampleIdc = m_pcCfg->getNNPostFilterSEICharacteristicsOutSampleIdc(filterIdx);
-
- if(sei->m_outSampleIdc == 4)
- {
- sei->m_outTensorBitDepthMinus8 = m_pcCfg->getNNPostFilterSEICharacteristicsOutTensorBitDepthMinus8(filterIdx);
- }
-#endif
sei->m_auxInpIdc = m_pcCfg->getNNPostFilterSEICharacteristicsAuxInpIdc(filterIdx);
sei->m_sepColDescriptionFlag = m_pcCfg->getNNPostFilterSEICharacteristicsSepColDescriptionFlag(filterIdx);
if (sei->m_sepColDescriptionFlag)
@@ -1382,13 +1365,11 @@ void SEIEncoder::initSEINeuralNetworkPostFilterCharacteristics(SEINeuralNetworkP
sei->m_matrixCoeffs = m_pcCfg->getNNPostFilterSEICharacteristicsMatrixCoeffs(filterIdx);
}
-#if M60678_BALLOT_COMMENTS_OF_FI_03
sei->m_outFormatIdc = m_pcCfg->getNNPostFilterSEICharacteristicsOutFormatIdc(filterIdx);
if (sei->m_outFormatIdc == 1)
{
sei->m_outTensorBitDepthMinus8 = m_pcCfg->getNNPostFilterSEICharacteristicsOutTensorBitDepthMinus8(filterIdx);
}
-#endif
sei->m_outOrderIdc = m_pcCfg->getNNPostFilterSEICharacteristicsOutOrderIdc(filterIdx);
sei->m_constantPatchSizeFlag = m_pcCfg->getNNPostFilterSEICharacteristicsConstantPatchSizeFlag(filterIdx);
sei->m_patchWidthMinus1 = m_pcCfg->getNNPostFilterSEICharacteristicsPatchWidthMinus1(filterIdx);
diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp
index 7e4b98b4e..f1c910540 100644
--- a/source/Lib/EncoderLib/SEIwrite.cpp
+++ b/source/Lib/EncoderLib/SEIwrite.cpp
@@ -1717,20 +1717,11 @@ void SEIWriter::xWriteSEINeuralNetworkPostFilterCharacteristics(const SEINeuralN
}
xWriteFlag(sei.m_componentLastFlag, "nnpfc_component_last_flag");
-#if M60678_BALLOT_COMMENTS_OF_FI_03
xWriteUvlc(sei.m_inpFormatIdc, "nnpfc_inp_format_idc");
if (sei.m_inpFormatIdc == 1)
{
xWriteUvlc(sei.m_inpTensorBitDepthMinus8, "nnpfc_inp_tensor_bitdepth_minus8");
}
-#else
- xWriteUvlc(sei.m_inpSampleIdc, "nnpfc_inp_sample_idc");
-
- if(sei.m_inpSampleIdc == 4)
- {
- xWriteUvlc(sei.m_inpTensorBitDepthMinus8, "nnpfc_inp_tensor_bitdepth_minus8");
- }
-#endif
xWriteUvlc(sei.m_inpOrderIdc, "nnpfc_inp_order_idc");
xWriteUvlc(sei.m_auxInpIdc, "nnpfc_aux_inp_idc");
xWriteFlag(sei.m_sepColDescriptionFlag, "nnpfc_sep_col_desc_flag");
@@ -1741,20 +1732,11 @@ void SEIWriter::xWriteSEINeuralNetworkPostFilterCharacteristics(const SEINeuralN
xWriteCode(sei.m_transCharacteristics, 8, "nnpfc_trans_characteristics");
xWriteCode(sei.m_matrixCoeffs, 8, "nnpfc_matrix_coeffs");
}
-#if M60678_BALLOT_COMMENTS_OF_FI_03
xWriteUvlc(sei.m_outFormatIdc, "nnpfc_out_format_idc");
if (sei.m_outFormatIdc == 1)
{
xWriteUvlc(sei.m_outTensorBitDepthMinus8, "nnpfc_out_tensor_bitdepth_minus8");
}
-#else
- xWriteUvlc(sei.m_outSampleIdc, "nnpfc_out_sample_idc");
-
- if(sei.m_outSampleIdc == 4)
- {
- xWriteUvlc(sei.m_outTensorBitDepthMinus8, "nnpfc_out_tensor_bitdepth_minus8");
- }
-#endif
xWriteUvlc(sei.m_outOrderIdc, "nnpfc_out_order_idc");
xWriteFlag(sei.m_constantPatchSizeFlag, "nnpfc_constant_patch_size_flag");
--
GitLab