From: Marco <marpan@google.com>
Date: Tue, 28 Nov 2017 22:28:26 +0000 (-0800)
Subject: vp9-svc: Fix condition for setting downsampling filter.
X-Git-Tag: v1.7.0~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0b4868625e67f8c4cf6ba917a74404ef7226b1c;p=libvpx

vp9-svc: Fix condition for setting downsampling filter.

Use (width * height) for setting downsampling filter type.

Change-Id: If4acfde7ff9339e0584155f8a4d15b2f134211f2
---

diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c
index b33434e62..38895be68 100644
--- a/vp9/encoder/vp9_svc_layercontext.c
+++ b/vp9/encoder/vp9_svc_layercontext.c
@@ -656,9 +656,9 @@ int vp9_one_pass_cbr_svc_start_layer(VP9_COMP *const cpi) {
                        lc->scaling_factor_num, lc->scaling_factor_den, &width,
                        &height);
 
-  // For low resolutions: set phase of the filter = 8 (for symmetric averaging
-  // filter), use bilinear for now.
-  if (width <= 320 && height <= 240) {
+  // For resolutions <= QVGA: set phase of the filter = 8 (for symmetric
+  // averaging filter), use bilinear for now.
+  if (width * height <= 320 * 240) {
     cpi->svc.downsample_filter_type[cpi->svc.spatial_layer_id] = BILINEAR;
     cpi->svc.downsample_filter_phase[cpi->svc.spatial_layer_id] = 8;
   }