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

Move float-specific function to mpegaudiodec_float.c

Browse Source 
Originally committed as revision 23743 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2010-06-23 20:45:36 +00:00
parent 9dac6dbb22
commit 47ba787442
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/mpegaudiodec.c
View File

@ -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 sub band synthesis filter. Input: 32 sub band samples, Output:
32 samples. */ 32 samples. */
/* XXX: optimize by avoiding ring buffer usage */ /* XXX: optimize by avoiding ring buffer usage */
#if CONFIG_FLOAT #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
void ff_mpa_synth_filter(MPA_INT *synth_buf_ptr, int *synth_buf_offset, void ff_mpa_synth_filter(MPA_INT *synth_buf_ptr, int *synth_buf_offset,
MPA_INT *window, int *dither_state, MPA_INT *window, int *dither_state,
OUT_INT *samples, int incr, OUT_INT *samples, int incr,

19
libavcodec/mpegaudiodec_float.c
View File

@ -22,6 +22,25 @@
#define CONFIG_FLOAT 1 #define CONFIG_FLOAT 1
#include "mpegaudiodec.c" #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 #if CONFIG_MP1FLOAT_DECODER
AVCodec mp1float_decoder = AVCodec mp1float_decoder =
{ {