Commit 1fd71059 authored by Yaowu Xu's avatar Yaowu Xu Committed by James Zern

lpf_8_test: Use static arrays for test params

fixes compiler warnings in MSVC related to decorated name truncation

Change-Id: I8a46898ac61d97ba3479268f16a93cc5d3169f4b
parent c854bacc
...@@ -412,71 +412,69 @@ using std::tr1::make_tuple; ...@@ -412,71 +412,69 @@ using std::tr1::make_tuple;
#if HAVE_SSE2 #if HAVE_SSE2
#if CONFIG_HIGHBITDEPTH #if CONFIG_HIGHBITDEPTH
INSTANTIATE_TEST_CASE_P(
SSE2, Loop8Test6Param, const loop8_param_t kHbdLoop8Test6[] = {
::testing::Values(make_tuple(&aom_highbd_lpf_horizontal_4_sse2, make_tuple(&aom_highbd_lpf_horizontal_4_sse2, &aom_highbd_lpf_horizontal_4_c,
&aom_highbd_lpf_horizontal_4_c, 8), 8),
make_tuple(&aom_highbd_lpf_vertical_4_sse2, make_tuple(&aom_highbd_lpf_vertical_4_sse2, &aom_highbd_lpf_vertical_4_c, 8),
&aom_highbd_lpf_vertical_4_c, 8), make_tuple(&aom_highbd_lpf_horizontal_8_sse2, &aom_highbd_lpf_horizontal_8_c,
make_tuple(&aom_highbd_lpf_horizontal_8_sse2, 8),
&aom_highbd_lpf_horizontal_8_c, 8), make_tuple(&aom_highbd_lpf_horizontal_edge_8_sse2,
make_tuple(&aom_highbd_lpf_horizontal_edge_8_sse2, &aom_highbd_lpf_horizontal_edge_8_c, 8),
&aom_highbd_lpf_horizontal_edge_8_c, 8), make_tuple(&aom_highbd_lpf_horizontal_edge_16_sse2,
make_tuple(&aom_highbd_lpf_horizontal_edge_16_sse2, &aom_highbd_lpf_horizontal_edge_16_c, 8),
&aom_highbd_lpf_horizontal_edge_16_c, 8), make_tuple(&aom_highbd_lpf_vertical_8_sse2, &aom_highbd_lpf_vertical_8_c, 8),
make_tuple(&aom_highbd_lpf_vertical_8_sse2, make_tuple(&aom_highbd_lpf_vertical_16_sse2, &aom_highbd_lpf_vertical_16_c,
&aom_highbd_lpf_vertical_8_c, 8), 8),
make_tuple(&aom_highbd_lpf_vertical_16_sse2, make_tuple(&aom_highbd_lpf_horizontal_4_sse2, &aom_highbd_lpf_horizontal_4_c,
&aom_highbd_lpf_vertical_16_c, 8), 10),
make_tuple(&aom_highbd_lpf_horizontal_4_sse2, make_tuple(&aom_highbd_lpf_vertical_4_sse2, &aom_highbd_lpf_vertical_4_c, 10),
&aom_highbd_lpf_horizontal_4_c, 10), make_tuple(&aom_highbd_lpf_horizontal_8_sse2, &aom_highbd_lpf_horizontal_8_c,
make_tuple(&aom_highbd_lpf_vertical_4_sse2, 10),
&aom_highbd_lpf_vertical_4_c, 10), make_tuple(&aom_highbd_lpf_horizontal_edge_8_sse2,
make_tuple(&aom_highbd_lpf_horizontal_8_sse2, &aom_highbd_lpf_horizontal_edge_8_c, 10),
&aom_highbd_lpf_horizontal_8_c, 10), make_tuple(&aom_highbd_lpf_horizontal_edge_16_sse2,
make_tuple(&aom_highbd_lpf_horizontal_edge_8_sse2, &aom_highbd_lpf_horizontal_edge_16_c, 10),
&aom_highbd_lpf_horizontal_edge_8_c, 10), make_tuple(&aom_highbd_lpf_vertical_8_sse2, &aom_highbd_lpf_vertical_8_c, 10),
make_tuple(&aom_highbd_lpf_horizontal_edge_16_sse2, make_tuple(&aom_highbd_lpf_vertical_16_sse2, &aom_highbd_lpf_vertical_16_c,
&aom_highbd_lpf_horizontal_edge_16_c, 10), 10),
make_tuple(&aom_highbd_lpf_vertical_8_sse2, make_tuple(&aom_highbd_lpf_horizontal_4_sse2, &aom_highbd_lpf_horizontal_4_c,
&aom_highbd_lpf_vertical_8_c, 10), 12),
make_tuple(&aom_highbd_lpf_vertical_16_sse2, make_tuple(&aom_highbd_lpf_vertical_4_sse2, &aom_highbd_lpf_vertical_4_c, 12),
&aom_highbd_lpf_vertical_16_c, 10), make_tuple(&aom_highbd_lpf_horizontal_8_sse2, &aom_highbd_lpf_horizontal_8_c,
make_tuple(&aom_highbd_lpf_horizontal_4_sse2, 12),
&aom_highbd_lpf_horizontal_4_c, 12), make_tuple(&aom_highbd_lpf_horizontal_edge_8_sse2,
make_tuple(&aom_highbd_lpf_vertical_4_sse2, &aom_highbd_lpf_horizontal_edge_8_c, 12),
&aom_highbd_lpf_vertical_4_c, 12), make_tuple(&aom_highbd_lpf_horizontal_edge_16_sse2,
make_tuple(&aom_highbd_lpf_horizontal_8_sse2, &aom_highbd_lpf_horizontal_edge_16_c, 12),
&aom_highbd_lpf_horizontal_8_c, 12), make_tuple(&aom_highbd_lpf_vertical_8_sse2, &aom_highbd_lpf_vertical_8_c, 12),
make_tuple(&aom_highbd_lpf_horizontal_edge_8_sse2, make_tuple(&aom_highbd_lpf_vertical_16_sse2, &aom_highbd_lpf_vertical_16_c,
&aom_highbd_lpf_horizontal_edge_8_c, 12), 12),
make_tuple(&aom_highbd_lpf_horizontal_edge_16_sse2, make_tuple(&aom_highbd_lpf_vertical_16_dual_sse2,
&aom_highbd_lpf_horizontal_edge_16_c, 12), &aom_highbd_lpf_vertical_16_dual_c, 8),
make_tuple(&aom_highbd_lpf_vertical_8_sse2, make_tuple(&aom_highbd_lpf_vertical_16_dual_sse2,
&aom_highbd_lpf_vertical_8_c, 12), &aom_highbd_lpf_vertical_16_dual_c, 10),
make_tuple(&aom_highbd_lpf_vertical_16_sse2, make_tuple(&aom_highbd_lpf_vertical_16_dual_sse2,
&aom_highbd_lpf_vertical_16_c, 12), &aom_highbd_lpf_vertical_16_dual_c, 12)
make_tuple(&aom_highbd_lpf_vertical_16_dual_sse2, };
&aom_highbd_lpf_vertical_16_dual_c, 8),
make_tuple(&aom_highbd_lpf_vertical_16_dual_sse2, INSTANTIATE_TEST_CASE_P(SSE2, Loop8Test6Param,
&aom_highbd_lpf_vertical_16_dual_c, 10), ::testing::ValuesIn(kHbdLoop8Test6));
make_tuple(&aom_highbd_lpf_vertical_16_dual_sse2,
&aom_highbd_lpf_vertical_16_dual_c, 12)));
#else #else
INSTANTIATE_TEST_CASE_P( const loop8_param_t kLoop8Test6[] = {
SSE2, Loop8Test6Param, make_tuple(&aom_lpf_horizontal_4_sse2, &aom_lpf_horizontal_4_c, 8),
::testing::Values( make_tuple(&aom_lpf_horizontal_8_sse2, &aom_lpf_horizontal_8_c, 8),
make_tuple(&aom_lpf_horizontal_4_sse2, &aom_lpf_horizontal_4_c, 8), make_tuple(&aom_lpf_horizontal_edge_8_sse2, &aom_lpf_horizontal_edge_8_c, 8),
make_tuple(&aom_lpf_horizontal_8_sse2, &aom_lpf_horizontal_8_c, 8), make_tuple(&aom_lpf_horizontal_edge_16_sse2, &aom_lpf_horizontal_edge_16_c,
make_tuple(&aom_lpf_horizontal_edge_8_sse2, 8),
&aom_lpf_horizontal_edge_8_c, 8), make_tuple(&aom_lpf_vertical_4_sse2, &aom_lpf_vertical_4_c, 8),
make_tuple(&aom_lpf_horizontal_edge_16_sse2, make_tuple(&aom_lpf_vertical_8_sse2, &aom_lpf_vertical_8_c, 8),
&aom_lpf_horizontal_edge_16_c, 8), make_tuple(&aom_lpf_vertical_16_sse2, &aom_lpf_vertical_16_c, 8),
make_tuple(&aom_lpf_vertical_4_sse2, &aom_lpf_vertical_4_c, 8), make_tuple(&aom_lpf_vertical_16_dual_sse2, &aom_lpf_vertical_16_dual_c, 8)
make_tuple(&aom_lpf_vertical_8_sse2, &aom_lpf_vertical_8_c, 8), };
make_tuple(&aom_lpf_vertical_16_sse2, &aom_lpf_vertical_16_c, 8),
make_tuple(&aom_lpf_vertical_16_dual_sse2, &aom_lpf_vertical_16_dual_c, INSTANTIATE_TEST_CASE_P(SSE2, Loop8Test6Param,
8))); ::testing::ValuesIn(kLoop8Test6));
#endif // CONFIG_HIGHBITDEPTH #endif // CONFIG_HIGHBITDEPTH
#endif #endif
...@@ -491,43 +489,45 @@ INSTANTIATE_TEST_CASE_P( ...@@ -491,43 +489,45 @@ INSTANTIATE_TEST_CASE_P(
#if HAVE_SSE2 #if HAVE_SSE2
#if CONFIG_HIGHBITDEPTH #if CONFIG_HIGHBITDEPTH
INSTANTIATE_TEST_CASE_P( const dualloop8_param_t kHbdLoop8Test9[] = {
SSE2, Loop8Test9Param, make_tuple(&aom_highbd_lpf_horizontal_4_dual_sse2,
::testing::Values(make_tuple(&aom_highbd_lpf_horizontal_4_dual_sse2, &aom_highbd_lpf_horizontal_4_dual_c, 8),
&aom_highbd_lpf_horizontal_4_dual_c, 8), make_tuple(&aom_highbd_lpf_horizontal_8_dual_sse2,
make_tuple(&aom_highbd_lpf_horizontal_8_dual_sse2, &aom_highbd_lpf_horizontal_8_dual_c, 8),
&aom_highbd_lpf_horizontal_8_dual_c, 8), make_tuple(&aom_highbd_lpf_vertical_4_dual_sse2,
make_tuple(&aom_highbd_lpf_vertical_4_dual_sse2, &aom_highbd_lpf_vertical_4_dual_c, 8),
&aom_highbd_lpf_vertical_4_dual_c, 8), make_tuple(&aom_highbd_lpf_vertical_8_dual_sse2,
make_tuple(&aom_highbd_lpf_vertical_8_dual_sse2, &aom_highbd_lpf_vertical_8_dual_c, 8),
&aom_highbd_lpf_vertical_8_dual_c, 8), make_tuple(&aom_highbd_lpf_horizontal_4_dual_sse2,
make_tuple(&aom_highbd_lpf_horizontal_4_dual_sse2, &aom_highbd_lpf_horizontal_4_dual_c, 10),
&aom_highbd_lpf_horizontal_4_dual_c, 10), make_tuple(&aom_highbd_lpf_horizontal_8_dual_sse2,
make_tuple(&aom_highbd_lpf_horizontal_8_dual_sse2, &aom_highbd_lpf_horizontal_8_dual_c, 10),
&aom_highbd_lpf_horizontal_8_dual_c, 10), make_tuple(&aom_highbd_lpf_vertical_4_dual_sse2,
make_tuple(&aom_highbd_lpf_vertical_4_dual_sse2, &aom_highbd_lpf_vertical_4_dual_c, 10),
&aom_highbd_lpf_vertical_4_dual_c, 10), make_tuple(&aom_highbd_lpf_vertical_8_dual_sse2,
make_tuple(&aom_highbd_lpf_vertical_8_dual_sse2, &aom_highbd_lpf_vertical_8_dual_c, 10),
&aom_highbd_lpf_vertical_8_dual_c, 10), make_tuple(&aom_highbd_lpf_horizontal_4_dual_sse2,
make_tuple(&aom_highbd_lpf_horizontal_4_dual_sse2, &aom_highbd_lpf_horizontal_4_dual_c, 12),
&aom_highbd_lpf_horizontal_4_dual_c, 12), make_tuple(&aom_highbd_lpf_horizontal_8_dual_sse2,
make_tuple(&aom_highbd_lpf_horizontal_8_dual_sse2, &aom_highbd_lpf_horizontal_8_dual_c, 12),
&aom_highbd_lpf_horizontal_8_dual_c, 12), make_tuple(&aom_highbd_lpf_vertical_4_dual_sse2,
make_tuple(&aom_highbd_lpf_vertical_4_dual_sse2, &aom_highbd_lpf_vertical_4_dual_c, 12),
&aom_highbd_lpf_vertical_4_dual_c, 12), make_tuple(&aom_highbd_lpf_vertical_8_dual_sse2,
make_tuple(&aom_highbd_lpf_vertical_8_dual_sse2, &aom_highbd_lpf_vertical_8_dual_c, 12)
&aom_highbd_lpf_vertical_8_dual_c, 12))); };
INSTANTIATE_TEST_CASE_P(SSE2, Loop8Test9Param,
::testing::ValuesIn(kHbdLoop8Test9));
#else #else
INSTANTIATE_TEST_CASE_P( const dualloop8_param_t kLoop8Test9[] = {
SSE2, Loop8Test9Param, make_tuple(&aom_lpf_horizontal_4_dual_sse2, &aom_lpf_horizontal_4_dual_c, 8),
::testing::Values(make_tuple(&aom_lpf_horizontal_4_dual_sse2, make_tuple(&aom_lpf_horizontal_8_dual_sse2, &aom_lpf_horizontal_8_dual_c, 8),
&aom_lpf_horizontal_4_dual_c, 8), make_tuple(&aom_lpf_vertical_4_dual_sse2, &aom_lpf_vertical_4_dual_c, 8),
make_tuple(&aom_lpf_horizontal_8_dual_sse2, make_tuple(&aom_lpf_vertical_8_dual_sse2, &aom_lpf_vertical_8_dual_c, 8)
&aom_lpf_horizontal_8_dual_c, 8), };
make_tuple(&aom_lpf_vertical_4_dual_sse2,
&aom_lpf_vertical_4_dual_c, 8), INSTANTIATE_TEST_CASE_P(SSE2, Loop8Test9Param,
make_tuple(&aom_lpf_vertical_8_dual_sse2, ::testing::ValuesIn(kLoop8Test9));
&aom_lpf_vertical_8_dual_c, 8)));
#endif // CONFIG_HIGHBITDEPTH #endif // CONFIG_HIGHBITDEPTH
#endif #endif
......
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