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

avcodec/wmaprodec: Use avpriv_float_dsp_alloc() 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-01 18:07:59 +01:00
parent 24fdf7334d
commit 3384d76503
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/wmaprodec.c
View File

@ -171,7 +171,7 @@ typedef struct {
typedef struct WMAProDecodeCtx { typedef struct WMAProDecodeCtx {
/* generic decoder variables */ /* generic decoder variables */
AVCodecContext* avctx; ///< codec context for av_log AVCodecContext* avctx; ///< codec context for av_log
AVFloatDSPContext fdsp; AVFloatDSPContext *fdsp;
uint8_t frame_data[MAX_FRAMESIZE + uint8_t frame_data[MAX_FRAMESIZE +
FF_INPUT_BUFFER_PADDING_SIZE];///< compressed frame data FF_INPUT_BUFFER_PADDING_SIZE];///< compressed frame data
PutBitContext pb; ///< context for filling the frame_data buffer PutBitContext pb; ///< context for filling the frame_data buffer
@ -260,6 +260,8 @@ static av_cold int decode_end(AVCodecContext *avctx)
WMAProDecodeCtx *s = avctx->priv_data; WMAProDecodeCtx *s = avctx->priv_data;
int i; int i;
av_freep(&s->fdsp);
for (i = 0; i < WMAPRO_BLOCK_SIZES; i++) for (i = 0; i < WMAPRO_BLOCK_SIZES; i++)
ff_mdct_end(&s->mdct_ctx[i]); ff_mdct_end(&s->mdct_ctx[i]);
@ -286,7 +288,9 @@ static av_cold int decode_init(AVCodecContext *avctx)
} }
s->avctx = avctx; s->avctx = avctx;
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);
init_put_bits(&s->pb, s->frame_data, MAX_FRAMESIZE); init_put_bits(&s->pb, s->frame_data, MAX_FRAMESIZE);
@ -1037,10 +1041,10 @@ static void inverse_channel_transform(WMAProDecodeCtx *s)
} }
} else if (s->avctx->channels == 2) { } else if (s->avctx->channels == 2) {
int len = FFMIN(sfb[1], s->subframe_len) - sfb[0]; int len = FFMIN(sfb[1], s->subframe_len) - sfb[0];
s->fdsp.vector_fmul_scalar(ch_data[0] + sfb[0], s->fdsp->vector_fmul_scalar(ch_data[0] + sfb[0],
ch_data[0] + sfb[0], ch_data[0] + sfb[0],
181.0 / 128, len); 181.0 / 128, len);
s->fdsp.vector_fmul_scalar(ch_data[1] + sfb[0], s->fdsp->vector_fmul_scalar(ch_data[1] + sfb[0],
ch_data[1] + sfb[0], ch_data[1] + sfb[0],
181.0 / 128, len); 181.0 / 128, len);
} }
@ -1071,7 +1075,7 @@ static void wmapro_window(WMAProDecodeCtx *s)
winlen >>= 1; winlen >>= 1;
s->fdsp.vector_fmul_window(start, start, start + winlen, s->fdsp->vector_fmul_window(start, start, start + winlen,
window, winlen); window, winlen);
s->channel[c].prev_block_len = s->subframe_len; s->channel[c].prev_block_len = s->subframe_len;
@ -1291,7 +1295,7 @@ static int decode_subframe(WMAProDecodeCtx *s)
s->channel[c].scale_factor_step; s->channel[c].scale_factor_step;
const float quant = pow(10.0, exp / 20.0); const float quant = pow(10.0, exp / 20.0);
int start = s->cur_sfb_offsets[b]; int start = s->cur_sfb_offsets[b];
s->fdsp.vector_fmul_scalar(s->tmp + start, s->fdsp->vector_fmul_scalar(s->tmp + start,
s->channel[c].coeffs + start, s->channel[c].coeffs + start,
quant, end - start); quant, end - start);
} }