highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/testsrc2: fix completely transparent alpha.

Browse Source
This commit is contained in:
Nicolas George
2017-07-20 17:35:44 +02:00
parent 4a654be3fb
commit bbc7cfbf1e
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/filters.texi
View File

@@ -16394,6 +16394,11 @@ The sources accept the following parameters:
@table @option @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 @item color, c
Specify the color of the source, only available in the @code{color} 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 source. For the syntax of this option, check the "Color" section in the

12
libavfilter/vsrc_testsrc.c
View File

@@ -66,6 +66,9 @@ typedef struct TestSourceContext {
/* only used by testsrc */ /* only used by testsrc */
int nb_decimals; int nb_decimals;
/* only used by testsrc2 */
int alpha;
/* only used by color */ /* only used by color */
FFDrawContext draw; FFDrawContext draw;
FFDrawColor color; FFDrawColor color;
@@ -685,6 +688,7 @@ AVFilter ff_vsrc_testsrc = {
static const AVOption testsrc2_options[] = { static const AVOption testsrc2_options[] = {
COMMON_OPTIONS COMMON_OPTIONS
{ "alpha", "set global alpha (opacity)", OFFSET(alpha), AV_OPT_TYPE_INT, {.i64 = 255}, 0, 255, FLAGS },
{ NULL } { NULL }
}; };
@@ -735,6 +739,7 @@ static void test2_fill_picture(AVFilterContext *ctx, AVFrame *frame)
{ {
TestSourceContext *s = ctx->priv; TestSourceContext *s = ctx->priv;
FFDrawColor color; FFDrawColor color;
unsigned alpha = (uint32_t)s->alpha << 24;
/* colored background */ /* 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); x2 = ff_draw_round_to_sub(&s->draw, 0, 0, x2);
set_color(s, &color, ((i & 1) ? 0xFF0000 : 0) | set_color(s, &color, ((i & 1) ? 0xFF0000 : 0) |
((i & 2) ? 0x00FF00 : 0) | ((i & 2) ? 0x00FF00 : 0) |
((i & 4) ? 0x0000FF : 0)); ((i & 4) ? 0x0000FF : 0) |
alpha);
ff_fill_rectangle(&s->draw, &color, frame->data, frame->linesize, ff_fill_rectangle(&s->draw, &color, frame->data, frame->linesize,
x, 0, x2 - x, frame->height); x, 0, x2 - x, frame->height);
x = x2; 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)); g0 = av_rescale_q(s->pts, s->time_base, av_make_q(1, 128));
for (x = 0; x < s->w; x += dx) { for (x = 0; x < s->w; x += dx) {
g = (av_rescale(x, 6 * 256, s->w) + g0) % (6 * 256); 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 = y0 + av_rescale(x, s->h / 2, s->w);
y %= 2 * (s->h - 16); y %= 2 * (s->h - 16);
if (y > s->h - 16) if (y > s->h - 16)
@@ -785,7 +791,7 @@ static void test2_fill_picture(AVFilterContext *ctx, AVFrame *frame)
int c, i; int c, i;
for (c = 0; c < 3; c++) { 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; pos = av_rescale_q(s->pts, s->time_base, av_make_q(64 >> (c << 1), cycle)) % cycle;
xh = pos < 1 * l ? pos : xh = pos < 1 * l ? pos :
pos < 2 * l ? l : pos < 2 * l ? l :