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

Timestamp:

23 Apr 2014, 08:24:48 (11 years ago)

Author:

seregin

Message:

checks for ILRP prediction type

Location:

branches/SHM-6-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (1 diff)
• TDecTop.cpp (modified) (2 diffs)

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

@@ -2990 +2990 @@
 #if SVC_EXTENSION && REF_IDX_MFM
       // set motion mapping flag
-      rpcSlice->setMFMEnabledFlag( ( rpcSlice->getNumMotionPredRefLayers() > 0 && rpcSlice->getActiveNumILRRefIdx() ) ? true : false );
+      rpcSlice->setMFMEnabledFlag( ( rpcSlice->getNumMotionPredRefLayers() > 0 && rpcSlice->getActiveNumILRRefIdx() && !rpcSlice->isIntra() ) ? true : false );
 #endif
       if ( rpcSlice->getSliceType() == B_SLICE )

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

@@ -1737 +1737 @@
     if( pcSlice->getMFMEnabledFlag() )
     {
-      Int refLayerId = pcSlice->getRefPic( pcSlice->getSliceType() == B_SLICE ? ( RefPicList )( 1 - pcSlice->getColFromL0Flag() ) : REF_PIC_LIST_0 , pcSlice->getColRefIdx() )->getLayerId();
+      TComPic* refPic = pcSlice->getRefPic( pcSlice->getSliceType() == B_SLICE ? ( RefPicList )( 1 - pcSlice->getColFromL0Flag() ) : REF_PIC_LIST_0 , pcSlice->getColRefIdx() );
+
+      assert( refPic );
+
+      Int refLayerId = refPic->getLayerId();
+
       if( refLayerId != pcSlice->getLayerId() )
       {
@@ -1765 +1770 @@
 #endif
 
-    if( m_layerId > 0 && pcSlice->getEnableTMVPFlag() )
+    if( m_layerId > 0 && !pcSlice->isIntra() && pcSlice->getEnableTMVPFlag() )
     {
       TComPic* refPic = pcSlice->getRefPic(RefPicList(1 - pcSlice->getColFromL0Flag()), pcSlice->getColRefIdx());
+
+      assert( refPic );
 
       // It is a requirement of bitstream conformance when the collocated picture, used for temporal motion vector prediction, is an inter-layer reference picture,