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

Timestamp:

8 Jul 2015, 00:21:05 (10 years ago)

Author:

seregin

Message:

macro cleanup: NECESSARY_LAYER_FLAG

File:

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

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

@@ -2946 +2946 @@
 #endif
   vps->setNumOutputLayerSets( numOutputLayerSets );
-#if NECESSARY_LAYER_FLAG
+
   // Default output layer set
   vps->setOutputLayerSetIdx(0, 0);
@@ -2955 +2955 @@
   vps->getProfileLevelTierIdx(0)->push_back( vps->getBaseLayerInternalFlag() && vps->getMaxLayers() > 1 ? 1 : 0);
 #endif
-#endif
+
   for(i = 1; i < numOutputLayerSets; i++)
   {
@@ -3011 +3011 @@
       }
     }
-#if NECESSARY_LAYER_FLAG
+
     vps->deriveNecessaryLayerFlag(i);  
-#endif
+
 #if PER_LAYER_PTL
     vps->getProfileLevelTierIdx(i)->assign(vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet), -1);
@@ -3078 +3078 @@
 #endif
   }
-#if NECESSARY_LAYER_FLAG
+
   vps->checkNecessaryLayerFlagCondition();  
-#endif
+
 #else
   if( numOutputLayerSets > 1 )
@@ -3369 +3369 @@
   }
 
-#if NECESSARY_LAYER_FLAG
   // Default output layer set
   // The value of NumLayersInIdList[ 0 ] is set equal to 1 and the value of LayerSetLayerIdList[ 0 ][ 0 ] is set equal to 0.
@@ -3378 +3377 @@
 
   vps->deriveNecessaryLayerFlag(0);
-#endif
 
   // The value of sub_layer_dpb_info_present_flag[ i ][ 0 ] for any possible value of i is inferred to be equal to 1