generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
36,063 Commits 24 Branches 241 Tags 173 MiB
d8fd06c37d
Commit Graph

46 Commits

Author SHA1 Message Date
Anton Khirnov
cb45553f57 Remove pointless #undefs of previously forbidden functions. 2012-12-04 21:40:22 +01:00
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.
 2012-11-28 08:50:19 +01:00
Anton Khirnov
b68aac7ea3 vf_drawtext: do not use deprecated av_tree_node_size 2012-11-02 18:28:55 +01:00
Anton Khirnov
59ee9f78b0 lavfi: do not use av_pix_fmt_descriptors directly. 2012-10-12 12:45:39 +02:00
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>
 2012-10-10 22:26:12 +01:00
Anton Khirnov
716d413c13 Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat 2012-10-08 07:13:26 +02:00
Martin Storsjö
e6153f173a avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-04 23:13:44 +03:00
Martin Storsjö
d58dd4b5b5 avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-04 23:13:38 +03:00
Martin Storsjö
124134e424 avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-04 23:13:32 +03:00
Martin Storsjö
33e112847d Add more missing includes after removing the implicit common.h 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-08-16 10:49:54 +03:00
Anton Khirnov
d4f89906e3 lavfi: add error handling to end_frame(). 2012-07-22 09:14:05 +02:00
Anton Khirnov
e9b992d035 lavfi: add error handling to draw_slice(). 2012-07-22 09:14:05 +02:00
Anton Khirnov
ebc8d97481 lavfi: add error handling to start_frame(). 2012-07-22 09:14:04 +02:00
Ronald S. Bultje
3db407038e lavfi: use const for AVFilterPad declarations in all filters. 2012-07-21 16:31:15 -07:00
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.
 2012-07-20 21:10:42 +02:00
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.
 2012-07-20 21:07:32 +02:00
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.
 2012-06-26 13:13:48 +02:00
Anton Khirnov
9d0bfc5052 lavfi: make AVFilterPad opaque after two major bumps. 
It will allow adding new fields to it without ABI breaks.
 2012-06-13 11:11:33 +02:00
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.
 2012-06-05 09:38:16 +02:00
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.
 2012-06-05 09:37:30 +02:00
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.
 2012-05-22 21:36:23 +02:00
Alex Converse
b0f29db5c2 Mark mutable static data const where appropriate. 2012-02-21 09:47:07 -08:00
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>
 2012-02-06 07:57:40 +01:00
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>
 2012-02-06 07:52:05 +01:00
Andrey Utkin
e7f0bc8c0f drawtext: add missing braces around an if() block. 
Prevents uninitialized read.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-02-05 08:07:55 +01:00
Diego Biurrun
d4b63054d9 cosmetics: Drop unnecessary parentheses around return values. 2011-12-30 22:18:07 +01:00
Luca Barbato
78212cefe1 drawtext: remove typo 
It slipped through the last two iterations.
 2011-12-07 20:40:18 +01:00
Luca Barbato
f5edfc9e92 drawtext: introduce rand(min, max) 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-07 12:11:14 +01:00
Luca Barbato
73585620b8 drawtext: introduce explicit draw/hide variable 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-07 12:11:14 +01:00
Luca Barbato
2cf74eca70 drawtext: make x and y parametric 
Introduce variables "E", "PHI", "PI", "main_w"/"W", "main_h"/"H",
"text_w"/"w", "text_h"/"h", "x", "y", "n" and "t" in line with
vf_overlay and refactor the code accordingly.
 2011-12-03 01:35:29 +01:00
Luca Barbato
ec11ff8407 drawtext: manage memory allocation better 
Call dtext_prepare_text as early as possible
Do not draw if the memory allocation failed
 2011-12-03 01:35:28 +01:00
Luca Barbato
a2fb4bcb01 drawtext: refactor draw_text 
Split the memory allocation from the actual drawing.
 2011-12-03 01:35:28 +01:00
Diego Biurrun
124e28847b Remove some stray unnecessary ffmpeg references. 2011-11-02 10:42:54 +01:00
Anton Khirnov
145f741e11 AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_* 2011-10-12 16:51:16 +02:00
Anton Khirnov
79eff91325 AVOptions: deprecate av_opt_set_defaults2 
It's a hack which was created to allow for multiple options with
different defaults to refer to same field (e.g. 'b' vs 'ab'). There is
no need for it anymore.
 2011-09-07 11:19:43 +02:00
Diego Biurrun
965fdda015 vf_drawtext: Remove some write-only variables. 
libavfilter/vf_drawtext.c:427:22: warning: variable 'dst_pixel' set but not used
libavfilter/vf_drawtext.c:463:22: warning: variable 'dst_pixel' set but not used
 2011-07-07 17:32:50 +02:00
Stefano Sabatini
702a62a1c6 drawtext: add braces around initialisers for option defaults 
Fix warnings of the type:
vf_drawtext.c:NNN: warning: missing braces around initializer
vf_drawtext.c:NNN: warning: (near initialization for ‘drawtext_options[X].default_val’)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-20 20:54:40 +02:00
Stefano Sabatini
53a715f576 drawtext: reindent after the previous commit 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-20 20:54:40 +02:00
Stefano Sabatini
3fd53defaa drawtext: fix strftime() text expansion 
The feature was dropped after the filter was partially rewritten and
recommitted.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-20 20:54:40 +02:00
Diego Biurrun
5ac4952a58 vf_drawtext: Replace FFmpeg by Libav in license boilerplate. 2011-05-31 21:15:49 +02:00
Michael Niedermayer
c5420f100f drawtext: add shadow support. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-07 10:21:56 +02:00
Michael Niedermayer
e73127a443 drawtext: factor draw_glyphs. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-07 10:21:56 +02:00
Michael Niedermayer
a5b81c317e drawtext: fix and optimize yuv blend. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-07 10:21:53 +02:00
Michael Niedermayer
3953a88014 drawtext: get rid of divisions in the inner loop. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-07 10:18:16 +02:00
Michael Niedermayer
e74bf3f368 drawtext: simplify chroma blend and fix chroma alpha. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-07 10:18:16 +02:00
Stefano Sabatini
a5b64584f3 lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo 
With the following additions:
* support to anti-aliased glyph rendering
* support to UTF-8 text and Unicode chars rendering
* support for RGB packed formats
* fix minor errors and typos in the filter description
* extend/clarify examples in the filter description

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-07 10:17:40 +02:00