RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-16 03:45:23 +00:00
Code Issues Releases Wiki Activity
24,556 Commits 41 Branches 86 Tags 133 MiB
23f5d9b6ba
Commit Graph

265 Commits

Author SHA1 Message Date
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
rfelker
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
rfelker
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
eugeni
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
diego
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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
diego
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
reynaldo
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
reynaldo
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
eugeni
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
eugeni
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
eugeni
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
diego
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
eugeni
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
eugeni
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
eugeni
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
eugeni
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