* ./modules/audio_output/arts.c: ported the aRts module to aout3.

  * ./modules/audio_filter/converter/*: fixed a bug in all the converters
    test routines (thx Meuuh).

configure.in

@@ -1493,7 +1493,7 @@ AC_ARG_ENABLE(esd,
      AC_PATH_PROG(ESD_CONFIG, esd-config, no)
      if test "x${ESD_CONFIG}" != "xno"
      then
-       #PLUGINS="${PLUGINS} audio_output/esd"
+       PLUGINS="${PLUGINS} audio_output/esd"
        esd_CFLAGS="${esd_CFLAGS} `${ESD_CONFIG} --cflags`"
        esd_LDFLAGS="${esd_LDFLAGS} `${ESD_CONFIG} --libs`"
      fi
@@ -1509,7 +1509,7 @@ AC_ARG_ENABLE(arts,
      AC_PATH_PROG(ARTS_CONFIG, artsc-config, no)
      if test "x${ARTS_CONFIG}" != "xno"
      then
-       #PLUGINS="${PLUGINS} audio_output/arts"
+       PLUGINS="${PLUGINS} audio_output/arts"
        arts_CFLAGS="${arts_CFLAGS} `${ARTS_CONFIG} --cflags`"
        arts_LDFLAGS="${arts_LDFLAGS} `${ARTS_CONFIG} --libs `"
      fi

modules/audio_filter/converter/a52tospdif.c

@@ -2,7 +2,7 @@
  * a52tospdif.c : encapsulates A/52 frames into S/PDIF packets
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: a52tospdif.c,v 1.5 2002/08/13 14:53:46 sam Exp $
+ * $Id: a52tospdif.c,v 1.6 2002/08/13 16:11:15 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Stphane Borel <stef@via.ecp.fr>
@@ -65,7 +65,7 @@ static int Create( vlc_object_t *p_this )
     aout_filter_t * p_filter = (aout_filter_t *)p_this;
 
     if ( p_filter->input.i_format != AOUT_FMT_A52
-          && p_filter->output.i_format != AOUT_FMT_SPDIF )
+          || p_filter->output.i_format != AOUT_FMT_SPDIF )
     {
         return -1;
     }

modules/audio_filter/converter/fixed32tofloat32.c

@@ -2,7 +2,7 @@
  * fixed32float32.c : converter from fixed32 to float32 bits integer
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: fixed32tofloat32.c,v 1.3 2002/08/13 14:53:46 sam Exp $
+ * $Id: fixed32tofloat32.c,v 1.4 2002/08/13 16:11:15 sam Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *
@@ -59,7 +59,7 @@ static int Create( vlc_object_t *p_this )
     aout_filter_t * p_filter = (aout_filter_t *)p_this;
 
     if ( p_filter->input.i_format != AOUT_FMT_FIXED32
-          && p_filter->output.i_format != AOUT_FMT_FLOAT32 )
+          || p_filter->output.i_format != AOUT_FMT_FLOAT32 )
     {
         return -1;
     }
@@ -88,7 +88,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     vlc_fixed_t * p_in = (vlc_fixed_t *)p_in_buf->p_buffer;
     float * p_out = (float *)p_out_buf->p_buffer;
 
-    for ( i = p_in_buf->i_nb_samples * p_filter->input.i_channels ; i-- )
+    for ( i = p_in_buf->i_nb_samples * p_filter->input.i_channels ; i-- ; )
     {
         /* convert vlc_fixed_t into s32 */
 #if 0

modules/audio_filter/converter/fixed32tos16.c

@@ -2,7 +2,7 @@
  * fixed32tos16.c : converter from fixed32 to signed 16 bits integer
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: fixed32tos16.c,v 1.2 2002/08/13 14:53:46 sam Exp $
+ * $Id: fixed32tos16.c,v 1.3 2002/08/13 16:11:15 sam Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *
@@ -59,7 +59,7 @@ static int Create( vlc_object_t *p_this )
     aout_filter_t * p_filter = (aout_filter_t *)p_this;
 
     if ( p_filter->input.i_format != AOUT_FMT_FIXED32
-          && p_filter->output.i_format != AOUT_FMT_S16_NE )
+          || p_filter->output.i_format != AOUT_FMT_S16_NE )
     {
         return -1;
     }
@@ -201,7 +201,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     s16 sample;
 //    static struct audio_dither dither;
 
