RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-18 21:22:38 +00:00
Code Issues Releases Wiki Activity
22,456 Commits 41 Branches 86 Tags 163 MiB
3a14d1c37a
Commit Graph

112 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
eugeni
07786c1275 Fix compilation broken in previous commit. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21338 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-27 17:53:33 +00:00
eugeni
6e9a5a842c Move ass_font_t allocation to ass_font.h. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21333 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-27 17:13:52 +00:00
eugeni
b11cd1d856 Remove obsolete "no_more_font_messages" hack. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21295 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-26 22:53:52 +00:00
eugeni
1cbd5dfd31 Move fonts-related code to a separate file. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21293 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-26 22:49:27 +00:00
eugeni
4d27dbd5c9 Make ass_new_font return ass_font_t struct (instead of just FT_Face). 
Use it to access the font face.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21283 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-26 20:53:29 +00:00
eugeni
85fb960769 Rename: 
face_desc_t -> ass_font_desc_t
face_cache_item_t -> ass_font_t
*face* -> *font*


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21281 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-26 20:34:54 +00:00
eugeni
bec3287bd4 Cosmetics: remove unneeded curly brackets. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21114 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-20 17:13:19 +00:00
eugeni
852e37033b Fix collision detection. The old method tried to avoid gaps between subtitles 
by moving the upper subtitle down. This is wrong. With this fix, a subtitle
will be moved only if it overlaps with another one.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21113 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-20 17:10:18 +00:00
kraymer
598d5be3ad MSGTRs for libass 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21082 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-19 22:35:17 +00:00
eugeni
8856d67d40 Collect all includes of mplayer headers in libass in a single file (mputils.h). 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21042 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-19 00:41:00 +00:00
eugeni
656bde87fa Support \t with acceleration. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20891 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-13 16:49:32 +00:00
eugeni
60d29dbd71 s/break/continue/. A crazy mistake, somehow unnoticed for more that 2 months. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20795 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-08 18:57:40 +00:00
eugeni
c8b995cf2f Calculate text bounding box in a way that does not depend on actual glyph 
bitmaps. Each glyph is considered to be bounded by (origin, origin + advance)
horizontally, and (max font ascender, max font descender) vertically.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20734 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-06 02:47:57 +00:00
eugeni
a5c1f03baa More precise bounding box calculation for karaoke effects. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20669 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-04 17:58:09 +00:00
eugeni
6fef7a200f Introduce MSGT_ASS, use it for all libass messages. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20645 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-03 18:15:33 +00:00
eugeni
ef5dee5d56 Revert r20517. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20519 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-29 17:29:55 +00:00
eugeni
06758d89bc Copy the following functions to libass to avoid dependency on the rest of mplayer: 
guess_buffer_cp
utf8_get_char
blur



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20517 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-29 15:03:30 +00:00
eugeni
7e9c778cf2 Fix width -> orig_width typo. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20513 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-29 13:59:36 +00:00