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

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/TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

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

@@ -980 +980 @@
 
 #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
     if( !pcSlice->getIdrPicFlag() )
@@ -2196 +2192 @@
   WRITE_FLAG(vps->getVpsPocLsbAlignedFlag(), "vps_poc_lsb_aligned_flag");
 #endif
-#if O0062_POC_LSB_NOT_PRESENT_FLAG
-  for(i = 1; i< vps->getMaxLayers(); i++)
+
+  for( i = 1; i< vps->getMaxLayers(); i++ )
   {
     if( vps->getNumDirectRefLayers( vps->getLayerIdInNuh(i) ) == 0  )
@@ -2204 +2200 @@
     }
   }
-#endif
  
 #if VPS_DPB_SIZE_TABLE