{"id":14250,"url":"https://patchwork.libcamera.org/api/1.1/patches/14250/?format=json","web_url":"https://patchwork.libcamera.org/patch/14250/","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":"<20211022073249.35084-15-jeanmichel.hautbois@ideasonboard.com>","date":"2021-10-22T07:32:49","name":"[libcamera-devel,v4,14/14] ipa: ipu3: Use sensor limits for analogue gain","commit_ref":"43d098ce5f2733dbde249d33d3b418cbeadfaaa5","pull_url":null,"state":"accepted","archived":false,"hash":"8e24fc66c976867746de6b47bc88e9d61390bb22","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/14250/mbox/","series":[{"id":2647,"url":"https://patchwork.libcamera.org/api/1.1/series/2647/?format=json","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/14250/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14250/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 96CDFBF415\n\tfor ;\n\tFri, 22 Oct 2021 07:33:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 40DC668F65;\n\tFri, 22 Oct 2021 09:33:10 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0543A68F69\n\tfor ;\n\tFri, 22 Oct 2021 09:32:57 +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 B0C5851D;\n\tFri, 22 Oct 2021 09:32:56 +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=\"qHWUY568\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1634887976;\n\tbh=AkwM/bbwVrcAmX7XtfmikA5MEkZF6SJiOIk/rB4RiVQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=qHWUY568POA1/9rD8KrqTrnF/grDA1iVaLP/34XO6ydEoNvek25thXUTE4v5DdM1R\n\txvhFW1SYyMeMcGmJYRN4yHeLotyeEIi+EAs3DWjI79mmrpnVYMiB8LeXqYTf4rAakh\n\tKS7a3GXFJWc86qWBXxfEoySo5swdcyhDp1uhFIEI=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 22 Oct 2021 09:32:49 +0200","Message-Id":"<20211022073249.35084-15-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 14/14] ipa: ipu3: Use sensor limits for\n\tanalogue gain","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":"Instead of using constants for the analogue gains limits, use the\nminimum and maximum from the configured sensor.\n\nSigned-off-by: Jean-Michel Hautbois \nReviewed-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \n---\n src/ipa/ipu3/algorithms/agc.cpp | 19 ++++++++++---------\n src/ipa/ipu3/algorithms/agc.h | 3 +++\n 2 files changed, 13 insertions(+), 9 deletions(-)","diff":"diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\nindex 74e94544..6c151232 100644\n--- a/src/ipa/ipu3/algorithms/agc.cpp\n+++ b/src/ipa/ipu3/algorithms/agc.cpp\n@@ -30,10 +30,9 @@ static constexpr uint32_t kInitialFrameMinAECount = 4;\n /* Number of frames to wait between new gain/exposure estimations */\n static constexpr uint32_t kFrameSkipCount = 6;\n \n-/* Maximum analogue gain value\n- * \\todo grab it from a camera helper */\n-static constexpr double kMinGain = 1.0;\n-static constexpr double kMaxGain = 8.0;\n+/* Limits for analogue gain values */\n+static constexpr double kMinAnalogueGain = 1.0;\n+static constexpr double kMaxAnalogueGain = 8.0;\n \n /* Histogram constants */\n static constexpr uint32_t knumHistogramBins = 256;\n@@ -57,9 +56,11 @@ int Agc::configure(IPAContext &context, const IPAConfigInfo &configInfo)\n \tminExposureLines_ = context.configuration.agc.minShutterSpeed / lineDuration_;\n \tmaxExposureLines_ = context.configuration.agc.maxShutterSpeed / lineDuration_;\n \n+\tminAnalogueGain_ = std::max(context.configuration.agc.minAnalogueGain, kMinAnalogueGain);\n+\tmaxAnalogueGain_ = std::min(context.configuration.agc.maxAnalogueGain, kMaxAnalogueGain);\n+\n \t/* Configure the default exposure and gain. */\n-\tcontext.frameContext.agc.gain =\n-\t\tcontext.configuration.agc.minAnalogueGain;\n+\tcontext.frameContext.agc.gain = minAnalogueGain_;\n \tcontext.frameContext.agc.exposure = minExposureLines_;\n \n \tprevExposureValue_ = context.frameContext.agc.gain\n@@ -148,7 +149,7 @@ void Agc::lockExposureGain(uint32_t &exposure, double &analogueGain)\n \tutils::Duration minShutterSpeed = minExposureLines_ * lineDuration_;\n \tutils::Duration maxShutterSpeed = maxExposureLines_ * lineDuration_;\n \n-\tutils::Duration maxTotalExposure = maxShutterSpeed * kMaxGain;\n+\tutils::Duration maxTotalExposure = maxShutterSpeed * maxAnalogueGain_;\n \tcurrentExposure_ = std::min(currentExposure_, maxTotalExposure);\n \tLOG(IPU3Agc, Debug) << \"Target total exposure \" << currentExposure_\n \t\t\t << \", maximum is \" << maxTotalExposure;\n@@ -163,10 +164,10 @@ void Agc::lockExposureGain(uint32_t &exposure, double &analogueGain)\n \t* Push the shutter time up to the maximum first, and only then\n \t* increase the gain.\n \t*/\n-\tshutterTime = std::clamp(exposureValue / kMinGain,\n+\tshutterTime = std::clamp(exposureValue / minAnalogueGain_,\n \t\t\t\t\t\t minShutterSpeed, maxShutterSpeed);\n \tdouble stepGain = std::clamp(exposureValue / shutterTime,\n-\t\t\t\t kMinGain, kMaxGain);\n+\t\t\t\t minAnalogueGain_, maxAnalogueGain_);\n \tLOG(IPU3Agc, Debug) << \"Divided up shutter and gain are \"\n \t\t\t << shutterTime << \" and \"\n \t\t\t << stepGain;\ndiff --git a/src/ipa/ipu3/algorithms/agc.h b/src/ipa/ipu3/algorithms/agc.h\nindex ad133b98..1840205b 100644\n--- a/src/ipa/ipu3/algorithms/agc.h\n+++ b/src/ipa/ipu3/algorithms/agc.h\n@@ -45,6 +45,9 @@ private:\n \tuint32_t minExposureLines_;\n \tuint32_t maxExposureLines_;\n \n+\tdouble minAnalogueGain_;\n+\tdouble maxAnalogueGain_;\n+\n \tutils::Duration filteredExposure_;\n \tutils::Duration currentExposure_;\n \tutils::Duration prevExposureValue_;\n","prefixes":["libcamera-devel","v4","14/14"]}