]> granicus.if.org Git - libass/log
libass
17 years agoIf a glyph is not found in the current font, switch to another one.
eugeni [Tue, 28 Nov 2006 22:50:02 +0000 (22:50 +0000)]
If a glyph is not found in the current font, switch to another one.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21367 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoSkip glyphs with char code < 0x20.
eugeni [Tue, 28 Nov 2006 22:44:40 +0000 (22:44 +0000)]
Skip glyphs with char code < 0x20.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21366 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoAdd FT_Library to ass_font_t.
eugeni [Tue, 28 Nov 2006 22:20:24 +0000 (22:20 +0000)]
Add FT_Library to ass_font_t.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21365 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoUse (ass_font_t, char code) instead of (FT_Face, glyph index) to identify
eugeni [Tue, 28 Nov 2006 22:17:33 +0000 (22:17 +0000)]
Use (ass_font_t, char code) instead of (FT_Face, glyph index) to identify
glyphs in cache.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21364 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoDon't include freetype headers in other headers.
eugeni [Mon, 27 Nov 2006 17:56:49 +0000 (17:56 +0000)]
Don't include freetype headers in other headers.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21339 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoFix compilation broken in previous commit.
eugeni [Mon, 27 Nov 2006 17:53:33 +0000 (17:53 +0000)]
Fix compilation broken in previous commit.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21338 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoMove ass_font_desc_t and ass_font_t declarations to ass_font.h.
eugeni [Mon, 27 Nov 2006 17:50:05 +0000 (17:50 +0000)]
Move ass_font_desc_t and ass_font_t declarations to ass_font.h.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21337 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoCosmetics: reindent.
eugeni [Mon, 27 Nov 2006 17:34:47 +0000 (17:34 +0000)]
Cosmetics: reindent.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21336 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoDon't call FT_Set_Transform/FT_Set_Pixel_Sizes if values have not changed.
eugeni [Mon, 27 Nov 2006 17:33:59 +0000 (17:33 +0000)]
Don't call FT_Set_Transform/FT_Set_Pixel_Sizes if values have not changed.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21335 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoMove ass_font_t allocation to ass_font.h.
eugeni [Mon, 27 Nov 2006 17:13:52 +0000 (17:13 +0000)]
Move ass_font_t allocation to ass_font.h.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21333 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoInitialize font size with 0.
eugeni [Mon, 27 Nov 2006 16:21:10 +0000 (16:21 +0000)]
Initialize font size with 0.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21330 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoRemove obsolete "no_more_font_messages" hack.
eugeni [Sun, 26 Nov 2006 22:53:52 +0000 (22:53 +0000)]
Remove obsolete "no_more_font_messages" hack.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21295 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoMove fonts-related code to a separate file.
eugeni [Sun, 26 Nov 2006 22:49:27 +0000 (22:49 +0000)]
Move fonts-related code to a separate file.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21293 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoMake ass_new_font return ass_font_t struct (instead of just FT_Face).
eugeni [Sun, 26 Nov 2006 20:53:29 +0000 (20:53 +0000)]
Make ass_new_font return ass_font_t struct (instead of just FT_Face).
Use it to access the font face.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21283 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoMove ass_font_t to header.
eugeni [Sun, 26 Nov 2006 20:38:06 +0000 (20:38 +0000)]
Move ass_font_t to header.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21282 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoRename:
eugeni [Sun, 26 Nov 2006 20:34:54 +0000 (20:34 +0000)]
Rename:
face_desc_t -> ass_font_desc_t
face_cache_item_t -> ass_font_t
*face* -> *font*

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21281 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoMerge common parts of all Makefiles into one file included by all.
diego [Sun, 26 Nov 2006 18:12:36 +0000 (18:12 +0000)]
Merge common parts of all Makefiles into one file included by all.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21275 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoSRCS should be one per line to make patches more readable.
diego [Sat, 25 Nov 2006 17:06:08 +0000 (17:06 +0000)]
SRCS should be one per line to make patches more readable.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21229 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoRemove pointless indirection.
diego [Sat, 25 Nov 2006 17:02:52 +0000 (17:02 +0000)]
Remove pointless indirection.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21227 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoRemove superfluous comment.
diego [Sat, 25 Nov 2006 16:12:36 +0000 (16:12 +0000)]
Remove superfluous comment.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21222 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoCosmetics: remove unneeded curly brackets.
eugeni [Mon, 20 Nov 2006 17:13:19 +0000 (17:13 +0000)]
Cosmetics: remove unneeded curly brackets.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21114 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoFix collision detection. The old method tried to avoid gaps between subtitles
eugeni [Mon, 20 Nov 2006 17:10:18 +0000 (17:10 +0000)]
Fix collision detection. The old method tried to avoid gaps between subtitles
by moving the upper subtitle down. This is wrong. With this fix, a subtitle
will be moved only if it overlaps with another one.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21113 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoUnify dep/depend targets.
diego [Mon, 20 Nov 2006 11:18:01 +0000 (11:18 +0000)]
Unify dep/depend targets.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21096 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoMSGTRs for libass
kraymer [Sun, 19 Nov 2006 22:35:17 +0000 (22:35 +0000)]
MSGTRs for libass

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21082 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoCollect all includes of mplayer headers in libass in a single file (mputils.h).
eugeni [Sun, 19 Nov 2006 00:41:00 +0000 (00:41 +0000)]
Collect all includes of mplayer headers in libass in a single file (mputils.h).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21042 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoSupport \t with acceleration.
eugeni [Mon, 13 Nov 2006 16:49:32 +0000 (16:49 +0000)]
Support \t with acceleration.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20891 b3059339-0415-0410-9bf9-f77b7e298cf2

