From 510d320b64751e3bad8605e1b9eeb41a1dca136b Mon Sep 17 00:00:00 2001 From: martii Date: Fri, 26 Jul 2013 22:50:26 +0200 Subject: [PATCH] libeplayer3/container_ass: font size adjusted Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/441f337b4894a2dc55736f9a25a0209c47e9afaa Author: martii Date: 2013-07-26 (Fri, 26 Jul 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3/container/container_ass.c | 8 ++++---- libeplayer3/include/subtitle.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libeplayer3/container/container_ass.c b/libeplayer3/container/container_ass.c index dd4de10..5e104e7 100644 --- a/libeplayer3/container/container_ass.c +++ b/libeplayer3/container/container_ass.c @@ -116,8 +116,8 @@ static unsigned char isContainerRunning = 0; static ASS_Library *ass_library; static ASS_Renderer *ass_renderer; -static float ass_font_scale = 0.4; // was: 0.7 -static float ass_line_spacing = 0.4; // was: 0.7 +//static float ass_font_scale = 0.4; // was: 0.7 +//static float ass_line_spacing = 0.4; // was: 0.7 static unsigned int screen_width = 0; static unsigned int screen_height = 0; @@ -593,10 +593,10 @@ int container_ass_init(Context_t *context) } ass_set_use_margins(ass_renderer, 1); - ass_set_font_scale(ass_renderer, (ass_font_scale * screen_height) / 240.0); +// ass_set_font_scale(ass_renderer, (ass_font_scale * screen_height) / 240.0); ass_set_hinting(ass_renderer, ASS_HINTING_LIGHT); - ass_set_line_spacing(ass_renderer, (ass_line_spacing * screen_height) / 240.0); +// ass_set_line_spacing(ass_renderer, (ass_line_spacing * screen_height) / 240.0); ass_set_fonts(ass_renderer, ASS_FONT, "Arial", 0, NULL, 1); if(threeDMode == 0){ diff --git a/libeplayer3/include/subtitle.h b/libeplayer3/include/subtitle.h index f31aa69..9587691 100644 --- a/libeplayer3/include/subtitle.h +++ b/libeplayer3/include/subtitle.h @@ -29,7 +29,7 @@ Collisions: Normal\n\ Timer: 100.0000\n\n\ [V4 Styles]\n\ Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, TertiaryColour, BackColour, Bold, Italic, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, AlphaLevel, Encoding\n\ -Style: Default,Arial,26,16777215,0,16777215,0,0,0,2,2,2,2,20,20,10,0\n\n\ +Style: Default,Arial,64,16777215,0,16777215,0,0,0,2,2,2,2,20,20,10,0\n\n\ [Events]\n\ Format: Marked, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\n\n\n"