commit 7eab9ff19dde07a76d20abcf6d4fb793874ebad1
author Jingning Han <jingning@google.com> Thu Jul 06 10:12:54 2017 -0700
committer Jingning Han <jingning@google.com> Thu Jul 13 18:26:36 2017 +0000
tree aa31e0ea0271bcb55a4c9423a3b8956ae4347e40
parent 1c318d528fdec05e3231686e533699d1d4d35706

Refactor get_tx_type indexing

Use row and column indexes to fetch the txk_type value.

Change-Id: I881d500c030e322d8aca9dccb6ff2870c9e1e392

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index c8b6f75..a206673 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -5871,7 +5871,7 @@
 
 void av1_update_tx_type_count(const AV1_COMMON *cm, MACROBLOCKD *xd,
 #if CONFIG_TXK_SEL
-                              int block, int plane,
+                              int blk_row, int blk_col, int block, int plane,
 #endif
                               BLOCK_SIZE bsize, TX_SIZE tx_size,
                               FRAME_COUNTS *counts) {
@@ -5881,6 +5881,8 @@
 #if !CONFIG_TXK_SEL
   TX_TYPE tx_type = mbmi->tx_type;
 #else
+  (void)blk_row;
+  (void)blk_col;
   // Only y plane's tx_type is updated
   if (plane > 0) return;
   TX_TYPE tx_type = get_tx_type(PLANE_TYPE_Y, xd, block, tx_size);