{"id":10759,"url":"https://patchwork.libcamera.org/api/patches/10759/?format=json","web_url":"https://patchwork.libcamera.org/patch/10759/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20201228165203.53771-5-jacopo@jmondi.org>","date":"2020-12-28T16:52:03","name":"[libcamera-devel,v3,4/4] android: camera_device: Align style of active area size","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"795ef26eee6e0cef670e7ce488ef9193c8062ae2","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/10759/mbox/","series":[{"id":1557,"url":"https://patchwork.libcamera.org/api/series/1557/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1557","date":"2020-12-28T16:51:59","name":"libcamera: Introduce sensor database","version":3,"mbox":"https://patchwork.libcamera.org/series/1557/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10759/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10759/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 34794C0F1B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 28 Dec 2020 16:51:59 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 81D9E61D64;\n\tMon, 28 Dec 2020 17:51:58 +0100 (CET)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 965C960111\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 28 Dec 2020 17:51:54 +0100 (CET)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 578431C000A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 28 Dec 2020 16:51:54 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi <jacopo@jmondi.org>","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\n\tstyle of active area size","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"Align the style of ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE property\nregistration with the one of the other sensor related properties.\n\nCosmetic change only, no functional changes intended.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 11 +++++------\n 1 file changed, 5 insertions(+), 6 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 9ad417ee6c3a..b48c7b7c9d2b 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -883,26 +883,25 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_PHYSICAL_SIZE,\n \t\t\t\t  physicalSize.data(), physicalSize.size());\n \n+\tstd::vector<int32_t> activeAreaSize(4);\n \tif (properties.contains(properties::PixelArrayActiveAreas)) {\n \t\tconst Span<const Rectangle> &rects =\n \t\t\tproperties.get(properties::PixelArrayActiveAreas);\n-\t\tstd::vector<int32_t> data{\n+\t\tactiveAreaSize = {\n \t\t\tstatic_cast<int32_t>(rects[0].x),\n \t\t\tstatic_cast<int32_t>(rects[0].y),\n \t\t\tstatic_cast<int32_t>(rects[0].width),\n \t\t\tstatic_cast<int32_t>(rects[0].height),\n \t\t};\n-\t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE,\n-\t\t\t\t\t  data.data(), data.size());\n \t} else {\n \t\t/*\n \t\t * \\todo Drop the default once the ov5670 and ov13858 drivers\n \t\t * are updated to report the pixel array size.\n \t\t */\n-\t\tint32_t data[] = { 0, 0, 2560, 1920 };\n-\t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE,\n-\t\t\t\t\t  data, 4);\n+\t\tactiveAreaSize = { 0, 0, 2560, 1920 };\n \t}\n+\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE,\n+\t\t\t\t  activeAreaSize.data(), 4);\n \n \tint32_t sensitivityRange[] = {\n \t\t32, 2400,\n","prefixes":["libcamera-devel","v3","4/4"]}