commit 80eb454fb6a9c63d3fcdd79553c44b067affd65e
author Hui Su <huisu@google.com> Fri Mar 16 12:01:43 2018 -0700
committer Hui Su <huisu@google.com> Sat Mar 17 00:52:09 2018 +0000
tree 95bc49916b0724e3db7ab01ac0eb6a899b096554
parent 1d1db119d7068e74d88cb8d4807c7adab5acc006

Remove an invalid assertion in av1_encode_block_intra()

Also add a TODO in encode_block() for txk type check.

BUG=aomedia:1551

Change-Id: Ia020335b40dffc7eb5d313cb213588ba2781cea4

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 3bd920b..ff27b2c 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -255,7 +255,9 @@
   if (args->cpi->oxcf.aq_mode != NO_AQ && p->eobs[block] == 0 && plane == 0) {
     xd->mi[0]->mbmi.txk_type[txk_type_idx] = DCT_DCT;
   }
-  uint8_t disable_txk_check = args->enable_optimize_b;
+  // TODO(jingning,angiebird,huisu@google.com): enable txk_check when
+  // enable_optimize_b is true.
+  const uint8_t disable_txk_check = args->enable_optimize_b;
   if (plane == 0 && p->eobs[block] == 0) {
     if (disable_txk_check) {
       xd->mi[0]->mbmi.txk_type[txk_type_idx] = DCT_DCT;
@@ -550,10 +552,6 @@
                     AV1_XFORM_QUANT_FP);
     av1_optimize_b(args->cpi, x, plane, blk_row, blk_col, block, plane_bsize,
                    tx_size, a, l, 1, &dummy_rate_cost);
-    if (plane == 0 && p->eobs[block] == 0) {
-      assert(xd->mi[0]->mbmi.txk_type[av1_get_txk_type_index(
-                 plane_bsize, blk_row, blk_col)] == DCT_DCT);
-    }
   } else {
     av1_xform_quant(
         cm, x, plane, block, blk_row, blk_col, plane_bsize, tx_size,