Mercurial > libavcodec.hg
changeset 11757:7dff9c1061e1 libavcodec
theora: Don't read an excess bit for maximum length long bit runs if the run
exactly ends the remaining blocks.
| author | conrad |
|---|---|
| date | Tue, 25 May 2010 03:19:54 +0000 |
| parents | cec5a6f0beec |
| children | 6c1e78b8aba5 |
| files | vp3.c |
| diffstat | 1 files changed, 24 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/vp3.c Tue May 25 01:19:08 2010 +0000 +++ b/vp3.c Tue May 25 03:19:54 2010 +0000 @@ -378,8 +378,15 @@ } else { /* unpack the list of partially-coded superblocks */ - bit = get_bits1(gb); + bit = get_bits1(gb) ^ 1; + current_run = 0; + while (current_superblock < s->superblock_count && get_bits_left(gb) > 0) { + if (s->theora && current_run == MAXIMUM_LONG_BIT_RUN) + bit = get_bits1(gb); + else + bit ^= 1; + current_run = get_vlc2(gb, s->superblock_run_length_vlc.table, 6, 2) + 1; if (current_run == 34) @@ -395,11 +402,6 @@ current_superblock += current_run; if (bit) num_partial_superblocks += current_run; - - if (s->theora && current_run == MAXIMUM_LONG_BIT_RUN) - bit = get_bits1(gb); - else - bit ^= 1; } /* unpack the list of fully coded superblocks if any of the blocks were @@ -408,9 +410,17 @@ int superblocks_decoded = 0; current_superblock = 0; - bit = get_bits1(gb); + bit = get_bits1(gb) ^ 1; + current_run = 0; + while (superblocks_decoded < s->superblock_count - num_partial_superblocks && get_bits_left(gb) > 0) { + + if (s->theora && current_run == MAXIMUM_LONG_BIT_RUN) + bit = get_bits1(gb); + else + bit ^= 1; + current_run = get_vlc2(gb, s->superblock_run_length_vlc.table, 6, 2) + 1; if (current_run == 34) @@ -429,11 +439,6 @@ } } superblocks_decoded += current_run; - - if (s->theora && current_run == MAXIMUM_LONG_BIT_RUN) - bit = get_bits1(gb); - else - bit ^= 1; } } @@ -800,9 +805,15 @@ for (qpi = 0; qpi < s->nqps-1 && num_blocks > 0; qpi++) { i = blocks_decoded = num_blocks_at_qpi = 0; - bit = get_bits1(gb); + bit = get_bits1(gb) ^ 1; + run_length = 0; do { + if (run_length == MAXIMUM_LONG_BIT_RUN) + bit = get_bits1(gb); + else + bit ^= 1; + run_length = get_vlc2(gb, s->superblock_run_length_vlc.table, 6, 2) + 1; if (run_length == 34) run_length += get_bits(gb, 12); @@ -820,11 +831,6 @@ j++; } } - - if (run_length == MAXIMUM_LONG_BIT_RUN) - bit = get_bits1(gb); - else - bit ^= 1; } while (blocks_decoded < num_blocks && get_bits_left(gb) > 0); num_blocks -= num_blocks_at_qpi;