]> git.sesse.net Git - vlc/blobdiff - src/video_output/vout_subpictures.c
Fixed spu_RenderSubpictures prototype.
[vlc] / src / video_output / vout_subpictures.c
index 3be8471213ab86487172ba0f33bd89019f439e08..5cff7dfb2656038198cd8a6d655e97fa9364944e 100644 (file)
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                                /* free() */
-#include <stdio.h>                                              /* sprintf() */
-#include <string.h>                                            /* strerror() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_block.h>
 #include <vlc_filter.h>
 #include <vlc_osd.h>
+#include "../libvlc.h"
+
+#include <assert.h>
 
 /*****************************************************************************
  * Local prototypes
@@ -53,16 +56,24 @@ static picture_t *spu_new_video_buffer( filter_t * );
 static void spu_del_video_buffer( filter_t *, picture_t * );
 
 static int spu_ParseChain( spu_t * );
-static void spu_DeleteChain( spu_t * );
 static int SubFilterCallback( vlc_object_t *, char const *,
                               vlc_value_t, vlc_value_t, void * );
 
+static int SubFilterAllocationInit( filter_t *, void * );
+static void SubFilterAllocationClean( filter_t * );
 struct filter_owner_sys_t
 {
     spu_t *p_spu;
     int i_channel;
 };
 
+#define SCALE_UNIT (1000)
+
+/* */
+static void SpuRenderCreateAndLoadText( spu_t *p_spu );
+static void SpuRenderCreateAndLoadScale( spu_t *p_spu );
+static void FilterRelease( filter_t *p_filter );
+
 /**
  * Creates the subpicture unit
  *
@@ -71,7 +82,8 @@ struct filter_owner_sys_t
 spu_t *__spu_Create( vlc_object_t *p_this )
 {
     int i_index;
-    spu_t *p_spu = vlc_object_create( p_this, VLC_OBJECT_SPU );
+    spu_t *p_spu = vlc_custom_create( p_this, sizeof( spu_t ),
+                                      VLC_OBJECT_GENERIC, "subpicture" );
 
     for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++)
     {
@@ -81,16 +93,25 @@ spu_t *__spu_Create( vlc_object_t *p_this )
     p_spu->p_blend = NULL;
     p_spu->p_text = NULL;
     p_spu->p_scale = NULL;
-    p_spu->i_filter = 0;
+    p_spu->p_scale_yuvp = NULL;
     p_spu->pf_control = spu_vaControlDefault;
 
     /* Register the default subpicture channel */
     p_spu->i_channel = 2;
 
-    vlc_mutex_init( p_this, &p_spu->subpicture_lock );
+    vlc_mutex_init( &p_spu->subpicture_lock );
 
     vlc_object_attach( p_spu, p_this );
 
+    p_spu->p_chain = filter_chain_New( p_spu, "sub filter", false,
+                                       SubFilterAllocationInit,
+                                       SubFilterAllocationClean,
+                                       p_spu );
+
+    /* Load text and scale module */
+    SpuRenderCreateAndLoadText( p_spu );
+    SpuRenderCreateAndLoadScale( p_spu );
+
     return p_spu;
 }
 
@@ -113,60 +134,20 @@ int spu_Init( spu_t *p_spu )
 
     spu_ParseChain( p_spu );
 
-    return VLC_EGENERIC;
+    return VLC_SUCCESS;
 }
 
 int spu_ParseChain( spu_t *p_spu )
 {
-    char *psz_parser;
-    vlc_value_t val;
-    var_Get( p_spu, "sub-filter", &val );
-    psz_parser = val.psz_string;
-
-    while( psz_parser && *psz_parser )
+    char *psz_parser = var_GetString( p_spu, "sub-filter" );
+    if( filter_chain_AppendFromString( p_spu->p_chain, psz_parser ) < 0 )
     {
-        config_chain_t *p_cfg;
-        char *psz_name;
-
-        psz_parser = config_ChainCreate( &psz_name, &p_cfg, psz_parser );
-
-        msg_Dbg( p_spu, "adding sub-filter: %s", psz_name );
-
-        p_spu->pp_filter[p_spu->i_filter] =
-            vlc_object_create( p_spu, VLC_OBJECT_FILTER );
-        vlc_object_attach( p_spu->pp_filter[p_spu->i_filter], p_spu );
-        p_spu->pp_filter[p_spu->i_filter]->pf_sub_buffer_new = sub_new_buffer;
-        p_spu->pp_filter[p_spu->i_filter]->pf_sub_buffer_del = sub_del_buffer;
-        p_spu->pp_filter[p_spu->i_filter]->p_cfg = p_cfg;
-        p_spu->pp_filter[p_spu->i_filter]->p_module =
-            module_Need( p_spu->pp_filter[p_spu->i_filter],
-                         "sub filter", psz_name, VLC_TRUE );
-        if( p_spu->pp_filter[p_spu->i_filter]->p_module )
-        {
-            filter_owner_sys_t *p_sys = malloc( sizeof(filter_owner_sys_t) );
-            p_spu->pp_filter[p_spu->i_filter]->p_owner = p_sys;
-            spu_Control( p_spu, SPU_CHANNEL_REGISTER, &p_sys->i_channel );
-            p_sys->p_spu = p_spu;
-            p_spu->i_filter++;
-        }
-        else
-        {
-            msg_Dbg( p_spu, "no sub filter found" );
-            config_ChainDestroy( p_spu->pp_filter[p_spu->i_filter]->p_cfg );
-            vlc_object_detach( p_spu->pp_filter[p_spu->i_filter] );
-            vlc_object_destroy( p_spu->pp_filter[p_spu->i_filter] );
-        }
-
-        if( p_spu->i_filter >= 10 )
-        {
-            msg_Dbg( p_spu, "can't add anymore filters" );
-        }
-
-        free( psz_name );
+        free( psz_parser );
+        return VLC_EGENERIC;
     }
-    if( val.psz_string ) free( val.psz_string );
 
-    return VLC_EGENERIC;
+    free( psz_parser );
+    return VLC_SUCCESS;
 }
 
 /**
@@ -178,8 +159,6 @@ void spu_Destroy( spu_t *p_spu )
 {
     int i_index;
 
-    vlc_object_detach( p_spu );
-
     /* Destroy all remaining subpictures */
     for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ )
     {
@@ -190,50 +169,21 @@ void spu_Destroy( spu_t *p_spu )
     }
 
     if( p_spu->p_blend )
-    {
-        if( p_spu->p_blend->p_module )
-            module_Unneed( p_spu->p_blend, p_spu->p_blend->p_module );
-
-        vlc_object_detach( p_spu->p_blend );
-        vlc_object_destroy( p_spu->p_blend );
-    }
+        FilterRelease( p_spu->p_blend );
 
     if( p_spu->p_text )
-    {
-        if( p_spu->p_text->p_module )
-            module_Unneed( p_spu->p_text, p_spu->p_text->p_module );
+        FilterRelease( p_spu->p_text );
 
-        vlc_object_detach( p_spu->p_text );
-        vlc_object_destroy( p_spu->p_text );
-    }
+    if( p_spu->p_scale_yuvp )
+        FilterRelease( p_spu->p_scale_yuvp );
 
     if( p_spu->p_scale )
-    {
-        if( p_spu->p_scale->p_module )
-            module_Unneed( p_spu->p_scale, p_spu->p_scale->p_module );
+        FilterRelease( p_spu->p_scale );
 
-        vlc_object_detach( p_spu->p_scale );
-        vlc_object_destroy( p_spu->p_scale );
-    }
-
-    spu_DeleteChain( p_spu );
+    filter_chain_Delete( p_spu->p_chain );
 
     vlc_mutex_destroy( &p_spu->subpicture_lock );
-    vlc_object_destroy( p_spu );
-}
-
-static void spu_DeleteChain( spu_t *p_spu )
-{
-    if( p_spu->i_filter )
-    while( p_spu->i_filter-- )
-    {
-        module_Unneed( p_spu->pp_filter[p_spu->i_filter],
-                       p_spu->pp_filter[p_spu->i_filter]->p_module );
-        free( p_spu->pp_filter[p_spu->i_filter]->p_owner );
-        config_ChainDestroy( p_spu->pp_filter[p_spu->i_filter]->p_cfg );
-        vlc_object_detach( p_spu->pp_filter[p_spu->i_filter] );
-        vlc_object_destroy( p_spu->pp_filter[p_spu->i_filter] );
-    }
+    vlc_object_release( p_spu );
 }
 
 /**
@@ -242,7 +192,7 @@ static void spu_DeleteChain( spu_t *p_spu )
  * \param p_this the object in which to destroy the subpicture unit
  * \param b_attach to select attach or detach
  */
