diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-03-27 00:50:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-27 00:50:12 +0000 |
| commit | 7616a7e29066d65ecd1d6f54485360d3964c67bb (patch) | |
| tree | c051eed430b02e9a3b5275d65969e25b024e2733 /libvpx/test/convolve_test.cc | |
| parent | b2e48fbeea3ad651e5e1d00770cb3609c60bb3e7 (diff) | |
| parent | 2ec72e65689c948e92b826ae1e867bf369e72f13 (diff) | |
| download | android_external_libvpx-7616a7e29066d65ecd1d6f54485360d3964c67bb.tar.gz android_external_libvpx-7616a7e29066d65ecd1d6f54485360d3964c67bb.tar.bz2 android_external_libvpx-7616a7e29066d65ecd1d6f54485360d3964c67bb.zip | |
am 2ec72e65: libvpx: Roll latest libvpx
* commit '2ec72e65689c948e92b826ae1e867bf369e72f13':
libvpx: Roll latest libvpx
Diffstat (limited to 'libvpx/test/convolve_test.cc')
| -rw-r--r-- | libvpx/test/convolve_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libvpx/test/convolve_test.cc b/libvpx/test/convolve_test.cc index abeb4bd..e920de8 100644 --- a/libvpx/test/convolve_test.cc +++ b/libvpx/test/convolve_test.cc @@ -14,13 +14,11 @@ #include "test/util.h" #include "third_party/googletest/src/include/gtest/gtest.h" -extern "C" { #include "./vpx_config.h" #include "./vp9_rtcd.h" #include "vp9/common/vp9_filter.h" #include "vpx_mem/vpx_mem.h" #include "vpx_ports/mem.h" -} namespace { typedef void (*convolve_fn_t)(const uint8_t *src, ptrdiff_t src_stride, @@ -44,6 +42,8 @@ struct ConvolveFunctions { convolve_fn_t hv8_avg_; }; +typedef std::tr1::tuple<int, int, const ConvolveFunctions*> convolve_param_t; + // Reference 8-tap subpixel filter, slightly modified to fit into this test. #define VP9_FILTER_WEIGHT 128 #define VP9_FILTER_SHIFT 7 @@ -169,7 +169,7 @@ void filter_average_block2d_8_c(const uint8_t *src_ptr, output_width, output_height); } -class ConvolveTest : public PARAMS(int, int, const ConvolveFunctions*) { +class ConvolveTest : public ::testing::TestWithParam<convolve_param_t> { public: static void SetUpTestCase() { // Force input_ to be unaligned, output to be 16 byte aligned. |