commit 8bc64121dc600e405a56b8d8c18dafc070736567
author Nithya V S <nithya.vs@ittiam.com> Wed Aug 18 10:53:10 2021 +0530
committer Yunqing Wang <yunqingwang@google.com> Wed Aug 18 15:33:06 2021 +0000
tree 292275bb6cfc8bf2b9d707da3fb627b0b1692eb9
parent 5e7282e4c85cca4e0e9d992f89d6173f7d7059a4

FPMT: Fix the computation of num_mod_workers for parallel frames

The computation of num_mod_workers[] for each of the parallel frames is
corrected to account for the uneven number of workers per frame when the
total workers is a non-multiple of the number of parallel frames.

Change-Id: Iad65e4933506b008912316e309151f697bbe274c

av1/encoder/ethread.c

diff --git a/av1/encoder/ethread.c b/av1/encoder/ethread.c
index 9e81d7a..5fcc7e4 100644
--- a/av1/encoder/ethread.c
+++ b/av1/encoder/ethread.c
@@ -840,7 +840,7 @@
     mt_info->num_workers = AOMMIN(workers_per_frame, num_workers - i);
     for (int j = MOD_FP; j < NUM_MT_MODULES; j++) {
       mt_info->num_mod_workers[j] =
-          AOMMIN(workers_per_frame, ppi->p_mt_info.num_mod_workers[j]);
+          AOMMIN(mt_info->num_workers, ppi->p_mt_info.num_mod_workers[j]);
     }
 
     frame_worker->hook = hook;