[{"id":21115,"web_url":"https://patchwork.libcamera.org/comment/21115/","msgid":"","date":"2021-11-23T10:42:36","subject":"Re: [libcamera-devel] [PATCH v2 02/11] ipa: rkisp1: Pass\n\tIPASettings at init call","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jean-Michel,\n\nThank you for the patch.\n\nOn Tue, Nov 23, 2021 at 10:14:42AM +0100, Jean-Michel Hautbois wrote:\n> When the IPA is initialized, it will need to know the sensor model\n> used in order to properly call CameraSensorHelper for the analogue gain.\n> Modify the init definition in the pipeline handler and in the IPA as\n> well as the mojo interface to pass the IPASettings.\n> \n> Signed-off-by: Jean-Michel Hautbois \n> ---\n> include/libcamera/ipa/rkisp1.mojom | 4 +++-\n> src/ipa/rkisp1/rkisp1.cpp | 5 +++--\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n> 3 files changed, 7 insertions(+), 4 deletions(-)\n> \n> diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\n> index cae757ea..a6991d4f 100644\n> --- a/include/libcamera/ipa/rkisp1.mojom\n> +++ b/include/libcamera/ipa/rkisp1.mojom\n> @@ -29,7 +29,9 @@ struct RkISP1Action {\n> };\n> \n> interface IPARkISP1Interface {\n> -\tinit(uint32 hwRevision) => (int32 ret);\n> +\tinit(libcamera.IPASettings settings,\n> +\t uint32 hwRevision)\n\nIt may make sense to add the hw revision to IPASettings later. For now,\n\nReviewed-by: Laurent Pinchart \n\n> +\t\t=> (int32 ret);\n> \tstart() => (int32 ret);\n> \tstop();\n> \n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index bf2c13b6..7ecbf8ae 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -34,7 +34,7 @@ namespace ipa::rkisp1 {\n> class IPARkISP1 : public IPARkISP1Interface\n> {\n> public:\n> -\tint init(unsigned int hwRevision) override;\n> +\tint init(const IPASettings &settings, unsigned int hwRevision) override;\n> \tint start() override;\n> \tvoid stop() override {}\n> \n> @@ -75,7 +75,8 @@ private:\n> \tunsigned int hwHistogramWeightGridsSize_;\n> };\n> \n> -int IPARkISP1::init(unsigned int hwRevision)\n> +int IPARkISP1::init([[maybe_unused]] const IPASettings &settings,\n> +\t\t unsigned int hwRevision)\n> {\n> \t/* \\todo Add support for other revisions */\n> \tswitch (hwRevision) {\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 98008862..6cdc4c03 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -319,7 +319,7 @@ int RkISP1CameraData::loadIPA(unsigned int hwRevision)\n> \tipa_->queueFrameAction.connect(this,\n> \t\t\t\t &RkISP1CameraData::queueFrameAction);\n> \n> -\tint ret = ipa_->init(hwRevision);\n> +\tint ret = ipa_->init(IPASettings{ \"\", sensor_->model() }, hwRevision);\n> \tif (ret < 0) {\n> \t\tLOG(RkISP1, Error) << \"IPA initialization failure\";\n> \t\treturn ret;","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 03412BDB13\n\tfor ;\n\tTue, 23 Nov 2021 10:43:01 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6125C60376;\n\tTue, 23 Nov 2021 11:43:01 +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 464106036F\n\tfor ;\n\tTue, 23 Nov 2021 11:42:59 +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 B1008A1B;\n\tTue, 23 Nov 2021 11:42:58 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"nSSWMWlh\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1637664178;\n\tbh=/rQuTIBjaLbit4Yi/gQ+9CjOmJtL+LHDsRcL0IvKwfI=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=nSSWMWlhetSKjzugGVyyi76hFhKiwZrchDALeKYozTjnsK6PMJEFHaxb1SWmrXvpl\n\tolgbOFeXjJfI9YqWqvRwzPm24YlDW2iW28D526IYMa00VSUrMz2H6maogsImZJiZh6\n\twsQ5sAqYy8o7aEe4puDANTvYLWqy0bXGzxF5FqLQ=","Date":"Tue, 23 Nov 2021 12:42:36 +0200","From":"Laurent Pinchart ","To":"Jean-Michel Hautbois ","Message-ID":"","References":"<20211123091451.67404-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20211123091451.67404-3-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20211123091451.67404-3-jeanmichel.hautbois@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 02/11] ipa: rkisp1: Pass\n\tIPASettings at init call","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]