Changeset 195 in SHVCSoftware

Timestamp:

14 May 2013, 18:42:37 (12 years ago)

Author:

sharp

Message:

JCTVC-M0208 proposal 1— A restriction on inter-layer reference pictures
From Sachin Deshpande <sdeshpande@…>

Location:

branches/SHM-2.1-dev/source/Lib

Files:

• TLibCommon/TComSlice.h (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (1 diff)

branches/SHM-2.1-dev/source/Lib/TLibCommon/TComSlice.h

@@ -1616 +1616 @@
   Bool      getIdrPicFlag       ()                              { return getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP; }
   Bool      isIRAP              () const                        { return (getNalUnitType() >= 16) && (getNalUnitType() <= 23); }  
+#if RESTR_CHK
+   Bool     isRADL() {  return (m_eNalUnitType == NAL_UNIT_CODED_SLICE_RADL_N || m_eNalUnitType == NAL_UNIT_CODED_SLICE_RADL_R); }
+   Bool     isRASL()   {   return (m_eNalUnitType == NAL_UNIT_CODED_SLICE_RASL_N || m_eNalUnitType == NAL_UNIT_CODED_SLICE_RASL_R); }
+#endif
+
   Void      checkCRA(TComReferencePictureSet *pReferencePictureSet, Int& pocCRA, Bool& prevRAPisBLA, TComList<TComPic *>& rcListPic);
   Void      decodingRefreshMarking(Int& pocCRA, Bool& bRefreshPending, TComList<TComPic*>& rcListPic);

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

@@ -71 +71 @@
 #define ILP_DECODED_PICTURE              1      ///< M0274: use decoded picture for inter-layer prediction
 #define JCTVC_M0259_LAMBDAREFINEMENT     1      ///< JCTVC-M0259: lambda refinement (encoder only optimization)
+#define RESTR_CHK                        1      ///< JCTVC-M0208 proposal 1
 
 #define REF_IDX_FRAMEWORK                1      ///< inter-layer reference framework

branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -670 +670 @@
 #endif
     {
+#if RESTR_CHK
+      if (pcSlice->getPOC()>0  && pcSlice->isRADL()&& pcPic->getSlice(0)->isRASL())
+      {
+#if JCTVC_M0458_INTERLAYER_RPS_SIG
+        pcSlice->setActiveNumILRRefIdx(0);
+        pcSlice->setInterLayerPredEnabledFlag(0);
+#else
+        pcSlice->setNumILRRefIdx(0);
+#endif
+      }
+#endif
 #if JCTVC_M0458_INTERLAYER_RPS_SIG
       if( pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA )