generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make RECT_TX(>=8x8) work with VAR_TX

Browse Source 
Bitstream syntax:
For a rectangular inter block, 'rect_tx' flag is sent to indicate if
the biggest rect tx is used. If no, continue to decode regular
recursive tx partition.

Change-Id: I127e35cc619b65acb5e9a0717f399cdcdb73fbf0
This commit is contained in:
Yue Chen
2016-08-29 17:29:33 -07:00
parent 5ebdf40d77
commit a1e48dccf2
9 changed files with 242 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
av1/encoder/encodemb.c
View File

@@ -791,7 +791,7 @@ static void encode_block(int plane, int block, int blk_row, int blk_col,
#endif
#if CONFIG_VAR_TX
// Assert not magic number (uninitialised).
// Assert not magic number (uninitialized).
assert(x->blk_skip[plane][(blk_row << bwl) + blk_col] != 234);
if (x->blk_skip[plane][(blk_row << bwl) + blk_col] == 0) {
@@ -976,9 +976,6 @@ void av1_encode_sb(MACROBLOCK *x, BLOCK_SIZE bsize) {
int idx, idy;
int block = 0;
int step = num_4x4_blocks_txsize_lookup[max_tx_size];
#if CONFIG_EXT_TX && CONFIG_RECT_TX
const TX_SIZE tx_size = plane ? get_uv_tx_size(mbmi, pd) : mbmi->tx_size;
#endif
av1_get_entropy_contexts(bsize, TX_4X4, pd, ctx.ta[plane], ctx.tl[plane]);
#else
const struct macroblockd_plane *const pd = &xd->plane[plane];
@@ -991,7 +988,7 @@ void av1_encode_sb(MACROBLOCK *x, BLOCK_SIZE bsize) {
#if CONFIG_VAR_TX
#if CONFIG_EXT_TX && CONFIG_RECT_TX
if (tx_size >= TX_SIZES) {
if (is_rect_tx(mbmi->tx_size)) {
av1_foreach_transformed_block_in_plane(xd, bsize, plane, encode_block,
&arg);
} else {