reimar
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
reimar
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
reimar