RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 18:12:22 +00:00
Code Issues Releases Wiki Activity
30,899 Commits 41 Branches 0 Tags 145 MiB
443a427b0e
Commit Graph

396 Commits

Author SHA1 Message Date
reimar
2b7b000b80 Add const to ass_read_stream fname argument, the string is not modified. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30740 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-25 22:51:23 +00:00
reimar
fc50523f80 Add support for loading ASS subtitles through the stream layer and thus e.g. 
from some network location.
Patch by Yuriy Kaminskiy [yumkam mail ru]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30515 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-05 17:13:47 +00:00
greg
9aea06cf7d Update internal libass copy to commit 8db4a5 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30242 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-08 18:35:44 +00:00
greg
699e0c888b Fix libass API checks 
libass API changed in 0.9.7, not 0.9.8.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30239 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-08 18:07:12 +00:00
reimar
c1d166be18 Fix compilation if FreeType is not available, in particular do not try to build 
libass and use the internal ass.h as a stub for structs needed for EOSD.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30166 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-01 18:51:59 +00:00
reimar
a3e355babf Revert renaming of process_force_style to restore compilation against 
Ubuntu's libass.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30108 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-24 10:56:25 +00:00
reimar
6023874828 Some ugly hacks to make compiling against a newer external version of libass work. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30107 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-24 10:51:24 +00:00
reimar
1414f844c5 rename process_force_style to ass_process_force_style to match the API 
as newer libass versions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30106 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-24 10:45:05 +00:00
reimar
8b6dca72c6 Fix compilation with internal ASS when no ass header is installed system-wide. 
Patch by Erik Auerswald [auerswal unix-ag.uni-kl.de]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30073 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-19 20:59:58 +00:00
reimar
bfd01bdc17 Make ass_mp.h use the system-libass headers when the internal one is disabled. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30068 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-19 15:41:47 +00:00
greg
629d7023da Fix crash when event format is not specified 
Patch by Andrew Savchenko <bircoph@gmail.com>.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29514 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-08-13 22:52:45 +00:00
eugeni
9cd56d5e40 Fix stupid, off-by-one, mistakes in assert() expressions. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29448 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-07-27 19:39:23 +00:00
eugeni
bad51c711f Make sure clip coordinates are inside the screen area. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29425 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-07-18 11:33:03 +00:00
eugeni
380fc1a763 Cosmetics: make some variables constant to signify their intended use and, 
therefore, improve code readability.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29424 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-07-18 11:33:00 +00:00
eugeni
9dc9f1a77d Fix read after the end of allocated buffer. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29423 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-07-18 11:32:58 +00:00
eugeni
ed5cac57c7 Add a missing check for a NULL return value. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29367 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-06-16 17:58:12 +00:00
diego
6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-05-13 02:58:57 +00:00
eugeni
78f362136d Don't automatically wrap lines when WrapStyle==2. 
\n and \N still work.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29219 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-21 21:27:53 +00:00
reimar
0a1f688c6e Document the ass_render_event event_images parameter. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29087 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-28 19:24:08 +00:00
reimar
bbf6e2d0a9 Initialize all structs to 0 before using them. 
This is consistent with the remaining code (which uses e.g. calloc) and makes
it easier to extend the structs in the future.
As a side effect it fixes several valgrind errors in hashmap_hash/hashmap_key_compare
caused by padding in the structures, but it is not a correct fix for that issue.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29086 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-28 19:21:34 +00:00
eugeni
bebbe6557b Cosmetics: reindent. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28977 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-16 19:26:23 +00:00
eugeni
bc1d60dcb7 Fix uninitialized memory access in ass_fontconfig. 
This fixes hangups with plaintext subtitles happening when
the first subtitle is about to be displayed.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28976 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-16 19:26:19 +00:00
greg
a0735f5859 Use ScaledBorderAndShadow: yes by default. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28935 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-11 22:55:23 +00:00
eugeni
79b9156732 Cosmetics: reindent. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28896 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-08 16:13:26 +00:00
eugeni
686d57168f Treat -font/-subfont as Fontconfig pattern in libass. 
Patch by Adrian Stutz (adrian sttz ch).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28895 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-08 16:13:21 +00:00
greg
2a70f019e9 Remove extraneous braces. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28892 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-08 15:30:40 +00:00
greg
af0797010e Don't assume width == stride for bitmap composition. 
Fixes http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1421

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28891 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-08 15:30:27 +00:00
greg
2c55cbabf9 Fix clipping for pan-and-scan. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28876 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-08 04:03:28 +00:00
greg
eb3f82bfee Add a proper color check to the overlap compositing. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28875 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-08 04:03:24 +00:00
greg
668810ab04 Replace rotation functions with a simplified version adapted from 
vsfilter.

