commit 8c587fac2859192189bbf064f4cbb1961d919d8b
author Wan-Teh Chang <wtc@google.com> Wed Feb 01 21:58:30 2023 +0000
committer Wan-Teh Chang <wtc@google.com> Thu Feb 02 02:20:05 2023 +0000
tree 51f05eeffbefbe77131dd2eff2a774f24f94aad0
parent 43b99daea2daa6acdb9fe23775a4466ed99cd180

Revert "Correct buffer fullness Q adjustment."

This reverts commit b4a4588a4a64aa8670c762cd379a1d039a966dda.

Reason for revert: AddressSanitizer global-buffer-overflow in
AV1/LosslessTestLarge.TestLossLessEncodingCtrl/2

Bug: aomedia:3378
Change-Id: I2e216ac774c42b24e3510f99012e00df2aeb2f57

av1/encoder/ratectrl.c

diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c
index ad46187..4ea1c9a 100644
--- a/av1/encoder/ratectrl.c
+++ b/av1/encoder/ratectrl.c
@@ -1033,20 +1033,11 @@
   ambient_qp = (cm->current_frame.frame_number < num_frames_weight_key)
                    ? AOMMIN(p_rc->avg_frame_qindex[INTER_FRAME], avg_qindex_key)
                    : p_rc->avg_frame_qindex[INTER_FRAME];
-
+  active_worst_quality = AOMMIN(rc->worst_quality, ambient_qp * 5 / 4);
   if (p_rc->buffer_level > p_rc->optimal_buffer_level) {
     // Adjust down.
-    int max_adjustment_down;  // Maximum adjustment down for Q
-
-    if (cpi->oxcf.q_cfg.aq_mode == CYCLIC_REFRESH_AQ && !cpi->ppi->use_svc &&
-        (cpi->oxcf.tune_cfg.content == AOM_CONTENT_SCREEN)) {
-      active_worst_quality = AOMMIN(rc->worst_quality, ambient_qp);
-      max_adjustment_down = AOMMIN(4, active_worst_quality / 16);
-    } else {
-      active_worst_quality = AOMMIN(rc->worst_quality, ambient_qp * 5 / 4);
-      max_adjustment_down = active_worst_quality / 3;
-    }
-
+    // Maximum limit for down adjustment, ~30%.
+    int max_adjustment_down = active_worst_quality / 3;
     if (max_adjustment_down) {
       buff_lvl_step =
           ((p_rc->maximum_buffer_size - p_rc->optimal_buffer_level) /
@@ -1058,7 +1049,6 @@
     }
   } else if (p_rc->buffer_level > critical_level) {
     // Adjust up from ambient Q.
-    active_worst_quality = AOMMIN(rc->worst_quality, ambient_qp);
     if (critical_level) {
       buff_lvl_step = (p_rc->optimal_buffer_level - critical_level);
       if (buff_lvl_step) {
@@ -1066,7 +1056,7 @@
                            (p_rc->optimal_buffer_level - p_rc->buffer_level) /
                            buff_lvl_step);
       }
-      active_worst_quality += adjustment;
+      active_worst_quality = ambient_qp + adjustment;
     }
   } else {
     // Set to worst_quality if buffer is below critical level.