diff --git a/cfg/multi-layer/two_layers.cfg b/cfg/multi-layer/two_layers.cfg index 0dc54becd683349353721b38ede3b3eec9db7752..4218c76149a84a706b641a7677a6fa05b484c717 100644 --- a/cfg/multi-layer/two_layers.cfg +++ b/cfg/multi-layer/two_layers.cfg @@ -1,4 +1,5 @@ #======== Layers =============== +MultiLayerEnabledFlag : 1 MaxLayers : 2 MaxSublayers : 7 DefaultPtlDpbHrdMaxTidFlag : 0 diff --git a/cfg/multi-layer/two_layers_ELonlyILP.cfg b/cfg/multi-layer/two_layers_ELonlyILP.cfg index e5e177b70e32610957742d0c59c28697df4576b2..b93c890630cdfacbaf08c41c1a961d0d10e553b7 100644 --- a/cfg/multi-layer/two_layers_ELonlyILP.cfg +++ b/cfg/multi-layer/two_layers_ELonlyILP.cfg @@ -1,4 +1,5 @@ #======== Layers =============== +MultiLayerEnabledFlag : 1 MaxLayers : 2 MaxSublayers : 1 DefaultPtlDpbHrdMaxTidFlag : 0 diff --git a/cfg/multi-layer/two_layers_max_tid_ref_pic.cfg b/cfg/multi-layer/two_layers_max_tid_ref_pic.cfg index 08e97f802927663cc6891a20d64c9d70c786689d..d9e228baaa483d77a704b04e76cdac4cad349719 100644 --- a/cfg/multi-layer/two_layers_max_tid_ref_pic.cfg +++ b/cfg/multi-layer/two_layers_max_tid_ref_pic.cfg @@ -2,6 +2,7 @@ # combines with random-access GOP config file #======== Layers =============== +MultiLayerEnabledFlag : 1 MaxLayers : 2 MaxSublayers : 7 # allow up to 7 temporal layers DefaultPtlDpbHrdMaxTidFlag : 0 diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp index ccfb2c73d20256282997fea0875930f842036b0b..1c58a602b2507e9ae7eedaee0a5d7ce4c38da760 100644 --- a/source/App/EncoderApp/EncApp.cpp +++ b/source/App/EncoderApp/EncApp.cpp @@ -161,12 +161,6 @@ void EncApp::xInitLibCfg( int layerIdx ) if (vps.getMaxLayers() > 1) { - if (!m_multiLayerEnabledFlag) - { - printf ("Warning: more than one layer in OLS while ptl_multi_layer_enabled_flag is equal to 0, setting ptl_multi_layer_enabled_flag to 1. Set MultiLayerEnabledFlag=1 to avoid this warning.\n"); - m_multiLayerEnabledFlag = 1; - } - if (vps.getAllIndependentLayersFlag()) { vps.setEachLayerIsAnOlsFlag(m_eachLayerIsAnOlsFlag);