Changeset 867 in 3DVCSoftware for branches/HTM-10.0-dev0/source/Lib/TLibCommon

Timestamp:

15 Mar 2014, 08:37:13 (11 years ago)

Author:

qualcomm

Message:

POC-related in slice header (Macro: H_MV_HLS_7_POC_P0041)

POC-related signaling in slice header tested and included. Decoding process and encoder assignment in a later patch.

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/HTM-10.0-dev0/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (1 diff)
• TComSlice.h (modified) (5 diffs)

branches/HTM-10.0-dev0/source/Lib/TLibCommon/TComSlice.cpp

@@ -112 +112 @@
 , m_interLayerPredEnabledFlag     (false)
 , m_numInterLayerRefPicsMinus1    (0)
+#if H_MV_HLS_7_POC_P0041
+, m_sliceSegmentHeaderExtensionLength (0)
+, m_pocResetIdc                       (0)
+, m_pocResetPeriodId                  (0)
+, m_fullPocResetFlag                  (false)
+, m_pocLsbVal                         (0)
+, m_pocMsbValPresentFlag              (false)
+, m_pocMsbVal                         (0)
+, m_pocMsbValRequiredFlag         ( false )
+#endif
 #if H_3D_IC
 , m_bApplyIC                      ( false )

branches/HTM-10.0-dev0/source/Lib/TLibCommon/TComSlice.h

@@ -2240 +2240 @@
   Int        m_interLayerPredLayerIdc       [MAX_NUM_LAYERS];
 
-#if H_MV_HLS7_GEN
+#if H_MV_HLS_7_POC_P0041
   Int        m_sliceSegmentHeaderExtensionLength;
   Int        m_pocResetIdc;
@@ -2248 +2248 @@
   Bool       m_pocMsbValPresentFlag;
   Int        m_pocMsbVal;
+  Bool       m_pocMsbValRequiredFlag;
 #endif
 
@@ -2596 +2597 @@
   Int  getInterLayerPredLayerIdc( Int i ) { return m_interLayerPredLayerIdc[i]; } 
 
-#if H_MV_HLS7_GEN
+#if H_MV_HLS_7_POC_P0041
   Void setSliceSegmentHeaderExtensionLength( Int  val ) { m_sliceSegmentHeaderExtensionLength = val; } 
   Int  getSliceSegmentHeaderExtensionLength(  ) { return m_sliceSegmentHeaderExtensionLength; } 
@@ -2618 +2619 @@
   Int  getPocMsbVal(  ) { return m_pocMsbVal; } 
 
+  Bool getPocMsbValRequiredFlag() { return m_pocMsbValRequiredFlag; }
+  Void setPocMsbValRequiredFlag(Bool x) { m_pocMsbValRequiredFlag = x; }
+
+  UInt getPocLsbValLen() { return getSPS()->getBitsForPOC(); }; //log2_max_pic_order_cnt_lsb_minus4 + 4  
+
+  Bool TComSlice::getBlaPicFlag       ()
+  {
+    return  getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_N_LP
+    || getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_RADL
+    || getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_LP;
+  }
+  Bool TComSlice::getCraPicFlag       ()
+  {
+    return getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA;
+  }
 #endif
 
@@ -2638 +2654 @@
   TComPic* getPicFromRefPicSetInterLayer( Int setIdc, Int layerId );
 
-#if H_MV_HLS7_GEN
-  Bool     getPocMsbValRequiredFlag( )        { return   }; 
-  UInt     getPocLsbValLen()                  { return getSPS->getBitsForPOC(); }; //log2_max_pic_order_cnt_lsb_minus4 + 4  
-#endif
 #endif
 #if MTK_DDD_G0063