#include "libavutil/float_dsp.h"
#include "libavutil/lfg.h"
#include "libavutil/random_seed.h"
+
+#define BITSTREAM_READER_LE
#include "avcodec.h"
+#include "bitstream.h"
#include "fft.h"
-#include "fmtconvert.h"
#include "internal.h"
#include "nellymoser.h"
#include "sinewin.h"
-#define BITSTREAM_READER_LE
-#include "get_bits.h"
-
typedef struct NellyMoserDecodeContext {
AVCodecContext* avctx;
AVLFG random_state;
- GetBitContext gb;
+ BitstreamContext bc;
float scale_bias;
AVFloatDSPContext fdsp;
FFTContext imdct_ctx;
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;
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) {
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];
}
}
av_lfg_init(&s->random_state, 0);
ff_mdct_init(&s->imdct_ctx, 8, 1, 1.0);
- avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
+ avpriv_float_dsp_init(&s->fdsp, avctx->flags & AV_CODEC_FLAG_BITEXACT);
s->scale_bias = 1.0/(32768*8);
avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
/* get output buffer */
frame->nb_samples = NELLY_SAMPLES * blocks;
- if ((ret = ff_get_buffer(avctx, frame)) < 0) {
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
AVCodec ff_nellymoser_decoder = {
.name = "nellymoser",
+ .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"),
.type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_NELLYMOSER,
.priv_data_size = sizeof(NellyMoserDecodeContext),
.init = decode_init,
.close = decode_end,
.decode = decode_tag,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_PARAM_CHANGE,
- .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"),
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_PARAM_CHANGE,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_NONE },
};