commit 70e5f3f02b1437539fac3350a2ed0da9fdc4c7d7
author Jingning Han <jingning@google.com> Wed Nov 09 17:03:07 2016 -0800
committer Jingning Han <jingning@google.com> Thu Nov 10 17:55:16 2016 +0000
tree 8ff5986cf6fc3f1dd4d1a560f9af69edd04cb149
parent af6df17516fa820c8c4e2ebc166e9122c28450fa

Support rectangular tx_size in recursive txfm partition

This commit supports the recursive transform block partition to
start with both square and rectangular transform block sizes.

Change-Id: Idaf29d50cb1f4876b43e5ba82c2609708c6b1926

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 95d5cb9..d79fb96 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -5166,7 +5166,7 @@
   MACROBLOCKD *xd = &x->e_mbd;
   const int mi_width = num_4x4_blocks_wide_lookup[plane_bsize];
   const int mi_height = num_4x4_blocks_high_lookup[plane_bsize];
-  TX_SIZE max_tx_size = max_txsize_lookup[plane_bsize];
+  TX_SIZE max_tx_size = max_txsize_rect_lookup[plane_bsize];
   const int bh = tx_size_high_unit[max_tx_size];
   const int bw = tx_size_wide_unit[max_tx_size];
   int idx, idy;
@@ -5224,7 +5224,7 @@
                                       int mi_row, int mi_col) {
   const int mi_width = num_4x4_blocks_wide_lookup[plane_bsize];
   const int mi_height = num_4x4_blocks_high_lookup[plane_bsize];
-  TX_SIZE max_tx_size = max_txsize_lookup[plane_bsize];
+  TX_SIZE max_tx_size = max_txsize_rect_lookup[plane_bsize];
   const int bh = tx_size_high_unit[max_tx_size];
   const int bw = tx_size_wide_unit[max_tx_size];
   int idx, idy;