shithub: libvpx

Download patch

ref: 3c055612c6b97bbea36767a38b8c5261bf0c839c
parent: 8f730cede071dcb6157acc237aec85e1e439f6de
author: angiebird <angiebird@google.com>
date: Mon Oct 14 11:05:03 EDT 2019

Localize av_err mean_mod_score in define_gf_group

Change-Id: I3fb23f5c8df1c3276b663a32556ca800b7ba2ade

--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -2498,8 +2498,6 @@
 
   double zero_motion_accumulator = 1.0;
 
-  const double av_err = get_distribution_av_err(cpi, twopass);
-  const double mean_mod_score = twopass->mean_mod_score;
   unsigned int allow_alt_ref = is_altref_enabled(cpi);
 
   int active_max_gf_interval;
@@ -2749,6 +2747,8 @@
     is_alt_ref_flash = detect_flash(twopass, rc->baseline_gf_interval);
 
   {
+    const double av_err = get_distribution_av_err(cpi, twopass);
+    const double mean_mod_score = twopass->mean_mod_score;
     // If the first frame is a key frame or the overlay from a previous arf then
     // the error score / cost of this frame has already been accounted for.
     int start_idx = arf_active_or_kf ? 1 : 0;