diff options
author | Grigori Goronzy <greg@blackbox> | 2010-08-01 04:41:32 +0200 |
---|---|---|
committer | Grigori Goronzy <greg@blackbox> | 2010-08-01 04:48:15 +0200 |
commit | abbdc18758b62c78d76d65d70900a12abe164add (patch) | |
tree | cfd6700bded8a8dcab8b5c92343284cf7e1f0363 | |
parent | 2dba022308846eff5b967ff1b60efce122579e76 (diff) | |
download | libass-abbdc18758b62c78d76d65d70900a12abe164add.tar.bz2 libass-abbdc18758b62c78d76d65d70900a12abe164add.tar.xz |
refactor: move ASS_Renderer getters/setters/etc into separate file
-rw-r--r-- | libass/Makefile.am | 2 | ||||
-rw-r--r-- | libass/ass_render.c | 126 | ||||
-rw-r--r-- | libass/ass_render.h | 4 | ||||
-rw-r--r-- | libass/ass_render_api.c | 141 |
4 files changed, 147 insertions, 126 deletions
diff --git a/libass/Makefile.am b/libass/Makefile.am index 10b5c5b..b9b5ca0 100644 --- a/libass/Makefile.am +++ b/libass/Makefile.am @@ -8,7 +8,7 @@ libass_la_SOURCES = ass.c ass_cache.c ass_font.c ass_fontconfig.c ass_render.c \ ass_cache.h ass_fontconfig.h ass_font.h ass.h \ ass_library.h ass_types.h ass_utils.h ass_drawing.c \ ass_drawing.h ass_cache_template.h ass_render.h \ - ass_parse.c ass_parse.h ass_strtod.c + ass_parse.c ass_parse.h ass_render_api.c ass_strtod.c libass_la_LDFLAGS = -version-info $(LIBASS_LT_CURRENT):$(LIBASS_LT_REVISION):$(LIBASS_LT_AGE) libass_la_LDFLAGS += -export-symbols $(srcdir)/libass.sym diff --git a/libass/ass_render.c b/libass/ass_render.c index 81866e9..5b2df92 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -44,8 +44,6 @@ #define MAX_LINES_INITIAL 64 #define SUBPIXEL_MASK 63 #define SUBPIXEL_ACCURACY 7 // d6 mask for subpixel accuracy adjustment -#define GLYPH_CACHE_MAX 1000 -#define BITMAP_CACHE_MAX_SIZE 30 * 1048576 static void ass_lazy_track_init(ASS_Renderer *render_priv) { @@ -134,14 +132,6 @@ ASS_Renderer *ass_renderer_init(ASS_Library *library) return priv; } -void ass_set_cache_limits(ASS_Renderer *render_priv, int glyph_max, - int bitmap_max) -{ - render_priv->cache.glyph_max = glyph_max ? glyph_max : GLYPH_CACHE_MAX; - render_priv->cache.bitmap_max_size = bitmap_max ? 1048576 * bitmap_max : - BITMAP_CACHE_MAX_SIZE; -} - static void free_list_clear(ASS_Renderer *render_priv) { if (render_priv->free_head) { @@ -156,8 +146,6 @@ static void free_list_clear(ASS_Renderer *render_priv) } } -static void ass_free_images(ASS_Image *img); - void ass_renderer_done(ASS_Renderer *render_priv) { ass_font_cache_done(render_priv->cache.font_cache); @@ -2164,7 +2152,7 @@ ass_render_event(ASS_Renderer *render_priv, ASS_Event *event, * \brief deallocate image list * \param img list pointer */ -static void ass_free_images(ASS_Image *img) +void ass_free_images(ASS_Image *img) { while (img) { ASS_Image *next = img->next; @@ -2173,118 +2161,6 @@ static void ass_free_images(ASS_Image *img) } } -static void ass_reconfigure(ASS_Renderer *priv) -{ - ASS_Settings *settings = &priv->settings; - - priv->render_id++; - priv->cache.glyph_cache = - ass_glyph_cache_reset(priv->cache.glyph_cache); - priv->cache.bitmap_cache = - ass_bitmap_cache_reset(priv->cache.bitmap_cache); - priv->cache.composite_cache = - ass_composite_cache_reset(priv->cache.composite_cache); - ass_free_images(priv->prev_images_root); - priv->prev_images_root = 0; - - priv->width = settings->frame_width; - priv->height = settings->frame_height; - priv->orig_width = settings->frame_width - settings->left_margin - - settings->right_margin; - priv->orig_height = settings->frame_height - settings->top_margin - - settings->bottom_margin; - priv->orig_width_nocrop = - settings->frame_width - FFMAX(settings->left_margin, 0) - - FFMAX(settings->right_margin, 0); - priv->orig_height_nocrop = - settings->frame_height - FFMAX(settings->top_margin, 0) - - FFMAX(settings->bottom_margin, 0); -} - -void ass_set_frame_size(ASS_Renderer *priv, int w, int h) -{ - if (priv->settings.frame_width != w || priv->settings.frame_height != h) { - priv->settings.frame_width = w; - priv->settings.frame_height = h; - if (priv->settings.aspect == 0.) { - priv->settings.aspect = ((double) w) / h; - priv->settings.storage_aspect = ((double) w) / h; - } - ass_reconfigure(priv); - } -} - -void ass_set_margins(ASS_Renderer *priv, int t, int b, int l, int r) -{ - if (priv->settings.left_margin != l || - priv->settings.right_margin != r || - priv->settings.top_margin != t - || priv->settings.bottom_margin != b) { - priv->settings.left_margin = l; - priv->settings.right_margin = r; - priv->settings.top_margin = t; - priv->settings.bottom_margin = b; - ass_reconfigure(priv); - } -} - -void ass_set_use_margins(ASS_Renderer *priv, int use) -{ - priv->settings.use_margins = use; -} - -void ass_set_aspect_ratio(ASS_Renderer *priv, double dar, double sar) -{ - if (priv->settings.aspect != dar || priv->settings.storage_aspect != sar) { - priv->settings.aspect = dar; - priv->settings.storage_aspect = sar; - ass_reconfigure(priv); - } -} - -void ass_set_font_scale(ASS_Renderer *priv, double font_scale) -{ - if (priv->settings.font_size_coeff != font_scale) { - priv->settings.font_size_coeff = font_scale; - ass_reconfigure(priv); - } -} - -void ass_set_hinting(ASS_Renderer *priv, ASS_Hinting ht) -{ - if (priv->settings.hinting != ht) { - priv->settings.hinting = ht; - ass_reconfigure(priv); - } -} - -void ass_set_line_spacing(ASS_Renderer *priv, double line_spacing) -{ - priv->settings.line_spacing = line_spacing; -} - -void ass_set_fonts(ASS_Renderer *priv, const char *default_font, - const char *default_family, int fc, const char *config, - int update) -{ - free(priv->settings.default_font); - free(priv->settings.default_family); - priv->settings.default_font = default_font ? strdup(default_font) : 0; - priv->settings.default_family = - default_family ? strdup(default_family) : 0; - - if (priv->fontconfig_priv) - fontconfig_done(priv->fontconfig_priv); - priv->fontconfig_priv = - fontconfig_init(priv->library, priv->ftlibrary, default_family, - default_font, fc, config, update); -} - -int ass_fonts_update(ASS_Renderer *render_priv) -{ - return fontconfig_update(render_priv->fontconfig_priv); -} - /** * \brief Check cache limits and reset cache if they are exceeded */ diff --git a/libass/ass_render.h b/libass/ass_render.h index 6d9db23..b039f48 100644 --- a/libass/ass_render.h +++ b/libass/ass_render.h @@ -38,6 +38,9 @@ #include "ass_library.h" #include "ass_drawing.h" +#define GLYPH_CACHE_MAX 1000 +#define BITMAP_CACHE_MAX_SIZE 30 * 1048576 + typedef struct { double xMin; double xMax; @@ -258,5 +261,6 @@ typedef struct { } Segment; void reset_render_context(ASS_Renderer *render_priv); +void ass_free_images(ASS_Image *img); #endif /* LIBASS_RENDER_H */ diff --git a/libass/ass_render_api.c b/libass/ass_render_api.c new file mode 100644 index 0000000..058e6c3 --- /dev/null +++ b/libass/ass_render_api.c @@ -0,0 +1,141 @@ +/* + * Copyright (C) 2006 Evgeniy Stepanov <eugeni.stepanov@gmail.com> + * Copyright (C) 2010 Grigori Goronzy <greg@geekmind.org> + * + * This file is part of libass. + * + * libass 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. + * + * libass 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 libass; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" +#include "ass_render.h" + +static void ass_reconfigure(ASS_Renderer *priv) +{ + ASS_Settings *settings = &priv->settings; + + priv->render_id++; + priv->cache.glyph_cache = + ass_glyph_cache_reset(priv->cache.glyph_cache); + priv->cache.bitmap_cache = + ass_bitmap_cache_reset(priv->cache.bitmap_cache); + priv->cache.composite_cache = + ass_composite_cache_reset(priv->cache.composite_cache); + ass_free_images(priv->prev_images_root); + priv->prev_images_root = 0; + + priv->width = settings->frame_width; + priv->height = settings->frame_height; + priv->orig_width = settings->frame_width - settings->left_margin - + settings->right_margin; + priv->orig_height = settings->frame_height - settings->top_margin - + settings->bottom_margin; + priv->orig_width_nocrop = + settings->frame_width - FFMAX(settings->left_margin, 0) - + FFMAX(settings->right_margin, 0); + priv->orig_height_nocrop = + settings->frame_height - FFMAX(settings->top_margin, 0) - + FFMAX(settings->bottom_margin, 0); +} + +void ass_set_frame_size(ASS_Renderer *priv, int w, int h) +{ + if (priv->settings.frame_width != w || priv->settings.frame_height != h) { + priv->settings.frame_width = w; + priv->settings.frame_height = h; + if (priv->settings.aspect == 0.) { + priv->settings.aspect = ((double) w) / h; + priv->settings.storage_aspect = ((double) w) / h; + } + ass_reconfigure(priv); + } +} + +void ass_set_margins(ASS_Renderer *priv, int t, int b, int l, int r) +{ + if (priv->settings.left_margin != l || priv->settings.right_margin != r || + priv->settings.top_margin != t || priv->settings.bottom_margin != b) { + priv->settings.left_margin = l; + priv->settings.right_margin = r; + priv->settings.top_margin = t; + priv->settings.bottom_margin = b; + ass_reconfigure(priv); + } +} + +void ass_set_use_margins(ASS_Renderer *priv, int use) +{ + priv->settings.use_margins = use; +} + +void ass_set_aspect_ratio(ASS_Renderer *priv, double dar, double sar) +{ + if (priv->settings.aspect != dar || priv->settings.storage_aspect != sar) { + priv->settings.aspect = dar; + priv->settings.storage_aspect = sar; + ass_reconfigure(priv); + } +} + +void ass_set_font_scale(ASS_Renderer *priv, double font_scale) +{ + if (priv->settings.font_size_coeff != font_scale) { + priv->settings.font_size_coeff = font_scale; + ass_reconfigure(priv); + } +} + +void ass_set_hinting(ASS_Renderer *priv, ASS_Hinting ht) +{ + if (priv->settings.hinting != ht) { + priv->settings.hinting = ht; + ass_reconfigure(priv); + } +} + +void ass_set_line_spacing(ASS_Renderer *priv, double line_spacing) +{ + priv->settings.line_spacing = line_spacing; +} + +void ass_set_fonts(ASS_Renderer *priv, const char *default_font, + const char *default_family, int fc, const char *config, + int update) +{ + free(priv->settings.default_font); + free(priv->settings.default_family); + priv->settings.default_font = default_font ? strdup(default_font) : 0; + priv->settings.default_family = + default_family ? strdup(default_family) : 0; + + if (priv->fontconfig_priv) + fontconfig_done(priv->fontconfig_priv); + priv->fontconfig_priv = + fontconfig_init(priv->library, priv->ftlibrary, default_family, + default_font, fc, config, update); +} + +int ass_fonts_update(ASS_Renderer *render_priv) +{ + return fontconfig_update(render_priv->fontconfig_priv); +} + +void ass_set_cache_limits(ASS_Renderer *render_priv, int glyph_max, + int bitmap_max) +{ + render_priv->cache.glyph_max = glyph_max ? glyph_max : GLYPH_CACHE_MAX; + render_priv->cache.bitmap_max_size = bitmap_max ? 1048576 * bitmap_max : + BITMAP_CACHE_MAX_SIZE; +} |