har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/dcadec: Use avpriv_float_dsp_alloc()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-20 22:46:08 +01:00
parent 9018bd1197
commit b054054c9b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/dcadec.c
View File

@ -472,7 +472,7 @@ typedef struct {
int profile; int profile;
int debug_flag; ///< used for suppressing repeated error messages output int debug_flag; ///< used for suppressing repeated error messages output
AVFloatDSPContext fdsp; AVFloatDSPContext *fdsp;
FFTContext imdct; FFTContext imdct;
SynthFilterContext synth; SynthFilterContext synth;
DCADSPContext dcadsp; DCADSPContext dcadsp;
@ -2519,8 +2519,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
float *back_chan = s->samples_chanptr[s->channel_order_tab[s->xch_base_channel]]; float *back_chan = s->samples_chanptr[s->channel_order_tab[s->xch_base_channel]];
float *lt_chan = s->samples_chanptr[s->channel_order_tab[s->xch_base_channel - 2]]; float *lt_chan = s->samples_chanptr[s->channel_order_tab[s->xch_base_channel - 2]];
float *rt_chan = s->samples_chanptr[s->channel_order_tab[s->xch_base_channel - 1]]; float *rt_chan = s->samples_chanptr[s->channel_order_tab[s->xch_base_channel - 1]];
s->fdsp.vector_fmac_scalar(lt_chan, back_chan, -M_SQRT1_2, 256); s->fdsp->vector_fmac_scalar(lt_chan, back_chan, -M_SQRT1_2, 256);
s->fdsp.vector_fmac_scalar(rt_chan, back_chan, -M_SQRT1_2, 256); s->fdsp->vector_fmac_scalar(rt_chan, back_chan, -M_SQRT1_2, 256);
} }
/* If stream contains XXCH, we might need to undo an embedded downmix */ /* If stream contains XXCH, we might need to undo an embedded downmix */
@ -2540,7 +2540,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
scale = s->xxch_dmix_coeff[j][k]; scale = s->xxch_dmix_coeff[j][k];
if (scale != 0.0) { if (scale != 0.0) {
dst_chan = s->samples_chanptr[achan]; dst_chan = s->samples_chanptr[achan];
s->fdsp.vector_fmac_scalar(dst_chan, src_chan, s->fdsp->vector_fmac_scalar(dst_chan, src_chan,
-scale, 256); -scale, 256);
} }
} }
@ -2603,7 +2603,10 @@ static av_cold int dca_decode_init(AVCodecContext *avctx)
s->avctx = avctx; s->avctx = avctx;
dca_init_vlcs(); dca_init_vlcs();
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)
return AVERROR(ENOMEM);
ff_mdct_init(&s->imdct, 6, 1, 1.0); ff_mdct_init(&s->imdct, 6, 1, 1.0);
ff_synth_filter_init(&s->synth); ff_synth_filter_init(&s->synth);
ff_dcadsp_init(&s->dcadsp); ff_dcadsp_init(&s->dcadsp);
@ -2630,6 +2633,7 @@ static av_cold int dca_decode_end(AVCodecContext *avctx)
DCAContext *s = avctx->priv_data; DCAContext *s = avctx->priv_data;
ff_mdct_end(&s->imdct); ff_mdct_end(&s->imdct);
av_freep(&s->extra_channels_buffer); av_freep(&s->extra_channels_buffer);
av_freep(&s->fdsp);
return 0; return 0;
} }