diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2012-07-10 09:19:37 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-07-10 09:19:37 -0700 |
| commit | bb3d510a18350eb44038897187b1c4b28da86200 (patch) | |
| tree | c108a37d1e3033fec7064e55d367a47868d2c1be /vp8 | |
| parent | eab09e34e3e3cd0da671b4dbb7fd75e976915fa7 (diff) | |
| parent | 0ca0c4f6a0dfc2177a71eb17c41e960b65d1e18e (diff) | |
| download | libvpx-bb3d510a18350eb44038897187b1c4b28da86200.tar libvpx-bb3d510a18350eb44038897187b1c4b28da86200.tar.gz libvpx-bb3d510a18350eb44038897187b1c4b28da86200.tar.bz2 libvpx-bb3d510a18350eb44038897187b1c4b28da86200.zip | |
Merge "Remove goldfreq in VP8_COMP"
Diffstat (limited to 'vp8')
| -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 4a57d3b27..d50076d3b 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -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)) { diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index 22bfeaf3a..808080f22 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -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; diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c index 500c1518b..05e152ebe 100644 --- a/vp8/encoder/ratectrl.c +++ b/vp8/encoder/ratectrl.c @@ -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; |