From 31a4e18b9f2258095d2c7ede8d7e76fda94c35a7 Mon Sep 17 00:00:00 2001
From: zhipin <zhipin.deng@bytedance.com>
Date: Tue, 14 Jul 2020 20:29:52 +0800
Subject: [PATCH] use config option for GCI fields, and the default value is no
constraint
---
source/App/EncoderApp/EncApp.cpp | 4 ++--
source/App/EncoderApp/EncAppCfg.cpp | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index 1d7aacac8..11af41352 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -305,8 +305,8 @@ void EncApp::xInitLibCfg()
m_cEncLib.setNoActConstraintFlag ( !m_useColorTrans );
m_cEncLib.setNoLmcsConstraintFlag ( !m_lmcsEnabled );
#if JVET_S0050_GCI
- m_cEncLib.setNoExplicitScaleListConstraintFlag ( m_useScalingListId == SCALING_LIST_OFF );
- m_cEncLib.setNoVirtualBoundaryConstraintFlag ( !m_virtualBoundariesEnabledFlag );
+ m_cEncLib.setNoExplicitScaleListConstraintFlag ( m_noExplicitScaleListConstraintFlag );
+ m_cEncLib.setNoVirtualBoundaryConstraintFlag ( m_noVirtualBoundaryConstraintFlag );
#endif
//====== Coding Structure ========
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index fc75a1517..8c0ddf6bf 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -100,10 +100,6 @@ EncAppCfg::EncAppCfg()
, m_noPaletteConstraintFlag(false)
, m_noActConstraintFlag(false)
, m_noLmcsConstraintFlag(false)
-#if JVET_S0050_GCI
-, m_noExplicitScaleListConstraintFlag(false)
-, m_noVirtualBoundaryConstraintFlag(false)
-#endif
, m_bNoQtbttDualTreeIntraConstraintFlag(false)
, m_noPartitionConstraintsOverrideConstraintFlag(false)
, m_bNoSaoConstraintFlag(false)
@@ -835,6 +831,10 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("OneSlicePerPicConstraintFlag", m_oneSlicePerPicConstraintFlag, false, "Indicate that each picture shall contain only one slice")
("OneSubpicPerPicConstraintFlag", m_oneSubpicPerPicConstraintFlag, false, "Indicate that each picture shall contain only one subpicture")
("FrameOnly", m_frameOnlyConstraintFlag, false, "Indicate that the bitstream contains only frames")
+#if JVET_S0050_GCI
+ ("ExplicitScaleListConstraintFlag", m_noExplicitScaleListConstraintFlag, false, "Indicate that explicit scaling list is deactivated")
+ ("VirtualBoundaryConstraintFlag", m_noVirtualBoundaryConstraintFlag, false, "Indicate that virtual boundary 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")
("SubPicInfoPresentFlag", m_subPicInfoPresentFlag, false, "equal to 1 specifies that subpicture parameters are present in in the SPS RBSP syntax")
--
GitLab