commit bebb59d93a7bc045d42d2ab61eb822541ab84013
author Hui Su <huisu@google.com> Fri Jul 27 08:58:19 2018 -0700
committer Hui Su <huisu@google.com> Fri Jul 27 17:28:55 2018 +0000
tree d3ec08fadc0606441f0696052dcb3f9bd69a1abb
parent 828eb2050c87099ebb674210418a4a10025e3658

Fix bug introduced in 7e384835e8

two_pass_partition_search was mistakenly turned off for 720p and above
resolutions.

Change-Id: I1e02fc350582b097a21cff36fc8f9b938b3214ff

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 740908e..8d29b86 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4115,8 +4115,7 @@
       x->use_cb_search_range = 0;
       init_first_partition_pass_stats_tables(x->first_partition_pass_stats);
       if (cpi->sf.two_pass_partition_search &&
-          cpi->sf.use_square_partition_only_threshold <
-              cm->seq_params.sb_size &&
+          cpi->sf.use_square_partition_only_threshold > BLOCK_4X4 &&
           mi_row + mi_size_high[cm->seq_params.sb_size] < cm->mi_rows &&
           mi_col + mi_size_wide[cm->seq_params.sb_size] < cm->mi_cols &&
           cm->frame_type != KEY_FRAME) {