{"id":18631,"url":"https://patchwork.libcamera.org/api/patches/18631/?format=json","web_url":"https://patchwork.libcamera.org/patch/18631/","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":"<20230515124550.3601128-3-kieran.bingham@ideasonboard.com>","date":"2023-05-15T12:45:47","name":"[libcamera-devel,v3,2/5] libcamera: camera_manager: Move private implementation to internal","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c71e64f1ea66f0a82d630ad1f371383a577f5d82","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18631/mbox/","series":[{"id":3878,"url":"https://patchwork.libcamera.org/api/series/3878/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3878","date":"2023-05-15T12:45:45","name":"libcamera: Add new Camera devices property","version":3,"mbox":"https://patchwork.libcamera.org/series/3878/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18631/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18631/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 169CEC3285\n\tfor ;\n\tMon, 15 May 2023 12:45:59 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7A18E62864;\n\tMon, 15 May 2023 14:45:56 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3D72C6039F\n\tfor ;\n\tMon, 15 May 2023 14:45:54 +0200 (CEST)","from Monstersaurus.local\n\t(aztw-30-b2-v4wan-166917-cust845.vm26.cable.virginm.net\n\t[82.37.23.78])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6D52BDE5;\n\tMon, 15 May 2023 14:45:43 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1684154756;\n\tbh=YJ2NhkXjQIO23I37hFg2q+9LaZMSe9xW+qEQVScHmqk=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=dzgELdtO0N65vKgt7ymYQ9QFcnc9vGIkwMxupaKnpu5UILcKrLXrlQ9aNdogellb4\n\tQXDkEVvZxsDqopsEnUCi2uDluvIVR1/2aVuHkJyWsOjUUm/xqMpTCN9rycH7ZXgfB9\n\tPMY90+xbfT1XzWM38RpQmKovxQdVQZC2y4ZPggzHgf8ZqdV3sBNGTF99xX9wAMqExN\n\tpjWkfHDmDWEixFRJE4IhPgDbGaF8GqjJG24vM3OvfQEGVJfPvtu/vJ6LGiJSxlf3na\n\tXBp5oIUyjHrFDz9yPtSCRLDy9XMHD7NZMfqUbk+1W6nMxLjo43iHPX+4dClgJrQCEo\n\toO6Ja/1hWhKFA==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1684154743;\n\tbh=YJ2NhkXjQIO23I37hFg2q+9LaZMSe9xW+qEQVScHmqk=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Je26vaotGdkAAlkqRzR6gM0nEjuYZjof6veSHH4WG6ALHp8NGlQEj8bdAiZsG8oPn\n\t4viO4wvMlbW0OM5RSqt6789sILjxio+OAzI6SrS6qcMuD6f2MizLCnOYqOEbNQpTwt\n\tKwX4MYe84QN+4hoMhQ+UNN/hgnzGZ13hnXXDt7WA="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"Je26vaot\"; dkim-atps=neutral","To":"libcamera devel ","Date":"Mon, 15 May 2023 13:45:47 +0100","Message-Id":"<20230515124550.3601128-3-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20230515124550.3601128-1-kieran.bingham@ideasonboard.com>","References":"<20230515124550.3601128-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 2/5] libcamera: camera_manager: Move\n\tprivate implementation to internal","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","From":"Kieran Bingham via libcamera-devel\n\t","Reply-To":"Kieran Bingham ","Cc":"Jacopo Mondi ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The CameraManager makes use of the Extensible pattern to provide an\ninternal private implementation that is not exposed in the public API.\n\nMove the Private declaration to an internal header to make it available\nfrom other internal components in preperation for reducing the surface\narea of the public interface of the Camera Manager.\n\nSigned-off-by: Kieran Bingham \nReviewed-by: Jacopo Mondi \n---\n include/libcamera/internal/camera_manager.h | 64 +++++++++++++++++++++\n include/libcamera/internal/meson.build | 1 +\n src/libcamera/camera_manager.cpp | 50 ++--------------\n 3 files changed, 69 insertions(+), 46 deletions(-)\n create mode 100644 include/libcamera/internal/camera_manager.h","diff":"diff --git a/include/libcamera/internal/camera_manager.h b/include/libcamera/internal/camera_manager.h\nnew file mode 100644\nindex 000000000000..05a1e4df8add\n--- /dev/null\n+++ b/include/libcamera/internal/camera_manager.h\n@@ -0,0 +1,64 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2023, Ideas on Board Oy.\n+ *\n+ * camera_manager.h - Camera manager private data\n+ */\n+\n+#pragma once\n+\n+#include \n+\n+#include \n+#include \n+\n+#include \n+\n+#include \"libcamera/internal/ipa_manager.h\"\n+#include \"libcamera/internal/process.h\"\n+\n+namespace libcamera {\n+\n+class DeviceEnumerator;\n+\n+class CameraManager::Private : public Extensible::Private, public Thread\n+{\n+\tLIBCAMERA_DECLARE_PUBLIC(CameraManager)\n+\n+public:\n+\tPrivate();\n+\n+\tint start();\n+\tvoid addCamera(std::shared_ptr camera,\n+\t\t const std::vector &devnums) LIBCAMERA_TSA_EXCLUDES(mutex_);\n+\tvoid removeCamera(Camera *camera) LIBCAMERA_TSA_EXCLUDES(mutex_);\n+\n+\t/*\n+\t * This mutex protects\n+\t *\n+\t * - initialized_ and status_ during initialization\n+\t * - cameras_ and camerasByDevnum_ after initialization\n+\t */\n+\tmutable Mutex mutex_;\n+\tstd::vector> cameras_ LIBCAMERA_TSA_GUARDED_BY(mutex_);\n+\tstd::map> camerasByDevnum_ LIBCAMERA_TSA_GUARDED_BY(mutex_);\n+\n+protected:\n+\tvoid run() override;\n+\n+private:\n+\tint init();\n+\tvoid createPipelineHandlers();\n+\tvoid cleanup() LIBCAMERA_TSA_EXCLUDES(mutex_);\n+\n+\tConditionVariable cv_;\n+\tbool initialized_ LIBCAMERA_TSA_GUARDED_BY(mutex_);\n+\tint status_ LIBCAMERA_TSA_GUARDED_BY(mutex_);\n+\n+\tstd::unique_ptr enumerator_;\n+\n+\tIPAManager ipaManager_;\n+\tProcessManager processManager_;\n+};\n+\n+} /* namespace libcamera */\ndiff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build\nindex d75088059996..0028ed0dc27f 100644\n--- a/include/libcamera/internal/meson.build\n+++ b/include/libcamera/internal/meson.build\n@@ -13,6 +13,7 @@ libcamera_internal_headers = files([\n 'bayer_format.h',\n 'byte_stream_buffer.h',\n 'camera.h',\n+ 'camera_manager.h',\n 'camera_controls.h',\n 'camera_lens.h',\n 'camera_sensor.h',\ndiff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex c1edefdad160..d3c297b888d8 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -5,24 +5,22 @@\n * camera_manager.h - Camera management\n */\n \n-#include \n+#include \"libcamera/internal/camera_manager.h\"\n \n #include \n \n-#include \n-\n #include \n #include \n #include \n #include \n \n+#include \n+\n #include \"libcamera/internal/device_enumerator.h\"\n-#include \"libcamera/internal/ipa_manager.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n-#include \"libcamera/internal/process.h\"\n \n /**\n- * \\file camera_manager.h\n+ * \\file libcamera/camera_manager.h\n * \\brief The camera manager\n */\n \n@@ -33,46 +31,6 @@ namespace libcamera {\n \n LOG_DEFINE_CATEGORY(Camera)\n \n-class CameraManager::Private : public Extensible::Private, public Thread\n-{\n-\tLIBCAMERA_DECLARE_PUBLIC(CameraManager)\n-\n-public:\n-\tPrivate();\n-\n-\tint start();\n-\tvoid addCamera(std::shared_ptr camera,\n-\t\t const std::vector &devnums) LIBCAMERA_TSA_EXCLUDES(mutex_);\n-\tvoid removeCamera(Camera *camera) LIBCAMERA_TSA_EXCLUDES(mutex_);\n-\n-\t/*\n-\t * This mutex protects\n-\t *\n-\t * - initialized_ and status_ during initialization\n-\t * - cameras_ and camerasByDevnum_ after initialization\n-\t */\n-\tmutable Mutex mutex_;\n-\tstd::vector> cameras_ LIBCAMERA_TSA_GUARDED_BY(mutex_);\n-\tstd::map> camerasByDevnum_ LIBCAMERA_TSA_GUARDED_BY(mutex_);\n-\n-protected:\n-\tvoid run() override;\n-\n-private:\n-\tint init();\n-\tvoid createPipelineHandlers();\n-\tvoid cleanup() LIBCAMERA_TSA_EXCLUDES(mutex_);\n-\n-\tConditionVariable cv_;\n-\tbool initialized_ LIBCAMERA_TSA_GUARDED_BY(mutex_);\n-\tint status_ LIBCAMERA_TSA_GUARDED_BY(mutex_);\n-\n-\tstd::unique_ptr enumerator_;\n-\n-\tIPAManager ipaManager_;\n-\tProcessManager processManager_;\n-};\n-\n CameraManager::Private::Private()\n \t: initialized_(false)\n {\n","prefixes":["libcamera-devel","v3","2/5"]}