Commit f1633e58 authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review
Browse files

Merge "Remove an unused variable"

parents 64548b64 c58e1c7b
...@@ -112,7 +112,6 @@ extern "C" { ...@@ -112,7 +112,6 @@ extern "C" {
int auto_key; // autodetect cut scenes and set the keyframes int auto_key; // autodetect cut scenes and set the keyframes
int key_freq; // maximum distance to key frame. 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 int lag_in_frames; // how many frames lag before we start encoding
// ---------------------------------------------------------------- // ----------------------------------------------------------------
......
...@@ -1505,13 +1505,9 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) { ...@@ -1505,13 +1505,9 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) {
cpi->speed = abs(cpi->oxcf.cpu_used); cpi->speed = abs(cpi->oxcf.cpu_used);
if (cpi->oxcf.lag_in_frames == 0) { // Limit on lag buffers as these are not currently dynamically allocated.
// Force allow_lag to 0 if lag_in_frames is 0. if (cpi->oxcf.lag_in_frames > MAX_LAG_BUFFERS)
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.
cpi->oxcf.lag_in_frames = MAX_LAG_BUFFERS; cpi->oxcf.lag_in_frames = MAX_LAG_BUFFERS;
}
#if CONFIG_MULTIPLE_ARF #if CONFIG_MULTIPLE_ARF
vp9_zero(cpi->alt_ref_source); vp9_zero(cpi->alt_ref_source);
......
...@@ -289,10 +289,8 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf, ...@@ -289,10 +289,8 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf,
} }
if (cfg.g_pass == VPX_RC_FIRST_PASS) { if (cfg.g_pass == VPX_RC_FIRST_PASS) {
oxcf->allow_lag = 0;
oxcf->lag_in_frames = 0; oxcf->lag_in_frames = 0;
} else { } else {
oxcf->allow_lag = (cfg.g_lag_in_frames) > 0;
oxcf->lag_in_frames = cfg.g_lag_in_frames; oxcf->lag_in_frames = cfg.g_lag_in_frames;
} }
...@@ -390,7 +388,6 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf, ...@@ -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_vbrbias: %d\n", oxcf->two_pass_vbrbias);
printf("two_pass_vbrmin_section: %d\n", oxcf->two_pass_vbrmin_section); 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("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("lag_in_frames: %d\n", oxcf->lag_in_frames);
printf("play_alternate: %d\n", oxcf->play_alternate); printf("play_alternate: %d\n", oxcf->play_alternate);
printf("Version: %d\n", oxcf->Version); printf("Version: %d\n", oxcf->Version);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment