diff options
| author | Johann <johann@duck.com> | 2022-11-05 09:53:07 +0900 |
|---|---|---|
| committer | Johann <johann@duck.com> | 2023-03-06 09:16:04 +0900 |
| commit | 0384a2aab79a8b004257ba32d7824e8defb12c55 (patch) | |
| tree | dc65fa7b37223539b06f39a5856b2b523149ecea /vp9 | |
| parent | 5fae248f2a8af49bc82590ec1d397c8535859b0e (diff) | |
| download | libvpx-0384a2aab79a8b004257ba32d7824e8defb12c55.tar libvpx-0384a2aab79a8b004257ba32d7824e8defb12c55.tar.gz libvpx-0384a2aab79a8b004257ba32d7824e8defb12c55.tar.bz2 libvpx-0384a2aab79a8b004257ba32d7824e8defb12c55.zip | |
reland: quantize: simplify 32x32_b args
Allocate mb_plane_ on the heap to ensure src is aligned.
Now that all the implementations of the 32x32 quantize are in
intrinsics we can reference struct members directly. Saves
pushing them to the stack.
n_coeffs is not used at all for this function.
Change-Id: Ib551f7f583977602504d962b72063bc6eda9dda9
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_block.h | 1 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_block.h b/vp9/encoder/vp9_block.h index 3e2c9a3c3..da01c346d 100644 --- a/vp9/encoder/vp9_block.h +++ b/vp9/encoder/vp9_block.h @@ -13,6 +13,7 @@ #include "vpx_util/vpx_thread.h" +#include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_entropymv.h" #include "vp9/common/vp9_entropy.h" diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index fa222f9dc..4910dc20f 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -542,8 +542,7 @@ void vp9_xform_quant(MACROBLOCK *x, int plane, int block, int row, int col, switch (tx_size) { case TX_32X32: fdct32x32(x->use_lp32x32fdct, src_diff, coeff, diff_stride); - vpx_quantize_b_32x32(coeff, 1024, p->zbin, p->round, p->quant, - p->quant_shift, qcoeff, dqcoeff, pd->dequant, eob, + vpx_quantize_b_32x32(coeff, p, qcoeff, dqcoeff, pd->dequant, eob, scan_order->scan, scan_order->iscan); break; case TX_16X16: @@ -948,8 +947,7 @@ void vp9_encode_block_intra(int plane, int block, int row, int col, vpx_subtract_block(32, 32, src_diff, diff_stride, src, src_stride, dst, dst_stride); fdct32x32(x->use_lp32x32fdct, src_diff, coeff, diff_stride); - vpx_quantize_b_32x32(coeff, 1024, p->zbin, p->round, p->quant, - p->quant_shift, qcoeff, dqcoeff, pd->dequant, eob, + vpx_quantize_b_32x32(coeff, p, qcoeff, dqcoeff, pd->dequant, eob, scan_order->scan, scan_order->iscan); } if (args->enable_coeff_opt && !x->skip_recode) { |