Changeset 872 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

18 Aug 2014, 22:31:55 (11 years ago)

Author:

qualcomm

Message:

Move calculation of MaxSubLayerInLayerSets to a separate function (Macro: SUB_LAYERS_IN_LAYER_SET)

From: Adarsh K. Ramasubramonian <aramasub@…>

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (6 diffs)

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

@@ -2123 +2123 @@
 {
   UInt uiCode;
+#if SUB_LAYERS_IN_LAYER_SET
+  vps->calculateMaxSLInLayerSets();
+#else
 #if DPB_PARAMS_MAXTLAYERS
 #if BITRATE_PICRATE_SIGNALLING
@@ -2151 +2154 @@
   }
 #endif
+#endif
 
 #if !RESOLUTION_BASED_DPB
@@ -2161 +2165 @@
 #endif
     READ_FLAG( uiCode, "sub_layer_flag_info_present_flag[i]");  vps->setSubLayerFlagInfoPresentFlag( i, uiCode ? true : false );
+#if SUB_LAYERS_IN_LAYER_SET
+    for(Int j = 0; j <= vps->getMaxSLayersInLayerSetMinus1( layerSetIdxForOutputLayerSet ); j++)
+#else
 #if DPB_PARAMS_MAXTLAYERS
 #if BITRATE_PICRATE_SIGNALLING
@@ -2169 +2176 @@
 #else
     for(Int j = 0; j <= vps->getMaxTLayers(); j++)
+#endif
 #endif
     {
@@ -2222 +2230 @@
   }
 
+#if !SUB_LAYERS_IN_LAYER_SET
 #if BITRATE_PICRATE_SIGNALLING
   if( MaxSubLayersInLayerSetMinus1 )
@@ -2227 +2236 @@
     delete [] MaxSubLayersInLayerSetMinus1;
   }
+#endif
 #endif