Patch Detail
Show a patch.
GET /api/patches/17855/?format=api
{ "id": 17855, "url": "https://patchwork.libcamera.org/api/patches/17855/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17855/", "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": "<20221124025133.17875-5-laurent.pinchart@ideasonboard.com>", "date": "2022-11-24T02:51:28", "name": "[libcamera-devel,v4,4/9] ipa: rkisp1: Add support for manual gain and exposure", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "cdf19dd894a1c5d9d5380f17b2ba1689567c2d03", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17855/mbox/", "series": [ { "id": 3634, "url": "https://patchwork.libcamera.org/api/series/3634/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3634", "date": "2022-11-24T02:51:24", "name": "Add Bayer format support for RkISP1", "version": 4, "mbox": "https://patchwork.libcamera.org/series/3634/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17855/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17855/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 2C83BC3286\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 24 Nov 2022 02:51:58 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B34C063322;\n\tThu, 24 Nov 2022 03:51:57 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CCF1563313\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 24 Nov 2022 03:51:55 +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 619C4496;\n\tThu, 24 Nov 2022 03:51:55 +0100 (CET)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1669258317;\n\tbh=AvK98lEHmZhXRJ/k3wkhLy85q2ewWwDf1lrRQ8IukCc=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=h34fI41jnx8D8vRSbeuIOJyd5HCcLS4bBGRUTjZM4aCiFw26Z0kcUpqMIiA2dgW+t\n\tTlTVKBbLjo579g+czVjBaDH+gV4zJdq9+lY7/nJTXjnddEVPCyn2iukVlLjgGxABR2\n\tApXQub6H2VgybvHy3qqHHpuZAieoQBEuwQ1jQ1W3L/aEZBXRjXn1P2KiKo/x1tLtMb\n\t3F3xhbhO8uWVagcgrihSOAeHbuIUKS4/bix3+fOvNAxCcftq1UJa2jx6CroG9wsFjW\n\tNYIJmBZi9AO1dWGY5IS02vsuIbAcn4HHM00BT5nxskblkxSRzaFd+g3dx8vIQlaHb/\n\trmgaxkNvUeMnQ==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1669258315;\n\tbh=AvK98lEHmZhXRJ/k3wkhLy85q2ewWwDf1lrRQ8IukCc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=cuk0GJ20gVrqC170Ayl8jdyjBU61TiuylynHIP6Zv49hnu+Bvxl7FOi9now+3l5q/\n\tS9Uqsdnc1qup4ewdgo/X/TjC/e+LrDQY0j/RkAhN/JvPHnwvv19K6qoAlgEC1khQwb\n\tJprZ506NEagRS9Tzx5laGHknuIgywGsN92chJoBY=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"cuk0GJ20\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 24 Nov 2022 04:51:28 +0200", "Message-Id": "<20221124025133.17875-5-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.37.4", "In-Reply-To": "<20221124025133.17875-1-laurent.pinchart@ideasonboard.com>", "References": "<20221124025133.17875-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 4/9] ipa: rkisp1: Add support for\n\tmanual gain and exposure", "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>", "From": "Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "From: Paul Elder <paul.elder@ideasonboard.com>\n\nAdd support for manual gain and exposure in the rkisp1 IPA.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\nChanges since v3:\n\n- Convert exposure and gain V4L2 controls limits to libcamera values\n- Convert exposure control from duration to lines in AGC\n- Initialize lineDuration in init()\n- Small fixes in debug messages\n- Drop unnecessary curly braces\n- Use std::piecewise_construct\n---\n src/ipa/rkisp1/algorithms/agc.cpp | 63 +++++++++++++++++++++++++++----\n src/ipa/rkisp1/algorithms/agc.h | 4 ++\n src/ipa/rkisp1/ipa_context.h | 13 ++++++-\n src/ipa/rkisp1/rkisp1.cpp | 25 ++++++++++++\n 4 files changed, 96 insertions(+), 9 deletions(-)", "diff": "diff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp\nindex 169afe372803..ccbcd4a9583d 100644\n--- a/src/ipa/rkisp1/algorithms/agc.cpp\n+++ b/src/ipa/rkisp1/algorithms/agc.cpp\n@@ -74,9 +74,14 @@ Agc::Agc()\n int Agc::configure(IPAContext &context, const IPACameraSensorInfo &configInfo)\n {\n \t/* Configure the default exposure and gain. */\n-\tcontext.activeState.agc.gain = std::max(context.configuration.sensor.minAnalogueGain,\n-\t\t\t\t\t\tkMinAnalogueGain);\n-\tcontext.activeState.agc.exposure = 10ms / context.configuration.sensor.lineDuration;\n+\tcontext.activeState.agc.automatic.gain =\n+\t\tstd::max(context.configuration.sensor.minAnalogueGain,\n+\t\t\t kMinAnalogueGain);\n+\tcontext.activeState.agc.automatic.exposure =\n+\t\t10ms / context.configuration.sensor.lineDuration;\n+\tcontext.activeState.agc.manual.gain = context.activeState.agc.automatic.gain;\n+\tcontext.activeState.agc.manual.exposure = context.activeState.agc.automatic.exposure;\n+\tcontext.activeState.agc.autoEnabled = true;\n \n \t/*\n \t * According to the RkISP1 documentation:\n@@ -108,14 +113,58 @@ int Agc::configure(IPAContext &context, const IPACameraSensorInfo &configInfo)\n \treturn 0;\n }\n \n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::queueRequest\n+ */\n+void Agc::queueRequest(IPAContext &context,\n+\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t IPAFrameContext &frameContext,\n+\t\t const ControlList &controls)\n+{\n+\tauto &agc = context.activeState.agc;\n+\n+\tconst auto &agcEnable = controls.get(controls::AeEnable);\n+\tif (agcEnable && *agcEnable != agc.autoEnabled) {\n+\t\tagc.autoEnabled = *agcEnable;\n+\n+\t\tLOG(RkISP1Agc, Debug)\n+\t\t\t<< (agc.autoEnabled ? \"Enabling\" : \"Disabling\") << \" AGC\";\n+\t}\n+\n+\tconst auto &exposure = controls.get(controls::ExposureTime);\n+\tif (exposure && !agc.autoEnabled) {\n+\t\tagc.manual.exposure = *exposure * 1.0us\n+\t\t\t\t / context.configuration.sensor.lineDuration;\n+\n+\t\tLOG(RkISP1Agc, Debug)\n+\t\t\t<< \"Set exposure to \" << agc.manual.exposure;\n+\t}\n+\n+\tconst auto &gain = controls.get(controls::AnalogueGain);\n+\tif (gain && !agc.autoEnabled) {\n+\t\tagc.manual.gain = *gain;\n+\n+\t\tLOG(RkISP1Agc, Debug) << \"Set gain to \" << agc.manual.gain;\n+\t}\n+\n+\tframeContext.agc.autoEnabled = agc.autoEnabled;\n+\n+\tif (!frameContext.agc.autoEnabled) {\n+\t\tframeContext.agc.exposure = agc.manual.exposure;\n+\t\tframeContext.agc.gain = agc.manual.gain;\n+\t}\n+}\n+\n /**\n * \\copydoc libcamera::ipa::Algorithm::prepare\n */\n void Agc::prepare(IPAContext &context, const uint32_t frame,\n \t\t IPAFrameContext &frameContext, rkisp1_params_cfg *params)\n {\n-\tframeContext.agc.exposure = context.activeState.agc.exposure;\n-\tframeContext.agc.gain = context.activeState.agc.gain;\n+\tif (frameContext.agc.autoEnabled) {\n+\t\tframeContext.agc.exposure = context.activeState.agc.automatic.exposure;\n+\t\tframeContext.agc.gain = context.activeState.agc.automatic.gain;\n+\t}\n \n \tif (frame > 0)\n \t\treturn;\n@@ -263,8 +312,8 @@ void Agc::computeExposure(IPAContext &context, IPAFrameContext &frameContext,\n \t\t\t << stepGain;\n \n \t/* Update the estimated exposure and gain. */\n-\tactiveState.agc.exposure = shutterTime / configuration.sensor.lineDuration;\n-\tactiveState.agc.gain = stepGain;\n+\tactiveState.agc.automatic.exposure = shutterTime / configuration.sensor.lineDuration;\n+\tactiveState.agc.automatic.gain = stepGain;\n }\n \n /**\ndiff --git a/src/ipa/rkisp1/algorithms/agc.h b/src/ipa/rkisp1/algorithms/agc.h\nindex da4d2d4e8359..a228d0c37768 100644\n--- a/src/ipa/rkisp1/algorithms/agc.h\n+++ b/src/ipa/rkisp1/algorithms/agc.h\n@@ -26,6 +26,10 @@ public:\n \t~Agc() = default;\n \n \tint configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;\n+\tvoid queueRequest(IPAContext &context,\n+\t\t\t const uint32_t frame,\n+\t\t\t IPAFrameContext &frameContext,\n+\t\t\t const ControlList &controls) override;\n \tvoid prepare(IPAContext &context, const uint32_t frame,\n \t\t IPAFrameContext &frameContext,\n \t\t rkisp1_params_cfg *params) override;\ndiff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\nindex 3e47ac663c58..b9b2065328d6 100644\n--- a/src/ipa/rkisp1/ipa_context.h\n+++ b/src/ipa/rkisp1/ipa_context.h\n@@ -54,8 +54,16 @@ struct IPASessionConfiguration {\n \n struct IPAActiveState {\n \tstruct {\n-\t\tuint32_t exposure;\n-\t\tdouble gain;\n+\t\tstruct {\n+\t\t\tuint32_t exposure;\n+\t\t\tdouble gain;\n+\t\t} manual;\n+\t\tstruct {\n+\t\t\tuint32_t exposure;\n+\t\t\tdouble gain;\n+\t\t} automatic;\n+\n+\t\tbool autoEnabled;\n \t} agc;\n \n \tstruct {\n@@ -96,6 +104,7 @@ struct IPAFrameContext : public FrameContext {\n \tstruct {\n \t\tuint32_t exposure;\n \t\tdouble gain;\n+\t\tbool autoEnabled;\n \t} agc;\n \n \tstruct {\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 6ac29df8ec8d..76e818d2d11e 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -158,6 +158,9 @@ int IPARkISP1::init(const IPASettings &settings, unsigned int hwRevision,\n \t\treturn -ENODEV;\n \t}\n \n+\tcontext_.configuration.sensor.lineDuration = sensorInfo.minLineLength\n+\t\t\t\t\t\t * 1.0s / sensorInfo.pixelRate;\n+\n \t/* Load the tuning data file. */\n \tFile file(settings.configurationFile);\n \tif (!file.open(File::OpenModeFlag::ReadOnly)) {\n@@ -377,6 +380,28 @@ void IPARkISP1::updateControls(const IPACameraSensorInfo &sensorInfo,\n {\n \tControlInfoMap::Map ctrlMap = rkisp1Controls;\n \n+\t/*\n+\t * Compute exposure time limits from the V4L2_CID_EXPOSURE control\n+\t * limits and the line duration.\n+\t */\n+\tdouble lineDuration = context_.configuration.sensor.lineDuration.get<std::micro>();\n+\tconst ControlInfo &v4l2Exposure = sensorControls.find(V4L2_CID_EXPOSURE)->second;\n+\tint32_t minExposure = v4l2Exposure.min().get<int32_t>() * lineDuration;\n+\tint32_t maxExposure = v4l2Exposure.max().get<int32_t>() * lineDuration;\n+\tint32_t defExposure = v4l2Exposure.def().get<int32_t>() * lineDuration;\n+\tctrlMap.emplace(std::piecewise_construct,\n+\t\t\tstd::forward_as_tuple(&controls::ExposureTime),\n+\t\t\tstd::forward_as_tuple(minExposure, maxExposure, defExposure));\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<int32_t>());\n+\tfloat maxGain = camHelper_->gain(v4l2Gain.max().get<int32_t>());\n+\tfloat defGain = camHelper_->gain(v4l2Gain.def().get<int32_t>());\n+\tctrlMap.emplace(std::piecewise_construct,\n+\t\t\tstd::forward_as_tuple(&controls::AnalogueGain),\n+\t\t\tstd::forward_as_tuple(minGain, maxGain, defGain));\n+\n \t/*\n \t * Compute the frame duration limits.\n \t *\n", "prefixes": [ "libcamera-devel", "v4", "4/9" ] }