X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fmosaic_bridge.c;h=e9ff68b27a5de6e0f583e8cecf6a9f945c1cfb63;hb=15b6bc540ddc74f977f37abacede550c0380df6a;hp=da7e264df03928afd0c4e5b7cdf26aaa2c1730be;hpb=6b1af002854395958a4f2871ab9eed54348d542b;p=vlc

diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c
index da7e264df0..e9ff68b27a 100644
--- a/modules/stream_out/mosaic_bridge.c
+++ b/modules/stream_out/mosaic_bridge.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * mosaic_bridge.c:
  *****************************************************************************
- * Copyright (C) 2004-2005 the VideoLAN team
+ * Copyright (C) 2004-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea@videolan.org>
@@ -25,16 +25,20 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>                                                 /* ENOMEM */
-#include <stdlib.h>                                                /* free() */
-#include <string.h>                                            /* strerror() */
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
 #include <vlc_codec.h>
+#include <vlc_meta.h>
 
-#include "vlc_image.h"
+#include <vlc_image.h>
+#include <vlc_filter.h>
 
 #include "../video_filter/mosaic.h"
 
@@ -51,57 +55,19 @@ struct sout_stream_sys_t
     int i_height, i_width;
     unsigned int i_sar_num, i_sar_den;
     char *psz_id;
-    vlc_bool_t b_inited;
+    bool b_inited;
+
+    int i_chroma; /* force image format chroma */
 
-    picture_t *p_mask;
+    filter_chain_t *p_vf2;
 };
 
-#define PICTURE_RING_SIZE 4
 struct decoder_owner_sys_t
 {
-    picture_t *pp_pics[PICTURE_RING_SIZE];
-
     /* Current format in use by the output */
     video_format_t video;
 };
 
-typedef void (* pf_release_t)( picture_t * );
-static void ReleasePicture( picture_t *p_pic )
-{
-    p_pic->i_refcount--;
-
-    if ( p_pic->i_refcount <= 0 )
-    {
-        if ( p_pic->p_sys != NULL )
-        {
-            pf_release_t pf_release = (pf_release_t)p_pic->p_sys;
-            p_pic->p_sys = NULL;
-            pf_release( p_pic );
-        }
-        else
-        {
-            if( p_pic && p_pic->p_data_orig ) free( p_pic->p_data_orig );
-            if( p_pic ) free( p_pic );
-        }
-    }
-}
-
-/* copied from video_filters/erase.c . Gruik ? */
-static void LoadMask( sout_stream_t *p_stream, const char *psz_filename )
-{
-    image_handler_t *p_image;
-    video_format_t fmt_in, fmt_out;
-    memset( &fmt_in, 0, sizeof( video_format_t ) );
-    memset( &fmt_out, 0, sizeof( video_format_t ) );
-    fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
-    if( p_stream->p_sys->p_mask )
-        p_stream->p_sys->p_mask->pf_release( p_stream->p_sys->p_mask );
-    p_image = image_HandlerCreate( p_stream );
-    p_stream->p_sys->p_mask =
-        image_ReadUrl( p_image, psz_filename, &fmt_in, &fmt_out );
-    image_HandlerDelete( p_image );
-}
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
@@ -111,11 +77,28 @@ static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
 static int               Del ( sout_stream_t *, sout_stream_id_t * );
 static int               Send( sout_stream_t *, sout_stream_id_t *, block_t * );
 
-static void video_del_buffer( decoder_t *, picture_t * );
-static picture_t *video_new_buffer( decoder_t * );
+inline static void video_del_buffer_decoder( decoder_t *, picture_t * );
+inline static void video_del_buffer_filter( filter_t *, picture_t * );
+
+inline static picture_t *video_new_buffer_decoder( decoder_t * );
+inline static picture_t *video_new_buffer_filter( filter_t * );
+static picture_t *video_new_buffer( vlc_object_t *, decoder_owner_sys_t *,
+                                    es_format_t * );
+
 static void video_link_picture_decoder( decoder_t *, picture_t * );
 static void video_unlink_picture_decoder( decoder_t *, picture_t * );
 
+static int HeightCallback( vlc_object_t *, char const *,
+                           vlc_value_t, vlc_value_t, void * );
+static int WidthCallback( vlc_object_t *, char const *,
+                          vlc_value_t, vlc_value_t, void * );
+static int alphaCallback( vlc_object_t *, char const *,
+                          vlc_value_t, vlc_value_t, void * );
+static int xCallback( vlc_object_t *, char const *,
+                      vlc_value_t, vlc_value_t, void * );
+static int yCallback( vlc_object_t *, char const *,
+                      vlc_value_t, vlc_value_t, void * );
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -132,36 +115,60 @@ static void video_unlink_picture_decoder( decoder_t *, picture_t * );
 #define RATIO_TEXT N_("Sample aspect ratio")
 #define RATIO_LONGTEXT N_( \
     "Sample aspect ratio of the destination (1:1, 3:4, 2:3)." )
