From patchwork Mon Dec 28 16:52:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 10759 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 34794C0F1B for ; Mon, 28 Dec 2020 16:51:59 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 81D9E61D64; Mon, 28 Dec 2020 17:51:58 +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 965C960111 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 578431C000A for ; Mon, 28 Dec 2020 16:51:54 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Mon, 28 Dec 2020 17:52:03 +0100 Message-Id: <20201228165203.53771-5-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 4/4] android: camera_device: Align style of active area 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" Align the style of ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE property registration with the one of the other sensor related properties. Cosmetic change only, no functional changes intended. Signed-off-by: Jacopo Mondi Reviewed-by: Paul Elder Reviewed-by: Niklas Söderlund --- src/android/camera_device.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 9ad417ee6c3a..b48c7b7c9d2b 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -883,26 +883,25 @@ const camera_metadata_t *CameraDevice::getStaticMetadata() staticMetadata_->addEntry(ANDROID_SENSOR_INFO_PHYSICAL_SIZE, physicalSize.data(), physicalSize.size()); + std::vector activeAreaSize(4); if (properties.contains(properties::PixelArrayActiveAreas)) { const Span &rects = properties.get(properties::PixelArrayActiveAreas); - std::vector data{ + activeAreaSize = { static_cast(rects[0].x), static_cast(rects[0].y), static_cast(rects[0].width), static_cast(rects[0].height), }; - staticMetadata_->addEntry(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE, - data.data(), data.size()); } else { /* * \todo Drop the default once the ov5670 and ov13858 drivers * are updated to report the pixel array size. */ - int32_t data[] = { 0, 0, 2560, 1920 }; - staticMetadata_->addEntry(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE, - data, 4); + activeAreaSize = { 0, 0, 2560, 1920 }; } + staticMetadata_->addEntry(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE, + activeAreaSize.data(), 4); int32_t sensitivityRange[] = { 32, 2400,