commit e67b38aa7cfb17a57bfcc78061568f7f17f0bd29
author Jingning Han <jingning@google.com> Fri Nov 04 10:30:00 2016 -0700
committer Jingning Han <jingning@google.com> Tue Nov 08 09:36:54 2016 -0800
tree 5929b258478bed82ae313ae175482789d73de83c
parent 713b56121ae19e85c3103b4dea7eaf401278d6e4

Add min_tx_size variable to recursive transform block partition system

Replace max_tx_size with min_tx_size for transform type decision.

Change-Id: I64e39923a67903d52b381bd93eaac33b3400a201

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 1d08cfa..8649b7d 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -189,6 +189,7 @@
   // TODO(jingning): This effectively assigned a separate entry for each
   // 8x8 block. Apparently it takes much more space than needed.
   TX_SIZE inter_tx_size[MAX_MIB_SIZE][MAX_MIB_SIZE];
+  TX_SIZE min_tx_size;
 #endif
   int8_t skip;
   int8_t segment_id;

av1/common/onyxc_int.h

diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index 464314e..9bf672d 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -731,6 +731,11 @@
 }
 
 #if CONFIG_VAR_TX
+static INLINE TX_SIZE get_min_tx_size(const TX_SIZE tx_size) {
+  if (tx_size >= TX_SIZES_ALL) assert(0);
+  return txsize_sqr_map[tx_size];
+}
+
 static INLINE void set_txfm_ctx(TXFM_CONTEXT *txfm_ctx, uint8_t txs, int len) {
   int i;
   for (i = 0; i < len; ++i) txfm_ctx[i] = txs;