diff options
Diffstat (limited to 'libavcodec/lagarithrac.c')
| -rw-r--r-- | libavcodec/lagarithrac.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/libavcodec/lagarithrac.c b/libavcodec/lagarithrac.c index 7441dc7e83..cdda67fb81 100644 --- a/libavcodec/lagarithrac.c +++ b/libavcodec/lagarithrac.c @@ -3,20 +3,20 @@ * Copyright (c) 2009 Nathan Caldwell <saintdev (at) gmail.com> * Copyright (c) 2009 David Conrad * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -27,33 +27,31 @@ * @author David Conrad */ -#include "bitstream.h" +#include "get_bits.h" #include "lagarithrac.h" -void ff_lag_rac_init(lag_rac *l, BitstreamContext *bc, int length) +void ff_lag_rac_init(lag_rac *l, GetBitContext *gb, int length) { int i, j, left; /* According to reference decoder "1st byte is garbage", - * however, it gets skipped by the call to bitstream_align() + * however, it gets skipped by the call to align_get_bits() */ - bitstream_align(bc); - left = bitstream_bits_left(bc) >> 3; + align_get_bits(gb); + left = get_bits_left(gb) >> 3; l->bytestream_start = - l->bytestream = bc->buffer + bitstream_tell(bc) / 8; - l->bytestream_end = l->bytestream_start + FFMIN(length, left); + l->bytestream = gb->buffer + get_bits_count(gb) / 8; + l->bytestream_end = l->bytestream_start + left; l->range = 0x80; l->low = *l->bytestream >> 1; - l->hash_shift = FFMAX(l->scale, 8) - 8; + l->hash_shift = FFMAX(l->scale, 10) - 10; + l->overread = 0; - for (i = j = 0; i < 256; i++) { + for (i = j = 0; i < 1024; i++) { unsigned r = i << l->hash_shift; while (l->prob[j + 1] <= r) j++; l->range_hash[i] = j; } - - /* Add conversion factor to hash_shift so we don't have to in lag_get_rac. */ - l->hash_shift += 23; } |