commit 4c1e5c6cd1463f4b9afa406fbd2767cf85fd2245
author chiyotsai <chiyotsai@google.com> Thu Apr 30 17:54:14 2020 -0700
committer Chi Yo Tsai <chiyotsai@google.com> Mon May 04 22:27:18 2020 +0000
tree b9d7c7b665cbce439c12fe5f28d8527eee782165
parent b4bdcc8f9c2aeee8f4809c32aee71a03ba333ea4

Pack txfm-search records in MACROBLOCK to TxfmSearchInfo

This CL introduces TxfmSearchInfo struct that is meant to store the
intermediate results during txfm search.

Bug=aomedia:2618

Change-Id: Id5860a6017fceeaec742066644a03645114669e6

av1/encoder/rd.h

diff --git a/av1/encoder/rd.h b/av1/encoder/rd.h
index 4cf3816..32aea44 100644
--- a/av1/encoder/rd.h
+++ b/av1/encoder/rd.h
@@ -310,7 +310,7 @@
 }
 
 // Used to reset the state of tx/mb rd hash information
-static INLINE void reset_hash_records(MACROBLOCK *const x,
+static INLINE void reset_hash_records(TxfmSearchInfo *const txfm_info,
                                       int use_inter_txb_hash) {
   int32_t record_idx;
 
@@ -318,27 +318,28 @@
   if (use_inter_txb_hash) {
     for (record_idx = 0;
          record_idx < ((MAX_MIB_SIZE >> 1) * (MAX_MIB_SIZE >> 1)); record_idx++)
-      x->txb_rd_record_8X8[record_idx].num =
-          x->txb_rd_record_8X8[record_idx].index_start = 0;
+      txfm_info->txb_rd_record_8X8[record_idx].num =
+          txfm_info->txb_rd_record_8X8[record_idx].index_start = 0;
     for (record_idx = 0;
          record_idx < ((MAX_MIB_SIZE >> 2) * (MAX_MIB_SIZE >> 2)); record_idx++)
-      x->txb_rd_record_16X16[record_idx].num =
-          x->txb_rd_record_16X16[record_idx].index_start = 0;
+      txfm_info->txb_rd_record_16X16[record_idx].num =
+          txfm_info->txb_rd_record_16X16[record_idx].index_start = 0;
     for (record_idx = 0;
          record_idx < ((MAX_MIB_SIZE >> 3) * (MAX_MIB_SIZE >> 3)); record_idx++)
-      x->txb_rd_record_32X32[record_idx].num =
-          x->txb_rd_record_32X32[record_idx].index_start = 0;
+      txfm_info->txb_rd_record_32X32[record_idx].num =
+          txfm_info->txb_rd_record_32X32[record_idx].index_start = 0;
     for (record_idx = 0;
          record_idx < ((MAX_MIB_SIZE >> 4) * (MAX_MIB_SIZE >> 4)); record_idx++)
-      x->txb_rd_record_64X64[record_idx].num =
-          x->txb_rd_record_64X64[record_idx].index_start = 0;
+      txfm_info->txb_rd_record_64X64[record_idx].num =
+          txfm_info->txb_rd_record_64X64[record_idx].index_start = 0;
   }
 
   // Reset the state for use_intra_txb_hash
-  x->txb_rd_record_intra.num = x->txb_rd_record_intra.index_start = 0;
+  txfm_info->txb_rd_record_intra.num =
+      txfm_info->txb_rd_record_intra.index_start = 0;
 
   // Reset the state for use_mb_rd_hash
-  x->mb_rd_record.num = x->mb_rd_record.index_start = 0;
+  txfm_info->mb_rd_record.num = txfm_info->mb_rd_record.index_start = 0;
 }
 
 void av1_setup_pred_block(const MACROBLOCKD *xd,