summaryrefslogtreecommitdiffstats
path: root/libass
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r28951Uoti Urpala2009-03-149-134/+123
|\
| * Use ScaledBorderAndShadow: yes by default.greg2009-03-111-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28935 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics: reindent.eugeni2009-03-081-25/+25
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28896 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Treat -font/-subfont as Fontconfig pattern in libass.eugeni2009-03-088-13/+31
| | | | | | | | | | | | Patch by Adrian Stutz (adrian sttz ch). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28895 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove extraneous braces.greg2009-03-081-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28892 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Don't assume width == stride for bitmap composition.greg2009-03-081-6/+8
| | | | | | | | | | | | 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
| * Fix clipping for pan-and-scan.greg2009-03-081-4/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28876 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a proper color check to the overlap compositing.greg2009-03-081-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28875 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace rotation functions with a simplified version adapted fromgreg2009-03-081-79/+40
| | | | | | | | | | | | | | | | 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
| * Only use first \org in a line.greg2009-03-071-4/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28873 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28862Uoti Urpala2009-03-079-45/+282
|\|
| * Fix \be blur start position.greg2009-03-061-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28837 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Raise max. number of \be applications to 100, introduce #define for it.greg2009-03-061-2/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28836 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace magic numbers (for subpixel accuracy masking) with a define.greg2009-03-061-4/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28835 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use blur with kernel [[1,2,1], [2,4,2], [1,2,1]] for \be.greg2009-03-063-14/+34
| | | | | | | | | | | | 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
| * Combine adjacent overlapping, translucent glyph borders and shadows togreg2009-03-053-1/+177
| | | | | | | | | | | | | | | | 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
| * Fix positioned events' y-position when pan-and-scan is used.greg2009-03-051-2/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28823 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support for subpixel accuracy of 3 bits for \pos and \move.greg2009-03-051-15/+20
| | | | | | | | | | | | | | 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
| * Style override for ScaledBorderAndShadow.greg2009-03-051-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28821 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support ScaledBorderAndShadow property.greg2009-03-055-1/+19
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28820 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Scale shadow displacement and blur size like border size.greg2009-03-051-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28819 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Round shadow displacement to nearest int.greg2009-03-051-4/+5
| | | | | | | | | | | | Use double for shadow displacement parameter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28818 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support a vsfilter special case:greg2009-03-051-1/+7
| | | | | | | | | | | | | | 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
| * Hack: half-merge glyph border with outline to avoid ugly anti-aliasinggreg2009-03-051-1/+1
| | | | | | | | | | | | in certain situations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28816 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Ignore PlayResX/Y aspect ratio for font aspect ratio.greg2009-03-051-4/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28814 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix a memory leak.eugeni2009-03-011-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28787 b3059339-0415-0410-9bf9-f77b7e298cf2
| * With pan-and-scan, keep positioned events in their original positionseugeni2009-03-011-1/+5
| | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r28755Uoti Urpala2009-02-284-54/+70
|\|
| * Zero-fill glyph_info_t before use.eugeni2009-02-271-1/+1
| | | | | | | | | | | | Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28754 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused function argument.eugeni2009-02-273-44/+44
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28753 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support fractional arguments for some override tags.eugeni2009-02-273-22/+40
| | | | | | | | | | | | | | 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
| * Fix two gcc warnings.eugeni2009-02-271-2/+2
| | | | | | | | | | | | Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28751 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix memory leak produced by the \blur patch.eugeni2009-02-271-2/+2
| | | | | | | | | | | | Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28750 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Stronger blur.eugeni2009-02-271-0/+1
| | | | | | | | | | | | Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28749 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allow shadow without border.eugeni2009-02-271-6/+3
| | | | | | | | | | | | Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28748 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28537Uoti Urpala2009-02-124-24/+107
|\|
| * In case of several \move or \pos in one line, prefer the first one.eugeni2009-02-071-8/+12
| | | | | | | | | | | | Patch by Grigori G, greg at chown ath cx. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28473 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add stubs for a few unimplemented tags.eugeni2009-02-071-1/+39
| | | | | | | | | | | | Patch by Grigori G, greg at chown ath cx. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28472 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allow \be with arguments other than 0 or 1. Implement \blur.eugeni2009-02-074-20/+63
| | | | | | | | | | | | Patch by Grigori G, greg at chown ath cx. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28471 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28403Uoti Urpala2009-01-311-2/+2
|\|
| * increase max glyph and lines limitcompn2009-01-291-2/+2
| | | | | | | | | | | | | | | | patch by Scaevolus on irc fixes http://samples.mplayerhq.hu/Matroska/subtitles/090128_gszs02.mkv git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28386 b3059339-0415-0410-9bf9-f77b7e298cf2
* | libass: If a bad subtitle has multiple \pos use firstUoti Urpala2008-12-221-4/+9
| | | | | | | | | | | | | | | | Having multiple \pos makes no sense, but such files exist. Apparently VSFilter uses the values from the first \pos in this case whereas libass used the last one. Change the behavior to make it compatible with VSfilter since this has the highest chance of matching what the creators of the file intended.
* | libass: Fix cache lookup problem causing memory bloatUoti Urpala2008-12-223-31/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cache code did hash lookups by storing key values in struct fields and then hashing and comparing the struct as a single memory block. In at least one case such a struct contained uninitialized padding bytes which prevented the complete memory area of the struct from matching even though the fields did. As a result the code failed to find existing objects in the cache and stored new versions of them, causing gigabytes of memory use in some circumstances. Initializing the struct memory to zero before writing the fields avoided such memory use in tests but is not guaranteed to work if I interpret the C standard correctly (the compiler is allowed to write garbage over padding bytes when changing struct member values). Change the code to use struct-specific hashing and comparison functions that work field by field to guarantee correct behavior. Create these by replacing the struct definition with a template that lists the fields and can be used the generate each of struct definition, hash function and compare function with some preprocessor magic (otherwise every field would need to be listed separately in all three).
* | Merge svn changes up to r28087Uoti Urpala2008-12-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
| * Get rid of pointless 'extern' keywords.diego2008-12-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27899Uoti Urpala2008-11-061-11/+9
|\|
| * Consistently use NULL for pointers instead of 0.reimar2008-11-021-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27876 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fallback to non-fontconfig behaviour when fontconfig initialization fails.reimar2008-11-021-5/+3
| | | | | | | | | | | | | | Also fixes a memleak in that case, bug #1313. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27875 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27573Uoti Urpala2008-09-102-6/+26
|\| | | | | | | | | Conflicts: libmpcodecs/vd_ffmpeg.c
| * libass: fix type mismatch between size parameter and the way it's usedaurel2008-09-052-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27531 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libass: add a new ass_process_data() to process demuxed subtitle packetsaurel2008-09-052-4/+24
| | | | | | | | | | | | | | conforming to the ASS spec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27530 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27458Uoti Urpala2008-08-121-1/+12
|\|
| * Don't print drawing commands on screen.eugeni2008-08-081-1/+12
| | | | | | | | | | | | | | Drawing mode is not implemented in libass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27442 b3059339-0415-0410-9bf9-f77b7e298cf2
| * If (has outline) blur(outline) else blur(glyph).eugeni2008-08-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | If there is an outline, the glyph itself should not be blurred. Keeps the border between glyph and outline clear (unblurred), which is probably how it should be. Patch by Diogo Franco (diogomfranco gmail com). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27441 b3059339-0415-0410-9bf9-f77b7e298cf2
| * \org turns off collision detection.eugeni2008-08-071-0/+1
| | | | | | | | | | | | | | Patch by Diogo Franco (diogomfranco gmail com). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27440 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Treat \h as space character.eugeni2008-08-071-1/+1
| | | | | | | | | | | | | | Patch by Robert Rudd (robrudd at users sourceforge net). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27439 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Calculate subtitle origin in floating point.eugeni2008-08-071-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27438 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Calculate subtitle position in floating point.eugeni2008-08-071-7/+7
| | | | | | | | | | | | | | | | Improves subtitle position precision from a unit of script coordinates to a screen pixel. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27437 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Make various functions staticUoti Urpala2008-08-121-3/+3
| |
* | Merge svn changes up to r27441Uoti Urpala2008-08-087-25/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |