* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <stdio.h>
-#include <stdlib.h> /* calloc(), malloc(), free() */
#include <string.h>
+#include <math.h>
#include <vlc_input.h> /* for input_thread_t and i_pts_delay */
#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
*****************************************************************************/
/* 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 = "spectrometer"; text.psz_string = _("Spectrometer");
+ 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 );
/* 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 */
- p_module = config_FindModule( VLC_OBJECT(p_aout), "galaktos" );
- if( p_module )
+ if( module_Exists( VLC_OBJECT(p_aout), "galaktos" ) )
{
- val.psz_string = "galaktos"; text.psz_string = "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 );
}
text.psz_string = _("Equalizer");
var_Change( p_aout, "equalizer", VLC_VAR_SETTEXT, &text, NULL );
- val.psz_string = ""; text.psz_string = _("Disable");
+ 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++ )
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;
var_Get( p_aout, "audio-visual", &val );
psz_parser );
vlc_object_detach( p_filter );
- vlc_object_destroy( p_filter );
+ vlc_object_release( p_filter );
psz_parser = psz_next;
continue;
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;
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 ) )
* p_input->input.i_rate
/ p_input->input.i_frame_length) );
+ ReplayGainSelect( p_aout, p_input );
+
/* Success */
p_input->b_error = VLC_FALSE;
p_input->b_restart = VLC_FALSE;
+ p_input->i_last_input_rate = INPUT_RATE_DEFAULT;
return 0;
}
*****************************************************************************
* 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;
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. */
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;
- if( p_input->p_input_thread )
- {
- 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);
- }
}
if ( p_buffer->start_date < mdate() + AOUT_MIN_PREPARE_TIME )
* 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 );
- if( p_input->p_input_thread )
- {
- 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);
- }
- 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;
}
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;
}
else if ( start_date != 0 &&
{
msg_Warn( p_aout, "audio drift is too big ("I64Fd"), dropping buffer",
start_date - p_buffer->start_date );
- aout_BufferFree( p_buffer );
- if( p_input->p_input_thread )
- {
- 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);
- }
+ 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. */
/* 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 "
/* 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 )
{
&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;
}
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 = VLC_FALSE;
+ }
+}
+
static int ChangeFiltersString( aout_instance_t * p_aout, const char* psz_variable,
const char *psz_name, vlc_bool_t b_add )
{
return VLC_SUCCESS;
}
+
+static int ReplayGainCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ 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;
+
+ 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] );
+
+ /* 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 );
+
+ 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;
+
+ /* 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] )
+ {
+ for( i_use = 0; i_use < AUDIO_REPLAY_GAIN_MAX; i_use++ )
+ {
+ if( p_input->replay_gain.pb_gain[i_use] )
+ break;
+ }
+ }
+
+ /* */
+ 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 )
+ {
+ p_input->f_multiplier = 1.0f / p_input->replay_gain.pf_peak[i_use];
+ }
+
+ free( psz_replay_gain );
+}
+
projects / vlc / blobdiff