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

Add av1 prefix to inv_txfm_add

Change-Id: Id7cbb89ba344770297ef42bf1b09a2b9ba5a1378
parent b4e25d2c
...@@ -2787,8 +2787,8 @@ void av1_highbd_inv_txfm_add_64x64(const tran_low_t *input, uint8_t *dest, ...@@ -2787,8 +2787,8 @@ void av1_highbd_inv_txfm_add_64x64(const tran_low_t *input, uint8_t *dest,
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
#endif // CONFIG_AOM_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
void inv_txfm_add(const tran_low_t *input, uint8_t *dest, int stride, void av1_inv_txfm_add(const tran_low_t *input, uint8_t *dest, int stride,
INV_TXFM_PARAM *inv_txfm_param) { INV_TXFM_PARAM *inv_txfm_param) {
const TX_TYPE tx_type = inv_txfm_param->tx_type; const TX_TYPE tx_type = inv_txfm_param->tx_type;
const TX_SIZE tx_size = inv_txfm_param->tx_size; const TX_SIZE tx_size = inv_txfm_param->tx_size;
const int eob = inv_txfm_param->eob; const int eob = inv_txfm_param->eob;
...@@ -2837,8 +2837,8 @@ void inv_txfm_add(const tran_low_t *input, uint8_t *dest, int stride, ...@@ -2837,8 +2837,8 @@ void inv_txfm_add(const tran_low_t *input, uint8_t *dest, int stride,
} }
#if CONFIG_AOM_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
void highbd_inv_txfm_add(const tran_low_t *input, uint8_t *dest, int stride, void av1_highbd_inv_txfm_add(const tran_low_t *input, uint8_t *dest, int stride,
INV_TXFM_PARAM *inv_txfm_param) { INV_TXFM_PARAM *inv_txfm_param) {
const TX_TYPE tx_type = inv_txfm_param->tx_type; const TX_TYPE tx_type = inv_txfm_param->tx_type;
const TX_SIZE tx_size = inv_txfm_param->tx_size; const TX_SIZE tx_size = inv_txfm_param->tx_size;
const int eob = inv_txfm_param->eob; const int eob = inv_txfm_param->eob;
......
...@@ -76,8 +76,8 @@ void av1_inv_txfm_add_16x16(const tran_low_t *input, uint8_t *dest, int stride, ...@@ -76,8 +76,8 @@ void av1_inv_txfm_add_16x16(const tran_low_t *input, uint8_t *dest, int stride,
int eob, TX_TYPE tx_type); int eob, TX_TYPE tx_type);
void av1_inv_txfm_add_32x32(const tran_low_t *input, uint8_t *dest, int stride, void av1_inv_txfm_add_32x32(const tran_low_t *input, uint8_t *dest, int stride,
int eob, TX_TYPE tx_type); int eob, TX_TYPE tx_type);
void inv_txfm_add(const tran_low_t *input, uint8_t *dest, int stride, void av1_inv_txfm_add(const tran_low_t *input, uint8_t *dest, int stride,
INV_TXFM_PARAM *inv_txfm_param); INV_TXFM_PARAM *inv_txfm_param);
#if CONFIG_AOM_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
void av1_highbd_iwht4x4_add(const tran_low_t *input, uint8_t *dest, int stride, void av1_highbd_iwht4x4_add(const tran_low_t *input, uint8_t *dest, int stride,
int eob, int bd); int eob, int bd);
...@@ -104,8 +104,8 @@ void av1_highbd_inv_txfm_add_16x16(const tran_low_t *input, uint8_t *dest, ...@@ -104,8 +104,8 @@ void av1_highbd_inv_txfm_add_16x16(const tran_low_t *input, uint8_t *dest,
void av1_highbd_inv_txfm_add_32x32(const tran_low_t *input, uint8_t *dest, void av1_highbd_inv_txfm_add_32x32(const tran_low_t *input, uint8_t *dest,
int stride, int eob, int bd, int stride, int eob, int bd,
TX_TYPE tx_type); TX_TYPE tx_type);
void highbd_inv_txfm_add(const tran_low_t *input, uint8_t *dest, int stride, void av1_highbd_inv_txfm_add(const tran_low_t *input, uint8_t *dest, int stride,
INV_TXFM_PARAM *inv_txfm_param); INV_TXFM_PARAM *inv_txfm_param);
#endif // CONFIG_AOM_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
......
...@@ -336,10 +336,10 @@ static void inverse_transform_block(MACROBLOCKD *xd, int plane, ...@@ -336,10 +336,10 @@ static void inverse_transform_block(MACROBLOCKD *xd, int plane,
#if CONFIG_AOM_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
inv_txfm_param.bd = xd->bd; inv_txfm_param.bd = xd->bd;
highbd_inv_txfm_add(dqcoeff, dst, stride, &inv_txfm_param); av1_highbd_inv_txfm_add(dqcoeff, dst, stride, &inv_txfm_param);
} else { } else {
#endif // CONFIG_AOM_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
inv_txfm_add(dqcoeff, dst, stride, &inv_txfm_param); av1_inv_txfm_add(dqcoeff, dst, stride, &inv_txfm_param);
#if CONFIG_AOM_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
} }
#endif // CONFIG_AOM_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
......
...@@ -753,11 +753,11 @@ static void encode_block(int plane, int block, int blk_row, int blk_col, ...@@ -753,11 +753,11 @@ static void encode_block(int plane, int block, int blk_row, int blk_col,
#if CONFIG_AOM_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
inv_txfm_param.bd = xd->bd; inv_txfm_param.bd = xd->bd;
highbd_inv_txfm_add(dqcoeff, dst, pd->dst.stride, &inv_txfm_param); av1_highbd_inv_txfm_add(dqcoeff, dst, pd->dst.stride, &inv_txfm_param);
return; return;
} }
#endif // CONFIG_AOM_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
inv_txfm_add(dqcoeff, dst, pd->dst.stride, &inv_txfm_param); av1_inv_txfm_add(dqcoeff, dst, pd->dst.stride, &inv_txfm_param);
} }
#if CONFIG_VAR_TX #if CONFIG_VAR_TX
...@@ -1078,12 +1078,12 @@ void av1_encode_block_intra(int plane, int block, int blk_row, int blk_col, ...@@ -1078,12 +1078,12 @@ void av1_encode_block_intra(int plane, int block, int blk_row, int blk_col,
#if CONFIG_AOM_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
inv_txfm_param.bd = xd->bd; inv_txfm_param.bd = xd->bd;
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
highbd_inv_txfm_add(dqcoeff, dst, dst_stride, &inv_txfm_param); av1_highbd_inv_txfm_add(dqcoeff, dst, dst_stride, &inv_txfm_param);
} else { } else {
inv_txfm_add(dqcoeff, dst, dst_stride, &inv_txfm_param); av1_inv_txfm_add(dqcoeff, dst, dst_stride, &inv_txfm_param);
} }
#else #else
inv_txfm_add(dqcoeff, dst, dst_stride, &inv_txfm_param); av1_inv_txfm_add(dqcoeff, dst, dst_stride, &inv_txfm_param);
#endif // CONFIG_AOM_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
*(args->skip) = 0; *(args->skip) = 0;
...@@ -1124,7 +1124,7 @@ void av1_encode_block_intra(int plane, int block, int blk_row, int blk_col, ...@@ -1124,7 +1124,7 @@ void av1_encode_block_intra(int plane, int block, int blk_row, int blk_col,
#error #error
#else #else
inv_txfm_add(dqcoeff, dst, dst_stride, &inv_txfm_param); av1_inv_txfm_add(dqcoeff, dst, dst_stride, &inv_txfm_param);
#endif #endif
#endif // #if !CONFIG_PVQ #endif // #if !CONFIG_PVQ
......
...@@ -1336,7 +1336,7 @@ static void dist_block(const AV1_COMP *cpi, MACROBLOCK *x, int plane, int block, ...@@ -1336,7 +1336,7 @@ static void dist_block(const AV1_COMP *cpi, MACROBLOCK *x, int plane, int block,
inv_txfm_param.bd = xd->bd; inv_txfm_param.bd = xd->bd;
aom_highbd_convolve_copy(dst, dst_stride, recon, MAX_TX_SIZE, NULL, 0, aom_highbd_convolve_copy(dst, dst_stride, recon, MAX_TX_SIZE, NULL, 0,
NULL, 0, bsw, bsh, xd->bd); NULL, 0, bsw, bsh, xd->bd);
highbd_inv_txfm_add(dqcoeff, recon, MAX_TX_SIZE, &inv_txfm_param); av1_highbd_inv_txfm_add(dqcoeff, recon, MAX_TX_SIZE, &inv_txfm_param);
} else } else
#endif // CONFIG_AOM_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
{ {
...@@ -1349,7 +1349,7 @@ static void dist_block(const AV1_COMP *cpi, MACROBLOCK *x, int plane, int block, ...@@ -1349,7 +1349,7 @@ static void dist_block(const AV1_COMP *cpi, MACROBLOCK *x, int plane, int block,
for (j = 0; j < bsh; j++) for (j = 0; j < bsh; j++)
for (i = 0; i < bsw; i++) recon[j * MAX_TX_SIZE + i] = 0; for (i = 0; i < bsw; i++) recon[j * MAX_TX_SIZE + i] = 0;
#endif // !CONFIG_PVQ #endif // !CONFIG_PVQ
inv_txfm_add(dqcoeff, recon, MAX_TX_SIZE, &inv_txfm_param); av1_inv_txfm_add(dqcoeff, recon, MAX_TX_SIZE, &inv_txfm_param);
} }
#if CONFIG_DAALA_DIST #if CONFIG_DAALA_DIST
if (plane == 0) { if (plane == 0) {
...@@ -1451,7 +1451,7 @@ static void block_rd_txfm(int plane, int block, int blk_row, int blk_col, ...@@ -1451,7 +1451,7 @@ static void block_rd_txfm(int plane, int block, int blk_row, int blk_col,
&this_rd_stats.dist, &this_rd_stats.sse); &this_rd_stats.dist, &this_rd_stats.sse);
} else { } else {
// Note that the encode block_intra call above already calls // Note that the encode block_intra call above already calls
// inv_txfm_add, so we can't just call dist_block here. // av1_inv_txfm_add, so we can't just call dist_block here.
const BLOCK_SIZE tx_bsize = txsize_to_bsize[tx_size]; const BLOCK_SIZE tx_bsize = txsize_to_bsize[tx_size];
const aom_variance_fn_t variance = args->cpi->fn_ptr[tx_bsize].vf; const aom_variance_fn_t variance = args->cpi->fn_ptr[tx_bsize].vf;
const struct macroblock_plane *const p = &x->plane[plane]; const struct macroblock_plane *const p = &x->plane[plane];
...@@ -3894,12 +3894,13 @@ void av1_tx_block_rd_b(const AV1_COMP *cpi, MACROBLOCK *x, TX_SIZE tx_size, ...@@ -3894,12 +3894,13 @@ void av1_tx_block_rd_b(const AV1_COMP *cpi, MACROBLOCK *x, TX_SIZE tx_size,
#if CONFIG_AOM_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
inv_txfm_param.bd = xd->bd; inv_txfm_param.bd = xd->bd;
highbd_inv_txfm_add(dqcoeff, rec_buffer, MAX_TX_SIZE, &inv_txfm_param); av1_highbd_inv_txfm_add(dqcoeff, rec_buffer, MAX_TX_SIZE,
&inv_txfm_param);
} else { } else {
inv_txfm_add(dqcoeff, rec_buffer, MAX_TX_SIZE, &inv_txfm_param); av1_inv_txfm_add(dqcoeff, rec_buffer, MAX_TX_SIZE, &inv_txfm_param);
} }
#else // CONFIG_AOM_HIGHBITDEPTH #else // CONFIG_AOM_HIGHBITDEPTH
inv_txfm_add(dqcoeff, rec_buffer, MAX_TX_SIZE, &inv_txfm_param); av1_inv_txfm_add(dqcoeff, rec_buffer, MAX_TX_SIZE, &inv_txfm_param);
#endif // CONFIG_AOM_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
if (txb_w + blk_col > max_blocks_wide || if (txb_w + blk_col > max_blocks_wide ||
...@@ -6638,7 +6639,7 @@ static int64_t rd_pick_inter_best_sub8x8_mode( ...@@ -6638,7 +6639,7 @@ static int64_t rd_pick_inter_best_sub8x8_mode(
for (i2 = 0; i2 < 4; i2++) dst[j2 * dst_stride + i2] = 0; for (i2 = 0; i2 < 4; i2++) dst[j2 * dst_stride + i2] = 0;
} }
#endif // CONFIG_PVQ #endif // CONFIG_PVQ
inv_txfm_add(dqcoeff, dst, dst_stride, &inv_txfm_param); av1_inv_txfm_add(dqcoeff, dst, dst_stride, &inv_txfm_param);
} }
} }
} }
......
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