[FFmpeg-cvslog] r23743 - in trunk/libavcodec: mpegaudiodec.c mpegaudiodec_float.c

[vitor]

Author: vitor
Date: Wed Jun 23 22:45:36 2010
New Revision: 23743

Log:
Move float-specific function to mpegaudiodec_float.c

Modified:
   trunk/libavcodec/mpegaudiodec.c
   trunk/libavcodec/mpegaudiodec_float.c

Modified: trunk/libavcodec/mpegaudiodec.c
==============================================================================
--- trunk/libavcodec/mpegaudiodec.c	Wed Jun 23 22:43:37 2010	(r23742)
+++ trunk/libavcodec/mpegaudiodec.c	Wed Jun 23 22:45:36 2010	(r23743)
@@ -897,26 +897,7 @@ static void apply_window_mp3_c(MPA_INT *
 /* 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,

Modified: trunk/libavcodec/mpegaudiodec_float.c
==============================================================================
--- trunk/libavcodec/mpegaudiodec_float.c	Wed Jun 23 22:43:37 2010	(r23742)
+++ trunk/libavcodec/mpegaudiodec_float.c	Wed Jun 23 22:45:36 2010	(r23743)
@@ -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 =
 {