-void spu_Attach( spu_t *p_spu, vlc_object_t *p_this, vlc_bool_t b_attach )
+void spu_Attach( spu_t *p_spu, vlc_object_t *p_this, bool b_attach )
 {
     vlc_object_t *p_input;
 
@@ -263,45 +213,51 @@ void spu_Attach( spu_t *p_spu, vlc_object_t *p_this, vlc_bool_t b_attach )
     }
 }
 
+
+/* */
+static void RegionPictureRelease( picture_t *p_pic )
+{
+    free( p_pic->p_data_orig );
+    /* We use pf_release nullity to know if the picture has already been released. */
+    p_pic->pf_release = NULL;
+}
+
 /**
  * Create a subpicture region
  *
  * \param p_this vlc_object_t
  * \param p_fmt the format that this subpicture region should have
  */
-static void RegionPictureRelease( picture_t *p_pic )
-{
-    if( p_pic->p_data_orig ) free( p_pic->p_data_orig );
-}
 subpicture_region_t *__spu_CreateRegion( vlc_object_t *p_this,
                                          video_format_t *p_fmt )
 {
-    subpicture_region_t *p_region = malloc( sizeof(subpicture_region_t) );
-    if( !p_region ) return NULL;
-
-    memset( p_region, 0, sizeof(subpicture_region_t) );
-    p_region->p_next = 0;
-    p_region->p_cache = 0;
-    p_region->fmt = *p_fmt;
-    p_region->psz_text = 0;
-    p_region->p_style = NULL;
+    subpicture_region_t *p_region = calloc( 1, sizeof(*p_region ) );
+    if( !p_region )
+        return NULL;
 
+    /* FIXME is that *really* wanted? */
     if( p_fmt->i_chroma == VLC_FOURCC('Y','U','V','P') )
-        p_fmt->p_palette = p_region->fmt.p_palette =
-            malloc( sizeof(video_palette_t) );
-    else p_fmt->p_palette = p_region->fmt.p_palette = NULL;
+        p_fmt->p_palette = calloc( 1, sizeof(video_palette_t) );
+    else
+        p_fmt->p_palette = NULL;    /* XXX and that above all? */
 
-    p_region->picture.p_data_orig = NULL;
+    p_region->fmt = *p_fmt;
+    p_region->i_alpha = 0xff;
+    p_region->p_next = NULL;
+    p_region->p_cache = NULL;
+    p_region->psz_text = NULL;
+    p_region->p_style = NULL;
 
-    if( p_fmt->i_chroma == VLC_FOURCC('T','E','X','T') ) return p_region;
+    if( p_fmt->i_chroma == VLC_FOURCC('T','E','X','T') )
+        return p_region;
 
     vout_AllocatePicture( p_this, &p_region->picture, p_fmt->i_chroma,
                           p_fmt->i_width, p_fmt->i_height, p_fmt->i_aspect );
 
     if( !p_region->picture.i_planes )
     {
+        free( p_fmt->p_palette );
         free( p_region );
-        if( p_fmt->p_palette ) free( p_fmt->p_palette );
         return NULL;
     }
 
@@ -310,37 +266,6 @@ subpicture_region_t *__spu_CreateRegion( vlc_object_t *p_this,
     return p_region;
 }
 
-/**
- * Make a subpicture region from an existing picture_t
- *
- * \param p_this vlc_object_t
- * \param p_fmt the format that this subpicture region should have
- * \param p_pic a pointer to the picture creating the region (not freed)
- */
-subpicture_region_t *__spu_MakeRegion( vlc_object_t *p_this,
-                                       video_format_t *p_fmt,
-                                       picture_t *p_pic )
-{
-    subpicture_region_t *p_region = malloc( sizeof(subpicture_region_t) );
-    (void)p_this;
-    memset( p_region, 0, sizeof(subpicture_region_t) );
-    p_region->p_next = 0;
-    p_region->p_cache = 0;
-    p_region->fmt = *p_fmt;
-    p_region->psz_text = 0;
-    p_region->p_style = NULL;
-
-    if( p_fmt->i_chroma == VLC_FOURCC('Y','U','V','P') )
-        p_fmt->p_palette = p_region->fmt.p_palette =
-            malloc( sizeof(video_palette_t) );
-    else p_fmt->p_palette = p_region->fmt.p_palette = NULL;
-
-    memcpy( &p_region->picture, p_pic, sizeof(picture_t) );
-    p_region->picture.pf_release = RegionPictureRelease;
-
-    return p_region;
-}
-
 /**
  * Destroy a subpicture region
  *
@@ -349,16 +274,17 @@ subpicture_region_t *__spu_MakeRegion( vlc_object_t *p_this,
  */
 void __spu_DestroyRegion( vlc_object_t *p_this, subpicture_region_t *p_region )
 {
-    if( !p_region ) return;
-    if( p_region->picture.pf_release )
-        p_region->picture.pf_release( &p_region->picture );
-    if( p_region->fmt.p_palette ) free( p_region->fmt.p_palette );
-    if( p_region->p_cache ) __spu_DestroyRegion( p_this, p_region->p_cache );
+    if( !p_region )
+        return;
 
-    if( p_region->psz_text )
-        free( p_region->psz_text );
-    if( p_region->psz_html )
-        free( p_region->psz_html );
+    picture_Release( &p_region->picture );
+
+    free( p_region->fmt.p_palette );
+    if( p_region->p_cache )
+        __spu_DestroyRegion( p_this, p_region->p_cache );
+
+    free( p_region->psz_text );
+    free( p_region->psz_html );
     //free( p_region->p_style ); FIXME --fenrir plugin does not allocate the memory for it. I think it might lead to segfault, video renderer can live longer than the decoder
     free( p_region );
 }
@@ -435,18 +361,17 @@ subpicture_t *spu_CreateSubpicture( spu_t *p_spu )
     /* Copy subpicture information, set some default values */
     memset( p_subpic, 0, sizeof(subpicture_t) );
     p_subpic->i_status   = RESERVED_SUBPICTURE;
-    p_subpic->b_absolute = VLC_TRUE;
-    p_subpic->b_pausable = VLC_FALSE;
-    p_subpic->b_fade     = VLC_FALSE;
+    p_subpic->b_absolute = true;
+    p_subpic->b_fade     = false;
+    p_subpic->b_subtitle = false;
     p_subpic->i_alpha    = 0xFF;
-    p_subpic->p_region   = 0;
-    p_subpic->pf_render  = 0;
-    p_subpic->pf_destroy = 0;
-    p_subpic->p_sys      = 0;
+    p_subpic->p_region   = NULL;
+    p_subpic->pf_render  = NULL;
+    p_subpic->pf_destroy = NULL;
+    p_subpic->p_sys      = NULL;
     vlc_mutex_unlock( &p_spu->subpicture_lock );
 
     p_subpic->pf_create_region = __spu_CreateRegion;
-    p_subpic->pf_make_region = __spu_MakeRegion;
     p_subpic->pf_destroy_region = __spu_DestroyRegion;
 
     return p_subpic;
@@ -502,364 +427,661 @@ void spu_DestroySubpicture( spu_t *p_spu, subpicture_t *p_subpic )
  *****************************************************************************
  * This function renders all sub picture units in the list.
  *****************************************************************************/
-void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
-                            picture_t *p_pic_dst, picture_t *p_pic_src,
-                            subpicture_t *p_subpic,
-                            int i_scale_width_orig, int i_scale_height_orig )
+static void FilterRelease( filter_t *p_filter )
 {
-    /* Get lock */
-    vlc_mutex_lock( &p_spu->subpicture_lock );
+    if( p_filter->p_module )
+        module_Unneed( p_filter, p_filter->p_module );
+
+    vlc_object_detach( p_filter );
+    vlc_object_release( p_filter );
+}
+
+static void SpuRenderCreateBlend( spu_t *p_spu, vlc_fourcc_t i_chroma, int i_aspect )
+{
+    filter_t *p_blend;
+
+    assert( !p_spu->p_blend );
+
+    p_spu->p_blend =
+    p_blend        = vlc_custom_create( p_spu, sizeof(filter_t),
+                                        VLC_OBJECT_GENERIC, "blend" );
+    if( !p_blend )
+        return;
+
+    es_format_Init( &p_blend->fmt_in, VIDEO_ES, 0 );
+
+    es_format_Init( &p_blend->fmt_out, VIDEO_ES, 0 );
+    p_blend->fmt_out.video.i_x_offset = 0;
+    p_blend->fmt_out.video.i_y_offset = 0;
+    p_blend->fmt_out.video.i_chroma = i_chroma;
+    p_blend->fmt_out.video.i_aspect = i_aspect;
+
+    /* The blend module will be loaded when needed with the real
+    * input format */
+    p_blend->p_module = NULL;
+
+    /* */
+    vlc_object_attach( p_blend, p_spu );
+}
+static void SpuRenderUpdateBlend( spu_t *p_spu, int i_out_width, int i_out_height, const video_format_t *p_in_fmt )
+{
+    filter_t *p_blend = p_spu->p_blend;
+
+    assert( p_blend );
 
-    /* Check i_status again to make sure spudec hasn't destroyed the subpic */
-    while( p_subpic != NULL && p_subpic->i_status != FREE_SUBPICTURE )
+    /* */
+    if( p_blend->p_module && p_blend->fmt_in.video.i_chroma != p_in_fmt->i_chroma )
     {
-        subpicture_region_t *p_region = p_subpic->p_region;
-        int i_scale_width, i_scale_height;
-        int i_subpic_x = p_subpic->i_x;
+        /* The chroma is not the same, we need to reload the blend module
+         * XXX to match the old behaviour just test !p_blend->fmt_in.video.i_chroma */
+        module_Unneed( p_blend, p_blend->p_module );
+        p_blend->p_module = NULL;
+    }
 
-        /* Load the blending module */
-        if( !p_spu->p_blend && p_region )
-        {
-            p_spu->p_blend = vlc_object_create( p_spu, VLC_OBJECT_FILTER );
-            vlc_object_attach( p_spu->p_blend, p_spu );
-            p_spu->p_blend->fmt_out.video.i_x_offset =
-                p_spu->p_blend->fmt_out.video.i_y_offset = 0;
-            p_spu->p_blend->fmt_out.video.i_aspect = p_fmt->i_aspect;
-            p_spu->p_blend->fmt_out.video.i_chroma = p_fmt->i_chroma;
-            p_spu->p_blend->fmt_in.video.i_chroma = VLC_FOURCC('Y','U','V','P');
-            /* XXX: We'll also be using it for YUVA and RGBA blending ... */
-
-            p_spu->p_blend->p_module =
-                module_Need( p_spu->p_blend, "video blending", 0, 0 );
-        }
+    /* */
+    p_blend->fmt_in.video = *p_in_fmt;
 
-        /* Load the text rendering module */
-        if( !p_spu->p_text && p_region && p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') )
-        {
-            char *psz_modulename = NULL;
+    /* */
+    p_blend->fmt_out.video.i_width =
+    p_blend->fmt_out.video.i_visible_width = i_out_width;
+    p_blend->fmt_out.video.i_height =
+    p_blend->fmt_out.video.i_visible_height = i_out_height;
 
-            p_spu->p_text = vlc_object_create( p_spu, VLC_OBJECT_FILTER );
-            vlc_object_attach( p_spu->p_text, p_spu );
+    /* */
+    if( !p_blend->p_module )
+        p_blend->p_module = module_Need( p_blend, "video blending", 0, 0 );
+}
+static void SpuRenderCreateAndLoadText( spu_t *p_spu )
+{
+    filter_t *p_text;
 
-            p_spu->p_text->fmt_out.video.i_width =
-                p_spu->p_text->fmt_out.video.i_visible_width =
-                p_fmt->i_width;
-            p_spu->p_text->fmt_out.video.i_height =
-                p_spu->p_text->fmt_out.video.i_visible_height =
-                p_fmt->i_height;
+    assert( !p_spu->p_text );
 
-            p_spu->p_text->pf_sub_buffer_new = spu_new_buffer;
-            p_spu->p_text->pf_sub_buffer_del = spu_del_buffer;
+    p_spu->p_text =
+    p_text        = vlc_custom_create( p_spu, sizeof(filter_t),
+                                       VLC_OBJECT_GENERIC, "spu text" );
+    if( !p_text )
+        return;
 
-            psz_modulename = var_CreateGetString( p_spu, "text-renderer" );
-            if( psz_modulename && *psz_modulename )
-            {
-                p_spu->p_text->p_module =
-                    module_Need( p_spu->p_text, "text renderer",
-                                 psz_modulename, VLC_TRUE );
-            }
-            if( !p_spu->p_text->p_module )
+    es_format_Init( &p_text->fmt_in, VIDEO_ES, 0 );
+
+    es_format_Init( &p_text->fmt_out, VIDEO_ES, 0 );
+    p_text->fmt_out.video.i_width =
+    p_text->fmt_out.video.i_visible_width = 32;
+    p_text->fmt_out.video.i_height =
+    p_text->fmt_out.video.i_visible_height = 32;
+
+    p_text->pf_sub_buffer_new = spu_new_buffer;
+    p_text->pf_sub_buffer_del = spu_del_buffer;
+
+    vlc_object_attach( p_text, p_spu );
+
+    /* FIXME TOCHECK shouldn't module_Need( , , psz_modulename, false ) do the
+     * same than these 2 calls ? */
+    char *psz_modulename = var_CreateGetString( p_spu, "text-renderer" );
+    if( psz_modulename && *psz_modulename )
+    {
+        p_text->p_module = module_Need( p_text, "text renderer",
+                                        psz_modulename, true );
+    }
+    free( psz_modulename );
+
+    if( !p_text->p_module )
+        p_text->p_module = module_Need( p_text, "text renderer", NULL, false );
+}
+
+static filter_t *CreateAndLoadScale( vlc_object_t *p_obj, vlc_fourcc_t i_chroma )
+{
+    filter_t *p_scale;
+
+    p_scale = vlc_custom_create( p_obj, sizeof(filter_t),
+                                 VLC_OBJECT_GENERIC, "scale" );
+    if( !p_scale )
+        return NULL;
+
+    es_format_Init( &p_scale->fmt_in, VIDEO_ES, 0 );
+    p_scale->fmt_in.video.i_chroma = i_chroma;
+    p_scale->fmt_in.video.i_width =
+    p_scale->fmt_in.video.i_height = 32;
+
+    es_format_Init( &p_scale->fmt_out, VIDEO_ES, 0 );
+    p_scale->fmt_out.video.i_chroma = i_chroma;
+    p_scale->fmt_out.video.i_width =
+    p_scale->fmt_out.video.i_height = 16;
+
+    p_scale->pf_vout_buffer_new = spu_new_video_buffer;
+    p_scale->pf_vout_buffer_del = spu_del_video_buffer;
+
+    vlc_object_attach( p_scale, p_obj );
+    p_scale->p_module = module_Need( p_scale, "video filter2", 0, 0 );
+
+    return p_scale;
+}
+static void SpuRenderCreateAndLoadScale( spu_t *p_spu )
+{
+    /* FIXME: We'll also be using it for YUVA and RGBA blending ... */
+
+    assert( !p_spu->p_scale );
+    assert( !p_spu->p_scale_yuvp );
+    p_spu->p_scale = CreateAndLoadScale( VLC_OBJECT(p_spu), VLC_FOURCC('Y','U','V','A') );
+    p_spu->p_scale_yuvp = p_spu->p_scale_yuvp = CreateAndLoadScale( VLC_OBJECT(p_spu), VLC_FOURCC('Y','U','V','P') );
+}
+
+static void SpuRenderText( spu_t *p_spu, bool *pb_rerender_text,
+                           subpicture_t *p_subpic, subpicture_region_t *p_region, int i_min_scale_ratio )
+{
+    assert( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') );
+
+    if( !p_spu->p_text || !p_spu->p_text->p_module )
+        goto exit;
+
+    /* Setup 3 variables which can be used to render
+     * time-dependent text (and effects). The first indicates
+     * the total amount of time the text will be on screen,
+     * the second the amount of time it has already been on
+     * screen (can be a negative value as text is layed out
+     * before it is rendered) and the third is a feedback
+     * variable from the renderer - if the renderer sets it
+     * then this particular text is time-dependent, eg. the
+     * visual progress bar inside the text in karaoke and the
+     * text needs to be rendered multiple times in order for
+     * the effect to work - we therefore need to return the
+     * region to its original state at the end of the loop,
+     * instead of leaving it in YUVA or YUVP.
+     * Any renderer which is unaware of how to render
+     * time-dependent text can happily ignore the variables
+     * and render the text the same as usual - it should at
+     * least show up on screen, but the effect won't change
+     * the text over time.
+     */
+
+    /* FIXME why these variables are recreated every time and not
+     * when text renderer module was created ? */
+    var_Create( p_spu->p_text, "spu-duration", VLC_VAR_TIME );
+    var_Create( p_spu->p_text, "spu-elapsed", VLC_VAR_TIME );
+    var_Create( p_spu->p_text, "text-rerender", VLC_VAR_BOOL );
+    var_Create( p_spu->p_text, "scale", VLC_VAR_INTEGER );
+
+    var_SetTime( p_spu->p_text, "spu-duration", p_subpic->i_stop - p_subpic->i_start );
+    var_SetTime( p_spu->p_text, "spu-elapsed", mdate() - p_subpic->i_start );
+    var_SetBool( p_spu->p_text, "text-rerender", false );
+    var_SetInteger( p_spu->p_text, "scale", i_min_scale_ratio );
+
+    if( p_spu->p_text->pf_render_html && p_region->psz_html )
+    {
+        p_spu->p_text->pf_render_html( p_spu->p_text,
+                                       p_region, p_region );
+    }
+    else if( p_spu->p_text->pf_render_text )
+    {
+        p_spu->p_text->pf_render_text( p_spu->p_text,
+                                       p_region, p_region );
+    }
+    *pb_rerender_text = var_GetBool( p_spu->p_text, "text-rerender" );
+
+    var_Destroy( p_spu->p_text, "spu-duration" );
+    var_Destroy( p_spu->p_text, "spu-elapsed" );
+    var_Destroy( p_spu->p_text, "text-rerender" );
+    var_Destroy( p_spu->p_text, "scale" );
+
+exit:
+    p_region->i_align |= SUBPICTURE_RENDERED;
+}
+
+/**
+ * A few scale functions helpers.
+ */
+typedef struct
+{
+    int w;
+    int h;
+} spu_scale_t;
+
+static spu_scale_t spu_scale_create( int w, int h )
+{
+    spu_scale_t s = { .w = w, .h = h };
+    if( s.w <= 0 )
+        s.w = SCALE_UNIT;
+    if( s.h <= 0 )
+        s.h = SCALE_UNIT;
+    return s;
+}
+static spu_scale_t spu_scale_createq( int wn, int wd, int hn, int hd )
+{
+    return spu_scale_create( wn * SCALE_UNIT / wd,
+                             hn * SCALE_UNIT / hd );
+}
+static int spu_scale_w( int v, const spu_scale_t s )
+{
+    return v * s.w / SCALE_UNIT;
+}
+static int spu_scale_h( int v, const spu_scale_t s )
+{
+    return v * s.h / SCALE_UNIT;
+}
+
+/**
+ * Place a region
+ */
+static void SpuRegionPlace( int *pi_x, int *pi_y,
+                            const video_format_t *p_fmt,
+                            const subpicture_t *p_subpic,
+                            const subpicture_region_t *p_region )
+{
+    int i_delta_x = p_region->i_x;
+    int i_delta_y = p_region->i_y;
+    int i_x, i_y;
+
+    if( p_region->i_align & SUBPICTURE_ALIGN_TOP )
+    {
+        i_y = i_delta_y;
+    }
+    else if( p_region->i_align & SUBPICTURE_ALIGN_BOTTOM )
+    {
+        i_y = p_fmt->i_height - p_region->fmt.i_height - i_delta_y;
+    }
+    else
+    {
+        i_y = p_fmt->i_height / 2 - p_region->fmt.i_height / 2;
+    }
+
+    if( p_region->i_align & SUBPICTURE_ALIGN_LEFT )
+    {
+        i_x = i_delta_x;
+    }
+    else if( p_region->i_align & SUBPICTURE_ALIGN_RIGHT )
+    {
+        i_x = p_fmt->i_width - p_region->fmt.i_width - i_delta_x;
+    }
+    else
+    {
+        i_x = p_fmt->i_width / 2 - p_region->fmt.i_width / 2;
+    }
+
+    if( p_subpic->b_absolute )
+    {
+        i_x = i_delta_x;
+        i_y = i_delta_y;
+    }
+    if( i_x < 0 )
+        i_x = 0;
+    if( i_y < 0 )
+        i_y = 0;
+
+    *pi_x = i_x;
+    *pi_y = i_y;
+}
+
+static void SpuRenderRegion( spu_t *p_spu,
+                             picture_t *p_pic_dst,
+                             subpicture_t *p_subpic, subpicture_region_t *p_region,
+                             const spu_scale_t scale_size,
+                             const video_format_t *p_fmt )
+{
+    video_format_t fmt_original;
+    bool b_rerender_text;
+    bool b_restore_format = false;
+    int i_fade_alpha;
+    int i_x_offset;
+    int i_y_offset;
+    filter_t *p_scale;
+
+    vlc_assert_locked( &p_spu->subpicture_lock );
+
+    fmt_original = p_region->fmt;
+    b_rerender_text = false;
+    if( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') )
+    {
+        SpuRenderText( p_spu, &b_rerender_text, p_subpic, p_region, SCALE_UNIT );
+        b_restore_format = b_rerender_text;
+
+        /* Check if the rendering has failed ... */
+        if( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') )
+            goto exit;
+    }
+
+    /* Force palette if requested
+     * FIXME b_force_palette and b_force_crop are applied to all subpictures using palette
+     * instead of only the right one (being the dvd spu).
+     */
+    const bool b_using_palette = p_region->fmt.i_chroma == VLC_FOURCC('Y','U','V','P');
+    const bool b_force_palette = b_using_palette && p_spu->b_force_palette;
+    const bool b_force_crop    = b_force_palette && p_spu->b_force_crop;
+
+    if( b_force_palette )
+    {
+        /* It looks so wrong I won't comment
+         * p_palette->palette is [256][4] with a int i_entries
+         * p_spu->palette is [4][4]
+         * */
+        p_region->fmt.p_palette->i_entries = 4;
+        memcpy( p_region->fmt.p_palette->palette, p_spu->palette, 4*sizeof(uint32_t) );
+    }
+
+    if( b_using_palette )
+        p_scale = p_spu->p_scale_yuvp;
+    else
+        p_scale = p_spu->p_scale;
+
+    if( p_scale &&
+        ( scale_size.w != SCALE_UNIT || scale_size.h != SCALE_UNIT || b_force_palette ) )
+    {
+        const unsigned i_dst_width  = spu_scale_w( p_region->fmt.i_width, scale_size );
+        const unsigned i_dst_height = spu_scale_h( p_region->fmt.i_height, scale_size );
+
+        /* Destroy if cache is unusable */
+        if( p_region->p_cache )
+        {
+            if( p_region->p_cache->fmt.i_width  != i_dst_width ||
+                p_region->p_cache->fmt.i_height != i_dst_height ||
+                b_force_palette )
             {
-                p_spu->p_text->p_module =
-                    module_Need( p_spu->p_text, "text renderer", 0, 0 );
+                p_subpic->pf_destroy_region( VLC_OBJECT(p_spu),
+                                             p_region->p_cache );
+                p_region->p_cache = NULL;
             }
-            if( psz_modulename ) free( psz_modulename );
         }
-        if( p_spu->p_text )
+
+        /* Scale if needed into cache */
+        if( !p_region->p_cache )
         {
-            if( p_subpic->i_original_picture_height > 0 &&
-                p_subpic->i_original_picture_width  > 0 )
+            picture_t *p_pic;
+
+            p_scale->fmt_in.video = p_region->fmt;
+            p_scale->fmt_out.video = p_region->fmt;
+
+            p_region->p_cache =
+                p_subpic->pf_create_region( VLC_OBJECT(p_spu),
+                                            &p_scale->fmt_out.video );
+            p_region->p_cache->p_next = p_region->p_next;
+
+            if( p_scale->fmt_out.video.p_palette )
+                *p_scale->fmt_out.video.p_palette =
+                    *p_region->fmt.p_palette;
+
+            vout_CopyPicture( p_spu, &p_region->p_cache->picture,
+                              &p_region->picture );
+
+            p_scale->fmt_out.video.i_width = i_dst_width;
+            p_scale->fmt_out.video.i_height = i_dst_height;
+
+            p_scale->fmt_out.video.i_visible_width =
+                spu_scale_w( p_region->fmt.i_visible_width, scale_size );
+            p_scale->fmt_out.video.i_visible_height =
+                spu_scale_h( p_region->fmt.i_visible_height, scale_size );
+
+            p_region->p_cache->fmt = p_scale->fmt_out.video;
+            p_region->p_cache->i_x = spu_scale_w( p_region->i_x, scale_size );
+            p_region->p_cache->i_y = spu_scale_h( p_region->i_y, scale_size );
+            p_region->p_cache->i_align = p_region->i_align;
+            p_region->p_cache->i_alpha = p_region->i_alpha;
+
+            p_pic = NULL;
+            if( p_scale->p_module )
+                p_pic = p_scale->pf_video_filter( p_scale, &p_region->p_cache->picture );
+            else
+                msg_Err( p_spu, "scaling failed (module not loaded)" );
+
+            if( p_pic )
             {
-                p_spu->p_text->fmt_out.video.i_width =
-                    p_spu->p_text->fmt_out.video.i_visible_width =
-                    p_subpic->i_original_picture_width;
-                p_spu->p_text->fmt_out.video.i_height =
-                    p_spu->p_text->fmt_out.video.i_visible_height =
-                    p_subpic->i_original_picture_height;
+                p_region->p_cache->picture = *p_pic;
+                free( p_pic );
             }
             else
             {
-                p_spu->p_text->fmt_out.video.i_width =
-                    p_spu->p_text->fmt_out.video.i_visible_width =
-                    p_fmt->i_width;
-                p_spu->p_text->fmt_out.video.i_height =
-                    p_spu->p_text->fmt_out.video.i_visible_height =
-                    p_fmt->i_height;
+                p_subpic->pf_destroy_region( VLC_OBJECT(p_spu),
+                                             p_region->p_cache );
+                p_region->p_cache = NULL;
             }
         }
 
-        i_scale_width = i_scale_width_orig;
-        i_scale_height = i_scale_height_orig;
-
-        if( p_subpic->i_original_picture_height > 0 &&
-            p_subpic->i_original_picture_width  > 0 )
+        /* And use the scaled picture */
+        if( p_region->p_cache )
         {
-            i_scale_width = i_scale_width * p_fmt->i_width /
-                             p_subpic->i_original_picture_width;
-            i_scale_height = i_scale_height * p_fmt->i_height /
-                             p_subpic->i_original_picture_height;
-        }
-        else if( p_subpic->i_original_picture_height > 0 )
-        {
-            i_scale_height = i_scale_height * p_fmt->i_height /
-                             p_subpic->i_original_picture_height;
-            i_scale_width = i_scale_height * i_scale_height / p_fmt->i_height;
+            p_region = p_region->p_cache;
+            fmt_original = p_region->fmt;
         }
+    }
 
-        /* Set default subpicture aspect ratio */
-        if( p_region && p_region->fmt.i_aspect &&
-            (!p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den) )
+    /* */
+    SpuRegionPlace( &i_x_offset, &i_y_offset,
+                    p_fmt, p_subpic, p_region );
+
+    if( p_spu->i_margin != 0 && !b_force_crop )
+    {
+        int i_diff = 0;
+        int i_low = i_y_offset - p_spu->i_margin;
+        int i_high = i_low + p_region->fmt.i_height;
+
+        /* crop extra margin to keep within bounds */
+        if( i_low < 0 )
+            i_diff = i_low;
+        if( i_high > (int)p_fmt->i_height )
+            i_diff = i_high - p_fmt->i_height;
+        i_y_offset -= p_spu->i_margin + i_diff;
+    }
+
+    /* Force cropping if requested */
+    if( b_force_crop )
+    {
+        video_format_t *p_fmt = &p_region->fmt;
+        int i_crop_x = spu_scale_w( p_spu->i_crop_x, scale_size );
+        int i_crop_y = spu_scale_h( p_spu->i_crop_y, scale_size );
+        int i_crop_width = spu_scale_w( p_spu->i_crop_width, scale_size );
+        int i_crop_height= spu_scale_h( p_spu->i_crop_height,scale_size );
+
+        /* Find the intersection */
+        if( i_crop_x + i_crop_width <= i_x_offset ||
+            i_x_offset + (int)p_fmt->i_visible_width < i_crop_x ||
+            i_crop_y + i_crop_height <= i_y_offset ||
+            i_y_offset + (int)p_fmt->i_visible_height < i_crop_y )
         {
-            p_region->fmt.i_sar_den = p_region->fmt.i_aspect;
-            p_region->fmt.i_sar_num = VOUT_ASPECT_FACTOR;
+            /* No intersection */
+            p_fmt->i_visible_width = p_fmt->i_visible_height = 0;
         }
-        if( p_region &&
-            (!p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den) )
+        else
         {
-            p_region->fmt.i_sar_den = p_fmt->i_sar_den;
-            p_region->fmt.i_sar_num = p_fmt->i_sar_num;
+            int i_x, i_y, i_x_end, i_y_end;
+            i_x = __MAX( i_crop_x, i_x_offset );
+            i_y = __MAX( i_crop_y, i_y_offset );
+            i_x_end = __MIN( i_crop_x + i_crop_width,
+                           i_x_offset + (int)p_fmt->i_visible_width );
+            i_y_end = __MIN( i_crop_y + i_crop_height,
+                           i_y_offset + (int)p_fmt->i_visible_height );
+
+            p_fmt->i_x_offset = i_x - i_x_offset;
+            p_fmt->i_y_offset = i_y - i_y_offset;
+            p_fmt->i_visible_width = i_x_end - i_x;
+            p_fmt->i_visible_height = i_y_end - i_y;
+
+            i_x_offset = i_x;
+            i_y_offset = i_y;
         }
+        b_restore_format = true;
+    }
 
-        /* Take care of the aspect ratio */
-        if( p_region && p_region->fmt.i_sar_num * p_fmt->i_sar_den !=
-            p_region->fmt.i_sar_den * p_fmt->i_sar_num )
-        {
-            i_scale_width = i_scale_width *
-                (int64_t)p_region->fmt.i_sar_num * p_fmt->i_sar_den /
-                p_region->fmt.i_sar_den / p_fmt->i_sar_num;
-            i_subpic_x = p_subpic->i_x * i_scale_width / 1000;
-        }
+    i_x_offset = __MAX( i_x_offset, 0 );
+    i_y_offset = __MAX( i_y_offset, 0 );
 
-        /* Load the scaling module */
-        if( !p_spu->p_scale && (i_scale_width != 1000 ||
-            i_scale_height != 1000) )
+    /* Compute alpha blend value */
+    i_fade_alpha = 255;
+    if( p_subpic->b_fade )
+    {
+        mtime_t i_fade_start = ( p_subpic->i_stop +
+                                 p_subpic->i_start ) / 2;
+        mtime_t i_now = mdate();
+        if( i_now >= i_fade_start && p_subpic->i_stop > i_fade_start )
         {
-            p_spu->p_scale = vlc_object_create( p_spu, VLC_OBJECT_FILTER );
-            vlc_object_attach( p_spu->p_scale, p_spu );
-            p_spu->p_scale->fmt_out.video.i_chroma =
-                p_spu->p_scale->fmt_in.video.i_chroma =
-                    VLC_FOURCC('Y','U','V','P');
-            /* XXX: We'll also be using it for YUVA and RGBA blending ... */
-            p_spu->p_scale->fmt_in.video.i_width =
-                p_spu->p_scale->fmt_in.video.i_height = 32;
-            p_spu->p_scale->fmt_out.video.i_width =
-                p_spu->p_scale->fmt_out.video.i_height = 16;
-
-            p_spu->p_scale->pf_vout_buffer_new = spu_new_video_buffer;
-            p_spu->p_scale->pf_vout_buffer_del = spu_del_video_buffer;
-            p_spu->p_scale->p_module =
-                module_Need( p_spu->p_scale, "video filter2", 0, 0 );
+            i_fade_alpha = 255 * ( p_subpic->i_stop - i_now ) /
+                           ( p_subpic->i_stop - i_fade_start );
         }
+    }
 
-        while( p_region && p_spu->p_blend && p_spu->p_blend->pf_video_blend )
-        {
-            int i_fade_alpha = 255;
-            int i_x_offset = p_region->i_x + i_subpic_x;
-            int i_y_offset = p_region->i_y + p_subpic->i_y;
+    /* Update the blender */
+    SpuRenderUpdateBlend( p_spu, p_fmt->i_width, p_fmt->i_height, &p_region->fmt );
 
-            if( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') )
-            {
-                if( p_spu->p_text && p_spu->p_text->p_module )
-                {
-                    p_region->i_align = p_subpic->i_flags;
-
-                    if( p_spu->p_text->pf_render_html && p_region->psz_html )
-                    {
-                        p_spu->p_text->pf_render_html( p_spu->p_text,
-                                                       p_region, p_region );
-                    }
-                    else if( p_spu->p_text->pf_render_text )
-                    {
-                        p_spu->p_text->pf_render_text( p_spu->p_text,
-                                                       p_region, p_region );
-                    }
-                }
-            }
+    if( p_spu->p_blend->p_module )
+    {
+        p_spu->p_blend->pf_video_blend( p_spu->p_blend, p_pic_dst,
+            &p_region->picture, i_x_offset, i_y_offset,
+            i_fade_alpha * p_subpic->i_alpha * p_region->i_alpha / 65025 );
+    }
+    else
+    {
+        msg_Err( p_spu, "blending %4.4s to %4.4s failed",
+                 (char *)&p_spu->p_blend->fmt_out.video.i_chroma,
+                 (char *)&p_spu->p_blend->fmt_out.video.i_chroma );
+    }
 
-            /* Force palette if requested */
-            if( p_spu->b_force_palette &&
-                (VLC_FOURCC('Y','U','V','P') == p_region->fmt.i_chroma) )
-            {
-                memcpy( p_region->fmt.p_palette->palette,
-                        p_spu->palette, 16 );
-            }
+exit:
+    if( b_rerender_text )
+    {
+        /* Some forms of subtitles need to be re-rendered more than
+         * once, eg. karaoke. We therefore restore the region to its
+         * pre-rendered state, so the next time through everything is
+         * calculated again.
+         */
+        p_region->picture.pf_release( &p_region->picture );
+        memset( &p_region->picture, 0, sizeof( picture_t ) );
+        p_region->i_align &= ~SUBPICTURE_RENDERED;
+    }
+    if( b_restore_format )
+        p_region->fmt = fmt_original;
+}
 
-            /* Scale SPU if necessary */
-            if( p_region->p_cache )
-            {
-                if( i_scale_width * p_region->fmt.i_width / 1000 !=
-                    p_region->p_cache->fmt.i_width ||
-                    i_scale_height * p_region->fmt.i_height / 1000 !=
-                    p_region->p_cache->fmt.i_height )
-                {
-                    p_subpic->pf_destroy_region( VLC_OBJECT(p_spu),
-                                                 p_region->p_cache );
-                    p_region->p_cache = 0;
-                }
-            }
+void spu_RenderSubpictures( spu_t *p_spu,
+                            picture_t *p_pic_dst, video_format_t *p_fmt_dst,
+                            subpicture_t *p_subpic_list,
+                            const video_format_t *p_fmt_src )
+{
+    video_format_t *p_fmt = p_fmt_dst;
+    const mtime_t i_current_date = mdate();
+    int i_source_video_width;
+    int i_source_video_height;
+    subpicture_t *p_subpic;
 
-            if( (i_scale_width != 1000 || i_scale_height != 1000) &&
-                p_spu->p_scale && !p_region->p_cache )
-            {
-                picture_t *p_pic;
-
-                p_spu->p_scale->fmt_in.video = p_region->fmt;
-                p_spu->p_scale->fmt_out.video = p_region->fmt;
-
-                p_region->p_cache =
-                    p_subpic->pf_create_region( VLC_OBJECT(p_spu),
-                        &p_spu->p_scale->fmt_out.video );
-                if( p_spu->p_scale->fmt_out.video.p_palette )
-                    *p_spu->p_scale->fmt_out.video.p_palette =
-                        *p_region->fmt.p_palette;
-                p_region->p_cache->p_next = p_region->p_next;
-
-                vout_CopyPicture( p_spu, &p_region->p_cache->picture,
-                                  &p_region->picture );
-
-                p_spu->p_scale->fmt_out.video.i_width =
-                    p_region->fmt.i_width * i_scale_width / 1000;
-                p_spu->p_scale->fmt_out.video.i_visible_width =
-                    p_region->fmt.i_visible_width * i_scale_width / 1000;
-                p_spu->p_scale->fmt_out.video.i_height =
-                    p_region->fmt.i_height * i_scale_height / 1000;
-                p_spu->p_scale->fmt_out.video.i_visible_height =
-                    p_region->fmt.i_visible_height * i_scale_height / 1000;
-                p_region->p_cache->fmt = p_spu->p_scale->fmt_out.video;
-                p_region->p_cache->i_x = p_region->i_x * i_scale_width / 1000;
-                p_region->p_cache->i_y = p_region->i_y * i_scale_height / 1000;
-
-                p_pic = p_spu->p_scale->pf_video_filter(
-                                 p_spu->p_scale, &p_region->p_cache->picture );
-                if( p_pic )
-                {
-                    picture_t p_pic_tmp = p_region->p_cache->picture;
-                    p_region->p_cache->picture = *p_pic;
-                    *p_pic = p_pic_tmp;
-                    free( p_pic );
-                }
-            }
-            if( (i_scale_width != 1000 || i_scale_height != 1000) &&
-                p_spu->p_scale && p_region->p_cache )
-            {
-                p_region = p_region->p_cache;
-            }
+    /* Get lock */
+    vlc_mutex_lock( &p_spu->subpicture_lock );
 
-            if( p_subpic->i_flags & SUBPICTURE_ALIGN_BOTTOM )
-            {
-                i_y_offset = p_fmt->i_height - p_region->fmt.i_height -
-                    p_subpic->i_y;
-            }
-            else if ( !(p_subpic->i_flags & SUBPICTURE_ALIGN_TOP) )
-            {
-                i_y_offset = p_fmt->i_height / 2 - p_region->fmt.i_height / 2;
-            }
+    /* Be sure we have at least 1 picture to process */
+    if( !p_subpic_list || p_subpic_list->i_status == FREE_SUBPICTURE )
+    {
+        vlc_mutex_unlock( &p_spu->subpicture_lock );
+        return;
+    }
 
-            if( p_subpic->i_flags & SUBPICTURE_ALIGN_RIGHT )
-            {
-                i_x_offset = p_fmt->i_width - p_region->fmt.i_width -
-                    i_subpic_x;
-            }
-            else if ( !(p_subpic->i_flags & SUBPICTURE_ALIGN_LEFT) )
-            {
-                i_x_offset = p_fmt->i_width / 2 - p_region->fmt.i_width / 2;
-            }
+    i_source_video_width  = p_fmt_src->i_width;
+    i_source_video_height = p_fmt_src->i_height;
 
-            if( p_subpic->b_absolute )
-            {
-                i_x_offset = p_region->i_x +
-                    i_subpic_x * i_scale_width / 1000;
-                i_y_offset = p_region->i_y +
-                    p_subpic->i_y * i_scale_height / 1000;
+    /* */
+    for( p_subpic = p_subpic_list;
+            p_subpic != NULL && p_subpic->i_status != FREE_SUBPICTURE; /* Check again status (as we where unlocked) */
+                p_subpic = p_subpic->p_next )
+    {
+        /* */
+        if( p_subpic->pf_pre_render )
+            p_subpic->pf_pre_render( p_fmt, p_spu, p_subpic );
 
-            }
+        if( p_subpic->pf_update_regions )
+        {
+            /* TODO do not reverse the scaling that was done before calling
+             * spu_RenderSubpictures, just pass it along (or do it inside
+             * spu_RenderSubpictures) */
+            video_format_t fmt_org = *p_fmt;
+            fmt_org.i_width =
+            fmt_org.i_visible_width = i_source_video_width;
+            fmt_org.i_height =
+            fmt_org.i_visible_height = i_source_video_height;
+
+            p_subpic->pf_update_regions( &fmt_org, p_spu, p_subpic, i_current_date );
+        }
+    }
 
-            i_x_offset = __MAX( i_x_offset, 0 );
-            i_y_offset = __MAX( i_y_offset, 0 );
+    /* Create the blending module */
+    if( !p_spu->p_blend )
+        SpuRenderCreateBlend( p_spu, p_fmt->i_chroma, p_fmt->i_aspect );
 
-            if( p_spu->i_margin != 0 && p_spu->b_force_crop == VLC_FALSE )
-            {
-                int i_diff = 0;
-                int i_low = i_y_offset - p_spu->i_margin;
-                int i_high = i_y_offset + p_region->fmt.i_height - p_spu->i_margin;
-
-                /* crop extra margin to keep within bounds */
-                if( i_low < 0 ) i_diff = i_low;
-                if( i_high > (int)p_fmt->i_height ) i_diff = i_high - p_fmt->i_height;
-                i_y_offset -= ( p_spu->i_margin + i_diff );
-            }
+    /* */
+    for( p_subpic = p_subpic_list; ; p_subpic = p_subpic->p_next )
+    {
+        subpicture_region_t *p_region;
 
-            p_spu->p_blend->fmt_in.video = p_region->fmt;
+        if( !p_subpic || p_subpic->i_status == FREE_SUBPICTURE )
+            break;
 
-            /* Force cropping if requested */
-            if( p_spu->b_force_crop )
-            {
-                video_format_t *p_fmt = &p_spu->p_blend->fmt_in.video;
-                int i_crop_x = p_spu->i_crop_x * i_scale_width / 1000;
-                int i_crop_y = p_spu->i_crop_y * i_scale_height / 1000;
-                int i_crop_width = p_spu->i_crop_width * i_scale_width / 1000;
-                int i_crop_height = p_spu->i_crop_height * i_scale_height/1000;
-
-                /* Find the intersection */
-                if( i_crop_x + i_crop_width <= i_x_offset ||
-                    i_x_offset + (int)p_fmt->i_visible_width < i_crop_x ||
-                    i_crop_y + i_crop_height <= i_y_offset ||
-                    i_y_offset + (int)p_fmt->i_visible_height < i_crop_y )
-                {
-                    /* No intersection */
-                    p_fmt->i_visible_width = p_fmt->i_visible_height = 0;
-                }
-                else
-                {
-                    int i_x, i_y, i_x_end, i_y_end;
-                    i_x = __MAX( i_crop_x, i_x_offset );
-                    i_y = __MAX( i_crop_y, i_y_offset );
-                    i_x_end = __MIN( i_crop_x + i_crop_width,
-                                   i_x_offset + (int)p_fmt->i_visible_width );
-                    i_y_end = __MIN( i_crop_y + i_crop_height,
-                                   i_y_offset + (int)p_fmt->i_visible_height );
-
-                    p_fmt->i_x_offset = i_x - i_x_offset;
-                    p_fmt->i_y_offset = i_y - i_y_offset;
-                    p_fmt->i_visible_width = i_x_end - i_x;
-                    p_fmt->i_visible_height = i_y_end - i_y;
-
-                    i_x_offset = i_x;
-                    i_y_offset = i_y;
-                }
-            }
+        if( !p_subpic->p_region )
+            continue;
 
-            /* Update the output picture size */
-            p_spu->p_blend->fmt_out.video.i_width =
-                p_spu->p_blend->fmt_out.video.i_visible_width =
-                    p_fmt->i_width;
-            p_spu->p_blend->fmt_out.video.i_height =
-                p_spu->p_blend->fmt_out.video.i_visible_height =
-                    p_fmt->i_height;
+        /* FIXME when possible use a better rendering size than source size
+         * (max of display size and source size for example) FIXME */
+        int i_render_width  = p_subpic->i_original_picture_width;
+        int i_render_height = p_subpic->i_original_picture_height;
+        if( !i_render_width || !i_render_height )
+        {
+            if( i_render_width != 0 || i_render_height != 0 )
+                msg_Err( p_spu, "unsupported original picture size %dx%d",
+                         i_render_width, i_render_height );
 
-            if( p_subpic->b_fade )
+            i_render_width = i_source_video_width;
+            i_render_height = i_source_video_height;
+        }
+
+        if( p_spu->p_text )
+        {
+            p_spu->p_text->fmt_out.video.i_width          =
+            p_spu->p_text->fmt_out.video.i_visible_width  = i_render_width;
+
+            p_spu->p_text->fmt_out.video.i_height         =
+            p_spu->p_text->fmt_out.video.i_visible_height = i_render_height;
+        }
+
+        /* Compute scaling from picture to source size */
+        spu_scale_t scale = spu_scale_createq( i_source_video_width,  i_render_width,
+                                               i_source_video_height, i_render_height );
+
+        /* Update scaling from source size to display size(p_fmt) */
+        scale.w = scale.w * p_fmt->i_width  / i_source_video_width;
+        scale.h = scale.h * p_fmt->i_height / i_source_video_height;
+
+        /* Set default subpicture aspect ratio
+         * FIXME if we only handle 1 aspect ratio per picture, why is it set per
+         * region ? */
+        p_region = p_subpic->p_region;
+        if( !p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den )
+        {
+            if( p_region->fmt.i_aspect != 0 )
+            {
+                p_region->fmt.i_sar_den = p_region->fmt.i_aspect;
+                p_region->fmt.i_sar_num = VOUT_ASPECT_FACTOR;
+            }
+            else
             {
-                mtime_t i_fade_start = ( p_subpic->i_stop +
-                                         p_subpic->i_start ) / 2;
-                mtime_t i_now = mdate();
-                if( i_now >= i_fade_start && p_subpic->i_stop > i_fade_start )
-                {
-                    i_fade_alpha = 255 * ( p_subpic->i_stop - i_now ) /
-                                   ( p_subpic->i_stop - i_fade_start );
-                }
+                p_region->fmt.i_sar_den = p_fmt->i_sar_den;
+                p_region->fmt.i_sar_num = p_fmt->i_sar_num;
             }
+        }
 
-            i_x_offset = __MAX( i_x_offset, 0 );
-            i_y_offset = __MAX( i_y_offset, 0 );
+        /* Take care of the aspect ratio */
+        if( p_region->fmt.i_sar_num * p_fmt->i_sar_den !=
+            p_region->fmt.i_sar_den * p_fmt->i_sar_num )
+        {
+            /* FIXME FIXME what about region->i_x/i_y ? */
+            scale.w = scale.w *
+                (int64_t)p_region->fmt.i_sar_num * p_fmt->i_sar_den /
+                p_region->fmt.i_sar_den / p_fmt->i_sar_num;
+        }
 
-            p_spu->p_blend->pf_video_blend( p_spu->p_blend, p_pic_dst,
-                p_pic_src, &p_region->picture, i_x_offset, i_y_offset,
-                i_fade_alpha * p_subpic->i_alpha / 255 );
+        /* Render all regions */
+        for( p_region = p_subpic->p_region; p_region != NULL; p_region = p_region->p_next )
+        {
+            /* Check scale validity */
+            if( scale.w <= 0 || scale.h <= 0 )
+                continue;
 
-            p_region = p_region->p_next;
+            /* */
+            SpuRenderRegion( p_spu, p_pic_dst, p_subpic, p_region,
+                             scale, p_fmt );
         }
-
-        p_subpic = p_subpic->p_next;
     }
 
     vlc_mutex_unlock( &p_spu->subpicture_lock );
@@ -877,55 +1099,45 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
  * more difficult to guess if a subpicture has to be rendered or not.
  *****************************************************************************/
 subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date,
-                                   vlc_bool_t b_paused )
+                                   bool b_paused, bool b_subtitle_only )
 {
-    int i_index, i_channel;
+    int i_channel;
     subpicture_t *p_subpic = NULL;
-    subpicture_t *p_ephemer;
-    mtime_t      ephemer_date;
 
     /* Run subpicture filters */
-    for( i_index = 0; i_index < p_spu->i_filter; i_index++ )
-    {
-        subpicture_t *p_subpic_filter;
-        p_subpic_filter = p_spu->pp_filter[i_index]->
-            pf_sub_filter( p_spu->pp_filter[i_index], display_date );
-        if( p_subpic_filter )
-        {
-            spu_DisplaySubpicture( p_spu, p_subpic_filter );
-        }
-    }
+    filter_chain_SubFilter( p_spu->p_chain, display_date );
 
     /* We get an easily parsable chained list of subpictures which
      * ends with NULL since p_subpic was initialized to NULL. */
     for( i_channel = 0; i_channel < p_spu->i_channel; i_channel++ )
     {
-        p_ephemer = 0;
-        ephemer_date = 0;
+        subpicture_t *p_ephemer = NULL;
+        mtime_t      ephemer_date = 0;
+        int i_index;
 
         for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ )
         {
-            if( p_spu->p_subpicture[i_index].i_channel != i_channel ||
-                p_spu->p_subpicture[i_index].i_status != READY_SUBPICTURE )
+            subpicture_t *p_current = &p_spu->p_subpicture[i_index];
+
+            if( p_current->i_channel != i_channel ||
+                p_current->i_status != READY_SUBPICTURE ||
+                ( b_subtitle_only && !p_current->b_subtitle ) )
             {
                 continue;
             }
             if( display_date &&
-                display_date < p_spu->p_subpicture[i_index].i_start )
+                display_date < p_current->i_start )
             {
                 /* Too early, come back next monday */
                 continue;
             }
 
-            if( p_spu->p_subpicture[i_index].i_start > ephemer_date )
-                ephemer_date = p_spu->p_subpicture[i_index].i_start;
+            if( p_current->i_start > ephemer_date )
+                ephemer_date = p_current->i_start;
 
-            if( display_date > p_spu->p_subpicture[i_index].i_stop &&
-                ( !p_spu->p_subpicture[i_index].b_ephemer ||
-                  p_spu->p_subpicture[i_index].i_stop >
-                  p_spu->p_subpicture[i_index].i_start ) &&
-                !( p_spu->p_subpicture[i_index].b_pausable &&
-                   b_paused ) )
+            if( display_date > p_current->i_stop &&
+                ( !p_current->b_ephemer || p_current->i_stop > p_current->i_start ) &&
+                !( p_current->b_subtitle && b_paused ) ) /* XXX Assume that subtitle are pausable */
             {
                 /* Too late, destroy the subpic */
                 spu_DestroySubpicture( p_spu, &p_spu->p_subpicture[i_index] );
@@ -933,16 +1145,16 @@ subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date,
             }
 
             /* If this is an ephemer subpic, add it to our list */
-            if( p_spu->p_subpicture[i_index].b_ephemer )
+            if( p_current->b_ephemer )
             {
-                p_spu->p_subpicture[i_index].p_next = p_ephemer;
-                p_ephemer = &p_spu->p_subpicture[i_index];
+                p_current->p_next = p_ephemer;
+                p_ephemer = p_current;
 
                 continue;
             }
 
-            p_spu->p_subpicture[i_index].p_next = p_subpic;
-            p_subpic = &p_spu->p_subpicture[i_index];
+            p_current->p_next = p_subpic;
+            p_subpic = p_current;
         }
 
         /* If we found ephemer subpictures, check if they have to be
@@ -975,12 +1187,13 @@ subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date,
  * This function destroys the subpictures which belong to the spu channel
  * corresponding to i_channel_id.
  *****************************************************************************/
-static void SpuClearChannel( spu_t *p_spu, int i_channel )
+static void SpuClearChannel( spu_t *p_spu, int i_channel, bool b_locked )
 {
     int          i_subpic;                               /* subpicture index */
     subpicture_t *p_subpic = NULL;                  /* first free subpicture */
 
-    vlc_mutex_lock( &p_spu->subpicture_lock );
+    if( !b_locked )
+        vlc_mutex_lock( &p_spu->subpicture_lock );
 
     for( i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ )
     {
@@ -1006,7 +1219,8 @@ static void SpuClearChannel( spu_t *p_spu, int i_channel )
         }
     }
 
-    vlc_mutex_unlock( &p_spu->subpicture_lock );
+    if( !b_locked )
+        vlc_mutex_unlock( &p_spu->subpicture_lock );
 }
 
 /*****************************************************************************
@@ -1020,12 +1234,15 @@ static int spu_vaControlDefault( spu_t *p_spu, int i_query, va_list args )
     {
     case SPU_CHANNEL_REGISTER:
         pi = (int *)va_arg( args, int * );
-        if( pi ) *pi = p_spu->i_channel++;
+        vlc_mutex_lock( &p_spu->subpicture_lock );
+        if( pi )
+            *pi = p_spu->i_channel++;
+        vlc_mutex_unlock( &p_spu->subpicture_lock );
         break;
 
     case SPU_CHANNEL_CLEAR:
         i = (int)va_arg( args, int );
-        SpuClearChannel( p_spu, i );
+        SpuClearChannel( p_spu, i, false );
         break;
 
     default:
@@ -1050,12 +1267,18 @@ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object )
 {
     vlc_value_t val;
 
-    p_spu->b_force_palette = VLC_FALSE;
-    p_spu->b_force_crop = VLC_FALSE;
+    vlc_mutex_lock( &p_spu->subpicture_lock );
 
-    if( var_Get( p_object, "highlight", &val ) || !val.b_bool ) return;
+    p_spu->b_force_palette = false;
+    p_spu->b_force_crop = false;
 
-    p_spu->b_force_crop = VLC_TRUE;
+    if( var_Get( p_object, "highlight", &val ) || !val.b_bool )
+    {
+        vlc_mutex_unlock( &p_spu->subpicture_lock );
+        return;
+    }
+
+    p_spu->b_force_crop = true;
     var_Get( p_object, "x-start", &val );
     p_spu->i_crop_x = val.i_int;
     var_Get( p_object, "y-start", &val );
@@ -1068,8 +1291,9 @@ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object )
     if( var_Get( p_object, "menu-palette", &val ) == VLC_SUCCESS )
     {
         memcpy( p_spu->palette, val.p_address, 16 );
-        p_spu->b_force_palette = VLC_TRUE;
+        p_spu->b_force_palette = true;
     }
+    vlc_mutex_unlock( &p_spu->subpicture_lock );
 
     msg_Dbg( p_object, "crop: %i,%i,%i,%i, palette forced: %i",
              p_spu->i_crop_x, p_spu->i_crop_y,
@@ -1109,15 +1333,17 @@ static void sub_del_buffer( filter_t *p_filter, subpicture_t *p_subpic )
 
 static subpicture_t *spu_new_buffer( filter_t *p_filter )
 {
-    subpicture_t *p_subpic = (subpicture_t *)malloc(sizeof(subpicture_t));
-    (void)p_filter;
-    memset( p_subpic, 0, sizeof(subpicture_t) );
-    p_subpic->b_absolute = VLC_TRUE;
+    subpicture_t *p_subpic = calloc( 1, sizeof(subpicture_t) );
+    if( !p_subpic )
+        return NULL;
+
+    p_subpic->b_absolute = true;
+    p_subpic->i_alpha    = 0xFF;
 
     p_subpic->pf_create_region = __spu_CreateRegion;
-    p_subpic->pf_make_region = __spu_MakeRegion;
     p_subpic->pf_destroy_region = __spu_DestroyRegion;
 
+    VLC_UNUSED(p_filter);
     return p_subpic;
 }
 
@@ -1135,43 +1361,57 @@ static void spu_del_buffer( filter_t *p_filter, subpicture_t *p_subpic )
 
 static picture_t *spu_new_video_buffer( filter_t *p_filter )
 {
-    picture_t *p_picture = malloc( sizeof(picture_t) );
-
-    if( vout_AllocatePicture( p_filter, p_picture,
-                              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 )
-        != VLC_SUCCESS )
-    {
-        free( p_picture );
-        return NULL;
-    }
-
-    p_picture->pf_release = RegionPictureRelease;
+    const video_format_t *p_fmt = &p_filter->fmt_out.video;
 
-    return p_picture;
+    VLC_UNUSED(p_filter);
+    return picture_New( p_fmt->i_chroma,
+                        p_fmt->i_width, p_fmt->i_height, p_fmt->i_aspect );
 }
 
-static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_pic )
+static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_picture )
 {
-    (void)p_filter;
-    if( p_pic && p_pic->p_data_orig ) free( p_pic->p_data_orig );
-    if( p_pic ) free( p_pic );
+    VLC_UNUSED(p_filter);
+    picture_Release( p_picture );
 }
 
 static int SubFilterCallback( vlc_object_t *p_object, char const *psz_var,
                          vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {
-    (void)p_object; (void)oldval; (void)newval;
+    spu_t *p_spu = p_data;
+
+    VLC_UNUSED(p_object); VLC_UNUSED(oldval);
+    VLC_UNUSED(newval); VLC_UNUSED(psz_var);
+
+    vlc_mutex_lock( &p_spu->subpicture_lock );
+    filter_chain_Reset( p_spu->p_chain, NULL, NULL );
+    spu_ParseChain( p_spu );
+    vlc_mutex_unlock( &p_spu->subpicture_lock );
+    return VLC_SUCCESS;
+}
+
+static int SubFilterAllocationInit( filter_t *p_filter, void *p_data )
+{
+    spu_t *p_spu = p_data;
+
+    filter_owner_sys_t *p_sys = malloc( sizeof(filter_owner_sys_t) );
+    if( !p_sys )
+        return VLC_EGENERIC;
+
+    p_filter->pf_sub_buffer_new = sub_new_buffer;
+    p_filter->pf_sub_buffer_del = sub_del_buffer;
+
+    p_filter->p_owner = p_sys;
+    spu_Control( p_spu, SPU_CHANNEL_REGISTER, &p_sys->i_channel );
+    p_sys->p_spu = p_spu;
 
-    if( !strcmp( psz_var, "sub-filter" ) )
-    {
-        spu_t *p_spu = (spu_t *)p_data;
-        vlc_mutex_lock( &p_spu->subpicture_lock );
-        spu_DeleteChain( p_spu );
-        spu_ParseChain( p_spu );
-        vlc_mutex_unlock( &p_spu->subpicture_lock );
-    }
     return VLC_SUCCESS;
 }
+
+static void SubFilterAllocationClean( filter_t *p_filter )
+{
+    filter_owner_sys_t *p_sys = p_filter->p_owner;
+
+    SpuClearChannel( p_sys->p_spu, p_sys->i_channel, true );
+    free( p_filter->p_owner );
+}
+