From 200f9f05e9d1e68cfbb6161cb21688e20ccbb437 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Wed, 21 Oct 2020 17:10:33 +0200
Subject: [PATCH] remove macro JVET_S0138_GCI_PTL
---
source/App/EncoderApp/EncApp.cpp | 16 -------------
source/App/EncoderApp/EncAppCfg.cpp | 6 -----
source/App/EncoderApp/EncAppCfg.h | 8 -------
source/Lib/CommonLib/ParameterSetManager.cpp | 2 --
source/Lib/CommonLib/Slice.cpp | 8 -------
source/Lib/CommonLib/Slice.h | 24 --------------------
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/VLCReader.cpp | 18 ---------------
source/Lib/EncoderLib/EncCfg.h | 18 ---------------
source/Lib/EncoderLib/EncLib.cpp | 8 -------
source/Lib/EncoderLib/VLCWriter.cpp | 16 -------------
11 files changed, 125 deletions(-)
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index aebb63b580..151fec1f74 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -205,14 +205,12 @@ void EncApp::xInitLibCfg()
ptls[0].setLevelIdc ( m_level );
ptls[0].setProfileIdc ( m_profile);
ptls[0].setTierFlag ( m_levelTier );
-#if JVET_S0138_GCI_PTL
ptls[0].setFrameOnlyConstraintFlag ( m_frameOnlyConstraintFlag);
ptls[0].setMultiLayerEnabledFlag ( m_multiLayerEnabledFlag);
CHECK((m_profile == Profile::MAIN_10 || m_profile == Profile::MAIN_10_444
|| m_profile == Profile::MAIN_10_STILL_PICTURE || m_profile == Profile::MAIN_10_444_STILL_PICTURE)
&& m_multiLayerEnabledFlag,
"ptl_multilayer_enabled_flag shall be equal to 0 for non-multilayer profiles");
-#endif
ptls[0].setNumSubProfile ( m_numSubProfile );
for (int i = 0; i < m_numSubProfile; i++)
{
@@ -226,10 +224,8 @@ void EncApp::xInitLibCfg()
vps.setVPSExtensionFlag ( false );
m_cEncLib.setProfile ( m_profile);
m_cEncLib.setLevel ( m_levelTier, m_level);
-#if JVET_S0138_GCI_PTL
m_cEncLib.setFrameOnlyConstraintFlag ( m_frameOnlyConstraintFlag);
m_cEncLib.setMultiLayerEnabledFlag ( m_multiLayerEnabledFlag || m_maxLayers > 1);
-#endif
m_cEncLib.setNumSubProfile ( m_numSubProfile );
for (int i = 0; i < m_numSubProfile; i++)
{
@@ -282,17 +278,11 @@ void EncApp::xInitLibCfg()
CHECK(m_noSubpicInfoConstraintFlag&& m_subPicInfoPresentFlag, "Subpicture information shall not present when gci_no_subpic_info_constraint_flag equal to 1");
#else
m_cEncLib.setOneSubpicPerPicConstraintFlag(m_oneSubpicPerPicConstraintFlag);
-#endif
-#if !JVET_S0138_GCI_PTL
- m_cEncLib.setFrameOnlyConstraintFlag(m_frameOnlyConstraintFlag);
#endif
m_cEncLib.setOnePictureOnlyConstraintFlag(m_onePictureOnlyConstraintFlag);
m_cEncLib.setIntraOnlyConstraintFlag(m_intraOnlyConstraintFlag);
m_cEncLib.setNoIdrConstraintFlag(m_noIdrConstraintFlag);
m_cEncLib.setNoGdrConstraintFlag(m_noGdrConstraintFlag);
-#if !JVET_S0138_GCI_PTL
- m_cEncLib.setSingleLayerConstraintFlag(m_singleLayerConstraintFlag);
-#endif
m_cEncLib.setAllLayersIndependentConstraintFlag(m_allLayersIndependentConstraintFlag);
m_cEncLib.setNoCuQpDeltaConstraintFlag(m_noCuQpDeltaConstraintFlag);
@@ -458,9 +448,6 @@ void EncApp::xInitLibCfg()
{
m_cEncLib.setNonPackedConstraintFlag(false);
m_cEncLib.setNonProjectedConstraintFlag(false);
-#if !JVET_S0138_GCI_PTL
- m_cEncLib.setSingleLayerConstraintFlag(false);
-#endif
m_cEncLib.setAllLayersIndependentConstraintFlag(false);
m_cEncLib.setNoResChangeInClvsConstraintFlag(false);
m_cEncLib.setOneTilePerPicConstraintFlag(false);
@@ -473,9 +460,6 @@ void EncApp::xInitLibCfg()
m_cEncLib.setNoSubpicInfoConstraintFlag(false);
#else
m_cEncLib.setOneSubpicPerPicConstraintFlag(false);
-#endif
-#if !JVET_S0138_GCI_PTL
- m_cEncLib.setFrameOnlyConstraintFlag(false);
#endif
m_cEncLib.setOnePictureOnlyConstraintFlag(false);
m_cEncLib.setIntraOnlyConstraintFlag(false);
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index f4d45b43ac..740b86c66c 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -772,10 +772,8 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("Profile", extendedProfile, ExtendedProfileName::NONE, "Profile name to use for encoding. Use [multilayer_]main_10[_444][_still_picture], auto, or none")
("Level", m_level, Level::NONE, "Level limit to be used, eg 5.1, or none")
("Tier", m_levelTier, Level::MAIN, "Tier to use for interpretation of --Level (main or high only)")
-#if JVET_S0138_GCI_PTL
("FrameOnlyConstraintFlag", m_frameOnlyConstraintFlag, true, "Bitstream contains only frames")
("MultiLayerEnabledFlag", m_multiLayerEnabledFlag, false, "Bitstream might contain more than one layer")
-#endif
("SubProfile", cfg_SubProfile, cfg_SubProfile, "Sub-profile idc")
("EnableDecodingCapabilityInformation", m_DCIEnabled, false, "Enables writing of Decoding Capability Information")
("MaxBitDepthConstraint", m_bitDepthConstraint, 0u, "Bit depth to use for profile-constraint for RExt profiles. 0=automatically choose based upon other parameters")
@@ -853,10 +851,6 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("NoLmcsConstraintFlag", m_noLmcsConstraintFlag, false, "Indicate that LMCS is deactivated")
("NoLadfConstraintFlag", m_noLadfConstraintFlag, false, "Indicate that LADF is deactivated")
("NoVirtualBoundaryConstraintFlag", m_noVirtualBoundaryConstraintFlag, false, "Indicate that virtual boundary is deactivated")
-#if !JVET_S0138_GCI_PTL
- ("SingleLayerConstraintFlag", m_singleLayerConstraintFlag, false, "Indicate that the bitstream contains only one layer")
- ("FrameOnlyConstraintFlag", m_frameOnlyConstraintFlag, false, "Indicate that the bitstream contains only frames")
-#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 33d3dc3c79..cf876d36ae 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -135,9 +135,6 @@ protected:
bool m_bIntraOnlyConstraintFlag;
uint32_t m_maxBitDepthConstraintIdc;
int m_maxChromaFormatConstraintIdc;
-#if !JVET_S0138_GCI_PTL
- bool m_singleLayerConstraintFlag;
-#endif
bool m_allLayersIndependentConstraintFlag;
bool m_noMrlConstraintFlag;
bool m_noIspConstraintFlag;
@@ -195,10 +192,8 @@ protected:
Profile::Name m_profile;
Level::Tier m_levelTier;
Level::Name m_level;
-#if JVET_S0138_GCI_PTL
bool m_frameOnlyConstraintFlag;
bool m_multiLayerEnabledFlag;
-#endif
std::vector<uint32_t> m_subProfile;
uint8_t m_numSubProfile;
@@ -222,9 +217,6 @@ protected:
bool m_noSubpicInfoConstraintFlag;
#else
bool m_oneSubpicPerPicConstraintFlag;
-#endif
-#if !JVET_S0138_GCI_PTL
- bool m_frameOnlyConstraintFlag;
#endif
// coding structure
int m_iIntraPeriod; ///< period of I-slice (random access period)
diff --git a/source/Lib/CommonLib/ParameterSetManager.cpp b/source/Lib/CommonLib/ParameterSetManager.cpp
index 6539c9b548..5fb051c6be 100644
--- a/source/Lib/CommonLib/ParameterSetManager.cpp
+++ b/source/Lib/CommonLib/ParameterSetManager.cpp
@@ -162,10 +162,8 @@ ProfileTierLevel::ProfileTierLevel()
, m_numSubProfile(0)
, m_subProfileIdc(0)
, m_levelIdc (Level::NONE)
-#if JVET_S0138_GCI_PTL
, m_frameOnlyConstraintFlag(1)
, m_multiLayerEnabledFlag(0)
-#endif
{
::memset(m_subLayerLevelPresentFlag, 0, sizeof(m_subLayerLevelPresentFlag ));
::memset(m_subLayerLevelIdc, Level::NONE, sizeof(m_subLayerLevelIdc ));
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index d257f963a2..4d29ccd706 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -4325,17 +4325,11 @@ bool Slice::checkRPR()
bool operator == (const ConstraintInfo& op1, const ConstraintInfo& op2)
{
-#if !JVET_S0138_GCI_PTL
- if( op1.m_frameOnlyConstraintFlag != op2.m_frameOnlyConstraintFlag ) return false;
-#endif
if( op1.m_intraOnlyConstraintFlag != op2.m_intraOnlyConstraintFlag ) return false;
if( op1.m_maxBitDepthConstraintIdc != op2.m_maxBitDepthConstraintIdc ) return false;
if( op1.m_maxChromaFormatConstraintIdc != op2.m_maxChromaFormatConstraintIdc ) return false;
if( op1.m_onePictureOnlyConstraintFlag != op2.m_onePictureOnlyConstraintFlag ) return false;
if( op1.m_lowerBitRateConstraintFlag != op2.m_lowerBitRateConstraintFlag ) return false;
-#if !JVET_S0138_GCI_PTL
- if (op1.m_singleLayerConstraintFlag != op2.m_singleLayerConstraintFlag ) return false;
-#endif
if (op1.m_allLayersIndependentConstraintFlag != op2.m_allLayersIndependentConstraintFlag ) return false;
if (op1.m_noMrlConstraintFlag != op2.m_noMrlConstraintFlag ) return false;
if (op1.m_noIspConstraintFlag != op2.m_noIspConstraintFlag ) return false;
@@ -4402,10 +4396,8 @@ bool operator == (const ProfileTierLevel& op1, const ProfileTierLeve
if (op1.m_profileIdc != op2.m_profileIdc) return false;
if (op1.m_numSubProfile != op2.m_numSubProfile) return false;
if (op1.m_levelIdc != op2.m_levelIdc) return false;
-#if JVET_S0138_GCI_PTL
if (op1.m_frameOnlyConstraintFlag != op2.m_frameOnlyConstraintFlag) return false;
if (op1.m_multiLayerEnabledFlag != op2.m_multiLayerEnabledFlag) return false;
-#endif
if (op1.m_constraintInfo != op2.m_constraintInfo) return false;
if (op1.m_subProfileIdc != op2.m_subProfileIdc) return false;
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index cba99dbbcb..6e152285fe 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -250,18 +250,12 @@ class ConstraintInfo
bool m_noSubpicInfoConstraintFlag;
#else
bool m_oneSubpicPerPicConstraintFlag;
-#endif
-#if !JVET_S0138_GCI_PTL
- bool m_frameOnlyConstraintFlag;
#endif
bool m_intraOnlyConstraintFlag;
uint32_t m_maxBitDepthConstraintIdc;
int m_maxChromaFormatConstraintIdc;
bool m_onePictureOnlyConstraintFlag;
bool m_lowerBitRateConstraintFlag;
-#if !JVET_S0138_GCI_PTL
- bool m_singleLayerConstraintFlag;
-#endif
bool m_allLayersIndependentConstraintFlag;
bool m_noMrlConstraintFlag;
bool m_noIspConstraintFlag;
@@ -334,18 +328,12 @@ public:
, m_noSubpicInfoConstraintFlag(false)
#else
, m_oneSubpicPerPicConstraintFlag(false)
-#endif
-#if !JVET_S0138_GCI_PTL
- , m_frameOnlyConstraintFlag (false)
#endif
, m_intraOnlyConstraintFlag (false)
, m_maxBitDepthConstraintIdc ( 16)
, m_maxChromaFormatConstraintIdc(CHROMA_444)
, m_onePictureOnlyConstraintFlag (false)
, m_lowerBitRateConstraintFlag (false )
-#if !JVET_S0138_GCI_PTL
- , m_singleLayerConstraintFlag(false)
-#endif
, m_allLayersIndependentConstraintFlag(false)
, m_noMrlConstraintFlag(false)
, m_noIspConstraintFlag(false)
@@ -405,10 +393,6 @@ public:
bool getGciPresentFlag() const { return m_gciPresentFlag; }
void setGciPresentFlag(bool b) { m_gciPresentFlag = b; }
-#if !JVET_S0138_GCI_PTL
- bool getFrameOnlyConstraintFlag() const { return m_frameOnlyConstraintFlag; }
- void setFrameOnlyConstraintFlag(bool b) { m_frameOnlyConstraintFlag = b; }
-#endif
uint32_t getMaxBitDepthConstraintIdc() const { return m_maxBitDepthConstraintIdc; }
void setMaxBitDepthConstraintIdc(uint32_t bitDepth) { m_maxBitDepthConstraintIdc = bitDepth; }
@@ -458,10 +442,6 @@ public:
bool getLowerBitRateConstraintFlag() const { return m_lowerBitRateConstraintFlag; }
void setLowerBitRateConstraintFlag(bool b) { m_lowerBitRateConstraintFlag = b; }
-#if !JVET_S0138_GCI_PTL
- bool getSingleLayerConstraintFlag() const { return m_singleLayerConstraintFlag; }
- void setSingleLayerConstraintFlag(bool b) { m_singleLayerConstraintFlag = b; }
-#endif
bool getAllLayersIndependentConstraintFlag() const { return m_allLayersIndependentConstraintFlag; }
void setAllLayersIndependentConstraintFlag(bool b) { m_allLayersIndependentConstraintFlag = b; }
bool getNoMrlConstraintFlag() const { return m_noMrlConstraintFlag; }
@@ -580,10 +560,8 @@ class ProfileTierLevel
uint8_t m_numSubProfile;
std::vector<uint32_t> m_subProfileIdc;
Level::Name m_levelIdc;
-#if JVET_S0138_GCI_PTL
bool m_frameOnlyConstraintFlag;
bool m_multiLayerEnabledFlag;
-#endif
ConstraintInfo m_constraintInfo;
bool m_subLayerLevelPresentFlag[MAX_TLAYER - 1];
Level::Name m_subLayerLevelIdc[MAX_TLAYER];
@@ -606,13 +584,11 @@ public:
Level::Name getLevelIdc() const { return m_levelIdc; }
void setLevelIdc(Level::Name x) { m_levelIdc = x; }
-#if JVET_S0138_GCI_PTL
bool getFrameOnlyConstraintFlag() const { return m_frameOnlyConstraintFlag; }
void setFrameOnlyConstraintFlag(bool x) { m_frameOnlyConstraintFlag = x; }
bool getMultiLayerEnabledFlag() const { return m_multiLayerEnabledFlag; }
void setMultiLayerEnabledFlag(bool x) { m_multiLayerEnabledFlag = x; }
-#endif
ConstraintInfo* getConstraintInfo() { return &m_constraintInfo; }
const ConstraintInfo* getConstraintInfo() const { return &m_constraintInfo; }
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 16f9a4667d..90a406c036 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -119,7 +119,6 @@
// Constrain the value of one_subpic_per_pic_constraint_flag, one_slice_per_pic_constraint_flag and no_aps_constraint_flag
// Remove all constraints that require GCI fields to be equal to a value that imposes a constraint
-#define JVET_S0138_GCI_PTL 1 // JVET-S_Notes_d9: move frame_only_constraint_flag and single_layer_constraint_flag into PTL for easy access
#define JVET_S0113_S0195_GCI 1 // JVET-S0113: no_rectangular_slice_constraint_flag to constrain pps_rect_slice_flag
// one_slice_per_subpicture_constraint_flag to constrain pps_single_slice_per_subpic_flag
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 339cc2b2e8..4ea01ba160 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -2049,9 +2049,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
}
READ_FLAG( uiCode, "sps_field_seq_flag"); pcSPS->setFieldSeqFlag(uiCode);
-#if JVET_S0138_GCI_PTL
CHECK( pcSPS->getProfileTierLevel()->getFrameOnlyConstraintFlag() && uiCode, "When ptl_frame_only_constraint_flag equal to 1 , the value of sps_field_seq_flag shall be equal to 0");
-#endif
READ_FLAG( uiCode, "sps_vui_parameters_present_flag" ); pcSPS->setVuiParametersPresentFlag(uiCode);
@@ -2304,11 +2302,7 @@ void HLSyntaxReader::parseVPS(VPS* pcVPS)
int cnt = 0;
while (m_pcBitstream->getNumBitsUntilByteAligned())
{
-#if JVET_S0138_GCI_PTL
READ_FLAG( uiCode, "vps_ptl_reserved_zero_bit");
-#else
- READ_FLAG( uiCode, "vps_ptl_alignment_zero_bit");
-#endif
CHECK(uiCode!=0, "Alignment bit is not '0'");
cnt++;
}
@@ -4491,18 +4485,12 @@ void HLSyntaxReader::parseConstraintInfo(ConstraintInfo *cinfo)
READ_FLAG(symbol, "gci_no_ladf_constraint_flag"); cinfo->setNoLadfConstraintFlag(symbol > 0 ? true : false);
READ_FLAG(symbol, "gci_no_virtual_boundaries_constraint_flag"); cinfo->setNoVirtualBoundaryConstraintFlag(symbol > 0 ? true : false);
#else
-#if !JVET_S0138_GCI_PTL
- READ_FLAG(symbol, "general_frame_only_constraint_flag" ); cinfo->setFrameOnlyConstraintFlag(symbol ? true : false);
-#endif
READ_FLAG(symbol, "general_one_picture_only_constraint_flag" ); cinfo->setOnePictureOnlyConstraintFlag(symbol ? true : false);
READ_FLAG(symbol, "intra_only_constraint_flag" ); cinfo->setIntraOnlyConstraintFlag(symbol ? true : false);
READ_CODE(4, symbol, "gci_sixteen_minus_max_bitdepth_constraint_idc" ); cinfo->setMaxBitDepthConstraintIdc(symbol>8 ? 16 : (16-symbol));
CHECK(symbol>8, "gci_sixteen_minus_max_bitdepth_constraint_idc shall be in the range 0 to 8, inclusive");
READ_CODE(2, symbol, "gci_three_minus_max_chroma_format_constraint_idc" ); cinfo->setMaxChromaFormatConstraintIdc((ChromaFormat)(3-symbol));
-#if !JVET_S0138_GCI_PTL
- READ_FLAG(symbol, "single_layer_constraint_flag"); cinfo->setSingleLayerConstraintFlag(symbol ? true : false);
-#endif
READ_FLAG(symbol, "all_layers_independent_constraint_flag"); cinfo->setAllLayersIndependentConstraintFlag(symbol ? true : false);
#if JVET_Q0114_ASPECT5_GCI_FLAG
READ_FLAG(symbol, "gci_no_ref_pic_resampling_constraint_flag"); cinfo->setNoRprConstraintFlag(symbol ? true : false);
@@ -4599,7 +4587,6 @@ void HLSyntaxReader::parseProfileTierLevel(ProfileTierLevel *ptl, bool profileTi
READ_CODE( 8, symbol, "general_level_idc" ); ptl->setLevelIdc( Level::Name( symbol ) );
-#if JVET_S0138_GCI_PTL
READ_FLAG( symbol, "ptl_frame_only_constraint_flag" ); ptl->setFrameOnlyConstraintFlag(symbol);
READ_FLAG( symbol, "ptl_multilayer_enabled_flag" ); ptl->setMultiLayerEnabledFlag(symbol);
CHECK((ptl->getProfileIdc() == Profile::MAIN_10 || ptl->getProfileIdc() == Profile::MAIN_10_444
@@ -4607,7 +4594,6 @@ void HLSyntaxReader::parseProfileTierLevel(ProfileTierLevel *ptl, bool profileTi
|| ptl->getProfileIdc() == Profile::MAIN_10_444_STILL_PICTURE)
&& symbol,
"ptl_multilayer_enabled_flag shall be equal to 0 for non-multilayer profiles");
-#endif
if(profileTierPresentFlag)
{
@@ -4621,11 +4607,7 @@ void HLSyntaxReader::parseProfileTierLevel(ProfileTierLevel *ptl, bool profileTi
while (!isByteAligned())
{
-#if JVET_S0138_GCI_PTL
READ_FLAG( symbol, "ptl_reserved_zero_bit" ); CHECK (symbol != 0, "ptl_reserved_zero_bit not equal to zero");
-#else
- READ_FLAG( symbol, "ptl_alignment_zero_bit" ); CHECK (symbol != 0, "ptl_alignment_zero_bit not equal to zero");
-#endif
}
for (int i = maxNumSubLayersMinus1 - 1; i >= 0; i--)
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index b30078033a..873a6a6fbc 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -180,9 +180,6 @@ protected:
bool m_bIntraOnlyConstraintFlag;
uint32_t m_maxBitDepthConstraintIdc;
int m_maxChromaFormatConstraintIdc;
-#if !JVET_S0138_GCI_PTL
- bool m_singleLayerConstraintFlag;
-#endif
bool m_allLayersIndependentConstraintFlag;
bool m_noMrlConstraintFlag;
bool m_noIspConstraintFlag;
@@ -240,10 +237,8 @@ protected:
Profile::Name m_profile;
Level::Tier m_levelTier;
Level::Name m_level;
-#if JVET_S0138_GCI_PTL
bool m_frameOnlyConstraintFlag;
bool m_multiLayerEnabledFlag;
-#endif
std::vector<uint32_t> m_subProfile;
uint8_t m_numSubProfile;
bool m_nonPackedConstraintFlag;
@@ -262,9 +257,6 @@ protected:
bool m_noSubpicInfoConstraintFlag;
#else
bool m_oneSubpicPerPicConstraintFlag;
-#endif
-#if !JVET_S0138_GCI_PTL
- bool m_frameOnlyConstraintFlag;
#endif
bool m_intraOnlyConstraintFlag;
@@ -783,12 +775,10 @@ public:
void setProfile(Profile::Name profile) { m_profile = profile; }
void setLevel(Level::Tier tier, Level::Name level) { m_levelTier = tier; m_level = level; }
-#if JVET_S0138_GCI_PTL
bool getFrameOnlyConstraintFlag() const { return m_frameOnlyConstraintFlag; }
void setFrameOnlyConstraintFlag(bool b) { m_frameOnlyConstraintFlag = b; }
bool getMultiLayerEnabledFlag() const { return m_multiLayerEnabledFlag; }
void setMultiLayerEnabledFlag(bool b) { m_multiLayerEnabledFlag = b; }
-#endif
void setNumSubProfile( uint8_t numSubProfile) { m_numSubProfile = numSubProfile; m_subProfile.resize(m_numSubProfile); }
void setSubProfile( int i, uint32_t subProfile) { m_subProfile[i] = subProfile; }
@@ -803,10 +793,6 @@ public:
void setMaxChromaFormatConstraintIdc(int u) { m_maxChromaFormatConstraintIdc = u; }
bool getGciPresentFlag() const { return m_gciPresentFlag; }
void setGciPresentFlag(bool b) { m_gciPresentFlag = b; }
-#if !JVET_S0138_GCI_PTL
- bool getSingleLayerConstraintFlag() const { return m_singleLayerConstraintFlag; }
- void setSingleLayerConstraintFlag(bool val) { m_singleLayerConstraintFlag = val; }
-#endif
bool getAllLayersIndependentConstraintFlag() const { return m_allLayersIndependentConstraintFlag; }
void setAllLayersIndependentConstraintFlag(bool val) { m_allLayersIndependentConstraintFlag = val; }
bool getNoMrlConstraintFlag() const { return m_noMrlConstraintFlag; }
@@ -1895,10 +1881,6 @@ public:
void setOneSubpicPerPicConstraintFlag(bool b) { m_oneSubpicPerPicConstraintFlag = b; }
#endif
-#if !JVET_S0138_GCI_PTL
- bool getFrameOnlyConstraintFlag() const { return m_frameOnlyConstraintFlag; }
- void setFrameOnlyConstraintFlag(bool b) { m_frameOnlyConstraintFlag = b; }
-#endif
void setSummaryOutFilename(const std::string &s) { m_summaryOutFilename = s; }
const std::string& getSummaryOutFilename() const { return m_summaryOutFilename; }
void setSummaryPicFilenameBase(const std::string &s) { m_summaryPicFilenameBase = s; }
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 9e818b935a..5ec799dce0 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -1181,17 +1181,11 @@ void EncLib::xInitSPS( SPS& sps )
cinfo->setNoSubpicInfoConstraintFlag(m_noSubpicInfoConstraintFlag);
#else
cinfo->setOneSubpicPerPicConstraintFlag(m_oneSubpicPerPicConstraintFlag);
-#endif
-#if !JVET_S0138_GCI_PTL
- cinfo->setFrameOnlyConstraintFlag (m_frameOnlyConstraintFlag);
#endif
cinfo->setOnePictureOnlyConstraintFlag(m_onePictureOnlyConstraintFlag);
cinfo->setIntraOnlyConstraintFlag (m_intraOnlyConstraintFlag);
cinfo->setMaxBitDepthConstraintIdc (m_maxBitDepthConstraintIdc);
cinfo->setMaxChromaFormatConstraintIdc((int)m_maxChromaFormatConstraintIdc);
-#if !JVET_S0138_GCI_PTL
- cinfo->setSingleLayerConstraintFlag (m_singleLayerConstraintFlag);
-#endif
cinfo->setAllLayersIndependentConstraintFlag (m_allLayersIndependentConstraintFlag);
cinfo->setNoMrlConstraintFlag (m_noMrlConstraintFlag);
cinfo->setNoIspConstraintFlag (m_noIspConstraintFlag);
@@ -1246,10 +1240,8 @@ void EncLib::xInitSPS( SPS& sps )
profileTierLevel->setLevelIdc (m_level);
profileTierLevel->setTierFlag (m_levelTier);
profileTierLevel->setProfileIdc (m_profile);
-#if JVET_S0138_GCI_PTL
profileTierLevel->setFrameOnlyConstraintFlag (m_frameOnlyConstraintFlag);
profileTierLevel->setMultiLayerEnabledFlag (m_multiLayerEnabledFlag);
-#endif
profileTierLevel->setNumSubProfile(m_numSubProfile);
for (int k = 0; k < m_numSubProfile; k++)
{
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index df0205232a..ef993e1f59 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -1423,11 +1423,7 @@ void HLSWriter::codeVPS(const VPS* pcVPS)
int cnt = 0;
while (m_pcBitIf->getNumBitsUntilByteAligned())
{
-#if JVET_S0138_GCI_PTL
WRITE_FLAG( 0, "vps_ptl_reserved_zero_bit");
-#else
- WRITE_FLAG( 0, "vps_ptl_alignment_zero_bit");
-#endif
cnt++;
}
CHECK(cnt>=8, "More than '8' alignment bytes written");
@@ -2645,17 +2641,11 @@ void HLSWriter::codeConstraintInfo ( const ConstraintInfo* cinfo )
WRITE_FLAG(cinfo->getNoLadfConstraintFlag() ? 1 : 0, "gci_no_ladf_constraint_flag");
WRITE_FLAG(cinfo->getNoVirtualBoundaryConstraintFlag() ? 1 : 0, "gci_no_virtual_boundaries_constraint_flag");
#else
-#if !JVET_S0138_GCI_PTL
- WRITE_FLAG(cinfo->getFrameOnlyConstraintFlag(), "general_frame_only_constraint_flag" );
-#endif
WRITE_FLAG(cinfo->getOnePictureOnlyConstraintFlag(), "general_one_picture_only_constraint_flag" );
WRITE_FLAG(cinfo->getIntraOnlyConstraintFlag(), "intra_only_constraint_flag" );
WRITE_CODE(16-cinfo->getMaxBitDepthConstraintIdc(), 4, "gci_sixteen_minus_max_bitdepth_constraint_idc" );
WRITE_CODE(3-cinfo->getMaxChromaFormatConstraintIdc(), 2, "gci_three_minus_max_chroma_format_constraint_idc" );
-#if !JVET_S0138_GCI_PTL
- WRITE_FLAG(cinfo->getSingleLayerConstraintFlag(), "single_layer_constraint_flag");
-#endif
WRITE_FLAG(cinfo->getAllLayersIndependentConstraintFlag(), "all_layers_independent_constraint_flag");
#if JVET_Q0114_ASPECT5_GCI_FLAG
WRITE_FLAG(cinfo->getNoRprConstraintFlag(), "gci_no_ref_pic_resampling_constraint_flag");
@@ -2748,10 +2738,8 @@ void HLSWriter::codeProfileTierLevel ( const ProfileTierLevel* ptl, bool pro
WRITE_CODE( int( ptl->getLevelIdc() ), 8, "general_level_idc" );
-#if JVET_S0138_GCI_PTL
WRITE_FLAG( ptl->getFrameOnlyConstraintFlag(), "ptl_frame_only_constraint_flag" );
WRITE_FLAG( ptl->getMultiLayerEnabledFlag(), "ptl_multilayer_enabled_flag" );
-#endif
if(profileTierPresentFlag)
{
@@ -2765,11 +2753,7 @@ void HLSWriter::codeProfileTierLevel ( const ProfileTierLevel* ptl, bool pro
while (!isByteAligned())
{
-#if JVET_S0138_GCI_PTL
WRITE_FLAG(0, "ptl_reserved_zero_bit");
-#else
- WRITE_FLAG(0, "ptl_alignment_zero_bit");
-#endif
}
for (int i = maxNumSubLayersMinus1 - 1; i >= 0; i--)
--
GitLab