From patchwork Sun Oct 24 20:25:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 31222 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp4158554ioa; Sun, 24 Oct 2021 13:25:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvssO71DQxn3cPqAOmTJkeTLQxp4Ec9izi1kl+mfeZsuvbH47l7CWSun4OGtsPwwPSeDXK X-Received: by 2002:a05:6402:1658:: with SMTP id s24mr3992018edx.174.1635107152428; Sun, 24 Oct 2021 13:25:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635107152; cv=none; d=google.com; s=arc-20160816; b=HG7ZDm9D07ucWdM/n/h9ltgos+dJQZ6ABtPXMdMVEKmFY732njhHF6iqACBqJ3BLww CcznTHoEgbcaMI0EhgANE/nDBtfj3X9eyBxJFIVdudqmvKGANpNkEl1ldYizboPEiKls ErGSyNVNzaiqhIYR5LoEetE9lznRkb/ShA735wqofQIvCdLDVPJYE1f8tGiZwhxrjmiZ r6cTz9X3tWGB2M4MymfYDT38E/wL/PEvvwEr1H2Fs2YRLybVjpUnQDzNbVKd4gNQmpME RQbFqpCFvWSweYFjOjUrYi9UMsOLdf5eBCBQslF1FyNENNsQRwjRNywyL/qi+6SPt+Z4 RZrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=uB4WkmWMduAqT7Z+G0ln/8EB9DX1msUCEohRnucckd4=; b=VX5uEOkqCdCRxNK8LzNSULxoIdrHXWWsH+sZChkkjHsE+xfbCt9+T09+6h91QlVoD4 jYr2ceSpiIkZLxdSsp6Ar8YYBE7pR8zh4U4wsrISUIsdkf3eLQokriaS8Y/XAq+2Rip7 5HWXj3yOsf7GLDFwoDgQwGjty3qIQ6ysiwbmEJe36h+rSuCULBbSUGwxr8y0Np7p2WOK HP/z7jCo7EBQQawwev7C+ocDqh2tjQVidTVrHY2a0ctSV28kuF+HUWfcfOo7kYbVpkIQ LX1x12+DPEkWjlxRfc3hX18JXehWlqqZwNnifLIwyII4FyXSKouBATI81WCC57h7WwuU op4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=aMDp0T1S; 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 i22si33649989ejw.286.2021.10.24.13.25.52; Sun, 24 Oct 2021 13:25:52 -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=20210112 header.b=aMDp0T1S; 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 3FAE768A83B; Sun, 24 Oct 2021 23:25:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E3E93687F4C for ; Sun, 24 Oct 2021 23:25:02 +0300 (EEST) Received: by mail-ed1-f51.google.com with SMTP id a26so9269258edy.11 for ; Sun, 24 Oct 2021 13:25:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=76Aj9qd7FjMOqL9pvMO1WL+MKy66VFPkK7C4bVC4pV0=; b=aMDp0T1SgRAAY9m58ZntXfmNb8toECvI6+Be7xukyYQ940O6VXIF3j5jid3BovLyyb tUZh7J5QaGIFQaz4H0RrFfBB2w9Hz+xMw/nx8vQm/7KDioxhrv+1bG3TS3lpgWCLfIZE gX4VmNaA8hxNeQTgq8Ex9RECitDXUuNtWGrczL2tFVhPeuh0sEywB3+uQRuWiKayUn+M hAnTRu8fShQKClvWYsYvNm00M82NDTl6nITbSvmUWUS5YXBKKWet73RpKgrBNm8VC8EQ k1NdeoAl5CUmIhKPHx+l7dUi7UmD+HRdIPi/PY7cAVHbdxK4W2MuQE2FOp9qrxyLLwJm pojQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=76Aj9qd7FjMOqL9pvMO1WL+MKy66VFPkK7C4bVC4pV0=; b=bG9fQN671Vc4z8a/FGP8TCi3ITRn5phMpluUPPVArYVY3Nf3HEjtNoG1i19m6eflaj stjk9J5EGZros0gpBcVNPtZOeN7yIyIFOVq2fabUgSQY+XzpGy34KOg8mRaPGZ35HnA6 mU84iZDEtQuQ6uEeHqwp1xBQJwLuqzzmUoqa7lx+1218I4ndBfdfLZlSmKAf3j5MH+qY kUOZPmrpPPO0nWIwYr6on5kwUNRq0hJvVdpZIWWCt4HHsfZy2B39y+ppx2mrv1LEmgCF +f0bxBrU+0sE4kx5mxrW2gk9FfxyHbmuFPfoLJhB9fjpVVwmKLL+wbV6OczNR7Z30zVI WNtQ== X-Gm-Message-State: AOAM531PWubRaRkE23ShhqjVtI2UywJvMn94QUEm/5oINbTurMZb+I4O lOx5Q8CtNqbjGS81EUAxBTS0oamAyL0= X-Received: by 2002:a50:fc17:: with SMTP id i23mr19843992edr.213.1635107102511; Sun, 24 Oct 2021 13:25:02 -0700 (PDT) Received: from localhost.localdomain ([95.168.118.28]) by smtp.gmail.com with ESMTPSA id ga42sm6416697ejc.105.2021.10.24.13.25.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Oct 2021 13:25:02 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Oct 2021 22:25:00 +0200 Message-Id: <20211024202502.945133-4-onemda@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211024202502.945133-1-onemda@gmail.com> References: <20211024202502.945133-1-onemda@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] avfilter/vf_nlmeans: avoid if () to help paralellization X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RUhppIdHjhBD Signed-off-by: Paul B Mahol --- libavfilter/vf_nlmeans.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_nlmeans.c b/libavfilter/vf_nlmeans.c index d5a71291af..af165c861c 100644 --- a/libavfilter/vf_nlmeans.c +++ b/libavfilter/vf_nlmeans.c @@ -332,6 +332,7 @@ struct thread_data { static int nlmeans_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { NLMeansContext *s = ctx->priv; + const uint32_t max_meaningful_diff = s->max_meaningful_diff; const struct thread_data *td = arg; const ptrdiff_t src_linesize = td->src_linesize; const int process_h = td->endy - td->starty; @@ -383,13 +384,11 @@ static int nlmeans_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs const uint32_t b = ii[x + dist_b]; const uint32_t d = ii[x + dist_d]; const uint32_t e = ii[x + dist_e]; - const uint32_t patch_diff_sq = e - d - b + a; + const uint32_t patch_diff_sq = FFMIN(e - d - b + a, max_meaningful_diff); + const float weight = weight_lut[patch_diff_sq]; // exp(-patch_diff_sq * s->pdiff_scale) - if (patch_diff_sq < s->max_meaningful_diff) { - const float weight = weight_lut[patch_diff_sq]; // exp(-patch_diff_sq * s->pdiff_scale) - wa[x].total_weight += weight; - wa[x].sum += weight * src[x]; - } + wa[x].total_weight += weight; + wa[x].sum += weight * src[x]; } ii += s->ii_lz_32; } @@ -506,7 +505,7 @@ static av_cold int init(AVFilterContext *ctx) s->pdiff_scale = 1. / (h * h); s->max_meaningful_diff = log(255.) / s->pdiff_scale; - s->weight_lut = av_calloc(s->max_meaningful_diff, sizeof(*s->weight_lut)); + s->weight_lut = av_calloc(s->max_meaningful_diff + 1, sizeof(*s->weight_lut)); if (!s->weight_lut) return AVERROR(ENOMEM); for (int i = 0; i < s->max_meaningful_diff; i++)