From patchwork Fri Oct 29 15:19: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: 31254 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:a610:0:0:0:0:0 with SMTP id q16csp1805063ioi; Fri, 29 Oct 2021 08:20:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqswR8vwSmfeqJCnsK/KJve3p8JidtpskFwc+RK44AGiUy+7iwY9Pye8URAtLimgjV7Jwi X-Received: by 2002:a17:907:7e82:: with SMTP id qb2mr14062352ejc.530.1635520828449; Fri, 29 Oct 2021 08:20:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635520828; cv=none; d=google.com; s=arc-20160816; b=OnOMLZq363+GGG+nE6HoDjk24klNK8UJwZlghDdQ59PFDQYOfN/MaR2GCmG+hP3qZ/ 8KZybGf5c2aFGVESIpCPlO6zgjmFTt3N4xBg8/tt9dd97g06MznDrTGNx7Jc+jnOr2Zl oT80cgsGcDAeuTP1OnjR/QhQV/g8H7ZFSK/8qwn6XlljFymz3co4zAr6ZnWSr18VdMKN fOiF9VTpCHUvmPnoFGYt7kXeHni//x+KTQm0DCl2x+NbVGeCvBgJJfc0aVe4jZsV6KqU 3eOA1TVSHZ17Ml/wjB43FFWb08Hffg1vN/BOdALi2lUPn4u8aBIRDRyzITXOpX3iGMUw c1zg== 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=S3ATfBTfJYvv8UzYdrwpQa8FP+lwxEQRNgBk2a21T4a6lXMSNQjM/iSUTidHhQBdmW BNg1rpGlWEH7TRuv9Nf8Ztr6Zm0aah6cBhGcWXbLTjD/0x1YPxoDgpOczKMozEJtcDQ0 3YN2Kazs+POaGp8zVKr/DqDddn61zBwu/Vqxd11MAxWgpKUityDTHSHnxhWeMWJWT0Mv g5yjR/WTG55+T5L5YxxJ2/xVvXwa4ehu6Y9gMndlq/NhVKuNvJN24tGuhX1RJN7+RWzx YUtX48my3LiGOf65BO6rMfBmIuBfKqayvGaIlD4bZaEmwtdNQl6U2GTTh2qMxZLHpV1B cNiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qUztGwBX; 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 e1si2853271edr.491.2021.10.29.08.20.05; Fri, 29 Oct 2021 08:20:28 -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=qUztGwBX; 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 A535E68AA26; Fri, 29 Oct 2021 18:19:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD0F368A963 for ; Fri, 29 Oct 2021 18:19:05 +0300 (EEST) Received: by mail-ed1-f41.google.com with SMTP id ee16so26838425edb.10 for ; Fri, 29 Oct 2021 08:19:05 -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=qUztGwBXneoIDr6+Xc20HWa/84PwHzUTAQBH5fd9T2tdcJiIgEiORewJOWl9Yf12/J 5MK/OEjSxtM8hMccZbx4/s6UlccDUvmmieBJPf6kWOrIjwQk1dW8yUwdibAUcybbDHOa kAnE0OEEYjqx65kpJFiszyIphSJQROnO0fWhHRTtOT8qfq2G4gFIyka7FnFhIQ3RlM9j ua9NKMg5sgOpUOyldVsh3giyoEReb9Rf8MnRH4xRFZ9Ckx2s/QnkQau3Rvn/NQaS99fh qSr9H7UuaIiXTd+hsPNJmX3KPP+WXS1evKaif4T8M5XrrjMz5kO2iEM5+r9klCzMIMBT 9jKQ== 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=ZpZ3PNVR+u7zrsdaYfG4SqExyieyQOCJXP/fCnUcMYLwRrAUUF8X0DhGnACepl4duO vOyQnAfBn/Z11R4Ij0ulSWrGlPPkR+9fY5KXCY5ivWrqu88LUPb66KezXek7cpKkanO1 65zdExhNEWO9NFPuRMYiOJizRUBYYiNrTM7+azixlLttPpdCOzOLF+QyoJBHFnoW0IIC EF4azORSjh0eLnhY7Sdx4CB7FumR1d/rJgiWx5KJsIGJcMzLcunBohybFKm8Zgs4kVxl eDzdgtJiDcmQdtgB28G50tLx367BQ0mxbaMLcM3nwunV8eF3jJUfYXNy1HVg8K5ch+Ym 80QQ== X-Gm-Message-State: AOAM533h3OWjkxYIdEX/jmFjTwUPPXZlyZZJM0fmMbMORGKXBBRsm6O4 9M5hdKrw54UtPNr9KIj3X+YtlteNEqk= X-Received: by 2002:a17:907:7ea8:: with SMTP id qb40mr15085601ejc.168.1635520743645; Fri, 29 Oct 2021 08:19:03 -0700 (PDT) Received: from localhost.localdomain ([212.15.177.28]) by smtp.gmail.com with ESMTPSA id gb3sm3101386ejc.81.2021.10.29.08.19.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 08:19:03 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Oct 2021 17:19:00 +0200 Message-Id: <20211029151903.1078367-4-onemda@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211029151903.1078367-1-onemda@gmail.com> References: <20211029151903.1078367-1-onemda@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/7] 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: X55RPNPjpkXp 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++)