commit 5fffb448347793d61795cb03c1e752dfd506cfe0
author Marco Paniconi <marpan@google.com> Wed Jul 01 10:49:30 2020 -0700
committer Marco Paniconi <marpan@google.com> Wed Jul 01 10:56:58 2020 -0700
tree 29883b391796eb51af90692111e949b2c640f262
parent 173a756af9f94138287d36bd3b2265c6bca4a652

rtc: Adjust filter scaler settings for rtc mode

Adjust filter scaler setting for cases that use the
optimized scalers, for RTC mode.

Change-Id: I15faa59e2b0cadf4b7fb8998e747400a370df0b3

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index dd79d6b..867c1c7 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -2037,13 +2037,21 @@
 
   if (!cpi->use_svc) {
     phase_scaler = 8;
+    // 2:1 scaling.
     if ((cm->width << 1) == unscaled->y_crop_width &&
-        (cm->height << 1) == unscaled->y_crop_height)
+        (cm->height << 1) == unscaled->y_crop_height) {
       filter_scaler = BILINEAR;
-    // Use eighttap for 4:1 scaling.
-    if ((cm->width << 2) == unscaled->y_crop_width &&
-        (cm->height << 2) == unscaled->y_crop_height)
+      // For lower resolutions use eighttap_smooth.
+      if (cm->width * cm->height <= 320 * 180) filter_scaler = EIGHTTAP_SMOOTH;
+    } else if ((cm->width << 2) == unscaled->y_crop_width &&
+               (cm->height << 2) == unscaled->y_crop_height) {
+      // 4:1 scaling.
       filter_scaler = EIGHTTAP_SMOOTH;
+    } else if ((cm->width << 2) == 3 * unscaled->y_crop_width &&
+               (cm->height << 2) == 3 * unscaled->y_crop_height) {
+      // 4:3 scaling.
+      filter_scaler = EIGHTTAP_REGULAR;
+    }
   }
 
   if (cpi->sf.part_sf.partition_search_type == VAR_BASED_PARTITION)