- Timestamp:
- 19 May 2013, 10:47:55 (12 years ago)
- Location:
- branches/HTM-6.2-dev2-MERL/source/Lib
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComDataCU.cpp
r416 r418 1747 1747 memcpy( rpcCU->getVSPIndex() + m_uiAbsIdxInLCU, m_piVSPIndex, iSizeInChar ); 1748 1748 #if MERL_VSP_NBDV_RefVId_Fix_D0166 1749 memcpy( rpcCU->getVSPDir () 1749 memcpy( rpcCU->getVSPDir () + m_uiAbsIdxInLCU, m_piVSPDir , iSizeInChar ); 1750 1750 #endif 1751 1751 #endif … … 1884 1884 memcpy( rpcCU->getVSPIndex() + uiPartOffset, m_piVSPIndex, iSizeInChar ); 1885 1885 #if MERL_VSP_NBDV_RefVId_Fix_D0166 1886 memcpy( rpcCU->getVSPDir () + uiPartOffset, m_piVSPDir ,iSizeInChar );1886 memcpy( rpcCU->getVSPDir () + uiPartOffset, m_piVSPDir , iSizeInChar ); 1887 1887 #endif 1888 1888 #endif … … 3865 3865 #if MERL_VSP_NBDV_RefVId_Fix_D0166 3866 3866 cDisInfo.m_aListIdx[0] = getDvInfo(uiAbsPartIdx).m_aListIdx[0]; 3867 cDisInfo.m_aRefIdx[0] = getDvInfo(uiAbsPartIdx).m_aRefIdx[0];3867 cDisInfo.m_aRefIdx[0] = getDvInfo(uiAbsPartIdx).m_aRefIdx[0]; 3868 3868 #endif 3869 3869 #endif … … 4380 4380 #endif 4381 4381 #if MERL_VSP_C0152 4382 4382 xInheritVspMode( pcCULeftBottom, uiLeftBottomPartIdx, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo 4383 4383 #if MERL_VSP_NBDV_RefVId_Fix_D0166 4384 4384 , iVSPDirTrue … … 4438 4438 #endif 4439 4439 #if MERL_VSP_C0152 4440 xInheritVspMode( pcCUAboveLeft, uiAboveLeftPartIdx, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo4440 xInheritVspMode( pcCUAboveLeft, uiAboveLeftPartIdx, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo 4441 4441 #if MERL_VSP_NBDV_RefVId_Fix_D0166 4442 4442 , iVSPDirTrue … … 5521 5521 Bool TComDataCU::getRefListAndRefFrmIdx(Int targetRefViewIdx, RefPicList& eRefPicList, Int& refFrmIdx) 5522 5522 { 5523 Bool isFound 5523 Bool isFound = false; 5524 5524 RefPicList privateRefPicList = REF_PIC_LIST_0; 5525 5525 … … 5894 5894 pDInfo->m_aRefIdx [ pDInfo->iN ] = -1-refFrmIdx; 5895 5895 assert(pDInfo->m_aRefIdx [ pDInfo->iN ] < 0); 5896 5897 5896 #endif 5898 5897 pDInfo->m_acMvCand[pDInfo->iN] = defaultDV; -
branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComDataCU.h
r412 r418 290 290 inline Void xInheritVspMode ( TComDataCU* pcCURef, UInt uiIdx, Bool* bVspMvZeroDone, Int iCount, Int* iVSPIndexTrue, TComMvField* pcMvFieldNeighbours, DisInfo* pDInfo 291 291 #if MERL_VSP_NBDV_RefVId_Fix_D0166 292 ,Int *iVSPDirTrue292 , Int *iVSPDirTrue 293 293 #endif 294 294 ) ; -
branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComPrediction.cpp
r417 r418 837 837 assert(pcBaseViewTxtPicYuv != NULL); 838 838 839 // initialize the LUT according to the reference view idx839 // initialize the LUT according to the reference view idx 840 840 pcCU->getSlice()->getBWVSPLUTParam(pShiftLUT, iShiftPrec, pRefPicBaseTxt->getViewId()); 841 841 -
branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TypeDef.h
r413 r418 213 213 #define MERL_VSP_BLOCKSIZE_C0152 4 // JCT3V-C0152: VSP block size, supported values: 1, 2 and 4. 214 214 #define MERL_VSP_C0152_BugFix_ForNoDepthCase 0 // MERL bugfix for test condition of no depth 215 define MERL_CVSP_D01650 // JCT3V-D0165: 1: enable CVSP; 0: disable CVSP.215 #define MERL_CVSP_D0165 0 // JCT3V-D0165: 1: enable CVSP; 0: disable CVSP. 216 216 #define MERL_VSP_NBDV_RefVId_Fix_D0166 0 // JCT3V-D0166: 1: fix the NBDV with ref view selectioin; 0: always use base view with refViewIdx=0 217 217 #define MERL_Bi_VSP_D0166 0 // JCT3V-D0166: 1: add supporting for Bi-VSP, the code under the macro can also handle uni-direction VSP -
branches/HTM-6.2-dev2-MERL/source/Lib/TLibEncoder/TEncSlice.cpp
r412 r418 62 62 #if MERL_VSP_NBDV_RefVId_Fix_D0166 63 63 for(Int iNumCount = 0; iNumCount < MAX_VIEW_NUM; iNumCount++) 64 m_pcListDepthPic[iNumCount] = NULL;64 m_pcListDepthPic[iNumCount] = NULL; 65 65 #endif 66 66 #if FCO_DVP_REFINE_C0132_C0170 … … 155 155 #if MERL_VSP_NBDV_RefVId_Fix_D0166 156 156 for(Int iNumCount = 0; iNumCount < MAX_VIEW_NUM; iNumCount++) 157 m_pcListDepthPic[iNumCount] = NULL;157 m_pcListDepthPic[iNumCount] = NULL; 158 158 #endif 159 159 } … … 834 834 pcSlice->setRefPicBaseDepth(m_pPicBaseDepth); 835 835 #if MERL_VSP_NBDV_RefVId_Fix_D0166 836 for (Int ref viewId=0; refviewId < pcSlice->getViewId(); refviewId++)837 { 838 assert( m_pcListDepthPic[ref viewId] );839 pcSlice->setListDepthPic(m_pcListDepthPic[ref viewId], refviewId);840 pcSlice->setBWVSPLUTParam(m_aiShiftLUT[ref viewId], m_iShiftPrec, refviewId);836 for (Int refViewId=0; refViewId < pcSlice->getViewId(); refViewId++) 837 { 838 assert( m_pcListDepthPic[refViewId] ); 839 pcSlice->setListDepthPic(m_pcListDepthPic[refViewId], refViewId); 840 pcSlice->setBWVSPLUTParam(m_aiShiftLUT[refViewId], m_iShiftPrec, refViewId); 841 841 } 842 842 #endif
Note: See TracChangeset for help on using the changeset viewer.