filter_chain: introduce dedicated filter_chain_NewVideo() for video filters

[vlc] / modules / video_chroma / chain.c

diff --git a/modules/video_chroma/chain.c b/modules/video_chroma/chain.c
index 8bea64747fe139e329695e543c9d7b6b918a80cf..242862c348271409a6d3707f890e9dfffb8cc2a4 100644 (file)
--- a/modules/video_chroma/chain.c
+++ b/modules/video_chroma/chain.c
@@ -49,7 +49,6 @@ vlc_module_end ()
  * Local prototypes.
  *****************************************************************************/
 static picture_t *Chain         ( filter_t *, picture_t * );
-static int BufferAllocationInit ( filter_t *, void * );
 
 static int BuildTransformChain( filter_t *p_filter );
 static int BuildChromaResize( filter_t * );
@@ -74,6 +73,23 @@ struct filter_sys_t
     filter_chain_t *p_chain;
 };
 
+/*****************************************************************************
+ * Buffer management
+ *****************************************************************************/
+static picture_t *BufferNew( filter_t *p_filter )
+{
+    filter_t *p_parent = p_filter->owner.sys;
+
+    return filter_NewPicture( p_parent );
+}
+
+static void BufferDel( filter_t *p_filter, picture_t *p_pic )
+{
+    filter_t *p_parent = p_filter->owner.sys;
+
+    filter_DeletePicture( p_parent, p_pic );
+}
+
 #define CHAIN_LEVEL_MAX 1
 
 /*****************************************************************************
@@ -99,7 +115,15 @@ static int Activate( vlc_object_t *p_this )
     if( !p_sys )
         return VLC_ENOMEM;
 
-    p_sys->p_chain = filter_chain_New( p_filter, "video filter2", false, BufferAllocationInit, NULL, p_filter );
+    filter_owner_t owner = {
+        .sys = p_filter,
+        .video = {
+            .buffer_new = BufferNew,
+            .buffer_del = BufferDel,
+        },
+    };
+
+    p_sys->p_chain = filter_chain_NewVideo( p_filter, false, &owner );
     if( !p_sys->p_chain )
     {
         free( p_sys );
@@ -261,31 +285,6 @@ exit:
     return i_ret;
 }
 
-/*****************************************************************************
- * Buffer management
- *****************************************************************************/
-static picture_t *BufferNew( filter_t *p_filter )
-{
-    filter_t *p_parent = p_filter->owner.sys;
-
-    return filter_NewPicture( p_parent );
-}
-
-static void BufferDel( filter_t *p_filter, picture_t *p_pic )
-{
-    filter_t *p_parent = p_filter->owner.sys;
-
-    filter_DeletePicture( p_parent, p_pic );
-}
-
-static int BufferAllocationInit ( filter_t *p_filter, void *p_data )
-{
-    p_filter->owner.sys = p_data;
-    p_filter->owner.video.buffer_new = BufferNew;
-    p_filter->owner.video.buffer_del = BufferDel;
-    return VLC_SUCCESS;
-}
-
 /*****************************************************************************
  *
  *****************************************************************************/