libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_scale.c

 /*
  *  Copyright (c) 2013 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 29 matching lines @@
     scaled_y(mv->row, sf) + y_off_q4,
     scaled_x(mv->col, sf) + x_off_q4
   };
   return res;
 }
 
 #if CONFIG_VP9_HIGHBITDEPTH
 void vp9_setup_scale_factors_for_frame(struct scale_factors *sf,
                                        int other_w, int other_h,
                                        int this_w, int this_h,
-                                       int use_high) {
+                                       int use_highbd) {
 #else
 void vp9_setup_scale_factors_for_frame(struct scale_factors *sf,
                                        int other_w, int other_h,
                                        int this_w, int this_h) {
 #endif
   if (!valid_ref_frame_size(other_w, other_h, this_w, this_h)) {
     sf->x_scale_fp = REF_INVALID_SCALE;
     sf->y_scale_fp = REF_INVALID_SCALE;
     return;
   }
@@ skipping 51 matching lines @@
       sf->predict[0][1][0] = vp9_convolve8;
       sf->predict[0][1][1] = vp9_convolve8_avg;
       sf->predict[1][0][0] = vp9_convolve8;
       sf->predict[1][0][1] = vp9_convolve8_avg;
     }
   }
   // 2D subpel motion always gets filtered in both directions
   sf->predict[1][1][0] = vp9_convolve8;
   sf->predict[1][1][1] = vp9_convolve8_avg;
 #if CONFIG_VP9_HIGHBITDEPTH
-  if (use_high) {
+  if (use_highbd) {
     if (sf->x_step_q4 == 16) {
       if (sf->y_step_q4 == 16) {
         // No scaling in either direction.
-        sf->high_predict[0][0][0] = vp9_high_convolve_copy;
-        sf->high_predict[0][0][1] = vp9_high_convolve_avg;
-        sf->high_predict[0][1][0] = vp9_high_convolve8_vert;
-        sf->high_predict[0][1][1] = vp9_high_convolve8_avg_vert;
-        sf->high_predict[1][0][0] = vp9_high_convolve8_horiz;
-        sf->high_predict[1][0][1] = vp9_high_convolve8_avg_horiz;
+        sf->highbd_predict[0][0][0] = vp9_highbd_convolve_copy;
+        sf->highbd_predict[0][0][1] = vp9_highbd_convolve_avg;
+        sf->highbd_predict[0][1][0] = vp9_highbd_convolve8_vert;
+        sf->highbd_predict[0][1][1] = vp9_highbd_convolve8_avg_vert;
+        sf->highbd_predict[1][0][0] = vp9_highbd_convolve8_horiz;
+        sf->highbd_predict[1][0][1] = vp9_highbd_convolve8_avg_horiz;
       } else {
         // No scaling in x direction. Must always scale in the y direction.
-        sf->high_predict[0][0][0] = vp9_high_convolve8_vert;
-        sf->high_predict[0][0][1] = vp9_high_convolve8_avg_vert;
-        sf->high_predict[0][1][0] = vp9_high_convolve8_vert;
-        sf->high_predict[0][1][1] = vp9_high_convolve8_avg_vert;
-        sf->high_predict[1][0][0] = vp9_high_convolve8;
-        sf->high_predict[1][0][1] = vp9_high_convolve8_avg;
+        sf->highbd_predict[0][0][0] = vp9_highbd_convolve8_vert;
+        sf->highbd_predict[0][0][1] = vp9_highbd_convolve8_avg_vert;
+        sf->highbd_predict[0][1][0] = vp9_highbd_convolve8_vert;
+        sf->highbd_predict[0][1][1] = vp9_highbd_convolve8_avg_vert;
+        sf->highbd_predict[1][0][0] = vp9_highbd_convolve8;
+        sf->highbd_predict[1][0][1] = vp9_highbd_convolve8_avg;
       }
     } else {
       if (sf->y_step_q4 == 16) {
         // No scaling in the y direction. Must always scale in the x direction.
-        sf->high_predict[0][0][0] = vp9_high_convolve8_horiz;
-        sf->high_predict[0][0][1] = vp9_high_convolve8_avg_horiz;
-        sf->high_predict[0][1][0] = vp9_high_convolve8;
-        sf->high_predict[0][1][1] = vp9_high_convolve8_avg;
-        sf->high_predict[1][0][0] = vp9_high_convolve8_horiz;
-        sf->high_predict[1][0][1] = vp9_high_convolve8_avg_horiz;
+        sf->highbd_predict[0][0][0] = vp9_highbd_convolve8_horiz;
+        sf->highbd_predict[0][0][1] = vp9_highbd_convolve8_avg_horiz;
+        sf->highbd_predict[0][1][0] = vp9_highbd_convolve8;
+        sf->highbd_predict[0][1][1] = vp9_highbd_convolve8_avg;
+        sf->highbd_predict[1][0][0] = vp9_highbd_convolve8_horiz;
+        sf->highbd_predict[1][0][1] = vp9_highbd_convolve8_avg_horiz;
       } else {
         // Must always scale in both directions.
-        sf->high_predict[0][0][0] = vp9_high_convolve8;
-        sf->high_predict[0][0][1] = vp9_high_convolve8_avg;
-        sf->high_predict[0][1][0] = vp9_high_convolve8;
-        sf->high_predict[0][1][1] = vp9_high_convolve8_avg;
-        sf->high_predict[1][0][0] = vp9_high_convolve8;
-        sf->high_predict[1][0][1] = vp9_high_convolve8_avg;
+        sf->highbd_predict[0][0][0] = vp9_highbd_convolve8;
+        sf->highbd_predict[0][0][1] = vp9_highbd_convolve8_avg;
+        sf->highbd_predict[0][1][0] = vp9_highbd_convolve8;
+        sf->highbd_predict[0][1][1] = vp9_highbd_convolve8_avg;
+        sf->highbd_predict[1][0][0] = vp9_highbd_convolve8;
+        sf->highbd_predict[1][0][1] = vp9_highbd_convolve8_avg;
       }
     }
     // 2D subpel motion always gets filtered in both directions.
-    sf->high_predict[1][1][0] = vp9_high_convolve8;
-    sf->high_predict[1][1][1] = vp9_high_convolve8_avg;
+    sf->highbd_predict[1][1][0] = vp9_highbd_convolve8;
+    sf->highbd_predict[1][1][1] = vp9_highbd_convolve8_avg;
   }
 #endif
 }