]> git.sesse.net Git - vlc/blobdiff - modules/codec/subsdec.c
Use I420 image buffers instead of YUVA for mosaic bridge. Impact on CPU usage for...
[vlc] / modules / codec / subsdec.c
index 566a31d7ae375f28579d5e9bce96cd5abc32ae07..e4d66b309b4da2f6a841093c2b7a0a4731e3c5e4 100644 (file)
@@ -1,11 +1,13 @@
 /*****************************************************************************
  * subsdec.c : text subtitles decoder
  *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
- * $Id: subsdec.c,v 1.7 2003/11/16 21:07:30 gbazin Exp $
+ * Copyright (C) 2000-2006 the VideoLAN team
+ * $Id$
  *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
+ * Authors: Gildas Bazin <gbazin@videolan.org>
  *          Samuel Hocevar <sam@zoy.org>
+ *          Derk-Jan Hartman <hartman at videolan dot org>
+ *          Bernie Purcell <b dot purcell at adbglobal dot com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>                                    /* memcpy(), memset() */
-
 #include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/decoder.h>
-#include <osd.h>
-#include <codecs.h>
+#include <vlc_vout.h>
+#include <vlc_codec.h>
 
-#if defined(HAVE_ICONV)
-#include <iconv.h>
-#endif
+#include <vlc_osd.h>
+#include <vlc_filter.h>
+#include <vlc_charset.h>
+#include <vlc_stream.h>
+#include <vlc_xml.h>
+#include <errno.h>
+#include <string.h>
 
-#include "charset.h"
+typedef struct
+{
+    char *          psz_stylename; /* The name of the style, no comma's allowed */
+    text_style_t    font_style;
+    int             i_align;
+    int             i_margin_h;
+    int             i_margin_v;
+}  ssa_style_t;
 
 /*****************************************************************************
  * decoder_sys_t : decoder descriptor
  *****************************************************************************/
 struct decoder_sys_t
 {
+    vlc_bool_t          b_ass;                           /* The subs are ASS */
+    int                 i_original_height;
+    int                 i_original_width;
     int                 i_align;          /* Subtitles alignment on the vout */
+    vlc_iconv_t         iconv_handle;            /* handle to iconv instance */
+    vlc_bool_t          b_autodetect_utf8;
 
-#if defined(HAVE_ICONV)
-    iconv_t             iconv_handle;            /* handle to iconv instance */
-#endif
+    ssa_style_t         **pp_ssa_styles;
+    int                 i_ssa_styles;
 };
 
 /*****************************************************************************
@@ -58,17 +70,24 @@ struct decoder_sys_t
 static int  OpenDecoder   ( vlc_object_t * );
 static void CloseDecoder  ( vlc_object_t * );
 
-static void DecodeBlock   ( decoder_t *, block_t ** );
-
-static void ParseText     ( decoder_t *, block_t *, vout_thread_t * );
+static subpicture_t *DecodeBlock   ( decoder_t *, block_t ** );
+static subpicture_t *ParseText     ( decoder_t *, block_t * );
+static void         ParseSSAHeader ( decoder_t * );
+static void         ParseUSFHeader ( decoder_t * );
+static void         ParseUSFHeaderTags( decoder_sys_t *, xml_reader_t * );
+static void         ParseSSAString ( decoder_t *, char *, subpicture_t * );
+static void         ParseUSFString ( decoder_t *, char *, subpicture_t * );
+static void         ParseColor     ( decoder_t *, char *, int *, int * );
+static char        *StripTags      ( char * );
+static char        *CreateHtmlSubtitle ( char * );
 
-#define DEFAULT_NAME "System Default"
+#define DEFAULT_NAME "Default"
+#define MAX_LINE 8192
 
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/
-#if defined(HAVE_ICONV)
-static char *ppsz_encodings[] = { DEFAULT_NAME, "ASCII", "UTF-8", "",
+static const char *ppsz_encodings[] = { DEFAULT_NAME, "ASCII", "UTF-8", "",
     "ISO-8859-1", "CP1252", "MacRoman", "MacIceland","ISO-8859-15", "",
     "ISO-8859-2", "CP1250", "MacCentralEurope", "MacCroatian", "MacRomania", "",
     "ISO-8859-5", "CP1251", "MacCyrillic", "MacUkraine", "KOI8-R", "KOI8-U", "KOI8-RU", "",
@@ -89,30 +108,65 @@ static char *ppsz_encodings[] = { DEFAULT_NAME, "ASCII", "UTF-8", "",
     "HZ", "GBK", "GB18030", "JOHAB", "ARMSCII-8",
     "Georgian-Academy", "Georgian-PS", "TIS-620", "MuleLao-1", "VISCII", "TCVN",
     "HPROMAN8", "NEXTSTEP" };
-#endif
+/*
+SSA supports charset selection.
+The following known charsets are used:
+
+0 = Ansi - Western European
+1 = default
+2 = symbol
+3 = invalid
+77 = Mac
+128 = Japanese (Shift JIS)
+129 = Hangul
+130 = Johab
+134 = GB2312 Simplified Chinese
+136 = Big5 Traditional Chinese
+161 = Greek
+162 = Turkish
+163 = Vietnamese
+177 = Hebrew
+178 = Arabic
+186 = Baltic
+204 = Russian (Cyrillic)
+222 = Thai
+238 = Eastern European
+254 = PC 437
+*/
 
 static int  pi_justification[] = { 0, 1, 2 };
-static char *ppsz_justification_text[] = {N_("Center"),N_("Left"),N_("Right")};
+static const char *ppsz_justification_text[] = {N_("Center"),N_("Left"),N_("Right")};
 
 #define ENCODING_TEXT N_("Subtitles text encoding")
-#define ENCODING_LONGTEXT N_("Change the encoding used in text subtitles")
+#define ENCODING_LONGTEXT N_("Set the encoding used in text subtitles")
 #define ALIGN_TEXT N_("Subtitles justification")
-#define ALIGN_LONGTEXT N_("Change the justification of substitles")
+#define ALIGN_LONGTEXT N_("Set the justification of subtitles")
+#define AUTODETECT_UTF8_TEXT N_("UTF-8 subtitles autodetection")
+#define AUTODETECT_UTF8_LONGTEXT N_("This enables automatic detection of " \
+            "UTF-8 encoding within subtitles files.")
+#define FORMAT_TEXT N_("Formatted Subtitles")
+#define FORMAT_LONGTEXT N_("Some subtitle formats allow for text formatting. " \
+ "VLC partly implements this, but you can choose to disable all formatting.")
+
 
 vlc_module_begin();
-    set_description( _("text subtitles decoder") );
+    set_shortname( _("Subtitles"));
+    set_description( _("Text subtitles decoder") );
     set_capability( "decoder", 50 );
     set_callbacks( OpenDecoder, CloseDecoder );
+    set_category( CAT_INPUT );
+    set_subcategory( SUBCAT_INPUT_SCODEC );
 
-    add_category_hint( N_("Subtitles"), NULL, VLC_FALSE );
     add_integer( "subsdec-align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT,
-                 VLC_TRUE );
+                 VLC_FALSE );
         change_integer_list( pi_justification, ppsz_justification_text, 0 );
