Make alt_extra_bits a local variable

alt_extra_bits is now only used in a local context so
remove it from the twopass_rc structure.

Change-Id: I5bbf0a3dba9712a3da45760f7bb865243705b53e

diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c
index ddedb37bc459d0d2b1068966c77f6653a121707c..d333e8e310a798e19ccb753daab3b1fe366948e6 100644 (file)
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -1980,27 +1980,22 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
 
     // This condition could fail if there are two kfs very close together
     // despite (MIN_GF_INTERVAL) and would cause a divide by 0 in the
-    // calculation of cpi->twopass.alt_extra_bits.
+    // calculation of alt_extra_bits.
     if (cpi->baseline_gf_interval >= 3) {
       int boost = (cpi->source_alt_ref_pending)
                   ? b_boost : cpi->gfu_boost;
 
       if (boost >= 150) {
         int pct_extra;
+        int alt_extra_bits;
 
         pct_extra = (boost - 100) / 50;
         pct_extra = (pct_extra > 20) ? 20 : pct_extra;
 
-        // TODO(agrange) Remove cpi->twopass.alt_extra_bits.
-        cpi->twopass.alt_extra_bits = (int)
-          ((cpi->twopass.gf_group_bits * pct_extra) / 100);
-        cpi->twopass.gf_group_bits -= cpi->twopass.alt_extra_bits;
-        cpi->twopass.alt_extra_bits /=
-          ((cpi->baseline_gf_interval - 1) >> 1);
-      } else
-        cpi->twopass.alt_extra_bits = 0;
-    } else
-      cpi->twopass.alt_extra_bits = 0;
+        alt_extra_bits = (int)((cpi->twopass.gf_group_bits * pct_extra) / 100);
+        cpi->twopass.gf_group_bits -= alt_extra_bits;
+      }
+    }
   }
 
   if (cpi->common.frame_type != KEY_FRAME) {