ref: 0ca0c4f6a0dfc2177a71eb17c41e960b65d1e18e
parent: 30fb976e3e42b6bc8f9360437033d8ae22c5a2f4
author: Yunqing Wang <yunqingwang@google.com>
date: Tue Jun 12 07:57:26 EDT 2012
Remove goldfreq in VP8_COMP goldfreq can be replaced by DEFAULT_GF_INTERVAL. Change-Id: I3659a9e7b9a6be9cb1952a1838e02c20d656e369
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -1225,7 +1225,6 @@
cpi->auto_gold = 1;
cpi->auto_adjust_gold_quantizer = 1;
- cpi->goldfreq = 7;
cm->version = oxcf->Version;
vp8_setup_version(cm);
@@ -2669,7 +2668,7 @@
// 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)
{
@@ -2708,7 +2707,7 @@
{
// 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))
{
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -477,7 +477,6 @@
int interquantizer;
int auto_gold;
int auto_adjust_gold_quantizer;
- int goldfreq;
int auto_worst_q;
int cpu_used;
int pass;
--- a/vp8/encoder/ratectrl.c
+++ b/vp8/encoder/ratectrl.c
@@ -323,7 +323,7 @@
//cpi->frames_till_gf_update_due = DEFAULT_GF_INTERVAL;
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;