From: Jingning Han <jingning@google.com>
Date: Wed, 10 Dec 2014 02:01:17 +0000 (-0800)
Subject: Use use_prev_frame_mvs flag for ref mv search branch
X-Git-Tag: v1.4.0~396^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0cac834b5a3ed300f338e30c57652bdb5fe1530e;p=libvpx

Use use_prev_frame_mvs flag for ref mv search branch

Replace error_resilient flag with use_prev_frame_mvs in
vp9_pick_inter_mode reference motion vector search selection.
This effectively turns off the simplified ref mv search in the
settings of frame resizing, even if error-resilient mode is off.

Change-Id: I7fed814ee7bc0cb419a03b846e0fc2de46ba7686
---

diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index 1da5a83bd..b45032456 100644
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -622,7 +622,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
       vp9_setup_pred_block(xd, yv12_mb[ref_frame], yv12, mi_row, mi_col,
                            sf, sf);
 
-      if (!cm->error_resilient_mode)
+      if (cm->use_prev_frame_mvs)
         vp9_find_mv_refs(cm, xd, tile_info, xd->mi[0].src_mi, ref_frame,
                          candidates, mi_row, mi_col);
       else