-#define MASK_TEXT N_("Transparency mask")
-#define MASK_LONGTEXT N_( \
-    "Alpha blending transparency mask. Use's a png alpha channel.")
-
-#define SOUT_CFG_PREFIX "sout-mosaic-bridge-"
-
-vlc_module_begin();
-    set_shortname( _( "Mosaic bridge" ) );
-    set_description(_("Mosaic bridge stream output") );
-    set_capability( "sout stream", 0 );
-    add_shortcut( "mosaic-bridge" );
-
-    add_string( SOUT_CFG_PREFIX "id", "Id", NULL, ID_TEXT, ID_LONGTEXT,
-                VLC_FALSE );
-    add_integer( SOUT_CFG_PREFIX "width", 0, NULL, WIDTH_TEXT,
-                 WIDTH_LONGTEXT, VLC_TRUE );
-    add_integer( SOUT_CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT,
-                 HEIGHT_LONGTEXT, VLC_TRUE );
-    add_string( SOUT_CFG_PREFIX "sar", "1:1", NULL, RATIO_TEXT,
-                RATIO_LONGTEXT, VLC_FALSE );
-    add_string( SOUT_CFG_PREFIX "mask", NULL, NULL, MASK_TEXT,
-                MASK_LONGTEXT, VLC_FALSE );
-
-    set_callbacks( Open, Close );
-
-    var_Create( p_module->p_libvlc_global, "mosaic-lock", VLC_VAR_MUTEX );
-vlc_module_end();
-
-static const char *ppsz_sout_options[] = {
-    "id", "width", "height", "sar", "mask", NULL
+
+#define VFILTER_TEXT N_("Video filter")
+#define VFILTER_LONGTEXT N_( \
+    "Video filters will be applied to the video stream." )
+
+#define CHROMA_TEXT N_("Image chroma")
+#define CHROMA_LONGTEXT N_( \
+    "Force the use of a specific chroma. Use YUVA if you're planning " \
+    "to use the Alphamask or Bluescreen video filter." )
+
+#define ALPHA_TEXT N_("Transparency")
+#define ALPHA_LONGTEXT N_( \
+    "Transparency of the mosaic picture." )
+
+#define X_TEXT N_("X offset")
+#define X_LONGTEXT N_( \
+    "X coordinate of the upper left corner in the mosaic if non negative." )
+
+#define Y_TEXT N_("Y offset")
+#define Y_LONGTEXT N_( \
+    "Y coordinate of the upper left corner in the mosaic if non negative." )
+
+#define CFG_PREFIX "sout-mosaic-bridge-"
+
+vlc_module_begin ()
+    set_shortname( N_( "Mosaic bridge" ) )
+    set_description(N_("Mosaic bridge stream output") )
+    set_capability( "sout stream", 0 )
+    add_shortcut( "mosaic-bridge" )
+
+    add_string( CFG_PREFIX "id", "Id", NULL, ID_TEXT, ID_LONGTEXT,
+                false )
+    add_integer( CFG_PREFIX "width", 0, NULL, WIDTH_TEXT,
+                 WIDTH_LONGTEXT, true )
+    add_integer( CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT,
+                 HEIGHT_LONGTEXT, true )
+    add_string( CFG_PREFIX "sar", "1:1", NULL, RATIO_TEXT,
+                RATIO_LONGTEXT, false )
+    add_string( CFG_PREFIX "chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
+                false )
+
+    add_module_list( CFG_PREFIX "vfilter", "video filter2",
+                     NULL, NULL, VFILTER_TEXT, VFILTER_LONGTEXT, false )
+
+    add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255, NULL,
+                            ALPHA_TEXT, ALPHA_LONGTEXT, false )
+    add_integer( CFG_PREFIX "x", -1, NULL, X_TEXT, X_LONGTEXT, false )
+    add_integer( CFG_PREFIX "y", -1, NULL, Y_TEXT, Y_LONGTEXT, false )
+
+    set_callbacks( Open, Close )
+vlc_module_end ()
+
+static const char *const ppsz_sout_options[] = {
+    "id", "width", "height", "sar", "vfilter", "chroma", "alpha", "x", "y", NULL
 };
 
 /*****************************************************************************
@@ -169,45 +176,37 @@ static const char *ppsz_sout_options[] = {
  *****************************************************************************/
 static int Open( vlc_object_t *p_this )
 {
-    sout_stream_t     *p_stream = (sout_stream_t *)p_this;
-    sout_stream_sys_t *p_sys;
-    libvlc_global_data_t *p_libvlc_global = p_this->p_libvlc_global;
-    vlc_value_t val;
+    sout_stream_t        *p_stream = (sout_stream_t *)p_this;
+    sout_stream_sys_t    *p_sys;
+    vlc_object_t         *p_libvlc = VLC_OBJECT( p_this->p_libvlc );
+    vlc_value_t           val;
+
+    config_ChainParse( p_stream, CFG_PREFIX, ppsz_sout_options,
+                       p_stream->p_cfg );
 
-    config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
-                   p_stream->p_cfg );
+    p_sys = malloc( sizeof( sout_stream_sys_t ) );
+    if( !p_sys )
+        return VLC_ENOMEM;
 
-    p_sys          = malloc( sizeof( sout_stream_sys_t ) );
     p_stream->p_sys = p_sys;
-    p_sys->b_inited = VLC_FALSE;
+    p_sys->b_inited = false;
 
-    var_Get( p_libvlc_global, "mosaic-lock", &val );
+    var_Create( p_libvlc, "mosaic-lock", VLC_VAR_MUTEX );
+    var_Get( p_libvlc, "mosaic-lock", &val );
     p_sys->p_lock = val.p_address;
 
