commit a78eb76cbf4a1e109071c7c020ee578758c9a339
author Urvang Joshi <urvang@google.com> Tue Oct 20 11:25:45 2020 -0700
committer Urvang Joshi <urvang@google.com> Thu Oct 22 16:16:37 2020 -0700
tree b59e9756d414d59c33ff4b26bf9e5be4110dede1
parent 2541b8ad4f622065bbc63c7027f535e6949d3564

SUPERRES_AUTO: Fix exhaustive search.

Also, fix a corner case where encoder may choose to insert 2 successive
scene-cut keyframes, disabling superres recode just for the 1st
scene-cut keyframe.

BUG=aomedia:2844

Change-Id: Ic3c445d1a04321693f63c54830647aaa102aa5d5

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 5acf3c8..a95d7db 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -2721,9 +2721,12 @@
       superres_cfg->superres_scale_denominator = denom;
       superres_cfg->superres_kf_scale_denominator = denom;
       const int this_index = denom - (SCALE_NUMERATOR + 1);
+
+      cpi->superres_mode = AOM_SUPERRES_AUTO;  // Super-res on for this loop.
       err = encode_with_recode_loop_and_filter(
           cpi, size, dest, &superres_sses[this_index],
           &superres_rates[this_index], &superres_largest_tile_ids[this_index]);
+      cpi->superres_mode = AOM_SUPERRES_NONE;  // Reset to default (full-res).
       if (err != AOM_CODEC_OK) return err;
       restore_all_coding_context(cpi);
     }
@@ -3064,11 +3067,13 @@
     }
   } else {
 #endif  // CONFIG_SUPERRES_IN_RECODE
+    const aom_superres_mode orig_superres_mode = cpi->superres_mode;  // save
     cpi->superres_mode = cpi->oxcf.superres_cfg.superres_mode;
     if (encode_with_recode_loop_and_filter(cpi, size, dest, NULL, NULL,
                                            &largest_tile_id) != AOM_CODEC_OK) {
       return AOM_CODEC_ERROR;
     }
+    cpi->superres_mode = orig_superres_mode;  // restore
 #if CONFIG_SUPERRES_IN_RECODE
   }
 #endif  // CONFIG_SUPERRES_IN_RECODE