diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2010-07-22 16:07:13 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2010-09-08 11:26:13 -0400 |
| commit | 63ccfbd54537cde423298703b42cd30001e2b053 (patch) | |
| tree | 848b3233c7394bec95984fc25409675f79eb8736 | |
| parent | 0de458f6b9627844160768c0b2417058c7a865bc (diff) | |
| download | libvpx-63ccfbd54537cde423298703b42cd30001e2b053.tar libvpx-63ccfbd54537cde423298703b42cd30001e2b053.tar.gz libvpx-63ccfbd54537cde423298703b42cd30001e2b053.tar.bz2 libvpx-63ccfbd54537cde423298703b42cd30001e2b053.zip | |
Enable ARFs for non-lagged compress
ARFs were explicitly disabled except in lagged compress mode. New
ARF logic allows for the ARF buffer to hold an older golden frame,
which does not require lagged compress.
Change-Id: I1dff82b6f53e8311f1e0514b1794ae05919d5f79
| -rw-r--r-- | vp8/encoder/onyx_if.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 201de3377..d9ff6b05b 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -1652,13 +1652,6 @@ void vp8_init_config(VP8_PTR ptr, VP8_CONFIG *oxcf) else if (cpi->oxcf.lag_in_frames > MAX_LAG_BUFFERS) cpi->oxcf.lag_in_frames = MAX_LAG_BUFFERS; - // force play_alternate to 0 if allow_lag is 0, lag_in_frames is too small, Mode is real time or one pass compress enabled. - if (cpi->oxcf.allow_lag == 0 || cpi->oxcf.lag_in_frames <= 5 || (cpi->oxcf.Mode < MODE_SECONDPASS)) - { - cpi->oxcf.play_alternate = 0; - cpi->ref_frame_flags = cpi->ref_frame_flags & ~VP8_ALT_FLAG; - } - // YX Temp cpi->last_alt_ref_sei = -1; cpi->is_src_frame_alt_ref = 0; @@ -1937,13 +1930,6 @@ void vp8_change_config(VP8_PTR ptr, VP8_CONFIG *oxcf) else if (cpi->oxcf.lag_in_frames > MAX_LAG_BUFFERS) cpi->oxcf.lag_in_frames = MAX_LAG_BUFFERS; - // force play_alternate to 0 if allow_lag is 0, lag_in_frames is too small, Mode is real time or one pass compress enabled. - if (cpi->oxcf.allow_lag == 0 || cpi->oxcf.lag_in_frames <= 5 || (cpi->oxcf.Mode < MODE_SECONDPASS)) - { - cpi->oxcf.play_alternate = 0; - cpi->ref_frame_flags = cpi->ref_frame_flags & ~VP8_ALT_FLAG; - } - // YX Temp cpi->last_alt_ref_sei = -1; cpi->is_src_frame_alt_ref = 0; |