Changeset 6df5e4eca4fcbd38de041352b908c79149523191

Timestamp:

31/07/07 08:47:01 (1 year ago)

Author:

Bernie Purcell <bitmap@videolan.org>

git-committer:

Bernie Purcell <bitmap@videolan.org> 1185864421 +0000

git-parent:

[1decebd2c8ade2eba2b637e87a5519b5a76a9295]

git-author:

Bernie Purcell <bitmap@videolan.org> 1185864421 +0000

Message:

Dynamically load any TTF or OTF fonts available in the attachments of
the media file and make them available to FreeType? as memory based fonts
for subtitle rendering.

Files:

• modules/misc/freetype.c (modified) (10 diffs)

modules/misc/freetype.c

@@ -7 +7 @@
- * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
- *          Gildas Bazin <gbazin@videolan.org>
- dot purcell at adbglobal dot com
+itmap@videolan.org
- *
- * This program is free software; you can redistribute it and/or modify
@@ -41 +41 @@
-#include <vlc_stream.h>
-#include <vlc_xml.h>
+#include <vlc_input.h>
-
-#include <math.h>
@@ -84 +85 @@
-static int  Create ( vlc_object_t * );
-static void Destroy( vlc_object_t * );
+
+static int LoadFontsFromAttachments( filter_t *p_filter );
-
-/* The RenderText call maps to pf_render_string, defined in vlc_filter.h */
@@ -259 +262 @@
-    FcConfig      *p_fontconfig;
-#endif
+
+    input_attachment_t **pp_font_attachments;
+    int                  i_font_attachments;
-};
-
@@ -366 +372 @@
-
-    if( psz_fontfile ) free( psz_fontfile );
+
+    p_sys->pp_font_attachments = NULL;
+    p_sys->i_font_attachments = 0;
+
-    p_filter->pf_render_text = RenderText;
-#ifdef HAVE_FONTCONFIG
@@ -372 +382 @@
-    p_filter->pf_render_html = NULL;
-#endif
+
+    LoadFontsFromAttachments( p_filter );
+
-    return VLC_SUCCESS;
-
@@ -391 +404 @@
-    filter_t *p_filter = (filter_t *)p_this;
-    filter_sys_t *p_sys = p_filter->p_sys;
+
+    if( p_sys->pp_font_attachments )
+    {
+        int   k;
+
+        for( k = 0; k < p_sys->i_font_attachments; k++ )
+        {
+            vlc_input_attachment_Delete( p_sys->pp_font_attachments[k] );
+        }
+
+        free( p_sys->pp_font_attachments );
+    }
-
-#ifdef HAVE_FONTCONFIG
@@ -402 +427 @@
-    FT_Done_FreeType( p_sys->p_library );
-    free( p_sys );
+}
+
+/*****************************************************************************
+ * Make any TTF/OTF fonts present in the attachments of the media file
+ * and store them for later use by the FreeType Engine
+ *****************************************************************************/
+static int LoadFontsFromAttachments( filter_t *p_filter )
+{
+    filter_sys_t         *p_sys = p_filter->p_sys;
+    input_thread_t       *p_input;
+    input_attachment_t  **pp_attachments;
+    int                   i_attachments_cnt;
+    int                   k;
+    int                   rv = VLC_SUCCESS;
+
+    p_input = (input_thread_t *)vlc_object_find( p_filter, VLC_OBJECT_INPUT, FIND_PARENT );
+    if( ! p_input )
+        return VLC_EGENERIC;
+    
+    if( VLC_SUCCESS != input_Control( p_input, INPUT_GET_ATTACHMENTS, &pp_attachments, &i_attachments_cnt ))
+        return VLC_EGENERIC;
+
+    p_sys->i_font_attachments = 0;
+    p_sys->pp_font_attachments = malloc( i_attachments_cnt * sizeof( input_attachment_t * ));
+    if(! p_sys->pp_font_attachments )
+        rv = VLC_ENOMEM;
+
+    for( k = 0; k < i_attachments_cnt; k++ )
+    {
+        input_attachment_t *p_attach = pp_attachments[k];
+
+        if( p_sys->pp_font_attachments )
+        {
+            if(( !strcmp( p_attach->psz_mime, "application/x-truetype-font" ) || // TTF
+                 !strcmp( p_attach->psz_mime, "application/x-font-otf" ) ) &&    // OTF
+               ( p_attach->i_data > 0 ) &&
+               ( p_attach->p_data != NULL ) )
+            {
+                p_sys->pp_font_attachments[ p_sys->i_font_attachments++ ] = p_attach;
+            }
+            else
+            {
+                vlc_input_attachment_Delete( p_attach );
+            }
+        }
+        else
+        {
+            vlc_input_attachment_Delete( p_attach );
+        }
+    }
+    free( pp_attachments );        
+
+    return rv;
-}
-
@@ -1933 +2011 @@
-}
-
+static int CheckForEmbeddedFont( filter_sys_t *p_sys, FT_Face *pp_face, ft_style_t *p_style )
+{
+    int k;
+
+    for( k=0; k < p_sys->i_font_attachments; k++ )
+    {
+        input_attachment_t *p_attach   = p_sys->pp_font_attachments[k];
+        int                 i_font_idx = 0;
+        FT_Face             p_face = NULL;
+
+        while( 0 == FT_New_Memory_Face( p_sys->p_library,
+                                        p_attach->p_data,
+                                        p_attach->i_data,
+                                        i_font_idx,
+                                        &p_face ))
+        {
+            if( p_face )
+            {
+                vlc_bool_t match = !strcasecmp( p_face->family_name,
+                                                p_style->psz_fontname );
+
+                if( p_face->style_flags & FT_STYLE_FLAG_BOLD )
+                    match = match && p_style->b_bold;
+                else
+                    match = match && !p_style->b_bold;
+
+                if( p_face->style_flags & FT_STYLE_FLAG_ITALIC )
+                    match = match && p_style->b_italic;
+                else
+                    match = match && !p_style->b_italic;
+
+                if(  match )
+                {
+                    *pp_face = p_face;
+                    return VLC_SUCCESS;
+                }
+                
+                FT_Done_Face( p_face );
+            }
+            i_font_idx++;
+        }
+    }
+    return VLC_EGENERIC;
+}
+
-static int ProcessLines( filter_t *p_filter,
-                         uint32_t *psz_text,
@@ -2145 +2268 @@
-            FT_Face p_face = NULL;
-            int      i_idx = 0;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                {
+                    if( FT_New_Face( p_sys->p_library,
+                                psz_fontfile ? psz_fontfile : "", i_idx, &p_face ) )
+                    {
+                        free( psz_fontfile );
+                        free( pp_char_styles );
+#if defined(HAVE_FRIBIDI)
+                        free( psz_text );
+#endif
+                        if( pi_karaoke_bar )
+                            free( pi_karaoke_bar );
+                        return VLC_EGENERIC;
+                    }
-                    free( psz_fontfile );
-                    free( pp_char_styles );
-#if defined(HAVE_FRIBIDI)
-                    free( psz_text );
-#endif
-                    if( pi_karaoke_bar )
-                        free( pi_karaoke_bar );
-                    return VLC_EGENERIC;
-                }
-
+
+
+
+
+
+
+
+
+
-            }
-