Changeset 1270 in 3DVCSoftware for branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComPrediction.h
- Timestamp:
- 13 Jul 2015, 15:22:02 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComPrediction.h
r1259 r1270 45 45 #include "TComWeightPrediction.h" 46 46 47 #if NH_3D_ARP 48 #include "TComPic.h" 49 #endif 47 50 // forward declaration 48 51 class TComMv; … … 77 80 TComYuv m_acYuvPred[NUM_REF_PIC_LIST_01]; 78 81 TComYuv m_cYuvPredTemp; 79 #if H_3D_ARP82 #if NH_3D_ARP 80 83 TComYuv m_acYuvPredBase[2]; 81 84 #endif … … 100 103 101 104 // motion compensation functions 102 #if H_3D_ARP 103 Void xPredInterUniARP ( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi=false, TComMvField * pNewMvFiled = NULL ); 105 #if NH_3D_ARP 106 Void xPredInterUniARP ( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi ); 107 Void xPredInterUniARPviewRef ( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi ); 104 108 Bool xCheckBiInterviewARP ( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eBaseRefPicList, TComPic*& pcPicYuvCurrTRef, TComMv& cBaseTMV, Int& iCurrTRefPoc ); 105 Void xPredInterUniARPviewRef( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi, TComMvField * pNewMvFiled = NULL );106 109 #endif 107 110 … … 114 117 115 118 Void xPredInterBlk(const ComponentID compID, TComDataCU *cu, TComPicYuv *refPic, UInt partAddr, TComMv *mv, Int width, Int height, TComYuv *dstPic, Bool bi, const Int bitDepth 116 #if H_3D_ARP119 #if NH_3D_ARP 117 120 , Bool filterType = false 118 121 #endif … … 122 125 ); 123 126 124 #if H_3D_ARP125 , Bool filterType = false126 #endif127 127 #if H_3D_IC 128 128 , Bool bICFlag = false … … 187 187 #endif 188 188 189 #if H_3D_DBBP189 #if NH_3D_DBBP 190 190 PartSize getPartitionSizeFromDepth(Pel* pDepthPels, UInt uiDepthStride, UInt uiSize, TComDataCU*& pcCU); 191 191 Bool getSegmentMaskFromDepth( Pel* pDepthPels, UInt uiDepthStride, UInt uiWidth, UInt uiHeight, Bool* pMask, TComDataCU*& pcCU); 192 Void combineSegmentsWithMask( TComYuv* pInYuv[2], TComYuv* pOutYuv, Bool* pMask, UInt uiWidth, UInt uiHeight, UInt uiPartAddr, UInt partSize );192 Void combineSegmentsWithMask( TComYuv* pInYuv[2], TComYuv* pOutYuv, Bool* pMask, UInt uiWidth, UInt uiHeight, UInt uiPartAddr, UInt partSize, Int bitDepthY ); 193 193 #endif 194 194
Note: See TracChangeset for help on using the changeset viewer.