X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Finput.c;h=184e8f77dc5134e8f8171f01fb40d7c97493715d;hb=55f1d3272f61f46068e58c41690111e879082188;hp=6c80db1ada7ed07c5dda2b41d3da7178d730c5e3;hpb=2a6648ee790984b32b09aee458b0f84673dcfcf6;p=vlc diff --git a/src/audio_output/input.c b/src/audio_output/input.c index 6c80db1ada..184e8f77dc 100644 --- a/src/audio_output/input.c +++ b/src/audio_output/input.c @@ -1,7 +1,7 @@ /***************************************************************************** * input.c : internal management of input streams for the audio output ***************************************************************************** - * Copyright (C) 2002-2004 VideoLAN + * Copyright (C) 2002-2007 the VideoLAN team * $Id$ * * Authors: Christophe Massiot @@ -18,116 +18,140 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* calloc(), malloc(), free() */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include #include +#include -#include -#include /* for input_thread_t and i_pts_delay */ +#include /* for input_thread_t and i_pts_delay */ #ifdef HAVE_ALLOCA_H # include #endif +#include -#include "audio_output.h" #include "aout_internal.h" -static int VisualizationCallback( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); -static aout_filter_t * allocateUserChannelMixer( aout_instance_t *, - audio_sample_format_t *, - audio_sample_format_t * ); +/** 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 inputResamplingStop( aout_input_t *p_input ); +static int VisualizationCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); +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 * ); /***************************************************************************** * aout_InputNew : allocate a new input and rework the filter pipeline *****************************************************************************/ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) { - audio_sample_format_t user_filter_format; - audio_sample_format_t intermediate_format;/* input of resampler */ + audio_sample_format_t chain_input_format; + audio_sample_format_t chain_output_format; vlc_value_t val, text; - char * psz_filters; - aout_filter_t * p_user_channel_mixer; + char * psz_filters, *psz_visual; + 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; /* Prepare format structure */ - memcpy( &intermediate_format, &p_aout->mixer.mixer, + memcpy( &chain_input_format, &p_input->input, sizeof(audio_sample_format_t) ); - intermediate_format.i_rate = p_input->input.i_rate; - - /* Try to use the channel mixer chosen by the user */ - memcpy ( &user_filter_format, &intermediate_format, - sizeof(audio_sample_format_t) ); - user_filter_format.i_physical_channels = p_input->input.i_physical_channels; - user_filter_format.i_original_channels = p_input->input.i_original_channels; - user_filter_format.i_bytes_per_frame = user_filter_format.i_bytes_per_frame - * aout_FormatNbChannels( &user_filter_format ) - / aout_FormatNbChannels( &intermediate_format ); - p_user_channel_mixer = allocateUserChannelMixer( p_aout, &user_filter_format, - &intermediate_format ); - /* If it failed, let the main pipeline do channel mixing */ - if ( ! p_user_channel_mixer ) - { - memcpy ( &user_filter_format, &intermediate_format, - sizeof(audio_sample_format_t) ); - } - - /* Create filters. */ - if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters, - &p_input->i_nb_filters, - &p_input->input, - &user_filter_format - ) < 0 ) - { - msg_Err( p_aout, "couldn't set an input pipeline" ); - - aout_FifoDestroy( p_aout, &p_input->fifo ); - p_input->b_error = 1; - return -1; - } + memcpy( &chain_output_format, &p_aout->mixer.mixer, + sizeof(audio_sample_format_t) ); + chain_output_format.i_rate = p_input->input.i_rate; + aout_FormatPrepare( &chain_output_format ); /* Now add user filters */ if( var_Type( p_aout, "visual" ) == 0 ) { - module_t *p_module; 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 = "random"; text.psz_string = _("Random"); + 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 */ - p_module = config_FindModule( VLC_OBJECT(p_aout), "goom" ); - if( p_module ) + if( module_Exists( VLC_OBJECT(p_aout), "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" ) ) + { + val.psz_string = (char*)"galaktos"; text.psz_string = (char*)"GaLaktos"; 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 ); + free( val.psz_string ); } var_AddCallback( p_aout, "visual", VisualizationCallback, NULL ); } + if( var_Type( p_aout, "equalizer" ) == 0 ) + { + module_config_t *p_config; + int i; + + p_config = config_FindConfig( VLC_OBJECT(p_aout), "equalizer-preset" ); + if( p_config && p_config->i_list ) + { + var_Create( p_aout, "equalizer", + VLC_VAR_STRING | VLC_VAR_HASCHOICE ); + text.psz_string = _("Equalizer"); + var_Change( p_aout, "equalizer", VLC_VAR_SETTEXT, &text, NULL ); + + 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++ ) + { + val.psz_string = (char *)p_config->ppsz_list[i]; + text.psz_string = (char *)p_config->ppsz_list_text[i]; + var_Change( p_aout, "equalizer", VLC_VAR_ADDCHOICE, + &val, &text ); + } + + var_AddCallback( p_aout, "equalizer", EqualizerCallback, NULL ); + } + } + if( var_Type( p_aout, "audio-filter" ) == 0 ) { var_Create( p_aout, "audio-filter", @@ -135,29 +159,84 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) text.psz_string = _("Audio filters"); var_Change( p_aout, "audio-filter", VLC_VAR_SETTEXT, &text, NULL ); } + if( var_Type( p_aout, "audio-visual" ) == 0 ) + { + var_Create( p_aout, "audio-visual", + VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + text.psz_string = _("Audio visualizations"); + var_Change( p_aout, "audio-visual", VLC_VAR_SETTEXT, &text, NULL ); + } + + if( var_Type( p_aout, "audio-replay-gain-mode" ) == 0 ) + { + module_config_t *p_config; + int i; + + p_config = config_FindConfig( VLC_OBJECT(p_aout), "audio-replay-gain-mode" ); + if( p_config && p_config->i_list ) + { + var_Create( p_aout, "audio-replay-gain-mode", + VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + + text.psz_string = _("Replay gain"); + var_Change( p_aout, "audio-replay-gain-mode", VLC_VAR_SETTEXT, &text, NULL ); + + for( i = 0; i < p_config->i_list; i++ ) + { + val.psz_string = (char *)p_config->ppsz_list[i]; + text.psz_string = (char *)p_config->ppsz_list_text[i]; + var_Change( p_aout, "audio-replay-gain-mode", VLC_VAR_ADDCHOICE, + &val, &text ); + } + + var_AddCallback( p_aout, "audio-replay-gain-mode", ReplayGainCallback, NULL ); + } + } + if( var_Type( p_aout, "audio-replay-gain-preamp" ) == 0 ) + { + var_Create( p_aout, "audio-replay-gain-preamp", + VLC_VAR_FLOAT | VLC_VAR_DOINHERIT ); + } + if( var_Type( p_aout, "audio-replay-gain-default" ) == 0 ) + { + var_Create( p_aout, "audio-replay-gain-default", + VLC_VAR_FLOAT | VLC_VAR_DOINHERIT ); + } + if( var_Type( p_aout, "audio-replay-gain-peak-protection" ) == 0 ) + { + var_Create( p_aout, "audio-replay-gain-peak-protection", + VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + } var_Get( p_aout, "audio-filter", &val ); psz_filters = val.psz_string; - if( psz_filters && *psz_filters ) + var_Get( p_aout, "audio-visual", &val ); + psz_visual = val.psz_string; + + /* parse user filter lists */ + for( i_visual = 0; i_visual < 2; i_visual++ ) { - char *psz_parser = psz_filters; - char *psz_next; + char *psz_next = NULL; + char *psz_parser = i_visual ? psz_visual : psz_filters; + + if( psz_parser == NULL || !*psz_parser ) + continue; while( psz_parser && *psz_parser ) { - aout_filter_t * p_filter; + aout_filter_t * p_filter = NULL; if( p_input->i_nb_filters >= AOUT_MAX_FILTERS ) { - msg_Dbg( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS ); + msg_Dbg( p_aout, "max filters reached (%d)", AOUT_MAX_FILTERS ); break; } - while( *psz_parser == ' ' && *psz_parser == ',' ) + while( *psz_parser == ' ' && *psz_parser == ':' ) { psz_parser++; } - if( ( psz_next = strchr( psz_parser , ',' ) ) ) + if( ( psz_next = strchr( psz_parser , ':' ) ) ) { *psz_next++ = '\0'; } @@ -166,8 +245,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) break; } - msg_Dbg( p_aout, "user filter \"%s\"", psz_parser ); - /* Create a VLC object */ p_filter = vlc_object_create( p_aout, sizeof(aout_filter_t) ); if( p_filter == NULL ) @@ -179,89 +256,155 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) } vlc_object_attach( p_filter , p_aout ); - memcpy( &p_filter->input, &user_filter_format, - sizeof(audio_sample_format_t) ); - memcpy( &p_filter->output, &user_filter_format, - sizeof(audio_sample_format_t) ); - p_filter->p_module = - module_Need( p_filter,"audio filter", psz_parser, VLC_TRUE ); + /* try to find the requested filter */ + if( i_visual == 1 ) /* 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, 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, true ); + + if ( p_filter->p_module == NULL ) + { + /* if the filter requested a special format, retry */ + if ( !( AOUT_FMTS_IDENTICAL( &p_filter->input, + &chain_input_format ) + && AOUT_FMTS_IDENTICAL( &p_filter->output, + &chain_output_format ) ) ) + { + aout_FormatPrepare( &p_filter->input ); + aout_FormatPrepare( &p_filter->output ); + p_filter->p_module = module_Need( p_filter, + "audio filter", + psz_parser, true ); + } + /* try visual filters */ + else + { + 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, true ); + } + } + } - if( p_filter->p_module== NULL ) + /* failure */ + if ( p_filter->p_module == NULL ) { msg_Err( p_aout, "cannot add user filter %s (skipped)", psz_parser ); vlc_object_detach( p_filter ); - vlc_object_destroy( p_filter ); + 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->input ) < 0 ) + { + 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_release( p_filter ); + + psz_parser = psz_next; + continue; + } } - p_filter->b_continuity = VLC_FALSE; + /* success */ + 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 ) ); /* next filter if any */ psz_parser = psz_next; } } - if( psz_filters ) free( psz_filters ); + free( psz_filters ); + free( psz_visual ); - /* Attach the user channel mixer */ - if ( p_user_channel_mixer ) + /* complete the filter chain if necessary */ + if ( !AOUT_FMTS_IDENTICAL( &chain_input_format, &chain_output_format ) ) { - p_input->pp_filters[p_input->i_nb_filters++] = p_user_channel_mixer; + 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; + } } /* 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; - if ( AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) ) - { - p_input->i_nb_resamplers = 0; - } - else + /* Create resamplers. */ + if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) ) { - /* Create resamplers. */ - intermediate_format.i_rate = (__MAX(p_input->input.i_rate, + chain_output_format.i_rate = (__MAX(p_input->input.i_rate, p_aout->mixer.mixer.i_rate) * (100 + AOUT_MAX_RESAMPLING)) / 100; - if ( intermediate_format.i_rate == p_aout->mixer.mixer.i_rate ) + if ( chain_output_format.i_rate == p_aout->mixer.mixer.i_rate ) { /* Just in case... */ - intermediate_format.i_rate++; + chain_output_format.i_rate++; } if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_resamplers, &p_input->i_nb_resamplers, - &intermediate_format, + &chain_output_format, &p_aout->mixer.mixer ) < 0 ) { - msg_Err( p_aout, "couldn't set a resampler pipeline" ); - - aout_FiltersDestroyPipeline( p_aout, p_input->pp_filters, - p_input->i_nb_filters ); - aout_FifoDestroy( p_aout, &p_input->fifo ); - var_Destroy( p_aout, "visual" ); - p_input->b_error = 1; - + 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->i_resampling_type = AOUT_RESAMPLING_NONE; - p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP; 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( @@ -269,11 +412,13 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) (int)(p_input->input.i_bytes_per_frame * p_input->input.i_rate / p_input->input.i_frame_length) ); - /* Allocate in the heap, it is more convenient for the decoder. */ - p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP; - p_input->b_error = VLC_FALSE; - p_input->b_restart = VLC_FALSE; + 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; } @@ -289,8 +434,10 @@ int aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input ) aout_FiltersDestroyPipeline( p_aout, p_input->pp_filters, p_input->i_nb_filters ); + p_input->i_nb_filters = 0; 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 ); return 0; @@ -301,15 +448,17 @@ int aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input ) ***************************************************************************** * 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 ) + aout_buffer_t * p_buffer, int i_input_rate ) { mtime_t start_date; if( p_input->b_restart ) { aout_fifo_t fifo, dummy_fifo; - int p_first_byte_to_mix; + uint8_t *p_first_byte_to_mix; vlc_mutex_lock( &p_aout->mixer_lock ); @@ -326,6 +475,44 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, vlc_mutex_unlock( &p_aout->mixer_lock ); } + if( i_input_rate != INPUT_RATE_DEFAULT && p_input->i_nb_resamplers <= 0 ) + { + inputDrop( p_aout, p_input, p_buffer ); + return 0; + } + +#ifdef AOUT_PROCESS_BEFORE_CHEKS + /* Run pre-filters. */ + aout_FiltersPlay( p_aout, p_input->pp_filters, p_input->i_nb_filters, + &p_buffer ); + + /* Actually run the resampler now. */ + if ( p_input->i_nb_resamplers > 0 ) + { + const mtime_t i_date = p_buffer->start_date; + aout_FiltersPlay( p_aout, p_input->pp_resamplers, + p_input->i_nb_resamplers, + &p_buffer ); + } + + if( p_buffer->i_nb_samples <= 0 ) + { + aout_BufferFree( p_buffer ); + return 0; + } +#endif + + /* Handle input rate change by modifying resampler input rate */ + if( i_input_rate != p_input->i_last_input_rate ) + { + unsigned int * const pi_rate = &p_input->pp_resamplers[0]->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); +#undef F + p_input->i_last_input_rate = 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. */ @@ -338,7 +525,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, /* 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 ); @@ -346,12 +533,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, vlc_mutex_unlock( &p_aout->input_fifos_lock ); if ( p_input->i_resampling_type != AOUT_RESAMPLING_NONE ) msg_Warn( p_aout, "timing screwed, stopping resampling" ); - p_input->i_resampling_type = AOUT_RESAMPLING_NONE; - if ( p_input->i_nb_resamplers != 0 ) - { - p_input->pp_resamplers[0]->input.i_rate = p_input->input.i_rate; - p_input->pp_resamplers[0]->b_continuity = VLC_FALSE; - } + inputResamplingStop( p_input ); start_date = 0; } @@ -359,24 +541,46 @@ 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 ); - aout_BufferFree( p_buffer ); - p_input->i_resampling_type = AOUT_RESAMPLING_NONE; - if ( p_input->i_nb_resamplers != 0 ) - { - p_input->pp_resamplers[0]->input.i_rate = p_input->input.i_rate; - p_input->pp_resamplers[0]->b_continuity = VLC_FALSE; - } + + inputDrop( p_aout, 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. */ + if ( start_date != 0 && + ( start_date < p_buffer->start_date - 3 * AOUT_PTS_TOLERANCE ) ) + { + 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 ); + 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 ) ) + { + 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; } 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 ); +#endif /* Run the resampler if needed. * We first need to calculate the output rate of this resampler. */ @@ -402,7 +606,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"); @@ -416,21 +620,22 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, if( p_input->i_resampling_type == AOUT_RESAMPLING_UP ) { - p_input->pp_resamplers[0]->input.i_rate += 10; /* Hz */ + p_input->pp_resamplers[0]->input.i_rate += 2; /* Hz */ } else { - p_input->pp_resamplers[0]->input.i_rate -= 10; /* Hz */ + p_input->pp_resamplers[0]->input.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 == - p_input->input.i_rate ) + if( p_input->pp_resamplers[0]->input.i_rate == 1000 * p_input->input.i_rate / i_input_rate ) { p_input->i_resampling_type = AOUT_RESAMPLING_NONE; - msg_Warn( p_aout, "resampling stopped after "I64Fi" usec", - mdate() - p_input->i_resamp_start_date ); + msg_Warn( p_aout, "resampling stopped after %"PRIi64" usec " + "(drift: %"PRIi64")", + mdate() - p_input->i_resamp_start_date, + p_buffer->start_date - start_date); } else if( abs( (int)(p_buffer->start_date - start_date) ) < abs( p_input->i_resamp_start_drift ) / 2 ) @@ -450,16 +655,11 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, /* 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" ); - p_input->i_resampling_type = AOUT_RESAMPLING_NONE; - p_input->pp_resamplers[0]->input.i_rate = p_input->input.i_rate; + inputResamplingStop( p_input ); } } - /* 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; - +#ifndef AOUT_PROCESS_BEFORE_CHEKS /* Actually run the resampler now. */ if ( p_input->i_nb_resamplers > 0 ) { @@ -468,13 +668,123 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, &p_buffer ); } + if( p_buffer->i_nb_samples <= 0 ) + { + aout_BufferFree( p_buffer ); + return 0; + } +#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; } +/***************************************************************************** + * static functions + *****************************************************************************/ + +static void inputFailure( aout_instance_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, + 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" ); + var_Destroy( p_aout, "audio-visual" ); + + var_Destroy( p_aout, "audio-replay-gain-mode" ); + var_Destroy( p_aout, "audio-replay-gain-default" ); + var_Destroy( p_aout, "audio-replay-gain-preamp" ); + var_Destroy( p_aout, "audio-replay-gain-peak-protection" ); + + /* error flag */ + p_input->b_error = 1; +} + +static void inputDrop( aout_instance_t *p_aout, 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); +} + +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 = false; + } +} + +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; +} + static int VisualizationCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { @@ -482,17 +792,27 @@ static int VisualizationCallback( vlc_object_t *p_this, char const *psz_cmd, 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 ) { - val.psz_string = ""; - var_Set( p_aout, "audio-filter", val ); + ChangeFiltersString( p_aout, "audio-visual", "goom", false ); + ChangeFiltersString( p_aout, "audio-visual", "visual", false ); + ChangeFiltersString( p_aout, "audio-visual", "galaktos", false ); } else { if( !strcmp( "goom", psz_mode ) ) { - val.psz_string = "goom"; + ChangeFiltersString( p_aout, "audio-visual", "visual", false ); + ChangeFiltersString( p_aout, "audio-visual", "goom", true ); + ChangeFiltersString( p_aout, "audio-visual", "galaktos", false); + } + else if( !strcmp( "galaktos", psz_mode ) ) + { + ChangeFiltersString( p_aout, "audio-visual", "visual", false ); + ChangeFiltersString( p_aout, "audio-visual", "goom", false ); + ChangeFiltersString( p_aout, "audio-visual", "galaktos", true ); } else { @@ -500,62 +820,126 @@ static int VisualizationCallback( vlc_object_t *p_this, char const *psz_cmd, var_Create( p_aout, "effect-list", VLC_VAR_STRING ); var_Set( p_aout, "effect-list", val ); - val.psz_string = "visual"; + ChangeFiltersString( p_aout, "audio-visual", "goom", false ); + ChangeFiltersString( p_aout, "audio-visual", "visual", true ); + ChangeFiltersString( p_aout, "audio-visual", "galaktos", false); } - - var_Set( p_aout, "audio-filter", val ); } /* That sucks */ for( i = 0; i < p_aout->i_nb_inputs; i++ ) { - p_aout->pp_inputs[i]->b_restart = VLC_TRUE; + p_aout->pp_inputs[i]->b_restart = true; + } + + 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 ) +{ + 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", + 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", + true ); + + } + + /* That sucks */ + if( i_ret == 1 ) + { + for( i = 0; i < p_aout->i_nb_inputs; i++ ) + { + p_aout->pp_inputs[i]->b_restart = true; + } } return VLC_SUCCESS; } -static aout_filter_t * allocateUserChannelMixer( aout_instance_t * p_aout, - audio_sample_format_t * p_input_format, - audio_sample_format_t * p_output_format ) +static int ReplayGainCallback( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - aout_filter_t * p_channel_mixer; + 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; - /* Retreive user preferred channel mixer */ - char * psz_name = config_GetPsz( p_aout, "audio-channel-mixer" ); + 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] ); - /* Not specified => let the main pipeline do the mixing */ - if ( ! psz_name ) return NULL; + /* 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 ); - /* Debug information */ - aout_FormatsPrint( p_aout, "channel mixer", p_input_format, - p_output_format ); + return VLC_SUCCESS; +} + +static void ReplayGainSelect( aout_instance_t *p_aout, aout_input_t *p_input ) +{ + char *psz_replay_gain = var_GetNonEmptyString( p_aout, + "audio-replay-gain-mode" ); + int i_mode; + int i_use; + float f_gain; + + p_input->f_multiplier = 1.0; + + if( !psz_replay_gain ) + return; + + /* Find select mode */ + if( !strcmp( psz_replay_gain, "track" ) ) + i_mode = AUDIO_REPLAY_GAIN_TRACK; + else if( !strcmp( psz_replay_gain, "album" ) ) + i_mode = AUDIO_REPLAY_GAIN_ALBUM; + else + i_mode = AUDIO_REPLAY_GAIN_MAX; - /* Create a VLC object */ - p_channel_mixer = vlc_object_create( p_aout, sizeof(aout_filter_t) ); - if( p_channel_mixer == NULL ) + /* If the select mode is not available, prefer the other one */ + i_use = i_mode; + if( i_use != AUDIO_REPLAY_GAIN_MAX && !p_input->replay_gain.pb_gain[i_use] ) { - msg_Err( p_aout, "cannot add user channel mixer %s", psz_name ); - return NULL; + for( i_use = 0; i_use < AUDIO_REPLAY_GAIN_MAX; i_use++ ) + { + if( p_input->replay_gain.pb_gain[i_use] ) + break; + } } - vlc_object_attach( p_channel_mixer , p_aout ); - /* Attach the suitable module */ - memcpy( &p_channel_mixer->input, p_input_format, - sizeof(audio_sample_format_t) ); - memcpy( &p_channel_mixer->output, p_output_format, - sizeof(audio_sample_format_t) ); - p_channel_mixer->p_module = - module_Need( p_channel_mixer,"audio filter", psz_name, VLC_TRUE ); - if( p_channel_mixer->p_module== NULL ) + /* */ + if( i_use != AUDIO_REPLAY_GAIN_MAX ) + f_gain = p_input->replay_gain.pf_gain[i_use] + var_GetFloat( p_aout, "audio-replay-gain-preamp" ); + else if( i_mode != AUDIO_REPLAY_GAIN_MAX ) + 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 ); + + /* */ + 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 ) { - msg_Err( p_aout, "cannot add user channel mixer %s", psz_name ); - vlc_object_detach( p_channel_mixer ); - vlc_object_destroy( p_channel_mixer ); - return NULL; + p_input->f_multiplier = 1.0f / p_input->replay_gain.pf_peak[i_use]; } - p_channel_mixer->b_continuity = VLC_FALSE; - /* Ok */ - return p_channel_mixer; + free( psz_replay_gain ); } +