{"id":13336,"url":"https://patchwork.libcamera.org/api/patches/13336/?format=json","web_url":"https://patchwork.libcamera.org/patch/13336/","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":"<20210812165243.276977-9-jeanmichel.hautbois@ideasonboard.com>","date":"2021-08-12T16:52:41","name":"[libcamera-devel,v2,08/10] ipa: ipu3: Remove unneeded function calls in AGC","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"e692fe6289fb76c515932cc0f5b11838c068d60f","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/13336/mbox/","series":[{"id":2347,"url":"https://patchwork.libcamera.org/api/series/2347/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2347","date":"2021-08-12T16:52:33","name":"IPU3: Introduce modularity for algorithms","version":2,"mbox":"https://patchwork.libcamera.org/series/2347/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13336/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13336/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 951F8BD87D\n\tfor ;\n\tThu, 12 Aug 2021 16:52:56 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4699F6888F;\n\tThu, 12 Aug 2021 18:52:56 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4F8AE68894\n\tfor ;\n\tThu, 12 Aug 2021 18:52:48 +0200 (CEST)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:3d6d:7284:3c48:5edc])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0884149A;\n\tThu, 12 Aug 2021 18:52:48 +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=\"kFoiCMJy\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628787168;\n\tbh=55jw/y2mhxYMAJL6uHbuv9dgarSKY+SQjqqYtIFCRxs=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=kFoiCMJyMuiI2ctq6IC6hppfYOzeG88HwNRo/KEUszHT4bdQJUVhaqXX00cEpyvEb\n\tI72B0zbHhkEzLQyBbrv5nD2d9FB/n9RvoBaIVem3nfOyBWYCZoJdjnVQ+873oXhciV\n\tiBHzVRP87ivlAwS46pgfL5kCpPSZuak1zF+lYEyU=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 12 Aug 2021 18:52:41 +0200","Message-Id":"<20210812165243.276977-9-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.30.2","In-Reply-To":"<20210812165243.276977-1-jeanmichel.hautbois@ideasonboard.com>","References":"<20210812165243.276977-1-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 08/10] ipa: ipu3: Remove unneeded\n\tfunction calls in AGC","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 never use converged_ so remove its declaration.\nThe controls may not need to be updated at each call, but it should be\ndecided on the context side and not by a specific call.\n\nSigned-off-by: Jean-Michel Hautbois \n---\n src/ipa/ipu3/ipu3.cpp | 6 ++----\n src/ipa/ipu3/ipu3_agc.cpp | 10 ++--------\n src/ipa/ipu3/ipu3_agc.h | 5 -----\n 3 files changed, 4 insertions(+), 17 deletions(-)","diff":"diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 2a8225a0..27765aa6 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -309,8 +309,7 @@ void IPAIPU3::fillParams(unsigned int frame, ipu3_uapi_params *params)\n \tfor (auto const &algo : algorithms_)\n \t\talgo->prepare(context_, params_);\n \n-\tif (agcAlgo_->updateControls())\n-\t\tawbAlgo_->prepare(context_, params_);\n+\tawbAlgo_->prepare(context_, params_);\n \n \t*params = params_;\n \n@@ -338,8 +337,7 @@ void IPAIPU3::parseStatistics(unsigned int frame,\n \n \tawbAlgo_->process(context_, stats);\n \n-\tif (agcAlgo_->updateControls())\n-\t\tsetControls(frame);\n+\tsetControls(frame);\n \n \t/* \\todo Use VBlank value calculated from each frame exposure. */\n \tint64_t frameDuration = sensorInfo_.lineLength * (defVBlank_ + sensorInfo_.outputSize.height) /\ndiff --git a/src/ipa/ipu3/ipu3_agc.cpp b/src/ipa/ipu3/ipu3_agc.cpp\nindex 0cc35b9f..0d0584a8 100644\n--- a/src/ipa/ipu3/ipu3_agc.cpp\n+++ b/src/ipa/ipu3/ipu3_agc.cpp\n@@ -51,9 +51,8 @@ static constexpr double kEvGainTarget = 0.5;\n static constexpr uint8_t kCellSize = 8;\n \n IPU3Agc::IPU3Agc()\n-\t: frameCount_(0), lastFrame_(0), converged_(false),\n-\t updateControls_(false), iqMean_(0.0),\n-\t lineDuration_(0s), maxExposureTime_(0s),\n+\t: frameCount_(0), lastFrame_(0),\n+\t iqMean_(0.0), lineDuration_(0s), maxExposureTime_(0s),\n \t prevExposure_(0s), prevExposureNoDg_(0s),\n \t currentExposure_(0s), currentExposureNoDg_(0s)\n {\n@@ -146,8 +145,6 @@ void IPU3Agc::filterExposure()\n \n void IPU3Agc::lockExposureGain(uint32_t &exposure, double &gain)\n {\n-\tupdateControls_ = false;\n-\n \t/* Algorithm initialization should wait for first valid frames */\n \t/* \\todo - have a number of frames given by DelayedControls ?\n \t * - implement a function for IIR */\n@@ -157,7 +154,6 @@ void IPU3Agc::lockExposureGain(uint32_t &exposure, double &gain)\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\tconverged_ = true;\n \t} else {\n \t\tdouble newGain = kEvGainTarget * knumHistogramBins / iqMean_;\n \n@@ -180,12 +176,10 @@ void IPU3Agc::lockExposureGain(uint32_t &exposure, double &gain)\n \t\t\texposure = std::clamp(static_cast(exposure * currentExposure_ / currentExposureNoDg_), kMinExposure, kMaxExposure);\n \t\t\tnewExposure = currentExposure_ / exposure;\n \t\t\tgain = std::clamp(static_cast(gain * currentExposure_ / newExposure), kMinGain, kMaxGain);\n-\t\t\tupdateControls_ = true;\n \t\t} else if (currentShutter >= maxExposureTime_) {\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\tupdateControls_ = true;\n \t\t}\n \t\tLOG(IPU3Agc, Debug) << \"Adjust exposure \" << exposure * lineDuration_ << \" and gain \" << gain;\n \t}\ndiff --git a/src/ipa/ipu3/ipu3_agc.h b/src/ipa/ipu3/ipu3_agc.h\nindex e096648b..0e922664 100644\n--- a/src/ipa/ipu3/ipu3_agc.h\n+++ b/src/ipa/ipu3/ipu3_agc.h\n@@ -31,8 +31,6 @@ public:\n \n \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n \tvoid process(IPAContext &context, const ipu3_uapi_stats_3a *stats) override;\n-\tbool converged() { return converged_; }\n-\tbool updateControls() { return updateControls_; }\n \n private:\n \tvoid processBrightness(const ipu3_uapi_stats_3a *stats);\n@@ -44,9 +42,6 @@ private:\n \tuint64_t frameCount_;\n \tuint64_t lastFrame_;\n \n-\tbool converged_;\n-\tbool updateControls_;\n-\n \tdouble iqMean_;\n \n \tDuration lineDuration_;\n","prefixes":["libcamera-devel","v2","08/10"]}