-    var_Get( p_stream, SOUT_CFG_PREFIX "id", &val );
-    p_sys->psz_id = val.psz_string;
+    p_sys->psz_id = var_CreateGetString( p_stream, CFG_PREFIX "id" );
 
-    var_Get( p_stream, SOUT_CFG_PREFIX "height", &val );
-    p_sys->i_height = val.i_int;
+    p_sys->i_height =
+        var_CreateGetIntegerCommand( p_stream, CFG_PREFIX "height" );
+    var_AddCallback( p_stream, CFG_PREFIX "height", HeightCallback, p_stream );
 
-    var_Get( p_stream, SOUT_CFG_PREFIX "width", &val );
-    p_sys->i_width = val.i_int;
+    p_sys->i_width =
+        var_CreateGetIntegerCommand( p_stream, CFG_PREFIX "width" );
+    var_AddCallback( p_stream, CFG_PREFIX "width", WidthCallback, p_stream );
 
-    var_Get( p_stream, SOUT_CFG_PREFIX "mask", &val );
-    if( val.psz_string && *val.psz_string )
-    {
-        p_sys->p_mask = NULL;
-        LoadMask( p_stream, val.psz_string );
-        if( !p_sys->p_mask )
-            msg_Err( p_stream, "Error while loading mask (%s).",
-                     val.psz_string );
-    }
-    else
-        p_sys->p_mask = NULL;
-    free( val.psz_string );
-
-    var_Get( p_stream, SOUT_CFG_PREFIX "sar", &val );
-    if ( val.psz_string )
+    var_Get( p_stream, CFG_PREFIX "sar", &val );
+    if( val.psz_string )
     {
         char *psz_parser = strchr( val.psz_string, ':' );
 
@@ -232,6 +231,26 @@ static int Open( vlc_object_t *p_this )
         p_sys->i_sar_num = p_sys->i_sar_den = 1;
     }
 
+    p_sys->i_chroma = 0;
+    val.psz_string = var_GetNonEmptyString( p_stream, CFG_PREFIX "chroma" );
+    if( val.psz_string && strlen( val.psz_string ) >= 4 )
+    {
+        memcpy( &p_sys->i_chroma, val.psz_string, 4 );
+        msg_Dbg( p_stream, "Forcing image chroma to 0x%.8x (%4.4s)", p_sys->i_chroma, (char*)&p_sys->i_chroma );
+    }
+    free( val.psz_string );
+
+#define INT_COMMAND( a ) do { \
+    var_Create( p_stream, CFG_PREFIX #a, \
+                VLC_VAR_INTEGER | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND ); \
+    var_AddCallback( p_stream, CFG_PREFIX #a, a ## Callback, \
+                     p_stream ); } while(0)
+    INT_COMMAND( alpha );
+    INT_COMMAND( x );
+    INT_COMMAND( y );
+
+#undef INT_COMMAND
+
     p_stream->pf_add    = Add;
     p_stream->pf_del    = Del;
     p_stream->pf_send   = Send;
@@ -249,74 +268,98 @@ static void Close( vlc_object_t * p_this )
     sout_stream_t     *p_stream = (sout_stream_t*)p_this;
     sout_stream_sys_t *p_sys = p_stream->p_sys;
 
-    p_stream->p_sout->i_out_pace_nocontrol--;
+    /* Delete the callbacks */
+    var_DelCallback( p_stream, CFG_PREFIX "height", HeightCallback, p_stream );
+    var_DelCallback( p_stream, CFG_PREFIX "width", WidthCallback, p_stream );
+    var_DelCallback( p_stream, CFG_PREFIX "alpha", alphaCallback, p_stream );
+    var_DelCallback( p_stream, CFG_PREFIX "x", xCallback, p_stream );
+    var_DelCallback( p_stream, CFG_PREFIX "y", yCallback, p_stream );
 
-    if ( p_sys->psz_id )
-        free( p_sys->psz_id );
+    p_stream->p_sout->i_out_pace_nocontrol--;
 
-    if( p_stream->p_sys->p_mask )
-        p_stream->p_sys->p_mask->pf_release( p_stream->p_sys->p_mask );
+    free( p_sys->psz_id );
 
     free( p_sys );
 }
 
