From 0e53d520886bbc633fb552c92572f9238fc74397 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Thu, 20 Mar 2014 20:02:08 -0700 Subject: [PATCH] changed to use correct pred_mv The third pred_mv is stored in x->pred_mv[ref_frame]. This commit make sure the correct mv is read. Change-Id: Ibed24daf36703a63f0394c87b2381ee1d2eb7910 --- vp9/encoder/vp9_pickmode.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 6c84144..8b2a894 100644 --- 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; -- 2.7.4