17 years agoPartial fix for semitransparent glyph outlines.
eugeni [Mon, 13 Nov 2006 16:35:15 +0000 (16:35 +0000)]
Partial fix for semitransparent glyph outlines.

This fix removes semitransparent area (less then pixel width) between glyph and
it's outline. Instead, it makes them overlap a little. It usually looks much
better this way.
Complete fix seems impossible with the current output format (single color
alpha bitmaps). The right way is to blend both glyph and outline into one
bitmap so that 2 pixels with 50% transparency produce a fully solid one.
This requires RGBA bitmap output from libass.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20890 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agos/break/continue/. A crazy mistake, somehow unnoticed for more that 2 months.
eugeni [Wed, 8 Nov 2006 18:57:40 +0000 (18:57 +0000)]
s/break/continue/. A crazy mistake, somehow unnoticed for more that 2 months.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20795 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoBugfix: when copying ass_force_style_list, ending 0 was left out.
eugeni [Mon, 6 Nov 2006 20:09:28 +0000 (20:09 +0000)]
Bugfix: when copying ass_force_style_list, ending 0 was left out.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20738 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCalculate text bounding box in a way that does not depend on actual glyph
eugeni [Mon, 6 Nov 2006 02:47:57 +0000 (02:47 +0000)]
Calculate text bounding box in a way that does not depend on actual glyph
bitmaps. Each glyph is considered to be bounded by (origin, origin + advance)
horizontally, and (max font ascender, max font descender) vertically.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20734 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoInitialize fontconfig in VFCTRL_INIT_EOSD handler.
eugeni [Sun, 5 Nov 2006 18:56:31 +0000 (18:56 +0000)]
Initialize fontconfig in VFCTRL_INIT_EOSD handler.

