Commit a3e9c506 authored by Linfeng Zhang's avatar Linfeng Zhang

Update convolve 2d unit testing code

Test all possible sizes.

Change-Id: I042c7eef6d7af149885606c1085fac76f913671e
parent 625dfac7
......@@ -26,9 +26,9 @@ using libaom_test::AV1HighbdConvolve2D::AV1HighbdJntConvolve2DTest;
namespace {
TEST_P(AV1Convolve2DTest, DISABLED_Speed) { RunSpeedTest(GET_PARAM(2)); }
TEST_P(AV1Convolve2DTest, DISABLED_Speed) { RunSpeedTest(GET_PARAM(0)); }
TEST_P(AV1Convolve2DTest, CheckOutput) { RunCheckOutput(GET_PARAM(2)); }
TEST_P(AV1Convolve2DTest, CheckOutput) { RunCheckOutput(GET_PARAM(0)); }
INSTANTIATE_TEST_CASE_P(
C_COPY, AV1Convolve2DTest,
......@@ -73,7 +73,7 @@ INSTANTIATE_TEST_CASE_P(
#endif
#if CONFIG_JNT_COMP && HAVE_SSE4_1
TEST_P(AV1JntConvolve2DTest, CheckOutput) { RunCheckOutput(GET_PARAM(2)); }
TEST_P(AV1JntConvolve2DTest, CheckOutput) { RunCheckOutput(GET_PARAM(0)); }
INSTANTIATE_TEST_CASE_P(C_COPY, AV1JntConvolve2DTest,
libaom_test::AV1Convolve2D::BuildParams(
......@@ -89,7 +89,7 @@ INSTANTIATE_TEST_CASE_P(SSE4_1, AV1JntConvolve2DTest,
#endif
#if HAVE_SSSE3
TEST_P(AV1HighbdConvolve2DTest, CheckOutput) { RunCheckOutput(GET_PARAM(3)); }
TEST_P(AV1HighbdConvolve2DTest, CheckOutput) { RunCheckOutput(GET_PARAM(1)); }
INSTANTIATE_TEST_CASE_P(SSSE3, AV1HighbdConvolve2DTest,
libaom_test::AV1HighbdConvolve2D::BuildParams(
......@@ -102,7 +102,7 @@ INSTANTIATE_TEST_CASE_P(
#if CONFIG_JNT_COMP && HAVE_SSE4_1
TEST_P(AV1HighbdJntConvolve2DTest, CheckOutput) {
RunCheckOutput(GET_PARAM(3));
RunCheckOutput(GET_PARAM(1));
}
INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdJntConvolve2DTest,
......
This diff is collapsed.
......@@ -31,8 +31,7 @@ typedef void (*convolve_2d_func)(const uint8_t *src, int src_stride,
const int subpel_x_q4, const int subpel_y_q4,
ConvolveParams *conv_params);
typedef std::tr1::tuple<int, int, convolve_2d_func, int, int, int>
Convolve2DParam;
typedef std::tr1::tuple<convolve_2d_func, int, int, int> Convolve2DParam;
::testing::internal::ParamGenerator<Convolve2DParam> BuildParams(
convolve_2d_func filter, int subx_exist, int suby_exist, int is_compound);
......@@ -75,8 +74,7 @@ typedef void (*highbd_convolve_2d_func)(
InterpFilterParams *filter_params_y, const int subpel_x_q4,
const int subpel_y_q4, ConvolveParams *conv_params, int bd);
typedef std::tr1::tuple<int, int, int, highbd_convolve_2d_func>
HighbdConvolve2DParam;
typedef std::tr1::tuple<int, highbd_convolve_2d_func> HighbdConvolve2DParam;
::testing::internal::ParamGenerator<HighbdConvolve2DParam> BuildParams(
highbd_convolve_2d_func filter);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment