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.
  */
 
-#include "vpx_config.h"
+#include "./vpx_config.h"
 
 #include "vp9/encoder/vp9_variance.h"
 #include "vp9/common/vp9_pragmas.h"
 #include "vpx_ports/mem.h"
 
 extern unsigned int vp9_get4x4var_mmx
 (
   const unsigned char *src_ptr,
   int  source_stride,
   const unsigned char *ref_ptr,
   int  recon_stride,
   unsigned int *SSE,
   int *Sum
 );
 
 unsigned int vp9_get_mb_ss_sse2
 (
-  const short *src_ptr
+  const int16_t *src_ptr
 );
 unsigned int vp9_get16x16var_sse2
 (
   const unsigned char *src_ptr,
   int source_stride,
   const unsigned char *ref_ptr,
   int recon_stride,
   unsigned int *SSE,
   int *Sum
 );
@@ skipping 203 matching lines @@
   *sse = var;
   return (var - (((unsigned int)avg * avg) >> 8));
 }
 
 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);
   *sse = sse0;
   return sse0;
 }
 
 unsigned int vp9_variance32x32_sse2(const uint8_t *src_ptr,
                                     int  source_stride,
@@ skipping 136 matching lines @@
 }
 
 #define FNS(opt1, opt2) \
 FN(64, 64, 16, 6, 6, opt1, (int64_t)); \
 FN(64, 32, 16, 6, 5, opt1, (int64_t)); \
 FN(32, 64, 16, 5, 6, opt1, (int64_t)); \
 FN(32, 32, 16, 5, 5, opt1, (int64_t)); \
 FN(32, 16, 16, 5, 4, opt1, (int64_t)); \
 FN(16, 32, 16, 4, 5, opt1, (int64_t)); \
 FN(16, 16, 16, 4, 4, opt1, (unsigned int)); \
-FN(16,  8, 16, 4, 3, opt1,); \
-FN(8,  16,  8, 3, 4, opt1,); \
-FN(8,   8,  8, 3, 3, opt1,); \
-FN(8,   4,  8, 3, 2, opt1,); \
-FN(4,   8,  4, 2, 3, opt2,); \
-FN(4,   4,  4, 2, 2, opt2,)
+FN(16,  8, 16, 4, 3, opt1, (unsigned int)); \
+FN(8,  16,  8, 3, 4, opt1, (unsigned int)); \
+FN(8,   8,  8, 3, 3, opt1, (unsigned int)); \
+FN(8,   4,  8, 3, 2, opt1, (unsigned int)); \
+FN(4,   8,  4, 2, 3, opt2, (unsigned int)); \
+FN(4,   4,  4, 2, 2, opt2, (unsigned int))
 
 FNS(sse2, sse);
 FNS(ssse3, ssse3);
 
 #undef FNS
 #undef FN
 
 #define DECL(w, opt) \
 int vp9_sub_pixel_avg_variance##w##xh_##opt(const uint8_t *src, \
                                             ptrdiff_t src_stride, \
@@ skipping 54 matching lines @@
 }
 
 #define FNS(opt1, opt2) \
 FN(64, 64, 16, 6, 6, opt1, (int64_t)); \
 FN(64, 32, 16, 6, 5, opt1, (int64_t)); \
 FN(32, 64, 16, 5, 6, opt1, (int64_t)); \
 FN(32, 32, 16, 5, 5, opt1, (int64_t)); \
 FN(32, 16, 16, 5, 4, opt1, (int64_t)); \
 FN(16, 32, 16, 4, 5, opt1, (int64_t)); \
 FN(16, 16, 16, 4, 4, opt1, (unsigned int)); \
-FN(16,  8, 16, 4, 3, opt1,); \
-FN(8,  16,  8, 3, 4, opt1,); \
-FN(8,   8,  8, 3, 3, opt1,); \
-FN(8,   4,  8, 3, 2, opt1,); \
-FN(4,   8,  4, 2, 3, opt2,); \
-FN(4,   4,  4, 2, 2, opt2,)
+FN(16,  8, 16, 4, 3, opt1, (unsigned int)); \
+FN(8,  16,  8, 3, 4, opt1, (unsigned int)); \
+FN(8,   8,  8, 3, 3, opt1, (unsigned int)); \
+FN(8,   4,  8, 3, 2, opt1, (unsigned int)); \
+FN(4,   8,  4, 2, 3, opt2, (unsigned int)); \
+FN(4,   4,  4, 2, 2, opt2, (unsigned int))
 
 FNS(sse2, sse);
 FNS(ssse3, ssse3);
 
 #undef FNS
 #undef FN
 
 unsigned int vp9_variance_halfpixvar16x16_h_sse2(
   const unsigned char *src_ptr,
   int  src_pixels_per_line,
@@ skipping 41 matching lines @@
   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));
 }