* input.c : internal management of input streams for the audio output
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: input.c,v 1.31 2003/01/26 13:37:09 gbazin Exp $
+ * $Id: input.c,v 1.39 2003/11/02 06:33:49 hartman Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
#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 int VisualizationCallback( 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, headphone_intermediate_format;
- aout_filter_t * p_headphone_filter;
- vlc_bool_t b_use_headphone_filter = VLC_FALSE;
+ audio_sample_format_t intermediate_format;
+ vlc_value_t val, text;
+ char * psz_filters;
aout_FormatPrint( p_aout, "input", &p_input->input );
sizeof(audio_sample_format_t) );
intermediate_format.i_rate = p_input->input.i_rate;
- /* Headphone filter add-ons. */
- memcpy( &headphone_intermediate_format, &p_aout->mixer.mixer,
- sizeof(audio_sample_format_t) );
- headphone_intermediate_format.i_rate = p_input->input.i_rate;
- if ( config_GetInt( p_aout , "headphone" ) )
- {
- /* Do we use heaphone filter ? */
- if ( intermediate_format.i_physical_channels
- == ( AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT )
- && ( intermediate_format.i_format != VLC_FOURCC('f','l','3','2')
- || intermediate_format.i_format != VLC_FOURCC('f','i','3','2')
- ) )
- {
- b_use_headphone_filter = VLC_TRUE;
- }
- }
- if ( b_use_headphone_filter == VLC_TRUE )
- {
- /* Split the filter pipeline. */
- headphone_intermediate_format.i_physical_channels = p_input->input.i_physical_channels;
- headphone_intermediate_format.i_original_channels = p_input->input.i_original_channels;
- headphone_intermediate_format.i_bytes_per_frame =
- headphone_intermediate_format.i_bytes_per_frame
- * aout_FormatNbChannels( &headphone_intermediate_format )
- / aout_FormatNbChannels( &intermediate_format );
- }
-
/* Create filters. */
if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters,
- &p_input->i_nb_filters, &p_input->input,
- &headphone_intermediate_format ) < 0 )
+ &p_input->i_nb_filters,
+ &p_input->input,
+ &intermediate_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;
}
- /* Headphone filter add-ons. */
- if ( b_use_headphone_filter == VLC_TRUE )
+ /* Now add user filters */
+ if( ( psz_filters = config_GetPsz( p_aout , "audio-filter" ) ) )
{
- /* create a vlc object */
- p_headphone_filter = vlc_object_create( p_aout
- , sizeof(aout_filter_t) );
- if ( p_headphone_filter == NULL )
+ char *psz_parser = psz_filters;
+ char *psz_next;
+ audio_sample_format_t format_in, format_out;
+
+ memcpy( &format_in, &p_aout->mixer.mixer,
+ sizeof( audio_sample_format_t ) );
+ memcpy( &format_out,&p_aout->mixer.mixer,
+ sizeof( audio_sample_format_t ) );
+
+ format_in.i_rate = p_input->input.i_rate;
+ format_out.i_rate = p_input->input.i_rate;
+
+ while( psz_parser && *psz_parser )
{
- msg_Err( p_aout, "couldn't open the headphone virtual spatialization module" );
- aout_FifoDestroy( p_aout, &p_input->fifo );
- p_input->b_error = 1;
- return -1;
+ aout_filter_t * p_filter;
+
+ if( p_input->i_nb_filters >= AOUT_MAX_FILTERS )
+ {
+ msg_Dbg( p_aout, "max filter 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;
+ }
+
+ 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 )
+ {
+ msg_Err( p_aout, "cannot add user filter %s (skipped)",
+ psz_parser );
+ psz_parser = psz_next;
+ continue;
+ }
+
+ vlc_object_attach( p_filter , p_aout );
+ memcpy( &p_filter->input, &format_in,
+ sizeof(audio_sample_format_t) );
+ memcpy( &p_filter->output, &format_out,
+ sizeof(audio_sample_format_t) );
+
+ p_filter->p_module =
+ module_Need( p_filter,"audio filter", psz_parser );
+
+ 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;
+
+ }
+ p_filter->b_continuity = VLC_FALSE;
+
+ p_input->pp_filters[p_input->i_nb_filters++] = p_filter;
+
+ /* next filter if any */
+ psz_parser = psz_next;
}
- vlc_object_attach( p_headphone_filter, p_aout );
-
- /* find the headphone filter */
- memcpy( &p_headphone_filter->input, &headphone_intermediate_format
- , sizeof(audio_sample_format_t) );
- memcpy( &p_headphone_filter->output, &intermediate_format
- , sizeof(audio_sample_format_t) );
- p_headphone_filter->p_module = module_Need( p_headphone_filter, "audio filter"
- , "headphone" );
- if ( p_headphone_filter->p_module == NULL )
- {
- vlc_object_detach( p_headphone_filter );
- vlc_object_destroy( p_headphone_filter );
+ free( psz_filters );
+ }
+
+ 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 = "random"; text.psz_string = _("Random");
+ 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 );
+ val.psz_string = "goom"; text.psz_string = _("Goom");
+ 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 );
+ }
+ var_AddCallback( p_aout, "visual", VisualizationCallback, NULL );
- msg_Err( p_aout, "couldn't open the headphone virtual spatialization module" );
- aout_FifoDestroy( p_aout, &p_input->fifo );
- p_input->b_error = 1;
- return -1;
- }
- /* success */
- p_headphone_filter->b_reinit = VLC_TRUE;
- p_input->pp_filters[p_input->i_nb_filters++] = p_headphone_filter;
+ var_Create( p_aout, "audio-filter", VLC_VAR_STRING );
+ text.psz_string = _("Audio filters");
+ var_Change( p_aout, "audio-filter", VLC_VAR_SETTEXT, &text, NULL );
+ var_Change( p_aout, "audio-filter", VLC_VAR_INHERITVALUE, &val, NULL );
+ if( var_Get( p_aout, "audio-filter", &val ) == VLC_SUCCESS )
+ {
+ var_Set( p_aout, "audio-filter", val );
}
+ //var_AddCallback( p_aout, "audio-filter", AudioFilterCallback, NULL );
/* Prepare hints for the buffer allocator. */
p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP;
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 );
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_reinit = VLC_TRUE;
+ p_input->pp_resamplers[0]->b_continuity = VLC_FALSE;
}
start_date = 0;
}
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;
+ }
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 );
p_buffer->start_date = start_date;
/* Actually run the resampler now. */
- if ( p_input->i_nb_resamplers > 0 && 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 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;
+ input_thread_t *p_input;
+ vlc_value_t val;
+
+ char *psz_mode = newval.psz_string;
+ char *psz_filter;
+ unsigned int i;
+
+ psz_filter = config_GetPsz( p_aout, "audio-filter" );
+
+ if( !psz_mode || !*psz_mode )
+ {
+ config_PutPsz( p_aout, "audio-filter", "" );
+ }
+ else
+ {
+ if( !psz_filter || !*psz_filter )
+ {
+ config_PutPsz( p_aout, "audio-filter", "visual" );
+ }
+ else
+ {
+ if( strstr( psz_filter, "visual" ) == NULL )
+ {
+ psz_filter = realloc( psz_filter, strlen( psz_filter ) + 20 );
+ strcat( psz_filter, ",visual" );
+ }
+ config_PutPsz( p_aout, "audio-filter", psz_filter );
+ }
+ }
+
+ if( psz_mode && *psz_mode )
+ {
+ config_PutPsz( p_aout, "effect-list", psz_mode );
+ }
+
+ if( psz_filter ) free( psz_filter );
+
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff