From patchwork Thu Aug 10 11:46:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 4680 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp2309344vsu; Thu, 10 Aug 2017 04:48:55 -0700 (PDT) X-Received: by 10.28.20.65 with SMTP id 62mr6903518wmu.51.1502365735271; Thu, 10 Aug 2017 04:48:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502365735; cv=none; d=google.com; s=arc-20160816; b=v+D6Jjvg+3pRubt/YKM+DQ5UFEnjpXZWlyompwHjzNXj2kOyEpo0SGB2qZDJE6iWVD 5kjNtQmWDxPZzoGRlkoJU+73rzy0YvZSSTUfbwvDoCvNIKamwTnkWAIxpLt8NH/Zbwqj J1Q9vNxZjADs8EmCNn+oYnT3q17muiU7U0We26K+OQF5MI3T1b+ihsqs7uy1GOug4Tg4 3K+2PiifzFy/5GdVnGgIse26GAGArmksNMEPmxkhtlqpHs2NtNjK4EmoxI8o/+mZS+4+ xH/fXKsBAHLfUIs0tydBXf6EGsy960XZWqRpXBAiomi02dClx32HSmpUnZMgmFagAoRJ sW7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=oDQuCue/kQwr9fFwTGRHVQxxn3n78YhHipYX0SqG2F8=; b=KGUGv4/7tHRlBnbyLL3sDbvEGandGXlVeu1JBE+XQ4tQ/W3gxgFIIeubemyW+dMIZq WPPTeP/1Le5RVqQrjH91o1aHiwshEOXa6KZnuHMv1vews6PC2U9Cg7p7YRmfygWaFyTf n5+cakmLxq8xTdn1icV+199A/BM00I3DIvQ6OKPaNs1A1mXuI5Psmr2armHLGTt2gwEv Lgs8iFavUD+AGza3C2++ST15Hvc4qJ98zXA5Que5gwFuLyFkJPSbrByTZ3ujv8a4dxxB fN7vYtj4uIjm9QmPN2JwrrO6d6txZyO5PnIMAnTOSzTBG02AQrCqH6mSxfQMFwqzVqYO SIPw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 36si5220131wrr.268.2017.08.10.04.48.54; Thu, 10 Aug 2017 04:48:55 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 40BCB689C81; Thu, 10 Aug 2017 14:46:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from nef2.ens.fr (nef2.ens.fr [129.199.96.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2918F689C84 for ; Thu, 10 Aug 2017 14:46:50 +0300 (EEST) Received: from phare.normalesup.org (archicubes.ens.fr [129.199.129.80]) by nef2.ens.fr (8.13.6/1.01.28121999) with ESMTP id v7ABkqH8043717 for ; Thu, 10 Aug 2017 13:46:52 +0200 (CEST) Received: by phare.normalesup.org (Postfix, from userid 1001) id 61D3BE00F1; Thu, 10 Aug 2017 13:46:52 +0200 (CEST) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Aug 2017 13:46:35 +0200 Message-Id: <20170810114642.26779-9-george@nsup.org> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170810114642.26779-1-george@nsup.org> References: <20170810114642.26779-1-george@nsup.org> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef2.ens.fr [129.199.96.32]); Thu, 10 Aug 2017 13:46:52 +0200 (CEST) Subject: [FFmpeg-devel] [PATCH 09/16] lavfi/vf_blend: convert to framesync2. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Nicolas George --- libavfilter/Makefile | 4 ++-- libavfilter/vf_blend.c | 48 +++++++++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 23 deletions(-) Unchanged. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 75a73c4cc0..13c0c2dbd2 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -136,7 +136,7 @@ OBJS-$(CONFIG_BENCH_FILTER) += f_bench.o OBJS-$(CONFIG_BITPLANENOISE_FILTER) += vf_bitplanenoise.o OBJS-$(CONFIG_BLACKDETECT_FILTER) += vf_blackdetect.o OBJS-$(CONFIG_BLACKFRAME_FILTER) += vf_blackframe.o -OBJS-$(CONFIG_BLEND_FILTER) += vf_blend.o dualinput.o framesync.o +OBJS-$(CONFIG_BLEND_FILTER) += vf_blend.o framesync2.o OBJS-$(CONFIG_BOXBLUR_FILTER) += vf_boxblur.o OBJS-$(CONFIG_BWDIF_FILTER) += vf_bwdif.o OBJS-$(CONFIG_CHROMAKEY_FILTER) += vf_chromakey.o @@ -307,7 +307,7 @@ OBJS-$(CONFIG_SUBTITLES_FILTER) += vf_subtitles.o OBJS-$(CONFIG_SUPER2XSAI_FILTER) += vf_super2xsai.o OBJS-$(CONFIG_SWAPRECT_FILTER) += vf_swaprect.o OBJS-$(CONFIG_SWAPUV_FILTER) += vf_swapuv.o -OBJS-$(CONFIG_TBLEND_FILTER) += vf_blend.o dualinput.o framesync.o +OBJS-$(CONFIG_TBLEND_FILTER) += vf_blend.o framesync2.o OBJS-$(CONFIG_TELECINE_FILTER) += vf_telecine.o OBJS-$(CONFIG_THRESHOLD_FILTER) += vf_threshold.o framesync2.o OBJS-$(CONFIG_THUMBNAIL_FILTER) += vf_thumbnail.o diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 9bde3b22a1..24f8729892 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -25,8 +25,8 @@ #include "avfilter.h" #include "bufferqueue.h" #include "formats.h" +#include "framesync2.h" #include "internal.h" -#include "dualinput.h" #include "video.h" #include "blend.h" @@ -35,7 +35,7 @@ typedef struct BlendContext { const AVClass *class; - FFDualInputContext dinput; + FFFrameSync fs; int hsub, vsub; ///< chroma subsampling values int nb_planes; char *all_expr; @@ -114,12 +114,10 @@ typedef struct ThreadData { static const AVOption blend_options[] = { COMMON_OPTIONS, - { "shortest", "force termination when the shortest input terminates", OFFSET(dinput.shortest), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS }, - { "repeatlast", "repeat last bottom frame", OFFSET(dinput.repeatlast), AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, FLAGS }, { NULL } }; -AVFILTER_DEFINE_CLASS(blend); +FRAMESYNC_DEFINE_CLASS(blend, BlendContext, fs); #define COPY(src) \ static void blend_copy ## src(const uint8_t *top, ptrdiff_t top_linesize, \ @@ -405,13 +403,28 @@ static AVFrame *blend_frame(AVFilterContext *ctx, AVFrame *top_buf, return dst_buf; } +static int blend_frame_for_dualinput(FFFrameSync *fs) +{ + AVFilterContext *ctx = fs->parent; + AVFrame *top_buf, *bottom_buf, *dst_buf; + int ret; + + ret = ff_framesync2_dualinput_get(fs, &top_buf, &bottom_buf); + if (ret < 0) + return ret; + if (!bottom_buf) + return ff_filter_frame(ctx->outputs[0], top_buf); + dst_buf = blend_frame(ctx, top_buf, bottom_buf); + return ff_filter_frame(ctx->outputs[0], dst_buf); +} + static av_cold int init(AVFilterContext *ctx) { BlendContext *s = ctx->priv; s->tblend = !strcmp(ctx->filter->name, "tblend"); - s->dinput.process = blend_frame; + s->fs.on_event = blend_frame_for_dualinput; return 0; } @@ -439,7 +452,7 @@ static av_cold void uninit(AVFilterContext *ctx) BlendContext *s = ctx->priv; int i; - ff_dualinput_uninit(&s->dinput); + ff_framesync2_uninit(&s->fs); av_frame_free(&s->prev_frame); for (i = 0; i < FF_ARRAY_ELEMS(s->params); i++) @@ -539,7 +552,7 @@ static int config_output(AVFilterLink *outlink) s->nb_planes = av_pix_fmt_count_planes(toplink->format); if (!s->tblend) - if ((ret = ff_dualinput_init(ctx, &s->dinput)) < 0) + if ((ret = ff_framesync2_init_dualinput(&s->fs, ctx)) < 0) return ret; for (plane = 0; plane < FF_ARRAY_ELEMS(s->params); plane++) { @@ -566,32 +579,24 @@ static int config_output(AVFilterLink *outlink) } } - return 0; + return s->tblend ? 0 : ff_framesync2_configure(&s->fs); } #if CONFIG_BLEND_FILTER -static int request_frame(AVFilterLink *outlink) +static int activate(AVFilterContext *ctx) { - BlendContext *s = outlink->src->priv; - return ff_dualinput_request_frame(&s->dinput, outlink); -} - -static int filter_frame(AVFilterLink *inlink, AVFrame *buf) -{ - BlendContext *s = inlink->dst->priv; - return ff_dualinput_filter_frame(&s->dinput, inlink, buf); + BlendContext *s = ctx->priv; + return ff_framesync2_activate(&s->fs); } static const AVFilterPad blend_inputs[] = { { .name = "top", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame, },{ .name = "bottom", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame, }, { NULL } }; @@ -601,7 +606,6 @@ static const AVFilterPad blend_outputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_output, - .request_frame = request_frame, }, { NULL } }; @@ -609,10 +613,12 @@ static const AVFilterPad blend_outputs[] = { AVFilter ff_vf_blend = { .name = "blend", .description = NULL_IF_CONFIG_SMALL("Blend two video frames into each other."), + .preinit = blend_framesync_preinit, .init = init, .uninit = uninit, .priv_size = sizeof(BlendContext), .query_formats = query_formats, + .activate = activate, .inputs = blend_inputs, .outputs = blend_outputs, .priv_class = &blend_class,