+static int video_filter_buffer_allocation_init( filter_t *p_filter, void *p_data )
+{
+    p_filter->pf_video_buffer_new = video_new_buffer_filter;
+    p_filter->pf_video_buffer_del = video_del_buffer_filter;
+    p_filter->p_owner = p_data;
+    return VLC_SUCCESS;
+}
+
 static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
 {
     sout_stream_sys_t *p_sys = p_stream->p_sys;
     bridge_t *p_bridge;
     bridged_es_t *p_es;
+    char *psz_chain;
     int i;
 
-    if ( p_sys->b_inited )
-    {
+    if( p_sys->b_inited || p_fmt->i_cat != VIDEO_ES )
         return NULL;
-    }
 
     /* Create decoder object */
-    p_sys->p_decoder = vlc_object_create( p_stream, VLC_OBJECT_DECODER );
+    p_sys->p_decoder = vlc_object_create( p_stream, sizeof( decoder_t ) );
+    if( !p_sys->p_decoder )
+        return NULL;
     vlc_object_attach( p_sys->p_decoder, p_stream );
     p_sys->p_decoder->p_module = NULL;
     p_sys->p_decoder->fmt_in = *p_fmt;
-    p_sys->p_decoder->b_pace_control = VLC_FALSE;
+    p_sys->p_decoder->b_pace_control = false;
     p_sys->p_decoder->fmt_out = p_sys->p_decoder->fmt_in;
     p_sys->p_decoder->fmt_out.i_extra = 0;
     p_sys->p_decoder->fmt_out.p_extra = 0;
     p_sys->p_decoder->pf_decode_video = 0;
-    p_sys->p_decoder->pf_vout_buffer_new = video_new_buffer;
-    p_sys->p_decoder->pf_vout_buffer_del = video_del_buffer;
+    p_sys->p_decoder->pf_vout_buffer_new = video_new_buffer_decoder;
+    p_sys->p_decoder->pf_vout_buffer_del = video_del_buffer_decoder;
     p_sys->p_decoder->pf_picture_link    = video_link_picture_decoder;
     p_sys->p_decoder->pf_picture_unlink  = video_unlink_picture_decoder;
     p_sys->p_decoder->p_owner = malloc( sizeof(decoder_owner_sys_t) );
-    for( i = 0; i < PICTURE_RING_SIZE; i++ )
-        p_sys->p_decoder->p_owner->pp_pics[i] = 0;
+    if( !p_sys->p_decoder->p_owner )
+    {
+        vlc_object_release( p_sys->p_decoder );
+        return NULL;
+    }
+
     p_sys->p_decoder->p_owner->video = p_fmt->video;
     //p_sys->p_decoder->p_cfg = p_sys->p_video_cfg;
 
     p_sys->p_decoder->p_module =
-        module_Need( p_sys->p_decoder, "decoder", "$codec", 0 );
+        module_need( p_sys->p_decoder, "decoder", "$codec", false );
 
-    if( !p_sys->p_decoder->p_module )
+    if( !p_sys->p_decoder->p_module || !p_sys->p_decoder->pf_decode_video )
     {
-        msg_Err( p_stream, "cannot find decoder" );
-        vlc_object_detach( p_sys->p_decoder );
-        vlc_object_destroy( p_sys->p_decoder );
+        if( p_sys->p_decoder->p_module )
+        {
+            msg_Err( p_stream, "instanciated a non video decoder" );
+            module_unneed( p_sys->p_decoder, p_sys->p_decoder->p_module );
+        }
+        else
+        {
+            msg_Err( p_stream, "cannot find decoder" );
+        }
+        free( p_sys->p_decoder->p_owner );
+        vlc_object_release( p_sys->p_decoder );
         return NULL;
     }
 
-    p_sys->b_inited = VLC_TRUE;
+    p_sys->b_inited = true;
     vlc_mutex_lock( p_sys->p_lock );
 
     p_bridge = GetBridge( p_stream );
     if ( p_bridge == NULL )
     {
-        libvlc_global_data_t *p_libvlc_global = p_stream->p_libvlc_global;
+        vlc_object_t *p_libvlc = VLC_OBJECT( p_stream->p_libvlc );
         vlc_value_t val;
 
-        p_bridge = malloc( sizeof( bridge_t ) );
+        p_bridge = xmalloc( sizeof( bridge_t ) );
 
-        var_Create( p_libvlc_global, "mosaic-struct", VLC_VAR_ADDRESS );
+        var_Create( p_libvlc, "mosaic-struct", VLC_VAR_ADDRESS );
         val.p_address = p_bridge;
-        var_Set( p_libvlc_global, "mosaic-struct", val );
+        var_Set( p_libvlc, "mosaic-struct", val );
 
         p_bridge->i_es_num = 0;
         p_bridge->pp_es = NULL;
@@ -330,20 +373,23 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
 
     if ( i == p_bridge->i_es_num )
     {
-        p_bridge->pp_es = realloc( p_bridge->pp_es,
-                                   (p_bridge->i_es_num + 1)
-                                     * sizeof(bridged_es_t *) );
+        p_bridge->pp_es = xrealloc( p_bridge->pp_es,
+                          (p_bridge->i_es_num + 1) * sizeof(bridged_es_t *) );
         p_bridge->i_es_num++;
-        p_bridge->pp_es[i] = malloc( sizeof(bridged_es_t) );
+        p_bridge->pp_es[i] = xmalloc( sizeof(bridged_es_t) );
     }
 
     p_sys->p_es = p_es = p_bridge->pp_es[i];
 
+    p_es->i_alpha = var_GetInteger( p_stream, CFG_PREFIX "alpha" );
+    p_es->i_x = var_GetInteger( p_stream, CFG_PREFIX "x" );
+    p_es->i_y = var_GetInteger( p_stream, CFG_PREFIX "y" );
+
     //p_es->fmt = *p_fmt;
     p_es->psz_id = p_sys->psz_id;
     p_es->p_picture = NULL;
     p_es->pp_last = &p_es->p_picture;
-    p_es->b_empty = VLC_FALSE;
+    p_es->b_empty = false;
 
     vlc_mutex_unlock( p_sys->p_lock );
 
@@ -351,56 +397,77 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     {
         p_sys->p_image = image_HandlerCreate( p_stream );
     }
+    else
+    {
+        p_sys->p_image = NULL;
+    }
 
     msg_Dbg( p_stream, "mosaic bridge id=%s pos=%d", p_es->psz_id, i );
 
+    /* Create user specified video filters */
+    psz_chain = var_GetNonEmptyString( p_stream, CFG_PREFIX "vfilter" );
+    msg_Dbg( p_stream, "psz_chain: %s", psz_chain );
+    if( psz_chain )
+    {
+        p_sys->p_vf2 = filter_chain_New( p_stream, "video filter2", false,
+                                         video_filter_buffer_allocation_init,
+                                         NULL, p_sys->p_decoder->p_owner );
+        es_format_t fmt;
+        es_format_Copy( &fmt, &p_sys->p_decoder->fmt_out );
+        if( p_sys->i_chroma )
+            fmt.video.i_chroma = p_sys->i_chroma;
+        filter_chain_Reset( p_sys->p_vf2, &fmt, &fmt );
+        filter_chain_AppendFromString( p_sys->p_vf2, psz_chain );
+        free( psz_chain );
+    }
+    else
+    {
+        p_sys->p_vf2 = NULL;
+    }
+
     return (sout_stream_id_t *)p_sys;
 }
 
 static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
 {
+    VLC_UNUSED(id);
     sout_stream_sys_t *p_sys = p_stream->p_sys;
     bridge_t *p_bridge;
     bridged_es_t *p_es;
-    vlc_bool_t b_last_es = VLC_TRUE;
+    bool b_last_es = true;
     int i;
 
-    if ( !p_sys->b_inited )
-    {
+    if( !p_sys->b_inited )
         return VLC_SUCCESS;
-    }
 
-    if ( p_sys->p_decoder != NULL )
+    if( p_sys->p_decoder != NULL )
     {
-        picture_t **pp_ring = p_sys->p_decoder->p_owner->pp_pics;
+        decoder_owner_sys_t *p_owner = p_sys->p_decoder->p_owner;
 
         if( p_sys->p_decoder->p_module )
-            module_Unneed( p_sys->p_decoder, p_sys->p_decoder->p_module );
-        vlc_object_detach( p_sys->p_decoder );
-        vlc_object_destroy( p_sys->p_decoder );
+            module_unneed( p_sys->p_decoder, p_sys->p_decoder->p_module );
+        if( p_sys->p_decoder->p_description )
+            vlc_meta_Delete( p_sys->p_decoder->p_description );
 
-        for( i = 0; i < PICTURE_RING_SIZE; i++ )
-        {
-            if ( pp_ring[i] != NULL )
-            {
-                if ( pp_ring[i]->p_data_orig != NULL )
-                    free( pp_ring[i]->p_data_orig );
-                free( pp_ring[i]->p_sys );
-                free( pp_ring[i] );
-            }
-        }
+        vlc_object_release( p_sys->p_decoder );
+
+        free( p_owner );
     }
 
+    /* Destroy user specified video filters */
+    if( p_sys->p_vf2 )
+        filter_chain_Delete( p_sys->p_vf2 );
+
     vlc_mutex_lock( p_sys->p_lock );
 
     p_bridge = GetBridge( p_stream );
     p_es = p_sys->p_es;
 
-    p_es->b_empty = VLC_TRUE;
+    p_es->b_empty = true;
     while ( p_es->p_picture )
     {
         picture_t *p_next = p_es->p_picture->p_next;
-        p_es->p_picture->pf_release( p_es->p_picture );
+        picture_Release( p_es->p_picture );
         p_es->p_picture = p_next;
     }
 
@@ -408,29 +475,29 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
     {
         if ( !p_bridge->pp_es[i]->b_empty )
         {
-            b_last_es = VLC_FALSE;
+            b_last_es = false;
             break;
         }
     }
 
     if ( b_last_es )
     {
-        libvlc_global_data_t *p_libvlc_global = p_stream->p_libvlc_global;
+        vlc_object_t *p_libvlc = VLC_OBJECT( p_stream->p_libvlc );
         for ( i = 0; i < p_bridge->i_es_num; i++ )
             free( p_bridge->pp_es[i] );
         free( p_bridge->pp_es );
         free( p_bridge );
-        var_Destroy( p_libvlc_global, "mosaic-struct" );
+        var_Destroy( p_libvlc, "mosaic-struct" );
     }
 
     vlc_mutex_unlock( p_sys->p_lock );
 
-    if ( p_sys->i_height || p_sys->i_width )
+    if ( p_sys->p_image )
     {
         image_HandlerDelete( p_sys->p_image );
     }
 
-    p_sys->b_inited = VLC_FALSE;
+    p_sys->b_inited = false;
 
     return VLC_SUCCESS;
 }
@@ -477,22 +544,27 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
             memset( &fmt_out, 0, sizeof(video_format_t) );
             fmt_in = p_sys->p_decoder->fmt_out.video;
 
-            if( p_sys->p_mask )
-                fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
+
+            if( p_sys->i_chroma )
+                fmt_out.i_chroma = p_sys->i_chroma;
             else
-                fmt_out.i_chroma = VLC_FOURCC('I','4','2','0');
+                fmt_out.i_chroma = VLC_CODEC_I420;
 
+            const unsigned i_fmt_in_aspect =
+                (int64_t)VOUT_ASPECT_FACTOR *
+                fmt_in.i_sar_num * fmt_in.i_width /
+                (fmt_in.i_sar_den * fmt_in.i_height);
             if ( !p_sys->i_height )
             {
                 fmt_out.i_width = p_sys->i_width;
                 fmt_out.i_height = (p_sys->i_width * VOUT_ASPECT_FACTOR
-                    * p_sys->i_sar_num / p_sys->i_sar_den / fmt_in.i_aspect)
+                    * p_sys->i_sar_num / p_sys->i_sar_den / i_fmt_in_aspect)
                       & ~0x1;
             }
             else if ( !p_sys->i_width )
             {
                 fmt_out.i_height = p_sys->i_height;
-                fmt_out.i_width = (p_sys->i_height * fmt_in.i_aspect
+                fmt_out.i_width = (p_sys->i_height * i_fmt_in_aspect
                     * p_sys->i_sar_den / p_sys->i_sar_num / VOUT_ASPECT_FACTOR)
                       & ~0x1;
             }
@@ -506,231 +578,190 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
 
             p_new_pic = image_Convert( p_sys->p_image,
                                        p_pic, &fmt_in, &fmt_out );
-            if ( p_new_pic == NULL )
+            if( p_new_pic == NULL )
             {
                 msg_Err( p_stream, "image conversion failed" );
+                picture_Release( p_pic );
                 continue;
             }
-
-            if( p_sys->p_mask )
-            {
-                plane_t *p_mask = p_sys->p_mask->p+A_PLANE;
-                plane_t *p_apic = p_new_pic->p+A_PLANE;
-                if(    p_mask->i_visible_pitch
-                    != p_apic->i_visible_pitch
-                    || p_mask->i_visible_lines
-                    != p_apic->i_visible_lines )
-                {
-                    msg_Warn( p_stream,
-                              "Mask size (%d x %d) and image size (%d x %d) "
-                              "don't match. The mask will not be applied.",
-                              p_mask->i_visible_pitch,
-                              p_mask->i_visible_lines,
-                              p_apic->i_visible_pitch,
-                              p_apic->i_visible_lines );
-                }
-                else
-                {
-                    if( p_mask->i_pitch != p_apic->i_pitch
-                    ||  p_mask->i_lines != p_apic->i_lines )
-                    {
-                        /* visible plane sizes match ... but not the undelying
-                         * buffer. I'm not sure that this can happen,
-                         * but better safe than sorry. */
-                        int i_line;
-                        int i_lines = p_mask->i_visible_lines;
-                        uint8_t *p_src = p_mask->p_pixels;
-                        uint8_t *p_dst = p_apic->p_pixels;
-                        int i_src_pitch = p_mask->i_pitch;
-                        int i_dst_pitch = p_apic->i_pitch;
-                        int i_visible_pitch = p_mask->i_visible_pitch;
-                        for( i_line = 0; i_line < i_lines; i_line++,
-                             p_src += i_src_pitch, p_dst += i_dst_pitch )
-                        {
-                            p_stream->p_libvlc->pf_memcpy(
-                                p_dst, p_src, i_visible_pitch );
-                        }
-                    }
-                    else
-                    {
-                        /* plane sizes match */
-                        p_stream->p_libvlc->pf_memcpy(
-                            p_apic->p_pixels, p_mask->p_pixels,
-                            p_mask->i_pitch * p_mask->i_lines );
-                    }
-                }
-            }
         }
         else
         {
-            p_new_pic = (picture_t*)malloc( sizeof(picture_t) );
-            vout_AllocatePicture( p_stream, p_new_pic, p_pic->format.i_chroma,
-                                  p_pic->format.i_width, p_pic->format.i_height,
-                                  p_sys->p_decoder->fmt_out.video.i_aspect );
+            /* TODO: chroma conversion if needed */
+
+            p_new_pic = picture_New( p_pic->format.i_chroma,
+                                     p_pic->format.i_width, p_pic->format.i_height,
+                                     p_sys->p_decoder->fmt_out.video.i_sar_num,
+                                     p_sys->p_decoder->fmt_out.video.i_sar_den );
+            if( !p_new_pic )
+            {
+                picture_Release( p_pic );
+                msg_Err( p_stream, "image allocation failed" );
+                continue;
+            }
 
-            vout_CopyPicture( p_stream, p_new_pic, p_pic );
+            picture_Copy( p_new_pic, p_pic );
         }
