Localize av_err mean_mod_score in define_gf_group

Change-Id: I3fb23f5c8df1c3276b663a32556ca800b7ba2ade
This commit is contained in:
angiebird
2019-10-14 15:05:03 -07:00
parent 8f730cede0
commit 3c055612c6

View File

@@ -2498,8 +2498,6 @@ static void define_gf_group(VP9_COMP *cpi, int gf_start_show_idx) {
double zero_motion_accumulator = 1.0; 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); unsigned int allow_alt_ref = is_altref_enabled(cpi);
int active_max_gf_interval; int active_max_gf_interval;
@@ -2749,6 +2747,8 @@ static void define_gf_group(VP9_COMP *cpi, int gf_start_show_idx) {
is_alt_ref_flash = detect_flash(twopass, rc->baseline_gf_interval); 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 // 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. // the error score / cost of this frame has already been accounted for.
int start_idx = arf_active_or_kf ? 1 : 0; int start_idx = arf_active_or_kf ? 1 : 0;