Changeset 1193 in SHVCSoftware

Timestamp:

8 Jul 2015, 19:31:16 (9 years ago)

Author:

seregin

Message:

macro cleanup: Q0142_POC_LSB_NOT_PRESENT

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (4 diffs)

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

@@ -53 +53 @@
 #define Q0108_TSA_STSA                   1      ///< JCTVC-Q0108, Remove cross-layer alignment constraints of TSA and STSA pictures, enable to have different prediction structures in different layers
 #define Q0177_EOS_CHECKS                 1      ///< JCTVC-Q0177; Put checks on handling EOS
-#define Q0142_POC_LSB_NOT_PRESENT        1      ///< JCTVC-Q0142; Add constraint checking on the value of poc_reset_idc and poc_lsb_val
 #define P0130_EOB                        1      ///< JCTVC-P0130, set layer Id of EOB NALU to be fixed to 0
 #define DISCARDABLE_PIC_RPS              1      ///< JCTVC-P0130: Inter-layer RPS and temporal RPS should not contain picture with discardable_flag equal to 1

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

@@ -1214 +1214 @@
   }
 
-#if Q0142_POC_LSB_NOT_PRESENT
+#if SVC_EXTENSION
   Int iPOClsb = 0;
 #endif
@@ -1276 +1276 @@
       pcSlice->setRPS(rps);
     }
+
 #if SVC_EXTENSION
 #if O0062_POC_LSB_NOT_PRESENT_FLAG
@@ -1945 +1946 @@
       pcSlice->setPocResetIdc( 0 );
     }
-#if Q0142_POC_LSB_NOT_PRESENT
-    if ( pcSlice->getVPS()->getPocLsbNotPresentFlag( pcSlice->getVPS()->getLayerIdxInVps(pcSlice->getLayerId()) ) && iPOClsb > 0 )
+
+    if( pcSlice->getVPS()->getPocLsbNotPresentFlag( pcSlice->getVPS()->getLayerIdxInVps(pcSlice->getLayerId()) ) && iPOClsb > 0 )
     {
       assert( pcSlice->getPocResetIdc() != 2 );
     }
-#endif
+
     if( pcSlice->getPocResetIdc() > 0 )
     {
@@ -1961 +1962 @@
     }
 
-    if (pcSlice->getPocResetIdc() == 3)
+    if( pcSlice->getPocResetIdc() == 3 )
     {
       READ_FLAG( uiCode,        "full_poc_reset_flag"); pcSlice->setFullPocResetFlag((uiCode == 1) ? true : false);
       READ_CODE(pcSlice->getSPS()->getBitsForPOC(), uiCode,"poc_lsb_val"); pcSlice->setPocLsbVal(uiCode);
-#if Q0142_POC_LSB_NOT_PRESENT
-      if ( pcSlice->getVPS()->getPocLsbNotPresentFlag( pcSlice->getVPS()->getLayerIdxInVps(pcSlice->getLayerId()) ) && pcSlice->getFullPocResetFlag() )
+
+      if( pcSlice->getVPS()->getPocLsbNotPresentFlag( pcSlice->getVPS()->getLayerIdxInVps(pcSlice->getLayerId()) ) && pcSlice->getFullPocResetFlag() )
       {
         assert( pcSlice->getPocLsbVal() == 0 );
       }
-#endif
     }