From patchwork Fri Dec 18 16:47:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 10689 X-Patchwork-Delegate: jacopo@jmondi.org 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 C8583C0F1A for ; Fri, 18 Dec 2020 16:47:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 95C0862000; Fri, 18 Dec 2020 17:47:58 +0100 (CET) Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C5FD9619E2 for ; Fri, 18 Dec 2020 17:47:52 +0100 (CET) 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 relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 914F920003 for ; Fri, 18 Dec 2020 16:47:52 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Fri, 18 Dec 2020 17:47:54 +0100 Message-Id: <20201218164754.81422-10-jacopo@jmondi.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201218164754.81422-1-jacopo@jmondi.org> References: <20201218164754.81422-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 9/9] android: camera_device: Report sensor physical size 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" Report the ANDROID_SENSOR_INFO_PHYSICAL_SIZE property inspecting the draft SensorPhysicalSize property reported by libcamera. Maintain a default value to support pipelines that do not register the camera property. Signed-off-by: Jacopo Mondi --- src/android/camera_device.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index bad8a51ae7f7..f50a539e907d 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -919,12 +919,20 @@ const camera_metadata_t *CameraDevice::getStaticMetadata() testPatterModes.data(), testPatterModes.size()); - std::vector physicalSize = { - 2592, 1944, - }; + std::vector physicalSize(2); + if (properties.contains(properties::draft::SensorPhysicalSize)) { + const Span data = + properties.get>(properties::draft::SensorPhysicalSize); + physicalSize = { data[0], data[1] }; + } else { + /* + * \todo Drop the default once all pipelines report the + * property. + */ + physicalSize = { 2.592, 1.944 }; + } staticMetadata_->addEntry(ANDROID_SENSOR_INFO_PHYSICAL_SIZE, - physicalSize.data(), - physicalSize.size()); + physicalSize.data(), physicalSize.size()); uint8_t timestampSource = ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE_UNKNOWN; staticMetadata_->addEntry(ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE,