diff options
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 21 | ||||
| -rw-r--r-- | libavcodec/mpegaudiodec_float.c | 19 |
2 files changed, 20 insertions, 20 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 858f3b4d6d..bdf01ea45a 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -897,26 +897,7 @@ static void apply_window_mp3_c(MPA_INT *synth_buf, MPA_INT *window, /* 32 sub band synthesis filter. Input: 32 sub band samples, Output: 32 samples. */ /* XXX: optimize by avoiding ring buffer usage */ -#if CONFIG_FLOAT -void ff_mpa_synth_filter_float(MPADecodeContext *s, float *synth_buf_ptr, - int *synth_buf_offset, - float *window, int *dither_state, - float *samples, int incr, - float sb_samples[SBLIMIT]) -{ - float *synth_buf; - int offset; - - offset = *synth_buf_offset; - synth_buf = synth_buf_ptr + offset; - - dct32(synth_buf, sb_samples); - s->apply_window_mp3(synth_buf, window, dither_state, samples, incr); - - offset = (offset - 32) & 511; - *synth_buf_offset = offset; -} -#else +#if !CONFIG_FLOAT void ff_mpa_synth_filter(MPA_INT *synth_buf_ptr, int *synth_buf_offset, MPA_INT *window, int *dither_state, OUT_INT *samples, int incr, diff --git a/libavcodec/mpegaudiodec_float.c b/libavcodec/mpegaudiodec_float.c index dcdeea59cf..578270be1e 100644 --- a/libavcodec/mpegaudiodec_float.c +++ b/libavcodec/mpegaudiodec_float.c @@ -22,6 +22,25 @@ #define CONFIG_FLOAT 1 #include "mpegaudiodec.c" +void ff_mpa_synth_filter_float(MPADecodeContext *s, float *synth_buf_ptr, + int *synth_buf_offset, + float *window, int *dither_state, + float *samples, int incr, + float sb_samples[SBLIMIT]) +{ + float *synth_buf; + int offset; + + offset = *synth_buf_offset; + synth_buf = synth_buf_ptr + offset; + + dct32(synth_buf, sb_samples); + s->apply_window_mp3(synth_buf, window, dither_state, samples, incr); + + offset = (offset - 32) & 511; + *synth_buf_offset = offset; +} + #if CONFIG_MP1FLOAT_DECODER AVCodec mp1float_decoder = { |