X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Finput.c;h=85d439bbcbb254e9c9afa6947e75d6628b663e07;hb=4b9c63a36eded246ad9ef1ea0de0cf7b38d29ad9;hp=20ded4148d118e86292183a02bd673b1d8663378;hpb=d4ccb69dc2c75767b7f4719da1612678083711aa;p=vlc diff --git a/src/audio_output/input.c b/src/audio_output/input.c index 20ded4148d..85d439bbcb 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,122 +18,124 @@ * * 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 -#include -#include /* for input_thread_t and i_pts_delay */ +#include +#include /* for vout_Request */ -#ifdef HAVE_ALLOCA_H -# include -#endif +#include +#include +#include -#include "audio_output.h" #include "aout_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_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 aout_filter_t * allocateUserChannelMixer( aout_instance_t *, - audio_sample_format_t *, - audio_sample_format_t * ); +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 ); /***************************************************************************** * 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 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, *psz_scaletempo; + int i_visual; aout_FormatPrint( p_aout, "input", &p_input->input ); - /* Prepare FIFO. */ - aout_FifoInit( p_aout, &p_input->fifo, p_aout->mixer.mixer.i_rate ); - p_input->p_first_byte_to_mix = NULL; + p_input->i_nb_resamplers = p_input->i_nb_filters = 0; - /* Prepare format structure */ - memcpy( &intermediate_format, &p_aout->mixer.mixer, - sizeof(audio_sample_format_t) ); - intermediate_format.i_rate = p_input->input.i_rate; + /* Prepare FIFO. */ + aout_FifoInit( p_aout, &p_input->mixer.fifo, p_aout->mixer_format.i_rate ); + p_input->mixer.begin = NULL; - /* 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 ) + /* */ + if( p_request_vout ) { - memcpy ( &user_filter_format, &intermediate_format, - sizeof(audio_sample_format_t) ); + p_input->request_vout = *p_request_vout; } - - /* Create filters. */ - if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters, - &p_input->i_nb_filters, - &p_input->input, - &user_filter_format - ) < 0 ) + else { - msg_Err( p_aout, "couldn't set an input pipeline" ); - - aout_FifoDestroy( p_aout, &p_input->fifo ); - p_input->b_error = 1; - return -1; + p_input->request_vout.pf_request_vout = RequestVout; + p_input->request_vout.p_private = p_aout; } + /* Prepare format structure */ + chain_input_format = p_input->input; + chain_output_format = p_aout->mixer_format; + 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 = "random"; text.psz_string = _("Random"); + 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 */ - p_module = config_FindModule( VLC_OBJECT(p_aout), "goom" ); - if( p_module ) + 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 */ - p_module = config_FindModule( VLC_OBJECT(p_aout), "galaktos" ); - if( p_module ) + /* 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 ); } @@ -141,29 +143,29 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) if( var_Type( p_aout, "equalizer" ) == 0 ) { module_config_t *p_config; - int i; + 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 ); + 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 = ""; text.psz_string = _("Disable"); - var_Change( p_aout, "equalizer", VLC_VAR_ADDCHOICE, &val, &text ); + 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 = p_config->ppsz_list[i]; - text.psz_string = p_config->ppsz_list_text[i]; - 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 ); - } + var_AddCallback( p_aout, "equalizer", EqualizerCallback, NULL ); + } } if( var_Type( p_aout, "audio-filter" ) == 0 ) @@ -173,29 +175,93 @@ 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 ); + } - var_Get( p_aout, "audio-filter", &val ); - psz_filters = val.psz_string; - if( psz_filters && *psz_filters ) + if( var_Type( p_aout, "audio-replay-gain-mode" ) == 0 ) { - char *psz_parser = psz_filters; - char *psz_next; + 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 ); + } + 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; + + p_input->b_recycle_vout = psz_visual && *psz_visual; + + /* parse user filter lists */ + 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 = ppsz_array[i_visual]; + + if( psz_parser == NULL || !*psz_parser ) + continue; while( psz_parser && *psz_parser ) { - aout_filter_t * p_filter; + 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'; } @@ -204,10 +270,10 @@ 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) ); + 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)", @@ -217,89 +283,165 @@ 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, + + 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) ); - memcpy( &p_filter->output, &user_filter_format, + 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; - p_filter->p_module = - module_Need( p_filter,"audio filter", psz_parser, VLC_TRUE ); + /* 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, "visualization2", + psz_parser, true ); + } + else /* this can be a audio filter module as well as a visualization module */ + { + 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->fmt_in.audio, + &chain_input_format ) + && AOUT_FMTS_IDENTICAL( &p_filter->fmt_out.audio, + &chain_output_format ) ) ) + { + 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, true ); + } + /* try visual filters */ + else + { + memcpy( &p_filter->fmt_in.audio, &chain_output_format, + sizeof(audio_sample_format_t) ); + memcpy( &p_filter->fmt_out.audio, &chain_output_format, + sizeof(audio_sample_format_t) ); + p_filter->p_module = module_need( p_filter, + "visualization2", + 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 ); + 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->fmt_in.audio ) ) + { + if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters, + &p_input->i_nb_filters, + &chain_input_format, + &p_filter->fmt_in.audio ) < 0 ) + { + msg_Err( p_aout, "cannot add user filter %s (skipped)", + psz_parser ); + + module_unneed( p_filter, p_filter->p_module ); + free( p_filter->p_owner ); + vlc_object_release( p_filter ); + + psz_parser = psz_next; + continue; + } } - p_filter->b_continuity = VLC_FALSE; + /* success */ p_input->pp_filters[p_input->i_nb_filters++] = p_filter; + 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 ); + free( psz_visual ); + free( psz_filters ); + free( psz_scaletempo ); - /* 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.b_alloc = true; p_input->input_alloc.i_bytes_per_sec = -1; - if ( AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) ) + /* Create resamplers. */ + if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer_format ) ) { - p_input->i_nb_resamplers = 0; - } - else - { - /* Create resamplers. */ - intermediate_format.i_rate = (__MAX(p_input->input.i_rate, - p_aout->mixer.mixer.i_rate) + chain_output_format.i_rate = (__MAX(p_input->input.i_rate, + p_aout->mixer_format.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_format.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, - &p_aout->mixer.mixer ) < 0 ) + &chain_output_format, + &p_aout->mixer_format ) < 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.b_alloc = true; /* 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; - p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP; + 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 ); + 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( @@ -307,11 +449,12 @@ 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->i_last_input_rate = INPUT_RATE_DEFAULT; return 0; } @@ -323,104 +466,198 @@ 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 ); + p_input->i_nb_filters = 0; aout_FiltersDestroyPipeline( p_aout, p_input->pp_resamplers, p_input->i_nb_resamplers ); - aout_FifoDestroy( p_aout, &p_input->fifo ); + p_input->i_nb_resamplers = 0; + aout_FifoDestroy( p_aout, &p_input->mixer.fifo ); return 0; } +/***************************************************************************** + * aout_InputCheckAndRestart : restart an input + ***************************************************************************** + * This function must be entered with the input and mixer lock. + *****************************************************************************/ +void aout_InputCheckAndRestart( aout_instance_t * p_aout, aout_input_t * p_input ) +{ + AOUT_ASSERT_MIXER_LOCKED; + AOUT_ASSERT_INPUT_LOCKED; + + if( !p_input->b_restart ) + return; + + aout_lock_input_fifos( p_aout ); + + /* A little trick to avoid loosing our input fifo and properties */ + + 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_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; + + 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 ) + aout_buffer_t * p_buffer, int i_input_rate ) { mtime_t start_date; + AOUT_ASSERT_INPUT_LOCKED; - if( p_input->b_restart ) + if( i_input_rate != INPUT_RATE_DEFAULT && p_input->p_playback_rate_filter == NULL ) { - aout_fifo_t fifo, dummy_fifo; - byte_t *p_first_byte_to_mix; + inputDrop( p_input, p_buffer ); + return 0; + } - vlc_mutex_lock( &p_aout->mixer_lock ); +#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 0; - /* 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; + /* Actually run the resampler now. */ + if ( p_input->i_nb_resamplers > 0 ) + { + const mtime_t i_date = p_buffer->i_pts; + aout_FiltersPlay( p_aout, p_input->pp_resamplers, + p_input->i_nb_resamplers, + &p_buffer ); + } - vlc_mutex_unlock( &p_aout->mixer_lock ); + if( !p_buffer ) + return 0; + if( p_buffer->i_nb_samples <= 0 ) + { + block_Release( p_buffer ); + return 0; + } +#endif + + /* 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->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); +#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. */ - 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" ); - 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 ); + p_buffer->i_flags |= BLOCK_FLAG_DISCONTINUITY; start_date = 0; } - if ( p_buffer->start_date < mdate() + AOUT_MIN_PREPARE_TIME ) + if ( p_buffer->i_pts < mdate() + 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 ); - 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; - } + msg_Warn( p_aout, "PTS is out of range (%"PRId64"), dropping buffer", + mdate() - p_buffer->i_pts ); + + 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->i_pts - i_pts_tolerance ) ) + { + msg_Warn( p_aout, "audio drift is too big (%"PRId64"), clearing out", + start_date - p_buffer->i_pts ); + 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 ); + p_buffer->i_flags |= BLOCK_FLAG_DISCONTINUITY; + start_date = 0; + } + else if ( start_date != 0 && + ( start_date > p_buffer->i_pts + i_pts_tolerance) ) + { + msg_Warn( p_aout, "audio drift is too big (%"PRId64"), dropping buffer", + start_date - p_buffer->i_pts ); + inputDrop( p_input, p_buffer ); return 0; } - if ( start_date == 0 ) start_date = p_buffer->start_date; + if ( start_date == 0 ) start_date = p_buffer->i_pts; +#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. * 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 ) && + ( start_date < p_buffer->i_pts - AOUT_PTS_TOLERANCE + || start_date > p_buffer->i_pts + AOUT_PTS_TOLERANCE ) && p_input->i_nb_resamplers > 0 ) { /* Can happen in several circumstances : @@ -430,7 +667,7 @@ 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; + mtime_t drift = p_buffer->i_pts - start_date; p_input->i_resamp_start_date = mdate(); p_input->i_resamp_start_drift = (int)drift; @@ -440,7 +677,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"); @@ -454,25 +691,28 @@ 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 += 1; /* Hz */ + p_input->pp_resamplers[0]->fmt_in.audio.i_rate += 2; /* Hz */ } else { - p_input->pp_resamplers[0]->input.i_rate -= 1; /* 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 == - p_input->input.i_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")", + msg_Warn( p_aout, "resampling stopped after %"PRIi64" usec " + "(drift: %"PRIi64")", mdate() - p_input->i_resamp_start_date, - p_buffer->start_date - 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 @@ -484,81 +724,125 @@ 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" ); - p_input->i_resampling_type = AOUT_RESAMPLING_NONE; - p_input->pp_resamplers[0]->input.i_rate = p_input->input.i_rate; + inputResamplingStop( p_input ); + p_buffer->i_flags |= BLOCK_FLAG_DISCONTINUITY; } } - /* 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 ) { - 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 ); } - 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 ); + if( !p_buffer ) + return 0; + if( p_buffer->i_nb_samples <= 0 ) + { + block_Release( p_buffer ); + return 0; + } +#endif + /* Adding the start date will be managed by aout_FifoPush(). */ + p_buffer->i_pts = start_date; + + aout_lock_input_fifos( p_aout ); + aout_FifoPush( p_aout, &p_input->mixer.fifo, p_buffer ); + aout_unlock_input_fifos( p_aout ); return 0; } -static int ChangeFiltersString( aout_instance_t * p_aout, - char *psz_name, vlc_bool_t b_add ) +/***************************************************************************** + * static functions + *****************************************************************************/ + +static void inputFailure( aout_instance_t * p_aout, aout_input_t * p_input, + const char * psz_error_message ) { - vlc_value_t val; - char *psz_parser; + /* error message */ + msg_Err( p_aout, "%s", psz_error_message ); - var_Get( p_aout, "audio-filter", &val ); + /* 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->mixer.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; +} - if( !val.psz_string ) val.psz_string = strdup(""); +static void inputDrop( aout_input_t *p_input, aout_buffer_t *p_buffer ) +{ + aout_BufferFree( p_buffer ); - psz_parser = strstr( val.psz_string, psz_name ); + p_input->i_buffer_lost++; +} - 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 +static void inputResamplingStop( aout_input_t *p_input ) +{ + p_input->i_resampling_type = AOUT_RESAMPLING_NONE; + if( p_input->i_nb_resamplers != 0 ) { - 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; - } + 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 vout_thread_t *RequestVout( void *p_private, + vout_thread_t *p_vout, video_format_t *p_fmt, bool b_recycle ) +{ + aout_instance_t *p_aout = p_private; + VLC_UNUSED(b_recycle); + vout_configuration_t cfg = { + .vout = p_vout, + .input = NULL, + .fmt = p_fmt, + }; + return vout_Request( p_aout, &cfg ); +} + +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; - var_Set( p_aout, "audio-filter", val ); - free( val.psz_string ); - return 1; + /* 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). */ + + return p_request->pf_request_vout( p_request->p_private, + p_vout, p_fmt, p_input->b_recycle_vout ); +} + +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, @@ -566,46 +850,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, "goom", VLC_FALSE ); - ChangeFiltersString( p_aout, "visual", VLC_FALSE ); - ChangeFiltersString( p_aout, "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, "visual", VLC_FALSE ); - ChangeFiltersString( p_aout, "goom", VLC_TRUE ); - ChangeFiltersString( p_aout, "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, "visual", VLC_FALSE ); - ChangeFiltersString( p_aout, "goom", VLC_FALSE ); - ChangeFiltersString( p_aout, "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, "goom", VLC_FALSE ); - ChangeFiltersString( p_aout, "visual", VLC_TRUE ); - ChangeFiltersString( p_aout, "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; } @@ -615,76 +894,97 @@ 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, "equalizer", VLC_FALSE ); + 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, "equalizer", VLC_TRUE ); - + var_SetString( p_aout, "equalizer-preset", psz_mode ); + 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 = VLC_TRUE; - } - } - + AoutInputsMarkToRestart( p_aout ); 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" ); + aout_lock_mixer( p_aout ); + 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) */ + if( p_aout->p_mixer ) + aout_MixerMultiplierSet( p_aout, p_aout->mixer_multiplier ); + aout_unlock_mixer( p_aout ); - /* 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->mixer.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->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->mixer.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->mixer.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 ); } +