{"id":11727,"url":"https://patchwork.libcamera.org/api/1.1/patches/11727/?format=json","web_url":"https://patchwork.libcamera.org/patch/11727/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20210325135116.21548-4-jacopo@jmondi.org>","date":"2021-03-25T13:51:16","name":"[libcamera-devel,v3,3/3] android: camera_device: Report sensor physical size","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"9b9e83f5c525f91b4ea4ff8420c1d9f2c1336deb","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/1.1/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/11727/mbox/","series":[{"id":1837,"url":"https://patchwork.libcamera.org/api/1.1/series/1837/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1837","date":"2021-03-25T13:51:13","name":"libcamera: Add sensor database","version":3,"mbox":"https://patchwork.libcamera.org/series/1837/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11727/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11727/checks/","tags":{},"headers":{"Return-Path":"","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 86450BDC66\n\tfor ;\n\tThu, 25 Mar 2021 13:50:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DFE1F68D6D;\n\tThu, 25 Mar 2021 14:50:51 +0100 (CET)","from relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8266768D6D\n\tfor ;\n\tThu, 25 Mar 2021 14:50:48 +0100 (CET)","from uno.LocalDomain (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay12.mail.gandi.net (Postfix) with ESMTPSA id 14167200002;\n\tThu, 25 Mar 2021 13:50:47 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 25 Mar 2021 14:51:16 +0100","Message-Id":"<20210325135116.21548-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.30.0","In-Reply-To":"<20210325135116.21548-1-jacopo@jmondi.org>","References":"<20210325135116.21548-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 3/3] android: camera_device: Report\n\tsensor physical size","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Calculate the value of the ANDROID_SENSOR_INFO_PHYSICAL_SIZE property\nmultiplying the number of sensor's readable pixels with the pixel unit\ncell size if provided by the Camera.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 25 +++++++++++++------------\n 1 file changed, 13 insertions(+), 12 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 5fbf6f82ee9a..1d94e3a0b6ab 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -931,15 +931,23 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \tstaticMetadata_->addEntry(ANDROID_JPEG_MAX_SIZE, &maxJpegBufferSize_, 1);\n \n \t/* Sensor static metadata. */\n+\tint32_t pixelArraySize[2];\n \t{\n \t\tconst Size &size =\n \t\t\tproperties.get(properties::PixelArraySize);\n-\t\tstd::vector data{\n-\t\t\tstatic_cast(size.width),\n-\t\t\tstatic_cast(size.height),\n-\t\t};\n+\t\tpixelArraySize[0] = size.width;\n+\t\tpixelArraySize[1] = size.height;\n \t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE,\n-\t\t\t\t\t data.data(), data.size());\n+\t\t\t\t\t pixelArraySize, 2);\n+\t}\n+\n+\tif (properties.contains(properties::UnitCellSize)) {\n+\t\tstd::vector physicalSize(2);\n+\t\tconst Size &size = properties.get(properties::UnitCellSize);\n+\t\tphysicalSize[0] = size.width * pixelArraySize[0] / 1e6f;\n+\t\tphysicalSize[1] = size.height * pixelArraySize[1] / 1e6f;\n+\t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_PHYSICAL_SIZE,\n+\t\t\t\t\t physicalSize.data(), physicalSize.size());\n \t}\n \n \t{\n@@ -987,13 +995,6 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\t\t testPatterModes.data(),\n \t\t\t\t testPatterModes.size());\n \n-\tstd::vector physicalSize = {\n-\t\t2592, 1944,\n-\t};\n-\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_PHYSICAL_SIZE,\n-\t\t\t\t physicalSize.data(),\n-\t\t\t\t physicalSize.size());\n-\n \tuint8_t timestampSource = ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE_UNKNOWN;\n \tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE,\n \t\t\t\t ×tampSource, 1);\n","prefixes":["libcamera-devel","v3","3/3"]}