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

Timestamp:

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

Author:

seregin

Message:

macro cleanup: CHANGE_NUMSUBDPB_IDX

File:

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

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

@@ -2426 +2426 @@
     {
         UInt maxSLMinus1 = 0;
-#if CHANGE_NUMSUBDPB_IDX
         Int optLsIdx = vps->getOutputLayerSetIdx( i );
-#else
-        Int optLsIdx = i;
-#endif
 #if BITRATE_PICRATE_SIGNALLING
         optLsIdx = i;
@@ -2449 +2445 @@
   for(Int i = 1; i < vps->getNumOutputLayerSets(); i++)
   {
-#if CHANGE_NUMSUBDPB_IDX
     Int layerSetIdxForOutputLayerSet = vps->getOutputLayerSetIdx( i );
-#endif
+
     WRITE_FLAG( vps->getSubLayerFlagInfoPresentFlag( i ), "sub_layer_flag_info_present_flag[i]");
 #if SUB_LAYERS_IN_LAYER_SET
@@ -2473 +2468 @@
       if( vps->getSubLayerDpbInfoPresentFlag(i, j) )
       {
-#if CHANGE_NUMSUBDPB_IDX
         for(Int k = 0; k < vps->getNumLayersInIdList( layerSetIdxForOutputLayerSet ); k++)
-#else
-        for(Int k = 0; k < vps->getNumSubDpbs(i); k++)
-#endif
         {
 #if DPB_INTERNAL_BL_SIG