commit 0fa057f8a02d85599623e1140b3c679f3be4ffde
author Debargha Mukherjee <debargha@google.com> Wed Dec 06 17:06:29 2017 -0800
committer Debargha Mukherjee <debargha@google.com> Fri Dec 08 17:18:09 2017 +0000
tree 3a61195ca047f2a29b4285ff271cbdffd356cfdc
parent 37131cfdaf0a4adfd7d94917a1a38dc696392670

Misc refactors to support 4:1->2:1->1:1 tx splits

Currently 4:1 transforms have max 2 split levels:
4:1 -> 1:1 -> 0.5:0.5.

This refactor enables split levels:
4:1 -> 2:1 -> 1:1,

by simply changing the tables in common_data.h.

The actual switch will be made in a subsequent patch.

Change-Id: I33f8d9ca5159ba3e7d02ced449ddf6f804a8f12a

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 607357d..12d69ee 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -263,8 +263,8 @@
     const TX_SIZE tx_size = mbmi->tx_size;
     const int tx_size_ctx = get_tx_size_context(xd);
     const int32_t tx_size_cat = intra_tx_size_cat_lookup[bsize];
-    const int depth = tx_size_to_depth(tx_size, bsize);
-    const int max_depths = bsize_to_max_depth(bsize);
+    const int depth = tx_size_to_depth(tx_size, bsize, 0);
+    const int max_depths = bsize_to_max_depth(bsize, 0);
 
     assert(depth >= 0 && depth <= max_depths);
     assert(!is_inter_block(mbmi));