Patch Detail
Show a patch.
GET /api/1.1/patches/14243/?format=api
{ "id": 14243, "url": "https://patchwork.libcamera.org/api/1.1/patches/14243/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14243/", "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": "<20211022073249.35084-7-jeanmichel.hautbois@ideasonboard.com>", "date": "2021-10-22T07:32:41", "name": "[libcamera-devel,v4,06/14] ipa: ipu3: agc: Change exposure limits", "commit_ref": "355503233baae4ebf4ad6fd64023e66d4b05cb7e", "pull_url": null, "state": "accepted", "archived": false, "hash": "4c5038f6d453270fac7962d0c976c1eb141b8dc5", "submitter": { "id": 75, "url": "https://patchwork.libcamera.org/api/1.1/people/75/?format=api", "name": "Jean-Michel Hautbois", "email": "jeanmichel.hautbois@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/14243/mbox/", "series": [ { "id": 2647, "url": "https://patchwork.libcamera.org/api/1.1/series/2647/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2647", "date": "2021-10-22T07:32:35", "name": "ipa: ipu3: Fix AGC bugs", "version": 4, "mbox": "https://patchwork.libcamera.org/series/2647/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14243/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14243/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 C8279BF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 22 Oct 2021 07:33:05 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1747768F73;\n\tFri, 22 Oct 2021 09:33:05 +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 5666F68F5A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 22 Oct 2021 09:32:55 +0200 (CEST)", "from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:22cc:3af6:5ccb:8367])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 093D651D;\n\tFri, 22 Oct 2021 09:32:55 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"eB3Ou34h\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1634887975;\n\tbh=Hy+TDqG/3B5iRlX4WoQ7KJSk+yCGiD9F16WtlbDpCyw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=eB3Ou34hI2KQwlseaAY6/orRqiyMCGbmWxSK/bUQBszOOZvaPW4/1S93fl6rFUz5G\n\tVpXnOS4KVWEz0UcrIzZpB+a5O6ahtxeiIGFYg/o3GsluDvJ2IoDcIPTNT/vx8sLteI\n\twvMccH4GJh9OH6gHzQVyfkIGjgYnFL5Q4Cep3ej4=", "From": "Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 22 Oct 2021 09:32:41 +0200", "Message-Id": "<20211022073249.35084-7-jeanmichel.hautbois@ideasonboard.com>", "X-Mailer": "git-send-email 2.32.0", "In-Reply-To": "<20211022073249.35084-1-jeanmichel.hautbois@ideasonboard.com>", "References": "<20211022073249.35084-1-jeanmichel.hautbois@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 06/14] ipa: ipu3: agc: Change exposure\n\tlimits", "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": "We are using arbitrary constants for the exposure limit in a number of\nlines.\n\nInstead of using static constants for those, use the limits of the\nsensor passed in IPASessionConfiguration and cache those.\n\nSigned-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/ipa/ipu3/algorithms/agc.cpp | 35 +++++++++++++++++++--------------\n src/ipa/ipu3/algorithms/agc.h | 3 ++-\n 2 files changed, 22 insertions(+), 16 deletions(-)", "diff": "diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\nindex 62ea0916..58872410 100644\n--- a/src/ipa/ipu3/algorithms/agc.cpp\n+++ b/src/ipa/ipu3/algorithms/agc.cpp\n@@ -39,18 +39,14 @@ static constexpr uint32_t kMaxISO = 1500;\n static constexpr uint32_t kMinGain = kMinISO / 100;\n static constexpr uint32_t kMaxGain = kMaxISO / 100;\n \n-/* \\todo use calculated value based on sensor */\n-static constexpr uint32_t kMinExposure = 1;\n-static constexpr uint32_t kMaxExposure = 1976;\n-\n /* Histogram constants */\n static constexpr uint32_t knumHistogramBins = 256;\n static constexpr double kEvGainTarget = 0.5;\n \n Agc::Agc()\n \t: frameCount_(0), lastFrame_(0), iqMean_(0.0), lineDuration_(0s),\n-\t maxExposureTime_(0s), filteredExposure_(0s), filteredExposureNoDg_(0s),\n-\t currentExposure_(0s), currentExposureNoDg_(0s)\n+\t minExposureLines_(0), maxExposureLines_(0), filteredExposure_(0s),\n+\t filteredExposureNoDg_(0s), currentExposure_(0s), currentExposureNoDg_(0s)\n {\n }\n \n@@ -60,13 +56,15 @@ int Agc::configure(IPAContext &context, const IPAConfigInfo &configInfo)\n \n \tlineDuration_ = configInfo.sensorInfo.lineLength * 1.0s\n \t\t / configInfo.sensorInfo.pixelRate;\n-\tmaxExposureTime_ = context.configuration.agc.maxShutterSpeed;\n+\n+\t/* \\todo replace the exposure in lines storage with time based ones. */\n+\tminExposureLines_ = context.configuration.agc.minShutterSpeed / lineDuration_;\n+\tmaxExposureLines_ = context.configuration.agc.maxShutterSpeed / lineDuration_;\n \n \t/* Configure the default exposure and gain. */\n \tcontext.frameContext.agc.gain =\n \t\tcontext.configuration.agc.minAnalogueGain;\n-\tcontext.frameContext.agc.exposure =\n-\t\tcontext.configuration.agc.minShutterSpeed / lineDuration_;\n+\tcontext.frameContext.agc.exposure = minExposureLines_;\n \n \treturn 0;\n }\n@@ -151,23 +149,30 @@ void Agc::lockExposureGain(uint32_t &exposure, double &gain)\n \t\tLOG(IPU3Agc, Debug) << \"Actual total exposure \" << currentExposureNoDg_\n \t\t\t\t << \" Shutter speed \" << currentShutter\n \t\t\t\t << \" Gain \" << gain;\n+\n \t\tcurrentExposure_ = currentExposureNoDg_ * newGain;\n-\t\tutils::Duration maxTotalExposure = maxExposureTime_ * kMaxGain;\n+\t\tutils::Duration maxShutterSpeed = maxExposureLines_ * lineDuration_;\n+\t\tutils::Duration maxTotalExposure = maxShutterSpeed * kMaxGain;\n \t\tcurrentExposure_ = std::min(currentExposure_, maxTotalExposure);\n-\t\tLOG(IPU3Agc, Debug) << \"Target total exposure \" << currentExposure_;\n+\t\tLOG(IPU3Agc, Debug) << \"Target total exposure \" << currentExposure_\n+\t\t\t\t << \", maximum is \" << maxTotalExposure;\n \n \t\t/* \\todo: estimate if we need to desaturate */\n \t\tfilterExposure();\n \n \t\tutils::Duration newExposure = 0.0s;\n-\t\tif (currentShutter < maxExposureTime_) {\n-\t\t\texposure = std::clamp(static_cast<uint32_t>(exposure * currentExposure_ / currentExposureNoDg_), kMinExposure, kMaxExposure);\n+\t\tif (currentShutter < maxShutterSpeed) {\n+\t\t\texposure = std::clamp<uint32_t>(exposure * currentExposure_ / currentExposureNoDg_,\n+\t\t\t\t\t\t\tminExposureLines_,\n+\t\t\t\t\t\t\tmaxExposureLines_);\n \t\t\tnewExposure = currentExposure_ / exposure;\n \t\t\tgain = std::clamp(static_cast<uint32_t>(gain * currentExposure_ / newExposure), kMinGain, kMaxGain);\n-\t\t} else if (currentShutter >= maxExposureTime_) {\n+\t\t} else {\n \t\t\tgain = std::clamp(static_cast<uint32_t>(gain * currentExposure_ / currentExposureNoDg_), kMinGain, kMaxGain);\n \t\t\tnewExposure = currentExposure_ / gain;\n-\t\t\texposure = std::clamp(static_cast<uint32_t>(exposure * currentExposure_ / newExposure), kMinExposure, kMaxExposure);\n+\t\t\texposure = std::clamp<uint32_t>(exposure * currentExposure_ / newExposure,\n+\t\t\t\t\t\t\tminExposureLines_,\n+\t\t\t\t\t\t\tmaxExposureLines_);\n \t\t}\n \t\tLOG(IPU3Agc, Debug) << \"Adjust exposure \" << exposure * lineDuration_ << \" and gain \" << gain;\n \t}\ndiff --git a/src/ipa/ipu3/algorithms/agc.h b/src/ipa/ipu3/algorithms/agc.h\nindex 16b9fa0a..cd26d08c 100644\n--- a/src/ipa/ipu3/algorithms/agc.h\n+++ b/src/ipa/ipu3/algorithms/agc.h\n@@ -42,7 +42,8 @@ private:\n \tdouble iqMean_;\n \n \tutils::Duration lineDuration_;\n-\tutils::Duration maxExposureTime_;\n+\tuint32_t minExposureLines_;\n+\tuint32_t maxExposureLines_;\n \n \tutils::Duration filteredExposure_;\n \tutils::Duration filteredExposureNoDg_;\n", "prefixes": [ "libcamera-devel", "v4", "06/14" ] }