From 423a87db16e6d69baf7a0fb06262310cac5969ab Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Tue, 25 Jan 2022 13:09:58 +0100
Subject: [PATCH] remove macro JVET_X0076_X0095_V2_GCI
---
source/App/EncoderApp/EncApp.cpp | 4 ----
source/App/EncoderApp/EncAppCfg.cpp | 2 --
source/App/EncoderApp/EncAppCfg.h | 2 --
source/Lib/CommonLib/Slice.h | 6 ------
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/VLCReader.cpp | 4 ----
source/Lib/EncoderLib/EncCfg.h | 4 ----
source/Lib/EncoderLib/EncLib.cpp | 2 --
source/Lib/EncoderLib/VLCWriter.cpp | 6 ------
9 files changed, 31 deletions(-)
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index 1fbaa2a83..60be3c4b9 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -454,7 +454,6 @@ void EncApp::xInitLibCfg()
m_cEncLib.setNoChromaQpOffsetConstraintFlag(m_noChromaQpOffsetConstraintFlag);
CHECK(m_noChromaQpOffsetConstraintFlag && m_cuChromaQpOffsetSubdiv, "Chroma Qp offset shall be 0 when m_noChromaQpOffsetConstraintFlag is equal to 1");
m_cEncLib.setAllRapPicturesFlag(m_allRapPicturesFlag);
-#if JVET_X0076_X0095_V2_GCI
m_cEncLib.setNoExtendedPrecisionProcessingConstraintFlag(m_noExtendedPrecisionProcessingConstraintFlag);
CHECK(m_noExtendedPrecisionProcessingConstraintFlag && m_extendedPrecisionProcessingFlag, "ExtendedPrecision shall be deactivated when m_noExtendedPrecisionProcessingConstraintFlag is equal to 1");
m_cEncLib.setNoTsResidualCodingRiceConstraintFlag(m_noTsResidualCodingRiceConstraintFlag);
@@ -465,7 +464,6 @@ void EncApp::xInitLibCfg()
CHECK(m_noPersistentRiceAdaptationConstraintFlag && m_persistentRiceAdaptationEnabledFlag, "GolombRiceParameterAdaptation shall be deactivated when m_noPersistentRiceAdaptationConstraintFlag is equal to 1");
m_cEncLib.setNoReverseLastSigCoeffConstraintFlag(m_noReverseLastSigCoeffConstraintFlag);
CHECK(m_noReverseLastSigCoeffConstraintFlag && m_reverseLastSigCoeffEnabledFlag, "ReverseLastSigCoeff shall be deactivated when m_noReverseLastSigCoeffConstraintFlag is equal to 1");
-#endif
}
else
{
@@ -532,13 +530,11 @@ void EncApp::xInitLibCfg()
m_cEncLib.setNoLmcsConstraintFlag(false);
m_cEncLib.setNoChromaQpOffsetConstraintFlag(false);
m_cEncLib.setAllRapPicturesFlag(false);
-#if JVET_X0076_X0095_V2_GCI
m_cEncLib.setNoExtendedPrecisionProcessingConstraintFlag(false);
m_cEncLib.setNoTsResidualCodingRiceConstraintFlag(false);
m_cEncLib.setNoRrcRiceExtensionConstraintFlag(false);
m_cEncLib.setNoPersistentRiceAdaptationConstraintFlag(false);
m_cEncLib.setNoReverseLastSigCoeffConstraintFlag(false);
-#endif
}
//====== Coding Structure ========
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index e04fead1e..cd8274ca1 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -937,13 +937,11 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("NoLadfConstraintFlag", m_noLadfConstraintFlag, false, "Indicate that LADF is deactivated")
("NoVirtualBoundaryConstraintFlag", m_noVirtualBoundaryConstraintFlag, false, "Indicate that virtual boundary is deactivated")
("AllRapPicturesFlag", m_allRapPicturesFlag, false, "Indicate that all pictures in OlsInScope are IRAP pictures or GDR pictures with ph_recovery_poc_cnt equal to 0")
-#if JVET_X0076_X0095_V2_GCI
("NoExtendedPrecisionProcessingConstraintFlag", m_noExtendedPrecisionProcessingConstraintFlag, false, "Indicate that ExtendedPrecision is deactivated")
("NoTsResidualCodingRiceConstraintFlag", m_noTsResidualCodingRiceConstraintFlag, false, "Indicate that TSRCRicePresent is deactivated")
("NoRrcRiceExtensionConstraintFlag", m_noRrcRiceExtensionConstraintFlag, false, "Indicate that ExtendedRiceRRC is deactivated")
("NoPersistentRiceAdaptationConstraintFlag", m_noPersistentRiceAdaptationConstraintFlag, false, "Indicate that GolombRiceParameterAdaptation is deactivated")
("NoReverseLastSigCoeffConstraintFlag", m_noReverseLastSigCoeffConstraintFlag, false, "Indicate that ReverseLastSigCoeff is deactivated")
-#endif
("CTUSize", m_uiCTUSize, 128u, "CTUSize (specifies the CTU size if QTBT is on) [default: 128]")
("Log2MinCuSize", m_log2MinCuSize, 2u, "Log2 min CU size")
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index 431c23246..f987b9cb5 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -190,13 +190,11 @@ protected:
bool m_noGdrConstraintFlag;
bool m_noApsConstraintFlag;
bool m_allRapPicturesFlag;
-#if JVET_X0076_X0095_V2_GCI
bool m_noExtendedPrecisionProcessingConstraintFlag;
bool m_noTsResidualCodingRiceConstraintFlag;
bool m_noRrcRiceExtensionConstraintFlag;
bool m_noPersistentRiceAdaptationConstraintFlag;
bool m_noReverseLastSigCoeffConstraintFlag;
-#endif
// profile/level
Profile::Name m_profile;
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index 5395be4bb..94df36998 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -304,13 +304,11 @@ class ConstraintInfo
bool m_noGdrConstraintFlag;
bool m_noApsConstraintFlag;
bool m_allRapPicturesFlag;
-#if JVET_X0076_X0095_V2_GCI
bool m_noExtendedPrecisionProcessingConstraintFlag;
bool m_noTsResidualCodingRiceConstraintFlag;
bool m_noRrcRiceExtensionConstraintFlag;
bool m_noPersistentRiceAdaptationConstraintFlag;
bool m_noReverseLastSigCoeffConstraintFlag;
-#endif
public:
ConstraintInfo()
@@ -382,13 +380,11 @@ public:
, m_noGdrConstraintFlag (false)
, m_noApsConstraintFlag (false)
, m_allRapPicturesFlag (false)
-#if JVET_X0076_X0095_V2_GCI
, m_noExtendedPrecisionProcessingConstraintFlag (false)
, m_noTsResidualCodingRiceConstraintFlag (false)
, m_noRrcRiceExtensionConstraintFlag (false)
, m_noPersistentRiceAdaptationConstraintFlag (false)
, m_noReverseLastSigCoeffConstraintFlag (false)
-#endif
{}
@@ -543,7 +539,6 @@ public:
void setNoApsConstraintFlag(bool bVal) { m_noApsConstraintFlag = bVal; }
bool getAllRapPicturesFlag() const { return m_allRapPicturesFlag; }
void setAllRapPicturesFlag(bool bVal) { m_allRapPicturesFlag = bVal; }
-#if JVET_X0076_X0095_V2_GCI
bool getNoExtendedPrecisionProcessingConstraintFlag() const { return m_noExtendedPrecisionProcessingConstraintFlag; }
void setNoExtendedPrecisionProcessingConstraintFlag(bool val) { m_noExtendedPrecisionProcessingConstraintFlag = val; }
bool getNoTsResidualCodingRiceConstraintFlag() const { return m_noTsResidualCodingRiceConstraintFlag; }
@@ -554,7 +549,6 @@ public:
void setNoPersistentRiceAdaptationConstraintFlag(bool val) { m_noPersistentRiceAdaptationConstraintFlag = val; }
bool getNoReverseLastSigCoeffConstraintFlag() const { return m_noReverseLastSigCoeffConstraintFlag; }
void setNoReverseLastSigCoeffConstraintFlag(bool val) { m_noReverseLastSigCoeffConstraintFlag = val; }
-#endif
friend bool operator == (const ConstraintInfo& op1, const ConstraintInfo& op2);
friend bool operator != (const ConstraintInfo& op1, const ConstraintInfo& op2);
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 2a2bfe085..95ad95c0d 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -59,7 +59,6 @@
-#define JVET_X0076_X0095_V2_GCI 1 // JVET-X0076/X0095 GCI flags for VVC V2 tools
#define JVET_X0101_ADD_WRAPAROUND_CONSTRAINT 1 // JVET-X0101 add WrapAround constraint for Constrained RASL Encoding SEI message
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index a08155152..3b3cbca13 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -4596,16 +4596,12 @@ void HLSyntaxReader::parseConstraintInfo(ConstraintInfo *cinfo, const ProfileTie
if (numAdditionalBits > 0)
{
READ_FLAG(symbol, "gci_all_rap_pictures_flag"); cinfo->setAllRapPicturesFlag(symbol > 0 ? true : false);
-#if JVET_X0076_X0095_V2_GCI
READ_FLAG(symbol, "gci_no_extended_precision_processing_constraint_flag"); cinfo->setNoExtendedPrecisionProcessingConstraintFlag(symbol > 0 ? true : false);
READ_FLAG(symbol, "gci_no_ts_residual_coding_rice_constraint_flag"); cinfo->setNoTsResidualCodingRiceConstraintFlag(symbol > 0 ? true : false);
READ_FLAG(symbol, "gci_no_rrc_rice_extension_constraint_flag"); cinfo->setNoRrcRiceExtensionConstraintFlag(symbol > 0 ? true : false);
READ_FLAG(symbol, "gci_no_persistent_rice_adaptation_constraint_flag"); cinfo->setNoPersistentRiceAdaptationConstraintFlag(symbol > 0 ? true : false);
READ_FLAG(symbol, "gci_no_reverse_last_sig_coeff_constraint_flag"); cinfo->setNoReverseLastSigCoeffConstraintFlag(symbol > 0 ? true : false);
numAdditionalBitsUsed = 6;
-#else
- numAdditionalBitsUsed = 1;
-#endif
}
else
{
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index faa179dba..fd7958f2f 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -236,13 +236,11 @@ protected:
bool m_noGdrConstraintFlag;
bool m_noApsConstraintFlag;
bool m_allRapPicturesFlag;
-#if JVET_X0076_X0095_V2_GCI
bool m_noExtendedPrecisionProcessingConstraintFlag;
bool m_noTsResidualCodingRiceConstraintFlag;
bool m_noRrcRiceExtensionConstraintFlag;
bool m_noPersistentRiceAdaptationConstraintFlag;
bool m_noReverseLastSigCoeffConstraintFlag;
-#endif
/* profile & level */
Profile::Name m_profile;
@@ -1031,7 +1029,6 @@ public:
void setNoApsConstraintFlag(bool val) { m_noApsConstraintFlag = val; }
bool getAllRapPicturesFlag() const { return m_allRapPicturesFlag; }
void setAllRapPicturesFlag(bool val) { m_allRapPicturesFlag = val; }
-#if JVET_X0076_X0095_V2_GCI
bool getNoExtendedPrecisionProcessingConstraintFlag() const { return m_noExtendedPrecisionProcessingConstraintFlag; }
void setNoExtendedPrecisionProcessingConstraintFlag(bool val) { m_noExtendedPrecisionProcessingConstraintFlag = val; }
bool getNoTsResidualCodingRiceConstraintFlag() const { return m_noTsResidualCodingRiceConstraintFlag; }
@@ -1042,7 +1039,6 @@ public:
void setNoPersistentRiceAdaptationConstraintFlag(bool val) { m_noPersistentRiceAdaptationConstraintFlag = val; }
bool getNoReverseLastSigCoeffConstraintFlag() const { return m_noReverseLastSigCoeffConstraintFlag; }
void setNoReverseLastSigCoeffConstraintFlag(bool val) { m_noReverseLastSigCoeffConstraintFlag = val; }
-#endif
void setFrameRate ( int i ) { m_iFrameRate = i; }
void setFrameSkip ( uint32_t i ) { m_FrameSkip = i; }
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 24fb35213..613bdeda0 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -1145,13 +1145,11 @@ void EncLib::xInitSPS( SPS& sps )
cinfo->setNoGdrConstraintFlag(m_noGdrConstraintFlag);
cinfo->setNoApsConstraintFlag(m_noApsConstraintFlag);
cinfo->setAllRapPicturesFlag(m_allRapPicturesFlag);
-#if JVET_X0076_X0095_V2_GCI
cinfo->setNoExtendedPrecisionProcessingConstraintFlag(m_noExtendedPrecisionProcessingConstraintFlag);
cinfo->setNoTsResidualCodingRiceConstraintFlag(m_noTsResidualCodingRiceConstraintFlag);
cinfo->setNoRrcRiceExtensionConstraintFlag(m_noRrcRiceExtensionConstraintFlag);
cinfo->setNoPersistentRiceAdaptationConstraintFlag(m_noPersistentRiceAdaptationConstraintFlag);
cinfo->setNoReverseLastSigCoeffConstraintFlag(m_noReverseLastSigCoeffConstraintFlag);
-#endif
profileTierLevel->setLevelIdc (m_level);
profileTierLevel->setTierFlag (m_levelTier);
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 575187b48..cadea7c83 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -2726,20 +2726,14 @@ void HLSWriter::codeConstraintInfo ( const ConstraintInfo* cinfo, const Profil
profile == Profile::MAIN_12_444 || profile == Profile::MAIN_12_444_INTRA || profile == Profile::MAIN_12_444_STILL_PICTURE ||
profile == Profile::MAIN_16_444 || profile == Profile::MAIN_16_444_INTRA || profile == Profile::MAIN_16_444_STILL_PICTURE)
{
-#if JVET_X0076_X0095_V2_GCI
int numAdditionalBits = 6;
-#else
- int numAdditionalBits = 1;
-#endif
WRITE_CODE(numAdditionalBits, 8, "gci_num_additional_bits");
WRITE_FLAG(cinfo->getAllRapPicturesFlag() ? 1 : 0, "gci_all_rap_pictures_flag");
-#if JVET_X0076_X0095_V2_GCI
WRITE_FLAG(cinfo->getNoExtendedPrecisionProcessingConstraintFlag() ? 1 : 0, "gci_no_extended_precision_processing_constraint_flag");
WRITE_FLAG(cinfo->getNoTsResidualCodingRiceConstraintFlag() ? 1 : 0, "gci_no_ts_residual_coding_rice_constraint_flag");
WRITE_FLAG(cinfo->getNoRrcRiceExtensionConstraintFlag() ? 1 : 0, "gci_no_rrc_rice_extension_constraint_flag");
WRITE_FLAG(cinfo->getNoPersistentRiceAdaptationConstraintFlag() ? 1 : 0, "gci_no_persistent_rice_adaptation_constraint_flag");
WRITE_FLAG(cinfo->getNoReverseLastSigCoeffConstraintFlag() ? 1 : 0, "gci_no_reverse_last_sig_coeff_constraint_flag");
-#endif
}
else
{
--
GitLab