commit 51b883e7212ae79d745d8337a7cde13747e3ee41
author Cheng Chen <chengchen@google.com> Fri Apr 28 11:45:34 2023 -0700
committer Cheng Chen <chengchen@google.com> Sat Apr 29 00:37:21 2023 +0000
tree 81df2e1f6379d61803449dab68186fa373118672
parent 4d926b7d9dc823fdbb2b88b61c64c3349745243c

Properly compute multi thread workers for allintra

The implementation of multi-threading for deltaq-mode=3 in allintra
mode is based on row mt. Therefore we need to respect row mt setting
when determining number of multi-thread workers.

BUG=aomedia:3433

Change-Id: Ifcf274c5a9dfba6c28974c92936918ad87669af4

av1/encoder/ethread.c

diff --git a/av1/encoder/ethread.c b/av1/encoder/ethread.c
index f13b493..208e4a6 100644
--- a/av1/encoder/ethread.c
+++ b/av1/encoder/ethread.c
@@ -3006,6 +3006,9 @@
 // Computes num_workers for all intra multi-threading.
 static AOM_INLINE int compute_num_ai_workers(AV1_COMP *cpi) {
   if (cpi->oxcf.max_threads <= 1) return 1;
+  // The multi-threading implementation of deltaq-mode = 3 in allintra
+  // mode is based on row multi threading.
+  if (!cpi->oxcf.row_mt) return 1;
   cpi->weber_bsize = BLOCK_8X8;
   const BLOCK_SIZE bsize = cpi->weber_bsize;
   const int mb_step = mi_size_wide[bsize];