Patch Detail
Show a patch.
GET /api/1.1/patches/1900/?format=api
{ "id": 1900, "url": "https://patchwork.libcamera.org/api/1.1/patches/1900/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1900/", "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": "<20190829232653.13214-14-niklas.soderlund@ragnatech.se>", "date": "2019-08-29T23:26:52", "name": "[libcamera-devel,v2,13/14] libcamera: ipa: rkisp1: Add basic control of auto exposure", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "f55e167e362edb97ea70ef10f0298dcd13c8df62", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/1.1/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1900/mbox/", "series": [ { "id": 475, "url": "https://patchwork.libcamera.org/api/1.1/series/475/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=475", "date": "2019-08-29T23:26:40", "name": "libcamera: ipa: Add basic IPA support", "version": 2, "mbox": "https://patchwork.libcamera.org/series/475/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1900/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1900/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "Received": [ "from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B72FF60C37\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 30 Aug 2019 01:27:38 +0200 (CEST)", "from bismarck.berto.se (unknown [79.202.45.17])\n\tby bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid 937f8e65-cab4-11e9-837a-0050569116f7;\n\tFri, 30 Aug 2019 01:27:33 +0200 (CEST)" ], "X-Halon-ID": "937f8e65-cab4-11e9-837a-0050569116f7", "Authorized-sender": "niklas@soderlund.pp.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 30 Aug 2019 01:26:52 +0200", "Message-Id": "<20190829232653.13214-14-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.22.1", "In-Reply-To": "<20190829232653.13214-1-niklas.soderlund@ragnatech.se>", "References": "<20190829232653.13214-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 13/14] libcamera: ipa: rkisp1: Add\n\tbasic control of auto exposure", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "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>", "X-List-Received-Date": "Thu, 29 Aug 2019 23:27:39 -0000" }, "content": "Add an IPA which controls the exposure time and analog gain for a sensor\nconnected to the rkisp1 pipeline. The IPA supports turning AE on and off\nbut lacks the support to inform the camera of the status of the AE\ncontrol loop.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n src/ipa/ipa_rkisp1.cpp | 165 +++++++++++++++++++++++++++++++++++++++++\n src/ipa/meson.build | 5 +-\n 2 files changed, 168 insertions(+), 2 deletions(-)\n create mode 100644 src/ipa/ipa_rkisp1.cpp", "diff": "diff --git a/src/ipa/ipa_rkisp1.cpp b/src/ipa/ipa_rkisp1.cpp\nnew file mode 100644\nindex 0000000000000000..063b075d8358c30d\n--- /dev/null\n+++ b/src/ipa/ipa_rkisp1.cpp\n@@ -0,0 +1,165 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * ipa_rkisp1.cpp - RkISP1 Image Processing Algorithms\n+ */\n+\n+#include <algorithm>\n+#include <string.h>\n+\n+#include <linux/rkisp1-config.h>\n+\n+#include <libcamera/buffer.h>\n+#include <libcamera/ipa/ipa_interface.h>\n+#include <libcamera/ipa/ipa_module_info.h>\n+#include <libcamera/request.h>\n+\n+#include \"log.h\"\n+#include \"utils.h\"\n+\n+namespace libcamera {\n+\n+LOG_DEFINE_CATEGORY(IPARkISP1)\n+\n+class IPARkISP1 : public IPAInterface\n+{\n+public:\n+\tint initSensor(const V4L2ControlInfoMap &controls) override;\n+\tvoid processRequest(const void *cookie, const ControlList &controls,\n+\t\t\t Buffer ¶meters) override;\n+\tvoid updateStatistics(const void *cookie, Buffer &statistics) override;\n+\n+private:\n+\tvoid setControls();\n+\n+\tuint64_t statFrame_;\n+\n+\t/* Camera sensor controls. */\n+\tbool autoExposure_;\n+\tuint64_t exposure_;\n+\tuint64_t minExposure_;\n+\tuint64_t maxExposure_;\n+\tuint64_t gain_;\n+\tuint64_t minGain_;\n+\tuint64_t maxGain_;\n+};\n+\n+int IPARkISP1::initSensor(const V4L2ControlInfoMap &controls)\n+{\n+\tstatFrame_ = 0;\n+\n+\tconst auto itExp = controls.find(V4L2_CID_EXPOSURE);\n+\tif (itExp == controls.end())\n+\t\treturn -ENODEV;\n+\n+\tconst auto itGain = controls.find(V4L2_CID_ANALOGUE_GAIN);\n+\tif (itGain == controls.end())\n+\t\treturn -ENODEV;\n+\n+\tautoExposure_ = true;\n+\n+\tminExposure_ = std::max<uint64_t>(itExp->second.min(), 1);\n+\tmaxExposure_ = itExp->second.max();\n+\texposure_ = minExposure_;\n+\n+\tminGain_ = std::max<uint64_t>(itGain->second.min(), 1);\n+\tmaxGain_ = itGain->second.max();\n+\tgain_ = minGain_;\n+\n+\tLOG(IPARkISP1, Info)\n+\t\t<< \"Exposure: \" << minExposure_ << \"-\" << maxExposure_\n+\t\t<< \" Gain: \" << minGain_ << \"-\" << maxGain_;\n+\n+\tsetControls();\n+\n+\treturn 0;\n+}\n+\n+void IPARkISP1::setControls()\n+{\n+\tV4L2ControlList ctrls;\n+\tctrls.add(V4L2_CID_EXPOSURE);\n+\tctrls.add(V4L2_CID_ANALOGUE_GAIN);\n+\tctrls[V4L2_CID_EXPOSURE]->setValue(exposure_);\n+\tctrls[V4L2_CID_ANALOGUE_GAIN]->setValue(gain_);\n+\n+\tupdateSensor.emit(ctrls);\n+}\n+\n+void IPARkISP1::processRequest(const void *cookie, const ControlList &controls,\n+\t\t\t Buffer ¶meters)\n+{\n+\trkisp1_isp_params_cfg *params =\n+\t\tstatic_cast<rkisp1_isp_params_cfg *>(parameters.mem()->planes()[0].mem());\n+\n+\tmemset(params, 0, sizeof(*params));\n+\n+\t/* Auto Exposure on/off. */\n+\tif (controls.contains(AeEnable)) {\n+\t\tautoExposure_ = controls[AeEnable].getBool();\n+\t\tif (autoExposure_)\n+\t\t\tparams->module_ens = CIFISP_MODULE_AEC;\n+\n+\t\tparams->module_en_update = CIFISP_MODULE_AEC;\n+\t}\n+\n+\tqueueRequest.emit(cookie);\n+}\n+\n+void IPARkISP1::updateStatistics(const void *cookie, Buffer &statistics)\n+{\n+\tconst rkisp1_stat_buffer *stats =\n+\t\tstatic_cast<rkisp1_stat_buffer *>(statistics.mem()->planes()[0].mem());\n+\tconst cifisp_stat *params = &stats->params;\n+\n+\tif ((stats->meas_type & CIFISP_STAT_AUTOEXP) && (statFrame_ % 2 == 0)) {\n+\t\tconst cifisp_ae_stat *ae = ¶ms->ae;\n+\n+\t\tconst unsigned int target = 60;\n+\n+\t\tunsigned int value = 0;\n+\t\tunsigned int num = 0;\n+\t\tfor (int i = 0; i < CIFISP_AE_MEAN_MAX; i++) {\n+\t\t\tif (ae->exp_mean[i] > 15) {\n+\t\t\t\tvalue += ae->exp_mean[i];\n+\t\t\t\tnum++;\n+\t\t\t}\n+\t\t}\n+\t\tvalue /= num;\n+\n+\t\tdouble factor = (double)target / value;\n+\t\tdouble tmp;\n+\n+\t\ttmp = factor * exposure_ * gain_ / minGain_;\n+\t\texposure_ = utils::clamp<uint64_t>((uint64_t)tmp, minExposure_, maxExposure_);\n+\n+\t\ttmp = tmp / exposure_ * minGain_;\n+\t\tgain_ = utils::clamp<uint64_t>((uint64_t)tmp, minGain_, maxGain_);\n+\n+\t\tsetControls();\n+\t}\n+\n+\tstatFrame_++;\n+}\n+\n+/*\n+ * External IPA module interface\n+ */\n+\n+extern \"C\" {\n+const struct IPAModuleInfo ipaModuleInfo = {\n+\tIPA_MODULE_API_VERSION,\n+\t1,\n+\t\"PipelineHandlerRkISP1\",\n+\t\"RkISP1 IPA\",\n+\t\"LGPL-2.1-or-later\",\n+};\n+\n+IPAInterface *ipaCreate()\n+{\n+\treturn new IPARkISP1();\n+}\n+};\n+\n+}; /* namespace libcamera */\ndiff --git a/src/ipa/meson.build b/src/ipa/meson.build\nindex dca7a9461385b68d..59311e6adae90ada 100644\n--- a/src/ipa/meson.build\n+++ b/src/ipa/meson.build\n@@ -1,11 +1,12 @@\n-ipa_dummy_sources = [\n+ipa_sources = [\n ['ipa_dummy', 'ipa_dummy.cpp'],\n ['ipa_dummy_isolate', 'ipa_dummy_isolate.cpp'],\n+ ['ipa_rkisp1', 'ipa_rkisp1.cpp'],\n ]\n \n ipa_install_dir = join_paths(get_option('libdir'), 'libcamera')\n \n-foreach t : ipa_dummy_sources\n+foreach t : ipa_sources\n ipa = shared_module(t[0],\n t[1],\n name_prefix : '',\n", "prefixes": [ "libcamera-devel", "v2", "13/14" ] }