{"id":11064,"url":"https://patchwork.libcamera.org/api/1.1/patches/11064/?format=json","web_url":"https://patchwork.libcamera.org/patch/11064/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210129151154.1051163-5-naush@raspberrypi.com>","date":"2021-01-29T15:11:52","name":"[libcamera-devel,v5,4/6] ipa: raspberrypi: Rename SdnStatus to DenoiseStatus","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"705c4ce75834921bfaa0ccb1470c8dde91f102bd","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/1.1/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11064/mbox/","series":[{"id":1627,"url":"https://patchwork.libcamera.org/api/1.1/series/1627/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1627","date":"2021-01-29T15:11:48","name":"Raspberry Pi: Colour denoise","version":5,"mbox":"https://patchwork.libcamera.org/series/1627/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11064/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11064/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id EC6DCBD808\n\tfor ;\n\tFri, 29 Jan 2021 15:12:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B23AB683C4;\n\tFri, 29 Jan 2021 16:12:06 +0100 (CET)","from mail-wm1-x329.google.com (mail-wm1-x329.google.com\n\t[IPv6:2a00:1450:4864:20::329])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 10B04683BF\n\tfor ;\n\tFri, 29 Jan 2021 16:12:05 +0100 (CET)","by mail-wm1-x329.google.com with SMTP id m1so4179784wml.2\n\tfor ;\n\tFri, 29 Jan 2021 07:12:05 -0800 (PST)","from naushir-VirtualBox.patuck.local ([88.97.76.4])\n\tby smtp.gmail.com with ESMTPSA id\n\tf13sm6517461wmf.1.2021.01.29.07.12.02\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 29 Jan 2021 07:12:03 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"KdfPJVr8\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=r60/x9D2wFvPc1qF59Lv1Xv7mQ0M3HtfAuQgufi2E88=;\n\tb=KdfPJVr8XNYFDfrt7/61+O9Bxws4nl34oX46ltimWgRrx96BQTFzYSxoJwkarNi6tu\n\tZzM7mleoYKxzS8FIZxlBsWns8YvTpw3wJZsi1C4J1SJHDi1Ybl9SBOpmsxwemfcJ03Sn\n\tK9n8kVI79lPC+bAaRB8OwuoGxG76m1Oreps/TmSsVIxKl+bvOo3Xw5vGStgnGjimLwFF\n\to7GnY++/m42hxJyBG7PA3/DaHCDxbZnMqJiQnXfteMzzpw7NOQ1OsDhi8sQF+hCmzPNN\n\t+t/6fswx4Ls1HfKOMhFFwvjxbU0/+bH8R3+rYSi1EcQB+qn6YbAV5zl5Ud4Xn5DzgYj4\n\tnFoQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=r60/x9D2wFvPc1qF59Lv1Xv7mQ0M3HtfAuQgufi2E88=;\n\tb=eKEG1n1fJUYhEGOowgEkQ9WQxuacqTT9DwAlKdwux+X5LDpl54jjV9hNkA8g7HQ2kX\n\tGb/hCi/cN7X3JI/OkYm8Y7mB4wA9gxBXPG7zcrw2uDmLTtEpyS8GmnkOoPo4fpW4nGEa\n\tjEYMRR/8l+zvLodmSt8Yr09vEHR5WA3csMDwt3za+IdW1w2BNL5dVYRixji2IFrOjYkf\n\tbuuiNTjN4pBkd11Kal48L4IhQ1zH4hR95PjtntQOZD1lq/4q3MFJwTzHHBtJ8f2d+FKz\n\tlM8aCgxnez8m0TkyUCWiH6/sjp4ckIBbVMNMuRSYzrRX+V2tn5/rWCjkoIskfMApPxlj\n\tbuCQ==","X-Gm-Message-State":"AOAM533WpX1js+A0atbEQ11wmJS4RXOmhbgXAMnVRMD+PF4XeMnZr2VT\n\tDucitk5LClMTaa4dMdGIXHoNeR7FTiVvu5MU","X-Google-Smtp-Source":"ABdhPJweOnvATuoaV2jQEQnZT5SkjF3w6Hd53eFsrgUxQpTdmUwo/2Oz2lTHtnkWWheOyBEklesC0A==","X-Received":"by 2002:a1c:1b83:: with SMTP id b125mr4327363wmb.8.1611933123893;\n\tFri, 29 Jan 2021 07:12:03 -0800 (PST)","From":"Naushir Patuck ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 29 Jan 2021 15:11:52 +0000","Message-Id":"<20210129151154.1051163-5-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20210129151154.1051163-1-naush@raspberrypi.com>","References":"<20210129151154.1051163-1-naush@raspberrypi.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v5 4/6] ipa: raspberrypi: Rename SdnStatus\n\tto DenoiseStatus","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"This change is in anticipation of the addition of a DenoiseAlgorithm\nbase class which the SDN class will derive from. We want to match the\nmetadata object name with the base class algorithm name.\n\nThis renames:\n- SdnStatus metadata object to DenoiseStatus\n- \"sdn.status\" metadata string key to \"denoise.status\"\n- sdn_status.h header file to denoise_status.h\n\nSigned-off-by: Naushir Patuck \nReviewed-by: David Plowman \nReviewed-by: Kieran Bingham \n---\n .../controller/{sdn_status.h => denoise_status.h} | 6 +++---\n src/ipa/raspberrypi/controller/rpi/sdn.cpp | 6 +++---\n src/ipa/raspberrypi/raspberrypi.cpp | 8 ++++----\n 3 files changed, 10 insertions(+), 10 deletions(-)\n rename src/ipa/raspberrypi/controller/{sdn_status.h => denoise_status.h} (65%)","diff":"diff --git a/src/ipa/raspberrypi/controller/sdn_status.h b/src/ipa/raspberrypi/controller/denoise_status.h\nsimilarity index 65%\nrename from src/ipa/raspberrypi/controller/sdn_status.h\nrename to src/ipa/raspberrypi/controller/denoise_status.h\nindex 871e0b62af1f..06d7cfb91ae8 100644\n--- a/src/ipa/raspberrypi/controller/sdn_status.h\n+++ b/src/ipa/raspberrypi/controller/denoise_status.h\n@@ -1,8 +1,8 @@\n /* SPDX-License-Identifier: BSD-2-Clause */\n /*\n- * Copyright (C) 2019, Raspberry Pi (Trading) Limited\n+ * Copyright (C) 2019-2021, Raspberry Pi (Trading) Limited\n *\n- * sdn_status.h - SDN (spatial denoise) control algorithm status\n+ * denoise_status.h - Spatial Denoise control algorithm status\n */\n #pragma once\n \n@@ -12,7 +12,7 @@\n extern \"C\" {\n #endif\n \n-struct SdnStatus {\n+struct DenoiseStatus {\n \tdouble noise_constant;\n \tdouble noise_slope;\n \tdouble strength;\ndiff --git a/src/ipa/raspberrypi/controller/rpi/sdn.cpp b/src/ipa/raspberrypi/controller/rpi/sdn.cpp\nindex aa82830b02b4..d8c1521a6633 100644\n--- a/src/ipa/raspberrypi/controller/rpi/sdn.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/sdn.cpp\n@@ -5,8 +5,8 @@\n * sdn.cpp - SDN (spatial denoise) control algorithm\n */\n \n+#include \"../denoise_status.h\"\n #include \"../noise_status.h\"\n-#include \"../sdn_status.h\"\n \n #include \"sdn.hpp\"\n \n@@ -44,11 +44,11 @@ void Sdn::Prepare(Metadata *image_metadata)\n \tRPI_LOG(\"Noise profile: constant \" << noise_status.noise_constant\n \t\t\t\t\t << \" slope \"\n \t\t\t\t\t << noise_status.noise_slope);\n-\tstruct SdnStatus status;\n+\tstruct DenoiseStatus status;\n \tstatus.noise_constant = noise_status.noise_constant * deviation_;\n \tstatus.noise_slope = noise_status.noise_slope * deviation_;\n \tstatus.strength = strength_;\n-\timage_metadata->Set(\"sdn.status\", status);\n+\timage_metadata->Set(\"denoise.status\", status);\n \tRPI_LOG(\"Sdn: programmed constant \" << status.noise_constant\n \t\t\t\t\t << \" slope \" << status.noise_slope\n \t\t\t\t\t << \" strength \"\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex 5ccc7a6551f5..220cf174aa4f 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -43,13 +43,13 @@\n #include \"contrast_algorithm.hpp\"\n #include \"contrast_status.h\"\n #include \"controller.hpp\"\n+#include \"denoise_status.h\"\n #include \"dpc_status.h\"\n #include \"focus_status.h\"\n #include \"geq_status.h\"\n #include \"lux_status.h\"\n #include \"metadata.hpp\"\n #include \"noise_status.h\"\n-#include \"sdn_status.h\"\n #include \"sharpen_algorithm.hpp\"\n #include \"sharpen_status.h\"\n \n@@ -109,7 +109,7 @@ private:\n \tvoid applyBlackLevel(const struct BlackLevelStatus *blackLevelStatus, ControlList &ctrls);\n \tvoid applyGamma(const struct ContrastStatus *contrastStatus, ControlList &ctrls);\n \tvoid applyGEQ(const struct GeqStatus *geqStatus, ControlList &ctrls);\n-\tvoid applyDenoise(const struct SdnStatus *denoiseStatus, ControlList &ctrls);\n+\tvoid applyDenoise(const struct DenoiseStatus *denoiseStatus, ControlList &ctrls);\n \tvoid applySharpen(const struct SharpenStatus *sharpenStatus, ControlList &ctrls);\n \tvoid applyDPC(const struct DpcStatus *dpcStatus, ControlList &ctrls);\n \tvoid applyLS(const struct AlscStatus *lsStatus, ControlList &ctrls);\n@@ -899,7 +899,7 @@ void IPARPi::prepareISP(unsigned int bufferId)\n \t\tif (geqStatus)\n \t\t\tapplyGEQ(geqStatus, ctrls);\n \n-\t\tSdnStatus *denoiseStatus = rpiMetadata_.GetLocked(\"sdn.status\");\n+\t\tDenoiseStatus *denoiseStatus = rpiMetadata_.GetLocked(\"denoise.status\");\n \t\tif (denoiseStatus)\n \t\t\tapplyDenoise(denoiseStatus, ctrls);\n \n@@ -1083,7 +1083,7 @@ void IPARPi::applyGEQ(const struct GeqStatus *geqStatus, ControlList &ctrls)\n \tctrls.set(V4L2_CID_USER_BCM2835_ISP_GEQ, c);\n }\n \n-void IPARPi::applyDenoise(const struct SdnStatus *denoiseStatus, ControlList &ctrls)\n+void IPARPi::applyDenoise(const struct DenoiseStatus *denoiseStatus, ControlList &ctrls)\n {\n \tbcm2835_isp_denoise denoise;\n \n","prefixes":["libcamera-devel","v5","4/6"]}