{"id":13395,"url":"https://patchwork.libcamera.org/api/patches/13395/?format=json","web_url":"https://patchwork.libcamera.org/patch/13395/","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":"<20210818155403.268694-10-jeanmichel.hautbois@ideasonboard.com>","date":"2021-08-18T15:54:03","name":"[libcamera-devel,v3,9/9] ipa: ipu3: Move IPU3 agc into algorithms","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b7b334f9af1218105a06db8b22379be41b46a404","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/13395/mbox/","series":[{"id":2370,"url":"https://patchwork.libcamera.org/api/series/2370/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2370","date":"2021-08-18T15:53:54","name":"IPU3: Introduce modularity for algorithms","version":3,"mbox":"https://patchwork.libcamera.org/series/2370/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13395/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13395/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 B2DF3BD87C\n\tfor ;\n\tWed, 18 Aug 2021 15:54:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 660EA6891F;\n\tWed, 18 Aug 2021 17:54:18 +0200 (CEST)","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 DE61768895\n\tfor ;\n\tWed, 18 Aug 2021 17:54:10 +0200 (CEST)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:946e:2bbb:370e:41e4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 902D1EE;\n\tWed, 18 Aug 2021 17:54:10 +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=\"CRUD1MV7\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1629302050;\n\tbh=XEdBzGBGCWWLbfKjxcTgrWiUb1aS5gSnnYPdSjZ5dj0=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=CRUD1MV7dmk6h0hEEBNSp9SuQ19RIAofJCL5YcRdj2UIHH/zusEdlpnE5ddQFJ4so\n\tYK1842cHAsDpY8bK1a0xeLs/EJ+lgVP9Ngs8Y56rRArY4+DIXn6g1TlMvAKqAPV/Sh\n\toPCrGJjvhu2iahKykCRdPShLNrCyZOI52Wde3KKU=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 18 Aug 2021 17:54:03 +0200","Message-Id":"<20210818155403.268694-10-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.30.2","In-Reply-To":"<20210818155403.268694-1-jeanmichel.hautbois@ideasonboard.com>","References":"<20210818155403.268694-1-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 9/9] ipa: ipu3: Move IPU3 agc into\n\talgorithms","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":"Now that the interface is properly used by the AGC class, move it into\nipa::ipu3::algorithms and let the loops do the calls.\nAs we need to exchange the exposure_ and gain_ by passing them through the\nFrameContext, use the calculated values in setControls() function to\nease the reading.\n\nSigned-off-by: Jean-Michel Hautbois \nReviewed-by: Kieran Bingham \n---\n .../ipu3/{ipu3_agc.cpp => algorithms/agc.cpp} | 21 +++++++++----------\n src/ipa/ipu3/{ipu3_agc.h => algorithms/agc.h} | 20 +++++++++---------\n src/ipa/ipu3/algorithms/meson.build | 1 +\n src/ipa/ipu3/ipu3.cpp | 15 +++++--------\n src/ipa/ipu3/meson.build | 1 -\n 5 files changed, 26 insertions(+), 32 deletions(-)\n rename src/ipa/ipu3/{ipu3_agc.cpp => algorithms/agc.cpp} (93%)\n rename src/ipa/ipu3/{ipu3_agc.h => algorithms/agc.h} (73%)","diff":"diff --git a/src/ipa/ipu3/ipu3_agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\nsimilarity index 93%\nrename from src/ipa/ipu3/ipu3_agc.cpp\nrename to src/ipa/ipu3/algorithms/agc.cpp\nindex 1c1f5fb5..bb119cb4 100644\n--- a/src/ipa/ipu3/ipu3_agc.cpp\n+++ b/src/ipa/ipu3/algorithms/agc.cpp\n@@ -5,7 +5,7 @@\n * ipu3_agc.cpp - AGC/AEC control algorithm\n */\n \n-#include \"ipu3_agc.h\"\n+#include \"agc.h\"\n \n #include \n #include \n@@ -21,7 +21,7 @@ namespace libcamera {\n \n using namespace std::literals::chrono_literals;\n \n-namespace ipa::ipu3 {\n+namespace ipa::ipu3::algorithms {\n \n LOG_DEFINE_CATEGORY(IPU3Agc)\n \n@@ -50,14 +50,13 @@ static constexpr double kEvGainTarget = 0.5;\n /* A cell is 8 bytes and contains averages for RGB values and saturation ratio */\n static constexpr uint8_t kCellSize = 8;\n \n-IPU3Agc::IPU3Agc()\n+Agc::Agc()\n \t: frameCount_(0), lastFrame_(0), iqMean_(0.0), lineDuration_(0s),\n-\t maxExposureTime_(0s), prevExposure_(0s), prevExposureNoDg_(0s),\n-\t currentExposure_(0s), currentExposureNoDg_(0s)\n+\t maxExposureTime_(0s), prevExposure_(0s), prevExposureNoDg_(0s)\n {\n }\n \n-int IPU3Agc::configure(IPAContext &context, const IPAConfigInfo &configInfo)\n+int Agc::configure(IPAContext &context, const IPAConfigInfo &configInfo)\n {\n \taeGrid_ = context.configuration.grid.bdsGrid;\n \n@@ -67,7 +66,7 @@ int IPU3Agc::configure(IPAContext &context, const IPAConfigInfo &configInfo)\n \treturn 0;\n }\n \n-void IPU3Agc::processBrightness(const ipu3_uapi_stats_3a *stats)\n+void Agc::processBrightness(const ipu3_uapi_stats_3a *stats)\n {\n \tconst struct ipu3_uapi_grid_config statsAeGrid = stats->stats_4a_config.awb_config.grid;\n \tRectangle aeRegion = { statsAeGrid.x_start,\n@@ -108,7 +107,7 @@ void IPU3Agc::processBrightness(const ipu3_uapi_stats_3a *stats)\n \tiqMean_ = Histogram(Span(hist)).interQuantileMean(0.98, 1.0);\n }\n \n-void IPU3Agc::filterExposure()\n+void Agc::filterExposure()\n {\n \tdouble speed = 0.2;\n \tif (prevExposure_ == 0s) {\n@@ -142,7 +141,7 @@ void IPU3Agc::filterExposure()\n \tLOG(IPU3Agc, Debug) << \"After filtering, total_exposure \" << prevExposure_;\n }\n \n-void IPU3Agc::lockExposureGain(uint32_t &exposure, double &gain)\n+void Agc::lockExposureGain(uint32_t &exposure, double &gain)\n {\n \t/* Algorithm initialization should wait for first valid frames */\n \t/* \\todo - have a number of frames given by DelayedControls ?\n@@ -185,7 +184,7 @@ void IPU3Agc::lockExposureGain(uint32_t &exposure, double &gain)\n \tlastFrame_ = frameCount_;\n }\n \n-void IPU3Agc::process(IPAContext &context, const ipu3_uapi_stats_3a *stats)\n+void Agc::process(IPAContext &context, const ipu3_uapi_stats_3a *stats)\n {\n \tuint32_t &exposure = context.frameContext.agc.exposure;\n \tdouble &gain = context.frameContext.agc.gain;\n@@ -194,6 +193,6 @@ void IPU3Agc::process(IPAContext &context, const ipu3_uapi_stats_3a *stats)\n \tframeCount_++;\n }\n \n-} /* namespace ipa::ipu3 */\n+} /* namespace ipa::ipu3::algorithms */\n \n } /* namespace libcamera */\ndiff --git a/src/ipa/ipu3/ipu3_agc.h b/src/ipa/ipu3/algorithms/agc.h\nsimilarity index 73%\nrename from src/ipa/ipu3/ipu3_agc.h\nrename to src/ipa/ipu3/algorithms/agc.h\nindex 0e922664..1739d2fd 100644\n--- a/src/ipa/ipu3/ipu3_agc.h\n+++ b/src/ipa/ipu3/algorithms/agc.h\n@@ -2,10 +2,10 @@\n /*\n * Copyright (C) 2021, Ideas On Board\n *\n- * ipu3_agc.h - IPU3 AGC/AEC control algorithm\n+ * agc.h - IPU3 AGC/AEC control algorithm\n */\n-#ifndef __LIBCAMERA_IPU3_AGC_H__\n-#define __LIBCAMERA_IPU3_AGC_H__\n+#ifndef __LIBCAMERA_IPU3_ALGORITHMS_AGC_H__\n+#define __LIBCAMERA_IPU3_ALGORITHMS_AGC_H__\n \n #include \n \n@@ -13,21 +13,21 @@\n \n #include \n \n-#include \"algorithms/algorithm.h\"\n+#include \"algorithm.h\"\n \n namespace libcamera {\n \n struct IPACameraSensorInfo;\n \n-namespace ipa::ipu3 {\n+namespace ipa::ipu3::algorithms {\n \n using utils::Duration;\n \n-class IPU3Agc : public Algorithm\n+class Agc : public Algorithm\n {\n public:\n-\tIPU3Agc();\n-\t~IPU3Agc() = default;\n+\tAgc();\n+\t~Agc() = default;\n \n \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n \tvoid process(IPAContext &context, const ipu3_uapi_stats_3a *stats) override;\n@@ -53,8 +53,8 @@ private:\n \tDuration currentExposureNoDg_;\n };\n \n-} /* namespace ipa::ipu3 */\n+} /* namespace ipa::ipu3::algorithms */\n \n } /* namespace libcamera */\n \n-#endif /* __LIBCAMERA_IPU3_AGC_H__ */\n+#endif /* __LIBCAMERA_IPU3_ALGORITHMS_AGC_H__ */\ndiff --git a/src/ipa/ipu3/algorithms/meson.build b/src/ipa/ipu3/algorithms/meson.build\nindex 87377f4e..acaadd90 100644\n--- a/src/ipa/ipu3/algorithms/meson.build\n+++ b/src/ipa/ipu3/algorithms/meson.build\n@@ -2,6 +2,7 @@\n \n ipu3_ipa_algorithms = files([\n 'algorithm.cpp',\n+ 'agc.cpp',\n 'awb.cpp',\n 'contrast.cpp',\n ])\ndiff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex f4f49025..d73ec79d 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -30,9 +30,9 @@\n #include \"libcamera/internal/mapped_framebuffer.h\"\n \n #include \"algorithms/algorithm.h\"\n+#include \"algorithms/agc.h\"\n #include \"algorithms/awb.h\"\n #include \"algorithms/contrast.h\"\n-#include \"ipu3_agc.h\"\n #include \"libipa/camera_sensor_helper.h\"\n \n static constexpr uint32_t kMaxCellWidthPerSet = 160;\n@@ -136,8 +136,6 @@ private:\n \tuint32_t minGain_;\n \tuint32_t maxGain_;\n \n-\t/* Interface to the AEC/AGC algorithm */\n-\tstd::unique_ptr agcAlgo_;\n \t/* Interface to the Camera Helper */\n \tstd::unique_ptr camHelper_;\n \n@@ -218,6 +216,7 @@ int IPAIPU3::init(const IPASettings &settings,\n \t*ipaControls = ControlInfoMap(std::move(controls), controls::controls);\n \n \t/* Construct our Algorithms */\n+\talgorithms_.emplace_back(new algorithms::Agc());\n \talgorithms_.emplace_back(new algorithms::Awb());\n \talgorithms_.emplace_back(new algorithms::Contrast());\n \n@@ -337,10 +336,6 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo)\n \t\t\treturn ret;\n \t}\n \n-\n-\tagcAlgo_ = std::make_unique();\n-\tagcAlgo_->configure(context_, configInfo);\n-\n \treturn 0;\n }\n \n@@ -436,9 +431,6 @@ void IPAIPU3::parseStatistics(unsigned int frame,\n \tfor (auto const &algo : algorithms_)\n \t\talgo->process(context_, stats);\n \n-\tagcAlgo_->process(context_, stats);\n-\texposure_ = context_.frameContext.agc.exposure;\n-\tgain_ = camHelper_->gainCode(context_.frameContext.agc.gain);\n \tsetControls(frame);\n \n \t/* \\todo Use VBlank value calculated from each frame exposure. */\n@@ -458,6 +450,9 @@ void IPAIPU3::setControls(unsigned int frame)\n \tIPU3Action op;\n \top.op = ActionSetSensorControls;\n \n+\texposure_ = context_.frameContext.agc.exposure;\n+\tgain_ = camHelper_->gainCode(context_.frameContext.agc.gain);\n+\n \tControlList ctrls(ctrls_);\n \tctrls.set(V4L2_CID_EXPOSURE, static_cast(exposure_));\n \tctrls.set(V4L2_CID_ANALOGUE_GAIN, static_cast(gain_));\ndiff --git a/src/ipa/ipu3/meson.build b/src/ipa/ipu3/meson.build\nindex d1126947..39320980 100644\n--- a/src/ipa/ipu3/meson.build\n+++ b/src/ipa/ipu3/meson.build\n@@ -6,7 +6,6 @@ ipa_name = 'ipa_ipu3'\n \n ipu3_ipa_sources = files([\n 'ipu3.cpp',\n- 'ipu3_agc.cpp',\n ])\n \n ipu3_ipa_sources += ipu3_ipa_algorithms\n","prefixes":["libcamera-devel","v3","9/9"]}