Commit 2511c661 authored by Jingning Han's avatar Jingning Han

Refactor supertx decoding context

Use table access to replace integer to enum conversion.

Change-Id: Idb3e7e2e3267bccf322cffbe4bfaa969e9018296
parent feb517c8
...@@ -766,12 +766,7 @@ static void dec_predict_b_extend( ...@@ -766,12 +766,7 @@ static void dec_predict_b_extend(
if (has_second_ref(&xd->mi[0]->mbmi)) if (has_second_ref(&xd->mi[0]->mbmi))
set_ref(cm, xd, 1, mi_row_pred, mi_col_pred); set_ref(cm, xd, 1, mi_row_pred, mi_col_pred);
if (!bextend) { if (!bextend) mbmi->tx_size = max_txsize_lookup[bsize_top];
mbmi->tx_size = b_width_log2_lookup[bsize_top];
#if CONFIG_CB4X4
++mbmi->tx_size;
#endif
}
xd->plane[0].dst.stride = dst_stride[0]; xd->plane[0].dst.stride = dst_stride[0];
xd->plane[1].dst.stride = dst_stride[1]; xd->plane[1].dst.stride = dst_stride[1];
...@@ -1772,7 +1767,7 @@ static void decode_partition(AV1Decoder *const pbi, MACROBLOCKD *const xd, ...@@ -1772,7 +1767,7 @@ static void decode_partition(AV1Decoder *const pbi, MACROBLOCKD *const xd,
#if CONFIG_SUPERTX #if CONFIG_SUPERTX
const int read_token = !supertx_enabled; const int read_token = !supertx_enabled;
int skip = 0; int skip = 0;
TX_SIZE supertx_size = b_width_log2_lookup[bsize] + CONFIG_CB4X4; TX_SIZE supertx_size = max_txsize_lookup[bsize];
const TileInfo *const tile = &xd->tile; const TileInfo *const tile = &xd->tile;
int txfm = DCT_DCT; int txfm = DCT_DCT;
#endif // CONFIG_SUPERTX #endif // CONFIG_SUPERTX
......
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