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/dct.c b/av1/encoder/dct.c
index e9d166c..c989d49 100644
--- a/av1/encoder/dct.c
+++ b/av1/encoder/dct.c
@@ -1064,23 +1064,23 @@
}
// The get_fwd_lgt functions return 1 if LGT is chosen to apply, and 0 otherwise
-int get_fwd_lgt4(transform_1d tx_orig, FWD_TXFM_PARAM *fwd_txfm_param,
+int get_fwd_lgt4(transform_1d tx_orig, TxfmParam *txfm_param,
const tran_high_t *lgtmtx[], int ntx) {
// inter/intra split
if (tx_orig == &fadst4) {
for (int i = 0; i < ntx; ++i)
- lgtmtx[i] = fwd_txfm_param->is_inter ? &lgt4_170[0][0] : &lgt4_140[0][0];
+ lgtmtx[i] = txfm_param->is_inter ? &lgt4_170[0][0] : &lgt4_140[0][0];
return 1;
}
return 0;
}
-int get_fwd_lgt8(transform_1d tx_orig, FWD_TXFM_PARAM *fwd_txfm_param,
+int get_fwd_lgt8(transform_1d tx_orig, TxfmParam *txfm_param,
const tran_high_t *lgtmtx[], int ntx) {
// inter/intra split
if (tx_orig == &fadst8) {
for (int i = 0; i < ntx; ++i)
- lgtmtx[i] = fwd_txfm_param->is_inter ? &lgt8_170[0][0] : &lgt8_150[0][0];
+ lgtmtx[i] = txfm_param->is_inter ? &lgt8_170[0][0] : &lgt8_150[0][0];
return 1;
}
return 0;
@@ -1215,8 +1215,8 @@
#endif // CONFIG_EXT_TX
void av1_fht4x4_c(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
- int tx_type = fwd_txfm_param->tx_type;
+ TxfmParam *txfm_param) {
+ int tx_type = txfm_param->tx_type;
#if CONFIG_DCT_ONLY
assert(tx_type == DCT_DCT);
#endif
@@ -1262,8 +1262,8 @@
// different rows/columns, indicated by the pointers to 2D arrays
const tran_high_t *lgtmtx_col[4];
const tran_high_t *lgtmtx_row[4];
- int use_lgt_col = get_fwd_lgt4(ht.cols, fwd_txfm_param, lgtmtx_col, 4);
- int use_lgt_row = get_fwd_lgt4(ht.rows, fwd_txfm_param, lgtmtx_row, 4);
+ int use_lgt_col = get_fwd_lgt4(ht.cols, txfm_param, lgtmtx_col, 4);
+ int use_lgt_row = get_fwd_lgt4(ht.rows, txfm_param, lgtmtx_row, 4);
#endif
// Columns
@@ -1303,8 +1303,8 @@
}
void av1_fht4x8_c(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
- int tx_type = fwd_txfm_param->tx_type;
+ TxfmParam *txfm_param) {
+ int tx_type = txfm_param->tx_type;
#if CONFIG_DCT_ONLY
assert(tx_type == DCT_DCT);
#endif
@@ -1342,8 +1342,8 @@
#if CONFIG_LGT
const tran_high_t *lgtmtx_col[4];
const tran_high_t *lgtmtx_row[8];
- int use_lgt_col = get_fwd_lgt8(ht.cols, fwd_txfm_param, lgtmtx_col, 4);
- int use_lgt_row = get_fwd_lgt4(ht.rows, fwd_txfm_param, lgtmtx_row, 8);
+ int use_lgt_col = get_fwd_lgt8(ht.cols, txfm_param, lgtmtx_col, 4);
+ int use_lgt_row = get_fwd_lgt4(ht.rows, txfm_param, lgtmtx_row, 8);
#endif
// Rows
@@ -1376,8 +1376,8 @@
}
void av1_fht8x4_c(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
- int tx_type = fwd_txfm_param->tx_type;
+ TxfmParam *txfm_param) {
+ int tx_type = txfm_param->tx_type;
#if CONFIG_DCT_ONLY
assert(tx_type == DCT_DCT);
#endif
@@ -1415,8 +1415,8 @@
#if CONFIG_LGT
const tran_high_t *lgtmtx_col[8];
const tran_high_t *lgtmtx_row[4];
- int use_lgt_col = get_fwd_lgt4(ht.cols, fwd_txfm_param, lgtmtx_col, 8);
- int use_lgt_row = get_fwd_lgt8(ht.rows, fwd_txfm_param, lgtmtx_row, 4);
+ int use_lgt_col = get_fwd_lgt4(ht.cols, txfm_param, lgtmtx_col, 8);
+ int use_lgt_row = get_fwd_lgt8(ht.rows, txfm_param, lgtmtx_row, 4);
#endif
// Columns
@@ -1449,8 +1449,8 @@
}
void av1_fht4x16_c(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
- int tx_type = fwd_txfm_param->tx_type;
+ TxfmParam *txfm_param) {
+ int tx_type = txfm_param->tx_type;
#if CONFIG_DCT_ONLY
assert(tx_type == DCT_DCT);
#endif
@@ -1487,7 +1487,7 @@
#if CONFIG_LGT
const tran_high_t *lgtmtx_row[16];
- int use_lgt_row = get_fwd_lgt4(ht.rows, fwd_txfm_param, lgtmtx_row, 16);
+ int use_lgt_row = get_fwd_lgt4(ht.rows, txfm_param, lgtmtx_row, 16);
#endif
// Rows
@@ -1513,8 +1513,8 @@
}
void av1_fht16x4_c(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
- int tx_type = fwd_txfm_param->tx_type;
+ TxfmParam *txfm_param) {
+ int tx_type = txfm_param->tx_type;
#if CONFIG_DCT_ONLY
assert(tx_type == DCT_DCT);
#endif
@@ -1551,7 +1551,7 @@
#if CONFIG_LGT
const tran_high_t *lgtmtx_col[16];
- int use_lgt_col = get_fwd_lgt4(ht.cols, fwd_txfm_param, lgtmtx_col, 16);
+ int use_lgt_col = get_fwd_lgt4(ht.cols, txfm_param, lgtmtx_col, 16);
#endif
// Columns
@@ -1577,8 +1577,8 @@
}
void av1_fht8x16_c(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
- int tx_type = fwd_txfm_param->tx_type;
+ TxfmParam *txfm_param) {
+ int tx_type = txfm_param->tx_type;
#if CONFIG_DCT_ONLY
assert(tx_type == DCT_DCT);
#endif
@@ -1615,7 +1615,7 @@
#if CONFIG_LGT
const tran_high_t *lgtmtx_row[16];
- int use_lgt_row = get_fwd_lgt8(ht.rows, fwd_txfm_param, lgtmtx_row, 16);
+ int use_lgt_row = get_fwd_lgt8(ht.rows, txfm_param, lgtmtx_row, 16);
#endif
// Rows
@@ -1643,8 +1643,8 @@
}
void av1_fht16x8_c(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
- int tx_type = fwd_txfm_param->tx_type;
+ TxfmParam *txfm_param) {
+ int tx_type = txfm_param->tx_type;
#if CONFIG_DCT_ONLY
assert(tx_type == DCT_DCT);
#endif
@@ -1681,7 +1681,7 @@
#if CONFIG_LGT
const tran_high_t *lgtmtx_col[16];
- int use_lgt_col = get_fwd_lgt8(ht.cols, fwd_txfm_param, lgtmtx_col, 16);
+ int use_lgt_col = get_fwd_lgt8(ht.cols, txfm_param, lgtmtx_col, 16);
#endif
// Columns
@@ -1709,8 +1709,8 @@
}
void av1_fht8x32_c(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
- int tx_type = fwd_txfm_param->tx_type;
+ TxfmParam *txfm_param) {
+ int tx_type = txfm_param->tx_type;
#if CONFIG_DCT_ONLY
assert(tx_type == DCT_DCT);
#endif
@@ -1747,7 +1747,7 @@
#if CONFIG_LGT
const tran_high_t *lgtmtx_row[32];
- int use_lgt_row = get_fwd_lgt8(ht.rows, fwd_txfm_param, lgtmtx_row, 32);
+ int use_lgt_row = get_fwd_lgt8(ht.rows, txfm_param, lgtmtx_row, 32);
#endif
// Rows
@@ -1773,8 +1773,8 @@
}
void av1_fht32x8_c(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
- int tx_type = fwd_txfm_param->tx_type;
+ TxfmParam *txfm_param) {
+ int tx_type = txfm_param->tx_type;
#if CONFIG_DCT_ONLY
assert(tx_type == DCT_DCT);
#endif
@@ -1811,7 +1811,7 @@
#if CONFIG_LGT
const tran_high_t *lgtmtx_col[32];
- int use_lgt_col = get_fwd_lgt8(ht.cols, fwd_txfm_param, lgtmtx_col, 32);
+ int use_lgt_col = get_fwd_lgt8(ht.cols, txfm_param, lgtmtx_col, 32);
#endif
// Columns
@@ -1837,8 +1837,8 @@
}
void av1_fht16x32_c(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
- int tx_type = fwd_txfm_param->tx_type;
+ TxfmParam *txfm_param) {
+ int tx_type = txfm_param->tx_type;
#if CONFIG_DCT_ONLY
assert(tx_type == DCT_DCT);
#endif
@@ -1893,8 +1893,8 @@
}
void av1_fht32x16_c(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
- int tx_type = fwd_txfm_param->tx_type;
+ TxfmParam *txfm_param) {
+ int tx_type = txfm_param->tx_type;
#if CONFIG_DCT_ONLY
assert(tx_type == DCT_DCT);
#endif
@@ -2074,8 +2074,8 @@
}
void av1_fht8x8_c(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
- int tx_type = fwd_txfm_param->tx_type;
+ TxfmParam *txfm_param) {
+ int tx_type = txfm_param->tx_type;
#if CONFIG_DCT_ONLY
assert(tx_type == DCT_DCT);
#endif
@@ -2115,8 +2115,8 @@
#if CONFIG_LGT
const tran_high_t *lgtmtx_col[8];
const tran_high_t *lgtmtx_row[8];
- int use_lgt_col = get_fwd_lgt8(ht.cols, fwd_txfm_param, lgtmtx_col, 8);
- int use_lgt_row = get_fwd_lgt8(ht.rows, fwd_txfm_param, lgtmtx_row, 8);
+ int use_lgt_col = get_fwd_lgt8(ht.cols, txfm_param, lgtmtx_col, 8);
+ int use_lgt_row = get_fwd_lgt8(ht.rows, txfm_param, lgtmtx_row, 8);
#endif
// Columns
@@ -2203,8 +2203,8 @@
}
void av1_fht16x16_c(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
- int tx_type = fwd_txfm_param->tx_type;
+ TxfmParam *txfm_param) {
+ int tx_type = txfm_param->tx_type;
#if CONFIG_DCT_ONLY
assert(tx_type == DCT_DCT);
#endif
@@ -2260,8 +2260,8 @@
}
void av1_fht32x32_c(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
- int tx_type = fwd_txfm_param->tx_type;
+ TxfmParam *txfm_param) {
+ int tx_type = txfm_param->tx_type;
#if CONFIG_DCT_ONLY
assert(tx_type == DCT_DCT);
#endif
@@ -2352,8 +2352,8 @@
}
void av1_fht64x64_c(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
- int tx_type = fwd_txfm_param->tx_type;
+ TxfmParam *txfm_param) {
+ int tx_type = txfm_param->tx_type;
#if CONFIG_DCT_ONLY
assert(tx_type == DCT_DCT);
#endif
diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 6c167fe..b397f73 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -490,7 +490,7 @@
#endif // !CONFIG_PVQ
typedef void (*fwdTxfmFunc)(const int16_t *diff, tran_low_t *coeff, int stride,
- FWD_TXFM_PARAM *param);
+ TxfmParam *txfm_param);
static const fwdTxfmFunc fwd_txfm_func[2] = { av1_fwd_txfm,
av1_highbd_fwd_txfm };
@@ -532,7 +532,7 @@
: cm->giqmatrix[NUM_QM_LEVELS - 1][0][0][tx_size];
#endif
- FWD_TXFM_PARAM fwd_txfm_param;
+ TxfmParam txfm_param;
#if CONFIG_PVQ || CONFIG_DAALA_DIST || CONFIG_LGT
uint8_t *dst;
@@ -623,20 +623,20 @@
(void)ctx;
- fwd_txfm_param.tx_type = tx_type;
- fwd_txfm_param.tx_size = tx_size;
- fwd_txfm_param.lossless = xd->lossless[mbmi->segment_id];
+ txfm_param.tx_type = tx_type;
+ txfm_param.tx_size = tx_size;
+ txfm_param.lossless = xd->lossless[mbmi->segment_id];
#if CONFIG_LGT
- fwd_txfm_param.is_inter = is_inter_block(mbmi);
- fwd_txfm_param.dst = dst;
- fwd_txfm_param.stride = dst_stride;
- fwd_txfm_param.mode = get_prediction_mode(xd->mi[0], plane, tx_size, block);
+ txfm_param.is_inter = is_inter_block(mbmi);
+ txfm_param.dst = dst;
+ txfm_param.stride = dst_stride;
+ txfm_param.mode = get_prediction_mode(xd->mi[0], plane, tx_size, block);
#endif
#if !CONFIG_PVQ
- fwd_txfm_param.bd = xd->bd;
+ txfm_param.bd = xd->bd;
const int is_hbd = get_bitdepth_data_path_index(xd);
- fwd_txfm_func[is_hbd](src_diff, coeff, diff_stride, &fwd_txfm_param);
+ fwd_txfm_func[is_hbd](src_diff, coeff, diff_stride, &txfm_param);
if (xform_quant_idx != AV1_XFORM_QUANT_SKIP_QUANT) {
if (LIKELY(!x->skip_block)) {
@@ -654,14 +654,14 @@
#else // CONFIG_PVQ
(void)xform_quant_idx;
#if CONFIG_HIGHBITDEPTH
- fwd_txfm_param.bd = xd->bd;
+ txfm_param.bd = xd->bd;
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
- av1_highbd_fwd_txfm(src_int16, coeff, diff_stride, &fwd_txfm_param);
- av1_highbd_fwd_txfm(pred, ref_coeff, diff_stride, &fwd_txfm_param);
+ av1_highbd_fwd_txfm(src_int16, coeff, diff_stride, &txfm_param);
+ av1_highbd_fwd_txfm(pred, ref_coeff, diff_stride, &txfm_param);
} else {
#endif
- av1_fwd_txfm(src_int16, coeff, diff_stride, &fwd_txfm_param);
- av1_fwd_txfm(pred, ref_coeff, diff_stride, &fwd_txfm_param);
+ av1_fwd_txfm(src_int16, coeff, diff_stride, &txfm_param);
+ av1_fwd_txfm(pred, ref_coeff, diff_stride, &txfm_param);
#if CONFIG_HIGHBITDEPTH
}
#endif
@@ -827,7 +827,7 @@
struct macroblock_plane *const p = &x->plane[plane];
struct macroblockd_plane *const pd = &xd->plane[plane];
tran_low_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
- INV_TXFM_PARAM inv_txfm_param;
+ TxfmParam txfm_param;
uint8_t *dst;
int ctx = 0;
dst = &pd->dst
@@ -863,21 +863,20 @@
#endif // CONFIG_HIGHBITDEPTH
}
#endif // !CONFIG_PVQ
- inv_txfm_param.bd = xd->bd;
- inv_txfm_param.tx_type = DCT_DCT;
- inv_txfm_param.eob = p->eobs[block];
- inv_txfm_param.lossless = xd->lossless[xd->mi[0]->mbmi.segment_id];
+ txfm_param.bd = xd->bd;
+ txfm_param.tx_type = DCT_DCT;
+ txfm_param.eob = p->eobs[block];
+ txfm_param.lossless = xd->lossless[xd->mi[0]->mbmi.segment_id];
#if CONFIG_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
- av1_highbd_inv_txfm_add_4x4(dqcoeff, dst, pd->dst.stride,
- &inv_txfm_param);
+ av1_highbd_inv_txfm_add_4x4(dqcoeff, dst, pd->dst.stride, &txfm_param);
return;
}
#endif // CONFIG_HIGHBITDEPTH
if (xd->lossless[xd->mi[0]->mbmi.segment_id]) {
- av1_iwht4x4_add(dqcoeff, dst, pd->dst.stride, &inv_txfm_param);
+ av1_iwht4x4_add(dqcoeff, dst, pd->dst.stride, &txfm_param);
} else {
- av1_idct4x4_add(dqcoeff, dst, pd->dst.stride, &inv_txfm_param);
+ av1_idct4x4_add(dqcoeff, dst, pd->dst.stride, &txfm_param);
}
}
}
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;
diff --git a/av1/encoder/hybrid_fwd_txfm.h b/av1/encoder/hybrid_fwd_txfm.h
index 36e7ee2..b25ffb8 100644
--- a/av1/encoder/hybrid_fwd_txfm.h
+++ b/av1/encoder/hybrid_fwd_txfm.h
@@ -19,10 +19,10 @@
#endif
void av1_fwd_txfm(const int16_t *src_diff, tran_low_t *coeff, int diff_stride,
- FWD_TXFM_PARAM *fwd_txfm_param);
+ TxfmParam *txfm_param);
void av1_highbd_fwd_txfm(const int16_t *src_diff, tran_low_t *coeff,
- int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param);
+ int diff_stride, TxfmParam *txfm_param);
#ifdef __cplusplus
} // extern "C"
diff --git a/av1/encoder/x86/dct_intrin_sse2.c b/av1/encoder/x86/dct_intrin_sse2.c
index 656305d..ba6345f 100644
--- a/av1/encoder/x86/dct_intrin_sse2.c
+++ b/av1/encoder/x86/dct_intrin_sse2.c
@@ -14,7 +14,6 @@
#include "./aom_dsp_rtcd.h"
#include "./av1_rtcd.h"
-#include "av1/common/idct.h"
#include "aom_dsp/txfm_common.h"
#include "aom_dsp/x86/fwd_txfm_sse2.h"
#include "aom_dsp/x86/synonyms.h"
@@ -204,9 +203,9 @@
#endif // CONFIG_EXT_TX
void av1_fht4x4_sse2(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ TxfmParam *txfm_param) {
__m128i in[4];
- int tx_type = fwd_txfm_param->tx_type;
+ int tx_type = txfm_param->tx_type;
switch (tx_type) {
case DCT_DCT: aom_fdct4x4_sse2(input, output, stride); break;
@@ -1303,9 +1302,9 @@
#endif // CONFIG_EXT_TX
void av1_fht8x8_sse2(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ TxfmParam *txfm_param) {
__m128i in[8];
- int tx_type = fwd_txfm_param->tx_type;
+ int tx_type = txfm_param->tx_type;
switch (tx_type) {
case DCT_DCT: aom_fdct8x8_sse2(input, output, stride); break;
@@ -2337,9 +2336,9 @@
#endif // CONFIG_EXT_TX
void av1_fht16x16_sse2(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ TxfmParam *txfm_param) {
__m128i in0[16], in1[16];
- int tx_type = fwd_txfm_param->tx_type;
+ int tx_type = txfm_param->tx_type;
switch (tx_type) {
case DCT_DCT:
@@ -2554,9 +2553,9 @@
}
void av1_fht4x8_sse2(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ TxfmParam *txfm_param) {
__m128i in[8];
- int tx_type = fwd_txfm_param->tx_type;
+ int tx_type = txfm_param->tx_type;
switch (tx_type) {
case DCT_DCT:
@@ -2729,9 +2728,9 @@
}
void av1_fht8x4_sse2(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ TxfmParam *txfm_param) {
__m128i in[8];
- int tx_type = fwd_txfm_param->tx_type;
+ int tx_type = txfm_param->tx_type;
switch (tx_type) {
case DCT_DCT:
@@ -2870,9 +2869,9 @@
}
void av1_fht8x16_sse2(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ TxfmParam *txfm_param) {
__m128i in[16];
- int tx_type = fwd_txfm_param->tx_type;
+ int tx_type = txfm_param->tx_type;
__m128i *const t = in; // Alias to top 8x8 sub block
__m128i *const b = in + 8; // Alias to bottom 8x8 sub block
@@ -3052,9 +3051,9 @@
#define col_16x8_rounding row_8x16_rounding
void av1_fht16x8_sse2(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ TxfmParam *txfm_param) {
__m128i in[16];
- int tx_type = fwd_txfm_param->tx_type;
+ int tx_type = txfm_param->tx_type;
__m128i *const l = in; // Alias to left 8x8 sub block
__m128i *const r = in + 8; // Alias to right 8x8 sub block, which we store
@@ -3363,9 +3362,9 @@
// For 16x32, this means the input is a 2x2 grid of such blocks.
// For 32x16, it means the input is a 4x1 grid.
void av1_fht16x32_sse2(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ TxfmParam *txfm_param) {
__m128i intl[16], intr[16], inbl[16], inbr[16];
- int tx_type = fwd_txfm_param->tx_type;
+ int tx_type = txfm_param->tx_type;
switch (tx_type) {
case DCT_DCT:
@@ -3553,9 +3552,9 @@
}
void av1_fht32x16_sse2(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ TxfmParam *txfm_param) {
__m128i in0[16], in1[16], in2[16], in3[16];
- int tx_type = fwd_txfm_param->tx_type;
+ int tx_type = txfm_param->tx_type;
load_buffer_32x16(input, in0, in1, in2, in3, stride, 0, 0);
switch (tx_type) {
@@ -3794,9 +3793,9 @@
}
void av1_fht32x32_sse2(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ TxfmParam *txfm_param) {
__m128i in0[32], in1[32], in2[32], in3[32];
- int tx_type = fwd_txfm_param->tx_type;
+ int tx_type = txfm_param->tx_type;
load_buffer_32x32(input, in0, in1, in2, in3, stride, 0, 0);
switch (tx_type) {
diff --git a/av1/encoder/x86/hybrid_fwd_txfm_avx2.c b/av1/encoder/x86/hybrid_fwd_txfm_avx2.c
index 10a16cf..6e82679 100644
--- a/av1/encoder/x86/hybrid_fwd_txfm_avx2.c
+++ b/av1/encoder/x86/hybrid_fwd_txfm_avx2.c
@@ -14,7 +14,6 @@
#include "./av1_rtcd.h"
#include "./aom_dsp_rtcd.h"
-#include "av1/common/idct.h"
#include "aom_dsp/x86/fwd_txfm_avx2.h"
#include "aom_dsp/txfm_common.h"
#include "aom_dsp/x86/txfm_common_avx2.h"
@@ -915,9 +914,9 @@
#endif
void av1_fht16x16_avx2(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ TxfmParam *txfm_param) {
__m256i in[16];
- int tx_type = fwd_txfm_param->tx_type;
+ int tx_type = txfm_param->tx_type;
switch (tx_type) {
case DCT_DCT:
@@ -1511,10 +1510,10 @@
#endif
void av1_fht32x32_avx2(const int16_t *input, tran_low_t *output, int stride,
- FWD_TXFM_PARAM *fwd_txfm_param) {
+ TxfmParam *txfm_param) {
__m256i in0[32]; // left 32 columns
__m256i in1[32]; // right 32 columns
- int tx_type = fwd_txfm_param->tx_type;
+ int tx_type = txfm_param->tx_type;
switch (tx_type) {
case DCT_DCT:
