Message ID | 55433BC015F6FF4E9E697658F2608B9201BDE841C0@WesUM03.cbc.corp |
---|---|
State | Changes Requested |
Headers | show |
On 9/22/16, Priebe, Jason <jpriebe@cbcnewmedia.com> wrote: > This patch adds a new filter that allows you to drive dynamic graphic > overlays > on a live encoding by creating/updating/deleting a specified 32-bit PNG. > This is very different from the overlay filter, because it lets you change > the overlay in real time during a live stream. It doesn't allow you to > overlay > video on top of video, but you can overlay still images over video, which is > useful for things like lower-thirds and fullscreen graphics. > > It is efficient in its handling of PNG files, as it only decodes the PNG > data > when it changes. It is not optimized in its handling of the compositing, > since > it composites the entire image on every frame, even if the majority of the > overlay is fully transparent. Even with that caveat, it only takes about > 2% of overall CPU while compositing 1920x1080 images on HD video on a > Core i7-6700K. > > I'm pretty sure that I'm allocating my frames/buffers correctly and that I'm > freeing them as expected. But if I've missed something, please let me know. > > I did my best with the FATE test. I understand the concept of "generate > video, perform the filter, calculate the MD5 of the output, compare to > expected MD5". But I didn't really see how I was supposed to visually > inspect > the output video before committing the test. > > I modified the fate-run.sh script to output the ffmpeg command it was > running > so I could capture the output video and make sure it contained what I > expected. > So I think my test is good. > > It's a very basic test -- just makes sure it can read the PNG and overlay > it. > I don't do anything fancy like remove or update the PNG during the encoding, > although that would be a more complete test of what the filter is designed > to do. > > The test included requires a PNG overlay image, dynoverlay.png. It can be > downloaded from http://imgur.com/a/6PIkT > > > > --- > Changelog | 1 + > doc/filters.texi | 54 ++++++ > libavfilter/Makefile | 1 + > libavfilter/allfilters.c | 1 + > libavfilter/version.h | 2 +- > libavfilter/vf_dynoverlay.c | 439 > ++++++++++++++++++++++++++++++++++++++++++++ dynoverlay sounds very powerful, but this filter funcionality is very limited. > tests/fate/filter-video.mak | 3 + > 7 files changed, 500 insertions(+), 1 deletion(-) > create mode 100644 libavfilter/vf_dynoverlay.c > What's up with code identation? > diff --git a/Changelog b/Changelog > index 2d0a449..5b620b4 100644 > --- a/Changelog > +++ b/Changelog > @@ -31,6 +31,7 @@ version <next>: > - MediaCodec HEVC decoding > - TrueHD encoder > - Meridian Lossless Packing (MLP) encoder > +- dynoverlay filter > version 3.1: > diff --git a/doc/filters.texi b/doc/filters.texi > index 070e57d..e67e29a 100644 > --- a/doc/filters.texi > +++ b/doc/filters.texi > @@ -7080,6 +7080,60 @@ For more information about fontconfig, check: > For more information about libfribidi, check: > @url{http://fribidi.org/}. > +@section dynoverlay > + > +Uses a PNG with alpha to dynamically add, update, and remove overlays > +during live streams. > + > +If the named PNG file does not exist, the filter will do nothing. I do not like this design. Supporting only PNG with RGBA, working only in YUV420P. > + > +When the filter first detects the presence of the PNG, it will load it > +into a memory and overlay it on all frames until the PNG is either > +updated or removed. If the PNG is updated, the filter will read it into > +memory again. If the PNG is removed, the filter will clear the memory > +and stop overlaying the image. > + > +Note that this filter only works with YUV420P video. > + > +The filter accepts the following options: > + > +@table @option > +@item overlayfile > +(required) The name of the PNG that will contain the overlays. Note that > the file > +may or may not exist when ffmpeg is launched. It can be created, updated, > +and removed from the filesystem, and the filter will respond accordingly. > + > +@item check_interval > +(optional) The interval (in ms) between checks for updates to the overlay > file. For > +efficiency, the filter does not check the filesystem on every frame. You > can make > +it check more frequently (less efficient, but more responsive to changes in > the > +overlay PNG) by specifying a lower number. Or you can make it check less > frequently > +(more efficient, but less responsive to changes in the overlay PNG) by > specifying > +a higher number. > + > +Default value is @code{250}. > +@end table This approach is bad to provide such functionality. > + > +@subsection Examples > + > +@itemize > +@item > +Add an overlay to video captured from a DeckLink Mini card; check for > updates to > +the overlay PNG every 100ms > +@example > +ffmpeg -probesize 10000k -r 30000/1001 \ > + -f decklink -i 'DeckLink Mini Recorder (1)@@11' -y \ > + -vf format=pix_fmts=yuv420p \ > + -vf dynoverlay=overlayfile=/var/tmp/overlay.png:check_interval=100 \ You can not give more than one -vf's, only one will ever be used. > + -pix_fmt yuv420p \ > + -s 960x540 \ > + -c:v libx264 -profile:v baseline \ > + -b:v 1024k \ > + -c:a aac -ac 2 -b:a 192k -ar 44100 \ > + -f flv -flags +global_header > 'rtmp://streaming.example.com/appname/streamname' > +@end example > +@end itemize > + > @section edgedetect > Detect and draw edges. The filter uses the Canny Edge Detection algorithm. > diff --git a/libavfilter/Makefile b/libavfilter/Makefile > index 5cd10fa..80a485c 100644 > --- a/libavfilter/Makefile > +++ b/libavfilter/Makefile > @@ -164,6 +164,7 @@ OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o > OBJS-$(CONFIG_DRAWGRAPH_FILTER) += f_drawgraph.o > OBJS-$(CONFIG_DRAWGRID_FILTER) += vf_drawbox.o > OBJS-$(CONFIG_DRAWTEXT_FILTER) += vf_drawtext.o > +OBJS-$(CONFIG_DYNOVERLAY_FILTER) += vf_dynoverlay.o > OBJS-$(CONFIG_EDGEDETECT_FILTER) += vf_edgedetect.o > OBJS-$(CONFIG_ELBG_FILTER) += vf_elbg.o > OBJS-$(CONFIG_EQ_FILTER) += vf_eq.o > diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c > index 47d95f5..d262881 100644 > --- a/libavfilter/allfilters.c > +++ b/libavfilter/allfilters.c > @@ -181,6 +181,7 @@ void avfilter_register_all(void) > REGISTER_FILTER(DRAWGRAPH, drawgraph, vf); > REGISTER_FILTER(DRAWGRID, drawgrid, vf); > REGISTER_FILTER(DRAWTEXT, drawtext, vf); > + REGISTER_FILTER(DYNOVERLAY, dynoverlay, vf); > REGISTER_FILTER(EDGEDETECT, edgedetect, vf); > REGISTER_FILTER(ELBG, elbg, vf); > REGISTER_FILTER(EQ, eq, vf); > diff --git a/libavfilter/version.h b/libavfilter/version.h > index 1a7a1b5..93d249b 100644 > --- a/libavfilter/version.h > +++ b/libavfilter/version.h > @@ -30,7 +30,7 @@ > #include "libavutil/version.h" > #define LIBAVFILTER_VERSION_MAJOR 6 > -#define LIBAVFILTER_VERSION_MINOR 62 > +#define LIBAVFILTER_VERSION_MINOR 63 > #define LIBAVFILTER_VERSION_MICRO 100 > #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ > diff --git a/libavfilter/vf_dynoverlay.c b/libavfilter/vf_dynoverlay.c > new file mode 100644 > index 0000000..9755a63 > --- /dev/null > +++ b/libavfilter/vf_dynoverlay.c > @@ -0,0 +1,439 @@ > +/* > + * Copyright (c) 2016 Jason Priebe > + * > + * 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 > + * dynamic overlay generator > + */ > + > +#include <unistd.h> > +#include <sys/stat.h> > + > +#include "avfilter.h" > +#include "drawutils.h" > +#include "formats.h" > +#include "lavfutils.h" > +#include "lswsutils.h" > +#include "internal.h" > +#include "video.h" > + > +#include "libswscale/swscale.h" > + > +#include "libavutil/avstring.h" > +#include "libavutil/bprint.h" > +#include "libavutil/common.h" > +#include "libavutil/file.h" > +#include "libavutil/eval.h" > +#include "libavutil/imgutils.h" > +#include "libavutil/internal.h" > +#include "libavutil/opt.h" > +#include "libavutil/pixdesc.h" > +#include "libavutil/random_seed.h" > +#include "libavutil/parseutils.h" > +#include "libavutil/timecode.h" > +#include "libavutil/time_internal.h" > +#include "libavutil/tree.h" > +#include "libavutil/lfg.h" Are all those headers really needed? > + > +typedef struct DynOverlayContext { > + const AVClass *class; > + char *overlayfile; > + int check_interval; > + unsigned long long ts_last_check; uint64_t > + time_t ts_last_update; > + AVFrame *overlay_frame; > + > + int main_pix_step[4]; ///< steps per pixel for each plane of the main > output > + int overlay_pix_step[4]; ///< steps per pixel for each plane of the > overlay > + int hsub, vsub; ///< chroma subsampling values > +} DynOverlayContext; > + > +#define OFFSET(x) offsetof(DynOverlayContext, x) > +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM > + > +static const AVOption dynoverlay_options[]= { > +{"overlayfile", "set overlay file", OFFSET(overlayfile), > AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS}, > +{"check_interval", "interval (in ms) between checks for updated overlay > file", OFFSET(check_interval), AV_OPT_TYPE_INT, {.i64=250}, INT_MIN, INT_MAX > , FLAGS}, > +{ NULL } > +}; > + > +AVFILTER_DEFINE_CLASS(dynoverlay); > + > +static unsigned long long get_current_time_ms (void) > +{ > + unsigned long long ms_since_epoch; > + struct timespec spec; > + > + clock_gettime(CLOCK_REALTIME, &spec); > + > + ms_since_epoch = > + (unsigned long long)(spec.tv_sec) * 1000 + > + (unsigned long long)(spec.tv_nsec) / 1.0e6; uint64_t > + > + return ms_since_epoch; > +} > + > +static int load_overlay (AVFilterContext *fctx) > +{ > + DynOverlayContext *ctx = fctx->priv; > + > + AVFrame *rgba_frame; > + > + struct stat attrib; > + int ret; > + > + if ((ret = stat(ctx->overlayfile, &attrib)) != 0) > + { > + return ret; > + } > + ctx->ts_last_update = attrib.st_mtime; > + > + if (ctx->overlay_frame) > + { > + // TODO - make sure we have freed everything > + av_freep(&ctx->overlay_frame->data[0]); > + } > + ctx->overlay_frame = NULL; This is wrong. > + > + rgba_frame = av_frame_alloc(); > + if ((ret = ff_load_image(rgba_frame->data, rgba_frame->linesize, > + &rgba_frame->width, &rgba_frame->height, > + &rgba_frame->format, ctx->overlayfile, ctx)) < 0) > + { > + av_log (fctx, AV_LOG_ERROR, "could not load overlay image\n"); > + return ret; > + } > + > + if (rgba_frame->format != AV_PIX_FMT_RGBA) > + { > + ctx->overlay_frame = NULL; > + av_log (fctx, AV_LOG_ERROR, "overlay image not in RGBA format\n"); > + return 1; > + } > + > + ctx->overlay_frame = av_frame_alloc(); > + > + ctx->overlay_frame->format = AV_PIX_FMT_YUVA420P; > + ctx->overlay_frame->width = rgba_frame->width; > + ctx->overlay_frame->height = rgba_frame->height; > + > + if (av_frame_get_buffer (ctx->overlay_frame, 32) < 0) { > + av_frame_free (&ctx->overlay_frame); > + av_frame_free (&rgba_frame); > + return 1; > + } > + > + if ((ret = ff_scale_image(ctx->overlay_frame->data, > ctx->overlay_frame->linesize, > + rgba_frame->width, rgba_frame->height, ctx->overlay_frame->format, > + rgba_frame->data, rgba_frame->linesize, > + rgba_frame->width, rgba_frame->height, rgba_frame->format, ctx)) < 0) > + { > + av_frame_free (&ctx->overlay_frame); > + av_frame_free (&rgba_frame); > + return ret; > + } > + > + av_frame_free (&rgba_frame); > + > + return 0; > +} > + > + > +static int clear_overlay (AVFilterContext *fctx) > +{ > + DynOverlayContext *ctx = fctx->priv; > + > + ctx->ts_last_update = 0; > + if (ctx->overlay_frame) > + { Check is not needed. > + av_frame_free (&ctx->overlay_frame); > + } > + ctx->overlay_frame = NULL; Not needed. > + > + return 0; > +} > + > +/** > + * Looks for a newly created/updated/deleted overlay file > + */ > +static int check_overlay (AVFilterContext *fctx) > +{ > + DynOverlayContext *ctx = fctx->priv; > + > + struct stat attrib; > + unsigned long long now; > + > + now = get_current_time_ms (); > + > + if ((int)(now - ctx->ts_last_check) < ctx->check_interval) > + { > + return 0; > + } > + > + ctx->ts_last_check = get_current_time_ms (); > + > + if (ctx->ts_last_update == 0) > + { > + // last time we checked, file did not exist (or this is our first time > through) > + if( access( ctx->overlayfile, F_OK ) == -1 ) { > + // file still doesn't exist, so bail out > + return 0; > + } > + > + load_overlay (fctx); > + return 0; > + } > + > + // if we fall through to this line, then last time we checked, the file > *did* exist, > + // so now we look to see if it has been deleted or updated > + if( access( ctx->overlayfile, F_OK ) != 0 ) { > + // file gone > + clear_overlay (fctx); > + return 0; > + } > + > + // file is still there, so get its mod time > + if (stat(ctx->overlayfile, &attrib) != 0) > + { > + // Whaa? file was there just a few lines ago, but now we can't stat it... > + return 1; > + } > + > + if (attrib.st_mtime > ctx->ts_last_update) > + { > + load_overlay (fctx); > + } > + > + return 0; > +} > + > +// divide by 255 and round to nearest > +// apply a fast variant: (X+127)/255 = ((X+127)*257+257)>>16 = > ((X+128)*257)>>16 > +#define FAST_DIV255(x) ((((x) + 128) * 257) >> 16) > + > +// calculate the unpremultiplied alpha, applying the general equation: > +// alpha = alpha_overlay / ( (alpha_main + alpha_overlay) - (alpha_main * > alpha_overlay) ) > +// (((x) << 16) - ((x) << 9) + (x)) is a faster version of: 255 * 255 * x > +// ((((x) + (y)) << 8) - ((x) + (y)) - (y) * (x)) is a faster version of: > 255 * (x + y) > +#define UNPREMULTIPLY_ALPHA(x, y) ((((x) << 16) - ((x) << 9) + (x)) / > ((((x) + (y)) << 8) - ((x) + (y)) - (y) * (x))) > + > +static void blend_image(AVFilterContext *fctx, > + AVFrame *dst, const AVFrame *src) > +{ > + DynOverlayContext *ctx = fctx->priv; > + > + int i, j, jmax, k, kmax; > + const int src_w = src->width; > + const int src_h = src->height; > + const int dst_w = dst->width; > + const int dst_h = dst->height; > + > + for (i = 0; i < 3; i++) > + { > + int hsub = i ? ctx->hsub : 0; > + int vsub = i ? ctx->vsub : 0; > + int src_wp = AV_CEIL_RSHIFT(src_w, hsub); > + int src_hp = AV_CEIL_RSHIFT(src_h, vsub); > + int dst_wp = AV_CEIL_RSHIFT(dst_w, hsub); > + int dst_hp = AV_CEIL_RSHIFT(dst_h, vsub); > + uint8_t *s, *sp, *d, *dp, *a, *ap; > + > + j = 0; > + sp = src->data[i] + j * src->linesize[i]; > + dp = dst->data[i] + j * dst->linesize[i]; > + ap = src->data[3] + (j<<vsub) * src->linesize[3]; > + > + for (jmax = FFMIN(dst_hp, src_hp); j < jmax; j++) > + { > + k = 0; > + d = dp + k; > + s = sp + k; > + a = ap + (k<<hsub); > + > + for (kmax = FFMIN(dst_wp, src_wp); k < kmax; k++) { > + int alpha_v, alpha_h, alpha; > + > + // average alpha for color components, improve quality > + if (hsub && vsub && j+1 < src_hp && k+1 < src_wp) > + { > + alpha = (a[0] + a[src->linesize[3]] + > + a[1] + a[src->linesize[3]+1]) >> 2; > + } > + else if (hsub || vsub) > + { > + alpha_h = hsub && k+1 < src_wp ? > + (a[0] + a[1]) >> 1 : a[0]; > + alpha_v = vsub && j+1 < src_hp ? > + (a[0] + a[src->linesize[3]]) >> 1 : a[0]; > + alpha = (alpha_v + alpha_h) >> 1; > + } > + else > + { > + alpha = a[0]; > + } > + > + *d = FAST_DIV255(*d * (255 - alpha) + *s * alpha); > + s++; > + d++; > + a += 1 << hsub; > + } > + dp += dst->linesize[i]; > + sp += src->linesize[i]; > + ap += (1 << vsub) * src->linesize[3]; > + } > + } > +} > + > +static int config_input(AVFilterLink *link) > +{ > + DynOverlayContext *ctx = link->dst->priv; > + > + const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(link->format); > + > + av_image_fill_max_pixsteps(ctx->main_pix_step, NULL, pix_desc); > + > + ctx->hsub = pix_desc->log2_chroma_w; > + ctx->vsub = pix_desc->log2_chroma_h; > + > + return 0; > +} > + > +static AVFrame *get_video_buffer(AVFilterLink *link, int w, int h) > +{ > + AVFrame *frame; > + > + frame = ff_get_video_buffer(link->dst->outputs[0], w, h); > + if (!frame) > + return NULL; > + > + return frame; > +} > + > +static int filter_frame(AVFilterLink *inlink, AVFrame *inframe) > +{ > + DynOverlayContext *ctx = inlink->dst->priv; > + AVFilterLink *outlink = inlink->dst->outputs[0]; > + AVFrame *outframe; > + int direct = 0; > + > + check_overlay (inlink->dst); > + > + if (!ctx->overlay_frame) > + { > + // if we don't have an overlay, pass the frame along with no > modifications... > + return ff_filter_frame(inlink->dst->outputs[0], inframe); > + } > + > + if (av_frame_is_writable (inframe)) > + { > + direct = 1; > + outframe = inframe; > + } > + else > + { > + outframe = ff_get_video_buffer (outlink, outlink->w, outlink->h); > + if (!outframe) { > + av_frame_free (&inframe); > + return AVERROR (ENOMEM); > + } > + av_frame_copy_props (outframe, inframe); > + } > + > + blend_image (inlink->dst, outframe, ctx->overlay_frame); > + > + if (!direct) > + { > + av_frame_free(&inframe); > + } > + > + return ff_filter_frame(outlink, outframe); > +} > + > +static const AVFilterPad avfilter_vf_dynoverlay_inputs[] = { > + { > + .name = "default", > + .type = AVMEDIA_TYPE_VIDEO, > + .get_video_buffer = get_video_buffer, > + .filter_frame = filter_frame, > + .config_props = config_input, > + }, > + { NULL } > +}; > + > +static const AVFilterPad avfilter_vf_dynoverlay_outputs[] = { > + { > + .name = "default", > + .type = AVMEDIA_TYPE_VIDEO, > + }, > + { NULL } > +}; > + > + > +static av_cold int init(AVFilterContext *fctx) > +{ > + DynOverlayContext *ctx = fctx->priv; > + > + if (!ctx->overlayfile) { > + av_log(fctx, AV_LOG_ERROR, "No overlay filename provided\n"); > + return AVERROR(EINVAL); > + } > + > + ctx->ts_last_check = 0; > + ctx->ts_last_update = 0; > + > + return 0; > +} > + > + > +static av_cold void uninit(AVFilterContext *fctx) > +{ > + DynOverlayContext *ctx = fctx->priv; > + > + if (ctx->overlay_frame) > + { > + av_frame_free (&ctx->overlay_frame); > + } > + ctx->overlay_frame = NULL; > + > + return; > +} > + > +static int query_formats(AVFilterContext *ctx) > +{ > + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV420P, > AV_PIX_FMT_NONE }; > + AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); > + if (!fmts_list) > + return AVERROR(ENOMEM); > + return ff_set_common_formats(ctx, fmts_list); > +} > + > + > + > +AVFilter ff_vf_dynoverlay = { > + .name = "dynoverlay", > + .description = NULL_IF_CONFIG_SMALL("Adds a dynamic PNG overlay to live > streams."), > + .priv_size = sizeof(DynOverlayContext), > + .priv_class = &dynoverlay_class, > + .query_formats = query_formats, > + .init = init, > + .uninit = uninit, > + .inputs = avfilter_vf_dynoverlay_inputs, > + .outputs = avfilter_vf_dynoverlay_outputs, > +}; > diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak > index e2513f5..62ad23b 100644 > --- a/tests/fate/filter-video.mak > +++ b/tests/fate/filter-video.mak > @@ -408,6 +408,9 @@ fate-filter-vflip_crop: CMD = video_filter > "vflip,crop=iw-100:ih-100:100:100" > FATE_FILTER_VSYNTH-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip_vflip > fate-filter-vflip_vflip: CMD = video_filter "vflip,vflip" > +FATE_FILTER_VSYNTH-$(CONFIG_DYNOVERLAY_FILTER) += fate-filter-dynoverlay > +fate-filter-dynoverlay: CMD = video_filter > "dynoverlay=overlayfile=$(TARGET_SAMPLES)/filter/dynoverlay.png:check_interval=100" > + > FATE_FILTER_VSYNTH-$(call ALLYES, FORMAT_FILTER PERMS_FILTER > EDGEDETECT_FILTER) += fate-filter-edgedetect > fate-filter-edgedetect: CMD = video_filter > "format=gray,perms=random,edgedetect" -vframes 20 > -- > 1.8.3.1 I think much better approach is to use named pipes, probably as separate video filter source.
Thanks for the detailed review of the code, Paul. You caught some dumb mistakes that I should have picked up on before I sent the submission. > dynoverlay sounds very powerful, but this filter funcionality is very limited. True, it is limited, but it does something that no other filter does (I am interested in your named pipe idea, though -- see note at the end). > What's up with code identation? I don't know -- I didn't realize there was a problem. I'm just using vi; maybe it formatted stuff in a funny way. Or maybe you don't like my braces on new lines? > > +If the named PNG file does not exist, the filter will do nothing. > > I do not like this design. Supporting only PNG with RGBA, working only > in YUV420P. I built the filter to satisfy a specific need; I thought that maybe others who needed other formats could add in the support for those formats later. I thought I saw some filters in ffmpeg that only support specific formats, so I didn't realize that was a problem. > > +@item check_interval > > +(optional) The interval (in ms) between checks for updates to the overlay > > file. For > > +efficiency, the filter does not check the filesystem on every frame. You > > can make > > +it check more frequently (less efficient, but more responsive to changes in > > the > > +overlay PNG) by specifying a lower number. Or you can make it check less > > frequently > > +(more efficient, but less responsive to changes in the overlay PNG) by > > specifying > > +a higher number. > > + > > +Default value is @code{250}. > > +@end table > > This approach is bad to provide such functionality. Why? Yes, it's a lot of system calls, but it's still performant, so is it fundamentally wrong? > > + -vf format=pix_fmts=yuv420p \ > > + -vf dynoverlay=overlayfile=/var/tmp/overlay.png:check_interval=100 \ > > You can not give more than one -vf's, only one will ever be used. My mistake - I was trying to take a much more complicated example and distill it down and anonymize it. > > +#include <unistd.h> > > ... many headers omitted ... > > +#include "libavutil/lfg.h" > > Are all those headers really needed? Probably not; I could try to pare it down. > > + if (ctx->overlay_frame) > > + { > > + // TODO - make sure we have freed everything > > + av_freep(&ctx->overlay_frame->data[0]); > > + } > > + ctx->overlay_frame = NULL; > > This is wrong. Thanks for catching this; I should use av_frame_free(), right? > > + if (ctx->overlay_frame) > > + { > > Check is not needed. > > > + av_frame_free (&ctx->overlay_frame); > > + } > > + ctx->overlay_frame = NULL; > > Not needed. Does this mean that it is safe to call av_frame_free() with NULL ? > I think much better approach is to use named pipes, probably as > separate video filter source. I would love to see an example of this technique. Based on what I read online (http://ffmpeg.gusari.org/viewtopic.php?f=11&t=2774 for example), I didn't think this technique worked. And even if it could work, wouldn't I need a process that is constantly generating frame data from PNGs to feed it to ffmpeg, which then has to read it 30 times a second (when it only changes every 2-3 *minutes*). That seems extremely inefficient for overlays that are not changing frequently. This is why I was trying to read the PNG once, hold it in memory until it changes or is removed. Maybe it would be more elegant if I wasn't polling the filesystem; I could send signals to ffmpeg instead. But I don't see a clear advantage to that technique, and there are some disadvantages. It's extremely simple for an external application to write to a specified file. But a model based on signalling would require that the process also know the PID of the ffmpeg process. I guess my question for you is whether this filter has any value to the larger community. If not, I'll just maintain it myself as a patch that I can apply to my own builds. Jason Priebe CBC New Media
On Thu, 22 Sep 2016 18:45:43 +0000 "Priebe, Jason" <jpriebe@cbcnewmedia.com> wrote: > This patch adds a new filter that allows you to drive dynamic graphic overlays > on a live encoding by creating/updating/deleting a specified 32-bit PNG. > This is very different from the overlay filter, because it lets you change > the overlay in real time during a live stream. It doesn't allow you to overlay > video on top of video, but you can overlay still images over video, which is > useful for things like lower-thirds and fullscreen graphics. This seems like a very odd approach, and the filter seems to have very limited usefulness. Why can't this be a bit more general? Like providing an API to set overlay images, and letting ffmpeg.c use it to e.g. load from a file in intervals. Rather than hardcoding yet another CLU use-case in the libs. We already have a long list of filters that seem to hardcode such things. Most importantly, it definitely shouldn't duplicate any blending code. > + > +static unsigned long long get_current_time_ms (void) > +{ > + unsigned long long ms_since_epoch; > + struct timespec spec; > + > + clock_gettime(CLOCK_REALTIME, &spec); Unportable. > + > + ms_since_epoch = > + (unsigned long long)(spec.tv_sec) * 1000 + > + (unsigned long long)(spec.tv_nsec) / 1.0e6; > + > + return ms_since_epoch; > +} > + > +static int load_overlay (AVFilterContext *fctx) > +{ > + DynOverlayContext *ctx = fctx->priv; > + > + AVFrame *rgba_frame; > + > + struct stat attrib; > + int ret; > + > + if ((ret = stat(ctx->overlayfile, &attrib)) != 0) Not sure if portable.
On 9/23/16, Priebe, Jason <jpriebe@cbcnewmedia.com> wrote: > Thanks for the detailed review of the code, Paul. You caught some dumb > mistakes that I should have picked up on before I sent the submission. > >> dynoverlay sounds very powerful, but this filter funcionality is very >> limited. > > True, it is limited, but it does something that no other filter does (I am > interested in your named pipe idea, though -- see note at the end). > >> What's up with code identation? > > I don't know -- I didn't realize there was a problem. I'm just using vi; > maybe > it formatted stuff in a funny way. Or maybe you don't like my braces on new > lines? > >> > +If the named PNG file does not exist, the filter will do nothing. >> >> I do not like this design. Supporting only PNG with RGBA, working only >> in YUV420P. > > I built the filter to satisfy a specific need; I thought that maybe others > who needed other formats could add in the support for those formats later. > I thought I saw some filters in ffmpeg that only support specific formats, > so I didn't realize that was a problem. > >> > +@item check_interval >> > +(optional) The interval (in ms) between checks for updates to the >> > overlay >> > file. For >> > +efficiency, the filter does not check the filesystem on every frame. >> > You >> > can make >> > +it check more frequently (less efficient, but more responsive to >> > changes in >> > the >> > +overlay PNG) by specifying a lower number. Or you can make it check >> > less >> > frequently >> > +(more efficient, but less responsive to changes in the overlay PNG) by >> > specifying >> > +a higher number. >> > + >> > +Default value is @code{250}. >> > +@end table >> >> This approach is bad to provide such functionality. > > Why? Yes, it's a lot of system calls, but it's still performant, so is > it fundamentally wrong? > >> > + -vf format=pix_fmts=yuv420p \ >> > + -vf dynoverlay=overlayfile=/var/tmp/overlay.png:check_interval=100 \ >> >> You can not give more than one -vf's, only one will ever be used. > > My mistake - I was trying to take a much more complicated example and > distill it > down and anonymize it. > >> > +#include <unistd.h> >> > ... many headers omitted ... >> > +#include "libavutil/lfg.h" >> >> Are all those headers really needed? > > Probably not; I could try to pare it down. > >> > + if (ctx->overlay_frame) >> > + { >> > + // TODO - make sure we have freed everything >> > + av_freep(&ctx->overlay_frame->data[0]); >> > + } >> > + ctx->overlay_frame = NULL; >> >> This is wrong. > > Thanks for catching this; I should use av_frame_free(), right? > >> > + if (ctx->overlay_frame) >> > + { >> >> Check is not needed. >> >> > + av_frame_free (&ctx->overlay_frame); >> > + } >> > + ctx->overlay_frame = NULL; >> >> Not needed. > > Does this mean that it is safe to call av_frame_free() with NULL ? > >> I think much better approach is to use named pipes, probably as >> separate video filter source. > > I would love to see an example of this technique. Based on what I read > online > (http://ffmpeg.gusari.org/viewtopic.php?f=11&t=2774 for example), I didn't > think this technique worked. And even if it could work, wouldn't I need a > process > that is constantly generating frame data from PNGs to feed it to ffmpeg, > which > then has to read it 30 times a second (when it only changes every 2-3 > *minutes*). Named pipe approach would implement video source which would read images from named pipe. It would read from named pipe until it decodes single frame and then would use that frame as input to next filter, for example overlay filter. If it encounters EOF in named pipe it would not abort but would instead keep sending last frame it got, for example completely transparent frame. If it suddenly get more data from pipe it would update its internal frame and output it as input to next filter in chain. So command would look like this: imagepipe=named_pipe:rate=30[o],[0:v][o]overlay=x=0:y=0 ... And than in another terminal, you would use commands like this: cat random_image.format > named_pipe
diff --git a/Changelog b/Changelog index 2d0a449..5b620b4 100644 --- a/Changelog +++ b/Changelog @@ -31,6 +31,7 @@ version <next>: - MediaCodec HEVC decoding - TrueHD encoder - Meridian Lossless Packing (MLP) encoder +- dynoverlay filter version 3.1: diff --git a/doc/filters.texi b/doc/filters.texi index 070e57d..e67e29a 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -7080,6 +7080,60 @@ For more information about fontconfig, check: For more information about libfribidi, check: @url{http://fribidi.org/}. +@section dynoverlay + +Uses a PNG with alpha to dynamically add, update, and remove overlays +during live streams. + +If the named PNG file does not exist, the filter will do nothing. + +When the filter first detects the presence of the PNG, it will load it +into a memory and overlay it on all frames until the PNG is either +updated or removed. If the PNG is updated, the filter will read it into +memory again. If the PNG is removed, the filter will clear the memory +and stop overlaying the image. + +Note that this filter only works with YUV420P video. + +The filter accepts the following options: + +@table @option +@item overlayfile +(required) The name of the PNG that will contain the overlays. Note that the file +may or may not exist when ffmpeg is launched. It can be created, updated, +and removed from the filesystem, and the filter will respond accordingly. + +@item check_interval +(optional) The interval (in ms) between checks for updates to the overlay file. For +efficiency, the filter does not check the filesystem on every frame. You can make +it check more frequently (less efficient, but more responsive to changes in the +overlay PNG) by specifying a lower number. Or you can make it check less frequently +(more efficient, but less responsive to changes in the overlay PNG) by specifying +a higher number. + +Default value is @code{250}. +@end table + +@subsection Examples + +@itemize +@item +Add an overlay to video captured from a DeckLink Mini card; check for updates to +the overlay PNG every 100ms +@example +ffmpeg -probesize 10000k -r 30000/1001 \ + -f decklink -i 'DeckLink Mini Recorder (1)@@11' -y \ + -vf format=pix_fmts=yuv420p \ + -vf dynoverlay=overlayfile=/var/tmp/overlay.png:check_interval=100 \ + -pix_fmt yuv420p \ + -s 960x540 \ + -c:v libx264 -profile:v baseline \ + -b:v 1024k \ + -c:a aac -ac 2 -b:a 192k -ar 44100 \ + -f flv -flags +global_header 'rtmp://streaming.example.com/appname/streamname' +@end example +@end itemize + @section edgedetect Detect and draw edges. The filter uses the Canny Edge Detection algorithm. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 5cd10fa..80a485c 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -164,6 +164,7 @@ OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o OBJS-$(CONFIG_DRAWGRAPH_FILTER) += f_drawgraph.o OBJS-$(CONFIG_DRAWGRID_FILTER) += vf_drawbox.o OBJS-$(CONFIG_DRAWTEXT_FILTER) += vf_drawtext.o +OBJS-$(CONFIG_DYNOVERLAY_FILTER) += vf_dynoverlay.o OBJS-$(CONFIG_EDGEDETECT_FILTER) += vf_edgedetect.o OBJS-$(CONFIG_ELBG_FILTER) += vf_elbg.o OBJS-$(CONFIG_EQ_FILTER) += vf_eq.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 47d95f5..d262881 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -181,6 +181,7 @@ void avfilter_register_all(void) REGISTER_FILTER(DRAWGRAPH, drawgraph, vf); REGISTER_FILTER(DRAWGRID, drawgrid, vf); REGISTER_FILTER(DRAWTEXT, drawtext, vf); + REGISTER_FILTER(DYNOVERLAY, dynoverlay, vf); REGISTER_FILTER(EDGEDETECT, edgedetect, vf); REGISTER_FILTER(ELBG, elbg, vf); REGISTER_FILTER(EQ, eq, vf); diff --git a/libavfilter/version.h b/libavfilter/version.h index 1a7a1b5..93d249b 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 6 -#define LIBAVFILTER_VERSION_MINOR 62 +#define LIBAVFILTER_VERSION_MINOR 63 #define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ diff --git a/libavfilter/vf_dynoverlay.c b/libavfilter/vf_dynoverlay.c new file mode 100644 index 0000000..9755a63 --- /dev/null +++ b/libavfilter/vf_dynoverlay.c @@ -0,0 +1,439 @@ +/* + * Copyright (c) 2016 Jason Priebe + * + * 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 + * dynamic overlay generator + */ + +#include <unistd.h> +#include <sys/stat.h> + +#include "avfilter.h" +#include "drawutils.h" +#include "formats.h" +#include "lavfutils.h" +#include "lswsutils.h" +#include "internal.h" +#include "video.h" + +#include "libswscale/swscale.h" + +#include "libavutil/avstring.h" +#include "libavutil/bprint.h" +#include "libavutil/common.h" +#include "libavutil/file.h" +#include "libavutil/eval.h" +#include "libavutil/imgutils.h" +#include "libavutil/internal.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "libavutil/random_seed.h" +#include "libavutil/parseutils.h" +#include "libavutil/timecode.h" +#include "libavutil/time_internal.h" +#include "libavutil/tree.h" +#include "libavutil/lfg.h" + +typedef struct DynOverlayContext { + const AVClass *class; + char *overlayfile; + int check_interval; + unsigned long long ts_last_check; + time_t ts_last_update; + AVFrame *overlay_frame; + + int main_pix_step[4]; ///< steps per pixel for each plane of the main output + int overlay_pix_step[4]; ///< steps per pixel for each plane of the overlay + int hsub, vsub; ///< chroma subsampling values +} DynOverlayContext; + +#define OFFSET(x) offsetof(DynOverlayContext, x) +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM + +static const AVOption dynoverlay_options[]= { +{"overlayfile", "set overlay file", OFFSET(overlayfile), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS}, +{"check_interval", "interval (in ms) between checks for updated overlay file", OFFSET(check_interval), AV_OPT_TYPE_INT, {.i64=250}, INT_MIN, INT_MAX , FLAGS}, +{ NULL } +}; + +AVFILTER_DEFINE_CLASS(dynoverlay); + +static unsigned long long get_current_time_ms (void) +{ + unsigned long long ms_since_epoch; + struct timespec spec; + + clock_gettime(CLOCK_REALTIME, &spec); + + ms_since_epoch = + (unsigned long long)(spec.tv_sec) * 1000 + + (unsigned long long)(spec.tv_nsec) / 1.0e6; + + return ms_since_epoch; +} + +static int load_overlay (AVFilterContext *fctx) +{ + DynOverlayContext *ctx = fctx->priv; + + AVFrame *rgba_frame; + + struct stat attrib; + int ret; + + if ((ret = stat(ctx->overlayfile, &attrib)) != 0) + { + return ret; + } + ctx->ts_last_update = attrib.st_mtime; + + if (ctx->overlay_frame) + { + // TODO - make sure we have freed everything + av_freep(&ctx->overlay_frame->data[0]); + } + ctx->overlay_frame = NULL; + + rgba_frame = av_frame_alloc(); + if ((ret = ff_load_image(rgba_frame->data, rgba_frame->linesize, + &rgba_frame->width, &rgba_frame->height, + &rgba_frame->format, ctx->overlayfile, ctx)) < 0) + { + av_log (fctx, AV_LOG_ERROR, "could not load overlay image\n"); + return ret; + } + + if (rgba_frame->format != AV_PIX_FMT_RGBA) + { + ctx->overlay_frame = NULL; + av_log (fctx, AV_LOG_ERROR, "overlay image not in RGBA format\n"); + return 1; + } + + ctx->overlay_frame = av_frame_alloc(); + + ctx->overlay_frame->format = AV_PIX_FMT_YUVA420P; + ctx->overlay_frame->width = rgba_frame->width; + ctx->overlay_frame->height = rgba_frame->height; + + if (av_frame_get_buffer (ctx->overlay_frame, 32) < 0) { + av_frame_free (&ctx->overlay_frame); + av_frame_free (&rgba_frame); + return 1; + } + + if ((ret = ff_scale_image(ctx->overlay_frame->data, ctx->overlay_frame->linesize, + rgba_frame->width, rgba_frame->height, ctx->overlay_frame->format, + rgba_frame->data, rgba_frame->linesize, + rgba_frame->width, rgba_frame->height, rgba_frame->format, ctx)) < 0) + { + av_frame_free (&ctx->overlay_frame); + av_frame_free (&rgba_frame); + return ret; + } + + av_frame_free (&rgba_frame); + + return 0; +} + + +static int clear_overlay (AVFilterContext *fctx) +{ + DynOverlayContext *ctx = fctx->priv; + + ctx->ts_last_update = 0; + if (ctx->overlay_frame) + { + av_frame_free (&ctx->overlay_frame); + } + ctx->overlay_frame = NULL; + + return 0; +} + +/** + * Looks for a newly created/updated/deleted overlay file + */ +static int check_overlay (AVFilterContext *fctx) +{ + DynOverlayContext *ctx = fctx->priv; + + struct stat attrib; + unsigned long long now; + + now = get_current_time_ms (); + + if ((int)(now - ctx->ts_last_check) < ctx->check_interval) + { + return 0; + } + + ctx->ts_last_check = get_current_time_ms (); + + if (ctx->ts_last_update == 0) + { + // last time we checked, file did not exist (or this is our first time through) + if( access( ctx->overlayfile, F_OK ) == -1 ) { + // file still doesn't exist, so bail out + return 0; + } + + load_overlay (fctx); + return 0; + } + + // if we fall through to this line, then last time we checked, the file *did* exist, + // so now we look to see if it has been deleted or updated + if( access( ctx->overlayfile, F_OK ) != 0 ) { + // file gone + clear_overlay (fctx); + return 0; + } + + // file is still there, so get its mod time + if (stat(ctx->overlayfile, &attrib) != 0) + { + // Whaa? file was there just a few lines ago, but now we can't stat it... + return 1; + } + + if (attrib.st_mtime > ctx->ts_last_update) + { + load_overlay (fctx); + } + + return 0; +} + +// divide by 255 and round to nearest +// apply a fast variant: (X+127)/255 = ((X+127)*257+257)>>16 = ((X+128)*257)>>16 +#define FAST_DIV255(x) ((((x) + 128) * 257) >> 16) + +// calculate the unpremultiplied alpha, applying the general equation: +// alpha = alpha_overlay / ( (alpha_main + alpha_overlay) - (alpha_main * alpha_overlay) ) +// (((x) << 16) - ((x) << 9) + (x)) is a faster version of: 255 * 255 * x +// ((((x) + (y)) << 8) - ((x) + (y)) - (y) * (x)) is a faster version of: 255 * (x + y) +#define UNPREMULTIPLY_ALPHA(x, y) ((((x) << 16) - ((x) << 9) + (x)) / ((((x) + (y)) << 8) - ((x) + (y)) - (y) * (x))) + +static void blend_image(AVFilterContext *fctx, + AVFrame *dst, const AVFrame *src) +{ + DynOverlayContext *ctx = fctx->priv; + + int i, j, jmax, k, kmax; + const int src_w = src->width; + const int src_h = src->height; + const int dst_w = dst->width; + const int dst_h = dst->height; + + for (i = 0; i < 3; i++) + { + int hsub = i ? ctx->hsub : 0; + int vsub = i ? ctx->vsub : 0; + int src_wp = AV_CEIL_RSHIFT(src_w, hsub); + int src_hp = AV_CEIL_RSHIFT(src_h, vsub); + int dst_wp = AV_CEIL_RSHIFT(dst_w, hsub); + int dst_hp = AV_CEIL_RSHIFT(dst_h, vsub); + uint8_t *s, *sp, *d, *dp, *a, *ap; + + j = 0; + sp = src->data[i] + j * src->linesize[i]; + dp = dst->data[i] + j * dst->linesize[i]; + ap = src->data[3] + (j<<vsub) * src->linesize[3]; + + for (jmax = FFMIN(dst_hp, src_hp); j < jmax; j++) + { + k = 0; + d = dp + k; + s = sp + k; + a = ap + (k<<hsub); + + for (kmax = FFMIN(dst_wp, src_wp); k < kmax; k++) { + int alpha_v, alpha_h, alpha; + + // average alpha for color components, improve quality + if (hsub && vsub && j+1 < src_hp && k+1 < src_wp) + { + alpha = (a[0] + a[src->linesize[3]] + + a[1] + a[src->linesize[3]+1]) >> 2; + } + else if (hsub || vsub) + { + alpha_h = hsub && k+1 < src_wp ? + (a[0] + a[1]) >> 1 : a[0]; + alpha_v = vsub && j+1 < src_hp ? + (a[0] + a[src->linesize[3]]) >> 1 : a[0]; + alpha = (alpha_v + alpha_h) >> 1; + } + else + { + alpha = a[0]; + } + + *d = FAST_DIV255(*d * (255 - alpha) + *s * alpha); + s++; + d++; + a += 1 << hsub; + } + dp += dst->linesize[i]; + sp += src->linesize[i]; + ap += (1 << vsub) * src->linesize[3]; + } + } +} + +static int config_input(AVFilterLink *link) +{ + DynOverlayContext *ctx = link->dst->priv; + + const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(link->format); + + av_image_fill_max_pixsteps(ctx->main_pix_step, NULL, pix_desc); + + ctx->hsub = pix_desc->log2_chroma_w; + ctx->vsub = pix_desc->log2_chroma_h; + + return 0; +} + +static AVFrame *get_video_buffer(AVFilterLink *link, int w, int h) +{ + AVFrame *frame; + + frame = ff_get_video_buffer(link->dst->outputs[0], w, h); + if (!frame) + return NULL; + + return frame; +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *inframe) +{ + DynOverlayContext *ctx = inlink->dst->priv; + AVFilterLink *outlink = inlink->dst->outputs[0]; + AVFrame *outframe; + int direct = 0; + + check_overlay (inlink->dst); + + if (!ctx->overlay_frame) + { + // if we don't have an overlay, pass the frame along with no modifications... + return ff_filter_frame(inlink->dst->outputs[0], inframe); + } + + if (av_frame_is_writable (inframe)) + { + direct = 1; + outframe = inframe; + } + else + { + outframe = ff_get_video_buffer (outlink, outlink->w, outlink->h); + if (!outframe) { + av_frame_free (&inframe); + return AVERROR (ENOMEM); + } + av_frame_copy_props (outframe, inframe); + } + + blend_image (inlink->dst, outframe, ctx->overlay_frame); + + if (!direct) + { + av_frame_free(&inframe); + } + + return ff_filter_frame(outlink, outframe); +} + +static const AVFilterPad avfilter_vf_dynoverlay_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .get_video_buffer = get_video_buffer, + .filter_frame = filter_frame, + .config_props = config_input, + }, + { NULL } +}; + +static const AVFilterPad avfilter_vf_dynoverlay_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + }, + { NULL } +}; + + +static av_cold int init(AVFilterContext *fctx) +{ + DynOverlayContext *ctx = fctx->priv; + + if (!ctx->overlayfile) { + av_log(fctx, AV_LOG_ERROR, "No overlay filename provided\n"); + return AVERROR(EINVAL); + } + + ctx->ts_last_check = 0; + ctx->ts_last_update = 0; + + return 0; +} + + +static av_cold void uninit(AVFilterContext *fctx) +{ + DynOverlayContext *ctx = fctx->priv; + + if (ctx->overlay_frame) + { + av_frame_free (&ctx->overlay_frame); + } + ctx->overlay_frame = NULL; + + return; +} + +static int query_formats(AVFilterContext *ctx) +{ + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }; + AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); + if (!fmts_list) + return AVERROR(ENOMEM); + return ff_set_common_formats(ctx, fmts_list); +} + + + +AVFilter ff_vf_dynoverlay = { + .name = "dynoverlay", + .description = NULL_IF_CONFIG_SMALL("Adds a dynamic PNG overlay to live streams."), + .priv_size = sizeof(DynOverlayContext), + .priv_class = &dynoverlay_class, + .query_formats = query_formats, + .init = init, + .uninit = uninit, + .inputs = avfilter_vf_dynoverlay_inputs, + .outputs = avfilter_vf_dynoverlay_outputs, +}; diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index e2513f5..62ad23b 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -408,6 +408,9 @@ fate-filter-vflip_crop: CMD = video_filter "vflip,crop=iw-100:ih-100:100:100" FATE_FILTER_VSYNTH-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip_vflip fate-filter-vflip_vflip: CMD = video_filter "vflip,vflip" +FATE_FILTER_VSYNTH-$(CONFIG_DYNOVERLAY_FILTER) += fate-filter-dynoverlay +fate-filter-dynoverlay: CMD = video_filter "dynoverlay=overlayfile=$(TARGET_SAMPLES)/filter/dynoverlay.png:check_interval=100" + FATE_FILTER_VSYNTH-$(call ALLYES, FORMAT_FILTER PERMS_FILTER EDGEDETECT_FILTER) += fate-filter-edgedetect fate-filter-edgedetect: CMD = video_filter "format=gray,perms=random,edgedetect" -vframes 20 -- 1.8.3.1