Changeset deef7f86ffe121398d3c86ab828e29a621dbad9d

Timestamp:

06/22/08 16:58:22 (3 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

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

git-parent:

[e2499dc3873f07fc916f292187c07d0eff74061c]

git-author:

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

Message:

Add support for format changes inside a video filter2 chain. (Not sure
if something similar is needed for audio filter2 ... I don't think it
is)

Files:

• src/misc/filter_chain.c (modified) (10 diffs)

src/misc/filter_chain.c

@@ -42 +42 @@
-
-/**
+ * 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 int filter_chain_AppendFromStringInternal( filter_chain_t *, const char * );
+static int filter_chain_DeleteFilterInternal( filter_chain_t *, filter_t * );
+
+static int UpdateBufferFunctions( filter_chain_t * );
+static picture_t *VideoBufferNew( filter_t * );
+static void VideoBufferRelease( picture_t * );
+
+/**
- * Filter chain initialisation
- */
@@ -79 +90 @@
-{
-    while( p_chain->filters.i_count )
-
+Internal
-                                   (filter_t*)p_chain->filters.pp_elems[0] );
-    vlc_array_clear( &p_chain->filters );
@@ -94 +105 @@
-{
-    while( p_chain->filters.i_count )
-
+Internal
-                                   (filter_t*)p_chain->filters.pp_elems[0] );
-    if( p_fmt_in )
@@ -112 +123 @@
- * Modifying the filter chain
- */
-filter_t *filter_chain_AppendFilter
-
-
-
-
+static filter_t *filter_chain_AppendFilterInternal
+               
+               
+               
+               
-{
-    filter_t *p_filter =
@@ -176 +187 @@
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    config_chain_t *p_cfg = NULL;
@@ -186 +211 @@
-    psz_string = config_ChainCreate( &psz_name, &p_cfg, psz_string );
-
-( p_chain, psz_name, p_cfg
-
+Internal( p_chain, psz_name
+        p_cfg, 
-    if( !p_filter )
-    {
@@ -198 +223 @@
-    free( psz_name );
-
-
+Internal
-    if( ret < 0 )
-    {
-
+Internal
-        return ret;
-    }
@@ -207 +232 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    int i;
@@ -238 +274 @@
-
-    /* FIXME: check fmt_in/fmt_out consitency */
-
-    return VLC_SUCCESS;
+}
+
+int filter_chain_DeleteFilter( filter_chain_t *p_chain, filter_t *p_filter )
+{
+    int i_ret = filter_chain_DeleteFilterInternal( p_chain, p_filter );
+    if( i_ret < 0 ) return i_ret;
+    return UpdateBufferFunctions( p_chain );
-}
-
@@ -338 +380 @@
-    {
-        filter_t *p_filter = pp_filter[i];
-
+
+
-        if( p_subpic )
-            spu_DisplaySubpicture( (spu_t*)p_chain->p_this, p_subpic );
-    }
-}
+
+/**
+ * Internal chain buffer handling
+ */
+
+/**
+ * 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" ) )
+    {
+        /**
+         * 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.
+         */
+        int i;
+        filter_t **pp_filter = (filter_t **)p_chain->filters.pp_elems;
+        filter_t *p_filter;
+        for( i = 0; i < p_chain->filters.i_count - 1; i++ )
+        {
+            p_filter = pp_filter[i];
+            if( p_filter->pf_vout_buffer_new != VideoBufferNew )
+            {
+                if( p_chain->pf_buffer_allocation_clear )
+                    p_chain->pf_buffer_allocation_clear( p_filter );
+                p_filter->pf_vout_buffer_new = VideoBufferNew;
+                p_filter->pf_vout_buffer_del = NULL;
+            }
+        }
+        if( p_chain->filters.i_count >= 1 )
+        {
+            p_filter = pp_filter[i];
+            if( p_filter->pf_vout_buffer_new == VideoBufferNew )
+            {
+                p_filter->pf_vout_buffer_new = NULL;
+                if( p_chain->pf_buffer_allocation_init( p_filter,
+                        p_chain->p_buffer_allocation_data ) != VLC_SUCCESS )
+                    return VLC_EGENERIC;
+            }
+        }
+    }
+    return VLC_SUCCESS;
+}
+
+static picture_t *VideoBufferNew( filter_t *p_filter )
+{
+    picture_t *p_pic = malloc( sizeof( picture_t ) );
+    if( !p_pic ) return NULL;
+    memset( p_pic, 0, sizeof( picture_t * ) );
+    int i_ret = vout_AllocatePicture( VLC_OBJECT( p_filter ), p_pic,
+                                      p_filter->fmt_out.video.i_chroma,
+                                      p_filter->fmt_out.video.i_width,
+                                      p_filter->fmt_out.video.i_height,
+                                      p_filter->fmt_out.video.i_aspect );
+    if( i_ret != VLC_SUCCESS )
+    {
+        msg_Err( p_filter, "Failed to allocate picture: %s",
+                 vlc_error( i_ret ) );
+        free( p_pic );
+        return NULL;
+    }
+    p_pic->pf_release = VideoBufferRelease;
+    p_pic->i_type = MEMORY_PICTURE;
+    p_pic->i_status = RESERVED_PICTURE;
+    return p_pic;
+}
+
+static void VideoBufferRelease( picture_t *p_pic )
+{
+    free( p_pic->p_data_orig );
+    free( p_pic );
+}