Changeset 723 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibDecoder

Timestamp:

22 Apr 2014, 19:22:47 (11 years ago)

Author:

seregin

Message:

add a check for motion prediction type of ILRP used as a collocated picture

File:

• branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.cpp (modified) (1 diff)

branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -1763 +1763 @@
       }
     }
-#endif 
+#endif
+
+    if( m_layerId > 0 && pcSlice->getEnableTMVPFlag() )
+    {
+      TComPic* refPic = pcSlice->getRefPic(RefPicList(1 - pcSlice->getColFromL0Flag()), pcSlice->getColRefIdx());
+
+      // It is a requirement of bitstream conformance when the collocated picture, used for temporal motion vector prediction, is an inter-layer reference picture, 
+      // VpsInterLayerMotionPredictionEnabled[ LayerIdxInVps[ currLayerId ] ][ LayerIdxInVps[ rLId ] ] shall be equal to 1, where rLId is set equal to nuh_layer_id of the inter-layer picture.
+      if( refPic->isILR(pcSlice->getLayerId()) )
+      {
+        assert( m_ppcTDecTop[m_layerId]->getMotionPredEnabledFlag(refPic->getLayerId()) );
+      }
+    }
 #endif //SVC_EXTENSION