Changeset 1136 in SHVCSoftware

Timestamp:

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

Author:

seregin

Message:

macro cleanup: SUB_LAYERS_IN_LAYER_SET

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TComSlice.cpp (modified) (4 diffs)
• Lib/TLibCommon/TComSlice.h (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1692 +1692 @@
 #endif
 #endif
-#if SUB_LAYERS_IN_LAYER_SET
+
   vps->calculateMaxSLInLayerSets();
-#endif
+
   // Initialize dpb_size_table() for all ouput layer sets in the VPS extension
   for(i = 1; i < vps->getNumOutputLayerSets(); i++)

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -3155 +3155 @@
   }
 }
-#endif
 
 #if DERIVE_LAYER_ID_LIST_VARIABLES
@@ -3609 +3608 @@
 }
 #endif
-#if SUB_LAYERS_IN_LAYER_SET
+
 Void TComVPS::calculateMaxSLInLayerSets()
 {
@@ -3622 +3621 @@
   }
 }
-#endif
 
 #if REPN_FORMAT_IN_VPS
@@ -3814 +3812 @@
 #endif
 
-#if SVC_EXTENSION
+
 Bool TComSlice::setBaseColPic(  TComList<TComPic*>& rcListPic, UInt refLayerIdc )
 {  

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

@@ -1316 +1316 @@
   Void  checkNecessaryLayerFlagCondition();
 #endif
-#if SUB_LAYERS_IN_LAYER_SET
   Void  calculateMaxSLInLayerSets();
-#endif
 #endif //SVC_EXTENSION
 };

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

@@ -61 +61 @@
 #endif
 #define BSP_INIT_ARRIVAL_SEI             1      ///< JCTVC-R0231: Make signalling of vcl_initial_arrival_delay independent of NalHrdBpPresentFlag
-#define SUB_LAYERS_IN_LAYER_SET          1      ///< Move calculation of MaxSubLayerInLayerSets to a separate function
 #define VPS_VUI_BSP_HRD_PARAMS           1      ///< JCTVC-R0231: Define the VPS VUI BSP hrd_params() as a separate function, and apply changes adopted.
 #define O0137_MAX_LAYERID                1      ///< JCTVC-O0137, JCTVC-O0200, JCTVC-O0223: restrict nuh_layer_id and vps_max_layers_minus1

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

@@ -3523 +3523 @@
 {
   UInt uiCode;
-#if SUB_LAYERS_IN_LAYER_SET
+
   vps->calculateMaxSLInLayerSets();
-#else
-#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()];
+  vps->deriveNumberOfSubDpbs();
+
   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
-
-  vps->deriveNumberOfSubDpbs();
-
-  for(Int i = 1; i < vps->getNumOutputLayerSets(); i++)
   {
     Int layerSetIdxForOutputLayerSet = vps->getOutputLayerSetIdx( i );
 
     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
-    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) )
@@ -3609 +3571 @@
     }
   }
-
-#if !SUB_LAYERS_IN_LAYER_SET
-#if BITRATE_PICRATE_SIGNALLING
-  if( MaxSubLayersInLayerSetMinus1 )
-  {
-    delete [] MaxSubLayersInLayerSetMinus1;
-  }
-#endif
-#endif
 
   // Infer values when not signalled

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