generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make cpi->speed always positive

Browse Source 
Minor fix to ensure that positive and negative cpu_used
values produce the same output.

Change-Id: I9157d05cb9a7c0bd57a4d8a9f268205a825b9b0b
This commit is contained in:
Deb Mukherjee 2014-02-14 11:15:29 -08:00
parent 323a7120b9
commit 56835f1bdd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/encoder/vp9_onyx_if.c
View File

@ -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.

2
vp9/encoder/vp9_rdopt.c
View File

@ -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;