Recent libass api changes moved fontconfig initialization to filter's
config() function. It is bad, because cache update can take a long time,
resulting in unpleasant sound effects. This change restores the original
behaviour.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20722 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCosmetics: indentation fix.
eugeni [Sun, 5 Nov 2006 18:21:39 +0000 (18:21 +0000)]
Cosmetics: indentation fix.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20718 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix the following compiler warnings:
eugeni [Sun, 5 Nov 2006 17:26:55 +0000 (17:26 +0000)]
Fix the following compiler warnings:
ass.c:999: warning: unused variable 'i'
ass.c:1041: warning: pointer targets in assignment differ in signedness
ass.c:1043: warning: pointer targets in assignment differ in signedness

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20714 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoMore precise bounding box calculation for karaoke effects.
eugeni [Sat, 4 Nov 2006 17:58:09 +0000 (17:58 +0000)]
More precise bounding box calculation for karaoke effects.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20669 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoPrefer microsoft-specific charmaps to all other.
eugeni [Fri, 3 Nov 2006 23:11:00 +0000 (23:11 +0000)]
Prefer microsoft-specific charmaps to all other.
There are some fonts with both 'Unicode' and 'Microsoft/Unicode'
charmaps, and the second always seems to be the right choice.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20653 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoIntroduce MSGT_ASS, use it for all libass messages.
eugeni [Fri, 3 Nov 2006 18:15:33 +0000 (18:15 +0000)]
Introduce MSGT_ASS, use it for all libass messages.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20645 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoImplement loading subtitles from memory.
eugeni [Fri, 3 Nov 2006 02:15:08 +0000 (02:15 +0000)]
Implement loading subtitles from memory.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20619 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoBugfix: sub_recode could deallocate global sub_cp under some circumstances.
eugeni [Fri, 3 Nov 2006 01:41:48 +0000 (01:41 +0000)]
Bugfix: sub_recode could deallocate global sub_cp under some circumstances.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20618 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoRevert r20517.
eugeni [Sun, 29 Oct 2006 17:29:55 +0000 (17:29 +0000)]
Revert r20517.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20519 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoMove ass_library initialization code to ass_mp.c.
eugeni [Sun, 29 Oct 2006 15:26:13 +0000 (15:26 +0000)]
Move ass_library initialization code to ass_mp.c.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20518 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCopy the following functions to libass to avoid dependency on the rest of mplayer:
eugeni [Sun, 29 Oct 2006 15:03:30 +0000 (15:03 +0000)]
Copy the following functions to libass to avoid dependency on the rest of mplayer:
guess_buffer_cp
utf8_get_char
blur

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20517 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix width -> orig_width typo.
eugeni [Sun, 29 Oct 2006 13:59:36 +0000 (13:59 +0000)]
Fix width -> orig_width typo.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20513 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoDon't set PlayResX for plaintext subtitles.
eugeni [Sun, 29 Oct 2006 13:58:30 +0000 (13:58 +0000)]
Don't set PlayResX for plaintext subtitles.
This way font proportions will not depend on frame aspect.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20512 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd \N at the end of each subtitle line when converting from subdata.
eugeni [Sun, 29 Oct 2006 13:52:51 +0000 (13:52 +0000)]
Add \N at the end of each subtitle line when converting from subdata.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20511 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoLibass interface reworked:
eugeni [Sat, 28 Oct 2006 15:07:18 +0000 (15:07 +0000)]
Libass interface reworked:
- ass_instance_t renamed to ass_renderer_t
- ass_library_t introduced
- use of mplayer-specific global variables limited to ass_mp.c

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20493 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoIf HAVE_FONTCONFIG is not defined, font_fontconfig might be declared both
reimar [Sat, 28 Oct 2006 10:21:30 +0000 (10:21 +0000)]
If HAVE_FONTCONFIG is not defined, font_fontconfig might be declared both
extern and static, causing compilation to fail

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20485 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd missing fontconfig_done() call.
eugeni [Fri, 27 Oct 2006 16:02:44 +0000 (16:02 +0000)]
Add missing fontconfig_done() call.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20467 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoSplit ass_configure() into several smaller functions.
eugeni [Thu, 26 Oct 2006 20:08:46 +0000 (20:08 +0000)]
Split ass_configure() into several smaller functions.
FontConfig initialization moved from ass_init() to ass_set_fonts().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20462 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoDon't forget to apply scaling coefficients to kerning values.
eugeni [Fri, 20 Oct 2006 23:06:52 +0000 (23:06 +0000)]
Don't forget to apply scaling coefficients to kerning values.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20326 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix center of rotation calculation. It was overly complex and
eugeni [Thu, 19 Oct 2006 18:08:44 +0000 (18:08 +0000)]
Fix center of rotation calculation. It was overly complex and
incorrect for right- and center-aligned text.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20308 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCenter of rotation depends on alignment.
eugeni [Wed, 18 Oct 2006 21:19:51 +0000 (21:19 +0000)]
Center of rotation depends on alignment.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20302 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoSupport separate rotation angle for each glyph.
eugeni [Wed, 18 Oct 2006 21:11:29 +0000 (21:11 +0000)]
Support separate rotation angle for each glyph.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20301 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoMove base point calculation to a separate function. Will be reused soon.
eugeni [Wed, 18 Oct 2006 18:33:19 +0000 (18:33 +0000)]
Move base point calculation to a separate function. Will be reused soon.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20300 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCosmetics: remove commented code.
eugeni [Wed, 18 Oct 2006 17:57:00 +0000 (17:57 +0000)]
Cosmetics: remove commented code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20299 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix a typo in collision detection code.
eugeni [Wed, 18 Oct 2006 15:52:26 +0000 (15:52 +0000)]
Fix a typo in collision detection code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20297 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoRemove an outdated debug message.
eugeni [Mon, 16 Oct 2006 19:02:11 +0000 (19:02 +0000)]
Remove an outdated debug message.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20275 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix crash because of last_glyph < first_glyph, probably caused by first line
reimar [Sun, 15 Oct 2006 13:03:43 +0000 (13:03 +0000)]
Fix crash because of last_glyph < first_glyph, probably caused by first line
only consisting of '\n'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20232 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoZerofill libass static variables during initialization.
eugeni [Sat, 14 Oct 2006 14:42:23 +0000 (14:42 +0000)]
Zerofill libass static variables during initialization.
Patch by Jindrich Makovicka <makovick a gmail d com>.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20208 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFree FT_Stroker during libass deinitialization.
eugeni [Sat, 14 Oct 2006 14:35:33 +0000 (14:35 +0000)]
Free FT_Stroker during libass deinitialization.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20207 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoReduce margins for plaintext subtitles.
eugeni [Mon, 9 Oct 2006 19:57:56 +0000 (19:57 +0000)]
Reduce margins for plaintext subtitles.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20144 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAvoid crash with fontconfig 2.3.9x (as shipped with SuSE 10.1, FcDirScan is broken)
reimar [Sun, 8 Oct 2006 13:01:14 +0000 (13:01 +0000)]
Avoid crash with fontconfig 2.3.9x (as shipped with SuSE 10.1, FcDirScan is broken)
and warn that these are beta versions and not supported.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20111 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd copyright notice and vim/emacs comments to libass and vf_ass.c.
eugeni [Sun, 1 Oct 2006 17:09:04 +0000 (17:09 +0000)]
Add copyright notice and vim/emacs comments to libass and vf_ass.c.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20014 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCosmetics: add some comments.
eugeni [Sun, 24 Sep 2006 16:15:47 +0000 (16:15 +0000)]
Cosmetics: add some comments.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19972 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoShadow support in libass.
eugeni [Sun, 24 Sep 2006 16:04:37 +0000 (16:04 +0000)]
Shadow support in libass.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19971 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFree memory in ass_synth_done().
eugeni [Sun, 24 Sep 2006 15:50:31 +0000 (15:50 +0000)]
Free memory in ass_synth_done().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19968 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoReduce size of non-blurred bitmaps.
eugeni [Sat, 23 Sep 2006 18:35:19 +0000 (18:35 +0000)]
Reduce size of non-blurred bitmaps.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19962 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCosmetics. Change indentation of block of code to make it consistent with
eugeni [Sat, 23 Sep 2006 17:54:24 +0000 (17:54 +0000)]
Cosmetics. Change indentation of block of code to make it consistent with
the rest of the file.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19961 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoBetter fix_outline implementation. No more "fix_outline failed" messages,
eugeni [Sat, 23 Sep 2006 00:15:00 +0000 (00:15 +0000)]
Better fix_outline implementation. No more "fix_outline failed" messages,
should work even with the craziest glyphs.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19947 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix width -> orig_width typo causing subtitles to be too far to the right
reimar [Fri, 22 Sep 2006 20:47:08 +0000 (20:47 +0000)]
Fix width -> orig_width typo causing subtitles to be too far to the right
for movies with vertical black bars (aspect < monitoraspect).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19946 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoMove calculation of text parameters (number of lines, height, etc.) from
eugeni [Fri, 22 Sep 2006 18:56:09 +0000 (18:56 +0000)]
Move calculation of text parameters (number of lines, height, etc.) from
wrap_lines_smart() into a separate function. Call it for every event, even
those that do not require line wrapping.

