Patch Detail
Show a patch.
GET /api/1.1/patches/1215/?format=api
{ "id": 1215, "url": "https://patchwork.libcamera.org/api/1.1/patches/1215/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1215/", "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": "<20190517005447.27171-11-niklas.soderlund@ragnatech.se>", "date": "2019-05-17T00:54:46", "name": "[libcamera-devel,v4,10/11] libcamera: pipeline_handler: Add functions to lock a whole pipeline", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "8d94a2f1823d375e696587596e645eaffd00b1f8", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/1.1/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1215/mbox/", "series": [ { "id": 306, "url": "https://patchwork.libcamera.org/api/1.1/series/306/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=306", "date": "2019-05-17T00:54:36", "name": "libcamerea: Add support for exclusive access to cameras between processes", "version": 4, "mbox": "https://patchwork.libcamera.org/series/306/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1215/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1215/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "Received": [ "from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EDA1260E4C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 17 May 2019 02:55:15 +0200 (CEST)", "from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid 6e415324-783e-11e9-8d05-005056917f90;\n\tFri, 17 May 2019 02:55:14 +0200 (CEST)" ], "X-Halon-ID": "6e415324-783e-11e9-8d05-005056917f90", "Authorized-sender": "niklas@soderlund.pp.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 17 May 2019 02:54:46 +0200", "Message-Id": "<20190517005447.27171-11-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190517005447.27171-1-niklas.soderlund@ragnatech.se>", "References": "<20190517005447.27171-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 10/11] libcamera: pipeline_handler: Add\n\tfunctions to lock a whole pipeline", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "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, 17 May 2019 00:55:16 -0000" }, "content": "Add lock() and unlock() which are backed by the MediaDevice\nimplementation and lock all media devices claimed by a pipeline handler\ninstance.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/include/pipeline_handler.h | 3 ++\n src/libcamera/pipeline_handler.cpp | 36 ++++++++++++++++++++++++\n 2 files changed, 39 insertions(+)", "diff": "diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h\nindex 8e6a136dd4907d9f..9f5fe3d673e294c8 100644\n--- a/src/libcamera/include/pipeline_handler.h\n+++ b/src/libcamera/include/pipeline_handler.h\n@@ -57,6 +57,9 @@ public:\n \tMediaDevice *acquireMediaDevice(DeviceEnumerator *enumerator,\n \t\t\t\t\tconst DeviceMatch &dm);\n \n+\tbool lock();\n+\tvoid unlock();\n+\n \tvirtual CameraConfiguration\n \tstreamConfiguration(Camera *camera, const std::vector<StreamUsage> &usages) = 0;\n \tvirtual int configureStreams(Camera *camera, const CameraConfiguration &config) = 0;\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex c92ee782701f57bf..1eeaf4bb6dae8601 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -181,6 +181,42 @@ MediaDevice *PipelineHandler::acquireMediaDevice(DeviceEnumerator *enumerator,\n \treturn media.get();\n }\n \n+/**\n+ * \\brief Lock all media devices acquired by the pipeline\n+ *\n+ * This method shall not be called from pipeline handler implementation, as the\n+ * Camera class handles locking directly.\n+ *\n+ * \\return True if the devices could be locked, false otherwise\n+ * \\sa unlock()\n+ * \\sa MediaDevice::lock()\n+ */\n+bool PipelineHandler::lock()\n+{\n+\tfor (std::shared_ptr<MediaDevice> &media : mediaDevices_) {\n+\t\tif (!media->lock()) {\n+\t\t\tunlock();\n+\t\t\treturn false;\n+\t\t}\n+\t}\n+\n+\treturn true;\n+}\n+\n+/**\n+ * \\brief Unlock all media devices acquired by the pipeline\n+ *\n+ * This method shall not be called from pipeline handler implementation, as the\n+ * Camera class handles locking directly.\n+ *\n+ * \\sa lock()\n+ */\n+void PipelineHandler::unlock()\n+{\n+\tfor (std::shared_ptr<MediaDevice> &media : mediaDevices_)\n+\t\tmedia->unlock();\n+}\n+\n /**\n * \\fn PipelineHandler::streamConfiguration()\n * \\brief Retrieve a group of stream configurations for a specified camera\n", "prefixes": [ "libcamera-devel", "v4", "10/11" ] }