diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2012-02-09 16:44:46 +0000 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2012-02-09 17:22:34 +0000 |
| commit | 3e9890a3944c4480e198020d7daea30f6a0a3ed0 (patch) | |
| tree | 3c50220b372bc5617474840e1aea48a8ea1c480e /vp8/decoder/detokenize.c | |
| parent | cf8af867dddc7830cf42577dd9bb27bf0330a682 (diff) | |
| download | libvpx-3e9890a3944c4480e198020d7daea30f6a0a3ed0.tar libvpx-3e9890a3944c4480e198020d7daea30f6a0a3ed0.tar.gz libvpx-3e9890a3944c4480e198020d7daea30f6a0a3ed0.tar.bz2 libvpx-3e9890a3944c4480e198020d7daea30f6a0a3ed0.zip | |
Merge Extended Q experiment.
Merge the extended Q experiment as indicated by the
Change-Id: I02d9e654fff9998cc7e9e2f1f5cd838dad8fb431
Diffstat (limited to 'vp8/decoder/detokenize.c')
| -rw-r--r-- | vp8/decoder/detokenize.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/vp8/decoder/detokenize.c b/vp8/decoder/detokenize.c index fd134156b..3c0d7403d 100644 --- a/vp8/decoder/detokenize.c +++ b/vp8/decoder/detokenize.c @@ -78,13 +78,8 @@ DECLARE_ALIGNED(64, static const unsigned char, coef_bands_x_8x8[64]) = { #define CAT5_PROB3 157 #define CAT5_PROB4 180 -#if CONFIG_EXTEND_QRANGE static const unsigned char cat6_prob[14] = { 129, 130, 133, 140, 153, 177, 196, 230, 243, 249, 252, 254, 254, 0 }; -#else -static const unsigned char cat6_prob[12] = -{ 129, 130, 133, 140, 153, 177, 196, 230, 243, 254, 254, 0 }; -#endif void vp8_reset_mb_tokens_context(MACROBLOCKD *x) { @@ -379,7 +374,7 @@ CHECK_0_8x8_: DECODE_AND_BRANCH_IF_ZERO(Prob[CAT_FIVE_CONTEXT_NODE], CAT_FIVE_CONTEXT_NODE_0_8x8_); val = CAT6_MIN_VAL; - bits_count = CONFIG_EXTEND_QRANGE?12:10; + bits_count = 12; do { DECODE_EXTRABIT_AND_ADJUST_VAL(cat6_prob[bits_count], bits_count); @@ -718,7 +713,7 @@ CHECK_0_: CAT_FIVE_CONTEXT_NODE_0_); val = CAT6_MIN_VAL; - bits_count = CONFIG_EXTEND_QRANGE?12:10; + bits_count = 12; do { |