From 56835f1bdd0737be67b7b86d472af51aa969d758 Mon Sep 17 00:00:00 2001
From: Deb Mukherjee <debargha@google.com>
Date: Fri, 14 Feb 2014 11:15:29 -0800
Subject: [PATCH] Make cpi->speed always positive
Minor fix to ensure that positive and negative cpu_used
values produce the same output.
Change-Id: I9157d05cb9a7c0bd57a4d8a9f268205a825b9b0b
---
vp9/encoder/vp9_onyx_if.c | 2 +-
vp9/encoder/vp9_rdopt.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index 84a0e6069a..69372bd59a 100644
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -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.
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index dfe39e8716..a3e879b821 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -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;
--
GitLab