Changeset 57d88c823edb427bdba7ed9d77da707064d90f2e

Timestamp:

04/06/08 13:14:12 (4 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1212578052 +0200

git-parent:

[69c6803c9cdf2232a76903722a542e26146e7d51]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1212525846 +0200

Message:

New filter chain handling API. This should make it possible to factorize
a lot of code everywhere a filter_t chain is used ("video filter2":
vout core, transcode, chain.c video filter; "sub filter": spu_Init;
"audio filter2": transcode; the other types of filter_t objects are
never chained)

Btw, why aren't "audio filter2" filters used anywhere in the aout core?

Files:

• include/vlc_filter.h (modified) (4 diffs)
• src/Makefile.am (modified) (1 diff)
• src/libvlccore.sym (modified) (1 diff)
• src/misc/filter_chain.c (added)

include/vlc_filter.h

@@ -1 +1 @@
-/*****************************************************************************
-
+ and functions
- *****************************************************************************
-3
+8
- * $Id$
- *
- * Authors: Gildas Bazin <gbazin@videolan.org>
+ *          Antoine Cellerier <dionoea at videolan dot org>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -56 +57 @@
-    /* Output format of filter */
-    es_format_t         fmt_out;
+    bool                b_allow_fmt_out_change;
-
-    /* Filter configuration */
@@ -82 +84 @@
-    picture_t     * ( * pf_vout_buffer_new) ( filter_t * );
-    void            ( * pf_vout_buffer_del) ( filter_t *, picture_t * );
-
-
+/* 
+ */
-
-    /* SPU output callbacks */
@@ -126 +128 @@
-    }
-
+/**
+ * Filter chain management API
+ */
+
+typedef struct filter_chain_t filter_chain_t;
+
+VLC_EXPORT( filter_chain_t *, __filter_chain_New, ( vlc_object_t *, const char *, bool, int (*)( filter_t *, void * ), void (*)( filter_t * ), void *  ) );
+#define filter_chain_New( a, b, c, d, e, f ) __filter_chain_New( VLC_OBJECT( a ), b, c, d, e, f )
+VLC_EXPORT( void, filter_chain_Delete, ( filter_chain_t * ) );
+VLC_EXPORT( void, filter_chain_Reset, ( filter_chain_t *, const es_format_t *, const es_format_t * ) );
+
+VLC_EXPORT( filter_t *, filter_chain_AppendFilter, ( filter_chain_t *, const char *, config_chain_t *, const es_format_t *, const es_format_t * ) );
+VLC_EXPORT( int, filter_chain_AppendFromString, ( filter_chain_t *, const char * ) );
+VLC_EXPORT( int, filter_chain_DeleteFilter, ( filter_chain_t *, filter_t * ) );
+
+VLC_EXPORT( filter_t *, filter_chain_GetFilter, ( filter_chain_t *, int, const char * ) );
+VLC_EXPORT( int, filter_chain_GetLength, ( filter_chain_t * ) );
+VLC_EXPORT( const es_format_t *, filter_chain_GetFmtOut, ( filter_chain_t * ) );
+
+/**
+ * Apply the filter chain
+ */
+VLC_EXPORT( picture_t *, filter_chain_VideoFilter, ( filter_chain_t *, picture_t * ) );
+VLC_EXPORT( block_t *, filter_chain_AudioFilter, ( filter_chain_t *, block_t * ) );
+VLC_EXPORT( void, filter_chain_SubFilter, ( filter_chain_t *, mtime_t ) );
+
-#endif /* _VLC_FILTER_H */

src/Makefile.am

@@ -363 +363 @@
-    misc/devices.c \
-    extras/libc.c \
+    misc/filter_chain.c \
-    $(NULL)
-

src/libvlccore.sym

@@ -94 +94 @@
-EnsureUTF8
-filename_sanitize
+filter_chain_AppendFilter
+filter_chain_AppendFromString
+filter_chain_AudioFilter
+filter_chain_Delete
+filter_chain_DeleteFilter
+filter_chain_GetFilter
+filter_chain_GetFmtOut
+filter_chain_GetLength
+__filter_chain_New
+filter_chain_Reset
+filter_chain_SubFilter
+filter_chain_VideoFilter
-FromLocale
-FromLocaleDup