X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Fesd.c;h=d42940e6d7ea31057b14a3c32ac41f90f75f4706;hb=efa30ea7db66a2e445f5622c04256bd8170234c5;hp=24d5364943882816a5869ae7b5bef7daea4834be;hpb=2f1be4f3e563c2bcfe8b51bda25ce804546f8748;p=vlc diff --git a/modules/audio_output/esd.c b/modules/audio_output/esd.c index 24d5364943..d42940e6d7 100644 --- a/modules/audio_output/esd.c +++ b/modules/audio_output/esd.c @@ -1,8 +1,8 @@ /***************************************************************************** * esd.c : EsounD module ***************************************************************************** - * Copyright (C) 2000, 2001 VideoLAN - * $Id: esd.c,v 1.5 2002/08/14 00:43:52 massiot Exp $ + * Copyright (C) 2000, 2001 the VideoLAN team + * $Id$ * * Authors: Samuel Hocevar * @@ -18,21 +18,27 @@ * * 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. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ #include /* ENOMEM */ -#include /* open(), O_WRONLY */ -#include /* strerror() */ #include /* write(), close() */ -#include /* calloc(), malloc(), free() */ -#include -#include -#include "aout_internal.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include + +#include + +#include +#include #include @@ -46,9 +52,8 @@ struct aout_sys_t { esd_format_t esd_format; int i_fd; - vlc_bool_t b_initialized; - mtime_t latency; + mtime_t latency; /* unused, but we might do something with it */ }; /***************************************************************************** @@ -56,17 +61,18 @@ struct aout_sys_t *****************************************************************************/ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); - -static int SetFormat ( aout_instance_t * ); -static void Play ( aout_instance_t *, aout_buffer_t * ); -static int ESDThread ( aout_instance_t * ); +static void Play ( aout_instance_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ vlc_module_begin(); - set_description( _("EsounD audio module") ); + set_description( N_("EsounD audio output") ); + set_shortname( "EsounD" ); set_capability( "audio output", 50 ); + add_string( "esdserver", "", NULL, N_("Esound server"), NULL, false ); + set_category( CAT_AUDIO ); + set_subcategory( SUBCAT_AUDIO_AOUT ); set_callbacks( Open, Close ); add_shortcut( "esound" ); vlc_module_end(); @@ -78,46 +84,35 @@ static int Open( vlc_object_t *p_this ) { aout_instance_t *p_aout = (aout_instance_t *)p_this; struct aout_sys_t * p_sys; + char * psz_server; + int i_nb_channels; + int i_newfd; /* Allocate structure */ 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; - /* Create ESD thread and wait for its readiness. */ - p_sys->b_initialized = VLC_FALSE; - if( vlc_thread_create( p_aout, "aout", ESDThread, VLC_FALSE ) ) - { - msg_Err( p_aout, "cannot create ESD thread (%s)", strerror(errno) ); - free( p_sys ); - return -1; - } - - p_aout->output.pf_setformat = SetFormat; p_aout->output.pf_play = Play; - - return( 0 ); -} - -/***************************************************************************** - * SetFormat: set the output format - *****************************************************************************/ -static int SetFormat( aout_instance_t *p_aout ) -{ - struct aout_sys_t * p_sys = p_aout->output.p_sys; - - p_sys->b_initialized = VLC_FALSE; + aout_VolumeSoftInit( p_aout ); /* Initialize some variables */ p_sys->esd_format = ESD_BITS16 | ESD_STREAM | ESD_PLAY; p_sys->esd_format &= ~ESD_MASK_CHAN; - switch( p_aout->output.output.i_channels ) + p_aout->output.output.i_format = AOUT_FMT_S16_NE; + i_nb_channels = aout_FormatNbChannels( &p_aout->output.output ); + if ( i_nb_channels > 2 ) + { + /* EsounD doesn't support more than two channels. */ + i_nb_channels = 2; + p_aout->output.output.i_physical_channels = + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT; + } + + switch( i_nb_channels ) { case 1: p_sys->esd_format |= ESD_MONO; @@ -125,44 +120,97 @@ static int SetFormat( aout_instance_t *p_aout ) case 2: p_sys->esd_format |= ESD_STEREO; break; - default: - return -1; } - /* open a socket for playing a stream + /* Force the rate, otherwise the sound is very noisy */ + p_aout->output.output.i_rate = ESD_DEFAULT_RATE; + p_aout->output.i_nb_samples = ESD_BUF_SIZE * 2; + + /* Open a socket for playing a stream * and try to open /dev/dsp if there's no EsounD */ - p_sys->i_fd = esd_play_stream_fallback( p_sys->esd_format, - p_aout->output.output.i_rate, NULL, "vlc" ); + psz_server = config_GetPsz( p_aout, "esdserver" ); + if( psz_server && *psz_server ) + { + p_sys->i_fd = esd_play_stream_fallback( p_sys->esd_format, + p_aout->output.output.i_rate, + psz_server, "vlc" ); + } + else + { + p_sys->i_fd = esd_play_stream_fallback( p_sys->esd_format, + p_aout->output.output.i_rate, + NULL, "vlc" ); + } + if( p_sys->i_fd < 0 ) { - msg_Err( p_aout, "cannot open esound socket (format 0x%08x at %ld Hz)", + msg_Err( p_aout, "cannot open esound socket (format 0x%08x at %d Hz)", p_sys->esd_format, p_aout->output.output.i_rate ); - return -1; + free( p_sys ); + return VLC_EGENERIC; } - p_aout->output.output.i_format = AOUT_FMT_S16_NE; - p_aout->output.i_nb_samples = ESD_BUF_SIZE * 2; + if( psz_server && *psz_server ) + { + struct timeval start, stop; + esd_server_info_t * p_info; + + gettimeofday( &start, NULL ); + p_info = esd_get_server_info( p_sys->i_fd ); + gettimeofday( &stop, NULL ); + + p_sys->latency = (mtime_t)( stop.tv_sec - start.tv_sec ) + * (mtime_t)1000000; + p_sys->latency += stop.tv_usec - start.tv_usec; + } + else + { + p_sys->latency = 0; + } /* ESD latency is calculated for 44100 Hz. We don't have any way to get the * number of buffered samples, so I assume ESD_BUF_SIZE/2 */ - p_sys->latency = - (mtime_t)( esd_get_latency( esd_open_sound(NULL) ) + ESD_BUF_SIZE / 2 - * p_aout->output.output.i_rate / ESD_DEFAULT_RATE - * aout_FormatTo( &p_aout->output.output, 1 ) ) + p_sys->latency += + (mtime_t)( esd_get_latency( i_newfd = esd_open_sound(NULL) ) + + ESD_BUF_SIZE / 2 + * p_aout->output.output.i_bytes_per_frame + * p_aout->output.output.i_rate + / ESD_DEFAULT_RATE ) * (mtime_t)1000000 - / (mtime_t)aout_FormatToByterate( &p_aout->output.output ); - - p_sys->b_initialized = VLC_TRUE; + / p_aout->output.output.i_bytes_per_frame + / p_aout->output.output.i_rate; - return 0; + close( i_newfd ); + return VLC_SUCCESS; } /***************************************************************************** - * Play: queue a buffer for playing by ESDThread + * Play: nothing to do *****************************************************************************/ -static void Play( aout_instance_t *p_aout, aout_buffer_t * p_buffer ) +static void Play( aout_instance_t *p_aout ) { - aout_FifoPush( p_aout, &p_aout->output.fifo, p_buffer ); + struct aout_sys_t * p_sys = p_aout->output.p_sys; + aout_buffer_t * p_buffer; + int i_tmp; + + p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo ); + + if ( p_buffer != NULL ) + { + unsigned int pos; + unsigned char *data = p_buffer->p_buffer; + + for( pos = 0; pos + ESD_BUF_SIZE <= p_buffer->i_nb_bytes; + pos += ESD_BUF_SIZE ) + { + i_tmp = write( p_sys->i_fd, data + pos, ESD_BUF_SIZE ); + if( i_tmp < 0 ) + { + msg_Err( p_aout, "write failed (%m)" ); + } + } + aout_BufferFree( p_buffer ); + } } /***************************************************************************** @@ -173,73 +221,17 @@ static void Close( vlc_object_t *p_this ) aout_instance_t *p_aout = (aout_instance_t *)p_this; struct aout_sys_t * p_sys = p_aout->output.p_sys; - p_aout->b_die = 1; - vlc_thread_join( p_aout ); - close( p_sys->i_fd ); free( p_sys ); } -/***************************************************************************** - * ESDThread: asynchronous thread used to DMA the data to the device - *****************************************************************************/ -static int ESDThread( aout_instance_t * p_aout ) -{ - 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 + buffered samples + esd latency */ - p_buffer = aout_OutputNextBuffer( p_aout, mdate() + p_sys->latency, 0 ); - - if ( p_buffer != NULL ) - { - p_bytes = p_buffer->p_buffer; - i_size = p_buffer->i_nb_bytes; - } - else - { - i_size = aout_FormatToByterate( &p_aout->output.output ) - * ESD_BUF_SIZE * 2 - / p_aout->output.output.i_rate; - p_bytes = alloca( i_size ); - memset( p_bytes, 0, i_size ); - } - - i_tmp = write( p_sys->i_fd, p_bytes, i_size ); - - if( i_tmp < 0 ) - { - msg_Err( p_aout, "write failed (%s)", strerror(errno) ); - } - - if ( p_buffer != NULL ) - { - aout_BufferFree( p_buffer ); - } - } - - return 0; -} - #if 0 /***************************************************************************** * Play: play a sound samples buffer ***************************************************************************** * This function writes a buffer of i_length bytes in the socket *****************************************************************************/ -static void Play( aout_thread_t *p_aout, byte_t *buffer, int i_size ) +static void Play( aout_thread_t *p_aout, uint8_t *buffer, int i_size ) { int i_amount;