RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-30 02:52:10 +00:00
Code Issues Releases Wiki Activity
24,093 Commits 41 Branches 86 Tags 148 MiB
6a4478d677
Commit Graph

262 Commits

Author SHA1 Message Date
iive
8051b919a7 Fix compilation of ass_fontconfig.c when fontconfig is disabled. 
Add missing parameter to the function in the #else case


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24008 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-04 10:46:14 +00:00
eugeni
dc0541c142 Don't apply windows-like font scaling if hhea or os2 tables contain invalid 
metrics.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24003 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-03 15:39:38 +00:00
eugeni
6f90765a40 Workaround for fonts with zero ascender/descender in horizontal header. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24002 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-03 15:22:55 +00:00
eugeni
66d6320b51 Factor out common code from ass_font_new and ass_font_reselect. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24001 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-03 14:10:53 +00:00
eugeni
10cd4a7e5a More simple and correct font reselection. 
Since ass_font_t contains a list of font faces, there is no need to select the
face with maximum charset coverage each time. It is enough to select any face
with the required glyph.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24000 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-03 13:43:11 +00:00
diego
3e9e4acd8d Do not use leading underscores in multiple inclusion guards, they are reserved. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-07-02 22:34:45 +00:00
diego
437e32353f Consistently use filename as multiple inclusion guard. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23707 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-07-02 21:34:39 +00:00
eugeni
387ccdc034 When parsing ass-force-style arguments, search for '=' and '.' characters with 
strrchr. This allows using it for styles whose name contains those characters.
Patch by Бранко Мајић <branko majic at gmail com>.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23560 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-15 22:22:16 +00:00
eugeni
34402c3cf2 Make sure there is at least one style in ass_track when parsing events. 
Before it was only checked for embedded subtitles.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23559 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-15 22:15:27 +00:00
eugeni
4939caa691 Move code for reading a file and recoding it to utf-8 to a separate function. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23442 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-01 19:56:44 +00:00
eugeni
c64608422a Fix #if condition. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23358 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-20 17:56:39 +00:00
eugeni
225a00fb2e FT_Request_Size does not exist in FreeType 2.1.*. Fallback to FT_Set_Char_Size. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23357 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-20 17:04:12 +00:00
eugeni
1762cbe986 Correct font size in libass. 
Values from TrueType OS/2 table are used to reproduce VSFilter behaviour.
Magic 0.8 multiplier and scaling for the fractional part of font size are not
needed anymore.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23346 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-19 14:11:41 +00:00
eugeni
c5bc1d693c Revert y-axis rotation. Change order of rotations. 
Now rotations are performed in the following order: X, Y, Z. Before this, it
was the other way around. Also, in FreeType Y axis is directed upwards, so the
corresponding rotation must be reverted.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23340 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-18 18:58:34 +00:00
eugeni
8513877fac Support fractional font sizes. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23318 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-14 20:41:14 +00:00
eugeni
b51b557529 Limit ass_font_set_transform to nonrotating transformations. 
Rotations are not needed here (they are performed in transform3d) and they
disable autohinter.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23317 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-14 20:24:53 +00:00
eugeni
929e461eb0 Don't deallocate font data if it will be used later. 
It produced either segfault or "Error opening memory font" with any script
that contains embedded fonts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23282 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-09 21:38:28 +00:00
eugeni
7a3a0a3225 Move variables and a function under #ifdef FC_VERSION to avoid warnings. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23234 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-03 20:10:14 +00:00
eugeni
ef3fb052c2 Deallocate FontConfig objects. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23233 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-03 19:52:46 +00:00
eugeni
1ec5f31f72 Fix stupid bug in r23229. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23232 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-03 19:47:34 +00:00
eugeni
e4855381f4 Deallocate string. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23231 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-03 19:33:35 +00:00
eugeni
e3e99c086c In ass_font_new, allocate temporary ass_font_t on stack and return the pointer 
to cache-owned copy. This fixes leaked ass_font_t struct.

