Changeset 1524 in SHVCSoftware for branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp
- Timestamp:
- 3 Feb 2016, 23:00:44 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp
r1517 r1524 249 249 //1 250 250 m_cTEncTop.setInterLayerWeightedPredFlag ( m_useInterLayerWeightedPred ); 251 #if AVC_BASE 251 252 m_cTEncTop.setMFMEnabledFlag ( layer == 0 ? false : ( m_nonHEVCBaseLayerFlag ? false : true ) && m_apcLayerCfg[layer]->getNumMotionPredRefLayers()); 253 #else 254 m_cTEncTop.setMFMEnabledFlag ( layer == 0 ? false : m_apcLayerCfg[layer]->getNumMotionPredRefLayers()); 255 #endif 252 256 253 257 // set layer ID … … 1059 1063 #if AVC_BASE 1060 1064 vps->setNonHEVCBaseLayerFlag( m_nonHEVCBaseLayerFlag ); 1061 if ( m_nonHEVCBaseLayerFlag ) 1062 { 1063 vps->setBaseLayerInternalFlag (false); 1064 } 1065 #else 1066 vps->setAvcBaseLayerFlag(false); 1065 if( m_nonHEVCBaseLayerFlag ) 1066 { 1067 vps->setBaseLayerInternalFlag(false); 1068 } 1067 1069 #endif 1068 1070 … … 1607 1609 { 1608 1610 list<AccessUnit>::iterator first_au = outputAccessUnits.begin(); 1611 #if AVC_BASE 1609 1612 if( m_nonHEVCBaseLayerFlag ) 1610 1613 { 1611 1614 first_au++; 1612 1615 } 1616 #endif 1613 1617 AccessUnit::iterator it_sps; 1614 1618 for (it_sps = first_au->begin(); it_sps != first_au->end(); it_sps++)
Note: See TracChangeset for help on using the changeset viewer.