Changeset 398 in SHVCSoftware for branches/SHM-3.1-dev/source/App

Timestamp:

17 Sep 2013, 19:25:17 (11 years ago)

Author:

seregin

Message:

rename max_tid_il_ref_pics_plus1_present_flag and related functions with max_tid_ref_present_flag

Location:

branches/SHM-3.1-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (2 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (1 diff)

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

@@ -74 +74 @@
 , m_elRapSliceBEnabled(0)
 #if N0120_MAX_TID_REF_CFG
-, m_maxTidIlRefPicsPlus1PresentFlag(1)
+, m_maxTidRefPresentFlag(1)
 #endif 
 {
@@ -524 +524 @@
 #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)) " )
+  ("MaxTidRefPresentFlag", m_maxTidRefPresentFlag, true, "max_tid_ref_present_flag (0: not present, 1: present(default)) " )
   ("MaxTidIlRefPicsPlus1%d", cfg_maxTidIlRefPicsPlus1, 1, MAX_LAYERS, "allowed maximum temporal_id for inter-layer prediction")
 #endif 

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

@@ -77 +77 @@
 #endif
 #if N0120_MAX_TID_REF_CFG
-  Bool      m_maxTidIlRefPicsPlus1PresentFlag; 
+  Bool      m_maxTidRefPresentFlag; 
 #endif 
 #else

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

@@ -932 +932 @@
 #if N0120_MAX_TID_REF_PRESENT_FLAG
 #if N0120_MAX_TID_REF_CFG
-  vps->setMaxTidIlRefPicsPlus1PresentFlag(m_maxTidIlRefPicsPlus1PresentFlag);
+  vps->setMaxTidRefPresentFlag(m_maxTidRefPresentFlag);
 #else 
   vps->setMaxTidIlRefPicsPlus1PresentFlag(true);
 #endif 
-  if (vps->getMaxTidIlRefPicsPlus1PresentFlag())
+  if (vps->getMaxTidRefPresentFlag())
   {
     for( i = 0; i < MAX_VPS_LAYER_ID_PLUS1 - 1; i++ )