{"id":14227,"url":"https://patchwork.libcamera.org/api/1.1/patches/14227/?format=json","web_url":"https://patchwork.libcamera.org/patch/14227/","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":"<20211021164401.110033-7-jeanmichel.hautbois@ideasonboard.com>","date":"2021-10-21T16:43:53","name":"[libcamera-devel,v3,06/14] ipa: ipu3: agc: Change exposure limits","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4c5038f6d453270fac7962d0c976c1eb141b8dc5","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/14227/mbox/","series":[{"id":2646,"url":"https://patchwork.libcamera.org/api/1.1/series/2646/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2646","date":"2021-10-21T16:43:47","name":"ipa: ipu3: Fix AGC bugs","version":3,"mbox":"https://patchwork.libcamera.org/series/2646/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14227/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14227/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 86C58C324F\n\tfor ;\n\tThu, 21 Oct 2021 16:44:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 836AD68F6E;\n\tThu, 21 Oct 2021 18:44:15 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 988C268F5F\n\tfor ;\n\tThu, 21 Oct 2021 18:44:06 +0200 (CEST)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:f9d:5926:ad90:4996])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 53CAE276;\n\tThu, 21 Oct 2021 18:44:06 +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=\"MKay6o1o\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1634834646;\n\tbh=Hy+TDqG/3B5iRlX4WoQ7KJSk+yCGiD9F16WtlbDpCyw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=MKay6o1oDCowzE2xMKmWiHaCqNm6dwd/Ka0lIOtvOSm3ckPpxBYN/E9O2UCbbVdHY\n\tPkm6RYlpDUqCL958dDe24n1vJsfCVoRdywmHMqKmXFXYfHSxo0yWOkWk2hd2Y0slNc\n\tn9PwWyxpIAanLse4SY1IcR81Qx+uyf9ojJGGbDDI=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 21 Oct 2021 18:43:53 +0200","Message-Id":"<20211021164401.110033-7-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20211021164401.110033-1-jeanmichel.hautbois@ideasonboard.com>","References":"<20211021164401.110033-1-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 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":"","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":"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 \nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \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(exposure * currentExposure_ / currentExposureNoDg_), kMinExposure, kMaxExposure);\n+\t\tif (currentShutter < maxShutterSpeed) {\n+\t\t\texposure = std::clamp(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(gain * currentExposure_ / newExposure), kMinGain, kMaxGain);\n-\t\t} else if (currentShutter >= maxExposureTime_) {\n+\t\t} else {\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(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","v3","06/14"]}