Changeset 1426 in SHVCSoftware for branches/SHM-dev


Ignore:
Timestamp:
5 Aug 2015, 19:47:39 (9 years ago)
Author:
seregin
Message:

fix uninitialized variables at decoder

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r1425 r1426  
    837837  setRefLayerParams(vps);
    838838  m_apcSlicePilot->setNumMotionPredRefLayers(m_numMotionPredRefLayers);
     839
     840  // set motion mapping flag
     841  m_apcSlicePilot->setMFMEnabledFlag( ( m_apcSlicePilot->getNumMotionPredRefLayers() > 0 && m_apcSlicePilot->getActiveNumILRRefIdx() && !m_apcSlicePilot->isIntra() ) ? true : false );
    839842#endif
    840843
    … …  
    17281731
    17291732    // motion field mapping constraint
    1730     if( pcSlice->getNumMotionPredRefLayers() > 0 && pcSlice->getActiveNumILRRefIdx() && !pcSlice->isIntra() )
     1733    if( pcSlice->getMFMEnabledFlag() )
    17311734    {
    17321735      TComPic* refPic = pcSlice->getRefPic( pcSlice->getSliceType() == B_SLICE ? ( RefPicList )( 1 - pcSlice->getColFromL0Flag() ) : REF_PIC_LIST_0 , pcSlice->getColRefIdx() );
Note: See TracChangeset for help on using the changeset viewer.