/*****************************************************************************
* input.c : internal management of input streams for the audio output
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: input.c,v 1.20 2002/11/11 22:27:00 gbazin Exp $
+ * Copyright (C) 2002-2004 the VideoLAN team
+ * $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* 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.
*****************************************************************************/
/*****************************************************************************
#include <string.h>
#include <vlc/vlc.h>
+#include <vlc/input.h> /* for input_thread_t and i_pts_delay */
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#include "audio_output.h"
#include "aout_internal.h"
+static void inputFailure( aout_instance_t *, aout_input_t *, char * );
+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 * );
+
/*****************************************************************************
* 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 intermediate_format;
+ audio_sample_format_t chain_input_format;
+ audio_sample_format_t chain_output_format;
+ vlc_value_t val, text;
+ char * psz_filters, *psz_visual;
+ int i_visual;
aout_FormatPrint( p_aout, "input", &p_input->input );
+ 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;
- /* Create filters. */
- memcpy( &intermediate_format, &p_aout->mixer.mixer,
+ /* Prepare format structure */
+ memcpy( &chain_input_format, &p_input->input,
sizeof(audio_sample_format_t) );
- intermediate_format.i_rate = p_input->input.i_rate;
- if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters,
- &p_input->i_nb_filters, &p_input->input,
- &intermediate_format ) < 0 )
+ 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 )
{
- msg_Err( p_aout, "couldn't set an input pipeline" );
+ 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");
+ var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "spectrometer"; text.psz_string = _("Spectrometer");
+ var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "scope"; text.psz_string = _("Scope");
+ var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "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 )
+ {
+ val.psz_string = "goom"; text.psz_string = "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 )
+ {
+ val.psz_string = "galaktos"; text.psz_string = "GaLaktos";
+ var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text );
+ }
- aout_FifoDestroy( p_aout, &p_input->fifo );
- p_input->b_error = 1;
+ if( var_Get( p_aout, "effect-list", &val ) == VLC_SUCCESS )
+ {
+ var_Set( p_aout, "visual", val );
+ if( 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;
- return -1;
+ 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 = ""; 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 = p_config->ppsz_list[i];
+ text.psz_string = 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",
+ VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ 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 );
+ }
+
+ var_Get( p_aout, "audio-filter", &val );
+ psz_filters = val.psz_string;
+ 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_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 = NULL;
+
+ if( p_input->i_nb_filters >= AOUT_MAX_FILTERS )
+ {
+ msg_Dbg( p_aout, "max filters reached (%d)", AOUT_MAX_FILTERS );
+ break;
+ }
+
+ while( *psz_parser == ' ' && *psz_parser == ':' )
+ {
+ psz_parser++;
+ }
+ if( ( psz_next = strchr( psz_parser , ':' ) ) )
+ {
+ *psz_next++ = '\0';
+ }
+ if( *psz_parser =='\0' )
+ {
+ break;
+ }
+
+ /* Create a VLC object */
+ p_filter = vlc_object_create( p_aout, sizeof(aout_filter_t) );
+ if( p_filter == NULL )
+ {
+ msg_Err( p_aout, "cannot add user filter %s (skipped)",
+ psz_parser );
+ psz_parser = psz_next;
+ continue;
+ }
+
+ vlc_object_attach( p_filter , p_aout );
+
+ /* 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 );
+ }
+ }
+ }
+
+ /* 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;
+ }
+ }
+
+ /* 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 );
+
+ /* complete the filter chain if necessary */
+ if ( !AOUT_FMTS_IDENTICAL( &chain_input_format, &chain_output_format ) )
+ {
+ 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;
+ /* Create resamplers. */
if ( AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) )
{
p_input->i_nb_resamplers = 0;
}
else
{
- /* Create resamplers. */
- intermediate_format.i_rate = (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++;
}
+ p_input->i_nb_resamplers = 0;
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 );
- 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->i_resampling_type = AOUT_RESAMPLING_NONE;
- p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP;
- p_input->input_alloc.i_bytes_per_sec = -1;
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(
p_input->input_alloc.i_bytes_per_sec,
- p_input->input.i_bytes_per_frame
+ (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->input.i_frame_length) );
- p_input->b_error = 0;
+ /* Success */
+ p_input->b_error = VLC_FALSE;
+ p_input->b_restart = VLC_FALSE;
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;
{
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 );
+ }
+
/* 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. */
"clearing out", mdate() - 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" );
p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
- p_input->pp_resamplers[0]->input.i_rate = p_input->input.i_rate;
- p_input->pp_resamplers[0]->b_reinit = VLC_TRUE;
+ 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;
+ }
start_date = 0;
+ if( p_input->p_input_thread )
+ {
+ vlc_mutex_lock( &p_input->p_input_thread->counters.counters_lock);
+ stats_UpdateInteger( p_aout, p_input->p_input_thread->counters.p_lost_abuffers, 1, NULL );
+ vlc_mutex_unlock( &p_input->p_input_thread->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->counters.counters_lock);
+ stats_UpdateInteger( p_aout, p_input->p_input_thread->counters.p_lost_abuffers, 1, NULL );
+ vlc_mutex_unlock( &p_input->p_input_thread->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;
+ }
+ 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" );
+ 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;
+ }
+ 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 );
+ aout_BufferFree( p_buffer );
+ if( p_input->p_input_thread )
+ {
+ vlc_mutex_lock( &p_input->p_input_thread->counters.counters_lock);
+ stats_UpdateInteger( p_aout, p_input->p_input_thread->counters.p_lost_abuffers, 1, NULL );
+ vlc_mutex_unlock( &p_input->p_input_thread->counters.counters_lock);
+ }
return 0;
}
if ( start_date == 0 ) start_date = p_buffer->start_date;
/* Run pre-filters. */
+
aout_FiltersPlay( p_aout, p_input->pp_filters, p_input->i_nb_filters,
&p_buffer );
* We first need to calculate the output rate of this resampler. */
if ( ( p_input->i_resampling_type == AOUT_RESAMPLING_NONE ) &&
( start_date < p_buffer->start_date - AOUT_PTS_TOLERANCE
- || start_date > p_buffer->start_date + AOUT_PTS_TOLERANCE ) )
+ || start_date > p_buffer->start_date + AOUT_PTS_TOLERANCE ) &&
+ p_input->i_nb_resamplers > 0 )
{
/* Can happen in several circumstances :
* 1. A problem at the input (clock drift)
mtime_t drift = p_buffer->start_date - start_date;
p_input->i_resamp_start_date = mdate();
- p_input->i_resamp_start_drift = drift;
+ p_input->i_resamp_start_drift = (int)drift;
if ( drift > 0 )
p_input->i_resampling_type = AOUT_RESAMPLING_DOWN;
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
p_input->input.i_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( 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 we reduced the drift from half, then it is time to switch
p_input->i_resamp_start_drift = 0;
}
else if( p_input->i_resamp_start_drift &&
- ( abs( p_buffer->start_date - start_date ) >
+ ( abs( (int)(p_buffer->start_date - start_date) ) >
abs( p_input->i_resamp_start_drift ) * 3 / 2 ) )
{
/* If the drift is increasing and not decreasing, than something
p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
p_input->pp_resamplers[0]->input.i_rate = p_input->input.i_rate;
}
-
}
/* Adding the start date will be managed by aout_FifoPush(). */
- p_buffer->start_date = start_date;
p_buffer->end_date = start_date +
(p_buffer->end_date - p_buffer->start_date);
+ p_buffer->start_date = start_date;
/* Actually run the resampler now. */
- if ( p_aout->mixer.mixer.i_rate !=
- p_input->pp_resamplers[0]->input.i_rate )
+ if ( p_input->i_nb_resamplers > 0 )
{
aout_FiltersPlay( p_aout, p_input->pp_resamplers,
p_input->i_nb_resamplers,
return 0;
}
+
+/*****************************************************************************
+ * static functions
+ *****************************************************************************/
+
+static void inputFailure( aout_instance_t * p_aout, aout_input_t * p_input,
+ char * psz_error_message )
+{
+ /* error message */
+ msg_Err( p_aout, "couldn't set an input pipeline" );
+
+ /* 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" );
+
+ /* error flag */
+ p_input->b_error = 1;
+}
+
+static int ChangeFiltersString( aout_instance_t * p_aout, char* psz_variable,
+ 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;
+ char *psz_mode = newval.psz_string;
+ vlc_value_t val;
+ int i;
+
+ 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 );
+ }
+ 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);
+ }
+ 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 );
+ }
+ else
+ {
+ 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);
+ }
+ }
+
+ /* That sucks */
+ for( i = 0; i < p_aout->i_nb_inputs; i++ )
+ {
+ p_aout->pp_inputs[i]->b_restart = VLC_TRUE;
+ }
+
+ return VLC_SUCCESS;
+}
+
+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;
+
+ 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;
+}
projects / vlc / blobdiff