* Some changes to preferences categorization (This really needs a lot more work)

[vlc] / modules / audio_filter / converter / mpgatofixed32.c

diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c
index 23452e1a1032169c4da71f0547664e03412c5f3a..8295a24c2ebca9c6bf9cfcd2674cf909f5bd2ab8 100644 (file)
--- a/modules/audio_filter/converter/mpgatofixed32.c
+++ b/modules/audio_filter/converter/mpgatofixed32.c
@@ -2,7 +2,7 @@
  * mpgatofixed32.c: MPEG-1 & 2 audio layer I, II, III + MPEG 2.5 decoder,
  * using MAD (MPEG Audio Decoder)
  *****************************************************************************
- * Copyright (C) 2001 by Jean-Paul Saman
+ * Copyright (C) 2001-2005 VideoLAN
  * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -62,6 +62,8 @@ struct filter_sys_t
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
+    set_category( CAT_INPUT );
+    set_subcategory( SUBCAT_INPUT_ACODEC );
     set_description( _("MPEG audio decoder") );
     set_capability( "audio filter", 100 );
     set_callbacks( Create, Destroy );
@@ -124,7 +126,7 @@ 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_samples * sizeof(vlc_fixed_t) * 
-                               aout_FormatNbChannels( &p_filter->input );
+                               aout_FormatNbChannels( &p_filter->output );
 
     /* Do the actual decoding now. */
     mad_stream_buffer( &p_sys->mad_stream, p_in_buf->p_buffer,
@@ -163,10 +165,36 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
         switch ( p_pcm->channels )
         {
         case 2:
-            while ( i_samples-- )
+            if ( p_filter->output.i_physical_channels == AOUT_CHAN_CENTER )
+            {
+                while ( i_samples-- )
+                {
+                    *p_samples++ = (*p_left++ >> 1) + (*p_right++ >> 1);
+                }
+            }
+            else if ( p_filter->output.i_original_channels == AOUT_CHAN_LEFT )
             {
-                *p_samples++ = *p_left++;
-                *p_samples++ = *p_right++;
+                while ( i_samples-- )
+                {
+                    *p_samples++ = *p_left;
+                    *p_samples++ = *p_left++;
+                }
+            }
+            else if ( p_filter->output.i_original_channels == AOUT_CHAN_RIGHT )
+            {
+                while ( i_samples-- )
+                {
+                    *p_samples++ = *p_right;
+                    *p_samples++ = *p_right++;
+                }
+            }
+            else
+            {
+                while ( i_samples-- )
+                {
+                    *p_samples++ = *p_left++;
+                    *p_samples++ = *p_right++;
+                }
             }
             break;
 
@@ -176,7 +204,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
             break;
 
         default:
-            msg_Err( p_filter, "cannot interleave %i channels",
+            msg_Err( p_aout, "cannot interleave %i channels",
                      p_pcm->channels );
         }
     }
@@ -189,14 +217,41 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
         mad_fixed_t const * p_left = p_pcm->samples[0];
         mad_fixed_t const * p_right = p_pcm->samples[1];
         float f_temp = (float)FIXED32_ONE;
-        
+
         switch ( p_pcm->channels )
         {
         case 2:
-            while ( i_samples-- )
+            if ( p_filter->output.i_physical_channels == AOUT_CHAN_CENTER )
             {
-                *p_samples++ = (float)*p_left++ / f_temp;
-                *p_samples++ = (float)*p_right++ / f_temp;
+                while ( i_samples-- )
+                {
+                    *p_samples++ = (float)*p_left++ / f_temp / 2 +
+                                   (float)*p_right++ / f_temp / 2;
+                }
+            }
+            else if ( p_filter->output.i_original_channels == AOUT_CHAN_LEFT )
+            {
+                while ( i_samples-- )
+                {
+                    *p_samples++ = (float)*p_left / f_temp;
+                    *p_samples++ = (float)*p_left++ / f_temp;
+                }
+            }
+            else if ( p_filter->output.i_original_channels == AOUT_CHAN_RIGHT )
+            {
+                while ( i_samples-- )
+                {
+                    *p_samples++ = (float)*p_right / f_temp;
+                    *p_samples++ = (float)*p_right++ / f_temp;
+                }
+            }
+            else
+            {
+                while ( i_samples-- )
+                {
+                    *p_samples++ = (float)*p_left++ / f_temp;
+                    *p_samples++ = (float)*p_right++ / f_temp;
+                }
             }
             break;
 
@@ -208,7 +263,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
             break;
 
         default:
-            msg_Err( p_filter, "cannot interleave %i channels",
+            msg_Err( p_aout, "cannot interleave %i channels",
                      p_pcm->channels );
         }
     }
@@ -258,14 +313,18 @@ static int OpenFilter( vlc_object_t *p_this )
     mad_synth_init( &p_sys->mad_synth );
     mad_stream_options( &p_sys->mad_stream, MAD_OPTION_IGNORECRC );
 
-    msg_Err( p_this, "%4.4s->%4.4s, bits per sample: %i",
+    if( p_this->p_libvlc->i_cpu & CPU_CAPABILITY_FPU )
+        p_filter->fmt_out.i_codec = VLC_FOURCC('f','l','3','2');
+    else
+        p_filter->fmt_out.i_codec = VLC_FOURCC('f','i','3','2');
+    p_filter->fmt_out.audio.i_format = p_filter->fmt_out.i_codec;
+
+    p_filter->fmt_out.audio.i_rate = p_filter->fmt_in.audio.i_rate;
+
+    msg_Dbg( p_this, "%4.4s->%4.4s, bits per sample: %i",
              (char *)&p_filter->fmt_in.i_codec,
              (char *)&p_filter->fmt_out.i_codec,
-             p_filter->fmt_out.audio.i_bitspersample );
-
-    p_filter->fmt_out.i_codec =
-        p_filter->fmt_out.audio.i_format = VLC_FOURCC('f','l','3','2');
-    p_filter->fmt_out.audio.i_bitspersample = sizeof(float);
+             p_filter->fmt_in.audio.i_bitspersample );
 
     return 0;
 }
@@ -299,7 +358,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
 
     i_out_size = p_block->i_samples *
       p_filter->fmt_out.audio.i_bitspersample *
-        p_filter->fmt_out.audio.i_channels;
+        p_filter->fmt_out.audio.i_channels / 8;
 
     p_out = p_filter->pf_audio_buffer_new( p_filter, i_out_size );
     if( !p_out )
@@ -331,5 +390,8 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
 
     p_block->pf_release( p_block );
 
+    p_out->i_buffer = out_buf.i_nb_bytes;
+    p_out->i_samples = out_buf.i_nb_samples;
+
     return p_out;
 }