commit f651dc3ff46d61a16f306aea7ec30372501fada0
author Fyodor Kyslov <kyslov@google.com> Wed Dec 02 15:07:54 2020 -0800
committer Fyodor Kyslov <kyslov@google.com> Thu Dec 03 00:08:15 2020 +0000
tree 637ad5a3c3122588fea9fb58ea02e0e23ada8a5b
parent 9a53dfa7ee3f4bc88ef0aa55b368355ad058ccce

AV1 RT: Fix spped 9 quality regression

Previous commit introduced quality regression on speed 9 by limiting
large block split for high noise content with already limited small
blocks. Fixing this

Change-Id: I653fe74ee006df9b4d2c1482aa39a1a7823cbb72

av1/encoder/var_based_part.c

diff --git a/av1/encoder/var_based_part.c b/av1/encoder/var_based_part.c
index c22dc10..c58f16a 100644
--- a/av1/encoder/var_based_part.c
+++ b/av1/encoder/var_based_part.c
@@ -1001,13 +1001,14 @@
       min_var_64x64 = AOMMIN(var_64x64, min_var_64x64);
       // If the difference of the max-min variances of sub-blocks or max
       // variance of a sub-block is above some threshold of then force this
-      // block to split. Only checking this for noise level >= medium or if
-      // encoder is in SVC.
+      // block to split. Only checking this for noise level >= medium, if
+      // encoder is in SVC or if we already forced large blocks.
 
       if (!is_key_frame &&
           (max_var_32x32[m] - min_var_32x32[m]) > 3 * (thresholds[1] >> 3) &&
           max_var_32x32[m] > thresholds[1] >> 1 &&
-          (noise_level >= kMedium || cpi->use_svc)) {
+          (noise_level >= kMedium || cpi->use_svc ||
+           cpi->sf.rt_sf.force_large_partition_blocks)) {
         force_split[1 + m] = 1;
         force_split[0] = 1;
       }