* AC3 IMDCT and downmix functions are now in plugins, --imdct and

[vlc] / plugins / downmix / ac3_downmix_c.c

diff --git a/src/ac3_decoder/ac3_downmix_c.c b/plugins/downmix/ac3_downmix_c.c
similarity index 82%
rename from src/ac3_decoder/ac3_downmix_c.c
rename to plugins/downmix/ac3_downmix_c.c
index 08573af5632aef03adba48c1b992a7763d2ed185..759933d6a77bae456e089f6b7e02f4b4ddbe26d7 100644 (file)
--- a/src/ac3_decoder/ac3_downmix_c.c
+++ b/plugins/downmix/ac3_downmix_c.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * ac3_downmix_c.c: ac3 downmix functions
+ * ac3_downmix_c.c: ac3 downmix functions in C
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: ac3_downmix_c.c,v 1.8 2001/05/14 15:58:04 reno Exp $
+ * $Id: ac3_downmix_c.c,v 1.1 2001/05/15 16:19:42 sam Exp $
  *
  * Authors: Renaud Dartus <reno@videolan.org>
  *          Aaron Holtzman <aholtzma@engr.uvic.ca>
@@ -22,6 +22,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#define MODULE_NAME downmix
+#include "modules_inner.h"
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
 #include "defs.h"
 
 #include <string.h>                                              /* memcpy() */
@@ -31,12 +37,9 @@
 #include "threads.h"
 #include "mtime.h"
 
-#include "stream_control.h"
-#include "input_ext-dec.h"
+#include "ac3_downmix.h"
 
-#include "ac3_decoder.h"
-
-void downmix_3f_2r_to_2ch_c (float *samples, dm_par_t *dm_par)
+void _M( downmix_3f_2r_to_2ch ) (float *samples, dm_par_t *dm_par)
 {
     int i;
     float *left, *right, *center, *left_sur, *right_sur;
@@ -56,7 +59,7 @@ void downmix_3f_2r_to_2ch_c (float *samples, dm_par_t *dm_par)
     }
 }
 
-void downmix_2f_2r_to_2ch_c (float *samples, dm_par_t *dm_par)
+void _M( downmix_2f_2r_to_2ch ) (float *samples, dm_par_t *dm_par)
 {
     int i;
     float *left, *right, *left_sur, *right_sur;
@@ -75,7 +78,7 @@ void downmix_2f_2r_to_2ch_c (float *samples, dm_par_t *dm_par)
     }
 }
 
-void downmix_3f_1r_to_2ch_c (float *samples, dm_par_t *dm_par)
+void _M( downmix_3f_1r_to_2ch ) (float *samples, dm_par_t *dm_par)
 {
     int i;
     float *left, *right, *center, *right_sur;
@@ -95,7 +98,7 @@ void downmix_3f_1r_to_2ch_c (float *samples, dm_par_t *dm_par)
 }
 
 
-void downmix_2f_1r_to_2ch_c (float *samples, dm_par_t *dm_par)
+void _M( downmix_2f_1r_to_2ch ) (float *samples, dm_par_t *dm_par)
 {
     int i;
     float *left, *right, *right_sur;
@@ -114,7 +117,7 @@ void downmix_2f_1r_to_2ch_c (float *samples, dm_par_t *dm_par)
 }
 
 
-void downmix_3f_0r_to_2ch_c (float *samples, dm_par_t *dm_par)
+void _M( downmix_3f_0r_to_2ch ) (float *samples, dm_par_t *dm_par)
 {
     int i;
     float *left, *right, *center;
@@ -133,7 +136,7 @@ void downmix_3f_0r_to_2ch_c (float *samples, dm_par_t *dm_par)
 }
 
 
-void stream_sample_2ch_to_s16_c (s16 *out_buf, float *left, float *right)
+void _M( stream_sample_2ch_to_s16 ) (s16 *out_buf, float *left, float *right)
 {
     int i;
     for (i=0; i < 256; i++) {
@@ -143,7 +146,7 @@ void stream_sample_2ch_to_s16_c (s16 *out_buf, float *left, float *right)
 }
 
 
-void stream_sample_1ch_to_s16_c (s16 *out_buf, float *center)
+void _M( stream_sample_1ch_to_s16 ) (s16 *out_buf, float *center)
 {
     int i;
     float tmp;
@@ -153,3 +156,4 @@ void stream_sample_1ch_to_s16_c (s16 *out_buf, float *center)
         *out_buf++ = tmp;
     }
 }
+