/*****************************************************************************
* output.c : internal management of output streams for the audio output
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: output.c,v 1.39 2003/05/04 23:39:02 gbazin Exp $
+ * Copyright (C) 2002-2004 the VideoLAN team
+ * $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
*
* 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 <stdlib.h> /* calloc(), malloc(), free() */
-#include <string.h>
-
#include <vlc/vlc.h>
-
-#include "audio_output.h"
+#include <vlc_aout.h>
#include "aout_internal.h"
/*****************************************************************************
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... */
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;
}
/* Mono - create the audio-channels variable. */
var_Create( p_aout, "audio-channels",
VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
- text.psz_string = _("Audio channels");
+ 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");
/* Stereo - create the audio-channels variable. */
var_Create( p_aout, "audio-channels",
VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
- text.psz_string = _("Audio channels");
+ 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 )
{
/* 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 );
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;
}
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.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_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 */
}
/* 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 );
+ "playing silence", i_delta );
p_aout->output.b_starving = 1;
return NULL;
}
projects / vlc / blobdiff