X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fnellymoserdec.c;h=59c1b3bdd87958114a1f8efc32007e47a76cbf8c;hb=d1be646e906487b395190af1d6dd8d33c22bf25f;hp=a4c74ea67601fac1203d6a0ee5eaded3f4a3dabf;hpb=fd76c37fd9f564b4e979fbe20ecfcfad13f8b4f4;p=ffmpeg diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index a4c74ea6760..59c1b3bdd87 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -26,36 +26,38 @@ */ /** - * @file nellymoserdec.c + * @file * The 3 alphanumeric copyright notices are md5summed they are from the original * implementors. The original code is available from http://code.google.com/p/nelly2pcm/ */ #include "nellymoser.h" -#include "libavutil/random.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 "sinewin.h" #define ALT_BITSTREAM_READER_LE -#include "bitstream.h" +#include "get_bits.h" typedef struct NellyMoserDecodeContext { AVCodecContext* avctx; - DECLARE_ALIGNED_16(float,float_buf[NELLY_SAMPLES]); + DECLARE_ALIGNED(32, float, float_buf)[NELLY_SAMPLES]; float state[128]; - AVRandomState random_state; + AVLFG random_state; GetBitContext gb; - int add_bias; float scale_bias; DSPContext dsp; - MDCTContext imdct_ctx; - DECLARE_ALIGNED_16(float,imdct_tmp[NELLY_BUF_LEN]); - DECLARE_ALIGNED_16(float,imdct_out[NELLY_BUF_LEN * 2]); + FFTContext imdct_ctx; + FmtConvertContext fmt_conv; + DECLARE_ALIGNED(32, float, imdct_out)[NELLY_BUF_LEN * 2]; } NellyMoserDecodeContext; -static DECLARE_ALIGNED_16(float,sine_window[128]); - static void overlap_and_window(NellyMoserDecodeContext *s, float *state, float *audio, float *a_in) { int bot, top; @@ -64,8 +66,8 @@ static void overlap_and_window(NellyMoserDecodeContext *s, float *state, float * top = NELLY_BUF_LEN-1; while (bot < NELLY_BUF_LEN) { - audio[bot] = a_in [bot]*sine_window[bot] - +state[bot]*sine_window[top] + s->add_bias; + audio[bot] = a_in [bot]*ff_sine_128[bot] + +state[bot]*ff_sine_128[top]; bot++; top--; @@ -105,12 +107,12 @@ static void nelly_decode_block(NellyMoserDecodeContext *s, aptr = audio + i * NELLY_BUF_LEN; init_get_bits(&s->gb, block, NELLY_BLOCK_LEN * 8); - skip_bits(&s->gb, NELLY_HEADER_BITS + i*NELLY_DETAIL_BITS); + skip_bits_long(&s->gb, NELLY_HEADER_BITS + i*NELLY_DETAIL_BITS); for (j = 0; j < NELLY_FILL_LEN; j++) { if (bits[j] <= 0) { aptr[j] = M_SQRT1_2*pows[j]; - if (av_random(&s->random_state) & 1) + if (av_lfg_get(&s->random_state) & 1) aptr[j] *= -1.0; } else { v = get_bits(&s->gb, bits[j]); @@ -120,8 +122,7 @@ static void nelly_decode_block(NellyMoserDecodeContext *s, memset(&aptr[NELLY_FILL_LEN], 0, (NELLY_BUF_LEN - NELLY_FILL_LEN) * sizeof(float)); - s->imdct_ctx.fft.imdct_calc(&s->imdct_ctx, s->imdct_out, - aptr, s->imdct_tmp); + 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 */ overlap_and_window(s, s->state, aptr, s->imdct_out); @@ -132,30 +133,28 @@ static av_cold int decode_init(AVCodecContext * avctx) { NellyMoserDecodeContext *s = avctx->priv_data; s->avctx = avctx; - av_init_random(0, &s->random_state); - ff_mdct_init(&s->imdct_ctx, 8, 1); + av_lfg_init(&s->random_state, 0); + ff_mdct_init(&s->imdct_ctx, 8, 1, 1.0); dsputil_init(&s->dsp, avctx); + ff_fmt_convert_init(&s->fmt_conv, avctx); - if(s->dsp.float_to_int16 == ff_float_to_int16_c) { - s->add_bias = 385; - s->scale_bias = 1.0/(8*32768); - } else { - s->add_bias = 0; - s->scale_bias = 1.0/(1*8); - } + s->scale_bias = 1.0/(1*8); /* Generate overlap window */ - if (!sine_window[0]) - ff_sine_window_init(sine_window, 128); + if (!ff_sine_128[127]) + ff_init_ff_sine_windows(7); - avctx->sample_fmt = SAMPLE_FMT_S16; + avctx->sample_fmt = AV_SAMPLE_FMT_S16; + avctx->channel_layout = AV_CH_LAYOUT_MONO; return 0; } static int decode_tag(AVCodecContext * avctx, void *data, int *data_size, - const uint8_t * buf, int buf_size) { + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; NellyMoserDecodeContext *s = avctx->priv_data; int blocks, i; int16_t* samples; @@ -165,23 +164,22 @@ static int decode_tag(AVCodecContext * avctx, if (buf_size < avctx->block_align) return buf_size; - switch (buf_size) { - case 64: // 8000Hz - blocks = 1; break; - case 128: // 11025Hz - blocks = 2; break; - case 256: // 22050Hz - blocks = 4; break; - case 512: // 44100Hz - blocks = 8; break; - default: - av_log(avctx, AV_LOG_DEBUG, "Tag size %d.\n", buf_size); - return buf_size; + if (buf_size % 64) { + av_log(avctx, AV_LOG_ERROR, "Tag size %d.\n", buf_size); + return buf_size; } + blocks = buf_size / 64; + /* Normal numbers of blocks for sample rates: + * 8000 Hz - 1 + * 11025 Hz - 2 + * 16000 Hz - 3 + * 22050 Hz - 4 + * 44100 Hz - 8 + */ for (i=0 ; ifloat_buf); - s->dsp.float_to_int16(&samples[i*NELLY_SAMPLES], s->float_buf, NELLY_SAMPLES); + s->fmt_conv.float_to_int16(&samples[i*NELLY_SAMPLES], s->float_buf, NELLY_SAMPLES); *data_size += NELLY_SAMPLES*sizeof(int16_t); } @@ -195,9 +193,9 @@ static av_cold int decode_end(AVCodecContext * avctx) { return 0; } -AVCodec nellymoser_decoder = { +AVCodec ff_nellymoser_decoder = { "nellymoser", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_NELLYMOSER, sizeof(NellyMoserDecodeContext), decode_init,