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

Merge "quantize test: lowbd functions do not pass in highbd"

Browse Source
This commit is contained in:
Johann Koenig 2017-07-20 19:45:59 +00:00 committed by Gerrit Code Review
commit 0c30b75f40
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/vp9_quantize_test.cc
View File

@ -353,11 +353,11 @@ using std::tr1::make_tuple;
#if HAVE_SSE2
#if CONFIG_VP9_HIGHBITDEPTH
// TODO(johannkoenig): Fix vpx_quantize_b_sse2 in highbitdepth builds.
// make_tuple(&vpx_quantize_b_sse2, &vpx_highbd_quantize_b_c, VPX_BITS_8),
INSTANTIATE_TEST_CASE_P(
SSE2, VP9QuantizeTest,
::testing::Values(make_tuple(&vpx_quantize_b_sse2, &vpx_highbd_quantize_b_c,
VPX_BITS_8),
make_tuple(&vpx_highbd_quantize_b_sse2,
::testing::Values(make_tuple(&vpx_highbd_quantize_b_sse2,
&vpx_highbd_quantize_b_c, VPX_BITS_8),
make_tuple(&vpx_highbd_quantize_b_sse2,
&vpx_highbd_quantize_b_c, VPX_BITS_10),
@ -392,8 +392,9 @@ INSTANTIATE_TEST_CASE_P(
&vpx_quantize_b_32x32_c, VPX_BITS_8)));
#endif // HAVE_SSSE3 && ARCH_X86_64
// TODO(johannkoenig): AVX optimizations do not yet pass the 32x32 test.
#if HAVE_AVX && ARCH_X86_64
// TODO(johannkoenig): AVX optimizations do not yet pass the 32x32 test or
// highbitdepth configurations.
#if HAVE_AVX && ARCH_X86_64 && !CONFIG_VP9_HIGHBITDEPTH
INSTANTIATE_TEST_CASE_P(AVX, VP9QuantizeTest,
::testing::Values(make_tuple(&vpx_quantize_b_avx,
&vpx_quantize_b_c,
@ -403,5 +404,5 @@ INSTANTIATE_TEST_CASE_P(DISABLED_AVX, VP9Quantize32Test,
::testing::Values(make_tuple(&vpx_quantize_b_32x32_avx,
&vpx_quantize_b_32x32_c,
VPX_BITS_8)));
#endif // HAVE_AVX && ARCH_X86_64
#endif // HAVE_AVX && ARCH_X86_64 && !CONFIG_VP9_HIGHBITDEPTH
} // namespace