/*****************************************************************************
* input.c : internal management of input streams for the audio output
*****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN
- * $Id: input.c,v 1.43 2004/01/06 12:02:05 zorglub Exp $
+ * Copyright (C) 2002-2007 the VideoLAN team
+ * $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
*
* 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 <stdlib.h> /* calloc(), malloc(), free() */
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
-#include <vlc/input.h> /* for input_thread_t and i_pts_delay */
+
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+
+#include <vlc_input.h> /* for input_thread_t and i_pts_delay */
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#endif
+#include <vlc_aout.h>
-#include "audio_output.h"
#include "aout_internal.h"
-static int VisualizationCallback( 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 * );
+/** FIXME: Ugly but needed to access the counters */
+#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
*****************************************************************************/
int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
{
- 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;
+ int i_visual;
aout_FormatPrint( p_aout, "input", &p_input->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;
/* Prepare format structure */
- memcpy( &intermediate_format, &p_aout->mixer.mixer,
+ memcpy( &chain_input_format, &p_input->input,
sizeof(audio_sample_format_t) );
- intermediate_format.i_rate = p_input->input.i_rate;
-
- /* 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 )
- {
- memcpy ( &user_filter_format, &intermediate_format,
- sizeof(audio_sample_format_t) );
- }
-
- /* Create filters. */
- if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters,
- &p_input->i_nb_filters,
- &p_input->input,
- &user_filter_format
- ) < 0 )
- {
- msg_Err( p_aout, "couldn't set an input pipeline" );
-
- aout_FifoDestroy( p_aout, &p_input->fifo );
- p_input->b_error = 1;
- return -1;
- }
+ memcpy( &chain_output_format, &p_aout->mixer.mixer,
+ sizeof(audio_sample_format_t) );
+ 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 )
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 = "goom"; text.psz_string = _("Goom");
- var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );*/
+
+ /* Look for goom plugin */
+ if( module_Exists( VLC_OBJECT(p_aout), "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" ) )
+ {
+ 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 );
}
+ if( var_Type( p_aout, "equalizer" ) == 0 )
+ {
+ module_config_t *p_config;
+ 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 );
+
+ 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 = (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 );
+ }
+ }
+
if( var_Type( p_aout, "audio-filter" ) == 0 )
{
var_Create( p_aout, "audio-filter",
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 );
+ }
+
+ 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;
- if( psz_filters && *psz_filters )
+ var_Get( p_aout, "audio-visual", &val );
+ psz_visual = val.psz_string;
+
+ /* parse user filter lists */
+ for( i_visual = 0; i_visual < 2; i_visual++ )
{
- char *psz_parser = psz_filters;
- char *psz_next;
+ char *psz_next = NULL;
+ char *psz_parser = i_visual ? psz_visual : psz_filters;
+
+ if( psz_parser == NULL || !*psz_parser )
+ continue;
while( psz_parser && *psz_parser )
{
- aout_filter_t * p_filter;
+ aout_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';
}
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) );
if( p_filter == NULL )
}
vlc_object_attach( p_filter , p_aout );
- memcpy( &p_filter->input, &user_filter_format,
- sizeof(audio_sample_format_t) );
- memcpy( &p_filter->output, &user_filter_format,
- sizeof(audio_sample_format_t) );
- p_filter->p_module =
- module_Need( p_filter,"audio filter", psz_parser );
+ /* try to find the requested filter */
+ if( i_visual == 1 ) /* 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",
+ psz_parser, VLC_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",
+ psz_parser, VLC_TRUE );
+
+ if ( p_filter->p_module == NULL )
+ {
+ /* if the filter requested a special format, retry */
+ if ( !( AOUT_FMTS_IDENTICAL( &p_filter->input,
+ &chain_input_format )
+ && AOUT_FMTS_IDENTICAL( &p_filter->output,
+ &chain_output_format ) ) )
+ {
+ aout_FormatPrepare( &p_filter->input );
+ aout_FormatPrepare( &p_filter->output );
+ p_filter->p_module = module_Need( p_filter,
+ "audio filter",
+ psz_parser, VLC_TRUE );
+ }
+ /* try visual filters */
+ else
+ {
+ 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",
+ psz_parser, VLC_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 );
+
psz_parser = psz_next;
continue;
+ }
+ /* complete the filter chain if necessary */
+ if ( !AOUT_FMTS_IDENTICAL( &chain_input_format, &p_filter->input ) )
+ {
+ if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters,
+ &p_input->i_nb_filters,
+ &chain_input_format,
+ &p_filter->input ) < 0 )
+ {
+ msg_Err( p_aout, "cannot add user filter %s (skipped)",
+ psz_parser );
+
+ module_Unneed( p_filter, p_filter->p_module );
+ vlc_object_detach( p_filter );
+ vlc_object_destroy( p_filter );
+
+ psz_parser = psz_next;
+ continue;
+ }
}
- p_filter->b_continuity = VLC_FALSE;
+ /* success */
+ p_filter->b_continuity = VLC_FALSE;
p_input->pp_filters[p_input->i_nb_filters++] = p_filter;
+ memcpy( &chain_input_format, &p_filter->output,
+ sizeof( audio_sample_format_t ) );
/* next filter if any */
psz_parser = psz_next;
}
}
if( psz_filters ) free( psz_filters );
+ if( psz_visual ) free( psz_visual );
- /* 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.i_bytes_per_sec = -1;
- if ( AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) )
+ /* Create resamplers. */
+ if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) )
{
- p_input->i_nb_resamplers = 0;
- }
- else
- {
- /* Create resamplers. */
- intermediate_format.i_rate = (__MAX(p_input->input.i_rate,
+ chain_output_format.i_rate = (__MAX(p_input->input.i_rate,
p_aout->mixer.mixer.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.mixer.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,
+ &chain_output_format,
&p_aout->mixer.mixer ) < 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.i_alloc_type = AOUT_ALLOC_HEAP;
/* Setup the initial rate of the resampler */
p_input->pp_resamplers[0]->input.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;
aout_FiltersHintBuffers( p_aout, p_input->pp_filters,
p_input->i_nb_filters,
&p_input->input_alloc );
+ p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP;
/* i_bytes_per_sec is still == -1 if no filters */
p_input->input_alloc.i_bytes_per_sec = __MAX(
(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 = 0;
+ 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;
}
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 );
+ p_input->i_nb_resamplers = 0;
aout_FifoDestroy( p_aout, &p_input->fifo );
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;
+ if( p_input->b_restart )
+ {
+ aout_fifo_t fifo, dummy_fifo;
+ byte_t *p_first_byte_to_mix;
+
+ vlc_mutex_lock( &p_aout->mixer_lock );
+
+ /* 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;
+
+ 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;
}
* 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;
- }
+
+ inputDrop( p_aout, 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. */
+ if ( start_date != 0 &&
+ ( start_date < p_buffer->start_date - 3 * AOUT_PTS_TOLERANCE ) )
+ {
+ msg_Warn( p_aout, "audio drift is too big ("I64Fd"), clearing out",
+ start_date - p_buffer->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 );
+ if ( p_input->i_resampling_type != AOUT_RESAMPLING_NONE )
+ msg_Warn( p_aout, "timing screwed, stopping resampling" );
+ inputResamplingStop( p_input );
+ start_date = 0;
+ }
+ else if ( start_date != 0 &&
+ ( start_date > p_buffer->start_date + 3 * AOUT_PTS_TOLERANCE ) )
+ {
+ msg_Warn( p_aout, "audio drift is too big ("I64Fd"), dropping buffer",
+ start_date - p_buffer->start_date );
+ 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. */
if( p_input->i_resampling_type == AOUT_RESAMPLING_UP )
{
- p_input->pp_resamplers[0]->input.i_rate += 10; /* Hz */
+ p_input->pp_resamplers[0]->input.i_rate += 2; /* Hz */
}
else
{
- p_input->pp_resamplers[0]->input.i_rate -= 10; /* Hz */
+ p_input->pp_resamplers[0]->input.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 )
+ 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",
- mdate() - p_input->i_resamp_start_date );
+ msg_Warn( p_aout, "resampling stopped after "I64Fi" usec "
+ "(drift: "I64Fi")",
+ mdate() - p_input->i_resamp_start_date,
+ p_buffer->start_date - start_date);
}
else if( abs( (int)(p_buffer->start_date - start_date) ) <
abs( p_input->i_resamp_start_drift ) / 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 );
}
}
- /* 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;
}
+/*****************************************************************************
+ * static functions
+ *****************************************************************************/
+
+static void inputFailure( aout_instance_t * p_aout, aout_input_t * p_input,
+ const char * psz_error_message )
+{
+ /* error message */
+ msg_Err( p_aout, "%s", psz_error_message );
+
+ /* 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->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;
+}
+
+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 )
+{
+ vlc_value_t val;
+ char *psz_parser;
+
+ var_Get( p_aout, psz_variable, &val );
+
+ if( !val.psz_string ) val.psz_string = strdup("");
+
+ psz_parser = strstr( val.psz_string, psz_name );
+
+ 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
+ {
+ 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;
+ }
+ }
+
+ var_Set( p_aout, psz_variable, val );
+ free( val.psz_string );
+ return 1;
+}
+
static int VisualizationCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
aout_instance_t *p_aout = (aout_instance_t *)p_this;
- vlc_value_t val;
char *psz_mode = newval.psz_string;
- char *psz_filter;
-
- var_Get( p_aout, "audio-filter", &val );
- psz_filter = val.psz_string;
+ vlc_value_t val;
+ int i;
+ (void)psz_cmd; (void)oldval; (void)p_data;
if( !psz_mode || !*psz_mode )
{
- val.psz_string = "";
- var_Set( p_aout, "audio-filter", val );
+ ChangeFiltersString( p_aout, "audio-visual", "goom", VLC_FALSE );
+ ChangeFiltersString( p_aout, "audio-visual", "visual", VLC_FALSE );
+ ChangeFiltersString( p_aout, "audio-visual", "galaktos", VLC_FALSE );
}
else
{
- if( !psz_filter || !*psz_filter )
+ 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);
+ }
+ else if( !strcmp( "galaktos", psz_mode ) )
{
- val.psz_string = "visual";
- var_Set( p_aout, "audio-filter", val );
+ ChangeFiltersString( p_aout, "audio-visual", "visual", VLC_FALSE );
+ ChangeFiltersString( p_aout, "audio-visual", "goom", VLC_FALSE );
+ ChangeFiltersString( p_aout, "audio-visual", "galaktos", VLC_TRUE );
}
else
{
- if( strstr( psz_filter, "visual" ) == NULL )
- {
- psz_filter = realloc( psz_filter, strlen( psz_filter ) + 20 );
- strcat( psz_filter, ",visual" );
- }
- val.psz_string = psz_filter;
- var_Set( p_aout, "audio-filter", val );
+ val.psz_string = psz_mode;
+ 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);
}
}
- if( psz_mode && *psz_mode )
+ /* That sucks */
+ for( i = 0; i < p_aout->i_nb_inputs; i++ )
{
- vlc_value_t val;
- val.psz_string = psz_mode;
- var_Create( p_aout, "effect-list", VLC_VAR_STRING );
- var_Set( p_aout, "effect-list", val);
+ p_aout->pp_inputs[i]->b_restart = VLC_TRUE;
}
- if( psz_filter ) free( psz_filter );
+ return VLC_SUCCESS;
+}
- aout_Restart( p_aout );
+static int EqualizerCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ 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, "audio-filter", "equalizer",
+ VLC_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, "audio-filter", "equalizer",
+ VLC_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;
+ }
+ }
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;
+ 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" );
+ 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] );
- /* Not specified => let the main pipeline do the mixing */
- if ( ! psz_name ) return NULL;
+ /* 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 );
- /* 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->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;
- /* 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 );
- 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->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 )
{
- 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->f_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 );
}
+
projects / vlc / blobdiff