X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Faudio_output%2Fesd.c;h=0022da6d7fb2ac1e5002d6d7e0caff15dff9320d;hb=678c0546b093328424f9df140af9a21996b71583;hp=4db499ecd7407a7e343e309bea42ed2838f773dc;hpb=eb93d56d8d76be74193a77ee163462c14af92959;p=vlc diff --git a/modules/audio_output/esd.c b/modules/audio_output/esd.c index 4db499ecd7..0022da6d7f 100644 --- a/modules/audio_output/esd.c +++ b/modules/audio_output/esd.c @@ -2,7 +2,7 @@ * esd.c : EsounD module ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: esd.c,v 1.4 2002/08/14 00:23:59 massiot Exp $ + * $Id$ * * Authors: Samuel Hocevar * @@ -34,6 +34,8 @@ #include #include "aout_internal.h" +#include + #include /***************************************************************************** @@ -46,9 +48,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,16 +57,13 @@ 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( _("EsounD audio output") ); set_capability( "audio output", 50 ); set_callbacks( Open, Close ); add_shortcut( "esound" ); @@ -78,46 +76,38 @@ static int Open( vlc_object_t *p_this ) { aout_instance_t *p_aout = (aout_instance_t *)p_this; struct aout_sys_t * p_sys; + int i_nb_channels; + int i_newfd = -1; + int fl; /* 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 +115,68 @@ static int SetFormat( aout_instance_t *p_aout ) case 2: p_sys->esd_format |= ESD_STEREO; break; - default: - return -1; } + /* Force the rate, otherwise the sound is very noisy */ + p_aout->output.output.i_rate = ESD_DEFAULT_RATE; + /* 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" ); 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; /* 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 ) ) + (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 ) + { + int pos; + 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 (%s)", strerror(errno) ); + } + } + aout_BufferFree( p_buffer ); + } } /***************************************************************************** @@ -173,66 +187,10 @@ 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 ); - - 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