summaryrefslogtreecommitdiff
path: root/test/vp9_quantize_test.cc
diff options
context:
space:
mode:
authorJohann <johann.koenig@duck.com>2018-11-30 15:42:57 -0800
committerJohann <johann.koenig@duck.com>2018-11-30 16:27:14 -0800
commit5fbc7a286b4d72883392fdbb10ec52bace662f66 (patch)
treebdb6cf66e8eb26819fb1a8ddb602cd75471608cc /test/vp9_quantize_test.cc
parent356174583506fb6654a3de7264348fbbfb7ca62c (diff)
downloadlibvpx-5fbc7a286b4d72883392fdbb10ec52bace662f66.tar
libvpx-5fbc7a286b4d72883392fdbb10ec52bace662f66.tar.gz
libvpx-5fbc7a286b4d72883392fdbb10ec52bace662f66.tar.bz2
libvpx-5fbc7a286b4d72883392fdbb10ec52bace662f66.zip
quantize 32x32: saturate dqcoeff on x86
This slows down low bitdepth builds but is necessary to obtain correct values. BUG=webm:1448 Change-Id: I4ca9145f576089bb8496fcfeedeb556dc8fe6574
Diffstat (limited to 'test/vp9_quantize_test.cc')
-rw-r--r--test/vp9_quantize_test.cc40
1 files changed, 1 insertions, 39 deletions
diff --git a/test/vp9_quantize_test.cc b/test/vp9_quantize_test.cc
index fc648e8cc..c623bfb5b 100644
--- a/test/vp9_quantize_test.cc
+++ b/test/vp9_quantize_test.cc
@@ -496,7 +496,6 @@ INSTANTIATE_TEST_CASE_P(
#endif // HAVE_SSE2
#if HAVE_SSSE3
-#if CONFIG_VP9_HIGHBITDEPTH
#if ARCH_X86_64
INSTANTIATE_TEST_CASE_P(
SSSE3, VP9QuantizeTest,
@@ -521,35 +520,9 @@ INSTANTIATE_TEST_CASE_P(
false)));
#endif // ARCH_X86_64
-#else
-#if ARCH_X86_64
-INSTANTIATE_TEST_CASE_P(
- SSSE3, VP9QuantizeTest,
- ::testing::Values(make_tuple(&vpx_quantize_b_ssse3, &vpx_quantize_b_c,
- VPX_BITS_8, 16, false),
- make_tuple(&QuantFPWrapper<vp9_quantize_fp_ssse3>,
- &QuantFPWrapper<quantize_fp_nz_c>, VPX_BITS_8,
- 16, true),
- make_tuple(&QuantFPWrapper<vp9_quantize_fp_32x32_ssse3>,
- &QuantFPWrapper<quantize_fp_32x32_nz_c>,
- VPX_BITS_8, 32, true)));
-
-#else
-INSTANTIATE_TEST_CASE_P(SSSE3, VP9QuantizeTest,
- ::testing::Values(make_tuple(&vpx_quantize_b_ssse3,
- &vpx_quantize_b_c,
- VPX_BITS_8, 16, false)));
-#endif // ARCH_X86_64
-// TODO(webm:1448): lowbd truncates results in C.
-INSTANTIATE_TEST_CASE_P(DISABLED_SSSE3, VP9QuantizeTest,
- ::testing::Values(make_tuple(
- &vpx_quantize_b_32x32_ssse3,
- &vpx_quantize_b_32x32_c, VPX_BITS_8, 32, false)));
-#endif // CONFIG_VP9_HIGHBITDEPTH
#endif // HAVE_SSSE3
#if HAVE_AVX
-#if CONFIG_VP9_HIGHBITDEPTH
INSTANTIATE_TEST_CASE_P(AVX, VP9QuantizeTest,
::testing::Values(make_tuple(&vpx_quantize_b_avx,
&vpx_quantize_b_c,
@@ -557,17 +530,6 @@ INSTANTIATE_TEST_CASE_P(AVX, VP9QuantizeTest,
make_tuple(&vpx_quantize_b_32x32_avx,
&vpx_quantize_b_32x32_c,
VPX_BITS_8, 32, false)));
-#else
-INSTANTIATE_TEST_CASE_P(AVX, VP9QuantizeTest,
- ::testing::Values(make_tuple(&vpx_quantize_b_avx,
- &vpx_quantize_b_c,
- VPX_BITS_8, 16, false)));
-// TODO(webm:1448): lowbd truncates results in C.
-INSTANTIATE_TEST_CASE_P(DISABLED_AVX, VP9QuantizeTest,
- ::testing::Values(make_tuple(&vpx_quantize_b_32x32_avx,
- &vpx_quantize_b_32x32_c,
- VPX_BITS_8, 32, false)));
-#endif // CONFIG_VP9_HIGHBITDEPTH
#endif // HAVE_AVX
#if ARCH_X86_64 && HAVE_AVX2
@@ -576,7 +538,7 @@ INSTANTIATE_TEST_CASE_P(
::testing::Values(make_tuple(&QuantFPWrapper<vp9_quantize_fp_avx2>,
&QuantFPWrapper<quantize_fp_nz_c>, VPX_BITS_8,
16, true)));
-#endif // HAVE_AVX2 && !CONFIG_VP9_HIGHBITDEPTH
+#endif // HAVE_AVX2
// TODO(webm:1448): dqcoeff is not handled correctly in HBD builds.
#if HAVE_NEON && !CONFIG_VP9_HIGHBITDEPTH