diff options
| author | Marco Paniconi <marpan@google.com> | 2015-11-24 19:14:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-24 19:14:35 +0000 |
| commit | e99e4a64e0ca6a00335a2d4171c2e71cc3064ca7 (patch) | |
| tree | c17e2e8619bf4212ba4e1dc8e66c828816799d38 /vp9/encoder | |
| parent | b84fa548fb0160c7fb4a03168730079cd1feefd0 (diff) | |
| parent | eb43c8ebfc033506a4392b1de164181fae80c032 (diff) | |
| download | libvpx-e99e4a64e0ca6a00335a2d4171c2e71cc3064ca7.tar libvpx-e99e4a64e0ca6a00335a2d4171c2e71cc3064ca7.tar.gz libvpx-e99e4a64e0ca6a00335a2d4171c2e71cc3064ca7.tar.bz2 libvpx-e99e4a64e0ca6a00335a2d4171c2e71cc3064ca7.zip | |
Merge "vp9 non-rd pickmode: Fix logic in reference masking."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 9db044f6b..8aafae1d4 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -1252,7 +1252,8 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, if (const_motion[ref_frame] && this_mode == NEARMV) continue; - if (!(this_mode == ZEROMV && ref_frame == LAST_FRAME)) { + if (!(frame_mv[this_mode][ref_frame].as_int == 0 && + ref_frame == LAST_FRAME)) { i = (ref_frame == LAST_FRAME) ? GOLDEN_FRAME : LAST_FRAME; if ((cpi->ref_frame_flags & flag_list[i]) && sf->reference_masking) if (x->pred_mv_sad[ref_frame] > (x->pred_mv_sad[i] << 1)) |