commit ff37c1a5f31d44575ec5d7cbd7e0330ee930961b
author Hui Su <huisu@google.com> Thu Sep 07 16:53:53 2017 -0700
committer Yaowu Xu <yaowu@google.com> Fri Sep 08 16:42:50 2017 +0000
tree f611262fcaecba6cad4958a265139d090571d065
parent ba9dd8a6dc67458fa16352ced9b1aad8933069b7

Resolve a confilict between intrabc and var-tx

Intrabc is counted as inter mode, but it doesn't support var-tx yet.
This patch skips tx partition info update for intrabc blocks. It
resolves a decoder crash issue.

Change-Id: I97e413e4a837ba6510e110347f5aa6e5fd14dcc5

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 38f83fe..53ee070 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -5975,6 +5975,10 @@
 static void tx_partition_count_update(const AV1_COMMON *const cm, MACROBLOCK *x,
                                       BLOCK_SIZE plane_bsize, int mi_row,
                                       int mi_col, FRAME_COUNTS *td_counts) {
+#if CONFIG_INTRABC
+  // Intrabc doesn't support var-tx yet. So no need to update tx partition info.
+  if (is_intrabc_block(&x->e_mbd.mi[0]->mbmi)) return;
+#endif  // CONFIG_INTRABC
   MACROBLOCKD *xd = &x->e_mbd;
   const int mi_width = block_size_wide[plane_bsize] >> tx_size_wide_log2[0];
   const int mi_height = block_size_high[plane_bsize] >> tx_size_wide_log2[0];