diff options
| author | James Zern <jzern@google.com> | 2016-04-02 19:38:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-04-02 19:38:36 +0000 |
| commit | 89b1c9d4bec12e96307942a3dfb9a1397276141d (patch) | |
| tree | ffc15467d51dbc11388031a48272cd264c3c0b3c /test | |
| parent | c21d4370527e1c31c88b5268b7e0a4d99ae0c557 (diff) | |
| parent | 50e05d06518040841c4cb4a437c320ff5575527d (diff) | |
| download | libvpx-89b1c9d4bec12e96307942a3dfb9a1397276141d.tar libvpx-89b1c9d4bec12e96307942a3dfb9a1397276141d.tar.gz libvpx-89b1c9d4bec12e96307942a3dfb9a1397276141d.tar.bz2 libvpx-89b1c9d4bec12e96307942a3dfb9a1397276141d.zip | |
Merge "dct32x32_test: create fn pointers w/'&' ref"
Diffstat (limited to 'test')
| -rw-r--r-- | test/dct32x32_test.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/dct32x32_test.cc b/test/dct32x32_test.cc index 407d9f0b0..87d836630 100644 --- a/test/dct32x32_test.cc +++ b/test/dct32x32_test.cc @@ -364,9 +364,9 @@ INSTANTIATE_TEST_CASE_P( &vpx_idct32x32_1024_add_c, 1, VPX_BITS_8))); INSTANTIATE_TEST_CASE_P( C, PartialTrans32x32Test, - ::testing::Values(make_tuple(vpx_highbd_fdct32x32_1_c, VPX_BITS_8), - make_tuple(vpx_highbd_fdct32x32_1_c, VPX_BITS_10), - make_tuple(vpx_highbd_fdct32x32_1_c, VPX_BITS_12))); + ::testing::Values(make_tuple(&vpx_highbd_fdct32x32_1_c, VPX_BITS_8), + make_tuple(&vpx_highbd_fdct32x32_1_c, VPX_BITS_10), + make_tuple(&vpx_highbd_fdct32x32_1_c, VPX_BITS_12))); #else INSTANTIATE_TEST_CASE_P( C, Trans32x32Test, @@ -376,7 +376,7 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vpx_fdct32x32_rd_c, &vpx_idct32x32_1024_add_c, 1, VPX_BITS_8))); INSTANTIATE_TEST_CASE_P(C, PartialTrans32x32Test, - ::testing::Values(make_tuple(vpx_fdct32x32_1_c, + ::testing::Values(make_tuple(&vpx_fdct32x32_1_c, VPX_BITS_8))); #endif // CONFIG_VP9_HIGHBITDEPTH @@ -399,7 +399,7 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vpx_fdct32x32_rd_sse2, &vpx_idct32x32_1024_add_sse2, 1, VPX_BITS_8))); INSTANTIATE_TEST_CASE_P(SSE2, PartialTrans32x32Test, - ::testing::Values(make_tuple(vpx_fdct32x32_1_sse2, + ::testing::Values(make_tuple(&vpx_fdct32x32_1_sse2, VPX_BITS_8))); #endif // HAVE_SSE2 && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE @@ -418,7 +418,7 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vpx_fdct32x32_rd_sse2, &vpx_idct32x32_1024_add_c, 1, VPX_BITS_8))); INSTANTIATE_TEST_CASE_P(SSE2, PartialTrans32x32Test, - ::testing::Values(make_tuple(vpx_fdct32x32_1_sse2, + ::testing::Values(make_tuple(&vpx_fdct32x32_1_sse2, VPX_BITS_8))); #endif // HAVE_SSE2 && CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE @@ -441,7 +441,7 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vpx_fdct32x32_rd_msa, &vpx_idct32x32_1024_add_msa, 1, VPX_BITS_8))); INSTANTIATE_TEST_CASE_P(MSA, PartialTrans32x32Test, - ::testing::Values(make_tuple(vpx_fdct32x32_1_msa, + ::testing::Values(make_tuple(&vpx_fdct32x32_1_msa, VPX_BITS_8))); #endif // HAVE_MSA && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE } // namespace |