RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-16 11:55:42 +00:00
Code Issues Releases Wiki Activity
22,463 Commits 41 Branches 86 Tags 133 MiB
5de53fffeb
Commit Graph

192 Commits

Author SHA1 Message Date
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
f2daf2d930 Add some missing includes. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22310 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-22 15:48:37 +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
eugeni
42871d8220 Move conversions between 16.16, 26.6 fixed point and int, double to separate 
functions. Some rounding errors are fixed along the way.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22231 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-16 17:49:35 +00:00
eugeni
1400b0f436 Select the first charmap in the font, if FreeType did not autoselect any. 
This happens, for example, with fonts only having an Apple Roman charmap.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22228 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-15 22:03:09 +00:00
eugeni
520db0d850 \r resets \frz to style value. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22227 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-15 21:53:28 +00:00
eugeni
e802fdf790 Fix \t(\frz) handling. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22226 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-15 21:51:51 +00:00
eugeni
42cfb2bb4d \org(0,0) is different from no \org at all. 
Use render_context.have_origin to tell them apart.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22225 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-15 21:50:21 +00:00
eugeni
7c137f48c6 Bugfix: glyph and bitmap pointers could be left uninitialized after 
get_glyph().
Based on a patch by Stanislav Maslovski (stanislav d maslovski a gmail d com).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22063 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-01-29 17:08:29 +00:00
reimar
580dccd5c4 Avoid invalid memory access in ass_process_subtitle for empty subtitles 
with sub->lines <= 0


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21853 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-01-07 16:07:45 +00:00
eugeni
896c9c1384 Make -embeddedfonts enabled by default with FontConfig >= 2.4.2. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21648 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-17 12:35:12 +00:00
eugeni
dd1a5a82c1 Update some comments. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21646 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-17 12:00:55 +00:00
eugeni
c0358ff255 Cosmetics: fix indentation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21636 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-16 19:35:48 +00:00
eugeni
d6ffde2900 Keep reselected fonts in an array, adding new ones to the end. Glyph 
lookup prefers earlier opened fonts.

This way glyph lookup is stable, which means that:
 - cache cleanup is never required after font reselecting;
 - a single unrecognized char won't change the appearance of all the others.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21635 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-16 19:34:00 +00:00
eugeni
eba0f2e158 Avoid storing font file path and index in ass_font_t. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21634 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-16 19:29:33 +00:00
eugeni
4eb3c3173e Remove a mistakenly committed debug printf. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21633 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-16 19:28:21 +00:00
eugeni
624724c001 FT_Set_Transform is fast enough to be called once for each glyph. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21632 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-16 19:24:01 +00:00
eugeni
2875decdc4 Avoid "pointer targets differ in signedness" warnings. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21631 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-16 19:19:27 +00:00
eugeni
db088e936d Move ascender, descender, and kerning computation to ass_font.c. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21630 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-16 19:17:50 +00:00
reimar
f4b7a0e4d1 Get rid on -DGNU_SOURCE for internal code, imported libs should be fixed 
ASAP, too, though


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21604 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-12 20:29:30 +00:00
eugeni
e15d11c89e Speed up ASS subtitles display by detecting changes between two consecutive 
rendering results.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21522 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-06 18:44:26 +00:00
reimar
e70b5d8500 Also free ass_library_t members in ass_library_done 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21513 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-06 10:11:23 +00:00
eugeni
92256c07d1 Open embedded fonts directly from memory. 
FontConfig 2.4.2 (released yesterday) supports scanning fonts with
FcFreeTypeQueryFace without writing them to disk. With earlier FontConfig
versions, the old mechanism is used.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21476 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-03 18:24:11 +00:00
eugeni
7db61d9736 Keep embedded fonts in ass_library_t and perform actual disk write 
in fontconfig initialization. This is required for some fontconfig-related
improvements.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21474 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-03 17:59:13 +00:00
eugeni
b5a682f0aa Rename: ass_process_font -> ass_add_font. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21471 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-03 17:35:40 +00:00
eugeni
985d92c189 Avoid calling validate_fname() twice for one string. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21469 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-03 16:10:23 +00:00
eugeni
9fdb13fd53 If a glyph is not found in the current font, switch to another one. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21367 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-28 22:50:02 +00:00
eugeni
a4d33dbb47 Skip glyphs with char code < 0x20. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21366 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-28 22:44:40 +00:00
eugeni
2dbaab9320 Add FT_Library to ass_font_t. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21365 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-28 22:20:24 +00:00
eugeni
27ebb01514 Use (ass_font_t, char code) instead of (FT_Face, glyph index) to identify 
glyphs in cache.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21364 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-28 22:17:33 +00:00