Changeset 1426 in SHVCSoftware

Timestamp:

5 Aug 2015, 19:47:39 (9 years ago)

Author:

seregin

Message:

fix uninitialized variables at decoder

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp (modified) (2 diffs)

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

@@ -837 +837 @@
   setRefLayerParams(vps);
   m_apcSlicePilot->setNumMotionPredRefLayers(m_numMotionPredRefLayers);
+
+  // set motion mapping flag
+  m_apcSlicePilot->setMFMEnabledFlag( ( m_apcSlicePilot->getNumMotionPredRefLayers() > 0 && m_apcSlicePilot->getActiveNumILRRefIdx() && !m_apcSlicePilot->isIntra() ) ? true : false );
 #endif
 
@@ -1728 +1731 @@
 
     // motion field mapping constraint
-    if( pcSlice->getNumMotionPredRefLayers() > 0 && pcSlice->getActiveNumILRRefIdx() && !pcSlice->isIntra() )
+    if( pcSlice->getMFMEnabledFlag() )
     {
       TComPic* refPic = pcSlice->getRefPic( pcSlice->getSliceType() == B_SLICE ? ( RefPicList )( 1 - pcSlice->getColFromL0Flag() ) : REF_PIC_LIST_0 , pcSlice->getColRefIdx() );