X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Faudio_output%2Finput.c;h=d237466bec9bfadc3c475ec381c357204fd3e666;hb=e2238b5cbbc7a85ac84ee62cf6d3eb49b79905ba;hp=85d439bbcbb254e9c9afa6947e75d6628b663e07;hpb=4b9c63a36eded246ad9ef1ea0de0cf7b38d29ad9;p=vlc diff --git a/src/audio_output/input.c b/src/audio_output/input.c index 85d439bbcb..d237466bec 100644 --- a/src/audio_output/input.c +++ b/src/audio_output/input.c @@ -40,6 +40,7 @@ #include #include /* for vout_Request */ +#include #include #include @@ -223,15 +224,10 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ var_Create( p_aout, "audio-replay-gain-peak-protection", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); } - if( var_Type( p_aout, "audio-time-stretch" ) == 0 ) - { - var_Create( p_aout, "audio-time-stretch", - VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - } psz_filters = var_GetString( p_aout, "audio-filter" ); psz_visual = var_GetString( p_aout, "audio-visual"); - psz_scaletempo = var_GetBool( p_aout, "audio-time-stretch" ) ? strdup( "scaletempo" ) : NULL; + psz_scaletempo = var_InheritBool( p_aout, "audio-time-stretch" ) ? strdup( "scaletempo" ) : NULL; p_input->b_recycle_vout = psz_visual && *psz_visual; @@ -816,9 +812,11 @@ static vout_thread_t *RequestVout( void *p_private, aout_instance_t *p_aout = p_private; VLC_UNUSED(b_recycle); vout_configuration_t cfg = { - .vout = p_vout, - .input = NULL, - .fmt = p_fmt, + .vout = p_vout, + .input = NULL, + .change_fmt = true, + .fmt = p_fmt, + .dpb_size = 1, }; return vout_Request( p_aout, &cfg ); } @@ -841,8 +839,8 @@ vout_thread_t *aout_filter_RequestVout( filter_t *p_filter, static int ChangeFiltersString( aout_instance_t * p_aout, const char* psz_variable, const char *psz_name, bool b_add ) { - return AoutChangeFilterString( VLC_OBJECT(p_aout), p_aout, - psz_variable, psz_name, b_add ) ? 1 : 0; + return aout_ChangeFilterString( VLC_OBJECT(p_aout), p_aout, + psz_variable, psz_name, b_add ) ? 1 : 0; } static int VisualizationCallback( vlc_object_t *p_this, char const *psz_cmd,