commit 1fbd93cee3a13ad1b294b5ae0ec1c4772d598969
author Jingning Han <jingning@google.com> Wed Mar 21 19:19:02 2018 -0700
committer Jingning Han <jingning@google.com> Thu Mar 22 04:32:22 2018 +0000
tree c62e522a1dcdb9898a2b8658cdd07d7aa4926043
parent c7645d533dd4a0f436158b5541c35678ecb40fe2

Disable txk_type assertion check

Temporarily disable the txk_thype assertion check to avoid certain
failure cases due to hash map collision.

BUG=aomedia:1637

Change-Id: Id4e858c12b7492adfe573c3451557319ce02ce1c

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 93761db..084e5b1 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -545,6 +545,12 @@
   if (*eob == 0 && plane == 0) {
     const int txk_type_idx =
         av1_get_txk_type_index(plane_bsize, blk_row, blk_col);
+    // TODO(jingning): Temporarily disable txk_type check for eob=0 case.
+    // It is possible that certain collision in hash index would cause
+    // the assertion failure. To further optimize the rate-distortion
+    // performance, we need to re-visit this part and enable this assert
+    // again.
+#if 0
 #if CONFIG_EXT_DELTA_Q
     assert(args->cpi->oxcf.aq_mode != NO_AQ ||
            args->cpi->oxcf.deltaq_mode != NO_DELTA_Q ||
@@ -553,7 +559,7 @@
     assert(args->cpi->oxcf.aq_mode != NO_AQ ||
            xd->mi[0]->mbmi.txk_type[txk_type_idx] == DCT_DCT);
 #endif
-
+#endif
     xd->mi[0]->mbmi.txk_type[txk_type_idx] = DCT_DCT;
   }