commit d4adea8c8022ab1698612515a04b833fbd246701
author Remya Prakasan <remya.prakasan@ittiam.com> Fri Sep 03 12:13:19 2021 +0530
committer Yunqing Wang <yunqingwang@google.com> Thu Sep 09 19:29:57 2021 +0000
tree 9d2e5965831339797005412a10bf44108336af51
parent e6860e03c1982e7c2e3c4697dbb551267b9f1e9b

Modify the conditions to set speed features for row-mt

Setting speed features 'prune_ref_frame_for_gm_search',
'mv_cost_upd_level' and 'inter_mode_rd_model_estimation' for
row-mt is modified to use cpi->mt_info.num_workers instead
of cpi->oxcf.max_threads so that with FPMT, any parallel frame
using single thread can set the speed features appropriately.

Change-Id: I7b969a9358400a6a07d58dc80d6801e0c2ab0e27

av1/encoder/speed_features.c

diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 1861369..cb2644c 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -1884,7 +1884,7 @@
   else if (cpi->oxcf.unit_test_cfg.motion_vector_unit_test == 2)
     cpi->mv_search_params.find_fractional_mv_step = av1_return_min_sub_pixel_mv;
 
-  if ((cpi->oxcf.row_mt == 1) && (cpi->oxcf.max_threads > 1)) {
+  if ((cpi->oxcf.row_mt == 1) && (cpi->mt_info.num_workers > 1)) {
     if (sf->inter_sf.mv_cost_upd_level < INTERNAL_COST_UPD_SBROW) {
       // Set mv_cost_upd_level to use row level update.
       sf->inter_sf.mv_cost_upd_level = INTERNAL_COST_UPD_SBROW;
@@ -2029,7 +2029,7 @@
          predict_dc_levels[cpi->sf.winner_mode_sf.dc_blk_pred_level],
          sizeof(winner_mode_params->predict_dc_level));
 
-  if (cpi->oxcf.row_mt == 1 && (cpi->oxcf.max_threads > 1)) {
+  if (cpi->oxcf.row_mt == 1 && (cpi->mt_info.num_workers > 1)) {
     if (sf->inter_sf.inter_mode_rd_model_estimation == 1) {
       // Revert to type 2
       sf->inter_sf.inter_mode_rd_model_estimation = 2;
@@ -2039,7 +2039,7 @@
     // better parallelism when number of threads available are greater than or
     // equal to maximum number of reference frames allowed for global motion.
     if (sf->gm_sf.gm_search_type != GM_DISABLE_SEARCH &&
-        (cpi->oxcf.max_threads >=
+        (cpi->mt_info.num_workers >=
          gm_available_reference_frames[sf->gm_sf.gm_search_type]))
       sf->gm_sf.prune_ref_frame_for_gm_search = 0;
   }