libvpx: Pull from upstream

source/libvpx/vp8/encoder/picklpf.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 31 matching lines @@
     /* Copy extra 4 so that full filter context is available if filtering done
      * on the copied partial frame and not original. Partial filter does mb
      * filtering for top row also, which can modify3 pixels above.
      */
     linestocopy += 4;
     /* partial image starts at ~middle of frame (macroblock border)*/
     yoffset  = ystride * (((yheight >> 5) * 16) - 4);
     src_y = src_ybc->y_buffer + yoffset;
     dst_y = dst_ybc->y_buffer + yoffset;
 
-    vpx_memcpy(dst_y, src_y, ystride * linestocopy);
+    memcpy(dst_y, src_y, ystride * linestocopy);
 }
 
 static int calc_partial_ssl_err(YV12_BUFFER_CONFIG *source,
                                 YV12_BUFFER_CONFIG *dest)
 {
     int i, j;
     int Total = 0;
     int srcoffset, dstoffset;
     unsigned char *src = source->y_buffer;
     unsigned char *dst = dest->y_buffer;
@@ skipping 72 matching lines @@
 
 void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)
 {
     VP8_COMMON *cm = &cpi->common;
 
     int best_err = 0;
     int filt_err = 0;
     int min_filter_level = get_min_filter_level(cpi, cm->base_qindex);
     int max_filter_level = get_max_filter_level(cpi, cm->base_qindex);
     int filt_val;
-    int best_filt_val = cm->filter_level;
+    int best_filt_val;
     YV12_BUFFER_CONFIG * saved_frame = cm->frame_to_show;
 
     /* Replace unfiltered frame buffer with a new one */
     cm->frame_to_show = &cpi->pick_lf_lvl_frame;
 
     if (cm->frame_type == KEY_FRAME)
         cm->sharpness_level = 0;
     else
         cm->sharpness_level = cpi->oxcf.Sharpness;
 
@@ skipping 111 matching lines @@
 {
     VP8_COMMON *cm = &cpi->common;
 
     int best_err = 0;
     int filt_err = 0;
     int min_filter_level = get_min_filter_level(cpi, cm->base_qindex);
     int max_filter_level = get_max_filter_level(cpi, cm->base_qindex);
 
     int filter_step;
     int filt_high = 0;
-    /* Start search at previous frame filter level */
-    int filt_mid = cm->filter_level;
+    int filt_mid;
     int filt_low = 0;
     int filt_best;
     int filt_direction = 0;
 
     /* Bias against raising loop filter and in favor of lowering it */
     int Bias = 0;
 
     int ss_err[MAX_LOOP_FILTER + 1];
 
     YV12_BUFFER_CONFIG * saved_frame = cm->frame_to_show;
 
-    vpx_memset(ss_err, 0, sizeof(ss_err));
+    memset(ss_err, 0, sizeof(ss_err));
 
     /* Replace unfiltered frame buffer with a new one */
     cm->frame_to_show = &cpi->pick_lf_lvl_frame;
 
     if (cm->frame_type == KEY_FRAME)
         cm->sharpness_level = 0;
     else
         cm->sharpness_level = cpi->oxcf.Sharpness;
 
     /* Start the search at the previous frame filter level unless it is
@@ skipping 97 matching lines @@
             filt_direction = (filt_best < filt_mid) ? -1 : 1;
             filt_mid = filt_best;
         }
     }
 
     cm->filter_level = filt_best;
 
     /* restore unfiltered frame pointer */
     cm->frame_to_show = saved_frame;
 }