{"id":14123,"url":"https://patchwork.libcamera.org/api/1.1/patches/14123/?format=json","web_url":"https://patchwork.libcamera.org/patch/14123/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20211013154125.133419-7-jeanmichel.hautbois@ideasonboard.com>","date":"2021-10-13T15:41:18","name":"[libcamera-devel,06/13] ipa: ipu3: agc: Change exposure limits","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"16d20e1e6bf199b0eeae3b3b34b3f421f89e22db","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/1.1/people/75/?format=json","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14123/mbox/","series":[{"id":2623,"url":"https://patchwork.libcamera.org/api/1.1/series/2623/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2623","date":"2021-10-13T15:41:13","name":"ipa: ipu3: Fix AGC bugs","version":1,"mbox":"https://patchwork.libcamera.org/series/2623/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14123/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14123/checks/","tags":{},"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 384E8BDC71\n\tfor ;\n\tWed, 13 Oct 2021 15:41:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4DDDF68F68;\n\tWed, 13 Oct 2021 17:41:41 +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 3A60868F52\n\tfor ;\n\tWed, 13 Oct 2021 17:41:32 +0200 (CEST)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:3857:aa01:4281:bd9f])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7F5661BBB;\n\tWed, 13 Oct 2021 17:41:31 +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=\"G5FOkj9q\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1634139691;\n\tbh=5LRqVWrGiH7gY/p5UwWfMxC8tcwuXUWzrgm0RHlf9w0=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=G5FOkj9qV3MpZQ24BbxmofKBq7DrPZ7zQ/vEw1M10aWSsv1u/oP8atmQgtZef7buB\n\tr8HzlcZPZyGJYFQZOvQDfRki24LKZ3eETIItqoMm+MDDcjS+kMJir1twJNc1nyFcg1\n\tBJoqpOZaCMJMOTr7wXGneI8XsTtz53RRROEK0UQU=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 13 Oct 2021 17:41:18 +0200","Message-Id":"<20211013154125.133419-7-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.30.2","In-Reply-To":"<20211013154125.133419-1-jeanmichel.hautbois@ideasonboard.com>","References":"<20211013154125.133419-1-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 06/13] ipa: ipu3: agc: Change exposure\n\tlimits","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\" "},"content":"The exposure limits are set for one sensor until now, in a number of\nlines. We should not use those, but exposure limits in a time unit.\n\nIntroduce default limits which with a default minimum of 20ms. This\nvalue should be given by the IPAIPU3. Use cached values expressed as a\nnumber of lines in the configure() call.\n\nAdapt the process() call accordingly.\n\nSigned-off-by: Jean-Michel Hautbois \n---\n src/ipa/ipu3/algorithms/agc.cpp | 30 +++++++++++++++++-------------\n src/ipa/ipu3/algorithms/agc.h | 3 ++-\n 2 files changed, 19 insertions(+), 14 deletions(-)","diff":"diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\nindex 7c2d4201..2dd5c5c1 100644\n--- a/src/ipa/ipu3/algorithms/agc.cpp\n+++ b/src/ipa/ipu3/algorithms/agc.cpp\n@@ -40,8 +40,8 @@ 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+static constexpr libcamera::utils::Duration kMinShutterSpeed = 100us;\n+static constexpr libcamera::utils::Duration kMaxShutterSpeed = 20ms;\n \n /* Histogram constants */\n static constexpr uint32_t knumHistogramBins = 256;\n@@ -49,8 +49,8 @@ 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,7 +60,9 @@ int Agc::configure(IPAContext &context, const IPAConfigInfo &configInfo)\n \n \tlineDuration_ = configInfo.sensorInfo.lineLength * 1.0s\n \t\t / configInfo.sensorInfo.pixelRate;\n-\tmaxExposureTime_ = kMaxExposure * lineDuration_;\n+\n+\tminExposureLines_ = kMinShutterSpeed / lineDuration_;\n+\tmaxExposureLines_ = kMaxShutterSpeed / lineDuration_;\n \n \treturn 0;\n }\n@@ -140,28 +142,30 @@ void Agc::lockExposureGain(uint32_t &exposure, double &gain)\n \t\tdouble newGain = kEvGainTarget * knumHistogramBins / iqMean_;\n \n \t\t/* extracted from Rpi::Agc::computeTargetExposure */\n-\t\tlibcamera::utils::Duration currentShutter = exposure * lineDuration_;\n+\t\tDuration currentShutter = exposure * lineDuration_;\n \t\tcurrentExposureNoDg_ = currentShutter * 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\tlibcamera::utils::Duration maxTotalExposure = maxExposureTime_ * kMaxGain;\n+\t\tDuration maxTotalExposure = kMaxShutterSpeed * 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\tlibcamera::utils::Duration newExposure = 0.0s;\n-\t\tif (currentShutter < maxExposureTime_) {\n-\t\t\texposure = std::clamp(static_cast(exposure * currentExposure_ / currentExposureNoDg_), kMinExposure, kMaxExposure);\n+\t\tDuration newExposure = 0.0s;\n+\t\tif (currentShutter < kMaxShutterSpeed) {\n+\t\t\texposure = std::clamp(static_cast(exposure * currentExposure_ / currentExposureNoDg_), minExposureLines_, maxExposureLines_);\n \t\t\tnewExposure = currentExposure_ / exposure;\n \t\t\tgain = std::clamp(static_cast(gain * currentExposure_ / newExposure), kMinGain, kMaxGain);\n-\t\t} else if (currentShutter >= maxExposureTime_) {\n+\t\t} else if (currentShutter >= kMaxShutterSpeed) {\n \t\t\tgain = std::clamp(static_cast(gain * currentExposure_ / currentExposureNoDg_), kMinGain, kMaxGain);\n \t\t\tnewExposure = currentExposure_ / gain;\n-\t\t\texposure = std::clamp(static_cast(exposure * currentExposure_ / newExposure), kMinExposure, kMaxExposure);\n+\t\t\texposure = std::clamp(static_cast(exposure * currentExposure_ / newExposure), minExposureLines_, maxExposureLines_);\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 cd4d4855..7605ab39 100644\n--- a/src/ipa/ipu3/algorithms/agc.h\n+++ b/src/ipa/ipu3/algorithms/agc.h\n@@ -44,7 +44,8 @@ private:\n \tdouble iqMean_;\n \n \tDuration lineDuration_;\n-\tDuration maxExposureTime_;\n+\tuint32_t minExposureLines_;\n+\tuint32_t maxExposureLines_;\n \n \tDuration filteredExposure_;\n \tDuration filteredExposureNoDg_;\n","prefixes":["libcamera-devel","06/13"]}