commit 95ba1fadac32e05f06808af76b85be38364dfb76
author Ravi Chaudhary <ravi.chaudhary@ittiam.com> Thu Oct 11 11:42:04 2018 +0530
committer Yunqing Wang <yunqingwang@google.com> Thu Oct 11 23:55:47 2018 +0000
tree 8a3736754042f38985ad9140bdf903dbfc18c2a1
parent 5baee46d0be212ae22a36f99adcef7a0d445c337

Modify hook function for enc row-mt

Encoder worker hook function has been modified to facilitate
row based multi-threading of encoder. Relevent initializations
for row-level entry points have been done.

STATS_CHANGED for cpi->row_mt==1

Change-Id: Ie5737f7cce39ee9b8f765f76fb25dae1fc006021

av1/encoder/ethread.c

diff --git a/av1/encoder/ethread.c b/av1/encoder/ethread.c
index 3727956..89f75b0 100644
--- a/av1/encoder/ethread.c
+++ b/av1/encoder/ethread.c
@@ -13,6 +13,7 @@
 #include "av1/encoder/encodeframe.h"
 #include "av1/encoder/encoder.h"
 #include "av1/encoder/ethread.h"
+#include "av1/encoder/rdopt.h"
 #include "aom_dsp/aom_dsp_common.h"
 
 static void accumulate_rd_opt(ThreadData *td, ThreadData *td_t) {
@@ -162,7 +163,7 @@
 static int enc_row_mt_worker_hook(void *arg1, void *unused) {
   EncWorkerData *const thread_data = (EncWorkerData *)arg1;
   AV1_COMP *const cpi = thread_data->cpi;
-  const AV1_COMMON *const cm = &cpi->common;
+  AV1_COMMON *const cm = &cpi->common;
   const int tile_cols = cm->tile_cols;
   const int tile_rows = cm->tile_rows;
   int t;
@@ -181,7 +182,22 @@
     td->mb.e_mbd.tile_ctx = td->tctx;
     td->mb.backup_tile_ctx = &this_tile->backup_tctx;
     memcpy(td->mb.e_mbd.tile_ctx, &this_tile->tctx, sizeof(FRAME_CONTEXT));
-    av1_encode_tile(cpi, td, tile_row, tile_col);
+    av1_init_above_context(cm, &td->mb.e_mbd, tile_row);
+
+    // Disable exhaustive search speed features for row based multi-threading of
+    // encoder.
+    td->mb.m_search_count_ptr = NULL;
+    td->mb.ex_search_count_ptr = NULL;
+
+    cfl_init(&td->mb.e_mbd.cfl, &cm->seq_params);
+    av1_crc32c_calculator_init(&td->mb.mb_rd_record.crc_calculator);
+    td->intrabc_used_this_tile = 0;
+
+    for (int mi_row = this_tile->tile_info.mi_row_start;
+         mi_row < this_tile->tile_info.mi_row_end;
+         mi_row += cm->seq_params.mib_size) {
+      av1_encode_sb_row(cpi, td, tile_row, tile_col, mi_row);
+    }
   }
 
   return 1;
@@ -476,6 +492,14 @@
       // Initialize cur_col to -1 for all rows.
       memset(this_tile->row_mt_sync.cur_col, -1,
              sizeof(*this_tile->row_mt_sync.cur_col) * max_sb_rows);
+#if CONFIG_COLLECT_INTER_MODE_RD_STATS
+      av1_inter_mode_data_init(this_tile);
+#endif
+      av1_zero_above_context(cm, &cpi->td.mb.e_mbd,
+                             this_tile->tile_info.mi_col_start,
+                             this_tile->tile_info.mi_col_end, tile_row);
+      this_tile->m_search_count = 0;   // Count of motion search hits.
+      this_tile->ex_search_count = 0;  // Exhaustive mesh search hits.
     }
   }