Changeset 1136 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

7 Jul 2015, 23:12:48 (10 years ago)

Author:

seregin

Message:

macro cleanup: SUB_LAYERS_IN_LAYER_SET

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

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

@@ -2415 +2415 @@
 Void TEncCavlc::codeVpsDpbSizeTable(TComVPS *vps)
 {
-#if !SUB_LAYERS_IN_LAYER_SET  // MaxSLInLayerSets calculated earlier in the encoder
-#if DPB_PARAMS_MAXTLAYERS
-#if BITRATE_PICRATE_SIGNALLING
-    Int * MaxSubLayersInLayerSetMinus1 = new Int[vps->getNumLayerSets()];
-    for(Int i = 0; i < vps->getNumLayerSets(); i++)
-#else
-    Int * MaxSubLayersInLayerSetMinus1 = new Int[vps->getNumOutputLayerSets()];
-    for(Int i = 1; i < vps->getNumOutputLayerSets(); i++)
-#endif
-    {
-        UInt maxSLMinus1 = 0;
-        Int optLsIdx = vps->getOutputLayerSetIdx( i );
-#if BITRATE_PICRATE_SIGNALLING
-        optLsIdx = i;
-#endif
-        for(Int k = 0; k < vps->getNumLayersInIdList(optLsIdx); k++ ) {
-            Int  lId = vps->getLayerSetLayerIdList(optLsIdx, k);
-            maxSLMinus1 = max(maxSLMinus1, vps->getMaxTSLayersMinus1(vps->getLayerIdxInVps(lId)));
-        }
-        MaxSubLayersInLayerSetMinus1[ i ] = maxSLMinus1;
-#if BITRATE_PICRATE_SIGNALLING
-        vps->setMaxSLayersInLayerSetMinus1(i,MaxSubLayersInLayerSetMinus1[ i ]);
-#endif
-    }
-#endif
-#endif
-    
-    
   for(Int i = 1; i < vps->getNumOutputLayerSets(); i++)
   {
@@ -2448 +2420 @@
 
     WRITE_FLAG( vps->getSubLayerFlagInfoPresentFlag( i ), "sub_layer_flag_info_present_flag[i]");
-#if SUB_LAYERS_IN_LAYER_SET
+
     for(Int j = 0; j <= vps->getMaxSLayersInLayerSetMinus1( layerSetIdxForOutputLayerSet ); j++)
-#else
-#if DPB_PARAMS_MAXTLAYERS
-#if BITRATE_PICRATE_SIGNALLING
-    for(Int j = 0; j <= MaxSubLayersInLayerSetMinus1[ vps->getOutputLayerSetIdx( i ) ]; j++)
-#else
-    for(Int j = 0; j <= MaxSubLayersInLayerSetMinus1[ i ]; j++)
-#endif
-#else
-    for(Int j = 0; j < vps->getMaxTLayers(); j++)
-#endif
-#endif
     {
       if( j > 0 && vps->getSubLayerFlagInfoPresentFlag(i) )
@@ -2481 +2442 @@
     }
   }
-
-#if !SUB_LAYERS_IN_LAYER_SET
-#if BITRATE_PICRATE_SIGNALLING
-  if( MaxSubLayersInLayerSetMinus1 )
-  {
-    delete [] MaxSubLayersInLayerSetMinus1;
-  }
-#endif
-#endif
 }
 #endif