ref: 56835f1bdd0737be67b7b86d472af51aa969d758
parent: 323a7120b9e92cd9e59ab7e72097a461d1324fd8
author: Deb Mukherjee <debargha@google.com>
date: Fri Feb 14 06:15:29 EST 2014
Make cpi->speed always positive Minor fix to ensure that positive and negative cpu_used values produce the same output. Change-Id: I9157d05cb9a7c0bd57a4d8a9f268205a825b9b0b
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -1496,7 +1496,7 @@
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.
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -447,7 +447,7 @@
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;
--
⑨