diff options
Diffstat (limited to 'vp9/encoder/vp9_encodeintra.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeintra.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encodeintra.c b/vp9/encoder/vp9_encodeintra.c index a52763080..e40127982 100644 --- a/vp9/encoder/vp9_encodeintra.c +++ b/vp9/encoder/vp9_encodeintra.c @@ -54,7 +54,11 @@ void vp9_encode_intra4x4block(MACROBLOCK *x, int ib) { tx_type = get_tx_type_4x4(&x->e_mbd, b); if (tx_type != DCT_DCT) { +#if CONFIG_INTHT4X4 + vp9_short_fht4x4(be->src_diff, be->coeff, 32, tx_type); +#else vp9_fht(be->src_diff, 32, be->coeff, tx_type, 4); +#endif vp9_ht_quantize_b_4x4(be, b, tx_type); #if CONFIG_INTHT4X4 vp9_short_iht4x4(b->dqcoeff, b->diff, 32, tx_type); @@ -153,8 +157,12 @@ void vp9_encode_intra8x8(MACROBLOCK *x, int ib) { tx_type = get_tx_type_8x8(xd, &xd->block[ib]); if (tx_type != DCT_DCT) { +#if CONFIG_INTHT + vp9_short_fht8x8(be->src_diff, (x->block + idx)->coeff, 32, tx_type); +#else vp9_fht(be->src_diff, 32, (x->block + idx)->coeff, tx_type, 8); +#endif x->quantize_b_8x8(x->block + idx, xd->block + idx); #if CONFIG_INTHT @@ -175,7 +183,11 @@ void vp9_encode_intra8x8(MACROBLOCK *x, int ib) { be = &x->block[ib + iblock[i]]; tx_type = get_tx_type_4x4(xd, b); if (tx_type != DCT_DCT) { +#if CONFIG_INTHT4X4 + vp9_short_fht4x4(be->src_diff, be->coeff, 32, tx_type); +#else vp9_fht_c(be->src_diff, 32, be->coeff, tx_type, 4); +#endif vp9_ht_quantize_b_4x4(be, b, tx_type); #if CONFIG_INTHT4X4 vp9_short_iht4x4(b->dqcoeff, b->diff, 32, tx_type); |