Changeset 96 in SHVCSoftware
- Timestamp:
- 22 Mar 2013, 23:11:21 (12 years ago)
- Location:
- branches/HM-10.0-dev-SHM/source
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HM-10.0-dev-SHM/source/App/TAppEncoder/TAppEncTop.cpp
r90 r96 110 110 111 111 #if REF_IDX_MFM 112 if(layer == 0) 113 { 114 m_acTEncTop[layer].setMFMEnabledFlag(false); 115 } 116 else 117 { 118 m_acTEncTop[layer].setMFMEnabledFlag(true); 119 } 112 m_acTEncTop[layer].setMFMEnabledFlag(layer == 0 ? false : true); 120 113 #endif 121 114 // set layer ID -
branches/HM-10.0-dev-SHM/source/Lib/TLibEncoder/TEncSearch.cpp
r95 r96 6218 6218 Bool foundILR = false; 6219 6219 for( Int refIdx = 0; refIdx < pcCU->getSlice()->getNumRefIdx(eRefPicList); refIdx++ ) 6220 { 6220 6221 if( pcCU->getSlice()->getRefPic(eRefPicList, refIdx)->isILR() ) 6221 6222 { … … 6224 6225 break; 6225 6226 } 6227 } 6226 6228 6227 6229 if(!foundILR) //no ILR in eRefPiclist 6230 { 6228 6231 continue; 6232 } 6229 6233 6230 6234 uiBitsTemp = uiMbBits[iRefList]; … … 6257 6261 6258 6262 if( uiCost[0] == MAX_UINT && uiCost[1] == MAX_UINT ) //no ILR in both list0 and list1 6263 { 6259 6264 return false; 6265 } 6260 6266 6261 6267 // Clear Motion Field … … 6297 6303 } 6298 6304 else 6305 { 6299 6306 assert(0); 6307 } 6300 6308 6301 6309 pcCU->setMergeFlagSubParts( false, uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
Note: See TracChangeset for help on using the changeset viewer.