commit ca40d03306a28de3e0757def7b4e1e707756628d
author Lester Lu <kslu@google.com> Mon Nov 22 22:26:17 2021 +0000
committer Leo (Liang) Zhao <leolzhao@tencent.com> Mon Nov 22 22:26:17 2021 +0000
tree b8e6937e4b7d2b5e6a1cd2afe0f8c2808ffe7e9f
parent 8cb8791846a57ac025724561c931840cdfba9a96

Fix a bug in CONFIG_ENTORPY_STATS and CONFIG_IST

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index edb8fa7..3905650 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -1790,8 +1790,13 @@
         else
           intra_dir = mbmi->mode;
 #if CONFIG_ENTROPY_STATS
+#if CONFIG_IST
+        const TX_TYPE primary_tx_type = get_primary_tx_type(tx_type);
+#else
+        const TX_TYPE primary_tx_type = tx_type;
+#endif  // CONFIG_IST
         ++counts->intra_ext_tx[eset][txsize_sqr_map[tx_size]][intra_dir]
-                              [av1_ext_tx_ind[tx_set_type][tx_type]];
+                              [av1_ext_tx_ind[tx_set_type][primary_tx_type]];
 #endif  // CONFIG_ENTROPY_STATS
         if (allow_update_cdf) {
           update_cdf(