diff options
| author | Alexandra Hájková <alexandra@khirnov.net> | 2016-04-12 18:39:16 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-11-18 10:36:18 +0100 |
| commit | 0dabd329e84a6a7b074fa55da844fc827a47aa01 (patch) | |
| tree | 8ab7c8144a7b646ba918d51b451a4d06557af75b /libavcodec/qcelpdec.c | |
| parent | 770406d1e8291dbfd846210d08c1b322d30c8142 (diff) | |
| download | ffmpeg-0dabd329e84a6a7b074fa55da844fc827a47aa01.tar.gz | |
qcelp: Convert to the new bitstream reader
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/qcelpdec.c')
| -rw-r--r-- | libavcodec/qcelpdec.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c index e9e73475c3..9d5e13a117 100644 --- a/libavcodec/qcelpdec.c +++ b/libavcodec/qcelpdec.c @@ -31,9 +31,10 @@ #include "libavutil/channel_layout.h" #include "libavutil/float_dsp.h" + #include "avcodec.h" +#include "bitstream.h" #include "internal.h" -#include "get_bits.h" #include "qcelpdata.h" #include "celp_filters.h" #include "acelp_filters.h" @@ -53,7 +54,7 @@ typedef enum { } qcelp_packet_rate; typedef struct QCELPContext { - GetBitContext gb; + BitstreamContext bc; qcelp_packet_rate bitrate; QCELPFrame frame; /**< unpacked data frame */ @@ -718,12 +719,12 @@ static int qcelp_decode_frame(AVCodecContext *avctx, void *data, qcelp_unpacking_bitmaps_lengths[q->bitrate]; uint8_t *unpacked_data = (uint8_t *)&q->frame; - init_get_bits(&q->gb, buf, 8 * buf_size); + bitstream_init(&q->bc, buf, 8 * buf_size); memset(&q->frame, 0, sizeof(QCELPFrame)); for (; bitmaps < bitmaps_end; bitmaps++) - unpacked_data[bitmaps->index] |= get_bits(&q->gb, bitmaps->bitlen) << bitmaps->bitpos; + unpacked_data[bitmaps->index] |= bitstream_read(&q->bc, bitmaps->bitlen) << bitmaps->bitpos; // Check for erasures/blanks on rates 1, 1/4 and 1/8. if (q->frame.reserved) { |