]> git.sesse.net Git - vlc/commitdiff
Quartz (Mac OS X) subtitle renderer by Bernie Purcell.
authorPierre d'Herbemont <pdherbemont@videolan.org>
Tue, 24 Apr 2007 19:59:59 +0000 (19:59 +0000)
committerPierre d'Herbemont <pdherbemont@videolan.org>
Tue, 24 Apr 2007 19:59:59 +0000 (19:59 +0000)
modules/LIST
modules/misc/Modules.am
modules/misc/quartztext.c [new file with mode: 0644]

index 682a3ef3b7b021fa9f4cff0b5bf618253f95b8fe..cca0cf34ae2b8ee2f8aba9e24d5f0f40562d0677 100644 (file)
@@ -217,6 +217,7 @@ $Id$
  * qt4: interface module using the cross-platform Qt4 library.
  * qte: video output module for Qt Embedded.
  * qte_main: a QT Embedded GUI wrapper module.
+ * quartztext: Text renderer using native Mac OS X API
  * quicktime: Quicktime decoder that uses the QT library
  * rawdv: Raw DV demuxer
  * rawvideo: Pseudo audio-decoder for raw video
index 63ed0e354d9d95b7ead4515fc1369fd921435137..8a4858c21ec521708f4cdb0fe07a6e12dc35062b 100644 (file)
@@ -6,6 +6,7 @@ SOURCES_screensaver = screensaver.c
 SOURCES_qte_main = qte_main.cpp
 SOURCES_freetype = freetype.c
 SOURCES_win32text = win32text.c
+SOURCES_quartztext = quartztext.c
 SOURCES_logger = logger.c
 SOURCES_vod_rtsp = rtsp.c
 SOURCES_gnutls = gnutls.c
