From patchwork Tue Sep 25 15:27:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 10478 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:1286:0:0:0:0:0 with SMTP id 6-v6csp3816211jap; Tue, 25 Sep 2018 08:27:33 -0700 (PDT) X-Google-Smtp-Source: ACcGV62UD8vT9/tliIRvbade5PA/0PzTvODKz4gKh9qR+pQXwXkH74+hhRNoT4DI5NjcUdtnwfcB X-Received: by 2002:adf:aa90:: with SMTP id h16-v6mr1472160wrc.216.1537889253648; Tue, 25 Sep 2018 08:27:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537889253; cv=none; d=google.com; s=arc-20160816; b=eLyonsTGRnXafzJVvP6QcffluyuSTyDriLMUFx+p8T7wR8OW+Ko59dYpDE3l+6Qs5q lIPNVuTePv70D7s1jMJDRfulYDqJBuSopnChH+03S8JYJr2dvV8AniDowEzk4CRGUQnN 4nyiKczFb/YyXRQzxE+LzyF9AbCxfOQMiB/9PFRQR6wvvgN8mMkdcD6rGopQE+2jOP1E doZ3qhjP3uZhdOM/gdoHn8wx3KVXQUyhpn8g7pOtwHA5qmoci9GCPhIEBV9YLRe8eT0d tV5+yxx8SkBgPYbiCZ0sqrHh0cq/V3TXBOE3vDhHz/A6fzXW4Mc1NHpe8/NWDS6S0wJy 6VzA== 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:cc: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:dkim-signature:delivered-to; bh=OPTbt1Gk4Yrp9IgnRedqk9Rph03pyi4Eznc7Jedn2AA=; b=yTwn+fy98ZCOqo2+Gfwpt7inK2Ppa+h0RBXRV8h0sSga4FRAgsJdoM1JwR9aAbFZLf 2TcuPpGH4VYuSpg4LVcgoTpQKKJyExWglE0Rfrfw9JaKVo7Ra6UWwtiIuCbnTe5ylQzg XboFy4Tw8JKJj50dTvf1qwujdCmipUkTu/x8AXjhtz6UtJtao6jVzMq3f1UPjQNoEZ/8 QFqbckH96WUJ5NlY/ULZMfkfTg3dYaXjJw//djxUydFO1KpxffW1gm0yDUPWUVu+Q7yc 6GbMITyGn4amlhQFCBkIrRs+SU9PPNvRViy5IpPEYwwaUK6ASqTum8kiNSKuJkvTsJcn gZkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lJSIjI00; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i4-v6si2522995wro.239.2018.09.25.08.27.33; Tue, 25 Sep 2018 08:27:33 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lJSIjI00; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD58568A335; Tue, 25 Sep 2018 18:27:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6691D68A24C for ; Tue, 25 Sep 2018 18:27:14 +0300 (EEST) Received: by mail-pf1-f178.google.com with SMTP id j8-v6so11481726pff.6 for ; Tue, 25 Sep 2018 08:27:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/uGsF8gMlvmGDZCE3I5kCwyFjJOKrRAjk3ZkE3n1sM0=; b=lJSIjI00SqU3IltiW4Bf9Z1V8MejjTBJEjou2f4Xtqwz9RdkcO3W8wW+2Xv3js8w2H WcHOamZ0VXk/CKGnWGMw+LLVSwDScv10XKP6i9u9GgLJUgIsd4MZByeH/nZcdKz2TkW3 7hh9AYjHSZC5dTD1jietSmb4Du+WhcfD6UXkAZFtZcsEdZ5ckgsDzHU2hBChI6WDyU5a 1BikxM4fSlma2uh6FzW+HnhqqAZu/GEI/p+mFjPcCivIriZ970Gic7icHjfyGdq4PtJw z3f4Aobhd20Ig1BFsfFce08GPwdleeh6318YNhi0msoPsgzB0RKCENF7wg/hgC1E928f h7Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/uGsF8gMlvmGDZCE3I5kCwyFjJOKrRAjk3ZkE3n1sM0=; b=FHRX6P+3CSx+yrArn90B740mVmkkABBXuyzdD58n7Aj+B1zFpMirRgLxiKrDnZfvCT 22D7TrZv2SdGFLTZC1EkQLdBtz7Khs7/iDKa0QSkUm8hc7DpAnRP2a9lUfXf+k2YVELq 2hfrnjKPfZPk0cNz7A+sAK9iWnHrdvRMw77Um1mU6LjwyWnwBkUQUJEq2k05GKxpiG+v Z8VT23EQ2mm9PekaLu7RAbVsnkL5EBbTqxtFxwbjOLKT+yarkjDg/rxoyVuDhjdLXyYg z5j8j1nSGLUbjDeHY35DvVqAi2Z6wDq3Dasb4BFrMs10D7Kr6e0yvMyuu79LvBHTRmlu qDGQ== X-Gm-Message-State: ABuFfohdvdiP2ZBpPkXerUuxMduJwxAGmDtsEvgEfS5GrP2LJtSZZhTo ppJmTwhuemYc158qxwGSZi+nu7n9TqE= X-Received: by 2002:a62:7d8d:: with SMTP id y135-v6mr1648346pfc.245.1537889248693; Tue, 25 Sep 2018 08:27:28 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id k1-v6sm3734914pfi.62.2018.09.25.08.27.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 08:27:28 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Sep 2018 23:27:15 +0800 Message-Id: <1537889235-17619-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1537889235-17619-1-git-send-email-mypopydev@gmail.com> References: <1537889235-17619-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 3/3] lavf/minterpolate: use av_global_blend_row for blend performance. 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 Cc: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Use the av_global_blend_row for blend mode performance. About 9x (43fps -> 415fps) in 1080P, use the command like: ffmpeg -i skyfall2-trailer.mp4 -vf minterpolate=mi_mode=blend \ -an -f null /dev/nul Signed-off-by: Jun Zhao --- libavfilter/vf_minterpolate.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_minterpolate.c b/libavfilter/vf_minterpolate.c index c6a5e63..c9fd418 100644 --- a/libavfilter/vf_minterpolate.c +++ b/libavfilter/vf_minterpolate.c @@ -27,6 +27,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/pixelutils.h" +#include "libavutil/blend.h" #include "avfilter.h" #include "formats.h" #include "internal.h" @@ -1113,6 +1114,10 @@ static void interpolate(AVFilterLink *inlink, AVFrame *avf_out) for (plane = 0; plane < mi_ctx->nb_planes; plane++) { int width = avf_out->width; int height = avf_out->height; + uint8_t *src0 = NULL; + uint8_t *src1 = NULL; + uint8_t *dst = NULL; + uint8_t alpha1 = (uint8_t)(alpha*256/1024); if (plane == 1 || plane == 2) { width = AV_CEIL_RSHIFT(width, mi_ctx->log2_chroma_w); @@ -1120,11 +1125,12 @@ static void interpolate(AVFilterLink *inlink, AVFrame *avf_out) } for (y = 0; y < height; y++) { - for (x = 0; x < width; x++) { - avf_out->data[plane][x + y * avf_out->linesize[plane]] = - (alpha * mi_ctx->frames[2].avf->data[plane][x + y * mi_ctx->frames[2].avf->linesize[plane]] + - (ALPHA_MAX - alpha) * mi_ctx->frames[1].avf->data[plane][x + y * mi_ctx->frames[1].avf->linesize[plane]] + 512) >> 10; - } + src0 = &mi_ctx->frames[2].avf->data[plane][y * mi_ctx->frames[2].avf->linesize[plane]]; + src1 = &mi_ctx->frames[1].avf->data[plane][y * mi_ctx->frames[1].avf->linesize[plane]]; + dst = &avf_out->data[plane][y * avf_out->linesize[plane]]; + + av_global_blend_row(src0, src1, (const uint8_t *)&alpha1, dst, width); + } }