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/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 7c78eda..e631989 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1129,7 +1129,11 @@
 #endif
                           aom_writer *w) {
   const int is_inter = is_inter_block(mbmi);
+#if CONFIG_VAR_TX
+  const TX_SIZE tx_size = is_inter ? mbmi->min_tx_size : mbmi->tx_size;
+#else
   const TX_SIZE tx_size = mbmi->tx_size;
+#endif
   if (!FIXED_TX_TYPE) {
 #if CONFIG_EXT_TX
     const BLOCK_SIZE bsize = mbmi->sb_type;
@@ -1184,13 +1188,6 @@
             &ext_tx_encodings[mbmi->tx_type]);
 #endif
       }
-    } else {
-      if (!mbmi->skip) {
-#if CONFIG_SUPERTX
-        if (!supertx_enabled)
-#endif  // CONFIG_SUPERTX
-          assert(mbmi->tx_type == DCT_DCT);
-      }
     }
 #endif  // CONFIG_EXT_TX
   }
@@ -1898,6 +1895,7 @@
       (*tok)++;
     }
   }
+
 #if CONFIG_RD_DEBUG
   for (plane = 0; plane < MAX_MB_PLANE; ++plane) {
     if (m->mbmi.txb_coeff_cost[plane] != txb_coeff_cost[plane]) {