]> git.sesse.net Git - vlc/blobdiff - modules/video_filter/chain.c
C++ compile fix
[vlc] / modules / video_filter / chain.c
index dd65f08c141dec4f21242c5d2d5ae928e072cfad..6642dd0539ca21dbe41d6218853380328f34d0ce 100644 (file)
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
-#include <vlc_vout.h>
 
 /*****************************************************************************
- * Local and extern prototypes.
+ * Module descriptor
  *****************************************************************************/
-static int  Activate   ( vlc_object_t * );
-static void Destroy    ( vlc_object_t * );
-static picture_t *Chain( filter_t *, picture_t * );
+static int       Activate   ( vlc_object_t * );
+static void      Destroy    ( vlc_object_t * );
+
+vlc_module_begin ()
+    set_description( N_("Video filtering using a chain of video filter modules") )
+    set_capability( "video filter2", 1 )
+    set_callbacks( Activate, Destroy )
+vlc_module_end ()
 
 /*****************************************************************************
- * Module descriptor
+ * Local prototypes.
  *****************************************************************************/
-vlc_module_begin();
-    set_description( N_("Video filtering using a chain of video filter modules") );
-    set_capability( "video filter2", 1 );
-    set_callbacks( Activate, Destroy );
-vlc_module_end();
+static picture_t *Chain         ( filter_t *, picture_t * );
+static int BufferAllocationInit ( filter_t *, void * );
 
-#define MAX_FILTERS 4
+static int BuildChromaResize( filter_t * );
+static int BuildChromaChain( filter_t *p_filter );
 
-struct filter_sys_t
-{
-    filter_t       *p_filter1; /* conversion from fmt_in to fmr_mid */
-    filter_t       *p_filter2; /* conversion from fmt_mid to fmt_out */
-    picture_t      *p_tmp;     /* temporary picture buffer */
-    video_format_t  fmt_mid;
-};
+static int CreateChain( filter_chain_t *p_chain, es_format_t *p_fmt_mid, config_chain_t * );
+static void EsFormatMergeSize( es_format_t *p_dst,
+                               const es_format_t *p_base,
+                               const es_format_t *p_size );
 
 static const vlc_fourcc_t pi_allowed_chromas[] = {
-    VLC_FOURCC('I','4','2','0'),
-    VLC_FOURCC('I','4','2','2'),
-    VLC_FOURCC('R','V','3','2'),
-    VLC_FOURCC('R','V','2','4'),
+    VLC_CODEC_I420,
+    VLC_CODEC_I422,
+    VLC_CODEC_RGB32,
+    VLC_CODEC_RGB24,
     0
 };
 
-static picture_t *get_pic( filter_t *p_filter )
-{
-    picture_t *p_pic = (picture_t *)p_filter->p_owner;
-    p_filter->p_owner = NULL;
-    return p_pic;
-}
-
-/* FIXME: this is almost like DeleteFilter in src/misc/image.c */
-static void DeleteFilter( filter_t *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 );
-}
-
-/* FIXME: this is almost like CreateFilter in src/misc/image.c */
-static filter_t *CreateFilter( vlc_object_t *p_this, video_format_t *fmt_in,
-                               video_format_t *fmt_out )
+struct filter_sys_t
 {
-    filter_t *p_filter = vlc_object_create( p_this, VLC_OBJECT_FILTER );
-    vlc_object_attach( p_filter, p_this );
-
-    p_filter->pf_vout_buffer_new = get_pic;
-
-    p_filter->fmt_in = *fmt_in;
-    p_filter->fmt_out = *fmt_out;
-
-    p_filter->p_module = module_Need( p_filter, "video filter2", NULL, 0 );
-
-    if( !p_filter->p_module )
-    {
-        DeleteFilter( p_filter );
-        return NULL;
-    }
+    filter_chain_t *p_chain;
+};
 
