From patchwork Thu Jan 31 13:55:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 11927 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3325B44D384 for ; Thu, 31 Jan 2019 16:01:44 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4ED1C68ABFF; Thu, 31 Jan 2019 16:01:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8450B68A95E for ; Thu, 31 Jan 2019 16:01:25 +0200 (EET) Received: by mail-pl1-f195.google.com with SMTP id 101so1515135pld.6 for ; Thu, 31 Jan 2019 06:01:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=y2pNBhyco2f/7+X5dvDWJ4g1dDCXsNC1+gtwFNqbEkU=; b=PZV3mUXgaVfJfpDak7olDH1a4Vmwxhv5xRCdrblJGCn+p4l+n8M+HP7STz++q1o0R+ ZWP2LbwgLTFOqzURho1dvNBSsMEeVoLkmgK16J2G6MYRiKtUZ0QekL+ilsXOGrHuhk8P 75hAyHB7ajHJJBrdrzogfLeimfR+b+LLh9b1Vyr1MT5VCZ93TCxKRzZiGyBLK0TEGbab K0d7f5nhvCQCXgv+M3JM/dWik0Y+NFZ5ghd1gzXgA3rdF3rnqLLuI7pCc5U28U+pijqM CRXYsj97Lx/BiTKFafyHR4cHckowzSc35HyDKfEwvt//QFiZKITNt9aOOwRyKp1uG8xi luOQ== 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; bh=y2pNBhyco2f/7+X5dvDWJ4g1dDCXsNC1+gtwFNqbEkU=; b=hxvCh1Y62pWK8urVuwRAnPQhqRg5ByjamdIIIUlFT/DzLywZ0+M/TFokWjvjnGWvLv UrPYAK3bc81IQW8j062M26YKa887OKP1BH8dau3x+7vO8uqlJbHkvqrCWQd5ebQfhCkM W3MfYhaCDLTZFMqqdV3CjKt4+WPVtoIWCyGSk3KfpLfgsbAtiqA/T8uSaVFmohZd4xmH nYx+ZCgX/tyZP/ZIg839ipv/KnAeHfVHjPF3asbXtZVOkFv7LGXGXmTVcnro5BjWDDh8 VjcbQNip3lj/xa+lGtgRGORpumouaefn6gacbimDYIfFh4GBNXVvknOsaBGnBgtAik05 JEaw== X-Gm-Message-State: AJcUukc6uT3P4UY1r8z20RIFvpoPs9J59JynPiMXAk0DUvBH81aOAs3e J9oI3qGeLpG6WgjkQ9TCmCuNzhCZ X-Google-Smtp-Source: ALg8bN7LlIyNXo1gWNuhl0Ex5a5KnImvVn4k7/xeB7Pu0Ch9+QbTv8os13xirNdurY2j5W/XbxmMnA== X-Received: by 2002:a17:902:a83:: with SMTP id 3mr32868410plp.276.1548942963625; Thu, 31 Jan 2019 05:56:03 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id b10sm7157497pfj.183.2019.01.31.05.56.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:56:02 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Jan 2019 21:55:57 +0800 Message-Id: <1548942957-19151-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH] lavfi/vf_nlmeans: Improve the performance for nlmeans 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" Remove the pdiff_lut_scale in nlmeans, when search the weight_luttable in nlmeans_slices(), the old way need to the float-point arithmetic using pdiff_lut_scale. This change will avoid using pdiff_lut_scale in the weight_lut table search, it's will improve the performance about 12%. (1080P size picture). Use the profiling cmd like: perf stat -a -d -r 5 ./ffmpeg -i input -an -vf nlmeans=s=30 -vframes 10 \ -f null /dev/null without this change: when s=1.0(default value) 63s s=30.0 72s after this change: s=1.0(default value) 56s s=30.0 63s Signed-off-by: Jun Zhao --- libavfilter/vf_nlmeans.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/libavfilter/vf_nlmeans.c b/libavfilter/vf_nlmeans.c index 82e779c..72eb819 100644 --- a/libavfilter/vf_nlmeans.c +++ b/libavfilter/vf_nlmeans.c @@ -43,8 +43,7 @@ struct weighted_avg { float sum; }; -#define WEIGHT_LUT_NBITS 9 -#define WEIGHT_LUT_SIZE (1< 300 * 300 * log(255) typedef struct NLMeansContext { const AVClass *class; @@ -63,7 +62,6 @@ typedef struct NLMeansContext { struct weighted_avg *wa; // weighted average of every pixel ptrdiff_t wa_linesize; // linesize for wa in struct size unit float weight_lut[WEIGHT_LUT_SIZE]; // lookup table mapping (scaled) patch differences to their associated weights - float pdiff_lut_scale; // scale factor for patch differences before looking into the LUT uint32_t max_meaningful_diff; // maximum difference considered (if the patch difference is too high we ignore the pixel) NLMeansDSPContext dsp; } NLMeansContext; @@ -401,8 +399,7 @@ static int nlmeans_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs const uint32_t patch_diff_sq = e - d - b + a; 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) + const float weight = s->weight_lut[patch_diff_sq]; // exp(-patch_diff_sq * s->pdiff_scale) wa[x].total_weight += weight; wa[x].sum += weight * src[x]; } @@ -527,10 +524,9 @@ static av_cold int init(AVFilterContext *ctx) 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)); + av_assert0((s->max_meaningful_diff - 1) < 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_scale); CHECK_ODD_FIELD(research_size, "Luma research window"); CHECK_ODD_FIELD(patch_size, "Luma patch");