Commit 0c70a80f authored by Jingning Han's avatar Jingning Han

Make txfm block partition context support rectangular blocks

Make the transform block partition context model support the
rectangular transform block size partition. The coding gains
from cb4x4 and var-tx are:
          cb4x4 + var-tx
lowres         4.3%
midres         2.6%

Change-Id: I6cc1413fbf6d7707ca7fd24300623a3f0118be7c
parent cefb4094
......@@ -815,6 +815,17 @@ static INLINE int txfm_partition_context(TXFM_CONTEXT *above_ctx,
TX_SIZE max_tx_size = max_txsize_lookup[bsize];
int category = TXFM_PARTITION_CONTEXTS - 1;
// dummy return, not used by others.
if (tx_size <= TX_4X4) return 0;
switch (AOMMAX(block_size_wide[bsize], block_size_high[bsize])) {
case 64:
case 32: max_tx_size = TX_32X32; break;
case 16: max_tx_size = TX_16X16; break;
case 8: max_tx_size = TX_8X8; break;
default: assert(0);
}
if (max_tx_size >= TX_8X8) {
category = (tx_size != max_tx_size && max_tx_size > TX_8X8) +
(TX_SIZES - 1 - max_tx_size) * 2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment