commit b625c5a90cb8076612c0b1c8032db8629809b92e Author: Grigori Goronzy Date: Thu Jul 16 22:44:12 2009 +0200 Tweak font metrics to match Windows GDI Try to change ascender/descender calculation to be more compatible with Windows GDI and consequently, VSFilter. libass/ass_font.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit 4ebb07452a0d5026dc9b21c95d76ab757ae41c48 Author: Grigori Goronzy Date: Thu Jul 16 20:57:39 2009 +0200 Clear free list on renderer uninit The vector clip support introduced a free list that gets freed on every new frame. Factor out the code for freeing it into a separate function and make sure it is called when uniniting the ass_renderer. libass/ass_render.c | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) commit ed8ecf731cc77292e613b7cfe13fa64068040c97 Author: Grigori Goronzy Date: Thu Jul 16 02:17:06 2009 +0200 Implement vector clips Make it possible to use drawings for clipping with \clip and \iclip. parse_tag was extended to parse drawings in \clip or \iclip tags in case parsing them as rectangular clips fails. These clip drawings are later rasterized and used for blending bitmaps, just after bitmaps are assembled into a list in render_text. Currently, the cache is not utilized for storing the parsed drawings or blended bitmaps. libass/ass_drawing.c | 19 +++-- libass/ass_drawing.h | 2 +- libass/ass_render.c | 226 ++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 224 insertions(+), 23 deletions(-) commit 94d41042a9006375eecf5332e9a59657a0c8a492 Author: Grigori Goronzy Date: Mon Jul 13 22:21:51 2009 +0200 Rework build system * Remove checks for functions or headers that are part of ANSI C or C89. * Make enca optional. * Conditionally compile the test program depending on libpng availability. Makefile.am | 7 ++++++- configure.ac | 45 ++++++++++++++++++++------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) commit 81070577a7bf81231ca79ce4efebc7235a9b605f Author: Grigori Goronzy Date: Sun Jul 12 23:03:46 2009 +0200 Output messages to stderr by default Modify the default message handler to output to stderr instead of stdout. libass/ass_library.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 8d6e8231f4a33cb98a4927d8dc80bc9698cf36f2 Author: Grigori Goronzy Date: Sun Jul 12 22:58:23 2009 +0200 Proper support for empty lines Calculate the line height of empty lines the VSFilter way in measure_text; curiously, VSFilter sets the height of an empty line to half the height of the line before. Remove the hack that created empty lines by inserting spaces--it was wrong anyway. libass/ass_render.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) commit 71fc0fbbf34110050bda200d25eb230b8b044324 Author: Grigori Goronzy Date: Sun Jul 12 08:01:23 2009 +0200 Allow passing user data to callback It is often useful or necessary to pass custom data to a callback. Add an argument to the callback registering function to pass a void pointer object to the callback each time it is called. libass/ass.h | 3 ++- libass/ass_library.c | 12 +++++++++--- libass/ass_library.h | 3 ++- libass/ass_utils.c | 2 +- test/test.c | 4 ++-- 5 files changed, 16 insertions(+), 8 deletions(-) commit d3cd5b0148d64ae0f6e288e69b09acfe639fdcce Author: Grigori Goronzy Date: Sun Jul 12 07:21:52 2009 +0200 Merge glyph and outline bitmap better Use a different threshold for merging the outline and glyph and also adjust the merge amount. This fails to give complete transparency (and thus will yield slightly darker looking glyphs, usually), but avoids very ugly looking artefacts at the edge between border and glyph that were still prevalent. libass/ass_bitmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 1baeba8197174a0b23bb6344c4175df336568d55 Author: Grigori Goronzy Date: Sun Jul 12 06:56:48 2009 +0200 Redo border calculations for \be and \blur The last commit related to this overdid it a bit -- in some cases, with \be5, for example, edges were visible on the outlines. Instead of using a linear function to map \be applications to border enlargement value, use a nonlinear function, a simple square root. This seems to work a lot better, while keeping the enlargement small. In addition, make it possible to use \be and \blur at the same time. \be is applied first. libass/ass_bitmap.c | 53 ++++++++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 25 deletions(-) commit d5b7cb636ccf447543cf2beb4b2d593fa4890570 Author: Grigori Goronzy Date: Sun Jul 12 05:42:57 2009 +0200 Check whether renderer and track use the same library instance Add a sanity check to ass_start_frame that checks whether the track that is currently rendered from and the ass_renderer use the same library instance. libass/ass_render.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit d1f0a66587b60cc9bacef21e38f8df14d1b626cb Author: Grigori Goronzy Date: Sat Jul 11 15:12:20 2009 +0200 Updates for autotools' make dist Rename ass_cache_template.c to ass_cache_template.h; add libass.sym to EXTRA_DIST. libass/Makefile.am | 3 +- libass/ass_cache.c | 4 +- libass/ass_cache.h | 2 +- libass/ass_cache_template.c | 118 ------------------------------------------- libass/ass_cache_template.h | 118 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 123 insertions(+), 122 deletions(-) commit 34923cb1813b9a1ffffa1799c5fda1803dbfb996 Author: Grigori Goronzy Date: Sat Jul 11 15:08:52 2009 +0200 Initial changelog update for 0.9.7 Update changelog and version number in configure.ac. Changelog | 18 ++++++++++++++++++ configure.ac | 2 +- 2 files changed, 19 insertions(+), 1 deletions(-) commit ce26c316751e7dbe844d5069731da9de32507ea3 Author: Grigori Goronzy Date: Sat Jul 11 03:50:41 2009 +0200 autoconf: disable Fortran/C++ checks For some reason, libtool wants to check for Fortran and C++ compilers, which takes some time. Disable these checks to speed up ./configure runs. configure.ac | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit cdb60002be244cea09d1efb94db6367a09f95859 Author: Grigori Goronzy Date: Sat Jul 11 03:37:59 2009 +0200 Add AM_PROG_CC_C_O to configure.ac This basically silences a automake error/warning. configure.ac | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 9938df3a44d71ec214a70200749a99cfc33dd814 Author: Grigori Goronzy Date: Sat Jul 11 02:57:17 2009 +0200 Convert test program to plain C The test program unnecessarily was using a few C++ features. Convert it to plain C to make everything work without a C++ compiler. configure.ac | 1 - test/Makefile.am | 2 +- test/test.c | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ test/test.cpp | 172 --------------------------------------------------- 4 files changed, 182 insertions(+), 174 deletions(-) commit cd0bf3db35a4fa0e7f5ac52453755f7f1f2d444f Author: Grigori Goronzy Date: Sat Jul 11 02:38:21 2009 +0200 configure: use pkg-config for libpng, enca Use pkg-config to check for enca and libpng, like it is already done for freetype and fontconfig. Also, use libass/ass.c instead of the test program, test/test.cpp, as the unique source identification. configure.ac | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) commit 2c412cdab94a7bb27c5a1e04ab902295215de888 Author: Grigori Goronzy Date: Sat Jul 11 02:18:51 2009 +0200 Message callback funtionality Introduce functionality for providing a message callback that is used for passing messages to the controlling application instead of simply printing them to standard output. The function pointer to the callback is stored in the ass_library_t instance. ass_msg needs access to it, so in many places the library instance needs to be passed around now. The default behavior is the old one: messages of MSGL_INFO or lower are printed to the standard output, prefixed with "[ass]". libass/ass.c | 119 ++++++++++++++++++++++++++--------------------- libass/ass.h | 4 ++ libass/ass_bitmap.c | 19 ++++---- libass/ass_bitmap.h | 10 ++-- libass/ass_cache.c | 35 +++++++++----- libass/ass_cache.h | 12 +++-- libass/ass_drawing.c | 6 ++- libass/ass_drawing.h | 1 + libass/ass_font.c | 32 ++++++++----- libass/ass_fontconfig.c | 75 +++++++++++++++-------------- libass/ass_fontconfig.h | 7 ++- libass/ass_library.c | 28 +++++++++++- libass/ass_library.h | 3 + libass/ass_render.c | 112 ++++++++++++++++++++++++-------------------- libass/ass_utils.c | 31 ++++++------ libass/ass_utils.h | 13 ++++-- libass/libass.sym | 1 + test/test.cpp | 11 ++++ 18 files changed, 308 insertions(+), 211 deletions(-) commit 613a22ab9b96453c10de6d75b43067652ad6d7db Author: Grigori Goronzy Date: Fri Jul 10 23:55:02 2009 +0200 Replace string defines with real strings Instead of referencing string defines from help_mp.h, use the strings directly in ass_msg. Consequently, help_mp.h is useless and can be deleted. libass/Makefile.am | 2 +- libass/ass.c | 75 +++++++++++++++++++++---------------------- libass/ass_bitmap.c | 6 ++-- libass/ass_cache.c | 3 +- libass/ass_drawing.c | 3 ++ libass/ass_font.c | 25 +++++++------- libass/ass_fontconfig.c | 67 ++++++++++++++++++-------------------- libass/ass_render.c | 81 ++++++++++++++++++++++------------------------ libass/ass_utils.c | 3 +- libass/ass_utils.h | 2 - libass/help_mp.h | 55 -------------------------------- 11 files changed, 131 insertions(+), 191 deletions(-) commit 9305f3815442f8c0bd735e96832b7f72628bfcad Author: Grigori Goronzy Date: Fri Jul 10 23:00:10 2009 +0200 Move gaussian blur into bitmap handling code libass/ass_bitmap.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++ libass/ass_utils.c | 119 -------------------------------------------------- libass/ass_utils.h | 3 - 3 files changed, 121 insertions(+), 122 deletions(-) commit ba770fa05426c04d5a1900b37fc7bcc700584720 Author: Grigori Goronzy Date: Fri Jul 10 19:31:07 2009 +0200 Slight optimizations for \be, \blur Enlarge bitmap glyphs less for \be, this is especially effective for lots of \be applications. Also make sure that the gaussian blur buffers are only updated if gaussian blur is actually used for a particular glyph. libass/ass_bitmap.c | 8 ++++---- libass/ass_render.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) commit 15df379c97159dbbc8d876a769edac0f8efecd75 Author: Grigori Goronzy Date: Wed Jul 8 14:43:58 2009 +0200 Use better method for stroking with \xbord, \ybord Instead of stroking in two passes using the regular stroker use the outline emboldener in case different x and y stroke widths are requested. The regular outline stroker draws circular arcs, adding points to the outline. The number of points can vary according to the width of the stroker. This makes it impossible to reliably stroke in two passes with it. The outline emboldener does not produce outlines looking as nice as the stroker outlines, but it never adds points to the outline, making it suitable for two-pass emboldening with different x and y width. libass/ass_render.c | 148 +++++++++++++++++++++----------------------------- 1 files changed, 62 insertions(+), 86 deletions(-) commit 55e9f91ec4868e8cd9098b367a0d935d703290d4 Author: Grigori Goronzy Date: Wed Jul 8 00:25:05 2009 +0200 Correctly round doubles to integers mystrtoi and mystrtoll did not round correctly for negative numbers, this was fixed. libass/ass_utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 6302f307524b430992bd7d71036f7b46c702f678 Author: Grigori Goronzy Date: Wed Jul 8 00:07:52 2009 +0200 Turn down subpixel accuracy to 1/8th pixel Using the full accuracy range of 1/64th pixel seems unnecessary--1/8th pixel is "good enough". Mask out the three lowest bits to lower cache and CPU usage; a short test shows that this almost halves the amount of glyphs with different subpixel shifts being generated and cached. libass/ass_render.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit f54a0cf94853d8372225bb0b45d6bd2b8e4e6fde Author: Grigori Goronzy Date: Tue Jul 7 20:25:55 2009 +0200 Support for underline and strikethrough Add support for the underline (\u) and strikethrough/strikeout (\s) properties. This is a bit tricky, since FreeType doesn't offer any method of adding the lines, so you have to draw them yourself. libass uses various information from TrueType tables to get position and size of the lines, does a few simple consistency checks (some fonts might be broken) and if everything is alright, adds new contours for the lines. Sometimes, rendering errors can occur: - Currently, kerning isn't taken into account, which means the lines can overlap a little, leading to small optical glitches. - Some (broken) fonts use the wrong winding direction. In this case, the FreeType stroker will only consider the added lines to be "outside" and only stroke the line instead of the whole glyph. libass/ass_cache_template.c | 1 + libass/ass_drawing.c | 2 +- libass/ass_font.c | 86 ++++++++++++++++++++++++++++++++++++++++++- libass/ass_font.h | 8 ++- libass/ass_render.c | 20 +++++++++- 5 files changed, 111 insertions(+), 6 deletions(-) commit 5a2b270b218a429763f0a032386705f55bca0a92 Author: Grigori Goronzy Date: Thu Jul 2 16:43:24 2009 +0200 Test program: check track initialization Stop in case the track initialization fails. This fixes a crash. test/test.cpp | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit bffeb000dc2b561733fb92fdf868e472a07ea258 Author: Grigori Goronzy Date: Thu Jul 2 16:37:52 2009 +0200 Fix crash when event format spec is missing libass didn't properly initialize its idea about the event format specification (the Format: line in the [Events] section) in case none was explicitly specified. This ends in a crash due to access to a null pointer. It was changed so that the event format is initialized to a reasonable default, the way it is also done for embedded subtitles. libass/ass.c | 35 ++++++++++++++++++++++------------- 1 files changed, 22 insertions(+), 13 deletions(-) commit 323e6cefb6e2c7dfd82ef397fffe395f7b3e49ef Author: Grigori Goronzy Date: Mon Jul 6 04:13:24 2009 +0200 Implement drawing mode (\p) Finally implement the drawing mode, which allows drawing of custom vector graphics. Drawings are intercepted in ass_render_event; a hash of the drawing string is generated which is then used for looking up drawings and bitmaps of drawings in the cache. The drawings itself are "fake" glyphs. They are created by parsing the simple drawing description language, evaluating the curves described (lines, cubic beziers and/or a special kind of b-splines) and creating vector outlines. Afterwards, these drawings are (with a few exceptions, e.g. ascender/descender) exactly handled like regular glyphs. Support for vector clippings is still missing, but otherwise the implementation should be complete and compatible with VSFilter. The libass integration of the drawing parsing/processing code is still a bit sketchy and should be refactored. History: WIP: Drawing mode infrastructure WIP: Drawing tokenizer WIP: Parse drawing tokens, call evaluators WIP: Bezier/b-spline evaluator WIP: Final pieces for the drawing mode WIP: Heavy modifications to the drawing parser/tokenizer WIP: Dynamic outline memory allocation WIP: Drawing position fixes WIP: more drawing position fixup (similar to VSFilter now) WIP: Lots of cleanup and fixes for drawings. WIP: Drawing mode integration into ass_render_event libass/Makefile.am | 3 +- libass/ass_cache.c | 27 --- libass/ass_cache.h | 1 + libass/ass_cache_template.c | 2 + libass/ass_drawing.c | 477 +++++++++++++++++++++++++++++++++++++++++++ libass/ass_drawing.h | 76 +++++++ libass/ass_render.c | 150 ++++++++++---- libass/ass_utils.h | 26 +++ 8 files changed, 694 insertions(+), 68 deletions(-) commit cbf59032a582b37e50490e3eea0cf3cf8532c418 Author: Grigori Goronzy Date: Wed Jul 1 16:22:27 2009 +0200 Remove read_file_recode from API read_file_recode is only used internally in ass_read_file and shouldn't be exposed in the API. Remove the prototype from ass.h and declare it static. libass/ass.c | 2 +- libass/ass.h | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) commit 032868aeaaa7616a6a6c71e4db20928ccb41f407 Author: Grigori Goronzy Date: Wed Jul 1 12:31:52 2009 +0200 Scale letter spacing with font scale libass/ass_render.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 49042cf5c3bac06c900a267a81bbbc4eb6f6b560 Author: Grigori Goronzy Date: Wed Jul 1 00:49:28 2009 +0200 Scale rotation constants with font scale Rotations use a "magic" constant of, by default, 20000. This number is more or less taken from VSFilter; I'm not even really sure what is (viewing distance, maybe), but scaling it according to font_scale solves problems with distortions of rotations in case the rendering resolution differs from the video resolution. libass/ass_render.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) commit e035b236cf3ddf49880fc6f60555ea89bb8744e6 Author: Grigori Goronzy Date: Wed Jul 1 00:16:20 2009 +0200 Assume pixel ratio equals aspect ratio In ass_set_frame_size pixel_ratio will be set alongside aspect ratio to the same value. This makes it possible to use libass without explicitely specifying an aspect ratio. libass/ass_render.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commit 4f8cbf58fca94d035bbda5cc9abdd12046b2ace6 Author: Grigori Goronzy Date: Tue Jun 30 13:39:14 2009 +0200 Support for \iclip (inverse clipping) Inverse clipping means to display everything outside the clipping rectangle. It is implemented by splitting up a bitmap into up to 4 parts, as needed by the clipping rectangle. Afterwards, the bitmap is clipped against the screen boundaries as usual. Finally, each bitmap is split up into left and right and colored different, in case \kf karaoke is in effect. libass/ass_render.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 127 insertions(+), 2 deletions(-) commit 1023e87ea247c893c0483c508dd6c59e3680b2d7 Author: Grigori Goronzy Date: Tue Jun 30 13:10:03 2009 +0200 Fix karaoke (\kf) timing The timing for the \kf karaoke which gradually fills the character from left to right, uses clipping and isn't aware of subpixel accuracy. This is simply fixed by casting these value to int. libass/ass_render.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 41bc5c4b00b2d975558d204a072a4d72f98a681b Author: Grigori Goronzy Date: Mon Jun 29 18:57:18 2009 +0200 Move subpixel shift out of transform_3d Instead of adding the subpixel shift to the glyph in transform_3d, do it directly in get_bitmap_glyph. This saves a few cycles for glyphs that are not transformed (rotated or sheared). libass/ass_render.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) commit 392c9b86ce5f931d313062b00a6a63166441d1d3 Author: Grigori Goronzy Date: Mon Jun 29 17:22:52 2009 +0200 API: make process_force_style available Rename process_force_style to ass_process_force_style and make it available in the DSO. libass/ass.c | 6 +++--- libass/ass.h | 2 ++ libass/libass.sym | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) commit 72f9a46303f853ffe7dc173bd2378bbf0d79032f Author: Grigori Goronzy Date: Mon Jun 29 17:05:44 2009 +0200 PAR correction for rendering at non-video resolution The most prominent ASS/SSA renderer (VSFilter) conveniently ignores the real aspect ratio, and everyone seems to rely on that. This is fine when the subtitles are rendered before anamorphic video is stretched to its native aspect ratio, but results in wrongly stretched text with native renderers (EOSD). It can be fixed by making libass aware of the pixel ratio of the video. ass_set_aspect_ratio now requires an extra argument that specifies the pixel ratio, which is just width / height of the video after decoding. Glyphs are stretched in x direction before transformation (rotation, shearing), so there are still issues with transformed glyphs to be fixed. libass/ass.h | 2 +- libass/ass_render.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) commit cddd9ad1c3a27d1f055a1aa91004feff27ab8f1a Author: Grigori Goronzy Date: Mon Jun 29 14:16:46 2009 +0200 Restrict symbols exported in the DSO Only export those symbols into the shared object which are defined in the API (ass.h). A file libass.sym which contains a list of symbols was added and libtool configured to use it. libass/Makefile.am | 1 + libass/libass.sym | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) commit 00983363e4356fd4bd0da3659f37707b31fc6597 Author: Grigori Goronzy Date: Mon Jun 29 05:19:40 2009 +0200 Fix two-pass stroking for \xbord, \ybord The two-pass stroker blindly assumed that the number of points of the stroked glyph is the same, no matter the size of the stroker. Unfortunately, this is not the case every time. In such cases, the coordinates will only be replaced up to mininum of points of both glyphs. It's incredibly hacky, but seems to work well (and look good). libass/ass_render.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit 1f176b7645318ec5d3f0e2dee81986b14eb8f1c2 Author: Grigori Goronzy Date: Mon Jun 29 04:17:24 2009 +0200 Handle conflicting \t time intervals If end <= start for a time interval specification, set end to the end of the event. VSFilter handles it like that, too. libass/ass_render.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 4aec4ab7b705535859d91fe0df562ec9679a7d40 Author: Grigori Goronzy Date: Mon Jun 29 02:46:45 2009 +0200 shift_bitmap: do not rely on compiler optimizations Do not rely on the compiler for optimizing a division into a shift. libass/ass_bitmap.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit e8433c6ff67409c55ff005fa3d7a28e52d8ec21b Author: Grigori Goronzy Date: Mon Jun 29 02:10:02 2009 +0200 Subpixel accurate shadow rendering Shadows are handled different from glyph and outline. A shadow is the sum of glyph and outline bitmap; therefore shifting to the correct subpixel amount before rasterization is out of the question. Instead, the bitmap is shifted by its subpixel amount after being built from shadow and glyph. The bitmap cache was extended for this. libass/ass_bitmap.c | 57 ++++++++++++++++++++++++++++++++++++++++++- libass/ass_bitmap.h | 2 +- libass/ass_cache_template.c | 1 + libass/ass_render.c | 18 ++++++++++--- 4 files changed, 72 insertions(+), 6 deletions(-) commit a75f6a8d3d3ed6410cc2a4efa866a99152d78af6 Author: Grigori Goronzy Date: Sun Jun 28 02:36:31 2009 +0200 Fix subpixel shift calculation for negative coordinates The subpixel shift calculation was off in case the device coordinates were negative. This has been corrected and the calculation been simplified. libass/ass_render.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 07bcf7f7cee44d208e07ae13d890d61a94c2d260 Author: Grigori Goronzy Date: Sat Jun 27 22:48:48 2009 +0200 Make \shad, \xshad and \yshad animatable. libass/ass_render.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) commit 29d541c5a3774f98854fcdeb379c39e8bf13e3b3 Author: Grigori Goronzy Date: Sat Jun 27 22:28:22 2009 +0200 Support \xshad and \yshad override tags Split up shadow displacement into x and y and allow parsing of the tags \xshad and \yshad to set it. This makes it possible to displace a shadow differently in x and y direction. libass/ass_render.c | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 deletions(-) commit c6c4b66a0cbee9f2b32289d1f73122530537f00c Author: Grigori Goronzy Date: Sat Jun 27 22:06:32 2009 +0200 Support \xbord and \ybord override tags Improve get_outline_glyph with a second pass which can be used for stroking with different width in x and y direction. This is done by first stroking in y direction, and if the stroke size for the x direction differs, stroking a copy of the glyph in x direction again. The x coordinates of the first stroker result are afterwards replaced by the coordinates of the second stroking. The cache hash keys for bitmaps and glyphs have been extended to carry the new properties. libass/ass_cache_template.c | 4 +- libass/ass_render.c | 154 ++++++++++++++++++++++++++++++++----------- 2 files changed, 117 insertions(+), 41 deletions(-) commit 2b4a7365b172bb0b5ee093329a7acdf6bce1cb8d Author: Grigori Goronzy Date: Sat Jun 27 15:20:28 2009 +0200 Fix memory leak in render_overlap render_overlap allocated memory for its hashmap key and values on the heap, relying on the cache cleanup to free them. However, these pointers are not directly inserted into the cache, but memcpy()'ed in hashmap_insert, leading to a pretty bad memory leak. Allocate the key and value on the stack instead to fix this problem. libass/ass_render.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) commit 490865d2c263aea6b7ee1dc1f197bb9fa7cb9b46 Author: Grigori Goronzy Date: Sat Jun 27 15:02:13 2009 +0200 Fix strdup() string leaks On two occassions strings where strdup()'ed but never freed. Fix these two small memory leaks. libass/ass_font.c | 3 +++ libass/ass_render.c | 5 +++++ 2 files changed, 8 insertions(+), 0 deletions(-) commit c58cd622ea2d2ab54fd56533c57d9995802f7bfd Author: Grigori Goronzy Date: Sat Jun 27 14:26:15 2009 +0200 Make \fax and \fay animatable. libass/ass_render.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit e7cd364193d9c724c5b269cc85ddba66f2a2a099 Author: Grigori Goronzy Date: Sat Jun 27 14:21:53 2009 +0200 Fix rotation and subpixel placement Add subpixel shift to the points after rotation transformations to fix rotations and subpixel accuracy. libass/ass_render.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit af0db69d3f4ca6dfe579135a7d7aa4236e90f0b6 Author: Grigori Goronzy Date: Sat Jun 27 06:52:26 2009 +0200 Include ass_utils.h instead of mputils.h libass/ass.c | 1 - libass/ass_bitmap.c | 2 +- libass/ass_cache.c | 2 +- libass/ass_font.c | 1 - libass/ass_fontconfig.c | 2 +- libass/ass_render.c | 2 -- libass/ass_utils.c | 1 - 7 files changed, 3 insertions(+), 8 deletions(-) commit 4c1f9e93addaa511f96908fe502e8d5709ed7500 Author: Grigori Goronzy Date: Sat Jun 27 06:31:45 2009 +0200 Incorporate mputils.c into ass_utils.c Move helper functions originating from MPlayer into ass_utils.c. Remove some debugging code that is #if 0'ed for ages now. Delete mputils.c and mputils.h and remove them from the build system. libass/Makefile.am | 6 +- libass/ass_utils.c | 215 ++++++++++++++++++++++++++++++++++++++++++----- libass/ass_utils.h | 28 ++++++ libass/mputils.c | 239 ---------------------------------------------------- libass/mputils.h | 24 ----- 5 files changed, 226 insertions(+), 286 deletions(-) commit 917e02edda4392b465ffa179628a5032ff969900 Author: Grigori Goronzy Date: Sat Jun 27 06:11:59 2009 +0200 Cosmetics: minor cleanup in ass_render_events libass/ass_render.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) commit 29060f388be283c78af768bcf9a9714c3784e6b9 Author: Grigori Goronzy Date: Sat Jun 27 06:10:07 2009 +0200 Cosmetics: fix a few remaining declarations Fix formatting of a few remaining declarations missed in the first cleanup. libass/ass_font.c | 2 +- libass/ass_render.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) commit 8a8943ca115db2d865bbbaecd709ef87fae49480 Author: Grigori Goronzy Date: Sat Jun 27 05:54:26 2009 +0200 Rename various non-static functions Rename a few functions to avoid symbol clashes. Clean up mputils.h. libass/ass.c | 2 +- libass/ass_bitmap.c | 14 ++++++++------ libass/ass_fontconfig.c | 2 +- libass/ass_render.c | 2 +- libass/mputils.c | 6 +++--- libass/mputils.h | 20 +++++++++----------- 6 files changed, 23 insertions(+), 23 deletions(-) commit 3060fc2e6547cac9eea0dc2d33ad5e65d3b4125f Author: Grigori Goronzy Date: Sat Jun 27 05:45:02 2009 +0200 Rename mp_msg to ass_msg libass/ass.c | 58 +++++++++++++++--------------- libass/ass_bitmap.c | 6 ++-- libass/ass_cache.c | 2 +- libass/ass_font.c | 16 ++++---- libass/ass_fontconfig.c | 42 +++++++++++----------- libass/ass_render.c | 90 +++++++++++++++++++++++----------------------- libass/ass_utils.c | 2 +- libass/mputils.c | 12 +++--- libass/mputils.h | 23 +++--------- 9 files changed, 120 insertions(+), 131 deletions(-) commit a4c7c0f2665bbda6bbe013b2f4a9582387b168e7 Author: Grigori Goronzy Date: Sat Jun 27 05:35:11 2009 +0200 Add standard GPL header to mputils.c libass/mputils.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) commit 0703d5fc7cdd6dc375b94314d0f6a95123f912da Author: Grigori Goronzy Date: Sat Jun 27 06:38:49 2009 +0200 Improve positioning for full subpixel accuracy Completely overhaul positioning for full subpixel accuracy (as much as FreeType offers, 1/64 pixel) for all positioning/typesetting related calculations and the final rendering. Positions are now calculated with doubles. FreeType uses a fixed-point 26.6 representation internally. Where needed, these are converted into double values as well. Finally, for the on-screen rendering, a subpixel shift for the rasterization is calculated (bitmaps cannot be rendered onto the video with subpixel accuracy). libass/ass_render.c | 262 ++++++++++++++++++++++++++------------------------- 1 files changed, 135 insertions(+), 127 deletions(-) commit 0893cc192612ee7ea6175094faa60a4f156459b5 Author: Grigori Goronzy Date: Thu Jun 25 00:05:04 2009 +0200 Test program: nicer-looking background Use a uniformly colored background in the test program. This looks better than the randomly-looking pattern that was used before. A chessboard pattern would be even better, but this will do for now. test/test.cpp | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit b53fb2ad554440646f5dfe781459af058ba11f8f Author: Grigori Goronzy Date: Wed Jun 24 23:48:05 2009 +0200 Correct vertical glyph positioning for \fay Offset the next glyph by the total shear of the glyph before. This is done before line-wrapping, so that a line that is vertically sheared will get as much higher, as it is sheared. Fine by me, but vsfilter probably does it in a different way. libass/ass_render.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 832fdb11a38f74bbd14ba6029a872e15501a1216 Author: greg Date: Tue Jun 23 02:55:04 2009 +0200 Initial support for \fax, \fay override tags This adds support for the \fax and \fay override tags which can be used for shearing the text horizontally and vertically. At the moment, this works correctly on a per-glyph basis, however, the glyph positioning is wrong, which is especially evident with \fay. libass/ass_cache_template.c | 2 + libass/ass_render.c | 47 ++++++++++++++++++++++++++++-------------- 2 files changed, 33 insertions(+), 16 deletions(-) commit 0b9223d493e016ccdce91aae1a6f69aff6c03a0f Author: Uoti Urpala Date: Fri Jun 19 19:26:36 2009 +0300 Use safe hash functions for composite bitmaps Previously the composite bitmap hash keys were compared and hashed based on all the bytes in the struct, which could cause problems because of padding bytes. Change the code to use field-by-field operations as already done for other hash key types. The composite hash key contains two bitmap hash keys. The hashing function currently handles those by calling the function to calculate the corresponding bitmap hash, and then updating the composite hash by treating the result of the function call as a byte buffer. An alternative would be to change the hash functions so that the initial hash value could be passed as a parameter to the recursively called function. libass/ass_cache.c | 3 ++- libass/ass_cache.h | 8 -------- libass/ass_cache_template.c | 24 ++++++++++++++++++++++++ 3 files changed, 26 insertions(+), 9 deletions(-) commit 6a5c6a3748e3825d7a4281cfeac4ca25b32c8571 Author: Uoti Urpala Date: Fri Jun 19 19:23:53 2009 +0300 ass_cache_template.c: Undo automatic reindent for this file The 'indent' program does not understand the macro trickery in this file and the result was clearly worse than the original. libass/ass_cache_template.c | 52 +++++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 21 deletions(-) commit 49bf5a419a286d70b3a82f4a60059849ed2c536a Author: greg Date: Fri Jun 19 07:34:03 2009 +0200 Add hack to support empty lines of text Consecutive forced breaks (\N\N) can be used to create empty lines of text in other renderers. This doesn't work with the current text layouter (wrap_lines_smart). This hack inserts a space glyph between two consecutive forced breaks to get around this limitation. libass/ass_render.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit 9c1ff393d29aee7b64be2f5c526886819abfc7ec Author: greg Date: Fri Jun 19 06:30:49 2009 +0200 Remove static variable modifier in sub_recode A variable was needlessly static, this has been corrected. libass/ass.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 21ab30f2ffbc71af46c0e64824e0596f14ddb424 Author: greg Date: Fri Jun 19 06:04:45 2009 +0200 ass_set_fonts: optionally pass fontconfig config path Optionally pass a fontconfig config file to the fontconfig initialisation. This changes the public API. libass/ass.h | 4 +++- libass/ass_fontconfig.c | 18 +++++++++++++----- libass/ass_fontconfig.h | 2 +- libass/ass_render.c | 4 ++-- test/test.cpp | 2 +- 5 files changed, 20 insertions(+), 10 deletions(-) commit 4600a9a40e82d9583e6b99a6633cadd379b8aa93 Author: greg Date: Fri Jun 19 05:33:40 2009 +0200 Remove wrappers for ass_set_fonts ass_set_fonts_ was wrapped through ass_set_fonts and ass_set_fonts_nofc to either use fontconfig or not. This is not very useful, since a simple parameter to ass_set_fonts_ can be used instead. Remove the wrapper functions and rename the real function to ass_set_fonts. This changes the public API. libass/ass.h | 1 + libass/ass_render.c | 19 ++----------------- test/test.cpp | 2 +- 3 files changed, 4 insertions(+), 18 deletions(-) commit c27e45dbb756d89124df72acf07a5856abb15ae1 Author: greg Date: Thu Jun 18 20:48:23 2009 +0200 Silence warnings introduced by -Wall Silence a few warnings that should be harmless and were introduced by the -Wall option. libass/ass_fontconfig.c | 2 +- libass/ass_render.c | 3 +-- libass/mputils.c | 12 ++++++------ 3 files changed, 8 insertions(+), 9 deletions(-) commit 18c4ba3955a56254b40416922e3db6915007c3ee Author: greg Date: Thu Jun 18 20:44:12 2009 +0200 Add -Wall to CFLAGS configure.ac | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 20e0278ffcc94c110fd749a9c804168c49738025 Author: greg Date: Thu Jun 18 18:20:09 2009 +0200 Replace manual fixed-point conversion Replace a manual fixed-point conversion to d16 by conversion function. libass/ass_render.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 2303b5430337da60f582613f95e605f08606759f Author: greg Date: Thu Jun 18 17:54:08 2009 +0200 Reindent all source code. Reindent complete source code (*.c, *.h) with indent, the exact command line being: indent -kr -i4 -bap -nut -l76 *.c *.h From now on, new code should use (more or less) K&R style, only spaces and no tabs, 4 spaces indent width. Avoid long lines. Fix function declaration pointer spacing. Remove spaces that were added to many function declarations by indent, like some_func(foo_t * bar). Fix indenting of macros in ass.c libass/ass.c | 1748 +++++++++-------- libass/ass.h | 99 +- libass/ass_bitmap.c | 528 +++--- libass/ass_bitmap.h | 21 +- libass/ass_cache.c | 406 ++-- libass/ass_cache.h | 123 +- libass/ass_cache_template.c | 52 +- libass/ass_font.c | 508 +++--- libass/ass_font.h | 47 +- libass/ass_fontconfig.c | 788 ++++---- libass/ass_fontconfig.h | 14 +- libass/ass_library.c | 115 +- libass/ass_library.h | 20 +- libass/ass_render.c | 4695 +++++++++++++++++++++++-------------------- libass/ass_types.h | 119 +- libass/ass_utils.c | 166 +- libass/ass_utils.h | 66 +- libass/help_mp.h | 1 - libass/mputils.c | 321 ++-- libass/mputils.h | 12 +- 20 files changed, 5189 insertions(+), 4660 deletions(-) commit 9c7521c0224f16880870839f7492e50b1c8602f7 Author: greg Date: Thu Jun 18 17:12:06 2009 +0200 Add .gitignore Ignore all objects, binaries and autotools files. .gitignore | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) commit b1065a398595a2d947bd2dcb549a838b0fbcd378 Author: greg Date: Thu Jun 18 14:41:02 2009 +0200 Do not print message level of a string (bloats output) and change the message level to MSGL_INFO. libass/mputils.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 8aa14b319b8f13bd817a116f27610173de37dae7 Author: greg Date: Thu Jun 18 14:16:07 2009 +0200 Fix up glyph stroker to avoid buggy rendering. This adds pre-processing to the stroker which removes certain contours that'd lead to areas wrongly getting not filled. The approach is very simple, but works well enough for most cases. libass/ass_render.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 79 insertions(+), 2 deletions(-) commit 7036f4774944d8acd2a175f1171e8c988f8c9d36 Author: greg Date: Thu Jun 18 14:15:12 2009 +0200 Set a more reasonable maximum blur radius and make \blur animatable. libass/ass_render.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 6ebc8ce286b38c95c660d33ce8cec35643dbdb99 Author: greg Date: Thu Jun 18 14:14:35 2009 +0200 Enlarge glyph size more for \blur to avoid artefacts. libass/ass_bitmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 3fcd2a5c6225edcd83d3f7e154592735dc8c6536 Author: greg Date: Thu Jun 18 14:12:32 2009 +0200 Remove MAX_GLYPHS and MAX_LINES limits. Instead, dynamically allocate memory and use reasonable initial sizes. libass/ass_render.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) commit 2f59cd0e21b3f4a953b67525fa56b133d4d6b352 Author: greg Date: Thu Jun 18 14:09:35 2009 +0200 Remove cache globals; move cache data into a separate cache_store struct that is part of ass_renderer. libass/ass_cache.c | 86 +++++++++++++++++++------------------------------- libass/ass_cache.h | 81 +++++++++++++++++++++++++++++------------------ libass/ass_font.c | 6 ++-- libass/ass_font.h | 3 +- libass/ass_render.c | 50 +++++++++++++++++------------ 5 files changed, 117 insertions(+), 109 deletions(-) commit 3dcfa5a61e58068b38fb97477e8935550ca8c683 Author: greg Date: Thu Jun 18 14:08:49 2009 +0200 Eliminate text_info global; move it into ass_renderer. libass/ass_render.c | 218 +++++++++++++++++++++++++------------------------- 1 files changed, 109 insertions(+), 109 deletions(-) commit 4bf43431ac566f59e29a8c72dfd822bab283ddec Author: greg Date: Thu Jun 18 14:08:27 2009 +0200 Eliminate render_context global; move it into ass_renderer. libass/ass_render.c | 623 ++++++++++++++++++++++++++------------------------- 1 files changed, 312 insertions(+), 311 deletions(-) commit 7336b01091b127beb292aecc3e6ce84fd1e00b14 Author: greg Date: Thu Jun 18 14:07:43 2009 +0200 Use ass_renderer to access settings instead of passing a pointer to ass_settings, where appropriate. libass/ass_render.c | 98 ++++++++++++++++++++++++++------------------------- 1 files changed, 50 insertions(+), 48 deletions(-) commit e0508248f02abf1c29bf46d4c19604f4b2156211 Author: greg Date: Thu Jun 18 14:06:40 2009 +0200 Move frame_context into ass_renderer. This finishes the previous elimination. libass/ass_render.c | 305 ++++++++++++++++++++++++--------------------------- 1 files changed, 145 insertions(+), 160 deletions(-) commit e5706e13bbb3e3c2ddbb6f27696b948d76119bbc Author: greg Date: Thu Jun 18 14:06:16 2009 +0200 Eliminate frame_context global, started. libass/ass_render.c | 274 ++++++++++++++++++++++++++------------------------- 1 files changed, 141 insertions(+), 133 deletions(-) commit 97639eba9b5096dde2082ab7cb22802bb48fd173 Author: greg Date: Thu Jun 18 14:05:52 2009 +0200 Eliminate global_settings global. libass/ass_render.c | 138 +++++++++++++++++++++++++------------------------- 1 files changed, 69 insertions(+), 69 deletions(-) commit b34de85e90f31ce22f101417a81241bccb6be83a Author: greg Date: Thu Jun 18 14:00:06 2009 +0200 Eliminate ass_renderer global. libass/ass_render.c | 66 ++++++++++++++++++++++++-------------------------- 1 files changed, 32 insertions(+), 34 deletions(-) commit 0a6f00a07f131a695f675c2a8f4e4635e50b2efd Author: greg Date: Fri Jun 19 05:16:30 2009 +0200 Warn on \pos, \move redefinitions Optionally output a warning when a \pos or \move is redefined in a single subtitle line. libass/ass_render.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit 4213f6ae3df34d6551f314122075ce58d95a09b6 Author: greg Date: Fri Jun 19 05:14:09 2009 +0200 ass_render.c: declare functions static Declare some functions only used in this file static. libass/ass_render.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 457a9146ee07060a8c45b850a69ea5c6bbdae70e Author: greg Date: Fri Jun 19 05:13:07 2009 +0200 From uau: libass: Fix cache lookup problem causing memory bloat 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). libass/ass_cache.c | 12 +++++- libass/ass_cache.h | 34 +--------------- libass/ass_cache_template.c | 88 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 101 insertions(+), 33 deletions(-) commit e7e108672381007c2beaec5c436d757cca0017a2 Author: greg Date: Thu Jun 18 13:04:29 2009 +0200 Add autotools infrastructure. COPYING | 339 ++++++++++++++++++++++++++++++++++++++++++++++++ Changelog | 19 +++ Makefile.am | 8 + autogen.sh | 5 + configure.ac | 58 ++++++++ libass.pc.in | 10 ++ libass/Makefile.am | 14 ++ shave/shave-libtool.in | 109 ++++++++++++++++ shave/shave.in | 109 ++++++++++++++++ shave/shave.m4 | 102 +++++++++++++++ test/Makefile.am | 5 + test/test.cpp | 156 ++++++++++++++++++++++ 12 files changed, 934 insertions(+), 0 deletions(-) commit 597a3d181a15107e52ef2533dbedad365250e486 Author: greg Date: Thu Jun 18 13:00:37 2009 +0200 Apply initial changes needed for standalone libass. libass/ass_mp.c | 279 ------------------------------------------------------ libass/ass_mp.h | 60 ------------ libass/help_mp.h | 56 +++++++++++ libass/mputils.c | 218 ++++++++++++++++++++++++++++++++++++++++++ libass/mputils.h | 62 +++++++------ 5 files changed, 307 insertions(+), 368 deletions(-) commit f440e5fa905f444017e27c1a7b9669de4b204433 Author: eugeni Date: Tue Jun 16 17:58:12 2009 +0000 Add a missing check for a NULL return value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29367 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit c0ecadd1e30f7a18a9a52e2c5c9812aaf60345fa Author: diego Date: Wed May 13 02:58:57 2009 +0000 whitespace cosmetics: Remove all trailing whitespace. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 88 +++++++++++++++++++------------------- libass/ass.h | 2 +- libass/ass_bitmap.c | 4 +- libass/ass_cache.c | 6 +- libass/ass_cache.h | 4 +- libass/ass_font.c | 18 ++++---- libass/ass_fontconfig.c | 30 +++++++------- libass/ass_library.c | 12 +++--- libass/ass_mp.c | 2 +- libass/ass_render.c | 108 +++++++++++++++++++++++----------------------- libass/ass_types.h | 4 +- libass/ass_utils.c | 10 ++-- 12 files changed, 144 insertions(+), 144 deletions(-) commit 8421b19d28d785748c0080f76ae36d341761ee1c Author: eugeni Date: Tue Apr 21 21:27:53 2009 +0000 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 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a6b0b5c1bf444c5dfc278a68f903526a7877c916 Author: reimar Date: Sat Mar 28 19:24:08 2009 +0000 Document the ass_render_event event_images parameter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29087 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 86509673b95b92add4d03d9aae57844b46b07877 Author: reimar Date: Sat Mar 28 19:21:34 2009 +0000 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 libass/ass_render.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 9f712dcf64a837b61dac21c8fd13a9fb5e40e754 Author: eugeni Date: Mon Mar 16 19:26:23 2009 +0000 Cosmetics: reindent. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28977 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit ecb38aecc9e461fef97b541eb49e69ec99ba1533 Author: eugeni Date: Mon Mar 16 19:26:19 2009 +0000 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 libass/ass_fontconfig.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit c7c290b4f3aac8f52287aec0f5a0766eaa881898 Author: greg Date: Wed Mar 11 22:55:23 2009 +0000 Use ScaledBorderAndShadow: yes by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28935 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit d07fb4e7a53f8357e5cb399ac39178a77bc06fc9 Author: eugeni Date: Sun Mar 8 16:13:26 2009 +0000 Cosmetics: reindent. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28896 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 48 +++++++++++++++++++++++----------------------- 1 files changed, 24 insertions(+), 24 deletions(-) commit 256c11324911da42ff829d9cb6906186b5173464 Author: eugeni Date: Sun Mar 8 16:13:21 2009 +0000 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 libass/ass_cache.c | 2 ++ libass/ass_font.c | 3 ++- libass/ass_font.h | 1 + libass/ass_fontconfig.c | 31 ++++++++++++++++++++----------- libass/ass_fontconfig.h | 2 +- libass/ass_mp.c | 1 + libass/ass_render.c | 3 +++ libass/ass_types.h | 1 + 8 files changed, 31 insertions(+), 13 deletions(-) commit f294178b97923f713ff6b6e994bfab10d25fac75 Author: greg Date: Sun Mar 8 15:30:40 2009 +0000 Remove extraneous braces. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28892 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 68e768cb68f7e40a0ac930e528a20159fa61ad0e Author: greg Date: Sun Mar 8 15:30:27 2009 +0000 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 libass/ass_render.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) commit 82ed1c0217af2b85c5eaabdcaa87ecb2245aa4b0 Author: greg Date: Sun Mar 8 04:03:28 2009 +0000 Fix clipping for pan-and-scan. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28876 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) commit c40e97f5741b61cd1f2944bd87019cbe9de0e402 Author: greg Date: Sun Mar 8 04:03:24 2009 +0000 Add a proper color check to the overlap compositing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28875 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 2d9feef0fc47b4f7108d3604ac9a5c951e405f98 Author: greg Date: Sun Mar 8 02:53:14 2009 +0000 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 libass/ass_render.c | 119 +++++++++++++++++---------------------------------- 1 files changed, 40 insertions(+), 79 deletions(-) commit b80348afd88f8b58e14e51a606ea0cc3479d8312 Author: greg Date: Sat Mar 7 23:56:03 2009 +0000 Only use first \org in a line. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28873 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) commit f9f5f9c911231b27e3f8d585fa0d20b75eca25d9 Author: greg Date: Fri Mar 6 09:20:14 2009 +0000 Fix \be blur start position. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28837 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 22a046e92f53ab18e9b523dd65d83e8d777a9de2 Author: greg Date: Fri Mar 6 09:20:09 2009 +0000 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 libass/ass_render.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit d80cd192af49b29aed5cc2a964f3c11910c1339c Author: greg Date: Fri Mar 6 01:26:44 2009 +0000 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 libass/ass_render.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) commit cd12c943e846ec7ec4e6d65266f20670e2072927 Author: greg Date: Fri Mar 6 01:17:05 2009 +0000 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 libass/ass_bitmap.c | 40 ++++++++++++++++++++++++++++++++-------- libass/ass_bitmap.h | 2 +- libass/ass_render.c | 6 +----- 3 files changed, 34 insertions(+), 14 deletions(-) commit 34e8e99865ae9227ca9d522fa394112ba1dfd5ef Author: greg Date: Thu Mar 5 20:47:33 2009 +0000 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 libass/ass_cache.c | 50 ++++++++++++++++++++++++ libass/ass_cache.h | 21 ++++++++++ libass/ass_render.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 177 insertions(+), 1 deletions(-) commit 7d67dae86d99a26cc221a1c04e4d07aefa7ba02e Author: greg Date: Thu Mar 5 20:36:59 2009 +0000 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 libass/ass_render.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) commit eef8055d54e52d3d1f5cc268ec88f4d1de641930 Author: greg Date: Thu Mar 5 20:36:56 2009 +0000 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 libass/ass_render.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) commit e0b7cdc24dd7f2fa8a694946fcd2927d6542898a Author: greg Date: Thu Mar 5 20:36:52 2009 +0000 Style override for ScaledBorderAndShadow. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28821 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit daf40d0368f5c99e1531e35f0ef9e821a712a06f Author: greg Date: Thu Mar 5 20:36:48 2009 +0000 Support ScaledBorderAndShadow property. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28820 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 2 ++ libass/ass_render.c | 5 ++++- libass/ass_types.h | 1 + libass/ass_utils.c | 11 +++++++++++ libass/ass_utils.h | 1 + 5 files changed, 19 insertions(+), 1 deletions(-) commit eef7ca24e810cb6f1bff983a2e77ece313893cb8 Author: greg Date: Thu Mar 5 20:36:44 2009 +0000 Scale shadow displacement and blur size like border size. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28819 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 9d9039449e9af314b43476ab45de8254b3bc84da Author: greg Date: Thu Mar 5 20:36:41 2009 +0000 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 libass/ass_render.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) commit cc59e2383248be2796d53ac4197f007cd2bdb930 Author: greg Date: Thu Mar 5 20:36:39 2009 +0000 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 libass/ass_render.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) commit 37f063bfb45fe33239fe8569be4acf2f80bc7174 Author: greg Date: Thu Mar 5 20:36:35 2009 +0000 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 libass/ass_bitmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 51e11115fcd18b6e7e02b24608928907cd36987f Author: greg Date: Thu Mar 5 20:05:56 2009 +0000 Ignore PlayResX/Y aspect ratio for font aspect ratio. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28814 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) commit 1408eb0e0ae2a10df3b727330ee1892745ac22d9 Author: eugeni Date: Sun Mar 1 19:31:29 2009 +0000 Fix a memory leak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28787 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 41071b4849de8e3659520b0ab4b26262203c5714 Author: eugeni Date: Sun Mar 1 16:01:24 2009 +0000 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 libass/ass_render.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit 70b929182fbf49193679cab2b7165914f774c315 Author: eugeni Date: Fri Feb 27 23:06:53 2009 +0000 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 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 0a2d66153902c856c6fae867ec88ef9686b4ca64 Author: eugeni Date: Fri Feb 27 23:06:50 2009 +0000 Remove unused function argument. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28753 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 80 +++++++++++++++++++++++++------------------------- libass/ass_utils.c | 4 +- libass/ass_utils.h | 4 +- 3 files changed, 44 insertions(+), 44 deletions(-) commit d56ecb131c1664a9a0791df9af7fa2e003fc47db Author: eugeni Date: Fri Feb 27 23:06:47 2009 +0000 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 libass/ass_render.c | 46 +++++++++++++++++++++++++--------------------- libass/ass_utils.c | 15 ++++++++++++++- libass/ass_utils.h | 1 + 3 files changed, 40 insertions(+), 22 deletions(-) commit e3da71a5b792bd7373d2452bfd14d87c2f78a0e0 Author: eugeni Date: Fri Feb 27 23:06:43 2009 +0000 Fix two gcc warnings. Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28751 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 80f88cf51425afa469145aa8063839c6be189ea6 Author: eugeni Date: Fri Feb 27 23:06:40 2009 +0000 Fix memory leak produced by the \blur patch. Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28750 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 4b3ec0a367a243f2926b5157964dfd496bead9ae Author: eugeni Date: Fri Feb 27 23:06:37 2009 +0000 Stronger blur. Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28749 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 7281c7f9c1c456bd7ef49d818b7303a84de53a5d Author: eugeni Date: Fri Feb 27 23:06:34 2009 +0000 Allow shadow without border. Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28748 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) commit 78b3cc16b91ba0212ab03d2223aea586c096ee1b Author: eugeni Date: Sat Feb 7 01:13:11 2009 +0000 In case of several \move or \pos in one line, prefer the first one. Patch by Grigori G, greg at chown ath cx. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28473 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) commit f14e1809237640fb39ef9d7c294ddfa4b81fdfcc Author: eugeni Date: Sat Feb 7 01:13:07 2009 +0000 Add stubs for a few unimplemented tags. Patch by Grigori G, greg at chown ath cx. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28472 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 39 insertions(+), 1 deletions(-) commit d7a782335c086cf65dd614afb8e4557b8c9ae538 Author: eugeni Date: Sat Feb 7 01:13:02 2009 +0000 Allow \be with arguments other than 0 or 1. Implement \blur. Patch by Grigori G, greg at chown ath cx. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28471 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 44 ++++++++++++++++++++++++++++++++------------ libass/ass_bitmap.h | 4 ++-- libass/ass_cache.h | 1 + libass/ass_render.c | 34 ++++++++++++++++++++++++++++------ 4 files changed, 63 insertions(+), 20 deletions(-) commit 3d35a6ffaa552d06375efa99921f59bc4a00da4a Author: compn Date: Thu Jan 29 02:23:06 2009 +0000 increase max glyph and lines limit 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/ass_render.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 507d7a86003419fc7648e32a1097369a0f8bd38f Author: diego Date: Wed Dec 3 23:01:03 2008 +0000 Get rid of pointless 'extern' keywords. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 3a7f74367bcc858d826f61e01ed2dcf4d31b85c2 Author: reimar Date: Sun Nov 2 11:48:20 2008 +0000 Consistently use NULL for pointers instead of 0. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27876 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) commit c6012a37793663082049bfdcec711ae9ddd2b740 Author: reimar Date: Sun Nov 2 09:57:22 2008 +0000 Fallback to non-fontconfig behaviour when fontconfig initialization fails. Also fixes a memleak in that case, bug #1313. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27875 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) commit 48b386f5d35e08e315f11457fa628d8ffce69daa Author: aurel Date: Fri Sep 5 22:59:01 2008 +0000 libass: fix type mismatch between size parameter and the way it's used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27531 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 2 +- libass/ass.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 9ddc9384bb8db6f405b40bef0793774326edab9d Author: aurel Date: Fri Sep 5 15:07:06 2008 +0000 libass: add a new ass_process_data() to process demuxed subtitle packets conforming to the ASS spec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27530 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 20 ++++++++++++++++---- libass/ass.h | 8 ++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) commit 7197bbf2e1d49f27878ad9d8eaec9499c1503fff Author: eugeni Date: Fri Aug 8 20:08:02 2008 +0000 Don't print drawing commands on screen. Drawing mode is not implemented in libass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27442 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) commit 673c8bab10c15b27e615acaf4673c813daafe361 Author: eugeni Date: Thu Aug 7 22:20:58 2008 +0000 If (has outline) blur(outline) else blur(glyph). 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 libass/ass_bitmap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 330e495e51ded6d0b0f2d2b2fe8c22c84732e3d6 Author: eugeni Date: Thu Aug 7 22:20:56 2008 +0000 \org turns off collision detection. Patch by Diogo Franco (diogomfranco gmail com). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27440 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit e128b2bac43fcff7aff0c57bc33fa480387042ce Author: eugeni Date: Thu Aug 7 22:20:54 2008 +0000 Treat \h as space character. Patch by Robert Rudd (robrudd at users sourceforge net). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27439 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 95eba84ccde384ca9168378ffb3640cd14546457 Author: eugeni Date: Thu Aug 7 22:20:52 2008 +0000 Calculate subtitle origin in floating point. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27438 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit df9553e1f00acb0054cf97f001a0d55e5a6a1b73 Author: eugeni Date: Thu Aug 7 22:20:50 2008 +0000 Calculate subtitle position in floating point. 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 libass/ass_render.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) commit 4b3e09b125ec56c3668f53aa5a529c0fc3d650c9 Author: diego Date: Thu Aug 7 10:36:07 2008 +0000 Rename font-related preprocessor directives. Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 12 ++++++------ libass/ass_font.c | 2 +- libass/ass_fontconfig.c | 8 ++++---- libass/ass_fontconfig.h | 2 +- libass/ass_mp.c | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) commit 638a513ee6494d5349699fef9108614e1cfb8235 Author: diego Date: Fri Aug 1 20:28:58 2008 +0000 Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate; CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 10 +++++----- libass/ass_mp.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) commit 2a5a9e3317ce901b0a2080e21991011aef193d12 Author: diego Date: Wed Jul 30 12:01:30 2008 +0000 Start unifying names of internal preprocessor directives. Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 10 +++++----- libass/ass_mp.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) commit 5db84354eb81da9f6d1c17560274e23decc2767b Author: eugeni Date: Wed Jul 9 15:05:56 2008 +0000 Fix \fn without an argument consuming the next '\'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27242 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) commit e664a1525eec26add0968280bd71ef7ebeb66e2e Author: eugeni Date: Mon Jun 23 14:46:55 2008 +0000 Check if the font set returned from FcFontSort in not NULL. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27128 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 20eb21f162c05b5943d0991cd4fb400df5d64063 Author: eugeni Date: Mon Jun 23 14:46:52 2008 +0000 Reindent. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27127 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 71 ++++++++++++++++++++++++----------------------- 1 files changed, 36 insertions(+), 35 deletions(-) commit cdefa182a957a050fcaf7ceff3f34b909974c2ea Author: eugeni Date: Mon Jun 23 14:46:50 2008 +0000 Only use application font dir if library->fonts_dir is not NULL. This can be the case if ass_set_fonts_dir() call is omitted, results in segfault. Never happens in the current MPlayer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27126 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 3b0c7fbebbae5797500dc5bd3fb2c1285dbcc092 Author: eugeni Date: Thu May 29 18:35:22 2008 +0000 The size of output buffer is stored in 'osize', not 'size'. This is just for readability, the code behaviour is not changed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26924 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 94ef7fd59c03212f515df1c7ed4637ad76198f81 Author: eugeni Date: Thu May 29 18:35:21 2008 +0000 Clear iconv conversion state also in libass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26923 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) commit 8e59a530c453f8d7c8d36611ae975fc3528afc30 Author: eugeni Date: Thu May 29 18:35:18 2008 +0000 Offset should be size_t. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26922 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a9a79fdff3506d5b64ea44639557a8a41c24aefd Author: eugeni Date: Thu May 22 22:52:58 2008 +0000 Cosmetics: reindent after the last commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26857 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 50 +++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 25 deletions(-) commit 4887e51504f734bb5d6081cb75810e7e58fcc74f Author: eugeni Date: Thu May 22 22:52:57 2008 +0000 Read all faces of a memory font, not just the first one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26856 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit 3ccca8b7136d16cf288f5d1b8f5f5ba988fbb628 Author: eugeni Date: Thu May 22 08:58:06 2008 +0000 Fix compilation with FontConfig <= 2.2.96. It lacks FcPatternRemove function. The code will work fine, but produce an incorrect "Selected font is not the requested one" warning in rare cases. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26851 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit f8ea68071c3ed23a5d431a36fd3c2f4527848d6e Author: eugeni Date: Mon May 19 18:37:27 2008 +0000 In case 2 styles have the same name, prefer the latest one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26839 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e9dd93fd85e003b1eb5bfc54b62a32b258e92d1c Author: diego Date: Fri May 16 09:42:28 2008 +0000 cosmetics: Remove useless parentheses from return statements. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26791 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 146cd7b7538b19f0bf7cdc8929bf398aaa5436c8 Author: diego Date: Wed May 14 17:21:58 2008 +0000 Speak of libass instead of MPlayer in the libass license headers. We already use LIBASS_ prefixes for the multiple inclusion guards. Thus libass can be considered separate enough to warrant this. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26770 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 8 ++++---- libass/ass.h | 8 ++++---- libass/ass_bitmap.c | 8 ++++---- libass/ass_bitmap.h | 8 ++++---- libass/ass_cache.c | 8 ++++---- libass/ass_cache.h | 8 ++++---- libass/ass_font.c | 8 ++++---- libass/ass_font.h | 8 ++++---- libass/ass_fontconfig.c | 8 ++++---- libass/ass_fontconfig.h | 8 ++++---- libass/ass_library.c | 8 ++++---- libass/ass_library.h | 8 ++++---- libass/ass_mp.c | 8 ++++---- libass/ass_mp.h | 8 ++++---- libass/ass_render.c | 8 ++++---- libass/ass_types.h | 8 ++++---- libass/ass_utils.c | 8 ++++---- libass/ass_utils.h | 8 ++++---- libass/mputils.h | 8 ++++---- 19 files changed, 76 insertions(+), 76 deletions(-) commit 678e26fd4df9cd8641d7f2d557473d003f4230cf Author: diego Date: Tue May 13 08:34:59 2008 +0000 Add standard license header. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26757 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/mputils.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) commit 873f44ab1c087ebc0bed6a33573408d7f5abdc72 Author: diego Date: Tue May 13 08:33:48 2008 +0000 Fix one more license header wording detail for consistency. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26756 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_library.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e74b1c77fd9d0f24a6f23de9f34097cb45bb9402 Author: diego Date: Tue May 13 08:02:23 2008 +0000 Use standard license header. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26755 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 34 ++++++++++++++++++---------------- libass/ass.h | 34 ++++++++++++++++++---------------- libass/ass_bitmap.c | 34 ++++++++++++++++++---------------- libass/ass_bitmap.h | 34 ++++++++++++++++++---------------- libass/ass_cache.c | 34 ++++++++++++++++++---------------- libass/ass_cache.h | 34 ++++++++++++++++++---------------- libass/ass_font.c | 34 ++++++++++++++++++---------------- libass/ass_font.h | 34 ++++++++++++++++++---------------- libass/ass_fontconfig.c | 34 ++++++++++++++++++---------------- libass/ass_fontconfig.h | 34 ++++++++++++++++++---------------- libass/ass_library.c | 34 ++++++++++++++++++---------------- libass/ass_library.h | 34 ++++++++++++++++++---------------- libass/ass_mp.c | 34 ++++++++++++++++++---------------- libass/ass_mp.h | 34 ++++++++++++++++++---------------- libass/ass_render.c | 34 ++++++++++++++++++---------------- libass/ass_types.h | 34 ++++++++++++++++++---------------- libass/ass_utils.c | 34 ++++++++++++++++++---------------- libass/ass_utils.h | 34 ++++++++++++++++++---------------- 18 files changed, 324 insertions(+), 288 deletions(-) commit b1d01cd02045c16c5eb9c04ca4508f38f8286120 Author: eugeni Date: Sun May 11 20:17:21 2008 +0000 When building font pattern, treat both ' ' and '-' as word separators. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26742 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) commit 0f11b6e891ccae5cd887c93a0d041b33a310b9ed Author: eugeni Date: Sun May 11 19:49:57 2008 +0000 Fix possible free of unallocated memory. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26741 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 1cd7093284115815a2737c43b47d50ade8f1dc22 Author: eugeni Date: Thu May 8 13:54:00 2008 +0000 Define FC_FULLNAME and FC_EMBOLDEN to fix compilation with ancient fontconfig. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26692 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) commit a3ad3f9a3f72b3764e083b15ae24aef388c1cf8f Author: eugeni Date: Thu May 8 13:53:58 2008 +0000 If both full name and family are available, use the former in inexact match warning. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26691 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ee1c861a20f831bf6ff2644000a21bab2998b8c5 Author: eugeni Date: Thu May 8 13:53:56 2008 +0000 Remove extra family names from the search pattern after FcFontSort and call FcFontRenderPrepare to select the best family name for the font in case there are several of them. This does not affect font matching results, but helps to avoid warning about inexact match. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26690 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) commit b38932110e0cd33b45713b87c14dc277c8353e6f Author: ulion Date: Sat May 3 12:44:16 2008 +0000 Fix the second fontconfig_init function as the declaration in the .h file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26652 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 6350078a1a154889f4063e8ace5f46e29d123d0e Author: eugeni Date: Fri May 2 23:32:29 2008 +0000 Print more info about selected font. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26648 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) commit 0d883857de00f46ece7e96b6d4ae1b0fa25ef002 Author: eugeni Date: Fri May 2 23:32:28 2008 +0000 Rewrite font family check in a simpler way. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26647 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) commit 7a8b2819b50a033680d070c29e26c748bc7ee41f Author: eugeni Date: Fri May 2 23:32:26 2008 +0000 Move font family check to the end of the list. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26646 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit a8ad22ef9d3c0095cb3439a79e9f48104a0efbc8 Author: eugeni Date: Fri May 2 23:32:25 2008 +0000 Cosmetics: rename local variables to better reflect their contents. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26645 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) commit e830c279cfa76d8b0f0bbb60b99dd8a1297b1cdd Author: eugeni Date: Thu May 1 11:06:16 2008 +0000 Skip '@' at the beginning of the font name. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26625 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 36d18b94a709692a076ac583daa2cbe72c19409c Author: eugeni Date: Thu May 1 00:34:29 2008 +0000 Only warn if both font family and it's full name are different from requested. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26624 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) commit 92eb522894c4f604ee028b372ec1244fd82f9280 Author: eugeni Date: Thu May 1 00:34:26 2008 +0000 Allow inexact font family matching. In SSA/ASS fonts are sometimes referenced by their "full name", which is usually a concatenation of family name and font style (ex. Ottawa Bold). Full name is available from FontConfig pattern element FC_FULLNAME, but it is never used for font matching. Therefore, I'm removing words from the end of the name one by one, and adding shortened names to the pattern. It seems that the first value (full name in this case) has precedence in matching. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26623 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) commit 3c5c439c8b5698dcc8358b5d931adce7395dae30 Author: eugeni Date: Wed Apr 30 14:16:22 2008 +0000 Remove libass dependency on global font_fontconfig variable. A new function (ass_set_fonts_nofc) is introduced instead of an extra argument to existing ass_set_fonts to keep binary compatibility with older versions of the library. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26614 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.h | 5 +++++ libass/ass_fontconfig.c | 9 ++++----- libass/ass_fontconfig.h | 2 +- libass/ass_mp.c | 5 ++++- libass/ass_render.c | 14 ++++++++++++-- 5 files changed, 26 insertions(+), 9 deletions(-) commit 550d08a1bf57c27fafd74850c0c48a32cc4b09bc Author: diego Date: Tue Apr 8 22:25:59 2008 +0000 Merge libass/Makefile into Makefile, one less recursive make directory. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26356 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/Makefile | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) commit 91d0873f4473ac8131bad687e348fb60d81f645b Author: eugeni Date: Sun Mar 30 17:42:19 2008 +0000 Case insensitive parsing of SSA/ASS section headers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26303 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit 5f5d389263fa0fcb47e3288dff448e320432e097 Author: eugeni Date: Sun Mar 30 17:42:17 2008 +0000 Skip BOM at the beginning of text in ASS parser. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26302 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) commit 9d1bda5eb503fd1333dba19803960b5e1759df9d Author: diego Date: Wed Mar 5 08:24:09 2008 +0000 Add missing header #includes to fix 'make checkheaders'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26170 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.h | 1 + libass/ass_bitmap.h | 3 +++ libass/ass_cache.h | 4 ++++ libass/ass_font.h | 6 ++++++ libass/ass_fontconfig.h | 5 +++++ libass/ass_mp.h | 2 ++ libass/ass_types.h | 2 ++ libass/ass_utils.h | 2 ++ 8 files changed, 25 insertions(+), 0 deletions(-) commit 4790d6b768abf65b346f734d83a38c2a571eb9e1 Author: eugeni Date: Fri Feb 22 21:24:35 2008 +0000 Comment out dump_glyph(): it is unused and, as it is now, breaks compilation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26068 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_utils.c | 2 ++ libass/ass_utils.h | 1 - 2 files changed, 2 insertions(+), 1 deletions(-) commit caf7e86eef8df95434798dec9b675da68fbef1ff Author: eugeni Date: Fri Feb 22 19:31:53 2008 +0000 Check glyph bounding box before rasterizing and complain if it is too large. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26067 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) commit 25e97ce713229319b404b52b4f70c67287a27c4a Author: eugeni Date: Fri Feb 22 19:31:51 2008 +0000 Some debugging routines. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26066 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_utils.c | 26 ++++++++++++++++++++++++++ libass/ass_utils.h | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) commit cefaf08c831bb1acdda55b7d38192fac3ead6d59 Author: eugeni Date: Fri Feb 22 19:31:49 2008 +0000 Better handling of behind-the-camera objects. Every point that is behind the camera is moved to the clipping plane by orthographic projection. It is obviously incorrect, but this is a very rare case, and proper clipping of Bezier curves is not that easy. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26065 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit 05ecf2c10f6acd6c893b4eb54651d15155ae0361 Author: eugeni Date: Fri Feb 22 19:31:47 2008 +0000 Print FreeType version in libass init. Makes error logs slightly more helpful. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26064 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) commit 3e095dc317fe645e13c636f6a2fd868c395c9bac Author: diego Date: Tue Jan 29 23:25:11 2008 +0000 Consistently give all libass multiple inclusion guards a LIBASS_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25927 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.h | 6 +++--- libass/ass_bitmap.h | 6 +++--- libass/ass_cache.h | 6 +++--- libass/ass_font.h | 6 +++--- libass/ass_fontconfig.h | 6 +++--- libass/ass_library.h | 6 +++--- libass/ass_mp.h | 6 +++--- libass/ass_types.h | 6 +++--- libass/ass_utils.h | 6 +++--- libass/mputils.h | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) commit 760eccce44a62b9ba5907ae80ea73314a595351e Author: diego Date: Mon Jan 28 01:32:52 2008 +0000 Consistently use uppercase filename as multiple inclusion guard. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25897 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/mputils.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 8da74ff97a645f1253269046c7ae56c5b3061aa5 Author: eugeni Date: Wed Jan 23 21:18:30 2008 +0000 Add global ass_force_reload flag. If it is set, renderer is reconfigured before the next frame. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25841 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 12 ++++++++++++ libass/ass_mp.h | 3 +++ 2 files changed, 15 insertions(+), 0 deletions(-) commit 8d0d19d76b8738529a18defc5a8856628a270c4d Author: eugeni Date: Sat Jan 12 02:27:01 2008 +0000 Do not try to guess font metrics based on its bounding box. It was originally a workaround for fonts with bad ascender/descender values, but it breaks display of some otherwise valid fonts (bugzilla 987), so reverted. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25688 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) commit 540f252999b671c3003bee5aa33ce88d15e9928d Author: eugeni Date: Tue Jan 8 12:45:41 2008 +0000 Fix ass_clear_fonts not deallocating fontdata. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25649 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_library.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 0890270300c7451a7194b4c4dbfb0c653616992a Author: eugeni Date: Mon Jan 7 21:06:50 2008 +0000 No need to reinvent strdup... git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25644 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_library.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 7295d0ca77a1f040fb9e50156f373062a213d8dd Author: eugeni Date: Mon Jan 7 14:02:06 2008 +0000 Copy font data to ass_library instead of referencing demuxer-owned memory. This fixes segfault when fonts are accessed after demuxer has been closed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25641 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.h | 5 +++++ libass/ass_library.c | 24 +++++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) commit d160eb6e3e2f9433f8f8ac20f1a153bf4cd4584d Author: eugeni Date: Sat Jan 5 15:38:46 2008 +0000 Allow overriding [Script Info] parameters with -ass-force-style option. Patch by Anton Khirnov, wyskas gmail com. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25610 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) commit 1badd0c18e6d5da3c580f8b6ac2194d237112319 Author: diego Date: Mon Dec 31 16:15:50 2007 +0000 Add explanatory comments to the #endif part of multiple inclusion guards. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25563 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.h | 3 +-- libass/ass_bitmap.h | 3 +-- libass/ass_cache.h | 3 +-- libass/ass_font.h | 2 +- libass/ass_fontconfig.h | 3 +-- libass/ass_library.h | 3 +-- libass/ass_mp.h | 3 +-- libass/ass_types.h | 3 +-- libass/ass_utils.h | 3 +-- libass/mputils.h | 2 +- 10 files changed, 10 insertions(+), 18 deletions(-) commit 65696c95f77f0303a282ec3acc180d180276b1a8 Author: diego Date: Sun Dec 30 03:17:04 2007 +0000 typo git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25543 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 2 +- libass/ass.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit fe68e4db7b1a48f570822e5a0b0a806451d63305 Author: eugeni Date: Sun Dec 30 02:17:16 2007 +0000 Improve comments for ass_process_* functions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25542 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 6eb36c5b6125ecf6e926a3c0cf26fecf192a9d90 Author: eugeni Date: Sun Dec 30 01:03:05 2007 +0000 Return from ass_start_frame immediately if the track is empty. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25541 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 4658f123bec812f77c7e8deed6b5457dd0afe04c Author: ben Date: Sun Dec 16 11:13:24 2007 +0000 make libass use sub_font_name whenever it's possible git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25420 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) commit 3f6d9bb8444940d74495845957fddf6a2627b2bc Author: ulion Date: Wed Dec 12 10:00:34 2007 +0000 Fix libass to support -nofontconfig. For history reason, fontconfig is auto-enabled when ass is enabled, we keep this behavior and document it clearly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25379 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 14 ++++++++++++++ libass/ass_mp.c | 8 ++++---- 2 files changed, 18 insertions(+), 4 deletions(-) commit ee96f478b7e058556bee463a39794fdb716d4f7c Author: iive Date: Sun Oct 28 14:26:05 2007 +0000 Our enca code uses strdup() on the input encoding name, as we don't modify it we can use the original constant string. Uses less memory, code is simpler and faster. Fixes memory leak (noticed by ulion). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24879 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) commit 52cf134a3b65f9964c29bf0f1704e2ffedfd0df1 Author: eugeni Date: Thu Oct 25 21:20:28 2007 +0000 Cosmetics: fix indentation after last commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24856 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) commit 96b63566400632340cd7ebec81686591b633a01e Author: eugeni Date: Thu Oct 25 21:19:20 2007 +0000 Check return value of add_face. This fixes segfault when reselecting fonts and the new font could not be loaded (because of a bad font file, or too many font faces already loaded). Patch by Glen Nakamura, glen at imodulo dot com. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24855 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit eee843be33e18e678b94ef41588defbeccad8428 Author: eugeni Date: Fri Oct 19 18:16:23 2007 +0000 Avoid text deformation and subtitles moving outside the screen in pan-and-scan mode. For this, crop amounts are passed from vo_gl as negative margins sizes. They are used to calculate aspect ratio. They are ignored when calculating subtitle positions, so subtitles will stay on screen most of the time. Based on a patch by Jindrich Makovicka [makovick gmail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24815 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) commit 50137532e6f7d78e9a60e93231badaaeb6bf5e0c Author: eugeni Date: Tue Sep 18 19:51:22 2007 +0000 More precise line spacing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24577 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8e11b75d0d2e4819aa1501e3fe285926eb48c013 Author: eugeni Date: Tue Sep 18 18:41:38 2007 +0000 Fix text height calculation. It depends on line spacing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24576 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 02df89af09893d9b037df30c4f356fa68a1b3789 Author: eugeni Date: Tue Sep 18 18:36:54 2007 +0000 Fix an obviously incorrect comment. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24575 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 1eda51261133cd1c382a43798239724d0092dcf2 Author: eugeni Date: Tue Sep 18 18:34:52 2007 +0000 Enable ass_line_spacing option. Patch by Thomas Reitmayr (treitmayr devbase at). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24574 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.h | 1 + libass/ass_mp.c | 1 + libass/ass_render.c | 5 +++++ 3 files changed, 7 insertions(+), 0 deletions(-) commit a9ef2db5d32b8689f3d9b13cb85944ba8cec1065 Author: diego Date: Tue Aug 28 11:20:24 2007 +0000 Clean up the way get_path is handled: Compile get_path.c to an object to link against instead of directly #including the C file and replace the many extern declarations by a proper header file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24262 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit c9f32b894e8eae96315c9fc1870d6a57731f236b Author: iive Date: Sat Aug 4 10:46:14 2007 +0000 Fix compilation of ass_fontconfig.c when fontconfig is disabled. Add missing parameter to the function in the #else case git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24008 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 4267831c822c9d126ffb250fcdcd35d1b738394e Author: eugeni Date: Fri Aug 3 15:39:38 2007 +0000 Don't apply windows-like font scaling if hhea or os2 tables contain invalid metrics. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24003 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) commit 7c9011871e254f2481eda6f7cefa239a760b6160 Author: eugeni Date: Fri Aug 3 15:22:55 2007 +0000 Workaround for fonts with zero ascender/descender in horizontal header. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24002 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) commit 632425a6873029fc59a82d582d5cd436ca623766 Author: eugeni Date: Fri Aug 3 14:10:53 2007 +0000 Factor out common code from ass_font_new and ass_font_reselect. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24001 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 104 +++++++++++++++++++++++----------------------------- libass/ass_font.h | 1 + 2 files changed, 47 insertions(+), 58 deletions(-) commit 19e1896e09d486fd42e4900abb135620662f4f7d Author: eugeni Date: Fri Aug 3 13:43:11 2007 +0000 More simple and correct font reselection. Since ass_font_t contains a list of font faces, there is no need to select the face with maximum charset coverage each time. It is enough to select any face with the required glyph. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24000 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 14 ++---------- libass/ass_font.h | 7 ------ libass/ass_fontconfig.c | 52 +++++++++++++++------------------------------- libass/ass_fontconfig.h | 6 +---- 4 files changed, 21 insertions(+), 58 deletions(-) commit 275dff68aeb193ac2872df877f988b7c33b94250 Author: diego Date: Mon Jul 2 22:34:45 2007 +0000 Do not use leading underscores in multiple inclusion guards, they are reserved. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.h | 4 ++-- libass/ass_bitmap.h | 4 ++-- libass/ass_cache.h | 4 ++-- libass/ass_font.h | 4 ++-- libass/ass_fontconfig.h | 4 ++-- libass/ass_library.h | 4 ++-- libass/ass_mp.h | 4 ++-- libass/ass_types.h | 4 ++-- libass/ass_utils.h | 4 ++-- libass/mputils.h | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) commit 5e6573dc47df48952ac6b4e5c0e844989dbfe1c9 Author: diego Date: Mon Jul 2 21:34:39 2007 +0000 Consistently use filename as multiple inclusion guard. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23707 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 662f9e99e6a04448ccd3d368f580a452c501f7e7 Author: eugeni Date: Fri Jun 15 22:22:16 2007 +0000 When parsing ass-force-style arguments, search for '=' and '.' characters with strrchr. This allows using it for styles whose name contains those characters. Patch by Бранко Мајић . git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23560 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 72decd0012d4ab5b8d3160d65e4142d36ffdb0d7 Author: eugeni Date: Fri Jun 15 22:15:27 2007 +0000 Make sure there is at least one style in ass_track when parsing events. Before it was only checked for embedded subtitles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23559 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) commit 25e78d5a4430cf8e3a8a88d96f92389406f892c0 Author: eugeni Date: Fri Jun 1 19:56:44 2007 +0000 Move code for reading a file and recoding it to utf-8 to a separate function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23442 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 30 +++++++++++++++++++++--------- libass/ass.h | 2 ++ 2 files changed, 23 insertions(+), 9 deletions(-) commit c9d3116875d0b4822d1df7065b3c538ce2c7e441 Author: eugeni Date: Sun May 20 17:56:39 2007 +0000 Fix #if condition. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23358 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d98f46c987051e85ed99be33c1b4727f5ce4bac6 Author: eugeni Date: Sun May 20 17:04:12 2007 +0000 FT_Request_Size does not exist in FreeType 2.1.*. Fallback to FT_Set_Char_Size. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23357 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 676b104211c85790802ad38cdb6cc310d05b0484 Author: eugeni Date: Sat May 19 14:11:41 2007 +0000 Correct font size in libass. Values from TrueType OS/2 table are used to reproduce VSFilter behaviour. Magic 0.8 multiplier and scaling for the fractional part of font size are not needed anymore. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23346 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 31 ++++++++++++++++++++++++++----- libass/ass_mp.c | 3 +-- libass/ass_render.c | 4 +--- 3 files changed, 28 insertions(+), 10 deletions(-) commit f6551666dcdb8a3f6bb8ca86c60c652d20c36304 Author: eugeni Date: Fri May 18 18:58:34 2007 +0000 Revert y-axis rotation. Change order of rotations. Now rotations are performed in the following order: X, Y, Z. Before this, it was the other way around. Also, in FreeType Y axis is directed upwards, so the corresponding rotation must be reverted. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23340 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) commit 66bfd7d69de30db9ad56e3b9ca92c967d22ab13b Author: eugeni Date: Mon May 14 20:41:14 2007 +0000 Support fractional font sizes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23318 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 4 ++-- libass/ass_cache.h | 4 ++-- libass/ass_font.c | 14 ++++++++------ libass/ass_font.h | 4 ++-- libass/ass_render.c | 8 ++++---- libass/ass_types.h | 2 +- 6 files changed, 19 insertions(+), 17 deletions(-) commit 33b678a028186c0269f04a5fd63e7fbd7a8b0e93 Author: eugeni Date: Mon May 14 20:24:53 2007 +0000 Limit ass_font_set_transform to nonrotating transformations. Rotations are not needed here (they are performed in transform3d) and they disable autohinter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23317 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 30 ++++++++++++++++++------------ libass/ass_font.h | 4 ++-- libass/ass_render.c | 13 ++++--------- libass/ass_utils.h | 6 ++++++ 4 files changed, 30 insertions(+), 23 deletions(-) commit d5ede6cbe1f2ac9fa569fa19228bc35ab02f5d58 Author: eugeni Date: Wed May 9 21:38:28 2007 +0000 Don't deallocate font data if it will be used later. It produced either segfault or "Error opening memory font" with any script that contains embedded fonts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23282 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commit cd9e74e8eab007045b5ec19168ce52c04cb3fb1e Author: eugeni Date: Thu May 3 20:10:14 2007 +0000 Move variables and a function under #ifdef FC_VERSION to avoid warnings. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23234 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) commit b01b92c8fb8fb4d2adc2290ef10b4be02a032d76 Author: eugeni Date: Thu May 3 19:52:46 2007 +0000 Deallocate FontConfig objects. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23233 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) commit 78e0e1892671ffbbaa56eb9dc5a747623338ccd3 Author: eugeni Date: Thu May 3 19:47:34 2007 +0000 Fix stupid bug in r23229. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23232 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 591b6d7575c60c84276e826ee8aa2b1e25b9664c Author: eugeni Date: Thu May 3 19:33:35 2007 +0000 Deallocate string. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23231 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 4e7a0af9e288f78b3e335eec895bf1f7768bdde9 Author: eugeni Date: Thu May 3 19:26:43 2007 +0000 In ass_font_new, allocate temporary ass_font_t on stack and return the pointer to cache-owned copy. This fixes leaked ass_font_t struct. Without this, font pointers obtained from ass_font_new() and ass_font_cache_find() were different, and bitmaps rendered with the first one could not be located in the cache later. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23230 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) commit 679d3373a3081317891c6f4f54d056d0cb1a39b7 Author: eugeni Date: Thu May 3 19:13:54 2007 +0000 Make cache_*_add functions return the pointer to new (copied) value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23229 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 15 ++++++++------- libass/ass_cache.h | 8 ++++---- 2 files changed, 12 insertions(+), 11 deletions(-) commit adcfa955d8d8468b5372dd02355349a0cb3ac169 Author: eugeni Date: Wed May 2 10:15:12 2007 +0000 Always deallocate glyphs. Fixes memory leak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23208 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit 115dee0e6ff3098727ffb80de8fa05790564179d Author: eugeni Date: Tue May 1 15:54:00 2007 +0000 Update comments. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23197 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 36 +++++++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 11 deletions(-) commit fc60946b84bee8228be51aa231f1730819b40a07 Author: eugeni Date: Tue May 1 15:34:08 2007 +0000 Cosmetics. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23196 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit e86984a78e2765da7fb046c9f0ba9c867b608778 Author: eugeni Date: Tue May 1 15:33:06 2007 +0000 Move glyph_to_bitmap() call and outline glyph deallocation to get_bitmap_glyph(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23195 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 52 +++++++++++++++++++++----------------------------- 1 files changed, 22 insertions(+), 30 deletions(-) commit 07a37c0f6c00dc8512aca0461b76dc5f1166d37f Author: eugeni Date: Tue May 1 15:21:34 2007 +0000 Minor code simplification. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23193 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) commit bea23320d4247b5e997c438d06ebeb818074b287 Author: eugeni Date: Tue May 1 15:14:22 2007 +0000 Move get_bitmap_glyph() call to a separate loop. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23192 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commit 309c113b399c4180df55675ac98a5b79e8d62dd5 Author: eugeni Date: Tue May 1 15:12:36 2007 +0000 Move transform_3d() call to get_bitmap_glyph(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23191 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) commit 85ce071b3777f6bb41f3df73c64618492e2a0ef5 Author: eugeni Date: Tue May 1 15:07:41 2007 +0000 Make a function static. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23190 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 95e71b09e5f581f3ff93b8d1649d6503061a366b Author: eugeni Date: Tue May 1 15:05:20 2007 +0000 Don't recalculate rotation radius. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23189 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 7c7e7f13f7c85740354337919fa8384b416dee0d Author: eugeni Date: Tue May 1 14:29:28 2007 +0000 Bugfix: glyph cache depends on border width, because it contains outline_glyph (glyph border obtained with FT_Glyph_StrokeBorder) since r23043. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23188 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.h | 1 + libass/ass_render.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) commit c113cc173e4f94fb4cb1af603ee26c58ff93bf1d Author: eugeni Date: Fri Apr 27 14:25:36 2007 +0000 Add -ass-hinting option for setting font hinting method. It is possible to separately configure hinting for scaled and unscaled osd. The default is native hinter for unscaled osd (only vo_gl at this point), no hinting for vf_ass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23152 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.h | 8 ++++++++ libass/ass_font.c | 12 ++++++++++-- libass/ass_font.h | 2 +- libass/ass_mp.c | 9 ++++++++- libass/ass_mp.h | 3 ++- libass/ass_render.c | 11 ++++++++++- 6 files changed, 39 insertions(+), 6 deletions(-) commit 13d73e231d48da28459f1be4d7a274e4b38ed553 Author: eugeni Date: Fri Apr 27 14:18:44 2007 +0000 Fix division by zero in "\t" parsing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23151 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) commit b95a3ee1b5f11a2629ce05ab86e5926d6ff1e5b0 Author: eugeni Date: Tue Apr 24 17:36:03 2007 +0000 Do not use FT_Glyph_Copy with NULL glyphs. Contrary to the docs, it leaves garbage in *target. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23104 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) commit 2d49463a2b1f01394b21bde21e8bad066bffbdc3 Author: eugeni Date: Sat Apr 21 11:02:49 2007 +0000 Deallocate glyphs in a separate loop. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23054 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit d489827db29c2da671c560bcb07e6082687fe7ce Author: eugeni Date: Sat Apr 21 10:56:28 2007 +0000 Always deallocate glyphs. Fixes a memory leak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23053 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit 568ac27cd58b66b15af86dba119232d93290b3a4 Author: eugeni Date: Sat Apr 21 10:43:19 2007 +0000 Reset outline glyph cache when configuration changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23052 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit ca130da50695efb041bcda1dfb4158866edc35a5 Author: eugeni Date: Sat Apr 21 10:42:10 2007 +0000 Scale camera distance. Otherwise perspective does not look the same in fullscreen. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23051 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit f56e9e8008544acc1c7bce6a3e3ed104218fa20c Author: eugeni Date: Fri Apr 20 23:25:30 2007 +0000 Remove unused variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23049 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit fe9fca807a133c4b83cb245fa0c16bfca3b6dbd8 Author: eugeni Date: Fri Apr 20 23:23:32 2007 +0000 Cosmetics. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23048 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) commit d517733485b0a0e6213d9ebdc9c2d13e4798606c Author: eugeni Date: Fri Apr 20 23:23:00 2007 +0000 Allow caching of rotated glyphs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23047 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) commit bf5f0dd91b865b6c2bb65d38b3f94cb40c93757d Author: eugeni Date: Fri Apr 20 23:19:23 2007 +0000 Add shift_[xy] (vector that is added to the glyph before transformation) to bitmap glyph key. Result of rotation depends on them because of perspective transformation. They are only set when some rotation take place. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23046 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.h | 3 +++ libass/ass_render.c | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) commit c242d459e23d96c587ac7c231291de40af285317 Author: eugeni Date: Fri Apr 20 23:16:29 2007 +0000 Fill bitmap_hash_key during parsing stage, call get_bitmap_glyph() much later. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23045 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) commit 09aee3d4c2d239f3febeb3b160b2a05a371210f8 Author: eugeni Date: Fri Apr 20 23:14:12 2007 +0000 Remove bbox and advance vector from bitmap cache. They are now available from glyph cache. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23044 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.h | 2 -- libass/ass_render.c | 6 ------ 2 files changed, 0 insertions(+), 8 deletions(-) commit 2e3b3bead40cf2841a69c1e3662fd2d63f861134 Author: eugeni Date: Fri Apr 20 23:13:34 2007 +0000 Store outline_glyph (glyph border) in glyph cache. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23043 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 1 + libass/ass_cache.h | 1 + libass/ass_render.c | 18 ++++++++++-------- 3 files changed, 12 insertions(+), 8 deletions(-) commit 361837ce865bf405fb3b7c52286f220b5058b1f3 Author: eugeni Date: Fri Apr 20 23:12:19 2007 +0000 Cosmetics: reindentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23042 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 0207ae0f0e585e8ab68b9b95591e2d891c426ca8 Author: eugeni Date: Fri Apr 20 23:11:39 2007 +0000 Because of the outline glyph cache it is now possible for glyph_info_t to have both non-zero glyph and bitmap at the same time. In that case, bitmap should not be generated anew. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23041 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commit ad23f2b2ca90b1ab5e246a59e2e2cdfec53dcf3d Author: eugeni Date: Fri Apr 20 23:10:33 2007 +0000 Make get_*_glyph return void. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23040 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) commit c09abdea937177a94fcd4241d91bfb27a8e72a78 Author: eugeni Date: Fri Apr 20 23:09:48 2007 +0000 Move outline glyph generation to a separate function, using outline glyph cache. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23039 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 94 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 60 insertions(+), 34 deletions(-) commit 59e2832c4cd22dd9e3bf487b55634faa85a02624 Author: eugeni Date: Fri Apr 20 23:09:06 2007 +0000 Oops, fix compilation broken in r23037. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23038 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a629c546051ef300a7a386e754e83cab4303a1ad Author: eugeni Date: Fri Apr 20 23:06:12 2007 +0000 Collect hit/miss statistic in hash map, and print in -v mode. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23037 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) commit 1d5be8dac6b7eb85ce37aa22a12b4e5b8193813a Author: eugeni Date: Fri Apr 20 23:04:21 2007 +0000 Add outline glyph cache (unused yet). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23036 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ libass/ass_cache.h | 22 ++++++++++++++++++++++ 2 files changed, 68 insertions(+), 0 deletions(-) commit 9539a14229280b03817b59ce8053327a19dd55fa Author: eugeni Date: Fri Apr 20 23:02:20 2007 +0000 Rename glyph cache to bitmap cache. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23035 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 36 ++++++++++++++++++------------------ libass/ass_cache.h | 27 +++++++++++++-------------- libass/ass_render.c | 18 +++++++++--------- 3 files changed, 40 insertions(+), 41 deletions(-) commit b75201782a04de81810ac34c133ae91bffd587a8 Author: eugeni Date: Fri Apr 20 23:00:30 2007 +0000 Add generic hash map implementation. Reimplement both font cache and glyph cache on top of it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23034 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 287 ++++++++++++++++++++++++++++++---------------------- libass/ass_cache.h | 12 ++ 2 files changed, 179 insertions(+), 120 deletions(-) commit d9a142a827487c9ce22e299bbd3dc3634b82113c Author: eugeni Date: Fri Apr 20 22:57:55 2007 +0000 A meaningless cosmetic change. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23033 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 5a51a3af5e0d1c59afd3382224b85c8d3dff7174 Author: eugeni Date: Fri Apr 20 22:56:42 2007 +0000 Add perspective projection. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23032 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) commit 4932c91ce6c5cdb31418dfc3a1c78f65e19f890c Author: eugeni Date: Fri Apr 20 22:55:28 2007 +0000 Applying transformation matrix to the glyph and the shift vector separately is incorrect. Instead, it should be applied to translated glyph. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23031 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 46 ++++++++++++++++++++-------------------------- 1 files changed, 20 insertions(+), 26 deletions(-) commit e9ac1550c34eb8fe1d75f7f0ef22abdf645e8b3f Author: eugeni Date: Fri Apr 20 22:51:19 2007 +0000 Cosmetics: reindentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23030 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) commit bfc6644b94de185dddd0eaf23ac5d6893438901a Author: eugeni Date: Fri Apr 20 22:49:48 2007 +0000 Disable caching of rotated glyphs. The following commits will add perspective distortion to the glyphs rotated with \frx and \fry. Somewhere along the way correct caching of such glyphs will become impossible, but in the end everything will be fine. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23029 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit fd5e59d0128f52b2f638fe8e3915f712a7847287 Author: eugeni Date: Fri Apr 13 13:46:49 2007 +0000 Fix a stupid bug in r22473: bbox is zero-filled everytime when a glyph is found in the cache. This leads to broken karaoke (some glyphs are not highlighted at all), and, probably, slightly incorrect linebreaks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22986 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) commit 2e3a2837c9e84f1925c7353aa11268a1e606a1b4 Author: eugeni Date: Tue Apr 10 17:54:02 2007 +0000 Remove unused includes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22965 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_utils.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 552df527f5769819e0548af6cecbafee9ed62ed1 Author: eugeni Date: Tue Apr 10 17:53:41 2007 +0000 Don't check if user-supplied default font path exists. It is checked in FT_New_Face anyway. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22964 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) commit 2af21936a81c9cfa44b5ca308ecc2be37cdcd387 Author: eugeni Date: Sat Apr 7 13:32:51 2007 +0000 Fix lost hard linebreaks in libass by repeating the loop when both soft and hard linebreaks are about to be added. Original message: http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2007-April/050876.html Patch by Jindrich Makovicka /makovick gmail com/ git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22931 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit 761f68bfbef6d892c4ee15a5226c0aa27433112e Author: uau Date: Sun Apr 1 21:59:54 2007 +0000 "()" to "(void)" function param list fixes patch from Stefan Huehner, stefan huehner org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22904 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 2 +- libass/ass_bitmap.h | 2 +- libass/ass_mp.c | 2 +- libass/ass_mp.h | 2 +- libass/ass_render.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) commit 3f202c6bb821dc621cd64b3f939cbce6a02d773d Author: iive Date: Sat Mar 31 20:58:14 2007 +0000 Use FT_Glyph_StrokeBorder to render only the outside border. Workarounds gaps between glyph and glyph border when rendering some fonts with freetype below 2.1.10 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22863 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 3378dfb99586b03d084f352bd63b20f364ffc658 Author: diego Date: Thu Mar 15 12:13:35 2007 +0000 Remove unnecessary include from CFLAGS. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22606 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/Makefile | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 0d23289ccd799bac186f0374467f7b69c8d6d9e7 Author: diego Date: Tue Mar 13 21:55:23 2007 +0000 cosmetics: Fix indentation, reorder some lines for consistency. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22549 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/Makefile | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) commit 0557970093fd2cdcca69b3bd7c02ef7fb8210169 Author: diego Date: Tue Mar 13 12:10:57 2007 +0000 Give more descriptive names to the source and library variables and split between common, MPlayer-specific and MEncoder-specific parts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22546 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 6eff5697625c09c6435bd50d76e8b1e0fcbfade9 Author: eugeni Date: Tue Mar 6 10:00:53 2007 +0000 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 libass/ass_render.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) commit 7b48fb88484603d7445f02265a4f3defe1f1165b Author: eugeni Date: Tue Mar 6 09:59:53 2007 +0000 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 libass/ass_render.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 1afca928d7cb07963225148d3bd626fb77163c12 Author: eugeni Date: Tue Mar 6 09:31:12 2007 +0000 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 libass/ass_render.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 554f2d80b7e4c5c9a6cf3dfb9a86ef6325c61ca3 Author: eugeni Date: Sat Mar 3 08:20:00 2007 +0000 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 libass/ass_render.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit dc44b6eb612a6a5786310cc35197d8e3271bb908 Author: eugeni Date: Fri Mar 2 17:59:19 2007 +0000 10l: x2scr used twice instead of y2scr. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22415 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 08463d812440e451b9f36d1e3b0698d4f7ea29f7 Author: eugeni Date: Fri Mar 2 17:54:47 2007 +0000 Bugfix: transform origin to screen coordinates. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22414 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 1feac5b1905bb816cfec2db923579738fb79a71a Author: uau Date: Fri Feb 23 03:08:54 2007 +0000 Fix \a parsing broken in r22291 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22321 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e74ffb8d6c412264703894d7146945dd968b70c1 Author: eugeni Date: Thu Feb 22 15:48:37 2007 +0000 Add some missing includes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22310 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 1 + libass/ass_fontconfig.c | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) commit 8b6d04d120bb05f2ca662e0c87301ee95fb5fbd6 Author: eugeni Date: Wed Feb 21 09:25:52 2007 +0000 Oops, forgot {} before "else". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22300 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit b9bc825e3e32cb6bd3395b4224ba2d155e63ec22 Author: eugeni Date: Tue Feb 20 17:22:34 2007 +0000 Cosmetics: fix indentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22294 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) commit 79a006d750edbba0dc13eaa76bc92e4c8dc5008f Author: eugeni Date: Tue Feb 20 17:20:21 2007 +0000 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 libass/ass_render.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 8a468795afbe2770880d5e9ab238d95a40927c27 Author: eugeni Date: Tue Feb 20 17:17:51 2007 +0000 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 libass/ass_render.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) commit 4c2ed03d5a84d45164a76d7ce1cd69c702b60e1c Author: eugeni Date: Tue Feb 20 16:37:18 2007 +0000 \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 libass/ass_render.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) commit 49b38497c29bb7101e53aa5a38d67ea1642109aa Author: eugeni Date: Tue Feb 20 16:20:55 2007 +0000 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 libass/ass_render.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) commit 84ccac186955ec45d9ef9f2839e437c56014d321 Author: eugeni Date: Mon Feb 19 20:10:55 2007 +0000 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 libass/ass.c | 3 +++ libass/ass_render.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) commit cc635086921326465c6eb7fd0d4fa8ba17b52c68 Author: eugeni Date: Mon Feb 19 19:01:45 2007 +0000 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 libass/ass_render.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit e6f67fcc0511e872d3422e29fa9783bc24d503cd Author: eugeni Date: Mon Feb 19 18:37:54 2007 +0000 Fix bounding box calculation with \fscx/\fscy. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22279 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit 50b186350b086da1fd67bb3bb561e16a7f244f9a Author: eugeni Date: Mon Feb 19 18:31:05 2007 +0000 Fix \fscx/\fscy animation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22278 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit a36155e6c566610233511c892378a1be870142f4 Author: eugeni Date: Mon Feb 19 18:01:49 2007 +0000 Correct implementation of text spacing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22277 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 4 ++-- libass/ass_render.c | 14 +++++++------- libass/ass_types.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) commit a9af1001eb2a28517b7510f6b5f0e1570b731840 Author: eugeni Date: Mon Feb 19 17:44:29 2007 +0000 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 libass/ass_render.c | 48 +++++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 23 deletions(-) commit 736d30d02fca8a6689603c28c8b4da62b583be17 Author: eugeni Date: Fri Feb 16 23:18:47 2007 +0000 Restore a minus sign that was lost in r22231. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22239 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 107f97739c61a8a7d5c8764474212f2697c0086a Author: eugeni Date: Fri Feb 16 17:54:47 2007 +0000 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 libass/ass_cache.c | 3 + libass/ass_cache.h | 2 +- libass/ass_render.c | 126 ++++++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 108 insertions(+), 23 deletions(-) commit 9a8f6a9729238063fe5fa002cabb870fd4960f21 Author: eugeni Date: Fri Feb 16 17:51:07 2007 +0000 Consistently name z-axis rotation angle "frz". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22232 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.h | 2 +- libass/ass_render.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) commit 9801dc05977c9fef203dacee72ded221c7c36f1a Author: eugeni Date: Fri Feb 16 17:49:35 2007 +0000 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 libass/ass_render.c | 34 +++++++++++++++++----------------- libass/ass_utils.h | 26 ++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 17 deletions(-) commit 5769ecba8ee5552c4fb08db52753942757a06cb1 Author: eugeni Date: Thu Feb 15 22:03:09 2007 +0000 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 libass/ass_font.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) commit 62c3b2b28979c22e0daff4512783e1185f406382 Author: eugeni Date: Thu Feb 15 21:53:28 2007 +0000 \r resets \frz to style value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22227 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d1532ad3648aebaee1c54015e1d5d7436805c081 Author: eugeni Date: Thu Feb 15 21:51:51 2007 +0000 Fix \t(\frz) handling. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22226 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) commit ed1d387afd0424f8947b9d6efb765857ca7ac5a8 Author: eugeni Date: Thu Feb 15 21:50:21 2007 +0000 \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 libass/ass_render.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit 19ab3f9ae3760239dc045f8f1f5378b1c89d0e59 Author: eugeni Date: Mon Jan 29 17:08:29 2007 +0000 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 libass/ass_render.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) commit 63757b4408b2a54c955fff2655fb4359c3d97df9 Author: reimar Date: Sun Jan 7 16:07:45 2007 +0000 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 libass/ass_mp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9182f72ad5fa34456174291bdf050d9105483e6e Author: eugeni Date: Sun Dec 17 12:35:12 2006 +0000 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 libass/ass_mp.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit e8a27ac3e57bcb07f153494e38aa1abd0781a49a Author: eugeni Date: Sun Dec 17 12:00:55 2006 +0000 Update some comments. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21646 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 31 +++++++++++++++++++++++++++++++ libass/ass_fontconfig.c | 18 ++++++++++++------ 2 files changed, 43 insertions(+), 6 deletions(-) commit f5e545f04972c39dedce19b15db8e143f7fb22d3 Author: eugeni Date: Sat Dec 16 19:35:48 2006 +0000 Cosmetics: fix indentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21636 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) commit f013553a39da1fe815e4788de05bd9cedd8f6a98 Author: eugeni Date: Sat Dec 16 19:34:00 2006 +0000 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 libass/ass_font.c | 80 ++++++++++++++++++++++++++++++++++---------------- libass/ass_font.h | 5 ++- libass/ass_render.c | 2 +- 3 files changed, 59 insertions(+), 28 deletions(-) commit ae47f49776d57148a7715fb8f9629577741812a4 Author: eugeni Date: Sat Dec 16 19:29:33 2006 +0000 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 libass/ass_font.c | 20 ++++++++------------ libass/ass_font.h | 2 -- 2 files changed, 8 insertions(+), 14 deletions(-) commit d50355db9615c6d4ebe8a40ac1dc5bdbc3d408eb Author: eugeni Date: Sat Dec 16 19:28:21 2006 +0000 Remove a mistakenly committed debug printf. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21633 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit f7090ec30090a4c58017760bc5e46e382060b34f Author: eugeni Date: Sat Dec 16 19:24:01 2006 +0000 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 libass/ass_font.c | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) commit 4d8d29cbbd04df069779e16c50e65902f5c76355 Author: eugeni Date: Sat Dec 16 19:19:27 2006 +0000 Avoid "pointer targets differ in signedness" warnings. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21631 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 2 +- libass/ass_fontconfig.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit 480ebb8a0ad161f8fc3c1e32389d22c084b387d2 Author: eugeni Date: Sat Dec 16 19:17:50 2006 +0000 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 libass/ass_font.c | 32 ++++++++++++++++++++++++++++++++ libass/ass_font.h | 2 ++ libass/ass_render.c | 42 +++++++++--------------------------------- 3 files changed, 43 insertions(+), 33 deletions(-) commit 44b83998075b66c2733c1186fbcd64ea7b2af192 Author: reimar Date: Tue Dec 12 20:29:30 2006 +0000 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 libass/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9a9d2a6153db6059166b82a2901e9f480ed5199e Author: eugeni Date: Wed Dec 6 18:44:26 2006 +0000 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 libass/ass.h | 2 +- libass/ass_mp.h | 5 +++ libass/ass_render.c | 94 +++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 90 insertions(+), 11 deletions(-) commit 3f8822971af85613de0781aac6af34b69d558e4c Author: reimar Date: Wed Dec 6 10:11:23 2006 +0000 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 libass/ass_library.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit 5071a6ffbb6a70f91cacaca8fd1f31c90e8792a6 Author: eugeni Date: Sun Dec 3 18:24:11 2006 +0000 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 libass/ass_font.c | 22 +++++++++++++++++++++- libass/ass_font.h | 2 +- libass/ass_fontconfig.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- libass/ass_fontconfig.h | 2 +- libass/ass_render.c | 4 ++-- 5 files changed, 67 insertions(+), 9 deletions(-) commit 42f148ad6df836a2e6a83c447a7e50bb390608ae Author: eugeni Date: Sun Dec 3 17:59:13 2006 +0000 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 libass/ass.c | 80 ---------------------------------------- libass/ass.h | 2 +- libass/ass_cache.c | 1 + libass/ass_font.c | 2 + libass/ass_fontconfig.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++- libass/ass_fontconfig.h | 2 +- libass/ass_library.c | 16 ++++++++ libass/ass_library.h | 9 ++++ libass/ass_render.c | 2 +- 9 files changed, 123 insertions(+), 85 deletions(-) commit f42b7ecef4f291847b8c813d8ec160fd2c316e73 Author: eugeni Date: Sun Dec 3 17:35:40 2006 +0000 Rename: ass_process_font -> ass_add_font. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21471 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 6 +++--- libass/ass.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) commit ccb0631375bd98c52c1ff6e558689b97591dd154 Author: eugeni Date: Sun Dec 3 16:10:23 2006 +0000 Avoid calling validate_fname() twice for one string. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21469 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) commit 8268e503020136bc523c01e7783fad8d810fa3a2 Author: eugeni Date: Tue Nov 28 22:50:02 2006 +0000 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 libass/ass_font.c | 55 +++++++++++++++++++++++++++++++++++++++ libass/ass_font.h | 7 +++++ libass/ass_fontconfig.c | 65 ++++++++++++++++++++++++++++++++++++---------- libass/ass_fontconfig.h | 8 ++++++ 4 files changed, 121 insertions(+), 14 deletions(-) commit e6eaaab9623a693fc914cfdb89264cbc790a5b9b Author: eugeni Date: Tue Nov 28 22:44:40 2006 +0000 Skip glyphs with char code < 0x20. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21366 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit f52c69d62df39dcbec4bdb9673b28a4b86b464cb Author: eugeni Date: Tue Nov 28 22:20:24 2006 +0000 Add FT_Library to ass_font_t. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21365 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 1 + libass/ass_font.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) commit 3e13c098887cef24308a86150221428ce33a5c61 Author: eugeni Date: Tue Nov 28 22:17:33 2006 +0000 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 libass/ass_cache.c | 6 +++--- libass/ass_cache.h | 4 ++-- libass/ass_render.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) commit ce96451ea68581afc68e5d8c54a0fb3936b8a745 Author: eugeni Date: Mon Nov 27 17:56:49 2006 +0000 Don't include freetype headers in other headers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21339 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.h | 5 ----- libass/ass_font.h | 5 ----- 2 files changed, 0 insertions(+), 10 deletions(-) commit cd9548f8986a58095c261f4dabcba055272e4b92 Author: eugeni Date: Mon Nov 27 17:53:33 2006 +0000 Fix compilation broken in previous commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21338 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 2 +- libass/ass_render.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit f7ba0f825d1bfc4fbe09248419c6b21ab90e1cf4 Author: eugeni Date: Mon Nov 27 17:50:05 2006 +0000 Move ass_font_desc_t and ass_font_t declarations to ass_font.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21337 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.h | 17 ----------------- libass/ass_font.c | 2 ++ libass/ass_font.h | 17 +++++++++++++++-- 3 files changed, 17 insertions(+), 19 deletions(-) commit 5df4e2e2bbcd5685e45ba93fda11fd38ebf33205 Author: eugeni Date: Mon Nov 27 17:34:47 2006 +0000 Cosmetics: reindent. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21336 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) commit c7080f7b2f865d92eed8e807c87f91146161058e Author: eugeni Date: Mon Nov 27 17:33:59 2006 +0000 Don't call FT_Set_Transform/FT_Set_Pixel_Sizes if values have not changed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21335 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) commit ccb0a1a543cedd23cd5deab6310c92080d0a9564 Author: eugeni Date: Mon Nov 27 17:13:52 2006 +0000 Move ass_font_t allocation to ass_font.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21333 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 41 +++++++++++++++++++++-------------------- libass/ass_cache.h | 3 ++- libass/ass_font.c | 15 ++++++++++++--- libass/ass_font.h | 2 +- libass/ass_render.c | 2 +- 5 files changed, 37 insertions(+), 26 deletions(-) commit 7270b3f0f663a81574907f7e18713b2afeaa92d1 Author: eugeni Date: Mon Nov 27 16:21:10 2006 +0000 Initialize font size with 0. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21330 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_font.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 4dcceaf3695d1bb2f3dff4e4cd4edc0ff36254e1 Author: eugeni Date: Sun Nov 26 22:53:52 2006 +0000 Remove obsolete "no_more_font_messages" hack. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21295 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 2 -- libass/ass_font.c | 6 +----- libass/ass_fontconfig.c | 11 ++++------- libass/ass_render.c | 2 -- 4 files changed, 5 insertions(+), 16 deletions(-) commit 8a9fdef48d4557b4140f61cd06ba922f3bb3804e Author: eugeni Date: Sun Nov 26 22:49:27 2006 +0000 Move fonts-related code to a separate file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21293 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/Makefile | 1 + libass/ass_cache.c | 48 +++--------------- libass/ass_cache.h | 3 + libass/ass_font.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++ libass/ass_font.h | 38 ++++++++++++++ libass/ass_render.c | 37 +++---------- 6 files changed, 197 insertions(+), 69 deletions(-) commit e88f1fa787abc0a1ef4acef23699a95288a4c98e Author: eugeni Date: Sun Nov 26 20:53:29 2006 +0000 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 libass/ass_cache.c | 25 ++++++++++++------------- libass/ass_cache.h | 2 +- libass/ass_render.c | 44 ++++++++++++++++++++------------------------ 3 files changed, 33 insertions(+), 38 deletions(-) commit 9d738ea60d060246d9f5fafe03d6233922c4421b Author: eugeni Date: Sun Nov 26 20:38:06 2006 +0000 Move ass_font_t to header. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21282 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 8 -------- libass/ass_cache.h | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-) commit 7b647fb09a9e1bea3d157b1a269f48cd0ba1c6d6 Author: eugeni Date: Sun Nov 26 20:34:54 2006 +0000 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 libass/ass_cache.c | 48 ++++++++++++++++++++++++------------------------ libass/ass_cache.h | 10 +++++----- libass/ass_render.c | 8 ++++---- 3 files changed, 33 insertions(+), 33 deletions(-) commit 1d0153ac6134272ee642dc7157aef71344b4492b Author: diego Date: Sun Nov 26 18:12:36 2006 +0000 Merge common parts of all Makefiles into one file included by all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21275 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/Makefile | 34 ++-------------------------------- 1 files changed, 2 insertions(+), 32 deletions(-) commit 26f5c41176ef449c29765a765fd6f903e4ca91db Author: diego Date: Sat Nov 25 17:06:08 2006 +0000 SRCS should be one per line to make patches more readable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21229 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/Makefile | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) commit 159335690a75a4c64401bef5b1be3b40dcae112a Author: diego Date: Sat Nov 25 17:02:52 2006 +0000 Remove pointless indirection. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21227 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/Makefile | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) commit 0bae4d0a25a08007e735002105353ab1278eca97 Author: diego Date: Sat Nov 25 16:12:36 2006 +0000 Remove superfluous comment. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21222 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/Makefile | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) commit 9b7a47225389d08446b0be26bdbffd7e9d1e8fda Author: eugeni Date: Mon Nov 20 17:13:19 2006 +0000 Cosmetics: remove unneeded curly brackets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21114 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) commit ddd3ed2a1e8bc30a8cb6f24077421c2c9ac72b59 Author: eugeni Date: Mon Nov 20 17:10:18 2006 +0000 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 libass/ass_render.c | 33 ++++++++++++--------------------- 1 files changed, 12 insertions(+), 21 deletions(-) commit 3808991e8917cb7d36b290c853645223034e8913 Author: diego Date: Mon Nov 20 11:18:01 2006 +0000 Unify dep/depend targets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21096 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/Makefile | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) commit b973f6aec3bb522c72fd44697c9868515a013a20 Author: kraymer Date: Sun Nov 19 22:35:17 2006 +0000 MSGTRs for libass git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21082 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 30 +++++++++++++++--------------- libass/ass_bitmap.c | 4 ++-- libass/ass_cache.c | 4 ++-- libass/ass_fontconfig.c | 25 ++++++++++++------------- libass/ass_render.c | 32 ++++++++++++++++---------------- libass/mputils.h | 1 + 6 files changed, 48 insertions(+), 48 deletions(-) commit d3a8f7b09d06e2965b1157e920c38e773e8cb5a4 Author: eugeni Date: Sun Nov 19 00:41:00 2006 +0000 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 libass/ass.c | 7 +------ libass/ass_bitmap.c | 3 +-- libass/ass_cache.c | 2 +- libass/ass_fontconfig.c | 2 +- libass/ass_render.c | 5 +---- libass/ass_utils.c | 2 +- libass/mputils.h | 10 ++++++++++ 7 files changed, 16 insertions(+), 15 deletions(-) commit 23be2015693ec2af94623627f9b08828b59aee76 Author: eugeni Date: Mon Nov 13 16:49:32 2006 +0000 Support \t with acceleration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20891 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commit 0699a8640056535901a9aabec58e909ce7ae54ef Author: eugeni Date: Mon Nov 13 16:35:15 2006 +0000 Partial fix for semitransparent glyph outlines. This fix removes semitransparent area (less then pixel width) between glyph and it's outline. Instead, it makes them overlap a little. It usually looks much better this way. Complete fix seems impossible with the current output format (single color alpha bitmaps). The right way is to blend both glyph and outline into one bitmap so that 2 pixels with 50% transparency produce a fully solid one. This requires RGBA bitmap output from libass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20890 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit cb4d2cf57e5e5aabe6c947cfcb410c6ba95b7a81 Author: eugeni Date: Wed Nov 8 18:57:40 2006 +0000 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 libass/ass_render.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 2ee26395552e6ebbc40a4e404a484805f1260d1d Author: eugeni Date: Mon Nov 6 20:09:28 2006 +0000 Bugfix: when copying ass_force_style_list, ending 0 was left out. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20738 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_library.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit b9116997ce1fa3e0b4726fa8a5533c6c11f39bfc Author: eugeni Date: Mon Nov 6 02:47:57 2006 +0000 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 libass/ass_render.c | 51 +++++++++++++++------------------------------------ 1 files changed, 15 insertions(+), 36 deletions(-) commit e2ab5ea8df5f2cb37cb2ec2f16d7d52e3cc1fb6e Author: eugeni Date: Sun Nov 5 18:56:31 2006 +0000 Initialize fontconfig in VFCTRL_INIT_EOSD handler. Recent libass api changes moved fontconfig initialization to filter's config() function. It is bad, because cache update can take a long time, resulting in unpleasant sound effects. This change restores the original behaviour. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20722 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 4 +++- libass/ass_mp.h | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) commit 0414ca0be3951dac63759596f223c0297077302f Author: eugeni Date: Sun Nov 5 18:21:39 2006 +0000 Cosmetics: indentation fix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20718 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) commit 3e4c068bf481370ed6da26005691cd9c6d962d05 Author: eugeni Date: Sun Nov 5 17:26:55 2006 +0000 Fix the following compiler warnings: ass.c:999: warning: unused variable 'i' ass.c:1041: warning: pointer targets in assignment differ in signedness ass.c:1043: warning: pointer targets in assignment differ in signedness git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20714 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit a5876880e6030067e4879fd1815234c313028ed6 Author: eugeni Date: Sat Nov 4 17:58:09 2006 +0000 More precise bounding box calculation for karaoke effects. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20669 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) commit eed98361befc05a44bae35f68a6348e49b9ecabc Author: eugeni Date: Fri Nov 3 23:11:00 2006 +0000 Prefer microsoft-specific charmaps to all other. There are some fonts with both 'Unicode' and 'Microsoft/Unicode' charmaps, and the second always seems to be the right choice. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20653 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) commit 8fccf229c3f4f7b41b63ff9b5b5e950a1ed61235 Author: eugeni Date: Fri Nov 3 18:15:33 2006 +0000 Introduce MSGT_ASS, use it for all libass messages. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20645 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 60 +++++++++++++++++----------------- libass/ass_bitmap.c | 4 +- libass/ass_cache.c | 4 +- libass/ass_fontconfig.c | 26 +++++++------- libass/ass_mp.c | 2 +- libass/ass_render.c | 84 +++++++++++++++++++++++----------------------- libass/ass_utils.c | 2 +- 7 files changed, 91 insertions(+), 91 deletions(-) commit 27999bd924a853622b1fbf851f022ce84c715572 Author: eugeni Date: Fri Nov 3 02:15:08 2006 +0000 Implement loading subtitles from memory. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20619 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++------------ libass/ass.h | 9 ++++ 2 files changed, 102 insertions(+), 24 deletions(-) commit 5bf8ec2568cab4b59a5773e711fa5f6b87c4564b Author: eugeni Date: Fri Nov 3 01:41:48 2006 +0000 Bugfix: sub_recode could deallocate global sub_cp under some circumstances. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20618 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 149b0891e558136b7f590f724f1d16b31a6f46a8 Author: eugeni Date: Sun Oct 29 17:29:55 2006 +0000 Revert r20517. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20519 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 9 +++- libass/ass_bitmap.c | 117 +-------------------------------------------------- libass/ass_render.c | 4 +- libass/ass_utils.c | 76 --------------------------------- libass/ass_utils.h | 6 --- 5 files changed, 11 insertions(+), 201 deletions(-) commit 788cdf051bdcf0b00523c4ac18665b8b1bfc80a6 Author: eugeni Date: Sun Oct 29 15:26:13 2006 +0000 Move ass_library initialization code to ass_mp.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20518 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 11 +++++++++++ libass/ass_mp.h | 1 + 2 files changed, 12 insertions(+), 0 deletions(-) commit 0e4b011fd42845dc8c87d4e0e211aede9b7d63e6 Author: eugeni Date: Sun Oct 29 15:03:30 2006 +0000 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 libass/ass.c | 9 +--- libass/ass_bitmap.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++- libass/ass_render.c | 4 +- libass/ass_utils.c | 76 +++++++++++++++++++++++++++++++++ libass/ass_utils.h | 6 +++ 5 files changed, 201 insertions(+), 11 deletions(-) commit f7bd79d23d904b115991ad32e205768d8e7116fa Author: eugeni Date: Sun Oct 29 13:59:36 2006 +0000 Fix width -> orig_width typo. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20513 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e54fb9b0a96692f4456bd4337132ebf3e7cc0501 Author: eugeni Date: Sun Oct 29 13:58:30 2006 +0000 Don't set PlayResX for plaintext subtitles. 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 libass/ass_mp.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 92ca0435da4cc134ad90a2a51a145766b485bc0b Author: eugeni Date: Sun Oct 29 13:52:51 2006 +0000 Add \N at the end of each subtitle line when converting from subdata. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20511 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit f0df4e0a5cb8352ef84f69222997711521d07037 Author: eugeni Date: Sat Oct 28 15:07:18 2006 +0000 Libass interface reworked: - 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 libass/Makefile | 2 +- libass/ass.c | 53 ++++++++++++++++++------------------ libass/ass.h | 59 +++++++++++++++++++++++++++++----------- libass/ass_library.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ libass/ass_library.h | 31 +++++++++++++++++++++ libass/ass_mp.c | 24 ++++++++++------ libass/ass_mp.h | 7 +++-- libass/ass_render.c | 66 +++++++++++++++++++++++----------------------- libass/ass_types.h | 3 ++ 9 files changed, 228 insertions(+), 89 deletions(-) commit fa66f24e5b3a28fbc74cd25968547c593b8c4165 Author: reimar Date: Sat Oct 28 10:21:30 2006 +0000 If HAVE_FONTCONFIG is not defined, font_fontconfig might be declared both extern and static, causing compilation to fail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20485 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) commit 1d3a9f492fc0d04d765384d0016b6540af7c3cff Author: eugeni Date: Fri Oct 27 16:02:44 2006 +0000 Add missing fontconfig_done() call. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20467 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 55269011a20efef1d66d3cfe2b2182ffc408c0b6 Author: eugeni Date: Thu Oct 26 20:08:46 2006 +0000 Split ass_configure() into several smaller functions. 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 libass/ass.h | 27 ++-------- libass/ass_mp.c | 28 +++++++++++ libass/ass_mp.h | 2 + libass/ass_render.c | 127 +++++++++++++++++++++++++++++++++------------------ 4 files changed, 119 insertions(+), 65 deletions(-) commit 63ffe0fbc65ca4f674267fecbb2a533c5c0e4713 Author: eugeni Date: Fri Oct 20 23:06:52 2006 +0000 Don't forget to apply scaling coefficients to kerning values. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20326 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 9778a645df94c5e77cf9afa657f2e3214ca9ad6a Author: eugeni Date: Thu Oct 19 18:08:44 2006 +0000 Fix center of rotation calculation. It was overly complex and incorrect for right- and center-aligned text. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20308 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) commit 4e04921d73ed4df34657f58e5bbaf996de613f4b Author: eugeni Date: Wed Oct 18 21:19:51 2006 +0000 Center of rotation depends on alignment. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20302 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit 3d54dcce589ca4a9b916a2999ad9e0a4dcc8cb0c Author: eugeni Date: Wed Oct 18 21:11:29 2006 +0000 Support separate rotation angle for each glyph. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20301 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) commit e9301b8dd75bbfb4268451716161322506be8ef6 Author: eugeni Date: Wed Oct 18 18:33:19 2006 +0000 Move base point calculation to a separate function. Will be reused soon. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20300 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 67 +++++++++++++++++++++++++++++++------------------- 1 files changed, 41 insertions(+), 26 deletions(-) commit 5d24873ac72511f33ccede72fe531f133869bbff Author: eugeni Date: Wed Oct 18 17:57:00 2006 +0000 Cosmetics: remove commented code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20299 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) commit 440f1563047261fc04baaf5fe9dc0666aa120aeb Author: eugeni Date: Wed Oct 18 15:52:26 2006 +0000 Fix a typo in collision detection code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20297 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9b76c73b16bf9be47dd1885aa51f7d37f4b9edd4 Author: eugeni Date: Mon Oct 16 19:02:11 2006 +0000 Remove an outdated debug message. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20275 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 0252efb13fd36499b3a109462b6f05a1c99585d0 Author: reimar Date: Sun Oct 15 13:03:43 2006 +0000 Fix crash because of last_glyph < first_glyph, probably caused by first line only consisting of '\n' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20232 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 096395fc40e48fc5c3400e72927a9c52a5e1c62c Author: eugeni Date: Sat Oct 14 14:42:23 2006 +0000 Zerofill libass static variables during initialization. Patch by Jindrich Makovicka . git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20208 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 2ed257b7af094ec107bd3b13244f67a7833b816e Author: eugeni Date: Sat Oct 14 14:35:33 2006 +0000 Free FT_Stroker during libass deinitialization. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20207 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit dfe0d989fbf1f763fd6061531d11d20d32cd6fac Author: eugeni Date: Mon Oct 9 19:57:56 2006 +0000 Reduce margins for plaintext subtitles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20144 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 774a2730873f30542adb83f35e7c5b81e52c2f4a Author: reimar Date: Sun Oct 8 13:01:14 2006 +0000 Avoid crash with fontconfig 2.3.9x (as shipped with SuSE 10.1, FcDirScan is 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 libass/ass_fontconfig.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit 8710742e9a8cfc2cd0742ab8b0fb8b81b83156a9 Author: eugeni Date: Sun Oct 1 17:09:04 2006 +0000 Add copyright notice and vim/emacs comments to libass and vf_ass.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20014 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 20 ++++++++++++++++++++ libass/ass.h | 20 ++++++++++++++++++++ libass/ass_bitmap.c | 20 ++++++++++++++++++++ libass/ass_bitmap.h | 20 ++++++++++++++++++++ libass/ass_cache.c | 20 ++++++++++++++++++++ libass/ass_cache.h | 20 ++++++++++++++++++++ libass/ass_fontconfig.c | 20 ++++++++++++++++++++ libass/ass_fontconfig.h | 20 ++++++++++++++++++++ libass/ass_mp.c | 20 ++++++++++++++++++++ libass/ass_mp.h | 20 ++++++++++++++++++++ libass/ass_render.c | 20 ++++++++++++++++++++ libass/ass_types.h | 20 ++++++++++++++++++++ libass/ass_utils.c | 20 ++++++++++++++++++++ libass/ass_utils.h | 20 ++++++++++++++++++++ 14 files changed, 280 insertions(+), 0 deletions(-) commit e84097bd90728fd769acb48c39b01eb88e50be93 Author: eugeni Date: Sun Sep 24 16:15:47 2006 +0000 Cosmetics: add some comments. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19972 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 6 ++++++ libass/ass_bitmap.h | 10 ++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) commit 5697a300a14aa46015c0138f8356068f828f81f2 Author: eugeni Date: Sun Sep 24 16:04:37 2006 +0000 Shadow support in libass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19971 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 39 ++++++++++++++++++++++++++++++--------- libass/ass_bitmap.h | 2 +- libass/ass_cache.c | 1 + libass/ass_cache.h | 1 + libass/ass_render.c | 34 ++++++++++++++++++++++++++++++---- 5 files changed, 63 insertions(+), 14 deletions(-) commit 45818975ce37920bec42b13471436725ee7a14c3 Author: eugeni Date: Sun Sep 24 15:50:31 2006 +0000 Free memory in ass_synth_done(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19968 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 6e78faf1cc04fb451187050cb8c74f3887afbb3b Author: eugeni Date: Sat Sep 23 18:35:19 2006 +0000 Reduce size of non-blurred bitmaps. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19962 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 12216f8ae3244263178b9742b29fc98eb43ac6c8 Author: eugeni Date: Sat Sep 23 17:54:24 2006 +0000 Cosmetics. Change indentation of block of code to make it consistent with the rest of the file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19961 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 74 +++++++++++++++++++++++++------------------------- 1 files changed, 37 insertions(+), 37 deletions(-) commit 9d256c7cb3013d5c86e82a83dd459aabf7c99861 Author: eugeni Date: Sat Sep 23 00:15:00 2006 +0000 Better fix_outline implementation. No more "fix_outline failed" messages, should work even with the craziest glyphs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19947 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) commit 2c7090ddc8d3ef2383a3072383bec85cdc9f43d7 Author: reimar Date: Fri Sep 22 20:47:08 2006 +0000 Fix width -> orig_width typo causing subtitles to be too far to the right for movies with vertical black bars (aspect < monitoraspect). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19946 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 5be11ce40a4cc2483695ea1ea7def706b34239f8 Author: eugeni Date: Fri Sep 22 18:56:09 2006 +0000 Move calculation of text parameters (number of lines, height, etc.) from 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 libass/ass_render.c | 57 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 36 insertions(+), 21 deletions(-) commit 1daa84aecfcade27e09e114263d266bef024b507 Author: eugeni Date: Fri Sep 22 18:47:29 2006 +0000 Move variable declaration to a more deeply nested block. It is not used outside of it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19937 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit d539e6cf7a55f0e337113ba4b22213f6e15b67b3 Author: eugeni Date: Thu Sep 21 22:37:42 2006 +0000 Cosmetics: fix indentation after last commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19925 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) commit e31a69721efc33d3dce837df02bb89eaabde6ff0 Author: eugeni Date: Thu Sep 21 22:36:47 2006 +0000 Fix FT_Stroker use in libass. The previous variant ended up with 0-width outline in some cases. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19924 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 46 ++++++++++++++++++---------------------------- 1 files changed, 18 insertions(+), 28 deletions(-) commit 7fb520a0f87b447fe8f8b7bc6b499b6a52319155 Author: eugeni Date: Thu Sep 21 19:31:28 2006 +0000 In r19831, font size multiplier was mistakenly applied to border width. Fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19923 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commit 5be2c15e5aa58c6b5ecd37fb1006ed272979e1b4 Author: eugeni Date: Tue Sep 19 18:23:36 2006 +0000 Sort events by ReadOrder (if both layer and start time are equal). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19912 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 984aded23f394e99e540cf02c327d89810ec0abc Author: eugeni Date: Tue Sep 19 18:22:44 2006 +0000 Set ReadOrder values for external subtitles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19911 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit 68dbadc36aa7dfb505d9f610b2c78aa281b54943 Author: eugeni Date: Tue Sep 19 17:40:31 2006 +0000 Calculate text bounding box in such way that it does not depend on the height of individual glyphs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19910 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 9c1007af20d122b5f180d09a062aec653460f514 Author: eugeni Date: Tue Sep 19 13:07:45 2006 +0000 Cosmetics: fix indentation after last commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19908 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) commit 59810606eafc189b97daf80829a44e7b882b81c4 Author: eugeni Date: Tue Sep 19 13:06:44 2006 +0000 Don't call FcDirScan/FcDirSave with FontConfig >= 2.4. Font cache is updated automatically in FcConfigAppFontAddDir. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19907 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit 4201c79997245bac42667c85251a5110e974c4f0 Author: eugeni Date: Mon Sep 18 18:54:38 2006 +0000 Fix a stupid bug in list concatenation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19897 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) commit ca88c0a342b7c89a22fb0088639c1a1db075bc7f Author: eugeni Date: Sun Sep 17 15:32:01 2006 +0000 Reduce code duplication in init_render_context(). Don't use glyph stroker for borderless glyphs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19879 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 15 +++-- libass/ass_render.c | 161 ++++++++++++++++++++++++++------------------------ 2 files changed, 93 insertions(+), 83 deletions(-) commit ea439208cc34065d32ca630fac6877f3cd1d6564 Author: eugeni Date: Sat Sep 16 19:01:56 2006 +0000 Subtract glyph bitmap from outline bitmap. 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 libass/ass_bitmap.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) commit bf0cb3bdf8d4829f41f4a340e18e9603f8088f86 Author: eugeni Date: Sat Sep 16 13:32:46 2006 +0000 Add \be (blur edges) support to libass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19854 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++++- libass/ass_bitmap.h | 7 +++- libass/ass_cache.c | 1 + libass/ass_cache.h | 1 + libass/ass_render.c | 19 ++++++++- 5 files changed, 128 insertions(+), 7 deletions(-) commit 85933b51d3aec4a524a4e4119318eefb16421fa6 Author: eugeni Date: Sat Sep 16 13:08:17 2006 +0000 Store bitmap glyphs in a separate struct, instead of FreeType's internal buffer. 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 libass/Makefile | 2 +- libass/ass_bitmap.c | 91 ++++++++++++++++++++++++++++++++++++++++++++ libass/ass_bitmap.h | 14 +++++++ libass/ass_cache.c | 6 ++- libass/ass_cache.h | 4 +- libass/ass_render.c | 104 +++++++++++++++++++++----------------------------- 6 files changed, 156 insertions(+), 65 deletions(-) commit 158ddc48afdd7104d0d9a944ded9b1d01a208922 Author: eugeni Date: Wed Sep 13 15:35:10 2006 +0000 Make font outline width proportional to movie resolution. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19831 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) commit acd2e4522eaa985429aaa8a4d3c1d4a9b46c1ffd Author: eugeni Date: Wed Sep 6 17:32:31 2006 +0000 Bugfix: timing for empty karaoke words was lost, resulting in faster than normal karaoke playback. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19722 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) commit 748c413e5c42bc48662148deea9392a7595e6b3a Author: eugeni Date: Tue Sep 5 20:06:20 2006 +0000 Workaround for broken fonts with bad ascender/descender. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19699 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) commit 1b4f2ff607fb6d8ed6cf36b45b1a9826aff92ef0 Author: eugeni Date: Tue Sep 5 19:06:15 2006 +0000 Change \fad behaviour so that it does not get cancelled by \r. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19698 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) commit 3b788e9c96f156270ee7bfb447a80719bf5ef2eb Author: eugeni Date: Tue Sep 5 18:33:31 2006 +0000 Simplification. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19697 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 78 ++++++++++++++++++++++---------------------------- 1 files changed, 34 insertions(+), 44 deletions(-) commit d17f8897615842194c12e17b002f4ab15bf586b1 Author: eugeni Date: Mon Sep 4 17:55:57 2006 +0000 Add vertical clipping for subtitles that were moved because of a collision. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19670 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) commit e5fa53f60ea287253336c2bf00e053fdd6020be8 Author: eugeni Date: Mon Sep 4 17:52:28 2006 +0000 Fix possible unallocated memory read in libass line wrapping code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19669 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit ca6161d7534c8b56847dc90195d31a9400b4fb98 Author: eugeni Date: Sun Sep 3 17:57:41 2006 +0000 Apply -ass-force-style also to matroska plaintext subs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19660 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8cd837f0c76ea6a80a5bc0f8a5d8e96605bcd566 Author: eugeni Date: Sun Sep 3 17:44:25 2006 +0000 Cosmetics: restore indentation after recent changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19659 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 98 +++++++++++++++++++++++++++--------------------------- 1 files changed, 49 insertions(+), 49 deletions(-) commit c1f99ddeb10d641e5faed32a284bc9a5f64b8a4b Author: eugeni Date: Sun Sep 3 17:42:31 2006 +0000 Add -ass-styles option. It allows to load styles from a file and use them for plain text subtitles rendering. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19658 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 53 +++++++++++++++++++++++++++++++++++++++++++---------- libass/ass.h | 6 ++++++ libass/ass_mp.c | 15 +++++++++++---- libass/ass_mp.h | 1 + 4 files changed, 61 insertions(+), 14 deletions(-) commit 959013d794716739c300d853ef89c96e7c271c6f Author: eugeni Date: Sun Sep 3 17:36:29 2006 +0000 Fix last commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19657 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit cee575f93edf30bd1662cae126a27fe667039756 Author: eugeni Date: Sun Sep 3 17:25:04 2006 +0000 More checks in ass_render_event. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19656 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) commit 41247decb79ddc86b377e07061313e2a79451234 Author: eugeni Date: Sun Sep 3 17:09:53 2006 +0000 Remove unneeded variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19655 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) commit 9438d86db4c56a991cf234e19438a3e123c2f8c7 Author: eugeni Date: Sun Sep 3 12:18:49 2006 +0000 ass-color and ass-border-color options. Only plain text subtitles are affected. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19652 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 15 ++++++++++++--- libass/ass_mp.h | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) commit 8e7fe7c2c5e7d661fa63658450e9e531570833a3 Author: eugeni Date: Sat Sep 2 20:46:26 2006 +0000 Add support for rendering matroska plaintext subtitles with libass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19649 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 103 ++++++++++++++++++++++++++++++++++++++++-------------- libass/ass_mp.h | 2 + 2 files changed, 78 insertions(+), 27 deletions(-) commit b5ce3793c89430fb47e63e4460b31d2abd45c627 Author: eugeni Date: Sat Sep 2 19:21:40 2006 +0000 Don't sort events when reading external subs. With r19644, the order does not matter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19645 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) commit 8276250ea0e0b1bf589914b197ea35b650ee6820 Author: eugeni Date: Sat Sep 2 19:17:32 2006 +0000 Better collision detection algorithm. The idea is to keep a subtitle in place 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 libass/ass.c | 2 + libass/ass.h | 25 ---- libass/ass_render.c | 331 ++++++++++++++++++++++++++++++++++++++++----------- libass/ass_types.h | 4 + 4 files changed, 269 insertions(+), 93 deletions(-) commit b14a183358b97b679b42dd7470372ea3caedf500 Author: eugeni Date: Sat Sep 2 18:33:51 2006 +0000 Remove some unused code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19642 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) commit 29606774537c0fabe126c802c85cca5a20bf2e99 Author: eugeni Date: Sat Sep 2 18:10:04 2006 +0000 Read layer info from external subs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19641 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 09da6e49fb8deffa28a5e991fa9d2bbb3f174663 Author: eugeni Date: Fri Sep 1 20:36:38 2006 +0000 Make \fr* parameter a floating point value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19628 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 58f15115bd5111bde295af15027d5be420476e8c Author: eugeni Date: Thu Aug 31 22:45:20 2006 +0000 Bugfix: potential write of unallocated memory. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19618 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) commit 94ae34f3d26226bf09abd7ca83749f5cde127534 Author: eugeni Date: Thu Aug 31 20:19:19 2006 +0000 Bugfix: wrong height value used in font size calculation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19616 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a596c3150f296b98199fc4835460cb96dbe03d08 Author: eugeni Date: Tue Aug 29 21:14:57 2006 +0000 Change default font family and color for plain text subs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19598 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit eb762f9e7b36967ac9dcac98e6cec5e4385da4df Author: eugeni Date: Tue Aug 29 18:15:48 2006 +0000 Bugfix: strdup of NULL value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19594 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 6fd59f37198d3ad6b066e6e5d5150073b865576c Author: eugeni Date: Tue Aug 29 10:35:58 2006 +0000 Apply -ass-force-style also to tracks generated from subdata. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19590 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 2 +- libass/ass_mp.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) commit 8cb5bde41ec92600a737fb49d77a00a881ca7f6d Author: eugeni Date: Mon Aug 28 16:59:29 2006 +0000 Ignore '*' at the beginning of style name. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19573 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 2f8c7381ca66785d5dc0a9a3d4feaba560f7203b Author: eugeni Date: Mon Aug 28 16:43:17 2006 +0000 Fix font scaling taking margins into account. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19572 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 6361dbbda5ef9ffc9c5fdb6a69112bb07c847d85 Author: eugeni Date: Mon Aug 28 15:12:45 2006 +0000 Add -(no)ass-use-margins option. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19569 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 1 + libass/ass_mp.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) commit d3099e4751d7d48d4b2debc64077ce19855f33e1 Author: eugeni Date: Sun Aug 27 22:15:46 2006 +0000 Cosmetics: fix indentation after r19562. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19563 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 58 +++++++++++++++++++++++++------------------------- 1 files changed, 29 insertions(+), 29 deletions(-) commit e7ae08191449aa772dbed3b9710a7ec17cd7ee1f Author: eugeni Date: Sun Aug 27 22:12:31 2006 +0000 Transition effects support. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19562 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 135 ++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 113 insertions(+), 22 deletions(-) commit c943ffda49b0b6f4c5889b27c7ac174fe0893b56 Author: eugeni Date: Sat Aug 26 20:09:54 2006 +0000 Simplify ass_glyph_cache_reset(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19551 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) commit 0a188fde552c8fe724466953e0e85295fb17bf14 Author: eugeni Date: Sat Aug 26 19:00:21 2006 +0000 Reset glyph cache on reconfigure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19545 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 9 +++++++-- libass/ass_cache.h | 1 + libass/ass_render.c | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) commit cfdd0e925e8111496b57832c1d71ad7b0ea5dcb7 Author: eugeni Date: Sat Aug 26 18:24:37 2006 +0000 Add right and left margins support to libass. Add ability to not use margins even when they are available. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19544 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.h | 4 ++++ libass/ass_render.c | 18 ++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) commit b4e7896b7db939c4890d820f0b41c847ca3a9b20 Author: eugeni Date: Thu Aug 24 15:38:28 2006 +0000 Fix previous commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19524 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e7bd9034b9cdd90981906e331b20c122d41744ad Author: eugeni Date: Thu Aug 24 15:36:20 2006 +0000 Simplify vf_ass initialization. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19523 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) commit 18187165506761918e8e2dc31c0b2ab3b5e0a463 Author: eugeni Date: Tue Aug 22 23:20:05 2006 +0000 New cmdline option: -ass-force-style. Allows overriding any style parameter from command line. Idea and original patch by Konstantin G. Khlebnikov { koct9i aT gmail doT com }. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19501 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- libass/ass_mp.c | 1 + libass/ass_mp.h | 1 + 3 files changed, 76 insertions(+), 1 deletions(-) commit b397532f5290e7c0d67ba298bd4a9851bafa62af Author: eugeni Date: Tue Aug 22 22:11:01 2006 +0000 SSA/ASS parser reworked, with 2 main results: support for script embedded fonts (fonts, uuencoded directly into script) added; matroska interface functions have got more sensible names. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19498 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 342 +++++++++++++++++++++++++++++++++++----------------- libass/ass.h | 4 +- libass/ass_types.h | 6 +- 3 files changed, 237 insertions(+), 115 deletions(-) commit d6b7c92479a3cdeb42c317ea1103c508b4fda7a9 Author: rfelker Date: Mon Aug 21 22:02:49 2006 +0000 use of malloc without prototype.. very bad on 64bit archs git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19490 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 02c82c82f025dc21cd27354d58ecba6c5528c41d Author: rfelker Date: Mon Aug 21 21:46:59 2006 +0000 no c++ decls! git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19487 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commit 3431941480a5959e0f6ede6b64a0eff8d525dce9 Author: eugeni Date: Mon Aug 21 16:33:13 2006 +0000 Add public functions for removal of styles and events. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19480 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 43 ++++++++++++++++++++++--------------------- libass/ass.h | 16 ++++++++++++++++ 2 files changed, 38 insertions(+), 21 deletions(-) commit 3c7aed27d36a82a506145c0e663aadb009130b33 Author: diego Date: Thu Aug 17 17:19:56 2006 +0000 Move all internal -I parameters to the front of CFLAGS to avoid using external header files that happen to have the same name as internal ones. based on a patch by Vladislav Naumov, vladislav.naumov **at** gmail **dot** com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19426 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 31ff3aed1035e0ce4b76e0e247a811d0ed26acb5 Author: eugeni Date: Wed Aug 16 00:54:59 2006 +0000 Fix wrong handling of transparency in \fad(\fade). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19412 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) commit 5a80e84e3a9b4d2fb5b30621cfbcd1f5344b17da Author: eugeni Date: Tue Aug 15 22:46:56 2006 +0000 Replace stdint.h with inttypes.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19411 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 1 - libass/ass_mp.c | 2 +- libass/ass_render.c | 1 - libass/ass_utils.c | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) commit 15e3b052aa287aeecf50fb5fba2fe56abbf66e6a Author: eugeni Date: Tue Aug 15 20:41:53 2006 +0000 Angle value from style was ignored. Not anymore. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19410 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 57da7a6cfe5318bf12a137b30d67311bb16ecfa8 Author: eugeni Date: Tue Aug 15 19:25:46 2006 +0000 Add subdata to ass_track conversion for external subtitles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19407 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++ libass/ass_mp.h | 4 ++ libass/ass_render.c | 4 ++- 3 files changed, 106 insertions(+), 1 deletions(-) commit 3f0bcb9c700f803683a926274722470cc36d8cf5 Author: eugeni Date: Tue Aug 15 14:43:04 2006 +0000 Cosmetics: fix indentation after the last patch. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19405 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) commit c0d5c6fa5f68048dbddb70f4b2f944c1925bf6cf Author: eugeni Date: Tue Aug 15 14:40:57 2006 +0000 Allow \fade to be used in place of \fad and vice versa. Now they are distinguished by the number of arguments. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19404 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 44 +++++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 21 deletions(-) commit 6d52a5edaca16609e86d7e0155eaca28d16d8f52 Author: eugeni Date: Sun Aug 13 10:54:29 2006 +0000 Replace %lld with PRId64, part 2. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19384 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 2 +- libass/ass_render.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) commit 11bdfa5fb319c6682a21097cffbb878952092ce3 Author: eugeni Date: Sun Aug 13 00:47:33 2006 +0000 MinGW treats %lld as %d. Replace it with PRId64. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19380 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 66e6e880d73a230c58677e3721098dc8367db69e Author: eugeni Date: Sat Aug 12 18:33:19 2006 +0000 Fix compilation with gcc 2.95. Patch by Jason Tackaberry, tack at urandom dot ca. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19376 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) commit fd6ada4afe859e5954a4ec68fcd1560ae50e5bc7 Author: eugeni Date: Sun Aug 6 17:56:01 2006 +0000 Use FontConfig cache to speedup mplayer startup. Patch by Zealot . git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19346 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) commit 2f8682c346bb031d08bf1d2942f1a7e99a419427 Author: diego Date: Thu Jul 27 10:08:17 2006 +0000 Unify include paths in the build system, part I. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19195 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/Makefile | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit acf46cbbc41672d753fdb043efc63bf9e7d47b73 Author: reynaldo Date: Sat Jul 15 16:03:12 2006 +0000 marks several read-only string parameters which aren't modified inside the called function as const. Patch by Stefan Huehner, stefan AT huehner-org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19109 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b5dbcb283866ea7443ed6f2668974e0f625aca98 Author: reynaldo Date: Thu Jul 13 20:59:18 2006 +0000 marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19071 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 2968581d34c59a0c342c57350a3a72dcdce75594 Author: eugeni Date: Thu Jul 13 18:52:16 2006 +0000 Cosmetics. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19069 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e80b3dfe8a891db190044c6ed56f2da6d66364e4 Author: eugeni Date: Thu Jul 13 18:49:06 2006 +0000 Use FcPatternAdd-Type instead of FcNameParse. The latter, as it turns out, requires escaping of some characters ('-', maybe more). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19068 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) commit ebd5a0932c6a9043cbba9d48d46a4b8ab32c9f34 Author: eugeni Date: Wed Jul 12 22:28:20 2006 +0000 Support 6 argument variant of \move. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19049 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) commit 2c59cda24bddf8a0391e4fafed0e6883f59e90bd Author: diego Date: Wed Jul 12 17:58:07 2006 +0000 OPTFLAGS already includes EXTRA_INC. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19042 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/Makefile | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit f320e68452027ab20cac4125eec4bbf822031f85 Author: eugeni Date: Mon Jul 10 23:58:24 2006 +0000 Support some recently discovered color formats. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19008 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_utils.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 37601a2f9e8dc1dd6de09bd21d19f3216dc9947d Author: eugeni Date: Mon Jul 10 23:57:17 2006 +0000 Ignoring FT_Glyph_Stroke() errors can potentially lead to double free(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19007 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit ea15b11beedd02b1cd4079d37609aa215714a120 Author: eugeni Date: Mon Jul 10 23:55:40 2006 +0000 Only match outline fonts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19006 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) commit 3ac944f8a6bea86e713e3bc225f6ceebdc5ae362 Author: eugeni Date: Fri Jul 7 18:26:51 2006 +0000 Initial libass release (without mencoder support). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18942 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/Makefile | 50 ++ libass/ass.c | 857 +++++++++++++++++++++++ libass/ass.h | 156 +++++ libass/ass_cache.c | 209 ++++++ libass/ass_cache.h | 50 ++ libass/ass_fontconfig.c | 192 +++++ libass/ass_fontconfig.h | 11 + libass/ass_mp.c | 10 + libass/ass_mp.h | 12 + libass/ass_render.c | 1766 +++++++++++++++++++++++++++++++++++++++++++++++ libass/ass_types.h | 83 +++ libass/ass_utils.c | 63 ++ libass/ass_utils.h | 9 + 13 files changed, 3468 insertions(+), 0 deletions(-)