X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Fesd.c;h=b56b99cb9890facf6927a0e228a3700306096683;hb=97c14e4c28c421395395033c17678d0d48eb6083;hp=15ef25b61c47a144b6ff4c18bcb85db5487188ba;hpb=123b3214ec0802b2c8d1ce6c693dd3b79e1ada31;p=vlc diff --git a/modules/audio_output/esd.c b/modules/audio_output/esd.c index 15ef25b61c..b56b99cb98 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.1 2002/08/07 21:36:55 massiot Exp $ + * Copyright (C) 2000, 2001 the VideoLAN team + * $Id$ * * Authors: Samuel Hocevar * @@ -10,7 +10,7 @@ * 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 @@ -18,20 +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 +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include + +#include + +#include +#include #include @@ -45,6 +52,8 @@ struct aout_sys_t { esd_format_t esd_format; int i_fd; + + mtime_t latency; /* unused, but we might do something with it */ }; /***************************************************************************** @@ -52,17 +61,18 @@ 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 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(); @@ -72,123 +82,167 @@ vlc_module_end(); *****************************************************************************/ static int Open( vlc_object_t *p_this ) { - aout_thread_t *p_aout = (aout_thread_t *)p_this; - - /* mpg123 does it this way */ - int i_bits = ESD_BITS16; - int i_mode = ESD_STREAM; - int i_func = ESD_PLAY; + 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_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 ) + return VLC_ENOMEM; + + p_aout->output.p_sys = p_sys; + + p_aout->output.pf_play = Play; + aout_VolumeSoftInit( p_aout ); + + /* Initialize some variables */ + p_sys->esd_format = ESD_BITS16 | ESD_STREAM | ESD_PLAY; + p_sys->esd_format &= ~ESD_MASK_CHAN; + + p_aout->output.output.i_format = AOUT_FMT_S16_NE; + i_nb_channels = aout_FormatNbChannels( &p_aout->output.output ); + if ( i_nb_channels > 2 ) { - msg_Err( p_aout, "out of memory" ); - return( 1 ); + /* 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; } - /* Initialize some variables */ - p_aout->i_rate = esd_audio_rate; /* We use actual esd rate value, not - * initial value */ + switch( i_nb_channels ) + { + case 1: + p_sys->esd_format |= ESD_MONO; + break; + case 2: + p_sys->esd_format |= ESD_STEREO; + break; + } - i_bits = ESD_BITS16; - i_mode = ESD_STREAM; - i_func = ESD_PLAY; - p_aout->p_sys->esd_format = (i_bits | i_mode | i_func) & (~ESD_MASK_CHAN); + /* 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; - if( p_aout->i_channels == 1 ) + /* Open a socket for playing a stream + * and try to open /dev/dsp if there's no EsounD */ + psz_server = config_GetPsz( p_aout, "esdserver" ); + if( psz_server && *psz_server ) { - p_aout->p_sys->esd_format |= ESD_MONO; + p_sys->i_fd = esd_play_stream_fallback( p_sys->esd_format, + p_aout->output.output.i_rate, + psz_server, "vlc" ); } else { - p_aout->p_sys->esd_format |= ESD_STEREO; + p_sys->i_fd = esd_play_stream_fallback( p_sys->esd_format, + p_aout->output.output.i_rate, + NULL, "vlc" ); } - /* open a socket for playing a stream - * and try to open /dev/dsp if there's no EsounD */ - if ( (p_aout->p_sys->i_fd - = esd_play_stream_fallback(p_aout->p_sys->esd_format, - p_aout->i_rate, NULL, "vlc")) < 0 ) + if( p_sys->i_fd < 0 ) { - msg_Err( p_aout, "cannot open esound socket (format 0x%08x at %ld Hz)", - p_aout->p_sys->esd_format, p_aout->i_rate ); - return( -1 ); + msg_Err( p_aout, "cannot open esound socket (format 0x%08x at %d Hz)", + p_sys->esd_format, p_aout->output.output.i_rate ); + free( psz_server ); + free( p_sys ); + return VLC_EGENERIC; } - p_aout->pf_setformat = SetFormat; - p_aout->pf_getbufinfo = GetBufInfo; - p_aout->pf_play = Play; + 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 ); - return( 0 ); + 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( 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 + / p_aout->output.output.i_bytes_per_frame + / p_aout->output.output.i_rate; + + free( psz_server ); + close( i_newfd ); + return VLC_SUCCESS; } /***************************************************************************** - * SetFormat: set the output format + * Play: nothing to do *****************************************************************************/ -static int SetFormat( aout_thread_t *p_aout ) +static void Play( aout_instance_t *p_aout ) { - int i_fd; + 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 ); - i_fd = esd_open_sound(NULL); - p_aout->i_latency = esd_get_latency(i_fd); - - msg_Dbg( p_aout, "aout_esd_latency: %d", p_aout->i_latency ); + if ( p_buffer != NULL ) + { + unsigned int pos; + unsigned char *data = p_buffer->p_buffer; - return( 0 ); + 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 ); + } } /***************************************************************************** - * GetBufInfo: buffer status query + * Close: close the Esound socket *****************************************************************************/ -static int GetBufInfo( aout_thread_t *p_aout, int i_buffer_limit ) +static void Close( vlc_object_t *p_this ) { - /* arbitrary value that should be changed */ - return( i_buffer_limit ); + aout_instance_t *p_aout = (aout_instance_t *)p_this; + struct aout_sys_t * p_sys = p_aout->output.p_sys; + + close( p_sys->i_fd ); + free( p_sys ); } +#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; - - if (p_aout->p_sys->esd_format & ESD_STEREO) - { - if (p_aout->p_sys->esd_format & ESD_BITS16) - { - i_amount = (44100 * (ESD_BUF_SIZE + 64)) / p_aout->i_rate; - } - else - { - i_amount = (44100 * (ESD_BUF_SIZE + 128)) / p_aout->i_rate; - } - } - else - { - if (p_aout->p_sys->esd_format & ESD_BITS16) - { - i_amount = (2 * 44100 * (ESD_BUF_SIZE + 128)) / p_aout->i_rate; - } - else - { - i_amount = (2 * 44100 * (ESD_BUF_SIZE + 256)) / p_aout->i_rate; - } - } - write( p_aout->p_sys->i_fd, buffer, i_size ); -} + int m1 = p_aout->output.p_sys->esd_format & ESD_STEREO ? 1 : 2; + int m2 = p_aout->output.p_sys->esd_format & ESD_BITS16 ? 64 : 128; -/***************************************************************************** - * Close: close the Esound socket - *****************************************************************************/ -static void Close( vlc_object_t *p_this ) -{ - aout_thread_t *p_aout = (aout_thread_t *)p_this; + i_amount = (m1 * 44100 * (ESD_BUF_SIZE + m1 * m2)) / p_aout->i_rate; - close( p_aout->p_sys->i_fd ); + write( p_aout->output.p_sys->i_fd, buffer, i_size ); } +#endif