Removes trailing spaces. Removes tabs.

[vlc] / modules / audio_filter / channel_mixer / simple.c

diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c
index 1b0cdf1fee7b1b2c79fa9bf09193fd60a9ecb341..7c9c448782708134ba03e1d625ff8c8cebb27405 100644 (file)
--- a/modules/audio_filter/channel_mixer/simple.c
+++ b/modules/audio_filter/channel_mixer/simple.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * simple.c : simple channel mixer plug-in (only 7/7.1/5/5.1 -> Stereo for now)
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
+ * Copyright (C) 2002, 2006 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
@@ -18,18 +18,15 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
 #include <vlc/vlc.h>
-#include "audio_output.h"
-#include "aout_internal.h"
+#include <vlc_aout.h>
 
 /*****************************************************************************
  * Local prototypes
@@ -43,8 +40,10 @@ static void DoWork    ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("audio filter for simple channel mixing") );
+    set_description( _("Audio filter for simple channel mixing") );
     set_capability( "audio filter", 10 );
+    set_category( CAT_AUDIO );
+    set_subcategory( SUBCAT_AUDIO_MISC );
     set_callbacks( Create, NULL );
 vlc_module_end();
 
@@ -66,11 +65,15 @@ static int Create( vlc_object_t *p_this )
         return -1;
     }
 
-    msg_Err( p_this, aout_FormatPrintChannels( &p_filter->input ) );
-
-    /* Only conversion to Stereo right now */
+    /* Only conversion to Stereo and 4.0 right now */
     if( p_filter->output.i_physical_channels !=
-        (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) ) return -1;
+        (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)
+        && p_filter->output.i_physical_channels !=
+        ( AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
+        AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT) )
+        {
+            return -1;
+        }
 
     /* Only from 7/7.1/5/5.1 */
     if( (p_filter->input.i_physical_channels & ~AOUT_CHAN_LFE) !=
@@ -105,28 +108,68 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
     p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes * i_output_nb / i_input_nb;
 
-    if( p_filter->input.i_physical_channels & AOUT_CHAN_MIDDLELEFT )
-    for( i = p_in_buf->i_nb_samples; i--; )
+    if( p_filter->output.i_physical_channels ==
+                            (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) )
     {
-        *p_dest = p_src[6] + 0.5 * p_src[0] + p_src[2] / 4 + p_src[4] / 4;
-        p_dest++;
-        *p_dest = p_src[6] + 0.5 * p_src[1] + p_src[3] / 4 + p_src[5] / 4;
-        p_dest++;
-
-        p_src += 7;
-
-        if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+        if( p_filter->input.i_physical_channels & AOUT_CHAN_MIDDLELEFT )
+        for( i = p_in_buf->i_nb_samples; i--; )
+        {
+            *p_dest = p_src[6] + 0.5 * p_src[0] + p_src[2] / 4 + p_src[4] / 4;
+            p_dest++;
+            *p_dest = p_src[6] + 0.5 * p_src[1] + p_src[3] / 4 + p_src[5] / 4;
+            p_dest++;
+
+            p_src += 7;
+
+            if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+        }
+        else
+        for( i = p_in_buf->i_nb_samples; i--; )
+        {
+            *p_dest = p_src[4] + 0.5 * p_src[0] + 0.33 * p_src[2];
+            p_dest++;
+            *p_dest = p_src[4] + 0.5 * p_src[1] + 0.33 * p_src[3];
+            p_dest++;
+
+            p_src += 5;
+
+            if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+        }
     }
     else
-    for( i = p_in_buf->i_nb_samples; i--; )
     {
-        *p_dest = p_src[4] + 0.5 * p_src[0] + 0.33 * p_src[2];
-        p_dest++;
-        *p_dest = p_src[4] + 0.5 * p_src[1] + 0.33 * p_src[3];
-        p_dest++;
-
-        p_src += 5;
+        if( p_filter->input.i_physical_channels & AOUT_CHAN_MIDDLELEFT )
+        for( i = p_in_buf->i_nb_samples; i--; )
+        {
+            *p_dest = p_src[6] + 0.5 * p_src[0] + p_src[2] / 6;
+            p_dest++;
+            *p_dest = p_src[6] + 0.5 * p_src[1] + p_src[3] / 6;
+            p_dest++;
+            *p_dest = p_src[2] / 6 +  p_src[4];
+            p_dest++;
+            *p_dest = p_src[3] / 6 +  p_src[5];
+            p_dest++;
+
+            p_src += 7;
+
+            if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+        }
+        else
+        for( i = p_in_buf->i_nb_samples; i--; )
+        {
+            *p_dest = p_src[4] + 0.5 * p_src[0];
+            p_dest++;
+            *p_dest = p_src[4] + 0.5 * p_src[1];
+            p_dest++;
+            *p_dest = p_src[2];
+            p_dest++;
+            *p_dest = p_src[3];
+            p_dest++;
+
+            p_src += 5;
+
+            if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+        }
 
-        if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
     }
 }