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

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/TLibEncoder/TEncCavlc.cpp (modified) (6 diffs)

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

@@ -1506 +1506 @@
 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
@@ -1534 +1535 @@
     }
 #endif
+#endif
     
     
@@ -1542 +1544 @@
 #endif
     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
@@ -1550 +1555 @@
 #else
     for(Int j = 0; j < vps->getMaxTLayers(); j++)
+#endif
 #endif
     {
@@ -1585 +1591 @@
   }
 
+#if !SUB_LAYERS_IN_LAYER_SET
 #if BITRATE_PICRATE_SIGNALLING
   if( MaxSubLayersInLayerSetMinus1 )
@@ -1590 +1597 @@
     delete [] MaxSubLayersInLayerSetMinus1;
   }
+#endif
 #endif
 }