#include <math.h>
#include <assert.h>
-#include <vlc_input.h> /* for input_thread_t and i_pts_delay */
+#include <vlc_input.h>
+#include <vlc_vout.h> /* for vout_Request */
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#define AOUT_ASSERT_INPUT_LOCKED vlc_assert_locked( &p_input->lock )
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 inputDrop( aout_input_t *, aout_buffer_t * );
static void inputResamplingStop( aout_input_t *p_input );
static int VisualizationCallback( vlc_object_t *, char const *,
static int ReplayGainCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static void ReplayGainSelect( aout_instance_t *, aout_input_t * );
+
+static vout_thread_t *RequestVout( void *,
+ vout_thread_t *, video_format_t *, bool );
+static vout_thread_t *RequestVoutFromFilter( void *,
+ vout_thread_t *, video_format_t *, bool );
+
/*****************************************************************************
* aout_InputNew : allocate a new input and rework the filter pipeline
*****************************************************************************/
-int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
+int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_request_vout_t *p_request_vout )
{
audio_sample_format_t chain_input_format;
audio_sample_format_t chain_output_format;
aout_FifoInit( p_aout, &p_input->fifo, p_aout->mixer.mixer.i_rate );
p_input->p_first_byte_to_mix = NULL;
+ /* */
+ if( p_request_vout )
+ {
+ p_input->request_vout = *p_request_vout;
+ }
+ else
+ {
+ p_input->request_vout.pf_request_vout = RequestVout;
+ p_input->request_vout.p_private = p_aout;
+ }
+
/* Prepare format structure */
memcpy( &chain_input_format, &p_input->input,
sizeof(audio_sample_format_t) );
if( var_Get( p_aout, "effect-list", &val ) == VLC_SUCCESS )
{
- var_Set( p_aout, "visual", val );
+ var_SetString( p_aout, "visual", val.psz_string );
free( val.psz_string );
}
var_AddCallback( p_aout, "visual", VisualizationCallback, NULL );
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_visual = val.psz_string;
-
+ psz_filters = var_GetString( p_aout, "audio-filter" );
+ psz_visual = var_GetString( p_aout, "audio-visual");
psz_scaletempo = var_GetBool( p_aout, "audio-time-stretch" ) ? strdup( "scaletempo" ) : NULL;
+ p_input->b_recycle_vout = psz_visual && *psz_visual;
+
/* parse user filter lists */
for( i_visual = 0; i_visual < 3 && !AOUT_FMT_NON_LINEAR(&chain_output_format); i_visual++ )
{
vlc_object_attach( p_filter , p_aout );
+ p_filter->request_vout.pf_request_vout = RequestVoutFromFilter;
+ p_filter->request_vout.p_private = p_input;
+
+ p_filter->p_owner = malloc( sizeof(*p_filter->p_owner) );
+ p_filter->p_owner->p_aout = p_aout;
+ p_filter->p_owner->p_input = p_input;
+
/* try to find the requested filter */
if( i_visual == 2 ) /* this can only be a visualization module */
{
msg_Err( p_aout, "cannot add user filter %s (skipped)",
psz_parser );
+ free( p_filter->p_owner );
vlc_object_detach( p_filter );
vlc_object_release( p_filter );
psz_parser );
module_unneed( p_filter, p_filter->p_module );
+ free( p_filter->p_owner );
vlc_object_detach( p_filter );
vlc_object_release( p_filter );
int aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input )
{
AOUT_ASSERT_MIXER_LOCKED;
- if ( p_input->b_error ) return 0;
+ if ( p_input->b_error )
+ return 0;
+
+ /* XXX We need to update b_recycle_vout before calling aout_FiltersDestroyPipeline.
+ * FIXME They can be a race condition if audio-visual is updated between
+ * aout_InputDelete and aout_InputNew.
+ */
+ char *psz_visual = var_GetString( p_aout, "audio-visual");
+ p_input->b_recycle_vout = psz_visual && *psz_visual;
+ free( psz_visual );
aout_FiltersDestroyPipeline( p_aout, p_input->pp_filters,
p_input->i_nb_filters );
aout_InputDelete( p_aout, p_input );
- aout_InputNew( p_aout, p_input );
+ aout_InputNew( p_aout, p_input, &p_input->request_vout );
p_input->p_first_byte_to_mix = p_first_byte_to_mix;
p_input->fifo = fifo;
p_input->b_paused = b_paused;
if( i_input_rate != INPUT_RATE_DEFAULT && p_input->p_playback_rate_filter == NULL )
{
- inputDrop( p_aout, p_input, p_buffer );
+ inputDrop( p_input, p_buffer );
return 0;
}
msg_Warn( p_aout, "PTS is out of range (%"PRId64"), dropping buffer",
mdate() - p_buffer->start_date );
- inputDrop( p_aout, p_input, p_buffer );
+ inputDrop( p_input, p_buffer );
inputResamplingStop( p_input );
return 0;
}
{
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 );
+ inputDrop( p_input, p_buffer );
return 0;
}
p_input->b_error = 1;
}
-static void inputDrop( aout_instance_t *p_aout, aout_input_t *p_input, aout_buffer_t *p_buffer )
+static void inputDrop( aout_input_t *p_input, aout_buffer_t *p_buffer )
{
aout_BufferFree( p_buffer );
}
}
+static vout_thread_t *RequestVout( void *p_private,
+ vout_thread_t *p_vout, video_format_t *p_fmt, bool b_recycle )
+{
+ aout_instance_t *p_aout = p_private;
+ VLC_UNUSED(b_recycle);
+ return vout_Request( p_aout, p_vout, p_fmt );
+}
+
+static vout_thread_t *RequestVoutFromFilter( void *p_private,
+ vout_thread_t *p_vout, video_format_t *p_fmt, bool b_recycle )
+{
+ aout_input_t *p_input = p_private;
+ aout_request_vout_t *p_request = &p_input->request_vout;
+
+ return p_request->pf_request_vout( p_request->p_private,
+ p_vout, p_fmt, p_input->b_recycle_vout && b_recycle );
+}
+
static int ChangeFiltersString( aout_instance_t * p_aout, const char* psz_variable,
const char *psz_name, bool b_add )
{
{
aout_instance_t *p_aout = (aout_instance_t *)p_this;
char *psz_mode = newval.psz_string;
- vlc_value_t val;
(void)psz_cmd; (void)oldval; (void)p_data;
if( !psz_mode || !*psz_mode )
}
else
{
- val.psz_string = psz_mode;
var_Create( p_aout, "effect-list", VLC_VAR_STRING );
- var_Set( p_aout, "effect-list", val );
+ var_SetString( p_aout, "effect-list", psz_mode );
ChangeFiltersString( p_aout, "audio-visual", "goom", false );
ChangeFiltersString( p_aout, "audio-visual", "visual", true );
{
aout_instance_t *p_aout = (aout_instance_t *)p_this;
char *psz_mode = newval.psz_string;
- vlc_value_t val;
int i_ret;
(void)psz_cmd; (void)oldval; (void)p_data;
}
else
{
- val.psz_string = psz_mode;
var_Create( p_aout, "equalizer-preset", VLC_VAR_STRING );
- var_Set( p_aout, "equalizer-preset", val );
+ var_SetString( p_aout, "equalizer-preset", psz_mode );
i_ret = ChangeFiltersString( p_aout, "audio-filter", "equalizer",
true );
-
}
/* That sucks */
projects / vlc / blobdiff