Changeset 1029 in 3DVCSoftware for branches/HTM-11.2-dev0/source/Lib/TLibCommon/TComPrediction.h

Timestamp:

30 Jul 2014, 18:43:21 (10 years ago)

Author:

tech

Message:

Merged 11.2-dev1-MediaTek@1004.

File:

• branches/HTM-11.2-dev0/source/Lib/TLibCommon/TComPrediction.h (modified) (1 diff)

branches/HTM-11.2-dev0/source/Lib/TLibCommon/TComPrediction.h

@@ -176 +176 @@
   PartSize      getPartitionSizeFromDepth(Pel* pDepthPels, UInt uiDepthStride, UInt uiSize);
   Bool          getSegmentMaskFromDepth( Pel* pDepthPels, UInt uiDepthStride, UInt uiWidth, UInt uiHeight, Bool* pMask );
+#if SHARP_DBBP_SIMPLE_FLTER_I0109
+  Void          combineSegmentsWithMask( TComYuv* pInYuv[2], TComYuv* pOutYuv, Bool* pMask, UInt uiWidth, UInt uiHeight, UInt uiPartAddr, UInt partSize );
+#else
   Void          combineSegmentsWithMask( TComYuv* pInYuv[2], TComYuv* pOutYuv, Bool* pMask, UInt uiWidth, UInt uiHeight, UInt uiPartAddr = 0 );
+#endif
 #endif