Changeset 1226 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder
- Timestamp:
- 9 Jul 2015, 00:20:09 (10 years ago)
- Location:
- branches/SHM-dev/source/Lib/TLibDecoder
- Files:
-
- 2 edited
-
TDecCAVLC.cpp (modified) (1 diff)
-
TDecTop.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
r1224 r1226 1745 1745 if ( pcSlice->getEnableTMVPFlag() ) 1746 1746 { 1747 #if SVC_EXTENSION && REF_IDX_MFM1747 #if SVC_EXTENSION 1748 1748 // set motion mapping flag 1749 1749 pcSlice->setMFMEnabledFlag( ( pcSlice->getNumMotionPredRefLayers() > 0 && pcSlice->getActiveNumILRRefIdx() && !pcSlice->isIntra() ) ? true : false ); -
branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp
r1223 r1226 1692 1692 pcSlice->setILRPic( m_cIlpPic ); 1693 1693 1694 #if REF_IDX_MFM1695 1694 pcSlice->setRefPicList( m_cListPic, false, m_cIlpPic); 1696 1695 } … … 1715 1714 } 1716 1715 } 1717 #endif1718 1716 1719 1717 if( m_layerId > 0 && pcSlice->getVPS()->getCrossLayerIrapAlignFlag() && ( !pcSlice->getVPS()->getSingleLayerForNonIrapFlag() || pcSlice->isIRAP() ) )
Note: See TracChangeset for help on using the changeset viewer.