# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <stdio.h>
#include <string.h>
#include <math.h>
+#include <assert.h>
-#include <vlc_input.h> /* for input_thread_t and i_pts_delay */
+#include <vlc_input.h>
+#include <vlc_vout.h> /* for vout_Request */
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#endif
#include <vlc_aout.h>
+#include <libvlc.h>
#include "aout_internal.h"
-/** FIXME: Ugly but needed to access the counters */
-#include "input/input_internal.h"
+#define AOUT_ASSERT_MIXER_LOCKED vlc_assert_locked( &p_aout->mixer_lock )
+#define AOUT_ASSERT_INPUT_LOCKED vlc_assert_locked( &p_input->lock )
static void inputFailure( aout_instance_t *, aout_input_t *, const char * );
static void inputDrop( aout_instance_t *, aout_input_t *, aout_buffer_t * );
static int ReplayGainCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static void ReplayGainSelect( aout_instance_t *, aout_input_t * );
+
+static vout_thread_t *RequestVout( void *,
+ vout_thread_t *, video_format_t * );
/*****************************************************************************
* aout_InputNew : allocate a new input and rework the filter pipeline
*****************************************************************************/
-int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
+int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_request_vout_t *p_request_vout )
{
audio_sample_format_t chain_input_format;
audio_sample_format_t chain_output_format;
vlc_value_t val, text;
- char * psz_filters, *psz_visual;
+ char *psz_filters, *psz_visual, *psz_scaletempo;
int i_visual;
aout_FormatPrint( p_aout, "input", &p_input->input );
aout_FifoInit( p_aout, &p_input->fifo, p_aout->mixer.mixer.i_rate );
p_input->p_first_byte_to_mix = NULL;
+ /* */
+ if( p_request_vout )
+ {
+ p_input->request_vout = *p_request_vout;
+ }
+ else
+ {
+ p_input->request_vout.pf_request_vout = RequestVout;
+ p_input->request_vout.p_private = p_aout;
+ }
+
/* Prepare format structure */
memcpy( &chain_input_format, &p_input->input,
sizeof(audio_sample_format_t) );
var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
val.psz_string = (char*)"spectrum"; text.psz_string = _("Spectrum");
var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = (char*)"vuMeter"; text.psz_string = _("Vu meter");
+ var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
/* Look for goom plugin */
- if( module_Exists( VLC_OBJECT(p_aout), "goom" ) )
+ if( module_exists( "goom" ) )
{
val.psz_string = (char*)"goom"; text.psz_string = (char*)"Goom";
var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
}
/* Look for galaktos plugin */
- if( module_Exists( VLC_OBJECT(p_aout), "galaktos" ) )
+ if( module_exists( "galaktos" ) )
{
val.psz_string = (char*)"galaktos"; text.psz_string = (char*)"GaLaktos";
var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
var_Create( p_aout, "audio-replay-gain-peak-protection",
VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
}
+ if( var_Type( p_aout, "audio-time-stretch" ) == 0 )
+ {
+ var_Create( p_aout, "audio-time-stretch",
+ VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ }
var_Get( p_aout, "audio-filter", &val );
psz_filters = val.psz_string;
var_Get( p_aout, "audio-visual", &val );
psz_visual = val.psz_string;
+ psz_scaletempo = var_GetBool( p_aout, "audio-time-stretch" ) ? strdup( "scaletempo" ) : NULL;
+
/* parse user filter lists */
- for( i_visual = 0; i_visual < 2; i_visual++ )
+ for( i_visual = 0; i_visual < 3 && !AOUT_FMT_NON_LINEAR(&chain_output_format); i_visual++ )
{
+ char *ppsz_array[] = { psz_scaletempo, psz_filters, psz_visual };
char *psz_next = NULL;
- char *psz_parser = i_visual ? psz_visual : psz_filters;
+ char *psz_parser = ppsz_array[i_visual];
if( psz_parser == NULL || !*psz_parser )
continue;
}
/* Create a VLC object */
- p_filter = vlc_object_create( p_aout, sizeof(aout_filter_t) );
+ static const char typename[] = "audio filter";
+ p_filter = vlc_custom_create( p_aout, sizeof(*p_filter),
+ VLC_OBJECT_GENERIC, typename );
if( p_filter == NULL )
{
msg_Err( p_aout, "cannot add user filter %s (skipped)",
vlc_object_attach( p_filter , p_aout );
+ p_filter->request_vout = p_input->request_vout;
+ p_filter->p_owner = malloc( sizeof(*p_filter->p_owner) );
+ p_filter->p_owner->p_aout = p_aout;
+ p_filter->p_owner->p_input = p_input;
+
/* try to find the requested filter */
- if( i_visual == 1 ) /* this can only be a visualization module */
+ if( i_visual == 2 ) /* this can only be a visualization module */
{
/* request format */
memcpy( &p_filter->input, &chain_output_format,
memcpy( &p_filter->output, &chain_output_format,
sizeof(audio_sample_format_t) );
- p_filter->p_module = module_Need( p_filter, "visualization",
+ p_filter->p_module = module_need( p_filter, "visualization",
psz_parser, true );
}
else /* this can be a audio filter module as well as a visualization module */
memcpy( &p_filter->output, &chain_output_format,
sizeof(audio_sample_format_t) );
- p_filter->p_module = module_Need( p_filter, "audio filter",
+ p_filter->p_module = module_need( p_filter, "audio filter",
psz_parser, true );
if ( p_filter->p_module == NULL )
{
aout_FormatPrepare( &p_filter->input );
aout_FormatPrepare( &p_filter->output );
- p_filter->p_module = module_Need( p_filter,
+ p_filter->p_module = module_need( p_filter,
"audio filter",
psz_parser, true );
}
sizeof(audio_sample_format_t) );
memcpy( &p_filter->output, &chain_output_format,
sizeof(audio_sample_format_t) );
- p_filter->p_module = module_Need( p_filter,
+ p_filter->p_module = module_need( p_filter,
"visualization",
psz_parser, true );
}
msg_Err( p_aout, "cannot add user filter %s (skipped)",
psz_parser );
+ free( p_filter->p_owner );
vlc_object_detach( p_filter );
vlc_object_release( p_filter );
msg_Err( p_aout, "cannot add user filter %s (skipped)",
psz_parser );
- module_Unneed( p_filter, p_filter->p_module );
+ module_unneed( p_filter, p_filter->p_module );
+ free( p_filter->p_owner );
vlc_object_detach( p_filter );
vlc_object_release( p_filter );
psz_parser = psz_next;
}
}
- free( psz_filters );
free( psz_visual );
+ free( psz_filters );
+ free( psz_scaletempo );
/* complete the filter chain if necessary */
if ( !AOUT_FMTS_IDENTICAL( &chain_input_format, &chain_output_format ) )
}
p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
+ p_input->p_playback_rate_filter = NULL;
+ for( int i = 0; i < p_input->i_nb_filters; i++ )
+ {
+ aout_filter_t *p_filter = p_input->pp_filters[i];
+ if( strcmp( "scaletempo", p_filter->psz_object_name ) == 0 )
+ {
+ p_input->p_playback_rate_filter = p_filter;
+ break;
+ }
+ }
+ if( ! p_input->p_playback_rate_filter && p_input->i_nb_resamplers > 0 )
+ {
+ p_input->p_playback_rate_filter = p_input->pp_resamplers[0];
+ }
+
aout_FiltersHintBuffers( p_aout, p_input->pp_filters,
p_input->i_nb_filters,
&p_input->input_alloc );
*****************************************************************************/
int aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input )
{
+ AOUT_ASSERT_MIXER_LOCKED;
if ( p_input->b_error ) return 0;
aout_FiltersDestroyPipeline( p_aout, p_input->pp_filters,
aout_buffer_t * p_buffer, int i_input_rate )
{
mtime_t start_date;
+ AOUT_ASSERT_INPUT_LOCKED;
if( p_input->b_restart )
{
- aout_fifo_t fifo, dummy_fifo;
+ aout_fifo_t fifo;
uint8_t *p_first_byte_to_mix;
+ bool b_paused;
+ mtime_t i_pause_date;
+
+ aout_lock_mixer( p_aout );
+ aout_lock_input_fifos( p_aout );
- vlc_mutex_lock( &p_aout->mixer_lock );
+ /* A little trick to avoid loosing our input fifo and properties */
- /* A little trick to avoid loosing our input fifo */
- aout_FifoInit( p_aout, &dummy_fifo, p_aout->mixer.mixer.i_rate );
p_first_byte_to_mix = p_input->p_first_byte_to_mix;
fifo = p_input->fifo;
- p_input->fifo = dummy_fifo;
+ b_paused = p_input->b_paused;
+ i_pause_date = p_input->i_pause_date;
+
+ aout_FifoInit( p_aout, &p_input->fifo, p_aout->mixer.mixer.i_rate );
+
aout_InputDelete( p_aout, p_input );
- aout_InputNew( p_aout, p_input );
+
+ aout_InputNew( p_aout, p_input, &p_input->request_vout );
p_input->p_first_byte_to_mix = p_first_byte_to_mix;
p_input->fifo = fifo;
+ p_input->b_paused = b_paused;
+ p_input->i_pause_date = i_pause_date;
- vlc_mutex_unlock( &p_aout->mixer_lock );
+ aout_unlock_input_fifos( p_aout );
+ aout_unlock_mixer( p_aout );
}
- if( i_input_rate != INPUT_RATE_DEFAULT && p_input->i_nb_resamplers <= 0 )
+ if( i_input_rate != INPUT_RATE_DEFAULT && p_input->p_playback_rate_filter == NULL )
{
inputDrop( p_aout, p_input, p_buffer );
return 0;
}
#endif
- /* Handle input rate change by modifying resampler input rate */
+ /* Handle input rate change, but keep drift correction */
if( i_input_rate != p_input->i_last_input_rate )
{
- unsigned int * const pi_rate = &p_input->pp_resamplers[0]->input.i_rate;
+ unsigned int * const pi_rate = &p_input->p_playback_rate_filter->input.i_rate;
#define F(r,ir) ( INPUT_RATE_DEFAULT * (r) / (ir) )
const int i_delta = *pi_rate - F(p_input->input.i_rate,p_input->i_last_input_rate);
*pi_rate = F(p_input->input.i_rate + i_delta, i_input_rate);
/* 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 );
+ aout_lock_input_fifos( p_aout );
start_date = aout_FifoNextStart( p_aout, &p_input->fifo );
- vlc_mutex_unlock( &p_aout->input_fifos_lock );
+ aout_unlock_input_fifos( p_aout );
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 ("I64Fd"), "
+ msg_Warn( p_aout, "computed PTS is out of range (%"PRId64"), "
"clearing out", mdate() - start_date );
- vlc_mutex_lock( &p_aout->input_fifos_lock );
+ aout_lock_input_fifos( p_aout );
aout_FifoSet( p_aout, &p_input->fifo, 0 );
p_input->p_first_byte_to_mix = NULL;
- vlc_mutex_unlock( &p_aout->input_fifos_lock );
+ aout_unlock_input_fifos( p_aout );
if ( p_input->i_resampling_type != AOUT_RESAMPLING_NONE )
msg_Warn( p_aout, "timing screwed, stopping resampling" );
inputResamplingStop( p_input );
{
/* 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",
+ msg_Warn( p_aout, "PTS is out of range (%"PRId64"), dropping buffer",
mdate() - p_buffer->start_date );
inputDrop( p_aout, p_input, p_buffer );
/* If the audio drift is too big then it's not worth trying to resample
* the audio. */
+ mtime_t i_pts_tolerance = 3 * AOUT_PTS_TOLERANCE * i_input_rate / INPUT_RATE_DEFAULT;
if ( start_date != 0 &&
- ( start_date < p_buffer->start_date - 3 * AOUT_PTS_TOLERANCE ) )
+ ( start_date < p_buffer->start_date - i_pts_tolerance ) )
{
- msg_Warn( p_aout, "audio drift is too big ("I64Fd"), clearing out",
+ msg_Warn( p_aout, "audio drift is too big (%"PRId64"), clearing out",
start_date - p_buffer->start_date );
- vlc_mutex_lock( &p_aout->input_fifos_lock );
+ aout_lock_input_fifos( p_aout );
aout_FifoSet( p_aout, &p_input->fifo, 0 );
p_input->p_first_byte_to_mix = NULL;
- vlc_mutex_unlock( &p_aout->input_fifos_lock );
+ aout_unlock_input_fifos( p_aout );
if ( p_input->i_resampling_type != AOUT_RESAMPLING_NONE )
msg_Warn( p_aout, "timing screwed, stopping resampling" );
inputResamplingStop( p_input );
start_date = 0;
}
else if ( start_date != 0 &&
- ( start_date > p_buffer->start_date + 3 * AOUT_PTS_TOLERANCE ) )
+ ( start_date > p_buffer->start_date + i_pts_tolerance) )
{
- msg_Warn( p_aout, "audio drift is too big ("I64Fd"), dropping buffer",
+ msg_Warn( p_aout, "audio drift is too big (%"PRId64"), dropping buffer",
start_date - p_buffer->start_date );
inputDrop( p_aout, p_input, p_buffer );
return 0;
else
p_input->i_resampling_type = AOUT_RESAMPLING_UP;
- msg_Warn( p_aout, "buffer is "I64Fd" %s, triggering %ssampling",
+ msg_Warn( p_aout, "buffer is %"PRId64" %s, triggering %ssampling",
drift > 0 ? drift : -drift,
drift > 0 ? "in advance" : "late",
drift > 0 ? "down" : "up");
/* Check if everything is back to normal, in which case we can stop the
* resampling */
- if( p_input->pp_resamplers[0]->input.i_rate == 1000 * p_input->input.i_rate / i_input_rate )
+ unsigned int i_nominal_rate =
+ (p_input->pp_resamplers[0] == p_input->p_playback_rate_filter)
+ ? INPUT_RATE_DEFAULT * p_input->input.i_rate / i_input_rate
+ : p_input->input.i_rate;
+ if( p_input->pp_resamplers[0]->input.i_rate == i_nominal_rate )
{
p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
- msg_Warn( p_aout, "resampling stopped after "I64Fi" usec "
- "(drift: "I64Fi")",
+ msg_Warn( p_aout, "resampling stopped after %"PRIi64" usec "
+ "(drift: %"PRIi64")",
mdate() - p_input->i_resamp_start_date,
p_buffer->start_date - start_date);
}
(p_buffer->end_date - p_buffer->start_date);
p_buffer->start_date = start_date;
- vlc_mutex_lock( &p_aout->input_fifos_lock );
+ aout_lock_input_fifos( p_aout );
aout_FifoPush( p_aout, &p_input->fifo, p_buffer );
- vlc_mutex_unlock( &p_aout->input_fifos_lock );
+ aout_unlock_input_fifos( p_aout );
return 0;
}
{
aout_BufferFree( p_buffer );
- if( !p_input->p_input_thread )
- return;
-
- vlc_mutex_lock( &p_input->p_input_thread->p->counters.counters_lock);
- stats_UpdateInteger( p_aout, p_input->p_input_thread->p->counters.p_lost_abuffers, 1, NULL );
- vlc_mutex_unlock( &p_input->p_input_thread->p->counters.counters_lock);
+ p_input->i_buffer_lost++;
}
static void inputResamplingStop( aout_input_t *p_input )
p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
if( p_input->i_nb_resamplers != 0 )
{
- p_input->pp_resamplers[0]->input.i_rate = INPUT_RATE_DEFAULT *
- p_input->input.i_rate / p_input->i_last_input_rate;
+ p_input->pp_resamplers[0]->input.i_rate =
+ ( p_input->pp_resamplers[0] == p_input->p_playback_rate_filter )
+ ? INPUT_RATE_DEFAULT * p_input->input.i_rate / p_input->i_last_input_rate
+ : p_input->input.i_rate;
p_input->pp_resamplers[0]->b_continuity = false;
}
}
+static vout_thread_t *RequestVout( void *p_private,
+ vout_thread_t *p_vout, video_format_t *p_fmt )
+{
+ aout_instance_t *p_aout = p_private;
+ return vout_Request( p_aout, p_vout, p_fmt );
+}
+
static int ChangeFiltersString( aout_instance_t * p_aout, const char* psz_variable,
const char *psz_name, bool b_add )
{
- vlc_value_t val;
- char *psz_parser;
-
- var_Get( p_aout, psz_variable, &val );
-
- if( !val.psz_string ) val.psz_string = strdup("");
-
- psz_parser = strstr( val.psz_string, psz_name );
-
- if( b_add )
- {
- if( !psz_parser )
- {
- psz_parser = val.psz_string;
- asprintf( &val.psz_string, (*val.psz_string) ? "%s:%s" : "%s%s",
- val.psz_string, psz_name );
- free( psz_parser );
- }
- else
- {
- return 0;
- }
- }
- else
- {
- if( psz_parser )
- {
- memmove( psz_parser, psz_parser + strlen(psz_name) +
- (*(psz_parser + strlen(psz_name)) == ':' ? 1 : 0 ),
- strlen(psz_parser + strlen(psz_name)) + 1 );
- }
- else
- {
- free( val.psz_string );
- return 0;
- }
- }
-
- var_Set( p_aout, psz_variable, val );
- free( val.psz_string );
- return 1;
+ return AoutChangeFilterString( VLC_OBJECT(p_aout), p_aout,
+ psz_variable, psz_name, b_add ) ? 1 : 0;
}
static int VisualizationCallback( vlc_object_t *p_this, char const *psz_cmd,
aout_instance_t *p_aout = (aout_instance_t *)p_this;
char *psz_mode = newval.psz_string;
vlc_value_t val;
- int i;
(void)psz_cmd; (void)oldval; (void)p_data;
if( !psz_mode || !*psz_mode )
}
/* That sucks */
- for( i = 0; i < p_aout->i_nb_inputs; i++ )
- {
- p_aout->pp_inputs[i]->b_restart = true;
- }
+ AoutInputsMarkToRestart( p_aout );
return VLC_SUCCESS;
}
aout_instance_t *p_aout = (aout_instance_t *)p_this;
char *psz_mode = newval.psz_string;
vlc_value_t val;
- int i;
int i_ret;
(void)psz_cmd; (void)oldval; (void)p_data;
/* That sucks */
if( i_ret == 1 )
- {
- for( i = 0; i < p_aout->i_nb_inputs; i++ )
- {
- p_aout->pp_inputs[i]->b_restart = true;
- }
- }
-
+ AoutInputsMarkToRestart( p_aout );
return VLC_SUCCESS;
}
aout_instance_t *p_aout = (aout_instance_t *)p_this;
int i;
- vlc_mutex_lock( &p_aout->mixer_lock );
+ aout_lock_mixer( p_aout );
for( i = 0; i < p_aout->i_nb_inputs; i++ )
ReplayGainSelect( p_aout, p_aout->pp_inputs[i] );
/* Restart the mixer (a trivial mixer may be in use) */
aout_MixerMultiplierSet( p_aout, p_aout->mixer.f_multiplier );
- vlc_mutex_unlock( &p_aout->mixer_lock );
+ aout_unlock_mixer( p_aout );
return VLC_SUCCESS;
}
projects / vlc / blobdiff