From 1832ba7509b0bb42143c2bb4101a6c8a90796774 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Thu, 15 Oct 2015 11:33:41 -0700 Subject: [PATCH] Restore partial changes from previous commit This portion was tested to have no effect on asan test failures. Change-Id: I3de1dab7479148bdffc24c4568cb2e7e9963f099 --- vp9/encoder/vp9_encodeframe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 9a639813d..2333a1391 100644 --- 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; } -- 2.40.0