Commit ff37c1a5 authored by Hui Su's avatar Hui Su Committed by Yaowu Xu
Browse files

Resolve a confilict between intrabc and var-tx

Intrabc is counted as inter mode, but it doesn't support var-tx yet.
This patch skips tx partition info update for intrabc blocks. It
resolves a decoder crash issue.

Change-Id: I97e413e4a837ba6510e110347f5aa6e5fd14dcc5
parent ba9dd8a6
......@@ -5975,6 +5975,10 @@ static void update_txfm_count(MACROBLOCK *x, MACROBLOCKD *xd,
static void tx_partition_count_update(const AV1_COMMON *const cm, MACROBLOCK *x,
BLOCK_SIZE plane_bsize, int mi_row,
int mi_col, FRAME_COUNTS *td_counts) {
// Intrabc doesn't support var-tx yet. So no need to update tx partition info.
if (is_intrabc_block(&x->e_mbd.mi[0]->mbmi)) return;
MACROBLOCKD *xd = &x->e_mbd;
const int mi_width = block_size_wide[plane_bsize] >> tx_size_wide_log2[0];
const int mi_height = block_size_high[plane_bsize] >> tx_size_wide_log2[0];
Supports Markdown
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