+        picture_Release( p_pic );
 
-        p_new_pic->i_refcount = 1;
-        p_new_pic->i_status = DESTROYED_PICTURE;
-        p_new_pic->i_type   = DIRECT_PICTURE;
-        p_new_pic->p_sys = (picture_sys_t *)p_new_pic->pf_release;
-        p_new_pic->pf_release = ReleasePicture;
-        p_new_pic->date = p_pic->date;
+        if( p_sys->p_vf2 )
+            p_new_pic = filter_chain_VideoFilter( p_sys->p_vf2, p_new_pic );
 
-        p_pic->pf_release( p_pic );
         PushPicture( p_stream, p_new_pic );
     }
 
     return VLC_SUCCESS;
 }
 
-struct picture_sys_t
+inline static picture_t *video_new_buffer_decoder( decoder_t *p_dec )
 {
-    vlc_object_t *p_owner;
-    vlc_bool_t b_dead;
-};
+    return video_new_buffer( VLC_OBJECT( p_dec ),
+                             (decoder_owner_sys_t *)p_dec->p_owner,
+                             &p_dec->fmt_out );
+}
 
-static void video_release_buffer( picture_t *p_pic )
+inline static picture_t *video_new_buffer_filter( filter_t *p_filter )
 {
-    if( p_pic && !p_pic->i_refcount && p_pic->pf_release && p_pic->p_sys )
-    {
-        video_del_buffer( (decoder_t *)p_pic->p_sys->p_owner, p_pic );
-    }
-    else if( p_pic && p_pic->i_refcount > 0 ) p_pic->i_refcount--;
+    return video_new_buffer( VLC_OBJECT( p_filter ),
+                             (decoder_owner_sys_t *)p_filter->p_owner,
+                             &p_filter->fmt_out );
 }
 
