commit 2bb860ed764ccf13feb574e1068cc9b0756b6d81
author Paul Wilkins <paulwilkins@google.com> Thu Nov 05 14:17:30 2020 +0000
committer Paul Wilkins <paulwilkins@google.com> Thu Nov 05 17:47:45 2020 +0000
tree d93e4e39e5937aa6f2e2ea46c671b903a9ce97b6
parent cb3b65b9865c303f91a7fef7af0c8ef35cbf3d56

Fix reset on rolling rate.

Fix bug whereby rolling target vs actual rate for arf groups
were reset before the final pass.

Change-Id: I3703a65d2ac8d5f23c77d90ab790ca63bab9c2b7

av1/encoder/pass2_strategy.c

diff --git a/av1/encoder/pass2_strategy.c b/av1/encoder/pass2_strategy.c
index b9ed687..de3e8b9 100644
--- a/av1/encoder/pass2_strategy.c
+++ b/av1/encoder/pass2_strategy.c
@@ -2559,10 +2559,6 @@
         rc->baseline_gf_interval);
   }
 
-  // Reset rolling actual and target bits counters for ARF groups.
-  twopass->rolling_arf_group_target_bits = 1;
-  twopass->rolling_arf_group_actual_bits = 1;
-
   av1_gop_bit_allocation(cpi, rc, gf_group, rc->frames_since_key == 0,
                          use_alt_ref, gf_group_bits);
 
@@ -2575,6 +2571,10 @@
   // TODO(jingning): Generalize this condition.
   if (is_final_pass) {
     cpi->gf_state.arf_gf_boost_lst = use_alt_ref;
+
+    // Reset rolling actual and target bits counters for ARF groups.
+    twopass->rolling_arf_group_target_bits = 1;
+    twopass->rolling_arf_group_actual_bits = 1;
   }
 }