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

Merge pull request #1763 from mstorsjo/mc-ut-simplify

Browse Source 
Remove the forceC parameter from DEF_MCCOPYTEST
This commit is contained in:
sijchen 2015-01-28 10:13:46 +08:00
commit a00dd56f1c
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/decoder/DecUT_MotionCompensation.cpp
View File

@ -11,16 +11,16 @@ using namespace WelsDec;
#include "mc_test_common.h"
DEF_MCCOPYTEST (, 2, 2, 1)
DEF_MCCOPYTEST (, 2, 4, 1)
DEF_MCCOPYTEST (, 4, 2, 0)
DEF_MCCOPYTEST (, 4, 4, 0)
DEF_MCCOPYTEST (, 4, 8, 0)
DEF_MCCOPYTEST (, 8, 4, 0)
DEF_MCCOPYTEST (, 8, 8, 0)
DEF_MCCOPYTEST (, 16, 8, 0)
DEF_MCCOPYTEST (, 8, 16, 0)
DEF_MCCOPYTEST (, 16, 16, 0)
DEF_MCCOPYTEST (, 2, 2)
DEF_MCCOPYTEST (, 2, 4)
DEF_MCCOPYTEST (, 4, 2)
DEF_MCCOPYTEST (, 4, 4)
DEF_MCCOPYTEST (, 4, 8)
DEF_MCCOPYTEST (, 8, 4)
DEF_MCCOPYTEST (, 8, 8)
DEF_MCCOPYTEST (, 16, 8)
DEF_MCCOPYTEST (, 8, 16)
DEF_MCCOPYTEST (, 16, 16)
DEF_LUMA_MCTEST (, 4, 4)
DEF_LUMA_MCTEST (, 4, 8)

4
test/encoder/EncUT_MotionCompensation.cpp
View File

@ -20,8 +20,8 @@ static void McLumaFunc (SMcFunc* pFuncs, const uint8_t* pSrc, int32_t iSrcStride
#include "mc_test_common.h"
DEF_MCCOPYTEST (Enc, 16, 8, 0)
DEF_MCCOPYTEST (Enc, 16, 16, 0)
DEF_MCCOPYTEST (Enc, 16, 8)
DEF_MCCOPYTEST (Enc, 16, 16)
DEF_LUMA_MCTEST (Enc, 16, 8)
DEF_LUMA_MCTEST (Enc, 16, 16)

4
test/mc_test_common.h
View File

@ -108,7 +108,7 @@ static void MCChromaAnchor (uint8_t* pDstU, uint8_t* pDstV, int32_t iDstStride,
}
/**********************MC Unit Test OPENH264 Code Begin******************************/
#define DEF_MCCOPYTEST(pfx, iW,iH, forceC) \
#define DEF_MCCOPYTEST(pfx, iW,iH) \
TEST(pfx##McCopy_c,iW##x##iH) \
{ \
SMcFunc sMcFunc; \
@ -116,7 +116,7 @@ TEST(pfx##McCopy_c,iW##x##iH) \
uint32_t uiCpuFlag;\
for(int32_t k =0; k<2; k++)\
{\
if(k==0||forceC!=0)\
if(k==0)\
{\
uiCpuFlag = 0;\
}else \