Commit 1aca990b authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/libmp3lame: Use avpriv_float_dsp_alloc()

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 2fbb9e64
...@@ -52,7 +52,7 @@ typedef struct LAMEContext { ...@@ -52,7 +52,7 @@ typedef struct LAMEContext {
int abr; int abr;
float *samples_flt[2]; float *samples_flt[2];
AudioFrameQueue afq; AudioFrameQueue afq;
AVFloatDSPContext fdsp; AVFloatDSPContext *fdsp;
} LAMEContext; } LAMEContext;
...@@ -79,6 +79,7 @@ static av_cold int mp3lame_encode_close(AVCodecContext *avctx) ...@@ -79,6 +79,7 @@ static av_cold int mp3lame_encode_close(AVCodecContext *avctx)
av_freep(&s->samples_flt[0]); av_freep(&s->samples_flt[0]);
av_freep(&s->samples_flt[1]); av_freep(&s->samples_flt[1]);
av_freep(&s->buffer); av_freep(&s->buffer);
av_freep(&s->fdsp);
ff_af_queue_close(&s->afq); ff_af_queue_close(&s->afq);
...@@ -158,7 +159,12 @@ static av_cold int mp3lame_encode_init(AVCodecContext *avctx) ...@@ -158,7 +159,12 @@ static av_cold int mp3lame_encode_init(AVCodecContext *avctx)
if (ret < 0) if (ret < 0)
goto error; goto error;
avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); s->fdsp = avpriv_float_dsp_alloc(avctx->flags & CODEC_FLAG_BITEXACT);
if (!s->fdsp) {
ret = AVERROR(ENOMEM);
goto error;
}
return 0; return 0;
error: error:
...@@ -197,7 +203,7 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, ...@@ -197,7 +203,7 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
for (ch = 0; ch < avctx->channels; ch++) { for (ch = 0; ch < avctx->channels; ch++) {
s->fdsp.vector_fmul_scalar(s->samples_flt[ch], s->fdsp->vector_fmul_scalar(s->samples_flt[ch],
(const float *)frame->data[ch], (const float *)frame->data[ch],
32768.0f, 32768.0f,
FFALIGN(frame->nb_samples, 8)); FFALIGN(frame->nb_samples, 8));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment