Patch Detail
Show a patch.
GET /api/1.1/patches/13254/?format=api
{ "id": 13254, "url": "https://patchwork.libcamera.org/api/1.1/patches/13254/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13254/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20210809092007.79067-4-jeanmichel.hautbois@ideasonboard.com>", "date": "2021-08-09T09:20:05", "name": "[libcamera-devel,RFC,3/5] ipa: ipu3: Introduce a modular contrast algorithm", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "373db5667978dcc29688fc232d36c10f365b3b34", "submitter": { "id": 75, "url": "https://patchwork.libcamera.org/api/1.1/people/75/?format=api", "name": "Jean-Michel Hautbois", "email": "jeanmichel.hautbois@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/13254/mbox/", "series": [ { "id": 2320, "url": "https://patchwork.libcamera.org/api/1.1/series/2320/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2320", "date": "2021-08-09T09:20:02", "name": "IPU3: Introduce modularity for algorithms", "version": 1, "mbox": "https://patchwork.libcamera.org/series/2320/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13254/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13254/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 2DE43C3242\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 9 Aug 2021 09:20:21 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B5F3868826;\n\tMon, 9 Aug 2021 11:20:20 +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 635F5687EB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 9 Aug 2021 11:20:16 +0200 (CEST)", "from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:14c5:c0eb:b1fb:db22])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1464BEE;\n\tMon, 9 Aug 2021 11:20:16 +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=\"g7OwlpWU\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628500816;\n\tbh=gV2W5BMl/IGfqZ28vFNS1Xz9w9rEZysXtutG/golD48=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=g7OwlpWUsWcziVrsAStrLEOaH6DHKfvofpUPl86ZtlyTJpNbmO/vCjJZYOOfTZDbd\n\tFfJITmulfuO69iQha61UbdpM4pyk5VDCwFw1SkpouKejnS+BtebjZsy6i/MQPwFCpl\n\th368kJb+uoX5Kxlt/vo61KQrygCE7AK7EuPdQS6I=", "From": "Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 9 Aug 2021 11:20:05 +0200", "Message-Id": "<20210809092007.79067-4-jeanmichel.hautbois@ideasonboard.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20210809092007.79067-1-jeanmichel.hautbois@ideasonboard.com>", "References": "<20210809092007.79067-1-jeanmichel.hautbois@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [RFC PATCH 3/5] ipa: ipu3: Introduce a modular\n\tcontrast algorithm", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Implement a new modular framework for algorithms with a common context\nstructure that is passed to each algorithm through a common API.\n\nThe initial algorithm is chosen to configure the gamma contrast curve\nwhich replicates the implementation from AWB for simplicity. As it is\ninitialised with a default gamma value of 1.0, there is no need to use\nthe default table at init time anymore.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nSigned-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\n---\n src/ipa/ipu3/algorithms/contrast.cpp | 52 ++++++++++++++++++++++++++++\n src/ipa/ipu3/algorithms/contrast.h | 32 +++++++++++++++++\n src/ipa/ipu3/algorithms/meson.build | 1 +\n src/ipa/ipu3/ipu3.cpp | 6 +++-\n src/ipa/ipu3/ipu3_agc.cpp | 5 +--\n src/ipa/ipu3/ipu3_agc.h | 3 --\n src/ipa/ipu3/ipu3_awb.cpp | 41 ++--------------------\n src/ipa/ipu3/ipu3_awb.h | 2 +-\n 8 files changed, 94 insertions(+), 48 deletions(-)\n create mode 100644 src/ipa/ipu3/algorithms/contrast.cpp\n create mode 100644 src/ipa/ipu3/algorithms/contrast.h", "diff": "diff --git a/src/ipa/ipu3/algorithms/contrast.cpp b/src/ipa/ipu3/algorithms/contrast.cpp\nnew file mode 100644\nindex 00000000..832dbf35\n--- /dev/null\n+++ b/src/ipa/ipu3/algorithms/contrast.cpp\n@@ -0,0 +1,52 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2021, Ideas On Board\n+ *\n+ * constrast.cpp - IPU3 Contrast and Gamma control\n+ */\n+\n+#include \"contrast.h\"\n+\n+#include <cmath>\n+\n+#include <libcamera/base/log.h>\n+\n+namespace libcamera {\n+\n+namespace ipa::ipu3::algorithms {\n+\n+LOG_DEFINE_CATEGORY(IPU3Contrast)\n+\n+Contrast::Contrast()\n+\t: gamma_(1.0)\n+{\n+\tLOG(IPU3Contrast, Info) << \"Instantiate Gamma\";\n+}\n+\n+int Contrast::initialise(IPAContext &context)\n+{\n+\tipu3_uapi_params ¶ms = context.params;\n+\n+\tparams.use.acc_gamma = 1;\n+\tparams.acc_param.gamma.gc_ctrl.enable = 1;\n+\n+\t/* Limit the gamma effect for now */\n+\tgamma_ = 1.1;\n+\n+\t/* Plot the gamma curve into the look up table */\n+\tfor (uint32_t i = 0; i < 256; i++) {\n+\t\tdouble j = i / 255.0;\n+\t\tdouble gamma = std::pow(j, 1.0 / gamma_);\n+\n+\t\t/* The maximum value 255 is represented on 13 bits in the IPU3 */\n+\t\tparams.acc_param.gamma.gc_lut.lut[i] = gamma * 8191;\n+\t}\n+\n+\tLOG(IPU3Contrast, Info) << \"Processed Gamma Curve\";\n+\n+\treturn 0;\n+}\n+\n+} /* namespace ipa::ipu3::algorithms */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/ipu3/algorithms/contrast.h b/src/ipa/ipu3/algorithms/contrast.h\nnew file mode 100644\nindex 00000000..958e8bb8\n--- /dev/null\n+++ b/src/ipa/ipu3/algorithms/contrast.h\n@@ -0,0 +1,32 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2021, Google\n+ *\n+ * constrast.h - IPU3 Contrast and Gamma control\n+ */\n+#ifndef __LIBCAMERA_IPU3_ALGORITHMS_CONTRAST_H__\n+#define __LIBCAMERA_IPU3_ALGORITHMS_CONTRAST_H__\n+\n+#include \"algorithm.h\"\n+\n+namespace libcamera {\n+\n+namespace ipa::ipu3::algorithms {\n+\n+class Contrast : public Algorithm\n+{\n+public:\n+\tContrast();\n+\t~Contrast() = default;\n+\n+\tint initialise(IPAContext &context) override;\n+\n+private:\n+\tdouble gamma_;\n+};\n+\n+} /* namespace ipa::ipu3::algorithms */\n+\n+} /* namespace libcamera */\n+\n+#endif /* __LIBCAMERA_IPU3_ALGORITHMS_CONTRAST_H__ */\ndiff --git a/src/ipa/ipu3/algorithms/meson.build b/src/ipa/ipu3/algorithms/meson.build\nindex 67148333..f71d1e61 100644\n--- a/src/ipa/ipu3/algorithms/meson.build\n+++ b/src/ipa/ipu3/algorithms/meson.build\n@@ -1,4 +1,5 @@\n # SPDX-License-Identifier: CC0-1.0\n \n ipu3_ipa_algorithms = files([\n+ 'contrast.cpp',\n ])\ndiff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 55c4da72..7035802f 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -23,6 +23,7 @@\n #include \"libcamera/internal/framebuffer.h\"\n \n #include \"algorithms/algorithm.h\"\n+#include \"algorithms/contrast.h\"\n #include \"ipa_context.h\"\n \n #include \"ipu3_agc.h\"\n@@ -103,6 +104,9 @@ int IPAIPU3::init(const IPASettings &settings)\n \t\treturn -ENODEV;\n \t}\n \n+\t/* Construct our Algorithms */\n+\talgorithms_.emplace_back(new algorithms::Contrast());\n+\n \t/* Reset all the hardware settings */\n \tcontext_.params = {};\n \n@@ -290,7 +294,7 @@ void IPAIPU3::processControls([[maybe_unused]] unsigned int frame,\n void IPAIPU3::fillParams(unsigned int frame, ipu3_uapi_params *params)\n {\n \tif (agcAlgo_->updateControls())\n-\t\tawbAlgo_->updateWbParameters(context_.params, agcAlgo_->gamma());\n+\t\tawbAlgo_->updateWbParameters(context_.params);\n \n \t*params = context_.params;\n \ndiff --git a/src/ipa/ipu3/ipu3_agc.cpp b/src/ipa/ipu3/ipu3_agc.cpp\nindex 6253ab94..733814dd 100644\n--- a/src/ipa/ipu3/ipu3_agc.cpp\n+++ b/src/ipa/ipu3/ipu3_agc.cpp\n@@ -52,7 +52,7 @@ 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), gamma_(1.0),\n+\t updateControls_(false), iqMean_(0.0),\n \t lineDuration_(0s), maxExposureTime_(0s),\n \t prevExposure_(0s), prevExposureNoDg_(0s),\n \t currentExposure_(0s), currentExposureNoDg_(0s)\n@@ -104,9 +104,6 @@ void IPU3Agc::processBrightness(const ipu3_uapi_stats_3a *stats)\n \t\t}\n \t}\n \n-\t/* Limit the gamma effect for now */\n-\tgamma_ = 1.1;\n-\n \t/* Estimate the quantile mean of the top 2% of the histogram */\n \tiqMean_ = Histogram(Span<uint32_t>(hist)).interQuantileMean(0.98, 1.0);\n }\ndiff --git a/src/ipa/ipu3/ipu3_agc.h b/src/ipa/ipu3/ipu3_agc.h\nindex e3e1d28b..3b7f781e 100644\n--- a/src/ipa/ipu3/ipu3_agc.h\n+++ b/src/ipa/ipu3/ipu3_agc.h\n@@ -37,8 +37,6 @@ public:\n \tvoid process(const ipu3_uapi_stats_3a *stats, uint32_t &exposure, double &gain);\n \tbool converged() { return converged_; }\n \tbool updateControls() { return updateControls_; }\n-\t/* \\todo Use a metadata exchange between IPAs */\n-\tdouble gamma() { return gamma_; }\n \n private:\n \tvoid processBrightness(const ipu3_uapi_stats_3a *stats);\n@@ -54,7 +52,6 @@ private:\n \tbool updateControls_;\n \n \tdouble iqMean_;\n-\tdouble gamma_;\n \n \tDuration lineDuration_;\n \tDuration maxExposureTime_;\ndiff --git a/src/ipa/ipu3/ipu3_awb.cpp b/src/ipa/ipu3/ipu3_awb.cpp\nindex 9b409c8f..043c3838 100644\n--- a/src/ipa/ipu3/ipu3_awb.cpp\n+++ b/src/ipa/ipu3/ipu3_awb.cpp\n@@ -134,31 +134,6 @@ static const struct ipu3_uapi_ccm_mat_config imguCssCcmDefault = {\n \t0, 0, 8191, 0\n };\n \n-/* Default settings for Gamma correction */\n-const struct ipu3_uapi_gamma_corr_lut imguCssGammaLut = { {\n-\t63, 79, 95, 111, 127, 143, 159, 175, 191, 207, 223, 239, 255, 271, 287,\n-\t303, 319, 335, 351, 367, 383, 399, 415, 431, 447, 463, 479, 495, 511,\n-\t527, 543, 559, 575, 591, 607, 623, 639, 655, 671, 687, 703, 719, 735,\n-\t751, 767, 783, 799, 815, 831, 847, 863, 879, 895, 911, 927, 943, 959,\n-\t975, 991, 1007, 1023, 1039, 1055, 1071, 1087, 1103, 1119, 1135, 1151,\n-\t1167, 1183, 1199, 1215, 1231, 1247, 1263, 1279, 1295, 1311, 1327, 1343,\n-\t1359, 1375, 1391, 1407, 1423, 1439, 1455, 1471, 1487, 1503, 1519, 1535,\n-\t1551, 1567, 1583, 1599, 1615, 1631, 1647, 1663, 1679, 1695, 1711, 1727,\n-\t1743, 1759, 1775, 1791, 1807, 1823, 1839, 1855, 1871, 1887, 1903, 1919,\n-\t1935, 1951, 1967, 1983, 1999, 2015, 2031, 2047, 2063, 2079, 2095, 2111,\n-\t2143, 2175, 2207, 2239, 2271, 2303, 2335, 2367, 2399, 2431, 2463, 2495,\n-\t2527, 2559, 2591, 2623, 2655, 2687, 2719, 2751, 2783, 2815, 2847, 2879,\n-\t2911, 2943, 2975, 3007, 3039, 3071, 3103, 3135, 3167, 3199, 3231, 3263,\n-\t3295, 3327, 3359, 3391, 3423, 3455, 3487, 3519, 3551, 3583, 3615, 3647,\n-\t3679, 3711, 3743, 3775, 3807, 3839, 3871, 3903, 3935, 3967, 3999, 4031,\n-\t4063, 4095, 4127, 4159, 4223, 4287, 4351, 4415, 4479, 4543, 4607, 4671,\n-\t4735, 4799, 4863, 4927, 4991, 5055, 5119, 5183, 5247, 5311, 5375, 5439,\n-\t5503, 5567, 5631, 5695, 5759, 5823, 5887, 5951, 6015, 6079, 6143, 6207,\n-\t6271, 6335, 6399, 6463, 6527, 6591, 6655, 6719, 6783, 6847, 6911, 6975,\n-\t7039, 7103, 7167, 7231, 7295, 7359, 7423, 7487, 7551, 7615, 7679, 7743,\n-\t7807, 7871, 7935, 7999, 8063, 8127, 8191\n-} };\n-\n IPU3Awb::IPU3Awb()\n \t: Algorithm()\n {\n@@ -198,10 +173,6 @@ void IPU3Awb::initialise(ipu3_uapi_params ¶ms, const Size &bdsOutputSize, st\n \tparams.use.acc_ccm = 1;\n \tparams.acc_param.ccm = imguCssCcmDefault;\n \n-\tparams.use.acc_gamma = 1;\n-\tparams.acc_param.gamma.gc_lut = imguCssGammaLut;\n-\tparams.acc_param.gamma.gc_ctrl.enable = 1;\n-\n \tzones_.reserve(kAwbStatsSizeX * kAwbStatsSizeY);\n }\n \n@@ -351,7 +322,7 @@ void IPU3Awb::calculateWBGains(const ipu3_uapi_stats_3a *stats)\n \t}\n }\n \n-void IPU3Awb::updateWbParameters(ipu3_uapi_params ¶ms, double agcGamma)\n+void IPU3Awb::updateWbParameters(ipu3_uapi_params ¶ms)\n {\n \t/*\n \t * Green gains should not be touched and considered 1.\n@@ -363,18 +334,10 @@ void IPU3Awb::updateWbParameters(ipu3_uapi_params ¶ms, double agcGamma)\n \tparams.acc_param.bnr.wb_gains.b = 4096 * asyncResults_.blueGain;\n \tparams.acc_param.bnr.wb_gains.gb = 16;\n \n-\tLOG(IPU3Awb, Debug) << \"Color temperature estimated: \" << asyncResults_.temperatureK\n-\t\t\t << \" and gamma calculated: \" << agcGamma;\n+\tLOG(IPU3Awb, Debug) << \"Color temperature estimated: \" << asyncResults_.temperatureK;\n \n \t/* The CCM matrix may change when color temperature will be used */\n \tparams.acc_param.ccm = imguCssCcmDefault;\n-\n-\tfor (uint32_t i = 0; i < 256; i++) {\n-\t\tdouble j = i / 255.0;\n-\t\tdouble gamma = std::pow(j, 1.0 / agcGamma);\n-\t\t/* The maximum value 255 is represented on 13 bits in the IPU3 */\n-\t\tparams.acc_param.gamma.gc_lut.lut[i] = gamma * 8191;\n-\t}\n }\n \n } /* namespace ipa::ipu3 */\ndiff --git a/src/ipa/ipu3/ipu3_awb.h b/src/ipa/ipu3/ipu3_awb.h\nindex 284e3844..8b05ac03 100644\n--- a/src/ipa/ipu3/ipu3_awb.h\n+++ b/src/ipa/ipu3/ipu3_awb.h\n@@ -32,7 +32,7 @@ public:\n \n \tvoid initialise(ipu3_uapi_params ¶ms, const Size &bdsOutputSize, struct ipu3_uapi_grid_config &bdsGrid);\n \tvoid calculateWBGains(const ipu3_uapi_stats_3a *stats);\n-\tvoid updateWbParameters(ipu3_uapi_params ¶ms, double agcGamma);\n+\tvoid updateWbParameters(ipu3_uapi_params ¶ms);\n \n \tstruct Ipu3AwbCell {\n \t\tunsigned char greenRedAvg;\n", "prefixes": [ "libcamera-devel", "RFC", "3/5" ] }