From 176f21b22fa2839f36d1ac54c5f5811e7c6b9a51 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Sun, 26 Apr 2020 20:12:39 +0200
Subject: [PATCH] remove macro JVET_Q0216
---
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/SEIread.cpp | 5 -----
source/Lib/EncoderLib/SEIwrite.cpp | 4 ----
3 files changed, 10 deletions(-)
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 5426767aa3..b6ee7e8901 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -162,7 +162,6 @@
#define JVET_M0497_MATRIX_MULT 0 // 0: Fast method; 1: Matrix multiplication
-#define JVET_Q0216 1 // JVET-Q0216: modification to picture timing SEI message
#define JVET_Q0218_PROPOSAL3 1 // JVET-Q0218_PROPOSAL3: fix missing inference rule for single_slice_per_subpic_flag
diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp
index 9c080867ae..ca6e1574e6 100644
--- a/source/Lib/DecoderLib/SEIread.cpp
+++ b/source/Lib/DecoderLib/SEIread.cpp
@@ -760,7 +760,6 @@ void SEIReader::xParseSEIPictureTiming(SEIPictureTiming& sei, uint32_t payloadSi
}
if( sei.m_cpbRemovalDelayDeltaEnabledFlag[ i ] )
{
-#if JVET_Q0216
if ((bp.m_numCpbRemovalDelayDeltas - 1) > 0)
{
sei_read_code(pDecodedMessageOutputStream, ceilLog2(bp.m_numCpbRemovalDelayDeltas), symbol, "cpb_removal_delay_delta_idx[i]");
@@ -770,10 +769,6 @@ void SEIReader::xParseSEIPictureTiming(SEIPictureTiming& sei, uint32_t payloadSi
{
sei.m_cpbRemovalDelayDeltaIdx[i] = 0;
}
-#else
- sei_read_code(pDecodedMessageOutputStream, ceilLog2(bp.m_numCpbRemovalDelayDeltas), symbol, "cpb_removal_delay_delta_idx[i]");
- sei.m_cpbRemovalDelayDeltaIdx[i] = symbol;
-#endif
}
else
{
diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp
index 2e65a2dc68..89b45001c1 100644
--- a/source/Lib/EncoderLib/SEIwrite.cpp
+++ b/source/Lib/EncoderLib/SEIwrite.cpp
@@ -378,14 +378,10 @@ void SEIWriter::xWriteSEIPictureTiming(const SEIPictureTiming& sei, const SEIBuf
}
if( sei.m_cpbRemovalDelayDeltaEnabledFlag[i] )
{
-#if JVET_Q0216
if ((bp.m_numCpbRemovalDelayDeltas - 1) > 0)
{
WRITE_CODE(sei.m_cpbRemovalDelayDeltaIdx[i], ceilLog2(bp.m_numCpbRemovalDelayDeltas), "cpb_removal_delay_delta_idx[i]");
}
-#else
- WRITE_CODE(sei.m_cpbRemovalDelayDeltaIdx[i], ceilLog2(bp.m_numCpbRemovalDelayDeltas), "cpb_removal_delay_delta_idx[i]");
-#endif
}
else
{
--
GitLab