Changeset 958 in 3DVCSoftware

Timestamp:

8 May 2014, 23:04:15 (11 years ago)

Author:

qualcomm

Message:

Implementation of JCT3V_H0044
MACRO H0044_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/HTM-11.0-dev0-Qualcomm/source/Lib

Files:

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

branches/HTM-11.0-dev0-Qualcomm/source/Lib/TLibCommon/TypeDef.h

@@ -359 +359 @@
 #define MPI_SUBPU_DEFAULT_MV_H0077_H0099_H0111_H0133    1
 #endif
+
+#define H0044_POC_LSB_NOT_PRESENT        1      ///< JCT3V-H0044: Add constraint checking on the value of poc_reset_idc and poc_lsb_val
+
 /////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////   TBD                  //////////////////////////////

branches/HTM-11.0-dev0-Qualcomm/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1944 +1944 @@
   }
   
+#if H0044_POC_LSB_NOT_PRESENT
+    UInt slicePicOrderCntLsb = 0;
+#endif
+
   if(!rpcSlice->getDependentSliceSegmentFlag())
   {
@@ -1994 +1998 @@
 
 #if H_MV
+#if !H0044_POC_LSB_NOT_PRESENT
     UInt slicePicOrderCntLsb = 0;
+#endif
     Int iPOClsb = slicePicOrderCntLsb;  // Needed later
     if ( (rpcSlice->getLayerId() > 0 && !vps->getPocLsbNotPresentFlag( rpcSlice->getLayerIdInVps())) || !rpcSlice->getIdrPicFlag() )
@@ -2579 +2585 @@
     }
 
+#if H0044_POC_LSB_NOT_PRESENT
+    if ( rpcSlice->getVPS()->getPocLsbNotPresentFlag(rpcSlice->getLayerId()) && slicePicOrderCntLsb > 0 )
+    {
+      assert( rpcSlice->getPocResetIdc() != 2 );
+    }
+#endif
     if( rpcSlice->getPocResetIdc() !=  0 )
     {
@@ -2593 +2605 @@
       READ_FLAG( uiCode, "full_poc_reset_flag" ); rpcSlice->setFullPocResetFlag( uiCode == 1 );
       READ_CODE( rpcSlice->getPocLsbValLen() , uiCode, "poc_lsb_val" ); rpcSlice->setPocLsbVal( uiCode );
+#if H0044_POC_LSB_NOT_PRESENT
+      if ( rpcSlice->getVPS()->getPocLsbNotPresentFlag(rpcSlice->getLayerId()) && rpcSlice->getFullPocResetFlag() )
+      {
+        assert( rpcSlice->getPocLsbVal() == 0 );
+      }
+#endif
     }