This fixes randomly wrong positioning of 'Banner' events.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19938 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoMove variable declaration to a more deeply nested block. It is not used outside of it.
eugeni [Fri, 22 Sep 2006 18:47:29 +0000 (18:47 +0000)]
Move variable declaration to a more deeply nested block. It is not used outside of it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19937 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCosmetics: fix indentation after last commit.
eugeni [Thu, 21 Sep 2006 22:37:42 +0000 (22:37 +0000)]
Cosmetics: fix indentation after last commit.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19925 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix FT_Stroker use in libass. The previous variant ended up with 0-width
eugeni [Thu, 21 Sep 2006 22:36:47 +0000 (22:36 +0000)]
Fix FT_Stroker use in libass. The previous variant ended up with 0-width
outline in some cases.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19924 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoIn r19831, font size multiplier was mistakenly applied to border width.
eugeni [Thu, 21 Sep 2006 19:31:28 +0000 (19:31 +0000)]
In r19831, font size multiplier was mistakenly applied to border width.
Fixed.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19923 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoSort events by ReadOrder (if both layer and start time are equal).
eugeni [Tue, 19 Sep 2006 18:23:36 +0000 (18:23 +0000)]
Sort events by ReadOrder (if both layer and start time are equal).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19912 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoSet ReadOrder values for external subtitles.
eugeni [Tue, 19 Sep 2006 18:22:44 +0000 (18:22 +0000)]
Set ReadOrder values for external subtitles.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19911 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCalculate text bounding box in such way that it does not depend on the height
eugeni [Tue, 19 Sep 2006 17:40:31 +0000 (17:40 +0000)]
Calculate text bounding box in such way that it does not depend on the height
of individual glyphs.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19910 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCosmetics: fix indentation after last commit.
eugeni [Tue, 19 Sep 2006 13:07:45 +0000 (13:07 +0000)]
Cosmetics: fix indentation after last commit.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19908 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoDon't call FcDirScan/FcDirSave with FontConfig >= 2.4.
eugeni [Tue, 19 Sep 2006 13:06:44 +0000 (13:06 +0000)]
Don't call FcDirScan/FcDirSave with FontConfig >= 2.4.
Font cache is updated automatically in FcConfigAppFontAddDir.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19907 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix a stupid bug in list concatenation.
eugeni [Mon, 18 Sep 2006 18:54:38 +0000 (18:54 +0000)]
Fix a stupid bug in list concatenation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19897 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoReduce code duplication in init_render_context().
eugeni [Sun, 17 Sep 2006 15:32:01 +0000 (15:32 +0000)]
Reduce code duplication in init_render_context().
Don't use glyph stroker for borderless glyphs.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19879 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoSubtract glyph bitmap from outline bitmap.
eugeni [Sat, 16 Sep 2006 19:01:56 +0000 (19:01 +0000)]
Subtract glyph bitmap from outline bitmap.
It greatly improves display of glyphs with semitransparent primary color.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19862 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd \be (blur edges) support to libass.
eugeni [Sat, 16 Sep 2006 13:32:46 +0000 (13:32 +0000)]
Add \be (blur edges) support to libass.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19854 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoStore bitmap glyphs in a separate struct, instead of FreeType's internal buffer.
eugeni [Sat, 16 Sep 2006 13:08:17 +0000 (13:08 +0000)]
Store bitmap glyphs in a separate struct, instead of FreeType's internal buffer.
This is required for various bitmap modifications (like blur, outline and shadow).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19852 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoMake font outline width proportional to movie resolution.
eugeni [Wed, 13 Sep 2006 15:35:10 +0000 (15:35 +0000)]
Make font outline width proportional to movie resolution.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19831 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoBugfix: timing for empty karaoke words was lost, resulting
eugeni [Wed, 6 Sep 2006 17:32:31 +0000 (17:32 +0000)]
Bugfix: timing for empty karaoke words was lost, resulting
in faster than normal karaoke playback.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19722 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoWorkaround for broken fonts with bad ascender/descender.
eugeni [Tue, 5 Sep 2006 20:06:20 +0000 (20:06 +0000)]
Workaround for broken fonts with bad ascender/descender.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19699 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoChange \fad behaviour so that it does not get cancelled by \r.
eugeni [Tue, 5 Sep 2006 19:06:15 +0000 (19:06 +0000)]
Change \fad behaviour so that it does not get cancelled by \r.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19698 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoSimplification.
eugeni [Tue, 5 Sep 2006 18:33:31 +0000 (18:33 +0000)]
Simplification.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19697 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd vertical clipping for subtitles that were moved because of a collision.
eugeni [Mon, 4 Sep 2006 17:55:57 +0000 (17:55 +0000)]
Add vertical clipping for subtitles that were moved because of a collision.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19670 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix possible unallocated memory read in libass line wrapping code.
eugeni [Mon, 4 Sep 2006 17:52:28 +0000 (17:52 +0000)]
Fix possible unallocated memory read in libass line wrapping code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19669 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoApply -ass-force-style also to matroska plaintext subs.
eugeni [Sun, 3 Sep 2006 17:57:41 +0000 (17:57 +0000)]
Apply -ass-force-style also to matroska plaintext subs.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19660 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCosmetics: restore indentation after recent changes.
eugeni [Sun, 3 Sep 2006 17:44:25 +0000 (17:44 +0000)]
Cosmetics: restore indentation after recent changes.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19659 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd -ass-styles option. It allows to load styles from a file and use them
eugeni [Sun, 3 Sep 2006 17:42:31 +0000 (17:42 +0000)]
Add -ass-styles option. It allows to load styles from a file and use them
for plain text subtitles rendering.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19658 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix last commit.
eugeni [Sun, 3 Sep 2006 17:36:29 +0000 (17:36 +0000)]
Fix last commit.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19657 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoMore checks in ass_render_event.
eugeni [Sun, 3 Sep 2006 17:25:04 +0000 (17:25 +0000)]
More checks in ass_render_event.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19656 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoRemove unneeded variable.
eugeni [Sun, 3 Sep 2006 17:09:53 +0000 (17:09 +0000)]
Remove unneeded variable.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19655 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoass-color and ass-border-color options.
eugeni [Sun, 3 Sep 2006 12:18:49 +0000 (12:18 +0000)]
ass-color and ass-border-color options.
Only plain text subtitles are affected.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19652 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd support for rendering matroska plaintext subtitles with libass.
eugeni [Sat, 2 Sep 2006 20:46:26 +0000 (20:46 +0000)]
Add support for rendering matroska plaintext subtitles with libass.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19649 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoDon't sort events when reading external subs. With r19644, the order does not matter.
eugeni [Sat, 2 Sep 2006 19:21:40 +0000 (19:21 +0000)]
Don't sort events when reading external subs. With r19644, the order does not matter.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19645 b3059339-0415-0410-9bf9-f77b7e298cf2