commit cbe65bf995489cbf02747fa7180258e8e716ee6c
author Paul Wilkins <paulwilkins@google.com> Thu Nov 05 14:25:02 2020 +0000
committer Paul Wilkins <paulwilkins@google.com> Thu Nov 05 17:48:18 2020 +0000
tree cdc2e07dc2adbe1531b741e6e93d612f61191e24
parent 2bb860ed764ccf13feb574e1068cc9b0756b6d81

Deleted unused rate control fields.

Deleted long_rolling_target_bits and long_rolling_actual_bits fields
as these are no longer used.

Change-Id: I74f012891aa6d0e39356cd5e0c4a90c0a08a8e3e

av1/encoder/ratectrl.c

diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c
index beadb73..0c90794 100644
--- a/av1/encoder/ratectrl.c
+++ b/av1/encoder/ratectrl.c
@@ -307,8 +307,6 @@
 
   rc->rolling_target_bits = rc->avg_frame_bandwidth;
   rc->rolling_actual_bits = rc->avg_frame_bandwidth;
-  rc->long_rolling_target_bits = rc->avg_frame_bandwidth;
-  rc->long_rolling_actual_bits = rc->avg_frame_bandwidth;
 
   rc->total_actual_bits = 0;
   rc->total_target_bits = 0;
@@ -1825,10 +1823,6 @@
         rc->rolling_target_bits * 3 + rc->this_frame_target, 2);
     rc->rolling_actual_bits = (int)ROUND_POWER_OF_TWO_64(
         rc->rolling_actual_bits * 3 + rc->projected_frame_size, 2);
-    rc->long_rolling_target_bits = (int)ROUND_POWER_OF_TWO_64(
-        rc->long_rolling_target_bits * 31 + rc->this_frame_target, 5);
-    rc->long_rolling_actual_bits = (int)ROUND_POWER_OF_TWO_64(
-        rc->long_rolling_actual_bits * 31 + rc->projected_frame_size, 5);
   }
 
   // Actual bits spent

av1/encoder/ratectrl.h

diff --git a/av1/encoder/ratectrl.h b/av1/encoder/ratectrl.h
index 7ddf152..1ee6413 100644
--- a/av1/encoder/ratectrl.h
+++ b/av1/encoder/ratectrl.h
@@ -254,9 +254,6 @@
   int rolling_target_bits;
   int rolling_actual_bits;
 
-  int long_rolling_target_bits;
-  int long_rolling_actual_bits;
-
   int rate_error_estimate;
 
   int64_t total_actual_bits;