Install.win32: Add path for pkg-config

[vlc] / src / audio_output / common.c

diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index c86b8158d7b12b6234773abd5fa6866985411385..f05c9e3bfb025146139ddd5878e7b4cf27e7db5a 100644 (file)
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * common.c : audio output management of common data structures
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: common.c,v 1.17 2003/02/11 11:16:04 massiot Exp $
+ * Copyright (C) 2002-2005 the VideoLAN team
+ * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -18,7 +18,7 @@
  *
  * 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.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -66,8 +66,6 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent )
     val.b_bool = VLC_TRUE;
     var_Set( p_aout, "intf-change", val );
 
-    vlc_object_attach( p_aout, p_parent->p_vlc );
-
     return p_aout;
 }
 
@@ -131,12 +129,20 @@ void aout_FormatPrepare( audio_sample_format_t * p_format )
         i_result = 2;
         break;
 
+    case VLC_FOURCC('u','2','4','l'):
+    case VLC_FOURCC('s','2','4','l'):
+    case VLC_FOURCC('u','2','4','b'):
+    case VLC_FOURCC('s','2','4','b'):
+        i_result = 3;
+        break;
+
     case VLC_FOURCC('f','l','3','2'):
     case VLC_FOURCC('f','i','3','2'):
         i_result = 4;
         break;
 
     case VLC_FOURCC('s','p','d','i'):
+    case VLC_FOURCC('s','p','d','b'): /* Big endian spdif output */
     case VLC_FOURCC('a','5','2',' '):
     case VLC_FOURCC('d','t','s',' '):
     case VLC_FOURCC('m','p','g','a'):
@@ -403,6 +409,9 @@ void aout_FifoDestroy( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
         aout_BufferFree( p_buffer );
         p_buffer = p_next;
     }
+
+    p_fifo->p_first = NULL;
+    p_fifo->pp_last = &p_fifo->p_first;
 }
 
 
@@ -463,3 +472,105 @@ mtime_t aout_DateIncrement( audio_date_t * p_date, uint32_t i_nb_samples )
     return p_date->date;
 }
 
+/*****************************************************************************
+ * aout_CheckChannelReorder : Check if we need to do some channel re-ordering
+ *****************************************************************************/
+int aout_CheckChannelReorder( const uint32_t *pi_chan_order_in,
+                              const uint32_t *pi_chan_order_out,
+                              uint32_t i_channel_mask,
+                              int i_channels, int *pi_chan_table )
+{
+    vlc_bool_t b_chan_reorder = VLC_FALSE;
+    int i, j, k, l;
+
+    if( i_channels > AOUT_CHAN_MAX ) return VLC_FALSE;
+
+    for( i = 0, j = 0; pi_chan_order_in[i]; i++ )
+    {
+        if( !(i_channel_mask & pi_chan_order_in[i]) ) continue;
+
+        for( k = 0, l = 0; pi_chan_order_in[i] != pi_chan_order_out[k]; k++ )
+        {
+            if( i_channel_mask & pi_chan_order_out[k] ) l++;
+        }
+
+        pi_chan_table[j++] = l;
+    }
+
+    for( i = 0; i < i_channels; i++ )
+    {
+        if( pi_chan_table[i] != i ) b_chan_reorder = VLC_TRUE;
+    }
+
+    return b_chan_reorder;
+}
+
+/*****************************************************************************
+ * aout_ChannelReorder :
+ *****************************************************************************/
+void aout_ChannelReorder( uint8_t *p_buf, int i_buffer,
+                          int i_channels, const int *pi_chan_table,
+                          int i_bits_per_sample )
+{
+    uint8_t p_tmp[AOUT_CHAN_MAX * 4];
+    int i, j;
+
+    if( i_bits_per_sample == 8 )
+    {
+        for( i = 0; i < i_buffer / i_channels; i++ )
+        {
+            for( j = 0; j < i_channels; j++ )
+            {
+                p_tmp[pi_chan_table[j]] = p_buf[j];
+            }
+
+            memcpy( p_buf, p_tmp, i_channels );
+            p_buf += i_channels;
+        }
+    }
+    else if( i_bits_per_sample == 16 )
+    {
+        for( i = 0; i < i_buffer / i_channels / 2; i++ )
+        {
+            for( j = 0; j < i_channels; j++ )
+            {
+                p_tmp[2 * pi_chan_table[j]]     = p_buf[2 * j];
+                p_tmp[2 * pi_chan_table[j] + 1] = p_buf[2 * j + 1];
+            }
+
+            memcpy( p_buf, p_tmp, 2 * i_channels );
+            p_buf += 2 * i_channels;
+        }
+    }
+    else if( i_bits_per_sample == 24 )
+    {
+        for( i = 0; i < i_buffer / i_channels / 3; i++ )
+        {
+            for( j = 0; j < i_channels; j++ )
+            {
+                p_tmp[3 * pi_chan_table[j]]     = p_buf[3 * j];
+                p_tmp[3 * pi_chan_table[j] + 1] = p_buf[3 * j + 1];
+                p_tmp[3 * pi_chan_table[j] + 2] = p_buf[3 * j + 2];
+            }
+
+            memcpy( p_buf, p_tmp, 3 * i_channels );
+            p_buf += 3 * i_channels;
+        }
+    }
+    else if( i_bits_per_sample == 32 )
+    {
+        for( i = 0; i < i_buffer / i_channels / 4; i++ )
+        {
+            for( j = 0; j < i_channels; j++ )
+            {
+                p_tmp[4 * pi_chan_table[j]]     = p_buf[4 * j];
+                p_tmp[4 * pi_chan_table[j] + 1] = p_buf[4 * j + 1];
+                p_tmp[4 * pi_chan_table[j] + 2] = p_buf[4 * j + 2];
+                p_tmp[4 * pi_chan_table[j] + 3] = p_buf[4 * j + 3];
+            }
+
+            memcpy( p_buf, p_tmp, 4 * i_channels );
+            p_buf += 4 * i_channels;
+        }
+    }
+}