Commit 1659191f authored by Yaowu Xu's avatar Yaowu Xu
Browse files

Change to use defined vectors in test

Fixes MSVC2015 build errors

BUG=aomedia:500

Change-Id: I5e6e689932e4f138a16d4c3b89a3d596de48ec75
parent e816b31a
...@@ -126,105 +126,111 @@ TEST_P(AV1IntraPredTest, IntraPredTests) { ...@@ -126,105 +126,111 @@ TEST_P(AV1IntraPredTest, IntraPredTests) {
#if HAVE_SSE2 #if HAVE_SSE2
#if CONFIG_HIGHBITDEPTH #if CONFIG_HIGHBITDEPTH
INSTANTIATE_TEST_CASE_P( const IntraPredFunc IntraPredTestVector8[] = {
SSE2_TO_C_8, AV1IntraPredTest, IntraPredFunc(&aom_highbd_dc_predictor_32x32_sse2,
::testing::Values(IntraPredFunc(&aom_highbd_dc_predictor_32x32_sse2, &aom_highbd_dc_predictor_32x32_c, 32, 8),
&aom_highbd_dc_predictor_32x32_c, 32, 8),
#if !CONFIG_ALT_INTRA #if !CONFIG_ALT_INTRA
IntraPredFunc(&aom_highbd_tm_predictor_16x16_sse2, IntraPredFunc(&aom_highbd_tm_predictor_16x16_sse2,
&aom_highbd_tm_predictor_16x16_c, 16, 8), &aom_highbd_tm_predictor_16x16_c, 16, 8),
IntraPredFunc(&aom_highbd_tm_predictor_32x32_sse2, IntraPredFunc(&aom_highbd_tm_predictor_32x32_sse2,
&aom_highbd_tm_predictor_32x32_c, 32, 8), &aom_highbd_tm_predictor_32x32_c, 32, 8),
#endif // !CONFIG_ALT_INTRA #endif // !CONFIG_ALT_INTRA
IntraPredFunc(&aom_highbd_dc_predictor_4x4_sse2, IntraPredFunc(&aom_highbd_dc_predictor_4x4_sse2,
&aom_highbd_dc_predictor_4x4_c, 4, 8), &aom_highbd_dc_predictor_4x4_c, 4, 8),
IntraPredFunc(&aom_highbd_dc_predictor_8x8_sse2, IntraPredFunc(&aom_highbd_dc_predictor_8x8_sse2,
&aom_highbd_dc_predictor_8x8_c, 8, 8), &aom_highbd_dc_predictor_8x8_c, 8, 8),
IntraPredFunc(&aom_highbd_dc_predictor_16x16_sse2, IntraPredFunc(&aom_highbd_dc_predictor_16x16_sse2,
&aom_highbd_dc_predictor_16x16_c, 16, 8), &aom_highbd_dc_predictor_16x16_c, 16, 8),
IntraPredFunc(&aom_highbd_v_predictor_4x4_sse2, IntraPredFunc(&aom_highbd_v_predictor_4x4_sse2, &aom_highbd_v_predictor_4x4_c,
&aom_highbd_v_predictor_4x4_c, 4, 8), 4, 8),
IntraPredFunc(&aom_highbd_v_predictor_8x8_sse2, IntraPredFunc(&aom_highbd_v_predictor_8x8_sse2, &aom_highbd_v_predictor_8x8_c,
&aom_highbd_v_predictor_8x8_c, 8, 8), 8, 8),
IntraPredFunc(&aom_highbd_v_predictor_16x16_sse2, IntraPredFunc(&aom_highbd_v_predictor_16x16_sse2,
&aom_highbd_v_predictor_16x16_c, 16, 8), &aom_highbd_v_predictor_16x16_c, 16, 8),
IntraPredFunc(&aom_highbd_v_predictor_32x32_sse2, IntraPredFunc(&aom_highbd_v_predictor_32x32_sse2,
&aom_highbd_v_predictor_32x32_c, 32, 8) &aom_highbd_v_predictor_32x32_c, 32, 8)
#if !CONFIG_ALT_INTRA #if !CONFIG_ALT_INTRA
, ,
IntraPredFunc(&aom_highbd_tm_predictor_4x4_sse2, IntraPredFunc(&aom_highbd_tm_predictor_4x4_sse2,
&aom_highbd_tm_predictor_4x4_c, 4, 8), &aom_highbd_tm_predictor_4x4_c, 4, 8),
IntraPredFunc(&aom_highbd_tm_predictor_8x8_sse2, IntraPredFunc(&aom_highbd_tm_predictor_8x8_sse2,
&aom_highbd_tm_predictor_8x8_c, 8, 8) &aom_highbd_tm_predictor_8x8_c, 8, 8)
#endif // !CONFIG_ALT_INTRA #endif // !CONFIG_ALT_INTRA
)); };
INSTANTIATE_TEST_CASE_P(SSE2_TO_C_8, AV1IntraPredTest,
::testing::ValuesIn(IntraPredTestVector8));
INSTANTIATE_TEST_CASE_P( const IntraPredFunc IntraPredTestVector10[] = {
SSE2_TO_C_10, AV1IntraPredTest, IntraPredFunc(&aom_highbd_dc_predictor_32x32_sse2,
::testing::Values(IntraPredFunc(&aom_highbd_dc_predictor_32x32_sse2, &aom_highbd_dc_predictor_32x32_c, 32, 10),
&aom_highbd_dc_predictor_32x32_c, 32, 10),
#if !CONFIG_ALT_INTRA #if !CONFIG_ALT_INTRA
IntraPredFunc(&aom_highbd_tm_predictor_16x16_sse2, IntraPredFunc(&aom_highbd_tm_predictor_16x16_sse2,
&aom_highbd_tm_predictor_16x16_c, 16, 10), &aom_highbd_tm_predictor_16x16_c, 16, 10),
IntraPredFunc(&aom_highbd_tm_predictor_32x32_sse2, IntraPredFunc(&aom_highbd_tm_predictor_32x32_sse2,
&aom_highbd_tm_predictor_32x32_c, 32, 10), &aom_highbd_tm_predictor_32x32_c, 32, 10),
#endif // !CONFIG_ALT_INTRA #endif // !CONFIG_ALT_INTRA
IntraPredFunc(&aom_highbd_dc_predictor_4x4_sse2, IntraPredFunc(&aom_highbd_dc_predictor_4x4_sse2,
&aom_highbd_dc_predictor_4x4_c, 4, 10), &aom_highbd_dc_predictor_4x4_c, 4, 10),
IntraPredFunc(&aom_highbd_dc_predictor_8x8_sse2, IntraPredFunc(&aom_highbd_dc_predictor_8x8_sse2,
&aom_highbd_dc_predictor_8x8_c, 8, 10), &aom_highbd_dc_predictor_8x8_c, 8, 10),
IntraPredFunc(&aom_highbd_dc_predictor_16x16_sse2, IntraPredFunc(&aom_highbd_dc_predictor_16x16_sse2,
&aom_highbd_dc_predictor_16x16_c, 16, 10), &aom_highbd_dc_predictor_16x16_c, 16, 10),
IntraPredFunc(&aom_highbd_v_predictor_4x4_sse2, IntraPredFunc(&aom_highbd_v_predictor_4x4_sse2, &aom_highbd_v_predictor_4x4_c,
&aom_highbd_v_predictor_4x4_c, 4, 10), 4, 10),
IntraPredFunc(&aom_highbd_v_predictor_8x8_sse2, IntraPredFunc(&aom_highbd_v_predictor_8x8_sse2, &aom_highbd_v_predictor_8x8_c,
&aom_highbd_v_predictor_8x8_c, 8, 10), 8, 10),
IntraPredFunc(&aom_highbd_v_predictor_16x16_sse2, IntraPredFunc(&aom_highbd_v_predictor_16x16_sse2,
&aom_highbd_v_predictor_16x16_c, 16, 10), &aom_highbd_v_predictor_16x16_c, 16, 10),
IntraPredFunc(&aom_highbd_v_predictor_32x32_sse2, IntraPredFunc(&aom_highbd_v_predictor_32x32_sse2,
&aom_highbd_v_predictor_32x32_c, 32, 10) &aom_highbd_v_predictor_32x32_c, 32, 10)
#if !CONFIG_ALT_INTRA #if !CONFIG_ALT_INTRA
, ,
IntraPredFunc(&aom_highbd_tm_predictor_4x4_sse2, IntraPredFunc(&aom_highbd_tm_predictor_4x4_sse2,
&aom_highbd_tm_predictor_4x4_c, 4, 10), &aom_highbd_tm_predictor_4x4_c, 4, 10),
IntraPredFunc(&aom_highbd_tm_predictor_8x8_sse2, IntraPredFunc(&aom_highbd_tm_predictor_8x8_sse2,
&aom_highbd_tm_predictor_8x8_c, 8, 10) &aom_highbd_tm_predictor_8x8_c, 8, 10)
#endif // !CONFIG_ALT_INTRA #endif // !CONFIG_ALT_INTRA
)); };
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(SSE2_TO_C_10, AV1IntraPredTest,
SSE2_TO_C_12, AV1IntraPredTest, ::testing::ValuesIn(IntraPredTestVector10));
::testing::Values(IntraPredFunc(&aom_highbd_dc_predictor_32x32_sse2,
&aom_highbd_dc_predictor_32x32_c, 32, 12), const IntraPredFunc IntraPredTestVector12[] = {
IntraPredFunc(&aom_highbd_dc_predictor_32x32_sse2,
&aom_highbd_dc_predictor_32x32_c, 32, 12),
#if !CONFIG_ALT_INTRA #if !CONFIG_ALT_INTRA
IntraPredFunc(&aom_highbd_tm_predictor_16x16_sse2, IntraPredFunc(&aom_highbd_tm_predictor_16x16_sse2,
&aom_highbd_tm_predictor_16x16_c, 16, 12), &aom_highbd_tm_predictor_16x16_c, 16, 12),
IntraPredFunc(&aom_highbd_tm_predictor_32x32_sse2, IntraPredFunc(&aom_highbd_tm_predictor_32x32_sse2,
&aom_highbd_tm_predictor_32x32_c, 32, 12), &aom_highbd_tm_predictor_32x32_c, 32, 12),
#endif // !CONFIG_ALT_INTRA #endif // !CONFIG_ALT_INTRA
IntraPredFunc(&aom_highbd_dc_predictor_4x4_sse2, IntraPredFunc(&aom_highbd_dc_predictor_4x4_sse2,
&aom_highbd_dc_predictor_4x4_c, 4, 12), &aom_highbd_dc_predictor_4x4_c, 4, 12),
IntraPredFunc(&aom_highbd_dc_predictor_8x8_sse2, IntraPredFunc(&aom_highbd_dc_predictor_8x8_sse2,
&aom_highbd_dc_predictor_8x8_c, 8, 12), &aom_highbd_dc_predictor_8x8_c, 8, 12),
IntraPredFunc(&aom_highbd_dc_predictor_16x16_sse2, IntraPredFunc(&aom_highbd_dc_predictor_16x16_sse2,
&aom_highbd_dc_predictor_16x16_c, 16, 12), &aom_highbd_dc_predictor_16x16_c, 16, 12),
IntraPredFunc(&aom_highbd_v_predictor_4x4_sse2, IntraPredFunc(&aom_highbd_v_predictor_4x4_sse2, &aom_highbd_v_predictor_4x4_c,
&aom_highbd_v_predictor_4x4_c, 4, 12), 4, 12),
IntraPredFunc(&aom_highbd_v_predictor_8x8_sse2, IntraPredFunc(&aom_highbd_v_predictor_8x8_sse2, &aom_highbd_v_predictor_8x8_c,
&aom_highbd_v_predictor_8x8_c, 8, 12), 8, 12),
IntraPredFunc(&aom_highbd_v_predictor_16x16_sse2, IntraPredFunc(&aom_highbd_v_predictor_16x16_sse2,
&aom_highbd_v_predictor_16x16_c, 16, 12), &aom_highbd_v_predictor_16x16_c, 16, 12),
IntraPredFunc(&aom_highbd_v_predictor_32x32_sse2, IntraPredFunc(&aom_highbd_v_predictor_32x32_sse2,
&aom_highbd_v_predictor_32x32_c, 32, 12) &aom_highbd_v_predictor_32x32_c, 32, 12)
#if !CONFIG_ALT_INTRA #if !CONFIG_ALT_INTRA
, ,
IntraPredFunc(&aom_highbd_tm_predictor_4x4_sse2, IntraPredFunc(&aom_highbd_tm_predictor_4x4_sse2,
&aom_highbd_tm_predictor_4x4_c, 4, 12), &aom_highbd_tm_predictor_4x4_c, 4, 12),
IntraPredFunc(&aom_highbd_tm_predictor_8x8_sse2, IntraPredFunc(&aom_highbd_tm_predictor_8x8_sse2,
&aom_highbd_tm_predictor_8x8_c, 8, 12) &aom_highbd_tm_predictor_8x8_c, 8, 12)
#endif // !CONFIG_ALT_INTRA #endif // !CONFIG_ALT_INTRA
)); };
INSTANTIATE_TEST_CASE_P(SSE2_TO_C_12, AV1IntraPredTest,
::testing::ValuesIn(IntraPredTestVector12));
#endif // CONFIG_HIGHBITDEPTH #endif // CONFIG_HIGHBITDEPTH
#endif // HAVE_SSE2 #endif // HAVE_SSE2
......
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