-#if defined(HAVE_ICONV)
-    add_string( "subsdec-encoding", "UTF-8", NULL,
+    add_string( "subsdec-encoding", DEFAULT_NAME, NULL,
                 ENCODING_TEXT, ENCODING_LONGTEXT, VLC_FALSE );
         change_string_list( ppsz_encodings, 0, 0 );
-#endif
+    add_bool( "subsdec-autodetect-utf8", VLC_TRUE, NULL,
+              AUTODETECT_UTF8_TEXT, AUTODETECT_UTF8_LONGTEXT, VLC_FALSE );
+    add_bool( "subsdec-formatted", VLC_TRUE, NULL, FORMAT_TEXT, FORMAT_LONGTEXT,
+                 VLC_FALSE );
 vlc_module_end();
 
 /*****************************************************************************
@@ -123,11 +177,12 @@ vlc_module_end();
  *****************************************************************************/
 static int OpenDecoder( vlc_object_t *p_this )
 {
-    decoder_t *p_dec = (decoder_t*)p_this;
+    decoder_t     *p_dec = (decoder_t*)p_this;
     decoder_sys_t *p_sys;
-    vlc_value_t val;
+    vlc_value_t    val;
 
-    if( p_dec->fmt_in.i_codec != VLC_FOURCC('s','u','b','t') && 
+    if( p_dec->fmt_in.i_codec != VLC_FOURCC('s','u','b','t') &&
+        p_dec->fmt_in.i_codec != VLC_FOURCC('u','s','f',' ') &&
         p_dec->fmt_in.i_codec != VLC_FOURCC('s','s','a',' ') )
     {
         return VLC_EGENERIC;
@@ -137,47 +192,95 @@ static int OpenDecoder( vlc_object_t *p_this )
 
     /* Allocate the memory needed to store the decoder's structure */
     if( ( p_dec->p_sys = p_sys =
-          (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
+          (decoder_sys_t *)calloc(1, sizeof(decoder_sys_t)) ) == NULL )
     {
         msg_Err( p_dec, "out of memory" );
-        return VLC_EGENERIC;
+        return VLC_ENOMEM;
     }
 
-    var_Create( p_dec, "subsdec-align", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-    var_Get( p_dec, "subsdec-align", &val );
-    p_sys->i_align = val.i_int;
+    /* init of p_sys */
+    p_sys->i_align = 0;
+    p_sys->iconv_handle = (vlc_iconv_t)-1;
+    p_sys->b_autodetect_utf8 = VLC_FALSE;
+    p_sys->b_ass = VLC_FALSE;
+    p_sys->i_original_height = -1;
+    p_sys->i_original_width = -1;
+    p_sys->pp_ssa_styles = NULL;
+    p_sys->i_ssa_styles = 0;
 
-#if defined(HAVE_ICONV)
-    var_Create( p_dec, "subsdec-encoding",
-                VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Get( p_dec, "subsdec-encoding", &val );
-    if( !strcmp( val.psz_string, DEFAULT_NAME ) )
+    char *psz_charset = NULL;
+    /* First try demux-specified encoding */
+    if( p_dec->fmt_in.subs.psz_encoding && *p_dec->fmt_in.subs.psz_encoding )
     {
-        char *psz_charset =(char*)malloc( 100 );
-        vlc_current_charset( &psz_charset );
-        p_sys->iconv_handle = iconv_open( "UTF-8", psz_charset );
-        free( psz_charset );
+        psz_charset = strdup (p_dec->fmt_in.subs.psz_encoding);
+        msg_Dbg (p_dec, "trying demuxer-specified character encoding: %s",
+                 p_dec->fmt_in.subs.psz_encoding ?: "not specified");
     }
-    else
+
+    /* Second, try configured encoding */
+    if (psz_charset == NULL)
+    {
+        psz_charset = var_CreateGetNonEmptyString (p_dec, "subsdec-encoding");
+        if ((psz_charset != NULL) && !strcasecmp (psz_charset, DEFAULT_NAME))
+        {
+            free (psz_charset);
+            psz_charset = NULL;
+        }
+
+        msg_Dbg (p_dec, "trying configured character encoding: %s",
+                 psz_charset ?: "not specified");
+    }
+
+    /* Third, try "local" encoding with optional UTF-8 autodetection */
+    if (psz_charset == NULL)
+    {
+        psz_charset = strdup (GetFallbackEncoding ());
+        msg_Dbg (p_dec, "trying default character encoding: %s",
+                 psz_charset ?: "not specified");
+
+        if (var_CreateGetBool (p_dec, "subsdec-autodetect-utf8"))
+        {
+            msg_Dbg (p_dec, "using automatic UTF-8 detection");
+            p_sys->b_autodetect_utf8 = VLC_TRUE;
+        }
+    }
+
+    if (psz_charset == NULL)
     {
-        p_sys->iconv_handle = iconv_open( "UTF-8", val.psz_string );
+        psz_charset = strdup ("UTF-8");
+        msg_Dbg (p_dec, "trying hard-coded character encoding: %s",
+                 psz_charset ?: "error");
     }
 
-    if( p_sys->iconv_handle == (iconv_t)-1 )
+    if (psz_charset == NULL)
     {
-        msg_Warn( p_dec, "Unable to do requested conversion" );
+        free (p_sys);
+        return VLC_ENOMEM;
     }
 
-    if( val.psz_string ) free( val.psz_string );
-#else
+    if (strcasecmp (psz_charset, "UTF-8") && strcasecmp (psz_charset, "utf8"))
+    {
+        p_sys->iconv_handle = vlc_iconv_open ("UTF-8", psz_charset);
+        if (p_sys->iconv_handle == (vlc_iconv_t)(-1))
+            msg_Err (p_dec, "cannot convert from %s: %s", psz_charset,
+                     strerror (errno));
+    }
+    free (psz_charset);
 
-    msg_Dbg( p_dec, "No iconv support available" );
-#endif
+    var_Create( p_dec, "subsdec-align", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Get( p_dec, "subsdec-align", &val );
+    p_sys->i_align = val.i_int;
 
-#if 0
-    if( p_demux_data )
-        msg_Dbg( p_dec, p_demux_data->psz_header );
-#endif
+    if( p_dec->fmt_in.i_codec == VLC_FOURCC('s','s','a',' ') && var_CreateGetBool( p_dec, "subsdec-formatted" ) )
+    {
+        if( p_dec->fmt_in.i_extra > 0 )
+            ParseSSAHeader( p_dec );
+    }
+    else if( p_dec->fmt_in.i_codec == VLC_FOURCC('u','s','f',' ') && var_CreateGetBool( p_dec, "subsdec-formatted" ) )
+    {
+        if( p_dec->fmt_in.i_extra > 0 )
+            ParseUSFHeader( p_dec );
+    }
 
     return VLC_SUCCESS;
 }
@@ -187,19 +290,18 @@ static int OpenDecoder( vlc_object_t *p_this )
  ****************************************************************************
  * This function must be fed with complete subtitles units.
  ****************************************************************************/
-static void DecodeBlock( decoder_t *p_dec, block_t **pp_block )
+static subpicture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 {
-    vout_thread_t *p_vout;
+    subpicture_t *p_spu = NULL;
 
-    /* Here we are dealing with text subtitles */
-    p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE );
-    if( !p_vout )
-    {
-        msg_Warn( p_dec, "couldn't find a video output, trashing subtitle" );
-    }
+    if( !pp_block || *pp_block == NULL ) return NULL;
+
+    p_spu = ParseText( p_dec, *pp_block );
+
+    block_Release( *pp_block );
+    *pp_block = NULL;
 
-    ParseText( p_dec, *pp_block, p_vout );
-    vlc_object_release( p_vout );
+    return p_spu;
 }
 
 /*****************************************************************************
@@ -209,34 +311,25 @@ static void CloseDecoder( vlc_object_t *p_this )
 {
     decoder_t *p_dec = (decoder_t *)p_this;
     decoder_sys_t *p_sys = p_dec->p_sys;
-    vout_thread_t *p_vout;
 
-    p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE );
-    if( p_vout != NULL && p_vout->p_subpicture != NULL )
+    if( p_sys->iconv_handle != (vlc_iconv_t)-1 )
     {
-        subpicture_t *p_subpic;
-        int          i_subpic;
-
-        for( i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ )
-        {
-            p_subpic = &p_vout->p_subpicture[i_subpic];
-
-            if( p_subpic != NULL &&
-              ( p_subpic->i_status == RESERVED_SUBPICTURE
-                || p_subpic->i_status == READY_SUBPICTURE ) )
-            {
-                vout_DestroySubPicture( p_vout, p_subpic );
-            }
-        }
+        vlc_iconv_close( p_sys->iconv_handle );
     }
-    if( p_vout ) vlc_object_release( p_vout );
 
-#if defined(HAVE_ICONV)
-    if( p_sys->iconv_handle != (iconv_t)-1 )
+    if( p_sys->pp_ssa_styles )
     {
-        iconv_close( p_sys->iconv_handle );
+        int i;
+        for( i = 0; i < p_sys->i_ssa_styles; i++ )
+        {
+            if( p_sys->pp_ssa_styles[i]->psz_stylename ) free( p_sys->pp_ssa_styles[i]->psz_stylename );
+            p_sys->pp_ssa_styles[i]->psz_stylename = NULL;
+            if( p_sys->pp_ssa_styles[i]->font_style.psz_fontname ) free( p_sys->pp_ssa_styles[i]->font_style.psz_fontname );
+            p_sys->pp_ssa_styles[i]->font_style.psz_fontname = NULL;
+            if( p_sys->pp_ssa_styles[i] ) free( p_sys->pp_ssa_styles[i] ); p_sys->pp_ssa_styles[i] = NULL;
+        }
+        free( p_sys->pp_ssa_styles ); p_sys->pp_ssa_styles = NULL;
     }
-#endif
 
     free( p_sys );
 }
@@ -244,121 +337,1124 @@ static void CloseDecoder( vlc_object_t *p_this )
 /*****************************************************************************
  * ParseText: parse an text subtitle packet and send it to the video output
  *****************************************************************************/
-static void ParseText( decoder_t *p_dec, block_t *p_block,
-                       vout_thread_t *p_vout )
+static subpicture_t *ParseText( decoder_t *p_dec, block_t *p_block )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
-    char *psz_subtitle;
-    int i_align_h, i_align_v;
+    subpicture_t *p_spu = NULL;
+    char *psz_subtitle = NULL;
+    video_format_t fmt;
 
     /* We cannot display a subpicture with no date */
     if( p_block->i_pts == 0 )
     {
         msg_Warn( p_dec, "subtitle without a date" );
-        return;
+        return NULL;
     }
 
     /* Check validity of packet data */
-    if( p_block->i_buffer <= 1 ||  p_block->p_buffer[0] == '\0' )
+    /* An "empty" line containing only \0 can be used to force
+       and ephemer picture from the screen */
+    if( p_block->i_buffer < 1 )
     {
-        msg_Warn( p_dec, "empty subtitle" );
-        return;
+        msg_Warn( p_dec, "no subtitle data" );
+        return NULL;
     }
 
     /* Should be resiliant against bad subtitles */
-    psz_subtitle = strndup( p_block->p_buffer, p_block->i_buffer );
-    
-    i_align_h = p_sys->i_align ? 20 : 0;
-    i_align_v = 10;
-
-#if defined(HAVE_ICONV)
-    if( p_sys->iconv_handle != (iconv_t)-1 )
-    {
-        char *psz_new_subtitle;
-        char *psz_convert_buffer_out;
-        const char *psz_convert_buffer_in;
-        size_t ret, inbytes_left, outbytes_left;
-
-        psz_new_subtitle = malloc( 6 * strlen( psz_subtitle ) );
-        psz_convert_buffer_out = psz_new_subtitle;
-        psz_convert_buffer_in = psz_subtitle;
-        inbytes_left = strlen( psz_subtitle );
-        outbytes_left = 6 * inbytes_left;
-        ret = iconv( p_sys->iconv_handle, &psz_convert_buffer_in,
-                     &inbytes_left, &psz_convert_buffer_out, &outbytes_left );
-        *psz_convert_buffer_out = '\0';
-
-        if( inbytes_left )
+    psz_subtitle = strndup( (const char *)p_block->p_buffer,
+                            p_block->i_buffer );
+    if( psz_subtitle == NULL )
+        return NULL;
+
+    if( p_sys->iconv_handle == (vlc_iconv_t)-1 )
+    {
+        if (EnsureUTF8( psz_subtitle ) == NULL)
         {
-            msg_Warn( p_dec, "Something fishy happened during conversion" );
+            msg_Err( p_dec, _("failed to convert subtitle encoding.\n"
+                     "Try manually setting a character-encoding "
+                     "before you open the file.") );
         }
-        else
+    }
+    else
+    {
+
+        if( p_sys->b_autodetect_utf8 )
+        {
+            if( IsUTF8( psz_subtitle ) == NULL )
+            {
+                msg_Dbg( p_dec, "invalid UTF-8 sequence: "
+                         "disabling UTF-8 subtitles autodetection" );
+                p_sys->b_autodetect_utf8 = VLC_FALSE;
+            }
+        }
+
+        if( !p_sys->b_autodetect_utf8 )
         {
+            size_t inbytes_left = strlen( psz_subtitle );
+            size_t outbytes_left = 6 * inbytes_left;
+            char *psz_new_subtitle = malloc( outbytes_left + 1 );
+            char *psz_convert_buffer_out = psz_new_subtitle;
+            const char *psz_convert_buffer_in = psz_subtitle;
+
+            size_t ret = vlc_iconv( p_sys->iconv_handle,
+                                    &psz_convert_buffer_in, &inbytes_left,
+                                    &psz_convert_buffer_out, &outbytes_left );
+
+            *psz_convert_buffer_out++ = '\0';
             free( psz_subtitle );
-            psz_subtitle = psz_new_subtitle;
+
+            if( ( ret == (size_t)(-1) ) || inbytes_left )
+            {
+                free( psz_new_subtitle );
+                msg_Err( p_dec, _("failed to convert subtitle encoding.\n"
+                        "Try manually setting a character-encoding "
+                                "before you open the file.") );
+                return NULL;
+            }
+
+            psz_subtitle = realloc( psz_new_subtitle,
+                                    psz_convert_buffer_out - psz_new_subtitle );
         }
     }
-#endif
 
-    if( p_dec->p_fifo->i_fourcc == VLC_FOURCC('s','s','a',' ') )
+    /* Create the subpicture unit */
+    p_spu = p_dec->pf_spu_buffer_new( p_dec );
+    if( !p_spu )
+    {
+        msg_Warn( p_dec, "can't get spu buffer" );
+        if( psz_subtitle ) free( psz_subtitle );
+        return NULL;
+    }
+
+    p_spu->b_pausable = VLC_TRUE;
+
+    /* Create a new subpicture region */
+    memset( &fmt, 0, sizeof(video_format_t) );
+    fmt.i_chroma = VLC_FOURCC('T','E','X','T');
+    fmt.i_aspect = 0;
+    fmt.i_width = fmt.i_height = 0;
+    fmt.i_x_offset = fmt.i_y_offset = 0;
+    p_spu->p_region = p_spu->pf_create_region( VLC_OBJECT(p_dec), &fmt );
+    if( !p_spu->p_region )
+    {
+        msg_Err( p_dec, "cannot allocate SPU region" );
+        if( psz_subtitle ) free( psz_subtitle );
+        p_dec->pf_spu_buffer_del( p_dec, p_spu );
+        return NULL;
+    }
+
+    /* Decode and format the subpicture unit */
+    if( p_dec->fmt_in.i_codec != VLC_FOURCC('s','s','a',' ') &&
+        p_dec->fmt_in.i_codec != VLC_FOURCC('u','s','f',' ') )
+    {
+        /* Normal text subs, easy markup */
+        p_spu->i_flags = SUBPICTURE_ALIGN_BOTTOM | p_sys->i_align;
+        p_spu->i_x = p_sys->i_align ? 20 : 0;
+        p_spu->i_y = 10;
+
+        /* Remove formatting from string */
+
+        p_spu->p_region->psz_text = StripTags( psz_subtitle );
+        p_spu->p_region->psz_html = CreateHtmlSubtitle( psz_subtitle );
+
+        p_spu->i_start = p_block->i_pts;
+        p_spu->i_stop = p_block->i_pts + p_block->i_length;
+        p_spu->b_ephemer = (p_block->i_length == 0);
+        p_spu->b_absolute = VLC_FALSE;
+    }
+    else
+    {
+        /* Decode SSA/USF strings */
+        if( p_dec->fmt_in.i_codec == VLC_FOURCC('s','s','a',' ') )
+            ParseSSAString( p_dec, psz_subtitle, p_spu );
+        else
+            ParseUSFString( p_dec, psz_subtitle, p_spu );
+
+        p_spu->i_start = p_block->i_pts;
+        p_spu->i_stop = p_block->i_pts + p_block->i_length;
+        p_spu->b_ephemer = (p_block->i_length == 0);
+        p_spu->b_absolute = VLC_FALSE;
+        p_spu->i_original_picture_width = p_sys->i_original_width;
+        p_spu->i_original_picture_height = p_sys->i_original_height;
+    }
+    if( psz_subtitle ) free( psz_subtitle );
+
+    return p_spu;
+}
+
+static void ParseUSFString( decoder_t *p_dec, char *psz_subtitle, subpicture_t *p_spu_in )
+{
+    decoder_sys_t   *p_sys = p_dec->p_sys;
+    subpicture_t    *p_spu = p_spu_in;
+    char            *psz_text;
+    char            *psz_text_start;
+    ssa_style_t     *p_style = NULL;
+    int              i;
+
+    /* Create a text only copy of the subtitle (for legacy implementations) and copy
+     * the rich html version across as is - for parsing by a rendering engine capable
+     * of understanding it.
+     */
+    p_spu->p_region->psz_text = NULL;
+    p_spu->p_region->psz_html = strdup( psz_subtitle );
+
+    for( i = 0; i < p_sys->i_ssa_styles; i++ )
     {
-        /* Decode SSA strings */
-        /* We expect: ReadOrder, Layer, Style, Name, MarginL, MarginR, MarginV, Effect, Text */
-        char *psz_new_subtitle;
-        char *psz_buffer_sub;
-        int         i_comma;
-        int         i_text;
+        if( !strcasecmp( p_sys->pp_ssa_styles[i]->psz_stylename, "Default" ) )
+            p_style = p_sys->pp_ssa_styles[i];
+    }
 
-        psz_buffer_sub = psz_subtitle;
-        for( ;; )
+    /* The StripTags() function doesn't do everything we need (eg. <br/> tag )
+     * so do it here ourselves.
+     */
+    psz_text_start = malloc( strlen( psz_subtitle ));
+
+    psz_text = psz_text_start;
+    while( *psz_subtitle )
+    {
+        if( *psz_subtitle == '<' )
         {
-            i_comma = 0;
-            while( i_comma < 8 &&
-                *psz_buffer_sub != '\0' )
+            if( !strncasecmp( psz_subtitle, "<br/>", 5 ))
+                *psz_text++ = '\n';
+            else if( !strncasecmp( psz_subtitle, "<text ", 6 ))
             {
-                if( *psz_buffer_sub == ',' )
+                char *psz_style = strcasestr( psz_subtitle, "style=\"" );
+
+                if( psz_style && ( psz_style < strchr( psz_subtitle, '>' ) ))
                 {
-                    i_comma++;
+                    int i_len;
+
+                    psz_style += strspn( psz_style, "\"" ) + 1;
+                    i_len = strcspn( psz_style, "\"" );
+
+                    psz_style[ i_len ] = '\0';
+
+                    for( i = 0; i < p_sys->i_ssa_styles; i++ )
+                    {
+                        if( !strcmp( p_sys->pp_ssa_styles[i]->psz_stylename, psz_style ) )
+                            p_style = p_sys->pp_ssa_styles[i];
+                    }
+
+                    psz_style[ i_len ] = '\"';
                 }
+            }
+            
+            psz_subtitle += strcspn( psz_subtitle, ">" );
+        }
+        else if( *psz_subtitle == '&' )
+        {
+            if( !strncasecmp( psz_subtitle, "&lt;", 4 ))
+                *psz_text++ = '<';
+            else if( !strncasecmp( psz_subtitle, "&gt;", 4 ))
+                *psz_text++ = '>';
+            else if( !strncasecmp( psz_subtitle, "&amp;", 5 ))
+                *psz_text++ = '&';
+
+            psz_subtitle += strcspn( psz_subtitle, ";" );
+        }
+        else if( ( *psz_subtitle == '\t' ) ||
+                 ( *psz_subtitle == '\r' ) ||
+                 ( *psz_subtitle == '\n' ) ||
+                 ( *psz_subtitle == ' ' ) )
+        {
+            if( ( psz_text_start < psz_text ) &&
+                ( *(psz_text-1) != ' ' ) )
+            {
+                *psz_text++ = ' ';
+            }
+        }
+        else
+            *psz_text++ = *psz_subtitle;
+
+        psz_subtitle++;
+    }
+    *psz_text = '\0';
+    p_spu->p_region->psz_text = strdup( psz_text_start );
+    free( psz_text_start );
+
+    if( p_style == NULL )
+    {
+        p_spu->i_flags = SUBPICTURE_ALIGN_BOTTOM | p_sys->i_align;
+        p_spu->i_x = p_sys->i_align ? 20 : 0;
+        p_spu->i_y = 10;
+    }
+    else
+    {
+        msg_Dbg( p_dec, "style is: %s", p_style->psz_stylename);
+        p_spu->p_region->p_style = &p_style->font_style;
+        p_spu->i_flags = p_style->i_align;
+    }
+}
+
+static void ParseSSAString( decoder_t *p_dec, char *psz_subtitle, subpicture_t *p_spu_in )
+{
+    /* We expect MKV formatted SSA:
+     * ReadOrder, Layer, Style, CharacterName, MarginL, MarginR,
+     * MarginV, Effect, Text */
+    decoder_sys_t   *p_sys = p_dec->p_sys;
+    subpicture_t    *p_spu = p_spu_in;
+    ssa_style_t     *p_style = NULL;
+    char            *psz_new_subtitle = NULL;
+    char            *psz_buffer_sub = NULL;
+    char            *psz_style = NULL;
+    char            *psz_style_start = NULL;
+    char            *psz_style_end = NULL;
+    int             i_text = 0, i_comma = 0, i_strlen = 0, i;
+    int             i_margin_l = 0, i_margin_r = 0, i_margin_v = 0;
+
+    psz_buffer_sub = psz_subtitle;
+
+    p_spu->p_region->psz_html = NULL;
+
+    i_comma = 0;
+    while( i_comma < 8 && *psz_buffer_sub != '\0' )
+    {
+        if( *psz_buffer_sub == ',' )
+        {
+            i_comma++;
+            if( i_comma == 2 ) psz_style_start = &psz_buffer_sub[1];
+            if( i_comma == 3 ) psz_style_end = &psz_buffer_sub[0];
+            if( i_comma == 4 ) i_margin_l = (int)strtol( psz_buffer_sub+1, NULL, 10 );
+            if( i_comma == 5 ) i_margin_r = (int)strtol( psz_buffer_sub+1, NULL, 10 );
+            if( i_comma == 6 ) i_margin_v = (int)strtol( psz_buffer_sub+1, NULL, 10 );
+        }
+        psz_buffer_sub++;
+    }
+
+    if( *psz_buffer_sub == '\0' && i_comma == 8 )
+    {
+        msg_Dbg( p_dec, "couldn't find all fields in this SSA line" );
+        return;
+    }
+
+    psz_new_subtitle = malloc( strlen( psz_buffer_sub ) + 1);
+    i_text = 0;
+    while( psz_buffer_sub[0] != '\0' )
+    {
+        if( psz_buffer_sub[0] == '\\' && psz_buffer_sub[1] == 'n' )
+        {
+            psz_new_subtitle[i_text] = ' ';
+            i_text++;
+            psz_buffer_sub += 2;
+        }
+        else if( psz_buffer_sub[0] == '\\' && psz_buffer_sub[1] == 'N' )
+        {
+            psz_new_subtitle[i_text] = '\n';
+            i_text++;
+            psz_buffer_sub += 2;
+        }
+        else if( psz_buffer_sub[0] == '{' &&
+                 psz_buffer_sub[1] == '\\' )
+        {
+            /* SSA control code */
+            while( psz_buffer_sub[0] != '\0' &&
+                   psz_buffer_sub[0] != '}' )
+            {
                 psz_buffer_sub++;
             }
-            psz_new_subtitle = malloc( strlen( psz_buffer_sub ) + 1);
-            i_text = 0;
-            while( psz_buffer_sub[0] != '\0' )
+            psz_buffer_sub++;
+        }
+        else
+        {
+            psz_new_subtitle[i_text] = psz_buffer_sub[0];
+            i_text++;
+            psz_buffer_sub++;
+        }
+    }
+    psz_new_subtitle[i_text] = '\0';
+
+    i_strlen = __MAX( psz_style_end - psz_style_start, 0);
+    psz_style = (char *)malloc( i_strlen + 1);
+    psz_style = memcpy( psz_style, psz_style_start, i_strlen );
+    psz_style[i_strlen] = '\0';
+
+    for( i = 0; i < p_sys->i_ssa_styles; i++ )
+    {
+        if( !strcmp( p_sys->pp_ssa_styles[i]->psz_stylename, psz_style ) )
+            p_style = p_sys->pp_ssa_styles[i];
+    }
+    if( psz_style ) free( psz_style );
+
+    p_spu->p_region->psz_text = psz_new_subtitle;
+    if( p_style == NULL )
+    {
+        p_spu->i_flags = SUBPICTURE_ALIGN_BOTTOM | p_sys->i_align;
+        p_spu->i_x = p_sys->i_align ? 20 : 0;
+        p_spu->i_y = 10;
+    }
+    else
+    {
+        msg_Dbg( p_dec, "style is: %s", p_style->psz_stylename);
+        p_spu->p_region->p_style = &p_style->font_style;
+        p_spu->i_flags = p_style->i_align;
+        if( p_style->i_align & SUBPICTURE_ALIGN_LEFT )
+        {
+            p_spu->i_x = (i_margin_l) ? i_margin_l : p_style->i_margin_h;
+        }
+        else if( p_style->i_align & SUBPICTURE_ALIGN_RIGHT ) 
+        {
+            p_spu->i_x = (i_margin_r) ? i_margin_r : p_style->i_margin_h;
+        }
+        p_spu->i_y = (i_margin_v) ? i_margin_v : p_style->i_margin_v;
+    }
+}
+
+static char* GotoNextLine( char *psz_text )
+{
+    char *p_newline = psz_text;
+
+    while( p_newline[0] != '\0' )
+    {
+        if( p_newline[0] == '\n' || p_newline[0] == '\r' )
+        {
+            p_newline++;
+            while( p_newline[0] == '\n' || p_newline[0] == '\r' )
+                p_newline++;
+            break;
+        }
+        else p_newline++;
+    }
+    return p_newline;
+}
+
+/*****************************************************************************
+ * ParseColor: SSA stores color in BBGGRR, in ASS it uses AABBGGRR
+ * The string value in the string can be a pure integer, or hexadecimal &HBBGGRR
+ *****************************************************************************/
+static void ParseColor( decoder_t *p_dec, char *psz_color, int *pi_color, int *pi_alpha )
+{
+    int i_color = 0;
+    if( !strncasecmp( psz_color, "&H", 2 ) )
+    {
+        /* textual HEX representation */
+        i_color = (int) strtol( psz_color+2, NULL, 16 );
+    }
+    else i_color = (int) strtol( psz_color, NULL, 0 );
+
+    *pi_color = 0;
+    *pi_color |= ( ( i_color & 0x000000FF ) << 16 ); /* Red */
+    *pi_color |= ( ( i_color & 0x0000FF00 ) );       /* Green */
+    *pi_color |= ( ( i_color & 0x00FF0000 ) >> 16 ); /* Blue */
+
+    if( pi_alpha != NULL )
+        *pi_alpha = ( i_color & 0xFF000000 ) >> 24;
+}
+
+/*****************************************************************************
+ * ParseUSFHeader: Retrieve global formatting information etc
+ *****************************************************************************/
+static void ParseUSFHeader( decoder_t *p_dec )
+{
+    decoder_sys_t *p_sys = p_dec->p_sys;
+    stream_t      *p_sub = NULL;
+    xml_t         *p_xml = NULL;
+    xml_reader_t  *p_xml_reader = NULL;
+
+    p_sub = stream_MemoryNew( VLC_OBJECT(p_dec),
+                              p_dec->fmt_in.p_extra,
+                              p_dec->fmt_in.i_extra,
+                              VLC_TRUE );
+    if( p_sub )
+    {
+        p_xml = xml_Create( p_dec );
+        if( p_xml )
+        {
+            p_xml_reader = xml_ReaderCreate( p_xml, p_sub );
+            if( p_xml_reader )
             {
-                if( psz_buffer_sub[0] == '\\' && ( psz_buffer_sub[1] =='n' || psz_buffer_sub[1] =='N' ) )
+                /* Look for Root Node */
+                if( xml_ReaderRead( p_xml_reader ) == 1 )
+                {
+                    char *psz_node = xml_ReaderName( p_xml_reader );
+
+                    if( !strcasecmp( "usfsubtitles", psz_node ) )
+                        ParseUSFHeaderTags( p_sys, p_xml_reader );
+
+                    free( psz_node );
+                }
+
+                xml_ReaderDelete( p_xml, p_xml_reader );
+            }
+            xml_Delete( p_xml );
+        }
+        stream_Delete( p_sub );
+    }
+}
+
+static void ParseUSFHeaderTags( decoder_sys_t *p_sys, xml_reader_t *p_xml_reader )
+{
+    char *psz_node;
+    ssa_style_t *p_style = NULL;
+    int i_style_level = 0;
+    int i_metadata_level = 0;
+
+    while ( xml_ReaderRead( p_xml_reader ) == 1 )
+    {
+        switch ( xml_ReaderNodeType( p_xml_reader ) )
+        {
+            case XML_READER_TEXT:
+            case XML_READER_NONE:
+                break;
+            case XML_READER_ENDELEM:
+                psz_node = xml_ReaderName( p_xml_reader );
+                
+                if( psz_node )
                 {
-                    psz_new_subtitle[i_text] = '\n';
-                    i_text++;
-                    psz_buffer_sub += 2;
+                    switch (i_style_level)
+                    {
+                        case 0:
+                            if( !strcasecmp( "metadata", psz_node ) && (i_metadata_level == 1) )
+                            {
+                                i_metadata_level--;
+                            }
+                            break;
+                        case 1:
+                            if( !strcasecmp( "styles", psz_node ) )
+                            {
+                                i_style_level--;
+                            }
+                            break;
+                        case 2:
+                            if( !strcasecmp( "style", psz_node ) )
+                            {
+                                p_style->font_style.i_text_align = p_style->i_align;
+
+                                TAB_APPEND( p_sys->i_ssa_styles, p_sys->pp_ssa_styles, p_style );
+
+                                p_style = NULL;
+                                i_style_level--;
+                            }
+                            break;
+                    }
+                    
+                    free( psz_node );
                 }
-                else if( psz_buffer_sub[0] == '{' && psz_buffer_sub[1] == '\\' )
+                break;
+            case XML_READER_STARTELEM:
+                psz_node = xml_ReaderName( p_xml_reader );
+
+                if( psz_node )
                 {
-                    /* SSA control code */
-                    while( psz_buffer_sub[0] != '\0' && psz_buffer_sub[0] != '}' )
+                    if( !strcasecmp( "metadata", psz_node ) && (i_style_level == 0) )
+                    {
+                        i_metadata_level++;
+                    }
+                    else if( !strcasecmp( "resolution", psz_node ) && (i_metadata_level == 1) )
+                    {
+                        while ( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
+                        {
+                            char *psz_name = xml_ReaderName ( p_xml_reader );
+                            char *psz_value = xml_ReaderValue ( p_xml_reader );
+
+                            if( psz_name && psz_value )
+                            {
+                                if( !strcasecmp( "x", psz_name ) )
+                                    p_sys->i_original_width = atoi( psz_value );
+                                else if( !strcasecmp( "y", psz_name ) )
+                                    p_sys->i_original_height = atoi( psz_value );
+                            }
+                            if( psz_name )  free( psz_name );
+                            if( psz_value ) free( psz_value );
+                        }
+                    }
+                    else if( !strcasecmp( "styles", psz_node ) && (i_style_level == 0) )
+                    {
+                        i_style_level++;
+                    }
+                    else if( !strcasecmp( "style", psz_node ) && (i_style_level == 1) )
                     {
-                        psz_buffer_sub++;
+                        i_style_level++;
+
+                        p_style = calloc( 1, sizeof(ssa_style_t) );
+
+                        while ( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
+                        {
+                            char *psz_name = xml_ReaderName ( p_xml_reader );
+                            char *psz_value = xml_ReaderValue ( p_xml_reader );
+
+                            if( psz_name && psz_value )
+                            {
+                                if( !strcasecmp( "name", psz_name ) )
+                                    p_style->psz_stylename = strdup( psz_value);
+                            }
+                            if( psz_name )  free( psz_name );
+                            if( psz_value ) free( psz_value );
+                        }
                     }
-                    psz_buffer_sub++;
+                    else if( !strcasecmp( "fontstyle", psz_node ) && (i_style_level == 2) )
+                    {
+                        while ( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
+                        {
+                            char *psz_name = xml_ReaderName ( p_xml_reader );
+                            char *psz_value = xml_ReaderValue ( p_xml_reader );
+
+                            if( psz_name && psz_value )
+                            {
+                                if( !strcasecmp( "face", psz_name ) )
+                                    p_style->font_style.psz_fontname = strdup( psz_value);
+                                else if( !strcasecmp( "size", psz_name ) )
+                                    p_style->font_style.i_font_size = atoi( psz_value);
+                                else if( !strcasecmp( "italic", psz_name ) )
+                                {
+                                    if( !strcasecmp( "yes", psz_value ))
+                                        p_style->font_style.i_style_flags |= STYLE_ITALIC;
+                                }
+                                else if( !strcasecmp( "weight", psz_name ) )
+                                {
+                                    if( !strcasecmp( "bold", psz_value ))
+                                        p_style->font_style.i_style_flags |= STYLE_BOLD;
+                                }
+                                else if( !strcasecmp( "underline", psz_name ) )
+                                {
+                                    if( !strcasecmp( "yes", psz_value ))
+                                        p_style->font_style.i_style_flags |= STYLE_UNDERLINE;
+                                }
+                                else if( !strcasecmp( "color", psz_name ) )
+                                {
+                                    if( *psz_value == '#' )
+                                    {
+                                        unsigned long col = strtol(psz_value+1, NULL, 16);
+                                        p_style->font_style.i_font_color = (col & 0x00ffffff);
+                                        /* From DTD: <!-- alpha range = 0..100 --> */
+                                        p_style->font_style.i_font_alpha = ((col >> 24) & 0xff) * 255 / 100;
+                                    }
+                                }
+                                else if( !strcasecmp( "outline-color", psz_name ) )
+                                {
+                                    if( *psz_value == '#' )
+                                    {
+                                        unsigned long col = strtol(psz_value+1, NULL, 16);
+                                        p_style->font_style.i_outline_color = (col & 0x00ffffff);
+                                        /* From DTD: <!-- alpha range = 0..100 --> */
+                                        p_style->font_style.i_outline_alpha = ((col >> 24) & 0xff) * 255 / 100;
+                                    }
+                                } 
+                                else if( !strcasecmp( "shadow-color", psz_name ) )
+                                {
+                                    if( *psz_value == '#' )
+                                    {
+                                        unsigned long col = strtol(psz_value+1, NULL, 16);
+                                        p_style->font_style.i_shadow_color = (col & 0x00ffffff);
+                                        /* From DTD: <!-- alpha range = 0..100 --> */
+                                        p_style->font_style.i_shadow_alpha = ((col >> 24) & 0xff) * 255 / 100;
+                                    }
+                                }
+                            }
+                            if( psz_name )  free( psz_name );
+                            if( psz_value ) free( psz_value );
+                        }
+                    }
+                    else if( !strcasecmp( "position", psz_node ) && (i_style_level == 2) )
+                    {
+                        while ( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
+                        {
+                            char *psz_name = xml_ReaderName ( p_xml_reader );
+                            char *psz_value = xml_ReaderValue ( p_xml_reader );
+
+                            if( psz_name && psz_value )
+                            {
+                                if( !strcasecmp( "alignment", psz_name ) )
+                                {
+                                    if( !strcasecmp( "TopLeft", psz_value ) )
+                                    {
+                                        p_style->i_align |= SUBPICTURE_ALIGN_TOP;
+                                        p_style->i_align |= SUBPICTURE_ALIGN_LEFT;
+                                    }
+                                    else if( !strcasecmp( "TopCenter", psz_value ) )
+                                    {
+                                        p_style->i_align |= SUBPICTURE_ALIGN_TOP;
+                                    }
+                                    else if( !strcasecmp( "TopRight", psz_value ) )
+                                    {
+                                        p_style->i_align |= SUBPICTURE_ALIGN_TOP;
+                                        p_style->i_align |= SUBPICTURE_ALIGN_RIGHT;
+                                    }
+                                    else if( !strcasecmp( "MiddleLeft", psz_value ) )
+                                    {
+                                        p_style->i_align |= SUBPICTURE_ALIGN_LEFT;
+                                    }
+                                    else if( !strcasecmp( "MiddleCenter", psz_value ) )
+                                    {
+                                        p_style->i_align = 0;
+                                    }
+                                    else if( !strcasecmp( "MiddleRight", psz_value ) )
+                                    {
+                                        p_style->i_align |= SUBPICTURE_ALIGN_RIGHT;
+                                    }
+                                    else if( !strcasecmp( "BottomLeft", psz_value ) )
+                                    {
+                                        p_style->i_align |= SUBPICTURE_ALIGN_BOTTOM;
+                                        p_style->i_align |= SUBPICTURE_ALIGN_LEFT;
+                                    }
+                                    else if( !strcasecmp( "BottomCenter", psz_value ) )
+                                    {
+                                        p_style->i_align |= SUBPICTURE_ALIGN_BOTTOM;
+                                    }
+                                    else if( !strcasecmp( "BottomRight", psz_value ) )
+                                    {
+                                        p_style->i_align |= SUBPICTURE_ALIGN_BOTTOM;
+                                        p_style->i_align |= SUBPICTURE_ALIGN_RIGHT;
+                                    }
+                                }
+                            }
+                            if( psz_name )  free( psz_name );
+                            if( psz_value ) free( psz_value );
+                        }
+                    }
+                    
+                    free( psz_node );
+                }
+                break;
+        }
+    }
+    if( p_style ) free( p_style );
+}
+/*****************************************************************************
+ * ParseSSAHeader: Retrieve global formatting information etc
+ *****************************************************************************/
+static void ParseSSAHeader( decoder_t *p_dec )
+{
+    decoder_sys_t *p_sys = p_dec->p_sys;
+    char *psz_parser = NULL;
+    char *psz_header = malloc( p_dec->fmt_in.i_extra+1 );
+    int i_section_type = 1;
+
+    memcpy( psz_header, p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra );
+    psz_header[ p_dec->fmt_in.i_extra] = '\0';
+
+    /* Handle [Script Info] section */
+    psz_parser = strcasestr( psz_header, "[Script Info]" );
+    if( psz_parser == NULL ) goto eof;
+
+    psz_parser = GotoNextLine( psz_parser );
+
+    while( psz_parser[0] != '\0' )
+    {
+        int temp;
+        char buffer_text[MAX_LINE + 1];
+
+        if( psz_parser[0] == '!' || psz_parser[0] == ';' ) /* comment */;
+        else if( sscanf( psz_parser, "PlayResX: %d", &temp ) == 1 )
+            p_sys->i_original_width = ( temp > 0 ) ? temp : -1;
+        else if( sscanf( psz_parser, "PlayResY: %d", &temp ) == 1 )
+            p_sys->i_original_height = ( temp > 0 ) ? temp : -1;
+        else if( sscanf( psz_parser, "Script Type: %8192s", buffer_text ) == 1 )
+        {
+            if( !strcasecmp( buffer_text, "V4.00+" ) ) p_sys->b_ass = VLC_TRUE;
+        }
+        else if( !strncasecmp( psz_parser, "[V4 Styles]", 11 ) )
+            i_section_type = 1;
+        else if( !strncasecmp( psz_parser, "[V4+ Styles]", 12) )
+        {
+            i_section_type = 2;
+            p_sys->b_ass = VLC_TRUE;
+        }
+        else if( !strncasecmp( psz_parser, "[Events]", 8 ) )
+            i_section_type = 4;
+        else if( !strncasecmp( psz_parser, "Style:", 6 ) )
+        {
+            int i_font_size, i_bold, i_italic, i_border, i_outline, i_shadow, i_underline,
+                i_strikeout, i_scale_x, i_scale_y, i_spacing, i_align, i_margin_l, i_margin_r, i_margin_v;
+
+            char psz_temp_stylename[MAX_LINE+1];
+            char psz_temp_fontname[MAX_LINE+1];
+            char psz_temp_color1[MAX_LINE+1];
+            char psz_temp_color2[MAX_LINE+1];
+            char psz_temp_color3[MAX_LINE+1];
+            char psz_temp_color4[MAX_LINE+1];
+
+            if( i_section_type == 1 ) /* V4 */
+            {
+                if( sscanf( psz_parser, "Style: %8192[^,],%8192[^,],%d,%8192[^,],%8192[^,],%8192[^,],%8192[^,],%d,%d,%d,%d,%d,%d,%d,%d,%d%*[^\r\n]",
+                    psz_temp_stylename, psz_temp_fontname, &i_font_size,
+                    psz_temp_color1, psz_temp_color2, psz_temp_color3, psz_temp_color4, &i_bold, &i_italic,
+                    &i_border, &i_outline, &i_shadow, &i_align, &i_margin_l, &i_margin_r, &i_margin_v ) == 16 )
+                {
+                    ssa_style_t *p_style = malloc( sizeof(ssa_style_t) );
+
+                    p_style->psz_stylename = strdup( psz_temp_stylename );
+                    p_style->font_style.psz_fontname = strdup( psz_temp_fontname );
+                    p_style->font_style.i_font_size = i_font_size;
+
+                    ParseColor( p_dec, psz_temp_color1, &p_style->font_style.i_font_color, NULL );
+                    ParseColor( p_dec, psz_temp_color4, &p_style->font_style.i_shadow_color, NULL );
+                    p_style->font_style.i_outline_color = p_style->font_style.i_shadow_color;
+                    p_style->font_style.i_font_alpha = p_style->font_style.i_outline_alpha = p_style->font_style.i_shadow_alpha = 0x00;
+                    p_style->font_style.i_style_flags = 0;
+                    if( i_bold ) p_style->font_style.i_style_flags |= STYLE_BOLD;
+                    if( i_italic ) p_style->font_style.i_style_flags |= STYLE_ITALIC;
+
+                    if( i_border == 1 ) p_style->font_style.i_style_flags |= (STYLE_ITALIC | STYLE_OUTLINE);
+                    else if( i_border == 3 )
+                    {
+                        p_style->font_style.i_style_flags |= STYLE_BACKGROUND;
+                        p_style->font_style.i_background_color = p_style->font_style.i_shadow_color;
+                        p_style->font_style.i_background_alpha = p_style->font_style.i_shadow_alpha;
+                    }
+                    p_style->font_style.i_shadow_width = i_shadow;
+                    p_style->font_style.i_outline_width = i_outline;
+
+                    p_style->i_align = 0;
+                    if( i_align == 1 || i_align == 5 || i_align == 9 ) p_style->i_align |= SUBPICTURE_ALIGN_LEFT;
+                    if( i_align == 3 || i_align == 7 || i_align == 11 ) p_style->i_align |= SUBPICTURE_ALIGN_RIGHT;
+                    if( i_align < 4 ) p_style->i_align |= SUBPICTURE_ALIGN_BOTTOM;
+                    else if( i_align < 8 ) p_style->i_align |= SUBPICTURE_ALIGN_TOP; 
+
+                    p_style->i_margin_h = ( p_style->i_align & SUBPICTURE_ALIGN_RIGHT ) ? i_margin_r : i_margin_l;
+                    p_style->i_margin_v = i_margin_v;
+
+                    TAB_APPEND( p_sys->i_ssa_styles, p_sys->pp_ssa_styles, p_style );
+                }
+                else msg_Warn( p_dec, "SSA v4 styleline parsing failed" );
+            }
+            else if( i_section_type == 2 ) /* V4+ */
+            {
+                /* Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour,
+                   Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline,
+                   Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
+                */
+                if( sscanf( psz_parser, "Style: %8192[^,],%8192[^,],%d,%8192[^,],%8192[^,],%8192[^,],%8192[^,],%d,%d,%d,%d,%d,%d,%d,%*f,%d,%d,%d,%d,%d,%d,%d%*[^\r\n]",
+                    psz_temp_stylename, psz_temp_fontname, &i_font_size,
+                    psz_temp_color1, psz_temp_color2, psz_temp_color3, psz_temp_color4, &i_bold, &i_italic,
+                    &i_underline, &i_strikeout, &i_scale_x, &i_scale_y, &i_spacing, &i_border, &i_outline,
+                    &i_shadow, &i_align, &i_margin_l, &i_margin_r, &i_margin_v ) == 21 )
+                {
+                    ssa_style_t *p_style = malloc( sizeof(ssa_style_t) );
+
+                    p_style->psz_stylename = strdup( psz_temp_stylename );
+                    p_style->font_style.psz_fontname = strdup( psz_temp_fontname );
+                    p_style->font_style.i_font_size = i_font_size;
+                    msg_Dbg( p_dec, psz_temp_color1 );
+                    ParseColor( p_dec, psz_temp_color1, &p_style->font_style.i_font_color, &p_style->font_style.i_font_alpha );
+                    ParseColor( p_dec, psz_temp_color3, &p_style->font_style.i_outline_color, &p_style->font_style.i_outline_alpha );
+                    ParseColor( p_dec, psz_temp_color4, &p_style->font_style.i_shadow_color, &p_style->font_style.i_shadow_alpha );
+
+                    p_style->font_style.i_style_flags = 0;
+                    if( i_bold ) p_style->font_style.i_style_flags |= STYLE_BOLD;
+                    if( i_italic ) p_style->font_style.i_style_flags |= STYLE_ITALIC;
+                    if( i_underline ) p_style->font_style.i_style_flags |= STYLE_UNDERLINE;
+                    if( i_strikeout ) p_style->font_style.i_style_flags |= STYLE_STRIKEOUT;
+                    if( i_border == 1 ) p_style->font_style.i_style_flags |= (STYLE_ITALIC | STYLE_OUTLINE);
+                    else if( i_border == 3 )
+                    {
+                        p_style->font_style.i_style_flags |= STYLE_BACKGROUND;
+                        p_style->font_style.i_background_color = p_style->font_style.i_shadow_color;
+                        p_style->font_style.i_background_alpha = p_style->font_style.i_shadow_alpha;
+                    }
+                    p_style->font_style.i_shadow_width  = ( i_border == 1 ) ? i_shadow : 0;
+                    p_style->font_style.i_outline_width = ( i_border == 1 ) ? i_outline : 0;
+                    p_style->font_style.i_spacing = i_spacing;
+                    //p_style->font_style.f_angle = f_angle;
+
+                    p_style->i_align = 0;
+                    if( i_align == 0x1 || i_align == 0x4 || i_align == 0x1 ) p_style->i_align |= SUBPICTURE_ALIGN_LEFT;
+                    if( i_align == 0x3 || i_align == 0x6 || i_align == 0x9 ) p_style->i_align |= SUBPICTURE_ALIGN_RIGHT;
+                    if( i_align == 0x7 || i_align == 0x8 || i_align == 0x9 ) p_style->i_align |= SUBPICTURE_ALIGN_TOP;
+                    if( i_align == 0x1 || i_align == 0x2 || i_align == 0x3 ) p_style->i_align |= SUBPICTURE_ALIGN_BOTTOM;
+                    p_style->i_margin_h = ( p_style->i_align & SUBPICTURE_ALIGN_RIGHT ) ? i_margin_r : i_margin_l;
+                    p_style->i_margin_v = i_margin_v;
+
+                    /*TODO: Ignored: angle i_scale_x|y (fontscaling), i_encoding */
+                    TAB_APPEND( p_sys->i_ssa_styles, p_sys->pp_ssa_styles, p_style );
+                }
+                else msg_Dbg( p_dec, "SSA V4+ styleline parsing failed" );
+            }
+        }
+        psz_parser = GotoNextLine( psz_parser );
+    }
+
+eof:
+    if( psz_header ) free( psz_header );
+    return;
+}
+
+/* Function now handles tags which has attribute values, and tries
+ * to deal with &' commands too. It no longer modifies the string
+ * in place, so that the original text can be reused
+ */
+static char *StripTags( char *psz_subtitle )
+{
+    char *psz_text_start;
+
+    psz_text_start = malloc( strlen( psz_subtitle ) + 1 );
+
+    if( psz_text_start != NULL )
+    {
+        char *psz_text = psz_text_start;
+
+        while( *psz_subtitle )
+        {
+            if( *psz_subtitle == '<' )
+            {
+                psz_subtitle += strcspn( psz_subtitle, ">" );
+            }
+            else if( *psz_subtitle == '&' )
+            {
+                if( !strncasecmp( psz_subtitle, "&lt;", 4 ))
+                {
+                    *psz_text++ = '<';
+                    psz_subtitle += strcspn( psz_subtitle, ";" );
+                }
+                else if( !strncasecmp( psz_subtitle, "&gt;", 4 ))
+                {
+                    *psz_text++ = '>';
+                    psz_subtitle += strcspn( psz_subtitle, ";" );
+                }
+                else if( !strncasecmp( psz_subtitle, "&amp;", 5 ))
+                {
+                    *psz_text++ = '&';
+                    psz_subtitle += strcspn( psz_subtitle, ";" );
                 }
                 else
                 {
-                    psz_new_subtitle[i_text] = psz_buffer_sub[0];
-                    i_text++;
-                    psz_buffer_sub++;
+                    /* Assume it is just a normal ampersand */
+                    *psz_text++ = '&';
                 }
             }
-            psz_new_subtitle[i_text] = '\0';
-            free( psz_subtitle );
-            psz_subtitle = psz_new_subtitle;
-            break;
+            else
+            {
+                *psz_text++ = *psz_subtitle;
+            }
+
+            psz_subtitle++;
         }
+        *psz_text = '\0';
+        psz_text_start = realloc( psz_text_start, strlen( psz_text_start ) + 1 );
     }
+    return psz_text_start;
+}
+
+/* Try to respect any style tags present in the subtitle string. The main
+ * problem here is a lack of adequate specs for the subtitle formats.
+ * SSA/ASS and USF are both detail spec'ed -- but they are handled elsewhere.
+ * SAMI has a detailed spec, but extensive rework is needed in the demux
+ * code to prevent all this style information being excised, as it presently
+ * does.
+ * That leaves the others - none of which were (I guess) originally intended
+ * to be carrying style information. Over time people have used them that way.
+ * In the absence of specifications from which to work, the tags supported
+ * have been restricted to the simple set permitted by the USF DTD, ie. :
+ *  Basic: <br>, <i>, <b>, <u>
+ *  Extended: <font>
+ *    Attributes: face
+ *                family
+ *                size
+ *                color
+ *                outline-color
+ *                shadow-color
+ *                outline-level
+ *                shadow-level
+ *                back-color
+ *                alpha
+ * There is also the further restriction that the subtitle be well-formed
+ * as an XML entity, ie. the HTML sentence:
+ *        <b><i>Bold and Italics</b></i>
+ * doesn't qualify because the tags aren't nested one inside the other.
+ * <text> tags are automatically added to the output to ensure
+ * well-formedness.
+ * If the text doesn't qualify for any reason, a NULL string is
+ * returned, and the rendering engine will fall back to the
+ * plain text version of the subtitle.
+ */
+static char *CreateHtmlSubtitle( char *psz_subtitle )
+{
+    char    psz_tagStack[ 100 ];
+    size_t  i_buf_size     = strlen( psz_subtitle ) + 100;
+    char   *psz_html_start = malloc( i_buf_size );
+
+    psz_tagStack[ 0 ] = '\0';
+
+    if( psz_html_start != NULL )
+    {
+        char *psz_html = psz_html_start;
+
+        strcpy( psz_html, "<text>" );
+        psz_html += 6;
+
+        while( *psz_subtitle )
+        {
+            if( *psz_subtitle == '\n' )
+            {
+                strcpy( psz_html, "<br/>" );
+                psz_html += 5;
+                psz_subtitle++;
+            }
+            else if( *psz_subtitle == '<' )
+            {
+                if( !strncasecmp( psz_subtitle, "<br/>", 5 ))
+                {
+                    strcpy( psz_html, "<br/>" );
+                    psz_html += 5;
+                    psz_subtitle += 5;
+                }
+                else if( !strncasecmp( psz_subtitle, "<b>", 3 ) )
+                {
+                    strcpy( psz_html, "<b>" );
+                    strcat( psz_tagStack, "b" );
+                    psz_html += 3;
+                    psz_subtitle += 3;
+                }
+                else if( !strncasecmp( psz_subtitle, "<i>", 3 ) )
+                {
+                    strcpy( psz_html, "<i>" );
+                    strcat( psz_tagStack, "i" );
+                    psz_html += 3;
+                    psz_subtitle += 3;
+                }
+                else if( !strncasecmp( psz_subtitle, "<u>", 3 ) )
+                {
+                    strcpy( psz_html, "<u>" );
+                    strcat( psz_tagStack, "u" );
+                    psz_html += 3;
+                    psz_subtitle += 3;
+                }
+                else if( !strncasecmp( psz_subtitle, "<font ", 6 ))
+                {
+                    const char *psz_attribs[] = { "face=\"", "family=\"", "size=\"",
+                            "color=\"", "outline-color=\"", "shadow-color=\"",
+                            "outline-level=\"", "shadow-level=\"", "back-color=\"",
+                            "alpha=\"", NULL };
 
-    vout_ShowTextAbsolute( p_vout, psz_subtitle, NULL, 
-                           OSD_ALIGN_BOTTOM | p_sys->i_align,
-                           i_align_h, i_align_v, 
-                           p_block->i_pts, p_block->i_dts );
+                    strcpy( psz_html, "<font " );
+                    strcat( psz_tagStack, "f" );
+                    psz_html += 6;
+                    psz_subtitle += 6;
 
-    free( psz_subtitle );
+                    while( *psz_subtitle != '>' )
+                    {
+                        int  k;
+
+                        for( k=0; psz_attribs[ k ]; k++ )
+                        {
+                            int i_len = strlen( psz_attribs[ k ] );
+
+                            if( !strncasecmp( psz_subtitle, psz_attribs[ k ], i_len )) 
+                            {
+                                i_len += strcspn( psz_subtitle + i_len, "\"" ) + 1;
+
+                                strncpy( psz_html, psz_subtitle, i_len );
+                                psz_html += i_len;
+                                psz_subtitle += i_len;
+                                break;
+                            }
+                        }
+                        if( psz_attribs[ k ] == NULL )
+                        {
+                            /* Jump over unrecognised tag */
+                            int i_len = strcspn( psz_subtitle, "\"" ) + 1;
+
+                            i_len += strcspn( psz_subtitle + i_len, "\"" ) + 1;
+                            psz_subtitle += i_len;
+                        }
+                        while (*psz_subtitle == ' ')
+                            *psz_html++ = *psz_subtitle++;
+                    }
+                    *psz_html++ = *psz_subtitle++;
+                }
+                else if( !strncmp( psz_subtitle, "</", 2 ))
+                {
+                    vlc_bool_t  b_match     = VLC_FALSE;
+                    int         i_len       = strlen( psz_tagStack ) - 1;
+                    char       *psz_lastTag = NULL;
+
+                    if( i_len >= 0 )
+                    {
+                        psz_lastTag = psz_tagStack + i_len;
+                        i_len = 0;
+
+                        switch( *psz_lastTag )
+                        {
+                            case 'b':
+                                b_match = !strncasecmp( psz_subtitle, "</b>", 4 );
+                                i_len   = 4;
+                                break;
+                            case 'i':
+                                b_match = !strncasecmp( psz_subtitle, "</i>", 4 );
+                                i_len   = 4;
+                                break;
+                            case 'u':
+                                b_match = !strncasecmp( psz_subtitle, "</u>", 4 );
+                                i_len   = 4;
+                                break;
+                            case 'f':
+                                b_match = !strncasecmp( psz_subtitle, "</font>", 7 );
+                                i_len   = 7;
+                                break;
+                        }
+                    }
+                    if( ! b_match )
+                    {
+                        /* Not well formed -- kill everything */
+                        free( psz_html_start );
+                        psz_html_start = NULL;
+                        break;
+                    }
+                    *psz_lastTag = '\0';
+                    strncpy( psz_html, psz_subtitle, i_len );
+                    psz_html += i_len;
+                    psz_subtitle += i_len;
+                }
+                else
+                {
+                    psz_subtitle += strcspn( psz_subtitle, ">" );
+                }
+            }
+            else if( *psz_subtitle == '&' )
+            {
+                if( !strncasecmp( psz_subtitle, "&lt;", 4 ))
+                {
+                    strcpy( psz_html, "&lt;" );
+                    psz_html += 4;
+                    psz_subtitle += 4;
+                }
+                else if( !strncasecmp( psz_subtitle, "&gt;", 4 ))
+                {
+                    strcpy( psz_html, "&gt;" );
+                    psz_html += 4;
+                    psz_subtitle += 4;
+                }
+                else if( !strncasecmp( psz_subtitle, "&amp;", 5 ))
+                {
+                    strcpy( psz_html, "&amp;" );
+                    psz_html += 5;
+                    psz_subtitle += 5;
+                }
+                else
+                {
+                    strcpy( psz_html, "&amp;" );
+                    psz_html += 5;
+                    psz_subtitle++;
+                }
+            }
+            else
+            {
+                *psz_html++ = *psz_subtitle++;
+            }
+
+            if( ( size_t )( psz_html - psz_html_start ) > i_buf_size - 10 )
+            {
+                int i_len = psz_html - psz_html_start;
+
+                i_buf_size += 100;
+                psz_html_start = realloc( psz_html_start, i_buf_size );
+                psz_html = psz_html_start + i_len;
+                *psz_html = '\0';
+            }
+        }
+        strcpy( psz_html, "</text>" );
+        psz_html += 7;
+
+        if( psz_tagStack[ 0 ] != '\0' )
+        {
+            /* Not well formed -- kill everything */
+            free( psz_html_start );
+            psz_html_start = NULL;
+        }
+        else if( psz_html_start )
+        {
+            /* Shrink the memory requirements */
+            psz_html_start = realloc( psz_html_start,  psz_html - psz_html_start + 1 );
+        }
+    }
+    return psz_html_start;
 }