Unify FWD_TXFM_PARAM and INV_TXFM_PARAM
Change two similar structs, FWD_TXFM_PARAM and INV_TXFM_PARAM,
into a common struct: TxfmParam. Its definition is moved to
aom_dsp/txfm_common.h to simplify dependency.
This change is made so that, in later changes of the LGT
experiment, functions requiring FWD_TXFM_PARAM and
INV_TXFM_PARAM, such as get_fwd_lgt4 and get_inv_lgt4, can
also be unified.
Change-Id: I756b0176a02314005060adbf8e62386f10eeb344
diff --git a/av1/encoder/hybrid_fwd_txfm.c b/av1/encoder/hybrid_fwd_txfm.c
index bc5b976..1e53c63 100644
--- a/av1/encoder/hybrid_fwd_txfm.c
+++ b/av1/encoder/hybrid_fwd_txfm.c
@@ -18,7 +18,7 @@
#if CONFIG_CHROMA_2X2
static void fwd_txfm_2x2(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
tran_high_t a1 = src_diff[0];
tran_high_t b1 = src_diff[1];
tran_high_t c1 = src_diff[diff_stride];
@@ -39,145 +39,144 @@
coeff[2] = (tran_low_t)(4 * c1);
coeff[3] = (tran_low_t)(4 * d1);
- (void)fwd_txfm_param;
+ (void)txfm_param;
}
#endif
static void fwd_txfm_4x4(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
- if (fwd_txfm_param->lossless) {
- assert(fwd_txfm_param->tx_type == DCT_DCT);
+ int diff_stride, TxfmParam *txfm_param) {
+ if (txfm_param->lossless) {
+ assert(txfm_param->tx_type == DCT_DCT);
av1_fwht4x4(src_diff, coeff, diff_stride);
return;
}
#if CONFIG_LGT
// only C version has LGTs
- av1_fht4x4_c(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht4x4_c(src_diff, coeff, diff_stride, txfm_param);
#else
- av1_fht4x4(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht4x4(src_diff, coeff, diff_stride, txfm_param);
#endif
}
static void fwd_txfm_4x8(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
#if CONFIG_LGT
- av1_fht4x8_c(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht4x8_c(src_diff, coeff, diff_stride, txfm_param);
#else
- av1_fht4x8(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht4x8(src_diff, coeff, diff_stride, txfm_param);
#endif
}
static void fwd_txfm_8x4(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
#if CONFIG_LGT
- av1_fht8x4_c(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht8x4_c(src_diff, coeff, diff_stride, txfm_param);
#else
- av1_fht8x4(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht8x4(src_diff, coeff, diff_stride, txfm_param);
#endif
}
static void fwd_txfm_8x16(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
#if CONFIG_LGT
- av1_fht8x16_c(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht8x16_c(src_diff, coeff, diff_stride, txfm_param);
#else
- av1_fht8x16(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht8x16(src_diff, coeff, diff_stride, txfm_param);
#endif
}
static void fwd_txfm_16x8(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
#if CONFIG_LGT
- av1_fht16x8_c(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht16x8_c(src_diff, coeff, diff_stride, txfm_param);
#else
- av1_fht16x8(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht16x8(src_diff, coeff, diff_stride, txfm_param);
#endif
}
static void fwd_txfm_16x32(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
- av1_fht16x32(src_diff, coeff, diff_stride, fwd_txfm_param);
+ int diff_stride, TxfmParam *txfm_param) {
+ av1_fht16x32(src_diff, coeff, diff_stride, txfm_param);
}
static void fwd_txfm_32x16(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
- av1_fht32x16(src_diff, coeff, diff_stride, fwd_txfm_param);
+ int diff_stride, TxfmParam *txfm_param) {
+ av1_fht32x16(src_diff, coeff, diff_stride, txfm_param);
}
static void fwd_txfm_8x8(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
#if CONFIG_LGT
- av1_fht8x8_c(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht8x8_c(src_diff, coeff, diff_stride, txfm_param);
#else
- av1_fht8x8(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht8x8(src_diff, coeff, diff_stride, txfm_param);
#endif
}
static void fwd_txfm_16x16(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
- av1_fht16x16(src_diff, coeff, diff_stride, fwd_txfm_param);
+ int diff_stride, TxfmParam *txfm_param) {
+ av1_fht16x16(src_diff, coeff, diff_stride, txfm_param);
}
static void fwd_txfm_32x32(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
- av1_fht32x32(src_diff, coeff, diff_stride, fwd_txfm_param);
+ int diff_stride, TxfmParam *txfm_param) {
+ av1_fht32x32(src_diff, coeff, diff_stride, txfm_param);
}
#if CONFIG_TX64X64
static void fwd_txfm_64x64(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
#if CONFIG_EXT_TX
- if (fwd_txfm_param->tx_type == IDTX)
- av1_fwd_idtx_c(src_diff, coeff, diff_stride, 64, fwd_txfm_param->tx_type);
+ if (txfm_param->tx_type == IDTX)
+ av1_fwd_idtx_c(src_diff, coeff, diff_stride, 64, txfm_param->tx_type);
else
#endif
- av1_fht64x64(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht64x64(src_diff, coeff, diff_stride, txfm_param);
}
#endif // CONFIG_TX64X64
#if CONFIG_EXT_TX && CONFIG_RECT_TX && CONFIG_RECT_TX_EXT
static void fwd_txfm_16x4(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
#if CONFIG_LGT
- av1_fht16x4_c(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht16x4_c(src_diff, coeff, diff_stride, txfm_param);
#else
- av1_fht16x4(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht16x4(src_diff, coeff, diff_stride, txfm_param);
#endif
}
static void fwd_txfm_4x16(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
#if CONFIG_LGT
- av1_fht4x16_c(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht4x16_c(src_diff, coeff, diff_stride, txfm_param);
#else
- av1_fht4x16(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht4x16(src_diff, coeff, diff_stride, txfm_param);
#endif
}
static void fwd_txfm_32x8(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
#if CONFIG_LGT
- av1_fht32x8_c(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht32x8_c(src_diff, coeff, diff_stride, txfm_param);
#else
- av1_fht32x8(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht32x8(src_diff, coeff, diff_stride, txfm_param);
#endif
}
static void fwd_txfm_8x32(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
#if CONFIG_LGT
- av1_fht8x32_c(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht8x32_c(src_diff, coeff, diff_stride, txfm_param);
#else
- av1_fht8x32(src_diff, coeff, diff_stride, fwd_txfm_param);
+ av1_fht8x32(src_diff, coeff, diff_stride, txfm_param);
#endif
}
#endif // CONFIG_EXT_TX && CONFIG_RECT_TX && CONFIG_RECT_TX_EXT
#if CONFIG_CHROMA_2X2
static void highbd_fwd_txfm_2x2(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
tran_high_t a1 = src_diff[0];
tran_high_t b1 = src_diff[1];
tran_high_t c1 = src_diff[diff_stride];
@@ -198,17 +197,16 @@
coeff[2] = (tran_low_t)(4 * c1);
coeff[3] = (tran_low_t)(4 * d1);
- (void)fwd_txfm_param;
+ (void)txfm_param;
}
#endif
static void highbd_fwd_txfm_4x4(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
int32_t *dst_coeff = (int32_t *)coeff;
- const int tx_type = fwd_txfm_param->tx_type;
- const int bd = fwd_txfm_param->bd;
- if (fwd_txfm_param->lossless) {
+ const int tx_type = txfm_param->tx_type;
+ const int bd = txfm_param->bd;
+ if (txfm_param->lossless) {
assert(tx_type == DCT_DCT);
av1_highbd_fwht4x4(src_diff, coeff, diff_stride);
return;
@@ -247,59 +245,52 @@
}
static void highbd_fwd_txfm_4x8(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
int32_t *dst_coeff = (int32_t *)coeff;
- av1_fwd_txfm2d_4x8_c(src_diff, dst_coeff, diff_stride,
- fwd_txfm_param->tx_type, fwd_txfm_param->bd);
+ av1_fwd_txfm2d_4x8_c(src_diff, dst_coeff, diff_stride, txfm_param->tx_type,
+ txfm_param->bd);
}
static void highbd_fwd_txfm_8x4(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
int32_t *dst_coeff = (int32_t *)coeff;
- av1_fwd_txfm2d_8x4_c(src_diff, dst_coeff, diff_stride,
- fwd_txfm_param->tx_type, fwd_txfm_param->bd);
+ av1_fwd_txfm2d_8x4_c(src_diff, dst_coeff, diff_stride, txfm_param->tx_type,
+ txfm_param->bd);
}
static void highbd_fwd_txfm_8x16(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
int32_t *dst_coeff = (int32_t *)coeff;
- av1_fwd_txfm2d_8x16_c(src_diff, dst_coeff, diff_stride,
- fwd_txfm_param->tx_type, fwd_txfm_param->bd);
+ av1_fwd_txfm2d_8x16_c(src_diff, dst_coeff, diff_stride, txfm_param->tx_type,
+ txfm_param->bd);
}
static void highbd_fwd_txfm_16x8(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
int32_t *dst_coeff = (int32_t *)coeff;
- av1_fwd_txfm2d_16x8_c(src_diff, dst_coeff, diff_stride,
- fwd_txfm_param->tx_type, fwd_txfm_param->bd);
+ av1_fwd_txfm2d_16x8_c(src_diff, dst_coeff, diff_stride, txfm_param->tx_type,
+ txfm_param->bd);
}
static void highbd_fwd_txfm_16x32(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
int32_t *dst_coeff = (int32_t *)coeff;
- av1_fwd_txfm2d_16x32_c(src_diff, dst_coeff, diff_stride,
- fwd_txfm_param->tx_type, fwd_txfm_param->bd);
+ av1_fwd_txfm2d_16x32_c(src_diff, dst_coeff, diff_stride, txfm_param->tx_type,
+ txfm_param->bd);
}
static void highbd_fwd_txfm_32x16(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
int32_t *dst_coeff = (int32_t *)coeff;
- av1_fwd_txfm2d_32x16_c(src_diff, dst_coeff, diff_stride,
- fwd_txfm_param->tx_type, fwd_txfm_param->bd);
+ av1_fwd_txfm2d_32x16_c(src_diff, dst_coeff, diff_stride, txfm_param->tx_type,
+ txfm_param->bd);
}
static void highbd_fwd_txfm_8x8(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
int32_t *dst_coeff = (int32_t *)coeff;
- const int tx_type = fwd_txfm_param->tx_type;
- const int bd = fwd_txfm_param->bd;
+ const int tx_type = txfm_param->tx_type;
+ const int bd = txfm_param->bd;
switch (tx_type) {
case DCT_DCT:
case ADST_DCT:
@@ -334,11 +325,10 @@
}
static void highbd_fwd_txfm_16x16(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
int32_t *dst_coeff = (int32_t *)coeff;
- const int tx_type = fwd_txfm_param->tx_type;
- const int bd = fwd_txfm_param->bd;
+ const int tx_type = txfm_param->tx_type;
+ const int bd = txfm_param->bd;
switch (tx_type) {
case DCT_DCT:
case ADST_DCT:
@@ -373,11 +363,10 @@
}
static void highbd_fwd_txfm_32x32(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
int32_t *dst_coeff = (int32_t *)coeff;
- const int tx_type = fwd_txfm_param->tx_type;
- const int bd = fwd_txfm_param->bd;
+ const int tx_type = txfm_param->tx_type;
+ const int bd = txfm_param->bd;
switch (tx_type) {
case DCT_DCT:
case ADST_DCT:
@@ -413,11 +402,10 @@
#if CONFIG_TX64X64
static void highbd_fwd_txfm_64x64(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ int diff_stride, TxfmParam *txfm_param) {
int32_t *dst_coeff = (int32_t *)coeff;
- const int tx_type = fwd_txfm_param->tx_type;
- const int bd = fwd_txfm_param->bd;
+ const int tx_type = txfm_param->tx_type;
+ const int bd = txfm_param->bd;
switch (tx_type) {
case DCT_DCT:
av1_fwd_txfm2d_64x64(src_diff, dst_coeff, diff_stride, tx_type, bd);
@@ -455,61 +443,51 @@
#endif // CONFIG_TX64X64
void av1_fwd_txfm(const int16_t *src_diff, tran_low_t *coeff, int diff_stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
- const TX_SIZE tx_size = fwd_txfm_param->tx_size;
+ TxfmParam *txfm_param) {
+ const TX_SIZE tx_size = txfm_param->tx_size;
switch (tx_size) {
#if CONFIG_TX64X64
case TX_64X64:
- fwd_txfm_64x64(src_diff, coeff, diff_stride, fwd_txfm_param);
+ fwd_txfm_64x64(src_diff, coeff, diff_stride, txfm_param);
break;
#endif // CONFIG_TX64X64
case TX_32X32:
- fwd_txfm_32x32(src_diff, coeff, diff_stride, fwd_txfm_param);
+ fwd_txfm_32x32(src_diff, coeff, diff_stride, txfm_param);
break;
case TX_16X16:
- fwd_txfm_16x16(src_diff, coeff, diff_stride, fwd_txfm_param);
+ fwd_txfm_16x16(src_diff, coeff, diff_stride, txfm_param);
break;
- case TX_8X8:
- fwd_txfm_8x8(src_diff, coeff, diff_stride, fwd_txfm_param);
- break;
- case TX_4X8:
- fwd_txfm_4x8(src_diff, coeff, diff_stride, fwd_txfm_param);
- break;
- case TX_8X4:
- fwd_txfm_8x4(src_diff, coeff, diff_stride, fwd_txfm_param);
- break;
+ case TX_8X8: fwd_txfm_8x8(src_diff, coeff, diff_stride, txfm_param); break;
+ case TX_4X8: fwd_txfm_4x8(src_diff, coeff, diff_stride, txfm_param); break;
+ case TX_8X4: fwd_txfm_8x4(src_diff, coeff, diff_stride, txfm_param); break;
case TX_8X16:
- fwd_txfm_8x16(src_diff, coeff, diff_stride, fwd_txfm_param);
+ fwd_txfm_8x16(src_diff, coeff, diff_stride, txfm_param);
break;
case TX_16X8:
- fwd_txfm_16x8(src_diff, coeff, diff_stride, fwd_txfm_param);
+ fwd_txfm_16x8(src_diff, coeff, diff_stride, txfm_param);
break;
case TX_16X32:
- fwd_txfm_16x32(src_diff, coeff, diff_stride, fwd_txfm_param);
+ fwd_txfm_16x32(src_diff, coeff, diff_stride, txfm_param);
break;
case TX_32X16:
- fwd_txfm_32x16(src_diff, coeff, diff_stride, fwd_txfm_param);
+ fwd_txfm_32x16(src_diff, coeff, diff_stride, txfm_param);
break;
- case TX_4X4:
- fwd_txfm_4x4(src_diff, coeff, diff_stride, fwd_txfm_param);
- break;
+ case TX_4X4: fwd_txfm_4x4(src_diff, coeff, diff_stride, txfm_param); break;
#if CONFIG_CHROMA_2X2
- case TX_2X2:
- fwd_txfm_2x2(src_diff, coeff, diff_stride, fwd_txfm_param);
- break;
+ case TX_2X2: fwd_txfm_2x2(src_diff, coeff, diff_stride, txfm_param); break;
#endif
#if CONFIG_EXT_TX && CONFIG_RECT_TX && CONFIG_RECT_TX_EXT
case TX_4X16:
- fwd_txfm_4x16(src_diff, coeff, diff_stride, fwd_txfm_param);
+ fwd_txfm_4x16(src_diff, coeff, diff_stride, txfm_param);
break;
case TX_16X4:
- fwd_txfm_16x4(src_diff, coeff, diff_stride, fwd_txfm_param);
+ fwd_txfm_16x4(src_diff, coeff, diff_stride, txfm_param);
break;
case TX_8X32:
- fwd_txfm_8x32(src_diff, coeff, diff_stride, fwd_txfm_param);
+ fwd_txfm_8x32(src_diff, coeff, diff_stride, txfm_param);
break;
case TX_32X8:
- fwd_txfm_32x8(src_diff, coeff, diff_stride, fwd_txfm_param);
+ fwd_txfm_32x8(src_diff, coeff, diff_stride, txfm_param);
break;
#endif // CONFIG_EXT_TX && CONFIG_RECT_TX && CONFIG_RECT_TX_EXT
default: assert(0); break;
@@ -517,47 +495,47 @@
}
void av1_highbd_fwd_txfm(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
- const TX_SIZE tx_size = fwd_txfm_param->tx_size;
+ int diff_stride, TxfmParam *txfm_param) {
+ const TX_SIZE tx_size = txfm_param->tx_size;
switch (tx_size) {
#if CONFIG_TX64X64
case TX_64X64:
- highbd_fwd_txfm_64x64(src_diff, coeff, diff_stride, fwd_txfm_param);
+ highbd_fwd_txfm_64x64(src_diff, coeff, diff_stride, txfm_param);
break;
#endif // CONFIG_TX64X64
case TX_32X32:
- highbd_fwd_txfm_32x32(src_diff, coeff, diff_stride, fwd_txfm_param);
+ highbd_fwd_txfm_32x32(src_diff, coeff, diff_stride, txfm_param);
break;
case TX_16X16:
- highbd_fwd_txfm_16x16(src_diff, coeff, diff_stride, fwd_txfm_param);
+ highbd_fwd_txfm_16x16(src_diff, coeff, diff_stride, txfm_param);
break;
case TX_8X8:
- highbd_fwd_txfm_8x8(src_diff, coeff, diff_stride, fwd_txfm_param);
+ highbd_fwd_txfm_8x8(src_diff, coeff, diff_stride, txfm_param);
break;
case TX_4X8:
- highbd_fwd_txfm_4x8(src_diff, coeff, diff_stride, fwd_txfm_param);
+ highbd_fwd_txfm_4x8(src_diff, coeff, diff_stride, txfm_param);
break;
case TX_8X4:
- highbd_fwd_txfm_8x4(src_diff, coeff, diff_stride, fwd_txfm_param);
+ highbd_fwd_txfm_8x4(src_diff, coeff, diff_stride, txfm_param);
break;
case TX_8X16:
- highbd_fwd_txfm_8x16(src_diff, coeff, diff_stride, fwd_txfm_param);
+ highbd_fwd_txfm_8x16(src_diff, coeff, diff_stride, txfm_param);
break;
case TX_16X8:
- highbd_fwd_txfm_16x8(src_diff, coeff, diff_stride, fwd_txfm_param);
+ highbd_fwd_txfm_16x8(src_diff, coeff, diff_stride, txfm_param);
break;
case TX_16X32:
- highbd_fwd_txfm_16x32(src_diff, coeff, diff_stride, fwd_txfm_param);
+ highbd_fwd_txfm_16x32(src_diff, coeff, diff_stride, txfm_param);
break;
case TX_32X16:
- highbd_fwd_txfm_32x16(src_diff, coeff, diff_stride, fwd_txfm_param);
+ highbd_fwd_txfm_32x16(src_diff, coeff, diff_stride, txfm_param);
break;
case TX_4X4:
- highbd_fwd_txfm_4x4(src_diff, coeff, diff_stride, fwd_txfm_param);
+ highbd_fwd_txfm_4x4(src_diff, coeff, diff_stride, txfm_param);
break;
#if CONFIG_CHROMA_2X2
case TX_2X2:
- highbd_fwd_txfm_2x2(src_diff, coeff, diff_stride, fwd_txfm_param);
+ highbd_fwd_txfm_2x2(src_diff, coeff, diff_stride, txfm_param);
break;
#endif
default: assert(0); break;
