Commit bb3d510a authored by Yunqing Wang's avatar Yunqing Wang Committed by Gerrit Code Review
Browse files

Merge "Remove goldfreq in VP8_COMP"

parents eab09e34 0ca0c4f6
......@@ -1209,7 +1209,6 @@ static void init_config(VP8_COMP *cpi, VP8_CONFIG *oxcf)
cpi->auto_gold = 1;
cpi->auto_adjust_gold_quantizer = 1;
cpi->goldfreq = 7;
cm->version = oxcf->Version;
vp8_setup_version(cm);
......@@ -2654,7 +2653,7 @@ static void update_alt_ref_frame_stats(VP8_COMP *cpi)
/* Select an interval before next GF or altref */
if (!cpi->auto_gold)
cpi->frames_till_gf_update_due = cpi->goldfreq;
cpi->frames_till_gf_update_due = DEFAULT_GF_INTERVAL;
if ((cpi->pass != 2) && cpi->frames_till_gf_update_due)
{
......@@ -2694,7 +2693,7 @@ static void update_golden_frame_stats(VP8_COMP *cpi)
{
/* Select an interval before next GF */
if (!cpi->auto_gold)
cpi->frames_till_gf_update_due = cpi->goldfreq;
cpi->frames_till_gf_update_due = DEFAULT_GF_INTERVAL;
if ((cpi->pass != 2) && (cpi->frames_till_gf_update_due > 0))
{
......
......@@ -489,7 +489,6 @@ typedef struct VP8_COMP
int interquantizer;
int auto_gold;
int auto_adjust_gold_quantizer;
int goldfreq;
int auto_worst_q;
int cpu_used;
int pass;
......
......@@ -326,7 +326,7 @@ void vp8_setup_key_frame(VP8_COMP *cpi)
if (cpi->auto_gold)
cpi->frames_till_gf_update_due = cpi->baseline_gf_interval;
else
cpi->frames_till_gf_update_due = cpi->goldfreq;
cpi->frames_till_gf_update_due = DEFAULT_GF_INTERVAL;
cpi->common.refresh_golden_frame = 1;
cpi->common.refresh_alt_ref_frame = 1;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment