commit 2b2c5fd711227b2c6c8ca9a2a275ae6b2a0d6ece
author Debargha Mukherjee <debargha@google.com> Wed Nov 14 13:21:24 2018 -0800
committer Debargha Mukherjee <debargha@google.com> Thu Nov 15 23:32:05 2018 +0000
tree 52a6255c999483a9f3aa475cdf9d01b50f5859d6
parent ddfc96c1d4db10576d3eb0810c30cc7d0d23b9b7

Add missing check for superres rate allocation.

Change-Id: If67c78d58eb337d4d31fe32416f11c94dce4c539

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 54e8437..99d3c5f 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -4179,7 +4179,8 @@
       const int qthresh = (rate_factor_delta <= 1.0)
                               ? oxcf->superres_qthresh
                               : oxcf->superres_kf_qthresh;
-      av1_set_target_rate(cpi, cpi->oxcf.width, cpi->oxcf.height);
+      if (oxcf->rc_mode == AOM_VBR || oxcf->rc_mode == AOM_CQ)
+        av1_set_target_rate(cpi, cpi->oxcf.width, cpi->oxcf.height);
       int bottom_index, top_index;
       const int q = av1_rc_pick_q_and_bounds(
           cpi, cpi->oxcf.width, cpi->oxcf.height, &bottom_index, &top_index);
@@ -4187,7 +4188,7 @@
         new_denom = SCALE_NUMERATOR;
       } else {
         const uint8_t min_denom = SCALE_NUMERATOR + 1;
-        const uint8_t denom_step = (MAXQ - qthresh + 1) >> 3;
+        const uint8_t denom_step = (MAXQ - qthresh + 4) >> 3;
 
         if (q == qthresh) {
           new_denom = min_denom;