commit 308aba5dca6241794051012ab46e9364f821ecb2
author Fyodor Kyslov <kyslov@google.com> Wed Apr 01 17:29:40 2020 -0700
committer Fyodor Kyslov <kyslov@google.com> Thu Apr 02 06:23:01 2020 +0000
tree 75bbb4ffdcb2ef820df70f1db24a8d628b7a9484
parent de18358d3c89ff767a3b0e73b89274bdc30472fa

Fixing rd_use_partition for non RT case

BUG=aomedia:2628

nonRT usecase may call rd_use_partition with SEARCH_PARTITION so
entering into RT-specific code. Removing this possibility

Change-Id: Ib8236e82cbe260213ee7a2287ca2f587e48630da

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index c146790..be62065 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -1929,12 +1929,11 @@
   const int orig_rdmult = x->rdmult;
   setup_block_rdmult(cpi, x, mi_row, mi_col, bsize, NO_AQ, NULL);
 
-  if (cpi->sf.part_sf.partition_search_type == SEARCH_PARTITION ||
-      (cpi->sf.part_sf.partition_search_type == VAR_BASED_PARTITION &&
-       (cpi->sf.part_sf.adjust_var_based_rd_partitioning == 2 ||
-        (cpi->sf.part_sf.adjust_var_based_rd_partitioning == 1 &&
-         cm->quant_params.base_qindex > 190 && bsize <= BLOCK_32X32 &&
-         !frame_is_intra_only(cm))))) {
+  if (cpi->sf.part_sf.partition_search_type == VAR_BASED_PARTITION &&
+      (cpi->sf.part_sf.adjust_var_based_rd_partitioning == 2 ||
+       (cpi->sf.part_sf.adjust_var_based_rd_partitioning == 1 &&
+        cm->quant_params.base_qindex > 190 && bsize <= BLOCK_32X32 &&
+        !frame_is_intra_only(cm)))) {
     // Check if any of the sub blocks are further split.
     if (partition == PARTITION_SPLIT && subsize > BLOCK_8X8) {
       sub_subsize = get_partition_subsize(subsize, PARTITION_SPLIT);
@@ -2069,9 +2068,8 @@
         RDCOST(x->rdmult, last_part_rdc.rate, last_part_rdc.dist);
   }
 
-  if ((cpi->sf.part_sf.partition_search_type == SEARCH_PARTITION ||
-       (cpi->sf.part_sf.partition_search_type == VAR_BASED_PARTITION &&
-        cpi->sf.part_sf.adjust_var_based_rd_partitioning == 2)) &&
+  if ((cpi->sf.part_sf.partition_search_type == VAR_BASED_PARTITION &&
+       cpi->sf.part_sf.adjust_var_based_rd_partitioning == 2) &&
       partition != PARTITION_SPLIT && bsize > BLOCK_8X8 &&
       (mi_row + bs < mi_params->mi_rows ||
        mi_row + hbs == mi_params->mi_rows) &&