diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-08-15 17:03:03 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-08-15 17:03:03 -0700 |
| commit | afd9bd3e3ce8bbdc3b4f9b23c7d882fee7109fd2 (patch) | |
| tree | d9bc93d6d08ab6ee06efbf63729adac9052ef40a /vp9/decoder/vp9_decodframe.c | |
| parent | 9451e8d37e89eb32f91fb844bf2ba31d16bc1526 (diff) | |
| download | libvpx-afd9bd3e3ce8bbdc3b4f9b23c7d882fee7109fd2.tar libvpx-afd9bd3e3ce8bbdc3b4f9b23c7d882fee7109fd2.tar.gz libvpx-afd9bd3e3ce8bbdc3b4f9b23c7d882fee7109fd2.tar.bz2 libvpx-afd9bd3e3ce8bbdc3b4f9b23c7d882fee7109fd2.zip | |
Moving from ss_txfrm_size to tx_size.
Updating foreach_transformed_block_visitor and corresponding functions
to accept tx_size instead of ss_txfrm_size. List of functions per file:
vp9_decodframe.c
decode_block
decode_block_intra
vp9_detokenize.c
decode_block
vp9_encodemb.c
optimize_block
vp9_xform_quant
vp9_encode_block_intra
vp9_rdopt.c
dist_block
rate_block
block_yrd_txfm
vp9_tokenize.c
set_entropy_context_b
tokenize_b
is_skippable
Change-Id: I351bf563eb36cf34db71c3f06b9bbc9a61b55b73
Diffstat (limited to 'vp9/decoder/vp9_decodframe.c')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 3edb98187..e1a6d5db1 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -88,13 +88,12 @@ static void init_dequantizer(VP9_COMMON *cm, MACROBLOCKD *xd) { } static void decode_block(int plane, int block, BLOCK_SIZE_TYPE bsize, - int ss_txfrm_size, void *arg) { + TX_SIZE tx_size, void *arg) { MACROBLOCKD* const xd = arg; struct macroblockd_plane *const pd = &xd->plane[plane]; int16_t* const qcoeff = BLOCK_OFFSET(pd->qcoeff, block); const int stride = pd->dst.stride; const int eob = pd->eobs[block]; - const TX_SIZE tx_size = (TX_SIZE)(ss_txfrm_size >> 1); const int raster_block = txfrm_block_to_raster_block(xd, bsize, plane, block, tx_size); uint8_t* const dst = raster_block_offset_uint8(xd, bsize, plane, @@ -126,11 +125,10 @@ static void decode_block(int plane, int block, BLOCK_SIZE_TYPE bsize, } static void decode_block_intra(int plane, int block, BLOCK_SIZE_TYPE bsize, - int ss_txfrm_size, void *arg) { + TX_SIZE tx_size, void *arg) { MACROBLOCKD* const xd = arg; struct macroblockd_plane *const pd = &xd->plane[plane]; MODE_INFO *const mi = xd->mode_info_context; - const TX_SIZE tx_size = (TX_SIZE)(ss_txfrm_size >> 1); const int raster_block = txfrm_block_to_raster_block(xd, bsize, plane, block, tx_size); uint8_t* const dst = raster_block_offset_uint8(xd, bsize, plane, @@ -160,7 +158,7 @@ static void decode_block_intra(int plane, int block, BLOCK_SIZE_TYPE bsize, if (mi->mbmi.skip_coeff) return; - decode_block(plane, block, bsize, ss_txfrm_size, arg); + decode_block(plane, block, bsize, tx_size, arg); } static int decode_tokens(VP9D_COMP *pbi, BLOCK_SIZE_TYPE bsize, vp9_reader *r) { |