commit 10b7456157fb33178f9715dbd56ef78f9dff9985
author Yue Chen <yuec@google.com> Mon Mar 26 11:39:19 2018 -0700
committer Yue Chen <yuec@google.com> Mon Mar 26 20:59:26 2018 +0000
tree 672e5dcfc3e5c4b353ef99d1fd7c1d0819e1bca1
parent 52c2e6e15c1c6cd7dabcccb5b823c001535d8ea6

Fix stats counting for ext_tx types

Apply mapping functions to map original indices to indices in
reduced sets.

Change-Id: I039addc66d92e72b905ccf184f7acdacab40a594

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index eb885bf..a27105d 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4649,7 +4649,8 @@
                      av1_num_ext_tx_set[tx_set_type]);
         }
 #if CONFIG_ENTROPY_STATS
-        ++counts->inter_ext_tx[eset][txsize_sqr_map[tx_size]][tx_type];
+        ++counts->inter_ext_tx[eset][txsize_sqr_map[tx_size]]
+                              [av1_ext_tx_ind[tx_set_type][tx_type]];
 #endif  // CONFIG_ENTROPY_STATS
       } else {
         PREDICTION_MODE intra_dir;
@@ -4659,8 +4660,8 @@
         else
           intra_dir = mbmi->mode;
 #if CONFIG_ENTROPY_STATS
-        ++counts
-              ->intra_ext_tx[eset][txsize_sqr_map[tx_size]][intra_dir][tx_type];
+        ++counts->intra_ext_tx[eset][txsize_sqr_map[tx_size]][intra_dir]
+                              [av1_ext_tx_ind[tx_set_type][tx_type]];
 #endif  // CONFIG_ENTROPY_STATS
         if (allow_update_cdf) {
           update_cdf(