* input.c : internal management of input streams for the audio output
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: input.c,v 1.2 2002/08/09 23:47:23 massiot Exp $
+ * $Id: input.c,v 1.10 2002/08/28 22:25:39 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
#include <vlc/vlc.h>
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
+
#include "audio_output.h"
#include "aout_internal.h"
static aout_input_t * InputNew( aout_instance_t * p_aout,
audio_sample_format_t * p_format )
{
- aout_input_t * p_input = malloc(sizeof(aout_input_t));
+ aout_input_t * p_input = malloc(sizeof(aout_input_t));
if ( p_input == NULL ) return NULL;
vlc_mutex_lock( &p_aout->mixer_lock );
- while ( p_aout->b_mixer_active )
- {
- vlc_cond_wait( &p_aout->mixer_signal, &p_aout->mixer_lock );
- }
if ( p_aout->i_nb_inputs == 0 )
{
memcpy( &p_input->input, p_format,
sizeof(audio_sample_format_t) );
+ aout_FormatPrepare( &p_input->input );
/* Prepare FIFO. */
- aout_FifoInit( p_aout, &p_input->fifo );
+ aout_FifoInit( p_aout, &p_input->fifo, p_aout->mixer.mixer.i_rate );
p_input->p_first_byte_to_mix = NULL;
/* Create filters. */
if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters,
&p_input->i_nb_filters, &p_input->input,
- &p_aout->mixer.input ) < 0 )
+ &p_aout->mixer.mixer ) < 0 )
{
msg_Err( p_aout, "couldn't set an input pipeline" );
if ( !p_aout->i_nb_inputs )
{
aout_OutputDelete( p_aout );
- }
+ }
+ else
+ {
+ aout_MixerNew( p_aout );
+ }
+ vlc_mutex_unlock( &p_aout->mixer_lock );
+
+ return NULL;
}
+ vlc_mutex_unlock( &p_aout->mixer_lock );
+
/* Prepare hints for the buffer allocator. */
p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP;
p_input->input_alloc.i_bytes_per_sec = -1;
/* i_bytes_per_sec is still == -1 if no filters */
p_input->input_alloc.i_bytes_per_sec = __MAX(
p_input->input_alloc.i_bytes_per_sec,
- aout_FormatToByterate( &p_input->input,
- p_input->input.i_rate ) );
+ p_input->input.i_bytes_per_frame
+ * p_input->input.i_rate
+ / p_input->input.i_frame_length );
/* Allocate in the heap, it is more convenient for the decoder. */
p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP;
- vlc_mutex_unlock( &p_aout->mixer_lock );
-
msg_Dbg( p_aout, "input 0x%x created", p_input );
return p_input;
}
{
int i_input;
- msg_Dbg( p_aout, "input 0x%x destroyed", p_input );
-
vlc_mutex_lock( &p_aout->mixer_lock );
- while ( p_aout->b_mixer_active )
- {
- vlc_cond_wait( &p_aout->mixer_signal, &p_aout->mixer_lock );
- }
for ( i_input = 0; i_input < p_aout->i_nb_inputs; i_input++ )
{
aout_OutputDelete( p_aout );
aout_MixerDelete( p_aout );
}
+
+ msg_Dbg( p_aout, "input 0x%x destroyed", p_input );
}
/*****************************************************************************
void aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
aout_buffer_t * p_buffer )
{
+ mtime_t start_date, duration;
+
vlc_mutex_lock( &p_aout->input_lock );
while( p_aout->b_change_requested )
{
p_aout->i_inputs_active++;
vlc_mutex_unlock( &p_aout->input_lock );
- aout_FiltersPlay( p_aout, p_input->pp_filters, p_input->i_nb_filters,
- &p_buffer );
+ /* We don't care if someone changes the start date behind our back after
+ * this. We'll deal with that when pushing the buffer, and compensate
+ * with the next incoming buffer. */
+ start_date = aout_FifoNextStart( p_aout, &p_input->fifo );
+ if ( start_date != 0 && start_date < mdate() )
+ {
+ /* The decoder is _very_ late. This can only happen if the user
+ * pauses the stream (or if the decoder is buggy, which cannot
+ * happen :). */
+ msg_Warn( p_aout, "computed PTS is out of range (%lld), clearing out",
+ start_date );
+ vlc_mutex_lock( &p_aout->mixer_lock );
+ aout_FifoSet( p_aout, &p_input->fifo, 0 );
+ vlc_mutex_unlock( &p_aout->mixer_lock );
+ start_date = 0;
+ }
+
+ if ( p_buffer->start_date < mdate() + AOUT_MIN_PREPARE_TIME )
+ {
+ /* The decoder gives us f*cked up PTS. It's its business, but we
+ * can't present it anyway, so drop the buffer. */
+ msg_Warn( p_aout, "PTS is out of range (%lld), dropping buffer",
+ mdate() - p_buffer->start_date );
+ aout_BufferFree( p_buffer );
+
+ vlc_mutex_lock( &p_aout->input_lock );
+ p_aout->i_inputs_active--;
+ vlc_cond_broadcast( &p_aout->input_signal );
+ vlc_mutex_unlock( &p_aout->input_lock );
+ return;
+ }
+
+ if ( start_date == 0 ) start_date = p_buffer->start_date;
+
+ if ( start_date < p_buffer->start_date - AOUT_PTS_TOLERANCE
+ || start_date > p_buffer->start_date + AOUT_PTS_TOLERANCE )
+ {
+ /* Can happen in several circumstances :
+ * 1. A problem at the input (clock drift)
+ * 2. A small pause triggered by the user
+ * 3. Some delay in the output stage, causing a loss of lip
+ * synchronization
+ * Solution : resample the buffer to avoid a scratch.
+ */
+ audio_sample_format_t new_input;
+ int i_ratio, i_nb_filters;
+ mtime_t old_duration;
+ aout_filter_t * pp_filters[AOUT_MAX_FILTERS];
+ aout_buffer_t * p_new_buffer;
+ aout_alloc_t dummy_alloc;
+ mtime_t drift = p_buffer->start_date - start_date;
+
+ msg_Warn( p_aout, "buffer is %lld %s, resampling",
+ drift > 0 ? drift : -drift,
+ drift > 0 ? "in advance" : "late" );
+ memcpy( &new_input, &p_input->input,
+ sizeof(audio_sample_format_t) );
+ old_duration = p_buffer->end_date - p_buffer->start_date;
+ duration = p_buffer->end_date - start_date;
+ i_ratio = duration * 100 / old_duration;
+ /* If the ratio is too != 100, the sound quality will be awful. */
+ if ( i_ratio < 66 /* % */ )
+ {
+ duration = old_duration * 66 / 100;
+ }
+ if ( i_ratio > 150 /* % */ )
+ {
+ duration = old_duration * 150 / 100;
+ }
+ new_input.i_rate = new_input.i_rate * old_duration / duration;
+ aout_FormatPrepare( &new_input );
+
+ if ( aout_FiltersCreatePipeline( p_aout, pp_filters,
+ &i_nb_filters, &new_input,
+ &p_aout->mixer.mixer ) < 0 )
+ {
+ msg_Err( p_aout, "couldn't set an input pipeline for resampling" );
+ vlc_mutex_lock( &p_aout->mixer_lock );
+ aout_FifoSet( p_aout, &p_input->fifo, 0 );
+ vlc_mutex_unlock( &p_aout->mixer_lock );
+ aout_BufferFree( p_buffer );
+
+ vlc_mutex_lock( &p_aout->input_lock );
+ p_aout->i_inputs_active--;
+ vlc_cond_broadcast( &p_aout->input_signal );
+ vlc_mutex_unlock( &p_aout->input_lock );
+ return;
+ }
+
+ dummy_alloc.i_alloc_type = AOUT_ALLOC_HEAP;
+ dummy_alloc.i_bytes_per_sec = -1;
+ aout_FiltersHintBuffers( p_aout, pp_filters, i_nb_filters,
+ &dummy_alloc );
+ dummy_alloc.i_bytes_per_sec = __MAX(
+ dummy_alloc.i_bytes_per_sec,
+ new_input.i_bytes_per_frame
+ * new_input.i_rate
+ / new_input.i_frame_length );
+ dummy_alloc.i_alloc_type = AOUT_ALLOC_HEAP;
+
+ aout_BufferAlloc( &dummy_alloc, duration, NULL, p_new_buffer );
+ memcpy( p_new_buffer->p_buffer, p_buffer->p_buffer,
+ p_buffer->i_nb_bytes );
+ p_new_buffer->i_nb_samples = p_buffer->i_nb_samples;
+ p_new_buffer->i_nb_bytes = p_buffer->i_nb_bytes;
+
+ aout_BufferFree( p_buffer );
+ p_buffer = p_new_buffer;
+
+ aout_FiltersPlay( p_aout, pp_filters, i_nb_filters,
+ &p_buffer );
+
+ aout_FiltersDestroyPipeline( p_aout, pp_filters,
+ i_nb_filters );
+ }
+ else
+ {
+ /* No resampling needed (except maybe the one imposed by the
+ * output). */
+ duration = p_buffer->end_date - p_buffer->start_date;
+ aout_FiltersPlay( p_aout, p_input->pp_filters, p_input->i_nb_filters,
+ &p_buffer );
+ }
+
+ vlc_mutex_lock( &p_aout->mixer_lock );
+ /* Adding the start date will be managed by aout_FifoPush(). */
+ p_buffer->start_date = start_date;
+ p_buffer->end_date = start_date + duration;
aout_FifoPush( p_aout, &p_input->fifo, p_buffer );
+ vlc_mutex_unlock( &p_aout->mixer_lock );
vlc_mutex_lock( &p_aout->input_lock );
p_aout->i_inputs_active--;
projects / vlc / blobdiff