Signed-off-by: Nicolas George <geo...@nsup.org>
---
doc/filters.texi | 5 +++++
libavfilter/vsrc_testsrc.c | 12 +++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
Fixed the undefined shift, thanks Clément for noticing.
Added documentation.
Note: until now, the "default" was 0, not 255. But it produces an ugly
image, so I considered nobody really uses it like that and decided it was ok
to change it to a saner default, but it can be discussed. It does not break
our existing FATE tests.
Note to whoever will push "fate: add vf_overlay test for main source with
alpha channel": if this patch is required and I have not applied it, feel
free to do it yourself.
diff --git a/doc/filters.texi b/doc/filters.texi
index 2708fdb1df..e265c4ef59 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -16390,6 +16390,11 @@ The sources accept the following parameters:
@table @option
+@item alpha
+Specify the alpha (opacity) of the background, only available in the
+@code{testsrc2} source. The value must be between 0 (fully transparent) and
+255 (fully opaque, the default).
+
@item color, c
Specify the color of the source, only available in the @code{color}
source. For the syntax of this option, check the "Color" section in the
diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c
index c4a5ae3742..fe0d50aa41 100644
--- a/libavfilter/vsrc_testsrc.c
+++ b/libavfilter/vsrc_testsrc.c
@@ -66,6 +66,9 @@ typedef struct TestSourceContext {
/* only used by testsrc */
int nb_decimals;
+ /* only used by testsrc2 */
+ int alpha;
+
/* only used by color */
FFDrawContext draw;
FFDrawColor color;
@@ -685,6 +688,7 @@ AVFilter ff_vsrc_testsrc = {
static const AVOption testsrc2_options[] = {
COMMON_OPTIONS
+ { "alpha", "set global alpha (opacity)", OFFSET(alpha), AV_OPT_TYPE_INT,
{.i64 = 255}, 0, 255, FLAGS },
{ NULL }
};
@@ -735,6 +739,7 @@ static void test2_fill_picture(AVFilterContext *ctx,
AVFrame *frame)
{
TestSourceContext *s = ctx->priv;
FFDrawColor color;
+ unsigned alpha = (uint32_t)s->alpha << 24;
/* colored background */
{
@@ -746,7 +751,8 @@ static void test2_fill_picture(AVFilterContext *ctx,
AVFrame *frame)
x2 = ff_draw_round_to_sub(&s->draw, 0, 0, x2);
set_color(s, &color, ((i & 1) ? 0xFF0000 : 0) |
((i & 2) ? 0x00FF00 : 0) |
- ((i & 4) ? 0x0000FF : 0));
+ ((i & 4) ? 0x0000FF : 0) |
+ alpha);
ff_fill_rectangle(&s->draw, &color, frame->data, frame->linesize,
x, 0, x2 - x, frame->height);
x = x2;
@@ -763,7 +769,7 @@ static void test2_fill_picture(AVFilterContext *ctx,
AVFrame *frame)
g0 = av_rescale_q(s->pts, s->time_base, av_make_q(1, 128));
for (x = 0; x < s->w; x += dx) {
g = (av_rescale(x, 6 * 256, s->w) + g0) % (6 * 256);
- set_color(s, &color, color_gradient(g));
+ set_color(s, &color, color_gradient(g) | alpha);
y = y0 + av_rescale(x, s->h / 2, s->w);
y %= 2 * (s->h - 16);
if (y > s->h - 16)
@@ -785,7 +791,7 @@ static void test2_fill_picture(AVFilterContext *ctx,
AVFrame *frame)
int c, i;
for (c = 0; c < 3; c++) {
- set_color(s, &color, 0xBBBBBB ^ (0xFF << (c << 3)));
+ set_color(s, &color, (0xBBBBBB ^ (0xFF << (c << 3))) | alpha);
pos = av_rescale_q(s->pts, s->time_base, av_make_q(64 >> (c << 1),
cycle)) % cycle;
xh = pos < 1 * l ? pos :
pos < 2 * l ? l :
--
2.13.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
