summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJingning Han <jingning@google.com>2019-03-25 11:27:14 -0700
committerJingning Han <jingning@google.com>2019-03-25 14:57:15 -0700
commit2c9d78f0b0cdf193774e23a2e5c06ce60428b68f (patch)
treec26deb88f0eeabcfb69403ed24454203da6f4f08
parentd8dbd853e9496dae01e06333a1d8433f11a441cc (diff)
downloadlibvpx-2c9d78f0b0cdf193774e23a2e5c06ce60428b68f.tar
libvpx-2c9d78f0b0cdf193774e23a2e5c06ce60428b68f.tar.gz
libvpx-2c9d78f0b0cdf193774e23a2e5c06ce60428b68f.tar.bz2
libvpx-2c9d78f0b0cdf193774e23a2e5c06ce60428b68f.zip
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
-rw-r--r--vp9/encoder/vp9_encodemb.c8
1 files 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);