diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index 0586c6cbd612407c52cf9bf40056eeab0a49befe..21deb722ac2c48a1d64a2ee331c2cd61912a4375 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -297,7 +297,7 @@ void EncApp::xInitLibCfg()
m_cEncLib.setSingleLayerConstraintFlag(m_singleLayerConstraintFlag);
#endif
m_cEncLib.setAllLayersIndependentConstraintFlag(m_allLayersIndependentConstraintFlag);
- m_cEncLib.setNoQpDeltaConstraintFlag(m_bNoQpDeltaConstraintFlag);
+ m_cEncLib.setNoQpDeltaConstraintFlag(m_noQpDeltaConstraintFlag);
m_cEncLib.setNoTrailConstraintFlag(m_noTrailConstraintFlag);
CHECK(m_noTrailConstraintFlag && m_iIntraPeriod != 1, "TRAIL shall be deactivated when m_noTrailConstraintFlag is equal to 1");
@@ -333,8 +333,8 @@ void EncApp::xInitLibCfg()
CHECK(m_noMttConstraintFlag && (m_uiMaxMTTHierarchyDepth || m_uiMaxMTTHierarchyDepthI || m_uiMaxMTTHierarchyDepthIChroma), "Mtt shall be deactivated when m_bNoMttConstraintFlag is equal to 1");
#endif
- m_cEncLib.setNoQtbttDualTreeIntraConstraintFlag(m_bNoQtbttDualTreeIntraConstraintFlag);
- CHECK(m_bNoQtbttDualTreeIntraConstraintFlag && m_dualTree, "Dual tree shall be deactivated when m_bNoQtbttDualTreeIntraConstraintFlag is equal to 1");
+ m_cEncLib.setNoQtbttDualTreeIntraConstraintFlag(m_noQtbttDualTreeIntraConstraintFlag);
+ CHECK(m_noQtbttDualTreeIntraConstraintFlag && m_dualTree, "Dual tree shall be deactivated when m_bNoQtbttDualTreeIntraConstraintFlag is equal to 1");
#if JVET_S0066_GCI
m_cEncLib.setMaxLog2CtuSizeConstraintIdc(m_maxLog2CtuSizeConstraintIdc);
@@ -344,11 +344,11 @@ void EncApp::xInitLibCfg()
m_cEncLib.setNoPartitionConstraintsOverrideConstraintFlag(m_noPartitionConstraintsOverrideConstraintFlag);
CHECK(m_noPartitionConstraintsOverrideConstraintFlag && m_SplitConsOverrideEnabledFlag, "Partition override shall be deactivated when m_noPartitionConstraintsOverrideConstraintFlag is equal to 1");
- m_cEncLib.setNoSaoConstraintFlag(m_bNoSaoConstraintFlag);
- CHECK(m_bNoSaoConstraintFlag && m_bUseSAO, "SAO shall be deactivated when m_bNoSaoConstraintFlag is equal to 1");
+ m_cEncLib.setNoSaoConstraintFlag(m_noSaoConstraintFlag);
+ CHECK(m_noSaoConstraintFlag && m_bUseSAO, "SAO shall be deactivated when m_bNoSaoConstraintFlag is equal to 1");
- m_cEncLib.setNoAlfConstraintFlag(m_bNoAlfConstraintFlag);
- CHECK(m_bNoAlfConstraintFlag && m_alf, "ALF shall be deactivated when m_bNoAlfConstraintFlag is equal to 1");
+ m_cEncLib.setNoAlfConstraintFlag(m_noAlfConstraintFlag);
+ CHECK(m_noAlfConstraintFlag && m_alf, "ALF shall be deactivated when m_bNoAlfConstraintFlag is equal to 1");
m_cEncLib.setNoCCAlfConstraintFlag(m_noCCAlfConstraintFlag);
CHECK(m_noCCAlfConstraintFlag && m_ccalf, "CCALF shall be deactivated when m_noCCAlfConstraintFlag is equal to 1");
@@ -358,51 +358,51 @@ void EncApp::xInitLibCfg()
CHECK(m_noWeightedPredictionConstraintFlag && (m_useWeightedPred || m_useWeightedBiPred), "Weighted Prediction shall be deactivated when m_bNoWeightedPredictionConstraintFlag is equal to 1");
#endif
- m_cEncLib.setNoRefWraparoundConstraintFlag(m_bNoRefWraparoundConstraintFlag);
- CHECK(m_bNoRefWraparoundConstraintFlag && m_wrapAround, "Wrap around shall be deactivated when m_bNoRefWraparoundConstraintFlag is equal to 1");
+ m_cEncLib.setNoRefWraparoundConstraintFlag(m_noRefWraparoundConstraintFlag);
+ CHECK(m_noRefWraparoundConstraintFlag && m_wrapAround, "Wrap around shall be deactivated when m_bNoRefWraparoundConstraintFlag is equal to 1");
- m_cEncLib.setNoTemporalMvpConstraintFlag(m_bNoTemporalMvpConstraintFlag);
- CHECK(m_bNoTemporalMvpConstraintFlag && m_TMVPModeId, "Temporal MVP shall be deactivated when m_bNoTemporalMvpConstraintFlag is equal to 1");
+ m_cEncLib.setNoTemporalMvpConstraintFlag(m_noTemporalMvpConstraintFlag);
+ CHECK(m_noTemporalMvpConstraintFlag && m_TMVPModeId, "Temporal MVP shall be deactivated when m_bNoTemporalMvpConstraintFlag is equal to 1");
- m_cEncLib.setNoSbtmvpConstraintFlag(m_bNoSbtmvpConstraintFlag);
- CHECK(m_bNoSbtmvpConstraintFlag && m_sbTmvpEnableFlag,
+ m_cEncLib.setNoSbtmvpConstraintFlag(m_noSbtmvpConstraintFlag);
+ CHECK(m_noSbtmvpConstraintFlag && m_sbTmvpEnableFlag,
"SbTMVP shall be deactivated when m_bNoSbtmvpConstraintFlag is equal to 1");
- m_cEncLib.setNoAmvrConstraintFlag(m_bNoAmvrConstraintFlag);
- CHECK(m_bNoAmvrConstraintFlag && (m_ImvMode != IMV_OFF || m_AffineAmvr), "AMVR shall be deactivated when m_bNoAmvrConstraintFlag is equal to 1");
+ m_cEncLib.setNoAmvrConstraintFlag(m_noAmvrConstraintFlag);
+ CHECK(m_noAmvrConstraintFlag && (m_ImvMode != IMV_OFF || m_AffineAmvr), "AMVR shall be deactivated when m_bNoAmvrConstraintFlag is equal to 1");
- m_cEncLib.setNoBdofConstraintFlag(m_bNoBdofConstraintFlag);
- CHECK(m_bNoBdofConstraintFlag && m_BIO, "BIO shall be deactivated when m_bNoBdofConstraintFlag is equal to 1");
+ m_cEncLib.setNoBdofConstraintFlag(m_noBdofConstraintFlag);
+ CHECK(m_noBdofConstraintFlag && m_BIO, "BIO shall be deactivated when m_bNoBdofConstraintFlag is equal to 1");
m_cEncLib.setNoDmvrConstraintFlag(m_noDmvrConstraintFlag);
CHECK(m_noDmvrConstraintFlag && m_DMVR, "DMVR shall be deactivated when m_noDmvrConstraintFlag is equal to 1");
- m_cEncLib.setNoCclmConstraintFlag(m_bNoCclmConstraintFlag);
- CHECK(m_bNoCclmConstraintFlag && m_LMChroma, "CCLM shall be deactivated when m_bNoCclmConstraintFlag is equal to 1");
+ m_cEncLib.setNoCclmConstraintFlag(m_noCclmConstraintFlag);
+ CHECK(m_noCclmConstraintFlag && m_LMChroma, "CCLM shall be deactivated when m_bNoCclmConstraintFlag is equal to 1");
- m_cEncLib.setNoMtsConstraintFlag(m_bNoMtsConstraintFlag);
- CHECK(m_bNoMtsConstraintFlag && (m_MTS || m_MTSImplicit), "MTS shall be deactivated when m_bNoMtsConstraintFlag is equal to 1");
+ m_cEncLib.setNoMtsConstraintFlag(m_noMtsConstraintFlag);
+ CHECK(m_noMtsConstraintFlag && (m_MTS || m_MTSImplicit), "MTS shall be deactivated when m_bNoMtsConstraintFlag is equal to 1");
m_cEncLib.setNoSbtConstraintFlag(m_noSbtConstraintFlag);
CHECK(m_noSbtConstraintFlag && m_SBT, "SBT shall be deactivated when mm_noSbtConstraintFlag_nonPackedConstraintFlag is equal to 1");
- m_cEncLib.setNoAffineMotionConstraintFlag(m_bNoAffineMotionConstraintFlag);
- CHECK(m_bNoAffineMotionConstraintFlag && m_Affine, "Affine shall be deactivated when m_bNoAffineMotionConstraintFlag is equal to 1");
+ m_cEncLib.setNoAffineMotionConstraintFlag(m_noAffineMotionConstraintFlag);
+ CHECK(m_noAffineMotionConstraintFlag && m_Affine, "Affine shall be deactivated when m_bNoAffineMotionConstraintFlag is equal to 1");
- m_cEncLib.setNoBcwConstraintFlag(m_bNoBcwConstraintFlag);
- CHECK(m_bNoBcwConstraintFlag && m_bcw, "BCW shall be deactivated when m_bNoBcwConstraintFlag is equal to 1");
+ m_cEncLib.setNoBcwConstraintFlag(m_noBcwConstraintFlag);
+ CHECK(m_noBcwConstraintFlag && m_bcw, "BCW shall be deactivated when m_bNoBcwConstraintFlag is equal to 1");
m_cEncLib.setNoIbcConstraintFlag(m_noIbcConstraintFlag);
CHECK(m_noIbcConstraintFlag && m_IBCMode, "IBC shall be deactivated when m_noIbcConstraintFlag is equal to 1");
- m_cEncLib.setNoCiipConstraintFlag(m_bNoCiipConstraintFlag);
- CHECK(m_bNoCiipConstraintFlag && m_ciip, "CIIP shall be deactivated when m_bNoCiipConstraintFlag is equal to 1");
+ m_cEncLib.setNoCiipConstraintFlag(m_noCiipConstraintFlag);
+ CHECK(m_noCiipConstraintFlag && m_ciip, "CIIP shall be deactivated when m_bNoCiipConstraintFlag is equal to 1");
m_cEncLib.setNoGeoConstraintFlag(m_noGeoConstraintFlag);
CHECK(m_noGeoConstraintFlag && m_Geo, "GEO shall be deactivated when m_noGeoConstraintFlag is equal to 1");
- m_cEncLib.setNoLadfConstraintFlag(m_bNoLadfConstraintFlag);
- CHECK(m_bNoLadfConstraintFlag && m_LadfEnabed, "LADF shall be deactivated when m_bNoLadfConstraintFlag is equal to 1");
+ m_cEncLib.setNoLadfConstraintFlag(m_noLadfConstraintFlag);
+ CHECK(m_noLadfConstraintFlag && m_LadfEnabed, "LADF shall be deactivated when m_bNoLadfConstraintFlag is equal to 1");
m_cEncLib.setNoTransformSkipConstraintFlag(m_noTransformSkipConstraintFlag);
CHECK(m_noTransformSkipConstraintFlag && m_useTransformSkip, "Transform skip shall be deactivated when m_noTransformSkipConstraintFlag is equal to 1");
@@ -418,11 +418,11 @@ void EncApp::xInitLibCfg()
m_cEncLib.setNoJointCbCrConstraintFlag(m_noJointCbCrConstraintFlag);
CHECK(m_noJointCbCrConstraintFlag && m_JointCbCrMode, "JCCR shall be deactivated when m_noJointCbCrConstraintFlag is equal to 1");
- m_cEncLib.setNoDepQuantConstraintFlag(m_bNoDepQuantConstraintFlag);
- CHECK(m_bNoDepQuantConstraintFlag && m_depQuantEnabledFlag, "DQ shall be deactivated when m_bNoDepQuantConstraintFlag is equal to 1");
+ m_cEncLib.setNoDepQuantConstraintFlag(m_noDepQuantConstraintFlag);
+ CHECK(m_noDepQuantConstraintFlag && m_depQuantEnabledFlag, "DQ shall be deactivated when m_bNoDepQuantConstraintFlag is equal to 1");
- m_cEncLib.setNoSignDataHidingConstraintFlag(m_bNoSignDataHidingConstraintFlag);
- CHECK(m_bNoSignDataHidingConstraintFlag && m_signDataHidingEnabledFlag, "SDH shall be deactivated when m_bNoSignDataHidingConstraintFlag is equal to 1");
+ m_cEncLib.setNoSignDataHidingConstraintFlag(m_noSignDataHidingConstraintFlag);
+ CHECK(m_noSignDataHidingConstraintFlag && m_signDataHidingEnabledFlag, "SDH shall be deactivated when m_bNoSignDataHidingConstraintFlag is equal to 1");
m_cEncLib.setNoApsConstraintFlag(m_noApsConstraintFlag);
CHECK(m_noApsConstraintFlag && (m_lmcsEnabled || (m_useScalingListId != SCALING_LIST_OFF)), "LMCS and explict scaling list shall be deactivated when m_noApsConstraintFlag is equal to 1");
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index a20f4d4522d2af9220a23cf2180245dc6f81ef49..d64932d2c098fef271da68813b9bc8f66534244c 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -850,13 +850,13 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
#if JVET_S0058_GCI
("MttConstraintFlag", m_noMttConstraintFlag, false, "Indicate that Mtt is deactivated")
#endif
- ("NoQtbttDualTreeIntraConstraintFlag", m_bNoQtbttDualTreeIntraConstraintFlag, false, "Indicate that Qtbtt DualTree Intra is deactivated")
+ ("NoQtbttDualTreeIntraConstraintFlag", m_noQtbttDualTreeIntraConstraintFlag, false, "Indicate that Qtbtt DualTree Intra is deactivated")
("NoPaletteConstraintFlag", m_noPaletteConstraintFlag, false, "Indicate that PLT is deactivated")
("NoIbcConstraintFlag", m_noIbcConstraintFlag, false, "Indicate that IBC is deactivated")
("NoIspConstraintFlag", m_noIspConstraintFlag, false, "Indicate that ISP is deactivated")
("NoMrlConstraintFlag", m_noMrlConstraintFlag, false, "Indicate that MRL is deactivated")
("NoMipConstraintFlag", m_noMipConstraintFlag, false, "Indicate that MIP is deactivated")
- ("NoCclmConstraintFlag", m_bNoCclmConstraintFlag, false, "Indicate that CCLM is deactivated")
+ ("NoCclmConstraintFlag", m_noCclmConstraintFlag, false, "Indicate that CCLM is deactivated")
#if JVET_Q0114_ASPECT5_GCI_FLAG
("NoRprConstraintFlag", m_noRprConstraintFlag, false, "Indicate that reference picture resampling is deactivated")
#endif
@@ -864,25 +864,25 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
#if JVET_S0058_GCI
("WeightedPredictionConstraintFlag", m_noWeightedPredictionConstraintFlag, false, "Indicate that Weighted Prediction is deactivated")
#endif
- ("NoRefWraparoundConstraintFlag", m_bNoRefWraparoundConstraintFlag, false, "Indicate that Reference Wraparound is deactivated")
- ("NoTemporalMvpConstraintFlag", m_bNoTemporalMvpConstraintFlag, false, "Indicate that temporal MVP is deactivated")
- ("NoSbtmvpConstraintFlag", m_bNoSbtmvpConstraintFlag, false, "Indicate that SbTMVP is deactivated")
- ("NoAmvrConstraintFlag", m_bNoAmvrConstraintFlag, false, "Indicate that AMVR is deactivated")
+ ("NoRefWraparoundConstraintFlag", m_noRefWraparoundConstraintFlag, false, "Indicate that Reference Wraparound is deactivated")
+ ("NoTemporalMvpConstraintFlag", m_noTemporalMvpConstraintFlag, false, "Indicate that temporal MVP is deactivated")
+ ("NoSbtmvpConstraintFlag", m_noSbtmvpConstraintFlag, false, "Indicate that SbTMVP is deactivated")
+ ("NoAmvrConstraintFlag", m_noAmvrConstraintFlag, false, "Indicate that AMVR is deactivated")
("NoSmvdConstraintFlag", m_noSmvdConstraintFlag, false, "Indicate that SMVD is deactivated")
- ("NoBdofConstraintFlag", m_bNoBdofConstraintFlag, false, "Indicate that BIO is deactivated")
+ ("NoBdofConstraintFlag", m_noBdofConstraintFlag, false, "Indicate that BIO is deactivated")
("NoDmvrConstraintFlag", m_noDmvrConstraintFlag, false, "Indicate that DMVR is deactivated")
("NoMmvdConstraintFlag", m_noMmvdConstraintFlag, false, "Indicate that MMVD is deactivated")
- ("NoAffineMotionConstraintFlag", m_bNoAffineMotionConstraintFlag, false, "Indicate that Affine is deactivated")
+ ("NoAffineMotionConstraintFlag", m_noAffineMotionConstraintFlag, false, "Indicate that Affine is deactivated")
("NoProfConstraintFlag", m_noProfConstraintFlag, false, "Indicate that PROF is deactivated")
- ("NoBcwConstraintFlag", m_bNoBcwConstraintFlag, false, "Indicate that BCW is deactivated")
- ("NoCiipConstraintFlag", m_bNoCiipConstraintFlag, false, "Indicate that CIIP is deactivated")
+ ("NoBcwConstraintFlag", m_noBcwConstraintFlag, false, "Indicate that BCW is deactivated")
+ ("NoCiipConstraintFlag", m_noCiipConstraintFlag, false, "Indicate that CIIP is deactivated")
("NoGpmConstraintFlag", m_noGeoConstraintFlag, false, "Indicate that GPM is deactivated")
("NoTransformSkipConstraintFlag", m_noTransformSkipConstraintFlag, false, "Indicate that Transform Skip is deactivated")
#if JVET_S0066_GCI
("NoLumaTransformSize64ConstraintFlag", m_noLumaTransformSize64ConstraintFlag, false, "Indicate that Luma Transform Size 64 is deactivated")
#endif
("NoBDPCMConstraintFlag", m_noBDPCMConstraintFlag, false, "Indicate that BDPCM is deactivated")
- ("NoMtsConstraintFlag", m_bNoMtsConstraintFlag, false, "Indicate that MTS is deactivated")
+ ("NoMtsConstraintFlag", m_noMtsConstraintFlag, false, "Indicate that MTS is deactivated")
("NoLfnstConstraintFlag", m_noLfnstConstraintFlag, false, "Indicate that LFNST is deactivated")
("NoJointCbCrConstraintFlag", m_noJointCbCrConstraintFlag, false, "Indicate that JCCR is deactivated")
("NoSbtConstraintFlag", m_noSbtConstraintFlag, false, "Indicate that SBT is deactivated")
@@ -890,14 +890,14 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
#if JVET_S0050_GCI
("NoExplicitScaleListConstraintFlag", m_noExplicitScaleListConstraintFlag, false, "Indicate that explicit scaling list is deactivated")
#endif
- ("NoDepQuantConstraintFlag", m_bNoDepQuantConstraintFlag, false, "Indicate that DQ is deactivated")
- ("NoSignDataHidingConstraintFlag", m_bNoSignDataHidingConstraintFlag, false, "Indicate that SDH is deactivated")
- ("NoQpDeltaConstraintFlag", m_bNoQpDeltaConstraintFlag, false, "Indicate that QPdelta is deactivated")
- ("NoSaoConstraintFlag", m_bNoSaoConstraintFlag, false, "Indicate that SAO is deactivated")
- ("NoAlfConstraintFlag", m_bNoAlfConstraintFlag, false, "Indicate that ALF is deactivated")
+ ("NoDepQuantConstraintFlag", m_noDepQuantConstraintFlag, false, "Indicate that DQ is deactivated")
+ ("NoSignDataHidingConstraintFlag", m_noSignDataHidingConstraintFlag, false, "Indicate that SDH is deactivated")
+ ("NoQpDeltaConstraintFlag", m_noQpDeltaConstraintFlag, false, "Indicate that QPdelta is deactivated")
+ ("NoSaoConstraintFlag", m_noSaoConstraintFlag, false, "Indicate that SAO is deactivated")
+ ("NoAlfConstraintFlag", m_noAlfConstraintFlag, false, "Indicate that ALF is deactivated")
("NoCCAlfConstraintFlag", m_noCCAlfConstraintFlag, false, "Indicate that CCALF is deactivated")
("NoLmcsConstraintFlag", m_noLmcsConstraintFlag, false, "Indicate that LMCS is deactivated")
- ("NoLadfConstraintFlag", m_bNoLadfConstraintFlag, false, "Indicate that LADF is deactivated")
+ ("NoLadfConstraintFlag", m_noLadfConstraintFlag, false, "Indicate that LADF is deactivated")
#if JVET_S0050_GCI
("NoVirtualBoundaryConstraintFlag", m_noVirtualBoundaryConstraintFlag, false, "Indicate that virtual boundary is deactivated")
#endif
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index 75b8aa99f4319f9f47de7974f84598219abdb791..a5653b2f3e02a9112e36ee519a81f7318883a80f 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -158,41 +158,41 @@ protected:
#if JVET_S0058_GCI
bool m_noMttConstraintFlag;
#endif
- bool m_bNoQtbttDualTreeIntraConstraintFlag;
+ bool m_noQtbttDualTreeIntraConstraintFlag;
#if JVET_S0066_GCI
int m_maxLog2CtuSizeConstraintIdc;
#endif
bool m_noPartitionConstraintsOverrideConstraintFlag;
- bool m_bNoSaoConstraintFlag;
- bool m_bNoAlfConstraintFlag;
+ bool m_noSaoConstraintFlag;
+ bool m_noAlfConstraintFlag;
bool m_noCCAlfConstraintFlag;
#if JVET_S0058_GCI
bool m_noWeightedPredictionConstraintFlag;
#endif
- bool m_bNoRefWraparoundConstraintFlag;
- bool m_bNoTemporalMvpConstraintFlag;
- bool m_bNoSbtmvpConstraintFlag;
- bool m_bNoAmvrConstraintFlag;
- bool m_bNoBdofConstraintFlag;
+ bool m_noRefWraparoundConstraintFlag;
+ bool m_noTemporalMvpConstraintFlag;
+ bool m_noSbtmvpConstraintFlag;
+ bool m_noAmvrConstraintFlag;
+ bool m_noBdofConstraintFlag;
bool m_noDmvrConstraintFlag;
- bool m_bNoCclmConstraintFlag;
- bool m_bNoMtsConstraintFlag;
+ bool m_noCclmConstraintFlag;
+ bool m_noMtsConstraintFlag;
bool m_noSbtConstraintFlag;
- bool m_bNoAffineMotionConstraintFlag;
- bool m_bNoBcwConstraintFlag;
+ bool m_noAffineMotionConstraintFlag;
+ bool m_noBcwConstraintFlag;
bool m_noIbcConstraintFlag;
- bool m_bNoCiipConstraintFlag;
+ bool m_noCiipConstraintFlag;
bool m_noGeoConstraintFlag;
- bool m_bNoLadfConstraintFlag;
+ bool m_noLadfConstraintFlag;
bool m_noTransformSkipConstraintFlag;
#if JVET_S0066_GCI
bool m_noLumaTransformSize64ConstraintFlag;
#endif
bool m_noBDPCMConstraintFlag;
bool m_noJointCbCrConstraintFlag;
- bool m_bNoQpDeltaConstraintFlag;
- bool m_bNoDepQuantConstraintFlag;
- bool m_bNoSignDataHidingConstraintFlag;
+ bool m_noQpDeltaConstraintFlag;
+ bool m_noDepQuantConstraintFlag;
+ bool m_noSignDataHidingConstraintFlag;
bool m_noTrailConstraintFlag;
bool m_noStsaConstraintFlag;
bool m_noRaslConstraintFlag;
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index ea4fbf65365bf710391a9ea1912b9b54d6804712..2093b7c95058844a62f29310f809184771c616be 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -4704,7 +4704,7 @@ void HLSyntaxReader::parseConstraintInfo(ConstraintInfo *cinfo)
}
#endif
#if JVET_S0058_GCI
- READ_FLAG(symbol, "gci_no_Mtt_constraint_flag" ); cinfo->setNoMttConstraintFlag(symbol > 0 ? true : false);
+ READ_FLAG(symbol, "gci_no_mtt_constraint_flag" ); cinfo->setNoMttConstraintFlag(symbol > 0 ? true : false);
#endif
READ_FLAG(symbol, "no_qtbtt_dual_tree_intra_constraint_flag" ); cinfo->setNoQtbttDualTreeIntraConstraintFlag(symbol > 0 ? true : false);
#if !JVET_S0050_GCI
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index e206643d209bbf9830163c779c65cd5c688f82aa..896610340bcae863479338852c078daf126142d4 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -201,43 +201,43 @@ protected:
bool m_noVirtualBoundaryConstraintFlag;
#endif
#if JVET_S0058_GCI
- bool m_bNoMttConstraintFlag;
+ bool m_noMttConstraintFlag;
#endif
- bool m_bNoQtbttDualTreeIntraConstraintFlag;
+ bool m_noQtbttDualTreeIntraConstraintFlag;
#if JVET_S0066_GCI
int m_maxLog2CtuSizeConstraintIdc;
#endif
bool m_noPartitionConstraintsOverrideConstraintFlag;
- bool m_bNoSaoConstraintFlag;
- bool m_bNoAlfConstraintFlag;
+ bool m_noSaoConstraintFlag;
+ bool m_noAlfConstraintFlag;
bool m_noCCAlfConstraintFlag;
#if JVET_S0058_GCI
- bool m_bNoWeightedPredictionConstraintFlag;
+ bool m_noWeightedPredictionConstraintFlag;
#endif
- bool m_bNoRefWraparoundConstraintFlag;
- bool m_bNoTemporalMvpConstraintFlag;
- bool m_bNoSbtmvpConstraintFlag;
- bool m_bNoAmvrConstraintFlag;
- bool m_bNoBdofConstraintFlag;
+ bool m_noRefWraparoundConstraintFlag;
+ bool m_noTemporalMvpConstraintFlag;
+ bool m_noSbtmvpConstraintFlag;
+ bool m_noAmvrConstraintFlag;
+ bool m_noBdofConstraintFlag;
bool m_noDmvrConstraintFlag;
- bool m_bNoCclmConstraintFlag;
- bool m_bNoMtsConstraintFlag;
+ bool m_noCclmConstraintFlag;
+ bool m_noMtsConstraintFlag;
bool m_noSbtConstraintFlag;
- bool m_bNoAffineMotionConstraintFlag;
- bool m_bNoBcwConstraintFlag;
+ bool m_noAffineMotionConstraintFlag;
+ bool m_noBcwConstraintFlag;
bool m_noIbcConstraintFlag;
- bool m_bNoCiipConstraintFlag;
+ bool m_noCiipConstraintFlag;
bool m_noGeoConstraintFlag;
- bool m_bNoLadfConstraintFlag;
+ bool m_noLadfConstraintFlag;
bool m_noTransformSkipConstraintFlag;
#if JVET_S0066_GCI
bool m_noLumaTransformSize64ConstraintFlag;
#endif
bool m_noBDPCMConstraintFlag;
bool m_noJointCbCrConstraintFlag;
- bool m_bNoQpDeltaConstraintFlag;
- bool m_bNoDepQuantConstraintFlag;
- bool m_bNoSignDataHidingConstraintFlag;
+ bool m_noQpDeltaConstraintFlag;
+ bool m_noDepQuantConstraintFlag;
+ bool m_noSignDataHidingConstraintFlag;
bool m_noTrailConstraintFlag;
bool m_noStsaConstraintFlag;
bool m_noRaslConstraintFlag;
@@ -812,7 +812,7 @@ public:
void setOnePictureOnlyConstraintFlag(bool b) { m_onePictureOnlyConstraintFlag=b; }
bool getIntraOnlyConstraintFlag() const { return m_bIntraOnlyConstraintFlag; }
- void setIntraOnlyConstraintFlag(bool bVal) { m_bIntraOnlyConstraintFlag = bVal; }
+ void setIntraOnlyConstraintFlag(bool val) { m_bIntraOnlyConstraintFlag = val; }
uint32_t getMaxBitDepthConstraintIdc() const { return m_maxBitDepthConstraintIdc; }
void setMaxBitDepthConstraintIdc(uint32_t u) { m_maxBitDepthConstraintIdc = u; }
int getMaxChromaFormatConstraintIdc() const { return m_maxChromaFormatConstraintIdc; }
@@ -823,120 +823,120 @@ public:
#endif
#if !JVET_S0138_GCI_PTL
bool getSingleLayerConstraintFlag() const { return m_singleLayerConstraintFlag; }
- void setSingleLayerConstraintFlag(bool bVal) { m_singleLayerConstraintFlag = bVal; }
+ void setSingleLayerConstraintFlag(bool val) { m_singleLayerConstraintFlag = val; }
#endif
bool getAllLayersIndependentConstraintFlag() const { return m_allLayersIndependentConstraintFlag; }
- void setAllLayersIndependentConstraintFlag(bool bVal) { m_allLayersIndependentConstraintFlag = bVal; }
+ void setAllLayersIndependentConstraintFlag(bool val) { m_allLayersIndependentConstraintFlag = val; }
bool getNoMrlConstraintFlag() const { return m_noMrlConstraintFlag; }
- void setNoMrlConstraintFlag(bool bVal) { m_noMrlConstraintFlag = bVal; }
+ void setNoMrlConstraintFlag(bool val) { m_noMrlConstraintFlag = val; }
bool getNoIspConstraintFlag() const { return m_noIspConstraintFlag; }
- void setNoIspConstraintFlag(bool bVal) { m_noIspConstraintFlag = bVal; }
+ void setNoIspConstraintFlag(bool val) { m_noIspConstraintFlag = val; }
bool getNoMipConstraintFlag() const { return m_noMipConstraintFlag; }
- void setNoMipConstraintFlag(bool bVal) { m_noMipConstraintFlag = bVal; }
+ void setNoMipConstraintFlag(bool val) { m_noMipConstraintFlag = val; }
bool getNoLfnstConstraintFlag() const { return m_noLfnstConstraintFlag; }
- void setNoLfnstConstraintFlag(bool bVal) { m_noLfnstConstraintFlag = bVal; }
+ void setNoLfnstConstraintFlag(bool val) { m_noLfnstConstraintFlag = val; }
bool getNoMmvdConstraintFlag() const { return m_noMmvdConstraintFlag; }
- void setNoMmvdConstraintFlag(bool bVal) { m_noMmvdConstraintFlag = bVal; }
+ void setNoMmvdConstraintFlag(bool val) { m_noMmvdConstraintFlag = val; }
bool getNoSmvdConstraintFlag() const { return m_noSmvdConstraintFlag; }
- void setNoSmvdConstraintFlag(bool bVal) { m_noSmvdConstraintFlag = bVal; }
+ void setNoSmvdConstraintFlag(bool val) { m_noSmvdConstraintFlag = val; }
bool getNoProfConstraintFlag() const { return m_noProfConstraintFlag; }
- void setNoProfConstraintFlag(bool bVal) { m_noProfConstraintFlag = bVal; }
+ void setNoProfConstraintFlag(bool val) { m_noProfConstraintFlag = val; }
bool getNoPaletteConstraintFlag() const { return m_noPaletteConstraintFlag; }
- void setNoPaletteConstraintFlag(bool bVal) { m_noPaletteConstraintFlag = bVal; }
+ void setNoPaletteConstraintFlag(bool val) { m_noPaletteConstraintFlag = val; }
bool getNoActConstraintFlag() const { return m_noActConstraintFlag; }
- void setNoActConstraintFlag(bool bVal) { m_noActConstraintFlag = bVal; }
+ void setNoActConstraintFlag(bool val) { m_noActConstraintFlag = val; }
bool getNoLmcsConstraintFlag() const { return m_noLmcsConstraintFlag; }
- void setNoLmcsConstraintFlag(bool bVal) { m_noLmcsConstraintFlag = bVal; }
+ void setNoLmcsConstraintFlag(bool val) { m_noLmcsConstraintFlag = val; }
#if JVET_S0050_GCI
bool getNoExplicitScaleListConstraintFlag() const { return m_noExplicitScaleListConstraintFlag; }
- void setNoExplicitScaleListConstraintFlag(bool bVal) { m_noExplicitScaleListConstraintFlag = bVal; }
+ void setNoExplicitScaleListConstraintFlag(bool val) { m_noExplicitScaleListConstraintFlag = val; }
bool getNoVirtualBoundaryConstraintFlag() const { return m_noVirtualBoundaryConstraintFlag; }
- void setNoVirtualBoundaryConstraintFlag(bool bVal) { m_noVirtualBoundaryConstraintFlag = bVal; }
+ void setNoVirtualBoundaryConstraintFlag(bool val) { m_noVirtualBoundaryConstraintFlag = val; }
#endif
#if JVET_S0058_GCI
- bool getNoMttConstraintFlag() const { return m_bNoMttConstraintFlag; }
- void setNoMttConstraintFlag(bool bVal) { m_bNoMttConstraintFlag = bVal; }
+ bool getNoMttConstraintFlag() const { return m_noMttConstraintFlag; }
+ void setNoMttConstraintFlag(bool val) { m_noMttConstraintFlag = val; }
#endif
- bool getNoQtbttDualTreeIntraConstraintFlag() const { return m_bNoQtbttDualTreeIntraConstraintFlag; }
- void setNoQtbttDualTreeIntraConstraintFlag(bool bVal) { m_bNoQtbttDualTreeIntraConstraintFlag = bVal; }
+ bool getNoQtbttDualTreeIntraConstraintFlag() const { return m_noQtbttDualTreeIntraConstraintFlag; }
+ void setNoQtbttDualTreeIntraConstraintFlag(bool val) { m_noQtbttDualTreeIntraConstraintFlag = val; }
#if JVET_S0066_GCI
int getMaxLog2CtuSizeConstraintIdc() const { return m_maxLog2CtuSizeConstraintIdc; }
void setMaxLog2CtuSizeConstraintIdc(int u) { m_maxLog2CtuSizeConstraintIdc = u; }
#endif
bool getNoPartitionConstraintsOverrideConstraintFlag() const { return m_noPartitionConstraintsOverrideConstraintFlag; }
- void setNoPartitionConstraintsOverrideConstraintFlag(bool bVal) { m_noPartitionConstraintsOverrideConstraintFlag = bVal; }
- bool getNoSaoConstraintFlag() const { return m_bNoSaoConstraintFlag; }
- void setNoSaoConstraintFlag(bool bVal) { m_bNoSaoConstraintFlag = bVal; }
- bool getNoAlfConstraintFlag() const { return m_bNoAlfConstraintFlag; }
- void setNoAlfConstraintFlag(bool bVal) { m_bNoAlfConstraintFlag = bVal; }
+ void setNoPartitionConstraintsOverrideConstraintFlag(bool val) { m_noPartitionConstraintsOverrideConstraintFlag = val; }
+ bool getNoSaoConstraintFlag() const { return m_noSaoConstraintFlag; }
+ void setNoSaoConstraintFlag(bool val) { m_noSaoConstraintFlag = val; }
+ bool getNoAlfConstraintFlag() const { return m_noAlfConstraintFlag; }
+ void setNoAlfConstraintFlag(bool val) { m_noAlfConstraintFlag = val; }
bool getNoCCAlfConstraintFlag() const { return m_noCCAlfConstraintFlag; }
- void setNoCCAlfConstraintFlag(bool bVal) { m_noCCAlfConstraintFlag = bVal; }
+ void setNoCCAlfConstraintFlag(bool val) { m_noCCAlfConstraintFlag = val; }
#if JVET_S0058_GCI
- bool getWeightedPredictionConstraintFlag() const { return m_bNoWeightedPredictionConstraintFlag; }
- void setNoWeightedPredictionConstraintFlag(bool bVal) { m_bNoWeightedPredictionConstraintFlag = bVal; }
-#endif
- bool getNoRefWraparoundConstraintFlag() const { return m_bNoRefWraparoundConstraintFlag; }
- void setNoRefWraparoundConstraintFlag(bool bVal) { m_bNoRefWraparoundConstraintFlag = bVal; }
- bool getNoTemporalMvpConstraintFlag() const { return m_bNoTemporalMvpConstraintFlag; }
- void setNoTemporalMvpConstraintFlag(bool bVal) { m_bNoTemporalMvpConstraintFlag = bVal; }
- bool getNoSbtmvpConstraintFlag() const { return m_bNoSbtmvpConstraintFlag; }
- void setNoSbtmvpConstraintFlag(bool bVal) { m_bNoSbtmvpConstraintFlag = bVal; }
- bool getNoAmvrConstraintFlag() const { return m_bNoAmvrConstraintFlag; }
- void setNoAmvrConstraintFlag(bool bVal) { m_bNoAmvrConstraintFlag = bVal; }
- bool getNoBdofConstraintFlag() const { return m_bNoBdofConstraintFlag; }
- void setNoBdofConstraintFlag(bool bVal) { m_bNoBdofConstraintFlag = bVal; }
+ bool getWeightedPredictionConstraintFlag() const { return m_noWeightedPredictionConstraintFlag; }
+ void setNoWeightedPredictionConstraintFlag(bool val) { m_noWeightedPredictionConstraintFlag = val; }
+#endif
+ bool getNoRefWraparoundConstraintFlag() const { return m_noRefWraparoundConstraintFlag; }
+ void setNoRefWraparoundConstraintFlag(bool val) { m_noRefWraparoundConstraintFlag = val; }
+ bool getNoTemporalMvpConstraintFlag() const { return m_noTemporalMvpConstraintFlag; }
+ void setNoTemporalMvpConstraintFlag(bool val) { m_noTemporalMvpConstraintFlag = val; }
+ bool getNoSbtmvpConstraintFlag() const { return m_noSbtmvpConstraintFlag; }
+ void setNoSbtmvpConstraintFlag(bool val) { m_noSbtmvpConstraintFlag = val; }
+ bool getNoAmvrConstraintFlag() const { return m_noAmvrConstraintFlag; }
+ void setNoAmvrConstraintFlag(bool val) { m_noAmvrConstraintFlag = val; }
+ bool getNoBdofConstraintFlag() const { return m_noBdofConstraintFlag; }
+ void setNoBdofConstraintFlag(bool val) { m_noBdofConstraintFlag = val; }
bool getNoDmvrConstraintFlag() const { return m_noDmvrConstraintFlag; }
- void setNoDmvrConstraintFlag(bool bVal) { m_noDmvrConstraintFlag = bVal; }
- bool getNoCclmConstraintFlag() const { return m_bNoCclmConstraintFlag; }
- void setNoCclmConstraintFlag(bool bVal) { m_bNoCclmConstraintFlag = bVal; }
- bool getNoMtsConstraintFlag() const { return m_bNoMtsConstraintFlag; }
- void setNoMtsConstraintFlag(bool bVal) { m_bNoMtsConstraintFlag = bVal; }
+ void setNoDmvrConstraintFlag(bool val) { m_noDmvrConstraintFlag = val; }
+ bool getNoCclmConstraintFlag() const { return m_noCclmConstraintFlag; }
+ void setNoCclmConstraintFlag(bool val) { m_noCclmConstraintFlag = val; }
+ bool getNoMtsConstraintFlag() const { return m_noMtsConstraintFlag; }
+ void setNoMtsConstraintFlag(bool val) { m_noMtsConstraintFlag = val; }
bool getNoSbtConstraintFlag() const { return m_noSbtConstraintFlag; }
- void setNoSbtConstraintFlag(bool bVal) { m_noSbtConstraintFlag = bVal; }
- bool getNoAffineMotionConstraintFlag() const { return m_bNoAffineMotionConstraintFlag; }
- void setNoAffineMotionConstraintFlag(bool bVal) { m_bNoAffineMotionConstraintFlag = bVal; }
- bool getNoBcwConstraintFlag() const { return m_bNoBcwConstraintFlag; }
- void setNoBcwConstraintFlag(bool bVal) { m_bNoBcwConstraintFlag = bVal; }
+ void setNoSbtConstraintFlag(bool val) { m_noSbtConstraintFlag = val; }
+ bool getNoAffineMotionConstraintFlag() const { return m_noAffineMotionConstraintFlag; }
+ void setNoAffineMotionConstraintFlag(bool val) { m_noAffineMotionConstraintFlag = val; }
+ bool getNoBcwConstraintFlag() const { return m_noBcwConstraintFlag; }
+ void setNoBcwConstraintFlag(bool val) { m_noBcwConstraintFlag = val; }
bool getNoIbcConstraintFlag() const { return m_noIbcConstraintFlag; }
- void setNoIbcConstraintFlag(bool bVal) { m_noIbcConstraintFlag = bVal; }
- bool getNoCiipConstraintFlag() const { return m_bNoCiipConstraintFlag; }
- void setNoCiipConstraintFlag(bool bVal) { m_bNoCiipConstraintFlag = bVal; }
+ void setNoIbcConstraintFlag(bool val) { m_noIbcConstraintFlag = val; }
+ bool getNoCiipConstraintFlag() const { return m_noCiipConstraintFlag; }
+ void setNoCiipConstraintFlag(bool val) { m_noCiipConstraintFlag = val; }
bool getNoGeoConstraintFlag() const { return m_noGeoConstraintFlag; }
- void setNoGeoConstraintFlag(bool bVal) { m_noGeoConstraintFlag = bVal; }
- bool getNoLadfConstraintFlag() const { return m_bNoLadfConstraintFlag; }
- void setNoLadfConstraintFlag(bool bVal) { m_bNoLadfConstraintFlag = bVal; }
+ void setNoGeoConstraintFlag(bool val) { m_noGeoConstraintFlag = val; }
+ bool getNoLadfConstraintFlag() const { return m_noLadfConstraintFlag; }
+ void setNoLadfConstraintFlag(bool val) { m_noLadfConstraintFlag = val; }
bool getNoTransformSkipConstraintFlag() const { return m_noTransformSkipConstraintFlag; }
- void setNoTransformSkipConstraintFlag(bool bVal) { m_noTransformSkipConstraintFlag = bVal; }
+ void setNoTransformSkipConstraintFlag(bool val) { m_noTransformSkipConstraintFlag = val; }
#if JVET_S0066_GCI
bool getNoLumaTransformSize64ConstraintFlag() const { return m_noLumaTransformSize64ConstraintFlag; }
- void setNoLumaTransformSize64ConstraintFlag(bool bVal) { m_noLumaTransformSize64ConstraintFlag = bVal; }
+ void setNoLumaTransformSize64ConstraintFlag(bool val) { m_noLumaTransformSize64ConstraintFlag = val; }
#endif
bool getNoBDPCMConstraintFlag() const { return m_noBDPCMConstraintFlag; }
- void setNoBDPCMConstraintFlag(bool bVal) { m_noBDPCMConstraintFlag = bVal; }
+ void setNoBDPCMConstraintFlag(bool val) { m_noBDPCMConstraintFlag = val; }
bool getNoJointCbCrConstraintFlag() const { return m_noJointCbCrConstraintFlag; }
- void setNoJointCbCrConstraintFlag(bool bVal) { m_noJointCbCrConstraintFlag = bVal; }
- bool getNoQpDeltaConstraintFlag() const { return m_bNoQpDeltaConstraintFlag; }
- void setNoQpDeltaConstraintFlag(bool bVal) { m_bNoQpDeltaConstraintFlag = bVal; }
- bool getNoDepQuantConstraintFlag() const { return m_bNoDepQuantConstraintFlag; }
- void setNoDepQuantConstraintFlag(bool bVal) { m_bNoDepQuantConstraintFlag = bVal; }
- bool getNoSignDataHidingConstraintFlag() const { return m_bNoSignDataHidingConstraintFlag; }
- void setNoSignDataHidingConstraintFlag(bool bVal) { m_bNoSignDataHidingConstraintFlag = bVal; }
+ void setNoJointCbCrConstraintFlag(bool val) { m_noJointCbCrConstraintFlag = val; }
+ bool getNoQpDeltaConstraintFlag() const { return m_noQpDeltaConstraintFlag; }
+ void setNoQpDeltaConstraintFlag(bool val) { m_noQpDeltaConstraintFlag = val; }
+ bool getNoDepQuantConstraintFlag() const { return m_noDepQuantConstraintFlag; }
+ void setNoDepQuantConstraintFlag(bool val) { m_noDepQuantConstraintFlag = val; }
+ bool getNoSignDataHidingConstraintFlag() const { return m_noSignDataHidingConstraintFlag; }
+ void setNoSignDataHidingConstraintFlag(bool val) { m_noSignDataHidingConstraintFlag = val; }
bool getNoTrailConstraintFlag() const { return m_noTrailConstraintFlag; }
- void setNoTrailConstraintFlag(bool bVal) { m_noTrailConstraintFlag = bVal; }
+ void setNoTrailConstraintFlag(bool val) { m_noTrailConstraintFlag = val; }
bool getNoStsaConstraintFlag() const { return m_noStsaConstraintFlag; }
- void setNoStsaConstraintFlag(bool bVal) { m_noStsaConstraintFlag = bVal; }
+ void setNoStsaConstraintFlag(bool val) { m_noStsaConstraintFlag = val; }
bool getNoRaslConstraintFlag() const { return m_noRaslConstraintFlag; }
- void setNoRaslConstraintFlag(bool bVal) { m_noRaslConstraintFlag = bVal; }
+ void setNoRaslConstraintFlag(bool val) { m_noRaslConstraintFlag = val; }
bool getNoRadlConstraintFlag() const { return m_noRadlConstraintFlag; }
- void setNoRadlConstraintFlag(bool bVal) { m_noRadlConstraintFlag = bVal; }
+ void setNoRadlConstraintFlag(bool val) { m_noRadlConstraintFlag = val; }
bool getNoIdrConstraintFlag() const { return m_noIdrConstraintFlag; }
- void setNoIdrConstraintFlag(bool bVal) { m_noIdrConstraintFlag = bVal; }
+ void setNoIdrConstraintFlag(bool val) { m_noIdrConstraintFlag = val; }
bool getNoCraConstraintFlag() const { return m_noCraConstraintFlag; }
- void setNoCraConstraintFlag(bool bVal) { m_noCraConstraintFlag = bVal; }
+ void setNoCraConstraintFlag(bool val) { m_noCraConstraintFlag = val; }
bool getNoGdrConstraintFlag() const { return m_noGdrConstraintFlag; }
- void setNoGdrConstraintFlag(bool bVal) { m_noGdrConstraintFlag = bVal; }
+ void setNoGdrConstraintFlag(bool val) { m_noGdrConstraintFlag = val; }
bool getNoApsConstraintFlag() const { return m_noApsConstraintFlag; }
- void setNoApsConstraintFlag(bool bVal) { m_noApsConstraintFlag = bVal; }
+ void setNoApsConstraintFlag(bool val) { m_noApsConstraintFlag = val; }
void setFrameRate ( int i ) { m_iFrameRate = i; }
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 08e579d53ab75e2751ed6d976ad294f4a62258f5..c8b7fefc1a60a60ddd41ed30f0c153d849d6b3a8 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -1164,37 +1164,37 @@ void EncLib::xInitSPS( SPS& sps )
cinfo->setNoVirtualBoundaryConstraintFlag(m_noVirtualBoundaryConstraintFlag);
#endif
#if JVET_S0058_GCI
- cinfo->setNoMttConstraintFlag(m_bNoMttConstraintFlag);
+ cinfo->setNoMttConstraintFlag(m_noMttConstraintFlag);
#endif
- cinfo->setNoQtbttDualTreeIntraConstraintFlag(m_bNoQtbttDualTreeIntraConstraintFlag);
+ cinfo->setNoQtbttDualTreeIntraConstraintFlag(m_noQtbttDualTreeIntraConstraintFlag);
cinfo->setNoPartitionConstraintsOverrideConstraintFlag(m_noPartitionConstraintsOverrideConstraintFlag);
- cinfo->setNoSaoConstraintFlag(m_bNoSaoConstraintFlag);
- cinfo->setNoAlfConstraintFlag(m_bNoAlfConstraintFlag);
+ cinfo->setNoSaoConstraintFlag(m_noSaoConstraintFlag);
+ cinfo->setNoAlfConstraintFlag(m_noAlfConstraintFlag);
cinfo->setNoCCAlfConstraintFlag(m_noCCAlfConstraintFlag);
#if JVET_S0058_GCI
- cinfo->setNoWeightedPredictionConstraintFlag(m_bNoWeightedPredictionConstraintFlag);
+ cinfo->setNoWeightedPredictionConstraintFlag(m_noWeightedPredictionConstraintFlag);
#endif
- cinfo->setNoRefWraparoundConstraintFlag(m_bNoRefWraparoundConstraintFlag);
- cinfo->setNoTemporalMvpConstraintFlag(m_bNoTemporalMvpConstraintFlag);
- cinfo->setNoSbtmvpConstraintFlag(m_bNoSbtmvpConstraintFlag);
- cinfo->setNoAmvrConstraintFlag(m_bNoAmvrConstraintFlag);
- cinfo->setNoBdofConstraintFlag(m_bNoBdofConstraintFlag);
+ cinfo->setNoRefWraparoundConstraintFlag(m_noRefWraparoundConstraintFlag);
+ cinfo->setNoTemporalMvpConstraintFlag(m_noTemporalMvpConstraintFlag);
+ cinfo->setNoSbtmvpConstraintFlag(m_noSbtmvpConstraintFlag);
+ cinfo->setNoAmvrConstraintFlag(m_noAmvrConstraintFlag);
+ cinfo->setNoBdofConstraintFlag(m_noBdofConstraintFlag);
cinfo->setNoDmvrConstraintFlag(m_noDmvrConstraintFlag);
- cinfo->setNoCclmConstraintFlag(m_bNoCclmConstraintFlag);
- cinfo->setNoMtsConstraintFlag(m_bNoMtsConstraintFlag);
+ cinfo->setNoCclmConstraintFlag(m_noCclmConstraintFlag);
+ cinfo->setNoMtsConstraintFlag(m_noMtsConstraintFlag);
cinfo->setNoSbtConstraintFlag(m_noSbtConstraintFlag);
- cinfo->setNoAffineMotionConstraintFlag(m_bNoAffineMotionConstraintFlag);
- cinfo->setNoBcwConstraintFlag(m_bNoBcwConstraintFlag);
+ cinfo->setNoAffineMotionConstraintFlag(m_noAffineMotionConstraintFlag);
+ cinfo->setNoBcwConstraintFlag(m_noBcwConstraintFlag);
cinfo->setNoIbcConstraintFlag(m_noIbcConstraintFlag);
- cinfo->setNoCiipConstraintFlag(m_bNoCiipConstraintFlag);
+ cinfo->setNoCiipConstraintFlag(m_noCiipConstraintFlag);
cinfo->setNoGeoConstraintFlag(m_noGeoConstraintFlag);
- cinfo->setNoLadfConstraintFlag(m_bNoLadfConstraintFlag);
+ cinfo->setNoLadfConstraintFlag(m_noLadfConstraintFlag);
cinfo->setNoTransformSkipConstraintFlag(m_noTransformSkipConstraintFlag);
cinfo->setNoBDPCMConstraintFlag(m_noBDPCMConstraintFlag);
cinfo->setNoJointCbCrConstraintFlag(m_noJointCbCrConstraintFlag);
- cinfo->setNoQpDeltaConstraintFlag(m_bNoQpDeltaConstraintFlag);
- cinfo->setNoDepQuantConstraintFlag(m_bNoDepQuantConstraintFlag);
- cinfo->setNoSignDataHidingConstraintFlag(m_bNoSignDataHidingConstraintFlag);
+ cinfo->setNoQpDeltaConstraintFlag(m_noQpDeltaConstraintFlag);
+ cinfo->setNoDepQuantConstraintFlag(m_noDepQuantConstraintFlag);
+ cinfo->setNoSignDataHidingConstraintFlag(m_noSignDataHidingConstraintFlag);
cinfo->setNoTrailConstraintFlag(m_noTrailConstraintFlag);
cinfo->setNoStsaConstraintFlag(m_noStsaConstraintFlag);
cinfo->setNoRaslConstraintFlag(m_noRaslConstraintFlag);