From db5fdd4bb18de44b6839f5565e5d61f8fbe301b7 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Mon, 11 Nov 2024 14:35:07 +0100
Subject: [PATCH] remove macro JVET_AI0073_BREADTH_FIRST_FLAG
---
source/App/EncoderApp/EncApp.cpp | 2 --
source/App/EncoderApp/EncAppCfg.cpp | 2 --
source/App/EncoderApp/EncAppCfg.h | 2 --
source/Lib/CommonLib/SEI.cpp | 2 --
source/Lib/CommonLib/SEI.h | 2 --
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/SEIread.cpp | 5 -----
source/Lib/EncoderLib/EncCfg.h | 4 ----
source/Lib/EncoderLib/SEIEncoder.cpp | 2 --
source/Lib/EncoderLib/SEIwrite.cpp | 4 ----
10 files changed, 26 deletions(-)
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index 45c8b5654..c49add57c 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -1452,9 +1452,7 @@ void EncApp::xInitLibCfg( int layerIdx )
}
m_cEncLib.setPoSEINumMinus2 (m_poSEINumMinus2);
-#if JVET_AI0073_BREADTH_FIRST_FLAG
m_cEncLib.setPoSEIBreadthFirstFlag (m_poSEIBreadthFirstFlag);
-#endif
m_cEncLib.setPoSEIWrappingFlag (m_poSEIWrappingFlag);
m_cEncLib.setPoSEIImportanceFlag (m_poSEIImportanceFlag);
m_cEncLib.setPoSEIPrefixFlag (m_poSEIPrefixFlag);
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 945ea7f36..bb6741832 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1694,9 +1694,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("SEIPOForMachineAnalysisIdc", m_poSEIForMachineAnalysisIdc, 0u, "Specifies the machine analysis usage level of video resulting from processing chain specified by SPO SEI: optimal for machine analysis (3), suitable (2), unsuitable (1), unknown (0, default)")
#endif
("SEIPONumMinus2", m_poSEINumMinus2, 0u, "Specifies the number of SEIs minus 2 in the SEI processing order SEI message")
-#if JVET_AI0073_BREADTH_FIRST_FLAG
("SEIPOBreadthFirstFlag", m_poSEIBreadthFirstFlag, false, "Specifies that breadth-first handling of processing chain is applied (1), or that either breadth-first or depth-first can be applied (0, default)")
-#endif
("SEIPOWrappingFlag", cfg_poSEIWrappingFlag, cfg_poSEIWrappingFlag, "Specifies whether a correspoding processing-order-nested SEI message exists or not")
("SEIPOImportanceFlag", cfg_poSEIImportanceFlag, cfg_poSEIImportanceFlag, "Specifies degree of importance for the SEI messages")
("SEIPOPrefixFlag", cfg_poSEIPrefixFlag, cfg_poSEIPrefixFlag, "Specifies whether SEI message prefix is present or not")
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index 227426056..c5e7fb3a1 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -858,9 +858,7 @@ protected:
uint32_t m_poSEIForMachineAnalysisIdc;
#endif
uint32_t m_poSEINumMinus2;
-#if JVET_AI0073_BREADTH_FIRST_FLAG
bool m_poSEIBreadthFirstFlag;
-#endif
std::vector<bool> m_poSEIWrappingFlag;
std::vector<bool> m_poSEIImportanceFlag;
std::vector<bool> m_poSEIPrefixFlag;
diff --git a/source/Lib/CommonLib/SEI.cpp b/source/Lib/CommonLib/SEI.cpp
index 5b11b2fba..776872e59 100644
--- a/source/Lib/CommonLib/SEI.cpp
+++ b/source/Lib/CommonLib/SEI.cpp
@@ -529,9 +529,7 @@ SEIProcessingOrderInfo::SEIProcessingOrderInfo(const SEIProcessingOrderInfo& sei
m_posForMachineAnalysisIdc = sei.m_posForMachineAnalysisIdc;
#endif
m_posNumMinus2 = sei.m_posNumMinus2;
-#if JVET_AI0073_BREADTH_FIRST_FLAG
m_posBreadthFirstFlag = sei.m_posBreadthFirstFlag;
-#endif
m_posWrappingFlag = sei.m_posWrappingFlag;
m_posImportanceFlag = sei.m_posImportanceFlag;
m_posPrefixFlag = sei.m_posPrefixFlag;
diff --git a/source/Lib/CommonLib/SEI.h b/source/Lib/CommonLib/SEI.h
index 2c0356ba2..eb947830f 100644
--- a/source/Lib/CommonLib/SEI.h
+++ b/source/Lib/CommonLib/SEI.h
@@ -202,9 +202,7 @@ public:
uint32_t m_posForMachineAnalysisIdc;
#endif
uint32_t m_posNumMinus2;
-#if JVET_AI0073_BREADTH_FIRST_FLAG
bool m_posBreadthFirstFlag;
-#endif
std::vector<bool> m_posWrappingFlag;
std::vector<bool> m_posImportanceFlag;
std::vector<bool> m_posPrefixFlag;
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 4ccaa9c58..6eeb84567 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -60,7 +60,6 @@
-#define JVET_AI0073_BREADTH_FIRST_FLAG 1 // Handling of a processing chain specified by an SPO SEI message
#define JVET_AI0071_NNPFC_SPO_USAGE_IDCS 1 // Indication of the user viewing and/or machine analysis usage in the NNPFC and SPO SEI messages
diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp
index 4d7775a9e..5d2a1a6a7 100644
--- a/source/Lib/DecoderLib/SEIread.cpp
+++ b/source/Lib/DecoderLib/SEIread.cpp
@@ -795,15 +795,10 @@ void SEIReader::xParseSEIProcessingOrder(SEIProcessingOrderInfo& sei, const NalU
sei.m_posForMachineAnalysisIdc = val;
sei_read_code(decodedMessageOutputStream, 4, val, "po_reserved_zero_4bits"); // Decoders shall allow any value of po_reserved_zero_4bits in the range of 0 to 15, inclusive
#endif
-#if JVET_AI0073_BREADTH_FIRST_FLAG
sei_read_code(decodedMessageOutputStream, 7, val, "po_sei_num_minus2");
sei.m_posNumMinus2 = val;
sei_read_flag(decodedMessageOutputStream, val, "po_breadth_first_flag");
sei.m_posBreadthFirstFlag = val;
-#else
- sei_read_code(decodedMessageOutputStream, 8, val, "po_sei_num_minus2");
- sei.m_posNumMinus2 = val;
-#endif
numMaxSeiMessages = sei.m_posNumMinus2 + 2;
sei.m_posPrefixFlag.resize(numMaxSeiMessages);
sei.m_posPayloadType.resize(numMaxSeiMessages);
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index fc31237aa..faeed2db2 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -960,9 +960,7 @@ protected:
uint32_t m_poSEIForMachineAnalysisIdc;
#endif
uint32_t m_poSEINumMinus2;
-#if JVET_AI0073_BREADTH_FIRST_FLAG
bool m_poSEIBreadthFirstFlag;
-#endif
std::vector<bool> m_poSEIWrappingFlag;
std::vector<bool> m_poSEIImportanceFlag;
std::vector<bool> m_poSEIPrefixFlag;
@@ -2781,10 +2779,8 @@ public:
#endif
void setPoSEINumMinus2(uint32_t i) { m_poSEINumMinus2 = i; }
uint32_t getPoSEINumMinus2() { return m_poSEINumMinus2; }
-#if JVET_AI0073_BREADTH_FIRST_FLAG
void setPoSEIBreadthFirstFlag(bool b) { m_poSEIBreadthFirstFlag = b; }
bool getPoSEIBreadthFirstFlag() { return m_poSEIBreadthFirstFlag; }
-#endif
void setPoSEIWrappingFlag(const std::vector<bool>& b) { m_poSEIWrappingFlag = b; }
bool getPoSEIWrappingFlag(uint16_t idx) const { return m_poSEIWrappingFlag[idx]; }
void setPoSEIImportanceFlag(const std::vector<bool>& b) { m_poSEIImportanceFlag = b; }
diff --git a/source/Lib/EncoderLib/SEIEncoder.cpp b/source/Lib/EncoderLib/SEIEncoder.cpp
index ecac6f148..7e638ea5e 100644
--- a/source/Lib/EncoderLib/SEIEncoder.cpp
+++ b/source/Lib/EncoderLib/SEIEncoder.cpp
@@ -610,9 +610,7 @@ void SEIEncoder::initSEIProcessingOrderInfo(SEIProcessingOrderInfo *seiProcessin
seiProcessingOrderInfo->m_posForMachineAnalysisIdc = m_pcCfg->getPoSEIForMachineAnalysisIdc();
#endif
seiProcessingOrderInfo->m_posNumMinus2 = m_pcCfg->getPoSEINumMinus2();
-#if JVET_AI0073_BREADTH_FIRST_FLAG
seiProcessingOrderInfo->m_posBreadthFirstFlag = m_pcCfg->getPoSEIBreadthFirstFlag();
-#endif
seiProcessingOrderInfo->m_posWrappingFlag.resize(m_pcCfg->getPoSEIPayloadTypeSize());
seiProcessingOrderInfo->m_posImportanceFlag.resize(m_pcCfg->getPoSEIPayloadTypeSize());
seiProcessingOrderInfo->m_posPrefixFlag.resize(m_pcCfg->getPoSEIPayloadTypeSize());
diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp
index 11ce8eb90..647dd799b 100644
--- a/source/Lib/EncoderLib/SEIwrite.cpp
+++ b/source/Lib/EncoderLib/SEIwrite.cpp
@@ -1698,12 +1698,8 @@ void SEIWriter::xWriteSEIProcessingOrder(OutputBitstream& bs, const SEIProcessin
xWriteCode(sei.m_posForMachineAnalysisIdc, 2, "po_for_machine_analysis_idc");
xWriteCode(0, 4, "po_reserved_zero_4bits");
#endif
-#if JVET_AI0073_BREADTH_FIRST_FLAG
xWriteCode(sei.m_posNumMinus2, 7, "po_num_sei_message_minus2");
xWriteFlag(sei.m_posBreadthFirstFlag, "po_breadth_first_flag");
-#else
- xWriteCode(sei.m_posNumMinus2, 8, "po_num_sei_message_minus2");
-#endif
for (uint32_t i = 0; i < ( sei.m_posNumMinus2 + 2 ); i++)
{
xWriteFlag(sei.m_posWrappingFlag[i], "po_sei_wrapping_flag[i]");
--
GitLab