Patch Detail
Show a patch.
GET /api/patches/1323/?format=api
{ "id": 1323, "url": "https://patchwork.libcamera.org/api/patches/1323/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1323/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20190527223540.21855-6-paul.elder@ideasonboard.com>", "date": "2019-05-27T22:35:37", "name": "[libcamera-devel,5/8] libcamera: ipa_manager: implement class for managing IPA modules", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "590528ade02b38008b61c9845f8a0aa9bb715b6f", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1323/mbox/", "series": [ { "id": 330, "url": "https://patchwork.libcamera.org/api/series/330/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=330", "date": "2019-05-27T22:35:32", "name": "Add IPAManager and IPAInterface", "version": 1, "mbox": "https://patchwork.libcamera.org/series/330/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1323/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1323/checks/", "tags": {}, "headers": { "Return-Path": "<paul.elder@ideasonboard.com>", "Received": [ "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 55FB0618F8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 28 May 2019 00:35:51 +0200 (CEST)", "from localhost.localdomain (unknown [96.44.9.117])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8AC7AE4D;\n\tTue, 28 May 2019 00:35:50 +0200 (CEST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1558996551;\n\tbh=ejkr2Gr046lR6nsQ+6poVvE2QydUKLMjBuvLNG0wGiU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=JY7Y+iNVz4NcPv15L6chZWEEgLNs6EB16mdCMfL6bwOCwJ/8tiQvOKWt5cnNZa63d\n\t7Mg7SLW/oGb0MmvXAAI3d0YkoX8IDJWacnlphlMuZpf4tmgG87CxhZYFuDapWhqFyN\n\tiZ5kNKoC1b4TX1mYoguB9KMaGkPjmLD0bNSL1KYc=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 27 May 2019 18:35:37 -0400", "Message-Id": "<20190527223540.21855-6-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190527223540.21855-1-paul.elder@ideasonboard.com>", "References": "<20190527223540.21855-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 5/8] libcamera: ipa_manager: implement\n\tclass for managing IPA modules", "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": "Mon, 27 May 2019 22:35:51 -0000" }, "content": "IPAManager is a class that will search in given directories for IPA\nmodules, and will load them into a list. It also provides an interface\nfor pipeline handlers to aquire an IPA.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n---\n src/libcamera/include/ipa_manager.h | 40 +++++++++\n src/libcamera/ipa_manager.cpp | 129 ++++++++++++++++++++++++++++\n src/libcamera/meson.build | 2 +\n 3 files changed, 171 insertions(+)\n create mode 100644 src/libcamera/include/ipa_manager.h\n create mode 100644 src/libcamera/ipa_manager.cpp", "diff": "diff --git a/src/libcamera/include/ipa_manager.h b/src/libcamera/include/ipa_manager.h\nnew file mode 100644\nindex 0000000..fafafad\n--- /dev/null\n+++ b/src/libcamera/include/ipa_manager.h\n@@ -0,0 +1,40 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * ipa_manager.h - Image Processing Algorithm module manager\n+ */\n+#ifndef __LIBCAMERA_IPA_MANAGER_H__\n+#define __LIBCAMERA_IPA_MANAGER_H__\n+\n+#include <libcamera/ipa/ipa_interface.h>\n+#include <libcamera/ipa/ipa_module_info.h>\n+#include <list>\n+#include <string>\n+\n+#include \"ipa_module.h\"\n+#include \"pipeline_handler.h\"\n+\n+namespace libcamera {\n+\n+class IPAManager\n+{\n+public:\n+\tstatic IPAManager *instance();\n+\n+\tint addDir(const std::string &libDir);\n+\n+\tstd::unique_ptr<IPAInterface> createIPA(PipelineHandler *pipe) const;\n+\n+private:\n+\tstd::list<IPAModule *> modules_;\n+\n+\tIPAManager();\n+\t~IPAManager();\n+\n+\tbool match(const IPAModule *ipam, PipelineHandler *pipe) const;\n+};\n+\n+} /* namespace libcamera */\n+\n+#endif /* __LIBCAMERA_IPA_MANAGER_H__ */\ndiff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\nnew file mode 100644\nindex 0000000..3b3c1a6\n--- /dev/null\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -0,0 +1,129 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * ipa_manager.cpp - Image Processing Algorithm module manager\n+ */\n+\n+#include \"ipa_manager.h\"\n+#include \"ipa_module.h\"\n+#include \"pipeline_handler.h\"\n+#include \"utils.h\"\n+\n+#include <dlfcn.h>\n+#include <dirent.h>\n+#include <string.h>\n+#include <sys/types.h>\n+\n+#include \"log.h\"\n+\n+/**\n+ * \\file ipa_manager.h\n+ * \\brief Image Processing Algorithm module manager\n+ */\n+\n+namespace libcamera {\n+\n+LOG_DEFINE_CATEGORY(IPAManager)\n+\n+/**\n+ * \\class IPAManager\n+ * \\brief Manager for IPA modules\n+ */\n+\n+IPAManager::IPAManager()\n+{\n+}\n+\n+IPAManager::~IPAManager()\n+{\n+\tfor (IPAModule *module : modules_)\n+\t\tdelete module;\n+}\n+\n+/**\n+ * \\brief Retrieve the IPA manager instance\n+ *\n+ * The IPAManager is a singleton and can't be constructed manually. This\n+ * function shall instead be used to retrieve the single global instance of the\n+ * manager.\n+ *\n+ * \\return The IPA manager instance\n+ */\n+IPAManager *IPAManager::instance()\n+{\n+\tstatic IPAManager ipaManager;\n+\treturn &ipaManager;\n+}\n+\n+/**\n+ * \\brief Load IPA modules from a directory\n+ * \\param[in] libDir directory to search for IPA modules\n+ *\n+ * Goes through \\a libDir and tries to create an IPAModule instance for every\n+ * found shared object. Skips invalid IPA modules.\n+ *\n+ * \\return total number of modules loaded (including modules loaded in\n+ * previous calls of this function), or negative error code\n+ */\n+int IPAManager::addDir(const std::string &libDir)\n+{\n+\tstruct dirent *ent;\n+\tDIR *dir;\n+\n+\tdir = opendir(libDir.c_str());\n+\tif (!dir) {\n+\t\tint ret = -errno;\n+\t\tLOG(IPAManager, Error) << \"Invalid path for IPA modules: \"\n+\t\t\t\t << strerror(ret);\n+\t\treturn ret;\n+\t}\n+\n+\twhile ((ent = readdir(dir)) != nullptr) {\n+\t\tint offset = strlen(ent->d_name) - 3;\n+\t\tif (strncmp(&ent->d_name[offset], \".so\", 3))\n+\t\t\tcontinue;\n+\n+\t\tIPAModule *ipaModule = new IPAModule(libDir + \"/\" + ent->d_name);\n+\t\tif (ipaModule->isValid())\n+\t\t\tmodules_.push_back(ipaModule);\n+\t}\n+\n+\tclosedir(dir);\n+\treturn modules_.size();\n+}\n+\n+/**\n+ * \\brief Create an IPA interface that matches a given pipeline handler\n+ * \\param[in] pipe the pipeline handler that wants a matching IPA interface\n+ *\n+ * \\return IPA interface, or nullptr if no matching IPA module is found\n+ */\n+std::unique_ptr<IPAInterface> IPAManager::createIPA(PipelineHandler *pipe) const\n+{\n+\tIPAModule *m = nullptr;\n+\n+\tfor (IPAModule *module : modules_) {\n+\t\tif (match(module, pipe)) {\n+\t\t\tm = module;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tif (!m || !m->load())\n+\t\treturn nullptr;\n+\n+\treturn m->createInstance();\n+}\n+\n+bool IPAManager::match(const IPAModule *ipam, PipelineHandler *pipe) const\n+{\n+\tconst struct IPAModuleInfo *info = &ipam->info();\n+\n+\treturn !strcmp(info->pipelineName, pipe->name()) &&\n+\t info->pipelineVersionMajor == pipe->majorVersion() &&\n+\t info->pipelineVersionMinor >= pipe->minorVersion() &&\n+\t info->moduleAPIVersion == IPA_MODULE_API_VERSION;\n+}\n+\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 32f7da4..0889b0d 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -11,6 +11,7 @@ libcamera_sources = files([\n 'formats.cpp',\n 'geometry.cpp',\n 'ipa_interface.cpp',\n+ 'ipa_manager.cpp',\n 'ipa_module.cpp',\n 'log.cpp',\n 'media_device.cpp',\n@@ -33,6 +34,7 @@ libcamera_headers = files([\n 'include/device_enumerator_udev.h',\n 'include/event_dispatcher_poll.h',\n 'include/formats.h',\n+ 'include/ipa_manager.h',\n 'include/ipa_module.h',\n 'include/log.h',\n 'include/media_device.h',\n", "prefixes": [ "libcamera-devel", "5/8" ] }