-    for ( i = p_in_buf->i_nb_samples * p_filter->input.i_channels ; i-- )
+    for ( i = p_in_buf->i_nb_samples * p_filter->input.i_channels ; i-- ; )
     {
         /* Accurate scaling */
 //        p_out = mpg321_s24_to_s16_pcm(16, *p_in++, &dither);

modules/audio_filter/converter/float32tos16.c

@@ -2,7 +2,7 @@
  * float32tos16.c : converter from float32 to signed 16 bits integer
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: float32tos16.c,v 1.4 2002/08/13 11:59:36 sam Exp $
+ * $Id: float32tos16.c,v 1.5 2002/08/13 16:11:15 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -59,7 +59,7 @@ static int Create( vlc_object_t *p_this )
     aout_filter_t * p_filter = (aout_filter_t *)p_this;
 
     if ( p_filter->input.i_format != AOUT_FMT_FLOAT32
-          && p_filter->output.i_format != AOUT_FMT_S16_NE )
+          || p_filter->output.i_format != AOUT_FMT_S16_NE )
     {
         return -1;
     }

modules/audio_output/arts.c

 /*****************************************************************************
  * arts.c : aRts module
  *****************************************************************************
- * Copyright (C) 2001 VideoLAN
+ * Copyright (C) 2001-2002 VideoLAN
  *
  * Authors: Emmanuel Blindauer <manu@agat.net>
+ *          Samuel Hocevar <sam@zoy.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,6 +33,8 @@
 #include <vlc/vlc.h>
 #include <vlc/aout.h>
 
+#include "aout_internal.h"
+
 #include <artsc.h>
 
 /*****************************************************************************
@@ -43,6 +46,10 @@
 struct aout_sys_t
 {
     arts_stream_t stream;
+    vlc_bool_t    b_initialized;
+
+    mtime_t       latency;
+    int           i_size;
 };
 
 /*****************************************************************************
@@ -51,9 +58,9 @@ struct aout_sys_t
 static int  Open         ( vlc_object_t * );
 static void Close        ( vlc_object_t * );
 
-static int  SetFormat    ( aout_thread_t * );
-static int  GetBufInfo   ( aout_thread_t *, int );
-static void Play         ( aout_thread_t *, byte_t *, int );
+static int  SetFormat    ( aout_instance_t * );
+static void Play         ( aout_instance_t *, aout_buffer_t * );
+static int  aRtsThread   ( aout_instance_t * );
 
 /*****************************************************************************
  * Module descriptor
@@ -65,19 +72,20 @@ vlc_module_begin();
 vlc_module_end();
 
 /*****************************************************************************
- * Open: initialize arts connection to server
+ * Open: open an aRts socket
  *****************************************************************************/
 static int Open( vlc_object_t *p_this )
 {
-    aout_thread_t *p_aout = (aout_thread_t *)p_this;
-    int i_err = 0;
+    aout_instance_t *p_aout = (aout_instance_t *)p_this;
+    struct aout_sys_t * p_sys;
+    int i_err;
 
     /* Allocate structure */
-    p_aout->p_sys = malloc( sizeof( aout_sys_t ) );
-    if( p_aout->p_sys == NULL )
+    p_sys = malloc( sizeof( aout_sys_t ) );
+    if( p_sys == NULL )
     {
         msg_Err( p_aout, "out of memory" );
-        return( 1 );
+        return -1;
     }
 
     i_err = arts_init();
@@ -85,66 +93,147 @@ static int Open( vlc_object_t *p_this )
     if (i_err < 0)
     {
         msg_Err( p_aout, "arts_init failed (%s)", arts_error_text(i_err) );
-        free( p_aout->p_sys );
-        return(-1);
+        free( p_sys );
+        return -1;
     }
 
-    p_aout->pf_setformat = SetFormat;
-    p_aout->pf_getbufinfo = GetBufInfo;
-    p_aout->pf_play = Play;
+    p_aout->output.p_sys = p_sys;
 
-    p_aout->p_sys->stream =
-        arts_play_stream( p_aout->i_rate, 16, p_aout->i_channels, "vlc" );
+    /* Create aRts thread and wait for its readiness. */
+    p_sys->b_initialized = VLC_FALSE;
+    if( vlc_thread_create( p_aout, "aout", aRtsThread, VLC_FALSE ) )
+    {
+        msg_Err( p_aout, "cannot create aRts thread (%s)", strerror(errno) );
+        free( p_sys );
+        return -1;
+    }
 
-    return( 0 );
+    p_aout->output.pf_setformat = SetFormat;
+    p_aout->output.pf_play = Play;
+
+    p_sys->stream = NULL;
+
+    return 0;
 }
 
 /*****************************************************************************
  * SetFormat: set the output format
  *****************************************************************************/
