Changeset 1187 in SHVCSoftware

Timestamp:

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

Author:

seregin

Message:

macro cleanup: N0065_LAYER_POC_ALIGNMENT

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -107 +107 @@
 
 #define VIEW_ID_RELATED_SIGNALING        1      ///< Introduce syntax elements view_id and view_id_val
-#define N0065_LAYER_POC_ALIGNMENT        1
 #define AUXILIARY_PICTURES               1      ///< JCTVC-O0041: auxiliary picture layers
 #define R0062_AUX_PSEUDO_MONOCHROME      1      ///> JCVVC-R0063: pseudo monochrome for auxiliary pictures

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

@@ -1277 +1277 @@
       pcSlice->setRPS(rps);
     }
-#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() )
@@ -1288 +1288 @@
     {
       READ_CODE(sps->getBitsForPOC(), uiCode, "pic_order_cnt_lsb");
+#if SVC_EXTENSION
 #if POC_RESET_IDC_DECODER
       pcSlice->setPicOrderCntLsb( uiCode );
 #endif
-#if SVC_EXTENSION
       iPOClsb = uiCode;
 #else
@@ -1322 +1322 @@
       pcSlice->setPOC              (iPOCmsb+iPOClsb);
 
-#if N0065_LAYER_POC_ALIGNMENT
+#if SVC_EXTENSION
     }
 #if POC_RESET_IDC_DECODER

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() )