libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_variance.h

 /*
  *  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.
  */
 
 #ifndef VP9_ENCODER_VP9_VARIANCE_H_
 #define VP9_ENCODER_VP9_VARIANCE_H_
 
 #include "vpx/vpx_integer.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 void variance(const uint8_t *a, int a_stride,
               const uint8_t *b, int b_stride,
               int  w, int  h,
               unsigned int *sse, int *sum);
 
 #if CONFIG_VP9_HIGHBITDEPTH
-void high_variance(const uint8_t *a8, int a_stride,
-                   const uint8_t *b8, int b_stride,
-                   int w, int h,
-                   unsigned int *sse, int *sum);
+void highbd_variance(const uint8_t *a8, int a_stride,
+                     const uint8_t *b8, int b_stride,
+                     int w, int h,
+                     unsigned int *sse, int *sum);
 
-void high_10_variance(const uint8_t *a8, int a_stride,
-                      const uint8_t *b8, int b_stride,
-                      int w, int h,
-                      unsigned int *sse, int *sum);
+void highbd_10_variance(const uint8_t *a8, int a_stride,
+                        const uint8_t *b8, int b_stride,
+                        int w, int h,
+                        unsigned int *sse, int *sum);
 
-void high_12_variance(const uint8_t *a8, int a_stride,
-                      const uint8_t *b8, int b_stride,
-                      int w, int h,
-                      unsigned int *sse, int *sum);
+void highbd_12_variance(const uint8_t *a8, int a_stride,
+                        const uint8_t *b8, int b_stride,
+                        int w, int h,
+                        unsigned int *sse, int *sum);
 #endif
 
 typedef unsigned int(*vp9_sad_fn_t)(const uint8_t *src_ptr,
                                     int source_stride,
                                     const uint8_t *ref_ptr,
                                     int ref_stride);
 
 typedef unsigned int(*vp9_sad_avg_fn_t)(const uint8_t *src_ptr,
                                         int source_stride,
                                         const uint8_t *ref_ptr,
@@ skipping 42 matching lines @@
   vp9_subp_avg_variance_fn_t svaf;
   vp9_sad_multi_fn_t         sdx3f;
   vp9_sad_multi_fn_t         sdx8f;
   vp9_sad_multi_d_fn_t       sdx4df;
 } vp9_variance_fn_ptr_t;
 
 void vp9_comp_avg_pred(uint8_t *comp_pred, const uint8_t *pred, int width,
                        int height, const uint8_t *ref, int ref_stride);
 
 #if CONFIG_VP9_HIGHBITDEPTH
-void vp9_high_comp_avg_pred(uint16_t *comp_pred, const uint8_t *pred, int width,
-                            int height, const uint8_t *ref, int ref_stride);
+void vp9_highbd_comp_avg_pred(uint16_t *comp_pred, const uint8_t *pred,
+                              int width, int height,
+                              const uint8_t *ref, int ref_stride);
 #endif
 
 #ifdef __cplusplus
 }  // extern "C"
 #endif
 
 #endif  // VP9_ENCODER_VP9_VARIANCE_H_