diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-02-15 12:09:05 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-02-15 14:06:30 -0800 |
| commit | 3af36ea8cc2e532c648e1d76d9aac96a0d612e1f (patch) | |
| tree | 7687c43f1d2eb4de183931bae23cd8d37d8c9775 /vp9/common/vp9_entropy.c | |
| parent | 48598e30b1927487bf51c5c7543984d18ef7db29 (diff) | |
| download | libvpx-3af36ea8cc2e532c648e1d76d9aac96a0d612e1f.tar libvpx-3af36ea8cc2e532c648e1d76d9aac96a0d612e1f.tar.gz libvpx-3af36ea8cc2e532c648e1d76d9aac96a0d612e1f.tar.bz2 libvpx-3af36ea8cc2e532c648e1d76d9aac96a0d612e1f.zip | |
Remove Y2 and Y-no-DC token types from the bitstream.
Change-Id: I7a5314daca993d46b8666ba1ec2ff3766c1e5042
Diffstat (limited to 'vp9/common/vp9_entropy.c')
| -rw-r--r-- | vp9/common/vp9_entropy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vp9/common/vp9_entropy.c b/vp9/common/vp9_entropy.c index df0bf0083..ec96b4489 100644 --- a/vp9/common/vp9_entropy.c +++ b/vp9/common/vp9_entropy.c @@ -1,4 +1,4 @@ -/* + /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license @@ -290,7 +290,7 @@ static void update_coef_probs(vp9_coeff_probs *dst_coef_probs, for (i = 0; i < block_types; ++i) for (j = 0; j < COEF_BANDS; ++j) 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; vp9_tree_probs_from_distribution(MAX_ENTROPY_TOKENS, vp9_coef_encodings, vp9_coef_tree, @@ -389,21 +389,21 @@ void vp9_adapt_coef_probs(VP9_COMMON *cm) { count_sat, update_factor); update_coef_probs(cm->fc.hybrid_coef_probs_4x4, cm->fc.pre_hybrid_coef_probs_4x4, - BLOCK_TYPES_4X4, cm->fc.hybrid_coef_counts_4x4, + BLOCK_TYPES_4X4_HYBRID, cm->fc.hybrid_coef_counts_4x4, count_sat, update_factor); update_coef_probs(cm->fc.coef_probs_8x8, cm->fc.pre_coef_probs_8x8, BLOCK_TYPES_8X8, cm->fc.coef_counts_8x8, count_sat, update_factor); update_coef_probs(cm->fc.hybrid_coef_probs_8x8, cm->fc.pre_hybrid_coef_probs_8x8, - BLOCK_TYPES_8X8, cm->fc.hybrid_coef_counts_8x8, + BLOCK_TYPES_8X8_HYBRID, cm->fc.hybrid_coef_counts_8x8, count_sat, update_factor); update_coef_probs(cm->fc.coef_probs_16x16, cm->fc.pre_coef_probs_16x16, BLOCK_TYPES_16X16, cm->fc.coef_counts_16x16, count_sat, update_factor); update_coef_probs(cm->fc.hybrid_coef_probs_16x16, cm->fc.pre_hybrid_coef_probs_16x16, - BLOCK_TYPES_16X16, cm->fc.hybrid_coef_counts_16x16, + BLOCK_TYPES_16X16_HYBRID, cm->fc.hybrid_coef_counts_16x16, count_sat, update_factor); update_coef_probs(cm->fc.coef_probs_32x32, cm->fc.pre_coef_probs_32x32, BLOCK_TYPES_32X32, cm->fc.coef_counts_32x32, |