diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-03-10 09:50:31 -0700 |
|---|---|---|
| committer | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-03-11 10:04:38 -0700 |
| commit | b08e2e23eec181e9951df33cd704ac294c5407b6 (patch) | |
| tree | 8efc1ca8af18169b44e505ea3ac1d224c1d777ab /libvpx/test/dct32x32_test.cc | |
| parent | f0ceed9d146017d218d64ca946d5c2b31356389b (diff) | |
| download | android_external_libvpx-b08e2e23eec181e9951df33cd704ac294c5407b6.tar.gz android_external_libvpx-b08e2e23eec181e9951df33cd704ac294c5407b6.tar.bz2 android_external_libvpx-b08e2e23eec181e9951df33cd704ac294c5407b6.zip | |
libvpx: Roll latest libvpx and enable VP9 Encoder
Rolling latest libvpx from upstream and generating configurations with VP9
Encoder enabled. Updating a mistake in UPDATING file.
Upstream Hash: 1f08824d6db735e4cacb0419785a789395e42b2b
Change-Id: Ie2c45e2253ade4a9ce88ca640cae39a7ece2d8f4
Diffstat (limited to 'libvpx/test/dct32x32_test.cc')
| -rw-r--r-- | libvpx/test/dct32x32_test.cc | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/libvpx/test/dct32x32_test.cc b/libvpx/test/dct32x32_test.cc index 1e792da..013f451 100644 --- a/libvpx/test/dct32x32_test.cc +++ b/libvpx/test/dct32x32_test.cc @@ -18,12 +18,9 @@ #include "test/register_state_check.h" #include "test/util.h" -extern "C" { #include "./vpx_config.h" -#include "vp9/common/vp9_entropy.h" #include "./vp9_rtcd.h" -} - +#include "vp9/common/vp9_entropy.h" #include "vpx/vpx_integer.h" using libvpx_test::ACMRandom; @@ -77,7 +74,9 @@ void reference_32x32_dct_2d(const int16_t input[kNumCoeffs], typedef void (*fwd_txfm_t)(const int16_t *in, int16_t *out, int stride); typedef void (*inv_txfm_t)(const int16_t *in, uint8_t *out, int stride); -class Trans32x32Test : public PARAMS(fwd_txfm_t, inv_txfm_t, int) { +typedef std::tr1::tuple<fwd_txfm_t, inv_txfm_t, int> trans_32x32_param_t; + +class Trans32x32Test : public ::testing::TestWithParam<trans_32x32_param_t> { public: virtual ~Trans32x32Test() {} virtual void SetUp() { @@ -249,6 +248,16 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vp9_fdct32x32_c, &vp9_idct32x32_1024_add_c, 0), make_tuple(&vp9_fdct32x32_rd_c, &vp9_idct32x32_1024_add_c, 1))); +#if HAVE_NEON +INSTANTIATE_TEST_CASE_P( + NEON, Trans32x32Test, + ::testing::Values( + make_tuple(&vp9_fdct32x32_c, + &vp9_idct32x32_1024_add_neon, 0), + make_tuple(&vp9_fdct32x32_rd_c, + &vp9_idct32x32_1024_add_neon, 1))); +#endif + #if HAVE_SSE2 INSTANTIATE_TEST_CASE_P( SSE2, Trans32x32Test, @@ -258,4 +267,14 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vp9_fdct32x32_rd_sse2, &vp9_idct32x32_1024_add_sse2, 1))); #endif + +#if HAVE_AVX2 +INSTANTIATE_TEST_CASE_P( + AVX2, Trans32x32Test, + ::testing::Values( + make_tuple(&vp9_fdct32x32_avx2, + &vp9_idct32x32_1024_add_sse2, 0), + make_tuple(&vp9_fdct32x32_rd_avx2, + &vp9_idct32x32_1024_add_sse2, 1))); +#endif } // namespace |