Index: source/libvpx/test/partial_idct_test.cc |
diff --git a/source/libvpx/test/partial_idct_test.cc b/source/libvpx/test/partial_idct_test.cc |
index 09cd09b7a4e1d6b8382c8ba2e130996aef61112f..6c824128b8f17897f383c22152773ce2696cc625 100644 |
--- a/source/libvpx/test/partial_idct_test.cc |
+++ b/source/libvpx/test/partial_idct_test.cc |
@@ -203,32 +203,32 @@ INSTANTIATE_TEST_CASE_P( |
C, PartialIDctTest, |
::testing::Values( |
make_tuple(&vpx_fdct32x32_c, |
- &vp9_idct32x32_1024_add_c, |
- &vp9_idct32x32_34_add_c, |
+ &vpx_idct32x32_1024_add_c, |
+ &vpx_idct32x32_34_add_c, |
TX_32X32, 34), |
make_tuple(&vpx_fdct32x32_c, |
- &vp9_idct32x32_1024_add_c, |
- &vp9_idct32x32_1_add_c, |
+ &vpx_idct32x32_1024_add_c, |
+ &vpx_idct32x32_1_add_c, |
TX_32X32, 1), |
make_tuple(&vpx_fdct16x16_c, |
- &vp9_idct16x16_256_add_c, |
- &vp9_idct16x16_10_add_c, |
+ &vpx_idct16x16_256_add_c, |
+ &vpx_idct16x16_10_add_c, |
TX_16X16, 10), |
make_tuple(&vpx_fdct16x16_c, |
- &vp9_idct16x16_256_add_c, |
- &vp9_idct16x16_1_add_c, |
+ &vpx_idct16x16_256_add_c, |
+ &vpx_idct16x16_1_add_c, |
TX_16X16, 1), |
make_tuple(&vpx_fdct8x8_c, |
- &vp9_idct8x8_64_add_c, |
- &vp9_idct8x8_12_add_c, |
+ &vpx_idct8x8_64_add_c, |
+ &vpx_idct8x8_12_add_c, |
TX_8X8, 12), |
make_tuple(&vpx_fdct8x8_c, |
- &vp9_idct8x8_64_add_c, |
- &vp9_idct8x8_1_add_c, |
+ &vpx_idct8x8_64_add_c, |
+ &vpx_idct8x8_1_add_c, |
TX_8X8, 1), |
make_tuple(&vpx_fdct4x4_c, |
- &vp9_idct4x4_16_add_c, |
- &vp9_idct4x4_1_add_c, |
+ &vpx_idct4x4_16_add_c, |
+ &vpx_idct4x4_1_add_c, |
TX_4X4, 1))); |
#if HAVE_NEON && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE |
@@ -236,28 +236,28 @@ INSTANTIATE_TEST_CASE_P( |
NEON, PartialIDctTest, |
::testing::Values( |
make_tuple(&vpx_fdct32x32_c, |
- &vp9_idct32x32_1024_add_c, |
- &vp9_idct32x32_1_add_neon, |
+ &vpx_idct32x32_1024_add_c, |
+ &vpx_idct32x32_1_add_neon, |
TX_32X32, 1), |
make_tuple(&vpx_fdct16x16_c, |
- &vp9_idct16x16_256_add_c, |
- &vp9_idct16x16_10_add_neon, |
+ &vpx_idct16x16_256_add_c, |
+ &vpx_idct16x16_10_add_neon, |
TX_16X16, 10), |
make_tuple(&vpx_fdct16x16_c, |
- &vp9_idct16x16_256_add_c, |
- &vp9_idct16x16_1_add_neon, |
+ &vpx_idct16x16_256_add_c, |
+ &vpx_idct16x16_1_add_neon, |
TX_16X16, 1), |
make_tuple(&vpx_fdct8x8_c, |
- &vp9_idct8x8_64_add_c, |
- &vp9_idct8x8_12_add_neon, |
+ &vpx_idct8x8_64_add_c, |
+ &vpx_idct8x8_12_add_neon, |
TX_8X8, 12), |
make_tuple(&vpx_fdct8x8_c, |
- &vp9_idct8x8_64_add_c, |
- &vp9_idct8x8_1_add_neon, |
+ &vpx_idct8x8_64_add_c, |
+ &vpx_idct8x8_1_add_neon, |
TX_8X8, 1), |
make_tuple(&vpx_fdct4x4_c, |
- &vp9_idct4x4_16_add_c, |
- &vp9_idct4x4_1_add_neon, |
+ &vpx_idct4x4_16_add_c, |
+ &vpx_idct4x4_1_add_neon, |
TX_4X4, 1))); |
#endif // HAVE_NEON && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE |
@@ -266,32 +266,32 @@ INSTANTIATE_TEST_CASE_P( |
SSE2, PartialIDctTest, |
::testing::Values( |
make_tuple(&vpx_fdct32x32_c, |
- &vp9_idct32x32_1024_add_c, |
- &vp9_idct32x32_34_add_sse2, |
+ &vpx_idct32x32_1024_add_c, |
+ &vpx_idct32x32_34_add_sse2, |
TX_32X32, 34), |
make_tuple(&vpx_fdct32x32_c, |
- &vp9_idct32x32_1024_add_c, |
- &vp9_idct32x32_1_add_sse2, |
+ &vpx_idct32x32_1024_add_c, |
+ &vpx_idct32x32_1_add_sse2, |
TX_32X32, 1), |
make_tuple(&vpx_fdct16x16_c, |
- &vp9_idct16x16_256_add_c, |
- &vp9_idct16x16_10_add_sse2, |
+ &vpx_idct16x16_256_add_c, |
+ &vpx_idct16x16_10_add_sse2, |
TX_16X16, 10), |
make_tuple(&vpx_fdct16x16_c, |
- &vp9_idct16x16_256_add_c, |
- &vp9_idct16x16_1_add_sse2, |
+ &vpx_idct16x16_256_add_c, |
+ &vpx_idct16x16_1_add_sse2, |
TX_16X16, 1), |
make_tuple(&vpx_fdct8x8_c, |
- &vp9_idct8x8_64_add_c, |
- &vp9_idct8x8_12_add_sse2, |
+ &vpx_idct8x8_64_add_c, |
+ &vpx_idct8x8_12_add_sse2, |
TX_8X8, 12), |
make_tuple(&vpx_fdct8x8_c, |
- &vp9_idct8x8_64_add_c, |
- &vp9_idct8x8_1_add_sse2, |
+ &vpx_idct8x8_64_add_c, |
+ &vpx_idct8x8_1_add_sse2, |
TX_8X8, 1), |
make_tuple(&vpx_fdct4x4_c, |
- &vp9_idct4x4_16_add_c, |
- &vp9_idct4x4_1_add_sse2, |
+ &vpx_idct4x4_16_add_c, |
+ &vpx_idct4x4_1_add_sse2, |
TX_4X4, 1))); |
#endif |
@@ -301,8 +301,8 @@ INSTANTIATE_TEST_CASE_P( |
SSSE3_64, PartialIDctTest, |
::testing::Values( |
make_tuple(&vpx_fdct8x8_c, |
- &vp9_idct8x8_64_add_c, |
- &vp9_idct8x8_12_add_ssse3, |
+ &vpx_idct8x8_64_add_c, |
+ &vpx_idct8x8_12_add_ssse3, |
TX_8X8, 12))); |
#endif |
@@ -311,32 +311,32 @@ INSTANTIATE_TEST_CASE_P( |
MSA, PartialIDctTest, |
::testing::Values( |
make_tuple(&vpx_fdct32x32_c, |
- &vp9_idct32x32_1024_add_c, |
- &vp9_idct32x32_34_add_msa, |
+ &vpx_idct32x32_1024_add_c, |
+ &vpx_idct32x32_34_add_msa, |
TX_32X32, 34), |
make_tuple(&vpx_fdct32x32_c, |
- &vp9_idct32x32_1024_add_c, |
- &vp9_idct32x32_1_add_msa, |
+ &vpx_idct32x32_1024_add_c, |
+ &vpx_idct32x32_1_add_msa, |
TX_32X32, 1), |
make_tuple(&vpx_fdct16x16_c, |
- &vp9_idct16x16_256_add_c, |
- &vp9_idct16x16_10_add_msa, |
+ &vpx_idct16x16_256_add_c, |
+ &vpx_idct16x16_10_add_msa, |
TX_16X16, 10), |
make_tuple(&vpx_fdct16x16_c, |
- &vp9_idct16x16_256_add_c, |
- &vp9_idct16x16_1_add_msa, |
+ &vpx_idct16x16_256_add_c, |
+ &vpx_idct16x16_1_add_msa, |
TX_16X16, 1), |
make_tuple(&vpx_fdct8x8_c, |
- &vp9_idct8x8_64_add_c, |
- &vp9_idct8x8_12_add_msa, |
+ &vpx_idct8x8_64_add_c, |
+ &vpx_idct8x8_12_add_msa, |
TX_8X8, 10), |
make_tuple(&vpx_fdct8x8_c, |
- &vp9_idct8x8_64_add_c, |
- &vp9_idct8x8_1_add_msa, |
+ &vpx_idct8x8_64_add_c, |
+ &vpx_idct8x8_1_add_msa, |
TX_8X8, 1), |
make_tuple(&vpx_fdct4x4_c, |
- &vp9_idct4x4_16_add_c, |
- &vp9_idct4x4_1_add_msa, |
+ &vpx_idct4x4_16_add_c, |
+ &vpx_idct4x4_1_add_msa, |
TX_4X4, 1))); |
#endif // HAVE_MSA && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE |