commit b00aa8f216029541b6343f61b64d0999c8b2e0f9
author Jingning Han <jingning@google.com> Tue Mar 15 16:59:37 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 15 16:59:37 2016 +0000
tree a5a5009832fe4b21329dcf46e9eba52c32235fbe
parent 429d304bc1db68f995d24670b0c9ec77251d48cd
parent a2c87a3ddaa653af8768852cd1bc43d9ce4d016a

Merge "Turn off 32x32 transform type selection" into nextgenv2

vp10/common/blockd.h

diff --git a/vp10/common/blockd.h b/vp10/common/blockd.h
index d5139f7..016fc75 100644
--- a/vp10/common/blockd.h
+++ b/vp10/common/blockd.h
@@ -380,7 +380,7 @@
 #if CONFIG_EXT_TX
 #define ALLOW_INTRA_EXT_TX       1
 // whether masked transforms are used for 32X32
-#define USE_MSKTX_FOR_32X32      1
+#define USE_MSKTX_FOR_32X32      0
 
 static const int num_ext_tx_set_inter[EXT_TX_SETS_INTER] = {
   1, 19, 12, 2
@@ -447,7 +447,7 @@
   { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
   { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},
   { 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1},
-  { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1},
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0},
 };
 
 static INLINE int get_ext_tx_types(TX_SIZE tx_size, BLOCK_SIZE bs,