This (mostly) fixes http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1394#c7

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28874 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-08 02:53:14 +00:00
greg
463d61c7a6 Only use first \org in a line. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28873 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-07 23:56:03 +00:00
greg
27b512e1f5 Fix \be blur start position. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28837 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-06 09:20:14 +00:00
greg
25abe9651d Raise max. number of \be applications to 100, introduce #define for it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28836 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-06 09:20:09 +00:00
greg
d303d39798 Replace magic numbers (for subpixel accuracy masking) with a define. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28835 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-06 01:26:44 +00:00
greg
d4423f7516 Use blur with kernel [[1,2,1], [2,4,2], [1,2,1]] for \be. 
This is faster than gaussian blur and similar to vsfilter.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28834 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-06 01:17:05 +00:00
greg
9bad4bdce4 Combine adjacent overlapping, translucent glyph borders and shadows to 
avoid luminance build-up, which looks ugly.

The resulting, modified bitmaps are stored in separate bitmap cache.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28824 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-05 20:47:33 +00:00
greg
8ad008e12a Fix positioned events' y-position when pan-and-scan is used. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28823 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-05 20:36:59 +00:00
greg
f9aba2b83a Support for subpixel accuracy of 3 bits for \pos and \move. 
Also, restrict advance subpixel accuracy to 3 bits to reduce cache
bloat.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28822 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-05 20:36:56 +00:00
greg
40a38da7db Style override for ScaledBorderAndShadow. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28821 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-05 20:36:52 +00:00
greg
2432bbd43d Support ScaledBorderAndShadow property. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28820 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-05 20:36:48 +00:00
greg
a2b82120c0 Scale shadow displacement and blur size like border size. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28819 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-05 20:36:44 +00:00
greg
c23a1cdfb3 Round shadow displacement to nearest int. 
Use double for shadow displacement parameter.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28818 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-05 20:36:41 +00:00
greg
a2020815ad Support a vsfilter special case: 
If PlayResX or Y is 1280/1024 respectively and the other
PlayRes attribute isn't provided, use 1280/1024 for it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28817 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-05 20:36:39 +00:00
greg
153e7ada4c Hack: half-merge glyph border with outline to avoid ugly anti-aliasing 
in certain situations.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28816 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-05 20:36:35 +00:00
greg
16731f6349 Ignore PlayResX/Y aspect ratio for font aspect ratio. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28814 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-05 20:05:56 +00:00
eugeni
20a2db7dfd Fix a memory leak. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28787 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-01 19:31:29 +00:00
eugeni
9c8a334cc5 With pan-and-scan, keep positioned events in their original positions 
relative to video.

Patch by Grigori Goronzy (greg chown ath cx).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28783 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-01 16:01:24 +00:00
eugeni
15ed6e0199 Zero-fill glyph_info_t before use. 
Patch by Grigori G (greg chown ath cx).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28754 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-27 23:06:53 +00:00
eugeni
69ce550ee0 Remove unused function argument. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28753 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-27 23:06:50 +00:00
eugeni
00d6bb12b9 Support fractional arguments for some override tags. 
Done by parsing all integers as doubles first and then converting them to the
nearest integer. Patch by Grigori G (greg chown ath cx).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28752 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-27 23:06:47 +00:00