X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Finput.c;h=a6c6f952ca2231e0b9c2c17a58ade096da93c2f2;hb=887b13d2cee8f5f255602752dd81e7c81864fb76;hp=f8d6662941f179f8577c66cba54f71af0d445b9b;hpb=a3576a2716c6ea17349b9dbeea4757d2198b40e6;p=vlc diff --git a/src/audio_output/input.c b/src/audio_output/input.c index f8d6662941..a6c6f952ca 100644 --- a/src/audio_output/input.c +++ b/src/audio_output/input.c @@ -25,26 +25,31 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include #include #include #include +#include -#include /* for input_thread_t and i_pts_delay */ +#include +#include /* for vout_Request */ +#include -#ifdef HAVE_ALLOCA_H -# include -#endif #include +#include +#include #include "aout_internal.h" -/** FIXME: Ugly but needed to access the counters */ -#include "input/input_internal.h" - -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 inputFailure( audio_output_t *, aout_input_t *, const char * ); +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 *, @@ -53,31 +58,41 @@ static int EqualizerCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); 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 void ReplayGainSelect( audio_output_t *, aout_input_t * ); + +static vout_thread_t *RequestVout( 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( audio_output_t * p_aout, aout_input_t * p_input, const aout_request_vout_t *p_request_vout ) { + aout_owner_t *owner = aout_owner (p_aout); 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 ); 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; + /* */ + 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 = owner->mixer_format; chain_output_format.i_rate = p_input->input.i_rate; aout_FormatPrepare( &chain_output_format ); @@ -87,35 +102,37 @@ 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 = (char*)"spectrometer"; text.psz_string = _("Spectrometer"); var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "spectrometer"; text.psz_string = _("Spectrometer"); + val.psz_string = (char*)"scope"; text.psz_string = _("Scope"); var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "scope"; text.psz_string = _("Scope"); + val.psz_string = (char*)"spectrum"; text.psz_string = _("Spectrum"); var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "spectrum"; text.psz_string = _("Spectrum"); + 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 ); + var_AddCallback( p_aout, "visual", VisualizationCallback, p_input ); } if( var_Type( p_aout, "equalizer" ) == 0 ) @@ -131,7 +148,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++ ) @@ -202,23 +219,27 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) 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_filters = var_GetString( p_aout, "audio-filter" ); + psz_visual = var_GetString( p_aout, "audio-visual"); + psz_scaletempo = var_InheritBool( p_aout, "audio-time-stretch" ) ? strdup( "scaletempo" ) : NULL; + + 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; 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 ) { @@ -240,7 +261,8 @@ 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) ); + p_filter = vlc_custom_create( p_aout, sizeof(*p_filter), + "audio filter" ); if( p_filter == NULL ) { msg_Err( p_aout, "cannot add user filter %s (skipped)", @@ -249,55 +271,54 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) continue; } - vlc_object_attach( p_filter , p_aout ); + 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->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 == 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, "visualization2", + 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 ) { /* if the filter requested a special format, retry */ - if ( !( AOUT_FMTS_IDENTICAL( &p_filter->input, + if ( !( AOUT_FMTS_IDENTICAL( &p_filter->fmt_in.audio, &chain_input_format ) - && AOUT_FMTS_IDENTICAL( &p_filter->output, + && AOUT_FMTS_IDENTICAL( &p_filter->fmt_out.audio, &chain_output_format ) ) ) { - aout_FormatPrepare( &p_filter->input ); - aout_FormatPrepare( &p_filter->output ); - p_filter->p_module = module_Need( p_filter, + aout_FormatPrepare( &p_filter->fmt_in.audio ); + aout_FormatPrepare( &p_filter->fmt_out.audio ); + p_filter->p_module = module_need( p_filter, "audio filter", - psz_parser, VLC_TRUE ); + psz_parser, true ); } /* try visual filters */ else { - memcpy( &p_filter->input, &chain_output_format, + memcpy( &p_filter->fmt_in.audio, &chain_output_format, sizeof(audio_sample_format_t) ); - memcpy( &p_filter->output, &chain_output_format, + memcpy( &p_filter->fmt_out.audio, &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, + "visualization2", + psz_parser, true ); } } } @@ -308,110 +329,90 @@ 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 ); - vlc_object_detach( p_filter ); - vlc_object_destroy( p_filter ); + free( p_filter->p_owner ); + vlc_object_release( p_filter ); psz_parser = psz_next; continue; } /* complete the filter chain if necessary */ - if ( !AOUT_FMTS_IDENTICAL( &chain_input_format, &p_filter->input ) ) + if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters, + &p_input->i_nb_filters, + &chain_input_format, + &p_filter->fmt_in.audio ) < 0 ) { - if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters, - &p_input->i_nb_filters, - &chain_input_format, - &p_filter->input ) < 0 ) - { - msg_Err( p_aout, "cannot add user filter %s (skipped)", - psz_parser ); + msg_Err( p_aout, "cannot add user filter %s (skipped)", + psz_parser ); - module_Unneed( p_filter, p_filter->p_module ); - vlc_object_detach( p_filter ); - vlc_object_destroy( p_filter ); + module_unneed( p_filter, p_filter->p_module ); + free( p_filter->p_owner ); + vlc_object_release( p_filter ); - psz_parser = psz_next; - continue; - } + psz_parser = psz_next; + continue; } /* success */ - p_filter->b_continuity = VLC_FALSE; p_input->pp_filters[p_input->i_nb_filters++] = p_filter; - memcpy( &chain_input_format, &p_filter->output, + memcpy( &chain_input_format, &p_filter->fmt_out.audio, 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 ) ) + if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters, + &p_input->i_nb_filters, + &chain_input_format, + &chain_output_format ) < 0 ) { - if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters, - &p_input->i_nb_filters, - &chain_input_format, - &chain_output_format ) < 0 ) - { - inputFailure( p_aout, p_input, "couldn't set an input pipeline" ); - return -1; - } + inputFailure( p_aout, p_input, "couldn't set an input pipeline" ); + return -1; } - /* 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; - /* Create resamplers. */ - if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) ) + if (!AOUT_FMT_NON_LINEAR(&owner->mixer_format)) { chain_output_format.i_rate = (__MAX(p_input->input.i_rate, - p_aout->mixer.mixer.i_rate) + owner->mixer_format.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 == owner->mixer_format.i_rate ) { /* Just in case... */ chain_output_format.i_rate++; } - if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_resamplers, - &p_input->i_nb_resamplers, - &chain_output_format, - &p_aout->mixer.mixer ) < 0 ) + if (aout_FiltersCreatePipeline (p_aout, p_input->pp_resamplers, + &p_input->i_nb_resamplers, + &chain_output_format, + &owner->mixer_format) < 0) { inputFailure( p_aout, p_input, "couldn't set a resampler pipeline"); return -1; } - aout_FiltersHintBuffers( p_aout, p_input->pp_resamplers, - p_input->i_nb_resamplers, - &p_input->input_alloc ); - p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP; - /* Setup the initial rate of the resampler */ - p_input->pp_resamplers[0]->input.i_rate = p_input->input.i_rate; + p_input->pp_resamplers[0]->fmt_in.audio.i_rate = p_input->input.i_rate; } p_input->i_resampling_type = AOUT_RESAMPLING_NONE; - aout_FiltersHintBuffers( p_aout, p_input->pp_filters, - p_input->i_nb_filters, - &p_input->input_alloc ); - p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP; - - /* 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) ); + if( ! p_input->p_playback_rate_filter && p_input->i_nb_resamplers > 0 ) + { + p_input->p_playback_rate_filter = p_input->pp_resamplers[0]; + } 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->i_last_input_rate = INPUT_RATE_DEFAULT; return 0; @@ -422,21 +423,46 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) ***************************************************************************** * This function must be entered with the mixer lock. *****************************************************************************/ -int aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input ) +int aout_InputDelete( audio_output_t * p_aout, aout_input_t * p_input ) { - if ( p_input->b_error ) return 0; + aout_assert_locked( p_aout ); + 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 ); + aout_FiltersDestroyPipeline( p_input->pp_filters, p_input->i_nb_filters ); p_input->i_nb_filters = 0; - aout_FiltersDestroyPipeline( p_aout, p_input->pp_resamplers, + aout_FiltersDestroyPipeline( p_input->pp_resamplers, p_input->i_nb_resamplers ); p_input->i_nb_resamplers = 0; - aout_FifoDestroy( p_aout, &p_input->fifo ); return 0; } +/***************************************************************************** + * aout_InputCheckAndRestart : restart an input + ***************************************************************************** + * This function must be entered with the input and mixer lock. + *****************************************************************************/ +void aout_InputCheckAndRestart( audio_output_t * p_aout, aout_input_t * p_input ) +{ + aout_assert_locked( p_aout ); + + if( !p_input->b_restart ) + return; + + aout_InputDelete( p_aout, p_input ); + aout_InputNew( p_aout, p_input, &p_input->request_vout ); + + p_input->b_restart = false; +} /***************************************************************************** * aout_InputPlay : play a buffer ***************************************************************************** @@ -444,62 +470,48 @@ int aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input ) *****************************************************************************/ /* 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 ) +block_t *aout_InputPlay(audio_output_t *p_aout, aout_input_t *p_input, + block_t *p_buffer, int i_input_rate, date_t *date ) { mtime_t start_date; - if( p_input->b_restart ) - { - aout_fifo_t fifo, dummy_fifo; - byte_t *p_first_byte_to_mix; - - vlc_mutex_lock( &p_aout->mixer_lock ); - - /* 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; + aout_assert_locked( p_aout ); - vlc_mutex_unlock( &p_aout->mixer_lock ); - } - - 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; + inputDrop( p_input, p_buffer ); + return NULL; } #ifdef AOUT_PROCESS_BEFORE_CHEKS /* Run pre-filters. */ aout_FiltersPlay( p_aout, p_input->pp_filters, p_input->i_nb_filters, &p_buffer ); + if( !p_buffer ) + return NULL; /* Actually run the resampler now. */ if ( p_input->i_nb_resamplers > 0 ) { - const mtime_t i_date = p_buffer->start_date; + const mtime_t i_date = p_buffer->i_pts; aout_FiltersPlay( p_aout, p_input->pp_resamplers, p_input->i_nb_resamplers, &p_buffer ); } + if( !p_buffer ) + return NULL; if( p_buffer->i_nb_samples <= 0 ) { - aout_BufferFree( p_buffer ); - return 0; + block_Release( p_buffer ); + return NULL; } #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->fmt_in.audio.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); @@ -507,80 +519,82 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, p_input->i_last_input_rate = i_input_rate; } + mtime_t now = mdate(); + /* 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 ); + start_date = date_Get (date); - if ( start_date != 0 && start_date < mdate() ) + if ( start_date != VLC_TS_INVALID && start_date < now ) { /* 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 ); - p_input->p_first_byte_to_mix = NULL; - vlc_mutex_unlock( &p_aout->input_fifos_lock ); + msg_Warn( p_aout, "computed PTS is out of range (%"PRId64"), " + "clearing out", now - start_date ); + aout_OutputFlush( p_aout, false ); if ( p_input->i_resampling_type != AOUT_RESAMPLING_NONE ) msg_Warn( p_aout, "timing screwed, stopping resampling" ); inputResamplingStop( p_input ); - start_date = 0; + p_buffer->i_flags |= BLOCK_FLAG_DISCONTINUITY; + start_date = VLC_TS_INVALID; } - if ( p_buffer->start_date < mdate() + AOUT_MIN_PREPARE_TIME ) + if ( p_buffer->i_pts < now + AOUT_MIN_PREPARE_TIME ) { /* 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 ); - - inputDrop( p_aout, p_input, p_buffer ); + msg_Warn( p_aout, "PTS is out of range (%"PRId64"), dropping buffer", + now - p_buffer->i_pts ); + inputDrop( p_input, p_buffer ); inputResamplingStop( p_input ); - return 0; + return NULL; } /* If the audio drift is too big then it's not worth trying to resample * the audio. */ - if ( start_date != 0 && - ( start_date < p_buffer->start_date - 3 * AOUT_PTS_TOLERANCE ) ) - { - msg_Warn( p_aout, "audio drift is too big ("I64Fd"), 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 ); + if( start_date == VLC_TS_INVALID ) + { + start_date = p_buffer->i_pts; + date_Set (date, start_date); + } + + mtime_t drift = start_date - p_buffer->i_pts; + + if( drift < -i_input_rate * 3 * AOUT_MAX_PTS_ADVANCE / INPUT_RATE_DEFAULT ) + { + msg_Warn( p_aout, "buffer way too early (%"PRId64"), clearing queue", + drift ); + aout_OutputFlush( p_aout, false ); if ( p_input->i_resampling_type != AOUT_RESAMPLING_NONE ) msg_Warn( p_aout, "timing screwed, stopping resampling" ); inputResamplingStop( p_input ); - start_date = 0; + p_buffer->i_flags |= BLOCK_FLAG_DISCONTINUITY; + start_date = p_buffer->i_pts; + date_Set (date, start_date); + drift = 0; } - else if ( start_date != 0 && - ( start_date > p_buffer->start_date + 3 * AOUT_PTS_TOLERANCE ) ) + else + if( drift > +i_input_rate * 3 * AOUT_MAX_PTS_DELAY / INPUT_RATE_DEFAULT ) { - msg_Warn( p_aout, "audio drift is too big ("I64Fd"), dropping buffer", - start_date - p_buffer->start_date ); - inputDrop( p_aout, p_input, p_buffer ); - return 0; + msg_Warn( p_aout, "buffer way too late (%"PRId64"), dropping buffer", + drift ); + inputDrop( p_input, p_buffer ); + return NULL; } - if ( start_date == 0 ) start_date = p_buffer->start_date; - #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 NULL; #endif /* 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 ) && + ( drift < -AOUT_MAX_PTS_ADVANCE || drift > +AOUT_MAX_PTS_DELAY ) && p_input->i_nb_resamplers > 0 ) { /* Can happen in several circumstances : @@ -590,20 +604,13 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, * 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"); + p_input->i_resamp_start_date = now; + p_input->i_resamp_start_drift = (int)-drift; + p_input->i_resampling_type = (drift < 0) ? AOUT_RESAMPLING_DOWN + : AOUT_RESAMPLING_UP; + msg_Warn( p_aout, (drift < 0) + ? "buffer too early (%"PRId64"), down-sampling" + : "buffer too late (%"PRId64"), up-sampling", drift ); } if ( p_input->i_resampling_type != AOUT_RESAMPLING_NONE ) @@ -613,25 +620,25 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, * it isn't too audible to the listener. */ if( p_input->i_resampling_type == AOUT_RESAMPLING_UP ) - { - p_input->pp_resamplers[0]->input.i_rate += 2; /* Hz */ - } + p_input->pp_resamplers[0]->fmt_in.audio.i_rate += 2; /* Hz */ else - { - p_input->pp_resamplers[0]->input.i_rate -= 2; /* Hz */ - } + p_input->pp_resamplers[0]->fmt_in.audio.i_rate -= 2; /* Hz */ /* 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]->fmt_in.audio.i_rate == i_nominal_rate ) { p_input->i_resampling_type = AOUT_RESAMPLING_NONE; - msg_Warn( p_aout, "resampling stopped after "I64Fi" usec " - "(drift: "I64Fi")", - mdate() - p_input->i_resamp_start_date, - p_buffer->start_date - start_date); + msg_Warn( p_aout, "resampling stopped after %"PRIi64" usec " + "(drift: %"PRIi64")", + now - p_input->i_resamp_start_date, + p_buffer->i_pts - start_date); } - else if( abs( (int)(p_buffer->start_date - start_date) ) < + else if( abs( (int)(p_buffer->i_pts - start_date) ) < abs( p_input->i_resamp_start_drift ) / 2 ) { /* if we reduced the drift from half, then it is time to switch @@ -643,13 +650,14 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, p_input->i_resamp_start_drift = 0; } else if( p_input->i_resamp_start_drift && - ( abs( (int)(p_buffer->start_date - start_date) ) > + ( abs( (int)(p_buffer->i_pts - 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" ); inputResamplingStop( p_input ); + p_buffer->i_flags |= BLOCK_FLAG_DISCONTINUITY; } } @@ -657,45 +665,37 @@ 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 NULL; if( p_buffer->i_nb_samples <= 0 ) { - aout_BufferFree( p_buffer ); - return 0; + block_Release( p_buffer ); + return NULL; } #endif - /* Adding the start date will be managed by aout_FifoPush(). */ - p_buffer->end_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_FifoPush( p_aout, &p_input->fifo, p_buffer ); - vlc_mutex_unlock( &p_aout->input_fifos_lock ); - return 0; + p_buffer->i_pts = start_date; + return p_buffer; } /***************************************************************************** * static functions *****************************************************************************/ -static void inputFailure( aout_instance_t * p_aout, aout_input_t * p_input, +static void inputFailure( audio_output_t * p_aout, aout_input_t * p_input, const char * psz_error_message ) { /* error message */ msg_Err( p_aout, "%s", psz_error_message ); /* clean up */ - aout_FiltersDestroyPipeline( p_aout, p_input->pp_filters, - p_input->i_nb_filters ); - aout_FiltersDestroyPipeline( p_aout, p_input->pp_resamplers, + aout_FiltersDestroyPipeline( p_input->pp_filters, p_input->i_nb_filters ); + aout_FiltersDestroyPipeline( p_input->pp_resamplers, p_input->i_nb_resamplers ); - aout_FifoDestroy( p_aout, &p_input->fifo ); var_Destroy( p_aout, "visual" ); var_Destroy( p_aout, "equalizer" ); var_Destroy( p_aout, "audio-filter" ); @@ -710,16 +710,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 ) @@ -727,163 +722,132 @@ 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]->fmt_in.audio.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; } } -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 ); + audio_output_t *p_aout = p_private; + VLC_UNUSED(b_recycle); + vout_configuration_t cfg = { + .vout = p_vout, + .input = NULL, + .change_fmt = true, + .fmt = p_fmt, + .dpb_size = 1, + }; + return vout_Request( p_aout, &cfg ); +} - if( !val.psz_string ) val.psz_string = strdup(""); +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; + aout_request_vout_t *p_request = &p_input->request_vout; - psz_parser = strstr( val.psz_string, psz_name ); + /* XXX: this only works from audio input */ + /* If you want to use visualization filters from another place, you will + * need to add a new pf_aout_request_vout callback or store a pointer + * to aout_request_vout_t inside filter_t (i.e. a level of indirection). */ - 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 ); +} - var_Set( p_aout, psz_variable, val ); - free( val.psz_string ); - return 1; +static inline bool ChangeFiltersString (vlc_object_t *aout, const char *var, + const char *filter, bool add) +{ + return aout_ChangeFilterString (aout, aout, var, filter, add); } -static int VisualizationCallback( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) +static int VisualizationCallback (vlc_object_t *obj, char const *var, + vlc_value_t oldval, vlc_value_t newval, + void *data) { - 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; + const char *mode = newval.psz_string; + aout_input_t *input = data; - if( !psz_mode || !*psz_mode ) + if (!*mode) + { + ChangeFiltersString (obj, "audio-visual", "goom", false); + ChangeFiltersString (obj, "audio-visual", "visual", false); + ChangeFiltersString (obj, "audio-visual", "projectm", false); + } + else if (!strcmp ("goom", mode)) + { + ChangeFiltersString (obj, "audio-visual", "visual", false ); + ChangeFiltersString (obj, "audio-visual", "goom", true ); + ChangeFiltersString (obj, "audio-visual", "projectm", false ); + } + else if (!strcmp ("projectm", 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 (obj, "audio-visual", "visual", false); + ChangeFiltersString (obj, "audio-visual", "goom", false); + ChangeFiltersString (obj, "audio-visual", "projectm", true); } 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); - } - else if( !strcmp( "galaktos", 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 ); - } - else - { - val.psz_string = psz_mode; - var_Create( p_aout, "effect-list", VLC_VAR_STRING ); - var_Set( p_aout, "effect-list", val ); + var_Create (obj, "effect-list", VLC_VAR_STRING); + var_SetString (obj, "effect-list", 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 (obj, "audio-visual", "goom", false); + ChangeFiltersString (obj, "audio-visual", "visual", true); + ChangeFiltersString (obj, "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; - } + /* That sucks FIXME: use "input" instead of cast */ + AoutInputsMarkToRestart ((audio_output_t *)obj); + (void) var; (void) oldval; return VLC_SUCCESS; } -static int EqualizerCallback( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) +static int EqualizerCallback (vlc_object_t *obj, char const *cmd, + vlc_value_t oldval, vlc_value_t newval, + void *data) { - 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; + char *mode = newval.psz_string; + aout_input_t *input = data; + bool ret; - if( !psz_mode || !*psz_mode ) - { - i_ret = ChangeFiltersString( p_aout, "audio-filter", "equalizer", - VLC_FALSE ); - } + (void) cmd; (void) oldval; + if (!*mode) + ret = ChangeFiltersString (obj, "audio-filter", "equalizer", false); else { - val.psz_string = psz_mode; - var_Create( p_aout, "equalizer-preset", VLC_VAR_STRING ); - var_Set( p_aout, "equalizer-preset", val ); - i_ret = ChangeFiltersString( p_aout, "audio-filter", "equalizer", - VLC_TRUE ); - + var_Create (obj, "equalizer-preset", VLC_VAR_STRING); + var_SetString (obj, "equalizer-preset", mode); + ret = ChangeFiltersString (obj, "audio-filter", "equalizer", 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; - } - } - + if (ret) + AoutInputsMarkToRestart ((audio_output_t *)obj); 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 ) { - aout_instance_t *p_aout = (aout_instance_t *)p_this; - int i; - - vlc_mutex_lock( &p_aout->mixer_lock ); - for( i = 0; i < p_aout->i_nb_inputs; i++ ) - ReplayGainSelect( p_aout, p_aout->pp_inputs[i] ); + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); + VLC_UNUSED(newval); VLC_UNUSED(p_data); + audio_output_t *aout = (audio_output_t *)p_this; + aout_owner_t *owner = aout_owner (aout); - /* 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_lock (aout); + if (owner->input != NULL) + ReplayGainSelect (aout, owner->input); + aout_unlock (aout); return VLC_SUCCESS; } -static void ReplayGainSelect( aout_instance_t *p_aout, aout_input_t *p_input ) +static void ReplayGainSelect( audio_output_t *p_aout, aout_input_t *p_input ) { char *psz_replay_gain = var_GetNonEmptyString( p_aout, "audio-replay-gain-mode" ); @@ -891,7 +855,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->multiplier = 1.0; if( !psz_replay_gain ) return; @@ -922,16 +886,15 @@ 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->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->multiplier > 1.0 ) { - p_input->f_multiplier = 1.0f / p_input->replay_gain.pf_peak[i_use]; + p_input->multiplier = 1.0f / p_input->replay_gain.pf_peak[i_use]; } free( psz_replay_gain ); } -