-    return p_filter;
-}
-
-static int CreateChain( vlc_object_t *p_this, filter_sys_t *p_sys )
-{
-    p_sys->p_filter1 = CreateFilter( p_this, &p_filter->fmt_in.video,
-                                     &p_sys->fmt_mid );
-    if( p_sys->p_filter1 )
-    {
-        p_sys->p_filter2 = CreateFilter( p_this, &p_sys->fmt_mid,
-                                         &p_filter->fmt_out.video );
-        if( p_sys->p_filter2 )
-            return VLC_SUCCESS;
-        DeleteFilter( p_sys->p_filter1 );
-    }
-    return VLC_EGENERIC;
-}
+#define CHAIN_LEVEL_MAX 1
 
 /*****************************************************************************
  * Activate: allocate a chroma function
@@ -129,77 +82,49 @@ static int CreateChain( vlc_object_t *p_this, filter_sys_t *p_sys )
 static int Activate( vlc_object_t *p_this )
 {
     filter_t *p_filter = (filter_t *)p_this;
-    static int hack = 0; /* FIXME */
+    filter_sys_t *p_sys;
+    int i_ret;
 
-    if( p_filter->fmt_in.video.i_chroma == p_filter->fmt_out.video.i_chroma )
+    const bool b_chroma = p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma;
+    const bool b_resize = p_filter->fmt_in.video.i_width  != p_filter->fmt_out.video.i_width ||
+                          p_filter->fmt_in.video.i_height != p_filter->fmt_out.video.i_height;
+    if( !b_chroma && !b_resize )
         return VLC_EGENERIC;
 
-    hack++;
-    if( hack >= MAX_FILTERS )
-    {
-        msg_Err( p_this, "Preventing chain filter reccursion (already %d long)",
-                 hack );
-        return VLC_EGENERIC;
-    }
-
-    filter_sys_t *p_sys = (filter_sys_t *)malloc( sizeof( filter_sys_t ) );
+    p_sys = p_filter->p_sys = calloc( 1, sizeof( *p_sys ) );
     if( !p_sys )
-    {
-        hack--;
         return VLC_ENOMEM;
-    }
-    memset( p_sys, 0, sizeof( filter_sys_t ) );
-    p_filter->p_sys = p_sys;
 
-    if( p_filter->fmt_in.i_width != p_filter->fmt_out.i_width ||
-        p_filter->fmt_in.i_height != p_filter->fmt_out.i_height ||
-        p_filter->fmt_in.i_visible_width != p_filter->fmt_out.i_visible_width ||
-        p_filter->fmt_in.i_visible_height != p_filter->fmt_out.i_visible_height )
+    p_sys->p_chain = filter_chain_New( p_filter, "video filter2", false, BufferAllocationInit, NULL, p_filter );
+    if( !p_sys->p_chain )
     {
-        /* Lets try resizing and then doing the chroma conversion */
-        p_sys->fmt_mid = p_filter->fmt_out.video;
-        p_sys->fmt_mid.i_chroma = p_filter->fmt_in.video.i_chroma;
-        if( CreateChain( p_this, p_sys ) == VLC_SUCCESS )
-            return VLC_SUCCESS;
-
-        /* Lets try it the other way arround (chroma and then resize) */
-        p_sys->fmt_mid = p_filter->fmt_in.video;
-        p_sys->fmt_mid.i_chroma = p_filter->fmt_out.video.i_chroma;
-        if( CreateChain( p_this, p_sys ) == VLC_SUCCESS )
-            return VLC_SUCCESS;
+        free( p_sys );
+        return VLC_EGENERIC;
     }
+
+    if( b_chroma && b_resize )
+        i_ret = BuildChromaResize( p_filter );
+    else if( b_chroma )
+        i_ret = BuildChromaChain( p_filter );
     else
+        i_ret = VLC_EGENERIC;
+
+    if( i_ret )
     {
-        /* Lets try doing a chroma chain */
-        int i;
-        p_sys->fmt_mid = p_filter->fmt_in.video;
-        for( i = 0; pi_allowed_chomas[i]; i++ )
-        {
-            p_sys->fmt_mid.i_chroma = pi_allowed_chromas[i];
-            if( CreateChain( p_this, p_sys ) == VLC_SUCCESS )
-                return VLC_SUCCESS;
-        }
+        /* Hum ... looks like this really isn't going to work. Too bad. */
+        filter_chain_Delete( p_sys->p_chain );
+        free( p_sys );
+        return VLC_EGENERIC;
     }
