Move the qpel function table into the luma function itself

This unifies the luma MC interface to match the decoder side.

Martin Storsjö committed 11 years ago

Commit 1cf68ca1 parent a8262dd5 files · +51 −47Browse files

Showing the changes to test/encoder/EncUT_MotionCompensation.cpp (1 of 5 files). Show all

Unified · Split

 #include "cpu.h"
 using namespace WelsEnc;
-static void McLumaFunc (SMcFunc* pFuncs, const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
-                        int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) {
-  uint8_t uiMvpIdx = ((iMvY & 0x03) << 2) + (iMvX & 0x03);
-  ASSERT_EQ (iWidth, 16);
-  pFuncs->pfLumaQuarpelMc[uiMvpIdx] (pSrc, iSrcStride, pDst, iDstStride, iHeight);
-}
 #define InitMcFunc WelsInitMcFuncs
 #define LUMA_FUNC(funcs, src, srcstride, dst, dststride, mvx, mvy, width, height) \
-  McLumaFunc (funcs, src, srcstride, dst, dststride, mvx, mvy, width, height)
+  sMcFunc.pfLumaMc (src, srcstride, dst, dststride, mvx, mvy, width, height)
 #define CHROMA_FUNC sMcFunc.pfChromaMc

Keyboard shortcuts