summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandra Hájková <alexandra@khirnov.net>2016-04-13 19:34:49 +0200
committerDiego Biurrun <diego@biurrun.de>2016-11-24 11:22:11 +0100
commitc60cda7cb476315fd7f6d28715316b1aff2e080a (patch)
treee522a6bd2e5fc1538ca909225b05a627e0cc943b
parent7d8075cf471459dee372595c74b7f28cb4e9a05d (diff)
downloadffmpeg-streaming-c60cda7cb476315fd7f6d28715316b1aff2e080a.zip
ffmpeg-streaming-c60cda7cb476315fd7f6d28715316b1aff2e080a.tar.gz
ra288: Convert to the new bitstream reader
-rw-r--r--libavcodec/ra288.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c
index 96d8d1e..bc3fe29 100644
--- a/libavcodec/ra288.c
+++ b/libavcodec/ra288.c
@@ -25,8 +25,8 @@
#define BITSTREAM_READER_LE
#include "avcodec.h"
+#include "bitstream.h"
#include "celp_filters.h"
-#include "get_bits.h"
#include "internal.h"
#include "lpc.h"
#include "ra288.h"
@@ -181,7 +181,7 @@ static int ra288_decode_frame(AVCodecContext * avctx, void *data,
float *out;
int i, ret;
RA288Context *ractx = avctx->priv_data;
- GetBitContext gb;
+ BitstreamContext bc;
if (buf_size < avctx->block_align) {
av_log(avctx, AV_LOG_ERROR,
@@ -198,11 +198,11 @@ static int ra288_decode_frame(AVCodecContext * avctx, void *data,
}
out = (float *)frame->data[0];
- init_get_bits(&gb, buf, avctx->block_align * 8);
+ bitstream_init(&bc, buf, avctx->block_align * 8);
for (i=0; i < RA288_BLOCKS_PER_FRAME; i++) {
- float gain = amptable[get_bits(&gb, 3)];
- int cb_coef = get_bits(&gb, 6 + (i&1));
+ float gain = amptable[bitstream_read(&bc, 3)];
+ int cb_coef = bitstream_read(&bc, 6 + (i & 1));
decode(ractx, gain, cb_coef);
OpenPOWER on IntegriCloud