/*****************************************************************************
* output.c : internal management of output streams for the audio output
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: output.c,v 1.24 2002/11/14 22:38:48 massiot Exp $
+ * Copyright (C) 2002-2004 the VideoLAN team
+ * $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* 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
*
* 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.
*****************************************************************************/
/*****************************************************************************
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, 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 )
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" );
}
if ( var_Type( p_aout, "audio-channels" ) ==
- (VLC_VAR_STRING | VLC_VAR_ISLIST) )
+ (VLC_VAR_INTEGER | VLC_VAR_HASCHOICE) )
{
/* The user may have selected a different channels configuration. */
- vlc_value_t val;
var_Get( p_aout, "audio-channels", &val );
- if ( !strcmp( val.psz_string, N_("Both") ) )
+ if ( val.i_int == AOUT_VAR_CHAN_RSTEREO )
+ {
+ p_aout->output.output.i_original_channels |=
+ AOUT_CHAN_REVERSESTEREO;
+ }
+ 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 )
+ 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. */
- vlc_value_t val;
- var_Create( p_aout, "audio-channels", VLC_VAR_STRING | VLC_VAR_ISLIST );
+ 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.i_int = AOUT_VAR_CHAN_LEFT;
+ var_Set( p_aout, "audio-channels", val );
}
- else
- {
- 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_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart,
NULL );
}
- else if ( p_aout->output.output.i_physical_channels ==
- (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)
- && p_aout->output.output.i_original_channels ==
- (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) )
+ else if ( p_aout->output.output.i_physical_channels ==
+ (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)
+ && (p_aout->output.output.i_original_channels &
+ (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
{
/* Stereo - create the audio-channels variable. */
- vlc_value_t val;
- var_Create( p_aout, "audio-channels", VLC_VAR_STRING | VLC_VAR_ISLIST );
- 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 );
+
if ( p_aout->output.output.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
{
- val.psz_string = N_("Dolby Surround");
- var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
+ val.i_int = AOUT_VAR_CHAN_DOLBYS;
+ text.psz_string = _("Dolby Surround");
+ }
+ else
+ {
+ 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 );
+ 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.i_int = AOUT_VAR_CHAN_LEFT;
+ var_Set( p_aout, "audio-channels", val );
}
- p_aout->output.output.i_original_channels &= ~AOUT_CHAN_DOLBYSTEREO;
var_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart,
NULL );
}
+ val.b_bool = VLC_TRUE;
+ var_Set( p_aout, "intf-change", val );
aout_FormatPrepare( &p_aout->output.output );
/* Prepare FIFO. */
- aout_FifoInit( p_aout, &p_aout->output.fifo, p_aout->output.output.i_rate );
+ aout_FifoInit( p_aout, &p_aout->output.fifo,
+ p_aout->output.output.i_rate );
vlc_mutex_unlock( &p_aout->output_fifo_lock );
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.i_nb_filters,
&p_aout->mixer.output_alloc );
+ p_aout->output.b_error = 0;
return 0;
}
*****************************************************************************/
void aout_OutputDelete( aout_instance_t * p_aout )
{
+ if ( p_aout->output.b_error )
+ {
+ return;
+ }
+
module_Unneed( p_aout, p_aout->output.p_module );
aout_FiltersDestroyPipeline( p_aout, p_aout->output.pp_filters,
p_aout->output.i_nb_filters );
aout_FifoDestroy( p_aout, &p_aout->output.fifo );
+
+ p_aout->output.b_error = VLC_TRUE;
}
/*****************************************************************************
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 );
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,
p_buffer->end_date - p_buffer->start_date );
p_buffer = p_buffer->p_next;
+ aout_BufferFree( p_aout->output.fifo.p_first );
+ p_aout->output.fifo.p_first = p_buffer;
}
- p_aout->output.fifo.p_first = p_buffer;
if ( p_buffer == NULL )
{
p_aout->output.fifo.pp_last = &p_aout->output.fifo.p_first;
}
/* 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
+ */
{
vlc_mutex_unlock( &p_aout->output_fifo_lock );
if ( !p_aout->output.b_starving )
projects / vlc / blobdiff