commit 3daa4fda6cb0b77515fcbc15f6755a7dac32fc17
author Jingning Han <jingning@google.com> Fri Jan 20 10:33:50 2017 -0800
committer Jingning Han <jingning@google.com> Sat Jan 21 21:04:27 2017 +0000
tree a6a9c1fa14133535b289604d5d2b3e0da7dc9783
parent 9303b941d86a30e653bab2769ecfae7f1cc24f26

Support rectangular tx size in cb4x4 mode

This commit makes ext-tx and rect-tx experiments supported in the
cb4x4 mode. It resolves an enc/dec mismatch issue when all the
transform experiments are enabled.

The coding gains are
        ext-tx + rect-tx   cb4x4    vartx     total
lowres      4.0%           2.3%      0.5%     6.9%

The encoding speed is about the same when cb4x4 and vartx are
further enabled.

BUG=aomedia:139

Change-Id: I3fdabc6d5de23ceb78ac0751a9bf7332ebc0a3ac

av1/common/pred_common.h

diff --git a/av1/common/pred_common.h b/av1/common/pred_common.h
index 75948b6..7825f3c 100644
--- a/av1/common/pred_common.h
+++ b/av1/common/pred_common.h
@@ -184,7 +184,7 @@
   int left_ctx = (has_left && !left_mbmi->skip)
                      ? (int)txsize_sqr_map[left_mbmi->tx_size]
                      : max_tx_size;
-  assert(xd->mi[0]->mbmi.sb_type >= BLOCK_8X8);
+
   if (!has_left) left_ctx = above_ctx;
 
   if (!has_above) above_ctx = left_ctx;