commit 70a970500c49868780c6ca06e4a1dce7d27badea
author Jingning Han <jingning@google.com> Tue Feb 06 09:37:16 2018 -0800
committer Jingning Han <jingning@google.com> Tue Feb 06 19:53:01 2018 +0000
tree 1a91208b7df87ff326da2e93aaf8aec6ed07f612
parent 0768d98bdb473facab16e3c10967cdb5c356fb3a

Make txk-sel compatible with speed 2 feature

BUG=aomedia:1320

Change-Id: Idac80eca2252173736d580bbfae8cf46722c02b0

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 12ca4e0..e928385 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4435,6 +4435,9 @@
       x->plane[plane].eobs[block] = 0;
 #if CONFIG_LV_MAP
       x->plane[plane].txb_entropy_ctx[block] = 0;
+#if CONFIG_TXK_SEL
+      update_txk_array(mbmi->txk_type, blk_row, blk_col, tx_size, DCT_DCT);
+#endif
 #endif  // CONFIG_LV_MAP
     } else {
       rd_stats->skip = 0;