RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-12 09:59:44 +00:00
Code Issues Releases Wiki Activity
23,153 Commits 41 Branches 86 Tags 161 MiB
bd14c1d8c1
Commit Graph

142 Commits

Author SHA1 Message Date
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
eugeni
1c2b174029 Move outline glyph generation to a separate function, using outline glyph 
cache.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23039 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-20 23:09:48 +00:00
eugeni
6c412d239b Rename glyph cache to bitmap cache. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23035 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-20 23:02:20 +00:00
eugeni
f7b1538978 A meaningless cosmetic change. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23033 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-20 22:57:55 +00:00
eugeni
36870a2a52 Add perspective projection. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23032 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-20 22:56:42 +00:00
eugeni
cf9aff424f Applying transformation matrix to the glyph and the shift vector separately is 
incorrect. Instead, it should be applied to translated glyph.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23031 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-20 22:55:28 +00:00
eugeni
3cbdb85046 Cosmetics: reindentation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23030 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-20 22:51:19 +00:00
eugeni
1a1ba22f93 Disable caching of rotated glyphs. 
The following commits will add perspective distortion to the glyphs rotated
with \frx and \fry. Somewhere along the way correct caching of such glyphs
will become impossible, but in the end everything will be fine.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23029 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-20 22:49:48 +00:00
eugeni
67061091c6 Fix a stupid bug in r22473: bbox is zero-filled everytime when a glyph 
is found in the cache. This leads to broken karaoke (some glyphs are not
highlighted at all), and, probably, slightly incorrect linebreaks.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22986 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-13 13:46:49 +00:00
eugeni
79e828c998 Fix lost hard linebreaks in libass by repeating the loop when both soft and 
hard linebreaks are about to be added.

Original message:
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2007-April/050876.html

Patch by Jindrich Makovicka /makovick gmail com/



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22931 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-07 13:32:51 +00:00
uau
208d4343ef "()" to "(void)" function param list fixes 
patch from Stefan Huehner, stefan huehner org


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22904 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-01 21:59:54 +00:00
iive
b5da111dd8 Use FT_Glyph_StrokeBorder to render only the outside border. 
Workarounds gaps between glyph and glyph border when rendering some fonts with freetype below 2.1.10


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22863 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-31 20:58:14 +00:00
eugeni
d96c2d51d9 A function always returning 0 could as well return void. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22475 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-06 10:00:53 +00:00
eugeni
df5bbaa735 Text alignment should not use bounding boxes of individual glyphs. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22474 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-06 09:59:53 +00:00
eugeni
3a14d1c37a Reset advance vector and glyph bounding box if glyph could not be found. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22473 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-06 09:31:12 +00:00
eugeni
cb9cde3f8c Fix incorrect spacing introduced in r22231: 
these two lines were supposed to perform truncation, not rounding.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22419 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-03 08:20:00 +00:00
eugeni
5c927f2367 10l: x2scr used twice instead of y2scr. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22415 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-02 17:59:19 +00:00
eugeni
83ef3fedab Bugfix: transform origin to screen coordinates. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22414 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-02 17:54:47 +00:00
uau
0a02ca6ec3 Fix \a parsing broken in r22291 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22321 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-23 03:08:54 +00:00
eugeni
6177b51841 Oops, forgot {} before "else". 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22300 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-21 09:25:52 +00:00
eugeni
87cb56fa1f Cosmetics: fix indentation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22294 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-20 17:22:34 +00:00
eugeni
a267f03bfa With \t(\b) text becomes bold at the middle of time interval, not at the end 
of it like before. The same for \t(\i).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22293 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-20 17:20:21 +00:00
eugeni
b4dac96e5a Any style modifier followed by no recognizable parameter resets to the default. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22291 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-20 17:17:51 +00:00
eugeni
796df56724 \fn without an argument resets font family to the value from style. 
Fixes bugzilla #762.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22287 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-20 16:37:18 +00:00
eugeni
c8497d4177 Fix display order of events. 
Starting time does not matter, it depends on Layer and ReadOrder only.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22286 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-20 16:20:55 +00:00
eugeni
999e603eb7 Both (-1) and 1 mean bold font in SSA/ASS styles. 
The same for italics and some other fields.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22281 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-19 20:10:55 +00:00
eugeni
11399e2ac8 Add \t(\b) support. 
Contradicts the specification, but supported by all other renderers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22280 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-19 19:01:45 +00:00
eugeni
2287f5662d Fix bounding box calculation with \fscx/\fscy. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22279 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-19 18:37:54 +00:00
eugeni
3e1dde83ba Fix \fscx/\fscy animation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22278 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-19 18:31:05 +00:00
eugeni
39c818a551 Correct implementation of text spacing. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22277 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-19 18:01:49 +00:00
eugeni
beaa890438 Reallocate event_images_t, removing limit on simultanious events count. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22276 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-19 17:44:29 +00:00
eugeni
885b7a1d4e Restore a minus sign that was lost in r22231. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22239 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-16 23:18:47 +00:00
eugeni
fb6a1101ce Implement \frx and \fry (and reimplement \frz) as 3d rotations. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22233 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-16 17:54:47 +00:00
eugeni
a2195cd28f Consistently name z-axis rotation angle "frz". 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22232 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-16 17:51:07 +00:00