Andrey Utkin
cb8cb85da7
lavfi/drawtext: add alias "expr_int_format" to expansion function "eif"
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Andrey Utkin
e9ff5df0b5
lavfi/drawtext: add fontcolor_expr option
Allow to dynamically evaluate the font color.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
11 years ago
Andrey Utkin
dec87454de
lavfi/drawtext: add expansion function eif()
It evaluates expression and outputs it as integer value, using specified
format.
Address trac ticket #3699 .
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
11 years ago
Marc Jeffreys
a0b71e9f3e
avfilter/drawtext: Add basic text shaping using libfribidi
Fixes ticket #3758
Reviewed-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
576ced5530
avfilter/vf_drawtext: Add #if HAVE_UNISTD_H around #include <unistd.h>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Stefano Sabatini
85eabd748b
lavfi/drawtext: do not allocate FT_Glyph, but keep it in the Glyph structure
Slightly simplify.
11 years ago
Leandro Santiago
4582e1162a
avfilter/vf_drawtext: fix resource leak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Andrey Utkin
3bb4d26a5d
drawtext: drop unused draw_glyphs() arg "rgbcolor"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Nicolas George
41334fcab4
lavfi/drawtext: allow to format pts as HH:MM:SS.mmm.
11 years ago
Michael Niedermayer
6956b048d8
avfilter/vf_drawtext: fix resource leaks
Fixes CID1206649
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Vittorio Giovara
58400ac133
lavfi: name anonymous structs
11 years ago
Luca Barbato
f1b239ec8b
drawtext: Add fontconfig support
Introduce the `font` option and make it optional to pass a fontfile.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
Matt Oliver
3e309c5d18
Fix compilation with msvc/icl due to missing header and define.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Andrey Utkin
6d7119dbd2
lavfi/drawtext: fix reinit command
Problem was that reinit argument wasn't used.
Regression came in at commit fd6228e657
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
11 years ago
Ramiro Polla
78a9f185eb
lavfi/drawtext: add option for drawing border around text
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Ramiro Polla
222fb8276d
lavfi/drawtext: get bitmap from glyph in a separate step
This change makes it possible to transform the glyph or get its border before
turning it into a bitmap.
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Luca Barbato
d68dc3c944
drawtext: Drop pointless header
It should be forward compatible with newer freetype.
11 years ago
Alexander Strasser
cea5812fa7
configure: Special case libfreetype test
Include the freetype header, in-directly through a macro, like it
is done in the drawtext filter. Do not break if the header is moved.
Unfortunately the drawtext filter included the file where the include
macros are defined in a wrong way. This is not needed and breaks the
build. Remove that #include line too.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
11 years ago
Anton Khirnov
cd43ca0443
lavfi: do not export the filters from shared objects
11 years ago
Paul B Mahol
ad934bc353
avfilter/vf_drawtext: remove dead initialization
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
b211607b5c
avfilter: various cosmetics
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
b077d8d908
avfilter: remove redundant .get_(audio/video)_buffer initializations
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Clément Bœsch
30d40c9e86
lavfi/drawtext: add generic timeline interface and deprecate "draw".
11 years ago
Paul B Mahol
c5a1b18f18
lavfi/drawtext: add support for printing frame metadata
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Mark Visser
2090abcc43
add the start_number offset to var_values[VAR_N] directly, instead of adding it in func_frame_num
12 years ago
Mark Visser
0defc77e9d
added start_number parameter to drawtext to permit an offset to n/frame_num var
12 years ago
Michael Niedermayer
b5be1a7e23
avfilter/vf_drawtext: Fix doxygen comment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Paul B Mahol
1d2ecf9609
lavfi/drawtext: switch to AV_OPT_TYPE_COLOR
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Anton Khirnov
3fb29588a2
vf_drawtext: don't leak the expressions.
12 years ago
Anton Khirnov
90d9a2a04c
vf_drawtext: do not reset the frame number in config_input.
Frame number should be incremented normally even if the link properties
change.
12 years ago
Anton Khirnov
d3735f7ad6
vf_drawtext: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
12 years ago
Michael Niedermayer
a9a537b154
avfilter/drawtext: add pict_type support
Fixes Ticket2470
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Clément Bœsch
b8a5c76131
lavfi: add frame counter into AVFilterLink and use it in filters.
12 years ago
Clément Bœsch
de656ea91e
lavfi/drawtext: make options array more readable.
12 years ago
Michael Niedermayer
fd6228e657
lavfi: remove now unused args parameter from AVFilter.init and init_opaque
This is mostly automated global search and replace
The deprecated aconvert filter is disabled, if it still has users
it should be updated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Anton Khirnov
d69a4177b9
lavfi: remove now unused args parameter from AVFilter.init
Conflicts:
libavfilter/avfilter.c
libavfilter/vf_drawtext.c
libavfilter/vf_lut.c
libavfilter/vf_select.c
libavfilter/vf_setpts.c
libavfilter/vsrc_color.c
libavfilter/vsrc_movie.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Anton Khirnov
c43a7ecad9
lavfi: remove now unused args parameter from AVFilter.init
12 years ago
Anton Khirnov
8ec464c61c
vf_drawtext: switch to an AVOptions-based system.
12 years ago
Anton Khirnov
7e350379f8
lavfi: switch to AVFrame.
Deprecate AVFilterBuffer/AVFilterBufferRef and everything related to it
and use AVFrame instead.
12 years ago
Nicolas George
42c6f2a645
lavfi/vf_drawtext: default to expansion=normal.
12 years ago
Stefano Sabatini
3942294fd5
lavfi/drawtext: make use of outlink variable in filter_frame()
Fix warning.
12 years ago
Anton Khirnov
cb45553f57
Remove pointless #undefs of previously forbidden functions.
12 years ago
Nicolas George
0444733b78
lavfi/drawtext: add the reload option.
12 years ago
Michael Niedermayer
7bfa2f25c0
vf_drawtext: switch to filter_frame, this filter did not support slices
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Anton Khirnov
565e4993c6
lavfi: merge start_frame/draw_slice/end_frame
Any alleged performance benefits gained from the split are purely
mythological and do not justify added code complexity.
12 years ago
Stefano Sabatini
2ac6a3d1bf
lavfi/drawtext: add support to expansion of generic expressions
12 years ago
Stefano Sabatini
eb87b340e8
lavfi/drawtext: add support for printing frame numbers
Fix trac ticket #1949 .
12 years ago
Nicolas George
c437c251b8
lavfi/drawtext: implement more generic expansion.
The new expansion mechanism uses the %{...} notation.
For compatibility reasons, it must be enabled explicitly,
but a warning is printed if a conflict is likely to happen.
12 years ago
Nicolas George
29e388abcb
lavfi/drawtext: use bprint for the expanded text.
12 years ago
Anton Khirnov
b68aac7ea3
vf_drawtext: do not use deprecated av_tree_node_size
12 years ago