From 0d58059236e2ceebbf2e5e0c8eb27a170f0706d8 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Fri, 21 Jul 2023 18:10:11 +0200
Subject: [PATCH] remove macro JVET_AD0056_NNPFC_METADATA_EXTENSION
---
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/SEIread.cpp | 2 --
source/Lib/EncoderLib/SEIwrite.cpp | 2 --
3 files changed, 5 deletions(-)
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index bbbb8f1199..898c803dd1 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -69,7 +69,6 @@
-#define JVET_AD0056_NNPFC_METADATA_EXTENSION 1
#define JVET_AD0056_NNPFA_TARGET_BASE_FLAG 1
diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp
index e3abbdaeef..6d81b4c139 100644
--- a/source/Lib/DecoderLib/SEIread.cpp
+++ b/source/Lib/DecoderLib/SEIread.cpp
@@ -3198,7 +3198,6 @@ void SEIReader::xParseSEINNPostFilterCharacteristics(SEINeuralNetworkPostFilterC
sei.m_totalKilobyteSize = val;
}
-#if JVET_AD0056_NNPFC_METADATA_EXTENSION
sei_read_uvlc(pDecodedMessageOutputStream, val, "nnpfc_metadata_extension_num_bits"); // nnpfc_metadata_extension_num_bits shall be equal to 0 in the current edition
CHECK (val > 2048, "Values of nnpfc_metadata_extension_num_bits greater than 2048 shall not be present in bitstreams");
for (uint32_t i = 0; i < val; i++)
@@ -3206,7 +3205,6 @@ void SEIReader::xParseSEINNPostFilterCharacteristics(SEINeuralNetworkPostFilterC
uint32_t val2;
sei_read_code(pDecodedMessageOutputStream, 1, val2, "nnpfc_reserved_metadata_extension"); // Decoders shall ignore the presence and value of nnpfc_reserved_metadata_extension
}
-#endif
}
if (sei.m_modeIdc == POST_FILTER_MODE::ISO_IEC_15938_17)
diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp
index 5892cdfd25..a6d094488a 100644
--- a/source/Lib/EncoderLib/SEIwrite.cpp
+++ b/source/Lib/EncoderLib/SEIwrite.cpp
@@ -1860,9 +1860,7 @@ void SEIWriter::xWriteSEINeuralNetworkPostFilterCharacteristics(const SEINeuralN
xWriteUvlc(sei.m_totalKilobyteSize, "nnpfc_total_kilobyte_size");
}
-#if JVET_AD0056_NNPFC_METADATA_EXTENSION
xWriteUvlc(0, "nnpfc_metadata_extension_num_bits"); // nnpfc_metadata_extension_num_bits shall be equal to 0 in the current edition
-#endif
}
if (sei.m_modeIdc == POST_FILTER_MODE::ISO_IEC_15938_17)
{
--
GitLab