From patchwork Tue Apr 6 15:45:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 11849 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 9F61BBD695 for ; Tue, 6 Apr 2021 15:45:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3C8EB687E1; Tue, 6 Apr 2021 17:45:31 +0200 (CEST) Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4F634687A1 for ; Tue, 6 Apr 2021 17:45:29 +0200 (CEST) X-Originating-IP: 93.34.118.233 Received: from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233]) (Authenticated sender: jacopo@jmondi.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id D6FF31BF204; Tue, 6 Apr 2021 15:45:28 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Tue, 6 Apr 2021 17:45:56 +0200 Message-Id: <20210406154557.27303-5-jacopo@jmondi.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210406154557.27303-1-jacopo@jmondi.org> References: <20210406154557.27303-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 4/5] android: camera_device: Get properties from configuration X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Open the HAL configuration file in the Camera HAL manager and get the camera properties for each created CameraDevice and initialize it with them. Signed-off-by: Jacopo Mondi Reviewed-by: Hirokazu Honda --- src/android/camera_device.cpp | 29 ++++++++++++++++++++++------- src/android/camera_device.h | 3 ++- src/android/camera_hal_manager.cpp | 21 +++++++++++++++++++-- src/android/camera_hal_manager.h | 3 +++ 4 files changed, 46 insertions(+), 10 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 89044efa7ebe..66030c012db0 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -6,6 +6,7 @@ */ #include "camera_device.h" +#include "camera_hal_config.h" #include "camera_ops.h" #include "post_processor.h" @@ -446,9 +447,15 @@ std::unique_ptr CameraDevice::create(unsigned int id, * Initialize the camera static information. * This method is called before the camera device is opened. */ -int CameraDevice::initialize() +int CameraDevice::initialize(const CameraProps &cameraProps) { - /* Initialize orientation and facing side of the camera. */ + /* + * Initialize orientation and facing side of the camera. + * + * If the libcamera::Camera provides those information as retrieved + * from firmware use that, otherwise fallback to values parsed from + * the configuration file. + */ const ControlList &properties = camera_->properties(); if (properties.contains(properties::Location)) { @@ -464,12 +471,14 @@ int CameraDevice::initialize() facing_ = CAMERA_FACING_EXTERNAL; break; } + + if (facing_ != cameraProps.facing) + LOG(HAL, Warning) + << "Camera location does not match" + << " configuration file. Use " << facing_; + } else { - /* - * \todo Retrieve the camera location from configuration file - * if not available from the library. - */ - facing_ = CAMERA_FACING_FRONT; + facing_ = cameraProps.facing; } /* @@ -483,6 +492,12 @@ int CameraDevice::initialize() if (properties.contains(properties::Rotation)) { int rotation = properties.get(properties::Rotation); orientation_ = (360 - rotation) % 360; + if (orientation_ != cameraProps.rotation) + LOG(HAL, Warning) + << "Camera orientation does not match" + << " configuration file. Use " << orientation_; + } else { + orientation_ = cameraProps.rotation; } int ret = camera_->acquire(); diff --git a/src/android/camera_device.h b/src/android/camera_device.h index 11bdfec8d587..ba3ec8770e11 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -29,6 +29,7 @@ #include "camera_worker.h" #include "jpeg/encoder.h" +class CameraProps; class CameraDevice : protected libcamera::Loggable { public: @@ -36,7 +37,7 @@ public: std::shared_ptr cam); ~CameraDevice(); - int initialize(); + int initialize(const CameraProps &cameraProps); int open(const hw_module_t *hardwareModule); void close(); diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp index bf3fcda75237..a517727ea0b8 100644 --- a/src/android/camera_hal_manager.cpp +++ b/src/android/camera_hal_manager.cpp @@ -39,13 +39,17 @@ CameraHalManager::~CameraHalManager() = default; int CameraHalManager::init() { + int ret = halConfig_.open(); + if (ret) + return ret; + cameraManager_ = std::make_unique(); /* Support camera hotplug. */ cameraManager_->cameraAdded.connect(this, &CameraHalManager::cameraAdded); cameraManager_->cameraRemoved.connect(this, &CameraHalManager::cameraRemoved); - int ret = cameraManager_->start(); + ret = cameraManager_->start(); if (ret) { LOG(HAL, Error) << "Failed to start camera manager: " << strerror(-ret); @@ -115,9 +119,22 @@ void CameraHalManager::cameraAdded(std::shared_ptr cam) } } + /* + * Get camera properties from the configuration file. + * + * The camera properties as recorded in the configuration file + * supplement information that cannot be retrieved from the + * libcamera::Camera at run time. + */ + const CameraProps &cameraProps = halConfig_.cameraProps(cam->id()); + if (!cameraProps.valid) { + LOG(HAL, Error) << "Failed to register camera: " << cam->id(); + return; + } + /* Create a CameraDevice instance to wrap the libcamera Camera. */ std::unique_ptr camera = CameraDevice::create(id, cam); - int ret = camera->initialize(); + int ret = camera->initialize(cameraProps); if (ret) { LOG(HAL, Error) << "Failed to initialize camera: " << cam->id(); return; diff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h index d9bf27989965..af1581da6579 100644 --- a/src/android/camera_hal_manager.h +++ b/src/android/camera_hal_manager.h @@ -19,6 +19,8 @@ #include +#include "camera_hal_config.h" + class CameraDevice; class CameraHalManager @@ -50,6 +52,7 @@ private: CameraDevice *cameraDeviceFromHalId(unsigned int id); std::unique_ptr cameraManager_; + CameraHalConfig halConfig_; const camera_module_callbacks_t *callbacks_; std::vector> cameras_;