-static picture_t *video_new_buffer( decoder_t *p_dec )
+static picture_t *video_new_buffer( vlc_object_t *p_this,
+                                    decoder_owner_sys_t *p_sys,
+                                    es_format_t *fmt_out )
 {
-    decoder_owner_sys_t *p_sys = (decoder_owner_sys_t *)p_dec->p_owner;
-    picture_t **pp_ring = p_dec->p_owner->pp_pics;
-    picture_t *p_pic;
-    int i;
-
-    if( p_dec->fmt_out.video.i_width != p_sys->video.i_width ||
-        p_dec->fmt_out.video.i_height != p_sys->video.i_height ||
-        p_dec->fmt_out.video.i_chroma != p_sys->video.i_chroma ||
-        p_dec->fmt_out.video.i_aspect != p_sys->video.i_aspect )
+    VLC_UNUSED(p_this);
+    if( fmt_out->video.i_width != p_sys->video.i_width ||
+        fmt_out->video.i_height != p_sys->video.i_height ||
+        fmt_out->video.i_chroma != p_sys->video.i_chroma ||
+        (int64_t)fmt_out->video.i_sar_num * p_sys->video.i_sar_den !=
+        (int64_t)fmt_out->video.i_sar_den * p_sys->video.i_sar_num )
     {
-        if( !p_dec->fmt_out.video.i_sar_num ||
-            !p_dec->fmt_out.video.i_sar_den )
-        {
-            p_dec->fmt_out.video.i_sar_num =
-              p_dec->fmt_out.video.i_aspect * p_dec->fmt_out.video.i_height;
-
-            p_dec->fmt_out.video.i_sar_den = VOUT_ASPECT_FACTOR *
-              p_dec->fmt_out.video.i_width;
-        }
+        vlc_ureduce( &fmt_out->video.i_sar_num,
+                     &fmt_out->video.i_sar_den,
+                     fmt_out->video.i_sar_num,
+                     fmt_out->video.i_sar_den, 0 );
 
-        vlc_ureduce( &p_dec->fmt_out.video.i_sar_num,
-                     &p_dec->fmt_out.video.i_sar_den,
-                     p_dec->fmt_out.video.i_sar_num,
-                     p_dec->fmt_out.video.i_sar_den, 0 );
-
-        if( !p_dec->fmt_out.video.i_visible_width ||
-            !p_dec->fmt_out.video.i_visible_height )
+        if( !fmt_out->video.i_visible_width ||
+            !fmt_out->video.i_visible_height )
         {
-            p_dec->fmt_out.video.i_visible_width =
-                p_dec->fmt_out.video.i_width;
-            p_dec->fmt_out.video.i_visible_height =
-                p_dec->fmt_out.video.i_height;
+            fmt_out->video.i_visible_width = fmt_out->video.i_width;
+            fmt_out->video.i_visible_height = fmt_out->video.i_height;
         }
 
-        p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
-        p_sys->video = p_dec->fmt_out.video;
-
-        for( i = 0; i < PICTURE_RING_SIZE; i++ )
-        {
-            if ( pp_ring[i] != NULL )
-            {
-                if ( pp_ring[i]->i_status == DESTROYED_PICTURE )
-                {
-                    if ( pp_ring[i]->p_data_orig != NULL )
-                        free( pp_ring[i]->p_data_orig );
-                    free( pp_ring[i]->p_sys );
-                    free( pp_ring[i] );
-                }
-                else
-                {
-                    pp_ring[i]->p_sys->b_dead = VLC_TRUE;
-                }
-                pp_ring[i] = NULL;
-            }
-        }
+        fmt_out->video.i_chroma = fmt_out->i_codec;
+        p_sys->video = fmt_out->video;
     }
 
-    /* Find an empty space in the picture ring buffer */
-    for( i = 0; i < PICTURE_RING_SIZE; i++ )
-    {
-        if( pp_ring[i] != NULL && pp_ring[i]->i_status == DESTROYED_PICTURE )
-        {
-            pp_ring[i]->i_status = RESERVED_PICTURE;
-            return pp_ring[i];
-        }
-    }
-    for( i = 0; i < PICTURE_RING_SIZE; i++ )
-    {
-        if( pp_ring[i] == NULL ) break;
-    }
+    /* */
+    fmt_out->video.i_chroma = fmt_out->i_codec;
 
-    if( i == PICTURE_RING_SIZE )
-    {
-        msg_Err( p_dec, "decoder/filter is leaking pictures, "
-                 "resetting its ring buffer" );
+    return picture_NewFromFormat( &fmt_out->video );
+}
 
-        for( i = 0; i < PICTURE_RING_SIZE; i++ )
-        {
-            pp_ring[i]->pf_release( pp_ring[i] );
-        }
+inline static void video_del_buffer_decoder( decoder_t *p_this,
+                                             picture_t *p_pic )
+{
+    VLC_UNUSED(p_this);
+    picture_Release( p_pic );
+}
 
-        i = 0;
-    }
+inline static void video_del_buffer_filter( filter_t *p_this,
+                                            picture_t *p_pic )
+{
+    VLC_UNUSED(p_this);
+    picture_Release( p_pic );
+}
 
