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
Anton Khirnov
59ee9f78b0
lavfi: do not use av_pix_fmt_descriptors directly.
12 years ago
Michael Niedermayer
7457da3698
drawtext: fix leak with timecodes
Fixes CID733799
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Mans Rullgard
568c70e79e
lavfi: convert input/ouput list compound literals to named objects
A number of compilers, for example those from TI and IBM, choke on
these initialisers. The current style is also quite ugly.
Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years ago
Anton Khirnov
716d413c13
Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat
12 years ago
Martin Storsjö
e6153f173a
avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Martin Storsjö
d58dd4b5b5
avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Martin Storsjö
124134e424
avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Stefano Sabatini
42d621d131
lavfi: add priv class to filter definitions and flags to filter internal options
This allows the iteration callbacks to discover the internal class and
options, and show them when required.
12 years ago
Nicolas George
d5765d4725
vf_drawtext: fix permissions.
12 years ago
Martin Storsjö
33e112847d
Add more missing includes after removing the implicit common.h
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Clément Bœsch
cc650cf029
Remove "Error parsing options string [...]" messages.
This reduces from 3 to 2 messages for the same syntax error in ffprobe,
and from 4 to 3 in filters.
12 years ago
Anton Khirnov
d4f89906e3
lavfi: add error handling to end_frame().
13 years ago
Anton Khirnov
e9b992d035
lavfi: add error handling to draw_slice().
13 years ago
Anton Khirnov
ebc8d97481
lavfi: add error handling to start_frame().
13 years ago
Ronald S. Bultje
3db407038e
lavfi: use const for AVFilterPad declarations in all filters.
13 years ago
Anton Khirnov
07bad27810
lavfi: unref AVFilterLink.cur_buf in ff_end_frame().
This reduces code duplication and prevents stale pointers from remaining
on the link.
13 years ago
Anton Khirnov
7155763b78
vf_drawtext: don't give up its own reference to the input buffer.
Directly forwarding the input buffer to the next filter means that
drawtext no longer owns any references to it and thus shouldn't refer to
it in any way.
13 years ago
Anton Khirnov
a5e8c41c28
lavfi: remove 'opaque' parameter from AVFilter.init()
It is not used in any filters currently and is inherently evil. If
passing binary data to filters is required in the future, it should be
done with some AVOptions-based system.
13 years ago
Stefano Sabatini
9b41ec4b9e
lavfi/drawtext: use av_opt_free() to free private context
Simplify code.
13 years ago
Stefano Sabatini
c17808cebd
lavfi: define macro AVFILTER_DEFINE_CLASS
The macro can be used to define consistently the internal class of a
filter, save some typing and factorize.
13 years ago
Stefano Sabatini
012aa12a6b
lavfi/drawtext: remove unnecessary parentheses in init()
13 years ago
Paul B Mahol
54101214d8
lavfi: use designated initializers for AVClass
While here:
- add missing .version and .category,
- make .class_name consistent across filters,
- align declarations.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 years ago
Anton Khirnov
9d0bfc5052
lavfi: make AVFilterPad opaque after two major bumps.
It will allow adding new fields to it without ABI breaks.
13 years ago
Anton Khirnov
803391f719
lavfi: remove request/poll and drawing functions from public API on next bump
They are only useful inside filters and we don't allow user filters for
now.
13 years ago
Anton Khirnov
b74a1da49d
lavfi: make formats API private on next bump.
It is only useful inside filters and we don't allow user filters for
now.
13 years ago
Stefano Sabatini
0f0f3bd1e0
lavfi: use av_default_item_name() as filter private context logger
avfilter_default_filter_name() is supposed to access an AVFilterContext
struct, if used with a private struct it will cause a crash since it will
access fields which are non defined in the private struct.
13 years ago
Stefano Sabatini
4d6a8a2bdb
lavfi: add avfilter_default_filter_name()
The function is modelled after av_default_item_name(), and will print the
name of the instance filter if defined, otherwise the name of the filter.
This allows to show the instance name in the log, which is useful when
debugging complex filter graphs.
13 years ago
Anton Khirnov
c04c533f62
lavfi: remove avfilter_null_* from public API on next bump.
Those functions are only useful inside filters. It is better to not
support user filters until the API is more stable.
13 years ago
Stefano Sabatini
126ba1626e
lavfi/drawtext: give a new alias "timecode_rate" to the the r/rate option
The option is related to the timecode, the new name clearly specifies the
context. Also it allows to list the option close to the other timecode
options.
13 years ago
Stefano Sabatini
eb07f4ccb5
lavfi/drawtext: rename and document variables d_expr and d_pexpr
Use the more expressive names draw_expr and draw_pexpr, also more
consistent.
13 years ago
Stefano Sabatini
65d2b2fbe4
lavfi/drawtext: alphabetically sort the expression parameters
13 years ago
Nicolas George
40b7a27bad
vf_drawtext: fontconfig support.
13 years ago
Nicolas George
be9b0d2c5a
vf_drawtext: fix memory leak of draw expression.
13 years ago
Nicolas George
423047ea31
vf_drawtext: fix memory leak of glyph data.
13 years ago
Nicolas George
a63712d37c
vf_drawtext: use drawutils.
13 years ago
Lou Logan
2d38081b4f
cosmetics: fix some typos
Patch attached.
From 2d4094fc0d
Mon Sep 17 00:00:00 2001
From: Lou Logan <lou@lrcd.com>
Date: Mon, 12 Mar 2012 14:13:44 -0800
Subject: [PATCH] cosmetics: fix some typos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Clément Bœsch
4fe5448790
lavfi/drawtext: add 24 hours wrapping option for timecode.
Fixes ticket #1044 .
13 years ago
Alex Converse
b0f29db5c2
Mark mutable static data const where appropriate.
13 years ago
Andrey Utkin
e496c45d9b
drawtext: add 'fix_bounds' option on coords fixing
Before, drawtext filter deliberately altered given text coordinates if
text didn't fully fit on the picture. This breaks the use case of
scrolling large text, e.g. movie closing credits.
Add 'fix_bounds', to make it usable in such cases (by setting its value to 0).
Default behavior is not changed, and non-fitting text coords are fixed.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years ago
Andrey Utkin
2b43dfce36
drawtext: fix text_{w, h} expression vars
Before, {text_,}{w,h} vars hadn't got initialized
Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years ago
Andrey Utkin
e7f0bc8c0f
drawtext: add missing braces around an if() block.
Prevents uninitialized read.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years ago