libvpx: Pull from upstream

source/libvpx/vp9/encoder/x86/vp9_variance_sse2.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 226 matching lines @@
   unsigned int *sse) {
   unsigned int var;
   int avg;
 
   variance_sse2(src_ptr, source_stride, ref_ptr, recon_stride, 16, 16,
                 &var, &avg, vp9_get16x16var_sse2, 16);
   *sse = var;
   return (var - (((unsigned int)avg * avg) >> 8));
 }
 
-unsigned int vp9_mse16x16_wmt(
+unsigned int vp9_mse16x16_sse2(
   const unsigned char *src_ptr,
   int  source_stride,
   const unsigned char *ref_ptr,
   int  recon_stride,
   unsigned int *sse) {
 
   unsigned int sse0;
   int sum0;
   vp9_get16x16var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &sse0,
                        &sum0);
@@ skipping 235 matching lines @@
 FN(8,   4,  8, 3, 2, opt1,); \
 FN(4,   8,  4, 2, 3, opt2,); \
 FN(4,   4,  4, 2, 2, opt2,)
 
 FNS(sse2, sse);
 FNS(ssse3, ssse3);
 
 #undef FNS
 #undef FN
 
-unsigned int vp9_variance_halfpixvar16x16_h_wmt(
+unsigned int vp9_variance_halfpixvar16x16_h_sse2(
   const unsigned char *src_ptr,
   int  src_pixels_per_line,
   const unsigned char *dst_ptr,
   int  dst_pixels_per_line,
   unsigned int *sse) {
   int xsum0;
   unsigned int xxsum0;
 
   vp9_half_horiz_variance16x_h_sse2(
     src_ptr, src_pixels_per_line,
     dst_ptr, dst_pixels_per_line, 16,
     &xsum0, &xxsum0);
 
   *sse = xxsum0;
   return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8));
 }
 
 
-unsigned int vp9_variance_halfpixvar16x16_v_wmt(
+unsigned int vp9_variance_halfpixvar16x16_v_sse2(
   const unsigned char *src_ptr,
   int  src_pixels_per_line,
   const unsigned char *dst_ptr,
   int  dst_pixels_per_line,
   unsigned int *sse) {
   int xsum0;
   unsigned int xxsum0;
   vp9_half_vert_variance16x_h_sse2(
     src_ptr, src_pixels_per_line,
     dst_ptr, dst_pixels_per_line, 16,
     &xsum0, &xxsum0);
 
   *sse = xxsum0;
   return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8));
 }
 
 
-unsigned int vp9_variance_halfpixvar16x16_hv_wmt(
+unsigned int vp9_variance_halfpixvar16x16_hv_sse2(
   const unsigned char *src_ptr,
   int  src_pixels_per_line,
   const unsigned char *dst_ptr,
   int  dst_pixels_per_line,
   unsigned int *sse) {
   int xsum0;
   unsigned int xxsum0;
 
   vp9_half_horiz_vert_variance16x_h_sse2(
     src_ptr, src_pixels_per_line,
     dst_ptr, dst_pixels_per_line, 16,
     &xsum0, &xxsum0);
 
   *sse = xxsum0;
   return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8));
 }