RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 23:00:41 +00:00
Code Issues Releases Wiki Activity
29,094 Commits 43 Branches 87 Tags 170 MiB
e3b6f71b2d
Commit Graph

204 Commits

Author SHA1 Message Date
eugeni
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
eugeni
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
eugeni
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
reimar
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
eugeni
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
eugeni
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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