-
-    /* Hum ... looks like this really isn't going to work. Too bad. */
-    free( p_sys );
-    hack--;
-    return VLC_EGENERIC;
+    /* */
+    p_filter->pf_video_filter = Chain;
+    return VLC_SUCCESS;
 }
 
 static void Destroy( vlc_object_t *p_this )
 {
     filter_t *p_filter = (filter_t *)p_this;
-
-    DeleteFilter( p_filter->p_sys->filter1 );
-    DeleteFilter( p_filter->p_sys->filter2 );
-
-    if( p_filter->p_sys->p_tmp )
-    {
-        free( p_filter->p_sys->p_tmp->p_data_orig );
-        free( p_filter->p_sys->p_tmp );
-    }
-
+    filter_chain_Delete( p_filter->p_sys->p_chain );
     free( p_filter->p_sys );
 }
 
@@ -208,41 +133,159 @@ static void Destroy( vlc_object_t *p_this )
  *****************************************************************************/
 static picture_t *Chain( filter_t *p_filter, picture_t *p_pic )
 {
-    picture_t *p_outpic = p_filter->pf_vout_buffer_new( p_filter );
-    if( !p_outpic )
+    return filter_chain_VideoFilter( p_filter->p_sys->p_chain, p_pic );
+}
+
+/*****************************************************************************
+ * Builders
+ *****************************************************************************/
+static int BuildChromaResize( filter_t *p_filter )
+{
+    filter_sys_t *p_sys = p_filter->p_sys;
+    es_format_t fmt_mid;
+    int i_ret;
+
+    /* Lets try resizing and then doing the chroma conversion */
+    filter_chain_Reset( p_sys->p_chain, &p_filter->fmt_in, &p_filter->fmt_out );
+
+    msg_Dbg( p_filter, "Trying to build resize+chroma" );
+    EsFormatMergeSize( &fmt_mid, &p_filter->fmt_in, &p_filter->fmt_out );
+    i_ret = CreateChain( p_sys->p_chain, &fmt_mid, NULL );
+    es_format_Clean( &fmt_mid );
+    if( i_ret == VLC_SUCCESS )
+        return VLC_SUCCESS;
+
+    /* Lets try it the other way arround (chroma and then resize) */
+    filter_chain_Reset( p_sys->p_chain, &p_filter->fmt_in, &p_filter->fmt_out );
+
+    msg_Dbg( p_filter, "Trying to build chroma+resize" );
+    EsFormatMergeSize( &fmt_mid, &p_filter->fmt_out, &p_filter->fmt_in );
+    i_ret = CreateChain( p_sys->p_chain, &fmt_mid, NULL );
+    es_format_Clean( &fmt_mid );
+    if( i_ret == VLC_SUCCESS )
+        return VLC_SUCCESS;
+
+    return VLC_EGENERIC;
+}
+
+static int BuildChromaChain( filter_t *p_filter )
+{
+    filter_sys_t *p_sys = p_filter->p_sys;
+    es_format_t fmt_mid;
+
+    /* We have to protect ourself against a too high recursion */
+    const char *psz_option = MODULE_STRING"-level";
+    int i_level = 0;
+    for( const config_chain_t *c = p_filter->p_cfg; c != NULL; c = c->p_next)
     {
-        msg_Warn( p_filter, "can't get output picture" );
-        if( p_pic->pf_release )
-            p_pic->pf_release( p_pic );
-        return NULL;
+        if( c->psz_name && c->psz_value && !strcmp(c->psz_name, psz_option) )
+        {
+            i_level = atoi(c->psz_value);
+            if( i_level < 0 || i_level > CHAIN_LEVEL_MAX )
+            {
+                msg_Err( p_filter, "Too high level of recursion (%d)", i_level );
+                return VLC_EGENERIC;
+            }
+            break;
+        }
     }
 
+    /* */
+    int i_ret = VLC_EGENERIC;
+
+    /* */
+    config_chain_t cfg_level;
+    memset(&cfg_level, 0, sizeof(cfg_level));
+    cfg_level.psz_name = strdup(psz_option);
+    if( asprintf( &cfg_level.psz_value, "%d", i_level + 1) < 0 )
+        cfg_level.psz_value = NULL;
+    if( !cfg_level.psz_name || !cfg_level.psz_value )
+        goto exit;
 
-    if( !p_sys->p_tmp )
+    /* Now try chroma format list */
+    for( int i = 0; pi_allowed_chromas[i]; i++ )
     {
-        picture_t *p_tmp = malloc( sizeof( picture_t ) );
-        if( !p_tmp )
-            return NULL;
-        vout_AllocatePicture( VLC_OBJECT( p_vout ), p_tmp,
-                              p_sys->fmt_mid.i_chroma,
-                              p_sys->fmt_mid.i_width,
-                              p_sys->fmt_mid.i_height,
-                              p_sys->fmt_mid.i_aspect );
-        p_sys->p_tmp = p_tmp;
-        p_tmp->pf_release = NULL;
-        p_tmp->i_status = RESERVED_PICTURE;
-        p_tmp->p_sys = NULL;
+        const vlc_fourcc_t i_chroma = pi_allowed_chromas[i];
+        if( i_chroma == p_filter->fmt_in.i_codec ||
+            i_chroma == p_filter->fmt_out.i_codec )
+            continue;
+
+        msg_Dbg( p_filter, "Trying to use chroma %4.4s as middle man",
+                 (char*)&i_chroma );
+
+        es_format_Copy( &fmt_mid, &p_filter->fmt_in );
+        fmt_mid.i_codec        =
+        fmt_mid.video.i_chroma = i_chroma;
+        fmt_mid.video.i_rmask  = 0;
+        fmt_mid.video.i_gmask  = 0;
+        fmt_mid.video.i_bmask  = 0;
+        video_format_FixRgb(&fmt_mid.video);
+
+        filter_chain_Reset( p_sys->p_chain, &p_filter->fmt_in, &p_filter->fmt_out );
+
+        i_ret = CreateChain( p_sys->p_chain, &fmt_mid, &cfg_level );
+        es_format_Clean( &fmt_mid );
+
+        if( i_ret == VLC_SUCCESS )
+            break;
     }
 
-    p_sys->p_filter1->p_owner = (filter_owner_sys_t*)p_sys->p_tmp;
-    if( !p_sys->p_filter1->pf_video_filter( p_sys->p_filter1, p_pic ) )
+exit:
+    free( cfg_level.psz_name );
+    free( cfg_level.psz_value );
+    return i_ret;
+}
+
+/*****************************************************************************
+ * Buffer management
+ *****************************************************************************/
+static picture_t *BufferNew( filter_t *p_filter )
+{
+    filter_t *p_parent = (filter_t*)p_filter->p_owner;
+
+    return filter_NewPicture( p_parent );
+}
+static void BufferDel( filter_t *p_filter, picture_t *p_pic )
+{
+    filter_t *p_parent = (filter_t*)p_filter->p_owner;
+
+    return filter_DeletePicture( p_parent, p_pic );
+}
+static int BufferAllocationInit ( filter_t *p_filter, void *p_data )
+{
+    p_filter->pf_video_buffer_new = BufferNew;
+    p_filter->pf_video_buffer_del = BufferDel;
+    p_filter->p_owner = p_data;
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ *
+ *****************************************************************************/
+static int CreateChain( filter_chain_t *p_chain, es_format_t *p_fmt_mid, config_chain_t *p_cfg )
+{
+    filter_t *p_filter1;
+    if( !( p_filter1 =
+           filter_chain_AppendFilter( p_chain, NULL, p_cfg, NULL, p_fmt_mid )) )
+        return VLC_EGENERIC;
+    if( !filter_chain_AppendFilter( p_chain, NULL, p_cfg, p_fmt_mid, NULL ) )
     {
-        if( p_pic->pf_release )
-            p_pic->pf_release( p_pic );
-        return NULL;
+        filter_chain_DeleteFilter( p_chain, p_filter1 );
+        return VLC_EGENERIC;
     }
-    if( p_pic->pf_release )
-        p_pic->pf_release( p_pic );
-    p_sys->p_filter2->p_owner = (filter_owner_sys_t*)p_outpic;
-    return p_sys->p_filter2->pf_video_filter( p_sys->p_filter2, p_sys->p_tmp );
+    return VLC_SUCCESS;
 }
+
+static void EsFormatMergeSize( es_format_t *p_dst,
+                               const es_format_t *p_base,
+                               const es_format_t *p_size )
+{
+    es_format_Copy( p_dst, p_base );
+
+    p_dst->video.i_width  = p_size->video.i_width;
+    p_dst->video.i_height = p_size->video.i_height;
+
+    p_dst->video.i_visible_width  = p_size->video.i_visible_width;
+    p_dst->video.i_visible_height = p_size->video.i_visible_height;
+}
+