From: Marco <marpan@google.com>
Date: Mon, 9 Nov 2015 18:03:27 +0000 (-0800)
Subject: Use same bias (against non-zero mv for big blocks) for speed 5.
X-Git-Tag: v1.6.0~574^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=718654848aa0fee41c37b50e4ff611302a7e4e06;p=libvpx

Use same bias (against non-zero mv for big blocks) for speed 5.

Use same setting for speed 5 (as it is for speed > 5).
Change is only for real-time (non-rd) mode.

Change-Id: I830250eac654328373cb318baa89d4f0e63942e1
---

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 ||