commit 571189c66d02ca149938b2a7d2097e5a0d53120e
author Jingning Han <jingning@google.com> Mon Oct 24 10:38:43 2016 -0700
committer Jingning Han <jingning@google.com> Mon Oct 24 10:38:43 2016 -0700
tree 6cae3d6ff133b5fed2976bb8a652cb2325eb7dfb
parent 421af3538d02a0faeab86bc8db18642abdcc394d

Add MAX_VARTX_DEPTH macro

Change-Id: I85532cf88f91f0f0cb4d9cb4b2dbda8a181297bf

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 1351281..889eaad 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -3116,13 +3116,13 @@
       *skip = 0;
     }
 
-    if (tx_size > TX_4X4 && depth < 2)
+    if (tx_size > TX_4X4 && depth < MAX_VARTX_DEPTH)
       *rate += av1_cost_bit(cpi->common.fc->txfm_partition_prob[ctx], 0);
     this_rd = RDCOST(x->rdmult, x->rddiv, *rate, *dist);
     tmp_eob = p->eobs[block];
   }
 
-  if (tx_size > TX_4X4 && depth < 2) {
+  if (tx_size > TX_4X4 && depth < MAX_VARTX_DEPTH) {
     BLOCK_SIZE bsize = txsize_to_bsize[tx_size];
     int bsl = b_height_log2_lookup[bsize];
     int sub_step = num_4x4_blocks_txsize_lookup[tx_size - 1];