/*****************************************************************************
* filter_chain.c : Handle chains of filter_t objects.
*****************************************************************************
- * Copyright (C) 2008 the VideoLAN team
- * $Id$
+ * Copyright (C) 2008 VLC authors and VideoLAN
+ * Copyright (C) 2008-2014 Rémi Denis-Courmont
*
* Author: Antoine Cellerier <dionoea at videolan dot org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
#endif
#include <vlc_filter.h>
-#include <vlc_arrays.h>
-#include <vlc_osd.h>
+#include <vlc_modules.h>
+#include <vlc_spu.h>
#include <libvlc.h>
+#include <assert.h>
-typedef struct
+typedef struct chained_filter_t
{
- int (*pf_init)( filter_t *, void *p_data ); /* Callback called once filter allocation has succeeded to initialize the filter's buffer allocation callbacks. This function is responsible for setting p_owner if needed. */
- void (* pf_clean)( filter_t * ); /* Callback called on filter removal from chain to clean up buffer allocation callbacks data (ie p_owner) */
- void *p_data; /* Data for pf_buffer_allocation_init */
-
-} filter_chain_allocator_t;
-
-static int AllocatorInit( const filter_chain_allocator_t *, filter_t * );
-static void AllocatorClean( const filter_chain_allocator_t *, filter_t * );
-
-static bool IsInternalVideoAllocator( filter_t * );
-
-static int InternalVideoInit( filter_t *, void * );
-static void InternalVideoClean( filter_t * );
-
-static const filter_chain_allocator_t internal_video_allocator = {
- .pf_init = InternalVideoInit,
- .pf_clean = InternalVideoClean,
- .p_data = NULL,
-};
+ /* Public part of the filter structure */
+ filter_t filter;
+ /* Private filter chain data (shhhh!) */
+ struct chained_filter_t *prev, *next;
+ vlc_mouse_t *mouse;
+ picture_t *pending;
+} chained_filter_t;
+
+/* Only use this with filter objects from _this_ C module */
+static inline chained_filter_t *chained (filter_t *filter)
+{
+ return (chained_filter_t *)filter;
+}
/* */
struct filter_chain_t
{
- /* Parent object */
- vlc_object_t *p_this;
-
- /* List of filters */
- vlc_array_t filters;
- vlc_array_t mouses;
-
- /* Capability of all the filters in the chain */
- char *psz_capability;
+ filter_owner_t callbacks; /**< Inner callbacks */
+ filter_owner_t owner; /**< Owner (downstream) callbacks */
- /* Input format (read only) */
- es_format_t fmt_in;
+ chained_filter_t *first, *last; /**< List of filters */
- /* allow changing fmt_out if true */
- bool b_allow_fmt_out_change;
-
- /* Output format (writable depending on ... */
- es_format_t fmt_out;
-
- /* User provided allocator */
- filter_chain_allocator_t allocator;
+ es_format_t fmt_in; /**< Chain input format (constant) */
+ es_format_t fmt_out; /**< Chain current output format */
+ unsigned length; /**< Number of filters */
+ bool b_allow_fmt_out_change; /**< Can the output format be changed? */
+ char psz_capability[1]; /**< Module capability for all chained filters */
};
/**
* Local prototypes
*/
-static filter_t *filter_chain_AppendFilterInternal( filter_chain_t *,
- const char *, config_chain_t *,
- const es_format_t *, const es_format_t * );
+static void FilterDeletePictures( picture_t * );
-static int filter_chain_AppendFromStringInternal( filter_chain_t *, const char * );
+static filter_chain_t *filter_chain_NewInner( const filter_owner_t *callbacks,
+ const char *cap, bool fmt_out_change, const filter_owner_t *owner )
+{
+ assert( callbacks != NULL && callbacks->sys != NULL );
+ assert( cap != NULL );
-static int filter_chain_DeleteFilterInternal( filter_chain_t *, filter_t * );
+ filter_chain_t *chain = malloc( sizeof(*chain) + strlen( cap ) );
+ if( unlikely(chain == NULL) )
+ return NULL;
-static int UpdateBufferFunctions( filter_chain_t * );
+ chain->callbacks = *callbacks;
+ if( owner != NULL )
+ chain->owner = *owner;
+ chain->first = NULL;
+ chain->last = NULL;
+ es_format_Init( &chain->fmt_in, UNKNOWN_ES, 0 );
+ es_format_Init( &chain->fmt_out, UNKNOWN_ES, 0 );
+ chain->length = 0;
+ chain->b_allow_fmt_out_change = fmt_out_change;
+ strcpy( chain->psz_capability, cap );
+
+ return chain;
+}
+#undef filter_chain_New
/**
* Filter chain initialisation
*/
-filter_chain_t *__filter_chain_New( vlc_object_t *p_this,
- const char *psz_capability,
- bool b_allow_fmt_out_change,
- int (*pf_buffer_allocation_init)( filter_t *, void * ),
- void (*pf_buffer_allocation_clean)( filter_t * ),
- void *p_buffer_allocation_data )
+filter_chain_t *filter_chain_New( vlc_object_t *obj, const char *cap,
+ bool fmt_out_change )
{
- filter_chain_t *p_chain = malloc( sizeof( *p_chain ) );
- if( !p_chain )
- return NULL;
+ filter_owner_t callbacks = {
+ .sys = obj,
+ };
- p_chain->p_this = p_this;
- vlc_array_init( &p_chain->filters );
- vlc_array_init( &p_chain->mouses );
- p_chain->psz_capability = strdup( psz_capability );
- if( !p_chain->psz_capability )
+ return filter_chain_NewInner( &callbacks, cap, fmt_out_change, NULL );
+}
+
+/** Chained filter picture allocator function */
+static picture_t *filter_chain_VideoBufferNew( filter_t *filter )
+{
+ if( chained(filter)->next != NULL )
{
- vlc_array_clear( &p_chain->mouses );
- vlc_array_clear( &p_chain->filters );
- free( p_chain );
- return NULL;
+ picture_t *pic = picture_NewFromFormat( &filter->fmt_out.video );
+ if( pic == NULL )
+ msg_Err( filter, "Failed to allocate picture" );
+ return pic;
}
- es_format_Init( &p_chain->fmt_in, UNKNOWN_ES, 0 );
- es_format_Init( &p_chain->fmt_out, UNKNOWN_ES, 0 );
- p_chain->b_allow_fmt_out_change = b_allow_fmt_out_change;
+ else
+ {
+ filter_chain_t *chain = filter->owner.sys;
- p_chain->allocator.pf_init = pf_buffer_allocation_init;
- p_chain->allocator.pf_clean = pf_buffer_allocation_clean;
- p_chain->allocator.p_data = p_buffer_allocation_data;
+ /* XXX ugly */
+ filter->owner.sys = chain->owner.sys;
+ picture_t *pic = chain->owner.video.buffer_new( filter );
+ filter->owner.sys = chain;
+ return pic;
+ }
+}
- return p_chain;
+#undef filter_chain_NewVideo
+filter_chain_t *filter_chain_NewVideo( vlc_object_t *obj, bool allow_change,
+ const filter_owner_t *restrict owner )
+{
+ filter_owner_t callbacks = {
+ .sys = obj,
+ .video = {
+ .buffer_new = filter_chain_VideoBufferNew,
+ },
+ };
+
+ return filter_chain_NewInner( &callbacks, "video filter2", allow_change,
+ owner );
}
/**
*/
void filter_chain_Delete( filter_chain_t *p_chain )
{
- filter_chain_Reset( p_chain, NULL, NULL );
+ while( p_chain->first != NULL )
+ filter_chain_DeleteFilter( p_chain, &p_chain->first->filter );
es_format_Clean( &p_chain->fmt_in );
es_format_Clean( &p_chain->fmt_out );
- free( p_chain->psz_capability );
- vlc_array_clear( &p_chain->mouses );
- vlc_array_clear( &p_chain->filters );
free( p_chain );
}
/**
void filter_chain_Reset( filter_chain_t *p_chain, const es_format_t *p_fmt_in,
const es_format_t *p_fmt_out )
{
- while( vlc_array_count( &p_chain->filters ) > 0 )
- {
- filter_t *p_filter = vlc_array_item_at_index( &p_chain->filters, 0 );
+ while( p_chain->first != NULL )
+ filter_chain_DeleteFilter( p_chain, &p_chain->first->filter );
- filter_chain_DeleteFilterInternal( p_chain, p_filter );
- }
if( p_fmt_in )
{
es_format_Clean( &p_chain->fmt_in );
}
}
-filter_t *filter_chain_AppendFilter( filter_chain_t *p_chain,
- const char *psz_name,
- config_chain_t *p_cfg,
- const es_format_t *p_fmt_in,
- const es_format_t *p_fmt_out )
+filter_t *filter_chain_AppendFilter( filter_chain_t *chain, const char *name,
+ config_chain_t *cfg,
+ const es_format_t *fmt_in,
+ const es_format_t *fmt_out )
{
- filter_t *p_filter = filter_chain_AppendFilterInternal( p_chain, psz_name,
- p_cfg, p_fmt_in,
- p_fmt_out );
- if( UpdateBufferFunctions( p_chain ) < 0 )
- msg_Err( p_filter, "Woah! This doesn't look good." );
- return p_filter;
-}
+ vlc_object_t *parent = chain->callbacks.sys;
+ chained_filter_t *chained =
+ vlc_custom_create( parent, sizeof(*chained), "filter" );
+ if( unlikely(chained == NULL) )
+ return NULL;
-int filter_chain_AppendFromString( filter_chain_t *p_chain,
- const char *psz_string )
-{
- const int i_ret = filter_chain_AppendFromStringInternal( p_chain, psz_string );
- if( i_ret < 0 )
- return i_ret;
+ filter_t *filter = &chained->filter;
+
+ if( fmt_in == NULL )
+ {
+ if( chain->last != NULL )
+ fmt_in = &chain->last->filter.fmt_out;
+ else
+ fmt_in = &chain->fmt_in;
+ }
+
+ if( fmt_out == NULL )
+ fmt_out = &chain->fmt_out;
+
+ es_format_Copy( &filter->fmt_in, fmt_in );
+ es_format_Copy( &filter->fmt_out, fmt_out );
+ filter->b_allow_fmt_out_change = chain->b_allow_fmt_out_change;
+ filter->p_cfg = cfg;
+
+ filter->owner = chain->callbacks;
+ filter->owner.sys = chain;
+
+ filter->p_module = module_need( filter, chain->psz_capability, name,
+ name != NULL );
+ if( filter->p_module == NULL )
+ goto error;
+
+ if( filter->b_allow_fmt_out_change )
+ {
+ es_format_Clean( &chain->fmt_out );
+ es_format_Copy( &chain->fmt_out, &filter->fmt_out );
+ }
- /* FIXME That one seems bad if a error is returned */
- return UpdateBufferFunctions( p_chain );
+ if( chain->last == NULL )
+ {
+ assert( chain->first == NULL );
+ chain->first = chained;
+ }
+ else
+ chain->last->next = chained;
+ chained->prev = chain->last;
+ chain->last = chained;
+ chained->next = NULL;
+ chain->length++;
+
+ vlc_mouse_t *mouse = malloc( sizeof(*mouse) );
+ if( likely(mouse != NULL) )
+ vlc_mouse_Init( mouse );
+ chained->mouse = mouse;
+ chained->pending = NULL;
+
+ msg_Dbg( parent, "Filter '%s' (%p) appended to chain",
+ (name != NULL) ? name : module_get_name(filter->p_module, false),
+ filter );
+ return filter;
+
+error:
+ if( name != NULL )
+ msg_Err( parent, "Failed to create %s '%s'", chain->psz_capability,
+ name );
+ else
+ msg_Err( parent, "Failed to create %s", chain->psz_capability );
+ es_format_Clean( &filter->fmt_out );
+ es_format_Clean( &filter->fmt_in );
+ vlc_object_release( filter );
+ return NULL;
}
-int filter_chain_DeleteFilter( filter_chain_t *p_chain, filter_t *p_filter )
+void filter_chain_DeleteFilter( filter_chain_t *chain, filter_t *filter )
{
- const int i_ret = filter_chain_DeleteFilterInternal( p_chain, p_filter );
- if( i_ret < 0 )
- return i_ret;
+ vlc_object_t *obj = chain->callbacks.sys;
+ chained_filter_t *chained = (chained_filter_t *)filter;
- /* FIXME That one seems bad if a error is returned */
- return UpdateBufferFunctions( p_chain );
+ /* Remove it from the chain */
+ if( chained->prev != NULL )
+ chained->prev->next = chained->next;
+ else
+ {
+ assert( chained == chain->first );
+ chain->first = chained->next;
+ }
+
+ if( chained->next != NULL )
+ chained->next->prev = chained->prev;
+ else
+ {
+ assert( chained == chain->last );
+ chain->last = chained->prev;
+ }
+
+ assert( chain->length > 0 );
+ chain->length--;
+
+ module_unneed( filter, filter->p_module );
+
+ msg_Dbg( obj, "Filter %p removed from chain", filter );
+ FilterDeletePictures( chained->pending );
+
+ free( chained->mouse );
+ es_format_Clean( &filter->fmt_out );
+ es_format_Clean( &filter->fmt_in );
+ vlc_object_release( filter );
+ /* FIXME: check fmt_in/fmt_out consitency */
}
-/**
- * Reading from the filter chain
- */
-filter_t *filter_chain_GetFilter( filter_chain_t *p_chain, int i_position,
- const char *psz_name )
+
+int filter_chain_AppendFromString( filter_chain_t *chain, const char *str )
{
- if( psz_name )
+ vlc_object_t *obj = chain->callbacks.sys;
+ char *buf = NULL;
+ int ret = 0;
+
+ while( str != NULL && str[0] != '\0' )
{
- if( i_position < 0 )
- return NULL;
+ config_chain_t *cfg;
+ char *name;
- for( int i = 0; i < vlc_array_count( &p_chain->filters ); i++ )
+ char *next = config_ChainCreate( &name, &cfg, str );
+
+ str = next;
+ free( buf );
+ buf = next;
+
+ filter_t *filter = filter_chain_AppendFilter( chain, name, cfg,
+ NULL, NULL );
+ if( filter == NULL )
{
- filter_t *p_filter = vlc_array_item_at_index( &p_chain->filters, i );
- if( !strcmp( p_filter->psz_object_name, psz_name ) )
- {
- if( i_position <= 0 )
- return p_filter;
- i_position--;
- }
- }
- return NULL;
+ msg_Err( obj, "Failed to append '%s' to chain", name );
+ free( name );
+ free( cfg );
+ goto error;
+ }
+
+ free( name );
+ ret++;
}
- else
+
+ free( buf );
+ return ret;
+
+error:
+ while( ret > 0 ) /* Unwind */
{
- if( i_position < 0 || i_position >= vlc_array_count( &p_chain->filters ) )
- return NULL;
- return vlc_array_item_at_index( &p_chain->filters, i_position );
+ filter_chain_DeleteFilter( chain, &chain->last->filter );
+ ret--;
}
+ free( buf );
+ return -1;
+}
+
+int filter_chain_ForEach( filter_chain_t *chain,
+ int (*cb)( filter_t *, void * ), void *opaque )
+{
+ for( chained_filter_t *f = chain->first; f != NULL; f = f->next )
+ {
+ int ret = cb( &f->filter, opaque );
+ if( ret )
+ return ret;
+ }
+ return VLC_SUCCESS;
}
int filter_chain_GetLength( filter_chain_t *p_chain )
{
- return vlc_array_count( &p_chain->filters );
+ return p_chain->length;
}
const es_format_t *filter_chain_GetFmtOut( filter_chain_t *p_chain )
if( p_chain->b_allow_fmt_out_change )
return &p_chain->fmt_out;
- const int i_count = vlc_array_count( &p_chain->filters );
- if( i_count > 0 )
- {
- filter_t *p_last = vlc_array_item_at_index( &p_chain->filters, i_count - 1 );
- return &p_last->fmt_out;
- }
+ if( p_chain->last != NULL )
+ return &p_chain->last->filter.fmt_out;
/* Unless filter_chain_Reset has been called we are doomed */
return &p_chain->fmt_out;
}
-picture_t *filter_chain_VideoFilter( filter_chain_t *p_chain, picture_t *p_pic )
+static picture_t *FilterChainVideoFilter( chained_filter_t *f, picture_t *p_pic )
{
- for( int i = 0; i < vlc_array_count( &p_chain->filters ); i++ )
+ for( ; f != NULL; f = f->next )
{
- filter_t *p_filter = vlc_array_item_at_index( &p_chain->filters, i );
-
+ filter_t *p_filter = &f->filter;
p_pic = p_filter->pf_video_filter( p_filter, p_pic );
if( !p_pic )
break;
+ if( f->pending )
+ {
+ msg_Warn( p_filter, "dropping pictures" );
+ FilterDeletePictures( f->pending );
+ }
+ f->pending = p_pic->p_next;
+ p_pic->p_next = NULL;
}
return p_pic;
}
-block_t *filter_chain_AudioFilter( filter_chain_t *p_chain, block_t *p_block )
+picture_t *filter_chain_VideoFilter( filter_chain_t *p_chain, picture_t *p_pic )
{
- for( int i = 0; i < vlc_array_count( &p_chain->filters ); i++ )
+ if( p_pic )
{
- filter_t *p_filter = vlc_array_item_at_index( &p_chain->filters, i );
-
- p_block = p_filter->pf_audio_filter( p_filter, p_block );
- if( !p_block )
- break;
+ p_pic = FilterChainVideoFilter( p_chain->first, p_pic );
+ if( p_pic )
+ return p_pic;
}
- return p_block;
-}
-
-void filter_chain_SubFilter( filter_chain_t *p_chain,
- mtime_t display_date )
-{
- for( int i = 0; i < vlc_array_count( &p_chain->filters ); i++ )
+ for( chained_filter_t *b = p_chain->last; b != NULL; b = b->prev )
{
- filter_t *p_filter = vlc_array_item_at_index( &p_chain->filters, i );
+ p_pic = b->pending;
+ if( !p_pic )
+ continue;
+ b->pending = p_pic->p_next;
+ p_pic->p_next = NULL;
- subpicture_t *p_subpic = p_filter->pf_sub_filter( p_filter, display_date );
- /* XXX I find that spu_t cast ugly */
- if( p_subpic )
- spu_DisplaySubpicture( (spu_t*)p_chain->p_this, p_subpic );
+ p_pic = FilterChainVideoFilter( b->next, p_pic );
+ if( p_pic )
+ return p_pic;
}
+ return NULL;
}
-int filter_chain_MouseFilter( filter_chain_t *p_chain, vlc_mouse_t *p_dst, const vlc_mouse_t *p_src )
+void filter_chain_VideoFlush( filter_chain_t *p_chain )
{
- vlc_mouse_t current = *p_src;
-
- for( int i = vlc_array_count( &p_chain->filters ) - 1; i >= 0; i-- )
+ for( chained_filter_t *f = p_chain->first; f != NULL; f = f->next )
{
- filter_t *p_filter = vlc_array_item_at_index( &p_chain->filters, i );
- vlc_mouse_t *p_mouse = vlc_array_item_at_index( &p_chain->mouses, i );
+ filter_t *p_filter = &f->filter;
- if( p_filter->pf_mouse && p_mouse )
- {
- vlc_mouse_t old = *p_mouse;
- vlc_mouse_t filtered;
+ FilterDeletePictures( f->pending );
+ f->pending = NULL;
- *p_mouse = current;
- if( p_filter->pf_mouse( p_filter, &filtered, &old, ¤t ) )
- return VLC_EGENERIC;
- current = filtered;
- }
+ filter_FlushPictures( p_filter );
}
-
- *p_dst = current;
- return VLC_SUCCESS;
}
-/* Helpers */
-static filter_t *filter_chain_AppendFilterInternal( filter_chain_t *p_chain,
- const char *psz_name,
- config_chain_t *p_cfg,
- const es_format_t *p_fmt_in,
- const es_format_t *p_fmt_out )
+block_t *filter_chain_AudioFilter( filter_chain_t *p_chain, block_t *p_block )
{
- filter_t *p_filter = vlc_custom_create( p_chain->p_this, sizeof(*p_filter),
- VLC_OBJECT_GENERIC, "filter" );
- if( !p_filter )
- return NULL;
- vlc_object_attach( p_filter, p_chain->p_this );
-
- if( !p_fmt_in )
+ for( chained_filter_t *f = p_chain->first; f != NULL; f = f->next )
{
- p_fmt_in = &p_chain->fmt_in;
+ filter_t *p_filter = &f->filter;
- const int i_count = vlc_array_count( &p_chain->filters );
- if( i_count > 0 )
- {
- filter_t *p_last = vlc_array_item_at_index( &p_chain->filters, i_count - 1 );
- p_fmt_in = &p_last->fmt_out;
- }
- }
-
- if( !p_fmt_out )
- {
- p_fmt_out = &p_chain->fmt_out;
- }
-
- es_format_Copy( &p_filter->fmt_in, p_fmt_in );
- es_format_Copy( &p_filter->fmt_out, p_fmt_out );
- p_filter->p_cfg = p_cfg;
- p_filter->b_allow_fmt_out_change = p_chain->b_allow_fmt_out_change;
-
- p_filter->p_module = module_need( p_filter, p_chain->psz_capability,
- psz_name, psz_name != NULL );
-
- if( !p_filter->p_module )
- goto error;
-
- if( p_filter->b_allow_fmt_out_change )
- {
- es_format_Clean( &p_chain->fmt_out );
- es_format_Copy( &p_chain->fmt_out, &p_filter->fmt_out );
+ p_block = p_filter->pf_audio_filter( p_filter, p_block );
+ if( !p_block )
+ break;
}
-
- if( AllocatorInit( &p_chain->allocator, p_filter ) )
- goto error;
-
- vlc_array_append( &p_chain->filters, p_filter );
-
- vlc_mouse_t *p_mouse = malloc( sizeof(*p_mouse) );
- if( p_mouse )
- vlc_mouse_Init( p_mouse );
- vlc_array_append( &p_chain->mouses, p_mouse );
-
- msg_Dbg( p_chain->p_this, "Filter '%s' (%p) appended to chain",
- psz_name ? psz_name : p_filter->psz_object_name, p_filter );
-
- return p_filter;
-
-error:
- if( psz_name )
- msg_Err( p_chain->p_this, "Failed to create %s '%s'",
- p_chain->psz_capability, psz_name );
- else
- msg_Err( p_chain->p_this, "Failed to create %s",
- p_chain->psz_capability );
- if( p_filter->p_module )
- module_unneed( p_filter, p_filter->p_module );
- es_format_Clean( &p_filter->fmt_in );
- es_format_Clean( &p_filter->fmt_out );
- vlc_object_detach( p_filter );
- vlc_object_release( p_filter );
- return NULL;
+ return p_block;
}
-
-static int filter_chain_AppendFromStringInternal( filter_chain_t *p_chain,
- const char *psz_string )
+void filter_chain_SubSource( filter_chain_t *p_chain, spu_t *spu,
+ mtime_t display_date )
{
- config_chain_t *p_cfg = NULL;
- char *psz_name = NULL;
- char* psz_new_string;
-
- if( !psz_string || !*psz_string )
- return 0;
-
- psz_new_string = config_ChainCreate( &psz_name, &p_cfg, psz_string );
-
- filter_t *p_filter = filter_chain_AppendFilterInternal( p_chain, psz_name,
- p_cfg, NULL, NULL );
- if( !p_filter )
+ for( chained_filter_t *f = p_chain->first; f != NULL; f = f->next )
{
- msg_Err( p_chain->p_this, "Failed while trying to append '%s' "
- "to filter chain", psz_name );
- free( psz_name );
- free( p_cfg );
- free( psz_new_string );
- return -1;
- }
- free( psz_name );
-
- const int i_ret = filter_chain_AppendFromStringInternal( p_chain, psz_new_string );
- free( psz_new_string );
- if( i_ret < 0 )
- {
- filter_chain_DeleteFilterInternal( p_chain, p_filter );
- return i_ret;
+ filter_t *p_filter = &f->filter;
+ subpicture_t *p_subpic = p_filter->pf_sub_source( p_filter, display_date );
+ if( p_subpic )
+ spu_PutSubpicture( spu, p_subpic );
}
- return 1 + i_ret;
}
-static int filter_chain_DeleteFilterInternal( filter_chain_t *p_chain,
- filter_t *p_filter )
+subpicture_t *filter_chain_SubFilter( filter_chain_t *p_chain, subpicture_t *p_subpic )
{
- const int i_filter_idx = vlc_array_index_of_item( &p_chain->filters, p_filter );
- if( i_filter_idx < 0 )
+ for( chained_filter_t *f = p_chain->first; f != NULL; f = f->next )
{
- /* Oops, filter wasn't found
- * FIXME shoulnd't it be an assert instead ? */
- msg_Err( p_chain->p_this,
- "Couldn't find filter '%s' (%p) when trying to remove it from chain",
- p_filter->psz_object_name, p_filter );
- return VLC_EGENERIC;
- }
+ filter_t *p_filter = &f->filter;
- /* Remove it from the chain */
- vlc_array_remove( &p_chain->filters, i_filter_idx );
+ p_subpic = p_filter->pf_sub_filter( p_filter, p_subpic );
- msg_Dbg( p_chain->p_this, "Filter '%s' (%p) removed from chain",
- p_filter->psz_object_name, p_filter );
-
- /* Destroy the filter object */
- if( IsInternalVideoAllocator( p_filter ) )
- AllocatorClean( &internal_video_allocator, p_filter );
- else
- AllocatorClean( &p_chain->allocator, p_filter );
-
- vlc_object_detach( p_filter );
- if( p_filter->p_module )
- module_unneed( p_filter, p_filter->p_module );
- vlc_object_release( p_filter );
-
- vlc_mouse_t *p_mouse = vlc_array_item_at_index( &p_chain->mouses, i_filter_idx );
- if( p_mouse )
- free( p_mouse );
- vlc_array_remove( &p_chain->mouses, i_filter_idx );
-
- /* FIXME: check fmt_in/fmt_out consitency */
- return VLC_SUCCESS;
+ if( !p_subpic )
+ break;
+ }
+ return p_subpic;
}
-/**
- * Internal chain buffer handling
- */
-
-static int UpdateVideoBufferFunctions( filter_chain_t *p_chain )
+int filter_chain_MouseFilter( filter_chain_t *p_chain, vlc_mouse_t *p_dst, const vlc_mouse_t *p_src )
{
- /**
- * Last filter uses the filter chain's parent buffer allocation
- * functions. All the other filters use internal functions.
- * This makes it possible to have format changes between each
- * filter without having to worry about the parent's picture
- * heap format.
- */
- const int i_count = vlc_array_count( &p_chain->filters );
- for( int i = 0; i < i_count - 1; i++ )
- {
- filter_t *p_filter = vlc_array_item_at_index( &p_chain->filters, i );
-
- if( !IsInternalVideoAllocator( p_filter ) )
- {
- AllocatorClean( &p_chain->allocator, p_filter );
+ vlc_mouse_t current = *p_src;
- AllocatorInit( &internal_video_allocator, p_filter );
- }
- }
- if( i_count >= 1 )
+ for( chained_filter_t *f = p_chain->last; f != NULL; f = f->prev )
{
- filter_t * p_filter = vlc_array_item_at_index( &p_chain->filters, i_count - 1 );
- if( IsInternalVideoAllocator( p_filter ) )
+ filter_t *p_filter = &f->filter;
+ vlc_mouse_t *p_mouse = f->mouse;
+
+ if( p_filter->pf_video_mouse && p_mouse )
{
- AllocatorClean( &internal_video_allocator, p_filter );
+ vlc_mouse_t old = *p_mouse;
+ vlc_mouse_t filtered;
- if( AllocatorInit( &p_chain->allocator, p_filter ) )
+ *p_mouse = current;
+ if( p_filter->pf_video_mouse( p_filter, &filtered, &old, ¤t ) )
return VLC_EGENERIC;
+ current = filtered;
}
}
- return VLC_SUCCESS;
-}
-/**
- * This function should be called after every filter chain change
- */
-static int UpdateBufferFunctions( filter_chain_t *p_chain )
-{
- if( !strcmp( p_chain->psz_capability, "video filter2" ) )
- return UpdateVideoBufferFunctions( p_chain );
+ *p_dst = current;
return VLC_SUCCESS;
}
-/* Internal video allocator functions */
-static picture_t *VideoBufferNew( filter_t *p_filter )
+int filter_chain_MouseEvent( filter_chain_t *p_chain,
+ const vlc_mouse_t *p_mouse,
+ const video_format_t *p_fmt )
{
- const video_format_t *p_fmt = &p_filter->fmt_out.video;
-
- picture_t *p_picture = picture_New( p_fmt->i_chroma,
- p_fmt->i_width, p_fmt->i_height,
- p_fmt->i_aspect );
- if( !p_picture )
- msg_Err( p_filter, "Failed to allocate picture" );
- return p_picture;
-}
-static void VideoBufferDelete( filter_t *p_filter, picture_t *p_picture )
-{
- VLC_UNUSED( p_filter );
- picture_Release( p_picture );
-}
-static int InternalVideoInit( filter_t *p_filter, void *p_data )
-{
- VLC_UNUSED(p_data);
+ for( chained_filter_t *f = p_chain->first; f != NULL; f = f->next )
+ {
+ filter_t *p_filter = &f->filter;
- p_filter->pf_vout_buffer_new = VideoBufferNew;
- p_filter->pf_vout_buffer_del = VideoBufferDelete;
+ if( p_filter->pf_sub_mouse )
+ {
+ vlc_mouse_t old = *f->mouse;
+ *f->mouse = *p_mouse;
+ if( p_filter->pf_sub_mouse( p_filter, &old, p_mouse, p_fmt ) )
+ return VLC_EGENERIC;
+ }
+ }
return VLC_SUCCESS;
}
-static void InternalVideoClean( filter_t *p_filter )
-{
- p_filter->pf_vout_buffer_new = NULL;
- p_filter->pf_vout_buffer_del = NULL;
-}
-static bool IsInternalVideoAllocator( filter_t *p_filter )
-{
- return p_filter->pf_vout_buffer_new == VideoBufferNew;
-}
-/* */
-static int AllocatorInit( const filter_chain_allocator_t *p_alloc, filter_t *p_filter )
-{
- if( p_alloc->pf_init )
- return p_alloc->pf_init( p_filter, p_alloc->p_data );
- return VLC_SUCCESS;
-}
-static void AllocatorClean( const filter_chain_allocator_t *p_alloc, filter_t *p_filter )
+/* Helpers */
+static void FilterDeletePictures( picture_t *picture )
{
- if( p_alloc->pf_clean )
- p_alloc->pf_clean( p_filter );
+ while( picture )
+ {
+ picture_t *next = picture->p_next;
+ picture_Release( picture );
+ picture = next;
+ }
}
-
projects / vlc / blobdiff