Commit 03b4761b authored by Yushin Cho's avatar Yushin Cho

Further remove the dead codes from the disabled SKIP_TXFM

Removed  av1_xform_quant_dc().

Change-Id: I2be2e95276001a209c107e15f5b57038eca911d9
parent 3d2665c9
......@@ -474,122 +474,6 @@ void av1_xform_quant_fp(const AV1_COMMON *const cm, MACROBLOCK *x, int plane,
}
}
void av1_xform_quant_dc(MACROBLOCK *x, int plane, int block, int blk_row,
int blk_col, BLOCK_SIZE plane_bsize, TX_SIZE tx_size) {
MACROBLOCKD *const xd = &x->e_mbd;
const struct macroblock_plane *const p = &x->plane[plane];
const struct macroblockd_plane *const pd = &xd->plane[plane];
PLANE_TYPE plane_type = (plane == 0) ? PLANE_TYPE_Y : PLANE_TYPE_UV;
tran_low_t *const coeff = BLOCK_OFFSET(p->coeff, block);
tran_low_t *const qcoeff = BLOCK_OFFSET(p->qcoeff, block);
tran_low_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
uint16_t *const eob = &p->eobs[block];
const int diff_stride = 4 * num_4x4_blocks_wide_lookup[plane_bsize];
int seg_id = xd->mi[0]->mbmi.segment_id;
#if CONFIG_AOM_QM
int is_intra = !is_inter_block(&xd->mi[0]->mbmi);
const qm_val_t *qmatrix = pd->seg_qmatrix[seg_id][is_intra][tx_size];
const qm_val_t *iqmatrix = pd->seg_iqmatrix[seg_id][is_intra][tx_size];
#endif
const int16_t *src_diff;
FWD_TXFM_PARAM fwd_txfm_param;
fwd_txfm_param.tx_type = get_tx_type(plane_type, xd, block);
fwd_txfm_param.tx_size = tx_size;
fwd_txfm_param.fwd_txfm_opt = FWD_TXFM_OPT_DC;
fwd_txfm_param.rd_transform = 0;
fwd_txfm_param.lossless = xd->lossless[seg_id];
src_diff = &p->src_diff[4 * (blk_row * diff_stride + blk_col)];
#if CONFIG_AOM_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
highbd_fwd_txfm(src_diff, coeff, diff_stride, &fwd_txfm_param);
switch (tx_size) {
case TX_32X32:
aom_highbd_quantize_dc_32x32(coeff, x->skip_block, p->round,
p->quant_fp[0], qcoeff, dqcoeff,
pd->dequant[0],
#if !CONFIG_AOM_QM
eob);
#else
eob, qmatrix, iqmatrix);
#endif
break;
case TX_16X16:
aom_highbd_quantize_dc(coeff, 256, x->skip_block, p->round,
p->quant_fp[0], qcoeff, dqcoeff, pd->dequant[0],
#if !CONFIG_AOM_QM
eob);
#else
eob, qmatrix, iqmatrix);
#endif
break;
case TX_8X8:
aom_highbd_quantize_dc(coeff, 64, x->skip_block, p->round,
p->quant_fp[0], qcoeff, dqcoeff, pd->dequant[0],
#if !CONFIG_AOM_QM
eob);
#else
eob, qmatrix, iqmatrix);
#endif
break;
case TX_4X4:
aom_highbd_quantize_dc(coeff, 16, x->skip_block, p->round,
p->quant_fp[0], qcoeff, dqcoeff, pd->dequant[0],
#if !CONFIG_AOM_QM
eob);
#else
eob, qmatrix, iqmatrix);
#endif
break;
default: assert(0);
}
return;
}
#endif // CONFIG_AOM_HIGHBITDEPTH
fwd_txfm(src_diff, coeff, diff_stride, &fwd_txfm_param);
switch (tx_size) {
case TX_32X32:
aom_quantize_dc_32x32(coeff, x->skip_block, p->round, p->quant_fp[0],
qcoeff, dqcoeff, pd->dequant[0],
#if !CONFIG_AOM_QM
eob);
#else
eob, qmatrix, iqmatrix);
#endif
break;
case TX_16X16:
aom_quantize_dc(coeff, 256, x->skip_block, p->round, p->quant_fp[0],
qcoeff, dqcoeff, pd->dequant[0],
#if !CONFIG_AOM_QM
eob);
#else
eob, qmatrix, iqmatrix);
#endif
break;
case TX_8X8:
aom_quantize_dc(coeff, 64, x->skip_block, p->round, p->quant_fp[0],
qcoeff, dqcoeff, pd->dequant[0],
#if !CONFIG_AOM_QM
eob);
#else
eob, qmatrix, iqmatrix);
#endif
break;
case TX_4X4:
aom_quantize_dc(coeff, 16, x->skip_block, p->round, p->quant_fp[0],
qcoeff, dqcoeff, pd->dequant[0],
#if !CONFIG_AOM_QM
eob);
#else
eob, qmatrix, iqmatrix);
#endif
break;
default: assert(0); break;
}
}
void av1_xform_quant(const AV1_COMMON *const cm, MACROBLOCK *x, int plane,
int block, int blk_row, int blk_col,
BLOCK_SIZE plane_bsize, TX_SIZE tx_size) {
......
......@@ -31,8 +31,6 @@ void av1_encode_sby_pass1(AV1_COMMON *cm, MACROBLOCK *x, BLOCK_SIZE bsize);
void av1_xform_quant_fp(const AV1_COMMON *const cm, MACROBLOCK *x, int plane,
int block, int blk_row, int blk_col,
BLOCK_SIZE plane_bsize, TX_SIZE tx_size);
void av1_xform_quant_dc(MACROBLOCK *x, int plane, int block, int blk_row,
int blk_col, BLOCK_SIZE plane_bsize, TX_SIZE tx_size);
void av1_xform_quant(const AV1_COMMON *const cm, MACROBLOCK *x, int plane,
int block, int blk_row, int blk_col,
BLOCK_SIZE plane_bsize, TX_SIZE tx_size);
......
......@@ -4875,7 +4875,6 @@ void av1_rd_pick_inter_mode_sb(const AV1_COMP *cpi, TileDataEnc *tile_data,
mbmi->uv_mode = DC_PRED;
mbmi->ref_frame[0] = INTRA_FRAME;
mbmi->ref_frame[1] = NONE;
memset(x->skip_txfm, SKIP_TXFM_NONE, sizeof(x->skip_txfm));
palette_mode_info.palette_size[0] = 0;
rate_overhead = rd_pick_palette_intra_sby(
cpi, x, bsize, palette_ctx, cpi->mbmode_cost[DC_PRED],
......
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