commit 80b1bb6daa1d7fb5890f19707289b9ffb518dff0
author Yunqing Wang <yunqingwang@google.com> Fri Aug 02 10:25:32 2019 -0700
committer Yunqing Wang <yunqingwang@google.com> Fri Aug 02 23:24:50 2019 +0000
tree c162ca0e96cde53a9e1f1e297e86004072584472
parent 2ffbeae715926e1cc7774e523b3b116d5284d7a9

Remove unnecessary sigmoid calculation

The sigmoid operation isn't necessary in tx_size split score
calculation, and is removed. The minor quality change was caused
by approximation of ml_tx_split_thresh.

midres set borg test result:
         avg_psnr: ovr_psnr: ssim:
speed 1:  -0.001   -0.008   -0.024
speed 3:   0.010    0.009   -0.009

Average speed 1 speedup over midres set is 0.4%(instruction count
result).

STATS_CHANGED

Change-Id: Ib77e3211319ead957b4b47e7775c47350d7f5537

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index cc73126..9b51d4c 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -5031,10 +5031,8 @@
   av1_nn_predict(features, nn_config, 1, &score);
   aom_clear_system_state();
 
-  if (score > 8.0f) return 100;
-  if (score < -8.0f) return 0;
-  score = 1.0f / (1.0f + (float)exp(-score));
-  return (int)(score * 100);
+  int int_score = (int)(score * 10000);
+  return clamp(int_score, -80000, 80000);
 }
 
 typedef struct {
@@ -5230,7 +5228,7 @@
     if (threshold >= 0) {
       const int split_score =
           ml_predict_tx_split(x, plane_bsize, blk_row, blk_col, tx_size);
-      if (split_score >= 0 && split_score < threshold) try_split = 0;
+      if (split_score < -threshold) try_split = 0;
     }
   }
 

av1/encoder/speed_features.c

diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index ad5b305..1651dbb 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -258,7 +258,7 @@
 
     sf->skip_repeat_interpolation_filter_search = 1;
     sf->tx_type_search.skip_tx_search = 1;
-    sf->tx_type_search.ml_tx_split_thresh = 40;
+    sf->tx_type_search.ml_tx_split_thresh = 4000;
     sf->adaptive_txb_search_level = 2;
     sf->use_intra_txb_hash = 1;
     sf->dual_sgr_penalty_level = 1;
@@ -488,7 +488,7 @@
     sf->prune_ext_partition_types_search_level = 2;
     sf->skip_repeat_interpolation_filter_search = 1;
     sf->tx_type_search.skip_tx_search = 1;
-    sf->tx_type_search.ml_tx_split_thresh = 40;
+    sf->tx_type_search.ml_tx_split_thresh = 4000;
     sf->adaptive_txb_search_level = 2;
     sf->use_intra_txb_hash = 1;
     sf->optimize_b_precheck = 1;
@@ -715,7 +715,7 @@
   sf->alt_ref_search_fp = 0;
   sf->partition_search_type = SEARCH_PARTITION;
   sf->tx_type_search.prune_mode = PRUNE_2D_ACCURATE;
-  sf->tx_type_search.ml_tx_split_thresh = 30;
+  sf->tx_type_search.ml_tx_split_thresh = 8500;
   sf->tx_type_search.use_skip_flag_prediction = 1;
   sf->tx_type_search.use_reduced_intra_txset = 0;
   sf->tx_type_search.fast_intra_tx_type_search = 0;