commit bce07f1c4a3b82c2f0d75c251d58ccf634a5ac03
author Angie Chiang <angiebird@google.com> Fri Dec 01 16:34:31 2017 -0800
committer Angie Chiang <angiebird@google.com> Mon Dec 04 17:19:08 2017 +0000
tree cafcd4d2f37a75473177fd4d629067ff3af68ac4
parent 8c7bd928c030a7a6b61c1c031d277e1c12dfb489

Use macro to set txk_type

This will make txk_sel support maximum bsize to 128x128

Change-Id: I33941966cb1ae4406ac68a2124c859c833a084d8

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 84aa8fd..58b789f 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -2695,7 +2695,9 @@
       ref_best_rd = AOMMIN(rd, ref_best_rd);
       if (rd < best_rd) {
 #if CONFIG_TXK_SEL
-        memcpy(best_txk_type, mbmi->txk_type, sizeof(best_txk_type[0]) * 256);
+        memcpy(best_txk_type, mbmi->txk_type,
+               sizeof(best_txk_type[0]) * MAX_SB_SQUARE /
+                   (TX_SIZE_W_MIN * TX_SIZE_H_MIN));
 #endif
         best_tx_type = tx_type;
         best_tx_size = n;
@@ -2711,7 +2713,9 @@
   mbmi->tx_size = best_tx_size;
   mbmi->tx_type = best_tx_type;
 #if CONFIG_TXK_SEL
-  memcpy(mbmi->txk_type, best_txk_type, sizeof(best_txk_type[0]) * 256);
+  memcpy(mbmi->txk_type, best_txk_type,
+         sizeof(best_txk_type[0]) * MAX_SB_SQUARE /
+             (TX_SIZE_W_MIN * TX_SIZE_H_MIN));
 #endif
 
   mbmi->min_tx_size = get_min_tx_size(mbmi->tx_size);
@@ -3857,7 +3861,7 @@
   RD_STATS sum_rd_stats;
 #if CONFIG_TXK_SEL
   TX_TYPE best_tx_type = TX_TYPES;
-  int txk_idx = (blk_row << 4) + blk_col;
+  int txk_idx = (blk_row << MAX_MIB_SIZE_LOG2) + blk_col;
 #endif
 
   av1_init_rd_stats(&sum_rd_stats);