Commit 0876302e authored by Deb Mukherjee's avatar Deb Mukherjee Committed by Gerrit Code Review

Merge "Make cpi->speed always positive"

parents 5306eda9 56835f1b
......@@ -1496,7 +1496,7 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) {
update_layer_context_change_config(cpi, cpi->oxcf.target_bandwidth);
}
cpi->speed = cpi->oxcf.cpu_used;
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.
......
......@@ -447,7 +447,7 @@ static void model_rd_for_sb(VP9_COMP *cpi, BLOCK_SIZE bsize,
x->pred_sse[ref] = sse;
// Fast approximate the modelling function.
if (cpi->oxcf.cpu_used < -4) {
if (cpi->speed > 4) {
int rate;
int64_t dist;
int64_t square_error = sse;
......
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