diff options
| author | Angie Chiang <angiebird@google.com> | 2015-09-21 23:25:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-21 23:25:26 +0000 |
| commit | 36c4e8b27a2ed3f1abfb4ed54b7cdf1d9b38f624 (patch) | |
| tree | 95ee9e5d7bb52fa694db6c9cf4d8e25acba6e381 /test | |
| parent | 90889b9a4563d9c4d341547bf5fe14836e92da11 (diff) | |
| parent | 8903b9fa8345726efbe9b92a759c98cc21c4c14b (diff) | |
| download | libvpx-36c4e8b27a2ed3f1abfb4ed54b7cdf1d9b38f624.tar libvpx-36c4e8b27a2ed3f1abfb4ed54b7cdf1d9b38f624.tar.gz libvpx-36c4e8b27a2ed3f1abfb4ed54b7cdf1d9b38f624.tar.bz2 libvpx-36c4e8b27a2ed3f1abfb4ed54b7cdf1d9b38f624.zip | |
Merge "remove static from fdct4/8/16/32"
Diffstat (limited to 'test')
| -rw-r--r-- | test/test.mk | 2 | ||||
| -rw-r--r-- | test/vp10_dct_test.cc | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/test/test.mk b/test/test.mk index bb5186b00..fde970311 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_ENCODER) += vp10_dct_test.cc +LIBVPX_TEST_SRCS-$(CONFIG_VP10) += 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 8e49609de..8fb5f4ff3 100644 --- a/test/vp10_dct_test.cc +++ b/test/vp10_dct_test.cc @@ -17,10 +17,7 @@ #include "test/util.h" #include "./vpx_config.h" #include "vpx_ports/msvc.h" - -#undef CONFIG_COEFFICIENT_RANGE_CHECKING -#define CONFIG_COEFFICIENT_RANGE_CHECKING 1 -#include "vp10/encoder/dct.c" +#include "vp10/encoder/dct.h" using libvpx_test::ACMRandom; @@ -105,8 +102,8 @@ TEST_P(Vp10FwdTxfm, RunFwdAccuracyCheck) { INSTANTIATE_TEST_CASE_P( C, Vp10FwdTxfm, ::testing::Values( - 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))); + 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))); } // namespace |