From patchwork Sat May 12 20:24:35 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: 8932 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2310087jad; Sat, 12 May 2018 13:25:03 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoGC2HMlBxxP1d2FQksfYXhHydrxsxPWc8UWU5KuaqTEn056ok17Is9yLYMd2rCzG6FpRQg X-Received: by 2002:a1c:7f0a:: with SMTP id a10-v6mr1962947wmd.97.1526156702973; Sat, 12 May 2018 13:25:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526156702; cv=none; d=google.com; s=arc-20160816; b=aeP5b/in1u8h7INglMbHA2kcKet1ND49JdG3oAg4+m7K3GEyzvdN2kbSjRU3iaaQyG S09Ln4gJIjXPfwxScFy/wjT2q07EghEFaliQgI2qDhbIOEt4vMtwOar3RQxdETO4QNaB MKjh7AJqs4F/i4XZmuUsPlEdkPfVxu7TYLE7Qs+CNwDh6bOoj0sLuMnJKdwuZOd+DDo9 l5pBW18AmEk5rUPJxcGrwwSWcmiZOT4bY4WOeNYg0i9Il9v6vPlnMFmy1E7oGbhSIvsx jvH82wOc3T7mmrwfyetfuobi9iIIIdm6qfY9CDloRQOnwrtnap/CSvuQkHjw7KaSafjw vOQw== 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:dkim-signature:delivered-to:arc-authentication-results; bh=Hap2IlAUVU2rYDBpku7/7JMr9kSBf43PCg4jkQ2UkVQ=; b=MAVrMKKtc+6nni7lS879dq5V5bsjfExDqG4H6jSSxjk8bf4+faVTne63f2fIqAcyFy 4T4BHw9tAlnAfuszwXfjK1FO4P8EDRIXhJwnOwiA40rH063GMz7o8+gOKVnYaTUoRk9+ BtBpakxvTLI4tvh/unsxu9TKc4f0uCg0AsH9RL3rmZG1Zq8yjvN4vmBepJBe37NDa8Ok jCLhYI2oJcegCr8NGgeaV3qCFDES0p6N1ym2n97iCNQcFOvpjDhP0mRoGvGQ3giZzN4K XNH38J8BEaVOC1D2/8Jl3hIZlp/pEE31Zys5p06hFGCLFRw7NfihwjB6aoto86lSBOsq xARA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=D++E/hS5; 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 z16-v6si5277181wrc.443.2018.05.12.13.25.01; Sat, 12 May 2018 13:25:02 -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=D++E/hS5; 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 8563968A953; Sat, 12 May 2018 23:24:16 +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 2941C68A6AA for ; Sat, 12 May 2018 23:24:10 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id a67-v6so7458190wmf.3 for ; Sat, 12 May 2018 13:24:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=DZ5llAhzKinkawtPoxkIpy6H7/MrTSOCRAGWe/PBdbg=; b=D++E/hS5gLvAxqualZs72ZQR18aajHIeQlCyHlHOaQSyEt0Hu6YoWUWysDvVpNXVSn 7wfnBOPbI+4T04XbWUTdUjTqCEYb1TVfPQTm3ORj6tb5Smx3djzAb+RWKp2g5pOmgRim s0ZKkGOZJ8kEgBjfKCbeKmWiMspBLYrZe17n9I96EPPfDcR4vfZsDFD9zkl345uaiSSv GL0Qy9XCLrS0PC9clOzudPWC7Z8nQrCVp/jbd/OlspFhN1g8VH/lIJuZroiph07+Y9Bw f8L4Z6UAembzS7D5quEBrV9kBaaElbCag7d/Hsb6rU2KNTdIMhzVur8315gV9onaU8dZ fgNg== 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:in-reply-to :references; bh=DZ5llAhzKinkawtPoxkIpy6H7/MrTSOCRAGWe/PBdbg=; b=IF0SU5lsTWdT5vB3vOKTheAAvGVev1+4xSTjq+DCDL0NBwjXDCumJNlSovBgovuxGX txOIKMOlBPsX34KwFXgjKc9hYiyYEv7MEJ15vIOB1nnC2f0/vcApK3I7vpmWpkPiQ7Sp I+8vHEB2BnXRvIPZBdG/7raeDjYfi363p6F3b71YQ/vBwpcc+8HKI2oRDI2M+aVPuASH ghicl7iA8+5wzrQEcfu40Hs5vNoYi+xutqRrWHd1wny0VQ41WW9aSKcx7NA3HIQdRT8T J3uKSRQM54/8yGAYlCHOt0EyswzEIZRm8IYLafVQnC1JOVAmD5VhxVh4jz50kcasOngs U3AA== X-Gm-Message-State: ALKqPwfYgwHYc+I6ghk5uP2SfGm5YSMHlsRUv4/ro47dM8VABGOOJAtU 51J3jO3VeRIez/cNnbYNPdU6PQ== X-Received: by 2002:a1c:78b:: with SMTP id 133-v6mr1874787wmh.72.1526156686756; Sat, 12 May 2018 13:24:46 -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.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 May 2018 13:24:46 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 May 2018 22:24:35 +0200 Message-Id: <20180512202435.6479-2-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180512202435.6479-1-onemda@gmail.com> References: <20180512202435.6479-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] libavfilter/vf_nlmeans: add amount parameter 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" For better control of denoising. Signed-off-by: Paul B Mahol --- doc/filters.texi | 4 ++++ libavfilter/vf_nlmeans.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index d77c67eb10..60ce18298b 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -11420,6 +11420,10 @@ Set research size. Same as @option{r} but for chroma planes. The default value is @var{0} and means automatic. + +@item a +Set denoising amount. Lower values reduces blurring. +Default value is @var{1.0} and means full denoising. @end table @section nnedi diff --git a/libavfilter/vf_nlmeans.c b/libavfilter/vf_nlmeans.c index 6c9c9d312d..ac6380bb83 100644 --- a/libavfilter/vf_nlmeans.c +++ b/libavfilter/vf_nlmeans.c @@ -53,6 +53,7 @@ typedef struct NLMeansContext { int chroma_w, chroma_h; double pdiff_scale; // invert of the filtering parameter (sigma*10) squared double sigma; // denoising strength + double amount; // denoising amount int patch_size, patch_hsize; // patch size and half size int patch_size_uv, patch_hsize_uv; // patch size and half size for chroma planes int research_size, research_hsize; // research size and half size @@ -77,6 +78,7 @@ static const AVOption nlmeans_options[] = { { "pc", "patch size for chroma planes", OFFSET(patch_size_uv), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 99, FLAGS }, { "r", "research window", OFFSET(research_size), AV_OPT_TYPE_INT, { .i64 = 7*2+1 }, 0, 99, FLAGS }, { "rc", "research window for chroma planes", OFFSET(research_size_uv), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 99, FLAGS }, + { "a", "denoising amount", OFFSET(amount), AV_OPT_TYPE_DOUBLE, { .dbl = 1.0 }, 0.001, 1.0, FLAGS }, { NULL } }; @@ -528,13 +530,14 @@ static av_cold int init(AVFilterContext *ctx) int i; NLMeansContext *s = ctx->priv; const double h = s->sigma * 10.; + const double a = 1. / (s->amount * s->amount); s->pdiff_scale = 1. / (h * h); s->max_meaningful_diff = -log(1/255.) / s->pdiff_scale; s->pdiff_lut_scale = 1./s->max_meaningful_diff * WEIGHT_LUT_SIZE; av_assert0((s->max_meaningful_diff - 1) * s->pdiff_lut_scale < FF_ARRAY_ELEMS(s->weight_lut)); for (i = 0; i < WEIGHT_LUT_SIZE; i++) - s->weight_lut[i] = exp(-i / s->pdiff_lut_scale * s->pdiff_scale); + s->weight_lut[i] = exp((-i / s->pdiff_lut_scale * s->pdiff_scale) * a); CHECK_ODD_FIELD(research_size, "Luma research window"); CHECK_ODD_FIELD(patch_size, "Luma patch");