ref: bb3d510a18350eb44038897187b1c4b28da86200
parent: eab09e34e3e3cd0da671b4dbb7fd75e976915fa7
parent: 0ca0c4f6a0dfc2177a71eb17c41e960b65d1e18e
author: Yunqing Wang <yunqingwang@google.com>
date: Tue Jul 10 05:19:37 EDT 2012
Merge "Remove goldfreq in VP8_COMP"
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -1209,7 +1209,6 @@
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 @@
/* 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 @@
{/* 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
@@ -489,7 +489,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
@@ -326,7 +326,7 @@
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;
--
⑨