X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Finput.c;h=d237466bec9bfadc3c475ec381c357204fd3e666;hb=e2238b5cbbc7a85ac84ee62cf6d3eb49b79905ba;hp=dd279cb76171ca1e01abd1dd612844da71741a09;hpb=2aa61dc55a77f535c3e70104b6ec2167766f8499;p=vlc diff --git a/src/audio_output/input.c b/src/audio_output/input.c index dd279cb761..d237466bec 100644 --- a/src/audio_output/input.c +++ b/src/audio_output/input.c @@ -40,6 +40,7 @@ #include #include /* for vout_Request */ +#include #include #include @@ -223,15 +224,10 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ 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; + psz_scaletempo = var_InheritBool( p_aout, "audio-time-stretch" ) ? strdup( "scaletempo" ) : NULL; p_input->b_recycle_vout = psz_visual && *psz_visual; @@ -343,7 +339,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ psz_parser ); free( p_filter->p_owner ); - vlc_object_detach( p_filter ); vlc_object_release( p_filter ); psz_parser = psz_next; @@ -364,7 +359,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ 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; @@ -456,7 +450,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ /* Success */ p_input->b_error = false; - p_input->b_restart = false; p_input->i_last_input_rate = INPUT_RATE_DEFAULT; return 0; @@ -493,48 +486,53 @@ int aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input ) } /***************************************************************************** - * aout_InputPlay : play a buffer + * aout_InputCheckAndRestart : restart an input ***************************************************************************** - * This function must be entered with the input lock. + * This function must be entered with the input and mixer lock. *****************************************************************************/ -/* XXX Do not activate it !! */ -//#define AOUT_PROCESS_BEFORE_CHEKS -int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, - aout_buffer_t * p_buffer, int i_input_rate ) +void aout_InputCheckAndRestart( aout_instance_t * p_aout, aout_input_t * p_input ) { - mtime_t start_date; + AOUT_ASSERT_MIXER_LOCKED; AOUT_ASSERT_INPUT_LOCKED; - if( p_input->b_restart ) - { - aout_fifo_t fifo; - uint8_t *p_first_byte_to_mix; - bool b_paused; - mtime_t i_pause_date; + if( !p_input->b_restart ) + return; - aout_lock_mixer( p_aout ); - aout_lock_input_fifos( p_aout ); + aout_lock_input_fifos( p_aout ); - /* A little trick to avoid loosing our input fifo and properties */ + /* 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; + uint8_t *p_first_byte_to_mix = p_input->mixer.begin; + aout_fifo_t fifo = p_input->mixer.fifo; + bool b_paused = p_input->b_paused; + mtime_t i_pause_date = p_input->i_pause_date; - aout_FifoInit( p_aout, &p_input->mixer.fifo, p_aout->mixer_format.i_rate ); + aout_FifoInit( p_aout, &p_input->mixer.fifo, p_aout->mixer_format.i_rate ); - aout_InputDelete( p_aout, p_input ); + aout_InputDelete( p_aout, p_input ); - 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_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 ); - } + p_input->b_restart = false; + + aout_unlock_input_fifos( p_aout ); +} +/***************************************************************************** + * aout_InputPlay : play a buffer + ***************************************************************************** + * This function must be entered with the input lock. + *****************************************************************************/ +/* XXX Do not activate it !! */ +//#define AOUT_PROCESS_BEFORE_CHEKS +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( i_input_rate != INPUT_RATE_DEFAULT && p_input->p_playback_rate_filter == NULL ) { @@ -813,7 +811,14 @@ static vout_thread_t *RequestVout( void *p_private, { aout_instance_t *p_aout = p_private; VLC_UNUSED(b_recycle); - return vout_Request( p_aout, p_vout, p_fmt ); + vout_configuration_t cfg = { + .vout = p_vout, + .input = NULL, + .change_fmt = true, + .fmt = p_fmt, + .dpb_size = 1, + }; + return vout_Request( p_aout, &cfg ); } vout_thread_t *aout_filter_RequestVout( filter_t *p_filter, @@ -834,8 +839,8 @@ vout_thread_t *aout_filter_RequestVout( filter_t *p_filter, 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; + return aout_ChangeFilterString( 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,