[{"id":36627,"web_url":"https://patchwork.libcamera.org/comment/36627/","msgid":"<20251102195246.GG27255@pendragon.ideasonboard.com>","date":"2025-11-02T19:52:46","subject":"Re: [PATCH v2 02/10] ipa: mali-c55: Move CameraHelper to context","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Tue, Oct 28, 2025 at 10:31:48AM +0100, Jacopo Mondi wrote:\n> From: Kieran Bingham \n> \n> Move the CameraHelper sensor to the Context so that it can be\n> used by the algorithms directly.\n> \n> While at it, document the undocumented ctrlMap member of IPAContext.\n> \n> Signed-off-by: Kieran Bingham \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/ipa/mali-c55/ipa_context.cpp | 6 ++++++\n> src/ipa/mali-c55/ipa_context.h | 4 ++++\n> src/ipa/mali-c55/mali-c55.cpp | 27 ++++++++++++---------------\n> 3 files changed, 22 insertions(+), 15 deletions(-)\n> \n> diff --git a/src/ipa/mali-c55/ipa_context.cpp b/src/ipa/mali-c55/ipa_context.cpp\n> index 1b203e2b260592cda945855d54f1aceefaaece91..a1e4c39f38704d3a4b5948ab789ffb9773f216c9 100644\n> --- a/src/ipa/mali-c55/ipa_context.cpp\n> +++ b/src/ipa/mali-c55/ipa_context.cpp\n> @@ -96,6 +96,12 @@ namespace libcamera::ipa::mali_c55 {\n> *\n> * \\var IPAContext::frameContexts\n> * \\brief Ring buffer of per-frame contexts\n> + *\n> + * \\var IPAContext::ctrlMap\n> + * \\brief A ControlInfoMap::Map of controls populated by the algorithms\n> + *\n> + * \\var IPAContext::camHelper\n> + * \\brief The camera sensor helper\n> */\n> \n> } /* namespace libcamera::ipa::mali_c55 */\n> diff --git a/src/ipa/mali-c55/ipa_context.h b/src/ipa/mali-c55/ipa_context.h\n> index 13885eb83b5c4d7c7af6c4f8d5673890834fed58..bfa805c7b93f313dda2497365e83542bbc39e291 100644\n> --- a/src/ipa/mali-c55/ipa_context.h\n> +++ b/src/ipa/mali-c55/ipa_context.h\n> @@ -12,6 +12,7 @@\n> \n> #include \"libcamera/internal/bayer_format.h\"\n> \n> +#include \n> #include \n> \n> namespace libcamera {\n> @@ -83,6 +84,9 @@ struct IPAContext {\n> \tFCQueue frameContexts;\n> \n> \tControlInfoMap::Map ctrlMap;\n> +\n> +\t/* Interface to the Camera Helper */\n> +\tstd::unique_ptr camHelper;\n> };\n> \n> } /* namespace ipa::mali_c55 */\n> diff --git a/src/ipa/mali-c55/mali-c55.cpp b/src/ipa/mali-c55/mali-c55.cpp\n> index 7d45e7310aecdae0e47655e6d2e8830e776d74cd..0751513dc584ca84dd212bf8c1469dd4b40c053d 100644\n> --- a/src/ipa/mali-c55/mali-c55.cpp\n> +++ b/src/ipa/mali-c55/mali-c55.cpp\n> @@ -74,9 +74,6 @@ private:\n> \n> \tControlInfoMap sensorControls_;\n> \n> -\t/* Interface to the Camera Helper */\n> -\tstd::unique_ptr camHelper_;\n> -\n> \t/* Local parameter storage */\n> \tstruct IPAContext context_;\n> };\n> @@ -98,8 +95,8 @@ std::string IPAMaliC55::logPrefix() const\n> int IPAMaliC55::init(const IPASettings &settings, const IPAConfigInfo &ipaConfig,\n> \t\t ControlInfoMap *ipaControls)\n> {\n> -\tcamHelper_ = CameraSensorHelperFactoryBase::create(settings.sensorModel);\n> -\tif (!camHelper_) {\n> +\tcontext_.camHelper = CameraSensorHelperFactoryBase::create(settings.sensorModel);\n> +\tif (!context_.camHelper) {\n> \t\tLOG(IPAMaliC55, Error)\n> \t\t\t<< \"Failed to create camera sensor helper for \"\n> \t\t\t<< settings.sensorModel;\n> @@ -142,10 +139,10 @@ void IPAMaliC55::setControls()\n> \n> \tif (activeState.agc.autoEnabled) {\n> \t\texposure = activeState.agc.automatic.exposure;\n> -\t\tgain = camHelper_->gainCode(activeState.agc.automatic.sensorGain);\n> +\t\tgain = context_.camHelper->gainCode(activeState.agc.automatic.sensorGain);\n> \t} else {\n> \t\texposure = activeState.agc.manual.exposure;\n> -\t\tgain = camHelper_->gainCode(activeState.agc.manual.sensorGain);\n> +\t\tgain = context_.camHelper->gainCode(activeState.agc.manual.sensorGain);\n> \t}\n> \n> \tControlList ctrls(sensorControls_);\n> @@ -191,17 +188,17 @@ void IPAMaliC55::updateSessionConfiguration(const IPACameraSensorInfo &info,\n> \tcontext_.configuration.agc.minShutterSpeed = minExposure * context_.configuration.sensor.lineDuration;\n> \tcontext_.configuration.agc.maxShutterSpeed = maxExposure * context_.configuration.sensor.lineDuration;\n> \tcontext_.configuration.agc.defaultExposure = defExposure;\n> -\tcontext_.configuration.agc.minAnalogueGain = camHelper_->gain(minGain);\n> -\tcontext_.configuration.agc.maxAnalogueGain = camHelper_->gain(maxGain);\n> +\tcontext_.configuration.agc.minAnalogueGain = context_.camHelper->gain(minGain);\n> +\tcontext_.configuration.agc.maxAnalogueGain = context_.camHelper->gain(maxGain);\n> \n> -\tif (camHelper_->blackLevel().has_value()) {\n> +\tif (context_.camHelper->blackLevel().has_value()) {\n> \t\t/*\n> \t\t * The black level from CameraSensorHelper is a 16-bit value.\n> \t\t * The Mali-C55 ISP expects 20-bit settings, so we shift it to\n> \t\t * the appropriate width\n> \t\t */\n> \t\tcontext_.configuration.sensor.blackLevel =\n> -\t\t\tcamHelper_->blackLevel().value() << 4;\n> +\t\t\tcontext_.camHelper->blackLevel().value() << 4;\n> \t}\n> }\n> \n> @@ -252,9 +249,9 @@ void IPAMaliC55::updateControls(const IPACameraSensorInfo &sensorInfo,\n> \n> \t/* Compute the analogue gain limits. */\n> \tconst ControlInfo &v4l2Gain = sensorControls.find(V4L2_CID_ANALOGUE_GAIN)->second;\n> -\tfloat minGain = camHelper_->gain(v4l2Gain.min().get());\n> -\tfloat maxGain = camHelper_->gain(v4l2Gain.max().get());\n> -\tfloat defGain = camHelper_->gain(v4l2Gain.def().get());\n> +\tfloat minGain = context_.camHelper->gain(v4l2Gain.min().get());\n> +\tfloat maxGain = context_.camHelper->gain(v4l2Gain.max().get());\n> +\tfloat defGain = context_.camHelper->gain(v4l2Gain.def().get());\n> \tctrlMap[&controls::AnalogueGain] = ControlInfo(minGain, maxGain, defGain);\n> \n> \t/*\n> @@ -362,7 +359,7 @@ void IPAMaliC55::processStats(unsigned int request, unsigned int bufferId,\n> \tframeContext.agc.exposure =\n> \t\tsensorControls.get(V4L2_CID_EXPOSURE).get();\n> \tframeContext.agc.sensorGain =\n> -\t\tcamHelper_->gain(sensorControls.get(V4L2_CID_ANALOGUE_GAIN).get());\n> +\t\tcontext_.camHelper->gain(sensorControls.get(V4L2_CID_ANALOGUE_GAIN).get());\n> \n> \tControlList metadata(controls::controls);\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 F1F08C3241\n\tfor ;\n\tSun, 2 Nov 2025 19:53:02 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 475AC6096B;\n\tSun, 2 Nov 2025 20:53:02 +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 C8D8C606E6\n\tfor ;\n\tSun, 2 Nov 2025 20:53:00 +0100 (CET)","from pendragon.ideasonboard.com (82-203-160-149.bb.dnainternet.fi\n\t[82.203.160.149])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 3FEBE99F;\n\tSun, 2 Nov 2025 20:51:08 +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=\"PiAu7maI\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1762113068;\n\tbh=YaI9yyuoNk1ljSSWNPq+CyywmBFeM88s5uc+Nil1kuU=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=PiAu7maI+Zva0CysxlR52m5gjefbArWvGXlNZEJrKmzMlfzmqpkvaOpElX6uQ9TGA\n\tMh3kCt4V2m1mG7B2A+cIRDpGJT+kgU4e+UiFVyAhWcYlvzC41+Y/dcIvBq6tESdsxz\n\tRiG87L9MXZEFPuw0Ah2achH/bVzPB6RQAkpyysI8=","Date":"Sun, 2 Nov 2025 21:52:46 +0200","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Cc":"Niklas =?utf-8?q?S=C3=B6derlund?= ,\n\tRobert Mader , \n\tlibcamera-devel@lists.libcamera.org, Kieran Bingham\n\t","Subject":"Re: [PATCH v2 02/10] ipa: mali-c55: Move CameraHelper to context","Message-ID":"<20251102195246.GG27255@pendragon.ideasonboard.com>","References":"<20251028-exposure-limits-v2-0-a8b5a318323e@ideasonboard.com>\n\t<20251028-exposure-limits-v2-2-a8b5a318323e@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20251028-exposure-limits-v2-2-a8b5a318323e@ideasonboard.com>","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\" "}},{"id":36691,"web_url":"https://patchwork.libcamera.org/comment/36691/","msgid":"<176232199655.144437.5095041966409940316@localhost>","date":"2025-11-05T05:53:16","subject":"Re: [PATCH v2 02/10] ipa: mali-c55: Move CameraHelper to context","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/people/184/","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nQuoting Jacopo Mondi (2025-10-28 10:31:48)\n> From: Kieran Bingham \n> \n> Move the CameraHelper sensor to the Context so that it can be\n> used by the algorithms directly.\n> \n> While at it, document the undocumented ctrlMap member of IPAContext.\n> \n> Signed-off-by: Kieran Bingham \n> Signed-off-by: Jacopo Mondi \n\nNo we had three people doing that, it must be right :-)\n\nReviewed-by: Stefan Klug \n\nRegards,\nStefan\n\n> ---\n> src/ipa/mali-c55/ipa_context.cpp | 6 ++++++\n> src/ipa/mali-c55/ipa_context.h | 4 ++++\n> src/ipa/mali-c55/mali-c55.cpp | 27 ++++++++++++---------------\n> 3 files changed, 22 insertions(+), 15 deletions(-)\n> \n> diff --git a/src/ipa/mali-c55/ipa_context.cpp b/src/ipa/mali-c55/ipa_context.cpp\n> index 1b203e2b260592cda945855d54f1aceefaaece91..a1e4c39f38704d3a4b5948ab789ffb9773f216c9 100644\n> --- a/src/ipa/mali-c55/ipa_context.cpp\n> +++ b/src/ipa/mali-c55/ipa_context.cpp\n> @@ -96,6 +96,12 @@ namespace libcamera::ipa::mali_c55 {\n> *\n> * \\var IPAContext::frameContexts\n> * \\brief Ring buffer of per-frame contexts\n> + *\n> + * \\var IPAContext::ctrlMap\n> + * \\brief A ControlInfoMap::Map of controls populated by the algorithms\n> + *\n> + * \\var IPAContext::camHelper\n> + * \\brief The camera sensor helper\n> */\n> \n> } /* namespace libcamera::ipa::mali_c55 */\n> diff --git a/src/ipa/mali-c55/ipa_context.h b/src/ipa/mali-c55/ipa_context.h\n> index 13885eb83b5c4d7c7af6c4f8d5673890834fed58..bfa805c7b93f313dda2497365e83542bbc39e291 100644\n> --- a/src/ipa/mali-c55/ipa_context.h\n> +++ b/src/ipa/mali-c55/ipa_context.h\n> @@ -12,6 +12,7 @@\n> \n> #include \"libcamera/internal/bayer_format.h\"\n> \n> +#include \n> #include \n> \n> namespace libcamera {\n> @@ -83,6 +84,9 @@ struct IPAContext {\n> FCQueue frameContexts;\n> \n> ControlInfoMap::Map ctrlMap;\n> +\n> + /* Interface to the Camera Helper */\n> + std::unique_ptr camHelper;\n> };\n> \n> } /* namespace ipa::mali_c55 */\n> diff --git a/src/ipa/mali-c55/mali-c55.cpp b/src/ipa/mali-c55/mali-c55.cpp\n> index 7d45e7310aecdae0e47655e6d2e8830e776d74cd..0751513dc584ca84dd212bf8c1469dd4b40c053d 100644\n> --- a/src/ipa/mali-c55/mali-c55.cpp\n> +++ b/src/ipa/mali-c55/mali-c55.cpp\n> @@ -74,9 +74,6 @@ private:\n> \n> ControlInfoMap sensorControls_;\n> \n> - /* Interface to the Camera Helper */\n> - std::unique_ptr camHelper_;\n> -\n> /* Local parameter storage */\n> struct IPAContext context_;\n> };\n> @@ -98,8 +95,8 @@ std::string IPAMaliC55::logPrefix() const\n> int IPAMaliC55::init(const IPASettings &settings, const IPAConfigInfo &ipaConfig,\n> ControlInfoMap *ipaControls)\n> {\n> - camHelper_ = CameraSensorHelperFactoryBase::create(settings.sensorModel);\n> - if (!camHelper_) {\n> + context_.camHelper = CameraSensorHelperFactoryBase::create(settings.sensorModel);\n> + if (!context_.camHelper) {\n> LOG(IPAMaliC55, Error)\n> << \"Failed to create camera sensor helper for \"\n> << settings.sensorModel;\n> @@ -142,10 +139,10 @@ void IPAMaliC55::setControls()\n> \n> if (activeState.agc.autoEnabled) {\n> exposure = activeState.agc.automatic.exposure;\n> - gain = camHelper_->gainCode(activeState.agc.automatic.sensorGain);\n> + gain = context_.camHelper->gainCode(activeState.agc.automatic.sensorGain);\n> } else {\n> exposure = activeState.agc.manual.exposure;\n> - gain = camHelper_->gainCode(activeState.agc.manual.sensorGain);\n> + gain = context_.camHelper->gainCode(activeState.agc.manual.sensorGain);\n> }\n> \n> ControlList ctrls(sensorControls_);\n> @@ -191,17 +188,17 @@ void IPAMaliC55::updateSessionConfiguration(const IPACameraSensorInfo &info,\n> context_.configuration.agc.minShutterSpeed = minExposure * context_.configuration.sensor.lineDuration;\n> context_.configuration.agc.maxShutterSpeed = maxExposure * context_.configuration.sensor.lineDuration;\n> context_.configuration.agc.defaultExposure = defExposure;\n> - context_.configuration.agc.minAnalogueGain = camHelper_->gain(minGain);\n> - context_.configuration.agc.maxAnalogueGain = camHelper_->gain(maxGain);\n> + context_.configuration.agc.minAnalogueGain = context_.camHelper->gain(minGain);\n> + context_.configuration.agc.maxAnalogueGain = context_.camHelper->gain(maxGain);\n> \n> - if (camHelper_->blackLevel().has_value()) {\n> + if (context_.camHelper->blackLevel().has_value()) {\n> /*\n> * The black level from CameraSensorHelper is a 16-bit value.\n> * The Mali-C55 ISP expects 20-bit settings, so we shift it to\n> * the appropriate width\n> */\n> context_.configuration.sensor.blackLevel =\n> - camHelper_->blackLevel().value() << 4;\n> + context_.camHelper->blackLevel().value() << 4;\n> }\n> }\n> \n> @@ -252,9 +249,9 @@ void IPAMaliC55::updateControls(const IPACameraSensorInfo &sensorInfo,\n> \n> /* Compute the analogue gain limits. */\n> const ControlInfo &v4l2Gain = sensorControls.find(V4L2_CID_ANALOGUE_GAIN)->second;\n> - float minGain = camHelper_->gain(v4l2Gain.min().get());\n> - float maxGain = camHelper_->gain(v4l2Gain.max().get());\n> - float defGain = camHelper_->gain(v4l2Gain.def().get());\n> + float minGain = context_.camHelper->gain(v4l2Gain.min().get());\n> + float maxGain = context_.camHelper->gain(v4l2Gain.max().get());\n> + float defGain = context_.camHelper->gain(v4l2Gain.def().get());\n> ctrlMap[&controls::AnalogueGain] = ControlInfo(minGain, maxGain, defGain);\n> \n> /*\n> @@ -362,7 +359,7 @@ void IPAMaliC55::processStats(unsigned int request, unsigned int bufferId,\n> frameContext.agc.exposure =\n> sensorControls.get(V4L2_CID_EXPOSURE).get();\n> frameContext.agc.sensorGain =\n> - camHelper_->gain(sensorControls.get(V4L2_CID_ANALOGUE_GAIN).get());\n> + context_.camHelper->gain(sensorControls.get(V4L2_CID_ANALOGUE_GAIN).get());\n> \n> ControlList metadata(controls::controls);\n> \n> \n> -- \n> 2.51.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 C7A67BDE4C\n\tfor ;\n\tWed, 5 Nov 2025 05:53:22 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0DEE560A8B;\n\tWed, 5 Nov 2025 06:53:22 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D91D0606A0\n\tfor ;\n\tWed, 5 Nov 2025 06:53:19 +0100 (CET)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:3793:9dc2:3dec:ebc3])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 47E5F7E0;\n\tWed, 5 Nov 2025 06:51:25 +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=\"Q5bUffmP\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1762321885;\n\tbh=823fQok3Gdiy+Q6ZDM4VqgiKJA8qRZQ6A2pYN2/oy+A=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=Q5bUffmPqY4T+g8LWO8G7lSuU8R2ONwr98TzHN/lsoHGqWnFetfHhMKiaiP8IaO+c\n\tHMBt7Bq81pIiTWX9ryxXM3I/oxU3KxY5pJAzVQZYCRAsxZAcIZGyiwvFlPNavJwi+a\n\tJYtOaOoM14mZuqeb6Dd/SfI+7uq8xbZEk8WQcAXw=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20251028-exposure-limits-v2-2-a8b5a318323e@ideasonboard.com>","References":"<20251028-exposure-limits-v2-0-a8b5a318323e@ideasonboard.com>\n\t<20251028-exposure-limits-v2-2-a8b5a318323e@ideasonboard.com>","Subject":"Re: [PATCH v2 02/10] ipa: mali-c55: Move CameraHelper to context","From":"Stefan Klug ","Cc":"Jacopo Mondi ,\n\tKieran Bingham ","To":"Jacopo Mondi , Niklas =?utf-8?b?U8O2?=\n\t=?utf-8?q?derlund?= , Robert Mader\n\t, libcamera-devel@lists.libcamera.org","Date":"Wed, 05 Nov 2025 06:53:16 +0100","Message-ID":"<176232199655.144437.5095041966409940316@localhost>","User-Agent":"alot/0.12.dev8+g2c003385c862.d20250602","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\" "}}]