Changeset 397 in SHVCSoftware for branches

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@…>

Location:

branches/SHM-3.1-dev

Files:

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

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))
 #============= LAYER 0 ==================
 QP0                           : 22
-
+MaxTidIlRefPicsPlus10         : 1           # max_tid_il_ref_pics_plus1 for layer0
 #============ Rate Control ==============
 RateControl0                  : 0           # Rate control: enable rate control for layer 0

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)

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

@@ -76 +76 @@
   Int       m_ilSampleOnlyPred[ MAX_LAYERS ];
 #endif
+#if N0120_MAX_TID_REF_CFG
+  Bool      m_maxTidIlRefPicsPlus1PresentFlag; 
+#endif 
 #else
   Char*     m_pchInputFile;                                   ///< source file name

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

@@ -66 +66 @@
 #endif
 
+#if N0120_MAX_TID_REF_CFG
+  Int       m_maxTidIlRefPicsPlus1;
+#endif 
 #if SVC_EXTENSION
   Int       m_iWaveFrontSubstreams; //< If iWaveFrontSynchro, this is the number of substreams per frame (dependent tiles) or per tile (independent tiles).
@@ -155 +158 @@
   Void    setSourceHeight(Int x)           {m_iSourceHeight = x;    }
 #endif
+#if N0120_MAX_TID_REF_CFG
+  Int     getMaxTidIlRefPicsPlus1()   { return m_maxTidIlRefPicsPlus1; }
+#endif 
 }; // END CLASS DEFINITION TAppEncLayerCfg
 

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 
     }
   }

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

@@ -126 +126 @@
 #define EARLY_REF_PIC_MARKING            1      ///< Decoded picture marking of sub-layer non-reference pictures
 #define N0120_MAX_TID_REF_PRESENT_FLAG   1      ///< JCTVC-N0120 max_tid_ref_pics_plus1_present_flag
+#define N0120_MAX_TID_REF_CFG            1      ///< set max_tid_il_ref_pics_plus1 and max_tid_ref_present_flag in the config. file (configuration setting)
 #endif
 #if REF_IDX_MFM

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

@@ -1004 +1004 @@
     {
       READ_CODE( 3, uiCode, "max_sublayer_for_ilp_plus1[i]" ); vps->setMaxSublayerForIlpPlus1(i, uiCode);
+#if N0120_MAX_TID_REF_CFG
+      assert( uiCode <= vps->getMaxTLayers());
+#else 
       assert( uiCode <= vps->getMaxTLayers()+ 1 );
+#endif 
     }
   }

branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -187 +187 @@
 #endif
 #endif
+#if N0120_MAX_TID_REF_CFG
+  Int       m_maxTidIlRefPicsPlus1;
+#endif 
   //======= Transform =============
   UInt      m_uiQuadtreeTULog2MaxSize;
@@ -468 +471 @@
 #endif
 #endif
+#if N0120_MAX_TID_REF_CFG
+  Int       getMaxTidIlRefPicsPlus1         ()                              { return m_maxTidIlRefPicsPlus1; }
+  Void      setMaxTidIlRefPicsPlus1         (Int num)                       { m_maxTidIlRefPicsPlus1 = num;  }
+#endif 
   //======== Transform =============
   Void      setQuadtreeTULog2MaxSize        ( UInt  u )      { m_uiQuadtreeTULog2MaxSize = u; }