diff options
author | John Koleszar <jkoleszar@google.com> | 2010-11-19 00:05:03 -0500 |
---|---|---|
committer | John Koleszar <jkoleszar@google.com> | 2010-11-19 00:05:03 -0500 |
commit | 1a1a8ea4df761f13c254cf021ff5d6510f42d95b (patch) | |
tree | fcaedef4f5819b723ba9505bebb5119af35bee18 /vp8/decoder | |
parent | f3919f187999b0f0c55cb252ae92394483f0152b (diff) | |
parent | 0867b8167899b9df7a0b40bbc416abd359ac0ac8 (diff) | |
download | libvpx-1a1a8ea4df761f13c254cf021ff5d6510f42d95b.tar libvpx-1a1a8ea4df761f13c254cf021ff5d6510f42d95b.tar.gz libvpx-1a1a8ea4df761f13c254cf021ff5d6510f42d95b.tar.bz2 libvpx-1a1a8ea4df761f13c254cf021ff5d6510f42d95b.zip |
Merge remote branch 'internal/upstream-experimental' into HEAD
Diffstat (limited to 'vp8/decoder')
-rw-r--r-- | vp8/decoder/detokenize.c | 24 | ||||
-rw-r--r-- | vp8/decoder/onyxd_int.h | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/vp8/decoder/detokenize.c b/vp8/decoder/detokenize.c index 7d013d240..1fdfdb783 100644 --- a/vp8/decoder/detokenize.c +++ b/vp8/decoder/detokenize.c @@ -38,23 +38,23 @@ typedef struct { INT16 min_val; INT16 Length; - UINT8 Probs[12]; + UINT8 Probs[14]; } TOKENEXTRABITS; */ DECLARE_ALIGNED(16, static const TOKENEXTRABITS, vp8d_token_extra_bits2[MAX_ENTROPY_TOKENS]) = { - { 0, -1, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* ZERO_TOKEN */ - { 1, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* ONE_TOKEN */ - { 2, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* TWO_TOKEN */ - { 3, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* THREE_TOKEN */ - { 4, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* FOUR_TOKEN */ - { 5, 0, { 159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY1 */ - { 7, 1, { 145, 165, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY2 */ - { 11, 2, { 140, 148, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY3 */ - { 19, 3, { 135, 140, 155, 176, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY4 */ - { 35, 4, { 130, 134, 141, 157, 180, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY5 */ - { 67, 10, { 129, 130, 133, 140, 153, 177, 196, 230, 243, 254, 254, 0 } }, /* DCT_VAL_CATEGORY6 */ + { 0, -1, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* ZERO_TOKEN */ + { 1, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* ONE_TOKEN */ + { 2, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* TWO_TOKEN */ + { 3, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* THREE_TOKEN */ + { 4, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* FOUR_TOKEN */ + { 5, 0, { 159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY1 */ + { 7, 1, { 145, 165, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY2 */ + { 11, 2, { 140, 148, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY3 */ + { 19, 3, { 135, 140, 155, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY4 */ + { 35, 4, { 130, 134, 141, 157, 180, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY5 */ + { 67, 12, { 129, 130, 133, 140, 153, 177, 196, 230, 243, 249, 252, 254, 254, 0 } }, /* DCT_VAL_CATEGORY6 */ { 0, -1, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* EOB TOKEN */ }; diff --git a/vp8/decoder/onyxd_int.h b/vp8/decoder/onyxd_int.h index fc1811d7f..940d1afa0 100644 --- a/vp8/decoder/onyxd_int.h +++ b/vp8/decoder/onyxd_int.h @@ -41,9 +41,9 @@ typedef struct typedef struct { - INT16 min_val; - INT16 Length; - UINT8 Probs[12]; + INT16 min_val; + INT16 Length; + UINT8 Probs[14]; } TOKENEXTRABITS; typedef struct |