generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Martin Storsjö 2015-01-27 11:49:26 +02:00
parent 1cf68cad13
commit bb21b62cbd
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/decoder/DecUT_MotionCompensation.cpp
View File

@ -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

3
test/encoder/EncUT_MotionCompensation.cpp
View File

@ -6,8 +6,7 @@ using namespace WelsEnc;
#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

4
test/mc_test_common.h
View File

@ -138,7 +138,7 @@ TEST(pfx##McCopy_c,iW##x##iH) \
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 @@ TEST(pfx##McHorVer,iW##x##iH) \
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++) \