ffmpeg | branch: master | Nicolas George <geo...@nsup.org> | Mon Jul 17 16:38:18 2017 +0200| [a5e3b0c1934f76f21957d001853cf976a94da47b] | committer: Nicolas George
lavfi/vf_maskedmerge: move to "activate" design. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5e3b0c1934f76f21957d001853cf976a94da47b --- libavfilter/Makefile | 2 +- libavfilter/maskedmerge.h | 2 +- libavfilter/vf_maskedmerge.c | 29 ++++++++++------------------- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 0edd33576f..5128f0f937 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -226,7 +226,7 @@ OBJS-$(CONFIG_LUT3D_FILTER) += vf_lut3d.o OBJS-$(CONFIG_LUTRGB_FILTER) += vf_lut.o OBJS-$(CONFIG_LUTYUV_FILTER) += vf_lut.o OBJS-$(CONFIG_MASKEDCLAMP_FILTER) += vf_maskedclamp.o framesync.o -OBJS-$(CONFIG_MASKEDMERGE_FILTER) += vf_maskedmerge.o framesync.o +OBJS-$(CONFIG_MASKEDMERGE_FILTER) += vf_maskedmerge.o framesync2.o OBJS-$(CONFIG_MCDEINT_FILTER) += vf_mcdeint.o OBJS-$(CONFIG_MERGEPLANES_FILTER) += vf_mergeplanes.o framesync.o OBJS-$(CONFIG_MESTIMATE_FILTER) += vf_mestimate.o motion_estimation.o diff --git a/libavfilter/maskedmerge.h b/libavfilter/maskedmerge.h index 8e2b1cf676..3d670f6d5d 100644 --- a/libavfilter/maskedmerge.h +++ b/libavfilter/maskedmerge.h @@ -22,7 +22,7 @@ #define AVFILTER_MASKEDMERGE_H #include "avfilter.h" -#include "framesync.h" +#include "framesync2.h" typedef struct MaskedMergeContext { const AVClass *class; diff --git a/libavfilter/vf_maskedmerge.c b/libavfilter/vf_maskedmerge.c index cf8a56814e..54def62820 100644 --- a/libavfilter/vf_maskedmerge.c +++ b/libavfilter/vf_maskedmerge.c @@ -71,9 +71,9 @@ static int process_frame(FFFrameSync *fs) AVFrame *out, *base, *overlay, *mask; int ret; - if ((ret = ff_framesync_get_frame(&s->fs, 0, &base, 0)) < 0 || - (ret = ff_framesync_get_frame(&s->fs, 1, &overlay, 0)) < 0 || - (ret = ff_framesync_get_frame(&s->fs, 2, &mask, 0)) < 0) + if ((ret = ff_framesync2_get_frame(&s->fs, 0, &base, 0)) < 0 || + (ret = ff_framesync2_get_frame(&s->fs, 1, &overlay, 0)) < 0 || + (ret = ff_framesync2_get_frame(&s->fs, 2, &mask, 0)) < 0) return ret; if (ctx->is_disabled) { @@ -232,7 +232,7 @@ static int config_output(AVFilterLink *outlink) if ((ret = av_image_fill_linesizes(s->linesize, outlink->format, outlink->w)) < 0) return ret; - if ((ret = ff_framesync_init(&s->fs, ctx, 3)) < 0) + if ((ret = ff_framesync2_init(&s->fs, ctx, 3)) < 0) return ret; in = s->fs.in; @@ -251,44 +251,35 @@ static int config_output(AVFilterLink *outlink) s->fs.opaque = s; s->fs.on_event = process_frame; - return ff_framesync_configure(&s->fs); + return ff_framesync2_configure(&s->fs); } -static int filter_frame(AVFilterLink *inlink, AVFrame *buf) +static int activate(AVFilterContext *ctx) { - MaskedMergeContext *s = inlink->dst->priv; - return ff_framesync_filter_frame(&s->fs, inlink, buf); -} - -static int request_frame(AVFilterLink *outlink) -{ - MaskedMergeContext *s = outlink->src->priv; - return ff_framesync_request_frame(&s->fs, outlink); + MaskedMergeContext *s = ctx->priv; + return ff_framesync2_activate(&s->fs); } static av_cold void uninit(AVFilterContext *ctx) { MaskedMergeContext *s = ctx->priv; - ff_framesync_uninit(&s->fs); + ff_framesync2_uninit(&s->fs); } static const AVFilterPad maskedmerge_inputs[] = { { .name = "base", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame, .config_props = config_input, }, { .name = "overlay", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame, }, { .name = "mask", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame, }, { NULL } }; @@ -298,7 +289,6 @@ static const AVFilterPad maskedmerge_outputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_output, - .request_frame = request_frame, }, { NULL } }; @@ -309,6 +299,7 @@ AVFilter ff_vf_maskedmerge = { .priv_size = sizeof(MaskedMergeContext), .uninit = uninit, .query_formats = query_formats, + .activate = activate, .inputs = maskedmerge_inputs, .outputs = maskedmerge_outputs, .priv_class = &maskedmerge_class, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog