RT: Disencorage split partition of 32x32 for 1080p

This cl disencorages split partitions for 1080 videos (except screen
content) by increasing the variance based partition thresholds.

It is based on the assumption that high resolution videos
benefit less from small block sizes.

The change shows both coding gains and speed up.

rtc_1080p      ovr_psnr    encoding_time
speed 8         -0.62%      -3.03%
speed 9         -0.58%      -2.06%
speed 10        -0.36%      -2.08%

Change-Id: I17e842b3e311aa7db053c5fc519ec10a6f01c52f
diff --git a/av1/encoder/var_based_part.c b/av1/encoder/var_based_part.c
index fe01955..dbff18f 100644
--- a/av1/encoder/var_based_part.c
+++ b/av1/encoder/var_based_part.c
@@ -562,10 +562,21 @@
     thresholds[2] = (5 * threshold_base) >> 2;
   } else if (cm->width < 1920 && cm->height < 1080) {
     thresholds[2] = threshold_base << 1;
-  } else if (cm->width < 2560 && cm->height < 1440) {
-    thresholds[2] = (5 * threshold_base) >> 1;
   } else {
-    thresholds[2] = (7 * threshold_base) >> 1;
+    // cm->width >= 1920 || cm->height >= 1080
+    if (cpi->oxcf.tune_cfg.content == AOM_CONTENT_SCREEN) {
+      if (cm->width < 2560 && cm->height < 1440) {
+        thresholds[2] = (5 * threshold_base) >> 1;
+      } else {
+        thresholds[2] = (7 * threshold_base) >> 1;
+      }
+    } else {
+      if (cpi->oxcf.speed > 7) {
+        thresholds[2] = 6 * threshold_base;
+      } else {
+        thresholds[2] = 3 * threshold_base;
+      }
+    }
   }
   // Tune thresholds less or more aggressively to prefer larger partitions
   if (cpi->sf.rt_sf.prefer_large_partition_blocks >= 3) {