{"id":10479,"url":"https://patchwork.libcamera.org/api/1.1/patches/10479/?format=json","web_url":"https://patchwork.libcamera.org/patch/10479/","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":"<20201123164319.152742-9-kieran.bingham@ideasonboard.com>","date":"2020-11-23T16:43:19","name":"[libcamera-devel,RFC,8/8] libcamera: camera_sensor: Parse configuration properties","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"aef7892d037c7db5422948c090a6c1fa2d178bac","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10479/mbox/","series":[{"id":1477,"url":"https://patchwork.libcamera.org/api/1.1/series/1477/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1477","date":"2020-11-23T16:43:11","name":"Configuration files and parsing","version":1,"mbox":"https://patchwork.libcamera.org/series/1477/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10479/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10479/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 B3CC1BE08A\n\tfor ;\n\tMon, 23 Nov 2020 16:45:05 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7F9E8633FF;\n\tMon, 23 Nov 2020 17:45:05 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5510A633FA\n\tfor ;\n\tMon, 23 Nov 2020 17:45:00 +0100 (CET)","from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0115A102C;\n\tMon, 23 Nov 2020 17:44:59 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"qgs43ZrY\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1606149900;\n\tbh=YvzN9h1fhb+XlVT8Bx6Fp1ABG07k7SDvCkVDUIkrufg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=qgs43ZrYUmJuVK6t+q6CuW9TycqGZa5ZAzNODChy13yw7uA3QfAjd1tVTgxi2nBhg\n\t20WTFhosDzQmrej5XX4AswQAqid5lPJoPl/yJKt9MVeCQdapJzkH6VJq5z+4rEPppI\n\tYw0laY5EBJ67kVpcZcR4Qiy4dTDxxa2XI4loSXBo=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Mon, 23 Nov 2020 16:43:19 +0000","Message-Id":"<20201123164319.152742-9-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20201123164319.152742-1-kieran.bingham@ideasonboard.com>","References":"<20201123164319.152742-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [RFC PATCH 8/8] libcamera: camera_sensor: Parse\n\tconfiguration 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":"Search for a camera_sensor.json configuration file specific to libcamera\nand parse it to see if any properties specific to this CameraSensor are\napplicable.\n\nSigned-off-by: Kieran Bingham \n---\n include/libcamera/internal/camera_sensor.h | 1 +\n src/libcamera/camera_sensor.cpp | 50 ++++++++++++++++++++++\n 2 files changed, 51 insertions(+)","diff":"diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex b9eba89f00fb..646f24a966bd 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+\tint parseConfigurationFile();\n \n \tconst MediaEntity *entity_;\n \tstd::unique_ptr subdev_;\ndiff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex 935de528c496..5a1bda483b9d 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -17,6 +17,7 @@\n \n #include \n \n+#include \"libcamera/internal/configuration.h\"\n #include \"libcamera/internal/formats.h\"\n #include \"libcamera/internal/sysfs.h\"\n #include \"libcamera/internal/utils.h\"\n@@ -251,6 +252,12 @@ int CameraSensor::init()\n \t\tpropertyValue = 0;\n \tproperties_.set(properties::Rotation, propertyValue);\n \n+\t/*\n+\t * Properties are pulled from a configuration file on a best effort.\n+\t * If the file doesn't exist, or has no properties there is no failure.\n+\t */\n+\tparseConfigurationFile();\n+\n \t/* Enumerate, sort and cache media bus codes and sizes. */\n \tformats_ = subdev_->formats(pad_);\n \tif (formats_.empty()) {\n@@ -584,4 +591,47 @@ int CameraSensor::generateId()\n \treturn -EINVAL;\n }\n \n+int CameraSensor::parseConfigurationFile()\n+{\n+\tConfiguration c;\n+\n+\tint ret = c.open(\"camera_sensor.json\");\n+\tif (ret) {\n+\t\tLOG(CameraSensor, Debug) << \"No configuration file available\";\n+\t\treturn -ENODATA;\n+\t}\n+\n+\t/* Find properties based on the Camera model_ */\n+\t/* Todo: Spilt parsing out for multiple paths. */\n+\n+\t/* Find properties based around the Camera Sensor ID */\n+\tjson::iterator it = c.data().find(id_);\n+\tif (it == c.data().end())\n+\t\treturn -ENOENT;\n+\n+\tjson j = *it;\n+\tit = j.find(\"properties\");\n+\tif (it == j.end())\n+\t\treturn -ENOENT;\n+\n+\tjson deviceProperties = *it;\n+\n+\tfor (auto &[key, value] : deviceProperties.items()) {\n+\t\tLOG(CameraSensor, Debug) << \"Key: \" << key << \" Value: \" << value;\n+\n+\t\tif (!value.is_number()) {\n+\t\t\tLOG(CameraSensor, Debug) << \"Not a number: \" << value;\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\tif (key == \"Rotation\")\n+\t\t\tproperties_.set(properties::Rotation, value);\n+\n+\t\tif (key == \"Location\")\n+\t\t\tproperties_.set(properties::Location, value);\n+\t}\n+\n+\treturn 0;\n+}\n+\n } /* namespace libcamera */\n","prefixes":["libcamera-devel","RFC","8/8"]}