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

Timestamp:

8 Jul 2015, 03:38:09 (10 years ago)

Author:

seregin

Message:

macro cleanup: N0065_LAYER_POC_ALIGNMENT

File:

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

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

@@ -979 +979 @@
     }
 
-#if N0065_LAYER_POC_ALIGNMENT
+#if SVC_EXTENSION
 #if O0062_POC_LSB_NOT_PRESENT_FLAG
     if( (pcSlice->getLayerId() > 0 && !pcSlice->getVPS()->getPocLsbNotPresentFlag( pcSlice->getVPS()->getLayerIdxInVps(pcSlice->getLayerId())) ) || !pcSlice->getIdrPicFlag())
@@ -989 +989 @@
 #endif
     {
-#if POC_RESET_IDC_ENCODER
+#if SVC_EXTENSION && POC_RESET_IDC_ENCODER
       Int picOrderCntLSB;
       if( pcSlice->getPocResetIdc() == 2 )  // i.e. the LSB is reset
@@ -1004 +1004 @@
       WRITE_CODE( picOrderCntLSB, pcSlice->getSPS()->getBitsForPOC(), "pic_order_cnt_lsb");
 
-#if N0065_LAYER_POC_ALIGNMENT
+#if SVC_EXTENSION
     }
     if( !pcSlice->getIdrPicFlag() )