Changeset 1255 in 3DVCSoftware for branches/HTM-14.1-update-dev3-NTT/source/Lib/TLibCommon/TComPrediction.cpp
- Timestamp:
- 11 Jun 2015, 01:07:43 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-14.1-update-dev3-NTT/source/Lib/TLibCommon/TComPrediction.cpp
r1210 r1255 82 82 } 83 83 } 84 #if H_3D_VSP85 m_pDepthBlock = (Int*) malloc(MAX_NUM_ SPU_W*MAX_NUM_SPU_W*sizeof(Int));84 #if NH_3D_VSP 85 m_pDepthBlock = (Int*) malloc(MAX_NUM_PART_IDXS_IN_CTU_WIDTH*MAX_NUM_PART_IDXS_IN_CTU_WIDTH*sizeof(Int)); 86 86 if (m_pDepthBlock == NULL) 87 87 { … … 94 94 TComPrediction::~TComPrediction() 95 95 { 96 #if H_3D_VSP96 #if NH_3D_VSP 97 97 if (m_pDepthBlock != NULL) 98 98 { … … 186 186 m_acYuvPredBase[1] .create( g_uiMaxCUWidth, g_uiMaxCUHeight ); 187 187 #endif 188 #if H_3D_VSP189 m_cYuvDepthOnVsp.create( g_uiMaxCUWidth, g_uiMaxCUHeight);188 #if NH_3D_VSP 189 m_cYuvDepthOnVsp.create( MAX_CU_SIZE, MAX_CU_SIZE, chromaFormatIDC ); 190 190 #endif 191 191 … … 1205 1205 { 1206 1206 pcCU->getPartIndexAndSize( iPartIdx, uiPartAddr, iWidth, iHeight ); 1207 #if H_3D_VSP1207 #if NH_3D_VSP 1208 1208 if ( pcCU->getVSPFlag(uiPartAddr) == 0) 1209 1209 { … … 1270 1270 #endif 1271 1271 } 1272 #if H_3D_VSP1272 #if NH_3D_VSP 1273 1273 } 1274 1274 else … … 1291 1291 pcCU->getPartIndexAndSize( iPartIdx, uiPartAddr, iWidth, iHeight ); 1292 1292 1293 #if H_3D_VSP1293 #if NH_3D_VSP 1294 1294 if ( pcCU->getVSPFlag(uiPartAddr) == 0 ) 1295 1295 { … … 1355 1355 #endif 1356 1356 } 1357 #if H_3D_VSP1357 #if NH_3D_VSP 1358 1358 } 1359 1359 else … … 1425 1425 } 1426 1426 1427 #if H_3D_VSP1427 #if NH_3D_VSP 1428 1428 Void TComPrediction::xPredInterUniVSP( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi ) 1429 1429 { … … 1446 1446 Void TComPrediction::xPredInterUniSubPU( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi, Int widthSubPU, Int heightSubPU ) 1447 1447 { 1448 UInt numPartsInLine = pcCU->getPic()->getNumPartIn Width();1448 UInt numPartsInLine = pcCU->getPic()->getNumPartInCtuWidth(); 1449 1449 UInt horiNumPartsInSubPU = widthSubPU >> 2; 1450 1450 UInt vertNumPartsInSubPU = (heightSubPU >> 2) * numPartsInLine; … … 1462 1462 pcCU->clipMv(cMv); 1463 1463 1464 xPredInterLumaBlk ( pcCU, pcCU->getSlice()->getRefPic( eRefPicList, refIdx )->getPicYuvRec(), partAddrSubPU, &cMv, widthSubPU, heightSubPU, rpcYuvPred, bi ); 1465 xPredInterChromaBlk( pcCU, pcCU->getSlice()->getRefPic( eRefPicList, refIdx )->getPicYuvRec(), partAddrSubPU, &cMv, widthSubPU, heightSubPU, rpcYuvPred, bi ); 1466 1467 } 1468 } 1469 } 1470 1464 xPredInterBlk( COMPONENT_Y, pcCU, pcCU->getSlice()->getRefPic( eRefPicList, refIdx )->getPicYuvRec(), partAddrSubPU, &cMv, widthSubPU, heightSubPU, rpcYuvPred, bi, pcCU->getSlice()->getSPS()->getBitDepth(CHANNEL_TYPE_LUMA) ); 1465 xPredInterBlk( COMPONENT_Cb, pcCU, pcCU->getSlice()->getRefPic( eRefPicList, refIdx )->getPicYuvRec(), partAddrSubPU, &cMv, widthSubPU, heightSubPU, rpcYuvPred, bi, pcCU->getSlice()->getSPS()->getBitDepth(CHANNEL_TYPE_CHROMA) ); 1466 xPredInterBlk( COMPONENT_Cr, pcCU, pcCU->getSlice()->getRefPic( eRefPicList, refIdx )->getPicYuvRec(), partAddrSubPU, &cMv, widthSubPU, heightSubPU, rpcYuvPred, bi, pcCU->getSlice()->getSPS()->getBitDepth(CHANNEL_TYPE_CHROMA) ); 1467 } 1468 } 1469 } 1471 1470 #endif 1472 1471 … … 1854 1853 } 1855 1854 1856 #if H_3D_VSP 1857 1855 #if NH_3D_VSP 1858 1856 Void TComPrediction::xPredInterBiVSP( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, TComYuv*& rpcYuvPred ) 1859 1857 { … … 1877 1875 } 1878 1876 1879 xWeightedAverage( &m_acYuvPred[0], &m_acYuvPred[1], iRefIdx[0], iRefIdx[1], uiPartAddr, iWidth, iHeight, rpcYuvPred ); 1880 } 1881 1877 xWeightedAverage( &m_acYuvPred[0], &m_acYuvPred[1], iRefIdx[0], iRefIdx[1], uiPartAddr, iWidth, iHeight, rpcYuvPred, pcCU->getSlice()->getSPS()->getBitDepths() ); 1878 } 1882 1879 #endif 1883 1880
Note: See TracChangeset for help on using the changeset viewer.