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

Timestamp:

8 Jul 2015, 01:20:27 (10 years ago)

Author:

seregin

Message:

macro cleanup: LIST_OF_PTL

File:

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

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

@@ -1984 +1984 @@
   Int NumOutputLayersInOutputLayerSet[MAX_VPS_LAYER_SETS_PLUS1];
   Int OlsHighestOutputLayerId[MAX_VPS_LAYER_SETS_PLUS1];
-#if LIST_OF_PTL
+
   if( vps->getMaxLayers() > 1 && vps->getBaseLayerInternalFlag() )
   {
@@ -1993 +1993 @@
 #endif
   }
-#endif
 
   UInt i = 0, j = 0;
@@ -2124 +2123 @@
   Int const numBitsForPtlIdx = vps->calculateLenOfSyntaxElement( vps->getNumProfileTierLevel() );
 
-#if LIST_OF_PTL
 #if MULTIPLE_PTL_SUPPORT
   //Do something here to make sure the loop is correct to consider base layer internal stuff
@@ -2131 +2129 @@
 #endif
   for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx < vps->getNumProfileTierLevel(); idx++)
-#else
-  for(Int idx = 1; idx <= vps->getNumProfileTierLevel() - 1; idx++)
-#endif
   {
 #if MULTIPLE_PTL_SUPPORT