{"id":14599,"url":"https://patchwork.libcamera.org/api/1.1/patches/14599/?format=json","web_url":"https://patchwork.libcamera.org/patch/14599/","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":"<20211113084947.21892-10-jeanmichel.hautbois@ideasonboard.com>","date":"2021-11-13T08:49:42","name":"[libcamera-devel,v5,09/14] ipa: ipu3: agc: Store exposure in units of time","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"3ec8daf9e763189fa91a9e83d7c26bc8b7c3e69e","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/14599/mbox/","series":[{"id":2717,"url":"https://patchwork.libcamera.org/api/1.1/series/2717/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2717","date":"2021-11-13T08:49:33","name":"IPA: IPU3: Introduce per-frame controls","version":5,"mbox":"https://patchwork.libcamera.org/series/2717/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14599/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14599/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 6E8B9C3250\n\tfor ;\n\tSat, 13 Nov 2021 08:50:02 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D565860451;\n\tSat, 13 Nov 2021 09:50:01 +0100 (CET)","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 A0E516038B\n\tfor ;\n\tSat, 13 Nov 2021 09:49:52 +0100 (CET)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:4d35:9445:6881:4ffd])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 589AFD89;\n\tSat, 13 Nov 2021 09:49:52 +0100 (CET)"],"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=\"pxpaR9/v\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1636793392;\n\tbh=v9d+/ELAZJnzhIawUaDoM5inmBpwqteDirstqqx0rrI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=pxpaR9/vkCtWi9Ybxus/OM78JDCCeXwKehxY1SDxg13iLzm0jBplLDCy9rXL30IRl\n\thzsGczofE+BBYb2VgN+wC72oXD89j0inYQRFK7RGs7SJYFzXMwntZG5WWCSmf/odWQ\n\tDLaRdCE70GxiaUXcWoqnegflrICA22raZy4B8+4A=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 13 Nov 2021 09:49:42 +0100","Message-Id":"<20211113084947.21892-10-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20211113084947.21892-1-jeanmichel.hautbois@ideasonboard.com>","References":"<20211113084947.21892-1-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 09/14] ipa: ipu3: agc: Store exposure\n\tin units of time","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 minimum and maximum exposure are stored in lines. Replace it by\nvalues in time to simplify the calculations.\n\nSigned-off-by: Jean-Michel Hautbois \nReviewed-by: Kieran Bingham \nReviewed-by: Umang Jain \nReviewed-by: Paul Elder \n---\n src/ipa/ipu3/algorithms/agc.cpp | 21 +++++++++------------\n src/ipa/ipu3/algorithms/agc.h | 4 ++--\n 2 files changed, 11 insertions(+), 14 deletions(-)","diff":"diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\nindex 4d2450fc..1e6f2b64 100644\n--- a/src/ipa/ipu3/algorithms/agc.cpp\n+++ b/src/ipa/ipu3/algorithms/agc.cpp\n@@ -79,8 +79,8 @@ static constexpr uint32_t kMaxLuminance = 255;\n static constexpr double kNormalizedLumaTarget = 0.16;\n \n Agc::Agc()\n-\t: frameCount_(0), iqMean_(0.0), lineDuration_(0s), minExposureLines_(0),\n-\t maxExposureLines_(0), filteredExposure_(0s), currentExposure_(0s)\n+\t: frameCount_(0), iqMean_(0.0), lineDuration_(0s), minShutterSpeed_(0s),\n+\t maxShutterSpeed_(0s), filteredExposure_(0s), currentExposure_(0s)\n {\n }\n \n@@ -99,17 +99,16 @@ int Agc::configure(IPAContext &context, const IPAConfigInfo &configInfo)\n \tlineDuration_ = configInfo.sensorInfo.lineLength * 1.0s\n \t\t / configInfo.sensorInfo.pixelRate;\n \n-\t/* \\todo replace the exposure in lines storage with time based ones. */\n-\tminExposureLines_ = context.configuration.agc.minShutterSpeed / lineDuration_;\n-\tmaxExposureLines_ = std::min(context.configuration.agc.maxShutterSpeed / lineDuration_,\n-\t\t\t\t kMaxShutterSpeed / lineDuration_);\n+\tminShutterSpeed_ = context.configuration.agc.minShutterSpeed;\n+\tmaxShutterSpeed_ = std::min(context.configuration.agc.maxShutterSpeed,\n+\t\t\t\t kMaxShutterSpeed);\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 = minAnalogueGain_;\n-\tcontext.frameContext.agc.exposure = minExposureLines_;\n+\tcontext.frameContext.agc.exposure = minShutterSpeed_ / lineDuration_;\n \n \treturn 0;\n }\n@@ -236,11 +235,9 @@ void Agc::computeExposure(IPAFrameContext &frameContext, double currentYGain)\n \t * exposure value applied multiplied by the new estimated gain.\n \t */\n \tcurrentExposure_ = effectiveExposureValue * evGain;\n-\tutils::Duration minShutterSpeed = minExposureLines_ * lineDuration_;\n-\tutils::Duration maxShutterSpeed = maxExposureLines_ * lineDuration_;\n \n \t/* Clamp the exposure value to the min and max authorized */\n-\tutils::Duration maxTotalExposure = maxShutterSpeed * maxAnalogueGain_;\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@@ -250,14 +247,14 @@ void Agc::computeExposure(IPAFrameContext &frameContext, double currentYGain)\n \n \t/* Divide the exposure value as new exposure and gain values */\n \tutils::Duration exposureValue = filteredExposure_;\n-\tutils::Duration shutterTime = minShutterSpeed;\n+\tutils::Duration shutterTime;\n \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 / minAnalogueGain_,\n-\t\t\t\t\t\t minShutterSpeed, maxShutterSpeed);\n+\t\t\t\t\t\t minShutterSpeed_, maxShutterSpeed_);\n \tdouble stepGain = std::clamp(exposureValue / shutterTime,\n \t\t\t\t minAnalogueGain_, maxAnalogueGain_);\n \tLOG(IPU3Agc, Debug) << \"Divided up shutter and gain are \"\ndiff --git a/src/ipa/ipu3/algorithms/agc.h b/src/ipa/ipu3/algorithms/agc.h\nindex 1d085b40..f14d56b7 100644\n--- a/src/ipa/ipu3/algorithms/agc.h\n+++ b/src/ipa/ipu3/algorithms/agc.h\n@@ -46,8 +46,8 @@ private:\n \tdouble iqMean_;\n \n \tutils::Duration lineDuration_;\n-\tuint32_t minExposureLines_;\n-\tuint32_t maxExposureLines_;\n+\tutils::Duration minShutterSpeed_;\n+\tutils::Duration maxShutterSpeed_;\n \n \tdouble minAnalogueGain_;\n \tdouble maxAnalogueGain_;\n","prefixes":["libcamera-devel","v5","09/14"]}