* input.c : internal management of input streams for the audio output
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: input.c,v 1.1 2002/08/07 21:36:56 massiot Exp $
+ * $Id: input.c,v 1.21 2002/11/13 20:51:04 sam 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"
/*****************************************************************************
* aout_InputNew : allocate a new input and rework the filter pipeline
*****************************************************************************/
-static aout_input_t * InputNew( aout_instance_t * p_aout,
- audio_sample_format_t * p_format )
+int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
{
- aout_input_t * p_input = malloc(sizeof(aout_input_t));
-
- if ( p_input == NULL ) return NULL;
+ audio_sample_format_t intermediate_format;
- 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 )
- {
- /* Recreate the output using the new format. */
- if ( aout_OutputNew( p_aout, p_format ) < 0 )
- {
- free( p_input );
- return NULL;
- }
- }
- else
- {
- aout_MixerDelete( p_aout );
- }
-
- memcpy( &p_input->input, p_format,
- sizeof(audio_sample_format_t) );
+ aout_FormatPrint( p_aout, "input", &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. */
+ memcpy( &intermediate_format, &p_aout->mixer.mixer,
+ sizeof(audio_sample_format_t) );
+ intermediate_format.i_rate = p_input->input.i_rate;
if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters,
&p_input->i_nb_filters, &p_input->input,
- &p_aout->mixer.input ) < 0 )
+ &intermediate_format ) < 0 )
{
msg_Err( p_aout, "couldn't set an input pipeline" );
aout_FifoDestroy( p_aout, &p_input->fifo );
+ p_input->b_error = 1;
+
+ return -1;
+ }
- free( p_input );
+ /* 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;
- if ( !p_aout->i_nb_inputs )
+ if ( AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) )
+ {
+ p_input->i_nb_resamplers = 0;
+ }
+ else
+ {
+ /* Create resamplers. */
+ intermediate_format.i_rate = (p_input->input.i_rate
+ * (100 + AOUT_MAX_RESAMPLING)) / 100;
+ if ( intermediate_format.i_rate == p_aout->mixer.mixer.i_rate )
{
- aout_OutputDelete( p_aout );
+ /* Just in case... */
+ intermediate_format.i_rate++;
}
- return NULL;
- }
+ if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_resamplers,
+ &p_input->i_nb_resamplers,
+ &intermediate_format,
+ &p_aout->mixer.mixer ) < 0 )
+ {
+ msg_Err( p_aout, "couldn't set a resampler pipeline" );
- p_aout->pp_inputs[p_aout->i_nb_inputs] = p_input;
- p_aout->i_nb_inputs++;
+ aout_FiltersDestroyPipeline( p_aout, p_input->pp_filters,
+ p_input->i_nb_filters );
+ aout_FifoDestroy( p_aout, &p_input->fifo );
+ p_input->b_error = 1;
- if ( aout_MixerNew( p_aout ) < 0 )
- {
- p_aout->i_nb_inputs--;
- aout_FiltersDestroyPipeline( p_aout, p_input->pp_filters,
- p_input->i_nb_filters );
- aout_FifoDestroy( p_aout, &p_input->fifo );
+ return -1;
+ }
- free( p_input );
+ aout_FiltersHintBuffers( p_aout, p_input->pp_resamplers,
+ p_input->i_nb_resamplers,
+ &p_input->input_alloc );
+
+ /* Setup the initial rate of the resampler */
+ p_input->pp_resamplers[0]->input.i_rate = p_input->input.i_rate;
+ p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
- if ( !p_aout->i_nb_inputs )
- {
- aout_OutputDelete( p_aout );
- }
}
- /* 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;
-
aout_FiltersHintBuffers( p_aout, p_input->pp_filters,
p_input->i_nb_filters,
&p_input->input_alloc );
/* 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_FormatToBytes( &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 );
+ p_input->b_error = 0;
- msg_Dbg( p_aout, "input 0x%x created", p_input );
- return p_input;
+ return 0;
}
-aout_input_t * __aout_InputNew( vlc_object_t * p_this,
- aout_instance_t ** pp_aout,
- audio_sample_format_t * p_format )
+/*****************************************************************************
+ * aout_InputDelete : delete an input
+ *****************************************************************************
+ * This function must be entered with the mixer lock.
+ *****************************************************************************/
+int aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input )
{
- /* Create an audio output if there is none. */
- *pp_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ if ( p_input->b_error ) return 0;
- if( *pp_aout == NULL )
- {
- msg_Dbg( p_this, "no aout present, spawning one" );
-
- *pp_aout = aout_NewInstance( p_this );
- /* Everything failed, I'm a loser, I just wanna die */
- if( *pp_aout == NULL )
- {
- return NULL;
- }
- }
- else
- {
- vlc_object_release( *pp_aout );
- }
+ aout_FiltersDestroyPipeline( p_aout, p_input->pp_filters,
+ p_input->i_nb_filters );
+ aout_FiltersDestroyPipeline( p_aout, p_input->pp_resamplers,
+ p_input->i_nb_resamplers );
+ aout_FifoDestroy( p_aout, &p_input->fifo );
- return InputNew( *pp_aout, p_format );
+ return 0;
}
/*****************************************************************************
- * aout_InputDelete : delete an input
+ * aout_InputPlay : play a buffer
+ *****************************************************************************
+ * This function must be entered with the input lock.
*****************************************************************************/
-void aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input )
+int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
+ aout_buffer_t * p_buffer )
{
- int i_input;
+ mtime_t start_date;
- msg_Dbg( p_aout, "input 0x%x destroyed", p_input );
+ /* 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. */
+ vlc_mutex_lock( &p_aout->input_fifos_lock );
+ start_date = aout_FifoNextStart( p_aout, &p_input->fifo );
+ vlc_mutex_unlock( &p_aout->input_fifos_lock );
- vlc_mutex_lock( &p_aout->mixer_lock );
- while ( p_aout->b_mixer_active )
+ if ( start_date != 0 && start_date < mdate() )
{
- vlc_cond_wait( &p_aout->mixer_signal, &p_aout->mixer_lock );
+ /* 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 ("I64Fd"), "
+ "clearing out", mdate() - start_date );
+ vlc_mutex_lock( &p_aout->input_fifos_lock );
+ aout_FifoSet( p_aout, &p_input->fifo, 0 );
+ vlc_mutex_unlock( &p_aout->input_fifos_lock );
+ if ( p_input->i_resampling_type != AOUT_RESAMPLING_NONE )
+ msg_Warn( p_aout, "timing screwed, stopping resampling" );
+ p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
+ p_input->pp_resamplers[0]->input.i_rate = p_input->input.i_rate;
+ p_input->pp_resamplers[0]->b_reinit = VLC_TRUE;
+ start_date = 0;
}
- for ( i_input = 0; i_input < p_aout->i_nb_inputs; i_input++ )
+ if ( p_buffer->start_date < mdate() + AOUT_MIN_PREPARE_TIME )
{
- if ( p_aout->pp_inputs[i_input] == p_input )
- {
- break;
- }
+ /* 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 ("I64Fd"), dropping buffer",
+ mdate() - p_buffer->start_date );
+ aout_BufferFree( p_buffer );
+
+ return 0;
}
- if ( i_input == p_aout->i_nb_inputs )
+ if ( start_date == 0 ) start_date = p_buffer->start_date;
+
+ /* Run pre-filters. */
+ aout_FiltersPlay( p_aout, p_input->pp_filters, p_input->i_nb_filters,
+ &p_buffer );
+
+ /* Run the resampler if needed.
+ * We first need to calculate the output rate of this resampler. */
+ if ( ( p_input->i_resampling_type == AOUT_RESAMPLING_NONE ) &&
+ ( start_date < p_buffer->start_date - AOUT_PTS_TOLERANCE
+ || start_date > p_buffer->start_date + AOUT_PTS_TOLERANCE ) )
{
- msg_Err( p_aout, "cannot find an input to delete" );
- return;
+ /* 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.
+ */
+ mtime_t drift = p_buffer->start_date - start_date;
+
+ p_input->i_resamp_start_date = mdate();
+ p_input->i_resamp_start_drift = (int)drift;
+
+ if ( drift > 0 )
+ p_input->i_resampling_type = AOUT_RESAMPLING_DOWN;
+ else
+ p_input->i_resampling_type = AOUT_RESAMPLING_UP;
+
+ msg_Warn( p_aout, "buffer is "I64Fd" %s, triggering %ssampling",
+ drift > 0 ? drift : -drift,
+ drift > 0 ? "in advance" : "late",
+ drift > 0 ? "down" : "up");
}
- /* Remove the input from the list. */
- memmove( &p_aout->pp_inputs[i_input], &p_aout->pp_inputs[i_input + 1],
- (AOUT_MAX_INPUTS - i_input - 1) * sizeof(aout_input_t *) );
- p_aout->i_nb_inputs--;
-
- vlc_mutex_unlock( &p_aout->mixer_lock );
+ if ( p_input->i_resampling_type != AOUT_RESAMPLING_NONE )
+ {
+ /* Resampling has been triggered previously (because of dates
+ * mismatch). We want the resampling to happen progressively so
+ * it isn't too audible to the listener. */
- aout_FiltersDestroyPipeline( p_aout, p_input->pp_filters,
- p_input->i_nb_filters );
- aout_FifoDestroy( p_aout, &p_input->fifo );
+ if( p_input->i_resampling_type == AOUT_RESAMPLING_UP )
+ {
+ p_input->pp_resamplers[0]->input.i_rate += 10; /* Hz */
+ }
+ else
+ {
+ p_input->pp_resamplers[0]->input.i_rate -= 10; /* Hz */
+ }
- free( p_input );
+ /* Check if everything is back to normal, in which case we can stop the
+ * resampling */
+ if( p_input->pp_resamplers[0]->input.i_rate ==
+ p_input->input.i_rate )
+ {
+ p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
+ msg_Warn( p_aout, "resampling stopped after "I64Fi" usec",
+ mdate() - p_input->i_resamp_start_date );
+ }
+ else if( abs( (int)(p_buffer->start_date - start_date) ) <
+ abs( p_input->i_resamp_start_drift ) / 2 )
+ {
+ /* if we reduced the drift from half, then it is time to switch
+ * back the resampling direction. */
+ if( p_input->i_resampling_type == AOUT_RESAMPLING_UP )
+ p_input->i_resampling_type = AOUT_RESAMPLING_DOWN;
+ else
+ p_input->i_resampling_type = AOUT_RESAMPLING_UP;
+ p_input->i_resamp_start_drift = 0;
+ }
+ else if( p_input->i_resamp_start_drift &&
+ ( abs( (int)(p_buffer->start_date - start_date) ) >
+ abs( p_input->i_resamp_start_drift ) * 3 / 2 ) )
+ {
+ /* If the drift is increasing and not decreasing, than something
+ * is bad. We'd better stop the resampling right now. */
+ msg_Warn( p_aout, "timing screwed, stopping resampling" );
+ p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
+ p_input->pp_resamplers[0]->input.i_rate = p_input->input.i_rate;
+ }
- if ( !p_aout->i_nb_inputs )
- {
- aout_OutputDelete( p_aout );
- aout_MixerDelete( p_aout );
}
-}
-/*****************************************************************************
- * aout_InputPlay : play a buffer
- *****************************************************************************/
-void aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
- aout_buffer_t * p_buffer )
-{
- vlc_mutex_lock( &p_aout->input_lock );
- while( p_aout->b_change_requested )
+ /* Adding the start date will be managed by aout_FifoPush(). */
+ p_buffer->start_date = start_date;
+ p_buffer->end_date = start_date +
+ (p_buffer->end_date - p_buffer->start_date);
+
+ /* Actually run the resampler now. */
+ if ( p_aout->mixer.mixer.i_rate !=
+ p_input->pp_resamplers[0]->input.i_rate )
{
- vlc_cond_wait( &p_aout->input_signal, &p_aout->input_lock );
+ aout_FiltersPlay( p_aout, p_input->pp_resamplers,
+ p_input->i_nb_resamplers,
+ &p_buffer );
}
- 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 );
+ vlc_mutex_lock( &p_aout->input_fifos_lock );
aout_FifoPush( p_aout, &p_input->fifo, p_buffer );
+ vlc_mutex_unlock( &p_aout->input_fifos_lock );
- 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 0;
}
projects / vlc / blobdiff