{"id":10688,"url":"https://patchwork.libcamera.org/api/patches/10688/?format=json","web_url":"https://patchwork.libcamera.org/patch/10688/","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":"<20201218164754.81422-9-jacopo@jmondi.org>","date":"2020-12-18T16:47:53","name":"[libcamera-devel,v2,8/9] libcamera: camera_sensor: Register static properties","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"5f4977f2f8266ccb2e44388206ff34407d42758a","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/10688/mbox/","series":[{"id":1538,"url":"https://patchwork.libcamera.org/api/series/1538/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1538","date":"2020-12-18T16:47:45","name":"libcamera: Introduce sensor database","version":2,"mbox":"https://patchwork.libcamera.org/series/1538/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10688/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10688/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 6D45AC0F1B\n\tfor ;\n\tFri, 18 Dec 2020 16:47:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 363DD615AC;\n\tFri, 18 Dec 2020 17:47:58 +0100 (CET)","from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net\n\t[217.70.183.200])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 71AD8615AC\n\tfor ;\n\tFri, 18 Dec 2020 17:47:52 +0100 (CET)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 39BDD20003\n\tfor ;\n\tFri, 18 Dec 2020 16:47:52 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 18 Dec 2020 17:47:53 +0100","Message-Id":"<20201218164754.81422-9-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.29.2","In-Reply-To":"<20201218164754.81422-1-jacopo@jmondi.org>","References":"<20201218164754.81422-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 8/9] libcamera: camera_sensor: Register\n\tstatic properties","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":"Register static properties, retrieved inspecting the sensor\ndatabase, in the CameraSensor class.\n\nStatic properties are overridden by properties retrieved from\nthe kernel interface at run-time if any overlap between the two\nsets occurs.\n\nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/internal/camera_sensor.h | 1 +\n src/libcamera/camera_sensor.cpp | 21 ++++++++++++++++++++-\n 2 files changed, 21 insertions(+), 1 deletion(-)","diff":"diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex f80d836161a5..1b3a17f2ce77 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -69,6 +69,7 @@ protected:\n \n private:\n \tint generateId();\n+\tvoid initStaticProperties();\n \tint initProperties();\n \n \tconst MediaEntity *entity_;\ndiff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex 2b78eb4cb530..18079da2e4b5 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -19,6 +19,7 @@\n \n #include \"libcamera/internal/bayer_format.h\"\n #include \"libcamera/internal/formats.h\"\n+#include \"libcamera/internal/sensor_database.h\"\n #include \"libcamera/internal/sysfs.h\"\n #include \"libcamera/internal/utils.h\"\n \n@@ -214,6 +215,21 @@ int CameraSensor::init()\n \treturn 0;\n }\n \n+void CameraSensor::initStaticProperties()\n+{\n+\tif (!sensorDatabase.contains(model_)) {\n+\t\tLOG(CameraSensor, Info)\n+\t\t\t<< \"No static properties available for '\" << model_ << \"'\";\n+\t\tLOG(CameraSensor, Info)\n+\t\t\t<< \"Please consider updating the sensor database\";\n+\t\treturn;\n+\t}\n+\n+\tconst ControlList &staticProperties = sensorDatabase.properties(model_);\n+\tfor (const auto &prop : staticProperties)\n+\t\tproperties_.set(prop.first, prop.second);\n+}\n+\n int CameraSensor::initProperties()\n {\n \t/*\n@@ -251,7 +267,10 @@ int CameraSensor::initProperties()\n \tif (ret)\n \t\treturn ret;\n \n-\t/* Retrieve and store the camera sensor properties. */\n+\t/* Initialize the static properties from the sensor database. */\n+\tinitStaticProperties();\n+\n+\t/* Retrieve and register properties from the kernel interface. */\n \tconst ControlInfoMap &controls = subdev_->controls();\n \tint32_t propertyValue;\n \n","prefixes":["libcamera-devel","v2","8/9"]}