{"id":12159,"url":"https://patchwork.libcamera.org/api/1.1/patches/12159/?format=json","web_url":"https://patchwork.libcamera.org/patch/12159/","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":"<20210430173803.198220-4-jacopo@jmondi.org>","date":"2021-04-30T17:38:03","name":"[libcamera-devel,v6,3/3] android: camera_device: Report sensor physical size","commit_ref":"45c6a7e6e8277fed743e4033d39deeb36a58a4b0","pull_url":null,"state":"accepted","archived":false,"hash":"3ef55ec8ef4d451c667af977969677f3281c3e12","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12159/mbox/","series":[{"id":1991,"url":"https://patchwork.libcamera.org/api/1.1/series/1991/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1991","date":"2021-04-30T17:38:00","name":"Introduce CameraSensorProperties database","version":6,"mbox":"https://patchwork.libcamera.org/series/1991/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12159/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12159/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 E2C7CBDE4F\n\tfor ;\n\tFri, 30 Apr 2021 17:37:32 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9FF0468901;\n\tFri, 30 Apr 2021 19:37:32 +0200 (CEST)","from relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F0A40688A5\n\tfor ;\n\tFri, 30 Apr 2021 19:37:28 +0200 (CEST)","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 EA07C200008;\n\tFri, 30 Apr 2021 17:37:27 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 30 Apr 2021 19:38:03 +0200","Message-Id":"<20210430173803.198220-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210430173803.198220-1-jacopo@jmondi.org>","References":"<20210430173803.198220-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v6 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=\"utf-8\"","Content-Transfer-Encoding":"base64","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\nReviewed-by: Laurent Pinchart \nReviewed-by: Hirokazu Honda \nReviewed-by: Niklas Söderlund \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 30 ++++++++++++++++--------------\n 1 file changed, 16 insertions(+), 14 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex a71aee2fc734..3d5b5f2432ad 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -9,6 +9,7 @@\n #include \"camera_ops.h\"\n #include \"post_processor.h\"\n \n+#include \n #include \n #include \n #include \n@@ -1032,15 +1033,23 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \tstaticMetadata_->addEntry(ANDROID_JPEG_MAX_SIZE, &maxJpegBufferSize_, 1);\n \n \t/* Sensor static metadata. */\n+\tstd::array pixelArraySize;\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\tconst Size &size = properties.get(properties::PixelArraySize);\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.data(), pixelArraySize.size());\n+\t}\n+\n+\tif (properties.contains(properties::UnitCellSize)) {\n+\t\tconst Size &cellSize = properties.get(properties::UnitCellSize);\n+\t\tstd::array physicalSize{\n+\t\t\tcellSize.width * pixelArraySize[0] / 1e6f,\n+\t\t\tcellSize.height * pixelArraySize[1] / 1e6f\n+\t\t};\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@@ -1088,13 +1097,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","v6","3/3"]}