2dbaab9320
Add FT_Library to ass_font_t.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21365 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 22:20:24 +00:00
27ebb01514
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
2006-11-28 22:17:33 +00:00
edc6501697
Don't include freetype headers in other headers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21339 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 17:56:49 +00:00
07786c1275
Fix compilation broken in previous commit.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21338 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 17:53:33 +00:00
65dbd03fed
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
2006-11-27 17:50:05 +00:00
f356ada7fb
Cosmetics: reindent.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21336 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 17:34:47 +00:00
42e4745f17
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
2006-11-27 17:33:59 +00:00
6e9a5a842c
Move ass_font_t allocation to ass_font.h.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21333 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 17:13:52 +00:00
84d0512e5b
Initialize font size with 0.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21330 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 16:21:10 +00:00
b11cd1d856
Remove obsolete "no_more_font_messages" hack.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21295 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 22:53:52 +00:00
1cbd5dfd31
Move fonts-related code to a separate file.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21293 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 22:49:27 +00:00
4d27dbd5c9
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
2006-11-26 20:53:29 +00:00
004c19b520
Move ass_font_t to header.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21282 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 20:38:06 +00:00
85fb960769
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
2006-11-26 20:34:54 +00:00
dc2be42703
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
2006-11-26 18:12:36 +00:00
8f167fc5c5
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
2006-11-25 17:06:08 +00:00
b0e412cc9c
Remove pointless indirection.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21227 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:02:52 +00:00
27b0177662
Remove superfluous comment.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21222 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 16:12:36 +00:00
bec3287bd4
Cosmetics: remove unneeded curly brackets.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21114 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 17:13:19 +00:00
852e37033b
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
2006-11-20 17:10:18 +00:00
cf4bf03dc2
Unify dep/depend targets.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21096 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:18:01 +00:00
598d5be3ad
MSGTRs for libass
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21082 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 22:35:17 +00:00
8856d67d40
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
2006-11-19 00:41:00 +00:00
656bde87fa
Support \t with acceleration.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20891 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 16:49:32 +00:00
4a27cb5876
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
2006-11-13 16:35:15 +00:00
60d29dbd71
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
2006-11-08 18:57:40 +00:00
ff4a1ad4a9
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
2006-11-06 20:09:28 +00:00
c8b995cf2f
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
2006-11-06 02:47:57 +00:00
aca2396794
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
2006-11-05 18:56:31 +00:00
0a8d19b293
Cosmetics: indentation fix.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20718 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 18:21:39 +00:00
f78a3783e5
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
2006-11-05 17:26:55 +00:00
a5c1f03baa
More precise bounding box calculation for karaoke effects.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20669 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-04 17:58:09 +00:00
46afb40907
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
2006-11-03 23:11:00 +00:00
6fef7a200f
Introduce MSGT_ASS, use it for all libass messages.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20645 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 18:15:33 +00:00
593e642133
Implement loading subtitles from memory.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20619 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 02:15:08 +00:00
452d1d6c61
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
2006-11-03 01:41:48 +00:00
ef5dee5d56
Revert r20517.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20519 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 17:29:55 +00:00
978061ad27
Move ass_library initialization code to ass_mp.c.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20518 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 15:26:13 +00:00
06758d89bc
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
2006-10-29 15:03:30 +00:00
7e9c778cf2
Fix width -> orig_width typo.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20513 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 13:59:36 +00:00
572576eb67
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
2006-10-29 13:58:30 +00:00
870ed1a164
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
2006-10-29 13:52:51 +00:00
efea99c2c9
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
2006-10-28 15:07:18 +00:00
ef45c3167f
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
2006-10-28 10:21:30 +00:00
4d268b94d7
Add missing fontconfig_done() call.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20467 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-27 16:02:44 +00:00
e8733cbf9d
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
2006-10-26 20:08:46 +00:00
08d9c0718a
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
2006-10-20 23:06:52 +00:00
a4a817a15f
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
2006-10-19 18:08:44 +00:00
7abe5a4ef8
Center of rotation depends on alignment.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20302 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-18 21:19:51 +00:00
2d3ad59854
Support separate rotation angle for each glyph.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20301 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-18 21:11:29 +00:00
5b5798f039
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
2006-10-18 18:33:19 +00:00
67232605ef
Cosmetics: remove commented code.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20299 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-18 17:57:00 +00:00
6d4ad204b2
Fix a typo in collision detection code.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20297 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-18 15:52:26 +00:00
28ecbe3cc3
Remove an outdated debug message.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20275 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-16 19:02:11 +00:00
404c75b083
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
2006-10-15 13:03:43 +00:00
47006b0d7d
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
2006-10-14 14:42:23 +00:00
965a305938
Free FT_Stroker during libass deinitialization.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20207 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-14 14:35:33 +00:00
4ad4f781db
Reduce margins for plaintext subtitles.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20144 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 19:57:56 +00:00
b7971e6a40
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
2006-10-08 13:01:14 +00:00
50ca7a4f72
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
2006-10-01 17:09:04 +00:00
74727dc564
Cosmetics: add some comments.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19972 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-24 16:15:47 +00:00
1b0251e7ad
Shadow support in libass.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19971 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-24 16:04:37 +00:00
a88de95383
Free memory in ass_synth_done().
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19968 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-24 15:50:31 +00:00
f21b92e1a5
Reduce size of non-blurred bitmaps.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19962 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 18:35:19 +00:00
50d2386180
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
2006-09-23 17:54:24 +00:00
64f3fac3a0
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
2006-09-23 00:15:00 +00:00
6c8ab3f263
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
2006-09-22 20:47:08 +00:00
0ba8cc2972
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
2006-09-22 18:56:09 +00:00
38ea1d82d8
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
2006-09-22 18:47:29 +00:00
4a09756828
Cosmetics: fix indentation after last commit.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19925 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-21 22:37:42 +00:00
a7e1afc5b3
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
2006-09-21 22:36:47 +00:00
997c42f17f
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
2006-09-21 19:31:28 +00:00
ef3a4fa04e
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
2006-09-19 18:23:36 +00:00
6cc5d2fc08
Set ReadOrder values for external subtitles.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19911 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-19 18:22:44 +00:00
0c1c5e7ea2
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
2006-09-19 17:40:31 +00:00
9cfbc0fd80
Cosmetics: fix indentation after last commit.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19908 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-19 13:07:45 +00:00
61d45a940d
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
2006-09-19 13:06:44 +00:00
ac4703fc35
Fix a stupid bug in list concatenation.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19897 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-18 18:54:38 +00:00
75cc0a6fc8
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
2006-09-17 15:32:01 +00:00
5cdc829b9f
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
2006-09-16 19:01:56 +00:00
69cbeae845
Add \be (blur edges) support to libass.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19854 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-16 13:32:46 +00:00
867aa92076
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
2006-09-16 13:08:17 +00:00
dccd5e19ee
Make font outline width proportional to movie resolution.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19831 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-13 15:35:10 +00:00
6019b400da
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
2006-09-06 17:32:31 +00:00
4fd16b0702
Workaround for broken fonts with bad ascender/descender.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19699 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-05 20:06:20 +00:00
b4d4d22a50
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
2006-09-05 19:06:15 +00:00
1e50bf37ea
Simplification.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19697 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-05 18:33:31 +00:00
d764df09de
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
2006-09-04 17:55:57 +00:00
06ffbd9d7d
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
2006-09-04 17:52:28 +00:00
1d6919b492
Apply -ass-force-style also to matroska plaintext subs.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19660 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-03 17:57:41 +00:00
06b0186037
Cosmetics: restore indentation after recent changes.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19659 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-03 17:44:25 +00:00
9d3ed04d47
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
2006-09-03 17:42:31 +00:00
8ed46df92f
Fix last commit.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19657 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-03 17:36:29 +00:00
d9f0a7b4ad
More checks in ass_render_event.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19656 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-03 17:25:04 +00:00
83a3b732c4
Remove unneeded variable.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19655 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-03 17:09:53 +00:00
62b44a7d1f
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
2006-09-03 12:18:49 +00:00
cc29cb220f
Add support for rendering matroska plaintext subtitles with libass.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19649 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-02 20:46:26 +00:00
b1515e31b1
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
2006-09-02 19:21:40 +00:00
fc6751b73a
Better collision detection algorithm. The idea is to keep a subtitle in place
...
when a lower placed one disappears, thus improving readability.
As a side effect, layers are supported now.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19644 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-02 19:17:32 +00:00
e6206f4e1c
Remove some unused code.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19642 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-02 18:33:51 +00:00
19e596920d
Read layer info from external subs.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19641 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-02 18:10:04 +00:00
729b0059a4
Make \fr* parameter a floating point value.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19628 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-01 20:36:38 +00:00
534fe740f5
Bugfix: potential write of unallocated memory.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19618 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-31 22:45:20 +00:00
9b39128d2e
Bugfix: wrong height value used in font size calculation.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19616 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-31 20:19:19 +00:00
867da260c9
Change default font family and color for plain text subs.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19598 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-29 21:14:57 +00:00
4c6dde8817
Bugfix: strdup of NULL value.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19594 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-29 18:15:48 +00:00
1d9317f8d5
Apply -ass-force-style also to tracks generated from subdata.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19590 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-29 10:35:58 +00:00
0decebcb05
Ignore '*' at the beginning of style name.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19573 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-28 16:59:29 +00:00
85063db776
Fix font scaling taking margins into account.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19572 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-28 16:43:17 +00:00
432868f92c
Add -(no)ass-use-margins option.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19569 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-28 15:12:45 +00:00
6b65c7c871
Cosmetics: fix indentation after r19562.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19563 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-27 22:15:46 +00:00
a812aee1e6
Transition effects support.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19562 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-27 22:12:31 +00:00
f5e2fac77b
Simplify ass_glyph_cache_reset().
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19551 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-26 20:09:54 +00:00
8b4274d71f
Reset glyph cache on reconfigure.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19545 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-26 19:00:21 +00:00
a0f422546d
Add right and left margins support to libass.
...
Add ability to not use margins even when they are available.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19544 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-26 18:24:37 +00:00
e8686ca1f1
Fix previous commit.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19524 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-24 15:38:28 +00:00
43a971a720
Simplify vf_ass initialization.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19523 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-24 15:36:20 +00:00
ae7f2be0ab
New cmdline option: -ass-force-style.
...
Allows overriding any style parameter from command line.
Idea and original patch by Konstantin G. Khlebnikov { koct9i aT gmail doT com }.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19501 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-22 23:20:05 +00:00
5762122f37
SSA/ASS parser reworked, with 2 main results:
...
support for script embedded fonts (fonts, uuencoded directly into script) added;
matroska interface functions have got more sensible names.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19498 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-22 22:11:01 +00:00
6e2e1a80e7
use of malloc without prototype.. very bad on 64bit archs
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19490 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 22:02:49 +00:00
748d139e19
no c++ decls!
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19487 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 21:46:59 +00:00
cd59e21610
Add public functions for removal of styles and events.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19480 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 16:33:13 +00:00
b02e7924b9
Move all internal -I parameters to the front of CFLAGS to avoid using external
...
header files that happen to have the same name as internal ones.
based on a patch by Vladislav Naumov, vladislav.naumov **at** gmail **dot** com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19426 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-17 17:19:56 +00:00
6037d1d6ee
Fix wrong handling of transparency in \fad(\fade).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19412 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-16 00:54:59 +00:00
eaffefaaf0
Replace stdint.h with inttypes.h.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19411 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-15 22:46:56 +00:00
e9297a3597
Angle value from style was ignored. Not anymore.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19410 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-15 20:41:53 +00:00
e3bf2d7343
Add subdata to ass_track conversion for external subtitles.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19407 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-15 19:25:46 +00:00
646de6eb2a
Cosmetics: fix indentation after the last patch.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19405 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-15 14:43:04 +00:00
6d21ed472c
Allow \fade to be used in place of \fad and vice versa.
...
Now they are distinguished by the number of arguments.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19404 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-15 14:40:57 +00:00
070c050f0a
Replace %lld with PRId64, part 2.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19384 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-13 10:54:29 +00:00
20b008a791
MinGW treats %lld as %d. Replace it with PRId64.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19380 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-13 00:47:33 +00:00
9481172438
Fix compilation with gcc 2.95.
...
Patch by Jason Tackaberry, tack at urandom dot ca.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19376 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-12 18:33:19 +00:00
5415ba27e4
Use FontConfig cache to speedup mplayer startup.
...
Patch by Zealot <zealot0630 at gmail dot com>.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19346 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-06 17:56:01 +00:00
22b5b6d0f5
Unify include paths in the build system, part I.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19195 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-27 10:08:17 +00:00
58ed2c3fe0
marks several read-only string parameters which aren't modified inside the called function as const. Patch by Stefan Huehner, stefan AT huehner-org
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19109 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-15 16:03:12 +00:00
c0c641f0e3
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19071 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 20:59:18 +00:00
feaf4bf603
Cosmetics.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19069 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 18:52:16 +00:00
8e9ac90c48
Use FcPatternAdd-Type instead of FcNameParse. The latter, as it turns out, requires escaping of some characters ('-', maybe more).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19068 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 18:49:06 +00:00
5ca4a9ad1e
Support 6 argument variant of \move.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19049 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-12 22:28:20 +00:00
f7d4dd174b
OPTFLAGS already includes EXTRA_INC.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19042 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-12 17:58:07 +00:00
1fe2561ed1
Support some recently discovered color formats.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19008 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-10 23:58:24 +00:00
2a6f4c3444
Ignoring FT_Glyph_Stroke() errors can potentially lead to double free().
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19007 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-10 23:57:17 +00:00
6127b2c08f
Only match outline fonts.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19006 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-10 23:55:40 +00:00
e15ae9a600
Initial libass release (without mencoder support).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18942 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 18:26:51 +00:00
eugeni
diego
kraymer
reimar
rfelker
reynaldo