Patch Detail
Show a patch.
GET /api/1.1/patches/19855/?format=api
{ "id": 19855, "url": "https://patchwork.libcamera.org/api/1.1/patches/19855/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19855/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20240405144729.2992219-6-paul.elder@ideasonboard.com>", "date": "2024-04-05T14:47:29", "name": "[5/5] ipa: rkisp1: agc: Plumb mode-selection and frame duration controls", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "b0e2155e6af3633eb8885e369cdb66f01dae91b3", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/19855/mbox/", "series": [ { "id": 4251, "url": "https://patchwork.libcamera.org/api/1.1/series/4251/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4251", "date": "2024-04-05T14:47:24", "name": "ipa: rkisp1: Improve AGC (plumbing)", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4251/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/19855/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19855/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 BA31DC32CC\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 5 Apr 2024 14:47:56 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 455D963365;\n\tFri, 5 Apr 2024 16:47:56 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 579126335E\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 5 Apr 2024 16:47:54 +0200 (CEST)", "from pyrite.hamster-moth.ts.net (h175-177-049-156.catv02.itscom.jp\n\t[175.177.49.156])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9878F8E1;\n\tFri, 5 Apr 2024 16:47:14 +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=\"ICWwGSSC\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1712328435;\n\tbh=UkIMdnPquCi1Z1Jv8wJhrkji5gwobMzv8tKEA1PGHdM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ICWwGSSCIWHY9LMOVC4IkDb8+dWjhSplx2KNk1BUrR/dmqy436Ezge97LnCbSMeQK\n\tgI/ZN39xKIu/a5XyH4AeKJF6E1zy0nSV/OgH/0CYwYjnj+FU+ygRU4ZT+C/u4JpEil\n\trhDf1okULx6+6Y2WfLveDwWF9Es7BC/ILLeh7H4M=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Paul Elder <paul.elder@ideasonboard.com>", "Subject": "[PATCH 5/5] ipa: rkisp1: agc: Plumb mode-selection and frame\n\tduration controls", "Date": "Fri, 5 Apr 2024 23:47:29 +0900", "Message-Id": "<20240405144729.2992219-6-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.39.2", "In-Reply-To": "<20240405144729.2992219-1-paul.elder@ideasonboard.com>", "References": "<20240405144729.2992219-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "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": "Plumb controls for setting metering mode, exposure mode, constraint\nmode, and frame duration limits. Also report them as available controls,\nas well as in metadata.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n---\n src/ipa/rkisp1/algorithms/agc.cpp | 67 ++++++++++++++++++++-------\n src/ipa/rkisp1/algorithms/agc.h | 5 ++\n src/ipa/rkisp1/algorithms/algorithm.h | 2 +\n src/ipa/rkisp1/ipa_context.h | 4 ++\n src/ipa/rkisp1/rkisp1.cpp | 10 ++++\n 5 files changed, 72 insertions(+), 16 deletions(-)", "diff": "diff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp\nindex a1b6eb39..ed4d6330 100644\n--- a/src/ipa/rkisp1/algorithms/agc.cpp\n+++ b/src/ipa/rkisp1/algorithms/agc.cpp\n@@ -11,6 +11,7 @@\n #include <chrono>\n #include <cmath>\n #include <tuple>\n+#include <vector>\n \n #include <libcamera/base/log.h>\n #include <libcamera/base/utils.h>\n@@ -49,6 +50,7 @@ int Agc::parseMeteringModes(IPAContext &context, const YamlObject &tuningData,\n \t\treturn -EINVAL;\n \t}\n \n+\tstd::vector<ControlValue> availableMeteringModes;\n \tfor (const auto &[key, value] : yamlMeteringModes.asDict()) {\n \t\tif (controls::AeMeteringModeNameValueMap.find(key) ==\n \t\t controls::AeMeteringModeNameValueMap.end()) {\n@@ -67,9 +69,14 @@ int Agc::parseMeteringModes(IPAContext &context, const YamlObject &tuningData,\n \t\t\treturn -ENODATA;\n \t\t}\n \n-\t\tmeteringModes_[controls::AeMeteringModeNameValueMap.at(key)] = weights;\n+\t\tint32_t control = controls::AeMeteringModeNameValueMap.at(key);\n+\t\tmeteringModes_[control] = weights;\n+\t\tavailableMeteringModes.push_back(control);\n \t}\n \n+\tAlgorithm::controls_[&controls::AeMeteringMode] =\n+\t\tControlInfo(availableMeteringModes);\n+\n \treturn 0;\n }\n \n@@ -131,9 +138,25 @@ int Agc::init(IPAContext &context, const YamlObject &tuningData)\n \n \tcontext.ctrlMap.merge(controls());\n \n+\tdefaultConstraintMode_ = constraintModes().begin()->first;\n+\tdefaultExposureMode_ = exposureModeHelpers().begin()->first;\n+\tdefaultMeteringMode_ = meteringModes_.begin()->first;\n+\n+\tAlgorithm::controls_.merge(ControlInfoMap::Map(controls()));\n+\n \treturn 0;\n }\n \n+void Agc::configureExposureModeHelpers(IPAContext &context, utils::Duration maxShutterSpeed)\n+{\n+\tfor (auto &[id, helper] : exposureModeHelpers()) {\n+\t\thelper->configure(context.configuration.sensor.minShutterSpeed,\n+\t\t\t\t maxShutterSpeed,\n+\t\t\t\t context.configuration.sensor.minAnalogueGain,\n+\t\t\t\t context.configuration.sensor.maxAnalogueGain);\n+\t}\n+}\n+\n /**\n * \\brief Configure the AGC given a configInfo\n * \\param[in] context The shared IPA context\n@@ -153,12 +176,8 @@ int Agc::configure(IPAContext &context, const IPACameraSensorInfo &configInfo)\n \tcontext.activeState.agc.manual.dgain = 1;\n \tcontext.activeState.agc.autoEnabled = !context.configuration.raw;\n \n-\t/*\n-\t* \\todo We should use the first available mode rather than assume that\n-\t* the \"Normal\" modes are present in tuning data.\n-\t*/\n-\tcontext.activeState.agc.constraintMode = controls::ConstraintNormal;\n-\tcontext.activeState.agc.exposureMode = controls::ExposureNormal;\n+\tcontext.activeState.agc.constraintMode = defaultConstraintMode_;\n+\tcontext.activeState.agc.exposureMode = defaultExposureMode_;\n \n \t/*\n \t * Define the measurement window for AGC as a centered rectangle\n@@ -169,13 +188,7 @@ int Agc::configure(IPAContext &context, const IPACameraSensorInfo &configInfo)\n \tcontext.configuration.agc.measureWindow.h_size = 3 * configInfo.outputSize.width / 4;\n \tcontext.configuration.agc.measureWindow.v_size = 3 * configInfo.outputSize.height / 4;\n \n-\tfor (auto &[id, helper] : exposureModeHelpers()) {\n-\t\t/* \\todo Run this again when FrameDurationLimits is passed in */\n-\t\thelper->configure(context.configuration.sensor.minShutterSpeed,\n-\t\t\t\t context.configuration.sensor.maxShutterSpeed,\n-\t\t\t\t context.configuration.sensor.minAnalogueGain,\n-\t\t\t\t context.configuration.sensor.maxAnalogueGain);\n-\t}\n+\tconfigureExposureModeHelpers(context, context.configuration.sensor.maxShutterSpeed);\n \n \treturn 0;\n }\n@@ -223,6 +236,20 @@ void Agc::queueRequest(IPAContext &context,\n \t\tframeContext.agc.exposure = agc.manual.exposure;\n \t\tframeContext.agc.gain = agc.manual.gain;\n \t}\n+\n+\tconst auto &meteringMode = controls.get(controls::AeMeteringMode);\n+\tframeContext.agc.meteringMode = meteringMode.value_or(defaultMeteringMode_);\n+\n+\tconst auto &exposureMode = controls.get(controls::AeExposureMode);\n+\tframeContext.agc.exposureMode = exposureMode.value_or(defaultExposureMode_);\n+\n+\tconst auto &constraintMode = controls.get(controls::AeConstraintMode);\n+\tframeContext.agc.constraintMode = constraintMode.value_or(defaultConstraintMode_);\n+\n+\tconst auto &frameDurationLimits = controls.get(controls::FrameDurationLimits);\n+\tframeContext.agc.maxShutterSpeed = frameDurationLimits\n+\t\t\t\t\t ? std::chrono::milliseconds((*frameDurationLimits).back())\n+\t\t\t\t\t : 60ms;\n }\n \n /**\n@@ -262,8 +289,7 @@ void Agc::prepare(IPAContext &context, const uint32_t frame,\n \t\tparams->meas.hst_config.hist_weight,\n \t\tcontext.hw->numHistogramWeights\n \t};\n-\t/* \\todo Get this from control */\n-\tstd::vector<uint8_t> &modeWeights = meteringModes_.at(controls::MeteringMatrix);\n+\tstd::vector<uint8_t> &modeWeights = meteringModes_.at(frameContext.agc.meteringMode);\n \tstd::copy(modeWeights.begin(), modeWeights.end(), weights.begin());\n \n \tstd::stringstream str;\n@@ -290,6 +316,7 @@ void Agc::fillMetadata(IPAContext &context, IPAFrameContext &frameContext,\n \t\t\t\t * frameContext.sensor.exposure;\n \tmetadata.set(controls::AnalogueGain, frameContext.sensor.gain);\n \tmetadata.set(controls::ExposureTime, exposureTime.get<std::micro>());\n+\tmetadata.set(controls::AeEnable, frameContext.agc.autoEnabled);\n \n \t/* \\todo Use VBlank value calculated from each frame exposure. */\n \tuint32_t vTotal = context.configuration.sensor.size.height\n@@ -297,6 +324,10 @@ void Agc::fillMetadata(IPAContext &context, IPAFrameContext &frameContext,\n \tutils::Duration frameDuration = context.configuration.sensor.lineDuration\n \t\t\t\t * vTotal;\n \tmetadata.set(controls::FrameDuration, frameDuration.get<std::micro>());\n+\n+\tmetadata.set(controls::AeMeteringMode, frameContext.agc.meteringMode);\n+\tmetadata.set(controls::AeExposureMode, frameContext.agc.exposureMode);\n+\tmetadata.set(controls::AeConstraintMode, frameContext.agc.constraintMode);\n }\n \n void Agc::parseStatistics(const rkisp1_stat_buffer *stats,\n@@ -378,6 +409,10 @@ void Agc::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,\n \n \tASSERT(stats->meas_type & RKISP1_CIF_ISP_STAT_AUTOEXP);\n \n+\tutils::Duration maxShutterSpeed = std::min(context.configuration.sensor.maxShutterSpeed,\n+\t\t\t\t\t\t frameContext.agc.maxShutterSpeed);\n+\tconfigureExposureModeHelpers(context, maxShutterSpeed);\n+\n \tparseStatistics(stats, context);\n \n \t/*\ndiff --git a/src/ipa/rkisp1/algorithms/agc.h b/src/ipa/rkisp1/algorithms/agc.h\nindex 43e3d5b2..c05ba4be 100644\n--- a/src/ipa/rkisp1/algorithms/agc.h\n+++ b/src/ipa/rkisp1/algorithms/agc.h\n@@ -47,6 +47,7 @@ private:\n \tint parseMeteringModes(IPAContext &context, const YamlObject &tuningData,\n \t\t\t const char *prop);\n \tuint8_t predivider(Size &size);\n+\tvoid configureExposureModeHelpers(IPAContext &context, utils::Duration maxShutterSpeed);\n \n \tvoid fillMetadata(IPAContext &context, IPAFrameContext &frameContext,\n \t\t\t ControlList &metadata);\n@@ -58,6 +59,10 @@ private:\n \tSpan<const uint8_t> expMeans_;\n \n \tstd::map<int32_t, std::vector<uint8_t>> meteringModes_;\n+\n+\tint32_t defaultConstraintMode_;\n+\tint32_t defaultExposureMode_;\n+\tint32_t defaultMeteringMode_;\n };\n \n } /* namespace ipa::rkisp1::algorithms */\ndiff --git a/src/ipa/rkisp1/algorithms/algorithm.h b/src/ipa/rkisp1/algorithms/algorithm.h\nindex 9454c9a1..c3a002b8 100644\n--- a/src/ipa/rkisp1/algorithms/algorithm.h\n+++ b/src/ipa/rkisp1/algorithms/algorithm.h\n@@ -25,6 +25,8 @@ public:\n \n \tbool disabled_;\n \tbool supportsRaw_;\n+\n+\tControlInfoMap::Map controls_;\n };\n \n } /* namespace ipa::rkisp1 */\ndiff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\nindex a70c7eb3..dc876da0 100644\n--- a/src/ipa/rkisp1/ipa_context.h\n+++ b/src/ipa/rkisp1/ipa_context.h\n@@ -114,6 +114,10 @@ struct IPAFrameContext : public FrameContext {\n \t\tdouble gain;\n \t\tdouble dgain;\n \t\tbool autoEnabled;\n+\t\tint32_t meteringMode;\n+\t\tint32_t exposureMode;\n+\t\tint32_t constraintMode;\n+\t\tutils::Duration maxShutterSpeed;\n \t} agc;\n \n \tstruct {\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex d66dfdd7..3654b5a6 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -80,6 +80,7 @@ private:\n \tstd::map<unsigned int, MappedFrameBuffer> mappedBuffers_;\n \n \tControlInfoMap sensorControls_;\n+\tControlInfoMap::Map algoControls_;\n \n \t/* Interface to the Camera Helper */\n \tstd::unique_ptr<CameraSensorHelper> camHelper_;\n@@ -193,6 +194,14 @@ int IPARkISP1::init(const IPASettings &settings, unsigned int hwRevision,\n \tif (ret)\n \t\treturn ret;\n \n+\tfor (auto const &a : algorithms()) {\n+\t\tAlgorithm *algo = static_cast<Algorithm *>(a.get());\n+\n+\t\t/* \\todo Avoid merging duplicate controls */\n+\t\tif (!algo->controls_.empty())\n+\t\t\talgoControls_.merge(ControlInfoMap::Map(algo->controls_));\n+\t}\n+\n \t/* Initialize controls. */\n \tupdateControls(sensorInfo, sensorControls, ipaControls);\n \n@@ -377,6 +386,7 @@ void IPARkISP1::updateControls(const IPACameraSensorInfo &sensorInfo,\n \t\t\t ControlInfoMap *ipaControls)\n {\n \tControlInfoMap::Map ctrlMap = rkisp1Controls;\n+\tctrlMap.merge(algoControls_);\n \n \t/*\n \t * Compute exposure time limits from the V4L2_CID_EXPOSURE control\n", "prefixes": [ "5/5" ] }