commit e319e4bfa6b54fb66b6fbc90923d0a96fd8900d9
author Minghai Shang <minghai@google.com> Wed Jun 25 10:31:21 2014 -0700
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Wed Jun 25 10:31:21 2014 -0700
tree 8fbf9ad94547969964639cae456c9b1b8da1b9a0
parent 0a103ae999a84ec2e09ff1f12353b5323d980ad2
parent 6bebe65118b43dde3a170c95e35e047450351368

Merge "[spatial svc]Don't skip motion search in first pass encoding"

vp9/encoder/vp9_firstpass.c

diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c
index 6fb263f..0261b98 100644
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -607,7 +607,8 @@
                                                 &unscaled_last_source_buf_2d);
 
         // TODO(pengchong): Replace the hard-coded threshold
-        if (raw_motion_error > 25) {
+        if (raw_motion_error > 25 ||
+            (cpi->use_svc && cpi->svc.number_temporal_layers == 1)) {
           // 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.as_mv, &mv.as_mv,