MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/libmp3lame: Use avpriv_float_dsp_alloc()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-30 11:21:50 +01:00
parent 2fbb9e647c
commit 1aca990bd9
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/libmp3lame.c
View File

@ -52,7 +52,7 @@ typedef struct LAMEContext {
int abr;
float *samples_flt[2];
AudioFrameQueue afq;
AVFloatDSPContext fdsp;
AVFloatDSPContext *fdsp;
} LAMEContext;
@ -79,6 +79,7 @@ static av_cold int mp3lame_encode_close(AVCodecContext *avctx)
av_freep(&s->samples_flt[0]);
av_freep(&s->samples_flt[1]);
av_freep(&s->buffer);
av_freep(&s->fdsp);
ff_af_queue_close(&s->afq);
@ -158,7 +159,12 @@ static av_cold int mp3lame_encode_init(AVCodecContext *avctx)
if (ret < 0)
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;
error:
@ -197,7 +203,7 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
return AVERROR(EINVAL);
}
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],
32768.0f,
FFALIGN(frame->nb_samples, 8));