commit e16b2665c29c4ba9e5da8b264135b6a40f2c1cb5
author Alex Converse <aconverse@google.com> Wed May 24 14:00:00 2017 -0700
committer Alex Converse <aconverse@google.com> Thu May 25 16:55:14 2017 +0000
tree c2e0903c3d167cca3204926b3d4080eac7e3c9c3
parent c156224a40e2b4867becc0aff958b3c7abd35904

var_tx+intrabc: Fix infinite recursion

Change-Id: Ibbf0c14934d0bff316cfdf5c252c64b3e68c73e7

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index d8cc525..35ebc6c 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1121,6 +1121,16 @@
 
       xd->corrupted |=
           !assign_dv(cm, xd, &mbmi->mv[0], &dv_ref, mi_row, mi_col, bsize, r);
+#if CONFIG_VAR_TX
+      // TODO(aconverse@google.com): Evaluate allowing VAR TX on intrabc blocks
+      const int width = block_size_wide[bsize] >> tx_size_wide_log2[0];
+      const int height = block_size_high[bsize] >> tx_size_high_log2[0];
+      int idx, idy;
+      for (idy = 0; idy < height; ++idy)
+        for (idx = 0; idx < width; ++idx)
+          mbmi->inter_tx_size[idy >> 1][idx >> 1] = mbmi->tx_size;
+      mbmi->min_tx_size = get_min_tx_size(mbmi->tx_size);
+#endif  // CONFIG_VAR_TX
 #if CONFIG_EXT_TX && !CONFIG_TXK_SEL
       av1_read_tx_type(cm, xd,
 #if CONFIG_SUPERTX