commit 162bc48906f9fbcc60ff11d083425f3abb3721a1
author venkat sanampudi <sanampudi.venkatarao@ittiam.com> Wed Nov 25 15:04:15 2020 +0530
committer Yunqing Wang <yunqingwang@google.com> Wed Nov 25 22:07:29 2020 +0000
tree efb2c187ea042798754263ba290b7070f7bf5a32
parent 03f0b5a06ba12261ac19402d9f3473e8aebd87ed

Set thread_data->start in create_enc_workers

Moved the initialization of thread_data->start variable
from launch_enc_workers() to create_enc_workers().
Renamed launch_enc_workers() to launch_workers().

Change-Id: I826c374cb347bc369386703747eabfb9196e27e6

av1/encoder/ethread.c

diff --git a/av1/encoder/ethread.c b/av1/encoder/ethread.c
index 0617c51..bf22743 100644
--- a/av1/encoder/ethread.c
+++ b/av1/encoder/ethread.c
@@ -555,6 +555,8 @@
 
     thread_data->cpi = cpi;
     thread_data->thread_id = i;
+    // Set the starting tile for each thread.
+    thread_data->start = i;
 
     if (i > 0) {
       // Set up sms_tree.
@@ -677,6 +679,8 @@
 
     thread_data->cpi = cpi;
     thread_data->thread_id = i;
+    // Set the starting tile for each thread.
+    thread_data->start = i;
 
     if (i > 0) {
       // Set up firstpass PICK_MODE_CONTEXT.
@@ -696,17 +700,11 @@
 }
 #endif
 
-static AOM_INLINE void launch_enc_workers(MultiThreadInfo *const mt_info,
-                                          int num_workers) {
+static AOM_INLINE void launch_workers(MultiThreadInfo *const mt_info,
+                                      int num_workers) {
   const AVxWorkerInterface *const winterface = aom_get_worker_interface();
-  // Encode a frame
   for (int i = num_workers - 1; i >= 0; i--) {
     AVxWorker *const worker = &mt_info->workers[i];
-    EncWorkerData *const thread_data = (EncWorkerData *)worker->data1;
-
-    // Set the starting tile for each thread.
-    thread_data->start = i;
-
     if (i == 0)
       winterface->execute(worker);
     else
@@ -891,7 +889,7 @@
     num_workers = AOMMIN(num_workers, mt_info->num_enc_workers);
   }
   prepare_enc_workers(cpi, enc_worker_hook, num_workers);
-  launch_enc_workers(&cpi->mt_info, num_workers);
+  launch_workers(&cpi->mt_info, num_workers);
   sync_enc_workers(&cpi->mt_info, cm, num_workers);
   accumulate_counters_enc_workers(cpi, num_workers);
 }
@@ -1036,7 +1034,7 @@
   assign_tile_to_thread(thread_id_to_tile_id, tile_cols * tile_rows,
                         num_workers);
   prepare_enc_workers(cpi, enc_row_mt_worker_hook, num_workers);
-  launch_enc_workers(&cpi->mt_info, num_workers);
+  launch_workers(&cpi->mt_info, num_workers);
   sync_enc_workers(&cpi->mt_info, cm, num_workers);
   if (cm->delta_q_info.delta_lf_present_flag) update_delta_lf_for_row_mt(cpi);
   accumulate_counters_enc_workers(cpi, num_workers);
@@ -1101,7 +1099,7 @@
   assign_tile_to_thread(thread_id_to_tile_id, tile_cols * tile_rows,
                         num_workers);
   fp_prepare_enc_workers(cpi, fp_enc_row_mt_worker_hook, num_workers);
-  launch_enc_workers(&cpi->mt_info, num_workers);
+  launch_workers(&cpi->mt_info, num_workers);
   sync_enc_workers(&cpi->mt_info, cm, num_workers);
 }
 
@@ -1307,7 +1305,7 @@
          sizeof(*tpl_sync->num_finished_cols) * mb_rows);
 
   prepare_tpl_workers(cpi, tpl_worker_hook, num_workers);
-  launch_enc_workers(&cpi->mt_info, num_workers);
+  launch_workers(&cpi->mt_info, num_workers);
   sync_enc_workers(&cpi->mt_info, cm, num_workers);
 }
 
@@ -1438,7 +1436,7 @@
     num_workers = AOMMIN(num_workers, mt_info->num_enc_workers);
 
   prepare_tf_workers(cpi, tf_worker_hook, num_workers, is_highbitdepth);
-  launch_enc_workers(mt_info, num_workers);
+  launch_workers(mt_info, num_workers);
   sync_enc_workers(mt_info, cm, num_workers);
   tf_accumulate_frame_diff(cpi, num_workers);
   tf_dealloc_thread_data(cpi, num_workers, is_highbitdepth);
@@ -1660,7 +1658,7 @@
 
   assign_thread_to_dir(job_info->thread_id_to_dir, num_workers);
   prepare_gm_workers(cpi, gm_mt_worker_hook, num_workers);
-  launch_enc_workers(&cpi->mt_info, num_workers);
+  launch_workers(&cpi->mt_info, num_workers);
   sync_enc_workers(&cpi->mt_info, &cpi->common, num_workers);
 }
 #endif  // !CONFIG_REALTIME_ONLY