commit 5767064698f86f86c6abdcbf4a4666c9f1c3baf5
author Cheng Chen <chengchen@google.com> Tue Feb 23 11:54:11 2021 -0800
committer Cheng Chen <chengchen@google.com> Wed Feb 24 01:57:33 2021 +0000
tree 7d53f7830a5ab13f60eebf9984138b53fec7ddb7
parent 9c34f937fc9719d8d65520a24c2733fbb3cd739f

Fix an error

Fix a naive errror introduced by this cl:
https://aomedia-review.googlesource.com/c/aom/+/130461

The motion search should be allowed for speed <= 2.

STATS_CHANGED

Change-Id: If7a2d7724cc7ae84521bdab1944d39d0c2dc8597

av1/encoder/firstpass.c

diff --git a/av1/encoder/firstpass.c b/av1/encoder/firstpass.c
index b3ff1ab..375db7d 100644
--- a/av1/encoder/firstpass.c
+++ b/av1/encoder/firstpass.c
@@ -635,7 +635,7 @@
   raw_motion_err_list[raw_motion_err_counts] = raw_motion_error;
 
   // TODO(pengchong): Replace the hard-coded threshold
-  if (raw_motion_error > LOW_MOTION_ERROR_THRESH && cpi->oxcf.speed > 2) {
+  if (raw_motion_error > LOW_MOTION_ERROR_THRESH || cpi->oxcf.speed <= 2) {
     // Test last reference frame using the previous best mv as the
     // starting point (best reference) for the search.
     first_pass_motion_search(cpi, x, best_ref_mv, &mv, &motion_error);