generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor: call inv_txfm_add

Browse Source 
Change-Id: I52c209a5db1b4a6525c04b70291a08ab5a68c6fe
This commit is contained in:
Angie Chiang
2016-03-14 17:38:15 -07:00
parent 6b55b8dc93
commit cb3072ca4a
2 changed files with 20 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
vp10/decoder/decodeframe.c
View File

@@ -224,49 +224,19 @@ static void inverse_transform_block(MACROBLOCKD* xd, int plane,
const int seg_id = xd->mi[0]->mbmi.segment_id; const int seg_id = xd->mi[0]->mbmi.segment_id;
if (eob > 0) { if (eob > 0) {
tran_low_t *const dqcoeff = pd->dqcoeff; tran_low_t *const dqcoeff = pd->dqcoeff;
INV_TXFM_PARAM inv_txfm_param;
inv_txfm_param.tx_type = tx_type;
inv_txfm_param.tx_size = tx_size;
inv_txfm_param.eob = eob;
inv_txfm_param.lossless = xd->lossless[seg_id];
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
switch (tx_size) { inv_txfm_param.bd = xd->bd;
case TX_4X4: highbd_inv_txfm_add(dqcoeff, dst, stride, &inv_txfm_param);
vp10_highbd_inv_txfm_add_4x4(dqcoeff, dst, stride, eob, xd->bd,
tx_type, xd->lossless[seg_id]);
break;
case TX_8X8:
vp10_highbd_inv_txfm_add_8x8(dqcoeff, dst, stride, eob, xd->bd,
tx_type);
break;
case TX_16X16:
vp10_highbd_inv_txfm_add_16x16(dqcoeff, dst, stride, eob, xd->bd,
tx_type);
break;
case TX_32X32:
vp10_highbd_inv_txfm_add_32x32(dqcoeff, dst, stride, eob, xd->bd,
tx_type);
break;
default:
assert(0 && "Invalid transform size");
return;
}
} else { } else {
#endif // CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9_HIGHBITDEPTH
switch (tx_size) { inv_txfm_add(dqcoeff, dst, stride, &inv_txfm_param);
case TX_4X4:
vp10_inv_txfm_add_4x4(dqcoeff, dst, stride, eob, tx_type,
xd->lossless[seg_id]);
break;
case TX_8X8:
vp10_inv_txfm_add_8x8(dqcoeff, dst, stride, eob, tx_type);
break;
case TX_16X16:
vp10_inv_txfm_add_16x16(dqcoeff, dst, stride, eob, tx_type);
break;
case TX_32X32:
vp10_inv_txfm_add_32x32(dqcoeff, dst, stride, eob, tx_type);
break;
default:
assert(0 && "Invalid transform size");
return;
}
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
} }
#endif // CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9_HIGHBITDEPTH

58
vp10/encoder/rdopt.c
View File

@@ -2846,57 +2846,21 @@ void vp10_tx_block_rd_b(const VP10_COMP *cpi, MACROBLOCK *x, TX_SIZE tx_size,
*bsse += tmp * 16; *bsse += tmp * 16;
if (p->eobs[block] > 0) { if (p->eobs[block] > 0) {
const int lossless = xd->lossless[xd->mi[0]->mbmi.segment_id]; INV_TXFM_PARAM inv_txfm_param;
inv_txfm_param.tx_type = tx_type;
inv_txfm_param.tx_size = tx_size;
inv_txfm_param.eob = p->eobs[block];
inv_txfm_param.lossless = xd->lossless[xd->mi[0]->mbmi.segment_id];
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
const int bd = xd->bd; inv_txfm_param.bd = xd->bd;
switch (tx_size) { highbd_inv_txfm_add(dqcoeff, rec_buffer, 32, &inv_txfm_param);
case TX_32X32:
vp10_highbd_inv_txfm_add_32x32(dqcoeff, rec_buffer, 32,
p->eobs[block], bd, tx_type);
break;
case TX_16X16:
vp10_highbd_inv_txfm_add_16x16(dqcoeff, rec_buffer, 32,
p->eobs[block], bd, tx_type);
break;
case TX_8X8:
vp10_highbd_inv_txfm_add_8x8(dqcoeff, rec_buffer, 32,
p->eobs[block], bd, tx_type);
break;
case TX_4X4:
vp10_highbd_inv_txfm_add_4x4(dqcoeff, rec_buffer, 32,
p->eobs[block], bd, tx_type, lossless);
break;
default:
assert(0 && "Invalid transform size");
break;
}
} else { } else {
#else inv_txfm_add(dqcoeff, rec_buffer, 32, &inv_txfm_param);
{ }
#else // CONFIG_VP9_HIGHBITDEPTH
inv_txfm_add(dqcoeff, rec_buffer, 32, &inv_txfm_param);
#endif // CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9_HIGHBITDEPTH
switch (tx_size) {
case TX_32X32:
vp10_inv_txfm_add_32x32(dqcoeff, rec_buffer, 32, p->eobs[block],
tx_type);
break;
case TX_16X16:
vp10_inv_txfm_add_16x16(dqcoeff, rec_buffer, 32, p->eobs[block],
tx_type);
break;
case TX_8X8:
vp10_inv_txfm_add_8x8(dqcoeff, rec_buffer, 32, p->eobs[block],
tx_type);
break;
case TX_4X4:
vp10_inv_txfm_add_4x4(dqcoeff, rec_buffer, 32, p->eobs[block],
tx_type, lossless);
break;
default:
assert(0 && "Invalid transform size");
break;
}
}
if ((bh >> 2) + blk_col > max_blocks_wide || if ((bh >> 2) + blk_col > max_blocks_wide ||
(bh >> 2) + blk_row > max_blocks_high) { (bh >> 2) + blk_row > max_blocks_high) {