[{"id":15829,"web_url":"https://patchwork.libcamera.org/comment/15829/","msgid":"","date":"2021-03-23T12:56:03","subject":"Re: [libcamera-devel] [PATCH v2 1/7] ipa: Add sensor model string\n\tto IPASettings","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Naush,\n\nThank you for the patch.\n\nOn Tue, Mar 23, 2021 at 12:27:33PM +0000, Naushir Patuck wrote:\n> Pass the sensor model string to the IPA init() method through the\n> IPASettings structure.\n> \n> Signed-off-by: Naushir Patuck \n> Tested-by: David Plowman \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> include/libcamera/ipa/core.mojom | 8 ++++++++\n> src/libcamera/pipeline/ipu3/ipu3.cpp | 3 ++-\n> src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 3 ++-\n> src/libcamera/pipeline/vimc/vimc.cpp | 2 +-\n> test/ipa/ipa_interface_test.cpp | 2 +-\n> 5 files changed, 14 insertions(+), 4 deletions(-)\n> \n> diff --git a/include/libcamera/ipa/core.mojom b/include/libcamera/ipa/core.mojom\n> index 5236a672461c..5363f1c5b48b 100644\n> --- a/include/libcamera/ipa/core.mojom\n> +++ b/include/libcamera/ipa/core.mojom\n> @@ -145,8 +145,16 @@ struct IPABuffer {\n> * This field may be an empty string if the IPA doesn't require a configuration\n> * file.\n> */\n> +\n> + /**\n> + * \\var IPASettings::sensorModel\n> + * \\brief The sensor model name\n> + *\n> + * Provides the sensor model name to the IPA.\n> + */\n> struct IPASettings {\n> \tstring configurationFile;\n> +\tstring sensorModel;\n> };\n> \n> /**\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index 2ea13ec9e1b9..c27120710323 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -1144,7 +1144,8 @@ int IPU3CameraData::loadIPA()\n> \n> \tipa_->queueFrameAction.connect(this, &IPU3CameraData::queueFrameAction);\n> \n> -\tipa_->init(IPASettings{});\n> +\tCameraSensor *sensor = cio2_.sensor();\n> +\tipa_->init(IPASettings{ \"\", sensor->model() });\n> \n> \treturn 0;\n> }\n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index 00fa62c972ed..2c8ae31a28ad 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -1227,7 +1227,8 @@ int RPiCameraData::loadIPA()\n> \tipa_->setIspControls.connect(this, &RPiCameraData::setIspControls);\n> \tipa_->setDelayedControls.connect(this, &RPiCameraData::setDelayedControls);\n> \n> -\tIPASettings settings(ipa_->configurationFile(sensor_->model() + \".json\"));\n> +\tIPASettings settings(ipa_->configurationFile(sensor_->model() + \".json\"),\n> +\t\t\t sensor_->model());\n> \n> \treturn ipa_->init(settings);\n> }\n> diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\n> index 57c65b021c46..2dfb63ecf2ef 100644\n> --- a/src/libcamera/pipeline/vimc/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc/vimc.cpp\n> @@ -425,7 +425,7 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n> \tdata->ipa_ = IPAManager::createIPA(this, 0, 0);\n> \tif (data->ipa_ != nullptr) {\n> \t\tstd::string conf = data->ipa_->configurationFile(\"vimc.conf\");\n> -\t\tdata->ipa_->init(IPASettings{ conf });\n> +\t\tdata->ipa_->init(IPASettings{ conf, data->sensor_->model() });\n> \t} else {\n> \t\tLOG(VIMC, Warning) << \"no matching IPA found\";\n> \t}\n> diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp\n> index 4b88806f8f67..d6ca6f5137b0 100644\n> --- a/test/ipa/ipa_interface_test.cpp\n> +++ b/test/ipa/ipa_interface_test.cpp\n> @@ -104,7 +104,7 @@ protected:\n> \n> \t\t/* Test initialization of IPA module. */\n> \t\tstd::string conf = ipa_->configurationFile(\"vimc.conf\");\n> -\t\tint ret = ipa_->init(IPASettings{ conf });\n> +\t\tint ret = ipa_->init(IPASettings{ conf, \"vimc\" });\n> \t\tif (ret < 0) {\n> \t\t\tcerr << \"IPA interface init() failed\" << endl;\n> \t\t\treturn TestFail;","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 80C88C32E4\n\tfor ;\n\tTue, 23 Mar 2021 12:56:47 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D77AD68D63;\n\tTue, 23 Mar 2021 13:56:46 +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 94ADB602D7\n\tfor ;\n\tTue, 23 Mar 2021 13:56:45 +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 141C7885;\n\tTue, 23 Mar 2021 13:56:45 +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=\"h14G+YCw\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1616504205;\n\tbh=1u+zjQ87qVRZ1RH6llPTh9zbqQl9gw+NSM9itH7XTjg=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=h14G+YCwiVKje6/8WuYnZGtw3k5YRqwBnrSJ9Py/5z2w+HZ3RJU5WptI8D2AS01qN\n\tH9cfHvbLyjCXDyr+igUjOgU3tkx8cdpUP0jJHGGLEnX/LGKXk1B55Cijlve0WlMq6N\n\tmwlT7b/Yxp+gbZkqXne6fOlS0V8gyBMrLxj8u3O0=","Date":"Tue, 23 Mar 2021 14:56:03 +0200","From":"Laurent Pinchart ","To":"Naushir Patuck ","Message-ID":"","References":"<20210323122739.680560-1-naush@raspberrypi.com>\n\t<20210323122739.680560-2-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210323122739.680560-2-naush@raspberrypi.com>","Subject":"Re: [libcamera-devel] [PATCH v2 1/7] ipa: Add sensor model string\n\tto IPASettings","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\" "}}]