commit f73e47eea4b20ddbcb350954704f690deacca5c0
author Nathan E. Egge <negge@mozilla.com> Sun Oct 22 06:41:55 2017 -0400
committer Nathan Egge <negge@mozilla.com> Mon Oct 23 16:49:24 2017 +0000
tree c58eefd96824a039165df373d1166c8e64bf7e6e
parent f1639a1e40fe53fb9aca8be6c6e0cbc767f0f8ec

Add new 32-point Type-IV DST to daala_tx.

Change-Id: I75ce79db34789151cc4cc9183a550f59e1357bfe

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index a43c103..8d81604 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -948,6 +948,16 @@
       return EXT_TX_SET_MRC_DCT;
   }
 #endif  // CONFIG_MRC_TX
+#if CONFIG_DAALA_TX32
+  if (tx_size_sqr_up > TX_32X32)
+    return is_inter ? EXT_TX_SET_DCT_IDTX : EXT_TX_SET_DCTONLY;
+  if (is_inter)
+    return (tx_size_sqr >= TX_16X16 ? EXT_TX_SET_DTT9_IDTX_1DDCT
+                                    : EXT_TX_SET_ALL16);
+  else
+    return (tx_size_sqr >= TX_16X16 ? EXT_TX_SET_DTT4_IDTX
+                                    : EXT_TX_SET_DTT4_IDTX_1DDCT);
+#endif
   if (tx_size_sqr_up == TX_32X32)
     return is_inter ? EXT_TX_SET_DCT_IDTX : EXT_TX_SET_DCTONLY;
   if (is_inter)