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

Timestamp:

8 Jul 2015, 19:43:28 (10 years ago)

Author:

seregin

Message:

macro cleanup: O0062_POC_LSB_NOT_PRESENT_FLAG

File:

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

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

@@ -1278 +1278 @@
 
 #if SVC_EXTENSION
-#if O0062_POC_LSB_NOT_PRESENT_FLAG
     if( ( pcSlice->getLayerId() > 0 && !pcSlice->getVPS()->getPocLsbNotPresentFlag( pcSlice->getVPS()->getLayerIdxInVps(pcSlice->getLayerId())) ) || !pcSlice->getIdrPicFlag() )
-#else
-    if( pcSlice->getLayerId() > 0 || !pcSlice->getIdrPicFlag() )
-#endif
 #else
     else
@@ -3034 +3030 @@
   vps->setVpsPocLsbAlignedFlag(uiCode);
 #endif
-#if O0062_POC_LSB_NOT_PRESENT_FLAG
+
   for(i = 1; i< vps->getMaxLayers(); i++)
   {
@@ -3043 +3039 @@
     }
   }
-#endif
 
 #if VPS_DPB_SIZE_TABLE
@@ -3186 +3181 @@
 #endif
 
-#if O0062_POC_LSB_NOT_PRESENT_FLAG
   // When not present, poc_lsb_not_present_flag[ i ] is inferred to be equal to 0.
-  for(i = 1; i< vps->getMaxLayers(); i++)
+  for( i = 1; i< vps->getMaxLayers(); i++ )
   {
     vps->setPocLsbNotPresentFlag(i, 0);
   }
-#endif
 
   // set default values for VPS VUI