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

Timestamp:

8 Jul 2015, 00:28:51 (11 years ago)

Author:

seregin

Message:

macro cleanup: PER_LAYER_PTL

File:

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

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

@@ -2874 +2874 @@
   READ_UVLC(  uiCode, "vps_num_profile_tier_level_minus1"); vps->setNumProfileTierLevel( uiCode + 1 );
 #endif
-#if PER_LAYER_PTL
   Int const numBitsForPtlIdx = vps->calculateLenOfSyntaxElement( vps->getNumProfileTierLevel() );
-#endif
 #if !MULTIPLE_PTL_SUPPORT
   vps->getPTLForExtnPtr()->resize(vps->getNumProfileTierLevel());
@@ -2951 +2949 @@
   vps->setOutputLayerFlag(0, 0, true);
   vps->deriveNecessaryLayerFlag(0);
-#if PER_LAYER_PTL
   vps->getProfileLevelTierIdx()->resize(numOutputLayerSets);
   vps->getProfileLevelTierIdx(0)->push_back( vps->getBaseLayerInternalFlag() && vps->getMaxLayers() > 1 ? 1 : 0);
-#endif
 
   for(i = 1; i < numOutputLayerSets; i++)
@@ -3014 +3010 @@
     vps->deriveNecessaryLayerFlag(i);  
 
-#if PER_LAYER_PTL
     vps->getProfileLevelTierIdx(i)->assign(vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet), -1);
     for(j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet) ; j++)
@@ -3044 +3039 @@
       }
     }
-#else
-    Int numBits = 1;
-    while ((1 << numBits) < (vps->getNumProfileTierLevel()))
-    {
-      numBits++;
-    }
-    READ_CODE( numBits, uiCode, "profile_tier_level_idx[i]" );     vps->setProfileLevelTierIdx(i, uiCode);
-#endif
 
     NumOutputLayersInOutputLayerSet[i] = 0;