diff --git a/modules/misc/quartztext.c b/modules/misc/quartztext.c
new file mode 100644 (file)
index 0000000..c41c984
--- /dev/null
@@ -0,0 +1,957 @@
+/*****************************************************************************
+ * quartztext.c : Put text on the video, using Mac OS X Quartz Engine
+ *****************************************************************************
+ * Copyright (C) 2007 the VideoLAN team
+ * $Id$
+ *
+ * Authors: 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+//////////////////////////////////////////////////////////////////////////////
+// Preamble
+//////////////////////////////////////////////////////////////////////////////
+#include <stdlib.h>                                      // malloc(), free()
+#include <string.h>
+
+#include <vlc/vlc.h>
+#include <vlc_vout.h>
+#include <vlc_osd.h>
+#include <vlc_block.h>
+#include <vlc_filter.h>
+#include <vlc_stream.h>
+#include <vlc_xml.h>
+
+#include <math.h>
+
+#include <Carbon/Carbon.h>
+
+#define DEFAULT_FONT           "Verdana"
+#define DEFAULT_FONT_COLOR     0xffffff
+#define DEFAULT_REL_FONT_SIZE  16
+
+#define VERTICAL_MARGIN 3
+#define HORIZONTAL_MARGIN 10
+
+//////////////////////////////////////////////////////////////////////////////
+// Local prototypes
+//////////////////////////////////////////////////////////////////////////////
+static int  Create ( vlc_object_t * );
+static void Destroy( vlc_object_t * );
+
+static int RenderText( filter_t *, subpicture_region_t *,
+                       subpicture_region_t * );
+static int RenderHtml( filter_t *, subpicture_region_t *,
+                       subpicture_region_t * );
+
+static int RenderYUVA( filter_t *p_filter, subpicture_region_t *p_region,
+                       UniChar *psz_utfString, uint32_t i_text_len,
+                       uint32_t i_runs, uint32_t *pi_run_lengths,
+                       ATSUStyle *pp_styles );
+static ATSUStyle CreateStyle( char *psz_fontname, int i_font_size,
+                              int i_font_color, int i_font_alpha,
+                              vlc_bool_t b_bold, vlc_bool_t b_italic,
+                              vlc_bool_t b_uline );
+//////////////////////////////////////////////////////////////////////////////
+// Module descriptor
+//////////////////////////////////////////////////////////////////////////////
+
+// The preferred way to set font style information is for it to come from the
+// subtitle file, and for it to be rendered with RenderHtml instead of
+// RenderText. This module, unlike Freetype, doesn't provide any options to
+// override the fallback font selection used when this style information is
+// absent.
+vlc_module_begin();
+    set_shortname( _("Mac Text renderer"));
+    set_description( _("Quartz font renderer") );
+    set_category( CAT_VIDEO );
+    set_subcategory( SUBCAT_VIDEO_SUBPIC );
+
+    set_capability( "text renderer", 120 );
+    add_shortcut( "text" );
+    set_callbacks( Create, Destroy );
+vlc_module_end();
+
+typedef struct font_stack_t font_stack_t;
+struct font_stack_t
+{
+    char          *psz_name;
+    int            i_size;
+    int            i_color;
+    int            i_alpha;
+
+    font_stack_t  *p_next;
+};
+
+typedef struct offscreen_bitmap_t offscreen_bitmap_t;
+struct offscreen_bitmap_t
+{
+    uint8_t       *p_data;
+    int            i_bitsPerChannel;
+    int            i_bitsPerPixel;
+    int            i_bytesPerPixel;
+    int            i_bytesPerRow;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+// filter_sys_t: quartztext local data
+//////////////////////////////////////////////////////////////////////////////
+// This structure is part of the video output thread descriptor.
+// It describes the freetype specific properties of an output thread.
+//////////////////////////////////////////////////////////////////////////////
+struct filter_sys_t
+{
+    char          *psz_font_name;
+    uint8_t        i_font_opacity;
+    int            i_font_color;
+    int            i_font_size;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+// Create: allocates osd-text video thread output method
+//////////////////////////////////////////////////////////////////////////////
+// This function allocates and initializes a Clone vout method.
+//////////////////////////////////////////////////////////////////////////////
+static int Create( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_t *)p_this;
+    filter_sys_t *p_sys;
+
+    // Allocate structure
+    p_filter->p_sys = p_sys = malloc( sizeof( filter_sys_t ) );
+    if( !p_sys )
+    {
+        msg_Err( p_filter, "out of memory" );
+        return VLC_ENOMEM;
+    }
+    p_sys->psz_font_name  = strdup( DEFAULT_FONT );
+    p_sys->i_font_opacity = 255;
+    p_sys->i_font_color   = DEFAULT_FONT_COLOR;
+    p_sys->i_font_size    = p_filter->fmt_out.video.i_height / DEFAULT_REL_FONT_SIZE;
+
+    p_filter->pf_render_text = RenderText;
+    p_filter->pf_render_html = RenderHtml;
+
+    return VLC_SUCCESS;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// Destroy: destroy Clone video thread output method
+//////////////////////////////////////////////////////////////////////////////
+// Clean up all data and library connections
+//////////////////////////////////////////////////////////////////////////////
+static void Destroy( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_t *)p_this;
+    filter_sys_t *p_sys = p_filter->p_sys;
+
+    free( p_sys->psz_font_name );
+    free( p_sys );
+}
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4
+// Original version of these functions available on:
+// http://developer.apple.com/documentation/Carbon/Conceptual/QuickDrawToQuartz2D/tq_color/chapter_4_section_3.html
+
+#define kGenericRGBProfilePathStr "/System/Library/ColorSync/Profiles/Generic RGB Profile.icc" 
+static CMProfileRef OpenGenericProfile( void )
+{
+    static CMProfileRef cached_rgb_prof = NULL;
+    // Create the profile reference only once
+    if( cached_rgb_prof == NULL )
+    {
+        OSStatus            err;
+        CMProfileLocation   loc;
+        loc.locType = cmPathBasedProfile;
+        strcpy( loc.u.pathLoc.path, kGenericRGBProfilePathStr );
+        err = CMOpenProfile( &cached_rgb_prof, &loc );
+        if( err != noErr )
+        {
+            cached_rgb_prof = NULL;
+        }
+    }
+    if( cached_rgb_prof )
+    {
+        // Clone the profile reference so that the caller has 
+        // their own reference, not our cached one.
+        CMCloneProfileRef( cached_rgb_prof );   
+    }
+    return cached_rgb_prof;
+}
+
+static CGColorSpaceRef CreateGenericRGBColorSpace( void )
+{
+    static CGColorSpaceRef p_generic_rgb_cs = NULL;
+    if( p_generic_rgb_cs == NULL )
+    {
+        CMProfileRef generic_rgb_prof = OpenGenericProfile();
+        if( generic_rgb_prof )
+        {
+            p_generic_rgb_cs = CGColorSpaceCreateWithPlatformColorSpace( generic_rgb_prof );
+            CMCloseProfile( generic_rgb_prof ); 
+        }
+    }
+
+    return p_generic_rgb_cs;
+}
+#endif
+
+static char *EliminateCRLF( char *psz_string )
+{
+    char *p;
+    char *q;
+
+    for( p = psz_string; p && *p; p++ )
+    {
+        if( ( *p == '\r' ) && ( *(p+1) == '\n' ) )
+        {
+            for( q = p + 1; *q; q++ )
+                *( q - 1 ) = *q;
+
+            *( q - 1 ) = '\0';
+        }
+    }
+    return psz_string;
+}
+
+// Convert UTF-8 string to UTF-16 character array -- internal Mac Endian-ness ;
+// we don't need to worry about bidirectional text conversion as ATSUI should
+// handle that for us automatically
+static void ConvertToUTF16( const char *psz_utf8_str, uint32_t *pi_strlen, UniChar **ppsz_utf16_str )
+{
+    CFStringRef   p_cfString;
+    int           i_string_length;
+
+    p_cfString = CFStringCreateWithCString( NULL, psz_utf8_str, kCFStringEncodingUTF8 );
+    i_string_length = CFStringGetLength( p_cfString );
+
+    if( pi_strlen )
+        *pi_strlen = i_string_length;
+
+    if( !*ppsz_utf16_str )
+        *ppsz_utf16_str = (UniChar *) calloc( i_string_length, sizeof( UniChar ) );
+
+    CFStringGetCharacters( p_cfString, CFRangeMake( 0, i_string_length ), *ppsz_utf16_str );
+    
+    CFRelease( p_cfString );
+}
+
+// Renders a text subpicture region into another one.
+// It is used as pf_add_string callback in the vout method by this module
+static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
+                       subpicture_region_t *p_region_in )
+{
+    filter_sys_t *p_sys = p_filter->p_sys;
+    UniChar      *psz_utf16_str = NULL;
+    uint32_t      i_string_length;
+    char         *psz_string;
+    int           i_font_color, i_font_alpha, i_font_size;
+
+    // Sanity check
+    if( !p_region_in || !p_region_out ) return VLC_EGENERIC;
+    psz_string = p_region_in->psz_text;
+    if( !psz_string || !*psz_string ) return VLC_EGENERIC;
+    
+    if( p_region_in->p_style )
+    {
+        i_font_color = __MAX( __MIN( p_region_in->p_style->i_font_color, 0xFFFFFF ), 0 );
+        i_font_alpha = __MAX( __MIN( p_region_in->p_style->i_font_alpha, 255 ), 0 );
+        i_font_size  = __MAX( __MIN( p_region_in->p_style->i_font_size, 255 ), 0 );
+    }
+    else
+    {
+        i_font_color = p_sys->i_font_color;
+        i_font_alpha = 255 - p_sys->i_font_opacity;
+        i_font_size  = p_sys->i_font_size;
+    }
+
+    if( !i_font_alpha ) i_font_alpha = 255 - p_sys->i_font_opacity;
+    
+    ConvertToUTF16( EliminateCRLF( psz_string ), &i_string_length, &psz_utf16_str );
+
+    p_region_out->i_x = p_region_in->i_x;
+    p_region_out->i_y = p_region_in->i_y;
+
+    if( psz_utf16_str != NULL )
+    {
+        ATSUStyle p_style = CreateStyle( p_sys->psz_font_name, i_font_size,
+                                         i_font_color, i_font_alpha,
+                                         VLC_FALSE, VLC_FALSE, VLC_FALSE );
+        if( p_style )
+        {
+            RenderYUVA( p_filter, p_region_out, psz_utf16_str, i_string_length,
+                        1, &i_string_length, &p_style );
+        }
+
+        ATSUDisposeStyle( p_style );
+        free( psz_utf16_str );
+    }
+
+    return VLC_SUCCESS;
+}
+
+
+static ATSUStyle CreateStyle( char *psz_fontname, int i_font_size, int i_font_color, int i_font_alpha,
+                              vlc_bool_t b_bold, vlc_bool_t b_italic, vlc_bool_t b_uline )
+{
+    ATSUStyle   p_style;
+    OSStatus    status;
+    uint32_t    i_tag_cnt;
+
+    float f_red   = (float)(( i_font_color & 0x00FF0000 ) >> 16) / 255.0;
+    float f_green = (float)(( i_font_color & 0x0000FF00 ) >>  8) / 255.0;
+    float f_blue  = (float)(  i_font_color & 0x000000FF        ) / 255.0;
+    float f_alpha = ( 255.0 - (float)i_font_alpha) / 255.0;
+
+    ATSUFontID           font;
+    Fixed                font_size  = IntToFixed( i_font_size );
+    ATSURGBAlphaColor    font_color = { f_red, f_green, f_blue, f_alpha };
+    Boolean              bold       = b_bold;
+    Boolean              italic     = b_italic;
+    Boolean              uline      = b_uline;
+
+    ATSUAttributeTag tags[]        = { kATSUSizeTag, kATSURGBAlphaColorTag, kATSUQDItalicTag,
+                                       kATSUQDBoldfaceTag, kATSUQDUnderlineTag, kATSUFontTag };
+    ByteCount sizes[]              = { sizeof( Fixed ), sizeof( ATSURGBAlphaColor ), sizeof( Boolean ),
+                                       sizeof( Boolean ), sizeof( Boolean ), sizeof( ATSUFontID )};
+    ATSUAttributeValuePtr values[] = { &font_size, &font_color, &italic, &bold, &uline, &font };
+
+    i_tag_cnt = sizeof( tags ) / sizeof( ATSUAttributeTag );
+
+    status = ATSUFindFontFromName( psz_fontname,
+                                   strlen( psz_fontname ),
+                                   kFontFullName,
+                                   kFontNoPlatform,
+                                   kFontNoScript,
+                                   kFontNoLanguageCode,
+                                   &font );
+
+    if( status != noErr )
+    {
+        // If we can't find a suitable font, just do everything else
+        i_tag_cnt--;
+    }
+
+    if( noErr == ATSUCreateStyle( &p_style ) )
+    {
+        if( noErr == ATSUSetAttributes( p_style, i_tag_cnt, tags, sizes, values ) )
+        {
+            return p_style;
+        }
+        ATSUDisposeStyle( p_style );
+    }
+    return NULL;
+}
+
+static int PushFont( font_stack_t **p_font, const char *psz_name, int i_size,
+                     int i_color, int i_alpha )
+{
+    font_stack_t *p_new;
+
+    if( !p_font )
+        return VLC_EGENERIC;
+
+    p_new = malloc( sizeof( font_stack_t ) );
+    p_new->p_next = NULL;
+
+    if( psz_name )
+        p_new->psz_name = strdup( psz_name );
+    else
+        p_new->psz_name = NULL;
+
+    p_new->i_size   = i_size;
+    p_new->i_color  = i_color;
+    p_new->i_alpha  = i_alpha;
+
+    if( !*p_font )
+    {
+        *p_font = p_new;
+    }
+    else
+    {
+        font_stack_t *p_last;
+
+        for( p_last = *p_font;
+             p_last->p_next;
+             p_last = p_last->p_next )
+        ;
+
+        p_last->p_next = p_new;
+    }
+    return VLC_SUCCESS;
+}
+
+static int PopFont( font_stack_t **p_font )
+{
+    font_stack_t *p_last, *p_next_to_last;
+
+    if( !p_font || !*p_font )
+        return VLC_EGENERIC;
+    
+    p_next_to_last = NULL;
+    for( p_last = *p_font;
+         p_last->p_next;
+         p_last = p_last->p_next )
+    {
+        p_next_to_last = p_last;
+    }
+
+    if( p_next_to_last )
+        p_next_to_last->p_next = NULL;
+    else
+        *p_font = NULL;
+
+    free( p_last->psz_name );
+    free( p_last );
+
+    return VLC_SUCCESS;
+}
+
+static int PeekFont( font_stack_t **p_font, char **psz_name, int *i_size,
+                     int *i_color, int *i_alpha )
+{
+    font_stack_t *p_last;
+
+    if( !p_font || !*p_font )
+        return VLC_EGENERIC;
+    
+    for( p_last=*p_font;
+         p_last->p_next;
+         p_last=p_last->p_next )
+    ;
+
+    *psz_name = p_last->psz_name;
+    *i_size   = p_last->i_size;
+    *i_color  = p_last->i_color;
+    *i_alpha  = p_last->i_alpha;
+
+    return VLC_SUCCESS;
+}
+
+static ATSUStyle GetStyleFromFontStack( filter_sys_t *p_sys, font_stack_t **p_fonts,
+                              vlc_bool_t b_bold, vlc_bool_t b_italic, vlc_bool_t b_uline )
+{
+    ATSUStyle   p_style = NULL;
+
+    char  *psz_fontname = NULL;
+    int    i_font_color = p_sys->i_font_color;
+    int    i_font_alpha = 0;
+    int    i_font_size  = p_sys->i_font_size;
+
+    if( VLC_SUCCESS == PeekFont( p_fonts, &psz_fontname, &i_font_size, &i_font_color, &i_font_alpha ) )
+    {
+        p_style = CreateStyle( psz_fontname, i_font_size, i_font_color, i_font_alpha,
+                               b_bold, b_italic, b_uline );
+    }
+    return p_style;
+}
+
+static void ProcessNodes( filter_t *p_filter, xml_reader_t *p_xml_reader,
+                          text_style_t *p_font_style, UniChar *psz_text, int *pi_len,
+                          uint32_t *pi_runs, uint32_t **ppi_run_lengths,
+                          ATSUStyle **ppp_styles)
+{
+    filter_sys_t *p_sys          = p_filter->p_sys;
+    UniChar      *psz_text_orig  = psz_text;
+    font_stack_t *p_fonts        = NULL;
+
+    char *psz_node  = NULL;
+
+    vlc_bool_t b_italic = VLC_FALSE;
+    vlc_bool_t b_bold   = VLC_FALSE;
+    vlc_bool_t b_uline  = VLC_FALSE;
+
+    if( p_font_style )
+    {
+        PushFont( &p_fonts, 
+                  p_font_style->psz_fontname,
+                  p_font_style->i_font_size,
+                  p_font_style->i_font_color,
+                  p_font_style->i_font_alpha );
+        
+        if( p_font_style->i_style_flags & STYLE_BOLD )
+            b_bold = VLC_TRUE;
+        if( p_font_style->i_style_flags & STYLE_ITALIC )
+            b_italic = VLC_TRUE;
+        if( p_font_style->i_style_flags & STYLE_UNDERLINE )
+            b_uline = VLC_TRUE;
+    }
+    else
+    {
+        PushFont( &p_fonts, p_sys->psz_font_name, p_sys->i_font_size, p_sys->i_font_color, 0 );
+    }
+
+    while ( ( xml_ReaderRead( p_xml_reader ) == 1 ) )
+    {
+        switch ( xml_ReaderNodeType( p_xml_reader ) )
+        {
+            case XML_READER_NONE:
+                break;
+            case XML_READER_ENDELEM:
+                psz_node = xml_ReaderName( p_xml_reader );
+                
+                if( psz_node )
+                {
+                    if( !strcasecmp( "font", psz_node ) )
+                        PopFont( &p_fonts );
+                    else if( !strcasecmp( "b", psz_node ) )
+                        b_bold   = VLC_FALSE;
+                    else if( !strcasecmp( "i", psz_node ) )
+                        b_italic = VLC_FALSE;
+                    else if( !strcasecmp( "u", psz_node ) )
+                        b_uline  = VLC_FALSE;
+                    
+                    free( psz_node );
+                }
+                break;
+            case XML_READER_STARTELEM:
+                psz_node = xml_ReaderName( p_xml_reader );
+                if( psz_node )
+                {
+                    if( !strcasecmp( "font", psz_node ) )
+                    {
+                        char *psz_fontname = NULL;
+                        int   i_font_color = 0xffffff;
+                        int   i_font_alpha = 0;
+                        int   i_font_size  = 24;
+
+                        // Default all attributes to the top font in the stack -- in case not
+                        // all attributes are specified in the sub-font
+                        if( VLC_SUCCESS == PeekFont( &p_fonts, &psz_fontname, &i_font_size, &i_font_color, &i_font_alpha ))
+                        {
+                            psz_fontname = strdup( psz_fontname );
+                        }
+
+                        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 ) )
+                                {
+                                    if( psz_fontname ) free( psz_fontname );
+                                    psz_fontname = strdup( psz_value );
+                                }
+                                else if( !strcasecmp( "size", psz_name ) )
+                                {
+                                    i_font_size = atoi( psz_value );
+                                }
+                                else if( !strcasecmp( "color", psz_name )  &&
+                                         ( psz_value[0] == '#' ) )
+                                {
+                                    i_font_color = strtol( psz_value+1, NULL, 16 );
+                                    i_font_color &= 0x00ffffff;
+                                }
+                                else if( !strcasecmp( "alpha", psz_name ) &&
+                                         ( psz_value[0] == '#' ) )
+                                {
+                                    i_font_alpha = strtol( psz_value+1, NULL, 16 );
+                                    i_font_alpha &= 0xff;
+                                }
+                                free( psz_name );
+                                free( psz_value );
+                            }
+                        }
+                        PushFont( &p_fonts, psz_fontname, i_font_size, i_font_color, i_font_alpha );
+                        free( psz_fontname );
+                    }
+                    else if( !strcasecmp( "b", psz_node ) )
+                    {
+                        b_bold = VLC_TRUE;
+                    }
+                    else if( !strcasecmp( "i", psz_node ) )
+                    {
+                        b_italic = VLC_TRUE;
+                    }
+                    else if( !strcasecmp( "u", psz_node ) )
+                    {
+                        b_uline = VLC_TRUE;
+                    }
+                    else if( !strcasecmp( "br", psz_node ) )
+                    {
+                        uint32_t i_string_length;
+
+                        ConvertToUTF16( "\n", &i_string_length, &psz_text );
+                        psz_text += i_string_length;
+
+                        (*pi_runs)++;
+
+                        if( *ppp_styles )
+                            *ppp_styles = (ATSUStyle *) realloc( *ppp_styles, *pi_runs * sizeof( ATSUStyle ) );
+                        else
+                            *ppp_styles = (ATSUStyle *) malloc( *pi_runs * sizeof( ATSUStyle ) );
+
+                        (*ppp_styles)[ *pi_runs - 1 ] = GetStyleFromFontStack( p_sys, &p_fonts, b_bold, b_italic, b_uline );
+
+                        if( *ppi_run_lengths )
+                            *ppi_run_lengths = (uint32_t *) realloc( *ppi_run_lengths, *pi_runs * sizeof( uint32_t ) );
+                        else
+                            *ppi_run_lengths = (uint32_t *) malloc( *pi_runs * sizeof( uint32_t ) );
+
+                        (*ppi_run_lengths)[ *pi_runs - 1 ] = i_string_length;
+                    }
+                    free( psz_node );
+                }
+                break;
+            case XML_READER_TEXT:
+                psz_node = xml_ReaderValue( p_xml_reader );
+                if( psz_node )
+                {
+                    uint32_t i_string_length;
+
+                    ConvertToUTF16( psz_node, &i_string_length, &psz_text );
+                    psz_text += i_string_length;
+
+                    (*pi_runs)++;
+
+                    if( *ppp_styles )
+                        *ppp_styles = (ATSUStyle *) realloc( *ppp_styles, *pi_runs * sizeof( ATSUStyle ) );
+                    else
+                        *ppp_styles = (ATSUStyle *) malloc( *pi_runs * sizeof( ATSUStyle ) );
+
+                    (*ppp_styles)[ *pi_runs - 1 ] = GetStyleFromFontStack( p_sys, &p_fonts, b_bold, b_italic, b_uline );
+
+                    if( *ppi_run_lengths )
+                        *ppi_run_lengths = (uint32_t *) realloc( *ppi_run_lengths, *pi_runs * sizeof( uint32_t ) );
+                    else
+                        *ppi_run_lengths = (uint32_t *) malloc( *pi_runs * sizeof( uint32_t ) );
+
+                    (*ppi_run_lengths)[ *pi_runs - 1 ] = i_string_length;
+
+                    free( psz_node );
+                }
+                break;
+        }
+    }
+
+    *pi_len = psz_text - psz_text_orig;
+
+    while( VLC_SUCCESS == PopFont( &p_fonts ) );
+}
+
+static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out,
+                       subpicture_region_t *p_region_in )
+{
+    int          rv = VLC_SUCCESS;
+    stream_t     *p_sub = NULL;
+    xml_t        *p_xml = NULL;
+    xml_reader_t *p_xml_reader = NULL;
+
+    if( !p_region_in || !p_region_in->psz_html )
+        return VLC_EGENERIC;
+
+    p_sub = stream_MemoryNew( VLC_OBJECT(p_filter),
+                              (uint8_t *) p_region_in->psz_html,
+                              strlen( p_region_in->psz_html ),
+                              VLC_TRUE );
+    if( p_sub )
+    {
+        p_xml = xml_Create( p_filter );
+        if( p_xml )
+        {
+            p_xml_reader = xml_ReaderCreate( p_xml, p_sub );
+            if( p_xml_reader )
+            {
+                UniChar    *psz_text;
+                int         i_len;
+                uint32_t    i_runs = 0;
+                uint32_t   *pi_run_lengths = NULL;
+                ATSUStyle  *pp_styles = NULL;
+
+                psz_text = (UniChar *) calloc( strlen( p_region_in->psz_html ), sizeof( UniChar ) );
+                if( psz_text )
+                {
+                    uint32_t k;
+
+                    ProcessNodes( p_filter, p_xml_reader, p_region_in->p_style, psz_text,
+                                  &i_len, &i_runs, &pi_run_lengths, &pp_styles );
+
+                    p_region_out->i_x = p_region_in->i_x;
+                    p_region_out->i_y = p_region_in->i_y;
+
+                    RenderYUVA( p_filter, p_region_out, psz_text, i_len, i_runs, pi_run_lengths, pp_styles);
+
+                    for( k=0; k<i_runs; k++)
+                        ATSUDisposeStyle( pp_styles[k] );
+                    free( pp_styles );
+                    free( pi_run_lengths );
+
+                    free( psz_text );
+                }
+
+                xml_ReaderDelete( p_xml, p_xml_reader );
+            }
+            xml_Delete( p_xml );
+        }
+        stream_Delete( p_sub );
+    }
+    // No longer need a HTML version of the text
+    free( p_region_in->psz_html );
+    p_region_in->psz_html = NULL;
+
+    return rv;
+}
+
+static CGContextRef CreateOffScreenContext( int i_width, int i_height,
+                         offscreen_bitmap_t **pp_memory, CGColorSpaceRef *pp_colorSpace )
+{
+    offscreen_bitmap_t *p_bitmap;
+    CGContextRef        p_context = NULL;
+
+    p_bitmap = (offscreen_bitmap_t *) malloc( sizeof( offscreen_bitmap_t ));
+    if( p_bitmap )
+    {
+        p_bitmap->i_bitsPerChannel = 8;
+        p_bitmap->i_bitsPerPixel   = 4 * p_bitmap->i_bitsPerChannel; // A,R,G,B
+        p_bitmap->i_bytesPerPixel  = p_bitmap->i_bitsPerPixel / 8;
+        p_bitmap->i_bytesPerRow    = i_width * p_bitmap->i_bytesPerPixel;
+
+        p_bitmap->p_data = calloc( i_height, p_bitmap->i_bytesPerRow );
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
+        *pp_colorSpace = CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB );
+#else
+        *pp_colorSpace = CreateGenericRGBColorSpace();
+#endif
+
+        if( p_bitmap->p_data && *pp_colorSpace )
+        {
+            p_context = CGBitmapContextCreate( p_bitmap->p_data, i_width, i_height,
+                                p_bitmap->i_bitsPerChannel, p_bitmap->i_bytesPerRow,
+                                *pp_colorSpace, kCGImageAlphaPremultipliedFirst);
+        }
+        if( p_context )
+        {
+#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_1
+            // OS X 10.1 doesn't support weak linking of this call which is only available
+            // int 10.4 and later
+            if( CGContextSetAllowsAntialiasing != NULL )
+            {
+                CGContextSetAllowsAntialiasing( p_context, true );
+            }
+#endif
+        }
+        *pp_memory = p_bitmap;
+    }
+
+    return p_context;
+}
+
+static offscreen_bitmap_t *Compose( int i_text_align, UniChar *psz_utf16_str, uint32_t i_text_len,
+                                    uint32_t i_runs, uint32_t *pi_run_lengths, ATSUStyle *pp_styles,
+                                    int i_width, int i_height, int *pi_textblock_height )
+{
+    offscreen_bitmap_t  *p_offScreen  = NULL;
+    CGColorSpaceRef      p_colorSpace = NULL;
+    CGContextRef         p_context = NULL;
+    
+    p_context = CreateOffScreenContext( i_width, i_height, &p_offScreen, &p_colorSpace );
+
+    if( p_context )
+    {
+        ATSUTextLayout p_textLayout;
+        OSStatus status = noErr;
+
+        status = ATSUCreateTextLayoutWithTextPtr( psz_utf16_str, 0, i_text_len, i_text_len,
+                                                  i_runs,
+                                                  (const UniCharCount *) pi_run_lengths,
+                                                  pp_styles,
+                                                  &p_textLayout );
+        if( status == noErr )
+        {
+            // Attach our offscreen Image Graphics Context to the text style
+            // and setup the line alignment (have to specify the line width
+            // also in order for our chosen alignment to work)
+
+            Fract   alignment  = kATSUStartAlignment;
+            Fixed   line_width = Long2Fix( i_width - HORIZONTAL_MARGIN * 2 );
+
+            ATSUAttributeTag tags[]        = { kATSUCGContextTag, kATSULineFlushFactorTag, kATSULineWidthTag };
+            ByteCount sizes[]              = { sizeof( CGContextRef ), sizeof( Fract ), sizeof( Fixed ) };
+            ATSUAttributeValuePtr values[] = { &p_context, &alignment, &line_width };
+
+            int i_tag_cnt = sizeof( tags ) / sizeof( ATSUAttributeTag );
+
+            if( i_text_align == SUBPICTURE_ALIGN_RIGHT )
+            {
+                alignment = kATSUEndAlignment;
+            }
+            else if( i_text_align != SUBPICTURE_ALIGN_LEFT ) 
+            {
+                alignment = kATSUCenterAlignment;
+            }
+
+            ATSUSetLayoutControls( p_textLayout, i_tag_cnt, tags, sizes, values );
+
+            // let ATSUI deal with characters not-in-our-specified-font
+            ATSUSetTransientFontMatching( p_textLayout, true );
+
+            Fixed x = Long2Fix( HORIZONTAL_MARGIN );
+            Fixed y = Long2Fix( i_height );
+
+            // Set the line-breaks and draw individual lines
+            uint32_t i_start = 0;
+            uint32_t i_end = i_text_len;
+
+            // Set up black outlining of the text -- 
+            CGContextSetRGBStrokeColor( p_context, 0, 0, 0, 0.5 );
+            CGContextSetTextDrawingMode( p_context, kCGTextFillStroke );
+
+            do
+            {
+                // ATSUBreakLine will automatically pick up any manual '\n's also
+                status = ATSUBreakLine( p_textLayout, i_start, line_width, true, (UniCharArrayOffset *) &i_end );
+                if( ( status == noErr ) || ( status == kATSULineBreakInWord ) )
+                {
+                    Fixed     ascent;
+                    Fixed     descent;
+                    uint32_t  i_actualSize;
+
+                    // Come down far enough to fit the height of this line --
+                    ATSUGetLineControl( p_textLayout, i_start, kATSULineAscentTag,
+                                    sizeof( Fixed ), &ascent, (ByteCount *) &i_actualSize );
+
+                    // Quartz uses an upside-down co-ordinate space -> y values decrease as
+                    // you move down the page
+                    y -= ascent;
+
+                    // Set the outlining for this line to be dependant on the size of the line -
+                    // make it about 5% of the ascent, with a minimum at 1.0
+                    float f_thickness = FixedToFloat( ascent ) * 0.05;
+                    CGContextSetLineWidth( p_context, (( f_thickness > 1.0 ) ? 1.0 : f_thickness ));
+
+                    ATSUDrawText( p_textLayout, i_start, i_end - i_start, x, y );
+
+                    // and now prepare for the next line by coming down far enough for our
+                    // descent
+                    ATSUGetLineControl( p_textLayout, i_start, kATSULineDescentTag,
+                                    sizeof( Fixed ), &descent, (ByteCount *) &i_actualSize );
+                    y -= descent;
+
+                    i_start = i_end;
+                }
+                else
+                    break;
+            }
+            while( i_end < i_text_len );
+
+            *pi_textblock_height = i_height - Fix2Long( y );
+            CGContextFlush( p_context );
+
+            ATSUDisposeTextLayout( p_textLayout );
+        }
+
+        CGContextRelease( p_context );
+    }
+    if( p_colorSpace ) CGColorSpaceRelease( p_colorSpace );
+
+    return p_offScreen;
+}
+
+static int RenderYUVA( filter_t *p_filter, subpicture_region_t *p_region, UniChar *psz_utf16_str,
+                       uint32_t i_text_len, uint32_t i_runs, uint32_t *pi_run_lengths, ATSUStyle *pp_styles )
+{
+    offscreen_bitmap_t *p_offScreen = NULL;
+    int      i_textblock_height = 0;
+
+    int i_width = p_filter->fmt_out.video.i_visible_width;
+    int i_height = p_filter->fmt_out.video.i_visible_height;
+
+    if( psz_utf16_str != NULL )
+    {
+        int i_text_align = 0;
+
+        if( p_region->p_style )
+            i_text_align = p_region->p_style->i_text_align;
+        else
+            i_text_align = p_region->i_align & 0x3;
+
+        p_offScreen = Compose( i_text_align, psz_utf16_str, i_text_len,
+                               i_runs, pi_run_lengths, pp_styles,
+                               i_width, i_height, &i_textblock_height );
+    }
+
+    uint8_t *p_dst_y,*p_dst_u,*p_dst_v,*p_dst_a;
+    video_format_t fmt;
+    int x, y, i_offset, i_pitch;
+    uint8_t i_y, i_u, i_v; // YUV values, derived from incoming RGB
+    subpicture_region_t *p_region_tmp;
+
+    // Create a new subpicture region
+    memset( &fmt, 0, sizeof(video_format_t) );
+    fmt.i_chroma = VLC_FOURCC('Y','U','V','A');
+    fmt.i_aspect = 0;
+    fmt.i_width = fmt.i_visible_width = i_width;
+    fmt.i_height = fmt.i_visible_height = i_textblock_height + VERTICAL_MARGIN * 2;
+    fmt.i_x_offset = fmt.i_y_offset = 0;
+    p_region_tmp = spu_CreateRegion( p_filter, &fmt );
+    if( !p_region_tmp )
+    {
+        msg_Err( p_filter, "cannot allocate SPU region" );
+        return VLC_EGENERIC;
+    }
+    p_region->fmt = p_region_tmp->fmt;
+    p_region->picture = p_region_tmp->picture;
+    free( p_region_tmp );
+
+    p_dst_y = p_region->picture.Y_PIXELS;
+    p_dst_u = p_region->picture.U_PIXELS;
+    p_dst_v = p_region->picture.V_PIXELS;
+    p_dst_a = p_region->picture.A_PIXELS;
+    i_pitch = p_region->picture.A_PITCH;
+
+    i_offset = VERTICAL_MARGIN *i_pitch;
+    for( y=0; y<i_textblock_height; y++)
+    {
+        for( x=0; x<i_width; x++)
+        {
+            int i_alpha = p_offScreen->p_data[ y * p_offScreen->i_bytesPerRow + x * p_offScreen->i_bytesPerPixel     ];
+            int i_red   = p_offScreen->p_data[ y * p_offScreen->i_bytesPerRow + x * p_offScreen->i_bytesPerPixel + 1 ];
+            int i_green = p_offScreen->p_data[ y * p_offScreen->i_bytesPerRow + x * p_offScreen->i_bytesPerPixel + 2 ];
+            int i_blue  = p_offScreen->p_data[ y * p_offScreen->i_bytesPerRow + x * p_offScreen->i_bytesPerPixel + 3 ];
+
+            i_y = (uint8_t)__MIN(abs( 2104 * i_red  + 4130 * i_green +
+                              802 * i_blue + 4096 + 131072 ) >> 13, 235);
+            i_u = (uint8_t)__MIN(abs( -1214 * i_red  + -2384 * i_green +
+                             3598 * i_blue + 4096 + 1048576) >> 13, 240);
+            i_v = (uint8_t)__MIN(abs( 3598 * i_red + -3013 * i_green +
+                              -585 * i_blue + 4096 + 1048576) >> 13, 240);
+
+            p_dst_y[ i_offset + x ] = i_y;
+            p_dst_u[ i_offset + x ] = i_u;
+            p_dst_v[ i_offset + x ] = i_v;
+            p_dst_a[ i_offset + x ] = i_alpha;
+        }
+        i_offset += i_pitch;
+    }
+
+    free( p_offScreen->p_data );
+    free( p_offScreen );
+
+    return VLC_SUCCESS;
+}