-static int SetFormat( aout_thread_t *p_aout )
+static int SetFormat( aout_instance_t *p_aout )
 {
-   /*Not ready*/ 
-/*    p_aout->i_latency = esd_get_latency(i_fd);*/
-    p_aout->i_latency = 0;
-   
-    //msg_Dbg( p_aout, "aout_arts_latency: %d", p_aout->i_latency );
+    struct aout_sys_t * p_sys = p_aout->output.p_sys;
+
+    p_sys->b_initialized = VLC_FALSE;
+
+    if( p_sys->stream )
+    {
+        arts_close_stream( p_sys->stream );
+    }
+
+    /* open a socket for playing a stream */
+    p_sys->stream = arts_play_stream( p_aout->output.output.i_rate, 16,
+                                      p_aout->output.output.i_channels, "vlc" );
+    if( p_sys->stream == NULL )
+    {
+        msg_Err( p_aout, "cannot open aRts socket" );
+        return -1;
+    }
 
-    return( 0 );
+    /* Try not to bufferize more than 200 ms */
+    arts_stream_set( p_sys->stream, ARTS_P_BUFFER_TIME, 200 );
+
+    /* Estimate latency with a half full buffer */
+    p_sys->latency = (mtime_t)1000
+       * (mtime_t)( arts_stream_get( p_sys->stream, ARTS_P_SERVER_LATENCY )
+                  + arts_stream_get( p_sys->stream, ARTS_P_BUFFER_TIME ) / 2 );
+    p_sys->i_size = arts_stream_get( p_sys->stream, ARTS_P_PACKET_SIZE );
+
+    p_aout->output.output.i_format = AOUT_FMT_S16_NE;
+    p_aout->output.i_nb_samples = p_sys->i_size;
+
+    p_sys->b_initialized = VLC_TRUE;
+
+    return 0;
 }
 
 /*****************************************************************************
- * GetBufInfo: buffer status query
+ * Play: queue a buffer for playing by aRtsThread
  *****************************************************************************/
-static int GetBufInfo( aout_thread_t *p_aout, int i_buffer_limit )
+static void Play( aout_instance_t *p_aout, aout_buffer_t * p_buffer )
 {
-    /* arbitrary value that should be changed */
-    return( i_buffer_limit );
+    aout_FifoPush( p_aout, &p_aout->output.fifo, p_buffer );
 }
 
 /*****************************************************************************
- * Play: play a sound samples buffer
- *****************************************************************************
- * This function writes a buffer of i_length bytes in the socket
+ * Close: close the aRts socket
  *****************************************************************************/
-static void Play( aout_thread_t *p_aout, byte_t *buffer, int i_size )
+static void Close( vlc_object_t *p_this )
 {
-    int i_err = arts_write( p_aout->p_sys->stream, buffer, i_size );
+    aout_instance_t *p_aout = (aout_instance_t *)p_this;
+    struct aout_sys_t * p_sys = p_aout->output.p_sys;
 
-    if( i_err < 0 )
+    p_aout->b_die = 1;
+    vlc_thread_join( p_aout );
+
+    if( p_sys->stream )
     {
-        msg_Err( p_aout, "arts_write failed (%s)", arts_error_text(i_err) );
+        arts_close_stream( p_sys->stream );
     }
+
+    arts_free();
+    free( p_sys );
 }
 
 /*****************************************************************************
- * Close: close the Esound socket
+ * aRtsThread: asynchronous thread used to DMA the data to the device
  *****************************************************************************/
-static void Close( vlc_object_t *p_this )
+static int aRtsThread( aout_instance_t * p_aout )
 {
-    aout_thread_t *p_aout = (aout_thread_t *)p_this;
+    struct aout_sys_t * p_sys = p_aout->output.p_sys;
+
+    while ( !p_aout->b_die )
+    {
+        aout_buffer_t * p_buffer;
+        int i_tmp, i_size;
+        byte_t * p_bytes;
+
+        if( !p_sys->b_initialized )
+        {
+            msleep( THREAD_SLEEP );
+            continue;
+        }
+
+        /* Get the presentation date of the next write() operation. It
+         * is equal to the current date + latency */
+        p_buffer = aout_OutputNextBuffer( p_aout, mdate() + p_sys->latency );
+
+        if ( p_buffer != NULL )
+        {
+            p_bytes = p_buffer->p_buffer;
+            i_size = aout_FormatToSize( &p_aout->output.output,
+                                        p_buffer->i_nb_samples );
+        }
+        else
+        {
+            i_size = aout_FormatToSize( &p_aout->output.output,
+                                        p_sys->i_size );
+            p_bytes = alloca( i_size );
+            memset( p_bytes, 0, i_size );
+        }
+
+        i_tmp = arts_write( p_sys->stream, p_bytes, i_size );
+
+        if( i_tmp < 0 )
+        {
+            msg_Err( p_aout, "write failed (%s)", arts_error_text(i_tmp) );
+        }
+
+        if ( p_buffer != NULL )
+        {
+            aout_BufferFree( p_buffer );
+        }
+    }
 
-    arts_close_stream( p_aout->p_sys->stream );
-    free( p_aout->p_sys );
+    return 0;
 }