{"id":10611,"url":"https://patchwork.libcamera.org/api/patches/10611/?format=json","web_url":"https://patchwork.libcamera.org/patch/10611/","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":"<20201208090042.4824-3-jacopo@jmondi.org>","date":"2020-12-08T09:00:42","name":"[libcamera-devel,2/2] android: camera_device: Get sensor properties from DB","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"8cf544a4182786fa2ce3bbda0389dd059faf5ce8","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/10611/mbox/","series":[{"id":1514,"url":"https://patchwork.libcamera.org/api/series/1514/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1514","date":"2020-12-08T09:00:40","name":"libcamera: Introduce sensor database","version":1,"mbox":"https://patchwork.libcamera.org/series/1514/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10611/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10611/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 99376BDB22\n\tfor ;\n\tTue, 8 Dec 2020 09:00:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8D60267E74;\n\tTue, 8 Dec 2020 10:00:40 +0100 (CET)","from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A20F8635F2\n\tfor ;\n\tTue, 8 Dec 2020 10:00:38 +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 relay11.mail.gandi.net (Postfix) with ESMTPSA id 657F2100009\n\tfor ;\n\tTue, 8 Dec 2020 09:00:38 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 8 Dec 2020 10:00:42 +0100","Message-Id":"<20201208090042.4824-3-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.29.1","In-Reply-To":"<20201208090042.4824-1-jacopo@jmondi.org>","References":"<20201208090042.4824-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 2/2] android: camera_device: Get sensor\n\tproperties from DB","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":"Use the newly introduced camera sensor database to retrieve the\nphysical size of the sensor to register the\nANDROID_SENSOR_INFO_PHYSICAL_SIZE property.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 27 ++++++++++++++++++++++-----\n 1 file changed, 22 insertions(+), 5 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 872c7b18ee49..0c756f14c29c 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -13,6 +13,7 @@\n #include \n #include \n \n+#include \n #include \n #include \n #include \n@@ -595,6 +596,19 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \tconst ControlInfoMap &controlsInfo = camera_->controls();\n \tconst ControlList &properties = camera_->properties();\n \n+\t/*\n+\t * If the camera sensor is not supported we get an empty SensorEntry.\n+\t * Record that in the log as all the properties retrieved from the\n+\t * empty SensorEntry will be zero.\n+\t */\n+\tconst std::string sensorModel = properties.get(properties::Model);\n+\tif (!sensorDatabase.contains(sensorModel)) {\n+\t\tLOG(HAL, Info) << \"Camera sensor \" << sensorModel\n+\t\t\t << \" not supported.\";\n+\t\tLOG(HAL, Info) << \"All sensor-related properties will be set to zero\";\n+\t}\n+\tconst SensorEntry &sensorEntry = sensorDatabase.get(sensorModel);\n+\n \t/* Color correction static metadata. */\n \t{\n \t\tstd::vector data;\n@@ -775,12 +789,15 @@ 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+\t/*\n+\t * ANDROID_SENSOR_INFO_PHYSICAL_SIZE is in expressed in millimeters\n+\t * while the sensor database reports the physical sizes in nanometers.\n+\t */\n+\tstd::vector physicalSize;\n+\tphysicalSize[0] = static_cast(sensorEntry.physicalSize.width * 10e6);\n+\tphysicalSize[1] = static_cast(sensorEntry.physicalSize.height * 10e6);\n \tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_PHYSICAL_SIZE,\n-\t\t\t\t physicalSize.data(),\n-\t\t\t\t physicalSize.size());\n+\t\t\t\t physicalSize.data(), physicalSize.size());\n \n \tuint8_t timestampSource = ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE_UNKNOWN;\n \tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE,\n","prefixes":["libcamera-devel","2/2"]}