Commit ff5e2098 authored by hui su's avatar hui su Committed by Hui Su

rect-tx/ext-tx: fix an assertion fail

Fix an assertion fail in rd_pick_intra_sub_8x8_y_subblock_mode().

BUG=aomedia:410

Change-Id: I22d4aaea0566336605230e09d9590bc235719685
parent 4d8b8f49
......@@ -2690,7 +2690,10 @@ static int64_t rd_pick_intra_sub_8x8_y_subblock_mode(
assert(bsize < BLOCK_8X8);
assert(tx_width < 8 || tx_height < 8);
#if CONFIG_EXT_TX && CONFIG_RECT_TX
assert(tx_width == pred_block_width && tx_height == pred_block_height);
if (is_lossless)
assert(tx_width == 4 && tx_height == 4);
else
assert(tx_width == pred_block_width && tx_height == pred_block_height);
#else
assert(tx_width == 4 && tx_height == 4);
#endif // CONFIG_EXT_TX && CONFIG_RECT_TX
......@@ -3227,7 +3230,6 @@ static int64_t rd_pick_intra_sub_8x8_y_mode(const AV1_COMP *const cpi,
bmode_costs = cpi->y_mode_costs[A][L];
}
this_rd = rd_pick_intra_sub_8x8_y_subblock_mode(
cpi, mb, idy, idx, &best_mode, bmode_costs,
xd->plane[0].above_context + idx, xd->plane[0].left_context + idy, &r,
......
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