commit 5a488a624c50e764ac8faf46b77517805d41868a
author Debargha Mukherjee <debargha@google.com> Tue Nov 22 22:24:10 2016 -0800
committer Debargha Mukherjee <debargha@google.com> Wed Nov 23 10:29:42 2016 -0800
tree a55e180a6c56b5ff28d7468033e680e6e5c1155d
parent 838a53d6236c7c09ca16ab784c3d3f492054420d

Some fixes related to 64x64 tx, ext-tx, supertx

Change-Id: I95455ed7e44f3a163c751bd8a89f6119c0055c71

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 7e1a4b9..2c46bee 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -512,6 +512,7 @@
 #endif  // CONFIG_SUPERTX
 
 #if CONFIG_EXT_TX
+
 #define ALLOW_INTRA_EXT_TX 1
 
 static const int num_ext_tx_set_inter[EXT_TX_SETS_INTER] = { 1, 16, 12, 2 };
@@ -524,18 +525,20 @@
   return (tx_size == TX_16X16 ? 2 : 1);
 }
 
-static const int use_intra_ext_tx_for_txsize[EXT_TX_SETS_INTRA][TX_SIZES] = {
-  { 0, 0, 0, 0 },  // unused
-  { 1, 1, 0, 0 },
-  { 0, 0, 1, 0 },
-};
+static const int use_intra_ext_tx_for_txsize[EXT_TX_SETS_INTRA]
+                                            [EXT_TX_SIZES] = {
+                                              { 1, 1, 1, 1 },  // unused
+                                              { 1, 1, 0, 0 },
+                                              { 0, 0, 1, 0 },
+                                            };
 
-static const int use_inter_ext_tx_for_txsize[EXT_TX_SETS_INTER][TX_SIZES] = {
-  { 0, 0, 0, 0 },  // unused
-  { 1, 1, 0, 0 },
-  { 0, 0, 1, 0 },
-  { 0, 0, 0, 1 },
-};
+static const int use_inter_ext_tx_for_txsize[EXT_TX_SETS_INTER]
+                                            [EXT_TX_SIZES] = {
+                                              { 1, 1, 1, 1 },  // unused
+                                              { 1, 1, 0, 0 },
+                                              { 0, 0, 1, 0 },
+                                              { 0, 0, 0, 1 },
+                                            };
 
 // Transform types used in each intra set
 static const int ext_tx_used_intra[EXT_TX_SETS_INTRA][TX_TYPES] = {
@@ -757,7 +760,7 @@
     }
     if (is_inter_block(mbmi))
       // UV Inter only
-      return (mbmi->tx_type == IDTX && txsize_sqr_map[tx_size] == TX_32X32)
+      return (mbmi->tx_type == IDTX && txsize_sqr_map[tx_size] >= TX_32X32)
                  ? DCT_DCT
                  : mbmi->tx_type;
   }