| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Use the correct terms (SAR/DAR) for the aspect ratio parameters.
|
|
|
|
|
| |
Allocate the maximum possible number of used events in fix_collisions
dynamically, eliminating the MAX_EVENTS limit.
|
|
|
|
|
|
| |
Do not round the coordinates of the glyph bbox (when converting 26.6
fixed-point to integer); they are used for timing karaoke. Doing so
can sometimes make \k and \ko karaoke not apply correctly.
|
|
|
|
|
|
| |
For the event/style/track types, bring back the struct name, but
without the _s suffix. This is useful for forward declaration of
these types.
|
|
|
|
|
|
| |
The timing calculations for \k and \ko were off and still assumed
int values for a bbox, while it now uses a d6 representation.
This essentially made duration about 64 times as long as it should be.
|
|
|
|
|
| |
Remove useless _s suffix from struct names and remove struct name where
not needed (only the typedef'd struct is used). Clean up API headers.
|
|
|
|
|
|
| |
Instead of passing a pointer to a va_list, pass the va_list itself.
Additionally, use const char for the format string and use names in
the prototype that describe the arguments' meaning.
|
|
|
|
|
|
|
| |
The shift is not calculated when fetching a glyph anymore. Instead,
it is calculated right before rasterizing a glyph. Remove the
shift vector and make get_outline_glyph, the glyph cache and
ass_font_set_transform work without supplying a shift vector.
|
|
|
|
|
| |
In case only one PlayResX/Y component is specified, calculate the other
component by assuming a 4:3 aspect ratio. This is similar to vsfilter.
|
|
|
|
|
| |
If rasterizing the clip vector fails, actually handle the situation
instead of crashing.
|
|
|
|
| |
Add a note to the docs regarding hinting method choice.
|
|
|
|
|
|
|
|
|
|
| |
Use the correct free order when freeing a ass_renderer and make sure
that the latest list of ass_images is freed, too.
Protect the font family string against double free and make sure it
is freed in free_render_context.
Leaks and access problems were found by valgrind/memcheck.
|
|
|
|
|
|
|
|
|
|
|
|
| |
Do not manually use FcConfigFilename; passing a NULL pointer to
FcConfigParseAndLoad is just as effective and also avoids a memory leak
since the string allocated by FcConfigFilename was never freed.
Free FcConfig instance in fontconfig_done; since we're not using the
default configuration anymore it doesn't make sense to keep the
configuration around.
Leaks were found by valgrind/memcheck.
|
|
|
|
|
| |
When freeing a track, also free the track name and the track itself.
Leak found by valgrind/memcheck.
|
|
|
|
|
| |
Adjust fontconfig_select and fontconfig_update stubs for the recent
changes.
|
|
|
|
|
| |
The render_id (last_render_id) variable was the last remaining static
data object; move it into render_priv.
|
|
|
|
|
|
|
|
| |
If parsing or loading the fontconfig configuration file, either
using the default or a specified one, fails, try to load the
default fontconfig configuration. This triggers loading a fallback
configuration if no configuration file is available at all. A warning
message is emitted to notify the user about this.
|
|
|
|
|
|
| |
In case rasterizing a glyph is successful, but rasterizing its outline
is not, do not free the glyph bitmap. It will be freed in cache cleanup
later. Freeing it earlier leads to a double free.
|
|
|
|
|
|
| |
Interpret the value -1 as "true", as specified in the ASS
specifications. Otherwise, clamp the value to 0 for other values <
0, so these are interpreted as "false".
|
|
|
|
| |
Reported by Martin Sourada.
|
|
|
|
|
|
|
| |
For clarity, factor out bitmap copying into a function. Do not pad the
bitmap with stride in the last row; this can not by guaranteed anyway.
Add a comment about this peculiarity to the API documentation in ass.h
Idea by Evgeniy Stepanov.
|
|
|
|
|
| |
Make sure the clip rectangle is inside the screen boundaries.
Idea by Evgeniy Stepanov.
|
|
|
|
|
|
| |
Do not set the end time of the animation to the end time of the event
in case end time and start time specified in a \t tag are equal.
This should sort out a problem introduced by commit 1f176b.
|
|
|
|
|
|
|
|
| |
The glyph striker (underline/strike-through) did not check for table
availability, possibly accessing a NULL pointer. Change this to
only strike the glyph if the table with the appropriate information
is available. Currently there is no fallback for fonts without the
required information.
|
|
|
|
|
|
| |
If possible, use ascender/descender from the OS/2 TTF table. This is
another try to get libass to match VSFilter in regard to vertical font
metrics.
|
| |
|
|
|
|
|
| |
Always free the drawing glyph in ass_drawing_free; do not double free
clip vector bitmap.
|
|
|
|
|
|
|
|
|
|
|
| |
libass' cache was basically unmanaged; it would grow without any limits,
depending on how complex the subtitles are. Introduce a simple limiting
that resets the cache if certain limits are exceeded. The bitmap cache
is limited to approx. 50 MB size by default, while the glyph cache
allows storing up to 1000 glyphs by default. A few tests with rather
heavily softsubbed fansubs show that these limits are fine.
The API was extended with the function ass_set_cache_limits which allows
modification of these limits.
|
|
|
|
|
|
|
| |
Match VSFilter behavior when centering non-positioned events
vertically. Previously, libass put the event on top of the vertical
center while VSFilter centered the event evenly. Adjust the centering
to behave like VSFilter.
|
|
|
|
|
| |
Take ascender/descender from the last valid glyph when empty lines
occur. This makes multiple empty lines (\N\N\N etc.) work correctly.
|
|
|
|
|
|
| |
Improve APi documentation; each function is properly documented now.
Add a new macro LIBASS_VERSION that encodes the version in a
hexadecimal format, similar to OpenSSL. Fix formatting of the headers.
|
|
|
|
|
|
|
| |
Add an argument to ass_set_fonts for controlling whether the fontconfig
font cache should be built/updated. Add a new function ass_fonts_update
to make it possible to update fonts later on.
Additionally, stop using FcConfigSetDefault for thread safety.
|
|
|
|
|
| |
Try to change ascender/descender calculation to be more compatible
with Windows GDI and consequently, VSFilter.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
Modify the default message handler to output to stderr instead of
stdout.
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
Rename ass_cache_template.c to ass_cache_template.h; add libass.sym to
EXTRA_DIST.
|
|
|
|
|
|
|
|
|
|
|
| |
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]".
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
mystrtoi and mystrtoll did not round correctly for negative numbers,
this was fixed.
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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 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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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).
|
|
|
|
|
| |
Rename process_force_style to ass_process_force_style and make it
available in the DSO.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
| |
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).
|
|
|
|
|
| |
If end <= start for a time interval specification, set end to the end of
the event. VSFilter handles it like that, too.
|
|
|
|
| |
Do not rely on the compiler for optimizing a division into a shift.
|
|
|
|
|
|
|
|
|
| |
|