diff options
Diffstat (limited to 'vp8/common/entropy.c')
| -rw-r--r-- | vp8/common/entropy.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/vp8/common/entropy.c b/vp8/common/entropy.c index 58328ceb5..ca37aab22 100644 --- a/vp8/common/entropy.c +++ b/vp8/common/entropy.c @@ -120,14 +120,21 @@ static const Prob Pcat2[] = { 165, 145}; static const Prob Pcat3[] = { 173, 148, 140}; static const Prob Pcat4[] = { 176, 155, 140, 135}; static const Prob Pcat5[] = { 180, 157, 141, 134, 130}; +#if CONFIG_EXTEND_QRANGE static const Prob Pcat6[] = { 254, 254, 252, 249, 243, 230, 196, 177, 153, 140, 133, 130, 129}; +#else +static const Prob Pcat6[] = +{ 254, 254, 243, 230, 196, 177, 153, 140, 133, 130, 129}; + +#endif static vp8_tree_index cat1[2], cat2[4], cat3[6], cat4[8], cat5[10], cat6[22]; void vp8_init_scan_order_mask() { int i; + for (i = 0; i < 16; i++) { vp8_default_zig_zag_mask[vp8_default_zig_zag1d[i]] = 1 << i; @@ -160,7 +167,11 @@ static void init_bit_trees() init_bit_tree(cat3, 3); init_bit_tree(cat4, 4); init_bit_tree(cat5, 5); +#if CONFIG_EXTEND_QRANGE init_bit_tree(cat6, 13); +#else + init_bit_tree(cat6, 11); +#endif } vp8_extra_bit_struct vp8_extra_bits[12] = @@ -175,7 +186,11 @@ vp8_extra_bit_struct vp8_extra_bits[12] = { cat3, Pcat3, 3, 11}, { cat4, Pcat4, 4, 19}, { cat5, Pcat5, 5, 35}, +#if CONFIG_EXTEND_QRANGE { cat6, Pcat6, 13, 67}, +#else + { cat6, Pcat6, 11, 67}, +#endif { 0, 0, 0, 0} }; #include "defaultcoefcounts.h" @@ -183,6 +198,7 @@ vp8_extra_bit_struct vp8_extra_bits[12] = void vp8_default_coef_probs(VP8_COMMON *pc) { int h = 0; + do { int i = 0; @@ -234,6 +250,7 @@ void vp8_default_coef_probs(VP8_COMMON *pc) #endif } + void vp8_coef_tree_initialize() { init_bit_trees(); |