Changeset 1317 in 3DVCSoftware for branches/HTM-15.0-dev0/source/Lib/TLibCommon/TComPrediction.cpp
- Timestamp:
- 4 Sep 2015, 21:28:58 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-15.0-dev0/source/Lib/TLibCommon/TComPrediction.cpp
r1313 r1317 584 584 pcCU->getSPAbsPartIdx(uiPartAddr, iSPWidth, iSPHeight, i, iNumSPInOneLine, uiSPAddr[i]); 585 585 } 586 #if H_3D_ARP || NH_3D_ALIGN_SPIVMP_RP // check this!586 #if NH_3D_ARP 587 587 if( pcCU->getARPW( uiPartAddr ) != 0 ) 588 588 { … … 1302 1302 TComMv cMv = pcCU->getCUMvField( eRefPicList )->getMv( uiPartAddr ); 1303 1303 pcCU->clipMv(cMv); 1304 1305 #if ENC_DEC_TRACE && H_MV_ENC_DEC_TRAC 1306 if ( g_traceMotionInfoBeforUniPred ) 1307 { 1308 std::cout << "RefPic POC : " << pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPOC() << std::endl; 1309 std::cout << "RefPic Layer Id: " << pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getLayerId() << std::endl; 1310 std::cout << "RefIdx : " << iRefIdx << std::endl; 1311 std::cout << "RefPIcList : " << eRefPicList << std::endl; 1312 } 1313 #endif 1314 1304 1315 #if NH_MV 1305 1316 pcCU->checkMvVertRest(cMv, eRefPicList, iRefIdx ); … … 1309 1320 { 1310 1321 if( pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPOC()== pcCU->getSlice()->getPOC() ) 1311 {1322 { 1312 1323 xPredInterUniARPviewRef( pcCU , uiPartAddr , iWidth , iHeight , eRefPicList , pcYuvPred , bi ); 1313 }1314 else1315 {1324 } 1325 else 1326 { 1316 1327 xPredInterUniARP( pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, bi ); 1317 1328 } 1318 } 1319 else 1320 { 1321 #endif 1322 for (UInt comp=COMPONENT_Y; comp<pcYuvPred->getNumberValidComponents(); comp++) 1323 { 1324 const ComponentID compID=ComponentID(comp); 1329 } 1330 else 1331 { 1332 #endif 1333 1334 for (UInt comp=COMPONENT_Y; comp<pcYuvPred->getNumberValidComponents(); comp++) 1335 { 1336 const ComponentID compID=ComponentID(comp); 1325 1337 #if NH_3D_IC 1326 Bool bICFlag = pcCU->getICFlag( uiPartAddr ) && ( pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getViewIndex() != pcCU->getSlice()->getViewIndex() ) && ( isLuma(compID) || (iWidth > 8) );1338 Bool bICFlag = pcCU->getICFlag( uiPartAddr ) && ( pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getViewIndex() != pcCU->getSlice()->getViewIndex() ) && ( isLuma(compID) || (iWidth > 8) ); 1327 1339 xPredInterBlk(compID, pcCU, pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPicYuvRec(), uiPartAddr, &cMv, iWidth, iHeight, pcYuvPred, bi, pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID)) 1328 1340 #if NH_3D_ARP … … 1331 1343 , bICFlag ); 1332 1344 #else 1333 xPredInterBlk (compID, pcCU, pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPicYuvRec(), uiPartAddr, &cMv, iWidth, iHeight, pcYuvPred, bi, pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID)) );1334 #endif 1335 }1345 xPredInterBlk (compID, pcCU, pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPicYuvRec(), uiPartAddr, &cMv, iWidth, iHeight, pcYuvPred, bi, pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID)) ); 1346 #endif 1347 } 1336 1348 #if NH_3D_ARP 1337 1349 } … … 1813 1825 ) 1814 1826 { 1827 #if NH_MV 1828 assert( refPic->getBorderExtension() ); 1829 #endif 1815 1830 Int refStride = refPic->getStride(compID); 1816 1831 Int dstStride = dstPic->getStride(compID);
Note: See TracChangeset for help on using the changeset viewer.