Restore partial changes from previous commit

This portion was tested to have no effect on asan test failures.

Change-Id: I3de1dab7479148bdffc24c4568cb2e7e9963f099

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 9a639813dc61af05eec8f70f2383825f9ecce681..2333a1391c08cf630d43d28a17731ba4a97df358 100644 (file)
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -2422,7 +2422,8 @@ static void rd_pick_partition(VP9_COMP *cpi, ThreadData *td,
     do_split &= bsize > min_size;
   }
 
-  if (cpi->sf.use_square_partition_only) {
+  if (cpi->sf.use_square_partition_only &&
+      bsize > cpi->sf.use_square_only_threshold) {
       partition_horz_allowed &= force_horz_split;
       partition_vert_allowed &= force_vert_split;
   }