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 295 matching lines @@
         filt_mid = min_filter_level;
     else if (filt_mid > max_filter_level)
         filt_mid = max_filter_level;
 
     /* Define the initial step size */
     filter_step = (filt_mid < 16) ? 4 : filt_mid / 4;
 
     /* Get baseline error score */
 
     /* Copy the unfiltered / processed recon buffer to the new buffer */
-    vp8_yv12_copy_y(saved_frame, cm->frame_to_show);
+    vpx_yv12_copy_y(saved_frame, cm->frame_to_show);
 
     vp8cx_set_alt_lf_level(cpi, filt_mid);
     vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_mid);
 
     best_err = vp8_calc_ss_err(sd, cm->frame_to_show);
 
     ss_err[filt_mid] = best_err;
 
     filt_best = filt_mid;
 
     while (filter_step > 0)
     {
         Bias = (best_err >> (15 - (filt_mid / 8))) * filter_step;
 
         if (cpi->twopass.section_intra_rating < 20)
             Bias = Bias * cpi->twopass.section_intra_rating / 20;
 
         filt_high = ((filt_mid + filter_step) > max_filter_level) ? max_filter_level : (filt_mid + filter_step);
         filt_low = ((filt_mid - filter_step) < min_filter_level) ? min_filter_level : (filt_mid - filter_step);
 
         if ((filt_direction <= 0) && (filt_low != filt_mid))
         {
             if(ss_err[filt_low] == 0)
             {
                 /* Get Low filter error score */
-                vp8_yv12_copy_y(saved_frame, cm->frame_to_show);
+                vpx_yv12_copy_y(saved_frame, cm->frame_to_show);
                 vp8cx_set_alt_lf_level(cpi, filt_low);
                 vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_low);
 
                 filt_err = vp8_calc_ss_err(sd, cm->frame_to_show);
                 ss_err[filt_low] = filt_err;
             }
             else
                 filt_err = ss_err[filt_low];
 
             /* If value is close to the best so far then bias towards a
              * lower loop filter value.
              */
             if ((filt_err - Bias) < best_err)
             {
                 /* Was it actually better than the previous best? */
                 if (filt_err < best_err)
                     best_err = filt_err;
 
                 filt_best = filt_low;
             }
         }
 
         /* Now look at filt_high */
         if ((filt_direction >= 0) && (filt_high != filt_mid))
         {
             if(ss_err[filt_high] == 0)
             {
-                vp8_yv12_copy_y(saved_frame, cm->frame_to_show);
+                vpx_yv12_copy_y(saved_frame, cm->frame_to_show);
                 vp8cx_set_alt_lf_level(cpi, filt_high);
                 vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_high);
 
                 filt_err = vp8_calc_ss_err(sd, cm->frame_to_show);
                 ss_err[filt_high] = filt_err;
             }
             else
                 filt_err = ss_err[filt_high];
 
             /* Was it better than the previous best? */
@@ skipping 17 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;
 }