From 7cbb2b6823a6e5742befdc9d82c934f000f2a29c Mon Sep 17 00:00:00 2001
From: Ahmed Sidiya <sidiyaa@sharplabs.com>
Date: Wed, 26 Jul 2023 20:22:47 -0400
Subject: [PATCH] Fixing the indent in SEIEncoder.cpp and moving macro in
TypeDef.h
---
source/Lib/CommonLib/TypeDef.h | 3 +--
source/Lib/EncoderLib/SEIEncoder.cpp | 16 ++++++++--------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 5db939d53..66d1f64e0 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -58,6 +58,7 @@
//########### place macros to be removed in next cycle below this line ###############
+#define JVET_AE0060_COND_SIG_INF 1 // signal nnpfc_chroma_loc_info_present_flag only when nnpfc_out_order_idc is not equal to 0 and infer nnpfc_chroma_loc_info_present_flag to be equal to 0 when not present.
//########### place macros to be be kept below this line ###############
@@ -79,8 +80,6 @@
#define JVET_AD0067_INCLUDE_SYNTAX 1 // include nnpfc_full_range_flag syntax element in the nnpfc sei message when nnpfc_separate_colour_description_present_flag is equal to 1 and when nnpfc_out_format_idc is equal to 1.
-#define JVET_AE0060_COND_SIG_INF 1 // signal nnpfc_chroma_loc_info_present_flag only when nnpfc_out_order_idc is not equal to 0 and infer nnpfc_chroma_loc_info_present_flag to be equal to 0 when not present.
-
#define REUSE_CU_RESULTS 1
#if REUSE_CU_RESULTS
#define REUSE_CU_RESULTS_WITH_MULTIPLE_TUS 1
diff --git a/source/Lib/EncoderLib/SEIEncoder.cpp b/source/Lib/EncoderLib/SEIEncoder.cpp
index 7af3e3dc6..04f588588 100644
--- a/source/Lib/EncoderLib/SEIEncoder.cpp
+++ b/source/Lib/EncoderLib/SEIEncoder.cpp
@@ -1446,14 +1446,14 @@ void SEIEncoder::initSEINeuralNetworkPostFilterCharacteristics(SEINeuralNetworkP
CHECK((sei->m_purpose & NNPC_PurposeType::CHROMA_UPSAMPLING) != 0 && (sei->m_outOrderIdc == 0 || sei->m_outOrderIdc == 3), "When nnpfc_purpose & 0x02 is not equal to 0, nnpfc_out_order_idc shall not be equal to 0 or 3");
CHECK((sei->m_purpose & NNPC_PurposeType::COLOURIZATION) != 0 && sei->m_outOrderIdc == 0, "When nnpfc_purpose & 0x20 is not equal to 0, nnpfc_out_order_idc shall not be equal to 0");
#if JVET_AE0060_COND_SIG_INF
- if(sei->m_outOrderIdc != 0)
- {
- sei->m_chromaLocInfoPresentFlag = m_pcCfg->getNNPostFilterSEICharacteristicsChromaLocInfoPresentFlag(filterIdx);
- }
- else
- {
- sei->m_chromaLocInfoPresentFlag = 0;
- }
+ if(sei->m_outOrderIdc != 0)
+ {
+ sei->m_chromaLocInfoPresentFlag = m_pcCfg->getNNPostFilterSEICharacteristicsChromaLocInfoPresentFlag(filterIdx);
+ }
+ else
+ {
+ sei->m_chromaLocInfoPresentFlag = 0;
+ }
#else
sei->m_chromaLocInfoPresentFlag = m_pcCfg->getNNPostFilterSEICharacteristicsChromaLocInfoPresentFlag(filterIdx);
#endif
--
GitLab