generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Restore partial changes from previous commit

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

Change-Id: I3de1dab7479148bdffc24c4568cb2e7e9963f099
This commit is contained in:
Yaowu Xu 2015-10-15 11:33:41 -07:00
parent aaf6f6215f
commit 1832ba7509
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vp9/encoder/vp9_encodeframe.c
View File

@ -2422,7 +2422,8 @@ static void rd_pick_partition(VP9_COMP *cpi, ThreadData *td,
do_split &= bsize > min_size; 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_horz_allowed &= force_horz_split;
partition_vert_allowed &= force_vert_split; partition_vert_allowed &= force_vert_split;
} }