generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/opus_celt: Use avpriv_float_dsp_alloc()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-01 18:12:38 +01:00
parent 3384d76503
commit 00d4759134
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/opus_celt.c
View File

@ -62,7 +62,7 @@ struct CeltContext {
// constant values that do not change during context lifetime // constant values that do not change during context lifetime
AVCodecContext *avctx; AVCodecContext *avctx;
CeltIMDCTContext *imdct[4]; CeltIMDCTContext *imdct[4];
AVFloatDSPContext dsp; AVFloatDSPContext *dsp;
int output_channels; int output_channels;
// values that have inter-frame effect and must be reset on flush // values that have inter-frame effect and must be reset on flush
@ -2072,7 +2072,7 @@ int ff_celt_decode_frame(CeltContext *s, OpusRangeCoder *rc,
/* stereo -> mono downmix */ /* stereo -> mono downmix */
if (s->output_channels < s->coded_channels) { if (s->output_channels < s->coded_channels) {
s->dsp.vector_fmac_scalar(s->coeffs[0], s->coeffs[1], 1.0, FFALIGN(frame_size, 16)); s->dsp->vector_fmac_scalar(s->coeffs[0], s->coeffs[1], 1.0, FFALIGN(frame_size, 16));
imdct_scale = 0.5; imdct_scale = 0.5;
} else if (s->output_channels > s->coded_channels) } else if (s->output_channels > s->coded_channels)
memcpy(s->coeffs[1], s->coeffs[0], frame_size * sizeof(float)); memcpy(s->coeffs[1], s->coeffs[0], frame_size * sizeof(float));
@ -2098,7 +2098,7 @@ int ff_celt_decode_frame(CeltContext *s, OpusRangeCoder *rc,
imdct->imdct_half(imdct, dst + CELT_OVERLAP / 2, s->coeffs[i] + j, imdct->imdct_half(imdct, dst + CELT_OVERLAP / 2, s->coeffs[i] + j,
s->blocks, imdct_scale); s->blocks, imdct_scale);
s->dsp.vector_fmul_window(dst, dst, dst + CELT_OVERLAP / 2, s->dsp->vector_fmul_window(dst, dst, dst + CELT_OVERLAP / 2,
celt_window, CELT_OVERLAP / 2); celt_window, CELT_OVERLAP / 2);
} }
@ -2181,6 +2181,7 @@ void ff_celt_free(CeltContext **ps)
for (i = 0; i < FF_ARRAY_ELEMS(s->imdct); i++) for (i = 0; i < FF_ARRAY_ELEMS(s->imdct); i++)
ff_celt_imdct_uninit(&s->imdct[i]); ff_celt_imdct_uninit(&s->imdct[i]);
av_freep(&s->dsp);
av_freep(ps); av_freep(ps);
} }
@ -2208,7 +2209,11 @@ int ff_celt_init(AVCodecContext *avctx, CeltContext **ps, int output_channels)
goto fail; goto fail;
} }
avpriv_float_dsp_init(&s->dsp, avctx->flags & CODEC_FLAG_BITEXACT); s->dsp = avpriv_float_dsp_alloc(avctx->flags & CODEC_FLAG_BITEXACT);
if (!s->dsp) {
ret = AVERROR(ENOMEM);
goto fail;
}
ff_celt_flush(s); ff_celt_flush(s);