X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Finput.c;h=e78c49b8b090e54cf04fad70c6487d077c2b6b11;hb=8c75d5edd5a0fcf8d3556aad868fdb569cea6e47;hp=121b8f426375d0f48d2c0ec1cdcd78089e771181;hpb=b2108b39f8c3a590c879de982fc0c4da88bed4bd;p=vlc diff --git a/src/audio_output/input.c b/src/audio_output/input.c index 121b8f4263..e78c49b8b0 100644 --- a/src/audio_output/input.c +++ b/src/audio_output/input.c @@ -29,7 +29,7 @@ # include "config.h" #endif -#include +#include #include #include @@ -99,6 +99,8 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text ); 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 */ if( module_Exists( VLC_OBJECT(p_aout), "goom" ) ) @@ -244,7 +246,9 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) } /* Create a VLC object */ - p_filter = vlc_object_create( p_aout, sizeof(aout_filter_t) ); + 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)", @@ -265,7 +269,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) sizeof(audio_sample_format_t) ); p_filter->p_module = module_Need( p_filter, "visualization", - psz_parser, VLC_TRUE ); + psz_parser, true ); } else /* this can be a audio filter module as well as a visualization module */ { @@ -276,7 +280,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) sizeof(audio_sample_format_t) ); p_filter->p_module = module_Need( p_filter, "audio filter", - psz_parser, VLC_TRUE ); + psz_parser, true ); if ( p_filter->p_module == NULL ) { @@ -290,7 +294,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) aout_FormatPrepare( &p_filter->output ); p_filter->p_module = module_Need( p_filter, "audio filter", - psz_parser, VLC_TRUE ); + psz_parser, true ); } /* try visual filters */ else @@ -301,7 +305,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) sizeof(audio_sample_format_t) ); p_filter->p_module = module_Need( p_filter, "visualization", - psz_parser, VLC_TRUE ); + psz_parser, true ); } } } @@ -313,7 +317,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) psz_parser ); vlc_object_detach( p_filter ); - vlc_object_destroy( p_filter ); + vlc_object_release( p_filter ); psz_parser = psz_next; continue; @@ -332,7 +336,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) module_Unneed( p_filter, p_filter->p_module ); vlc_object_detach( p_filter ); - vlc_object_destroy( p_filter ); + vlc_object_release( p_filter ); psz_parser = psz_next; continue; @@ -340,7 +344,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) } /* success */ - p_filter->b_continuity = VLC_FALSE; + 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 ) ); @@ -349,8 +353,8 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) psz_parser = psz_next; } } - if( psz_filters ) free( psz_filters ); - if( psz_visual ) free( psz_visual ); + free( psz_filters ); + free( psz_visual ); /* complete the filter chain if necessary */ if ( !AOUT_FMTS_IDENTICAL( &chain_input_format, &chain_output_format ) ) @@ -399,6 +403,21 @@ 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]; + } + aout_FiltersHintBuffers( p_aout, p_input->pp_filters, p_input->i_nb_filters, &p_input->input_alloc ); @@ -414,8 +433,8 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input ) ReplayGainSelect( p_aout, p_input ); /* Success */ - p_input->b_error = VLC_FALSE; - p_input->b_restart = VLC_FALSE; + p_input->b_error = false; + p_input->b_restart = false; p_input->i_last_input_rate = INPUT_RATE_DEFAULT; return 0; @@ -456,7 +475,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, if( p_input->b_restart ) { aout_fifo_t fifo, dummy_fifo; - byte_t *p_first_byte_to_mix; + uint8_t *p_first_byte_to_mix; vlc_mutex_lock( &p_aout->mixer_lock ); @@ -473,7 +492,7 @@ 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 ) + if( i_input_rate != INPUT_RATE_DEFAULT && p_input->p_playback_rate_filter == NULL ) { inputDrop( p_aout, p_input, p_buffer ); return 0; @@ -500,10 +519,10 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, } #endif - /* Handle input rate change by modifying resampler input rate */ + /* Handle input rate change, but keep drift correction */ if( i_input_rate != p_input->i_last_input_rate ) { - unsigned int * const pi_rate = &p_input->pp_resamplers[0]->input.i_rate; + unsigned int * const pi_rate = &p_input->p_playback_rate_filter->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); @@ -523,7 +542,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 ); @@ -539,7 +558,7 @@ 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 ); inputDrop( p_aout, p_input, p_buffer ); @@ -549,10 +568,11 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, /* 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->start_date - 3 * AOUT_PTS_TOLERANCE ) ) + ( start_date < p_buffer->start_date - i_pts_tolerance ) ) { - msg_Warn( p_aout, "audio drift is too big ("I64Fd"), clearing out", + 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 ); @@ -564,9 +584,9 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, start_date = 0; } else if ( start_date != 0 && - ( start_date > p_buffer->start_date + 3 * AOUT_PTS_TOLERANCE ) ) + ( start_date > p_buffer->start_date + i_pts_tolerance) ) { - msg_Warn( p_aout, "audio drift is too big ("I64Fd"), dropping buffer", + 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; @@ -604,7 +624,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"); @@ -627,11 +647,15 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, /* Check if everything is back to normal, in which case we can stop the * resampling */ - if( p_input->pp_resamplers[0]->input.i_rate == 1000 * p_input->input.i_rate / i_input_rate ) + unsigned int i_nominal_rate = + (p_input->pp_resamplers[0] == p_input->p_playback_rate_filter) + ? INPUT_RATE_DEFAULT * p_input->input.i_rate / i_input_rate + : p_input->input.i_rate; + if( p_input->pp_resamplers[0]->input.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); } @@ -731,14 +755,16 @@ static void inputResamplingStop( aout_input_t *p_input ) p_input->i_resampling_type = AOUT_RESAMPLING_NONE; if( p_input->i_nb_resamplers != 0 ) { - p_input->pp_resamplers[0]->input.i_rate = INPUT_RATE_DEFAULT * - p_input->input.i_rate / p_input->i_last_input_rate; - p_input->pp_resamplers[0]->b_continuity = VLC_FALSE; + p_input->pp_resamplers[0]->input.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; + p_input->pp_resamplers[0]->b_continuity = false; } } static int ChangeFiltersString( aout_instance_t * p_aout, const char* psz_variable, - const char *psz_name, vlc_bool_t b_add ) + const char *psz_name, bool b_add ) { vlc_value_t val; char *psz_parser; @@ -794,23 +820,23 @@ static int VisualizationCallback( vlc_object_t *p_this, char const *psz_cmd, if( !psz_mode || !*psz_mode ) { - ChangeFiltersString( p_aout, "audio-visual", "goom", VLC_FALSE ); - ChangeFiltersString( p_aout, "audio-visual", "visual", VLC_FALSE ); - ChangeFiltersString( p_aout, "audio-visual", "galaktos", VLC_FALSE ); + ChangeFiltersString( 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 ) ) { - ChangeFiltersString( p_aout, "audio-visual", "visual", VLC_FALSE ); - ChangeFiltersString( p_aout, "audio-visual", "goom", VLC_TRUE ); - ChangeFiltersString( p_aout, "audio-visual", "galaktos", VLC_FALSE); + 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", VLC_FALSE ); - ChangeFiltersString( p_aout, "audio-visual", "goom", VLC_FALSE ); - ChangeFiltersString( p_aout, "audio-visual", "galaktos", VLC_TRUE ); + ChangeFiltersString( p_aout, "audio-visual", "visual", false ); + ChangeFiltersString( p_aout, "audio-visual", "goom", false ); + ChangeFiltersString( p_aout, "audio-visual", "galaktos", true ); } else { @@ -818,16 +844,16 @@ 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 ); - ChangeFiltersString( p_aout, "audio-visual", "goom", VLC_FALSE ); - ChangeFiltersString( p_aout, "audio-visual", "visual", VLC_TRUE ); - ChangeFiltersString( p_aout, "audio-visual", "galaktos", VLC_FALSE); + ChangeFiltersString( p_aout, "audio-visual", "goom", false ); + ChangeFiltersString( p_aout, "audio-visual", "visual", true ); + ChangeFiltersString( p_aout, "audio-visual", "galaktos", false); } } /* 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; @@ -846,7 +872,7 @@ static int EqualizerCallback( vlc_object_t *p_this, char const *psz_cmd, if( !psz_mode || !*psz_mode ) { i_ret = ChangeFiltersString( p_aout, "audio-filter", "equalizer", - VLC_FALSE ); + false ); } else { @@ -854,7 +880,7 @@ static int EqualizerCallback( vlc_object_t *p_this, char const *psz_cmd, var_Create( p_aout, "equalizer-preset", VLC_VAR_STRING ); var_Set( p_aout, "equalizer-preset", val ); i_ret = ChangeFiltersString( p_aout, "audio-filter", "equalizer", - VLC_TRUE ); + true ); } @@ -863,7 +889,7 @@ static int EqualizerCallback( vlc_object_t *p_this, char const *psz_cmd, { 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; } }