X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Finput.c;h=1f11ae0d888cad5a299871af5b28944edbc7646e;hb=9f700867b29ee5c137c7c1b118eae35b7784c1fd;hp=10cfddb3305216a04ad0d2a7a0f0887b3715ec38;hpb=99fab9089e9e1709d9c3a4bc5ced0c137ac59134;p=vlc diff --git a/src/audio_output/input.c b/src/audio_output/input.c index 10cfddb330..1f11ae0d88 100644 --- a/src/audio_output/input.c +++ b/src/audio_output/input.c @@ -29,26 +29,29 @@ # include "config.h" #endif -#include +#include #include #include #include +#include -#include /* for input_thread_t and i_pts_delay */ +#include +#include /* for vout_Request */ #ifdef HAVE_ALLOCA_H # include #endif #include +#include #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 void inputDrop( aout_input_t *, aout_buffer_t * ); static void inputResamplingStop( aout_input_t *p_input ); static int VisualizationCallback( vlc_object_t *, char const *, @@ -58,15 +61,21 @@ static int EqualizerCallback( vlc_object_t *, char const *, 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 *, bool ); +static vout_thread_t *RequestVoutFromFilter( void *, + vout_thread_t *, video_format_t *, bool ); + /***************************************************************************** * 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 ); @@ -74,14 +83,23 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) p_input->i_nb_resamplers = p_input->i_nb_filters = 0; /* Prepare FIFO. */ - aout_FifoInit( p_aout, &p_input->fifo, p_aout->mixer.mixer.i_rate ); - p_input->p_first_byte_to_mix = NULL; + aout_FifoInit( p_aout, &p_input->mixer.fifo, p_aout->p_mixer->fmt.i_rate ); + p_input->mixer.begin = 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) ); - memcpy( &chain_output_format, &p_aout->mixer.mixer, - sizeof(audio_sample_format_t) ); + chain_input_format = p_input->input; + chain_output_format = p_aout->p_mixer->fmt; chain_output_format.i_rate = p_input->input.i_rate; aout_FormatPrepare( &chain_output_format ); @@ -91,33 +109,35 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) var_Create( p_aout, "visual", VLC_VAR_STRING | VLC_VAR_HASCHOICE ); text.psz_string = _("Visualizations"); var_Change( p_aout, "visual", VLC_VAR_SETTEXT, &text, NULL ); - val.psz_string = ""; text.psz_string = _("Disable"); + val.psz_string = (char*)""; text.psz_string = _("Disable"); var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "spectrometer"; text.psz_string = _("Spectrometer"); + val.psz_string = (char*)"spectrometer"; text.psz_string = _("Spectrometer"); var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "scope"; text.psz_string = _("Scope"); + val.psz_string = (char*)"scope"; text.psz_string = _("Scope"); var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "spectrum"; text.psz_string = _("Spectrum"); + 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 = "goom"; text.psz_string = "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" ) ) + /* Look for libprojectM plugin */ + if( module_exists( "projectm" ) ) { - val.psz_string = "galaktos"; text.psz_string = "GaLaktos"; + val.psz_string = (char*)"projectm"; text.psz_string = (char*)"projectM"; var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text ); } if( var_Get( p_aout, "effect-list", &val ) == VLC_SUCCESS ) { - var_Set( p_aout, "visual", val ); - if( val.psz_string ) free( val.psz_string ); + var_SetString( p_aout, "visual", val.psz_string ); + free( val.psz_string ); } var_AddCallback( p_aout, "visual", VisualizationCallback, NULL ); } @@ -135,7 +155,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) text.psz_string = _("Equalizer"); var_Change( p_aout, "equalizer", VLC_VAR_SETTEXT, &text, NULL ); - val.psz_string = ""; text.psz_string = _("Disable"); + val.psz_string = (char*)""; text.psz_string = _("Disable"); var_Change( p_aout, "equalizer", VLC_VAR_ADDCHOICE, &val, &text ); for( i = 0; i < p_config->i_list; i++ ) @@ -205,17 +225,26 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) 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 ); + } + + psz_filters = var_GetString( p_aout, "audio-filter" ); + psz_visual = var_GetString( p_aout, "audio-visual"); + psz_scaletempo = var_GetBool( p_aout, "audio-time-stretch" ) ? strdup( "scaletempo" ) : NULL; - var_Get( p_aout, "audio-filter", &val ); - psz_filters = val.psz_string; - var_Get( p_aout, "audio-visual", &val ); - psz_visual = val.psz_string; + p_input->b_recycle_vout = psz_visual && *psz_visual; /* parse user filter lists */ - for( i_visual = 0; i_visual < 2; i_visual++ ) + char *const ppsz_array[] = { psz_scaletempo, psz_filters, psz_visual }; + p_input->p_playback_rate_filter = NULL; + + for( i_visual = 0; i_visual < 3 && !AOUT_FMT_NON_LINEAR(&chain_output_format); i_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; @@ -244,7 +273,9 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) } /* 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)", @@ -253,30 +284,33 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) continue; } + vlc_object_set_name( p_filter, psz_parser ); vlc_object_attach( p_filter , p_aout ); + p_filter->request_vout.pf_request_vout = RequestVoutFromFilter; + p_filter->request_vout.p_private = p_input; + + 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; + + /* request format */ + memcpy( &p_filter->input, &chain_output_format, + sizeof(audio_sample_format_t) ); + memcpy( &p_filter->output, &chain_output_format, + sizeof(audio_sample_format_t) ); + + /* 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, - 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, "visualization", - psz_parser, VLC_TRUE ); + 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 */ { - /* request format */ - memcpy( &p_filter->input, &chain_input_format, - 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, "audio filter", - psz_parser, VLC_TRUE ); + p_filter->p_module = module_need( p_filter, "audio filter", + psz_parser, true ); if ( p_filter->p_module == NULL ) { @@ -288,9 +322,9 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) { 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, VLC_TRUE ); + psz_parser, true ); } /* try visual filters */ else @@ -299,9 +333,9 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) 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, VLC_TRUE ); + psz_parser, true ); } } } @@ -312,8 +346,9 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) msg_Err( p_aout, "cannot add user filter %s (skipped)", psz_parser ); + free( p_filter->p_owner ); vlc_object_detach( p_filter ); - vlc_object_destroy( p_filter ); + vlc_object_release( p_filter ); psz_parser = psz_next; continue; @@ -330,9 +365,10 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) 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_destroy( p_filter ); + vlc_object_release( p_filter ); psz_parser = psz_next; continue; @@ -340,17 +376,21 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) } /* success */ - p_filter->b_continuity = VLC_FALSE; + p_filter->b_continuity = false; p_input->pp_filters[p_input->i_nb_filters++] = p_filter; memcpy( &chain_input_format, &p_filter->output, sizeof( audio_sample_format_t ) ); + if( i_visual == 0 ) /* scaletempo */ + p_input->p_playback_rate_filter = p_filter; + /* next filter if any */ psz_parser = psz_next; } } - if( psz_filters ) free( psz_filters ); - if( psz_visual ) free( psz_visual ); + 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 ) ) @@ -370,12 +410,12 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) p_input->input_alloc.i_bytes_per_sec = -1; /* Create resamplers. */ - if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) ) + if ( !AOUT_FMT_NON_LINEAR( &p_aout->p_mixer->fmt ) ) { chain_output_format.i_rate = (__MAX(p_input->input.i_rate, - p_aout->mixer.mixer.i_rate) + p_aout->p_mixer->fmt.i_rate) * (100 + AOUT_MAX_RESAMPLING)) / 100; - if ( chain_output_format.i_rate == p_aout->mixer.mixer.i_rate ) + if ( chain_output_format.i_rate == p_aout->p_mixer->fmt.i_rate ) { /* Just in case... */ chain_output_format.i_rate++; @@ -383,7 +423,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_resamplers, &p_input->i_nb_resamplers, &chain_output_format, - &p_aout->mixer.mixer ) < 0 ) + &p_aout->p_mixer->fmt ) < 0 ) { inputFailure( p_aout, p_input, "couldn't set a resampler pipeline"); return -1; @@ -399,6 +439,11 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) } p_input->i_resampling_type = AOUT_RESAMPLING_NONE; + 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 ); @@ -414,8 +459,8 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) ReplayGainSelect( p_aout, p_input ); /* Success */ - p_input->b_error = VLC_FALSE; - p_input->b_restart = VLC_FALSE; + p_input->b_error = false; + p_input->b_restart = false; p_input->i_last_input_rate = INPUT_RATE_DEFAULT; return 0; @@ -428,7 +473,17 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) *****************************************************************************/ int aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input ) { - if ( p_input->b_error ) return 0; + AOUT_ASSERT_MIXER_LOCKED; + if ( p_input->b_error ) + return 0; + + /* XXX We need to update b_recycle_vout before calling aout_FiltersDestroyPipeline. + * FIXME They can be a race condition if audio-visual is updated between + * aout_InputDelete and aout_InputNew. + */ + char *psz_visual = var_GetString( p_aout, "audio-visual"); + p_input->b_recycle_vout = psz_visual && *psz_visual; + free( psz_visual ); aout_FiltersDestroyPipeline( p_aout, p_input->pp_filters, p_input->i_nb_filters ); @@ -436,7 +491,7 @@ int aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input ) aout_FiltersDestroyPipeline( p_aout, p_input->pp_resamplers, p_input->i_nb_resamplers ); p_input->i_nb_resamplers = 0; - aout_FifoDestroy( p_aout, &p_input->fifo ); + aout_FifoDestroy( p_aout, &p_input->mixer.fifo ); return 0; } @@ -452,30 +507,42 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, 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; - byte_t *p_first_byte_to_mix; + 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 ); + + /* A little trick to avoid loosing our input fifo and properties */ + + p_first_byte_to_mix = p_input->mixer.begin; + fifo = p_input->mixer.fifo; + b_paused = p_input->b_paused; + i_pause_date = p_input->i_pause_date; - vlc_mutex_lock( &p_aout->mixer_lock ); + aout_FifoInit( p_aout, &p_input->mixer.fifo, p_aout->p_mixer->fmt.i_rate ); - /* 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; aout_InputDelete( p_aout, p_input ); - aout_InputNew( p_aout, p_input ); - p_input->p_first_byte_to_mix = p_first_byte_to_mix; - p_input->fifo = fifo; - vlc_mutex_unlock( &p_aout->mixer_lock ); + aout_InputNew( p_aout, p_input, &p_input->request_vout ); + p_input->mixer.begin = p_first_byte_to_mix; + p_input->mixer.fifo = fifo; + p_input->b_paused = b_paused; + p_input->i_pause_date = i_pause_date; + + 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 ); + inputDrop( p_input, p_buffer ); return 0; } @@ -500,10 +567,10 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, } #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); @@ -514,21 +581,21 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * 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 ); + aout_lock_input_fifos( p_aout ); + start_date = aout_FifoNextStart( p_aout, &p_input->mixer.fifo ); + 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_FifoSet( p_aout, &p_input->fifo, 0 ); - p_input->p_first_byte_to_mix = NULL; - vlc_mutex_unlock( &p_aout->input_fifos_lock ); + aout_lock_input_fifos( p_aout ); + aout_FifoSet( p_aout, &p_input->mixer.fifo, 0 ); + p_input->mixer.begin = NULL; + 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 ); @@ -539,36 +606,37 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * 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 ); + inputDrop( p_input, p_buffer ); inputResamplingStop( p_input ); return 0; } /* 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_FifoSet( p_aout, &p_input->fifo, 0 ); - p_input->p_first_byte_to_mix = NULL; - vlc_mutex_unlock( &p_aout->input_fifos_lock ); + aout_lock_input_fifos( p_aout ); + aout_FifoSet( p_aout, &p_input->mixer.fifo, 0 ); + p_input->mixer.begin = NULL; + 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 ); + inputDrop( p_input, p_buffer ); return 0; } @@ -604,7 +672,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, 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"); @@ -627,11 +695,15 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * 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 == 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); } @@ -678,9 +750,9 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, (p_buffer->end_date - p_buffer->start_date); p_buffer->start_date = start_date; - 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 ); + aout_lock_input_fifos( p_aout ); + aout_FifoPush( p_aout, &p_input->mixer.fifo, p_buffer ); + aout_unlock_input_fifos( p_aout ); return 0; } @@ -699,7 +771,7 @@ static void inputFailure( aout_instance_t * p_aout, aout_input_t * p_input, 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 ); + aout_FifoDestroy( p_aout, &p_input->mixer.fifo ); var_Destroy( p_aout, "visual" ); var_Destroy( p_aout, "equalizer" ); var_Destroy( p_aout, "audio-filter" ); @@ -714,16 +786,11 @@ static void inputFailure( aout_instance_t * p_aout, aout_input_t * p_input, p_input->b_error = 1; } -static void inputDrop( aout_instance_t *p_aout, aout_input_t *p_input, aout_buffer_t *p_buffer ) +static void inputDrop( aout_input_t *p_input, aout_buffer_t *p_buffer ) { 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 ) @@ -731,56 +798,37 @@ 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]->b_continuity = VLC_FALSE; + 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 int ChangeFiltersString( aout_instance_t * p_aout, const char* psz_variable, - const char *psz_name, vlc_bool_t b_add ) +static vout_thread_t *RequestVout( void *p_private, + vout_thread_t *p_vout, video_format_t *p_fmt, bool b_recycle ) { - vlc_value_t val; - char *psz_parser; - - var_Get( p_aout, psz_variable, &val ); - - if( !val.psz_string ) val.psz_string = strdup(""); + aout_instance_t *p_aout = p_private; + VLC_UNUSED(b_recycle); + return vout_Request( p_aout, p_vout, p_fmt ); +} - psz_parser = strstr( val.psz_string, psz_name ); +static vout_thread_t *RequestVoutFromFilter( void *p_private, + vout_thread_t *p_vout, video_format_t *p_fmt, bool b_recycle ) +{ + aout_input_t *p_input = p_private; + aout_request_vout_t *p_request = &p_input->request_vout; - 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; - } - } + return p_request->pf_request_vout( p_request->p_private, + p_vout, p_fmt, p_input->b_recycle_vout && b_recycle ); +} - var_Set( p_aout, psz_variable, val ); - free( val.psz_string ); - return 1; +static int ChangeFiltersString( aout_instance_t * p_aout, const char* psz_variable, + const char *psz_name, bool b_add ) +{ + 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, @@ -788,47 +836,41 @@ 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 ) { - ChangeFiltersString( p_aout, "audio-visual", "goom", VLC_FALSE ); - ChangeFiltersString( p_aout, "audio-visual", "visual", VLC_FALSE ); - ChangeFiltersString( p_aout, "audio-visual", "galaktos", VLC_FALSE ); + ChangeFiltersString( p_aout, "audio-visual", "goom", false ); + ChangeFiltersString( p_aout, "audio-visual", "visual", false ); + ChangeFiltersString( p_aout, "audio-visual", "projectm", false ); } else { if( !strcmp( "goom", psz_mode ) ) { - ChangeFiltersString( p_aout, "audio-visual", "visual", VLC_FALSE ); - ChangeFiltersString( p_aout, "audio-visual", "goom", VLC_TRUE ); - ChangeFiltersString( p_aout, "audio-visual", "galaktos", VLC_FALSE); + ChangeFiltersString( p_aout, "audio-visual", "visual", false ); + ChangeFiltersString( p_aout, "audio-visual", "goom", true ); + ChangeFiltersString( p_aout, "audio-visual", "projectm", false ); } - else if( !strcmp( "galaktos", psz_mode ) ) + else if( !strcmp( "projectm", psz_mode ) ) { - ChangeFiltersString( p_aout, "audio-visual", "visual", VLC_FALSE ); - ChangeFiltersString( p_aout, "audio-visual", "goom", VLC_FALSE ); - ChangeFiltersString( p_aout, "audio-visual", "galaktos", VLC_TRUE ); + ChangeFiltersString( p_aout, "audio-visual", "visual", false ); + ChangeFiltersString( p_aout, "audio-visual", "goom", false ); + ChangeFiltersString( p_aout, "audio-visual", "projectm", true ); } else { - val.psz_string = psz_mode; var_Create( p_aout, "effect-list", VLC_VAR_STRING ); - var_Set( p_aout, "effect-list", val ); + var_SetString( p_aout, "effect-list", psz_mode ); - ChangeFiltersString( p_aout, "audio-visual", "goom", VLC_FALSE ); - ChangeFiltersString( p_aout, "audio-visual", "visual", VLC_TRUE ); - ChangeFiltersString( p_aout, "audio-visual", "galaktos", VLC_FALSE); + ChangeFiltersString( p_aout, "audio-visual", "goom", false ); + ChangeFiltersString( p_aout, "audio-visual", "visual", true ); + ChangeFiltersString( p_aout, "audio-visual", "projectm", false ); } } /* That sucks */ - for( i = 0; i < p_aout->i_nb_inputs; i++ ) - { - p_aout->pp_inputs[i]->b_restart = VLC_TRUE; - } + AoutInputsMarkToRestart( p_aout ); return VLC_SUCCESS; } @@ -838,51 +880,44 @@ static int EqualizerCallback( 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; int i_ret; (void)psz_cmd; (void)oldval; (void)p_data; if( !psz_mode || !*psz_mode ) { i_ret = ChangeFiltersString( p_aout, "audio-filter", "equalizer", - VLC_FALSE ); + false ); } else { - val.psz_string = psz_mode; var_Create( p_aout, "equalizer-preset", VLC_VAR_STRING ); - var_Set( p_aout, "equalizer-preset", val ); + var_SetString( p_aout, "equalizer-preset", psz_mode ); i_ret = ChangeFiltersString( p_aout, "audio-filter", "equalizer", - VLC_TRUE ); - + true ); } /* That sucks */ if( i_ret == 1 ) - { - for( i = 0; i < p_aout->i_nb_inputs; i++ ) - { - p_aout->pp_inputs[i]->b_restart = VLC_TRUE; - } - } - + AoutInputsMarkToRestart( p_aout ); return VLC_SUCCESS; } static int ReplayGainCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); + VLC_UNUSED(newval); VLC_UNUSED(p_data); 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 ); + if( p_aout->p_mixer ) + aout_MixerMultiplierSet( p_aout, p_aout->mixer_multiplier ); + aout_unlock_mixer( p_aout ); return VLC_SUCCESS; } @@ -895,7 +930,7 @@ static void ReplayGainSelect( aout_instance_t *p_aout, aout_input_t *p_input ) int i_use; float f_gain; - p_input->f_multiplier = 1.0; + p_input->mixer.multiplier = 1.0; if( !psz_replay_gain ) return; @@ -926,14 +961,14 @@ static void ReplayGainSelect( aout_instance_t *p_aout, aout_input_t *p_input ) f_gain = var_GetFloat( p_aout, "audio-replay-gain-default" ); else f_gain = 0.0; - p_input->f_multiplier = pow( 10.0, f_gain / 20.0 ); + p_input->mixer.multiplier = pow( 10.0, f_gain / 20.0 ); /* */ if( p_input->replay_gain.pb_peak[i_use] && var_GetBool( p_aout, "audio-replay-gain-peak-protection" ) && - p_input->replay_gain.pf_peak[i_use] * p_input->f_multiplier > 1.0 ) + p_input->replay_gain.pf_peak[i_use] * p_input->mixer.multiplier > 1.0 ) { - p_input->f_multiplier = 1.0f / p_input->replay_gain.pf_peak[i_use]; + p_input->mixer.multiplier = 1.0f / p_input->replay_gain.pf_peak[i_use]; } free( psz_replay_gain );