{"id":11195,"url":"https://patchwork.libcamera.org/api/patches/11195/?format=json","web_url":"https://patchwork.libcamera.org/patch/11195/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20210208150738.2293520-5-naush@raspberrypi.com>","date":"2021-02-08T15:07:36","name":"[libcamera-devel,v6,4/6] ipa: raspberrypi: Rename SdnStatus to DenoiseStatus","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"1d0925d51c1b49afecada6da47472d10e2966231","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11195/mbox/","series":[{"id":1666,"url":"https://patchwork.libcamera.org/api/series/1666/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1666","date":"2021-02-08T15:07:32","name":"Raspberry Pi: Colour denoise","version":6,"mbox":"https://patchwork.libcamera.org/series/1666/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11195/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11195/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 56660BD162\n\tfor ;\n\tMon, 8 Feb 2021 15:08:35 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2560660D26;\n\tMon, 8 Feb 2021 16:08:35 +0100 (CET)","from mail-wr1-x435.google.com (mail-wr1-x435.google.com\n\t[IPv6:2a00:1450:4864:20::435])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 50B0C60D21\n\tfor ;\n\tMon, 8 Feb 2021 16:08:33 +0100 (CET)","by mail-wr1-x435.google.com with SMTP id u14so17572495wri.3\n\tfor ;\n\tMon, 08 Feb 2021 07:08:33 -0800 (PST)","from naush-laptop.pitowers.org (cust51-dsl50.idnet.net.\n\t[212.69.50.51]) by smtp.gmail.com with ESMTPSA id\n\ta17sm31261389wrx.63.2021.02.08.07.07.55\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 08 Feb 2021 07:07:56 -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=\"fHnWd8Ba\"; 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=MeSSeQisOMZr1VtdPoWYea3+nhKVhtFXVS0jLnW5PYM=;\n\tb=fHnWd8Ba3I9vbcqjtsLpUzTgu1gd+cbe8qUT5/kEZKv1cQGHiZLjsWbMyE25GqT5kY\n\tLRXCPaTMZfFGZMU7KRCuThOPVMWeBMOlqJKgerA6AkspB7U3GpK0kVNcxmP4tH8og4um\n\tFXEou5BG4cJsWxi6Ad0ao2jjIsgKaPKK6AmS7hPm2NQUyVPk3Z7GB6qQBEQE7LO1oSeU\n\tKYP+ENOMn+DbV7twaAhoiYpKnZVbeleFxTW4BMhns4dkB9gibgrbIJjDgaprAG5XqP+S\n\tQPpPOGZcad264F5dPyYGz9WTviIyAMr+69ahD2sjGX2nl0ZvgZBLtJ6GDi7uZY6CUy1H\n\tFOCg==","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=MeSSeQisOMZr1VtdPoWYea3+nhKVhtFXVS0jLnW5PYM=;\n\tb=J51h7Rb2roRLCstY29UCFvUhGjEA52P0kwnPQ+8gNBXZ8OIXL6YA5muhxeL7wjM3fQ\n\t9VQeoq7kfbXxXc8SoU4aeJe5jlT4XJf3Lh0KnnSpL50hvc2a3mQPmxZDBXlh9nESFImC\n\tdEv2hYEPlaDo9rxcT4HzRS0TjPxhRSZQNULWA+ysMg9ggkhQW839oaD6zg0EzWis5mS2\n\tSl4DyEGaLz/vG6KJs+18OZzX3f/YeGyUvqsNViKcbiNJpLl2tx5wm7LrXYA76VDnAQsu\n\tGSE1o4PwUXHChWQIEujMCrwRK/wtkMtRne5Uu9dyp1szXOn8SPoDuCr8yg7nAVA9cydy\n\tiXOA==","X-Gm-Message-State":"AOAM531GGtMn9RQQKFc6KmbuWAxLwqA12cvnIpLRaKsDPNfdE/smRRpH\n\t7CBbsdPsvDWh5NI1/FsiOGL5q2FZL/eYcbIA","X-Google-Smtp-Source":"ABdhPJxthSXt+jz2Q3HLqhY8c3kyVEdmu++TITUImB1iuc305Pxr1Gn51/keTfUi+vciXa0RyvtwlA==","X-Received":"by 2002:a5d:47ae:: with SMTP id\n\t14mr20271703wrb.378.1612796881599; \n\tMon, 08 Feb 2021 07:08:01 -0800 (PST)","From":"Naushir Patuck ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 8 Feb 2021 15:07:36 +0000","Message-Id":"<20210208150738.2293520-5-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20210208150738.2293520-1-naush@raspberrypi.com>","References":"<20210208150738.2293520-1-naush@raspberrypi.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v6 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 \nReviewed-by: Laurent Pinchart \n---\n .../controller/{sdn_status.h => denoise_status.h} | 8 ++++----\n src/ipa/raspberrypi/controller/rpi/sdn.cpp | 4 ++--\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} (50%)","diff":"diff --git a/src/ipa/raspberrypi/controller/sdn_status.h b/src/ipa/raspberrypi/controller/denoise_status.h\nsimilarity index 50%\nrename from src/ipa/raspberrypi/controller/sdn_status.h\nrename to src/ipa/raspberrypi/controller/denoise_status.h\nindex 871e0b62af1f..94f5df200ffd 100644\n--- a/src/ipa/raspberrypi/controller/sdn_status.h\n+++ b/src/ipa/raspberrypi/controller/denoise_status.h\n@@ -1,18 +1,18 @@\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 - Denoise control algorithm status\n */\n #pragma once\n \n-// This stores the parameters required for Spatial Denoise (SDN).\n+// This stores the parameters required for Denoise (SDN).\n \n #ifdef __cplusplus\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 0fad25504345..ef84a2dcbf86 100644\n--- a/src/ipa/raspberrypi/controller/rpi/sdn.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/sdn.cpp\n@@ -7,8 +7,8 @@\n \n #include \"libcamera/internal/log.h\"\n \n+#include \"../denoise_status.h\"\n #include \"../noise_status.h\"\n-#include \"../sdn_status.h\"\n \n #include \"sdn.hpp\"\n \n@@ -49,7 +49,7 @@ void Sdn::Prepare(Metadata *image_metadata)\n \tLOG(RPiSdn, Debug)\n \t\t<< \"Noise profile: constant \" << noise_status.noise_constant\n \t\t<< \" slope \" << 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_;\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex ff14cfc4b706..e76688a7b323 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@@ -110,7 +110,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@@ -952,7 +952,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@@ -1171,7 +1171,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","v6","4/6"]}