Patch Detail
Show a patch.
GET /api/1.1/patches/2092/?format=api
{ "id": 2092, "url": "https://patchwork.libcamera.org/api/1.1/patches/2092/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2092/", "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": "<20191003174941.1296988-11-niklas.soderlund@ragnatech.se>", "date": "2019-10-03T17:49:40", "name": "[libcamera-devel,v4,10/11] libcamera: ipa: rkisp1: Add basic control of auto exposure", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "a18a0cde85b75b75427d964d19584a9690213b10", "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/2092/mbox/", "series": [ { "id": 516, "url": "https://patchwork.libcamera.org/api/1.1/series/516/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=516", "date": "2019-10-03T17:49:31", "name": "libcamera: ipa: Add basic IPA support", "version": 4, "mbox": "https://patchwork.libcamera.org/series/516/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/2092/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2092/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "Received": [ "from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D091361767\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 3 Oct 2019 19:50:43 +0200 (CEST)", "from bismarck.berto.se (unknown [84.172.88.101])\n\tby bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid 34f93834-e606-11e9-837a-0050569116f7;\n\tThu, 03 Oct 2019 19:49:54 +0200 (CEST)" ], "X-Halon-ID": "34f93834-e606-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": "Thu, 3 Oct 2019 19:49:40 +0200", "Message-Id": "<20191003174941.1296988-11-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.23.0", "In-Reply-To": "<20191003174941.1296988-1-niklas.soderlund@ragnatech.se>", "References": "<20191003174941.1296988-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 10/11] libcamera: ipa: rkisp1: Add\n\tbasic control of auto exposure", "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>", "X-List-Received-Date": "Thu, 03 Oct 2019 17:50:44 -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\nand informing the camera of the status of the AE control loop.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n include/ipa/rkisp1.h | 23 ++++\n src/ipa/ipa_rkisp1.cpp | 278 +++++++++++++++++++++++++++++++++++++++++\n src/ipa/meson.build | 13 ++\n 3 files changed, 314 insertions(+)\n create mode 100644 include/ipa/rkisp1.h\n create mode 100644 src/ipa/ipa_rkisp1.cpp", "diff": "diff --git a/include/ipa/rkisp1.h b/include/ipa/rkisp1.h\nnew file mode 100644\nindex 0000000000000000..de9c7971e7bc94ad\n--- /dev/null\n+++ b/include/ipa/rkisp1.h\n@@ -0,0 +1,23 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * rkisp1.h - Image Processing Algorithm interface for RkISP1\n+ */\n+#ifndef __LIBCAMERA_IPA_INTERFACE_RKISP1_H__\n+#define __LIBCAMERA_IPA_INTERFACE_RKISP1_H__\n+\n+enum RkISP1BufferType {\n+\tRKISP1_BUFFER_PARAM = 1,\n+\tRKISP1_BUFFER_STAT = 2,\n+};\n+\n+enum RkISP1Operations {\n+\tRKISP1_IPA_ACTION_V4L2_SET = 1,\n+\tRKISP1_IPA_ACTION_QUEUE_BUFFER = 2,\n+\tRKISP1_IPA_ACTION_META_DATA = 3,\n+\tRKISP1_IPA_EVENT_SIGNAL_BUFFER = 4,\n+\tRKISP1_IPA_EVENT_QUEUE_REQUEST = 5,\n+};\n+\n+#endif /* __LIBCAMERA_IPA_INTERFACE_RKISP1_H__ */\ndiff --git a/src/ipa/ipa_rkisp1.cpp b/src/ipa/ipa_rkisp1.cpp\nnew file mode 100644\nindex 0000000000000000..78dd148a66299ab9\n--- /dev/null\n+++ b/src/ipa/ipa_rkisp1.cpp\n@@ -0,0 +1,278 @@\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 <cstdint>\n+#include <math.h>\n+#include <queue>\n+#include <string.h>\n+\n+#include <linux/rkisp1-config.h>\n+\n+#include <ipa/ipa_interface.h>\n+#include <ipa/ipa_module_info.h>\n+#include <ipa/rkisp1.h>\n+#include <libcamera/buffer.h>\n+#include <libcamera/control_ids.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 init() override { return 0; }\n+\n+\tvoid configure(const std::map<unsigned int, IPAStream> &streamConfig,\n+\t\t const std::map<unsigned int, V4L2ControlInfoMap> &entityControls) override;\n+\tvoid mapBuffers(const std::vector<IPABuffer> &buffers) override;\n+\tvoid unmapBuffers(const std::vector<IPABuffer> &buffers) override;\n+\tvoid processEvent(const IPAOperationData &event) override;\n+\n+private:\n+\tvoid signalBuffer(unsigned int type, unsigned int id);\n+\tvoid queueRequest(unsigned int frame, const ControlList &controls);\n+\tvoid updateStatistics(unsigned int frame, BufferMemory &statistics);\n+\n+\tvoid setControls(unsigned int frame);\n+\tvoid queueBuffer(unsigned int frame, unsigned int type,\n+\t\t\t unsigned int id);\n+\tvoid metaDataReady(unsigned int frame, unsigned int aeState);\n+\n+\tstd::map<unsigned int, std::map<unsigned int, BufferMemory>> bufferInfo_;\n+\tstd::map<unsigned int, std::map<unsigned int, unsigned int>> bufferFrame_;\n+\tstd::map<unsigned int, std::queue<unsigned int>> bufferFree_;\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+void IPARkISP1::configure(const std::map<unsigned int, IPAStream> &streamConfig,\n+\t\t\t const std::map<unsigned int, V4L2ControlInfoMap> &entityControls)\n+{\n+\tif (entityControls.empty())\n+\t\treturn;\n+\n+\tconst V4L2ControlInfoMap &ctrls = entityControls.at(0);\n+\n+\tconst auto itExp = ctrls.find(V4L2_CID_EXPOSURE);\n+\tif (itExp == ctrls.end()) {\n+\t\tLOG(IPARkISP1, Error) << \"Can't find exposure control\";\n+\t\treturn;\n+\t}\n+\n+\tconst auto itGain = ctrls.find(V4L2_CID_ANALOGUE_GAIN);\n+\tif (itGain == ctrls.end()) {\n+\t\tLOG(IPARkISP1, Error) << \"Can't find gain control\";\n+\t\treturn;\n+\t}\n+\n+\tautoExposure_ = true;\n+\n+\tminExposure_ = std::max<uint64_t>(itExp->second.range().min().get<int32_t>(), 1);\n+\tmaxExposure_ = itExp->second.range().max().get<int32_t>();\n+\texposure_ = minExposure_;\n+\n+\tminGain_ = std::max<uint64_t>(itGain->second.range().min().get<int32_t>(), 1);\n+\tmaxGain_ = itGain->second.range().max().get<int32_t>();\n+\tgain_ = minGain_;\n+\n+\tLOG(IPARkISP1, Info)\n+\t\t<< \"Exposure: \" << minExposure_ << \"-\" << maxExposure_\n+\t\t<< \" Gain: \" << minGain_ << \"-\" << maxGain_;\n+\n+\tsetControls(0);\n+}\n+\n+void IPARkISP1::mapBuffers(const std::vector<IPABuffer> &buffers)\n+{\n+\tfor (IPABuffer buffer : buffers) {\n+\t\tbufferInfo_[buffer.type][buffer.id] = buffer.buffer;\n+\t\tbufferInfo_[buffer.type][buffer.id].planes()[0].mem();\n+\t\tbufferFree_[buffer.type].push(buffer.id);\n+\t}\n+}\n+\n+void IPARkISP1::unmapBuffers(const std::vector<IPABuffer> &buffers)\n+{\n+\tfor (IPABuffer buffer : buffers)\n+\t\tbufferInfo_[buffer.type].erase(buffer.id);\n+}\n+\n+void IPARkISP1::processEvent(const IPAOperationData &event)\n+{\n+\tswitch (event.operation) {\n+\tcase RKISP1_IPA_EVENT_SIGNAL_BUFFER:\n+\t\tsignalBuffer(event.data[0], event.data[1]);\n+\t\tbreak;\n+\tcase RKISP1_IPA_EVENT_QUEUE_REQUEST:\n+\t\tqueueRequest(event.data[0], event.controls[0]);\n+\t\tbreak;\n+\tdefault:\n+\t\tLOG(IPARkISP1, Error) << \"Unkown event \" << event.operation;\n+\t\tbreak;\n+\t}\n+}\n+\n+void IPARkISP1::signalBuffer(unsigned int type, unsigned int id)\n+{\n+\tif (type == RKISP1_BUFFER_STAT) {\n+\t\tunsigned int frame = bufferFrame_[type][id];\n+\t\tBufferMemory &mem = bufferInfo_[type][id];\n+\t\tupdateStatistics(frame, mem);\n+\t}\n+\n+\tbufferFree_[type].push(id);\n+}\n+\n+void IPARkISP1::queueRequest(unsigned int frame, const ControlList &controls)\n+{\n+\t/* Find buffers. */\n+\tif (bufferFree_[RKISP1_BUFFER_PARAM].empty()) {\n+\t\tLOG(IPARkISP1, Error) << \"Param buffer underrun\";\n+\t\treturn;\n+\t}\n+\n+\tif (bufferFree_[RKISP1_BUFFER_STAT].empty()) {\n+\t\tLOG(IPARkISP1, Error) << \"Statistics buffer underrun\";\n+\t\treturn;\n+\t}\n+\n+\tunsigned int paramid = bufferFree_[RKISP1_BUFFER_PARAM].front();\n+\tbufferFree_[RKISP1_BUFFER_PARAM].pop();\n+\tunsigned int statid = bufferFree_[RKISP1_BUFFER_STAT].front();\n+\tbufferFree_[RKISP1_BUFFER_STAT].pop();\n+\n+\tbufferFrame_[RKISP1_BUFFER_PARAM][paramid] = frame;\n+\tbufferFrame_[RKISP1_BUFFER_STAT][statid] = frame;\n+\n+\t/* Prepare parameters buffer. */\n+\tBufferMemory &mem = bufferInfo_[RKISP1_BUFFER_PARAM][paramid];\n+\trkisp1_isp_params_cfg *params =\n+\t\tstatic_cast<rkisp1_isp_params_cfg *>(mem.planes()[0].mem());\n+\n+\tmemset(params, 0, sizeof(*params));\n+\n+\t/* Auto Exposure on/off. */\n+\tif (controls.contains(controls::AeEnable)) {\n+\t\tautoExposure_ = controls.get(controls::AeEnable);\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+\t/* Queue buffers to pipeline. */\n+\tqueueBuffer(frame, RKISP1_BUFFER_PARAM, paramid);\n+\tqueueBuffer(frame, RKISP1_BUFFER_STAT, statid);\n+}\n+\n+void IPARkISP1::updateStatistics(unsigned int frame, BufferMemory &statistics)\n+{\n+\tconst rkisp1_stat_buffer *stats =\n+\t\tstatic_cast<rkisp1_stat_buffer *>(statistics.planes()[0].mem());\n+\tconst cifisp_stat *params = &stats->params;\n+\tunsigned int aeState = 0;\n+\n+\tif (stats->meas_type & CIFISP_STAT_AUTOEXP) {\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+\n+\t\tif (frame % 3 == 0) {\n+\t\t\tdouble tmp;\n+\n+\t\t\ttmp = factor * exposure_ * gain_ / minGain_;\n+\t\t\texposure_ = utils::clamp<uint64_t>((uint64_t)tmp, minExposure_, maxExposure_);\n+\n+\t\t\ttmp = tmp / exposure_ * minGain_;\n+\t\t\tgain_ = utils::clamp<uint64_t>((uint64_t)tmp, minGain_, maxGain_);\n+\n+\t\t\tsetControls(frame + 1);\n+\t\t}\n+\n+\t\taeState = fabs(factor - 1.0f) < 0.05f ? 2 : 1;\n+\t}\n+\n+\tmetaDataReady(frame, aeState);\n+}\n+\n+void IPARkISP1::setControls(unsigned int frame)\n+{\n+\tIPAOperationData op;\n+\top.operation = RKISP1_IPA_ACTION_V4L2_SET;\n+\top.data.push_back(frame);\n+\top.data.push_back(V4L2_CID_EXPOSURE);\n+\top.data.push_back(exposure_);\n+\top.data.push_back(V4L2_CID_ANALOGUE_GAIN);\n+\top.data.push_back(gain_);\n+\n+\tqueueFrameAction.emit(op);\n+}\n+\n+void IPARkISP1::queueBuffer(unsigned int frame, unsigned int type,\n+\t\t\t unsigned int id)\n+{\n+\tIPAOperationData op;\n+\top.operation = RKISP1_IPA_ACTION_QUEUE_BUFFER;\n+\top.data = { frame, type, id };\n+\n+\tqueueFrameAction.emit(op);\n+}\n+\n+void IPARkISP1::metaDataReady(unsigned int frame, unsigned int aeState)\n+{\n+\tIPAOperationData op;\n+\top.operation = RKISP1_IPA_ACTION_META_DATA;\n+\top.data = { frame, aeState };\n+\n+\tqueueFrameAction.emit(op);\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 10448c2ffc76af4b..eb5b852eec282735 100644\n--- a/src/ipa/meson.build\n+++ b/src/ipa/meson.build\n@@ -3,6 +3,10 @@ ipa_dummy_sources = [\n ['ipa_dummy_isolate', 'Proprietary'],\n ]\n \n+ipa_sources = [\n+ ['ipa_rkisp1', 'ipa_rkisp1.cpp', 'LGPL-2.1-or-later'],\n+]\n+\n ipa_install_dir = join_paths(get_option('libdir'), 'libcamera')\n \n foreach t : ipa_dummy_sources\n@@ -14,5 +18,14 @@ foreach t : ipa_dummy_sources\n cpp_args : '-DLICENSE=\"' + t[1] + '\"')\n endforeach\n \n+foreach t : ipa_sources\n+ ipa = shared_module(t[0], t[1],\n+ name_prefix : '',\n+ include_directories : includes,\n+ install : true,\n+ install_dir : ipa_install_dir,\n+ cpp_args : '-DLICENSE=\"' + t[2] + '\"')\n+endforeach\n+\n config_h.set('IPA_MODULE_DIR',\n '\"' + join_paths(get_option('prefix'), ipa_install_dir) + '\"')\n", "prefixes": [ "libcamera-devel", "v4", "10/11" ] }