commit 6eca835fff6dba1e1a4f8b672a04a17d1b386bd9
author Thomas Daede <tdaede@mozilla.com> Fri Mar 17 14:14:12 2017 -0700
committer Thomas Daede <tdaede@mozilla.com> Tue Mar 21 20:15:38 2017 +0000
tree 31b89ea0dda1166e707d8b12563233e0a942d69e
parent 10fb9fb24ab22a37a3557fb7fa910089fed043e2

Remove "best" deadline parameter from aomenc.

This option increases runtime by 20% and is only marginally
better than good cpu-used=0:

   PSNR | PSNR Cb | PSNR Cr | PSNR HVS |    SSIM | MS SSIM | CIEDE 2000
-0.3382 | -0.3911 | -0.4875 |  -0.2982 | -0.2992 | -0.3164 |    -0.3686

It is also not well integrated with speed_features.c, which is
the main reason for the removal.

Change-Id: If88c50367f63b860ad57f650869b978ec7734aad

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index d6561fc..fff0176 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -890,8 +890,7 @@
   SPEED_FEATURES *const sf = &cpi->sf;
 
   // Set baseline threshold values.
-  for (i = 0; i < MAX_MODES; ++i)
-    rd->thresh_mult[i] = cpi->oxcf.mode == BEST ? -500 : 0;
+  for (i = 0; i < MAX_MODES; ++i) rd->thresh_mult[i] = cpi->oxcf.mode == 0;
 
   if (sf->adaptive_rd_thresh) {
     rd->thresh_mult[THR_NEARESTMV] = 300;
@@ -1160,20 +1159,34 @@
 }
 
 void av1_set_rd_speed_thresholds_sub8x8(AV1_COMP *cpi) {
-  static const int thresh_mult[2][MAX_REFS] = {
+  static const int thresh_mult[MAX_REFS] = {
 #if CONFIG_EXT_REFS
-    { 2500, 2500, 2500, 2500, 2500, 2500, 4500, 4500, 4500, 4500, 4500, 4500,
-      4500, 4500, 2500 },
-    { 2000, 2000, 2000, 2000, 2000, 2000, 4000, 4000, 4000, 4000, 4000, 4000,
-      4000, 4000, 2000 }
+    2500,
+    2500,
+    2500,
+    2500,
+    2500,
+    2500,
+    4500,
+    4500,
+    4500,
+    4500,
+    4500,
+    4500,
+    4500,
+    4500,
+    2500
 #else
-    { 2500, 2500, 2500, 4500, 4500, 2500 },
-    { 2000, 2000, 2000, 4000, 4000, 2000 }
+    2500,
+    2500,
+    2500,
+    4500,
+    4500,
+    2500
 #endif  // CONFIG_EXT_REFS
   };
   RD_OPT *const rd = &cpi->rd;
-  const int idx = cpi->oxcf.mode == BEST;
-  memcpy(rd->thresh_mult_sub8x8, thresh_mult[idx], sizeof(thresh_mult[idx]));
+  memcpy(rd->thresh_mult_sub8x8, thresh_mult, sizeof(thresh_mult));
 }
 
 void av1_update_rd_thresh_fact(const AV1_COMMON *const cm,