From patchwork Sat May 12 20:24:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 8931 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2310018jad; Sat, 12 May 2018 13:24:55 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrdbfGjoq5UUl6CR9Fu/+3+sylYysswEOwWXNkFl745CQH5z9dm8XeFN7D7YOASZEwIOIoN X-Received: by 2002:adf:b90a:: with SMTP id k10-v6mr3052144wrf.283.1526156695044; Sat, 12 May 2018 13:24:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526156694; cv=none; d=google.com; s=arc-20160816; b=wnQ+6k3G2a6aaEHNkMlfN6pyDuUFVKDjnD0j9FRTcuXGv97QtNbKxWFufS7LHVGaTh dpvmxN2FyfVevVW4IvaAtb4iujGxVLcu7trln9hCzUwYbxjm33IypedziS59lib7T3Hf NJdT9iHHwjgjZ7meBuiR4+dOLVutAJgpPoW9eNIiBAxaBFcDbnslfWGZJpRie0Eg4Bnw q4kpJdcJ7aFRn63K0jRBtaQ/COnlK5tf57KjV+T4DsbUZI8g+uSvmVeE/fTNesF0NbaM 03ofVTs38iVGQl9GoN4ci5wYAMOxPV4GoA4hIAE3pbTcvl1F5K4rGhbF/diwa1VVG3K1 X+Ww== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=D2pS734gulUXfzh7K2G9mFj5fZ8z0fjEI77i7AnWocQ=; b=wgiOT2ZzS4Z+TZFxxDl4yz9RI+o+AvGy60AI5bruO6vFW+MAH6AAZEyfTUJ5FXoh3o dB9yZZy3uZ+4tdDxnr5LRd0PB6zj8wHongnJhMtQEu3lArkl4Zd+wTUO5suUt+E45lf2 y+wn4c9qQPluSHSlQ/EPDU9xG41o5SCTONpfGm2AXO4SGXrfesjdvNqPh5HumhUdOKCz ga8icOQlcxlSBKKXsABi4LX3o50QTzyVnmtECtBsw9kojxMaqsWr/OI0VU/JkBw/Ep9Y XrgFWVmuFqx1tMiZXy9TbqScgA19UPb8t3C9HapQi/DiLfOICB46CPne3kSNNpM0TPL7 cUVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=jRXK+zhL; 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 o136-v6si2907418wmd.123.2018.05.12.13.24.54; Sat, 12 May 2018 13:24:54 -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=jRXK+zhL; 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 DEF2868A941; Sat, 12 May 2018 23:24:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7997F68A681 for ; Sat, 12 May 2018 23:24:09 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id w194-v6so7464456wmf.2 for ; Sat, 12 May 2018 13:24:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=fY+iUD4D3Cuy78f9RNCoq3X8VLlUG1DtvSv+srWHhnk=; b=jRXK+zhLyTFjPpnQT5Qh/0MV+UPcLgEjCctI4O0vUGSoDqBMTFcKNFe4E7Cb3+2Aiy 8oqdsddbmFeYiPL4n7qCyujDyLoK2X90u5xV6vp+hT74eFzYCUuj9Lqvr1CSN2CVE9qi 5MWZVum5pa8AY2Uu8cRNc6Y4yHjp773nFvveacdu8mU1w+Qp4IQNMMEGXlpAoUUz9cFZ clnJdA71lIZTv+kIdmi4ftF/5TT0pTrqD6NmgiXXLFpCYnT2WvjCesgvD8lL1iovWDOK KH3jROMDBLDtSlh1N06bKLgIJIf8KypXuRa5ZS7tssFyEuXrcmyZ3Zdt7VY/YxftGDBo /XWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=fY+iUD4D3Cuy78f9RNCoq3X8VLlUG1DtvSv+srWHhnk=; b=KKUnYjUPdCrpr85fDHIFxfHA9Z1vXGmworOBY5w0hS9Rtf7VXjjwUw4Cqa2At2MVy/ B2I7C4S+vfGoW/BLP3V6Z1Hq0lEX9ZfKoQyS5hPN0BV/zSiZp1xOzphqGCEvftMhQvX2 ipk8PDpdEySOCwckMkzHZFQXUtdGdXU4k93o1RlpS0UjVDu9QrB/mh/1BJo0VFMrojy1 SjsZw+HFhWYKoZfpb6ts0aCHd8pdR13oY1BumJ/z8ogtXUehN6vTSSd65Bg5tsP34SWb DQmsSiMr+41xoLWwHtGiPB79irhGeK2/EJIK08ptfRGCtq6GR5KADHZJYXr7Cdd0DQvD 8ZVA== X-Gm-Message-State: ALKqPwcWO3CspPxVfj88fgnhHkuaauEB6Bev6AsM4mFVfBo9HYaKlHyg 6+drvhEXj0v59uxLs9sWpde1mQ== X-Received: by 2002:a1c:9383:: with SMTP id v125-v6mr1865506wmd.58.1526156685951; Sat, 12 May 2018 13:24:45 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id u8-v6sm4042540wmf.3.2018.05.12.13.24.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 May 2018 13:24:45 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 May 2018 22:24:34 +0200 Message-Id: <20180512202435.6479-1-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH 1/2] avfilter/vf_nlmeans: better weighting of centered pixel 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: Paul B Mahol --- libavfilter/vf_nlmeans.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_nlmeans.c b/libavfilter/vf_nlmeans.c index 82e779ce85..6c9c9d312d 100644 --- a/libavfilter/vf_nlmeans.c +++ b/libavfilter/vf_nlmeans.c @@ -39,6 +39,7 @@ #include "video.h" struct weighted_avg { + float max_weight; float total_weight; float sum; }; @@ -403,6 +404,7 @@ static int nlmeans_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs if (patch_diff_sq < s->max_meaningful_diff) { const unsigned weight_lut_idx = patch_diff_sq * s->pdiff_lut_scale; const float weight = s->weight_lut[weight_lut_idx]; // exp(-patch_diff_sq * s->pdiff_scale) + wa[x].max_weight = FFMAX(weight, wa[x].max_weight); wa[x].total_weight += weight; wa[x].sum += weight * src[x]; } @@ -422,8 +424,10 @@ static void weight_averages(uint8_t *dst, ptrdiff_t dst_linesize, for (y = 0; y < h; y++) { for (x = 0; x < w; x++) { // Also weight the centered pixel - wa[x].total_weight += 1.f; - wa[x].sum += 1.f * src[x]; + if (!isnormal(wa[x].max_weight)) + wa[x].max_weight = 1.f; + wa[x].total_weight += wa[x].max_weight; + wa[x].sum += src[x] * wa[x].max_weight; dst[x] = av_clip_uint8(wa[x].sum / wa[x].total_weight); } dst += dst_linesize;