Commit 21ded9ce authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/imc: Use avpriv_float_dsp_alloc()

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent b054054c
...@@ -96,7 +96,7 @@ typedef struct { ...@@ -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) ...@@ -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, ...@@ -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, ...@@ -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;
} }
......
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