commit a3f7d2ef95582d56c1505ef5d3de4c6972cbab31
author Angie Chiang <angiebird@google.com> Thu Dec 07 19:51:14 2017 -0800
committer Angie Chiang <angiebird@google.com> Mon Dec 11 23:01:27 2017 +0000
tree 8d42be845c427393966ef59229854a129cef1a19
parent 5b5f4df7be2bd9db96ef4c28a13b59a6f44564f8

Reset txk_type to DCT_DCT whenever eob is zero

Change-Id: I2212609532783849ac5d8c91aec6e34af48f01f7

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index 071c47f..6d1750d 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -340,6 +340,9 @@
   (void)blk_col;
   aom_write_bin(w, eob == 0,
                 ec_ctx->txb_skip_cdf[txs_ctx][txb_ctx->txb_skip_ctx], 2);
+  if (plane == 0 && eob == 0) {
+    assert(tx_type == DCT_DCT);
+  }
   if (eob == 0) return;
 
   av1_txb_init_levels(tcoeff, width, height, levels);
@@ -2575,7 +2578,7 @@
 
   av1_merge_rd_stats(rd_stats, &best_rd_stats);
 
-  if (best_eob == 0 && is_inter_block(mbmi)) best_tx_type = DCT_DCT;
+  if (best_eob == 0) best_tx_type = DCT_DCT;
 
   if (plane == 0)
     mbmi->txk_type[(blk_row << MAX_MIB_SIZE_LOG2) + blk_col] = best_tx_type;