From patchwork Mon Dec 28 16:52:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 10758 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 B6046C0F1B for ; Mon, 28 Dec 2020 16:51:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D84CE61D25; Mon, 28 Dec 2020 17:51:57 +0100 (CET) Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 36FFD619AF for ; Mon, 28 Dec 2020 17:51:54 +0100 (CET) X-Originating-IP: 2.224.242.101 Received: from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101]) (Authenticated sender: jacopo@jmondi.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id EB79E1C000A for ; Mon, 28 Dec 2020 16:51:53 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Mon, 28 Dec 2020 17:52:02 +0100 Message-Id: <20201228165203.53771-4-jacopo@jmondi.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228165203.53771-1-jacopo@jmondi.org> References: <20201228165203.53771-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 3/4] 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" Calculate the value of the ANDROID_SENSOR_INFO_PHYSICAL_SIZE property multiplying the pixel unit cell size with the number of sensor's readable pixels. Maintain a default value to support pipelines that do not register the UnitCellSize property. Signed-off-by: Jacopo Mondi Reviewed-by: Paul Elder --- src/android/camera_device.cpp | 38 ++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 7678d4485ce9..9ad417ee6c3a 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -851,24 +851,37 @@ const camera_metadata_t *CameraDevice::getStaticMetadata() staticMetadata_->addEntry(ANDROID_JPEG_MAX_SIZE, &maxJpegBufferSize_, 1); /* Sensor static metadata. */ + std::vector pixelArraySize(2); if (properties.contains(properties::PixelArraySize)) { const Size &size = properties.get(properties::PixelArraySize); - std::vector data{ - static_cast(size.width), - static_cast(size.height), - }; - staticMetadata_->addEntry(ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE, - data.data(), data.size()); + pixelArraySize[0] = static_cast(size.width); + pixelArraySize[1] = static_cast(size.height); } else { /* * \todo Drop the default once the ov5670 and ov13858 drivers * are updated to report the pixel array size. */ - int32_t data[] = { 2592, 1944 }; - staticMetadata_->addEntry(ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE, - data, 2); + pixelArraySize = { 2592, 1944 }; } + staticMetadata_->addEntry(ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE, + pixelArraySize.data(), 2); + + std::vector physicalSize(2); + if (properties.contains(properties::UnitCellSize)) { + const Size &unitCellSize = + properties.get(properties::UnitCellSize); + physicalSize[0] = unitCellSize.width * pixelArraySize[0] / 1e6f; + physicalSize[1] = unitCellSize.height * pixelArraySize[1] / 1e6f; + } else { + /* + * \todo Drop the default once all camera sensors report + * the pixel unit size. + */ + physicalSize = { 2.592, 1.944 }; + } + staticMetadata_->addEntry(ANDROID_SENSOR_INFO_PHYSICAL_SIZE, + physicalSize.data(), physicalSize.size()); if (properties.contains(properties::PixelArrayActiveAreas)) { const Span &rects = @@ -919,13 +932,6 @@ const camera_metadata_t *CameraDevice::getStaticMetadata() testPatterModes.data(), testPatterModes.size()); - std::vector physicalSize = { - 2592, 1944, - }; - staticMetadata_->addEntry(ANDROID_SENSOR_INFO_PHYSICAL_SIZE, - physicalSize.data(), - physicalSize.size()); - uint8_t timestampSource = ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE_UNKNOWN; staticMetadata_->addEntry(ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE, ×tampSource, 1);