Commit d0058f6f authored by Sebastien Alaiwan's avatar Sebastien Alaiwan
Browse files

Simplify txmg

Change-Id: Ieb40253c3a0dcb81fc068fa41e23c867bddef22a
parent 83e5f377
......@@ -472,12 +472,16 @@ static AV1_QUANT_FACADE
{ NULL, NULL }
};
#if !CONFIG_TXMG
typedef void (*fwdTxfmFunc)(const int16_t *diff, tran_low_t *coeff, int stride,
TxfmParam *txfm_param);
static const fwdTxfmFunc fwd_txfm_func[2] = { av1_fwd_txfm,
av1_highbd_fwd_txfm };
static const fwdTxfmFunc fwd_txfm_func[2] = {
#if CONFIG_TXMG
av1_highbd_fwd_txfm,
#else
av1_fwd_txfm,
#endif
av1_highbd_fwd_txfm,
};
void av1_xform_quant(const AV1_COMMON *cm, MACROBLOCK *x, int plane, int block,
int blk_row, int blk_col, BLOCK_SIZE plane_bsize,
......@@ -541,11 +545,7 @@ void av1_xform_quant(const AV1_COMMON *cm, MACROBLOCK *x, int plane, int block,
txfm_param.bd = xd->bd;
txfm_param.is_hbd = get_bitdepth_data_path_index(xd);
#if CONFIG_TXMG
av1_highbd_fwd_txfm(src_diff, coeff, diff_stride, &txfm_param);
#else // CONFIG_TXMG
fwd_txfm_func[txfm_param.is_hbd](src_diff, coeff, diff_stride, &txfm_param);
#endif // CONFIG_TXMG
if (xform_quant_idx != AV1_XFORM_QUANT_SKIP_QUANT) {
const int n_coeffs = av1_get_max_eob(tx_size);
......
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