diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index bbbb8f11996e3c581294c8bd94a3401068404b82..898c803dd1f7749ae5193dd262c6ceddf1b9b06c 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 e3abbdaeef4d36b5e7435899ef08e41fb47ba7dc..6d81b4c1395f0256838610d693ecf27920b66533 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 5892cdfd252329ec008535a98bca723648f09c64..a6d094488a5f1faf4cbc5ec561350d9467150593 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) {