summaryrefslogtreecommitdiffstats
path: root/libass/ass_render.c
diff options
context:
space:
mode:
authorOleg Oshmyan <chortos@inbox.lv>2012-08-23 00:59:46 +0300
committerGrigori Goronzy <greg@blackbox>2013-03-03 23:17:50 +0100
commit0e1702ad7a6a827d400c87b7a98aea11e54d2127 (patch)
treeb10acef8f093190ff44eb243040b26873020bb22 /libass/ass_render.c
parent340ff8f4cbde87d2ce7d1133889e3afdd66d4e06 (diff)
downloadlibass-0e1702ad7a6a827d400c87b7a98aea11e54d2127.tar.bz2
libass-0e1702ad7a6a827d400c87b7a98aea11e54d2127.tar.xz
Add ass_set_storage_size and fix related scaling issues
\blur radius is not scaled from script to storage resolution but is scaled from storage to display resolution. The same applies to borders and shadows if ScaledBorderAndShadow is "no". (If it is "yes", borders and shadows are scaled from script to display resolution just like before.)
Diffstat (limited to 'libass/ass_render.c')
-rw-r--r--libass/ass_render.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/libass/ass_render.c b/libass/ass_render.c
index 2f0732e..6681612 100644
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -1308,7 +1308,7 @@ get_bitmap_glyph(ASS_Renderer *render_priv, GlyphInfo *info)
outline, border,
&hash_val.bm, &hash_val.bm_o,
&hash_val.bm_s, info->be,
- info->blur * render_priv->border_scale,
+ info->blur * render_priv->blur_scale,
key->shadow_offset,
info->border_style,
info->border_x || info->border_y);
@@ -2242,12 +2242,17 @@ ass_start_frame(ASS_Renderer *render_priv, ASS_Track *track,
render_priv->font_scale = settings_priv->font_size_coeff *
render_priv->orig_height / render_priv->track->PlayResY;
+ if (render_priv->storage_height)
+ render_priv->blur_scale = ((double) render_priv->orig_height) /
+ render_priv->storage_height;
+ else
+ render_priv->blur_scale = 1.;
if (render_priv->track->ScaledBorderAndShadow)
render_priv->border_scale =
((double) render_priv->orig_height) /
render_priv->track->PlayResY;
else
- render_priv->border_scale = 1.;
+ render_priv->border_scale = render_priv->blur_scale;
render_priv->border_scale *= settings_priv->font_size_coeff;
ass_shaper_set_kerning(render_priv->shaper, track->Kerning);