X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Finput.c;h=be83a6f5737be1adf7f372c187c92813756fed7e;hb=71b6f8922627d87da8d2137e36c33bb9a4425095;hp=728f0f857972c44023da0fa5cb7f8477a3851a1d;hpb=a087b40218aa408ea501741904c80553d7381b39;p=vlc diff --git a/src/audio_output/input.c b/src/audio_output/input.c index 728f0f8579..be83a6f573 100644 --- a/src/audio_output/input.c +++ b/src/audio_output/input.c @@ -40,8 +40,10 @@ #include #include /* for vout_Request */ +#include #include +#include #include #include "aout_internal.h" @@ -222,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; @@ -248,7 +245,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ while( psz_parser && *psz_parser ) { - aout_filter_t * p_filter = NULL; + filter_t * p_filter = NULL; if( p_input->i_nb_filters >= AOUT_MAX_FILTERS ) { @@ -290,14 +287,16 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ /* request format */ memcpy( &p_filter->fmt_in.audio, &chain_output_format, sizeof(audio_sample_format_t) ); + p_filter->fmt_in.i_codec = chain_output_format.i_format; memcpy( &p_filter->fmt_out.audio, &chain_output_format, sizeof(audio_sample_format_t) ); - + p_filter->fmt_out.i_codec = chain_output_format.i_format; + p_filter->pf_audio_buffer_new = aout_FilterBufferNew; /* try to find the requested filter */ if( i_visual == 2 ) /* this can only be a visualization module */ { - p_filter->p_module = module_need( p_filter, "visualization", + p_filter->p_module = module_need( p_filter, "visualization2", psz_parser, true ); } else /* this can be a audio filter module as well as a visualization module */ @@ -327,7 +326,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ memcpy( &p_filter->fmt_out.audio, &chain_output_format, sizeof(audio_sample_format_t) ); p_filter->p_module = module_need( p_filter, - "visualization", + "visualization2", psz_parser, true ); } } @@ -340,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; @@ -361,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; @@ -398,10 +395,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ } } - /* Prepare hints for the buffer allocator. */ - p_input->input_alloc.b_alloc = true; - p_input->input_alloc.i_bytes_per_sec = -1; - /* Create resamplers. */ if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer_format ) ) { @@ -422,11 +415,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ return -1; } - aout_FiltersHintBuffers( p_aout, p_input->pp_resamplers, - p_input->i_nb_resamplers, - &p_input->input_alloc ); - p_input->input_alloc.b_alloc = true; - /* Setup the initial rate of the resampler */ p_input->pp_resamplers[0]->fmt_in.audio.i_rate = p_input->input.i_rate; } @@ -437,23 +425,10 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ 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 ); - p_input->input_alloc.b_alloc = true; - - /* 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, - (int)(p_input->input.i_bytes_per_frame - * p_input->input.i_rate - / p_input->input.i_frame_length) ); - ReplayGainSelect( p_aout, p_input ); /* Success */ p_input->b_error = false; - p_input->b_restart = false; p_input->i_last_input_rate = INPUT_RATE_DEFAULT; return 0; @@ -490,48 +465,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 ) { @@ -543,6 +523,8 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, /* Run pre-filters. */ aout_FiltersPlay( p_aout, p_input->pp_filters, p_input->i_nb_filters, &p_buffer ); + if( !p_buffer ) + return 0; /* Actually run the resampler now. */ if ( p_input->i_nb_resamplers > 0 ) @@ -553,9 +535,11 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, &p_buffer ); } + if( !p_buffer ) + return 0; if( p_buffer->i_nb_samples <= 0 ) { - aout_BufferFree( p_buffer ); + block_Release( p_buffer ); return 0; } #endif @@ -639,8 +623,9 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, #ifndef AOUT_PROCESS_BEFORE_CHEKS /* Run pre-filters. */ - aout_FiltersPlay( p_aout, p_input->pp_filters, p_input->i_nb_filters, - &p_buffer ); + aout_FiltersPlay( p_input->pp_filters, p_input->i_nb_filters, &p_buffer ); + if( !p_buffer ) + return 0; #endif /* Run the resampler if needed. @@ -729,14 +714,15 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, /* Actually run the resampler now. */ if ( p_input->i_nb_resamplers > 0 ) { - aout_FiltersPlay( p_aout, p_input->pp_resamplers, - p_input->i_nb_resamplers, + aout_FiltersPlay( p_input->pp_resamplers, p_input->i_nb_resamplers, &p_buffer ); } + if( !p_buffer ) + return 0; if( p_buffer->i_nb_samples <= 0 ) { - aout_BufferFree( p_buffer ); + block_Release( p_buffer ); return 0; } #endif @@ -750,6 +736,14 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, return 0; } +bool aout_InputIsEmpty( aout_instance_t * p_aout, aout_input_t * p_input ) +{ + aout_lock_input_fifos( p_aout ); + bool is_empty = date_Get( &p_input->mixer.fifo.end_date ) <= mdate(); + aout_unlock_input_fifos( p_aout ); + return is_empty; +} + /***************************************************************************** * static functions *****************************************************************************/ @@ -804,10 +798,17 @@ 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( aout_filter_t *p_filter, +vout_thread_t *aout_filter_RequestVout( filter_t *p_filter, vout_thread_t *p_vout, video_format_t *p_fmt ) { aout_input_t *p_input = p_filter->p_owner->p_input; @@ -825,8 +826,8 @@ vout_thread_t *aout_filter_RequestVout( aout_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,