Index: source/libvpx/test/fdct8x8_test.cc |
diff --git a/source/libvpx/test/fdct8x8_test.cc b/source/libvpx/test/fdct8x8_test.cc |
index eeafde1af3c678c4852becf648e0b30987df0ef7..c0deaf4069e1483aff7c4b7a36f47d86116906bf 100644 |
--- a/source/libvpx/test/fdct8x8_test.cc |
+++ b/source/libvpx/test/fdct8x8_test.cc |
@@ -92,11 +92,11 @@ void fht8x8_ref(const int16_t *in, tran_low_t *out, int stride, int tx_type) { |
#if CONFIG_VP9_HIGHBITDEPTH |
void idct8x8_10(const tran_low_t *in, uint8_t *out, int stride) { |
- vp9_highbd_idct8x8_64_add_c(in, out, stride, 10); |
+ vpx_highbd_idct8x8_64_add_c(in, out, stride, 10); |
} |
void idct8x8_12(const tran_low_t *in, uint8_t *out, int stride) { |
- vp9_highbd_idct8x8_64_add_c(in, out, stride, 12); |
+ vpx_highbd_idct8x8_64_add_c(in, out, stride, 12); |
} |
void iht8x8_10(const tran_low_t *in, uint8_t *out, int stride, int tx_type) { |
@@ -108,28 +108,28 @@ void iht8x8_12(const tran_low_t *in, uint8_t *out, int stride, int tx_type) { |
} |
void idct8x8_10_add_10_c(const tran_low_t *in, uint8_t *out, int stride) { |
- vp9_highbd_idct8x8_10_add_c(in, out, stride, 10); |
+ vpx_highbd_idct8x8_10_add_c(in, out, stride, 10); |
} |
void idct8x8_10_add_12_c(const tran_low_t *in, uint8_t *out, int stride) { |
- vp9_highbd_idct8x8_10_add_c(in, out, stride, 12); |
+ vpx_highbd_idct8x8_10_add_c(in, out, stride, 12); |
} |
#if HAVE_SSE2 |
void idct8x8_10_add_10_sse2(const tran_low_t *in, uint8_t *out, int stride) { |
- vp9_highbd_idct8x8_10_add_sse2(in, out, stride, 10); |
+ vpx_highbd_idct8x8_10_add_sse2(in, out, stride, 10); |
} |
void idct8x8_10_add_12_sse2(const tran_low_t *in, uint8_t *out, int stride) { |
- vp9_highbd_idct8x8_10_add_sse2(in, out, stride, 12); |
+ vpx_highbd_idct8x8_10_add_sse2(in, out, stride, 12); |
} |
void idct8x8_64_add_10_sse2(const tran_low_t *in, uint8_t *out, int stride) { |
- vp9_highbd_idct8x8_64_add_sse2(in, out, stride, 10); |
+ vpx_highbd_idct8x8_64_add_sse2(in, out, stride, 10); |
} |
void idct8x8_64_add_12_sse2(const tran_low_t *in, uint8_t *out, int stride) { |
- vp9_highbd_idct8x8_64_add_sse2(in, out, stride, 12); |
+ vpx_highbd_idct8x8_64_add_sse2(in, out, stride, 12); |
} |
#endif // HAVE_SSE2 |
#endif // CONFIG_VP9_HIGHBITDEPTH |
@@ -658,14 +658,14 @@ using std::tr1::make_tuple; |
INSTANTIATE_TEST_CASE_P( |
C, FwdTrans8x8DCT, |
::testing::Values( |
- make_tuple(&vpx_fdct8x8_c, &vp9_idct8x8_64_add_c, 0, VPX_BITS_8), |
+ make_tuple(&vpx_fdct8x8_c, &vpx_idct8x8_64_add_c, 0, VPX_BITS_8), |
make_tuple(&vpx_highbd_fdct8x8_c, &idct8x8_10, 0, VPX_BITS_10), |
make_tuple(&vpx_highbd_fdct8x8_c, &idct8x8_12, 0, VPX_BITS_12))); |
#else |
INSTANTIATE_TEST_CASE_P( |
C, FwdTrans8x8DCT, |
::testing::Values( |
- make_tuple(&vpx_fdct8x8_c, &vp9_idct8x8_64_add_c, 0, VPX_BITS_8))); |
+ make_tuple(&vpx_fdct8x8_c, &vpx_idct8x8_64_add_c, 0, VPX_BITS_8))); |
#endif // CONFIG_VP9_HIGHBITDEPTH |
#if CONFIG_VP9_HIGHBITDEPTH |
@@ -698,7 +698,7 @@ INSTANTIATE_TEST_CASE_P( |
INSTANTIATE_TEST_CASE_P( |
NEON, FwdTrans8x8DCT, |
::testing::Values( |
- make_tuple(&vpx_fdct8x8_neon, &vp9_idct8x8_64_add_neon, 0, |
+ make_tuple(&vpx_fdct8x8_neon, &vpx_idct8x8_64_add_neon, 0, |
VPX_BITS_8))); |
#endif // HAVE_NEON_ASM && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE |
@@ -716,7 +716,7 @@ INSTANTIATE_TEST_CASE_P( |
INSTANTIATE_TEST_CASE_P( |
SSE2, FwdTrans8x8DCT, |
::testing::Values( |
- make_tuple(&vpx_fdct8x8_sse2, &vp9_idct8x8_64_add_sse2, 0, |
+ make_tuple(&vpx_fdct8x8_sse2, &vpx_idct8x8_64_add_sse2, 0, |
VPX_BITS_8))); |
INSTANTIATE_TEST_CASE_P( |
SSE2, FwdTrans8x8HT, |
@@ -731,7 +731,7 @@ INSTANTIATE_TEST_CASE_P( |
INSTANTIATE_TEST_CASE_P( |
SSE2, FwdTrans8x8DCT, |
::testing::Values( |
- make_tuple(&vpx_fdct8x8_sse2, &vp9_idct8x8_64_add_c, 0, VPX_BITS_8), |
+ make_tuple(&vpx_fdct8x8_sse2, &vpx_idct8x8_64_add_c, 0, VPX_BITS_8), |
make_tuple(&vpx_highbd_fdct8x8_c, |
&idct8x8_64_add_10_sse2, 12, VPX_BITS_10), |
make_tuple(&vpx_highbd_fdct8x8_sse2, |
@@ -769,7 +769,7 @@ INSTANTIATE_TEST_CASE_P( |
INSTANTIATE_TEST_CASE_P( |
SSSE3, FwdTrans8x8DCT, |
::testing::Values( |
- make_tuple(&vpx_fdct8x8_ssse3, &vp9_idct8x8_64_add_ssse3, 0, |
+ make_tuple(&vpx_fdct8x8_ssse3, &vpx_idct8x8_64_add_ssse3, 0, |
VPX_BITS_8))); |
#endif |
@@ -777,7 +777,7 @@ INSTANTIATE_TEST_CASE_P( |
INSTANTIATE_TEST_CASE_P( |
MSA, FwdTrans8x8DCT, |
::testing::Values( |
- make_tuple(&vpx_fdct8x8_msa, &vp9_idct8x8_64_add_msa, 0, VPX_BITS_8))); |
+ make_tuple(&vpx_fdct8x8_msa, &vpx_idct8x8_64_add_msa, 0, VPX_BITS_8))); |
INSTANTIATE_TEST_CASE_P( |
MSA, FwdTrans8x8HT, |
::testing::Values( |