diff options
| author | Marco Paniconi <marpan@google.com> | 2015-11-09 19:29:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-09 19:29:35 +0000 |
| commit | 498fd551fde9316c5a95ebaaa5e729d4596d2b0a (patch) | |
| tree | 71348bcf0a3a4799062422673a1d5d0c0560b84f | |
| parent | d1a7c103258f3afd438f584c3aee3663eada422f (diff) | |
| parent | 718654848aa0fee41c37b50e4ff611302a7e4e06 (diff) | |
| download | libvpx-498fd551fde9316c5a95ebaaa5e729d4596d2b0a.tar libvpx-498fd551fde9316c5a95ebaaa5e729d4596d2b0a.tar.gz libvpx-498fd551fde9316c5a95ebaaa5e729d4596d2b0a.tar.bz2 libvpx-498fd551fde9316c5a95ebaaa5e729d4596d2b0a.zip | |
Merge "Use same bias (against non-zero mv for big blocks) for speed 5."
| -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 8c4782da5..c495c42d4 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -1485,7 +1485,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, // Bias against non-zero (above some threshold) motion for large blocks. // This is temporary fix to avoid selection of large mv for big blocks. - if (cpi->oxcf.speed > 5 && + if (cpi->oxcf.speed >= 5 && cpi->oxcf.content != VP9E_CONTENT_SCREEN && (frame_mv[this_mode][ref_frame].as_mv.row > 64 || frame_mv[this_mode][ref_frame].as_mv.row < -64 || |