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

Change-Id: I75ce79db34789151cc4cc9183a550f59e1357bfe

Add new 32-point Type-IV DST to daala_tx.
Change-Id: I75ce79db34789151cc4cc9183a550f59e1357bfe
f73e47ee · Nathan E. Egge · Nathan Egge · f1639a1e · f73e47ee · f73e47ee
Commit f73e47ee authored Oct 22, 2017 by Nathan E. Egge Committed by Nathan Egge Oct 23, 2017
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 856 additions and 18 deletions

av1/common/blockd.h av1/common/blockd.h +10 -0

av1/common/daala_tx.c av1/common/daala_tx.c +846 -18

No files found.
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -948,6 +948,16 @@ static INLINE TxSetType get_ext_tx_set_type(TX_SIZE tx_size, BLOCK_SIZE bs,
      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)

--- a/av1/common/daala_tx.c
+++ b/av1/common/daala_tx.c