-    p_pic = malloc( sizeof(picture_t) );
-    p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
-    vout_AllocatePicture( VLC_OBJECT(p_dec), p_pic,
-                          p_dec->fmt_out.video.i_chroma,
-                          p_dec->fmt_out.video.i_width,
-                          p_dec->fmt_out.video.i_height,
-                          p_dec->fmt_out.video.i_aspect );
+static void video_link_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
+{
+    VLC_UNUSED(p_dec);
+    picture_Hold( p_pic );
+}
+
+static void video_unlink_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
+{
+    VLC_UNUSED(p_dec);
+    picture_Release( p_pic );
+}
 
-    if( !p_pic->i_planes )
-    {
-        free( p_pic );
-        return NULL;
-    }
 
-    p_pic->pf_release = video_release_buffer;
-    p_pic->p_sys = malloc( sizeof(picture_sys_t) );
-    p_pic->p_sys->p_owner = VLC_OBJECT(p_dec);
-    p_pic->p_sys->b_dead = VLC_FALSE;
-    p_pic->i_status = RESERVED_PICTURE;
+/**********************************************************************
+ * Callback to update (some) params on the fly
+ **********************************************************************/
+static int HeightCallback( vlc_object_t *p_this, char const *psz_var,
+                           vlc_value_t oldval, vlc_value_t newval,
+                           void *p_data )
+{
+    VLC_UNUSED(p_this); VLC_UNUSED(oldval); VLC_UNUSED(psz_var);
+    sout_stream_t *p_stream = (sout_stream_t *)p_data;
+    sout_stream_sys_t *p_sys = p_stream->p_sys;
 
-    pp_ring[i] = p_pic;
+    /* We create the handler before updating the value in p_sys
+     * so we don't have to worry about locking */
+    if( !p_sys->p_image && newval.i_int )
+        p_sys->p_image = image_HandlerCreate( p_stream );
+    p_sys->i_height = newval.i_int;
 
-    return p_pic;
+    return VLC_SUCCESS;
 }
 
