libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_mcomp.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 348 matching lines @@
 
     // no reason to check the same one again.
     if (tr == br && tc == bc)
       break;
 
     tr = br;
     tc = bc;
   }
 
   if (xd->allow_high_precision_mv) {
-    usehp = vp9_use_nmv_hp(&ref_mv->as_mv);
+    usehp = vp9_use_mv_hp(&ref_mv->as_mv);
   } else {
     usehp = 0;
   }
 
   if (usehp) {
     hstep >>= 1;
     while (--eighthiters) {
       CHECK_BETTER(left, tr, tc - hstep);
       CHECK_BETTER(right, tr, tc + hstep);
       CHECK_BETTER(up, tr - hstep, tc);
@@ skipping 169 matching lines @@
 
     // no reason to check the same one again.
     if (tr == br && tc == bc)
       break;
 
     tr = br;
     tc = bc;
   }
 
   if (xd->allow_high_precision_mv) {
-    usehp = vp9_use_nmv_hp(&ref_mv->as_mv);
+    usehp = vp9_use_mv_hp(&ref_mv->as_mv);
   } else {
     usehp = 0;
   }
 
   if (usehp) {
     hstep >>= 1;
     while (--eighthiters) {
       CHECK_BETTER(left, tr, tc - hstep);
       CHECK_BETTER(right, tr, tc + hstep);
       CHECK_BETTER(up, tr - hstep, tc);
@@ skipping 353 matching lines @@
                                xd->allow_high_precision_mv);
 
   if (diag < bestmse) {
     *bestmv = this_mv;
     bestmse = diag;
     *distortion = thismse;
     *sse1 = sse;
   }
 
   if (x->e_mbd.allow_high_precision_mv) {
-    usehp = vp9_use_nmv_hp(&ref_mv->as_mv);
+    usehp = vp9_use_mv_hp(&ref_mv->as_mv);
   } else {
     usehp = 0;
   }
   if (!usehp)
     return bestmse;
 
   /* Now do 1/8th pixel */
   if (bestmv->as_mv.row < orig_mv.as_mv.row && !yrow_movedback) {
     y -= y_stride;
     yrow_movedback = 1;
@@ skipping 1476 matching lines @@
         (unsigned int *)(&thissad)) +
         mv_err_cost(&this_mv, center_mv, mvjcost, mvcost, x->errorperbit,
                     xd->allow_high_precision_mv);
     vpx_free(comp_pred);
     return besterr;
   } else {
     vpx_free(comp_pred);
     return INT_MAX;
   }
 }