commit 2f65411ac27061e5e5147bb621689cbc3c5cfba4
author Hui Su <huisu@google.com> Thu Mar 15 12:59:56 2018 -0700
committer Hui Su <huisu@google.com> Fri Mar 16 17:22:19 2018 +0000
tree 55d4051be1923e18d242c0129c5e18297d017e1b
parent ba7b8fe2727598d85ce1f16f918a99bae3c16de1

delta-q: set tx_type as DCT_DCT when eob is 0

BUG=aomedia:1592

Change-Id: Ic1a18f91151875de0241b0b1320a82dffecc7afa

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index a2c2c75..3bd920b 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -560,9 +560,14 @@
         USE_B_QUANT_NO_TRELLIS ? AV1_XFORM_QUANT_B : AV1_XFORM_QUANT_FP);
   }
 
-  if (args->cpi->oxcf.aq_mode != NO_AQ && !*eob && plane == 0) {
+  if (*eob == 0 && plane == 0) {
     const int txk_type_idx =
         av1_get_txk_type_index(plane_bsize, blk_row, blk_col);
+    assert(args->cpi->oxcf.aq_mode != NO_AQ ||
+#if CONFIG_EXT_DELTA_Q
+           args->cpi->oxcf.deltaq_mode != NO_DELTA_Q ||
+#endif
+           xd->mi[0]->mbmi.txk_type[txk_type_idx] == DCT_DCT);
     xd->mi[0]->mbmi.txk_type[txk_type_idx] = DCT_DCT;
   }