RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/imc: Use avpriv_float_dsp_alloc() 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-20 22:46:26 +01:00
parent b054054c9b
commit 21ded9ce67
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/imc.c
View File

@ -96,7 +96,7 @@ typedef struct {
GetBitContext gb; GetBitContext gb;
BswapDSPContext bdsp; BswapDSPContext bdsp;
AVFloatDSPContext fdsp; AVFloatDSPContext *fdsp;
FFTContext fft; FFTContext fft;
DECLARE_ALIGNED(32, FFTComplex, samples)[COEFFS / 2]; DECLARE_ALIGNED(32, FFTComplex, samples)[COEFFS / 2];
float *out_samples; float *out_samples;
@ -256,7 +256,13 @@ static av_cold int imc_decode_init(AVCodecContext *avctx)
return ret; return ret;
} }
ff_bswapdsp_init(&q->bdsp); ff_bswapdsp_init(&q->bdsp);
avpriv_float_dsp_init(&q->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); q->fdsp = avpriv_float_dsp_alloc(avctx->flags & CODEC_FLAG_BITEXACT);
if (!q->fdsp) {
ff_fft_end(&q->fft);
return AVERROR(ENOMEM);
}
avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
avctx->channel_layout = avctx->channels == 1 ? AV_CH_LAYOUT_MONO avctx->channel_layout = avctx->channels == 1 ? AV_CH_LAYOUT_MONO
: AV_CH_LAYOUT_STEREO; : AV_CH_LAYOUT_STEREO;
@ -1044,7 +1050,7 @@ static int imc_decode_frame(AVCodecContext *avctx, void *data,
} }
if (avctx->channels == 2) { if (avctx->channels == 2) {
q->fdsp.butterflies_float((float *)frame->extended_data[0], q->fdsp->butterflies_float((float *)frame->extended_data[0],
(float *)frame->extended_data[1], COEFFS); (float *)frame->extended_data[1], COEFFS);
} }
@ -1053,12 +1059,12 @@ static int imc_decode_frame(AVCodecContext *avctx, void *data,
return IMC_BLOCK_SIZE * avctx->channels; return IMC_BLOCK_SIZE * avctx->channels;
} }
static av_cold int imc_decode_close(AVCodecContext * avctx) static av_cold int imc_decode_close(AVCodecContext * avctx)
{ {
IMCContext *q = avctx->priv_data; IMCContext *q = avctx->priv_data;
ff_fft_end(&q->fft); ff_fft_end(&q->fft);
av_freep(&q->fdsp);
return 0; return 0;
} }