Changeset 254 in 3DVCSoftware for branches/HTM-5.1-dev2-Mediatek/source/Lib/TLibEncoder/TEncSlice.cpp
- Timestamp:
- 4 Feb 2013, 02:58:35 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-5.1-dev2-Mediatek/source/Lib/TLibEncoder/TEncSlice.cpp
r210 r254 163 163 */ 164 164 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046 165 #if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137 166 Void TEncSlice::initEncSlice( TComPic* pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComVPS * pVPS, TComSPS* pSPS, TComPPS *pPPS, bool isDepth ) 167 #else 165 168 Void TEncSlice::initEncSlice( TComPic* pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComVPS * pVPS, TComSPS* pSPS, TComPPS *pPPS ) 169 #endif 166 170 #else 167 171 Void TEncSlice::initEncSlice( TComPic* pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS ) … … 470 474 #elif HHI_MPI 471 475 const int iExtraMergeCandidates = pSPS->getUseMVI() ? 1 : 0; 476 #elif MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137 477 const int iExtraMergeCandidates = ( isDepth || pSPS->getMultiviewMvPredMode() ) ? 1 : 0; 472 478 #else 473 479 const int iExtraMergeCandidates = pSPS->getMultiviewMvPredMode() ? 1 : 0;
Note: See TracChangeset for help on using the changeset viewer.