X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Foutput.c;h=b799855b43db43ac012c2ce0837f088aac515b64;hb=59da25707ad2c660c0327d6edb59824729922710;hp=555b4dd4c6af2846d8468c866dc1dceb96ad810c;hpb=c83f667f084a80af397caba3750de32b67f02f22;p=vlc diff --git a/src/audio_output/output.c b/src/audio_output/output.c index 555b4dd4c6..b799855b43 100644 --- a/src/audio_output/output.c +++ b/src/audio_output/output.c @@ -1,8 +1,8 @@ /***************************************************************************** * output.c : internal management of output streams for the audio output ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: output.c,v 1.35 2003/01/28 12:23:40 massiot Exp $ + * Copyright (C) 2002-2004 the VideoLAN team + * $Id$ * * Authors: Christophe Massiot * @@ -18,18 +18,18 @@ * * 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 /* calloc(), malloc(), free() */ -#include - -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "audio_output.h" +#include +#include #include "aout_internal.h" /***************************************************************************** @@ -41,9 +41,10 @@ int aout_OutputNew( aout_instance_t * p_aout, audio_sample_format_t * p_format ) { /* Retrieve user defaults. */ - char * psz_name = config_GetPsz( p_aout, "aout" ); int i_rate = config_GetInt( p_aout, "aout-rate" ); - vlc_value_t val; + vlc_value_t val, text; + /* kludge to avoid a fpu error when rate is 0... */ + if( i_rate == 0 ) i_rate = -1; memcpy( &p_aout->output.output, p_format, sizeof(audio_sample_format_t) ); if ( i_rate != -1 ) @@ -53,64 +54,65 @@ int aout_OutputNew( aout_instance_t * p_aout, vlc_mutex_lock( &p_aout->output_fifo_lock ); /* Find the best output plug-in. */ - p_aout->output.p_module = module_Need( p_aout, "audio output", - psz_name ); - if ( psz_name != NULL ) free( psz_name ); + p_aout->output.p_module = module_Need( p_aout, "audio output", "$aout", 0); if ( p_aout->output.p_module == NULL ) { - msg_Err( p_aout, "no suitable aout module" ); + msg_Err( p_aout, "no suitable audio output module" ); vlc_mutex_unlock( &p_aout->output_fifo_lock ); return -1; } if ( var_Type( p_aout, "audio-channels" ) == - (VLC_VAR_STRING | VLC_VAR_HASCHOICE) ) + (VLC_VAR_INTEGER | VLC_VAR_HASCHOICE) ) { /* The user may have selected a different channels configuration. */ var_Get( p_aout, "audio-channels", &val ); - if ( !strcmp( val.psz_string, N_("Reverse stereo") ) ) + if ( val.i_int == AOUT_VAR_CHAN_RSTEREO ) { p_aout->output.output.i_original_channels |= AOUT_CHAN_REVERSESTEREO; } - else if ( !strcmp( val.psz_string, N_("Both") ) ) + else if ( val.i_int == AOUT_VAR_CHAN_STEREO ) { p_aout->output.output.i_original_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT; } - else if ( !strcmp( val.psz_string, N_("Left") ) ) + else if ( val.i_int == AOUT_VAR_CHAN_LEFT ) { p_aout->output.output.i_original_channels = AOUT_CHAN_LEFT; } - else if ( !strcmp( val.psz_string, N_("Right") ) ) + else if ( val.i_int == AOUT_VAR_CHAN_RIGHT ) { p_aout->output.output.i_original_channels = AOUT_CHAN_RIGHT; } - else if ( !strcmp( val.psz_string, N_("Dolby Surround") ) ) + else if ( val.i_int == AOUT_VAR_CHAN_DOLBYS ) { p_aout->output.output.i_original_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_DOLBYSTEREO; } - free( val.psz_string ); } else if ( p_aout->output.output.i_physical_channels == AOUT_CHAN_CENTER && (p_aout->output.output.i_original_channels & AOUT_CHAN_PHYSMASK) == (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) ) { /* Mono - create the audio-channels variable. */ - var_Create( p_aout, "audio-channels", VLC_VAR_STRING | VLC_VAR_HASCHOICE ); - val.psz_string = N_("Both"); - var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val ); - val.psz_string = N_("Left"); - var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val ); - val.psz_string = N_("Right"); - var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val ); + var_Create( p_aout, "audio-channels", + VLC_VAR_INTEGER | VLC_VAR_HASCHOICE ); + text.psz_string = _("Audio Channels"); + var_Change( p_aout, "audio-channels", VLC_VAR_SETTEXT, &text, NULL ); + + val.i_int = AOUT_VAR_CHAN_STEREO; text.psz_string = _("Stereo"); + var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val, &text ); + val.i_int = AOUT_VAR_CHAN_LEFT; text.psz_string = _("Left"); + var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val, &text ); + val.i_int = AOUT_VAR_CHAN_RIGHT; text.psz_string = _("Right"); + var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val, &text ); if ( p_aout->output.output.i_original_channels & AOUT_CHAN_DUALMONO ) { /* Go directly to the left channel. */ p_aout->output.output.i_original_channels = AOUT_CHAN_LEFT; - val.psz_string = N_("Left"); + val.i_int = AOUT_VAR_CHAN_LEFT; var_Set( p_aout, "audio-channels", val ); } var_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart, @@ -122,33 +124,39 @@ int aout_OutputNew( aout_instance_t * p_aout, (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) ) { /* Stereo - create the audio-channels variable. */ - var_Create( p_aout, "audio-channels", VLC_VAR_STRING | VLC_VAR_HASCHOICE ); + var_Create( p_aout, "audio-channels", + VLC_VAR_INTEGER | VLC_VAR_HASCHOICE ); + text.psz_string = _("Audio Channels"); + var_Change( p_aout, "audio-channels", VLC_VAR_SETTEXT, &text, NULL ); + if ( p_aout->output.output.i_original_channels & AOUT_CHAN_DOLBYSTEREO ) { - val.psz_string = N_("Dolby Surround"); + val.i_int = AOUT_VAR_CHAN_DOLBYS; + text.psz_string = _("Dolby Surround"); } else { - val.psz_string = N_("Both"); + val.i_int = AOUT_VAR_CHAN_STEREO; + text.psz_string = _("Stereo"); } - var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val ); - val.psz_string = N_("Left"); - var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val ); - val.psz_string = N_("Right"); - var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val ); - val.psz_string = N_("Reverse stereo"); - var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val ); + var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val, &text ); + val.i_int = AOUT_VAR_CHAN_LEFT; text.psz_string = _("Left"); + var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val, &text ); + val.i_int = AOUT_VAR_CHAN_RIGHT; text.psz_string = _("Right"); + var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val, &text ); + val.i_int = AOUT_VAR_CHAN_RSTEREO; text.psz_string=_("Reverse stereo"); + var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val, &text ); if ( p_aout->output.output.i_original_channels & AOUT_CHAN_DUALMONO ) { /* Go directly to the left channel. */ p_aout->output.output.i_original_channels = AOUT_CHAN_LEFT; - val.psz_string = N_("Left"); + val.i_int = AOUT_VAR_CHAN_LEFT; var_Set( p_aout, "audio-channels", val ); } var_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart, NULL ); } - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_aout, "intf-change", val ); aout_FormatPrepare( &p_aout->output.output ); @@ -168,7 +176,7 @@ int aout_OutputNew( aout_instance_t * p_aout, { /* Non-S/PDIF mixer only deals with float32 or fixed32. */ p_aout->mixer.mixer.i_format - = (p_aout->p_libvlc->i_cpu & CPU_CAPABILITY_FPU) ? + = (vlc_CPU() & CPU_CAPABILITY_FPU) ? VLC_FOURCC('f','l','3','2') : VLC_FOURCC('f','i','3','2'); aout_FormatPrepare( &p_aout->mixer.mixer ); @@ -178,15 +186,16 @@ int aout_OutputNew( aout_instance_t * p_aout, p_aout->mixer.mixer.i_format = p_format->i_format; } - aout_FormatPrint( p_aout, "mixer", &p_aout->output.output ); + aout_FormatPrint( p_aout, "mixer", &p_aout->mixer.mixer ); /* Create filters. */ + p_aout->output.i_nb_filters = 0; if ( aout_FiltersCreatePipeline( p_aout, p_aout->output.pp_filters, &p_aout->output.i_nb_filters, &p_aout->mixer.mixer, &p_aout->output.output ) < 0 ) { - msg_Err( p_aout, "couldn't set an output pipeline" ); + msg_Err( p_aout, "couldn't create audio output pipeline" ); module_Unneed( p_aout, p_aout->output.p_module ); return -1; } @@ -222,9 +231,12 @@ void aout_OutputDelete( aout_instance_t * p_aout ) aout_FiltersDestroyPipeline( p_aout, p_aout->output.pp_filters, p_aout->output.i_nb_filters ); + + vlc_mutex_lock( &p_aout->output_fifo_lock ); aout_FifoDestroy( p_aout, &p_aout->output.fifo ); + vlc_mutex_unlock( &p_aout->output_fifo_lock ); - p_aout->output.b_error = VLC_TRUE; + p_aout->output.b_error = true; } /***************************************************************************** @@ -238,6 +250,12 @@ void aout_OutputPlay( aout_instance_t * p_aout, aout_buffer_t * p_buffer ) p_aout->output.i_nb_filters, &p_buffer ); + if( p_buffer->i_nb_bytes == 0 ) + { + aout_BufferFree( p_buffer ); + return; + } + vlc_mutex_lock( &p_aout->output_fifo_lock ); aout_FifoPush( p_aout, &p_aout->output.fifo, p_buffer ); p_aout->output.pf_play( p_aout ); @@ -254,17 +272,22 @@ void aout_OutputPlay( aout_instance_t * p_aout, aout_buffer_t * p_buffer ) *****************************************************************************/ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout, mtime_t start_date, - vlc_bool_t b_can_sleek ) + bool b_can_sleek ) { aout_buffer_t * p_buffer; vlc_mutex_lock( &p_aout->output_fifo_lock ); p_buffer = p_aout->output.fifo.p_first; - while ( p_buffer && p_buffer->start_date < mdate() ) + + /* Drop the audio sample if the audio output is really late. + * In the case of b_can_sleek, we don't use a resampler so we need to be + * a lot more severe. */ + while ( p_buffer && p_buffer->start_date < + (b_can_sleek ? start_date : mdate()) - AOUT_PTS_TOLERANCE ) { - msg_Dbg( p_aout, "audio output is too slow ("I64Fd"), " - "trashing "I64Fd"us", mdate() - p_buffer->start_date, + msg_Dbg( p_aout, "audio output is too slow (%"PRId64"), " + "trashing %"PRId64"us", mdate() - p_buffer->start_date, p_buffer->end_date - p_buffer->start_date ); p_buffer = p_buffer->p_next; aout_BufferFree( p_aout->output.fifo.p_first ); @@ -276,7 +299,7 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout, p_aout->output.fifo.pp_last = &p_aout->output.fifo.p_first; #if 0 /* This is bad because the audio output might just be trying to fill - * in it's internal buffers. And anyway, it's up to the audio output + * in its internal buffers. And anyway, it's up to the audio output * to deal with this kind of starvation. */ /* Set date to 0, to allow the mixer to send a new buffer ASAP */ @@ -292,14 +315,23 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout, } /* Here we suppose that all buffers have the same duration - this is - * generally true, and anyway if it's wrong it won't be a disaster. */ + * generally true, and anyway if it's wrong it won't be a disaster. + */ if ( p_buffer->start_date > start_date + (p_buffer->end_date - p_buffer->start_date) ) + /* + * + AOUT_PTS_TOLERANCE ) + * There is no reason to want that, it just worsen the scheduling of + * an audio sample after an output starvation (ie. on start or on resume) + * --Gibalou + */ { + const mtime_t i_delta = p_buffer->start_date - start_date; vlc_mutex_unlock( &p_aout->output_fifo_lock ); + if ( !p_aout->output.b_starving ) - msg_Dbg( p_aout, "audio output is starving ("I64Fd"), " - "playing silence", p_buffer->start_date - start_date ); + msg_Dbg( p_aout, "audio output is starving (%"PRId64"), " + "playing silence", i_delta ); p_aout->output.b_starving = 1; return NULL; } @@ -314,7 +346,7 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout, int i; mtime_t difference = start_date - p_buffer->start_date; msg_Warn( p_aout, "output date isn't PTS date, requesting " - "resampling ("I64Fd")", difference ); + "resampling (%"PRId64")", difference ); vlc_mutex_lock( &p_aout->input_fifos_lock ); for ( i = 0; i < p_aout->i_nb_inputs; i++ )