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

A bug fix for var-tx

Browse Source 
Fixes a crash with supertx, ext-tx and rect-tx

Change-Id: I6b5f4cfd6e209558541a791be685b55156aa0138
This commit is contained in:
Debargha Mukherjee
2016-10-05 00:48:28 -07:00
parent cb603790b0
commit 28d924b7b8
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
av1/encoder/encodeframe.c
View File

@@ -1304,10 +1304,13 @@ static void update_state_supertx(AV1_COMP *cpi, ThreadData *td,
#if CONFIG_VAR_TX #if CONFIG_VAR_TX
{ {
const TX_SIZE mtx = mbmi->tx_size; const TX_SIZE mtx = mbmi->tx_size;
const int num_4x4_blocks_wide = num_4x4_blocks_wide_txsize_lookup[mtx] >> 1;
const int num_4x4_blocks_high = num_4x4_blocks_high_txsize_lookup[mtx] >> 1;
int idy, idx; int idy, idx;
for (idy = 0; idy < (1 << mtx) / 2; ++idy) mbmi->inter_tx_size[0][0] = mtx;
for (idx = 0; idx < (1 << mtx) / 2; ++idx) for (idy = 0; idy < num_4x4_blocks_high; ++idy)
mbmi->inter_tx_size[idy][idx] = mbmi->tx_size; for (idx = 0; idx < num_4x4_blocks_wide; ++idx)
mbmi->inter_tx_size[idy][idx] = mtx;
} }
#endif // CONFIG_VAR_TX #endif // CONFIG_VAR_TX
// Turn motion variation off for supertx // Turn motion variation off for supertx

3
av1/encoder/rdopt.c
View File

@@ -3321,7 +3321,7 @@ static void select_tx_type_yrd(const AV1_COMP *cpi, MACROBLOCK *x, int *rate,
TX_TYPE tx_type, best_tx_type = DCT_DCT; TX_TYPE tx_type, best_tx_type = DCT_DCT;
const int is_inter = is_inter_block(mbmi); const int is_inter = is_inter_block(mbmi);
TX_SIZE best_tx_size[MAX_MIB_SIZE][MAX_MIB_SIZE]; TX_SIZE best_tx_size[MAX_MIB_SIZE][MAX_MIB_SIZE];
TX_SIZE best_tx = TX_SIZES; TX_SIZE best_tx = max_txsize_lookup[bsize];
uint8_t best_blk_skip[MAX_MIB_SIZE * MAX_MIB_SIZE * 4]; uint8_t best_blk_skip[MAX_MIB_SIZE * MAX_MIB_SIZE * 4];
const int n4 = 1 << (num_pels_log2_lookup[bsize] - 4); const int n4 = 1 << (num_pels_log2_lookup[bsize] - 4);
int idx, idy; int idx, idy;
@@ -7707,6 +7707,7 @@ static int64_t handle_inter_mode(
} else { } else {
x->skip = 1; x->skip = 1;
*disable_skip = 1; *disable_skip = 1;
mbmi->tx_size = tx_size_from_tx_mode(bsize, cm->tx_mode, 1);
// The cost of skip bit needs to be added. // The cost of skip bit needs to be added.
#if CONFIG_OBMC || CONFIG_WARPED_MOTION #if CONFIG_OBMC || CONFIG_WARPED_MOTION