-static void video_del_buffer( decoder_t *p_this, picture_t *p_pic )
+static int WidthCallback( vlc_object_t *p_this, char const *psz_var,
+                           vlc_value_t oldval, vlc_value_t newval,
+                           void *p_data )
 {
-    p_pic->i_refcount = 0;
-    p_pic->i_status = DESTROYED_PICTURE;
-    if ( p_pic->p_sys->b_dead )
-    {
-        if ( p_pic->p_data_orig != NULL )
-            free( p_pic->p_data_orig );
-        free( p_pic->p_sys );
-        free( p_pic );
-    }
+    VLC_UNUSED(p_this); VLC_UNUSED(oldval); VLC_UNUSED(psz_var);
+    sout_stream_t *p_stream = (sout_stream_t *)p_data;
+    sout_stream_sys_t *p_sys = p_stream->p_sys;
+
+    /* We create the handler before updating the value in p_sys
+     * so we don't have to worry about locking */
+    if( !p_sys->p_image && newval.i_int )
+        p_sys->p_image = image_HandlerCreate( p_stream );
+    p_sys->i_width = newval.i_int;
+
+    return VLC_SUCCESS;
 }
 
-static void video_link_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
+static int alphaCallback( vlc_object_t *p_this, char const *psz_var,
+                          vlc_value_t oldval, vlc_value_t newval,
+                          void *p_data )
 {
-    p_pic->i_refcount++;
+    VLC_UNUSED(p_this); VLC_UNUSED(oldval); VLC_UNUSED(psz_var);
+    sout_stream_t *p_stream = (sout_stream_t *)p_data;
+    sout_stream_sys_t *p_sys = p_stream->p_sys;
+
+    if( p_sys->p_es )
+        p_sys->p_es->i_alpha = newval.i_int;
+
+    return VLC_SUCCESS;
 }
 
-static void video_unlink_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
+static int xCallback( vlc_object_t *p_this, char const *psz_var,
+                      vlc_value_t oldval, vlc_value_t newval,
+                      void *p_data )
 {
-    video_release_buffer( p_pic );
+    VLC_UNUSED(p_this); VLC_UNUSED(oldval); VLC_UNUSED(psz_var);
+    sout_stream_t *p_stream = (sout_stream_t *)p_data;
+    sout_stream_sys_t *p_sys = p_stream->p_sys;
+
+    if( p_sys->p_es )
+        p_sys->p_es->i_x = newval.i_int;
+
+    return VLC_SUCCESS;
 }
 
+static int yCallback( vlc_object_t *p_this, char const *psz_var,
+                      vlc_value_t oldval, vlc_value_t newval,
+                      void *p_data )
+{
+    VLC_UNUSED(p_this); VLC_UNUSED(oldval); VLC_UNUSED(psz_var);
+    sout_stream_t *p_stream = (sout_stream_t *)p_data;
+    sout_stream_sys_t *p_sys = p_stream->p_sys;
+
+    if( p_sys->p_es )
+        p_sys->p_es->i_y = newval.i_int;
+
+    return VLC_SUCCESS;
+}