Revert "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 296 matching lines @@
   return *sse;
 }
 
 unsigned int vp9_mse16x16_sse2(const uint8_t *src, int src_stride,
                                const uint8_t *ref, int ref_stride,
                                unsigned int *sse) {
   vp9_variance16x16_sse2(src, src_stride, ref, ref_stride, sse);
   return *sse;
 }
 
-// The 2 unused parameters are place holders for PIC enabled build.
 #define DECL(w, opt) \
 int vp9_sub_pixel_variance##w##xh_##opt(const uint8_t *src, \
                                         ptrdiff_t src_stride, \
                                         int x_offset, int y_offset, \
                                         const uint8_t *dst, \
                                         ptrdiff_t dst_stride, \
-                                        int height, unsigned int *sse, \
-                                        void *unused0, void *unused)
+                                        int height, unsigned int *sse)
 #define DECLS(opt1, opt2) \
 DECL(4, opt2); \
 DECL(8, opt1); \
 DECL(16, opt1)
 
 DECLS(sse2, sse);
 DECLS(ssse3, ssse3);
 #undef DECLS
 #undef DECL
 
 #define FN(w, h, wf, wlog2, hlog2, opt, cast) \
 unsigned int vp9_sub_pixel_variance##w##x##h##_##opt(const uint8_t *src, \
                                                      int src_stride, \
                                                      int x_offset, \
                                                      int y_offset, \
                                                      const uint8_t *dst, \
                                                      int dst_stride, \
                                                      unsigned int *sse_ptr) { \
   unsigned int sse; \
   int se = vp9_sub_pixel_variance##wf##xh_##opt(src, src_stride, x_offset, \
                                                 y_offset, dst, dst_stride, \
-                                                h, &sse, NULL, NULL); \
+                                                h, &sse); \
   if (w > wf) { \
     unsigned int sse2; \
     int se2 = vp9_sub_pixel_variance##wf##xh_##opt(src + 16, src_stride, \
                                                    x_offset, y_offset, \
                                                    dst + 16, dst_stride, \
-                                                   h, &sse2, NULL, NULL); \
+                                                   h, &sse2); \
     se += se2; \
     sse += sse2; \
     if (w > wf * 2) { \
       se2 = vp9_sub_pixel_variance##wf##xh_##opt(src + 32, src_stride, \
                                                  x_offset, y_offset, \
                                                  dst + 32, dst_stride, \
-                                                 h, &sse2, NULL, NULL); \
+                                                 h, &sse2); \
       se += se2; \
       sse += sse2; \
       se2 = vp9_sub_pixel_variance##wf##xh_##opt(src + 48, src_stride, \
                                                  x_offset, y_offset, \
                                                  dst + 48, dst_stride, \
-                                                 h, &sse2, NULL, NULL); \
+                                                 h, &sse2); \
       se += se2; \
       sse += sse2; \
     } \
   } \
   *sse_ptr = sse; \
   return sse - ((cast se * se) >> (wlog2 + hlog2)); \
 }
 
 #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, (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
 
-// The 2 unused parameters are place holders for PIC enabled build.
 #define DECL(w, opt) \
 int vp9_sub_pixel_avg_variance##w##xh_##opt(const uint8_t *src, \
                                             ptrdiff_t src_stride, \
                                             int x_offset, int y_offset, \
                                             const uint8_t *dst, \
                                             ptrdiff_t dst_stride, \
                                             const uint8_t *sec, \
                                             ptrdiff_t sec_stride, \
-                                            int height, unsigned int *sse, \
-                                            void *unused0, void *unused)
+                                            int height, unsigned int *sse)
 #define DECLS(opt1, opt2) \
 DECL(4, opt2); \
 DECL(8, opt1); \
 DECL(16, opt1)
 
 DECLS(sse2, sse);
 DECLS(ssse3, ssse3);
 #undef DECL
 #undef DECLS
 
 #define FN(w, h, wf, wlog2, hlog2, opt, cast) \
 unsigned int vp9_sub_pixel_avg_variance##w##x##h##_##opt(const uint8_t *src, \
                                                          int src_stride, \
                                                          int x_offset, \
                                                          int y_offset, \
                                                          const uint8_t *dst, \
                                                          int dst_stride, \
                                                          unsigned int *sseptr, \
                                                          const uint8_t *sec) { \
   unsigned int sse; \
   int se = vp9_sub_pixel_avg_variance##wf##xh_##opt(src, src_stride, x_offset, \
                                                     y_offset, dst, dst_stride, \
-                                                    sec, w, h, &sse, NULL, \
-                                                    NULL); \
+                                                    sec, w, h, &sse); \
   if (w > wf) { \
     unsigned int sse2; \
     int se2 = vp9_sub_pixel_avg_variance##wf##xh_##opt(src + 16, src_stride, \
                                                        x_offset, y_offset, \
                                                        dst + 16, dst_stride, \
-                                                       sec + 16, w, h, &sse2, \
-                                                       NULL, NULL); \
+                                                       sec + 16, w, h, &sse2); \
     se += se2; \
     sse += sse2; \
     if (w > wf * 2) { \
       se2 = vp9_sub_pixel_avg_variance##wf##xh_##opt(src + 32, src_stride, \
                                                      x_offset, y_offset, \
                                                      dst + 32, dst_stride, \
-                                                     sec + 32, w, h, &sse2, \
-                                                     NULL, NULL); \
+                                                     sec + 32, w, h, &sse2); \
       se += se2; \
       sse += sse2; \
       se2 = vp9_sub_pixel_avg_variance##wf##xh_##opt(src + 48, src_stride, \
                                                      x_offset, y_offset, \
                                                      dst + 48, dst_stride, \
-                                                     sec + 48, w, h, &sse2, \
-                                                     NULL, NULL); \
+                                                     sec + 48, w, h, &sse2); \
       se += se2; \
       sse += sse2; \
     } \
   } \
   *sseptr = sse; \
   return sse - ((cast se * se) >> (wlog2 + hlog2)); \
 }
 
 #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, (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