Patch Detail
Show a patch.
GET /api/patches/11688/?format=api
{ "id": 11688, "url": "https://patchwork.libcamera.org/api/patches/11688/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11688/", "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": "<20210324112527.63701-6-jacopo@jmondi.org>", "date": "2021-03-24T11:25:25", "name": "[libcamera-devel,5/7] android: camera_hal_manager: Use CameraHalConfig", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "190ed0f341c97ec52d4c90c8a354c9a30a0e14e1", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": { "id": 15, "url": "https://patchwork.libcamera.org/api/users/15/?format=api", "username": "jmondi", "first_name": "Jacopo", "last_name": "Mondi", "email": "jacopo@jmondi.org" }, "mbox": "https://patchwork.libcamera.org/patch/11688/mbox/", "series": [ { "id": 1826, "url": "https://patchwork.libcamera.org/api/series/1826/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1826", "date": "2021-03-24T11:25:20", "name": "android: Add support for HAL configuration file", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1826/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/11688/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11688/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 26231C32E7\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 24 Mar 2021 11:25:24 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E40FB68D62;\n\tWed, 24 Mar 2021 12:25:23 +0100 (CET)", "from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B1E8868D62\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 24 Mar 2021 12:25:22 +0100 (CET)", "from uno.homenet.telecomitalia.it\n\t(host-82-63-7-72.business.telecomitalia.it [82.63.7.72])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 58AF324000C;\n\tWed, 24 Mar 2021 11:25:21 +0000 (UTC)" ], "X-Originating-IP": "82.63.7.72", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 24 Mar 2021 12:25:25 +0100", "Message-Id": "<20210324112527.63701-6-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.30.0", "In-Reply-To": "<20210324112527.63701-1-jacopo@jmondi.org>", "References": "<20210324112527.63701-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 5/7] android: camera_hal_manager: Use\n\tCameraHalConfig", "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": "Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_hal_manager.cpp | 6 +++++-\n src/android/camera_hal_manager.h | 3 +++\n 2 files changed, 8 insertions(+), 1 deletion(-)", "diff": "diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\nindex aeff14bdc14f..a19f80edede8 100644\n--- a/src/android/camera_hal_manager.cpp\n+++ b/src/android/camera_hal_manager.cpp\n@@ -47,13 +47,17 @@ CameraHalManager::~CameraHalManager()\n \n int CameraHalManager::init()\n {\n+\tint ret = halConfig_.open();\n+\tif (ret)\n+\t\treturn ret;\n+\n \tcameraManager_ = new CameraManager();\n \n \t/* Support camera hotplug. */\n \tcameraManager_->cameraAdded.connect(this, &CameraHalManager::cameraAdded);\n \tcameraManager_->cameraRemoved.connect(this, &CameraHalManager::cameraRemoved);\n \n-\tint ret = cameraManager_->start();\n+\tret = cameraManager_->start();\n \tif (ret) {\n \t\tLOG(HAL, Error) << \"Failed to start camera manager: \"\n \t\t\t\t<< strerror(-ret);\ndiff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h\nindex 24bf716c9f9d..cb333293a441 100644\n--- a/src/android/camera_hal_manager.h\n+++ b/src/android/camera_hal_manager.h\n@@ -19,6 +19,8 @@\n \n #include <libcamera/camera_manager.h>\n \n+#include \"camera_hal_config.h\"\n+\n class CameraDevice;\n \n class CameraHalManager\n@@ -50,6 +52,7 @@ private:\n \tCameraDevice *cameraDeviceFromHalId(unsigned int id);\n \n \tlibcamera::CameraManager *cameraManager_;\n+\tCameraHalConfig halConfig_;\n \n \tconst camera_module_callbacks_t *callbacks_;\n \tstd::vector<std::shared_ptr<CameraDevice>> cameras_;\n", "prefixes": [ "libcamera-devel", "5/7" ] }