diff options
| author | Alexandra Hájková <alexandra@khirnov.net> | 2016-04-12 12:32:06 +0200 |
|---|---|---|
| committer | Alexandra Hájková <alexandra@khirnov.net> | 2016-05-22 16:47:58 +0200 |
| commit | 489c6845789e986542a02b3d3348cc0bf7bab2b8 (patch) | |
| tree | d2d05600ab0acae5b28d397e3ae70128e6a718e9 | |
| parent | 7b06de5468e7b7a8df0e133949aa76c026869e69 (diff) | |
adxdec: convert to the new bitstream reader
| -rw-r--r-- | libavcodec/adxdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c index dc587b2733..c5d986b0ce 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -22,7 +22,7 @@ #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "adx.h" -#include "get_bits.h" +#include "bitstream.h" #include "internal.h" /** @@ -66,7 +66,7 @@ static int adx_decode(ADXContext *c, int16_t *out, int offset, const uint8_t *in, int ch) { ADXChannelState *prev = &c->prev[ch]; - GetBitContext gb; + BitstreamContext bc; int scale = AV_RB16(in); int i; int s0, s1, s2, d; @@ -75,12 +75,12 @@ static int adx_decode(ADXContext *c, int16_t *out, int offset, if (scale & 0x8000) return -1; - init_get_bits(&gb, in + 2, (BLOCK_SIZE - 2) * 8); + bitstream_init(&bc, in + 2, (BLOCK_SIZE - 2) * 8); out += offset; s1 = prev->s1; s2 = prev->s2; for (i = 0; i < BLOCK_SAMPLES; i++) { - d = get_sbits(&gb, 4); + d = bitstream_read_signed(&bc, 4); s0 = ((d << COEFF_BITS) * scale + c->coeff[0] * s1 + c->coeff[1] * s2) >> COEFF_BITS; s2 = s1; s1 = av_clip_int16(s0); |