Merge "changed to use correct pred_mv"

d070aa5d · Yaowu Xu · Gerrit Code Review · 2d70e165 · 0e53d520 · d070aa5d
Commit d070aa5d authored Mar 21, 2014 by Yaowu Xu Committed by Gerrit Code Review Mar 21, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

vp9/encoder/vp9_pickmode.c vp9/encoder/vp9_pickmode.c +5 -2

No files found.
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -76,8 +76,11 @@ static void full_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
      return;
    }
  }
-
-  mvp_full = mbmi->ref_mvs[ref][x->mv_best_ref_index[ref]].as_mv;
+  assert(x->mv_best_ref_index[ref] <= 2);
+  if (x->mv_best_ref_index[ref] < 2)
+    mvp_full = mbmi->ref_mvs[ref][x->mv_best_ref_index[ref]].as_mv;
+  else
+    mvp_full = x->pred_mv[ref].as_mv;

  mvp_full.col >>= 3;
  mvp_full.row >>= 3;