Patch Detail
Show a patch.
GET /api/patches/27470/?format=api
{ "id": 27470, "url": "https://patchwork.libcamera.org/api/patches/27470/?format=api", "web_url": "https://patchwork.libcamera.org/patch/27470/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20260723154327.1357866-21-barnabas.pocze@ideasonboard.com>", "date": "2026-07-23T15:43:03", "name": "[RFC,v2,20/43] ipa: Simplify sensor exposure/gain setting/getting", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "2aba9393ae1919b1df1dffe8510736f23a2a5967", "submitter": { "id": 216, "url": "https://patchwork.libcamera.org/api/people/216/?format=api", "name": "Barnabás Pőcze", "email": "barnabas.pocze@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/27470/mbox/", "series": [ { "id": 6075, "url": "https://patchwork.libcamera.org/api/series/6075/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=6075", "date": "2026-07-23T15:42:43", "name": "ipa: libipa: agc rework", "version": 2, "mbox": "https://patchwork.libcamera.org/series/6075/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/27470/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/27470/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 411FFC32FE\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 23 Jul 2026 15:44:05 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9D69567F43;\n\tThu, 23 Jul 2026 17:44:04 +0200 (CEST)", "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 5DE6667ED2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 23 Jul 2026 17:43:35 +0200 (CEST)", "from pb-laptop.local (185.182.215.156.nat.pool.zt.hu\n\t[185.182.215.156])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8460E1C37\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 23 Jul 2026 17:42:34 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"evWBDo43\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1784821354;\n\tbh=pvOoEl6K/zN1hhJVV5+pVpjqvC1d+U2qEwMpNAFizvs=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=evWBDo439+YpzLgjnkZ6ap45SpZq1CwBtmKsGsrmrYKf9F6biraUN+MjPgLmh9RTq\n\tz2VtwEbWWWPzco6sZsNFxJQe8lhLfguuNsoIELtnseZzX+4z/o834JiNY0d4j9p9dZ\n\tZ6fSTMgLwCJlCvkrzoe7CdE7a69NtqMTpmTY3Sbc=", "From": "=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= <barnabas.pocze@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Subject": "[RFC PATCH v2 20/43] ipa: Simplify sensor exposure/gain\n\tsetting/getting", "Date": "Thu, 23 Jul 2026 17:43:03 +0200", "Message-ID": "<20260723154327.1357866-21-barnabas.pocze@ideasonboard.com>", "X-Mailer": "git-send-email 2.55.0", "In-Reply-To": "<20260723154327.1357866-1-barnabas.pocze@ideasonboard.com>", "References": "<20260723154327.1357866-1-barnabas.pocze@ideasonboard.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Move the extraction and preparation of `V4L2_CID_{EXPOSURE,ANALOGUE_GAIN}`\ninto separate functions. This also implements support for not having a\na camera sensor helper.\n\nSigned-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>\n---\n src/ipa/ipu3/ipu3.cpp | 14 +++++-----\n src/ipa/libipa/agc.h | 49 ++++++++++++++++++++++++++++++++++\n src/ipa/libipa/meson.build | 1 +\n src/ipa/mali-c55/mali-c55.cpp | 17 +++++-------\n src/ipa/rkisp1/rkisp1.cpp | 11 +++-----\n src/ipa/simple/soft_simple.cpp | 15 +++--------\n 6 files changed, 72 insertions(+), 35 deletions(-)\n create mode 100644 src/ipa/libipa/agc.h", "diff": "diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 4bdc4b7677..51379808cd 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -36,6 +36,7 @@\n #include \"libcamera/internal/mapped_framebuffer.h\"\n #include \"libcamera/internal/yaml_parser.h\"\n \n+#include \"libipa/agc.h\"\n #include \"libipa/camera_sensor_helper.h\"\n \n #include \"ipa_context.h\"\n@@ -596,8 +597,8 @@ void IPAIPU3::processStats(const uint32_t frame,\n \n \tIPAFrameContext &frameContext = context_.frameContexts.get(frame);\n \n-\tframeContext.sensor.exposure = sensorControls.get(V4L2_CID_EXPOSURE).get<int32_t>();\n-\tframeContext.sensor.gain = camHelper_->gain(sensorControls.get(V4L2_CID_ANALOGUE_GAIN).get<int32_t>());\n+\tstd::tie(frameContext.sensor.exposure, frameContext.sensor.gain)\n+\t\t= agc::extractControls(sensorControls, camHelper_.get());\n \n \tControlList metadata(controls::controls);\n \n@@ -642,12 +643,11 @@ void IPAIPU3::queueRequest(const uint32_t frame, const ControlList &controls)\n */\n void IPAIPU3::setControls(unsigned int frame)\n {\n-\tint32_t exposure = context_.activeState.agc.exposure;\n-\tint32_t gain = camHelper_->gainCode(context_.activeState.agc.gain);\n-\n \tControlList ctrls(sensorCtrls_);\n-\tctrls.set(V4L2_CID_EXPOSURE, exposure);\n-\tctrls.set(V4L2_CID_ANALOGUE_GAIN, gain);\n+\tagc::prepareControls(\n+\t\tctrls, camHelper_.get(),\n+\t\tcontext_.activeState.agc.exposure, context_.activeState.agc.gain\n+\t);\n \n \tControlList lensCtrls(lensCtrls_);\n \tlensCtrls.set(V4L2_CID_FOCUS_ABSOLUTE,\ndiff --git a/src/ipa/libipa/agc.h b/src/ipa/libipa/agc.h\nnew file mode 100644\nindex 0000000000..5247425952\n--- /dev/null\n+++ b/src/ipa/libipa/agc.h\n@@ -0,0 +1,49 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2026 Ideas on Board Oy\n+ *\n+ * AGC-related functionality\n+ */\n+\n+#pragma once\n+\n+#include <utility>\n+\n+#include <linux/v4l2-controls.h>\n+\n+#include <libcamera/controls.h>\n+\n+#include \"camera_sensor_helper.h\"\n+\n+namespace libcamera {\n+\n+namespace ipa {\n+\n+namespace agc {\n+\n+[[nodiscard]]\n+inline std::pair<uint32_t, double>\n+extractControls(const ControlList &controls, const CameraSensorHelper *sensor)\n+{\n+\tauto exposure = controls.get(V4L2_CID_EXPOSURE).get<int32_t>();\n+\tauto gainCode = controls.get(V4L2_CID_ANALOGUE_GAIN).get<int32_t>();\n+\n+\treturn {\n+\t\tuint32_t(exposure),\n+\t\tsensor ? sensor->gain(gainCode) : gainCode,\n+\t};\n+}\n+\n+inline void\n+prepareControls(ControlList &controls, const CameraSensorHelper *sensor,\n+\t\tint32_t exposure, double gain)\n+{\n+\tcontrols.set(V4L2_CID_EXPOSURE, exposure);\n+\tcontrols.set(V4L2_CID_ANALOGUE_GAIN, int32_t(sensor ? sensor->gainCode(gain) : gain));\n+}\n+\n+} /* namespace agc */\n+\n+} /* namespace ipa */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/libipa/meson.build b/src/ipa/libipa/meson.build\nindex 963c5ee730..05f1a8749c 100644\n--- a/src/ipa/libipa/meson.build\n+++ b/src/ipa/libipa/meson.build\n@@ -1,6 +1,7 @@\n # SPDX-License-Identifier: CC0-1.0\n \n libipa_headers = files([\n+ 'agc.h',\n 'agc_mean_luminance.h',\n 'algorithm.h',\n 'awb_bayes.h',\ndiff --git a/src/ipa/mali-c55/mali-c55.cpp b/src/ipa/mali-c55/mali-c55.cpp\nindex 1d3af0627f..65e5297766 100644\n--- a/src/ipa/mali-c55/mali-c55.cpp\n+++ b/src/ipa/mali-c55/mali-c55.cpp\n@@ -27,6 +27,7 @@\n #include \"libcamera/internal/yaml_parser.h\"\n \n #include \"algorithms/algorithm.h\"\n+#include \"libipa/agc.h\"\n #include \"libipa/camera_sensor_helper.h\"\n \n #include \"ipa_context.h\"\n@@ -141,20 +142,18 @@ void IPAMaliC55::setControls()\n {\n \tIPAActiveState &activeState = context_.activeState;\n \tuint32_t exposure;\n-\tuint32_t gain;\n+\tdouble gain;\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 = 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 = activeState.agc.manual.sensorGain;\n \t}\n \n \tControlList ctrls(sensorControls_);\n-\tctrls.set(V4L2_CID_EXPOSURE, static_cast<int32_t>(exposure));\n-\tctrls.set(V4L2_CID_ANALOGUE_GAIN, static_cast<int32_t>(gain));\n-\n+\tagc::prepareControls(ctrls, camHelper_.get(), exposure, gain);\n \tsetSensorControls.emit(ctrls);\n }\n \n@@ -352,10 +351,8 @@ void IPAMaliC55::processStats(unsigned int request, unsigned int bufferId,\n \tstats = reinterpret_cast<mali_c55_stats_buffer *>(\n \t\tbuffers_.at(bufferId).planes()[0].data());\n \n-\tframeContext.agc.exposure =\n-\t\tsensorControls.get(V4L2_CID_EXPOSURE).get<int32_t>();\n-\tframeContext.agc.sensorGain =\n-\t\tcamHelper_->gain(sensorControls.get(V4L2_CID_ANALOGUE_GAIN).get<int32_t>());\n+\tstd::tie(frameContext.agc.exposure, frameContext.agc.sensorGain)\n+\t\t= agc::extractControls(sensorControls, camHelper_.get());\n \n \tControlList metadata(controls::controls);\n \ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 38f55b1d86..acb878d814 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -31,6 +31,7 @@\n #include \"libcamera/internal/yaml_parser.h\"\n \n #include \"algorithms/algorithm.h\"\n+#include \"libipa/agc.h\"\n \n #include \"ipa_context.h\"\n #include \"params.h\"\n@@ -328,10 +329,8 @@ void IPARkISP1::processStats(const uint32_t frame, const uint32_t bufferId,\n \t\tstats = reinterpret_cast<rkisp1_stat_buffer *>(\n \t\t\tmappedBuffers_.at(bufferId).planes()[0].data());\n \n-\tframeContext.sensor.exposure =\n-\t\tsensorControls.get(V4L2_CID_EXPOSURE).get<int32_t>();\n-\tframeContext.sensor.gain =\n-\t\tcontext_.camHelper->gain(sensorControls.get(V4L2_CID_ANALOGUE_GAIN).get<int32_t>());\n+\tstd::tie(frameContext.sensor.exposure, frameContext.sensor.gain)\n+\t\t= agc::extractControls(sensorControls, context_.camHelper.get());\n \n \tControlList metadata(controls::controls);\n \n@@ -365,7 +364,6 @@ void IPARkISP1::setControls(unsigned int frame)\n \n \tIPAFrameContext &frameContext = context_.frameContexts.get(frame);\n \tuint32_t exposure = frameContext.agc.exposure;\n-\tuint32_t gain = context_.camHelper->gainCode(frameContext.agc.gain);\n \tuint32_t vblank = frameContext.agc.vblank;\n \n \tLOG(IPARkISP1, Debug)\n@@ -373,8 +371,7 @@ void IPARkISP1::setControls(unsigned int frame)\n \t\t<< \", gain \" << frameContext.agc.gain << \", vblank \" << vblank;\n \n \tControlList ctrls(context_.sensorControls);\n-\tctrls.set(V4L2_CID_EXPOSURE, static_cast<int32_t>(exposure));\n-\tctrls.set(V4L2_CID_ANALOGUE_GAIN, static_cast<int32_t>(gain));\n+\tagc::prepareControls(ctrls, context_.camHelper.get(), exposure, frameContext.agc.gain);\n \tctrls.set(V4L2_CID_VBLANK, static_cast<int32_t>(vblank));\n \n \tsetSensorControls.emit(frame, ctrls);\ndiff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp\nindex 3932daaa1f..a38fcff7d8 100644\n--- a/src/ipa/simple/soft_simple.cpp\n+++ b/src/ipa/simple/soft_simple.cpp\n@@ -27,6 +27,7 @@\n #include \"libcamera/internal/yaml_parser.h\"\n \n #include \"algorithms/adjust.h\"\n+#include \"libipa/agc.h\"\n #include \"libipa/camera_sensor_helper.h\"\n \n #include \"module.h\"\n@@ -301,10 +302,8 @@ void IPASoftSimple::processStats(const uint32_t frame,\n {\n \tIPAFrameContext &frameContext = context_.frameContexts.get(frame);\n \n-\tframeContext.sensor.exposure =\n-\t\tsensorControls.get(V4L2_CID_EXPOSURE).get<int32_t>();\n-\tint32_t again = sensorControls.get(V4L2_CID_ANALOGUE_GAIN).get<int32_t>();\n-\tframeContext.sensor.gain = camHelper_ ? camHelper_->gain(again) : again;\n+\tstd::tie(frameContext.sensor.exposure, frameContext.sensor.gain)\n+\t\t= agc::extractControls(sensorControls, camHelper_.get());\n \n \tControlList metadata(controls::controls);\n \tfor (const auto &algo : algorithms())\n@@ -312,13 +311,7 @@ void IPASoftSimple::processStats(const uint32_t frame,\n \tmetadataReady.emit(frame, metadata);\n \n \tControlList ctrls(sensorInfoMap_);\n-\n-\tint32_t againNew = camHelper_\n-\t\t? camHelper_->gainCode(frameContext.agc.gain)\n-\t\t: static_cast<int32_t>(frameContext.agc.gain);\n-\tctrls.set(V4L2_CID_EXPOSURE, frameContext.agc.exposure);\n-\tctrls.set(V4L2_CID_ANALOGUE_GAIN, againNew);\n-\n+\tagc::prepareControls(ctrls, camHelper_.get(), frameContext.agc.exposure, frameContext.agc.gain);\n \tsetSensorControls.emit(ctrls);\n }\n \n", "prefixes": [ "RFC", "v2", "20/43" ] }