libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_variance.c

 /*
  *  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 138 matching lines @@
   var_filter_block2d_bil_first_pass(src, fdata3, src_stride, 1, H + 1, W, \
                                     BILINEAR_FILTERS_2TAP(xoffset)); \
   var_filter_block2d_bil_second_pass(fdata3, temp2, W, W, H, W, \
                                      BILINEAR_FILTERS_2TAP(yoffset)); \
 \
   vp9_comp_avg_pred(temp3, second_pred, W, H, temp2, W); \
 \
   return vp9_variance##W##x##H##_c(temp3, W, dst, dst_stride, sse); \
 }
 
+void vp9_get16x16var_c(const uint8_t *src_ptr, int source_stride,
+                       const uint8_t *ref_ptr, int ref_stride,
+                       unsigned int *sse, int *sum) {
+  variance(src_ptr, source_stride, ref_ptr, ref_stride, 16, 16, sse, sum);
+}
+
+void vp9_get8x8var_c(const uint8_t *src_ptr, int source_stride,
+                     const uint8_t *ref_ptr, int ref_stride,
+                     unsigned int *sse, int *sum) {
+  variance(src_ptr, source_stride, ref_ptr, ref_stride, 8, 8, sse, sum);
+}
+
 unsigned int vp9_mse16x16_c(const uint8_t *src, int src_stride,
                             const uint8_t *ref, int ref_stride,
                             unsigned int *sse) {
   int sum;
   variance(src, src_stride, ref, ref_stride, 16, 16, sse, &sum);
   return *sse;
 }
 
 unsigned int vp9_mse16x8_c(const uint8_t *src, int src_stride,
                            const uint8_t *ref, int ref_stride,
@@ skipping 78 matching lines @@
   for (i = 0; i < height; i++) {
     for (j = 0; j < width; j++) {
       const int tmp = pred[j] + ref[j];
       comp_pred[j] = ROUND_POWER_OF_TWO(tmp, 1);
     }
     comp_pred += width;
     pred += width;
     ref += ref_stride;
   }
 }