commit 856d1798f62ad979a29c850390c32e7c4b30b2f9
author Nathan E. Egge <negge@mozilla.com> Thu Oct 26 17:55:20 2017 -0400
committer Nathan Egge <negge@mozilla.com> Fri Oct 27 02:15:04 2017 +0000
tree 3a5ef510da731ad4f8294beeccccd68df33efdf9
parent 10a0380a9118d93e5d78d2796b81f031aab4b444

Fix bug when enabling 32-point DST in daala_tx.

Change-Id: I567420e45f54cfe991065614d0a8c0c4d637e116

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index d02e670..22bfe94 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -1240,8 +1240,12 @@
     return DCT_DCT;
   }
 #endif  // CONFIG_MRC_TX
+#if CONFIG_DAALA_TX32
+  if (xd->lossless[mbmi->segment_id] || txsize_sqr_map[tx_size] > TX_32X32)
+#else
   if (xd->lossless[mbmi->segment_id] || txsize_sqr_map[tx_size] > TX_32X32 ||
       (txsize_sqr_map[tx_size] >= TX_32X32 && !is_inter_block(mbmi)))
+#endif
     return DCT_DCT;
   if (plane_type == PLANE_TYPE_Y) {
 #if !ALLOW_INTRA_EXT_TX