shithub: libvpx

Info  •  Files  •  Log  •  Branches

Restore partial changes from previous commit

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

Change-Id: I3de1dab7479148bdffc24c4568cb2e7e9963f099

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -2422,7 +2422,8 @@

     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;

   }