* configure.ac.in: Re-added a52sys module, which was lost somewhere...

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

diff --git a/modules/audio_filter/converter/a52tofloat32.c b/modules/audio_filter/converter/a52tofloat32.c
index b579e51a83f1e2c8d8c8cabcee6c87b933387032..85a4b61d714232f6227f4d802a80db66b9486371 100644 (file)
--- a/modules/audio_filter/converter/a52tofloat32.c
+++ b/modules/audio_filter/converter/a52tofloat32.c
@@ -4,7 +4,7 @@
  *   (http://liba52.sf.net/).
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: a52tofloat32.c,v 1.8 2002/11/21 23:06:08 massiot Exp $
+ * $Id: a52tofloat32.c,v 1.11 2003/01/22 09:54:28 massiot Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -66,6 +66,7 @@ struct aout_filter_sys_t
     a52_state_t * p_liba52; /* liba52 internal structure */
     vlc_bool_t b_dynrng; /* see below */
     int i_flags; /* liba52 flags, see a52dec/doc/liba52.txt */
+    vlc_bool_t b_dontwarn;
     int i_nb_channels; /* number of float32 per sample */
 };
 
@@ -116,6 +117,7 @@ static int Create( vlc_object_t * _p_filter )
     }
 
     p_sys->b_dynrng = config_GetInt( p_filter, "a52-dynrng" );
+    p_sys->b_dontwarn = 0;
 
     /* We'll do our own downmixing, thanks. */
     p_sys->i_nb_channels = aout_FormatNbChannels( &p_filter->output );
@@ -144,6 +146,10 @@ static int Create( vlc_object_t * _p_filter )
         {
             p_sys->i_flags = A52_DOLBY;
         }
+        else if ( p_filter->input.i_original_channels == AOUT_CHAN_CENTER )
+        {
+            p_sys->i_flags = A52_MONO;
+        }
         else if ( p_filter->input.i_original_channels & AOUT_CHAN_DUALMONO )
         {
             p_sys->i_flags = A52_CHANNEL;
@@ -186,7 +192,7 @@ static int Create( vlc_object_t * _p_filter )
         break;
 
     default:
-        msg_Err( p_filter, "unknow sample format !" );
+        msg_Err( p_filter, "unknown sample format !" );
         free( p_sys );
         return -1;
     }
@@ -222,37 +228,37 @@ static void Interleave( float * p_out, const float * p_in, int i_nb_channels )
      * The WG-4 order is appropriate for stereo, quadrophonia, and 5.1 surround.
      *
      * 6 channel mode
-     * channel liba52 order    WG-4 order
-     * 0       LFE             // L
-     * 1       L               // R
-     * 2       C               // LS
-     * 3       R               // RS
-     * 4       LS              // C
-     * 5       RS              // LFE
+     * channel  liba52 order    WG-4 order
+     * 0        LFE             // L
+     * 1        L               // R
+     * 2        C               // LS
+     * 3        R               // RS
+     * 4        LS              // C
+     * 5        RS              // LFE
      *
      * The liba52 moves channels to the front if there are unused spaces, so
      * there is no gap between channels. The translation table says which
-     * channel of the new stream [use the new channel # as index] is taken
-     * from which original channel [use the number from the array to address
-     * the original channel].
+     * channel of the new stream is taken from which original channel [use
+     * the new channel as the array index, use the number you get from the
+     * array to address the original channel].
      */
-    
+
     static const int translation[7][6] =
-    {{ 0, 0, 0, 0, 0, 0 },     /* 0 channels (rarely used) */
-    { 0, 0, 0, 0, 0, 0 },      /* 1 ch */
-    { 0, 1, 0, 0, 0, 0 },      /* 2 */
-    { 1, 2, 0, 0, 0, 0 },      /* 3 */
-    { 1, 3, 2, 0, 0, 0 },      /* 4 */
-    { 1, 3, 4, 2, 0, 0 },      /* 5 */
-    { 1, 3, 4, 5, 2, 0 }};     /* 6 */
-       
+    {{ 0, 0, 0, 0, 0, 0 },      /* 0 channels (rarely used) */
+    { 0, 0, 0, 0, 0, 0 },       /* 1 ch */
+    { 0, 1, 0, 0, 0, 0 },       /* 2 */
+    { 1, 2, 0, 0, 0, 0 },       /* 3 */
+    { 1, 3, 2, 0, 0, 0 },       /* 4 */
+    { 1, 3, 4, 2, 0, 0 },       /* 5 */
+    { 1, 3, 4, 5, 2, 0 }};      /* 6 */
+
     int i, j;
     for ( j = 0; j < i_nb_channels; j++ )
     {
         for ( i = 0; i < 256; i++ )
         {
-            p_out[i * i_nb_channels + translation[i_nb_channels][j]]
-                    = p_in[j * 256 + i];
+            p_out[i * i_nb_channels + j] = p_in[translation[i_nb_channels][j]
+                                                 * 256 + i];
         }
     }
 }
@@ -289,19 +295,15 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     a52_frame( p_sys->p_liba52, p_in_buf->p_buffer,
                &i_flags, &i_sample_level, 0 );
 
-    if ( (i_flags & A52_CHANNEL_MASK) != (p_sys->i_flags & A52_CHANNEL_MASK) )
+    if ( (i_flags & A52_CHANNEL_MASK) != (p_sys->i_flags & A52_CHANNEL_MASK)
+          && !p_sys->b_dontwarn )
     {
-        msg_Err( p_filter,
-                 "liba52 couldn't do the requested downmix 0x%x->0x%x",
-                 p_sys->i_flags  & A52_CHANNEL_MASK,
-                 i_flags & A52_CHANNEL_MASK );
-
-        /* We do not know if the output has the same number of channels
-         * than the input, so die quietly... */
-        memset( p_out_buf->p_buffer, 0, i_bytes_per_block * 6 );
-        p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
-        p_out_buf->i_nb_bytes = i_bytes_per_block * 6;
-        return;
+        msg_Warn( p_filter,
+                  "liba52 couldn't do the requested downmix 0x%x->0x%x",
+                  p_sys->i_flags  & A52_CHANNEL_MASK,
+                  i_flags & A52_CHANNEL_MASK );
+
+        p_sys->b_dontwarn = 1;
     }
 
     if( !p_sys->b_dynrng )