From 92256c07d1383814a69dcc6f8cfe55437a371b34 Mon Sep 17 00:00:00 2001 From: eugeni Date: Sun, 3 Dec 2006 18:24:11 +0000 Subject: Open embedded fonts directly from memory. FontConfig 2.4.2 (released yesterday) supports scanning fonts with FcFreeTypeQueryFace without writing them to disk. With earlier FontConfig versions, the old mechanism is used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21476 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libass/ass_font.c | 22 +++++++++++++++++++++- libass/ass_font.h | 2 +- libass/ass_fontconfig.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- libass/ass_fontconfig.h | 2 +- libass/ass_render.c | 4 ++-- 5 files changed, 67 insertions(+), 9 deletions(-) (limited to 'libass') diff --git a/libass/ass_font.c b/libass/ass_font.c index 176dbed6ba..80490fad6a 100644 --- a/libass/ass_font.c +++ b/libass/ass_font.c @@ -52,13 +52,23 @@ static void charmap_magic(FT_Face face) } } -ass_font_t* ass_font_new(FT_Library ftlibrary, void* fc_priv, ass_font_desc_t* desc) +static int find_font(ass_library_t* library, char* name) +{ + int i; + for (i = 0; i < library->num_fontdata; ++i) + if (strcasecmp(name, library->fontdata[i].name) == 0) + return i; + return -1; +} + +ass_font_t* ass_font_new(ass_library_t* library, FT_Library ftlibrary, void* fc_priv, ass_font_desc_t* desc) { char* path; int index; FT_Face face; int error; ass_font_t* font; + int mem_idx; font = ass_font_cache_find(desc); if (font) @@ -66,11 +76,21 @@ ass_font_t* ass_font_new(FT_Library ftlibrary, void* fc_priv, ass_font_desc_t* d path = fontconfig_select(fc_priv, desc->family, desc->bold, desc->italic, &index); + mem_idx = find_font(library, path); + if (mem_idx >= 0) { + error = FT_New_Memory_Face(ftlibrary, library->fontdata[mem_idx].data, + library->fontdata[mem_idx].size, 0, &face); + if (error) { + mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_ErrorOpeningMemoryFont, path); + return 0; + } + } else { error = FT_New_Face(ftlibrary, path, index, &face); if (error) { mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_ErrorOpeningFont, path, index); return 0; } + } charmap_magic(face); diff --git a/libass/ass_font.h b/libass/ass_font.h index aac42e9a24..6aa284fbec 100644 --- a/libass/ass_font.h +++ b/libass/ass_font.h @@ -45,7 +45,7 @@ typedef struct ass_font_s { #endif } ass_font_t; -ass_font_t* ass_font_new(FT_Library ftlibrary, void* fc_priv, ass_font_desc_t* desc); +ass_font_t* ass_font_new(ass_library_t* library, FT_Library ftlibrary, void* fc_priv, ass_font_desc_t* desc); void ass_font_set_transform(ass_font_t* font, FT_Matrix* m, FT_Vector* v); void ass_font_set_size(ass_font_t* font, int size); FT_Glyph ass_font_get_glyph(void* fontconfig_priv, ass_font_t* font, uint32_t ch); diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index c2348fa6d8..5d9fe6b84f 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -34,6 +34,7 @@ #ifdef HAVE_FONTCONFIG #include +#include #endif struct fc_instance_s { @@ -228,7 +229,7 @@ static char* validate_fname(char* name) * \param data binary font data * \param data_size data size */ -static void process_fontdata(fc_instance_t* priv, ass_library_t* library, int idx) +static void process_fontdata(fc_instance_t* priv, ass_library_t* library, FT_Library ftlibrary, int idx) { char buf[1000]; FILE* fp = 0; @@ -239,7 +240,12 @@ static void process_fontdata(fc_instance_t* priv, ass_library_t* library, int id const char* data = library->fontdata[idx].data; int data_size = library->fontdata[idx].size; const char* fonts_dir = library->fonts_dir; + FT_Face face; + FcPattern* pattern; + FcFontSet* fset; + FcBool res; +#if (FC_VERSION < 20402) if (!fonts_dir) return; rc = stat(fonts_dir, &st); @@ -267,6 +273,38 @@ static void process_fontdata(fc_instance_t* priv, ass_library_t* library, int id fwrite(data, data_size, 1, fp); fclose(fp); + +#else // (FC_VERSION >= 20402) + + rc = FT_New_Memory_Face(ftlibrary, data, data_size, 0, &face); + if (rc) { + mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_ErrorOpeningMemoryFont, name); + return; + } + + pattern = FcFreeTypeQueryFace(face, name, 0, FcConfigGetBlanks(priv->config)); + if (!pattern) { + mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FunctionCallFailed, "FcFreeTypeQueryFace"); + FT_Done_Face(face); + return; + } + + fset = FcConfigGetFonts(priv->config, FcSetSystem); // somehow it failes when asked for FcSetApplication + if (!fset) { + mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FunctionCallFailed, "FcConfigGetFonts"); + FT_Done_Face(face); + return; + } + + res = FcFontSetAdd(fset, pattern); + if (!res) { + mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FunctionCallFailed, "FcFontSetAdd"); + FT_Done_Face(face); + return; + } + + FT_Done_Face(face); +#endif } /** @@ -276,7 +314,7 @@ static void process_fontdata(fc_instance_t* priv, ass_library_t* library, int id * \param path default font path * \return pointer to fontconfig private data */ -fc_instance_t* fontconfig_init(ass_library_t* library, const char* family, const char* path) +fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, const char* family, const char* path) { int rc; struct stat st; @@ -294,7 +332,7 @@ fc_instance_t* fontconfig_init(ass_library_t* library, const char* family, const } for (i = 0; i < library->num_fontdata; ++i) - process_fontdata(priv, library, i); + process_fontdata(priv, library, ftlibrary, i); if (FcDirCacheValid((const FcChar8 *)dir) == FcFalse) { @@ -355,7 +393,7 @@ char* fontconfig_select(fc_instance_t* priv, const char* family, unsigned bold, return priv->path_default; } -fc_instance_t* fontconfig_init(ass_library_t* library, const char* family, const char* path) +fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, const char* family, const char* path) { fc_instance_t* priv; diff --git a/libass/ass_fontconfig.h b/libass/ass_fontconfig.h index c36d67be46..a296bcef3e 100644 --- a/libass/ass_fontconfig.h +++ b/libass/ass_fontconfig.h @@ -27,7 +27,7 @@ typedef struct fc_instance_s fc_instance_t; -fc_instance_t* fontconfig_init(ass_library_t* library, const char* family, const char* path); +fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, const char* family, const char* path); char* fontconfig_select(fc_instance_t* priv, const char* family, unsigned bold, unsigned italic, int* index); void fontconfig_done(fc_instance_t* priv); diff --git a/libass/ass_render.c b/libass/ass_render.c index ef9a5f7bcb..60189d1d1d 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -561,7 +561,7 @@ static void update_font(void) else if (val == 1) val = 110; //italic desc.italic = val; - render_context.font = ass_font_new(priv->ftlibrary, priv->fontconfig_priv, &desc); + render_context.font = ass_font_new(priv->library, priv->ftlibrary, priv->fontconfig_priv, &desc); if (render_context.font) change_font_size(render_context.font_size); @@ -1928,7 +1928,7 @@ int ass_set_fonts(ass_renderer_t* priv, const char* default_font, const char* de if (priv->fontconfig_priv) fontconfig_done(priv->fontconfig_priv); - priv->fontconfig_priv = fontconfig_init(priv->library, default_family, default_font); + priv->fontconfig_priv = fontconfig_init(priv->library, priv->ftlibrary, default_family, default_font); return !!priv->fontconfig_priv; } -- cgit v1.2.3