Mercurial > libavcodec.hg
changeset 11935:5e8770f9d8f1 libavcodec
Move float-specific function to mpegaudiodec_float.c
| author | vitor |
|---|---|
| date | Wed, 23 Jun 2010 20:45:36 +0000 |
| parents | f881e8f699f4 |
| children | 0a36d4b2144b |
| files | mpegaudiodec.c mpegaudiodec_float.c |
| diffstat | 2 files changed, 20 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/mpegaudiodec.c Wed Jun 23 20:43:37 2010 +0000 +++ b/mpegaudiodec.c Wed Jun 23 20:45:36 2010 +0000 @@ -897,26 +897,7 @@ /* 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,
--- a/mpegaudiodec_float.c Wed Jun 23 20:43:37 2010 +0000 +++ b/mpegaudiodec_float.c Wed Jun 23 20:45:36 2010 +0000 @@ -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 = {