* output.c : internal management of output streams for the audio output
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: output.c,v 1.9 2002/08/21 22:41:59 massiot Exp $
+ * $Id: output.c,v 1.18 2002/10/20 12:23:48 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
/*****************************************************************************
* aout_OutputNew : allocate a new output and rework the filter pipeline
+ *****************************************************************************
+ * This function is entered with the mixer lock.
*****************************************************************************/
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" );
int i_channels = config_GetInt( p_aout, "aout-channels" );
- p_aout->output.p_module = module_Need( p_aout, "audio output",
- psz_name );
- if ( psz_name != NULL ) free( psz_name );
- if ( p_aout->output.p_module == NULL )
- {
- msg_Err( p_aout, "no suitable aout module" );
- return -1;
- }
-
- /* Retrieve user defaults. */
memcpy( &p_aout->output.output, p_format, sizeof(audio_sample_format_t) );
if ( i_rate != -1 ) p_aout->output.output.i_rate = i_rate;
if ( i_channels != -1 ) p_aout->output.output.i_channels = i_channels;
if ( AOUT_FMT_NON_LINEAR(&p_aout->output.output) )
{
- p_aout->output.output.i_format = AOUT_FMT_SPDIF;
+ p_aout->output.output.i_format = VLC_FOURCC('s','p','d','i');
}
else
{
/* Non-S/PDIF mixer only deals with float32 or fixed32. */
p_aout->output.output.i_format
- = (p_aout->p_vlc->i_cpu & CPU_CAPABILITY_FPU) ?
- AOUT_FMT_FLOAT32 : AOUT_FMT_FIXED32;
+ = (p_aout->p_libvlc->i_cpu & CPU_CAPABILITY_FPU) ?
+ VLC_FOURCC('f','l','3','2') :
+ VLC_FOURCC('f','i','3','2');
+
+ if ( p_aout->output.output.i_channels == AOUT_CHAN_DOLBY )
+ {
+ /* Do not do Dolby surround unless the user requests it. */
+ p_aout->output.output.i_channels = AOUT_CHAN_STEREO;
+ }
}
+ aout_FormatPrepare( &p_aout->output.output );
- /* Find the best output format. */
- if ( p_aout->output.pf_setformat( p_aout ) != 0 )
+ 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 );
+ if ( p_aout->output.p_module == NULL )
{
- msg_Err( p_aout, "couldn't set an output format" );
- module_Unneed( p_aout, p_aout->output.p_module );
+ msg_Err( p_aout, "no suitable aout module" );
+ vlc_mutex_unlock( &p_aout->output_fifo_lock );
return -1;
}
aout_FormatPrepare( &p_aout->output.output );
/* Prepare FIFO. */
aout_FifoInit( p_aout, &p_aout->output.fifo, p_aout->output.output.i_rate );
- msg_Dbg( p_aout, "output format=%d rate=%d channels=%d",
- p_aout->output.output.i_format, p_aout->output.output.i_rate,
- p_aout->output.output.i_channels );
+ vlc_mutex_unlock( &p_aout->output_fifo_lock );
+
+ aout_FormatPrint( p_aout, "output", &p_aout->output.output );
/* Calculate the resulting mixer output format. */
memcpy( &p_aout->mixer.mixer, &p_aout->output.output,
{
/* Non-S/PDIF mixer only deals with float32 or fixed32. */
p_aout->mixer.mixer.i_format
- = (p_aout->p_vlc->i_cpu & CPU_CAPABILITY_FPU) ?
- AOUT_FMT_FLOAT32 : AOUT_FMT_FIXED32;
+ = (p_aout->p_libvlc->i_cpu & CPU_CAPABILITY_FPU) ?
+ VLC_FOURCC('f','l','3','2') :
+ VLC_FOURCC('f','i','3','2');
aout_FormatPrepare( &p_aout->mixer.mixer );
}
else
p_aout->mixer.mixer.i_format = p_format->i_format;
}
- msg_Dbg( p_aout, "mixer format=%d rate=%d channels=%d",
- p_aout->mixer.mixer.i_format, p_aout->mixer.mixer.i_rate,
- p_aout->mixer.mixer.i_channels );
+ aout_FormatPrint( p_aout, "mixer", &p_aout->output.output );
/* Create filters. */
if ( aout_FiltersCreatePipeline( p_aout, p_aout->output.pp_filters,
/*****************************************************************************
* aout_OutputDelete : delete the output
+ *****************************************************************************
+ * This function is entered with the mixer lock.
*****************************************************************************/
void aout_OutputDelete( aout_instance_t * p_aout )
{
/*****************************************************************************
* aout_OutputPlay : play a buffer
+ *****************************************************************************
+ * This function is entered with the mixer lock.
*****************************************************************************/
void aout_OutputPlay( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
{
p_aout->output.i_nb_filters,
&p_buffer );
- vlc_mutex_lock( &p_aout->mixer_lock );
+ 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_unlock( &p_aout->mixer_lock );
+ vlc_mutex_unlock( &p_aout->output_fifo_lock );
}
/*****************************************************************************
* If b_can_sleek is 1, the aout core functions won't try to resample
* new buffers to catch up - that is we suppose that the output plug-in can
* compensate it by itself. S/PDIF outputs should always set b_can_sleek = 1.
+ * This function is entered with no lock at all :-).
*****************************************************************************/
aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
- mtime_t start_date ,
+ mtime_t start_date,
vlc_bool_t b_can_sleek )
{
aout_buffer_t * p_buffer;
- vlc_mutex_lock( &p_aout->mixer_lock );
- p_buffer = p_aout->output.fifo.p_first;
+ vlc_mutex_lock( &p_aout->output_fifo_lock );
- while ( p_buffer != NULL && p_buffer->start_date < start_date )
+ p_buffer = p_aout->output.fifo.p_first;
+ while ( p_buffer && p_buffer->start_date < start_date )
{
- msg_Dbg( p_aout, "audio output is too slow (%lld)",
- start_date - p_buffer->start_date );
+ msg_Dbg( p_aout, "audio output is too slow (%lld), trashing %lldus",
+ start_date - p_buffer->start_date,
+ p_buffer->end_date - p_buffer->start_date );
p_buffer = p_buffer->p_next;
}
p_aout->output.fifo.pp_last = &p_aout->output.fifo.p_first;
/* Set date to 0, to allow the mixer to send a new buffer ASAP */
aout_FifoSet( p_aout, &p_aout->output.fifo, 0 );
- vlc_mutex_unlock( &p_aout->mixer_lock );
- msg_Dbg( p_aout, "audio output is starving" );
+ vlc_mutex_unlock( &p_aout->output_fifo_lock );
+ msg_Dbg( p_aout,
+ "audio output is starving (no input), playing silence" );
return NULL;
}
if ( p_buffer->start_date > start_date
+ (p_buffer->end_date - p_buffer->start_date) )
{
- vlc_mutex_unlock( &p_aout->mixer_lock );
- msg_Dbg( p_aout, "audio output is starving (%lld)",
+ vlc_mutex_unlock( &p_aout->output_fifo_lock );
+ msg_Dbg( p_aout, "audio output is starving (%lld), playing silence",
p_buffer->start_date - start_date );
return NULL;
}
msg_Warn( p_aout, "output date isn't PTS date, resampling (%lld)",
difference );
- /* Remember that we still own the mixer lock. */
+ vlc_mutex_lock( &p_aout->input_fifos_lock );
for ( i = 0; i < p_aout->i_nb_inputs; i++ )
{
aout_fifo_t * p_fifo = &p_aout->pp_inputs[i]->fifo;
}
aout_FifoMoveDates( p_aout, &p_aout->output.fifo, difference );
+ vlc_mutex_unlock( &p_aout->input_fifos_lock );
}
p_aout->output.fifo.p_first = p_buffer->p_next;
p_aout->output.fifo.pp_last = &p_aout->output.fifo.p_first;
}
- vlc_mutex_unlock( &p_aout->mixer_lock );
+ vlc_mutex_unlock( &p_aout->output_fifo_lock );
return p_buffer;
}