Update aom to slightly newer commit ID

1 files changed, 11 insertions, 9 deletions

diff --git a/third_party/aom/test/warp_filter_test_util.h b/third_party/aom/test/warp_filter_test_util.h
index 6a87e46d0..651a9f830 100644
--- a/third_party/aom/test/warp_filter_test_util.h
+++ b/third_party/aom/test/warp_filter_test_util.h
@@ -26,16 +26,18 @@ namespace libaom_test {
 
 namespace AV1WarpFilter {
 
-typedef void (*warp_affine_func)(int32_t *mat, uint8_t *ref, int width,
-                                 int height, int stride, uint8_t *pred,
-                                 int p_col, int p_row, int p_width,
-                                 int p_height, int p_stride, int subsampling_x,
-                                 int subsampling_y, int ref_frm, int16_t alpha,
-                                 int16_t beta, int16_t gamma, int16_t delta);
+typedef void (*warp_affine_func)(const int32_t *mat, const uint8_t *ref,
+                                 int width, int height, int stride,
+                                 uint8_t *pred, int p_col, int p_row,
+                                 int p_width, int p_height, int p_stride,
+                                 int subsampling_x, int subsampling_y,
+                                 int ref_frm, int16_t alpha, int16_t beta,
+                                 int16_t gamma, int16_t delta);
 
-typedef std::tr1::tuple<int, int, int> WarpTestParam;
+typedef std::tr1::tuple<int, int, int, warp_affine_func> WarpTestParam;
 
-::testing::internal::ParamGenerator<WarpTestParam> GetDefaultParams();
+::testing::internal::ParamGenerator<WarpTestParam> BuildParams(
+    warp_affine_func filter);
 
 class AV1WarpFilterTest : public ::testing::TestWithParam<WarpTestParam> {
  public:
@@ -59,7 +61,7 @@ class AV1WarpFilterTest : public ::testing::TestWithParam<WarpTestParam> {
 #if CONFIG_HIGHBITDEPTH
 namespace AV1HighbdWarpFilter {
 typedef void (*highbd_warp_affine_func)(
-    int32_t *mat, uint16_t *ref, int width, int height, int stride,
+    const int32_t *mat, const uint16_t *ref, int width, int height, int stride,
     uint16_t *pred, int p_col, int p_row, int p_width, int p_height,
     int p_stride, int subsampling_x, int subsampling_y, int bd, int ref_frm,
     int16_t alpha, int16_t beta, int16_t gamma, int16_t delta);