[{"id":21144,"web_url":"https://patchwork.libcamera.org/comment/21144/","msgid":"<163768067638.3059017.6558738826649990143@Monstersaurus>","date":"2021-11-23T15:17:56","subject":"Re: [libcamera-devel] [PATCH v3 02/11] ipa: rkisp1: Pass\n\tIPASettings at init call","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Jean-Michel Hautbois (2021-11-23 15:04:14)\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> Reviewed-by: Laurent Pinchart \n\nReviewed-by: Kieran Bingham \n\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> - init(uint32 hwRevision) => (int32 ret);\n> + init(libcamera.IPASettings settings,\n> + uint32 hwRevision)\n> + => (int32 ret);\n> start() => (int32 ret);\n> stop();\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> - int init(unsigned int hwRevision) override;\n> + int init(const IPASettings &settings, unsigned int hwRevision) override;\n> int start() override;\n> void stop() override {}\n> \n> @@ -75,7 +75,8 @@ private:\n> unsigned int hwHistogramWeightGridsSize_;\n> };\n> \n> -int IPARkISP1::init(unsigned int hwRevision)\n> +int IPARkISP1::init([[maybe_unused]] const IPASettings &settings,\n> + unsigned int hwRevision)\n> {\n> /* \\todo Add support for other revisions */\n> switch (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> ipa_->queueFrameAction.connect(this,\n> &RkISP1CameraData::queueFrameAction);\n> \n> - int ret = ipa_->init(hwRevision);\n> + int ret = ipa_->init(IPASettings{ \"\", sensor_->model() }, hwRevision);\n> if (ret < 0) {\n> LOG(RkISP1, Error) << \"IPA initialization failure\";\n> return ret;\n> -- \n> 2.32.0\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 613A8BDB13\n\tfor ;\n\tTue, 23 Nov 2021 15:18:01 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A971360230;\n\tTue, 23 Nov 2021 16:18:00 +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 F206A60121\n\tfor ;\n\tTue, 23 Nov 2021 16:17:58 +0100 (CET)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A1AA3993;\n\tTue, 23 Nov 2021 16:17: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=\"ekmfvBIP\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1637680678;\n\tbh=G0XtemvqSD4jdy4ySNVaZ4+yOJ4M06QgnghKxMuuBW8=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=ekmfvBIPg2Tt926UN829e3KOAQfgsj3vFqw1wvfUywqHpsYOs+fz7Qx5/MiVfww1Y\n\tXeyr6j4vvFYPgv+a1FcpOsIPfSJu3RTMEA4WP38Wgcw4vYpiayjmKstRCosm1ST77T\n\tQ4Mk6xtWwIdbEqaUgXExZG/Re0H90Ajqt3Lf/pSE=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20211123150423.125524-3-jeanmichel.hautbois@ideasonboard.com>","References":"<20211123150423.125524-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20211123150423.125524-3-jeanmichel.hautbois@ideasonboard.com>","From":"Kieran Bingham ","To":"Jean-Michel Hautbois ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Tue, 23 Nov 2021 15:17:56 +0000","Message-ID":"<163768067638.3059017.6558738826649990143@Monstersaurus>","User-Agent":"alot/0.10","Subject":"Re: [libcamera-devel] [PATCH v3 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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]