diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index bfe9266fb14e6615486c37992ac88828eab0d711..57c087497d555822c9b762831f40fb8d1d6dab3b 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -3003,9 +3003,9 @@ SPS::SPS()
, m_sbtmvpEnabledFlag (false)
, m_bdofEnabledFlag (false)
, m_fpelMmvdEnabledFlag ( false )
-, m_BdofControlPresentFlag ( false )
-, m_DmvrControlPresentFlag ( false )
-, m_ProfControlPresentFlag ( false )
+, m_BdofControlPresentInPhFlag( false )
+, m_DmvrControlPresentInPhFlag( false )
+, m_ProfControlPresentInPhFlag( false )
, m_uiBitsForPOC ( 8)
, m_pocMsbFlag ( false )
, m_pocMsbLen ( 1 )
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index 16c03877f3e9cdfeec1fae0cdc24827e138c995a..5d3fd872d5527b7227b17d471487fc95533e6416 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -1560,9 +1560,9 @@ private:
bool m_sbtmvpEnabledFlag;
bool m_bdofEnabledFlag;
bool m_fpelMmvdEnabledFlag;
- bool m_BdofControlPresentFlag;
- bool m_DmvrControlPresentFlag;
- bool m_ProfControlPresentFlag;
+ bool m_BdofControlPresentInPhFlag;
+ bool m_DmvrControlPresentInPhFlag;
+ bool m_ProfControlPresentInPhFlag;
uint32_t m_uiBitsForPOC;
bool m_pocMsbFlag;
uint32_t m_pocMsbLen;
@@ -1883,14 +1883,14 @@ void setCCALFEnabledFlag( bool b )
void setUseDMVR(bool b) { m_DMVR = b; }
bool getUseMMVD()const { return m_MMVD; }
void setUseMMVD(bool b) { m_MMVD = b; }
- bool getBdofControlPresentFlag()const { return m_BdofControlPresentFlag; }
- void setBdofControlPresentFlag(bool b) { m_BdofControlPresentFlag = b; }
+ bool getBdofControlPresentInPhFlag()const { return m_BdofControlPresentInPhFlag; }
+ void setBdofControlPresentInPhFlag(bool b) { m_BdofControlPresentInPhFlag = b; }
- bool getDmvrControlPresentFlag()const { return m_DmvrControlPresentFlag; }
- void setDmvrControlPresentFlag(bool b) { m_DmvrControlPresentFlag = b; }
+ bool getDmvrControlPresentInPhFlag()const { return m_DmvrControlPresentInPhFlag; }
+ void setDmvrControlPresentInPhFlag(bool b) { m_DmvrControlPresentInPhFlag = b; }
- bool getProfControlPresentFlag()const { return m_ProfControlPresentFlag; }
- void setProfControlPresentFlag(bool b) { m_ProfControlPresentFlag = b; }
+ bool getProfControlPresentInPhFlag()const { return m_ProfControlPresentInPhFlag; }
+ void setProfControlPresentInPhFlag(bool b) { m_ProfControlPresentInPhFlag = b; }
uint32_t getMaxTLayers() const { return m_uiMaxTLayers; }
void setMaxTLayers( uint32_t uiMaxTLayers ) { CHECK( uiMaxTLayers > MAX_TLAYER, "Invalid number T-layers" ); m_uiMaxTLayers = uiMaxTLayers; }
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 6dc6af54724608d3011ebfa43962603e7f178810..f31cf180ff3cbf60a517a0c796e3e161e23384ca 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -2007,19 +2007,19 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
READ_FLAG( uiCode, "sps_bdof_enabled_flag" ); pcSPS->setBDOFEnabledFlag ( uiCode != 0 );
if (pcSPS->getBDOFEnabledFlag())
{
- READ_FLAG(uiCode, "sps_bdof_pic_present_flag"); pcSPS->setBdofControlPresentFlag( uiCode != 0 );
+ READ_FLAG(uiCode, "sps_bdof_control_present_in_ph_flag"); pcSPS->setBdofControlPresentInPhFlag( uiCode != 0 );
}
else {
- pcSPS->setBdofControlPresentFlag( false );
+ pcSPS->setBdofControlPresentInPhFlag( false );
}
READ_FLAG(uiCode, "sps_smvd_enabled_flag"); pcSPS->setUseSMVD( uiCode != 0 );
READ_FLAG(uiCode, "sps_dmvr_enabled_flag"); pcSPS->setUseDMVR(uiCode != 0);
if (pcSPS->getUseDMVR())
{
- READ_FLAG(uiCode, "sps_dmvr_pic_present_flag"); pcSPS->setDmvrControlPresentFlag( uiCode != 0 );
+ READ_FLAG(uiCode, "sps_dmvr_control_present_in_ph_flag"); pcSPS->setDmvrControlPresentInPhFlag( uiCode != 0 );
}
else {
- pcSPS->setDmvrControlPresentFlag( false );
+ pcSPS->setDmvrControlPresentInPhFlag( false );
}
READ_FLAG(uiCode, "sps_mmvd_enabled_flag"); pcSPS->setUseMMVD(uiCode != 0);
if (pcSPS->getUseMMVD())
@@ -2052,10 +2052,10 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
READ_FLAG( uiCode, "sps_affine_prof_enabled_flag" ); pcSPS->setUsePROF ( uiCode != 0 );
if (pcSPS->getUsePROF())
{
- READ_FLAG(uiCode, "sps_prof_pic_present_flag"); pcSPS->setProfControlPresentFlag ( uiCode != 0 );
+ READ_FLAG(uiCode, "sps_prof_control_present_in_ph_flag"); pcSPS->setProfControlPresentInPhFlag ( uiCode != 0 );
}
else {
- pcSPS->setProfControlPresentFlag( false );
+ pcSPS->setProfControlPresentInPhFlag( false );
}
}
@@ -3363,13 +3363,13 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
#endif
// picture level BDOF disable flags
- if (sps->getBdofControlPresentFlag() && (!pps->getRplInfoInPhFlag() || picHeader->getRPL(1)->getNumRefEntries() > 0))
+ if (sps->getBdofControlPresentInPhFlag() && (!pps->getRplInfoInPhFlag() || picHeader->getRPL(1)->getNumRefEntries() > 0))
{
READ_FLAG(uiCode, "ph_disable_bdof_flag"); picHeader->setDisBdofFlag(uiCode != 0);
}
else
{
- if (sps->getBdofControlPresentFlag() == 0)
+ if (sps->getBdofControlPresentInPhFlag() == 0)
{
picHeader->setDisBdofFlag(1 - (int)(sps->getBDOFEnabledFlag()));
}
@@ -3380,13 +3380,13 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
}
// picture level DMVR disable flags
- if (sps->getDmvrControlPresentFlag() && (!pps->getRplInfoInPhFlag() || picHeader->getRPL(1)->getNumRefEntries() > 0))
+ if (sps->getDmvrControlPresentInPhFlag() && (!pps->getRplInfoInPhFlag() || picHeader->getRPL(1)->getNumRefEntries() > 0))
{
READ_FLAG(uiCode, "ph_disable_dmvr_flag"); picHeader->setDisDmvrFlag(uiCode != 0);
}
else
{
- if (sps->getDmvrControlPresentFlag() == 0)
+ if (sps->getDmvrControlPresentInPhFlag() == 0)
{
picHeader->setDisDmvrFlag(1 - (int)(sps->getUseDMVR()));
}
@@ -3397,7 +3397,7 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
}
// picture level PROF disable flags
- if (sps->getProfControlPresentFlag())
+ if (sps->getProfControlPresentInPhFlag())
{
READ_FLAG(uiCode, "ph_disable_prof_flag"); picHeader->setDisProfFlag(uiCode != 0);
}
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 77fe29e75493e444cb8daee218ba78f072c67b5e..b813818f36b0965b3e99153f80fbdde942085202 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -1313,9 +1313,9 @@ void EncLib::xInitSPS( SPS& sps )
sps.setUseGeo ( m_Geo );
sps.setUseMMVD ( m_MMVD );
sps.setFpelMmvdEnabledFlag (( m_MMVD ) ? m_allowDisFracMMVD : false);
- sps.setBdofControlPresentFlag(m_BIO);
- sps.setDmvrControlPresentFlag(m_DMVR);
- sps.setProfControlPresentFlag(m_PROF);
+ sps.setBdofControlPresentInPhFlag(m_BIO);
+ sps.setDmvrControlPresentInPhFlag(m_DMVR);
+ sps.setProfControlPresentInPhFlag(m_PROF);
sps.setAffineAmvrEnabledFlag ( m_AffineAmvr );
sps.setUseDMVR ( m_DMVR );
sps.setUseColorTrans(m_useColorTrans);
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 15fbdccd7d9ca1653d92b4bc270e3aa8e1295576..c8f6c8ac412d3a44656af8b0185498b7f00dc574 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -1184,13 +1184,13 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
WRITE_FLAG( pcSPS->getBDOFEnabledFlag() ? 1 : 0, "sps_bdof_enabled_flag" );
if (pcSPS->getBDOFEnabledFlag())
{
- WRITE_FLAG(pcSPS->getBdofControlPresentFlag() ? 1 : 0, "sps_bdof_pic_present_flag");
+ WRITE_FLAG(pcSPS->getBdofControlPresentInPhFlag() ? 1 : 0, "sps_bdof_control_present_in_ph_flag");
}
WRITE_FLAG( pcSPS->getUseSMVD() ? 1 : 0, "sps_smvd_enabled_flag" );
WRITE_FLAG( pcSPS->getUseDMVR() ? 1 : 0, "sps_dmvr_enabled_flag" );
if (pcSPS->getUseDMVR())
{
- WRITE_FLAG(pcSPS->getDmvrControlPresentFlag() ? 1 : 0, "sps_dmvr_pic_present_flag");
+ WRITE_FLAG(pcSPS->getDmvrControlPresentInPhFlag() ? 1 : 0, "sps_dmvr_control_present_in_ph_flag");
}
WRITE_FLAG(pcSPS->getUseMMVD() ? 1 : 0, "sps_mmvd_enabled_flag");
if (pcSPS->getUseMMVD())
@@ -1211,7 +1211,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
WRITE_FLAG( pcSPS->getUsePROF() ? 1 : 0, "sps_affine_prof_enabled_flag" );
if (pcSPS->getUsePROF())
{
- WRITE_FLAG(pcSPS->getProfControlPresentFlag() ? 1 : 0, "sps_prof_pic_present_flag" );
+ WRITE_FLAG(pcSPS->getProfControlPresentInPhFlag() ? 1 : 0, "sps_prof_control_present_in_ph_flag" );
}
}
@@ -2090,7 +2090,7 @@ WRITE_FLAG(picHeader->getGdrOrIrapPicFlag(), "gdr_or_irap_pic_flag");
#endif
// picture level BDOF disable flags
- if (sps->getBdofControlPresentFlag() && (!pps->getRplInfoInPhFlag() || picHeader->getRPL(1)->getNumRefEntries() > 0))
+ if (sps->getBdofControlPresentInPhFlag() && (!pps->getRplInfoInPhFlag() || picHeader->getRPL(1)->getNumRefEntries() > 0))
{
WRITE_FLAG(picHeader->getDisBdofFlag(), "ph_disable_bdof_flag");
}
@@ -2100,7 +2100,7 @@ WRITE_FLAG(picHeader->getGdrOrIrapPicFlag(), "gdr_or_irap_pic_flag");
}
// picture level DMVR disable flags
- if (sps->getDmvrControlPresentFlag() && (!pps->getRplInfoInPhFlag() || picHeader->getRPL(1)->getNumRefEntries() > 0))
+ if (sps->getDmvrControlPresentInPhFlag() && (!pps->getRplInfoInPhFlag() || picHeader->getRPL(1)->getNumRefEntries() > 0))
{
WRITE_FLAG(picHeader->getDisDmvrFlag(), "ph_disable_dmvr_flag");
}
@@ -2110,7 +2110,7 @@ WRITE_FLAG(picHeader->getGdrOrIrapPicFlag(), "gdr_or_irap_pic_flag");
}
// picture level PROF disable flags
- if (sps->getProfControlPresentFlag())
+ if (sps->getProfControlPresentInPhFlag())
{
WRITE_FLAG(picHeader->getDisProfFlag(), "ph_disable_prof_flag");
}