From: Marco <marpan@google.com>
Date: Mon, 30 Jan 2017 19:12:49 +0000 (-0800)
Subject: vp9: Modify bsize condition for using model_rd_large for speed 7.
X-Git-Tag: v1.7.0~770
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d47f257484e9a4c50211adad0b1d4ebc0680d3d5;p=libvpx

vp9: Modify bsize condition for using model_rd_large for speed 7.

In non-rd pickmode: Allow speed 7 to also use larger block size in
model_rd. Small change in behavior for speed 7.

Change-Id: I8c5523e424308e8f0bc71b3f6324dec42a464cc8
---

diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index e7374263c..aa6b208be 100644
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -1793,7 +1793,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data,
         pd->dst.stride = this_mode_pred->stride;
       }
     } else {
-      const int large_block = (x->sb_is_skin || cpi->oxcf.speed < 8)
+      const int large_block = (x->sb_is_skin || cpi->oxcf.speed < 7)
                                   ? bsize > BLOCK_32X32
                                   : bsize >= BLOCK_32X32;
       mi->interp_filter = (filter_ref == SWITCHABLE) ? EIGHTTAP : filter_ref;