diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-05-21 12:58:41 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-06-08 13:14:38 -0400 |
| commit | d5a7229ba4aabc2b6407c731d9175879ae54c5ea (patch) | |
| tree | 0596aaae9622f0f7b7e5d689b20ab3dc82f59897 /libavcodec/nellymoserenc.c | |
| parent | 98db4e2a4e35ccc2406004216270ceaa1c6a7d00 (diff) | |
| download | ffmpeg-d5a7229ba4aabc2b6407c731d9175879ae54c5ea.tar.gz | |
Add a float DSP framework to libavutil
Move vector_fmul() from DSPContext to AVFloatDSPContext.
Diffstat (limited to 'libavcodec/nellymoserenc.c')
| -rw-r--r-- | libavcodec/nellymoserenc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c index e1b1d793a4..18ea6846c2 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -35,6 +35,7 @@ * http://wiki.multimedia.cx/index.php?title=Nellymoser */ +#include "libavutil/float_dsp.h" #include "libavutil/mathematics.h" #include "nellymoser.h" #include "avcodec.h" @@ -55,6 +56,7 @@ typedef struct NellyMoserEncodeContext { AVCodecContext *avctx; int last_frame; DSPContext dsp; + AVFloatDSPContext fdsp; FFTContext mdct_ctx; AudioFrameQueue afq; DECLARE_ALIGNED(32, float, mdct_out)[NELLY_SAMPLES]; @@ -120,11 +122,11 @@ static void apply_mdct(NellyMoserEncodeContext *s) float *in1 = s->buf + NELLY_BUF_LEN; float *in2 = s->buf + 2 * NELLY_BUF_LEN; - s->dsp.vector_fmul (s->in_buff, in0, ff_sine_128, NELLY_BUF_LEN); + s->fdsp.vector_fmul (s->in_buff, in0, ff_sine_128, NELLY_BUF_LEN); s->dsp.vector_fmul_reverse(s->in_buff + NELLY_BUF_LEN, in1, ff_sine_128, NELLY_BUF_LEN); s->mdct_ctx.mdct_calc(&s->mdct_ctx, s->mdct_out, s->in_buff); - s->dsp.vector_fmul (s->in_buff, in1, ff_sine_128, NELLY_BUF_LEN); + s->fdsp.vector_fmul (s->in_buff, in1, ff_sine_128, NELLY_BUF_LEN); s->dsp.vector_fmul_reverse(s->in_buff + NELLY_BUF_LEN, in2, ff_sine_128, NELLY_BUF_LEN); s->mdct_ctx.mdct_calc(&s->mdct_ctx, s->mdct_out + NELLY_BUF_LEN, s->in_buff); } @@ -172,6 +174,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if ((ret = ff_mdct_init(&s->mdct_ctx, 8, 0, 32768.0)) < 0) goto error; ff_dsputil_init(&s->dsp, avctx); + avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); /* Generate overlap window */ ff_sine_window_init(ff_sine_128, 128); |