From beee68dd6e513d5e821b6f9c64b49dc05c22b02c Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Sun, 26 Apr 2020 20:10:00 +0200
Subject: [PATCH] remove macro JVET_Q0420_PPS_CHROMA_TOOL_FLAG
---
source/Lib/CommonLib/Slice.h | 4 ----
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/VLCReader.cpp | 4 ----
source/Lib/EncoderLib/EncLib.cpp | 2 --
source/Lib/EncoderLib/VLCWriter.cpp | 4 ----
5 files changed, 15 deletions(-)
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index a07d741e8..ff40d548d 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -1938,9 +1938,7 @@ private:
int m_SPSId; // seq_parameter_set_id
int m_picInitQPMinus26;
bool m_useDQP;
-#if JVET_Q0420_PPS_CHROMA_TOOL_FLAG
bool m_usePPSChromaTool;
-#endif
bool m_bSliceChromaQpFlag; // slicelevel_chroma_qp_flag
int m_layerId;
@@ -2067,10 +2065,8 @@ public:
void setPicInitQPMinus26( int i ) { m_picInitQPMinus26 = i; }
bool getUseDQP() const { return m_useDQP; }
void setUseDQP( bool b ) { m_useDQP = b; }
-#if JVET_Q0420_PPS_CHROMA_TOOL_FLAG
bool getPPSChromaToolFlag() const { return m_usePPSChromaTool; }
void setPPSChromaToolFlag(bool b) { m_usePPSChromaTool = b; }
-#endif
bool getSliceChromaQpFlag() const { return m_bSliceChromaQpFlag; }
void setSliceChromaQpFlag( bool b ) { m_bSliceChromaQpFlag = b; }
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 04e67c96d..a898f46b4 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -92,7 +92,6 @@
-#define JVET_Q0420_PPS_CHROMA_TOOL_FLAG 1 // JVET-Q0420: add pps_chroma_tool_offsets_present_flag in PPS
#define JVET_Q0172_CHROMA_FORMAT_BITDEPTH_CONSTRAINT 1 // JVET-Q0172: Disallow differing chroma format and different bit depths for cross-layer prediction.
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index c1f853e49..0b1f15ad5 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -708,12 +708,10 @@ void HLSyntaxReader::parsePPS( PPS* pcPPS )
pcPPS->setLog2MaxTransformSkipBlockSize(uiCode + 2);
#endif
READ_FLAG( uiCode, "cu_qp_delta_enabled_flag" ); pcPPS->setUseDQP( uiCode ? true : false );
-#if JVET_Q0420_PPS_CHROMA_TOOL_FLAG
READ_FLAG(uiCode, "pps_chroma_tool_offsets_present_flag");
pcPPS->setPPSChromaToolFlag(uiCode ? true : false);
if (pcPPS->getPPSChromaToolFlag())
{
-#endif
READ_SVLC( iCode, "pps_cb_qp_offset");
pcPPS->setQpOffset(COMPONENT_Cb, iCode);
CHECK( pcPPS->getQpOffset(COMPONENT_Cb) < -12, "Invalid Cb QP offset" );
@@ -779,7 +777,6 @@ void HLSyntaxReader::parsePPS( PPS* pcPPS )
}
CHECK(pcPPS->getChromaQpOffsetListLen() != tableSizeMinus1 + 1, "Invalid chroma QP offset list length");
}
-#if JVET_Q0420_PPS_CHROMA_TOOL_FLAG
}
else
{
@@ -789,7 +786,6 @@ void HLSyntaxReader::parsePPS( PPS* pcPPS )
pcPPS->setSliceChromaQpFlag(0);
pcPPS->clearChromaQpOffsetList();
}
-#endif
READ_FLAG( uiCode, "weighted_pred_flag" ); // Use of Weighting Prediction (P_SLICE)
pcPPS->setUseWP( uiCode==1 );
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 02ba2cb89..28fd6a9af 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -1586,12 +1586,10 @@ void EncLib::xInitPPS(PPS &pps, const SPS &sps)
bUseDQP = true;
}
#endif
-#if JVET_Q0420_PPS_CHROMA_TOOL_FLAG
if (sps.getChromaFormatIdc() != CHROMA_400)
{
pps.setPPSChromaToolFlag (true);
}
-#endif
#if ENABLE_QPA
if (getUsePerceptQPA() && !bUseDQP)
{
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index abf016bd9..feafd6f11 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -436,11 +436,9 @@ void HLSWriter::codePPS( const PPS* pcPPS )
WRITE_UVLC( pcPPS->getLog2MaxTransformSkipBlockSize() - 2, "log2_transform_skip_max_size_minus2");
#endif
WRITE_FLAG( pcPPS->getUseDQP() ? 1 : 0, "cu_qp_delta_enabled_flag" );
-#if JVET_Q0420_PPS_CHROMA_TOOL_FLAG
WRITE_FLAG(pcPPS->getPPSChromaToolFlag() ? 1 : 0, "pps_chroma_tool_offsets_present_flag");
if (pcPPS->getPPSChromaToolFlag())
{
-#endif
WRITE_SVLC( pcPPS->getQpOffset(COMPONENT_Cb), "pps_cb_qp_offset" );
WRITE_SVLC( pcPPS->getQpOffset(COMPONENT_Cr), "pps_cr_qp_offset" );
WRITE_FLAG(pcPPS->getJointCbCrQpOffsetPresentFlag() ? 1 : 0, "pps_joint_cbcr_qp_offset_present_flag");
@@ -466,9 +464,7 @@ void HLSWriter::codePPS( const PPS* pcPPS )
}
}
}
-#if JVET_Q0420_PPS_CHROMA_TOOL_FLAG
}
-#endif
WRITE_FLAG( pcPPS->getUseWP() ? 1 : 0, "weighted_pred_flag" ); // Use of Weighting Prediction (P_SLICE)
WRITE_FLAG( pcPPS->getWPBiPred() ? 1 : 0, "weighted_bipred_flag" ); // Use of Weighting Bi-Prediction (B_SLICE)
--
GitLab