Commit 1a4b0ab9 authored by Karsten Suehring's avatar Karsten Suehring

remove macro JVET_L0696_CONSTRAINT_SYNTAX

parent 2b294722
......@@ -1768,7 +1768,6 @@ SPSNext::SPSNext( SPS& sps )
SPS::SPS()
: m_SPSId ( 0)
#if JVET_L0696_CONSTRAINT_SYNTAX
, m_bIntraOnlyConstraintFlag (false)
, m_maxBitDepthConstraintIdc ( 0)
, m_maxChromaFormatConstraintIdc(CHROMA_420)
......@@ -1786,7 +1785,6 @@ SPS::SPS()
, m_bNoLadfConstraintFlag (false)
, m_bNoDepQuantConstraintFlag (false)
, m_bNoSignDataHidingConstraintFlag(false)
#endif
#if HEVC_VPS
, m_VPSId ( 0)
#endif
......
......@@ -919,7 +919,6 @@ class SPS
{
private:
int m_SPSId;
#if JVET_L0696_CONSTRAINT_SYNTAX
bool m_bIntraOnlyConstraintFlag;
uint32_t m_maxBitDepthConstraintIdc;
uint32_t m_maxChromaFormatConstraintIdc;
......@@ -937,7 +936,6 @@ private:
bool m_bNoLadfConstraintFlag;
bool m_bNoDepQuantConstraintFlag;
bool m_bNoSignDataHidingConstraintFlag;
#endif
#if HEVC_VPS
int m_VPSId;
......@@ -1033,7 +1031,6 @@ public:
int getVPSId() const { return m_VPSId; }
void setVPSId(int i) { m_VPSId = i; }
#endif
#if JVET_L0696_CONSTRAINT_SYNTAX
bool getIntraOnlyConstraintFlag() const { return m_bIntraOnlyConstraintFlag; }
void setIntraOnlyConstraintFlag(bool bVal) { m_bIntraOnlyConstraintFlag = bVal; }
uint32_t getMaxBitDepthConstraintIdc() const { return m_maxBitDepthConstraintIdc; }
......@@ -1068,7 +1065,6 @@ public:
void setNoDepQuantConstraintFlag(bool bVal) { m_bNoDepQuantConstraintFlag = bVal; }
bool getNoSignDataHidingConstraintFlag() const { return m_bNoSignDataHidingConstraintFlag; }
void setNoSignDataHidingConstraintFlag(bool bVal) { m_bNoSignDataHidingConstraintFlag = bVal; }
#endif
int getSPSId() const { return m_SPSId; }
void setSPSId(int i) { m_SPSId = i; }
ChromaFormat getChromaFormatIdc () const { return m_chromaFormatIdc; }
......
......@@ -131,7 +131,6 @@
#endif
#define JVET_L0696_CONSTRAINT_SYNTAX 1 // Starting point for interoperability point syntax
#define JVET_L0428_DQP_SEP_TREE 1 // Delta QP for Separate Tree
// ====================================================================================================================
// NEXT software switches
......
......@@ -859,7 +859,6 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
#endif
uint32_t uiCode;
#if JVET_L0696_CONSTRAINT_SYNTAX
READ_FLAG(uiCode, "intra_only_constraint_flag"); pcSPS->setIntraOnlyConstraintFlag(uiCode > 0 ? true : false);
READ_CODE(4, uiCode, "max_bitdepth_constraint_idc"); pcSPS->setMaxBitDepthConstraintIdc(uiCode);
READ_CODE(2, uiCode, "max_chroma_format_constraint_idc"); pcSPS->setMaxChromaFormatConstraintIdc(uiCode);
......@@ -877,7 +876,6 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
READ_FLAG(uiCode, "no_ladf_constraint_flag"); pcSPS->setNoLadfConstraintFlag(uiCode > 0 ? true : false);
READ_FLAG(uiCode, "no_dep_quant_constraint_flag"); pcSPS->setNoDepQuantConstraintFlag(uiCode > 0 ? true : false);
READ_FLAG(uiCode, "no_sign_data_hiding_constraint_flag"); pcSPS->setNoSignDataHidingConstraintFlag(uiCode > 0 ? true : false);
#endif
#if HEVC_VPS
READ_CODE( 4, uiCode, "sps_video_parameter_set_id"); pcSPS->setVPSId ( uiCode );
#endif
......
......@@ -134,7 +134,6 @@ protected:
bool m_printSequenceMSE;
bool m_cabacZeroWordPaddingEnabled;
#if JVET_L0696_CONSTRAINT_SYNTAX
bool m_bIntraOnlyConstraintFlag;
uint32_t m_maxBitDepthConstraintIdc;
uint32_t m_maxChromaFormatConstraintIdc;
......@@ -152,7 +151,6 @@ protected:
bool m_bNoLadfConstraintFlag;
bool m_bNoDepQuantConstraintFlag;
bool m_bNoSignDataHidingConstraintFlag;
#endif
/* profile & level */
Profile::Name m_profile;
......@@ -573,7 +571,6 @@ 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_L0696_CONSTRAINT_SYNTAX
bool getIntraOnlyConstraintFlag() const { return m_bIntraOnlyConstraintFlag; }
void setIntraOnlyConstraintFlag(bool bVal) { m_bIntraOnlyConstraintFlag = bVal; }
uint32_t getMaxBitDepthConstraintIdc() const { return m_maxBitDepthConstraintIdc; }
......@@ -608,7 +605,6 @@ public:
void setNoDepQuantConstraintFlag(bool bVal) { m_bNoDepQuantConstraintFlag = bVal; }
bool getNoSignDataHidingConstraintFlag() const { return m_bNoSignDataHidingConstraintFlag; }
void setNoSignDataHidingConstraintFlag(bool bVal) { m_bNoSignDataHidingConstraintFlag = bVal; }
#endif
void setFrameRate ( int i ) { m_iFrameRate = i; }
void setFrameSkip ( uint32_t i ) { m_FrameSkip = i; }
......
......@@ -784,7 +784,6 @@ void EncLib::xInitVPS(VPS &vps, const SPS &sps)
void EncLib::xInitSPS(SPS &sps)
{
#if JVET_L0696_CONSTRAINT_SYNTAX
sps.setIntraOnlyConstraintFlag(m_intraConstraintFlag);
sps.setMaxBitDepthConstraintIdc(m_bitDepthConstraintValue - 8);
sps.setMaxChromaFormatConstraintIdc(m_chromaFormatConstraintValue);
......@@ -802,7 +801,6 @@ void EncLib::xInitSPS(SPS &sps)
sps.setNoLadfConstraintFlag(!m_LadfEnabled);
sps.setNoDepQuantConstraintFlag(!m_DepQuantEnabledFlag);
sps.setNoSignDataHidingConstraintFlag(!m_SignDataHidingEnabledFlag);
#endif
ProfileTierLevel& profileTierLevel = *sps.getPTL()->getGeneralPTL();
profileTierLevel.setLevelIdc (m_level);
profileTierLevel.setTierFlag (m_levelTier);
......
......@@ -589,7 +589,6 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
const ChromaFormat format = pcSPS->getChromaFormatIdc();
const bool chromaEnabled = isChromaEnabled(format);
#if JVET_L0696_CONSTRAINT_SYNTAX
WRITE_FLAG(pcSPS->getIntraOnlyConstraintFlag() ? 1 : 0, "intra_only_constraint_flag");
WRITE_CODE(pcSPS->getMaxBitDepthConstraintIdc(), 4, "max_bitdepth_constraint_idc");
WRITE_CODE(pcSPS->getMaxChromaFormatConstraintIdc(), 2, "max_chroma_format_constraint_idc");
......@@ -607,7 +606,6 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
WRITE_FLAG(pcSPS->getNoLadfConstraintFlag() ? 1 : 0, "no_ladf_constraint_flag");
WRITE_FLAG(pcSPS->getNoDepQuantConstraintFlag() ? 1 : 0, "no_dep_quant_constraint_flag");
WRITE_FLAG(pcSPS->getNoSignDataHidingConstraintFlag() ? 1 : 0, "no_sign_data_hiding_constraint_flag");
#endif
#if ENABLE_TRACING
xTraceSPSHeader ();
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment