diff --git a/doc/filters.texi b/doc/filters.texi index 5ebaf99f4c51f33787930bea46ec0efaa48325ba..e4c1851a050ea65ea953d539bb7645f35909535f 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -190,6 +190,38 @@ crop=in_w-100:in_h-100:100:100 "crop=in_w/2:in_h/2:y:10+10*sin(n/10)" @end example +@section drawbox + +Draw a colored box on the input image. + +It accepts the syntax: +@example +drawbox=@var{x}:@var{y}:@var{width}:@var{height}:@var{color} +@end example + +@table @option + +@item x, y +Specify the top left corner coordinates of the box. Default to 0. + +@item width, height +Specify the width and height of the box, if 0 they are interpreted as +the input width and height. Default to 0. + +@item color +Specify the color of the box to write, it can be the name of a color +(case insensitive match) or a 0xRRGGBB[AA] sequence. +@end table + +Follow some examples: +@example +# draw a black box around the edge of the input image +drawbox + +# draw a box with color red and an opacity of 50% +drawbox=10:20:200:60:red@@0.5" +@end example + @section fifo Buffer input images and send them when they are requested. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 6d73bf205bc097e0aeeb764f88b9d1aedacb3812..74e55bbfad16d462dda6ae3f2e44dd136bd47479 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -23,6 +23,7 @@ OBJS-$(CONFIG_ANULLSINK_FILTER) += asink_anullsink.o OBJS-$(CONFIG_ASPECT_FILTER) += vf_aspect.o OBJS-$(CONFIG_BLACKFRAME_FILTER) += vf_blackframe.o OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o +OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o OBJS-$(CONFIG_FIFO_FILTER) += vf_fifo.o OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o OBJS-$(CONFIG_FREI0R_FILTER) += vf_frei0r.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index d9681e67d80ae3f348a4e743f1592bf7d6475094..c5da6484c6f09f5bf02e43b85e232fc0158c1476 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -43,6 +43,7 @@ void avfilter_register_all(void) REGISTER_FILTER (ASPECT, aspect, vf); REGISTER_FILTER (BLACKFRAME, blackframe, vf); REGISTER_FILTER (CROP, crop, vf); + REGISTER_FILTER (DRAWBOX, drawbox, vf); REGISTER_FILTER (FIFO, fifo, vf); REGISTER_FILTER (FORMAT, format, vf); REGISTER_FILTER (FREI0R, frei0r, vf); diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 88991bc5a6116f3696663de3e6e8a2cfa67502b7..bb3312a82f13fbcbe283c325f193ebee68a2a00b 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -25,8 +25,8 @@ #include "libavutil/avutil.h" #define LIBAVFILTER_VERSION_MAJOR 1 -#define LIBAVFILTER_VERSION_MINOR 47 -#define LIBAVFILTER_VERSION_MICRO 1 +#define LIBAVFILTER_VERSION_MINOR 48 +#define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c new file mode 100644 index 0000000000000000000000000000000000000000..76fda584ced60a74f61bd8bfdf1a43b2983f872a --- /dev/null +++ b/libavfilter/vf_drawbox.c @@ -0,0 +1,143 @@ +/* + * Copyright (C) 2008 Affine Systems, Inc (Michael Sullivan, Bobby Impollonia) + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * Box drawing filter. Also a nice template for a filter that needs to + * write in the input frame. + */ + +#include "libavutil/colorspace.h" +#include "libavutil/pixdesc.h" +#include "avfilter.h" +#include "parseutils.h" + +enum { Y, U, V, A }; + +typedef struct { + int x, y, w, h; + unsigned char yuv_color[4]; + int vsub, hsub; //< chroma subsampling +} DrawBoxContext; + +static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) +{ + DrawBoxContext *drawbox= ctx->priv; + char color_str[1024] = "black"; + uint8_t rgba_color[4]; + + drawbox->x = drawbox->y = drawbox->w = drawbox->h = 0; + + if (args) + sscanf(args, "%d:%d:%d:%d:%s", + &drawbox->x, &drawbox->y, &drawbox->w, &drawbox->h, color_str); + + if (av_parse_color(rgba_color, color_str, ctx) < 0) + return AVERROR(EINVAL); + + drawbox->yuv_color[Y] = RGB_TO_Y_CCIR(rgba_color[0], rgba_color[1], rgba_color[2]); + drawbox->yuv_color[U] = RGB_TO_U_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0); + drawbox->yuv_color[V] = RGB_TO_V_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0); + drawbox->yuv_color[A] = rgba_color[3]; + + return 0; +} + +static int query_formats(AVFilterContext *ctx) +{ + enum PixelFormat pix_fmts[] = { + PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, + PIX_FMT_YUV411P, PIX_FMT_YUV410P, + PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P, + PIX_FMT_YUV440P, PIX_FMT_YUVJ440P, + PIX_FMT_NONE + }; + + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); + return 0; +} + +static int config_input(AVFilterLink *inlink) +{ + DrawBoxContext *drawbox = inlink->dst->priv; + + drawbox->hsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_w; + drawbox->vsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_h; + + if (drawbox->w == 0) drawbox->w = inlink->w; + if (drawbox->h == 0) drawbox->h = inlink->h; + + av_log(inlink->dst, AV_LOG_INFO, "x:%d y:%d w:%d h:%d color:0x%02X%02X%02X%02X\n", + drawbox->w, drawbox->y, drawbox->w, drawbox->h, + drawbox->yuv_color[Y], drawbox->yuv_color[U], drawbox->yuv_color[V], drawbox->yuv_color[A]); + + return 0; +} + +static void draw_slice(AVFilterLink *inlink, int y0, int h, int slice_dir) +{ + DrawBoxContext *drawbox = inlink->dst->priv; + int plane, x, y, xb = drawbox->x, yb = drawbox->y; + unsigned char *row[4]; + AVFilterBufferRef *picref = inlink->cur_buf; + + for (y = FFMAX(yb, y0); y < (y0 + h) && y < (yb + drawbox->h); y++) { + row[0] = picref->data[0] + y * picref->linesize[0]; + + for (plane = 1; plane < 3; plane++) + row[plane] = picref->data[plane] + + picref->linesize[plane] * (y >> drawbox->vsub); + + for (x = FFMAX(xb, 0); x < (xb + drawbox->w) && x < picref->video->w; x++) { + double alpha = (double)drawbox->yuv_color[A] / 255; + + if ((y - yb < 3) || (yb + drawbox->h - y < 4) || + (x - xb < 3) || (xb + drawbox->w - x < 4)) { + row[0][x ] = (1 - alpha) * row[0][x ] + alpha * drawbox->yuv_color[Y]; + row[1][x >> drawbox->hsub] = (1 - alpha) * row[1][x >> drawbox->hsub] + alpha * drawbox->yuv_color[U]; + row[2][x >> drawbox->hsub] = (1 - alpha) * row[2][x >> drawbox->hsub] + alpha * drawbox->yuv_color[V]; + } + } + } + + avfilter_draw_slice(inlink->dst->outputs[0], y0, h, 1); +} + +AVFilter avfilter_vf_drawbox = { + .name = "drawbox", + .description = NULL_IF_CONFIG_SMALL("Draw a colored box on the input video."), + .priv_size = sizeof(DrawBoxContext), + .init = init, + + .query_formats = query_formats, + .inputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_input, + .get_video_buffer = avfilter_null_get_video_buffer, + .start_frame = avfilter_null_start_frame, + .draw_slice = draw_slice, + .end_frame = avfilter_null_end_frame, + .min_perms = AV_PERM_WRITE | AV_PERM_READ, + .rej_perms = AV_PERM_PRESERVE }, + { .name = NULL}}, + .outputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, }, + { .name = NULL}}, +};