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

Add some indirection to the quantize test

Browse Source 
Visual Studio and XCode require the address of the functions be passed.

Change-Id: Id39cab8e50061fdc6ac6018371a3a158c713e14b
This commit is contained in:
Johann
2014-11-04 08:20:25 -08:00
parent 1e753387c8
commit 9c6ce43df6
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test/quantize_test.cc
View File

@@ -213,36 +213,37 @@ TEST_P(QuantizeTestPair, TestMultipleQ) {
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
SSE2, QuantizeTest, SSE2, QuantizeTest,
::testing::Values( ::testing::Values(
make_tuple(vp8_fast_quantize_b_sse2, vp8_fast_quantize_b_c), make_tuple(&vp8_fast_quantize_b_sse2, &vp8_fast_quantize_b_c),
make_tuple(vp8_regular_quantize_b_sse2, vp8_regular_quantize_b_c))); make_tuple(&vp8_regular_quantize_b_sse2, &vp8_regular_quantize_b_c)));
#endif // HAVE_SSE2 #endif // HAVE_SSE2
#if HAVE_SSSE3 #if HAVE_SSSE3
INSTANTIATE_TEST_CASE_P(SSSE3, QuantizeTest, INSTANTIATE_TEST_CASE_P(SSSE3, QuantizeTest,
::testing::Values(make_tuple(vp8_fast_quantize_b_ssse3, ::testing::Values(make_tuple(&vp8_fast_quantize_b_ssse3,
vp8_fast_quantize_b_c))); &vp8_fast_quantize_b_c)));
#endif // HAVE_SSSE3 #endif // HAVE_SSSE3
#if HAVE_SSE4_1 #if HAVE_SSE4_1
INSTANTIATE_TEST_CASE_P(SSE4_1, QuantizeTest, ::testing::Values(make_tuple( INSTANTIATE_TEST_CASE_P(
vp8_regular_quantize_b_sse4_1, SSE4_1, QuantizeTest,
vp8_regular_quantize_b_c))); ::testing::Values(make_tuple(&vp8_regular_quantize_b_sse4_1,
&vp8_regular_quantize_b_c)));
#endif // HAVE_SSE4_1 #endif // HAVE_SSE4_1
#if HAVE_MEDIA #if HAVE_MEDIA
INSTANTIATE_TEST_CASE_P(MEDIA, QuantizeTest, INSTANTIATE_TEST_CASE_P(MEDIA, QuantizeTest,
::testing::Values(make_tuple(vp8_fast_quantize_b_armv6, ::testing::Values(make_tuple(&vp8_fast_quantize_b_armv6,
vp8_fast_quantize_b_c))); &vp8_fast_quantize_b_c)));
#endif // HAVE_MEDIA #endif // HAVE_MEDIA
#if HAVE_NEON_ASM #if HAVE_NEON_ASM
INSTANTIATE_TEST_CASE_P(NEON, QuantizeTest, INSTANTIATE_TEST_CASE_P(NEON, QuantizeTest,
::testing::Values(make_tuple(vp8_fast_quantize_b_neon, ::testing::Values(make_tuple(&vp8_fast_quantize_b_neon,
vp8_fast_quantize_b_c))); &vp8_fast_quantize_b_c)));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
NEON, QuantizeTestPair, NEON, QuantizeTestPair,
::testing::Values(make_tuple(vp8_fast_quantize_b_pair_neon, ::testing::Values(make_tuple(&vp8_fast_quantize_b_pair_neon,
vp8_fast_quantize_b_pair_c))); &vp8_fast_quantize_b_pair_c)));
#endif // HAVE_NEON_ASM #endif // HAVE_NEON_ASM
} // namespace } // namespace