[FFmpeg-cvslog] r25244 - in trunk: doc/filters.texi libavfilter/Makefile libavfilter/allfilters.c libavfilter/avfilter.h libavfilter/vf_drawbox.c
stefano
subversion
Tue Sep 28 15:16:40 CEST 2010
Author: stefano
Date: Tue Sep 28 15:16:40 2010
New Revision: 25244
Log:
Add the drawbox filter from the soc libavfilter repo.
Pedagogically useful.
Added:
trunk/libavfilter/vf_drawbox.c
Modified:
trunk/doc/filters.texi
trunk/libavfilter/Makefile
trunk/libavfilter/allfilters.c
trunk/libavfilter/avfilter.h
Modified: trunk/doc/filters.texi
==============================================================================
--- trunk/doc/filters.texi Tue Sep 28 11:06:22 2010 (r25243)
+++ trunk/doc/filters.texi Tue Sep 28 15:16:40 2010 (r25244)
@@ -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
+ at section drawbox
+
+Draw a colored box on the input image.
+
+It accepts the syntax:
+ at example
+drawbox=@var{x}:@var{y}:@var{width}:@var{height}:@var{color}
+ at end example
+
+ at table @option
+
+ at item x, y
+Specify the top left corner coordinates of the box. Default to 0.
+
+ at 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.
+
+ at 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.
+ at end table
+
+Follow some examples:
+ at 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"
+ at end example
+
@section fifo
Buffer input images and send them when they are requested.
Modified: trunk/libavfilter/Makefile
==============================================================================
--- trunk/libavfilter/Makefile Tue Sep 28 11:06:22 2010 (r25243)
+++ trunk/libavfilter/Makefile Tue Sep 28 15:16:40 2010 (r25244)
@@ -23,6 +23,7 @@ OBJS-$(CONFIG_ANULLSINK_FILTER)
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
Modified: trunk/libavfilter/allfilters.c
==============================================================================
--- trunk/libavfilter/allfilters.c Tue Sep 28 11:06:22 2010 (r25243)
+++ trunk/libavfilter/allfilters.c Tue Sep 28 15:16:40 2010 (r25244)
@@ -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);
Modified: trunk/libavfilter/avfilter.h
==============================================================================
--- trunk/libavfilter/avfilter.h Tue Sep 28 11:06:22 2010 (r25243)
+++ trunk/libavfilter/avfilter.h Tue Sep 28 15:16:40 2010 (r25244)
@@ -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, \
Added: trunk/libavfilter/vf_drawbox.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libavfilter/vf_drawbox.c Tue Sep 28 15:16:40 2010 (r25244)
@@ -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}},
+};
More information about the ffmpeg-cvslog
mailing list