From 2cbba3821c35b13233d22adb15e2fb7745f538f8 Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Fri, 17 Jan 2020 15:28:54 +0100
Subject: [PATCH] remove macro JVET_P0126_SIGNALLING_SUBPICID
---
source/Lib/CommonLib/Slice.cpp | 4 ----
source/Lib/CommonLib/Slice.h | 8 --------
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/VLCReader.cpp | 4 ----
source/Lib/EncoderLib/VLCWriter.cpp | 4 ----
5 files changed, 21 deletions(-)
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index 4ee867696..34c00cf42 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -123,9 +123,7 @@ Slice::Slice()
, m_numEntryPoints ( 0 )
#endif
, m_cabacInitFlag ( false )
-#if JVET_P0126_SIGNALLING_SUBPICID
, m_sliceSubPicId ( 0 )
-#endif
#if !JVET_P1006_PICTURE_HEADER
, m_jointCbCrSignFlag ( false )
, m_bLMvdL1Zero ( false )
@@ -1902,9 +1900,7 @@ SPS::SPS()
// Structure
, m_maxWidthInLumaSamples (352)
, m_maxHeightInLumaSamples (288)
-#if JVET_P0126_SIGNALLING_SUBPICID
, m_subPicPresentFlag (0)
-#endif
#if JVET_P1006_PICTURE_HEADER
, m_numSubPics(1)
, m_subPicIdPresentFlag(0)
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index a4d9aea68..bf7cd04fd 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -1057,9 +1057,7 @@ private:
// Structure
uint32_t m_maxWidthInLumaSamples;
uint32_t m_maxHeightInLumaSamples;
-#if JVET_P0126_SIGNALLING_SUBPICID
bool m_subPicPresentFlag; // indicates the presence of sub-pictures
- #endif
#if JVET_P1006_PICTURE_HEADER
uint8_t m_numSubPics; //!< number of sub-pictures used
#if JVET_P0171_SUBPICTURE_LAYOUT
@@ -1240,10 +1238,8 @@ public:
void setMaxPicHeightInLumaSamples( uint32_t u ) { m_maxHeightInLumaSamples = u; }
uint32_t getMaxPicHeightInLumaSamples() const { return m_maxHeightInLumaSamples; }
-#if JVET_P0126_SIGNALLING_SUBPICID
void setSubPicPresentFlag(bool b) { m_subPicPresentFlag = b; }
bool getSubPicPresentFlag() const { return m_subPicPresentFlag; }
-#endif
#if JVET_P1006_PICTURE_HEADER
void setNumSubPics( uint8_t u ) { m_numSubPics = u; }
@@ -2500,9 +2496,7 @@ private:
bool m_cabacInitFlag;
-#if JVET_P0126_SIGNALLING_SUBPICID
uint32_t m_sliceSubPicId;
-#endif
#if !JVET_P1006_PICTURE_HEADER
bool m_jointCbCrSignFlag;
@@ -2741,10 +2735,8 @@ public:
void setSignDataHidingEnabledFlag( bool b ) { m_signDataHidingEnabledFlag = b; }
bool getSignDataHidingEnabledFlag() const { return m_signDataHidingEnabledFlag; }
#endif
-#if JVET_P0126_SIGNALLING_SUBPICID
void setSliceSubPicId(int i) { m_sliceSubPicId = i; }
uint32_t getSliceSubPicId() const { return m_sliceSubPicId; }
-#endif
#if JVET_P1006_PICTURE_HEADER
uint32_t getCuQpDeltaSubdiv() const { return this->isIntra() ? m_pcPicHeader->getCuQpDeltaSubdivIntra() : m_pcPicHeader->getCuQpDeltaSubdivInter(); }
uint32_t getCuChromaQpOffsetSubdiv() const { return this->isIntra() ? m_pcPicHeader->getCuChromaQpOffsetSubdivIntra() : m_pcPicHeader->getCuChromaQpOffsetSubdivInter(); }
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 51b17e28a..ea3ba789c 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -59,7 +59,6 @@
-#define JVET_P0126_SIGNALLING_SUBPICID 1 // JVET-P0126: Signalling of subpicture IDs
#define JVET_P1004_REMOVE_BRICKS 1 // JVET-P1004: Removal of bricks
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 9ca3e8400..3083b5c3c 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -1431,9 +1431,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
pcSPS->setLog2DiffMaxMinCodingBlockSize(uiCode+3);
pcSPS->setMaxCUWidth(pcSPS->getCTUSize());
pcSPS->setMaxCUHeight(pcSPS->getCTUSize());
-#if JVET_P0126_SIGNALLING_SUBPICID
READ_FLAG( uiCode, "subpics_present_flag" ); pcSPS->setSubPicPresentFlag(uiCode);
-#endif
#if JVET_P1006_PICTURE_HEADER
#if JVET_P0171_SUBPICTURE_LAYOUT
@@ -2936,7 +2934,6 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
}
#endif
-#if JVET_P0126_SIGNALLING_SUBPICID
if (sps->getSubPicPresentFlag())
{
uint32_t bitsSubPicId;
@@ -2958,7 +2955,6 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
}
READ_CODE(bitsSubPicId, uiCode, "slice_subpic_id"); pcSlice->setSliceSubPicId(uiCode);
}
-#endif
#if JVET_P1004_REMOVE_BRICKS
// raster scan slices
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 1aa75c39f..de667ed44 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -909,7 +909,6 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
WRITE_UVLC( pcSPS->getMaxPicHeightInLumaSamples(), "pic_height_max_in_luma_samples" );
WRITE_CODE(floorLog2(pcSPS->getCTUSize()) - 5, 2, "sps_log2_ctu_size_minus5");
-#if JVET_P0126_SIGNALLING_SUBPICID
WRITE_FLAG(pcSPS->getSubPicPresentFlag(), "subpics_present_flag");
#if JVET_P0171_SUBPICTURE_LAYOUT
if(pcSPS->getSubPicPresentFlag())
@@ -926,7 +925,6 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
}
}
#endif
-#endif
#if JVET_P1006_PICTURE_HEADER
WRITE_FLAG( pcSPS->getSubPicIdPresentFlag(), "sps_subpic_id_present_flag");
@@ -2021,7 +2019,6 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
WRITE_UVLC( pcSlice->getPPS()->getPPSId(), "slice_pic_parameter_set_id" );
#endif
- #if JVET_P0126_SIGNALLING_SUBPICID
if (pcSlice->getSPS()->getSubPicPresentFlag())
{
uint32_t bitsSubPicId;
@@ -2043,7 +2040,6 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
}
WRITE_CODE(pcSlice->getSliceSubPicId(), bitsSubPicId, "slice_subpic_id");
}
-#endif
#if JVET_P1004_REMOVE_BRICKS
// raster scan slices
--
GitLab