Patch Detail
Show a patch.
GET /api/patches/9782/?format=api
{ "id": 9782, "url": "https://patchwork.libcamera.org/api/patches/9782/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9782/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200924091927.116385-3-naush@raspberrypi.com>", "date": "2020-09-24T09:19:25", "name": "[libcamera-devel,2/4] ipa: raspberrypi: Rename the controller namespace from Rpi to RpiController", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "09e1acea8958aa5337f8bd3b0207ad1817351ae7", "submitter": { "id": 34, "url": "https://patchwork.libcamera.org/api/people/34/?format=api", "name": "Naushir Patuck", "email": "naush@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9782/mbox/", "series": [ { "id": 1318, "url": "https://patchwork.libcamera.org/api/series/1318/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1318", "date": "2020-09-24T09:19:23", "name": "Code tidy-ups", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1318/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9782/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9782/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 18CF1C3B5B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 24 Sep 2020 09:19:37 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7B88B63000;\n\tThu, 24 Sep 2020 11:19:36 +0200 (CEST)", "from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com\n\t[IPv6:2a00:1450:4864:20::42b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6990F62FD2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 24 Sep 2020 11:19:34 +0200 (CEST)", "by mail-wr1-x42b.google.com with SMTP id t10so3013596wrv.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 24 Sep 2020 02:19:34 -0700 (PDT)", "from naushir-VirtualBox.pitowers.org\n\t([2a00:1098:3142:14:a00:27ff:fe4d:f6a2])\n\tby smtp.gmail.com with ESMTPSA id\n\tw81sm2689324wmg.47.2020.09.24.02.19.32\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 24 Sep 2020 02:19:32 -0700 (PDT)" ], "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=\"N7vL3d7q\"; 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=V05LIAXaNnklLoFn3JO4LYXy5zTMN5MUCJ2jI/VVFCM=;\n\tb=N7vL3d7qz7ZJwuOeKW3cTQxRVtE71gEu+AGgtDQkF8GAwwKuMCnglyAqitCH/tYIvc\n\tbShEB91Fe8ErfBQwW8aABsjzA0YbrwTJAgGRstE/DNFsDxFAJApwtLT/8EJ4HBjB3Dze\n\tMmPc+6LJ9DGQY/q15Zpx+K7pmfWOim5QuAOc216zri3Tr4lfGfWmC6dQY6egm4MTEaNe\n\tZGCsDpGDxpZTOKVuq8CDub4YPWUf4UtUZwmGFLpmbY1wQwBZqoZIkvHX2t4cIy6BKgd3\n\t3exE2SgxOrldfOv0jBgz6+ro4Mjpad8xZnCOozIX2aVcnkwrgjsVej/A0Rz8TgetMkjF\n\tPYKw==", "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=V05LIAXaNnklLoFn3JO4LYXy5zTMN5MUCJ2jI/VVFCM=;\n\tb=Q1AMSzesS118NGPCVUkBnZVVaKUAtKO65r5WMiihZB4fTw5n3sWN7Wvoyad4zlY/3X\n\tKEM8aJiBigPJRyb3qmYfGOCf7PSbqxNamMqy6fETri7/RR418XjDwHUNue4ZZxWBgloe\n\tod6SDn/wAFK97lI+pcNbFIiPuKEfIk4UTbx+ex1foAmn5hgewgP2uDaNqCiY6vyN87Ru\n\t40Nb1w+7qI5Bk6Kd0lqrrvgWPdDVasj5J2zRSLX4hD10A6yOVIeUz74iCTn1JbeoWwez\n\tNKv+JOYCeszE2yqP37Q+2FfEJdVNQkAeuHNhbESvWWCi2gi7URy8LF6ROJXbVSUtyI4E\n\tB0qw==", "X-Gm-Message-State": "AOAM532M/NZsKAM1xO6t/vbtLs/lCqcs+OX4KLE4nz89YAm9Z7/06Xu+\n\t0tB0SgiLb1TUa6T5oZTZBw0f/O+g6r7deg==", "X-Google-Smtp-Source": "ABdhPJxMCiWn/WGotIoLJfsVY31V7RN+nrGPhrkS2euPqp55+9l6BLcQgHkAQkFBN1yRs+h7PCy65g==", "X-Received": "by 2002:a5d:5602:: with SMTP id l2mr4287741wrv.410.1600939173311;\n\tThu, 24 Sep 2020 02:19:33 -0700 (PDT)", "From": "Naushir Patuck <naush@raspberrypi.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 24 Sep 2020 10:19:25 +0100", "Message-Id": "<20200924091927.116385-3-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20200924091927.116385-1-naush@raspberrypi.com>", "References": "<20200924091927.116385-1-naush@raspberrypi.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 2/4] ipa: raspberrypi: Rename the\n\tcontroller namespace from Rpi to RpiController", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "This avoids a namespace clash with the RPi namespace used by the ipa and\npipeline handlers, and cleans up the syntax slightly.\n\nThere are no functional changes in this commit.\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nAcked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/ipa/raspberrypi/cam_helper.cpp | 2 +-\n src/ipa/raspberrypi/cam_helper.hpp | 2 +-\n src/ipa/raspberrypi/cam_helper_imx219.cpp | 2 +-\n src/ipa/raspberrypi/cam_helper_imx477.cpp | 2 +-\n src/ipa/raspberrypi/cam_helper_ov5647.cpp | 2 +-\n .../raspberrypi/controller/agc_algorithm.hpp | 4 +-\n src/ipa/raspberrypi/controller/algorithm.cpp | 4 +-\n src/ipa/raspberrypi/controller/algorithm.hpp | 4 +-\n .../raspberrypi/controller/awb_algorithm.hpp | 4 +-\n .../raspberrypi/controller/ccm_algorithm.hpp | 4 +-\n .../controller/contrast_algorithm.hpp | 4 +-\n src/ipa/raspberrypi/controller/controller.cpp | 2 +-\n src/ipa/raspberrypi/controller/controller.hpp | 4 +-\n src/ipa/raspberrypi/controller/histogram.cpp | 2 +-\n src/ipa/raspberrypi/controller/histogram.hpp | 4 +-\n src/ipa/raspberrypi/controller/metadata.hpp | 4 +-\n src/ipa/raspberrypi/controller/pwl.cpp | 2 +-\n src/ipa/raspberrypi/controller/pwl.hpp | 4 +-\n src/ipa/raspberrypi/controller/rpi/agc.cpp | 2 +-\n src/ipa/raspberrypi/controller/rpi/agc.hpp | 4 +-\n src/ipa/raspberrypi/controller/rpi/alsc.cpp | 2 +-\n src/ipa/raspberrypi/controller/rpi/alsc.hpp | 4 +-\n src/ipa/raspberrypi/controller/rpi/awb.cpp | 2 +-\n src/ipa/raspberrypi/controller/rpi/awb.hpp | 4 +-\n .../controller/rpi/black_level.cpp | 2 +-\n .../controller/rpi/black_level.hpp | 4 +-\n src/ipa/raspberrypi/controller/rpi/ccm.cpp | 2 +-\n src/ipa/raspberrypi/controller/rpi/ccm.hpp | 4 +-\n .../raspberrypi/controller/rpi/contrast.cpp | 2 +-\n .../raspberrypi/controller/rpi/contrast.hpp | 4 +-\n src/ipa/raspberrypi/controller/rpi/dpc.cpp | 2 +-\n src/ipa/raspberrypi/controller/rpi/dpc.hpp | 4 +-\n src/ipa/raspberrypi/controller/rpi/focus.cpp | 2 +-\n src/ipa/raspberrypi/controller/rpi/focus.hpp | 4 +-\n src/ipa/raspberrypi/controller/rpi/geq.cpp | 2 +-\n src/ipa/raspberrypi/controller/rpi/geq.hpp | 4 +-\n src/ipa/raspberrypi/controller/rpi/lux.cpp | 2 +-\n src/ipa/raspberrypi/controller/rpi/lux.hpp | 4 +-\n src/ipa/raspberrypi/controller/rpi/noise.cpp | 2 +-\n src/ipa/raspberrypi/controller/rpi/noise.hpp | 4 +-\n src/ipa/raspberrypi/controller/rpi/sdn.cpp | 2 +-\n src/ipa/raspberrypi/controller/rpi/sdn.hpp | 4 +-\n .../raspberrypi/controller/rpi/sharpen.cpp | 2 +-\n .../raspberrypi/controller/rpi/sharpen.hpp | 4 +-\n .../controller/sharpen_algorithm.hpp | 4 +-\n src/ipa/raspberrypi/md_parser.cpp | 2 +-\n src/ipa/raspberrypi/md_parser.hpp | 2 +-\n src/ipa/raspberrypi/md_parser_rpi.cpp | 2 +-\n src/ipa/raspberrypi/md_parser_rpi.hpp | 2 +-\n src/ipa/raspberrypi/raspberrypi.cpp | 52 +++++++++----------\n 50 files changed, 99 insertions(+), 99 deletions(-)", "diff": "diff --git a/src/ipa/raspberrypi/cam_helper.cpp b/src/ipa/raspberrypi/cam_helper.cpp\nindex b1343eb2..c8ac3232 100644\n--- a/src/ipa/raspberrypi/cam_helper.cpp\n+++ b/src/ipa/raspberrypi/cam_helper.cpp\n@@ -16,7 +16,7 @@\n #include \"cam_helper.hpp\"\n #include \"md_parser.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n static std::map<std::string, CamHelperCreateFunc> cam_helpers;\n \ndiff --git a/src/ipa/raspberrypi/cam_helper.hpp b/src/ipa/raspberrypi/cam_helper.hpp\nindex 97ce3e92..044c2866 100644\n--- a/src/ipa/raspberrypi/cam_helper.hpp\n+++ b/src/ipa/raspberrypi/cam_helper.hpp\n@@ -13,7 +13,7 @@\n \n #include \"libcamera/internal/v4l2_videodevice.h\"\n \n-namespace RPi {\n+namespace RPiController {\n \n // The CamHelper class provides a number of facilities that anyone trying\n // trying to drive a camera will need to know, but which are not provided by\ndiff --git a/src/ipa/raspberrypi/cam_helper_imx219.cpp b/src/ipa/raspberrypi/cam_helper_imx219.cpp\nindex 1b9ce382..db8ab879 100644\n--- a/src/ipa/raspberrypi/cam_helper_imx219.cpp\n+++ b/src/ipa/raspberrypi/cam_helper_imx219.cpp\n@@ -23,7 +23,7 @@\n #include \"md_parser_rpi.hpp\"\n #endif\n \n-using namespace RPi;\n+using namespace RPiController;\n \n /* Metadata parser implementation specific to Sony IMX219 sensors. */\n \ndiff --git a/src/ipa/raspberrypi/cam_helper_imx477.cpp b/src/ipa/raspberrypi/cam_helper_imx477.cpp\nindex a53b47c0..0e896ac7 100644\n--- a/src/ipa/raspberrypi/cam_helper_imx477.cpp\n+++ b/src/ipa/raspberrypi/cam_helper_imx477.cpp\n@@ -13,7 +13,7 @@\n #include \"cam_helper.hpp\"\n #include \"md_parser.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n /* Metadata parser implementation specific to Sony IMX477 sensors. */\n \ndiff --git a/src/ipa/raspberrypi/cam_helper_ov5647.cpp b/src/ipa/raspberrypi/cam_helper_ov5647.cpp\nindex 3dbcb164..dc5d8275 100644\n--- a/src/ipa/raspberrypi/cam_helper_ov5647.cpp\n+++ b/src/ipa/raspberrypi/cam_helper_ov5647.cpp\n@@ -10,7 +10,7 @@\n #include \"cam_helper.hpp\"\n #include \"md_parser_rpi.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n class CamHelperOv5647 : public CamHelper\n {\ndiff --git a/src/ipa/raspberrypi/controller/agc_algorithm.hpp b/src/ipa/raspberrypi/controller/agc_algorithm.hpp\nindex f29bb3ac..b4ea54fb 100644\n--- a/src/ipa/raspberrypi/controller/agc_algorithm.hpp\n+++ b/src/ipa/raspberrypi/controller/agc_algorithm.hpp\n@@ -8,7 +8,7 @@\n \n #include \"algorithm.hpp\"\n \n-namespace RPi {\n+namespace RPiController {\n \n class AgcAlgorithm : public Algorithm\n {\n@@ -25,4 +25,4 @@ public:\n \tSetConstraintMode(std::string const &contraint_mode_name) = 0;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/algorithm.cpp b/src/ipa/raspberrypi/controller/algorithm.cpp\nindex 1b80e296..43ad0a2b 100644\n--- a/src/ipa/raspberrypi/controller/algorithm.cpp\n+++ b/src/ipa/raspberrypi/controller/algorithm.cpp\n@@ -7,7 +7,7 @@\n \n #include \"algorithm.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n void Algorithm::Read([[maybe_unused]] boost::property_tree::ptree const ¶ms)\n {\n@@ -32,7 +32,7 @@ void Algorithm::Process([[maybe_unused]] StatisticsPtr &stats,\n // For registering algorithms with the system:\n \n static std::map<std::string, AlgoCreateFunc> algorithms;\n-std::map<std::string, AlgoCreateFunc> const &RPi::GetAlgorithms()\n+std::map<std::string, AlgoCreateFunc> const &RPiController::GetAlgorithms()\n {\n \treturn algorithms;\n }\ndiff --git a/src/ipa/raspberrypi/controller/algorithm.hpp b/src/ipa/raspberrypi/controller/algorithm.hpp\nindex 187c50c6..6196b2f9 100644\n--- a/src/ipa/raspberrypi/controller/algorithm.hpp\n+++ b/src/ipa/raspberrypi/controller/algorithm.hpp\n@@ -19,7 +19,7 @@\n \n #include <boost/property_tree/ptree.hpp>\n \n-namespace RPi {\n+namespace RPiController {\n \n // This defines the basic interface for all control algorithms.\n \n@@ -59,4 +59,4 @@ struct RegisterAlgorithm {\n };\n std::map<std::string, AlgoCreateFunc> const &GetAlgorithms();\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/awb_algorithm.hpp b/src/ipa/raspberrypi/controller/awb_algorithm.hpp\nindex 22508ddd..5be0c9f4 100644\n--- a/src/ipa/raspberrypi/controller/awb_algorithm.hpp\n+++ b/src/ipa/raspberrypi/controller/awb_algorithm.hpp\n@@ -8,7 +8,7 @@\n \n #include \"algorithm.hpp\"\n \n-namespace RPi {\n+namespace RPiController {\n \n class AwbAlgorithm : public Algorithm\n {\n@@ -19,4 +19,4 @@ public:\n \tvirtual void SetManualGains(double manual_r, double manual_b) = 0;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/ccm_algorithm.hpp b/src/ipa/raspberrypi/controller/ccm_algorithm.hpp\nindex 21806cb0..33d0e30d 100644\n--- a/src/ipa/raspberrypi/controller/ccm_algorithm.hpp\n+++ b/src/ipa/raspberrypi/controller/ccm_algorithm.hpp\n@@ -8,7 +8,7 @@\n \n #include \"algorithm.hpp\"\n \n-namespace RPi {\n+namespace RPiController {\n \n class CcmAlgorithm : public Algorithm\n {\n@@ -18,4 +18,4 @@ public:\n \tvirtual void SetSaturation(double saturation) = 0;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/contrast_algorithm.hpp b/src/ipa/raspberrypi/controller/contrast_algorithm.hpp\nindex 9780322b..7f03bba5 100644\n--- a/src/ipa/raspberrypi/controller/contrast_algorithm.hpp\n+++ b/src/ipa/raspberrypi/controller/contrast_algorithm.hpp\n@@ -8,7 +8,7 @@\n \n #include \"algorithm.hpp\"\n \n-namespace RPi {\n+namespace RPiController {\n \n class ContrastAlgorithm : public Algorithm\n {\n@@ -19,4 +19,4 @@ public:\n \tvirtual void SetContrast(double contrast) = 0;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/controller.cpp b/src/ipa/raspberrypi/controller/controller.cpp\nindex 7c4b04fe..22461cc4 100644\n--- a/src/ipa/raspberrypi/controller/controller.cpp\n+++ b/src/ipa/raspberrypi/controller/controller.cpp\n@@ -11,7 +11,7 @@\n #include <boost/property_tree/json_parser.hpp>\n #include <boost/property_tree/ptree.hpp>\n \n-using namespace RPi;\n+using namespace RPiController;\n \n Controller::Controller()\n \t: switch_mode_called_(false) {}\ndiff --git a/src/ipa/raspberrypi/controller/controller.hpp b/src/ipa/raspberrypi/controller/controller.hpp\nindex 6ba9412b..49b1a551 100644\n--- a/src/ipa/raspberrypi/controller/controller.hpp\n+++ b/src/ipa/raspberrypi/controller/controller.hpp\n@@ -19,7 +19,7 @@\n #include \"device_status.h\"\n #include \"metadata.hpp\"\n \n-namespace RPi {\n+namespace RPiController {\n \n class Algorithm;\n typedef std::unique_ptr<Algorithm> AlgorithmPtr;\n@@ -51,4 +51,4 @@ protected:\n \tbool switch_mode_called_;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/histogram.cpp b/src/ipa/raspberrypi/controller/histogram.cpp\nindex 103d3f60..9916b3ed 100644\n--- a/src/ipa/raspberrypi/controller/histogram.cpp\n+++ b/src/ipa/raspberrypi/controller/histogram.cpp\n@@ -9,7 +9,7 @@\n \n #include \"histogram.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n uint64_t Histogram::CumulativeFreq(double bin) const\n {\ndiff --git a/src/ipa/raspberrypi/controller/histogram.hpp b/src/ipa/raspberrypi/controller/histogram.hpp\nindex 06fc3aa7..90f5ac78 100644\n--- a/src/ipa/raspberrypi/controller/histogram.hpp\n+++ b/src/ipa/raspberrypi/controller/histogram.hpp\n@@ -13,7 +13,7 @@\n // A simple histogram class, for use in particular to find \"quantiles\" and\n // averages between \"quantiles\".\n \n-namespace RPi {\n+namespace RPiController {\n \n class Histogram\n {\n@@ -41,4 +41,4 @@ private:\n \tstd::vector<uint64_t> cumulative_;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/metadata.hpp b/src/ipa/raspberrypi/controller/metadata.hpp\nindex 1d7624a0..f3a8dfab 100644\n--- a/src/ipa/raspberrypi/controller/metadata.hpp\n+++ b/src/ipa/raspberrypi/controller/metadata.hpp\n@@ -15,7 +15,7 @@\n \n #include <boost/any.hpp>\n \n-namespace RPi {\n+namespace RPiController {\n \n class Metadata\n {\n@@ -74,4 +74,4 @@ private:\n \n typedef std::shared_ptr<Metadata> MetadataPtr;\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/pwl.cpp b/src/ipa/raspberrypi/controller/pwl.cpp\nindex 7e11d8f3..aa134a1f 100644\n--- a/src/ipa/raspberrypi/controller/pwl.cpp\n+++ b/src/ipa/raspberrypi/controller/pwl.cpp\n@@ -10,7 +10,7 @@\n \n #include \"pwl.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n void Pwl::Read(boost::property_tree::ptree const ¶ms)\n {\ndiff --git a/src/ipa/raspberrypi/controller/pwl.hpp b/src/ipa/raspberrypi/controller/pwl.hpp\nindex bd7c7668..4f168551 100644\n--- a/src/ipa/raspberrypi/controller/pwl.hpp\n+++ b/src/ipa/raspberrypi/controller/pwl.hpp\n@@ -11,7 +11,7 @@\n \n #include <boost/property_tree/ptree.hpp>\n \n-namespace RPi {\n+namespace RPiController {\n \n class Pwl\n {\n@@ -106,4 +106,4 @@ private:\n \tstd::vector<Point> points_;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp\nindex 3573f36b..df4d3647 100644\n--- a/src/ipa/raspberrypi/controller/rpi/agc.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp\n@@ -18,7 +18,7 @@\n \n #include \"agc.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n #define NAME \"rpi.agc\"\n \ndiff --git a/src/ipa/raspberrypi/controller/rpi/agc.hpp b/src/ipa/raspberrypi/controller/rpi/agc.hpp\nindex 9a7e89c1..ba7ae092 100644\n--- a/src/ipa/raspberrypi/controller/rpi/agc.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/agc.hpp\n@@ -20,7 +20,7 @@\n \n #define AGC_STATS_SIZE 15\n \n-namespace RPi {\n+namespace RPiController {\n \n struct AgcMeteringMode {\n \tdouble weights[AGC_STATS_SIZE];\n@@ -121,4 +121,4 @@ private:\n \tdouble fixed_analogue_gain_;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/rpi/alsc.cpp b/src/ipa/raspberrypi/controller/rpi/alsc.cpp\nindex 0d0e0b0c..49e60b98 100644\n--- a/src/ipa/raspberrypi/controller/rpi/alsc.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/alsc.cpp\n@@ -11,7 +11,7 @@\n \n // Raspberry Pi ALSC (Auto Lens Shading Correction) algorithm.\n \n-using namespace RPi;\n+using namespace RPiController;\n \n #define NAME \"rpi.alsc\"\n \ndiff --git a/src/ipa/raspberrypi/controller/rpi/alsc.hpp b/src/ipa/raspberrypi/controller/rpi/alsc.hpp\nindex 95572af0..13d1ba54 100644\n--- a/src/ipa/raspberrypi/controller/rpi/alsc.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/alsc.hpp\n@@ -13,7 +13,7 @@\n #include \"../algorithm.hpp\"\n #include \"../alsc_status.h\"\n \n-namespace RPi {\n+namespace RPiController {\n \n // Algorithm to generate automagic LSC (Lens Shading Correction) tables.\n \n@@ -102,4 +102,4 @@ private:\n \tdouble lambda_b_[ALSC_CELLS_X * ALSC_CELLS_Y];\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/rpi/awb.cpp b/src/ipa/raspberrypi/controller/rpi/awb.cpp\nindex a58fa11d..a5536e47 100644\n--- a/src/ipa/raspberrypi/controller/rpi/awb.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/awb.cpp\n@@ -10,7 +10,7 @@\n \n #include \"awb.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n #define NAME \"rpi.awb\"\n \ndiff --git a/src/ipa/raspberrypi/controller/rpi/awb.hpp b/src/ipa/raspberrypi/controller/rpi/awb.hpp\nindex 36925252..9124d042 100644\n--- a/src/ipa/raspberrypi/controller/rpi/awb.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/awb.hpp\n@@ -14,7 +14,7 @@\n #include \"../pwl.hpp\"\n #include \"../awb_status.h\"\n \n-namespace RPi {\n+namespace RPiController {\n \n // Control algorithm to perform AWB calculations.\n \n@@ -175,4 +175,4 @@ static inline Awb::RGB operator*(Awb::RGB const &rgb, double d)\n \treturn d * rgb;\n }\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/rpi/black_level.cpp b/src/ipa/raspberrypi/controller/rpi/black_level.cpp\nindex 59c9f5a6..0629b77c 100644\n--- a/src/ipa/raspberrypi/controller/rpi/black_level.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/black_level.cpp\n@@ -13,7 +13,7 @@\n \n #include \"black_level.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n #define NAME \"rpi.black_level\"\n \ndiff --git a/src/ipa/raspberrypi/controller/rpi/black_level.hpp b/src/ipa/raspberrypi/controller/rpi/black_level.hpp\nindex 5d74c6da..65ec4d0e 100644\n--- a/src/ipa/raspberrypi/controller/rpi/black_level.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/black_level.hpp\n@@ -11,7 +11,7 @@\n \n // This is our implementation of the \"black level algorithm\".\n \n-namespace RPi {\n+namespace RPiController {\n \n class BlackLevel : public Algorithm\n {\n@@ -27,4 +27,4 @@ private:\n \tdouble black_level_b_;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/rpi/ccm.cpp b/src/ipa/raspberrypi/controller/rpi/ccm.cpp\nindex 327cb71c..a8a2caff 100644\n--- a/src/ipa/raspberrypi/controller/rpi/ccm.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/ccm.cpp\n@@ -13,7 +13,7 @@\n \n #include \"ccm.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n // This algorithm selects a CCM (Colour Correction Matrix) according to the\n // colour temperature estimated by AWB (interpolating between known matricies as\ndiff --git a/src/ipa/raspberrypi/controller/rpi/ccm.hpp b/src/ipa/raspberrypi/controller/rpi/ccm.hpp\nindex f6f4dee1..fcf077e7 100644\n--- a/src/ipa/raspberrypi/controller/rpi/ccm.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/ccm.hpp\n@@ -12,7 +12,7 @@\n #include \"../ccm_algorithm.hpp\"\n #include \"../pwl.hpp\"\n \n-namespace RPi {\n+namespace RPiController {\n \n // Algorithm to calculate colour matrix. Should be placed after AWB.\n \n@@ -73,4 +73,4 @@ private:\n \tstd::atomic<double> saturation_;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/rpi/contrast.cpp b/src/ipa/raspberrypi/controller/rpi/contrast.cpp\nindex c8d9ab61..103153db 100644\n--- a/src/ipa/raspberrypi/controller/rpi/contrast.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/contrast.cpp\n@@ -11,7 +11,7 @@\n \n #include \"contrast.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n // This is a very simple control algorithm which simply retrieves the results of\n // AGC and AWB via their \"status\" metadata, and applies digital gain to the\ndiff --git a/src/ipa/raspberrypi/controller/rpi/contrast.hpp b/src/ipa/raspberrypi/controller/rpi/contrast.hpp\nindex 2e38a762..6836f181 100644\n--- a/src/ipa/raspberrypi/controller/rpi/contrast.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/contrast.hpp\n@@ -12,7 +12,7 @@\n #include \"../contrast_algorithm.hpp\"\n #include \"../pwl.hpp\"\n \n-namespace RPi {\n+namespace RPiController {\n \n // Back End algorithm to appaly correct digital gain. Should be placed after\n // Back End AWB.\n@@ -48,4 +48,4 @@ private:\n \tstd::mutex mutex_;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/rpi/dpc.cpp b/src/ipa/raspberrypi/controller/rpi/dpc.cpp\nindex d31fae97..348e1609 100644\n--- a/src/ipa/raspberrypi/controller/rpi/dpc.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/dpc.cpp\n@@ -8,7 +8,7 @@\n #include \"../logging.hpp\"\n #include \"dpc.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n // We use the lux status so that we can apply stronger settings in darkness (if\n // necessary).\ndiff --git a/src/ipa/raspberrypi/controller/rpi/dpc.hpp b/src/ipa/raspberrypi/controller/rpi/dpc.hpp\nindex 9fb72867..d90285c4 100644\n--- a/src/ipa/raspberrypi/controller/rpi/dpc.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/dpc.hpp\n@@ -9,7 +9,7 @@\n #include \"../algorithm.hpp\"\n #include \"../dpc_status.h\"\n \n-namespace RPi {\n+namespace RPiController {\n \n // Back End algorithm to apply appropriate GEQ settings.\n \n@@ -29,4 +29,4 @@ private:\n \tDpcConfig config_;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/rpi/focus.cpp b/src/ipa/raspberrypi/controller/rpi/focus.cpp\nindex ffe44362..bab4406f 100644\n--- a/src/ipa/raspberrypi/controller/rpi/focus.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/focus.cpp\n@@ -11,7 +11,7 @@\n #include \"../focus_status.h\"\n #include \"focus.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n using namespace libcamera;\n \n LOG_DEFINE_CATEGORY(RPiFocus)\ndiff --git a/src/ipa/raspberrypi/controller/rpi/focus.hpp b/src/ipa/raspberrypi/controller/rpi/focus.hpp\nindex a9756ea7..131b1d0f 100644\n--- a/src/ipa/raspberrypi/controller/rpi/focus.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/focus.hpp\n@@ -15,7 +15,7 @@\n * control.\n */\n \n-namespace RPi {\n+namespace RPiController {\n \n class Focus : public Algorithm\n {\n@@ -25,4 +25,4 @@ public:\n \tvoid Process(StatisticsPtr &stats, Metadata *image_metadata) override;\n };\n \n-} /* namespace RPi */\n+} /* namespace RPiController */\ndiff --git a/src/ipa/raspberrypi/controller/rpi/geq.cpp b/src/ipa/raspberrypi/controller/rpi/geq.cpp\nindex ee0cb95d..b6c98414 100644\n--- a/src/ipa/raspberrypi/controller/rpi/geq.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/geq.cpp\n@@ -12,7 +12,7 @@\n \n #include \"geq.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n // We use the lux status so that we can apply stronger settings in darkness (if\n // necessary).\ndiff --git a/src/ipa/raspberrypi/controller/rpi/geq.hpp b/src/ipa/raspberrypi/controller/rpi/geq.hpp\nindex 7d4bd38d..8ba3046b 100644\n--- a/src/ipa/raspberrypi/controller/rpi/geq.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/geq.hpp\n@@ -9,7 +9,7 @@\n #include \"../algorithm.hpp\"\n #include \"../geq_status.h\"\n \n-namespace RPi {\n+namespace RPiController {\n \n // Back End algorithm to apply appropriate GEQ settings.\n \n@@ -31,4 +31,4 @@ private:\n \tGeqConfig config_;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/rpi/lux.cpp b/src/ipa/raspberrypi/controller/rpi/lux.cpp\nindex 154db153..5acd49a0 100644\n--- a/src/ipa/raspberrypi/controller/rpi/lux.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/lux.cpp\n@@ -13,7 +13,7 @@\n \n #include \"lux.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n #define NAME \"rpi.lux\"\n \ndiff --git a/src/ipa/raspberrypi/controller/rpi/lux.hpp b/src/ipa/raspberrypi/controller/rpi/lux.hpp\nindex eb935409..7b6c7258 100644\n--- a/src/ipa/raspberrypi/controller/rpi/lux.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/lux.hpp\n@@ -14,7 +14,7 @@\n \n // This is our implementation of the \"lux control algorithm\".\n \n-namespace RPi {\n+namespace RPiController {\n \n class Lux : public Algorithm\n {\n@@ -39,4 +39,4 @@ private:\n \tstd::mutex mutex_;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/rpi/noise.cpp b/src/ipa/raspberrypi/controller/rpi/noise.cpp\nindex 1b84ecb0..9e9eaf1b 100644\n--- a/src/ipa/raspberrypi/controller/rpi/noise.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/noise.cpp\n@@ -13,7 +13,7 @@\n \n #include \"noise.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n #define NAME \"rpi.noise\"\n \ndiff --git a/src/ipa/raspberrypi/controller/rpi/noise.hpp b/src/ipa/raspberrypi/controller/rpi/noise.hpp\nindex 25bf1885..6f6e0be9 100644\n--- a/src/ipa/raspberrypi/controller/rpi/noise.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/noise.hpp\n@@ -11,7 +11,7 @@\n \n // This is our implementation of the \"noise algorithm\".\n \n-namespace RPi {\n+namespace RPiController {\n \n class Noise : public Algorithm\n {\n@@ -29,4 +29,4 @@ private:\n \tstd::atomic<double> mode_factor_;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/rpi/sdn.cpp b/src/ipa/raspberrypi/controller/rpi/sdn.cpp\nindex 28d9d983..aa82830b 100644\n--- a/src/ipa/raspberrypi/controller/rpi/sdn.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/sdn.cpp\n@@ -10,7 +10,7 @@\n \n #include \"sdn.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n // Calculate settings for the spatial denoise block using the noise profile in\n // the image metadata.\ndiff --git a/src/ipa/raspberrypi/controller/rpi/sdn.hpp b/src/ipa/raspberrypi/controller/rpi/sdn.hpp\nindex d48aab7e..486c000d 100644\n--- a/src/ipa/raspberrypi/controller/rpi/sdn.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/sdn.hpp\n@@ -8,7 +8,7 @@\n \n #include \"../algorithm.hpp\"\n \n-namespace RPi {\n+namespace RPiController {\n \n // Algorithm to calculate correct spatial denoise (SDN) settings.\n \n@@ -26,4 +26,4 @@ private:\n \tdouble strength_;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp\nindex 356c1058..c953a7d9 100644\n--- a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp\n@@ -12,7 +12,7 @@\n \n #include \"sharpen.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n #define NAME \"rpi.sharpen\"\n \ndiff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.hpp b/src/ipa/raspberrypi/controller/rpi/sharpen.hpp\nindex 568521b9..13a076a8 100644\n--- a/src/ipa/raspberrypi/controller/rpi/sharpen.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/sharpen.hpp\n@@ -11,7 +11,7 @@\n \n // This is our implementation of the \"sharpen algorithm\".\n \n-namespace RPi {\n+namespace RPiController {\n \n class Sharpen : public SharpenAlgorithm\n {\n@@ -31,4 +31,4 @@ private:\n \tdouble user_strength_;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/sharpen_algorithm.hpp b/src/ipa/raspberrypi/controller/sharpen_algorithm.hpp\nindex 3b27a745..ca800308 100644\n--- a/src/ipa/raspberrypi/controller/sharpen_algorithm.hpp\n+++ b/src/ipa/raspberrypi/controller/sharpen_algorithm.hpp\n@@ -8,7 +8,7 @@\n \n #include \"algorithm.hpp\"\n \n-namespace RPi {\n+namespace RPiController {\n \n class SharpenAlgorithm : public Algorithm\n {\n@@ -18,4 +18,4 @@ public:\n \tvirtual void SetStrength(double strength) = 0;\n };\n \n-} // namespace RPi\n+} // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/md_parser.cpp b/src/ipa/raspberrypi/md_parser.cpp\nindex ca809aa2..d82c102c 100644\n--- a/src/ipa/raspberrypi/md_parser.cpp\n+++ b/src/ipa/raspberrypi/md_parser.cpp\n@@ -11,7 +11,7 @@\n \n #include \"md_parser.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n // This function goes through the embedded data to find the offsets (not\n // values!), in the data block, where the values of the given registers can\ndiff --git a/src/ipa/raspberrypi/md_parser.hpp b/src/ipa/raspberrypi/md_parser.hpp\nindex 70d054b2..c9db62c0 100644\n--- a/src/ipa/raspberrypi/md_parser.hpp\n+++ b/src/ipa/raspberrypi/md_parser.hpp\n@@ -50,7 +50,7 @@ parser->Reset();\n \n before calling Parse again. */\n \n-namespace RPi {\n+namespace RPiController {\n \n // Abstract base class from which other metadata parsers are derived.\n \ndiff --git a/src/ipa/raspberrypi/md_parser_rpi.cpp b/src/ipa/raspberrypi/md_parser_rpi.cpp\nindex a42b28f7..2b0bcfc5 100644\n--- a/src/ipa/raspberrypi/md_parser_rpi.cpp\n+++ b/src/ipa/raspberrypi/md_parser_rpi.cpp\n@@ -9,7 +9,7 @@\n \n #include \"md_parser_rpi.hpp\"\n \n-using namespace RPi;\n+using namespace RPiController;\n \n MdParserRPi::MdParserRPi()\n {\ndiff --git a/src/ipa/raspberrypi/md_parser_rpi.hpp b/src/ipa/raspberrypi/md_parser_rpi.hpp\nindex 1fa334f4..52f54f00 100644\n--- a/src/ipa/raspberrypi/md_parser_rpi.hpp\n+++ b/src/ipa/raspberrypi/md_parser_rpi.hpp\n@@ -8,7 +8,7 @@\n \n #include \"md_parser.hpp\"\n \n-namespace RPi {\n+namespace RPiController {\n \n class MdParserRPi : public MdParser\n {\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex 0555cc4e..1d3136be 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -125,10 +125,10 @@ private:\n \tCameraMode lastMode_;\n \n \t/* Raspberry Pi controller specific defines. */\n-\tstd::unique_ptr<RPi::CamHelper> helper_;\n-\tRPi::Controller controller_;\n+\tstd::unique_ptr<RPiController::CamHelper> helper_;\n+\tRPiController::Controller controller_;\n \tbool controllerInit_;\n-\tRPi::Metadata rpiMetadata_;\n+\tRPiController::Metadata rpiMetadata_;\n \n \t/*\n \t * We count frames to decide if the frame must be hidden (e.g. from\n@@ -211,7 +211,7 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,\n \t */\n \tstd::string cameraName(sensorInfo.model);\n \tif (!helper_) {\n-\t\thelper_ = std::unique_ptr<RPi::CamHelper>(RPi::CamHelper::Create(cameraName));\n+\t\thelper_ = std::unique_ptr<RPiController::CamHelper>(RPiController::CamHelper::Create(cameraName));\n \t\t/*\n \t\t * Pass out the sensor config to the pipeline handler in order\n \t\t * to setup the staggered writer class.\n@@ -268,7 +268,7 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,\n \t\tagcStatus.analogue_gain = DEFAULT_ANALOGUE_GAIN;\n \t}\n \n-\tRPi::Metadata metadata;\n+\tRPiController::Metadata metadata;\n \tcontroller_.SwitchMode(mode_, &metadata);\n \n \t/* SwitchMode may supply updated exposure/gain values to use. */\n@@ -391,7 +391,7 @@ void IPARPi::processEvent(const IPAOperationData &event)\n \n void IPARPi::reportMetadata()\n {\n-\tstd::unique_lock<RPi::Metadata> lock(rpiMetadata_);\n+\tstd::unique_lock<RPiController::Metadata> lock(rpiMetadata_);\n \n \t/*\n \t * Certain information about the current frame and how it will be\n@@ -496,7 +496,7 @@ void IPARPi::queueRequest(const ControlList &controls)\n \n \t\tswitch (ctrl.first) {\n \t\tcase controls::AE_ENABLE: {\n-\t\t\tRPi::Algorithm *agc = controller_.GetAlgorithm(\"agc\");\n+\t\t\tRPiController::Algorithm *agc = controller_.GetAlgorithm(\"agc\");\n \t\t\tASSERT(agc);\n \t\t\tif (ctrl.second.get<bool>() == false)\n \t\t\t\tagc->Pause();\n@@ -508,7 +508,7 @@ void IPARPi::queueRequest(const ControlList &controls)\n \t\t}\n \n \t\tcase controls::EXPOSURE_TIME: {\n-\t\t\tRPi::AgcAlgorithm *agc = dynamic_cast<RPi::AgcAlgorithm *>(\n+\t\t\tRPiController::AgcAlgorithm *agc = dynamic_cast<RPiController::AgcAlgorithm *>(\n \t\t\t\tcontroller_.GetAlgorithm(\"agc\"));\n \t\t\tASSERT(agc);\n \t\t\t/* This expects units of micro-seconds. */\n@@ -522,7 +522,7 @@ void IPARPi::queueRequest(const ControlList &controls)\n \t\t}\n \n \t\tcase controls::ANALOGUE_GAIN: {\n-\t\t\tRPi::AgcAlgorithm *agc = dynamic_cast<RPi::AgcAlgorithm *>(\n+\t\t\tRPiController::AgcAlgorithm *agc = dynamic_cast<RPiController::AgcAlgorithm *>(\n \t\t\t\tcontroller_.GetAlgorithm(\"agc\"));\n \t\t\tASSERT(agc);\n \t\t\tagc->SetFixedAnalogueGain(ctrl.second.get<float>());\n@@ -536,7 +536,7 @@ void IPARPi::queueRequest(const ControlList &controls)\n \t\t}\n \n \t\tcase controls::AE_METERING_MODE: {\n-\t\t\tRPi::AgcAlgorithm *agc = dynamic_cast<RPi::AgcAlgorithm *>(\n+\t\t\tRPiController::AgcAlgorithm *agc = dynamic_cast<RPiController::AgcAlgorithm *>(\n \t\t\t\tcontroller_.GetAlgorithm(\"agc\"));\n \t\t\tASSERT(agc);\n \n@@ -552,7 +552,7 @@ void IPARPi::queueRequest(const ControlList &controls)\n \t\t}\n \n \t\tcase controls::AE_CONSTRAINT_MODE: {\n-\t\t\tRPi::AgcAlgorithm *agc = dynamic_cast<RPi::AgcAlgorithm *>(\n+\t\t\tRPiController::AgcAlgorithm *agc = dynamic_cast<RPiController::AgcAlgorithm *>(\n \t\t\t\tcontroller_.GetAlgorithm(\"agc\"));\n \t\t\tASSERT(agc);\n \n@@ -568,7 +568,7 @@ void IPARPi::queueRequest(const ControlList &controls)\n \t\t}\n \n \t\tcase controls::AE_EXPOSURE_MODE: {\n-\t\t\tRPi::AgcAlgorithm *agc = dynamic_cast<RPi::AgcAlgorithm *>(\n+\t\t\tRPiController::AgcAlgorithm *agc = dynamic_cast<RPiController::AgcAlgorithm *>(\n \t\t\t\tcontroller_.GetAlgorithm(\"agc\"));\n \t\t\tASSERT(agc);\n \n@@ -584,7 +584,7 @@ void IPARPi::queueRequest(const ControlList &controls)\n \t\t}\n \n \t\tcase controls::EXPOSURE_VALUE: {\n-\t\t\tRPi::AgcAlgorithm *agc = dynamic_cast<RPi::AgcAlgorithm *>(\n+\t\t\tRPiController::AgcAlgorithm *agc = dynamic_cast<RPiController::AgcAlgorithm *>(\n \t\t\t\tcontroller_.GetAlgorithm(\"agc\"));\n \t\t\tASSERT(agc);\n \n@@ -600,7 +600,7 @@ void IPARPi::queueRequest(const ControlList &controls)\n \t\t}\n \n \t\tcase controls::AWB_ENABLE: {\n-\t\t\tRPi::Algorithm *awb = controller_.GetAlgorithm(\"awb\");\n+\t\t\tRPiController::Algorithm *awb = controller_.GetAlgorithm(\"awb\");\n \t\t\tASSERT(awb);\n \n \t\t\tif (ctrl.second.get<bool>() == false)\n@@ -614,7 +614,7 @@ void IPARPi::queueRequest(const ControlList &controls)\n \t\t}\n \n \t\tcase controls::AWB_MODE: {\n-\t\t\tRPi::AwbAlgorithm *awb = dynamic_cast<RPi::AwbAlgorithm *>(\n+\t\t\tRPiController::AwbAlgorithm *awb = dynamic_cast<RPiController::AwbAlgorithm *>(\n \t\t\t\tcontroller_.GetAlgorithm(\"awb\"));\n \t\t\tASSERT(awb);\n \n@@ -631,7 +631,7 @@ void IPARPi::queueRequest(const ControlList &controls)\n \n \t\tcase controls::COLOUR_GAINS: {\n \t\t\tauto gains = ctrl.second.get<Span<const float>>();\n-\t\t\tRPi::AwbAlgorithm *awb = dynamic_cast<RPi::AwbAlgorithm *>(\n+\t\t\tRPiController::AwbAlgorithm *awb = dynamic_cast<RPiController::AwbAlgorithm *>(\n \t\t\t\tcontroller_.GetAlgorithm(\"awb\"));\n \t\t\tASSERT(awb);\n \n@@ -644,7 +644,7 @@ void IPARPi::queueRequest(const ControlList &controls)\n \t\t}\n \n \t\tcase controls::BRIGHTNESS: {\n-\t\t\tRPi::ContrastAlgorithm *contrast = dynamic_cast<RPi::ContrastAlgorithm *>(\n+\t\t\tRPiController::ContrastAlgorithm *contrast = dynamic_cast<RPiController::ContrastAlgorithm *>(\n \t\t\t\tcontroller_.GetAlgorithm(\"contrast\"));\n \t\t\tASSERT(contrast);\n \n@@ -655,7 +655,7 @@ void IPARPi::queueRequest(const ControlList &controls)\n \t\t}\n \n \t\tcase controls::CONTRAST: {\n-\t\t\tRPi::ContrastAlgorithm *contrast = dynamic_cast<RPi::ContrastAlgorithm *>(\n+\t\t\tRPiController::ContrastAlgorithm *contrast = dynamic_cast<RPiController::ContrastAlgorithm *>(\n \t\t\t\tcontroller_.GetAlgorithm(\"contrast\"));\n \t\t\tASSERT(contrast);\n \n@@ -666,7 +666,7 @@ void IPARPi::queueRequest(const ControlList &controls)\n \t\t}\n \n \t\tcase controls::SATURATION: {\n-\t\t\tRPi::CcmAlgorithm *ccm = dynamic_cast<RPi::CcmAlgorithm *>(\n+\t\t\tRPiController::CcmAlgorithm *ccm = dynamic_cast<RPiController::CcmAlgorithm *>(\n \t\t\t\tcontroller_.GetAlgorithm(\"ccm\"));\n \t\t\tASSERT(ccm);\n \n@@ -677,7 +677,7 @@ void IPARPi::queueRequest(const ControlList &controls)\n \t\t}\n \n \t\tcase controls::SHARPNESS: {\n-\t\t\tRPi::SharpenAlgorithm *sharpen = dynamic_cast<RPi::SharpenAlgorithm *>(\n+\t\t\tRPiController::SharpenAlgorithm *sharpen = dynamic_cast<RPiController::SharpenAlgorithm *>(\n \t\t\t\tcontroller_.GetAlgorithm(\"sharpen\"));\n \t\t\tASSERT(sharpen);\n \n@@ -720,7 +720,7 @@ void IPARPi::prepareISP(unsigned int bufferId)\n \t\tcontroller_.Prepare(&rpiMetadata_);\n \n \t\t/* Lock the metadata buffer to avoid constant locks/unlocks. */\n-\t\tstd::unique_lock<RPi::Metadata> lock(rpiMetadata_);\n+\t\tstd::unique_lock<RPiController::Metadata> lock(rpiMetadata_);\n \n \t\tAwbStatus *awbStatus = rpiMetadata_.GetLocked<AwbStatus>(\"awb.status\");\n \t\tif (awbStatus)\n@@ -781,18 +781,18 @@ bool IPARPi::parseEmbeddedData(unsigned int bufferId, struct DeviceStatus &devic\n \n \tint size = buffers_.find(bufferId)->second.planes()[0].length;\n \thelper_->Parser().SetBufferSize(size);\n-\tRPi::MdParser::Status status = helper_->Parser().Parse(it->second);\n-\tif (status != RPi::MdParser::Status::OK) {\n+\tRPiController::MdParser::Status status = helper_->Parser().Parse(it->second);\n+\tif (status != RPiController::MdParser::Status::OK) {\n \t\tLOG(IPARPI, Error) << \"Embedded Buffer parsing failed, error \" << status;\n \t} else {\n \t\tuint32_t exposure_lines, gain_code;\n-\t\tif (helper_->Parser().GetExposureLines(exposure_lines) != RPi::MdParser::Status::OK) {\n+\t\tif (helper_->Parser().GetExposureLines(exposure_lines) != RPiController::MdParser::Status::OK) {\n \t\t\tLOG(IPARPI, Error) << \"Exposure time failed\";\n \t\t\treturn false;\n \t\t}\n \n \t\tdeviceStatus.shutter_speed = helper_->Exposure(exposure_lines);\n-\t\tif (helper_->Parser().GetGainCode(gain_code) != RPi::MdParser::Status::OK) {\n+\t\tif (helper_->Parser().GetGainCode(gain_code) != RPiController::MdParser::Status::OK) {\n \t\t\tLOG(IPARPI, Error) << \"Gain failed\";\n \t\t\treturn false;\n \t\t}\n@@ -815,7 +815,7 @@ void IPARPi::processStats(unsigned int bufferId)\n \t}\n \n \tbcm2835_isp_stats *stats = static_cast<bcm2835_isp_stats *>(it->second);\n-\tRPi::StatisticsPtr statistics = std::make_shared<bcm2835_isp_stats>(*stats);\n+\tRPiController::StatisticsPtr statistics = std::make_shared<bcm2835_isp_stats>(*stats);\n \tcontroller_.Process(statistics, &rpiMetadata_);\n \n \tstruct AgcStatus agcStatus;\n", "prefixes": [ "libcamera-devel", "2/4" ] }