Changeset 741 in SHVCSoftware for branches

Timestamp:

25 Apr 2014, 01:30:28 (11 years ago)

Author:

qualcomm

Message:

Implementation of JCTVC_Q0142
MACRO Q0142_POC_LSB_NOT_PRESENT

Constraint checking on the value of poc_reset_idc and poc_lsb_val
When poc_lsb_not_present_flag[ i ] is equal to 1

• When slice_pic_order_cnt_lsb is greater than 0, poc_reset_idc shall not be equal to 2.
• When full_poc_reset_flag is equal to 1, poc_lsb_val shall be equal to 0.

Submitted by Hendry (fhendry@…)

Location:

branches/SHM-6-dev/source/Lib

Files:

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

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

@@ -50 +50 @@
 
 #define Q0177_SPS_TEMP_NESTING_FIX       1      ///< JCTVC-Q0177; Fix the inference value of sps_temporal_id_nesting_flag when it is not present
+#define Q0142_POC_LSB_NOT_PRESENT        1      ///< JCTVC-Q0142; Add constraint checking on the value of poc_reset_idc and poc_lsb_val
 
 #define Q0200_CONFORMANCE_BL_SIZE        1       ///< JCTVC-Q0200; use conformance picture size in re-sampling processs

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

@@ -2440 +2440 @@
   }
 
+#if Q0142_POC_LSB_NOT_PRESENT
+#if SHM_FIX7
+    Int iPOClsb = 0;
+#endif
+#endif
+
   if(!rpcSlice->getDependentSliceSegmentFlag())
   {
@@ -2512 +2518 @@
     }
 #if N0065_LAYER_POC_ALIGNMENT
+#if !Q0142_POC_LSB_NOT_PRESENT
 #if SHM_FIX7
     Int iPOClsb = 0;
+#endif
 #endif
 #if O0062_POC_LSB_NOT_PRESENT_FLAG
@@ -3180 +3188 @@
       rpcSlice->setPocResetIdc( 0 );
     }
+#if Q0142_POC_LSB_NOT_PRESENT
+    if ( rpcSlice->getVPS()->getPocLsbNotPresentFlag(rpcSlice->getLayerId()) && iPOClsb > 0 )
+    {
+      assert( rpcSlice->getPocResetIdc() != 2 );
+    }
+#endif
     if( rpcSlice->getPocResetIdc() > 0 )
     {
@@ -3194 +3208 @@
       READ_FLAG( uiCode,        "full_poc_reset_flag"); rpcSlice->setFullPocResetFlag((uiCode == 1) ? true : false);
       READ_CODE(rpcSlice->getSPS()->getBitsForPOC(), uiCode,"poc_lsb_val"); rpcSlice->setPocLsbVal(uiCode);
+#if Q0142_POC_LSB_NOT_PRESENT
+      if ( rpcSlice->getVPS()->getPocLsbNotPresentFlag(rpcSlice->getLayerId()) && rpcSlice->getFullPocResetFlag() )
+      {
+        assert( rpcSlice->getPocLsbVal() == 0 );
+      }
+#endif
     }