X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fnellymoserdec.c;h=5033282061e21b6827c6e071262e63adf20bde6c;hb=e7078e842d93436edba1f30af1f9869d3913f7fe;hp=7723c5827ba5a3229a5c1f19dae71193f9f4fdb3;hpb=0eea212943544d40f99b05571aa7159d78667154;p=ffmpeg diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index 7723c5827ba..5033282061e 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -31,32 +31,30 @@ * implementors. The original code is available from http://code.google.com/p/nelly2pcm/ */ -#include "nellymoser.h" +#include "libavutil/channel_layout.h" +#include "libavutil/float_dsp.h" #include "libavutil/lfg.h" #include "libavutil/random_seed.h" -#include "libavutil/audioconvert.h" #include "avcodec.h" -#include "dsputil.h" #include "fft.h" -#include "fmtconvert.h" +#include "internal.h" +#include "nellymoser.h" #include "sinewin.h" -#define ALT_BITSTREAM_READER_LE +#define BITSTREAM_READER_LE #include "get_bits.h" typedef struct NellyMoserDecodeContext { AVCodecContext* avctx; - AVFrame frame; - float *float_buf; - DECLARE_ALIGNED(16, float, state)[NELLY_BUF_LEN]; AVLFG random_state; GetBitContext gb; float scale_bias; - DSPContext dsp; + AVFloatDSPContext fdsp; FFTContext imdct_ctx; - FmtConvertContext fmt_conv; - DECLARE_ALIGNED(32, float, imdct_out)[NELLY_BUF_LEN * 2]; + DECLARE_ALIGNED(32, float, imdct_buf)[2][NELLY_BUF_LEN]; + float *imdct_out; + float *imdct_prev; } NellyMoserDecodeContext; static void nelly_decode_block(NellyMoserDecodeContext *s, @@ -106,12 +104,11 @@ static void nelly_decode_block(NellyMoserDecodeContext *s, memset(&aptr[NELLY_FILL_LEN], 0, (NELLY_BUF_LEN - NELLY_FILL_LEN) * sizeof(float)); - s->imdct_ctx.imdct_calc(&s->imdct_ctx, s->imdct_out, aptr); - /* XXX: overlapping and windowing should be part of a more - generic imdct function */ - s->dsp.vector_fmul_reverse(s->state, s->state, ff_sine_128, NELLY_BUF_LEN); - s->dsp.vector_fmul_add(aptr, s->imdct_out, ff_sine_128, s->state, NELLY_BUF_LEN); - memcpy(s->state, s->imdct_out + NELLY_BUF_LEN, sizeof(float)*NELLY_BUF_LEN); + s->imdct_ctx.imdct_half(&s->imdct_ctx, s->imdct_out, aptr); + s->fdsp.vector_fmul_window(aptr, s->imdct_prev + NELLY_BUF_LEN / 2, + s->imdct_out, ff_sine_128, + NELLY_BUF_LEN / 2); + FFSWAP(float *, s->imdct_out, s->imdct_prev); } } @@ -119,45 +116,34 @@ static av_cold int decode_init(AVCodecContext * avctx) { NellyMoserDecodeContext *s = avctx->priv_data; s->avctx = avctx; + s->imdct_out = s->imdct_buf[0]; + s->imdct_prev = s->imdct_buf[1]; av_lfg_init(&s->random_state, 0); ff_mdct_init(&s->imdct_ctx, 8, 1, 1.0); - dsputil_init(&s->dsp, avctx); - - if (avctx->request_sample_fmt == AV_SAMPLE_FMT_FLT) { - s->scale_bias = 1.0/(32768*8); - avctx->sample_fmt = AV_SAMPLE_FMT_FLT; - } else { - s->scale_bias = 1.0/(1*8); - avctx->sample_fmt = AV_SAMPLE_FMT_S16; - ff_fmt_convert_init(&s->fmt_conv, avctx); - s->float_buf = av_mallocz(NELLY_SAMPLES * sizeof(*s->float_buf)); - if (!s->float_buf) { - av_log(avctx, AV_LOG_ERROR, "error allocating float buffer\n"); - return AVERROR(ENOMEM); - } - } + 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; /* Generate overlap window */ if (!ff_sine_128[127]) ff_init_ff_sine_windows(7); + avctx->channels = 1; avctx->channel_layout = AV_CH_LAYOUT_MONO; - avcodec_get_frame_defaults(&s->frame); - avctx->coded_frame = &s->frame; - return 0; } static int decode_tag(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { + AVFrame *frame = data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; NellyMoserDecodeContext *s = avctx->priv_data; int blocks, i, ret; - int16_t *samples_s16; float *samples_flt; blocks = buf_size / NELLY_BLOCK_LEN; @@ -178,28 +164,20 @@ static int decode_tag(AVCodecContext *avctx, void *data, */ /* get output buffer */ - s->frame.nb_samples = NELLY_SAMPLES * blocks; - if ((ret = avctx->get_buffer(avctx, &s->frame)) < 0) { + frame->nb_samples = NELLY_SAMPLES * blocks; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } - samples_s16 = (int16_t *)s->frame.data[0]; - samples_flt = (float *)s->frame.data[0]; + samples_flt = (float *)frame->data[0]; for (i=0 ; isample_fmt == SAMPLE_FMT_FLT) { - nelly_decode_block(s, buf, samples_flt); - samples_flt += NELLY_SAMPLES; - } else { - nelly_decode_block(s, buf, s->float_buf); - s->fmt_conv.float_to_int16(samples_s16, s->float_buf, NELLY_SAMPLES); - samples_s16 += NELLY_SAMPLES; - } + nelly_decode_block(s, buf, samples_flt); + samples_flt += NELLY_SAMPLES; buf += NELLY_BLOCK_LEN; } - *got_frame_ptr = 1; - *(AVFrame *)data = s->frame; + *got_frame_ptr = 1; return buf_size; } @@ -207,7 +185,6 @@ static int decode_tag(AVCodecContext *avctx, void *data, static av_cold int decode_end(AVCodecContext * avctx) { NellyMoserDecodeContext *s = avctx->priv_data; - av_freep(&s->float_buf); ff_mdct_end(&s->imdct_ctx); return 0; @@ -215,16 +192,14 @@ static av_cold int decode_end(AVCodecContext * avctx) { AVCodec ff_nellymoser_decoder = { .name = "nellymoser", + .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), .type = AVMEDIA_TYPE_AUDIO, - .id = CODEC_ID_NELLYMOSER, + .id = AV_CODEC_ID_NELLYMOSER, .priv_data_size = sizeof(NellyMoserDecodeContext), .init = decode_init, .close = decode_end, .decode = decode_tag, - .capabilities = CODEC_CAP_DR1, - .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_S16, AV_SAMPLE_FMT_NONE }, }; -