Without this, font pointers obtained from ass_font_new() and
ass_font_cache_find() were different, and bitmaps rendered with the first one
could not be located in the cache later.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23230 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-03 19:26:43 +00:00
eugeni
0b8bd90b9e Make cache_*_add functions return the pointer to new (copied) value. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23229 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-03 19:13:54 +00:00
eugeni
9cda6a4834 Always deallocate glyphs. Fixes memory leak. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23208 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-02 10:15:12 +00:00
eugeni
e23d5dacb7 Update comments. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23197 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-01 15:54:00 +00:00
eugeni
22f759c04a Cosmetics. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23196 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-01 15:34:08 +00:00
eugeni
f0ffc341b6 Move glyph_to_bitmap() call and outline glyph deallocation to 
get_bitmap_glyph().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23195 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-01 15:33:06 +00:00
eugeni
6deff1f55a Minor code simplification. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23193 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-01 15:21:34 +00:00
eugeni
eaa1f9ab16 Move get_bitmap_glyph() call to a separate loop. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23192 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-01 15:14:22 +00:00
eugeni
8ffc803841 Move transform_3d() call to get_bitmap_glyph(). 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23191 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-01 15:12:36 +00:00
eugeni
3e9be13d66 Make a function static. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23190 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-01 15:07:41 +00:00
eugeni
005220995c Don't recalculate rotation radius. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23189 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-01 15:05:20 +00:00
eugeni
5221c54cb6 Bugfix: glyph cache depends on border width, because it contains outline_glyph 
(glyph border obtained with FT_Glyph_StrokeBorder) since r23043.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23188 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-01 14:29:28 +00:00
eugeni
c67220c86f Add -ass-hinting option for setting font hinting method. 
It is possible to separately configure hinting for scaled and unscaled osd.
The default is native hinter for unscaled osd (only vo_gl at this point),
no hinting for vf_ass.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23152 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-27 14:25:36 +00:00
eugeni
13156cd794 Fix division by zero in "\t" parsing. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23151 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-27 14:18:44 +00:00
eugeni
6f054a0afd Do not use FT_Glyph_Copy with NULL glyphs. 
Contrary to the docs, it leaves garbage in *target.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23104 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-24 17:36:03 +00:00
eugeni
9dbd459f7e Deallocate glyphs in a separate loop. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23054 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-21 11:02:49 +00:00
eugeni
2b1fb8c4ef Always deallocate glyphs. Fixes a memory leak. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23053 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-21 10:56:28 +00:00
eugeni
02966ab87d Reset outline glyph cache when configuration changes. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23052 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-21 10:43:19 +00:00
eugeni
d5f828f347 Scale camera distance. 
Otherwise perspective does not look the same in fullscreen.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23051 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-21 10:42:10 +00:00
eugeni
de9f870522 Remove unused variables. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23049 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-20 23:25:30 +00:00
eugeni
cd298098af Cosmetics. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23048 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-20 23:23:32 +00:00
eugeni
e8b8c0fe0e Allow caching of rotated glyphs. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23047 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-20 23:23:00 +00:00
eugeni
7c281a626d Add shift_[xy] (vector that is added to the glyph before transformation) to 
bitmap glyph key. Result of rotation depends on them because of perspective
transformation. They are only set when some rotation take place.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23046 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-20 23:19:23 +00:00
eugeni
fda46c092d Fill bitmap_hash_key during parsing stage, call get_bitmap_glyph() much later. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23045 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-20 23:16:29 +00:00
eugeni
f3375f1b4d Remove bbox and advance vector from bitmap cache. 
They are now available from glyph cache.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23044 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-20 23:14:12 +00:00
eugeni
35cc43696d Store outline_glyph (glyph border) in glyph cache. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23043 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-20 23:13:34 +00:00
eugeni
05739aa046 Cosmetics: reindentation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23042 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-20 23:12:19 +00:00
eugeni
b9809c1e13 Because of the outline glyph cache it is now possible for glyph_info_t to have 
both non-zero glyph and bitmap at the same time. In that case, bitmap should
not be generated anew.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23041 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-20 23:11:39 +00:00
eugeni
d9741a0278 Make get_*_glyph return void. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23040 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-20 23:10:33 +00:00