commit 4a20e521856ab8f6c62b32b00ab790af7e906aae
author chiyotsai <chiyotsai@google.com> Tue Feb 16 20:09:57 2021 -0800
committer Chi Yo Tsai <chiyotsai@google.com> Wed Feb 17 23:33:44 2021 +0000
tree ace8e939385ac3c436f780934c4d68dde0c2ccff
parent 62921a67a06a26d56619e8eb4a96c5b730f43298

Speed up speed 2 by enabling some conservative speed features

Performance:
 TESTSET | AVG_PSNR | OVR_PSNR |   SSIM  |  SPD
   HDRES |  +0.017% |  +0.004% | -0.020% | +3.8%
  MIDRES |  +0.054% |  +0.051% | +0.095% | +3.6%
  LOWRES |  +0.040% |  +0.033% | +0.033% | +2.6%

STATS_CHANGED

Change-Id: I5487bca5fcef4af1d61dee554543ea0dd18c68d8

av1/encoder/speed_features.c

diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 0c418ae..e145a9e 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -801,9 +801,12 @@
   }
 
   if (speed >= 2) {
+    sf->hl_sf.recode_loop = ALLOW_RECODE_KFARFGF;
+
     sf->part_sf.allow_partition_search_skip = 1;
 
     sf->mv_sf.auto_mv_step_size = 1;
+    sf->mv_sf.simple_motion_subpel_force_stop = QUARTER_PEL;
     sf->mv_sf.subpel_iters_per_step = 1;
 
     // TODO(chiyotsai@google.com): We can get 10% speed up if we move
@@ -834,6 +837,9 @@
         !frame_is_intra_only(&cpi->common) || (cpi->rc.frames_to_key > 1);
     sf->intra_sf.intra_pruning_with_hog = 2;
 
+    sf->tpl_sf.prune_starting_mv = 1;
+    sf->tpl_sf.search_method = DIAMOND;
+
     sf->rd_sf.perform_coeff_opt = is_boosted_arf2_bwd_type ? 3 : 4;
 
     sf->lpf_sf.prune_wiener_based_on_src_var = 1;
@@ -848,7 +854,6 @@
 
   if (speed >= 3) {
     sf->hl_sf.high_precision_mv_usage = CURRENT_Q;
-    sf->hl_sf.recode_loop = ALLOW_RECODE_KFARFGF;
 
     sf->gm_sf.gm_search_type = GM_DISABLE_SEARCH;
 
@@ -861,7 +866,6 @@
     // See aomedia:1778.
     // sf->mv_sf.adaptive_motion_search = 1;
     sf->mv_sf.full_pixel_search_level = 1;
-    sf->mv_sf.simple_motion_subpel_force_stop = QUARTER_PEL;
     sf->mv_sf.subpel_search_method = SUBPEL_TREE_PRUNED;
     sf->mv_sf.search_method = DIAMOND;
 
@@ -890,10 +894,8 @@
 
     sf->tpl_sf.skip_alike_starting_mv = 2;
     sf->tpl_sf.prune_intra_modes = 1;
-    sf->tpl_sf.prune_starting_mv = 1;
     sf->tpl_sf.reduce_first_step_size = 6;
     sf->tpl_sf.subpel_force_stop = QUARTER_PEL;
-    sf->tpl_sf.search_method = DIAMOND;
 
     sf->tx_sf.adaptive_txb_search_level = boosted ? 2 : 3;
     sf->tx_sf.tx_type_search.use_skip_flag_prediction = 2;