/*****************************************************************************
* arts.c : aRts module
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
+ * Copyright (C) 2001-2002 VideoLAN
+ * $Id$
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#include <vlc/vlc.h>
#include <vlc/aout.h>
+#include "aout_internal.h"
+
#include <artsc.h>
/*****************************************************************************
struct aout_sys_t
{
arts_stream_t stream;
+
+ mtime_t latency;
+ int i_size;
};
/*****************************************************************************
*****************************************************************************/
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 void Play ( aout_instance_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("aRts audio module") );
+ set_description( _("aRts audio output") );
set_capability( "audio output", 50 );
+ set_category( CAT_AUDIO );
+ set_subcategory( SUBCAT_AUDIO_AOUT );
set_callbacks( Open, Close );
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;
+ int i_nb_channels;
/* 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 VLC_ENOMEM;
}
+ p_aout->output.p_sys = p_sys;
i_err = arts_init();
-
- if (i_err < 0)
+
+ 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 VLC_EGENERIC;
}
- p_aout->pf_setformat = SetFormat;
- p_aout->pf_getbufinfo = GetBufInfo;
- p_aout->pf_play = Play;
+ p_aout->output.pf_play = Play;
+ aout_VolumeSoftInit( p_aout );
- p_aout->p_sys->stream =
- arts_play_stream( p_aout->i_rate, 16, p_aout->i_channels, "vlc" );
+ p_aout->output.output.i_format = AOUT_FMT_S16_NE;
+ i_nb_channels = aout_FormatNbChannels( &p_aout->output.output );
+ if ( i_nb_channels > 2 )
+ {
+ /* aRts doesn't support more than two channels. */
+ i_nb_channels = 2;
+ p_aout->output.output.i_physical_channels =
+ AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
+ }
- return( 0 );
-}
+ /* Open a socket for playing a stream, set format to 16 bits */
+ p_sys->stream = arts_play_stream( p_aout->output.output.i_rate, 16,
+ i_nb_channels, "vlc" );
+ if( p_sys->stream == NULL )
+ {
+ msg_Err( p_aout, "cannot open aRts socket" );
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
-/*****************************************************************************
- * SetFormat: set the output format
- *****************************************************************************/
-static int SetFormat( aout_thread_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 );
+ /* Try not to bufferize more than 200 ms */
+ arts_stream_set( p_sys->stream, ARTS_P_BUFFER_TIME, 50 );
- return( 0 );
-}
+ /* 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 );
+ p_sys->i_size = arts_stream_get( p_sys->stream, ARTS_P_PACKET_SIZE );
-/*****************************************************************************
- * GetBufInfo: buffer status query
- *****************************************************************************/
-static int GetBufInfo( aout_thread_t *p_aout, int i_buffer_limit )
-{
- /* arbitrary value that should be changed */
- return( i_buffer_limit );
+ msg_Dbg( p_aout, "aRts initialized, latency %i000, %i packets of size %i",
+ arts_stream_get( p_sys->stream, ARTS_P_SERVER_LATENCY ),
+ arts_stream_get( p_sys->stream, ARTS_P_PACKET_COUNT ),
+ arts_stream_get( p_sys->stream, ARTS_P_PACKET_SIZE ) );
+
+ p_aout->output.i_nb_samples = p_sys->i_size / sizeof(uint16_t)
+ / i_nb_channels;
+
+ return VLC_SUCCESS;
}
/*****************************************************************************
- * Play: play a sound samples buffer
- *****************************************************************************
- * This function writes a buffer of i_length bytes in the socket
+ * Play: nothing to do
*****************************************************************************/
-static void Play( aout_thread_t *p_aout, byte_t *buffer, int i_size )
+static void Play( aout_instance_t *p_aout )
{
- int i_err = arts_write( p_aout->p_sys->stream, buffer, i_size );
+ struct aout_sys_t * p_sys = p_aout->output.p_sys;
+ aout_buffer_t * p_buffer;
+ int i_tmp;
- if( i_err < 0 )
+#if 0
+ while( arts_stream_get( p_sys->stream, ARTS_P_BUFFER_SPACE ) < 16384*3/2 )
{
- msg_Err( p_aout, "arts_write failed (%s)", arts_error_text(i_err) );
+ msleep( 10000 );
+ }
+#endif
+
+ p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo );
+
+ if( p_buffer != NULL )
+ {
+ i_tmp = arts_write( p_sys->stream, p_buffer->p_buffer,
+ p_buffer->i_nb_bytes );
+
+ if( i_tmp < 0 )
+ {
+ msg_Err( p_aout, "write failed (%s)", arts_error_text(i_tmp) );
+ }
+
+ aout_BufferFree( p_buffer );
}
}
/*****************************************************************************
- * Close: close the Esound socket
+ * Close: close the aRts socket
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
- aout_thread_t *p_aout = (aout_thread_t *)p_this;
+ aout_instance_t *p_aout = (aout_instance_t *)p_this;
+ struct aout_sys_t * p_sys = p_aout->output.p_sys;
- arts_close_stream( p_aout->p_sys->stream );
- free( p_aout->p_sys );
+ arts_close_stream( p_sys->stream );
+ arts_free();
+ free( p_sys );
}
projects / vlc / blobdiff