Changeset 397 in SHVCSoftware for branches/SHM-3.1-dev/source/App/TAppEncoder/TAppEncCfg.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/TAppEncCfg.cpp (modified) (5 diffs)

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

@@ -73 +73 @@
 , m_scalingListFile()
 , m_elRapSliceBEnabled(0)
+#if N0120_MAX_TID_REF_CFG
+, m_maxTidIlRefPicsPlus1PresentFlag(1)
+#endif 
 {
   for(UInt layer=0; layer<MAX_LAYERS; layer++)
@@ -397 +400 @@
   Bool*   cfg_RCForceIntraQP       [MAX_LAYERS];
 #endif
+#if N0120_MAX_TID_REF_CFG
+  Int*    cfg_maxTidIlRefPicsPlus1[MAX_LAYERS]; 
+#endif 
   for(UInt layer = 0; layer < MAX_LAYERS; layer++)
   {
@@ -442 +448 @@
     cfg_RCForceIntraQP[layer]        = &m_acLayerCfg[layer].m_RCForceIntraQP;
 #endif
+#if N0120_MAX_TID_REF_CFG
+    cfg_maxTidIlRefPicsPlus1[layer] = &m_acLayerCfg[layer].m_maxTidIlRefPicsPlus1; 
+#endif 
   }
 #if AVC_BASE
@@ -514 +523 @@
                                                                  " bottom-right luma sample of the EL picture, in units of two luma samples")
 #endif
+#if N0120_MAX_TID_REF_CFG
+  ("MaxTidIlRefPicsPlus1Present", m_maxTidIlRefPicsPlus1PresentFlag, true, "max_tid_il_ref_pics_plus1_present_flag (0: not present, 1: present(default)) " )
+  ("MaxTidIlRefPicsPlus1%d", cfg_maxTidIlRefPicsPlus1, 1, MAX_LAYERS, "allowed maximum temporal_id for inter-layer prediction")
+#endif 
 #if AVC_BASE
   ("AvcBase,-avc",            m_avcBaseLayerFlag,     0, "avc_base_layer_flag")
@@ -2087 +2100 @@
   }
 #endif
+#if N0120_MAX_TID_REF_CFG
+  for (UInt layer=0; layer < MAX_LAYERS-1; layer++)
+  {
+    xConfirmPara(m_acLayerCfg[layer].m_maxTidIlRefPicsPlus1 < 0 || m_acLayerCfg[layer].m_maxTidIlRefPicsPlus1 > 7, "MaxTidIlRefPicsPlus1 must be in range 0 to 7");
+  }
+#endif 
 #undef xConfirmPara
   if (check_failed)