commit 6a3ee5326b18a5bb3ebb131033003aeceb15b322
author Mufaddal Chakera <mufaddal.chakera@ittiam.com> Mon May 18 12:46:50 2020 +0530
committer Mufaddal Chakera <mufaddal.chakera@ittiam.com> Fri May 22 06:20:01 2020 +0000
tree bcfa85e4ef93244151fdfe1a4e30fd11c90a4a63
parent 2e2e4110ff1c31651355bb434b10dbef89e79976

Enable multi-threading for firstpass

Enable multi-threading for firstpass when
num_workers > 1.

Change-Id: I0728d25a41b8fd9d7b7f35a087a5d6ce00d1ba3c

av1/encoder/ethread.c

diff --git a/av1/encoder/ethread.c b/av1/encoder/ethread.c
index 0b93994..e65c07c 100644
--- a/av1/encoder/ethread.c
+++ b/av1/encoder/ethread.c
@@ -643,13 +643,11 @@
   assert(mt_info->workers != NULL);
 
 #if CONFIG_MULTITHREAD
-  if (cpi->oxcf.row_mt == 1) {
-    AV1EncRowMultiThreadInfo *enc_row_mt = &mt_info->enc_row_mt;
-    if (enc_row_mt->mutex_ == NULL) {
-      CHECK_MEM_ERROR(cm, enc_row_mt->mutex_,
-                      aom_malloc(sizeof(*(enc_row_mt->mutex_))));
-      if (enc_row_mt->mutex_) pthread_mutex_init(enc_row_mt->mutex_, NULL);
-    }
+  AV1EncRowMultiThreadInfo *enc_row_mt = &mt_info->enc_row_mt;
+  if (enc_row_mt->mutex_ == NULL) {
+    CHECK_MEM_ERROR(cm, enc_row_mt->mutex_,
+                    aom_malloc(sizeof(*(enc_row_mt->mutex_))));
+    if (enc_row_mt->mutex_) pthread_mutex_init(enc_row_mt->mutex_, NULL);
   }
 #endif
 

av1/encoder/firstpass.c

diff --git a/av1/encoder/firstpass.c b/av1/encoder/firstpass.c
index a7a1618..fdc0465 100644
--- a/av1/encoder/firstpass.c
+++ b/av1/encoder/firstpass.c
@@ -1115,9 +1115,8 @@
 
   enc_row_mt->sync_read_ptr = av1_row_mt_sync_read_dummy;
   enc_row_mt->sync_write_ptr = av1_row_mt_sync_write_dummy;
-  mt_info->row_mt_enabled = 0;
 
-  if (mt_info->row_mt_enabled && (mt_info->num_workers > 1)) {
+  if (mt_info->num_workers > 1) {
     enc_row_mt->sync_read_ptr = av1_row_mt_sync_read;
     enc_row_mt->sync_write_ptr = av1_row_mt_sync_write;
     av1_fp_encode_tiles_row_mt(cpi);