diff options
author | Yunqing Wang <yunqingwang@google.com> | 2012-06-12 11:57:26 -0400 |
---|---|---|
committer | Yunqing Wang <yunqingwang@google.com> | 2012-06-12 11:57:26 -0400 |
commit | 0ca0c4f6a0dfc2177a71eb17c41e960b65d1e18e (patch) | |
tree | 6eb2e6fd15dcc22465d974b5552475efe30980b6 /vp8/encoder | |
parent | 30fb976e3e42b6bc8f9360437033d8ae22c5a2f4 (diff) | |
download | libvpx-0ca0c4f6a0dfc2177a71eb17c41e960b65d1e18e.tar libvpx-0ca0c4f6a0dfc2177a71eb17c41e960b65d1e18e.tar.gz libvpx-0ca0c4f6a0dfc2177a71eb17c41e960b65d1e18e.tar.bz2 libvpx-0ca0c4f6a0dfc2177a71eb17c41e960b65d1e18e.zip |
Remove goldfreq in VP8_COMP
goldfreq can be replaced by DEFAULT_GF_INTERVAL.
Change-Id: I3659a9e7b9a6be9cb1952a1838e02c20d656e369
Diffstat (limited to 'vp8/encoder')
-rw-r--r-- | vp8/encoder/onyx_if.c | 5 | ||||
-rw-r--r-- | vp8/encoder/onyx_int.h | 1 | ||||
-rw-r--r-- | vp8/encoder/ratectrl.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index fa8fea0d9..c24e944ee 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -1225,7 +1225,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); @@ -2669,7 +2668,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) { @@ -2708,7 +2707,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)) { diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index 3b202c941..860d16eb9 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -477,7 +477,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; diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c index f6baf4c7e..2a96d2d25 100644 --- a/vp8/encoder/ratectrl.c +++ b/vp8/encoder/ratectrl.c @@ -323,7 +323,7 @@ void vp8_setup_key_frame(VP8_COMP *cpi) //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; |