Changeset 1052 in 3DVCSoftware

Timestamp:

15 Sep 2014, 23:30:15 (10 years ago)

Author:

qualcomm

Message:

Add checking at decoder side to make sure that Inter-layer RPS does not contain picture with discardable_flag equal to 1 as agreed in G0131

Submitted by Hendry (fhendry@…)

Location:

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

Files:

• TComSlice.cpp (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

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

@@ -725 +725 @@
 
         assert( rpsCurrList[li][ orgIdx ] != NULL ); 
+#if DISCARDABLE_PIC_RPS
+        assert( rpsCurrList[li][ orgIdx ]->getSlice(0)->getDiscardableFlag() == 0 );    // Inter-layer RPS shall not contain picture with discardable_flag = 1.
+#endif
         m_apcRefPicList    [li][rIdx] = rpsCurrList    [li][ orgIdx ];
         m_bIsUsedAsLongTerm[li][rIdx] = usedAsLongTerm [li][ orgIdx ] ; 
+
       }
     }

branches/HTM-12.0-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -380 +380 @@
 ///////////////////////////////////   MV_HEVC HLS  //////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////
+
+//Added by Qualcomm for HLS
+#define DISCARDABLE_PIC_RPS        1      ///< JCTVC-G0131: Inter-layer RPS and temporal RPS should not contain picture with discardable_flag equal to 1
+
 // TBD: Check if integration is necessary. 
 #define H_MV_HLS7_GEN                        0  // General changes (not tested)