diff options
| -rw-r--r-- | vp9/common/vp9_onyx.h | 1 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 8 | ||||
| -rw-r--r-- | vp9/vp9_cx_iface.c | 3 |
3 files changed, 2 insertions, 10 deletions
diff --git a/vp9/common/vp9_onyx.h b/vp9/common/vp9_onyx.h index ac39a98fd..ab27ca523 100644 --- a/vp9/common/vp9_onyx.h +++ b/vp9/common/vp9_onyx.h @@ -112,7 +112,6 @@ extern "C" { int auto_key; // autodetect cut scenes and set the keyframes int key_freq; // maximum distance to key frame. - int allow_lag; // allow lagged compression (if 0 lagin frames is ignored) int lag_in_frames; // how many frames lag before we start encoding // ---------------------------------------------------------------- diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 73ac9bc88..5d463b6df 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -1502,13 +1502,9 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) { cpi->speed = abs(cpi->oxcf.cpu_used); - if (cpi->oxcf.lag_in_frames == 0) { - // Force allow_lag to 0 if lag_in_frames is 0. - cpi->oxcf.allow_lag = 0; - } else if (cpi->oxcf.lag_in_frames > MAX_LAG_BUFFERS) { - // Limit on lag buffers as these are not currently dynamically allocated. + // Limit on lag buffers as these are not currently dynamically allocated. + if (cpi->oxcf.lag_in_frames > MAX_LAG_BUFFERS) cpi->oxcf.lag_in_frames = MAX_LAG_BUFFERS; - } #if CONFIG_MULTIPLE_ARF vp9_zero(cpi->alt_ref_source); diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index fbdad7414..a819dfdf9 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -289,10 +289,8 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf, } if (cfg.g_pass == VPX_RC_FIRST_PASS) { - oxcf->allow_lag = 0; oxcf->lag_in_frames = 0; } else { - oxcf->allow_lag = (cfg.g_lag_in_frames) > 0; oxcf->lag_in_frames = cfg.g_lag_in_frames; } @@ -390,7 +388,6 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf, printf("two_pass_vbrbias: %d\n", oxcf->two_pass_vbrbias); printf("two_pass_vbrmin_section: %d\n", oxcf->two_pass_vbrmin_section); printf("two_pass_vbrmax_section: %d\n", oxcf->two_pass_vbrmax_section); - printf("allow_lag: %d\n", oxcf->allow_lag); printf("lag_in_frames: %d\n", oxcf->lag_in_frames); printf("play_alternate: %d\n", oxcf->play_alternate); printf("Version: %d\n", oxcf->Version); |