From 75b503ffde8542335543a5ca2307a9f20fbb1aca Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Mon, 6 Jul 2020 15:15:35 +0200
Subject: [PATCH] remove macro JVET_R0103_DU_SIGNALLING
---
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/SEIread.cpp | 4 ----
source/Lib/EncoderLib/SEIwrite.cpp | 4 ----
3 files changed, 9 deletions(-)
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 3a514015e..4a446140b 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -148,7 +148,6 @@
-#define JVET_R0103_DU_SIGNALLING 1 // JVET-R0103: Proposal 1 decoding unit signalling change
#define JVET_R0099_DPB_HRD_PARAMETERS_SIGNALLING 1 // JVET-R0099: DPB and HRD parameter signalling for OLS
diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp
index f7e30bddb..57f11a6d2 100644
--- a/source/Lib/DecoderLib/SEIread.cpp
+++ b/source/Lib/DecoderLib/SEIread.cpp
@@ -877,10 +877,8 @@ void SEIReader::xParseSEIPictureTiming(SEIPictureTiming& sei, uint32_t payloadSi
sei.m_numNalusInDuMinus1.resize(sei.m_numDecodingUnitsMinus1 + 1 );
sei.m_duCpbRemovalDelayMinus1.resize( (sei.m_numDecodingUnitsMinus1 + 1) * bp.m_bpMaxSubLayers );
-#if JVET_R0103_DU_SIGNALLING
if (sei.m_numDecodingUnitsMinus1 > 0)
{
-#endif
sei_read_flag( pDecodedMessageOutputStream, symbol, "du_common_cpb_removal_delay_flag" );
sei.m_duCommonCpbRemovalDelayFlag = symbol;
if( sei.m_duCommonCpbRemovalDelayFlag )
@@ -910,13 +908,11 @@ void SEIReader::xParseSEIPictureTiming(SEIPictureTiming& sei, uint32_t payloadSi
}
}
}
-#if JVET_R0103_DU_SIGNALLING
}
else
{
sei.m_duCommonCpbRemovalDelayFlag = 0;
}
-#endif
}
sei_read_uvlc( pDecodedMessageOutputStream, symbol, "pt_display_elemental_periods_minus1" );
sei.m_ptDisplayElementalPeriodsMinus1 = symbol;
diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp
index 08263b4bb..f48cf114b 100644
--- a/source/Lib/EncoderLib/SEIwrite.cpp
+++ b/source/Lib/EncoderLib/SEIwrite.cpp
@@ -423,10 +423,8 @@ void SEIWriter::xWriteSEIPictureTiming(const SEIPictureTiming& sei, const SEIBuf
if( bp.m_bpDecodingUnitHrdParamsPresentFlag && bp.m_decodingUnitCpbParamsInPicTimingSeiFlag )
{
WRITE_UVLC( sei.m_numDecodingUnitsMinus1, "num_decoding_units_minus1" );
-#if JVET_R0103_DU_SIGNALLING
if (sei.m_numDecodingUnitsMinus1 > 0)
{
-#endif
WRITE_FLAG( sei.m_duCommonCpbRemovalDelayFlag, "du_commmon_cpb_removal_delay_flag" );
if( sei.m_duCommonCpbRemovalDelayFlag )
{
@@ -448,9 +446,7 @@ void SEIWriter::xWriteSEIPictureTiming(const SEIPictureTiming& sei, const SEIBuf
}
}
}
-#if JVET_R0103_DU_SIGNALLING
}
-#endif
}
WRITE_UVLC( sei.m_ptDisplayElementalPeriodsMinus1, "pt_display_elemental_periods_minus1" );
}
--
GitLab