diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-04-10 16:50:01 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-04-10 17:38:57 -0700 |
| commit | 8fb5be48a600bc75ee0e0b720c3ffe680d11db53 (patch) | |
| tree | 6c76cc48f6bb05c895c854a622cad8592e25055a /vp9/decoder/vp9_detokenize.c | |
| parent | b4f6098ef772e381c174581eca324e9d9ff1b87e (diff) | |
| download | libvpx-8fb5be48a600bc75ee0e0b720c3ffe680d11db53.tar libvpx-8fb5be48a600bc75ee0e0b720c3ffe680d11db53.tar.gz libvpx-8fb5be48a600bc75ee0e0b720c3ffe680d11db53.tar.bz2 libvpx-8fb5be48a600bc75ee0e0b720c3ffe680d11db53.zip | |
Make usage of sb_type independent of literal values.
Change-Id: I0d12f9ef9d960df0172a1377f8e5236eb6d90492
Diffstat (limited to 'vp9/decoder/vp9_detokenize.c')
| -rw-r--r-- | vp9/decoder/vp9_detokenize.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vp9/decoder/vp9_detokenize.c b/vp9/decoder/vp9_detokenize.c index f9e9da9bc..457c739b2 100644 --- a/vp9/decoder/vp9_detokenize.c +++ b/vp9/decoder/vp9_detokenize.c @@ -157,7 +157,8 @@ static int decode_coefs(VP9D_COMP *dx, const MACROBLOCKD *xd, } case TX_8X8: { const BLOCK_SIZE_TYPE sb_type = xd->mode_info_context->mbmi.sb_type; - const int sz = 3 + sb_type, x = block_idx & ((1 << sz) - 1); + const int sz = 3 + mb_width_log2(sb_type); + const int x = block_idx & ((1 << sz) - 1); const int y = block_idx - x; const TX_TYPE tx_type = (type == PLANE_TYPE_Y_WITH_DC) ? get_tx_type_8x8(xd, y + (x >> 1)) : DCT_DCT; @@ -181,7 +182,8 @@ static int decode_coefs(VP9D_COMP *dx, const MACROBLOCKD *xd, } case TX_16X16: { const BLOCK_SIZE_TYPE sb_type = xd->mode_info_context->mbmi.sb_type; - const int sz = 4 + sb_type, x = block_idx & ((1 << sz) - 1); + const int sz = 4 + mb_width_log2(sb_type); + const int x = block_idx & ((1 << sz) - 1); const int y = block_idx - x; const TX_TYPE tx_type = (type == PLANE_TYPE_Y_WITH_DC) ? get_tx_type_16x16(xd, y + (x >> 2)) : DCT_DCT; |