commit 75fe580ebb7c59c55e0c2cf872c0555e4b93cd8e
author Wan-Teh Chang <wtc@google.com> Fri Dec 02 15:08:58 2022 -0800
committer Wan-Teh Chang <wtc@google.com> Thu Dec 08 02:41:47 2022 +0000
tree d80a9bb5a0347403f23f6ae139e1a17a3ba9b74d
parent a3b61c1648cc345f04d96d9f2d9b581d5434a291

Some cleanup related to av1_calc_mb_wiener_var_mt

The code was originally added in
https://aomedia-review.googlesource.com/c/aom/+/166141/3..4.

Pass num_workers as an input parameter to av1_calc_mb_wiener_var_mt() to
avoid calculating the value in both the function and its caller.

In av1_calc_mb_wiener_var_row(), explain why cpi->tile_data may be a
null pointer when the function is called in single-threaded mode. This
removes a TODO(any) comment.

Bug: b/257074966
Change-Id: Ifb45213f2286b99d1024fecf783b8cb23117ce0d

av1/encoder/ethread.c

diff --git a/av1/encoder/ethread.c b/av1/encoder/ethread.c
index a44a32b..518d77e 100644
--- a/av1/encoder/ethread.c
+++ b/av1/encoder/ethread.c
@@ -2521,14 +2521,13 @@
 // computation is before the frame encoding, so we don't need to consider
 // the number of tiles, instead we allocate all available threads to
 // the computation.
-void av1_calc_mb_wiener_var_mt(AV1_COMP *cpi, double *sum_rec_distortion,
+void av1_calc_mb_wiener_var_mt(AV1_COMP *cpi, int num_workers,
+                               double *sum_rec_distortion,
                                double *sum_est_rate) {
   (void)sum_rec_distortion;
   (void)sum_est_rate;
   AV1_COMMON *const cm = &cpi->common;
   MultiThreadInfo *const mt_info = &cpi->mt_info;
-  const int num_workers =
-      AOMMIN(mt_info->num_mod_workers[MOD_AI], mt_info->num_workers);
   const int tile_cols = 1;
   const int tile_rows = 1;
   if (cpi->tile_data != NULL) aom_free(cpi->tile_data);
@@ -2543,17 +2542,15 @@
   const int mi_rows = cm->mi_params.mi_rows;
   wiener_var_sync_mem_alloc(row_mt_sync, cm, mi_rows);
 
-  // wiener_var_sync_mem_alloc(row_mt_sync, cm, num_workers);
   row_mt_sync->intrabc_extra_top_right_sb_delay = 0;
   row_mt_sync->num_threads_working = num_workers;
   row_mt_sync->next_mi_row = 0;
-  row_mt_sync->sync_range = 1;
   memset(row_mt_sync->num_finished_cols, -1,
          sizeof(*row_mt_sync->num_finished_cols) * num_workers);
 
   prepare_wiener_var_workers(cpi, cal_mb_wiener_var_hook, num_workers);
-  launch_workers(&cpi->mt_info, num_workers);
-  sync_enc_workers(&cpi->mt_info, cm, num_workers);
+  launch_workers(mt_info, num_workers);
+  sync_enc_workers(mt_info, cm, num_workers);
 }
 
 // Compare and order tiles based on absolute sum of tx coeffs.