diff options
| author | James Zern <jzern@google.com> | 2015-09-23 17:45:27 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-09-23 17:45:57 -0700 |
| commit | e7c8b71a862806da78ba3ebe90767417be033658 (patch) | |
| tree | 293a6af9146b9f325a5422020b4f0e0de79783ed /test | |
| parent | af631e1f1959cf4961e1abeb7f547d6a9114fbcd (diff) | |
| download | libvpx-e7c8b71a862806da78ba3ebe90767417be033658.tar.gz | |
Revert "remove static from fdct4/8/16/32"
This reverts commit 8903b9fa8345726efbe9b92a759c98cc21c4c14b.
there is no reason for these to be global
Change-Id: I66a31c06f8426aeca348ef12d9b9ab59d6d5e55d
Diffstat (limited to 'test')
| -rw-r--r-- | test/test.mk | 2 | ||||
| -rw-r--r-- | test/vp10_dct_test.cc | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/test/test.mk b/test/test.mk index fde970311..bb5186b00 100644 --- a/test/test.mk +++ b/test/test.mk @@ -168,7 +168,7 @@ 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 ## VP10 -LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_dct_test.cc +LIBVPX_TEST_SRCS-$(CONFIG_VP10_ENCODER) += vp10_dct_test.cc LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_inv_txfm_test.cc endif # CONFIG_SHARED diff --git a/test/vp10_dct_test.cc b/test/vp10_dct_test.cc index 8fb5f4ff3..8e49609de 100644 --- a/test/vp10_dct_test.cc +++ b/test/vp10_dct_test.cc @@ -17,7 +17,10 @@ #include "test/util.h" #include "./vpx_config.h" #include "vpx_ports/msvc.h" -#include "vp10/encoder/dct.h" + +#undef CONFIG_COEFFICIENT_RANGE_CHECKING +#define CONFIG_COEFFICIENT_RANGE_CHECKING 1 +#include "vp10/encoder/dct.c" using libvpx_test::ACMRandom; @@ -102,8 +105,8 @@ TEST_P(Vp10FwdTxfm, RunFwdAccuracyCheck) { INSTANTIATE_TEST_CASE_P( C, Vp10FwdTxfm, ::testing::Values( - FdctParam(&vp10_fdct4, &reference_dct_1d, 4, 1), - FdctParam(&vp10_fdct8, &reference_dct_1d, 8, 1), - FdctParam(&vp10_fdct16, &reference_dct_1d, 16, 2), - FdctParam(&vp10_fdct32_local, &reference_dct_1d, 32, 4))); + FdctParam(&fdct4, &reference_dct_1d, 4, 1), + FdctParam(&fdct8, &reference_dct_1d, 8, 1), + FdctParam(&fdct16, &reference_dct_1d, 16, 2), + FdctParam(&fdct32, &reference_dct_1d, 32, 4))); } // namespace |