shithub: openh264

Download patch

ref: bb21b62cbddca3598dadb68344677f557c22ea89
parent: 1cf68cad1393ff918894e4da76954850e80dc9e2
author: Martin Storsjö <[email protected]>
date: Tue Jan 27 06:49:26 EST 2015 

Simplify the MC unit tests now that the luma functions have a similar signature


--- a/test/decoder/DecUT_MotionCompensation.cpp
+++ b/test/decoder/DecUT_MotionCompensation.cpp
@@ -4,8 +4,7 @@
 #include "cpu.h"
 using namespace WelsDec;
 
-#define LUMA_FUNC(funcs, src, srcstride, dst, dststride, mvx, mvy, width, height) \
-  sMcFunc.pMcLumaFunc (src, srcstride, dst, dststride, mvx, mvy, width, height)
+#define LUMA_FUNC sMcFunc.pMcLumaFunc
 
 #define CHROMA_FUNC sMcFunc.pMcChromaFunc
 
--- a/test/encoder/EncUT_MotionCompensation.cpp
+++ b/test/encoder/EncUT_MotionCompensation.cpp
@@ -6,8 +6,7 @@
 
 #define InitMcFunc WelsInitMcFuncs
 
-#define LUMA_FUNC(funcs, src, srcstride, dst, dststride, mvx, mvy, width, height) \
-  sMcFunc.pfLumaMc (src, srcstride, dst, dststride, mvx, mvy, width, height)
+#define LUMA_FUNC sMcFunc.pfLumaMc
 
 #define CHROMA_FUNC sMcFunc.pfChromaMc
 
--- a/test/mc_test_common.h
+++ b/test/mc_test_common.h
@@ -138,7 +138,7 @@
       memset(uDstAnchor,0,sizeof(uint8_t)*MC_BUFF_HEIGHT*MC_BUFF_DST_STRIDE);\
       memset(uDstTest,0,sizeof(uint8_t)*MC_BUFF_HEIGHT*MC_BUFF_DST_STRIDE);  \
       MCCopyAnchor(uSrcAnchor[0],MC_BUFF_SRC_STRIDE,uDstAnchor[0],MC_BUFF_DST_STRIDE,iW,iH);   \
-      LUMA_FUNC(&sMcFunc,uSrcTest[0],MC_BUFF_SRC_STRIDE,uDstTest[0],MC_BUFF_DST_STRIDE,0,0,iW,iH); \
+      LUMA_FUNC(uSrcTest[0],MC_BUFF_SRC_STRIDE,uDstTest[0],MC_BUFF_DST_STRIDE,0,0,iW,iH); \
       for(int32_t j=0;j<MC_BUFF_HEIGHT;j++)   \
       {                                                                             \
         for(int32_t i=0;i<MC_BUFF_DST_STRIDE;i++)                                  \
@@ -188,7 +188,7 @@
       memset(uDstTest,0,sizeof(uint8_t)*MC_BUFF_HEIGHT*MC_BUFF_DST_STRIDE); \
       MCHalfPelFilterAnchor(uSrcInputAnchor[1],uSrcInputAnchor[2],uSrcInputAnchor[3],uSrcInputAnchor[0],MC_BUFF_SRC_STRIDE,iW+1,iH+1,pBuf+4); \
       MCLumaAnchor(uDstAnchor[0],MC_BUFF_DST_STRIDE,uSrcInputAnchor,MC_BUFF_SRC_STRIDE,a,b,iW,iH); \
-      LUMA_FUNC(&sMcFunc,&uSrcTest[4][4],MC_BUFF_SRC_STRIDE,uDstTest[0],MC_BUFF_DST_STRIDE,a,b,iW,iH);\
+      LUMA_FUNC(&uSrcTest[4][4],MC_BUFF_SRC_STRIDE,uDstTest[0],MC_BUFF_DST_STRIDE,a,b,iW,iH);\
       for(int32_t j=0;j<MC_BUFF_HEIGHT;j++)   \
       {                                                                             \
           for(int32_t i=0;i<MC_BUFF_DST_STRIDE;i++)                                  \