diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-09-22 18:13:57 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-11-26 11:29:06 -0500 |
| commit | 284ea790d89441fa1e6b2d72d3c1ed6d61972f0b (patch) | |
| tree | bcfcca17dd96f1ea102ed069072abde7a57920bf /libavcodec/libmp3lame.c | |
| parent | 1e276553886a7ca315a055c489fabe456e789e3f (diff) | |
| download | ffmpeg-284ea790d89441fa1e6b2d72d3c1ed6d61972f0b.tar.gz | |
dsputil: move vector_fmul_scalar() to AVFloatDSPContext in libavutil
Diffstat (limited to 'libavcodec/libmp3lame.c')
| -rw-r--r-- | libavcodec/libmp3lame.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 600f6fd9dd..264a0e2236 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -28,12 +28,12 @@ #include "libavutil/channel_layout.h" #include "libavutil/common.h" +#include "libavutil/float_dsp.h" #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/opt.h" #include "avcodec.h" #include "audio_frame_queue.h" -#include "dsputil.h" #include "internal.h" #include "mpegaudio.h" #include "mpegaudiodecheader.h" @@ -50,7 +50,7 @@ typedef struct LAMEContext { int reservoir; float *samples_flt[2]; AudioFrameQueue afq; - DSPContext dsp; + AVFloatDSPContext fdsp; } LAMEContext; @@ -167,7 +167,7 @@ static av_cold int mp3lame_encode_init(AVCodecContext *avctx) if (ret < 0) goto error; - ff_dsputil_init(&s->dsp, avctx); + avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); return 0; error: @@ -205,10 +205,10 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, return AVERROR(EINVAL); } for (ch = 0; ch < avctx->channels; ch++) { - s->dsp.vector_fmul_scalar(s->samples_flt[ch], - (const float *)frame->data[ch], - 32768.0f, - FFALIGN(frame->nb_samples, 8)); + s->fdsp.vector_fmul_scalar(s->samples_flt[ch], + (const float *)frame->data[ch], + 32768.0f, + FFALIGN(frame->nb_samples, 8)); } ENCODE_BUFFER(lame_encode_buffer_float, float, s->samples_flt); break; |