{"id":11014,"url":"https://patchwork.libcamera.org/api/patches/11014/?format=json","web_url":"https://patchwork.libcamera.org/patch/11014/","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":"<20210126162412.824033-6-naush@raspberrypi.com>","date":"2021-01-26T16:24:11","name":"[libcamera-devel,v4,5/6] ipa: raspberrypi: Add a DenoiseAlgorithm class to the Controller","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"a086be3d26ceca9a9c451029be6e365e01b144bf","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/11014/mbox/","series":[{"id":1611,"url":"https://patchwork.libcamera.org/api/series/1611/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1611","date":"2021-01-26T16:24:06","name":"Raspberry Pi: Colour denoise","version":4,"mbox":"https://patchwork.libcamera.org/series/1611/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11014/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11014/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 304B7C0F2B\n\tfor ;\n\tTue, 26 Jan 2021 16:24:27 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E639068329;\n\tTue, 26 Jan 2021 17:24:26 +0100 (CET)","from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com\n\t[IPv6:2a00:1450:4864:20::42d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E190868317\n\tfor ;\n\tTue, 26 Jan 2021 17:24:22 +0100 (CET)","by mail-wr1-x42d.google.com with SMTP id c12so17126277wrc.7\n\tfor ;\n\tTue, 26 Jan 2021 08:24:22 -0800 (PST)","from naushir-VirtualBox.patuck.local ([88.97.76.4])\n\tby smtp.gmail.com with ESMTPSA id\n\tm18sm8725809wrx.17.2021.01.26.08.24.21\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 26 Jan 2021 08:24:21 -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=\"rJUau6ps\"; 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=Rw87xwJK3AixxcnAnpe8KJpYLB6K0bNSkqy7I+Uuq+w=;\n\tb=rJUau6psBZpNwIiOzCEXvXI3AXFGDNmrGdQtguECqtHip+5oKeydh73skY12fTwr2d\n\tsWalhEtDN5uCBCOMg1k4DrfRcQhl8FrMVmgJNBTmtosVwnAcixhw4olGfpkywgaFnxfm\n\t7/1KjFoj4Hh3itNbYvxPw4SKTnwp7tI/CO0DcMzAEqMbT7D430UMYqQVhD38lwsO9P3p\n\tsbNUywseLXgG9pB7fYfbmhV1Zn3Ht/bAWBhjLTfUgpAY1KVFnjefhh6+eN3T43EjkhuY\n\t2si6nWvQZGAuH/cTcnF3SBeDaZ/hWHrvqjLzRy+tZaFc09OUH8t/iH0eC7Xxu0IfJ3Sh\n\tBZdg==","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=Rw87xwJK3AixxcnAnpe8KJpYLB6K0bNSkqy7I+Uuq+w=;\n\tb=Lc0Dzx3w67Mk2GVAJ0LmAWkZ9OVy/snYFnC2xsdDyIAAfqUtCLZvgyJUHGHfvdxm4c\n\tJL2HugqrljK+XPoyWvi+RKSYZQrYh7MuIgUrLS8j+UiRq6J+sq2X3E0g4R+A2/f6bA+G\n\tB2mdBu97fs+onWXrthaIy7IVFsvmclsbc4crPzWk07q0/dtf/swlaJy3JEThPqU9+BNC\n\tGl1x5Ff6ZIddG8ibBZ3o7XqtHK/jIQhpyK00P7bzRI9HhF/YRM5A1EMcIMjwC5pF7SVp\n\t2YhL4qtlVQctKdU08n0ijODusD1PlG0o32sqM3kFXxumDZKzbbeyaxZV+q2NB7Q+QXNv\n\tmYkQ==","X-Gm-Message-State":"AOAM533OdMD5IsCajcEm8gW77gelHpa9JftmzNKLNnVF6ytVjr1swM69\n\t8aU1CNy5XpsYQtyg1ZyrlNd5kQhD/jQWv+ny","X-Google-Smtp-Source":"ABdhPJzKl4aIFtUavNq3EpvA0uVoST99vZBVSiQY+aXjnwAmjO9gbG5dvbjpBwBRFN/bgRBeyj9pFA==","X-Received":"by 2002:a5d:55c3:: with SMTP id i3mr6839224wrw.190.1611678262376;\n\tTue, 26 Jan 2021 08:24:22 -0800 (PST)","From":"Naushir Patuck ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 26 Jan 2021 16:24:11 +0000","Message-Id":"<20210126162412.824033-6-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20210126162412.824033-1-naush@raspberrypi.com>","References":"<20210126162412.824033-1-naush@raspberrypi.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 5/6] ipa: raspberrypi: Add a\n\tDenoiseAlgorithm class to the Controller","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 denoise algorithm class will be used to pass in the user requested\ndenoise operating mode to the controller. The existing Denoise\ncontroller will derive from this new DenoiseAlgorithm class.\n\nAdd a denoise mode field in the denoise status metadata object for the\nIPA to use when configuring the ISP.\n\nSigned-off-by: Naushir Patuck \nReviewed-by: David Plowman \nReviewed-by: Kieran Bingham \n---\n .../controller/denoise_algorithm.hpp | 23 +++++++++++++++++++\n .../raspberrypi/controller/denoise_status.h | 1 +\n src/ipa/raspberrypi/controller/rpi/sdn.cpp | 11 +++++++--\n src/ipa/raspberrypi/controller/rpi/sdn.hpp | 5 +++-\n 4 files changed, 37 insertions(+), 3 deletions(-)\n create mode 100644 src/ipa/raspberrypi/controller/denoise_algorithm.hpp","diff":"diff --git a/src/ipa/raspberrypi/controller/denoise_algorithm.hpp b/src/ipa/raspberrypi/controller/denoise_algorithm.hpp\nnew file mode 100644\nindex 000000000000..df1f35cc9e5f\n--- /dev/null\n+++ b/src/ipa/raspberrypi/controller/denoise_algorithm.hpp\n@@ -0,0 +1,23 @@\n+/* SPDX-License-Identifier: BSD-2-Clause */\n+/*\n+ * Copyright (C) 2021, Raspberry Pi (Trading) Limited\n+ *\n+ * denoise.hpp - Denoise control algorithm interface\n+ */\n+#pragma once\n+\n+#include \"algorithm.hpp\"\n+\n+namespace RPiController {\n+\n+enum DenoiseMode { Off, ColourOff, ColourFast, ColourHighQuality };\n+\n+class DenoiseAlgorithm : public Algorithm\n+{\n+public:\n+\tDenoiseAlgorithm(Controller *controller) : Algorithm(controller) {}\n+\t// A Denoise algorithm must provide the following:\n+\tvirtual void SetMode(DenoiseMode mode) = 0;\n+};\n+\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/denoise_status.h b/src/ipa/raspberrypi/controller/denoise_status.h\nindex 06d7cfb91ae8..6064cc2c192e 100644\n--- a/src/ipa/raspberrypi/controller/denoise_status.h\n+++ b/src/ipa/raspberrypi/controller/denoise_status.h\n@@ -16,6 +16,7 @@ struct DenoiseStatus {\n \tdouble noise_constant;\n \tdouble noise_slope;\n \tdouble strength;\n+\tunsigned int mode;\n };\n \n #ifdef __cplusplus\ndiff --git a/src/ipa/raspberrypi/controller/rpi/sdn.cpp b/src/ipa/raspberrypi/controller/rpi/sdn.cpp\nindex d8c1521a6633..ecc7845eda4c 100644\n--- a/src/ipa/raspberrypi/controller/rpi/sdn.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/sdn.cpp\n@@ -1,6 +1,6 @@\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.cpp - SDN (spatial denoise) control algorithm\n */\n@@ -18,7 +18,7 @@ using namespace RPiController;\n #define NAME \"rpi.sdn\"\n \n Sdn::Sdn(Controller *controller)\n-\t: Algorithm(controller)\n+\t: DenoiseAlgorithm(controller), mode_(DenoiseMode::ColourOff)\n {\n }\n \n@@ -48,6 +48,7 @@ void Sdn::Prepare(Metadata *image_metadata)\n \tstatus.noise_constant = noise_status.noise_constant * deviation_;\n \tstatus.noise_slope = noise_status.noise_slope * deviation_;\n \tstatus.strength = strength_;\n+\tstatus.mode = mode_;\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@@ -55,6 +56,12 @@ void Sdn::Prepare(Metadata *image_metadata)\n \t\t\t\t\t << status.strength);\n }\n \n+void Sdn::SetMode(DenoiseMode mode)\n+{\n+\t// We only distinguish between off and all other modes.\n+\tmode_ = mode;\n+}\n+\n // Register algorithm with the system.\n static Algorithm *Create(Controller *controller)\n {\ndiff --git a/src/ipa/raspberrypi/controller/rpi/sdn.hpp b/src/ipa/raspberrypi/controller/rpi/sdn.hpp\nindex 486c000d7b77..2371ce04163f 100644\n--- a/src/ipa/raspberrypi/controller/rpi/sdn.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/sdn.hpp\n@@ -7,12 +7,13 @@\n #pragma once\n \n #include \"../algorithm.hpp\"\n+#include \"../denoise_algorithm.hpp\"\n \n namespace RPiController {\n \n // Algorithm to calculate correct spatial denoise (SDN) settings.\n \n-class Sdn : public Algorithm\n+class Sdn : public DenoiseAlgorithm\n {\n public:\n \tSdn(Controller *controller = NULL);\n@@ -20,10 +21,12 @@ public:\n \tvoid Read(boost::property_tree::ptree const ¶ms) override;\n \tvoid Initialise() override;\n \tvoid Prepare(Metadata *image_metadata) override;\n+\tvoid SetMode(DenoiseMode mode) override;\n \n private:\n \tdouble deviation_;\n \tdouble strength_;\n+\tDenoiseMode mode_;\n };\n \n } // namespace RPiController\n","prefixes":["libcamera-devel","v4","5/6"]}