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

Timestamp:

7 Jul 2015, 23:08:44 (10 years ago)

Author:

seregin

Message:

macro cleanup: CHANGE_NUMSUBDPB_IDX

File:

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

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

@@ -3536 +3536 @@
   {
     UInt maxSLMinus1 = 0;
-#if CHANGE_NUMSUBDPB_IDX
     Int optLsIdx = vps->getOutputLayerSetIdx( i );
-#else
-    Int optLsIdx = i;
-#endif
 #if BITRATE_PICRATE_SIGNALLING
     optLsIdx = i;
@@ -3560 +3556 @@
   for(Int i = 1; i < vps->getNumOutputLayerSets(); i++)
   {
-#if CHANGE_NUMSUBDPB_IDX
     Int layerSetIdxForOutputLayerSet = vps->getOutputLayerSetIdx( i );
-#endif
+
     READ_FLAG( uiCode, "sub_layer_flag_info_present_flag[i]");  vps->setSubLayerFlagInfoPresentFlag( i, uiCode ? true : false );
 #if SUB_LAYERS_IN_LAYER_SET
@@ -3595 +3590 @@
       if( vps->getSubLayerDpbInfoPresentFlag(i, j) )  // If sub-layer DPB information is present
       {
-#if CHANGE_NUMSUBDPB_IDX
         for(Int k = 0; k < vps->getNumSubDpbs(layerSetIdxForOutputLayerSet); k++)
-#else
-        for(Int k = 0; k < vps->getNumSubDpbs(i); k++)
-#endif
         {
 #if DPB_INTERNAL_BL_SIG