Changeset 1055 in 3DVCSoftware for branches/HTM-12.0-dev1/source/Lib/TLibCommon/TComSlice.cpp

Timestamp:

26 Sep 2014, 19:29:56 (10 years ago)

Author:

tech

Message:

Merged 12.0_dev0@1053.

File:

• branches/HTM-12.0-dev1/source/Lib/TLibCommon/TComSlice.cpp (modified) (2 diffs)

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

@@ -103 +103 @@
 , m_temporalLayerNonReferenceFlag ( false )
 , m_enableTMVPFlag                ( true )
+#if I0044_SLICE_TMVP
+, m_availableForTMVPRefFlag       ( true )
+#endif
 #if H_MV
 , m_refPicSetInterLayer0           ( NULL )
@@ -725 +728 @@
 
         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 ] ;