From patchwork Mon Jul 31 12:02:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 4543 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.85 with SMTP id 82csp2325248vsb; Mon, 31 Jul 2017 05:04:42 -0700 (PDT) X-Received: by 10.28.213.75 with SMTP id m72mr10846784wmg.41.1501502681958; Mon, 31 Jul 2017 05:04:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501502681; cv=none; d=google.com; s=arc-20160816; b=gNFjHfkPX22XEjfYhXYO0rpusS2l/yfhZujCj0NiHmKxQ704p76pcfvVSsyUFYsSpB Rf0DZmlQFK/bklnGa4S/xo+uKBGZkuoWq19QgN+9B1FtE61HnHZpWxrAKqqvuh3mV8f4 0IpuXqEr0Mn1r5qpCWubs/UA7DhLU8re7WtXa5ED+3nWoCVxqbtB4Zx2aNgzoX7MWmAb wnG4JDJAlKEPhaIFfoH1LjSx7tG+qRizlpmi446ryPDBOqJ49hUYuraDGC9IjslkWXpC jawNuroQ3sZZ5kuk2nPzUobfyKlmXVE24zq3Y0uT+ntln/g/u/5x90JpgLm49s0rR4AW e0og== 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=Wv0xu1SK9wh/mau5epok46H/ZzyCEePw9z14orYjptk=; b=xSQLeLgW82S5xKjoLHdoQbTR1+6amuYx3MInBmMq560T6mYp8twh0a6DvWSoN5BKlt 6FxujecELpz5TEjejksomnBD19c7btf0piThpB/euJylXfQvzqt1tWBAGYwNPcza3Rqo ZwgUFduiSFR0a+BseDawBXJRQbW+FIxoWkOcUNBvAwdzPici8HRD4F2ad75Z4fv4vw5r jnBwitiS8P7h0lqZbnsdwpPOIRyJK7on6Sp6VyGTOzuo01MssUBOn9GV0JmlZRWvb8Ha FiqoDBMHHn33eGpS+obWRdvzgwaRA0fL29KlcivnCrqcDWqOv6N9hBhiByuFDLoYb7ZE q11Q== 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 y195si401956wme.250.2017.07.31.05.04.41; Mon, 31 Jul 2017 05:04:41 -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 2713B68A253; Mon, 31 Jul 2017 15:02:44 +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 3C6F268A1EC for ; Mon, 31 Jul 2017 15:02:35 +0300 (EEST) Received: from phare.normalesup.org (phare.normalesup.org [129.199.129.80]) by nef2.ens.fr (8.13.6/1.01.28121999) with ESMTP id v6VC2b3M071551 for ; Mon, 31 Jul 2017 14:02:37 +0200 (CEST) Received: by phare.normalesup.org (Postfix, from userid 1001) id 22DE0E00FB; Mon, 31 Jul 2017 14:02:37 +0200 (CEST) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Jul 2017 14:02:26 +0200 Message-Id: <20170731120227.31047-13-george@nsup.org> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170731120227.31047-1-george@nsup.org> References: <20170731120227.31047-1-george@nsup.org> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef2.ens.fr [129.199.96.32]); Mon, 31 Jul 2017 14:02:37 +0200 (CEST) Subject: [FFmpeg-devel] [PATCH 13/14] vf_ssim: 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 | 2 +- libavfilter/vf_ssim.c | 52 ++++++++++++++++++++++++++------------------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 3af35d2c47..76cd906148 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -299,7 +299,7 @@ OBJS-$(CONFIG_SMARTBLUR_FILTER) += vf_smartblur.o OBJS-$(CONFIG_SOBEL_FILTER) += vf_convolution.o OBJS-$(CONFIG_SPLIT_FILTER) += split.o OBJS-$(CONFIG_SPP_FILTER) += vf_spp.o -OBJS-$(CONFIG_SSIM_FILTER) += vf_ssim.o dualinput.o framesync.o +OBJS-$(CONFIG_SSIM_FILTER) += vf_ssim.o framesync2.o OBJS-$(CONFIG_STEREO3D_FILTER) += vf_stereo3d.o OBJS-$(CONFIG_STREAMSELECT_FILTER) += f_streamselect.o framesync.o OBJS-$(CONFIG_SUBTITLES_FILTER) += vf_subtitles.o diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c index c3c204268f..ba6ce846ae 100644 --- a/libavfilter/vf_ssim.c +++ b/libavfilter/vf_ssim.c @@ -38,16 +38,16 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" -#include "dualinput.h" #include "drawutils.h" #include "formats.h" +#include "framesync2.h" #include "internal.h" #include "ssim.h" #include "video.h" typedef struct SSIMContext { const AVClass *class; - FFDualInputContext dinput; + FFFrameSync fs; FILE *stats_file; char *stats_file_str; int nb_components; @@ -78,7 +78,7 @@ static const AVOption ssim_options[] = { { NULL } }; -AVFILTER_DEFINE_CLASS(ssim); +FRAMESYNC_DEFINE_CLASS(ssim, SSIMContext, fs); static void set_meta(AVDictionary **metadata, const char *key, char comp, float d) { @@ -280,13 +280,21 @@ static double ssim_db(double ssim, double weight) return 10 * log10(weight / (weight - ssim)); } -static AVFrame *do_ssim(AVFilterContext *ctx, AVFrame *main, - const AVFrame *ref) +static int do_ssim(FFFrameSync *fs) { - AVDictionary **metadata = &main->metadata; + AVFilterContext *ctx = fs->parent; SSIMContext *s = ctx->priv; + AVFrame *main, *ref; + AVDictionary **metadata; float c[4], ssimv = 0.0; - int i; + int ret, i; + + ret = ff_framesync2_dualinput_get(fs, &main, &ref); + if (ret < 0) + return ret; + if (!ref) + return ff_filter_frame(ctx->outputs[0], main); + metadata = &main->metadata; s->nb_frames++; @@ -318,7 +326,7 @@ static AVFrame *do_ssim(AVFilterContext *ctx, AVFrame *main, fprintf(s->stats_file, "All:%f (%f)\n", ssimv, ssim_db(ssimv, 1.0)); } - return main; + return ff_filter_frame(ctx->outputs[0], main); } static av_cold int init(AVFilterContext *ctx) @@ -341,9 +349,7 @@ static av_cold int init(AVFilterContext *ctx) } } - s->dinput.process = do_ssim; - s->dinput.shortest = 1; - s->dinput.repeatlast = 0; + s->fs.on_event = do_ssim; return 0; } @@ -423,28 +429,25 @@ static int config_output(AVFilterLink *outlink) AVFilterLink *mainlink = ctx->inputs[0]; int ret; + ret = ff_framesync2_init_dualinput(&s->fs, ctx); + if (ret < 0) + return ret; outlink->w = mainlink->w; outlink->h = mainlink->h; outlink->time_base = mainlink->time_base; outlink->sample_aspect_ratio = mainlink->sample_aspect_ratio; outlink->frame_rate = mainlink->frame_rate; - if ((ret = ff_dualinput_init(ctx, &s->dinput)) < 0) + if ((ret = ff_framesync2_configure(&s->fs)) < 0) return ret; return 0; } -static int filter_frame(AVFilterLink *inlink, AVFrame *buf) +static int activate(AVFilterContext *ctx) { - SSIMContext *s = inlink->dst->priv; - return ff_dualinput_filter_frame(&s->dinput, inlink, buf); -} - -static int request_frame(AVFilterLink *outlink) -{ - SSIMContext *s = outlink->src->priv; - return ff_dualinput_request_frame(&s->dinput, outlink); + SSIMContext *s = ctx->priv; + return ff_framesync2_activate(&s->fs); } static av_cold void uninit(AVFilterContext *ctx) @@ -464,7 +467,7 @@ static av_cold void uninit(AVFilterContext *ctx) s->ssim_total / s->nb_frames, ssim_db(s->ssim_total, s->nb_frames)); } - ff_dualinput_uninit(&s->dinput); + ff_framesync2_uninit(&s->fs); if (s->stats_file && s->stats_file != stdout) fclose(s->stats_file); @@ -476,11 +479,9 @@ static const AVFilterPad ssim_inputs[] = { { .name = "main", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame, },{ .name = "reference", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame, .config_props = config_input_ref, }, { NULL } @@ -491,7 +492,6 @@ static const AVFilterPad ssim_outputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_output, - .request_frame = request_frame, }, { NULL } }; @@ -499,9 +499,11 @@ static const AVFilterPad ssim_outputs[] = { AVFilter ff_vf_ssim = { .name = "ssim", .description = NULL_IF_CONFIG_SMALL("Calculate the SSIM between two video streams."), + .preinit = ssim_framesync_preinit, .init = init, .uninit = uninit, .query_formats = query_formats, + .activate = activate, .priv_size = sizeof(SSIMContext), .priv_class = &ssim_class, .inputs = ssim_inputs,