summaryrefslogtreecommitdiffstats
path: root/libass
Commit message (Collapse)AuthorAgeFilesLines
* Introduce MSGT_ASS, use it for all libass messages.eugeni2006-11-037-91/+91
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20645 b3059339-0415-0410-9bf9-f77b7e298cf2
* Implement loading subtitles from memory.eugeni2006-11-032-24/+102
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20619 b3059339-0415-0410-9bf9-f77b7e298cf2
* Bugfix: sub_recode could deallocate global sub_cp under some circumstances.eugeni2006-11-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20618 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert r20517.eugeni2006-10-295-201/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20519 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move ass_library initialization code to ass_mp.c.eugeni2006-10-292-0/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20518 b3059339-0415-0410-9bf9-f77b7e298cf2
* Copy the following functions to libass to avoid dependency on the rest of ↵eugeni2006-10-295-11/+201
| | | | | | | | | | | | mplayer: guess_buffer_cp utf8_get_char blur git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20517 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix width -> orig_width typo.eugeni2006-10-291-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20513 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't set PlayResX for plaintext subtitles.eugeni2006-10-291-1/+0
| | | | | | | This way font proportions will not depend on frame aspect. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20512 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add \N at the end of each subtitle line when converting from subdata.eugeni2006-10-291-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20511 b3059339-0415-0410-9bf9-f77b7e298cf2
* Libass interface reworked:eugeni2006-10-289-89/+228
| | | | | | | | | - ass_instance_t renamed to ass_renderer_t - ass_library_t introduced - use of mplayer-specific global variables limited to ass_mp.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20493 b3059339-0415-0410-9bf9-f77b7e298cf2
* If HAVE_FONTCONFIG is not defined, font_fontconfig might be declared bothreimar2006-10-281-5/+4
| | | | | | | extern and static, causing compilation to fail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20485 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing fontconfig_done() call.eugeni2006-10-271-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20467 b3059339-0415-0410-9bf9-f77b7e298cf2
* Split ass_configure() into several smaller functions.eugeni2006-10-264-65/+119
| | | | | | | FontConfig initialization moved from ass_init() to ass_set_fonts(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20462 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't forget to apply scaling coefficients to kerning values.eugeni2006-10-201-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20326 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix center of rotation calculation. It was overly complex andeugeni2006-10-191-9/+3
| | | | | | | incorrect for right- and center-aligned text. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20308 b3059339-0415-0410-9bf9-f77b7e298cf2
* Center of rotation depends on alignment.eugeni2006-10-181-2/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20302 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support separate rotation angle for each glyph.eugeni2006-10-181-10/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20301 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move base point calculation to a separate function. Will be reused soon.eugeni2006-10-181-26/+41
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20300 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: remove commented code.eugeni2006-10-181-5/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20299 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix a typo in collision detection code.eugeni2006-10-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20297 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove an outdated debug message.eugeni2006-10-161-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20275 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix crash because of last_glyph < first_glyph, probably caused by first linereimar2006-10-151-1/+1
| | | | | | | only consisting of '\n' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20232 b3059339-0415-0410-9bf9-f77b7e298cf2
* Zerofill libass static variables during initialization.eugeni2006-10-141-0/+4
| | | | | | | Patch by Jindrich Makovicka <makovick a gmail d com>. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20208 b3059339-0415-0410-9bf9-f77b7e298cf2
* Free FT_Stroker during libass deinitialization.eugeni2006-10-141-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20207 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reduce margins for plaintext subtitles.eugeni2006-10-091-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20144 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid crash with fontconfig 2.3.9x (as shipped with SuSE 10.1, FcDirScan is ↵reimar2006-10-081-1/+5
| | | | | | | | | broken) and warn that these are beta versions and not supported. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20111 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add copyright notice and vim/emacs comments to libass and vf_ass.c.eugeni2006-10-0114-0/+280
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20014 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: add some comments.eugeni2006-09-242-0/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19972 b3059339-0415-0410-9bf9-f77b7e298cf2
* Shadow support in libass.eugeni2006-09-245-14/+63
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19971 b3059339-0415-0410-9bf9-f77b7e298cf2
* Free memory in ass_synth_done().eugeni2006-09-241-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19968 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reduce size of non-blurred bitmaps.eugeni2006-09-231-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19962 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics. Change indentation of block of code to make it consistent witheugeni2006-09-231-39/+39
| | | | | | | the rest of the file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19961 b3059339-0415-0410-9bf9-f77b7e298cf2
* Better fix_outline implementation. No more "fix_outline failed" messages,eugeni2006-09-231-12/+15
| | | | | | | should work even with the craziest glyphs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19947 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix width -> orig_width typo causing subtitles to be too far to the rightreimar2006-09-221-1/+1
| | | | | | | for movies with vertical black bars (aspect < monitoraspect). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19946 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move calculation of text parameters (number of lines, height, etc.) fromeugeni2006-09-221-21/+36
| | | | | | | | | | wrap_lines_smart() into a separate function. Call it for every event, even those that do not require line wrapping. This fixes randomly wrong positioning of 'Banner' events. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19938 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move variable declaration to a more deeply nested block. It is not used ↵eugeni2006-09-221-1/+2
| | | | | | outside of it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19937 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: fix indentation after last commit.eugeni2006-09-211-18/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19925 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix FT_Stroker use in libass. The previous variant ended up with 0-widtheugeni2006-09-211-28/+18
| | | | | | | outline in some cases. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19924 b3059339-0415-0410-9bf9-f77b7e298cf2
* In r19831, font size multiplier was mistakenly applied to border width.eugeni2006-09-211-1/+3
| | | | | | | Fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19923 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sort events by ReadOrder (if both layer and start time are equal).eugeni2006-09-191-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19912 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set ReadOrder values for external subtitles.eugeni2006-09-191-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19911 b3059339-0415-0410-9bf9-f77b7e298cf2
* Calculate text bounding box in such way that it does not depend on the heighteugeni2006-09-191-0/+2
| | | | | | | of individual glyphs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19910 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: fix indentation after last commit.eugeni2006-09-191-23/+23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19908 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't call FcDirScan/FcDirSave with FontConfig >= 2.4.eugeni2006-09-191-1/+4
| | | | | | | Font cache is updated automatically in FcConfigAppFontAddDir. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19907 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix a stupid bug in list concatenation.eugeni2006-09-181-18/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19897 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reduce code duplication in init_render_context().eugeni2006-09-172-83/+93
| | | | | | | Don't use glyph stroker for borderless glyphs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19879 b3059339-0415-0410-9bf9-f77b7e298cf2
* Subtract glyph bitmap from outline bitmap.eugeni2006-09-161-0/+22
| | | | | | | It greatly improves display of glyphs with semitransparent primary color. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19862 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add \be (blur edges) support to libass.eugeni2006-09-165-7/+128
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19854 b3059339-0415-0410-9bf9-f77b7e298cf2
* Store bitmap glyphs in a separate struct, instead of FreeType's internal buffer.eugeni2006-09-166-65/+156
| | | | | | | This is required for various bitmap modifications (like blur, outline and shadow). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19852 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make font outline width proportional to movie resolution.eugeni2006-09-131-4/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19831 b3059339-0415-0410-9bf9-f77b7e298cf2
* Bugfix: timing for empty karaoke words was lost, resultingeugeni2006-09-061-5/+21
| | | | | | | in faster than normal karaoke playback. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19722 b3059339-0415-0410-9bf9-f77b7e298cf2
* Workaround for broken fonts with bad ascender/descender.eugeni2006-09-051-7/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19699 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change \fad behaviour so that it does not get cancelled by \r.eugeni2006-09-051-9/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19698 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplification.eugeni2006-09-051-44/+34
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19697 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add vertical clipping for subtitles that were moved because of a collision.eugeni2006-09-041-0/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19670 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix possible unallocated memory read in libass line wrapping code.eugeni2006-09-041-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19669 b3059339-0415-0410-9bf9-f77b7e298cf2
* Apply -ass-force-style also to matroska plaintext subs.eugeni2006-09-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19660 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: restore indentation after recent changes.eugeni2006-09-031-49/+49
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19659 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add -ass-styles option. It allows to load styles from a file and use themeugeni2006-09-034-14/+61
| | | | | | | for plain text subtitles rendering. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19658 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix last commit.eugeni2006-09-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19657 b3059339-0415-0410-9bf9-f77b7e298cf2
* More checks in ass_render_event.eugeni2006-09-031-7/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19656 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unneeded variable.eugeni2006-09-031-4/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19655 b3059339-0415-0410-9bf9-f77b7e298cf2
* ass-color and ass-border-color options.eugeni2006-09-032-3/+14
| | | | | | | Only plain text subtitles are affected. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19652 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for rendering matroska plaintext subtitles with libass.eugeni2006-09-022-27/+78
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19649 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't sort events when reading external subs. With r19644, the order does ↵eugeni2006-09-021-19/+0
| | | | | | not matter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19645 b3059339-0415-0410-9bf9-f77b7e298cf2
* Better collision detection algorithm. The idea is to keep a subtitle in placeeugeni2006-09-024-93/+269
| | | | | | | | when a lower placed one disappears, thus improving readability. As a side effect, layers are supported now. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19644 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some unused code.eugeni2006-09-021-5/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19642 b3059339-0415-0410-9bf9-f77b7e298cf2
* Read layer info from external subs.eugeni2006-09-021-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19641 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make \fr* parameter a floating point value.eugeni2006-09-011-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19628 b3059339-0415-0410-9bf9-f77b7e298cf2
* Bugfix: potential write of unallocated memory.eugeni2006-08-311-3/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19618 b3059339-0415-0410-9bf9-f77b7e298cf2
* Bugfix: wrong height value used in font size calculation.eugeni2006-08-311-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19616 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change default font family and color for plain text subs.eugeni2006-08-291-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19598 b3059339-0415-0410-9bf9-f77b7e298cf2
* Bugfix: strdup of NULL value.eugeni2006-08-291-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19594 b3059339-0415-0410-9bf9-f77b7e298cf2
* Apply -ass-force-style also to tracks generated from subdata.eugeni2006-08-292-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19590 b3059339-0415-0410-9bf9-f77b7e298cf2
* Ignore '*' at the beginning of style name.eugeni2006-08-281-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19573 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix font scaling taking margins into account.eugeni2006-08-281-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19572 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add -(no)ass-use-margins option.eugeni2006-08-282-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19569 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: fix indentation after r19562.eugeni2006-08-271-29/+29
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19563 b3059339-0415-0410-9bf9-f77b7e298cf2
* Transition effects support.eugeni2006-08-271-22/+113
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19562 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify ass_glyph_cache_reset().eugeni2006-08-261