X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Farts.c;h=525787d5818a0bf2b7e15a8ab2b5aa1fe8045531;hb=a46fb0e4e14d971e7482b010bb42c6bc93df66f7;hp=5508b1f09a5c5566c183bd01ff1e8920a2673148;hpb=51e9975309f7784ab00dacf9779090f19543a1ab;p=vlc diff --git a/modules/audio_output/arts.c b/modules/audio_output/arts.c index 5508b1f09a..525787d581 100644 --- a/modules/audio_output/arts.c +++ b/modules/audio_output/arts.c @@ -1,7 +1,8 @@ /***************************************************************************** * arts.c : aRts module ***************************************************************************** - * Copyright (C) 2001-2002 VideoLAN + * Copyright (C) 2001-2002 the VideoLAN team + * $Id$ * * Authors: Emmanuel Blindauer * Samuel Hocevar @@ -10,7 +11,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,22 +19,21 @@ * * 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 "aout_internal.h" +#include +#include +#include #include @@ -46,7 +46,6 @@ struct aout_sys_t { arts_stream_t stream; - vlc_bool_t b_initialized; mtime_t latency; int i_size; @@ -57,17 +56,17 @@ 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 * ); -static int aRtsThread ( aout_instance_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ vlc_module_begin(); - set_description( _("aRts audio module") ); + set_shortname( "aRts" ); + set_description( N_("aRts audio output") ); set_capability( "audio output", 50 ); + set_category( CAT_AUDIO ); + set_subcategory( SUBCAT_AUDIO_AOUT ); set_callbacks( Open, Close ); vlc_module_end(); @@ -79,161 +78,107 @@ 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_err; + int i_nb_channels; /* 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; i_err = arts_init(); - - if (i_err < 0) - { - msg_Err( p_aout, "arts_init failed (%s)", arts_error_text(i_err) ); - free( p_sys ); - return -1; - } - - p_aout->output.p_sys = p_sys; - /* Create aRts thread and wait for its readiness. */ - p_sys->b_initialized = VLC_FALSE; - if( vlc_thread_create( p_aout, "aout", aRtsThread, VLC_FALSE ) ) + if( i_err < 0 ) { - msg_Err( p_aout, "cannot create aRts thread (%s)", strerror(errno) ); + msg_Err( p_aout, "arts_init failed (%s)", arts_error_text(i_err) ); free( p_sys ); - return -1; + return VLC_EGENERIC; } - p_aout->output.pf_setformat = SetFormat; p_aout->output.pf_play = Play; + aout_VolumeSoftInit( p_aout ); - p_sys->stream = NULL; - - 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; - - if( p_sys->stream ) + 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_close_stream( p_sys->stream ); + /* 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; } - /* open a socket for playing a stream */ + /* 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, - p_aout->output.output.i_channels, "vlc" ); + i_nb_channels, "vlc" ); if( p_sys->stream == NULL ) { msg_Err( p_aout, "cannot open aRts socket" ); - return -1; + free( p_sys ); + return VLC_EGENERIC; } /* Try not to bufferize more than 200 ms */ - arts_stream_set( p_sys->stream, ARTS_P_BUFFER_TIME, 200 ); + arts_stream_set( p_sys->stream, ARTS_P_BUFFER_TIME, 50 ); /* 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 ); + * (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 ); - p_aout->output.output.i_format = AOUT_FMT_S16_NE; - p_aout->output.i_nb_samples = p_sys->i_size; + 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_sys->b_initialized = VLC_TRUE; + p_aout->output.i_nb_samples = p_sys->i_size / sizeof(uint16_t) + / i_nb_channels; - return 0; + return VLC_SUCCESS; } /***************************************************************************** - * Play: queue a buffer for playing by aRtsThread + * Play: nothing to do *****************************************************************************/ static void Play( aout_instance_t *p_aout ) { - ; -} - -/***************************************************************************** - * Close: close the aRts socket - *****************************************************************************/ -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; + aout_buffer_t * p_buffer; + int i_tmp; - p_aout->b_die = 1; - vlc_thread_join( p_aout ); - - if( p_sys->stream ) +#if 0 + while( arts_stream_get( p_sys->stream, ARTS_P_BUFFER_SPACE ) < 16384*3/2 ) { - arts_close_stream( p_sys->stream ); + msleep( 10000 ); } +#endif - arts_free(); - free( p_sys ); -} - -/***************************************************************************** - * aRtsThread: asynchronous thread used to DMA the data to the device - *****************************************************************************/ -static int aRtsThread( aout_instance_t * p_aout ) -{ - struct aout_sys_t * p_sys = p_aout->output.p_sys; + p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo ); - while ( !p_aout->b_die ) + if( p_buffer != NULL ) { - 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, - VLC_FALSE ); - - if ( p_buffer != NULL ) - { - p_bytes = p_buffer->p_buffer; - i_size = p_buffer->i_nb_bytes; - } - else - { - i_size = p_sys->i_size / p_aout->output.output.i_frame_length - * p_aout->output.output.i_bytes_per_frame; - p_bytes = alloca( i_size ); - memset( p_bytes, 0, i_size ); - } - - i_tmp = arts_write( p_sys->stream, p_bytes, i_size ); + 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) ); } - if ( p_buffer != NULL ) - { - aout_BufferFree( p_buffer ); - } + aout_BufferFree( p_buffer ); } +} + +/***************************************************************************** + * Close: close the aRts socket + *****************************************************************************/ +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; - return 0; + arts_close_stream( p_sys->stream ); + arts_free(); + free( p_sys ); }