diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-02-15 17:11:20 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-02-15 17:11:20 -0800 |
| commit | 5bb103c48682a030a650045249870cecabaed868 (patch) | |
| tree | 3a90a782e8b173c382abb1c2a8158028eb278c70 /vp9/decoder | |
| parent | e343732a92bddb3e8764e4757487bab6667f744c (diff) | |
| parent | 3af36ea8cc2e532c648e1d76d9aac96a0d612e1f (diff) | |
| download | libvpx-5bb103c48682a030a650045249870cecabaed868.tar libvpx-5bb103c48682a030a650045249870cecabaed868.tar.gz libvpx-5bb103c48682a030a650045249870cecabaed868.tar.bz2 libvpx-5bb103c48682a030a650045249870cecabaed868.zip | |
Merge "Remove Y2 and Y-no-DC token types from the bitstream." into experimental
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index b46d412a8..e619c3e84 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -1179,11 +1179,10 @@ static void read_coef_probs_common(BOOL_DECODER* const bc, if (vp9_read_bit(bc)) { for (i = 0; i < block_types; i++) { - for (j = !i; j < COEF_BANDS; j++) { + for (j = 0; j < COEF_BANDS; j++) { /* NB: This j loop starts from 1 on block type i == 0 */ for (k = 0; k < PREV_COEF_CONTEXTS; k++) { - if (k >= 3 && ((i == 0 && j == 1) || - (i > 0 && j == 0))) + if (k >= 3 && j == 0) continue; for (l = 0; l < ENTROPY_NODES; l++) { vp9_prob *const p = coef_probs[i][j][k] + l; @@ -1202,16 +1201,18 @@ static void read_coef_probs(VP9D_COMP *pbi, BOOL_DECODER* const bc) { VP9_COMMON *const pc = &pbi->common; read_coef_probs_common(bc, pc->fc.coef_probs_4x4, BLOCK_TYPES_4X4); - read_coef_probs_common(bc, pc->fc.hybrid_coef_probs_4x4, BLOCK_TYPES_4X4); + read_coef_probs_common(bc, pc->fc.hybrid_coef_probs_4x4, + BLOCK_TYPES_4X4_HYBRID); if (pbi->common.txfm_mode != ONLY_4X4) { read_coef_probs_common(bc, pc->fc.coef_probs_8x8, BLOCK_TYPES_8X8); - read_coef_probs_common(bc, pc->fc.hybrid_coef_probs_8x8, BLOCK_TYPES_8X8); + read_coef_probs_common(bc, pc->fc.hybrid_coef_probs_8x8, + BLOCK_TYPES_8X8_HYBRID); } if (pbi->common.txfm_mode > ALLOW_8X8) { read_coef_probs_common(bc, pc->fc.coef_probs_16x16, BLOCK_TYPES_16X16); read_coef_probs_common(bc, pc->fc.hybrid_coef_probs_16x16, - BLOCK_TYPES_16X16); + BLOCK_TYPES_16X16_HYBRID); } if (pbi->common.txfm_mode > ALLOW_16X16) { read_coef_probs_common(bc, pc->fc.coef_probs_32x32, BLOCK_TYPES_32X32); |