Changeset 398 in SHVCSoftware for branches

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

Files:

• cfg/layers.cfg (modified) (1 diff)
• source/App/TAppEncoder/TAppEncCfg.cpp (modified) (2 diffs)
• source/App/TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• source/App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• source/Lib/TLibCommon/TComSlice.h (modified) (1 diff)
• source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

branches/SHM-3.1-dev/cfg/layers.cfg

@@ -4 +4 @@
 ScalabilityMask1              : 1           # Scalable
 AdaptiveResolutionChange      : 0           # Resolution change frame (0: disable)
-MaxTidIlRefPicsPlus1Present   : 1           # MaxTidIlRefPicsPlus1 present (0=not present, 1=present(default))
+MaxTidRefPresentFlag          : 1           # max_tid_ref_present_flag (0=not present, 1=present(default))
 #============= LAYER 0 ==================
 QP0                           : 22

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++ )

branches/SHM-3.1-dev/source/Lib/TLibCommon/TComSlice.h

@@ -721 +721 @@
 #endif
 #if N0120_MAX_TID_REF_PRESENT_FLAG
-  Bool   getMaxTidIlRefPicsPlus1PresentFlag()                   { return m_maxTidIlRefPicsPlus1PresentFlag ;}
-  Void   setMaxTidIlRefPicsPlus1PresentFlag(Bool x)             { m_maxTidIlRefPicsPlus1PresentFlag = x;}
+  Bool   getMaxTidRefPresentFlag()                                  { return m_maxTidIlRefPicsPlus1PresentFlag ;}
+  Void   setMaxTidRefPresentFlag(Bool x)                            { m_maxTidIlRefPicsPlus1PresentFlag = x;}
 #endif 
 #if M0040_ADAPTIVE_RESOLUTION_CHANGE

branches/SHM-3.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -998 +998 @@
 #if JCTVC_M0203_INTERLAYER_PRED_IDC
 #if N0120_MAX_TID_REF_PRESENT_FLAG
-  READ_FLAG( uiCode, "max_tid_il_ref_pics_plus1_present_flag"); vps->setMaxTidIlRefPicsPlus1PresentFlag(uiCode ? true : false);
-  if (vps->getMaxTidIlRefPicsPlus1PresentFlag())
+  READ_FLAG( uiCode, "max_tid_ref_present_flag"); vps->setMaxTidRefPresentFlag(uiCode ? true : false);
+  if (vps->getMaxTidRefPresentFlag())
   {
     for(i = 0; i < vps->getMaxLayers() - 1; i++)

branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -783 +783 @@
 #if JCTVC_M0203_INTERLAYER_PRED_IDC
 #if N0120_MAX_TID_REF_PRESENT_FLAG
-   WRITE_FLAG( vps->getMaxTidIlRefPicsPlus1PresentFlag(), "max_tid_il_ref_pics_plus1_present_flag");
-   if (vps->getMaxTidIlRefPicsPlus1PresentFlag())
+   WRITE_FLAG( vps->getMaxTidRefPresentFlag(), "max_tid_ref_present_flag");
+   if (vps->getMaxTidRefPresentFlag())
    {
      for( i = 0; i < vps->getMaxLayers() - 1; i++)