commit 0299a603345be4922329387074274f08444e3731
author Tim Kopp <tkopp@google.com> Thu Jun 26 15:28:08 2014 -0700
committer Tim Kopp <tkopp@google.com> Fri Jun 27 08:56:09 2014 -0700
tree 3ebe1ed12e2317083441585a462026b941e9f36d
parent 52462bf7a8abd1af60105ef6e3e7e5886766985d

fix: Only do spatial SVC when there are > 1 layers

Bug introduced in I930dced169c9d53f8044d2754a04332138347409. If
svc.number_temporal_layers == 1 and svc.number_spatial_layers == 1, the system
attempt to do spatial SVC. It no longer does that.

Change-Id: Ie6b130a72b1eea40c547c9a64447e40695f811c5

vp9/encoder/vp9_encoder.c

diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index 1afbcf6..4b5e0c9 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -2462,7 +2462,8 @@
   MV_REFERENCE_FRAME ref_frame;
   int arf_src_index;
   const int is_spatial_svc = cpi->use_svc &&
-                             (cpi->svc.number_temporal_layers == 1);
+                             (cpi->svc.number_temporal_layers == 1) &&
+                             (cpi->svc.number_spatial_layers > 1);
 
   if (!cpi)
     return -1;