X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Finput.c;h=627ec926a7efb515e02a9610b0dd8db17ced7d01;hb=39328ae6ada45ef13ebe9c0b63b4959a5acf2aae;hp=24de3d31c9a9eafaedbe74e4a50fde50ea6dfa04;hpb=a56b8f9c5973dd145f91991dd8ae7f3cba04e854;p=vlc diff --git a/src/audio_output/input.c b/src/audio_output/input.c index 24de3d31c9..627ec926a7 100644 --- a/src/audio_output/input.c +++ b/src/audio_output/input.c @@ -36,23 +36,22 @@ #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 "aout_internal.h" -/** FIXME: Ugly but needed to access the counters */ -#include "input/input_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_instance_t *, aout_input_t *, aout_buffer_t * ); +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 *, @@ -62,15 +61,21 @@ static int EqualizerCallback( vlc_object_t *, char const *, 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 ); +static vout_thread_t *RequestVoutFromFilter( 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 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 ); @@ -78,14 +83,23 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_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; + aout_FifoInit( p_aout, &p_input->mixer.fifo, p_aout->p_mixer->fmt.i_rate ); + p_input->mixer.begin = 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 = p_aout->p_mixer->fmt; chain_output_format.i_rate = p_input->input.i_rate; aout_FormatPrepare( &chain_output_format ); @@ -107,22 +121,29 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) 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 = (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" ) ) + if( module_exists( "galaktos" ) ) { val.psz_string = (char*)"galaktos"; text.psz_string = (char*)"GaLaktos"; var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text ); } + /* Look for libprojectM plugin */ + if( module_exists( "projectm" ) ) + { + 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 ); + var_SetString( p_aout, "visual", val.psz_string ); free( val.psz_string ); } var_AddCallback( p_aout, "visual", VisualizationCallback, NULL ); @@ -211,17 +232,26 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) 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; - var_Get( p_aout, "audio-filter", &val ); - psz_filters = val.psz_string; - var_Get( p_aout, "audio-visual", &val ); - psz_visual = val.psz_string; + 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; @@ -261,29 +291,32 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) continue; } + vlc_object_set_name( p_filter, psz_parser ); vlc_object_attach( p_filter , p_aout ); + p_filter->request_vout.pf_request_vout = RequestVoutFromFilter; + p_filter->request_vout.p_private = p_input; + + 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->input, &chain_output_format, + sizeof(audio_sample_format_t) ); + memcpy( &p_filter->output, &chain_output_format, + sizeof(audio_sample_format_t) ); + + /* 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", + 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", + p_filter->p_module = module_need( p_filter, "audio filter", psz_parser, true ); if ( p_filter->p_module == NULL ) @@ -296,7 +329,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) { aout_FormatPrepare( &p_filter->input ); aout_FormatPrepare( &p_filter->output ); - p_filter->p_module = module_Need( p_filter, + p_filter->p_module = module_need( p_filter, "audio filter", psz_parser, true ); } @@ -307,7 +340,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) 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, + p_filter->p_module = module_need( p_filter, "visualization", psz_parser, true ); } @@ -320,6 +353,7 @@ 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 ); + free( p_filter->p_owner ); vlc_object_detach( p_filter ); vlc_object_release( p_filter ); @@ -338,7 +372,8 @@ 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 ); - module_Unneed( p_filter, p_filter->p_module ); + module_unneed( p_filter, p_filter->p_module ); + free( p_filter->p_owner ); vlc_object_detach( p_filter ); vlc_object_release( p_filter ); @@ -353,12 +388,16 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) memcpy( &chain_input_format, &p_filter->output, 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; } } - free( psz_filters ); 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 ) ) @@ -378,12 +417,12 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) 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( &p_aout->p_mixer->fmt ) ) { chain_output_format.i_rate = (__MAX(p_input->input.i_rate, - p_aout->mixer.mixer.i_rate) + p_aout->p_mixer->fmt.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 == p_aout->p_mixer->fmt.i_rate ) { /* Just in case... */ chain_output_format.i_rate++; @@ -391,7 +430,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_resamplers, &p_input->i_nb_resamplers, &chain_output_format, - &p_aout->mixer.mixer ) < 0 ) + &p_aout->p_mixer->fmt ) < 0 ) { inputFailure( p_aout, p_input, "couldn't set a resampler pipeline"); return -1; @@ -407,16 +446,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) } p_input->i_resampling_type = AOUT_RESAMPLING_NONE; - p_input->p_playback_rate_filter = NULL; - for( int i = 0; i < p_input->i_nb_filters; i++ ) - { - aout_filter_t *p_filter = p_input->pp_filters[i]; - if( strcmp( "scaletempo", p_filter->psz_object_name ) == 0 ) - { - p_input->p_playback_rate_filter = p_filter; - break; - } - } if( ! p_input->p_playback_rate_filter && p_input->i_nb_resamplers > 0 ) { p_input->p_playback_rate_filter = p_input->pp_resamplers[0]; @@ -452,7 +481,16 @@ 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 ) { AOUT_ASSERT_MIXER_LOCKED; - if ( p_input->b_error ) return 0; + 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 ); @@ -460,7 +498,7 @@ int aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input ) 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 ); + aout_FifoDestroy( p_aout, &p_input->mixer.fifo ); return 0; } @@ -480,21 +518,30 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, if( p_input->b_restart ) { - aout_fifo_t fifo, dummy_fifo; + aout_fifo_t fifo; uint8_t *p_first_byte_to_mix; + bool b_paused; + mtime_t i_pause_date; aout_lock_mixer( p_aout ); aout_lock_input_fifos( p_aout ); - /* 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; + /* A little trick to avoid loosing our input fifo and properties */ + + p_first_byte_to_mix = p_input->mixer.begin; + fifo = p_input->mixer.fifo; + b_paused = p_input->b_paused; + i_pause_date = p_input->i_pause_date; + + aout_FifoInit( p_aout, &p_input->mixer.fifo, p_aout->p_mixer->fmt.i_rate ); + 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_InputNew( p_aout, p_input, &p_input->request_vout ); + p_input->mixer.begin = p_first_byte_to_mix; + p_input->mixer.fifo = fifo; + p_input->b_paused = b_paused; + p_input->i_pause_date = i_pause_date; aout_unlock_input_fifos( p_aout ); aout_unlock_mixer( p_aout ); @@ -502,7 +549,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, if( i_input_rate != INPUT_RATE_DEFAULT && p_input->p_playback_rate_filter == NULL ) { - inputDrop( p_aout, p_input, p_buffer ); + inputDrop( p_input, p_buffer ); return 0; } @@ -542,7 +589,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, * this. We'll deal with that when pushing the buffer, and compensate * with the next incoming buffer. */ aout_lock_input_fifos( p_aout ); - start_date = aout_FifoNextStart( p_aout, &p_input->fifo ); + start_date = aout_FifoNextStart( p_aout, &p_input->mixer.fifo ); aout_unlock_input_fifos( p_aout ); if ( start_date != 0 && start_date < mdate() ) @@ -553,8 +600,8 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, msg_Warn( p_aout, "computed PTS is out of range (%"PRId64"), " "clearing out", mdate() - start_date ); aout_lock_input_fifos( p_aout ); - aout_FifoSet( p_aout, &p_input->fifo, 0 ); - p_input->p_first_byte_to_mix = NULL; + 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" ); @@ -569,7 +616,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, msg_Warn( p_aout, "PTS is out of range (%"PRId64"), dropping buffer", mdate() - p_buffer->start_date ); - inputDrop( p_aout, p_input, p_buffer ); + inputDrop( p_input, p_buffer ); inputResamplingStop( p_input ); return 0; } @@ -583,8 +630,8 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, msg_Warn( p_aout, "audio drift is too big (%"PRId64"), clearing out", start_date - p_buffer->start_date ); aout_lock_input_fifos( p_aout ); - aout_FifoSet( p_aout, &p_input->fifo, 0 ); - p_input->p_first_byte_to_mix = NULL; + 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" ); @@ -596,7 +643,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, { 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 ); + inputDrop( p_input, p_buffer ); return 0; } @@ -711,7 +758,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, p_buffer->start_date = start_date; aout_lock_input_fifos( p_aout ); - aout_FifoPush( p_aout, &p_input->fifo, p_buffer ); + aout_FifoPush( p_aout, &p_input->mixer.fifo, p_buffer ); aout_unlock_input_fifos( p_aout ); return 0; } @@ -731,7 +778,7 @@ static void inputFailure( aout_instance_t * p_aout, aout_input_t * p_input, 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 ); + aout_FifoDestroy( p_aout, &p_input->mixer.fifo ); var_Destroy( p_aout, "visual" ); var_Destroy( p_aout, "equalizer" ); var_Destroy( p_aout, "audio-filter" ); @@ -746,16 +793,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 ) @@ -771,6 +813,24 @@ static void inputResamplingStop( aout_input_t *p_input ) } } +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); + return vout_Request( p_aout, p_vout, p_fmt ); +} + +static vout_thread_t *RequestVoutFromFilter( void *p_private, + vout_thread_t *p_vout, video_format_t *p_fmt, bool b_recycle ) +{ + aout_input_t *p_input = p_private; + aout_request_vout_t *p_request = &p_input->request_vout; + + return p_request->pf_request_vout( p_request->p_private, + p_vout, p_fmt, p_input->b_recycle_vout && b_recycle ); +} + static int ChangeFiltersString( aout_instance_t * p_aout, const char* psz_variable, const char *psz_name, bool b_add ) { @@ -783,7 +843,6 @@ 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; (void)psz_cmd; (void)oldval; (void)p_data; if( !psz_mode || !*psz_mode ) @@ -791,6 +850,7 @@ static int VisualizationCallback( vlc_object_t *p_this, char const *psz_cmd, ChangeFiltersString( p_aout, "audio-visual", "goom", false ); ChangeFiltersString( p_aout, "audio-visual", "visual", false ); ChangeFiltersString( p_aout, "audio-visual", "galaktos", false ); + ChangeFiltersString( p_aout, "audio-visual", "projectm", false ); } else { @@ -798,7 +858,8 @@ static int VisualizationCallback( vlc_object_t *p_this, char const *psz_cmd, { ChangeFiltersString( p_aout, "audio-visual", "visual", false ); ChangeFiltersString( p_aout, "audio-visual", "goom", true ); - ChangeFiltersString( p_aout, "audio-visual", "galaktos", false); + ChangeFiltersString( p_aout, "audio-visual", "galaktos", false ); + ChangeFiltersString( p_aout, "audio-visual", "projectm", false ); } else if( !strcmp( "galaktos", psz_mode ) ) { @@ -806,15 +867,22 @@ static int VisualizationCallback( vlc_object_t *p_this, char const *psz_cmd, ChangeFiltersString( p_aout, "audio-visual", "goom", false ); ChangeFiltersString( p_aout, "audio-visual", "galaktos", true ); } + else if( !strcmp( "projectm", psz_mode ) ) + { + ChangeFiltersString( p_aout, "audio-visual", "visual", false ); + ChangeFiltersString( p_aout, "audio-visual", "goom", false ); + ChangeFiltersString( p_aout, "audio-visual", "galaktos", 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, "audio-visual", "goom", false ); ChangeFiltersString( p_aout, "audio-visual", "visual", true ); - ChangeFiltersString( p_aout, "audio-visual", "galaktos", false); + ChangeFiltersString( p_aout, "audio-visual", "galaktos", false ); + ChangeFiltersString( p_aout, "audio-visual", "projectm", false ); } } @@ -829,7 +897,6 @@ 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_ret; (void)psz_cmd; (void)oldval; (void)p_data; @@ -840,12 +907,10 @@ static int EqualizerCallback( vlc_object_t *p_this, char const *psz_cmd, } else { - val.psz_string = psz_mode; var_Create( p_aout, "equalizer-preset", VLC_VAR_STRING ); - var_Set( p_aout, "equalizer-preset", val ); + var_SetString( p_aout, "equalizer-preset", psz_mode ); i_ret = ChangeFiltersString( p_aout, "audio-filter", "equalizer", true ); - } /* That sucks */ @@ -867,7 +932,8 @@ static int ReplayGainCallback( vlc_object_t *p_this, char const *psz_cmd, ReplayGainSelect( p_aout, p_aout->pp_inputs[i] ); /* Restart the mixer (a trivial mixer may be in use) */ - aout_MixerMultiplierSet( p_aout, p_aout->mixer.f_multiplier ); + if( p_aout->p_mixer ) + aout_MixerMultiplierSet( p_aout, p_aout->mixer_multiplier ); aout_unlock_mixer( p_aout ); return VLC_SUCCESS; @@ -881,7 +947,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->mixer.multiplier = 1.0; if( !psz_replay_gain ) return; @@ -912,14 +978,14 @@ 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->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->f_multiplier > 1.0 ) + p_input->replay_gain.pf_peak[i_use] * p_input->mixer.multiplier > 1.0 ) { - p_input->f_multiplier = 1.0f / p_input->replay_gain.pf_peak[i_use]; + p_input->mixer.multiplier = 1.0f / p_input->replay_gain.pf_peak[i_use]; } free( psz_replay_gain );