diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2013-11-14 13:45:51 -0800 |
---|---|---|
committer | Dmitry Kovalev <dkovalev@google.com> | 2013-11-14 13:45:51 -0800 |
commit | 49fbbf72faf64cb095a7b83c9f42394e5f01fb4c (patch) | |
tree | 33dac5cffe4815e67ceb25c7e43ef7c08425235a /vp9/encoder | |
parent | f16cde998b3c43ccda202e463b0ff72e725e9829 (diff) | |
download | libvpx-49fbbf72faf64cb095a7b83c9f42394e5f01fb4c.tar libvpx-49fbbf72faf64cb095a7b83c9f42394e5f01fb4c.tar.gz libvpx-49fbbf72faf64cb095a7b83c9f42394e5f01fb4c.tar.bz2 libvpx-49fbbf72faf64cb095a7b83c9f42394e5f01fb4c.zip |
Finally removing txfrm_block_to_raster_block() function.
We only use txfrm_block_to_raster_xy() now.
Change-Id: I4242cd592da99e761041acf9fef1bac3d55a48e1
Diffstat (limited to 'vp9/encoder')
-rw-r--r-- | vp9/encoder/vp9_encodemb.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index a85ddee45..41cafd8b8 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -474,12 +474,11 @@ static void encode_block_pass1(int plane, int block, BLOCK_SIZE plane_bsize, MACROBLOCK *const x = args->x; MACROBLOCKD *const xd = &x->e_mbd; struct macroblockd_plane *const pd = &xd->plane[plane]; - const int raster_block = txfrm_block_to_raster_block(plane_bsize, tx_size, - block); - int16_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block); - uint8_t *const dst = raster_block_offset_uint8(plane_bsize, raster_block, - pd->dst.buf, pd->dst.stride); + int i, j; + uint8_t *dst; + txfrm_block_to_raster_xy(plane_bsize, tx_size, block, &i, &j); + dst = &pd->dst.buf[4 * j * pd->dst.stride + 4 * i]; vp9_xform_quant(plane, block, plane_bsize, tx_size, arg); |