Index: source/libvpx/test/dct16x16_test.cc |
diff --git a/source/libvpx/test/dct16x16_test.cc b/source/libvpx/test/dct16x16_test.cc |
index 173e5bb80a8d93ac026a174073ab63c14fedd334..e9de76ada917677df6c13598a9fb335a95c0e1e1 100644 |
--- a/source/libvpx/test/dct16x16_test.cc |
+++ b/source/libvpx/test/dct16x16_test.cc |
@@ -277,7 +277,7 @@ void fdct16x16_ref(const int16_t *in, tran_low_t *out, int stride, |
void idct16x16_ref(const tran_low_t *in, uint8_t *dest, int stride, |
int /*tx_type*/) { |
- vp9_idct16x16_256_add_c(in, dest, stride); |
+ vpx_idct16x16_256_add_c(in, dest, stride); |
} |
void fht16x16_ref(const int16_t *in, tran_low_t *out, int stride, |
@@ -292,11 +292,11 @@ void iht16x16_ref(const tran_low_t *in, uint8_t *dest, int stride, |
#if CONFIG_VP9_HIGHBITDEPTH |
void idct16x16_10(const tran_low_t *in, uint8_t *out, int stride) { |
- vp9_highbd_idct16x16_256_add_c(in, out, stride, 10); |
+ vpx_highbd_idct16x16_256_add_c(in, out, stride, 10); |
} |
void idct16x16_12(const tran_low_t *in, uint8_t *out, int stride) { |
- vp9_highbd_idct16x16_256_add_c(in, out, stride, 12); |
+ vpx_highbd_idct16x16_256_add_c(in, out, stride, 12); |
} |
void idct16x16_10_ref(const tran_low_t *in, uint8_t *out, int stride, |
@@ -318,28 +318,28 @@ void iht16x16_12(const tran_low_t *in, uint8_t *out, int stride, int tx_type) { |
} |
void idct16x16_10_add_10_c(const tran_low_t *in, uint8_t *out, int stride) { |
- vp9_highbd_idct16x16_10_add_c(in, out, stride, 10); |
+ vpx_highbd_idct16x16_10_add_c(in, out, stride, 10); |
} |
void idct16x16_10_add_12_c(const tran_low_t *in, uint8_t *out, int stride) { |
- vp9_highbd_idct16x16_10_add_c(in, out, stride, 12); |
+ vpx_highbd_idct16x16_10_add_c(in, out, stride, 12); |
} |
#if HAVE_SSE2 |
void idct16x16_256_add_10_sse2(const tran_low_t *in, uint8_t *out, int stride) { |
- vp9_highbd_idct16x16_256_add_sse2(in, out, stride, 10); |
+ vpx_highbd_idct16x16_256_add_sse2(in, out, stride, 10); |
} |
void idct16x16_256_add_12_sse2(const tran_low_t *in, uint8_t *out, int stride) { |
- vp9_highbd_idct16x16_256_add_sse2(in, out, stride, 12); |
+ vpx_highbd_idct16x16_256_add_sse2(in, out, stride, 12); |
} |
void idct16x16_10_add_10_sse2(const tran_low_t *in, uint8_t *out, int stride) { |
- vp9_highbd_idct16x16_10_add_sse2(in, out, stride, 10); |
+ vpx_highbd_idct16x16_10_add_sse2(in, out, stride, 10); |
} |
void idct16x16_10_add_12_sse2(const tran_low_t *in, uint8_t *out, int stride) { |
- vp9_highbd_idct16x16_10_add_sse2(in, out, stride, 12); |
+ vpx_highbd_idct16x16_10_add_sse2(in, out, stride, 12); |
} |
#endif // HAVE_SSE2 |
#endif // CONFIG_VP9_HIGHBITDEPTH |
@@ -824,12 +824,12 @@ INSTANTIATE_TEST_CASE_P( |
::testing::Values( |
make_tuple(&vpx_highbd_fdct16x16_c, &idct16x16_10, 0, VPX_BITS_10), |
make_tuple(&vpx_highbd_fdct16x16_c, &idct16x16_12, 0, VPX_BITS_12), |
- make_tuple(&vpx_fdct16x16_c, &vp9_idct16x16_256_add_c, 0, VPX_BITS_8))); |
+ make_tuple(&vpx_fdct16x16_c, &vpx_idct16x16_256_add_c, 0, VPX_BITS_8))); |
#else |
INSTANTIATE_TEST_CASE_P( |
C, Trans16x16DCT, |
::testing::Values( |
- make_tuple(&vpx_fdct16x16_c, &vp9_idct16x16_256_add_c, 0, VPX_BITS_8))); |
+ make_tuple(&vpx_fdct16x16_c, &vpx_idct16x16_256_add_c, 0, VPX_BITS_8))); |
#endif // CONFIG_VP9_HIGHBITDEPTH |
#if CONFIG_VP9_HIGHBITDEPTH |
@@ -863,7 +863,7 @@ INSTANTIATE_TEST_CASE_P( |
NEON, Trans16x16DCT, |
::testing::Values( |
make_tuple(&vpx_fdct16x16_c, |
- &vp9_idct16x16_256_add_neon, 0, VPX_BITS_8))); |
+ &vpx_idct16x16_256_add_neon, 0, VPX_BITS_8))); |
#endif |
#if HAVE_SSE2 && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE |
@@ -871,7 +871,7 @@ INSTANTIATE_TEST_CASE_P( |
SSE2, Trans16x16DCT, |
::testing::Values( |
make_tuple(&vpx_fdct16x16_sse2, |
- &vp9_idct16x16_256_add_sse2, 0, VPX_BITS_8))); |
+ &vpx_idct16x16_256_add_sse2, 0, VPX_BITS_8))); |
INSTANTIATE_TEST_CASE_P( |
SSE2, Trans16x16HT, |
::testing::Values( |
@@ -898,7 +898,7 @@ INSTANTIATE_TEST_CASE_P( |
make_tuple(&vpx_highbd_fdct16x16_c, |
&idct16x16_256_add_12_sse2, 0, VPX_BITS_12), |
make_tuple(&vpx_fdct16x16_sse2, |
- &vp9_idct16x16_256_add_c, 0, VPX_BITS_8))); |
+ &vpx_idct16x16_256_add_c, 0, VPX_BITS_8))); |
INSTANTIATE_TEST_CASE_P( |
SSE2, Trans16x16HT, |
::testing::Values( |
@@ -927,7 +927,7 @@ INSTANTIATE_TEST_CASE_P( |
MSA, Trans16x16DCT, |
::testing::Values( |
make_tuple(&vpx_fdct16x16_msa, |
- &vp9_idct16x16_256_add_msa, 0, VPX_BITS_8))); |
+ &vpx_idct16x16_256_add_msa, 0, VPX_BITS_8))); |
INSTANTIATE_TEST_CASE_P( |
MSA, Trans16x16HT, |
::testing::Values( |