diff options
| author | Johann <johannkoenig@google.com> | 2011-06-22 07:45:17 -0400 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2011-06-22 07:45:17 -0400 |
| commit | 786246ebf1fd4b875f33a8b0c35bab2a3df911b3 (patch) | |
| tree | fd2235c0be262280a561429bc2df343c79c3d646 /vp8/decoder | |
| parent | e18d7bc23095b89132007c64e38ce262dcb0a943 (diff) | |
| parent | 76495617e05d7192f887c688fa177fea77b9469b (diff) | |
| download | libvpx-786246ebf1fd4b875f33a8b0c35bab2a3df911b3.tar libvpx-786246ebf1fd4b875f33a8b0c35bab2a3df911b3.tar.gz libvpx-786246ebf1fd4b875f33a8b0c35bab2a3df911b3.tar.bz2 libvpx-786246ebf1fd4b875f33a8b0c35bab2a3df911b3.zip | |
Merge remote branch 'origin/master' into experimental
Conflicts:
vp8/encoder/rdopt.c
Use new constant (110) from 10ed60dc7
Change-Id: Ic7d8a45ccc8deeeb94a0ab1c58d5d052ef3c27e4
Diffstat (limited to 'vp8/decoder')
| -rw-r--r-- | vp8/decoder/dboolhuff.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vp8/decoder/dboolhuff.h b/vp8/decoder/dboolhuff.h index 5f6b211ea..f729837f9 100644 --- a/vp8/decoder/dboolhuff.h +++ b/vp8/decoder/dboolhuff.h @@ -81,11 +81,14 @@ static int vp8dx_decode_bool(BOOL_DECODER *br, int probability) { int count; unsigned int range; + split = 1 + (((br->range - 1) * probability) >> 8); + + if(br->count < 0) + vp8dx_bool_decoder_fill(br); + value = br->value; count = br->count; - range = br->range; - split = 1 + (((range - 1) * probability) >> 8); bigsplit = (VP8_BD_VALUE)split << (VP8_BD_VALUE_SIZE - 8); range = split; @@ -106,8 +109,7 @@ static int vp8dx_decode_bool(BOOL_DECODER *br, int probability) { br->value = value; br->count = count; br->range = range; - if(count < 0) - vp8dx_bool_decoder_fill(br); + return bit; } |