diff options
author | hui su <huisu@google.com> | 2015-07-21 09:39:46 -0700 |
---|---|---|
committer | hui su <huisu@google.com> | 2015-07-27 13:42:06 -0700 |
commit | 401364535394de5adc690da3d04a5c9aff01a214 (patch) | |
tree | 8f988d335c3eed9e754a2987b68bd6cf6629acc9 /test | |
parent | 7971846a5ef42d22385a4dffd1a2aa0b6ee93728 (diff) | |
download | libvpx-401364535394de5adc690da3d04a5c9aff01a214.tar libvpx-401364535394de5adc690da3d04a5c9aff01a214.tar.gz libvpx-401364535394de5adc690da3d04a5c9aff01a214.tar.bz2 libvpx-401364535394de5adc690da3d04a5c9aff01a214.zip |
Replace prefix vp9_ with vpx_ for intra prediction functions
Change-Id: I8ae6fb586f8d5d018ace228df11714f82b085076
Diffstat (limited to 'test')
-rw-r--r-- | test/test.mk | 4 | ||||
-rw-r--r-- | test/test_intra_pred_speed.cc | 232 | ||||
-rw-r--r-- | test/vp9_intrapred_test.cc | 252 |
3 files changed, 244 insertions, 244 deletions
diff --git a/test/test.mk b/test/test.mk index 8ecc856b0..6bb08bedb 100644 --- a/test/test.mk +++ b/test/test.mk @@ -164,8 +164,8 @@ endif # VP9 LIBVPX_TEST_SRCS-$(CONFIG_ENCODERS) += sad_test.cc -TEST_INTRA_PRED_SPEED_SRCS-$(CONFIG_VP9_DECODER) := test_intra_pred_speed.cc -TEST_INTRA_PRED_SPEED_SRCS-$(CONFIG_VP9_DECODER) += ../md5_utils.h ../md5_utils.c +TEST_INTRA_PRED_SPEED_SRCS-$(CONFIG_VP9) := test_intra_pred_speed.cc +TEST_INTRA_PRED_SPEED_SRCS-$(CONFIG_VP9) += ../md5_utils.h ../md5_utils.c endif # CONFIG_SHARED diff --git a/test/test_intra_pred_speed.cc b/test/test_intra_pred_speed.cc index 535806818..5d59e83f7 100644 --- a/test/test_intra_pred_speed.cc +++ b/test/test_intra_pred_speed.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -// Test and time VP9 intra-predictor functions +// Test and time VPX intra-predictor functions #include <stdio.h> #include <string.h> @@ -170,215 +170,215 @@ void TestIntraPred32(VpxPredFunc const *pred_funcs) { #define INTRA_PRED_TEST(arch, test_func, dc, dc_left, dc_top, dc_128, v, h, \ d45, d135, d117, d153, d207, d63, tm) \ TEST(arch, test_func) { \ - static const VpxPredFunc vp9_intra_pred[] = { \ + static const VpxPredFunc vpx_intra_pred[] = { \ dc, dc_left, dc_top, dc_128, v, h, d45, \ d135, d117, d153, d207, d63, tm}; \ - test_func(vp9_intra_pred); \ + test_func(vpx_intra_pred); \ } // ----------------------------------------------------------------------------- // 4x4 -INTRA_PRED_TEST(C, TestIntraPred4, vp9_dc_predictor_4x4_c, - vp9_dc_left_predictor_4x4_c, vp9_dc_top_predictor_4x4_c, - vp9_dc_128_predictor_4x4_c, vp9_v_predictor_4x4_c, - vp9_h_predictor_4x4_c, vp9_d45_predictor_4x4_c, - vp9_d135_predictor_4x4_c, vp9_d117_predictor_4x4_c, - vp9_d153_predictor_4x4_c, vp9_d207_predictor_4x4_c, - vp9_d63_predictor_4x4_c, vp9_tm_predictor_4x4_c) +INTRA_PRED_TEST(C, TestIntraPred4, vpx_dc_predictor_4x4_c, + vpx_dc_left_predictor_4x4_c, vpx_dc_top_predictor_4x4_c, + vpx_dc_128_predictor_4x4_c, vpx_v_predictor_4x4_c, + vpx_h_predictor_4x4_c, vpx_d45_predictor_4x4_c, + vpx_d135_predictor_4x4_c, vpx_d117_predictor_4x4_c, + vpx_d153_predictor_4x4_c, vpx_d207_predictor_4x4_c, + vpx_d63_predictor_4x4_c, vpx_tm_predictor_4x4_c) #if HAVE_SSE && CONFIG_USE_X86INC -INTRA_PRED_TEST(SSE, TestIntraPred4, vp9_dc_predictor_4x4_sse, - vp9_dc_left_predictor_4x4_sse, vp9_dc_top_predictor_4x4_sse, - vp9_dc_128_predictor_4x4_sse, vp9_v_predictor_4x4_sse, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, vp9_tm_predictor_4x4_sse) +INTRA_PRED_TEST(SSE, TestIntraPred4, vpx_dc_predictor_4x4_sse, + vpx_dc_left_predictor_4x4_sse, vpx_dc_top_predictor_4x4_sse, + vpx_dc_128_predictor_4x4_sse, vpx_v_predictor_4x4_sse, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, vpx_tm_predictor_4x4_sse) #endif // HAVE_SSE && CONFIG_USE_X86INC #if HAVE_SSSE3 && CONFIG_USE_X86INC INTRA_PRED_TEST(SSSE3, TestIntraPred4, NULL, NULL, NULL, NULL, NULL, - vp9_h_predictor_4x4_ssse3, vp9_d45_predictor_4x4_ssse3, NULL, - NULL, vp9_d153_predictor_4x4_ssse3, - vp9_d207_predictor_4x4_ssse3, vp9_d63_predictor_4x4_ssse3, NULL) + vpx_h_predictor_4x4_ssse3, vpx_d45_predictor_4x4_ssse3, NULL, + NULL, vpx_d153_predictor_4x4_ssse3, + vpx_d207_predictor_4x4_ssse3, vpx_d63_predictor_4x4_ssse3, NULL) #endif // HAVE_SSSE3 && CONFIG_USE_X86INC #if HAVE_DSPR2 -INTRA_PRED_TEST(DSPR2, TestIntraPred4, vp9_dc_predictor_4x4_dspr2, NULL, NULL, - NULL, NULL, vp9_h_predictor_4x4_dspr2, NULL, NULL, NULL, NULL, - NULL, NULL, vp9_tm_predictor_4x4_dspr2) +INTRA_PRED_TEST(DSPR2, TestIntraPred4, vpx_dc_predictor_4x4_dspr2, NULL, NULL, + NULL, NULL, vpx_h_predictor_4x4_dspr2, NULL, NULL, NULL, NULL, + NULL, NULL, vpx_tm_predictor_4x4_dspr2) #endif // HAVE_DSPR2 #if HAVE_NEON -INTRA_PRED_TEST(NEON, TestIntraPred4, vp9_dc_predictor_4x4_neon, - vp9_dc_left_predictor_4x4_neon, vp9_dc_top_predictor_4x4_neon, - vp9_dc_128_predictor_4x4_neon, vp9_v_predictor_4x4_neon, - vp9_h_predictor_4x4_neon, vp9_d45_predictor_4x4_neon, - vp9_d135_predictor_4x4_neon, NULL, NULL, NULL, NULL, - vp9_tm_predictor_4x4_neon) +INTRA_PRED_TEST(NEON, TestIntraPred4, vpx_dc_predictor_4x4_neon, + vpx_dc_left_predictor_4x4_neon, vpx_dc_top_predictor_4x4_neon, + vpx_dc_128_predictor_4x4_neon, vpx_v_predictor_4x4_neon, + vpx_h_predictor_4x4_neon, vpx_d45_predictor_4x4_neon, + vpx_d135_predictor_4x4_neon, NULL, NULL, NULL, NULL, + vpx_tm_predictor_4x4_neon) #endif // HAVE_NEON #if HAVE_MSA -INTRA_PRED_TEST(MSA, TestIntraPred4, vp9_dc_predictor_4x4_msa, - vp9_dc_left_predictor_4x4_msa, vp9_dc_top_predictor_4x4_msa, - vp9_dc_128_predictor_4x4_msa, vp9_v_predictor_4x4_msa, - vp9_h_predictor_4x4_msa, NULL, NULL, NULL, NULL, NULL, - NULL, vp9_tm_predictor_4x4_msa) +INTRA_PRED_TEST(MSA, TestIntraPred4, vpx_dc_predictor_4x4_msa, + vpx_dc_left_predictor_4x4_msa, vpx_dc_top_predictor_4x4_msa, + vpx_dc_128_predictor_4x4_msa, vpx_v_predictor_4x4_msa, + vpx_h_predictor_4x4_msa, NULL, NULL, NULL, NULL, NULL, + NULL, vpx_tm_predictor_4x4_msa) #endif // HAVE_MSA // ----------------------------------------------------------------------------- // 8x8 -INTRA_PRED_TEST(C, TestIntraPred8, vp9_dc_predictor_8x8_c, - vp9_dc_left_predictor_8x8_c, vp9_dc_top_predictor_8x8_c, - vp9_dc_128_predictor_8x8_c, vp9_v_predictor_8x8_c, - vp9_h_predictor_8x8_c, vp9_d45_predictor_8x8_c, - vp9_d135_predictor_8x8_c, vp9_d117_predictor_8x8_c, - vp9_d153_predictor_8x8_c, vp9_d207_predictor_8x8_c, - vp9_d63_predictor_8x8_c, vp9_tm_predictor_8x8_c) +INTRA_PRED_TEST(C, TestIntraPred8, vpx_dc_predictor_8x8_c, + vpx_dc_left_predictor_8x8_c, vpx_dc_top_predictor_8x8_c, + vpx_dc_128_predictor_8x8_c, vpx_v_predictor_8x8_c, + vpx_h_predictor_8x8_c, vpx_d45_predictor_8x8_c, + vpx_d135_predictor_8x8_c, vpx_d117_predictor_8x8_c, + vpx_d153_predictor_8x8_c, vpx_d207_predictor_8x8_c, + vpx_d63_predictor_8x8_c, vpx_tm_predictor_8x8_c) #if HAVE_SSE && CONFIG_USE_X86INC -INTRA_PRED_TEST(SSE, TestIntraPred8, vp9_dc_predictor_8x8_sse, - vp9_dc_left_predictor_8x8_sse, vp9_dc_top_predictor_8x8_sse, - vp9_dc_128_predictor_8x8_sse, vp9_v_predictor_8x8_sse, NULL, +INTRA_PRED_TEST(SSE, TestIntraPred8, vpx_dc_predictor_8x8_sse, + vpx_dc_left_predictor_8x8_sse, vpx_dc_top_predictor_8x8_sse, + vpx_dc_128_predictor_8x8_sse, vpx_v_predictor_8x8_sse, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) #endif // HAVE_SSE && CONFIG_USE_X86INC #if HAVE_SSE2 && CONFIG_USE_X86INC INTRA_PRED_TEST(SSE2, TestIntraPred8, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, vp9_tm_predictor_8x8_sse2) + NULL, NULL, NULL, NULL, NULL, vpx_tm_predictor_8x8_sse2) #endif // HAVE_SSE2 && CONFIG_USE_X86INC #if HAVE_SSSE3 && CONFIG_USE_X86INC INTRA_PRED_TEST(SSSE3, TestIntraPred8, NULL, NULL, NULL, NULL, NULL, - vp9_h_predictor_8x8_ssse3, vp9_d45_predictor_8x8_ssse3, NULL, - NULL, vp9_d153_predictor_8x8_ssse3, - vp9_d207_predictor_8x8_ssse3, vp9_d63_predictor_8x8_ssse3, NULL) + vpx_h_predictor_8x8_ssse3, vpx_d45_predictor_8x8_ssse3, NULL, + NULL, vpx_d153_predictor_8x8_ssse3, + vpx_d207_predictor_8x8_ssse3, vpx_d63_predictor_8x8_ssse3, NULL) #endif // HAVE_SSSE3 && CONFIG_USE_X86INC #if HAVE_DSPR2 -INTRA_PRED_TEST(DSPR2, TestIntraPred8, vp9_dc_predictor_8x8_dspr2, NULL, NULL, - NULL, NULL, vp9_h_predictor_8x8_dspr2, NULL, NULL, NULL, NULL, - NULL, NULL, vp9_tm_predictor_8x8_c) +INTRA_PRED_TEST(DSPR2, TestIntraPred8, vpx_dc_predictor_8x8_dspr2, NULL, NULL, + NULL, NULL, vpx_h_predictor_8x8_dspr2, NULL, NULL, NULL, NULL, + NULL, NULL, vpx_tm_predictor_8x8_c) #endif // HAVE_DSPR2 #if HAVE_NEON -INTRA_PRED_TEST(NEON, TestIntraPred8, vp9_dc_predictor_8x8_neon, - vp9_dc_left_predictor_8x8_neon, vp9_dc_top_predictor_8x8_neon, - vp9_dc_128_predictor_8x8_neon, vp9_v_predictor_8x8_neon, - vp9_h_predictor_8x8_neon, vp9_d45_predictor_8x8_neon, NULL, - NULL, NULL, NULL, NULL, vp9_tm_predictor_8x8_neon) +INTRA_PRED_TEST(NEON, TestIntraPred8, vpx_dc_predictor_8x8_neon, + vpx_dc_left_predictor_8x8_neon, vpx_dc_top_predictor_8x8_neon, + vpx_dc_128_predictor_8x8_neon, vpx_v_predictor_8x8_neon, + vpx_h_predictor_8x8_neon, vpx_d45_predictor_8x8_neon, NULL, + NULL, NULL, NULL, NULL, vpx_tm_predictor_8x8_neon) #endif // HAVE_NEON #if HAVE_MSA -INTRA_PRED_TEST(MSA, TestIntraPred8, vp9_dc_predictor_8x8_msa, - vp9_dc_left_predictor_8x8_msa, vp9_dc_top_predictor_8x8_msa, - vp9_dc_128_predictor_8x8_msa, vp9_v_predictor_8x8_msa, - vp9_h_predictor_8x8_msa, NULL, NULL, NULL, NULL, NULL, - NULL, vp9_tm_predictor_8x8_msa) +INTRA_PRED_TEST(MSA, TestIntraPred8, vpx_dc_predictor_8x8_msa, + vpx_dc_left_predictor_8x8_msa, vpx_dc_top_predictor_8x8_msa, + vpx_dc_128_predictor_8x8_msa, vpx_v_predictor_8x8_msa, + vpx_h_predictor_8x8_msa, NULL, NULL, NULL, NULL, NULL, + NULL, vpx_tm_predictor_8x8_msa) #endif // HAVE_MSA // ----------------------------------------------------------------------------- // 16x16 -INTRA_PRED_TEST(C, TestIntraPred16, vp9_dc_predictor_16x16_c, - vp9_dc_left_predictor_16x16_c, vp9_dc_top_predictor_16x16_c, - vp9_dc_128_predictor_16x16_c, vp9_v_predictor_16x16_c, - vp9_h_predictor_16x16_c, vp9_d45_predictor_16x16_c, - vp9_d135_predictor_16x16_c, vp9_d117_predictor_16x16_c, - vp9_d153_predictor_16x16_c, vp9_d207_predictor_16x16_c, - vp9_d63_predictor_16x16_c, vp9_tm_predictor_16x16_c) +INTRA_PRED_TEST(C, TestIntraPred16, vpx_dc_predictor_16x16_c, + vpx_dc_left_predictor_16x16_c, vpx_dc_top_predictor_16x16_c, + vpx_dc_128_predictor_16x16_c, vpx_v_predictor_16x16_c, + vpx_h_predictor_16x16_c, vpx_d45_predictor_16x16_c, + vpx_d135_predictor_16x16_c, vpx_d117_predictor_16x16_c, + vpx_d153_predictor_16x16_c, vpx_d207_predictor_16x16_c, + vpx_d63_predictor_16x16_c, vpx_tm_predictor_16x16_c) #if HAVE_SSE2 && CONFIG_USE_X86INC -INTRA_PRED_TEST(SSE2, TestIntraPred16, vp9_dc_predictor_16x16_sse2, - vp9_dc_left_predictor_16x16_sse2, - vp9_dc_top_predictor_16x16_sse2, - vp9_dc_128_predictor_16x16_sse2, vp9_v_predictor_16x16_sse2, +INTRA_PRED_TEST(SSE2, TestIntraPred16, vpx_dc_predictor_16x16_sse2, + vpx_dc_left_predictor_16x16_sse2, + vpx_dc_top_predictor_16x16_sse2, + vpx_dc_128_predictor_16x16_sse2, vpx_v_predictor_16x16_sse2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - vp9_tm_predictor_16x16_sse2) + vpx_tm_predictor_16x16_sse2) #endif // HAVE_SSE2 && CONFIG_USE_X86INC #if HAVE_SSSE3 && CONFIG_USE_X86INC INTRA_PRED_TEST(SSSE3, TestIntraPred16, NULL, NULL, NULL, NULL, NULL, - vp9_h_predictor_16x16_ssse3, vp9_d45_predictor_16x16_ssse3, - NULL, NULL, vp9_d153_predictor_16x16_ssse3, - vp9_d207_predictor_16x16_ssse3, vp9_d63_predictor_16x16_ssse3, + vpx_h_predictor_16x16_ssse3, vpx_d45_predictor_16x16_ssse3, + NULL, NULL, vpx_d153_predictor_16x16_ssse3, + vpx_d207_predictor_16x16_ssse3, vpx_d63_predictor_16x16_ssse3, NULL) #endif // HAVE_SSSE3 && CONFIG_USE_X86INC #if HAVE_DSPR2 -INTRA_PRED_TEST(DSPR2, TestIntraPred16, vp9_dc_predictor_16x16_dspr2, NULL, - NULL, NULL, NULL, vp9_h_predictor_16x16_dspr2, NULL, NULL, NULL, +INTRA_PRED_TEST(DSPR2, TestIntraPred16, vpx_dc_predictor_16x16_dspr2, NULL, + NULL, NULL, NULL, vpx_h_predictor_16x16_dspr2, NULL, NULL, NULL, NULL, NULL, NULL, NULL) #endif // HAVE_DSPR2 #if HAVE_NEON -INTRA_PRED_TEST(NEON, TestIntraPred16, vp9_dc_predictor_16x16_neon, - vp9_dc_left_predictor_16x16_neon, - vp9_dc_top_predictor_16x16_neon, - vp9_dc_128_predictor_16x16_neon, vp9_v_predictor_16x16_neon, - vp9_h_predictor_16x16_neon, vp9_d45_predictor_16x16_neon, NULL, - NULL, NULL, NULL, NULL, vp9_tm_predictor_16x16_neon) +INTRA_PRED_TEST(NEON, TestIntraPred16, vpx_dc_predictor_16x16_neon, + vpx_dc_left_predictor_16x16_neon, + vpx_dc_top_predictor_16x16_neon, + vpx_dc_128_predictor_16x16_neon, vpx_v_predictor_16x16_neon, + vpx_h_predictor_16x16_neon, vpx_d45_predictor_16x16_neon, NULL, + NULL, NULL, NULL, NULL, vpx_tm_predictor_16x16_neon) #endif // HAVE_NEON #if HAVE_MSA -INTRA_PRED_TEST(MSA, TestIntraPred16, vp9_dc_predictor_16x16_msa, - vp9_dc_left_predictor_16x16_msa, vp9_dc_top_predictor_16x16_msa, - vp9_dc_128_predictor_16x16_msa, vp9_v_predictor_16x16_msa, - vp9_h_predictor_16x16_msa, NULL, NULL, NULL, NULL, NULL, - NULL, vp9_tm_predictor_16x16_msa) +INTRA_PRED_TEST(MSA, TestIntraPred16, vpx_dc_predictor_16x16_msa, + vpx_dc_left_predictor_16x16_msa, vpx_dc_top_predictor_16x16_msa, + vpx_dc_128_predictor_16x16_msa, vpx_v_predictor_16x16_msa, + vpx_h_predictor_16x16_msa, NULL, NULL, NULL, NULL, NULL, + NULL, vpx_tm_predictor_16x16_msa) #endif // HAVE_MSA // ----------------------------------------------------------------------------- // 32x32 -INTRA_PRED_TEST(C, TestIntraPred32, vp9_dc_predictor_32x32_c, - vp9_dc_left_predictor_32x32_c, vp9_dc_top_predictor_32x32_c, - vp9_dc_128_predictor_32x32_c, vp9_v_predictor_32x32_c, - vp9_h_predictor_32x32_c, vp9_d45_predictor_32x32_c, - vp9_d135_predictor_32x32_c, vp9_d117_predictor_32x32_c, - vp9_d153_predictor_32x32_c, vp9_d207_predictor_32x32_c, - vp9_d63_predictor_32x32_c, vp9_tm_predictor_32x32_c) +INTRA_PRED_TEST(C, TestIntraPred32, vpx_dc_predictor_32x32_c, + vpx_dc_left_predictor_32x32_c, vpx_dc_top_predictor_32x32_c, + vpx_dc_128_predictor_32x32_c, vpx_v_predictor_32x32_c, + vpx_h_predictor_32x32_c, vpx_d45_predictor_32x32_c, + vpx_d135_predictor_32x32_c, vpx_d117_predictor_32x32_c, + vpx_d153_predictor_32x32_c, vpx_d207_predictor_32x32_c, + vpx_d63_predictor_32x32_c, vpx_tm_predictor_32x32_c) #if HAVE_SSE2 && CONFIG_USE_X86INC #if ARCH_X86_64 -INTRA_PRED_TEST(SSE2, TestIntraPred32, vp9_dc_predictor_32x32_sse2, - vp9_dc_left_predictor_32x32_sse2, - vp9_dc_top_predictor_32x32_sse2, - vp9_dc_128_predictor_32x32_sse2, vp9_v_predictor_32x32_sse2, +INTRA_PRED_TEST(SSE2, TestIntraPred32, vpx_dc_predictor_32x32_sse2, + vpx_dc_left_predictor_32x32_sse2, + vpx_dc_top_predictor_32x32_sse2, + vpx_dc_128_predictor_32x32_sse2, vpx_v_predictor_32x32_sse2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - vp9_tm_predictor_32x32_sse2) + vpx_tm_predictor_32x32_sse2) #else -INTRA_PRED_TEST(SSE2, TestIntraPred32, vp9_dc_predictor_32x32_sse2, - vp9_dc_left_predictor_32x32_sse2, - vp9_dc_top_predictor_32x32_sse2, - vp9_dc_128_predictor_32x32_sse2, vp9_v_predictor_32x32_sse2, +INTRA_PRED_TEST(SSE2, TestIntraPred32, vpx_dc_predictor_32x32_sse2, + vpx_dc_left_predictor_32x32_sse2, + vpx_dc_top_predictor_32x32_sse2, + vpx_dc_128_predictor_32x32_sse2, vpx_v_predictor_32x32_sse2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) #endif // ARCH_X86_64 #endif // HAVE_SSE2 && CONFIG_USE_X86INC #if HAVE_SSSE3 && CONFIG_USE_X86INC INTRA_PRED_TEST(SSSE3, TestIntraPred32, NULL, NULL, NULL, NULL, NULL, - vp9_h_predictor_32x32_ssse3, vp9_d45_predictor_32x32_ssse3, - NULL, NULL, vp9_d153_predictor_32x32_ssse3, - vp9_d207_predictor_32x32_ssse3, vp9_d63_predictor_32x32_ssse3, + vpx_h_predictor_32x32_ssse3, vpx_d45_predictor_32x32_ssse3, + NULL, NULL, vpx_d153_predictor_32x32_ssse3, + vpx_d207_predictor_32x32_ssse3, vpx_d63_predictor_32x32_ssse3, NULL) #endif // HAVE_SSSE3 && CONFIG_USE_X86INC #if HAVE_NEON -INTRA_PRED_TEST(NEON, TestIntraPred32, vp9_dc_predictor_32x32_neon, - vp9_dc_left_predictor_32x32_neon, - vp9_dc_top_predictor_32x32_neon, - vp9_dc_128_predictor_32x32_neon, vp9_v_predictor_32x32_neon, - vp9_h_predictor_32x32_neon, NULL, NULL, NULL, NULL, NULL, NULL, - vp9_tm_predictor_32x32_neon) +INTRA_PRED_TEST(NEON, TestIntraPred32, vpx_dc_predictor_32x32_neon, + vpx_dc_left_predictor_32x32_neon, + vpx_dc_top_predictor_32x32_neon, + vpx_dc_128_predictor_32x32_neon, vpx_v_predictor_32x32_neon, + vpx_h_predictor_32x32_neon, NULL, NULL, NULL, NULL, NULL, NULL, + vpx_tm_predictor_32x32_neon) #endif // HAVE_NEON #if HAVE_MSA -INTRA_PRED_TEST(MSA, TestIntraPred32, vp9_dc_predictor_32x32_msa, - vp9_dc_left_predictor_32x32_msa, vp9_dc_top_predictor_32x32_msa, - vp9_dc_128_predictor_32x32_msa, vp9_v_predictor_32x32_msa, - vp9_h_predictor_32x32_msa, NULL, NULL, NULL, NULL, NULL, - NULL, vp9_tm_predictor_32x32_msa) +INTRA_PRED_TEST(MSA, TestIntraPred32, vpx_dc_predictor_32x32_msa, + vpx_dc_left_predictor_32x32_msa, vpx_dc_top_predictor_32x32_msa, + vpx_dc_128_predictor_32x32_msa, vpx_v_predictor_32x32_msa, + vpx_h_predictor_32x32_msa, NULL, NULL, NULL, NULL, NULL, + NULL, vpx_tm_predictor_32x32_msa) #endif // HAVE_MSA #include "test/test_libvpx.cc" diff --git a/test/vp9_intrapred_test.cc b/test/vp9_intrapred_test.cc index 450210bca..c17259ae9 100644 --- a/test/vp9_intrapred_test.cc +++ b/test/vp9_intrapred_test.cc @@ -135,165 +135,165 @@ using std::tr1::make_tuple; #if ARCH_X86_64 INSTANTIATE_TEST_CASE_P(SSE2_TO_C_8, VP9IntraPredTest, ::testing::Values( - 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))); + make_tuple(&vpx_highbd_dc_predictor_32x32_sse2, + &vpx_highbd_dc_predictor_32x32_c, 32, 8), + make_tuple(&vpx_highbd_tm_predictor_16x16_sse2, + &vpx_highbd_tm_predictor_16x16_c, 16, 8), + make_tuple(&vpx_highbd_tm_predictor_32x32_sse2, + &vpx_highbd_tm_predictor_32x32_c, 32, 8), + make_tuple(&vpx_highbd_dc_predictor_4x4_sse, + &vpx_highbd_dc_predictor_4x4_c, 4, 8), + make_tuple(&vpx_highbd_dc_predictor_8x8_sse2, + &vpx_highbd_dc_predictor_8x8_c, 8, 8), + make_tuple(&vpx_highbd_dc_predictor_16x16_sse2, + &vpx_highbd_dc_predictor_16x16_c, 16, 8), + make_tuple(&vpx_highbd_v_predictor_4x4_sse, + &vpx_highbd_v_predictor_4x4_c, 4, 8), + make_tuple(&vpx_highbd_v_predictor_8x8_sse2, + &vpx_highbd_v_predictor_8x8_c, 8, 8), + make_tuple(&vpx_highbd_v_predictor_16x16_sse2, + &vpx_highbd_v_predictor_16x16_c, 16, 8), + make_tuple(&vpx_highbd_v_predictor_32x32_sse2, + &vpx_highbd_v_predictor_32x32_c, 32, 8), + make_tuple(&vpx_highbd_tm_predictor_4x4_sse, + &vpx_highbd_tm_predictor_4x4_c, 4, 8), + make_tuple(&vpx_highbd_tm_predictor_8x8_sse2, + &vpx_highbd_tm_predictor_8x8_c, 8, 8))); #else INSTANTIATE_TEST_CASE_P(SSE2_TO_C_8, VP9IntraPredTest, ::testing::Values( - 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))); + make_tuple(&vpx_highbd_dc_predictor_4x4_sse, + &vpx_highbd_dc_predictor_4x4_c, 4, 8), + make_tuple(&vpx_highbd_dc_predictor_8x8_sse2, + &vpx_highbd_dc_predictor_8x8_c, 8, 8), + make_tuple(&vpx_highbd_dc_predictor_16x16_sse2, + &vpx_highbd_dc_predictor_16x16_c, 16, 8), + make_tuple(&vpx_highbd_v_predictor_4x4_sse, + &vpx_highbd_v_predictor_4x4_c, 4, 8), + make_tuple(&vpx_highbd_v_predictor_8x8_sse2, + &vpx_highbd_v_predictor_8x8_c, 8, 8), + make_tuple(&vpx_highbd_v_predictor_16x16_sse2, + &vpx_highbd_v_predictor_16x16_c, 16, 8), + make_tuple(&vpx_highbd_v_predictor_32x32_sse2, + &vpx_highbd_v_predictor_32x32_c, 32, 8), + make_tuple(&vpx_highbd_tm_predictor_4x4_sse, + &vpx_highbd_tm_predictor_4x4_c, 4, 8), + make_tuple(&vpx_highbd_tm_predictor_8x8_sse2, + &vpx_highbd_tm_predictor_8x8_c, 8, 8))); #endif // !ARCH_X86_64 #if ARCH_X86_64 INSTANTIATE_TEST_CASE_P(SSE2_TO_C_10, VP9IntraPredTest, ::testing::Values( - make_tuple(&vp9_highbd_dc_predictor_32x32_sse2, - &vp9_highbd_dc_predictor_32x32_c, 32, + make_tuple(&vpx_highbd_dc_predictor_32x32_sse2, + &vpx_highbd_dc_predictor_32x32_c, 32, 10), - make_tuple(&vp9_highbd_tm_predictor_16x16_sse2, - &vp9_highbd_tm_predictor_16x16_c, 16, + make_tuple(&vpx_highbd_tm_predictor_16x16_sse2, + &vpx_highbd_tm_predictor_16x16_c, 16, 10), - make_tuple(&vp9_highbd_tm_predictor_32x32_sse2, - &vp9_highbd_tm_predictor_32x32_c, 32, + make_tuple(&vpx_highbd_tm_predictor_32x32_sse2, + &vpx_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, + make_tuple(&vpx_highbd_dc_predictor_4x4_sse, + &vpx_highbd_dc_predictor_4x4_c, 4, 10), + make_tuple(&vpx_highbd_dc_predictor_8x8_sse2, + &vpx_highbd_dc_predictor_8x8_c, 8, 10), + make_tuple(&vpx_highbd_dc_predictor_16x16_sse2, + &vpx_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, + make_tuple(&vpx_highbd_v_predictor_4x4_sse, + &vpx_highbd_v_predictor_4x4_c, 4, 10), + make_tuple(&vpx_highbd_v_predictor_8x8_sse2, + &vpx_highbd_v_predictor_8x8_c, 8, 10), + make_tuple(&vpx_highbd_v_predictor_16x16_sse2, + &vpx_highbd_v_predictor_16x16_c, 16, 10), - make_tuple(&vp9_highbd_v_predictor_32x32_sse2, - &vp9_highbd_v_predictor_32x32_c, 32, + make_tuple(&vpx_highbd_v_predictor_32x32_sse2, + &vpx_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))); + make_tuple(&vpx_highbd_tm_predictor_4x4_sse, + &vpx_highbd_tm_predictor_4x4_c, 4, 10), + make_tuple(&vpx_highbd_tm_predictor_8x8_sse2, + &vpx_highbd_tm_predictor_8x8_c, 8, 10))); #else INSTANTIATE_TEST_CASE_P(SSE2_TO_C_10, VP9IntraPredTest, ::testing::Values( - 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, + make_tuple(&vpx_highbd_dc_predictor_4x4_sse, + &vpx_highbd_dc_predictor_4x4_c, 4, 10), + make_tuple(&vpx_highbd_dc_predictor_8x8_sse2, + &vpx_highbd_dc_predictor_8x8_c, 8, 10), + make_tuple(&vpx_highbd_dc_predictor_16x16_sse2, + &vpx_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))); + make_tuple(&vpx_highbd_v_predictor_4x4_sse, + &vpx_highbd_v_predictor_4x4_c, 4, 10), + make_tuple(&vpx_highbd_v_predictor_8x8_sse2, + &vpx_highbd_v_predictor_8x8_c, 8, 10), + make_tuple(&vpx_highbd_v_predictor_16x16_sse2, + &vpx_highbd_v_predictor_16x16_c, 16, 10), + make_tuple(&vpx_highbd_v_predictor_32x32_sse2, + &vpx_highbd_v_predictor_32x32_c, 32, 10), + make_tuple(&vpx_highbd_tm_predictor_4x4_sse, + &vpx_highbd_tm_predictor_4x4_c, 4, 10), + make_tuple(&vpx_highbd_tm_predictor_8x8_sse2, + &vpx_highbd_tm_predictor_8x8_c, 8, 10))); #endif // !ARCH_X86_64 #if ARCH_X86_64 INSTANTIATE_TEST_CASE_P(SSE2_TO_C_12, VP9IntraPredTest, ::testing::Values( - make_tuple(&vp9_highbd_dc_predictor_32x32_sse2, - &vp9_highbd_dc_predictor_32x32_c, 32, + make_tuple(&vpx_highbd_dc_predictor_32x32_sse2, + &vpx_highbd_dc_predictor_32x32_c, 32, 12), - make_tuple(&vp9_highbd_tm_predictor_16x16_sse2, - &vp9_highbd_tm_predictor_16x16_c, 16, + make_tuple(&vpx_highbd_tm_predictor_16x16_sse2, + &vpx_highbd_tm_predictor_16x16_c, 16, 12), - make_tuple(&vp9_highbd_tm_predictor_32x32_sse2, - &vp9_highbd_tm_predictor_32x32_c, 32, + make_tuple(&vpx_highbd_tm_predictor_32x32_sse2, + &vpx_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, + make_tuple(&vpx_highbd_dc_predictor_4x4_sse, + &vpx_highbd_dc_predictor_4x4_c, 4, 12), + make_tuple(&vpx_highbd_dc_predictor_8x8_sse2, + &vpx_highbd_dc_predictor_8x8_c, 8, 12), + make_tuple(&vpx_highbd_dc_predictor_16x16_sse2, + &vpx_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, + make_tuple(&vpx_highbd_v_predictor_4x4_sse, + &vpx_highbd_v_predictor_4x4_c, 4, 12), + make_tuple(&vpx_highbd_v_predictor_8x8_sse2, + &vpx_highbd_v_predictor_8x8_c, 8, 12), + make_tuple(&vpx_highbd_v_predictor_16x16_sse2, + &vpx_highbd_v_predictor_16x16_c, 16, 12), - make_tuple(&vp9_highbd_v_predictor_32x32_sse2, - &vp9_highbd_v_predictor_32x32_c, 32, + make_tuple(&vpx_highbd_v_predictor_32x32_sse2, + &vpx_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))); + make_tuple(&vpx_highbd_tm_predictor_4x4_sse, + &vpx_highbd_tm_predictor_4x4_c, 4, 12), + make_tuple(&vpx_highbd_tm_predictor_8x8_sse2, + &vpx_highbd_tm_predictor_8x8_c, 8, 12))); #else INSTANTIATE_TEST_CASE_P(SSE2_TO_C_12, VP9IntraPredTest, ::testing::Values( - 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, + make_tuple(&vpx_highbd_dc_predictor_4x4_sse, + &vpx_highbd_dc_predictor_4x4_c, 4, 12), + make_tuple(&vpx_highbd_dc_predictor_8x8_sse2, + &vpx_highbd_dc_predictor_8x8_c, 8, 12), + make_tuple(&vpx_highbd_dc_predictor_16x16_sse2, + &vpx_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))); + make_tuple(&vpx_highbd_v_predictor_4x4_sse, + &vpx_highbd_v_predictor_4x4_c, 4, 12), + make_tuple(&vpx_highbd_v_predictor_8x8_sse2, + &vpx_highbd_v_predictor_8x8_c, 8, 12), + make_tuple(&vpx_highbd_v_predictor_16x16_sse2, + &vpx_highbd_v_predictor_16x16_c, 16, 12), + make_tuple(&vpx_highbd_v_predictor_32x32_sse2, + &vpx_highbd_v_predictor_32x32_c, 32, 12), + make_tuple(&vpx_highbd_tm_predictor_4x4_sse, + &vpx_highbd_tm_predictor_4x4_c, 4, 12), + make_tuple(&vpx_highbd_tm_predictor_8x8_sse2, + &vpx_highbd_tm_predictor_8x8_c, 8, 12))); #endif // !ARCH_X86_64 #endif // CONFIG_USE_X86INC #endif // CONFIG_VP9_HIGHBITDEPTH |