libvpx: Pull from upstream

source/libvpx/test/convolve_test.cc

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 26 matching lines @@
         hv8_avg_(hv8_avg) {}
 
   convolve_fn_t h8_;
   convolve_fn_t v8_;
   convolve_fn_t hv8_;
   convolve_fn_t h8_avg_;
   convolve_fn_t v8_avg_;
   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
 uint8_t clip_pixel(int x) {
   return x < 0 ? 0 :
          x > 255 ? 255 :
          x;
 }
 
 void filter_block2d_8_c(const uint8_t *src_ptr,
@@ skipping 105 matching lines @@
   uint8_t tmp[64 * 64];
 
   assert(output_width <= 64);
   assert(output_height <= 64);
   filter_block2d_8_c(src_ptr, src_stride, HFilter, VFilter, tmp, 64,
                      output_width, output_height);
   block2d_average_c(tmp, 64, dst_ptr, dst_stride,
                     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.
     input_ = reinterpret_cast<uint8_t*>(
         vpx_memalign(kDataAlignment, kInputBufferSize + 1)) + 1;
     output_ = reinterpret_cast<uint8_t*>(
         vpx_memalign(kDataAlignment, kOutputBufferSize));
   }
 
   static void TearDownTestCase() {
@@ skipping 497 matching lines @@
     make_tuple(8, 16, &convolve8_dspr2),
     make_tuple(16, 16, &convolve8_dspr2),
     make_tuple(32, 16, &convolve8_dspr2),
     make_tuple(16, 32, &convolve8_dspr2),
     make_tuple(32, 32, &convolve8_dspr2),
     make_tuple(64, 32, &convolve8_dspr2),
     make_tuple(32, 64, &convolve8_dspr2),
     make_tuple(64, 64, &convolve8_dspr2)));
 #endif
 }  // namespace