From 2c9d78f0b0cdf193774e23a2e5c06ce60428b68f Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Mon, 25 Mar 2019 11:27:14 -0700 Subject: [PATCH] Unify the transform and quantization process Unify the transform and quantization process for 4x4 - 16x16 transform block sizes. This doesn't affect the encoding speed visibly. Remove it to reduce the maintenance load. Change-Id: Ifbf20bf8554ecf7970a6279a2b783b1c58fac6e4 --- vp9/encoder/vp9_encodemb.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index 276510204..83cb37c2d 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -404,9 +404,11 @@ void vp9_xform_quant_fp(MACROBLOCK *x, int plane, int block, int row, int col, scan_order->iscan); break; case TX_8X8: - vp9_fdct8x8_quant(src_diff, diff_stride, coeff, 64, x->skip_block, - p->round_fp, p->quant_fp, qcoeff, dqcoeff, pd->dequant, - eob, scan_order->scan, scan_order->iscan); + vpx_fdct8x8(src_diff, coeff, diff_stride); + vp9_quantize_fp(coeff, 64, x->skip_block, p->round_fp, p->quant_fp, + qcoeff, dqcoeff, pd->dequant, eob, scan_order->scan, + scan_order->iscan); + break; default: assert(tx_size == TX_4X4); -- 2.40.0