Commit 9b4cd586 authored by Vitor Sessak's avatar Vitor Sessak Committed by Ronald S. Bultje

mpegaudiodec: use DSPUtil.butterflies_float().

Signed-off-by: 's avatarRonald S. Bultje <rsbultje@gmail.com>
parent 841c1717
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "get_bits.h" #include "get_bits.h"
#include "mathops.h" #include "mathops.h"
#include "mpegaudiodsp.h" #include "mpegaudiodsp.h"
#include "dsputil.h"
/* /*
* TODO: * TODO:
...@@ -80,6 +81,7 @@ typedef struct MPADecodeContext { ...@@ -80,6 +81,7 @@ typedef struct MPADecodeContext {
int err_recognition; int err_recognition;
AVCodecContext* avctx; AVCodecContext* avctx;
MPADSPContext mpadsp; MPADSPContext mpadsp;
DSPContext dsp;
AVFrame frame; AVFrame frame;
} MPADecodeContext; } MPADecodeContext;
...@@ -432,6 +434,7 @@ static av_cold int decode_init(AVCodecContext * avctx) ...@@ -432,6 +434,7 @@ static av_cold int decode_init(AVCodecContext * avctx)
s->avctx = avctx; s->avctx = avctx;
ff_mpadsp_init(&s->mpadsp); ff_mpadsp_init(&s->mpadsp);
ff_dsputil_init(&s->dsp, avctx);
avctx->sample_fmt= OUT_FMT; avctx->sample_fmt= OUT_FMT;
s->err_recognition = avctx->err_recognition; s->err_recognition = avctx->err_recognition;
...@@ -1153,6 +1156,9 @@ found2: ...@@ -1153,6 +1156,9 @@ found2:
/* ms stereo ONLY */ /* ms stereo ONLY */
/* NOTE: the 1/sqrt(2) normalization factor is included in the /* NOTE: the 1/sqrt(2) normalization factor is included in the
global gain */ global gain */
#if CONFIG_FLOAT
s-> dsp.butterflies_float(g0->sb_hybrid, g1->sb_hybrid, 576);
#else
tab0 = g0->sb_hybrid; tab0 = g0->sb_hybrid;
tab1 = g1->sb_hybrid; tab1 = g1->sb_hybrid;
for (i = 0; i < 576; i++) { for (i = 0; i < 576; i++) {
...@@ -1161,6 +1167,7 @@ found2: ...@@ -1161,6 +1167,7 @@ found2:
tab0[i] = tmp0 + tmp1; tab0[i] = tmp0 + tmp1;
tab1[i] = tmp0 - tmp1; tab1[i] = tmp0 - tmp1;
} }
#endif
} }
} }
......
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