diff options
author | Alexandra Hájková <alexandra@khirnov.net> | 2016-04-12 18:24:27 +0200 |
---|---|---|
committer | Alexandra Hájková <alexandra@khirnov.net> | 2016-05-22 16:47:58 +0200 |
commit | 3a71f35255584823a3fc477565cfc46dfba767e8 (patch) | |
tree | 4c818497b1815f69667f17f8c27d084a348c4029 | |
parent | 5962ddd8bd7b022c81a874b9d95259d0007733a1 (diff) |
nellymoser: convert to the new bitstream reader
-rw-r--r-- | libavcodec/nellymoser.c | 2 | ||||
-rw-r--r-- | libavcodec/nellymoserdec.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/nellymoser.c b/libavcodec/nellymoser.c index 0740c75a0f..e3d8cd9125 100644 --- a/libavcodec/nellymoser.c +++ b/libavcodec/nellymoser.c @@ -35,7 +35,7 @@ #include "avcodec.h" #define BITSTREAM_READER_LE -#include "get_bits.h" +#include "bitstream.h" const float ff_nelly_dequantization_table[127] = { 0.0000000000, diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index 5033282061..3158b34d20 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -42,13 +42,13 @@ #include "sinewin.h" #define BITSTREAM_READER_LE -#include "get_bits.h" +#include "bitstream.h" typedef struct NellyMoserDecodeContext { AVCodecContext* avctx; AVLFG random_state; - GetBitContext gb; + BitstreamContext bc; float scale_bias; AVFloatDSPContext fdsp; FFTContext imdct_ctx; @@ -67,14 +67,14 @@ static void nelly_decode_block(NellyMoserDecodeContext *s, int bits[NELLY_BUF_LEN]; unsigned char v; - init_get_bits(&s->gb, block, NELLY_BLOCK_LEN * 8); + bitstream_init(&s->bc, block, NELLY_BLOCK_LEN * 8); bptr = buf; pptr = pows; - val = ff_nelly_init_table[get_bits(&s->gb, 6)]; + val = ff_nelly_init_table[bitstream_read(&s->bc, 6)]; for (i=0 ; i<NELLY_BANDS ; i++) { if (i > 0) - val += ff_nelly_delta_table[get_bits(&s->gb, 5)]; + val += ff_nelly_delta_table[bitstream_read(&s->bc, 5)]; pval = -pow(2, val/2048) * s->scale_bias; for (j = 0; j < ff_nelly_band_sizes_table[i]; j++) { *bptr++ = val; @@ -88,8 +88,8 @@ static void nelly_decode_block(NellyMoserDecodeContext *s, for (i = 0; i < 2; i++) { aptr = audio + i * NELLY_BUF_LEN; - init_get_bits(&s->gb, block, NELLY_BLOCK_LEN * 8); - skip_bits_long(&s->gb, NELLY_HEADER_BITS + i*NELLY_DETAIL_BITS); + bitstream_init(&s->bc, block, NELLY_BLOCK_LEN * 8); + bitstream_skip(&s->bc, NELLY_HEADER_BITS + i*NELLY_DETAIL_BITS); for (j = 0; j < NELLY_FILL_LEN; j++) { if (bits[j] <= 0) { @@ -97,7 +97,7 @@ static void nelly_decode_block(NellyMoserDecodeContext *s, if (av_lfg_get(&s->random_state) & 1) aptr[j] *= -1.0; } else { - v = get_bits(&s->gb, bits[j]); + v = bitstream_read(&s->bc, bits[j]); aptr[j] = ff_nelly_dequantization_table[(1<<bits[j])-1+v]*pows[j]; } } |