diff options
| author | Yaowu Xu <yaowu@google.com> | 2012-12-11 13:51:56 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-12-11 13:51:56 -0800 |
| commit | 0c35b27689171503ac47f46f35a61d72bc5886c8 (patch) | |
| tree | ad653bbd781a99bbfa97f387c894312f545b27d5 /vp9/decoder | |
| parent | 6b380c0cfab9ad716970bd2ff7f02fc8ed0cbf9b (diff) | |
| parent | 899f0fc1268dd5665770031f308a3ed52a0de956 (diff) | |
| download | libvpx-0c35b27689171503ac47f46f35a61d72bc5886c8.tar libvpx-0c35b27689171503ac47f46f35a61d72bc5886c8.tar.gz libvpx-0c35b27689171503ac47f46f35a61d72bc5886c8.tar.bz2 libvpx-0c35b27689171503ac47f46f35a61d72bc5886c8.zip | |
Merge "clean up tokenize_b() and stuff_b()" into experimental
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_detokenize.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/vp9/decoder/vp9_detokenize.c b/vp9/decoder/vp9_detokenize.c index 32746d5a0..0c822d429 100644 --- a/vp9/decoder/vp9_detokenize.c +++ b/vp9/decoder/vp9_detokenize.c @@ -326,8 +326,8 @@ static int vp9_decode_mb_tokens_16x16(VP9D_COMP* const pbi, // 8x8 chroma blocks seg_eob = get_eob(xd, segment_id, 64); for (i = 16; i < 24; i += 4) { - ENTROPY_CONTEXT* const a = A + vp9_block2above_8x8[i]; - ENTROPY_CONTEXT* const l = L + vp9_block2left_8x8[i]; + ENTROPY_CONTEXT* const a = A + vp9_block2above[TX_8X8][i]; + ENTROPY_CONTEXT* const l = L + vp9_block2left[TX_8X8][i]; #if CONFIG_CNVCONTEXT above_ec = (a[0] + a[1]) != 0; left_ec = (l[0] + l[1]) != 0; @@ -363,8 +363,8 @@ static int vp9_decode_mb_tokens_8x8(VP9D_COMP* const pbi, int has_2nd_order = get_2nd_order_usage(xd); // 2nd order DC block if (has_2nd_order) { - ENTROPY_CONTEXT *const a = A + vp9_block2above_8x8[24]; - ENTROPY_CONTEXT *const l = L + vp9_block2left_8x8[24]; + ENTROPY_CONTEXT *const a = A + vp9_block2above[TX_8X8][24]; + ENTROPY_CONTEXT *const l = L + vp9_block2left[TX_8X8][24]; eobs[24] = c = decode_coefs(pbi, xd, bc, a, l, PLANE_TYPE_Y2, DCT_DCT, get_eob(xd, segment_id, 4), @@ -382,8 +382,8 @@ static int vp9_decode_mb_tokens_8x8(VP9D_COMP* const pbi, // luma blocks seg_eob = get_eob(xd, segment_id, 64); for (i = 0; i < 16; i += 4) { - ENTROPY_CONTEXT *const a = A + vp9_block2above_8x8[i]; - ENTROPY_CONTEXT *const l = L + vp9_block2left_8x8[i]; + ENTROPY_CONTEXT *const a = A + vp9_block2above[TX_8X8][i]; + ENTROPY_CONTEXT *const l = L + vp9_block2left[TX_8X8][i]; #if CONFIG_CNVCONTEXT ENTROPY_CONTEXT above_ec = (a[0] + a[1]) != 0; ENTROPY_CONTEXT left_ec = (l[0] + l[1]) != 0; @@ -408,8 +408,8 @@ static int vp9_decode_mb_tokens_8x8(VP9D_COMP* const pbi, // use 4x4 transform for U, V components in I8X8/splitmv prediction mode seg_eob = get_eob(xd, segment_id, 16); for (i = 16; i < 24; i++) { - ENTROPY_CONTEXT *const a = A + vp9_block2above[i]; - ENTROPY_CONTEXT *const l = L + vp9_block2left[i]; + ENTROPY_CONTEXT *const a = A + vp9_block2above[TX_4X4][i]; + ENTROPY_CONTEXT *const l = L + vp9_block2left[TX_4X4][i]; eobs[i] = c = decode_coefs(pbi, xd, bc, a, l, PLANE_TYPE_UV, DCT_DCT, seg_eob, xd->block[i].qcoeff, @@ -418,8 +418,8 @@ static int vp9_decode_mb_tokens_8x8(VP9D_COMP* const pbi, } } else { for (i = 16; i < 24; i += 4) { - ENTROPY_CONTEXT *const a = A + vp9_block2above_8x8[i]; - ENTROPY_CONTEXT *const l = L + vp9_block2left_8x8[i]; + ENTROPY_CONTEXT *const a = A + vp9_block2above[TX_8X8][i]; + ENTROPY_CONTEXT *const l = L + vp9_block2left[TX_8X8][i]; #if CONFIG_CNVCONTEXT ENTROPY_CONTEXT above_ec = (a[0] + a[1]) != 0; ENTROPY_CONTEXT left_ec = (l[0] + l[1]) != 0; @@ -448,8 +448,8 @@ static int decode_coefs_4x4(VP9D_COMP *dx, MACROBLOCKD *xd, TX_TYPE tx_type, const int *scan) { ENTROPY_CONTEXT *const A = (ENTROPY_CONTEXT *)xd->above_context; ENTROPY_CONTEXT *const L = (ENTROPY_CONTEXT *)xd->left_context; - ENTROPY_CONTEXT *const a = A + vp9_block2above[i]; - ENTROPY_CONTEXT *const l = L + vp9_block2left[i]; + ENTROPY_CONTEXT *const a = A + vp9_block2above[TX_4X4][i]; + ENTROPY_CONTEXT *const l = L + vp9_block2left[TX_4X4][i]; unsigned short *const eobs = xd->eobs; int c; |