Patch Detail
Show a patch.
GET /api/1.1/patches/2487/?format=api
{ "id": 2487, "url": "https://patchwork.libcamera.org/api/1.1/patches/2487/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2487/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20200103054120.30979-3-paul.elder@ideasonboard.com>", "date": "2020-01-03T05:41:18", "name": "[libcamera-devel,v5,2/4] libcamera: camera_manager, pipeline_handler: allow retrieving cameras by device numbers", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "2670557f6594fb1207e25b6e2a0e53d633efe5ff", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/2487/mbox/", "series": [ { "id": 598, "url": "https://patchwork.libcamera.org/api/1.1/series/598/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=598", "date": "2020-01-03T05:41:16", "name": "V4L2 compatibility layer", "version": 5, "mbox": "https://patchwork.libcamera.org/series/598/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/2487/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2487/checks/", "tags": {}, "headers": { "Return-Path": "<paul.elder@ideasonboard.com>", "Received": [ "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 79DF1605E3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 3 Jan 2020 06:41:29 +0100 (CET)", "from neptunite.amanokami.net (unknown [96.44.9.94])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A859930F;\n\tFri, 3 Jan 2020 06:41:28 +0100 (CET)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1578030089;\n\tbh=IxBlt+2iS6xFSDMRMidNDoB7vszYGCZx2C11fYf4bTA=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Ye2rBzf77sGOLxAPSUypaGSVMRpzwtidVfx1hNE6Fivi2lZA27+Aj9leK8kM0x0L4\n\tA9/Q62j+okgdgdD9Sj0o4FOyYGuUexvMQ18vCDOrEBRhQwPmpMnJX5v1ZmhrzBCxWU\n\tXs9RGiUMjFmNUIwRMe0u8OdKqL8QGYIDFn2coj4s=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 3 Jan 2020 00:41:18 -0500", "Message-Id": "<20200103054120.30979-3-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.24.1", "In-Reply-To": "<20200103054120.30979-1-paul.elder@ideasonboard.com>", "References": "<20200103054120.30979-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v5 2/4] libcamera: camera_manager,\n\tpipeline_handler: allow retrieving cameras by device numbers", "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>", "X-List-Received-Date": "Fri, 03 Jan 2020 05:41:30 -0000" }, "content": "The V4L2 compatibility layer will need a way to map device numbers to\nlibcamera Camera instances. Expose a method in the camera manager to\nretrieve Camera instances by devnum. The mapping from device numbers to\nCamera instances is optionally declared by pipeline handlers when they\nregister cameras with the camera manager.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n---\nChanges in v5:\n- remove devnum -> Camera mapping in CameraManager::removeCamera()\n- other cosmetic changes\n\nChanges in v4:\n- squashed 4/6 from v3\n- simplified registering devnum -> camera mappings\n - old (v3) system: pipeline handlers have their own map, that camera\n manager aggregates\n - new (v4) system: pipeline handlers, when they register the camera\n with the camera manager, (optionally) declare the devnum along with it\n\nNew in v3\n---\n include/libcamera/camera_manager.h | 6 ++-\n src/libcamera/camera_manager.cpp | 61 ++++++++++++++++++++----\n src/libcamera/include/pipeline_handler.h | 3 +-\n src/libcamera/pipeline_handler.cpp | 13 ++++-\n 4 files changed, 69 insertions(+), 14 deletions(-)", "diff": "diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h\nindex 8331898c..09419766 100644\n--- a/include/libcamera/camera_manager.h\n+++ b/include/libcamera/camera_manager.h\n@@ -7,8 +7,10 @@\n #ifndef __LIBCAMERA_CAMERA_MANAGER_H__\n #define __LIBCAMERA_CAMERA_MANAGER_H__\n \n+#include <map>\n #include <memory>\n #include <string>\n+#include <sys/types.h>\n #include <vector>\n \n #include <libcamera/object.h>\n@@ -33,8 +35,9 @@ public:\n \n \tconst std::vector<std::shared_ptr<Camera>> &cameras() const { return cameras_; }\n \tstd::shared_ptr<Camera> get(const std::string &name);\n+\tstd::shared_ptr<Camera> get(dev_t devnum);\n \n-\tvoid addCamera(std::shared_ptr<Camera> camera);\n+\tvoid addCamera(std::shared_ptr<Camera> camera, dev_t devnum);\n \tvoid removeCamera(Camera *camera);\n \n \tstatic const std::string &version() { return version_; }\n@@ -46,6 +49,7 @@ private:\n \tstd::unique_ptr<DeviceEnumerator> enumerator_;\n \tstd::vector<std::shared_ptr<PipelineHandler>> pipes_;\n \tstd::vector<std::shared_ptr<Camera>> cameras_;\n+\tstd::map<dev_t, std::weak_ptr<Camera>> camerasByDevnum_;\n \n \tstatic const std::string version_;\n \tstatic CameraManager *self_;\ndiff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex 7c6f72bb..88f8112c 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -180,15 +180,42 @@ std::shared_ptr<Camera> CameraManager::get(const std::string &name)\n \treturn nullptr;\n }\n \n+/**\n+ * \\brief Retrieve a camera based on device number\n+ * \\param[in] devnum Device number of camera to get\n+ *\n+ * This method is meant solely for the use of the V4L2 compatibility\n+ * layer, to map device nodes to Camera instances. Applications shall\n+ * not use it and shall instead retrieve cameras by name.\n+ *\n+ * Before calling this function the caller is responsible for ensuring that\n+ * the camera manager is running.\n+ *\n+ * \\return Shared pointer to Camera object, which is empty if the camera is\n+ * not found\n+ */\n+std::shared_ptr<Camera> CameraManager::get(dev_t devnum)\n+{\n+\tauto iter = camerasByDevnum_.find(devnum);\n+\tif (iter == camerasByDevnum_.end())\n+\t\treturn nullptr;\n+\n+\treturn iter->second.lock();\n+}\n+\n /**\n * \\brief Add a camera to the camera manager\n * \\param[in] camera The camera to be added\n+ * \\param[in] devnum The device number to associate with \\a camera\n *\n * This function is called by pipeline handlers to register the cameras they\n * handle with the camera manager. Registered cameras are immediately made\n * available to the system.\n+ *\n+ * \\a devnum is used by the V4L2 compatibility layer to map V4L2 device nodes\n+ * to Camera instances.\n */\n-void CameraManager::addCamera(std::shared_ptr<Camera> camera)\n+void CameraManager::addCamera(std::shared_ptr<Camera> camera, dev_t devnum)\n {\n \tfor (std::shared_ptr<Camera> c : cameras_) {\n \t\tif (c->name() == camera->name()) {\n@@ -200,6 +227,11 @@ void CameraManager::addCamera(std::shared_ptr<Camera> camera)\n \t}\n \n \tcameras_.push_back(std::move(camera));\n+\n+\tif (devnum) {\n+\t\tunsigned int index = cameras_.size() - 1;\n+\t\tcamerasByDevnum_[devnum] = cameras_[index];\n+\t}\n }\n \n /**\n@@ -212,15 +244,24 @@ void CameraManager::addCamera(std::shared_ptr<Camera> camera)\n */\n void CameraManager::removeCamera(Camera *camera)\n {\n-\tfor (auto iter = cameras_.begin(); iter != cameras_.end(); ++iter) {\n-\t\tif (iter->get() == camera) {\n-\t\t\tLOG(Camera, Debug)\n-\t\t\t\t<< \"Unregistering camera '\"\n-\t\t\t\t<< camera->name() << \"'\";\n-\t\t\tcameras_.erase(iter);\n-\t\t\treturn;\n-\t\t}\n-\t}\n+\tauto iter_d = std::find_if(camerasByDevnum_.begin(), camerasByDevnum_.end(),\n+\t\t\t\t [camera](const std::pair<dev_t, std::weak_ptr<Camera>> &p) {\n+\t\t\t\t\t return p.second.lock().get() == camera;\n+\t\t\t\t });\n+\tif (iter_d != camerasByDevnum_.end())\n+\t\tcamerasByDevnum_.erase(iter_d);\n+\n+\tauto iter = std::find_if(cameras_.begin(), cameras_.end(),\n+\t\t\t\t [camera](std::shared_ptr<Camera> &c) {\n+\t\t\t\t\t return c.get() == camera;\n+\t\t\t\t });\n+\tif (iter == cameras_.end())\n+\t\treturn;\n+\n+\tLOG(Camera, Debug)\n+\t\t<< \"Unregistering camera '\" << camera->name() << \"'\";\n+\n+\tcameras_.erase(iter);\n }\n \n /**\ndiff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h\nindex f3622631..067baef5 100644\n--- a/src/libcamera/include/pipeline_handler.h\n+++ b/src/libcamera/include/pipeline_handler.h\n@@ -12,6 +12,7 @@\n #include <memory>\n #include <set>\n #include <string>\n+#include <sys/sysmacros.h>\n #include <vector>\n \n #include <ipa/ipa_interface.h>\n@@ -86,7 +87,7 @@ public:\n \n protected:\n \tvoid registerCamera(std::shared_ptr<Camera> camera,\n-\t\t\t std::unique_ptr<CameraData> data);\n+\t\t\t std::unique_ptr<CameraData> data, dev_t devnum = 0);\n \tvoid hotplugMediaDevice(MediaDevice *media);\n \n \tvirtual int queueRequestDevice(Camera *camera, Request *request) = 0;\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 5badf31c..698dd525 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -7,6 +7,8 @@\n \n #include \"pipeline_handler.h\"\n \n+#include <sys/sysmacros.h>\n+\n #include <libcamera/buffer.h>\n #include <libcamera/camera.h>\n #include <libcamera/camera_manager.h>\n@@ -438,19 +440,26 @@ void PipelineHandler::completeRequest(Camera *camera, Request *request)\n * \\brief Register a camera to the camera manager and pipeline handler\n * \\param[in] camera The camera to be added\n * \\param[in] data Pipeline-specific data for the camera\n+ * \\param[in] devnum Device number of the camera (optional)\n *\n * This method is called by pipeline handlers to register the cameras they\n * handle with the camera manager. It associates the pipeline-specific \\a data\n * with the camera, for later retrieval with cameraData(). Ownership of \\a data\n * is transferred to the PipelineHandler.\n+ *\n+ * \\a devnum is the device number (as returned by makedev) that the \\a camera\n+ * is to be associated with. This is for the V4L2 compatibility layer to map\n+ * device nodes to Camera instances based on the device number\n+ * registered by this method in \\a devnum.\n */\n void PipelineHandler::registerCamera(std::shared_ptr<Camera> camera,\n-\t\t\t\t std::unique_ptr<CameraData> data)\n+\t\t\t\t std::unique_ptr<CameraData> data,\n+\t\t\t\t dev_t devnum)\n {\n \tdata->camera_ = camera.get();\n \tcameraData_[camera.get()] = std::move(data);\n \tcameras_.push_back(camera);\n-\tmanager_->addCamera(std::move(camera));\n+\tmanager_->addCamera(std::move(camera), devnum);\n }\n \n /**\n", "prefixes": [ "libcamera-devel", "v5", "2/4" ] }