Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(437)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: source/libvpx/test/vp9_intrapred_test.cc

Issue 668403002: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/libvpx/test/vp9_end_to_end_test.cc ('k') | source/libvpx/test/vp9_lossless_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/test/vp9_intrapred_test.cc
===================================================================
--- source/libvpx/test/vp9_intrapred_test.cc (revision 292608)
+++ source/libvpx/test/vp9_intrapred_test.cc (working copy)
@@ -134,150 +134,164 @@
#if ARCH_X86_64
INSTANTIATE_TEST_CASE_P(SSE2_TO_C_8, VP9IntraPredTest,
::testing::Values(
- make_tuple(&vp9_high_dc_predictor_32x32_sse2,
- &vp9_high_dc_predictor_32x32_c, 32, 8),
- make_tuple(&vp9_high_tm_predictor_16x16_sse2,
- &vp9_high_tm_predictor_16x16_c, 16, 8),
- make_tuple(&vp9_high_tm_predictor_32x32_sse2,
- &vp9_high_tm_predictor_32x32_c, 32, 8),
- make_tuple(&vp9_high_dc_predictor_4x4_sse,
- &vp9_high_dc_predictor_4x4_c, 4, 8),
- make_tuple(&vp9_high_dc_predictor_8x8_sse2,
- &vp9_high_dc_predictor_8x8_c, 8, 8),
- make_tuple(&vp9_high_dc_predictor_16x16_sse2,
- &vp9_high_dc_predictor_16x16_c, 16, 8),
- make_tuple(&vp9_high_v_predictor_4x4_sse,
- &vp9_high_v_predictor_4x4_c, 4, 8),
- make_tuple(&vp9_high_v_predictor_8x8_sse2,
- &vp9_high_v_predictor_8x8_c, 8, 8),
- make_tuple(&vp9_high_v_predictor_16x16_sse2,
- &vp9_high_v_predictor_16x16_c, 16, 8),
- make_tuple(&vp9_high_v_predictor_32x32_sse2,
- &vp9_high_v_predictor_32x32_c, 32, 8),
- make_tuple(&vp9_high_tm_predictor_4x4_sse,
- &vp9_high_tm_predictor_4x4_c, 4, 8),
- make_tuple(&vp9_high_tm_predictor_8x8_sse2,
- &vp9_high_tm_predictor_8x8_c, 8, 8)));
+ make_tuple(&vp9_highbd_dc_predictor_32x32_sse2,
+ &vp9_highbd_dc_predictor_32x32_c, 32, 8),
+ make_tuple(&vp9_highbd_tm_predictor_16x16_sse2,
+ &vp9_highbd_tm_predictor_16x16_c, 16, 8),
+ make_tuple(&vp9_highbd_tm_predictor_32x32_sse2,
+ &vp9_highbd_tm_predictor_32x32_c, 32, 8),
+ make_tuple(&vp9_highbd_dc_predictor_4x4_sse,
+ &vp9_highbd_dc_predictor_4x4_c, 4, 8),
+ make_tuple(&vp9_highbd_dc_predictor_8x8_sse2,
+ &vp9_highbd_dc_predictor_8x8_c, 8, 8),
+ make_tuple(&vp9_highbd_dc_predictor_16x16_sse2,
+ &vp9_highbd_dc_predictor_16x16_c, 16, 8),
+ make_tuple(&vp9_highbd_v_predictor_4x4_sse,
+ &vp9_highbd_v_predictor_4x4_c, 4, 8),
+ make_tuple(&vp9_highbd_v_predictor_8x8_sse2,
+ &vp9_highbd_v_predictor_8x8_c, 8, 8),
+ make_tuple(&vp9_highbd_v_predictor_16x16_sse2,
+ &vp9_highbd_v_predictor_16x16_c, 16, 8),
+ make_tuple(&vp9_highbd_v_predictor_32x32_sse2,
+ &vp9_highbd_v_predictor_32x32_c, 32, 8),
+ make_tuple(&vp9_highbd_tm_predictor_4x4_sse,
+ &vp9_highbd_tm_predictor_4x4_c, 4, 8),
+ make_tuple(&vp9_highbd_tm_predictor_8x8_sse2,
+ &vp9_highbd_tm_predictor_8x8_c, 8, 8)));
#else
INSTANTIATE_TEST_CASE_P(SSE2_TO_C_8, VP9IntraPredTest,
::testing::Values(
- make_tuple(&vp9_high_dc_predictor_4x4_sse,
- &vp9_high_dc_predictor_4x4_c, 4, 8),
- make_tuple(&vp9_high_dc_predictor_8x8_sse2,
- &vp9_high_dc_predictor_8x8_c, 8, 8),
- make_tuple(&vp9_high_dc_predictor_16x16_sse2,
- &vp9_high_dc_predictor_16x16_c, 16, 8),
- make_tuple(&vp9_high_v_predictor_4x4_sse,
- &vp9_high_v_predictor_4x4_c, 4, 8),
- make_tuple(&vp9_high_v_predictor_8x8_sse2,
- &vp9_high_v_predictor_8x8_c, 8, 8),
- make_tuple(&vp9_high_v_predictor_16x16_sse2,
- &vp9_high_v_predictor_16x16_c, 16, 8),
- make_tuple(&vp9_high_v_predictor_32x32_sse2,
- &vp9_high_v_predictor_32x32_c, 32, 8),
- make_tuple(&vp9_high_tm_predictor_4x4_sse,
- &vp9_high_tm_predictor_4x4_c, 4, 8),
- make_tuple(&vp9_high_tm_predictor_8x8_sse2,
- &vp9_high_tm_predictor_8x8_c, 8, 8)));
+ make_tuple(&vp9_highbd_dc_predictor_4x4_sse,
+ &vp9_highbd_dc_predictor_4x4_c, 4, 8),
+ make_tuple(&vp9_highbd_dc_predictor_8x8_sse2,
+ &vp9_highbd_dc_predictor_8x8_c, 8, 8),
+ make_tuple(&vp9_highbd_dc_predictor_16x16_sse2,
+ &vp9_highbd_dc_predictor_16x16_c, 16, 8),
+ make_tuple(&vp9_highbd_v_predictor_4x4_sse,
+ &vp9_highbd_v_predictor_4x4_c, 4, 8),
+ make_tuple(&vp9_highbd_v_predictor_8x8_sse2,
+ &vp9_highbd_v_predictor_8x8_c, 8, 8),
+ make_tuple(&vp9_highbd_v_predictor_16x16_sse2,
+ &vp9_highbd_v_predictor_16x16_c, 16, 8),
+ make_tuple(&vp9_highbd_v_predictor_32x32_sse2,
+ &vp9_highbd_v_predictor_32x32_c, 32, 8),
+ make_tuple(&vp9_highbd_tm_predictor_4x4_sse,
+ &vp9_highbd_tm_predictor_4x4_c, 4, 8),
+ make_tuple(&vp9_highbd_tm_predictor_8x8_sse2,
+ &vp9_highbd_tm_predictor_8x8_c, 8, 8)));
#endif
#if ARCH_X86_64
INSTANTIATE_TEST_CASE_P(SSE2_TO_C_10, VP9IntraPredTest,
::testing::Values(
- make_tuple(&vp9_high_dc_predictor_32x32_sse2,
- &vp9_high_dc_predictor_32x32_c, 32, 10),
- make_tuple(&vp9_high_tm_predictor_16x16_sse2,
- &vp9_high_tm_predictor_16x16_c, 16, 10),
- make_tuple(&vp9_high_tm_predictor_32x32_sse2,
- &vp9_high_tm_predictor_32x32_c, 32, 10),
- make_tuple(&vp9_high_dc_predictor_4x4_sse,
- &vp9_high_dc_predictor_4x4_c, 4, 10),
- make_tuple(&vp9_high_dc_predictor_8x8_sse2,
- &vp9_high_dc_predictor_8x8_c, 8, 10),
- make_tuple(&vp9_high_dc_predictor_16x16_sse2,
- &vp9_high_dc_predictor_16x16_c, 16, 10),
- make_tuple(&vp9_high_v_predictor_4x4_sse,
- &vp9_high_v_predictor_4x4_c, 4, 10),
- make_tuple(&vp9_high_v_predictor_8x8_sse2,
- &vp9_high_v_predictor_8x8_c, 8, 10),
- make_tuple(&vp9_high_v_predictor_16x16_sse2,
- &vp9_high_v_predictor_16x16_c, 16, 10),
- make_tuple(&vp9_high_v_predictor_32x32_sse2,
- &vp9_high_v_predictor_32x32_c, 32, 10),
- make_tuple(&vp9_high_tm_predictor_4x4_sse,
- &vp9_high_tm_predictor_4x4_c, 4, 10),
- make_tuple(&vp9_high_tm_predictor_8x8_sse2,
- &vp9_high_tm_predictor_8x8_c, 8, 10)));
+ make_tuple(&vp9_highbd_dc_predictor_32x32_sse2,
+ &vp9_highbd_dc_predictor_32x32_c, 32,
+ 10),
+ make_tuple(&vp9_highbd_tm_predictor_16x16_sse2,
+ &vp9_highbd_tm_predictor_16x16_c, 16,
+ 10),
+ make_tuple(&vp9_highbd_tm_predictor_32x32_sse2,
+ &vp9_highbd_tm_predictor_32x32_c, 32,
+ 10),
+ make_tuple(&vp9_highbd_dc_predictor_4x4_sse,
+ &vp9_highbd_dc_predictor_4x4_c, 4, 10),
+ make_tuple(&vp9_highbd_dc_predictor_8x8_sse2,
+ &vp9_highbd_dc_predictor_8x8_c, 8, 10),
+ make_tuple(&vp9_highbd_dc_predictor_16x16_sse2,
+ &vp9_highbd_dc_predictor_16x16_c, 16,
+ 10),
+ make_tuple(&vp9_highbd_v_predictor_4x4_sse,
+ &vp9_highbd_v_predictor_4x4_c, 4, 10),
+ make_tuple(&vp9_highbd_v_predictor_8x8_sse2,
+ &vp9_highbd_v_predictor_8x8_c, 8, 10),
+ make_tuple(&vp9_highbd_v_predictor_16x16_sse2,
+ &vp9_highbd_v_predictor_16x16_c, 16,
+ 10),
+ make_tuple(&vp9_highbd_v_predictor_32x32_sse2,
+ &vp9_highbd_v_predictor_32x32_c, 32,
+ 10),
+ make_tuple(&vp9_highbd_tm_predictor_4x4_sse,
+ &vp9_highbd_tm_predictor_4x4_c, 4, 10),
+ make_tuple(&vp9_highbd_tm_predictor_8x8_sse2,
+ &vp9_highbd_tm_predictor_8x8_c, 8, 10)));
#else
INSTANTIATE_TEST_CASE_P(SSE2_TO_C_10, VP9IntraPredTest,
::testing::Values(
- make_tuple(&vp9_high_dc_predictor_4x4_sse,
- &vp9_high_dc_predictor_4x4_c, 4, 10),
- make_tuple(&vp9_high_dc_predictor_8x8_sse2,
- &vp9_high_dc_predictor_8x8_c, 8, 10),
- make_tuple(&vp9_high_dc_predictor_16x16_sse2,
- &vp9_high_dc_predictor_16x16_c, 16, 10),
- make_tuple(&vp9_high_v_predictor_4x4_sse,
- &vp9_high_v_predictor_4x4_c, 4, 10),
- make_tuple(&vp9_high_v_predictor_8x8_sse2,
- &vp9_high_v_predictor_8x8_c, 8, 10),
- make_tuple(&vp9_high_v_predictor_16x16_sse2,
- &vp9_high_v_predictor_16x16_c, 16, 10),
- make_tuple(&vp9_high_v_predictor_32x32_sse2,
- &vp9_high_v_predictor_32x32_c, 32, 10),
- make_tuple(&vp9_high_tm_predictor_4x4_sse,
- &vp9_high_tm_predictor_4x4_c, 4, 10),
- make_tuple(&vp9_high_tm_predictor_8x8_sse2,
- &vp9_high_tm_predictor_8x8_c, 8, 10)));
+ make_tuple(&vp9_highbd_dc_predictor_4x4_sse,
+ &vp9_highbd_dc_predictor_4x4_c, 4, 10),
+ make_tuple(&vp9_highbd_dc_predictor_8x8_sse2,
+ &vp9_highbd_dc_predictor_8x8_c, 8, 10),
+ make_tuple(&vp9_highbd_dc_predictor_16x16_sse2,
+ &vp9_highbd_dc_predictor_16x16_c, 16,
+ 10),
+ make_tuple(&vp9_highbd_v_predictor_4x4_sse,
+ &vp9_highbd_v_predictor_4x4_c, 4, 10),
+ make_tuple(&vp9_highbd_v_predictor_8x8_sse2,
+ &vp9_highbd_v_predictor_8x8_c, 8, 10),
+ make_tuple(&vp9_highbd_v_predictor_16x16_sse2,
+ &vp9_highbd_v_predictor_16x16_c, 16, 10),
+ make_tuple(&vp9_highbd_v_predictor_32x32_sse2,
+ &vp9_highbd_v_predictor_32x32_c, 32, 10),
+ make_tuple(&vp9_highbd_tm_predictor_4x4_sse,
+ &vp9_highbd_tm_predictor_4x4_c, 4, 10),
+ make_tuple(&vp9_highbd_tm_predictor_8x8_sse2,
+ &vp9_highbd_tm_predictor_8x8_c, 8, 10)));
#endif
#if ARCH_X86_64
INSTANTIATE_TEST_CASE_P(SSE2_TO_C_12, VP9IntraPredTest,
::testing::Values(
- make_tuple(&vp9_high_dc_predictor_32x32_sse2,
- &vp9_high_dc_predictor_32x32_c, 32, 12),
- make_tuple(&vp9_high_tm_predictor_16x16_sse2,
- &vp9_high_tm_predictor_16x16_c, 16, 12),
- make_tuple(&vp9_high_tm_predictor_32x32_sse2,
- &vp9_high_tm_predictor_32x32_c, 32, 12),
- make_tuple(&vp9_high_dc_predictor_4x4_sse,
- &vp9_high_dc_predictor_4x4_c, 4, 12),
- make_tuple(&vp9_high_dc_predictor_8x8_sse2,
- &vp9_high_dc_predictor_8x8_c, 8, 12),
- make_tuple(&vp9_high_dc_predictor_16x16_sse2,
- &vp9_high_dc_predictor_16x16_c, 16, 12),
- make_tuple(&vp9_high_v_predictor_4x4_sse,
- &vp9_high_v_predictor_4x4_c, 4, 12),
- make_tuple(&vp9_high_v_predictor_8x8_sse2,
- &vp9_high_v_predictor_8x8_c, 8, 12),
- make_tuple(&vp9_high_v_predictor_16x16_sse2,
- &vp9_high_v_predictor_16x16_c, 16, 12),
- make_tuple(&vp9_high_v_predictor_32x32_sse2,
- &vp9_high_v_predictor_32x32_c, 32, 12),
- make_tuple(&vp9_high_tm_predictor_4x4_sse,
- &vp9_high_tm_predictor_4x4_c, 4, 12),
- make_tuple(&vp9_high_tm_predictor_8x8_sse2,
- &vp9_high_tm_predictor_8x8_c, 8, 12)));
+ make_tuple(&vp9_highbd_dc_predictor_32x32_sse2,
+ &vp9_highbd_dc_predictor_32x32_c, 32,
+ 12),
+ make_tuple(&vp9_highbd_tm_predictor_16x16_sse2,
+ &vp9_highbd_tm_predictor_16x16_c, 16,
+ 12),
+ make_tuple(&vp9_highbd_tm_predictor_32x32_sse2,
+ &vp9_highbd_tm_predictor_32x32_c, 32,
+ 12),
+ make_tuple(&vp9_highbd_dc_predictor_4x4_sse,
+ &vp9_highbd_dc_predictor_4x4_c, 4, 12),
+ make_tuple(&vp9_highbd_dc_predictor_8x8_sse2,
+ &vp9_highbd_dc_predictor_8x8_c, 8, 12),
+ make_tuple(&vp9_highbd_dc_predictor_16x16_sse2,
+ &vp9_highbd_dc_predictor_16x16_c, 16,
+ 12),
+ make_tuple(&vp9_highbd_v_predictor_4x4_sse,
+ &vp9_highbd_v_predictor_4x4_c, 4, 12),
+ make_tuple(&vp9_highbd_v_predictor_8x8_sse2,
+ &vp9_highbd_v_predictor_8x8_c, 8, 12),
+ make_tuple(&vp9_highbd_v_predictor_16x16_sse2,
+ &vp9_highbd_v_predictor_16x16_c, 16,
+ 12),
+ make_tuple(&vp9_highbd_v_predictor_32x32_sse2,
+ &vp9_highbd_v_predictor_32x32_c, 32,
+ 12),
+ make_tuple(&vp9_highbd_tm_predictor_4x4_sse,
+ &vp9_highbd_tm_predictor_4x4_c, 4, 12),
+ make_tuple(&vp9_highbd_tm_predictor_8x8_sse2,
+ &vp9_highbd_tm_predictor_8x8_c, 8, 12)));
#else
INSTANTIATE_TEST_CASE_P(SSE2_TO_C_12, VP9IntraPredTest,
::testing::Values(
- make_tuple(&vp9_high_dc_predictor_4x4_sse,
- &vp9_high_dc_predictor_4x4_c, 4, 12),
- make_tuple(&vp9_high_dc_predictor_8x8_sse2,
- &vp9_high_dc_predictor_8x8_c, 8, 12),
- make_tuple(&vp9_high_dc_predictor_16x16_sse2,
- &vp9_high_dc_predictor_16x16_c, 16, 12),
- make_tuple(&vp9_high_v_predictor_4x4_sse,
- &vp9_high_v_predictor_4x4_c, 4, 12),
- make_tuple(&vp9_high_v_predictor_8x8_sse2,
- &vp9_high_v_predictor_8x8_c, 8, 12),
- make_tuple(&vp9_high_v_predictor_16x16_sse2,
- &vp9_high_v_predictor_16x16_c, 16, 12),
- make_tuple(&vp9_high_v_predictor_32x32_sse2,
- &vp9_high_v_predictor_32x32_c, 32, 12),
- make_tuple(&vp9_high_tm_predictor_4x4_sse,
- &vp9_high_tm_predictor_4x4_c, 4, 12),
- make_tuple(&vp9_high_tm_predictor_8x8_sse2,
- &vp9_high_tm_predictor_8x8_c, 8, 12)));
+ make_tuple(&vp9_highbd_dc_predictor_4x4_sse,
+ &vp9_highbd_dc_predictor_4x4_c, 4, 12),
+ make_tuple(&vp9_highbd_dc_predictor_8x8_sse2,
+ &vp9_highbd_dc_predictor_8x8_c, 8, 12),
+ make_tuple(&vp9_highbd_dc_predictor_16x16_sse2,
+ &vp9_highbd_dc_predictor_16x16_c, 16,
+ 12),
+ make_tuple(&vp9_highbd_v_predictor_4x4_sse,
+ &vp9_highbd_v_predictor_4x4_c, 4, 12),
+ make_tuple(&vp9_highbd_v_predictor_8x8_sse2,
+ &vp9_highbd_v_predictor_8x8_c, 8, 12),
+ make_tuple(&vp9_highbd_v_predictor_16x16_sse2,
+ &vp9_highbd_v_predictor_16x16_c, 16, 12),
+ make_tuple(&vp9_highbd_v_predictor_32x32_sse2,
+ &vp9_highbd_v_predictor_32x32_c, 32, 12),
+ make_tuple(&vp9_highbd_tm_predictor_4x4_sse,
+ &vp9_highbd_tm_predictor_4x4_c, 4, 12),
+ make_tuple(&vp9_highbd_tm_predictor_8x8_sse2,
+ &vp9_highbd_tm_predictor_8x8_c, 8, 12)));
#endif
#endif // CONFIG_VP9_HIGHBITDEPTH
#endif // HAVE_SSE2
« no previous file with comments | « source/libvpx/test/vp9_end_to_end_test.cc ('k') | source/libvpx/test/vp9_lossless_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698