diff options
author | Hangyu Kuang <hkuang@google.com> | 2015-02-20 08:23:54 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-02-20 08:23:54 -0800 |
commit | a28a8cb72626d8bea3543052e9bf825e95666c7e (patch) | |
tree | 3fde66aff70d2fcf054eefcd92801cd24e5581fc /vp9/decoder/vp9_detokenize.c | |
parent | f03627347edfc63fc4127af4cc2aa0f41a32fa91 (diff) | |
parent | bdd249be313de5db6500d6239f77f00a5d1b6295 (diff) | |
download | libvpx-a28a8cb72626d8bea3543052e9bf825e95666c7e.tar libvpx-a28a8cb72626d8bea3543052e9bf825e95666c7e.tar.gz libvpx-a28a8cb72626d8bea3543052e9bf825e95666c7e.tar.bz2 libvpx-a28a8cb72626d8bea3543052e9bf825e95666c7e.zip |
Merge "Optimize the dequantization process on decoder side."
Diffstat (limited to 'vp9/decoder/vp9_detokenize.c')
-rw-r--r-- | vp9/decoder/vp9_detokenize.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vp9/decoder/vp9_detokenize.c b/vp9/decoder/vp9_detokenize.c index 28ef7111c..35690b89b 100644 --- a/vp9/decoder/vp9_detokenize.c +++ b/vp9/decoder/vp9_detokenize.c @@ -215,14 +215,15 @@ static int decode_coefs(VP9_COMMON *cm, const MACROBLOCKD *xd, int vp9_decode_block_tokens(VP9_COMMON *cm, MACROBLOCKD *xd, FRAME_COUNTS *counts, int plane, int block, BLOCK_SIZE plane_bsize, int x, int y, - TX_SIZE tx_size, vp9_reader *r) { + TX_SIZE tx_size, vp9_reader *r, + const int16_t *const dequant) { struct macroblockd_plane *const pd = &xd->plane[plane]; const int ctx = get_entropy_context(tx_size, pd->above_context + x, pd->left_context + y); const scan_order *so = get_scan(xd, tx_size, pd->plane_type, block); const int eob = decode_coefs(cm, xd, counts, pd->plane_type, BLOCK_OFFSET(pd->dqcoeff, block), tx_size, - pd->dequant, ctx, so->scan, so->neighbors, r); + dequant, ctx, so->scan, so->neighbors, r); vp9_set_contexts(xd, pd, plane_bsize, tx_size, eob > 0, x, y); return eob; } |