From: Jerome Jiang <jianj@google.com>
Date: Tue, 20 Nov 2018 19:52:09 +0000 (-0800)
Subject: Disable partition scaling on 1080p and above.
X-Git-Tag: v1.8.0~138^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6332e04f20277de7db0314f95a0d8f6a841f10d;p=libvpx

Disable partition scaling on 1080p and above.

BUG=webm:1578
Change-Id: I7c8014b7ab96d372d486433bce24d058a60fdc85
---

diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c
index 9f2dc144e..bf0a6bf5a 100644
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -710,9 +710,11 @@ static void set_rt_speed_feature_framesize_independent(
     // For SVC: enable use of lower resolution partition for higher resolution,
     // only for 3 spatial layers and when config/top resolution is above VGA.
     // Enable only for non-base temporal layer frames.
+    // TODO(jianj): Investigate webm:1578
     if (cpi->use_svc && cpi->svc.use_partition_reuse &&
         cpi->svc.number_spatial_layers == 3 && cpi->svc.temporal_layer_id > 0 &&
-        cpi->oxcf.width * cpi->oxcf.height > 640 * 480)
+        cpi->oxcf.width * cpi->oxcf.height > 640 * 480 &&
+        cpi->oxcf.width * cpi->oxcf.height < 1920 * 1080)
       sf->svc_use_lowres_part = 1;
     // For SVC when golden is used as second temporal reference: to avoid
     // encode time increase only use this feature on base temporal layer.