Changeset 397 in SHVCSoftware for branches/SHM-3.1-dev/source/App/TAppEncoder/TAppEncTop.cpp

Timestamp:

17 Sep 2013, 18:53:51 (11 years ago)

Author:

seregin

Message:

set max_tid_il_ref_pics_plus1 and max_tid_ref_present_flag in the config file (configuration setting). Patch provided by Hahyun Lee <hanilee@…>

File:

• branches/SHM-3.1-dev/source/App/TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)

branches/SHM-3.1-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -195 +195 @@
     m_acTEncTop[layer].setMaxTempLayer                 ( m_maxTempLayer );
     m_acTEncTop[layer].setUseAMP( m_enableAMP );
+#if N0120_MAX_TID_REF_CFG
+    if (layer<m_numLayers-1)
+    {
+       m_acTEncTop[layer].setMaxTidIlRefPicsPlus1 ( m_acLayerCfg[layer].getMaxTidIlRefPicsPlus1()); 
+    }
+#endif 
 #if VPS_EXTN_DIRECT_REF_LAYERS
     if(layer)
@@ -925 +931 @@
 #endif
 #if N0120_MAX_TID_REF_PRESENT_FLAG
+#if N0120_MAX_TID_REF_CFG
+  vps->setMaxTidIlRefPicsPlus1PresentFlag(m_maxTidIlRefPicsPlus1PresentFlag);
+#else 
   vps->setMaxTidIlRefPicsPlus1PresentFlag(true);
+#endif 
   if (vps->getMaxTidIlRefPicsPlus1PresentFlag())
   {
     for( i = 0; i < MAX_VPS_LAYER_ID_PLUS1 - 1; i++ )
     {
+#if N0120_MAX_TID_REF_CFG
+      vps->setMaxSublayerForIlpPlus1(i, m_acTEncTop[i].getMaxTidIlRefPicsPlus1()); 
+#else 
       vps->setMaxSublayerForIlpPlus1(i, vps->getMaxTLayers()+1);
+#endif 
     }
   }