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

Timestamp:

7 Jul 2015, 02:24:58 (10 years ago)

Author:

seregin

Message:

macro cleanup: P0300_ALT_OUTPUT_LAYER_FLAG, O0153_ALT_OUTPUT_LAYER_FLAG

File:

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

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

@@ -2698 +2698 @@
 {
   UInt uiCode;
-  // ... More syntax elements to be parsed here
-#if P0300_ALT_OUTPUT_LAYER_FLAG
   Int NumOutputLayersInOutputLayerSet[MAX_VPS_LAYER_SETS_PLUS1];
   Int OlsHighestOutputLayerId[MAX_VPS_LAYER_SETS_PLUS1];
-#endif
 #if LIST_OF_PTL
   if( vps->getMaxLayers() > 1 && vps->getBaseLayerInternalFlag() )
@@ -3089 +3086 @@
     READ_CODE( numBits, uiCode, "profile_tier_level_idx[i]" );     vps->setProfileLevelTierIdx(i, uiCode);
 #endif
-#if P0300_ALT_OUTPUT_LAYER_FLAG
+
     NumOutputLayersInOutputLayerSet[i] = 0;
     for (j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++)
@@ -3113 +3110 @@
 #if Q0165_OUTPUT_LAYER_SET
     assert( NumOutputLayersInOutputLayerSet[i]>0 );
-#endif
-
 #endif
   }
@@ -3210 +3205 @@
     READ_CODE( numBits, uiCode, "profile_level_tier_idx[i]" );     vps->setProfileLevelTierIdx(i, uiCode);
   }
-#endif
-
-#if !P0300_ALT_OUTPUT_LAYER_FLAG
-#if O0153_ALT_OUTPUT_LAYER_FLAG
-  if( vps->getMaxLayers() > 1 )
-  {
-    READ_FLAG( uiCode, "alt_output_layer_flag");
-    vps->setAltOuputLayerFlag( uiCode ? true : false );
-  }
-#endif
 #endif