ref: e5c2f333be6eb645846a52dfadba5ba633cf10bc
parent: d9ee70203173886208364c4f05176438e732a095
author: Martin Storsjö <[email protected]>
date: Tue Jan 27 06:52:02 EST 2015
Remove the forceC parameter from DEF_MCCOPYTEST Even if there actually is no SIMD optimized version of the width==2 cases, luma function for SIMD still needs to handle it by calling McCopyWidthEq2_c for these cases. This simplifies the UT code a little, and makes sure that those codepaths are tested properly.
--- a/test/decoder/DecUT_MotionCompensation.cpp
+++ b/test/decoder/DecUT_MotionCompensation.cpp
@@ -11,16 +11,16 @@
#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)
--- a/test/encoder/EncUT_MotionCompensation.cpp
+++ b/test/encoder/EncUT_MotionCompensation.cpp
@@ -20,8 +20,8 @@
#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)
--- a/test/mc_test_common.h
+++ b/test/mc_test_common.h
@@ -108,7 +108,7 @@
}
/**********************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 @@
uint32_t uiCpuFlag;\
for(int32_t k =0; k<2; k++)\
{\- if(k==0||forceC!=0)\
+ if(k==0)\
{\uiCpuFlag = 0;\
}else \