diff options
| author | Jingning Han <jingning@google.com> | 2014-12-09 18:01:17 -0800 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2014-12-09 18:18:40 -0800 |
| commit | 0cac834b5a3ed300f338e30c57652bdb5fe1530e (patch) | |
| tree | 5a3c475a0775c83ae08545ff2cfee3ceec22abf2 /vp9 | |
| parent | e728678c5061b01ab3484d676c42d562fe70c32b (diff) | |
| download | libvpx-0cac834b5a3ed300f338e30c57652bdb5fe1530e.tar libvpx-0cac834b5a3ed300f338e30c57652bdb5fe1530e.tar.gz libvpx-0cac834b5a3ed300f338e30c57652bdb5fe1530e.tar.bz2 libvpx-0cac834b5a3ed300f338e30c57652bdb5fe1530e.zip | |
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
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |