{"id":11769,"url":"https://patchwork.libcamera.org/api/1.1/patches/11769/?format=json","web_url":"https://patchwork.libcamera.org/patch/11769/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20210329152807.28331-4-jacopo@jmondi.org>","date":"2021-03-29T15:28:05","name":"[libcamera-devel,v2,4/6] android: camera_hal_manager: Use CameraHalConfig","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"65f2d04bfe6fc037f127dad58fece1a827a97afd","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/1.1/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/11769/mbox/","series":[{"id":1862,"url":"https://patchwork.libcamera.org/api/1.1/series/1862/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1862","date":"2021-03-29T15:28:02","name":"[libcamera-devel,v2,1/6] libcamera: List dependency for Android Camera3 HAL","version":2,"mbox":"https://patchwork.libcamera.org/series/1862/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11769/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11769/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 31910C32F0\n\tfor ;\n\tMon, 29 Mar 2021 15:27:46 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C0BE768789;\n\tMon, 29 Mar 2021 17:27:45 +0200 (CEST)","from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net\n\t[217.70.183.194])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 12AEE6877D\n\tfor ;\n\tMon, 29 Mar 2021 17:27:39 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 7AA8840008;\n\tMon, 29 Mar 2021 15:27:38 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 29 Mar 2021 17:28:05 +0200","Message-Id":"<20210329152807.28331-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.30.0","In-Reply-To":"<20210329152807.28331-1-jacopo@jmondi.org>","References":"<20210329152807.28331-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 4/6] android: camera_hal_manager: Use\n\tCameraHalConfig","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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Store the HAL configuration in the camera manager.\n\nReviewed-by: Niklas Söderlund \nSigned-off-by: Jacopo Mondi \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 bf3fcda75237..f79789b5bfb8 100644\n--- a/src/android/camera_hal_manager.cpp\n+++ b/src/android/camera_hal_manager.cpp\n@@ -39,13 +39,17 @@ CameraHalManager::~CameraHalManager() = default;\n \n int CameraHalManager::init()\n {\n+\tint ret = halConfig_.open();\n+\tif (ret)\n+\t\treturn ret;\n+\n \tcameraManager_ = std::make_unique();\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 d9bf27989965..af1581da6579 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 \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 \tstd::unique_ptr cameraManager_;\n+\tCameraHalConfig halConfig_;\n \n \tconst camera_module_callbacks_t *callbacks_;\n \tstd::vector> cameras_;\n","prefixes":["libcamera-devel","v2","4/6"]}