Commit 1832ba75 authored by Yaowu Xu's avatar Yaowu Xu

Restore partial changes from previous commit

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

Change-Id: I3de1dab7479148bdffc24c4568cb2e7e9963f099
parent aaf6f621
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment