{"id":14248,"url":"https://patchwork.libcamera.org/api/patches/14248/?format=json","web_url":"https://patchwork.libcamera.org/patch/14248/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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-13-jeanmichel.hautbois@ideasonboard.com>","date":"2021-10-22T07:32:47","name":"[libcamera-devel,v4,12/14] ipa: ipu3: agc: Refactor condition on exposure correction","commit_ref":"cbf2c9a6126f6c91ffce4a4e52d146f742fd4a28","pull_url":null,"state":"accepted","archived":false,"hash":"639be010e9fc53e7e2c6aaa1d225357357365d5d","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/people/75/?format=json","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14248/mbox/","series":[{"id":2647,"url":"https://patchwork.libcamera.org/api/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/14248/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14248/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 5CFFFBF415\n\tfor ;\n\tFri, 22 Oct 2021 07:33:09 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0989668F67;\n\tFri, 22 Oct 2021 09:33:09 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9A32A68F5D\n\tfor ;\n\tFri, 22 Oct 2021 09:32:56 +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 4940789A;\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=\"XUpIQ16r\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1634887976;\n\tbh=6UbDx1V9SPNEbV3UPzZHxU/3XI46hEN93pGA/Pa4uSE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=XUpIQ16rXz+tN7VRDLmonNJzmKFH64th8TjzsDpmUAqoji64E5KhacVI7V9Kk+EMZ\n\toNICy1Aku/XWXDT1SFI+dN6pBbuuEgBnen4PXIKNKdw7RESFhUwKdeojngGRb0pTCW\n\t2D2z82PAu9HJhdOqipcp/daPhpMZe0FFCCSomFLs=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 22 Oct 2021 09:32:47 +0200","Message-Id":"<20211022073249.35084-13-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 12/14] ipa: ipu3: agc: Refactor\n\tcondition on exposure correction","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":"Simplify the reading by removing one level of indentation to return\nearly when the change is small between two calls.\n\nReword the LOG() message when we are correctly exposed, and move the\nlastFrame_ variable to update it even if the change is small.\n\nSigned-off-by: Jean-Michel Hautbois \nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \n---\n src/ipa/ipu3/algorithms/agc.cpp | 93 +++++++++++++++++----------------\n 1 file changed, 48 insertions(+), 45 deletions(-)","diff":"diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\nindex 43ef89df..feee7939 100644\n--- a/src/ipa/ipu3/algorithms/agc.cpp\n+++ b/src/ipa/ipu3/algorithms/agc.cpp\n@@ -138,61 +138,64 @@ void Agc::lockExposureGain(uint32_t &exposure, double &analogueGain)\n \tif ((frameCount_ < kInitialFrameMinAECount) || (frameCount_ - lastFrame_ < kFrameSkipCount))\n \t\treturn;\n \n+\tlastFrame_ = frameCount_;\n+\n \t/* Are we correctly exposed ? */\n \tif (std::abs(iqMean_ - kEvGainTarget * knumHistogramBins) <= 1) {\n-\t\tLOG(IPU3Agc, Debug) << \"!!! Good exposure with iqMean = \" << iqMean_;\n-\t} else {\n-\t\tdouble evGain = kEvGainTarget * knumHistogramBins / iqMean_;\n+\t\tLOG(IPU3Agc, Debug) << \"We are well exposed (iqMean = \"\n+\t\t\t\t << iqMean_ << \")\";\n+\t\treturn;\n+\t}\n \n-\t\t/* extracted from Rpi::Agc::computeTargetExposure */\n-\t\tutils::Duration currentShutter = exposure * lineDuration_;\n-\t\tcurrentExposureNoDg_ = currentShutter * analogueGain;\n-\t\tLOG(IPU3Agc, Debug) << \"Actual total exposure \" << currentExposureNoDg_\n-\t\t\t\t << \" Shutter speed \" << currentShutter\n-\t\t\t\t << \" Gain \" << analogueGain\n-\t\t\t\t << \" Needed ev gain \" << evGain;\n+\tdouble evGain = kEvGainTarget * knumHistogramBins / iqMean_;\n \n-\t\tcurrentExposure_ = prevExposureValue_ * evGain;\n-\t\tutils::Duration minShutterSpeed = minExposureLines_ * lineDuration_;\n-\t\tutils::Duration maxShutterSpeed = maxExposureLines_ * lineDuration_;\n+\t/* extracted from Rpi::Agc::computeTargetExposure */\n+\tutils::Duration currentShutter = exposure * lineDuration_;\n+\tcurrentExposureNoDg_ = currentShutter * analogueGain;\n+\tLOG(IPU3Agc, Debug) << \"Actual total exposure \" << currentExposureNoDg_\n+\t\t\t << \" Shutter speed \" << currentShutter\n+\t\t\t << \" Gain \" << analogueGain\n+\t\t\t << \" Needed ev gain \" << evGain;\n \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\t\t\t << \", maximum is \" << maxTotalExposure;\n+\tcurrentExposure_ = prevExposureValue_ * evGain;\n+\tutils::Duration minShutterSpeed = minExposureLines_ * lineDuration_;\n+\tutils::Duration maxShutterSpeed = maxExposureLines_ * lineDuration_;\n \n-\t\t/* \\todo: estimate if we need to desaturate */\n-\t\tfilterExposure();\n+\tutils::Duration maxTotalExposure = maxShutterSpeed * kMaxGain;\n+\tcurrentExposure_ = std::min(currentExposure_, maxTotalExposure);\n+\tLOG(IPU3Agc, Debug) << \"Target total exposure \" << currentExposure_\n+\t\t\t << \", maximum is \" << maxTotalExposure;\n \n-\t\tutils::Duration exposureValue = filteredExposure_;\n-\t\tutils::Duration shutterTime = minShutterSpeed;\n+\t/* \\todo: estimate if we need to desaturate */\n+\tfilterExposure();\n \n-\t\t/*\n-\t\t * Push the shutter time up to the maximum first, and only then\n-\t\t * increase the gain.\n-\t\t */\n-\t\tshutterTime = std::clamp(exposureValue / kMinGain,\n-\t\t\t\t\t\t\t minShutterSpeed, maxShutterSpeed);\n-\t\tdouble stepGain = std::clamp(exposureValue / shutterTime,\n-\t\t\t\t\t kMinGain, kMaxGain);\n-\t\tLOG(IPU3Agc, Debug) << \"Divided up shutter and gain are \"\n-\t\t\t\t << shutterTime << \" and \"\n-\t\t\t\t << stepGain;\n+\tutils::Duration exposureValue = filteredExposure_;\n+\tutils::Duration shutterTime = minShutterSpeed;\n \n-\t\texposure = shutterTime / lineDuration_;\n-\t\tanalogueGain = stepGain;\n+\t/*\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+\t\t\t\t\t\t minShutterSpeed, maxShutterSpeed);\n+\tdouble stepGain = std::clamp(exposureValue / shutterTime,\n+\t\t\t\t kMinGain, kMaxGain);\n+\tLOG(IPU3Agc, Debug) << \"Divided up shutter and gain are \"\n+\t\t\t << shutterTime << \" and \"\n+\t\t\t << stepGain;\n+\n+\texposure = shutterTime / lineDuration_;\n+\tanalogueGain = stepGain;\n \n-\t\t/*\n-\t\t * Update the exposure value for the next process call.\n-\t\t *\n-\t\t * \\todo Obtain the values of the exposure time and analog gain\n-\t\t * that were actually used by the sensor, either from embedded\n-\t\t * data when available, or from the delayed controls\n-\t\t * infrastructure in case a slow down caused a mismatch.\n-\t\t */\n-\t\tprevExposureValue_ = shutterTime * analogueGain;\n-\t}\n-\tlastFrame_ = frameCount_;\n+\t/*\n+\t * Update the exposure value for the next process call.\n+\t *\n+\t * \\todo Obtain the values of the exposure time and analog gain\n+\t * that were actually used by the sensor, either from embedded\n+\t * data when available, or from the delayed controls\n+\t * infrastructure in case a slow down caused a mismatch.\n+\t */\n+\tprevExposureValue_ = shutterTime * analogueGain;\n }\n \n void Agc::process(IPAContext &context, const ipu3_uapi_stats_3a *stats)\n","prefixes":["libcamera-devel","v4","12/14"]}