[{"id":14316,"web_url":"https://patchwork.libcamera.org/comment/14316/","msgid":"","date":"2020-12-23T05:24:57","subject":"Re: [libcamera-devel] [PATCH v2 8/9] libcamera: camera_sensor:\n\tRegister static properties","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Fri, Dec 18, 2020 at 05:47:53PM +0100, Jacopo Mondi wrote:\n> Register static properties, retrieved inspecting the sensor\n> database, in the CameraSensor class.\n> \n> Static properties are overridden by properties retrieved from\n> the kernel interface at run-time if any overlap between the two\n> sets occurs.\n> \n> Signed-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(-)\n> \n> diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\n> index 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_;\n> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\n> index 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\nI'd upgrade this to a warning at least.\n\nReviewed-by: Laurent Pinchart \n\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>","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 1E395C0F1B\n\tfor ;\n\tWed, 23 Dec 2020 05:25:08 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A4E296158A;\n\tWed, 23 Dec 2020 06:25:07 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ECDD860320\n\tfor ;\n\tWed, 23 Dec 2020 06:25:05 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5F18FA32;\n\tWed, 23 Dec 2020 06:25:05 +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=\"V2OG2osq\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1608701105;\n\tbh=oZU2q2RKMxsDLttURiIv89MlbuXBxfNgMxYPXUlNUpY=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=V2OG2osq2S+5rNPDgDkcNFKjE0yIR/TaaKra1SVCXcuBVOlnJIZMbjVOMpdNMQv0M\n\teVL3iGefRDNv4B+t0eBavnd9mOCjwYIE7agZefDRXANvS1GfCpUELjidG5qUVZXHs4\n\ts9037mviy3JK7A43EUtK1cZqcUJC3XcQmoLGVLS8=","Date":"Wed, 23 Dec 2020 07:24:57 +0200","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"","References":"<20201218164754.81422-1-jacopo@jmondi.org>\n\t<20201218164754.81422-9-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201218164754.81422-9-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v2 8/9] libcamera: camera_sensor:\n\tRegister static 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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]