libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_findnearmv.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 39 matching lines @@
 }
 unsigned int vp9_sad16x3_c(const uint8_t *src_ptr,
                            int  src_stride,
                            const uint8_t *ref_ptr,
                            int  ref_stride) {
   return sad_mx_n_c(src_ptr, src_stride, ref_ptr, ref_stride, 16, 3);
 }
 
 
 unsigned int vp9_variance2x16_c(const uint8_t *src_ptr,
-                                const int  source_stride,
+                                int  source_stride,
                                 const uint8_t *ref_ptr,
-                                const int  recon_stride,
+                                int  recon_stride,
                                 unsigned int *sse) {
   int sum;
   variance(src_ptr, source_stride, ref_ptr, recon_stride, 2, 16, sse, &sum);
   return (*sse - (((unsigned int)sum * sum) >> 5));
 }
 
 unsigned int vp9_variance16x2_c(const uint8_t *src_ptr,
-                                const int  source_stride,
+                                int  source_stride,
                                 const uint8_t *ref_ptr,
-                                const int  recon_stride,
+                                int  recon_stride,
                                 unsigned int *sse) {
   int sum;
   variance(src_ptr, source_stride, ref_ptr, recon_stride, 16, 2, sse, &sum);
   return (*sse - (((unsigned int)sum * sum) >> 5));
 }
 
 unsigned int vp9_sub_pixel_variance16x2_c(const uint8_t *src_ptr,
-                                          const int  src_pixels_per_line,
-                                          const int  xoffset,
-                                          const int  yoffset,
+                                          int  src_pixels_per_line,
+                                          int  xoffset,
+                                          int  yoffset,
                                           const uint8_t *dst_ptr,
-                                          const int dst_pixels_per_line,
+                                          int dst_pixels_per_line,
                                           unsigned int *sse) {
   uint16_t FData3[16 * 3];  // Temp data buffer used in filtering
   uint8_t temp2[2 * 16];
   const int16_t *HFilter, *VFilter;
 
   HFilter = vp9_bilinear_filters[xoffset];
   VFilter = vp9_bilinear_filters[yoffset];
 
   var_filter_block2d_bil_first_pass(src_ptr, FData3,
                                     src_pixels_per_line, 1, 3, 16, HFilter);
   var_filter_block2d_bil_second_pass(FData3, temp2, 16, 16, 2, 16, VFilter);
 
   return vp9_variance16x2_c(temp2, 16, dst_ptr, dst_pixels_per_line, sse);
 }
 
 unsigned int vp9_sub_pixel_variance2x16_c(const uint8_t *src_ptr,
-                                          const int  src_pixels_per_line,
-                                          const int  xoffset,
-                                          const int  yoffset,
+                                          int  src_pixels_per_line,
+                                          int  xoffset,
+                                          int  yoffset,
                                           const uint8_t *dst_ptr,
-                                          const int dst_pixels_per_line,
+                                          int dst_pixels_per_line,
                                           unsigned int *sse) {
   uint16_t FData3[2 * 17];  // Temp data buffer used in filtering
   uint8_t temp2[2 * 16];
   const int16_t *HFilter, *VFilter;
 
   HFilter = vp9_bilinear_filters[xoffset];
   VFilter = vp9_bilinear_filters[yoffset];
 
   var_filter_block2d_bil_first_pass(src_ptr, FData3,
                                     src_pixels_per_line, 1, 17, 2, HFilter);
@@ skipping 170 matching lines @@
     else
       near->as_int = sorted_mvs[2].as_int;
   } else {
       nearest->as_int = sorted_mvs[1].as_int;
       near->as_int = sorted_mvs[2].as_int;
   }
 
   // Copy back the re-ordered mv list
   vpx_memcpy(mvlist, sorted_mvs, sizeof(sorted_mvs));
 }