From 76f32716922d816c9b012c8b090ec1112d1ddcdc Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Sun, 26 Apr 2020 20:10:22 +0200
Subject: [PATCH] remove macro JVET_Q0816
---
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/VLCReader.cpp | 4 ----
source/Lib/EncoderLib/VLCWriter.cpp | 4 ----
3 files changed, 9 deletions(-)
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 82a7464bd..6f534c6b8 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -102,7 +102,6 @@
-#define JVET_Q0816 1 // JVET_Q0816: Omit the signalling of subpic layout when there is only one subpicture
#define JVET_Q0438_MONOCHROME_BUGFIXES 1 // JVET-Q0438: Monochrome bug fixes
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index fe652b036..26159f300 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -1487,7 +1487,6 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
}
#endif
-#if JVET_Q0816
if( pcSPS->getNumSubPics() == 1 )
{
pcSPS->setSubPicCtuTopLeftX( 0, 0 );
@@ -1499,7 +1498,6 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
}
else
{
-#endif
for (int picIdx = 0; picIdx < pcSPS->getNumSubPics(); picIdx++)
{
#if JVET_Q0787_SUBPIC
@@ -1574,9 +1572,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
READ_FLAG(uiCode, "loop_filter_across_subpic_enabled_flag[ i ]");
pcSPS->setLoopFilterAcrossSubpicEnabledFlag(picIdx, uiCode);
}
-#if JVET_Q0816
}
-#endif
#if JVET_Q0119_CLEANUPS
READ_UVLC( uiCode, "sps_subpic_id_len_minus1" ); pcSPS->setSubPicIdLen( uiCode + 1 );
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 5b1028ffe..b37ccc550 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -968,10 +968,8 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
#else
WRITE_CODE(pcSPS->getNumSubPics() - 1, 8, "sps_num_subpics_minus1");
#endif
-#if JVET_Q0816
if( pcSPS->getNumSubPics() > 1 )
{
-#endif
for (int picIdx = 0; picIdx < pcSPS->getNumSubPics(); picIdx++)
{
#if JVET_Q0787_SUBPIC
@@ -1015,9 +1013,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
WRITE_FLAG( pcSPS->getSubPicTreatedAsPicFlag(picIdx), "subpic_treated_as_pic_flag[ i ]" );
WRITE_FLAG( pcSPS->getLoopFilterAcrossSubpicEnabledFlag(picIdx), "loop_filter_across_subpic_enabled_flag[ i ]" );
}
-#if JVET_Q0816
}
-#endif
#if JVET_Q0119_CLEANUPS
CHECK(pcSPS->getSubPicIdLen() < 1, "SPS: SubPicIdLen cannot be less than 1");
--
GitLab