commit 695abd72e09ae041641988b52a4e3c8624fda86a
author Debargha Mukherjee <debargha@google.com> Sat Dec 16 10:15:45 2017 -0800
committer Debargha Mukherjee <debargha@google.com> Mon Dec 18 02:30:27 2017 +0000
tree 95ee05cda55b56442e345405ea602a50eb21e965
parent 4e16ea648391676ab46352822a6e4bd393d681b1

Make lv-map work with 64x16/16x64 transforms

Some refactoring done to enable reuse of code.

Change-Id: I28cea413a1bf7e6b8ce82ee50c5b5603e8185a2a

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 0354183..05673f1 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -1457,6 +1457,21 @@
   return tx_size_2d[tx_size];
 }
 
+static INLINE TX_SIZE av1_get_adjusted_tx_size(TX_SIZE tx_size) {
+#if CONFIG_TX64X64
+  if (tx_size == TX_64X64 || tx_size == TX_64X32 || tx_size == TX_32X64) {
+    return TX_32X32;
+  }
+  if (tx_size == TX_16X64) {
+    return TX_16X32;
+  }
+  if (tx_size == TX_64X16) {
+    return TX_32X16;
+  }
+#endif  // CONFIG_TX64X64
+  return tx_size;
+}
+
 #ifdef __cplusplus
 }  // extern "C"
 #endif