Patch Detail
Show a patch.
GET /api/patches/1258/?format=api
{ "id": 1258, "url": "https://patchwork.libcamera.org/api/patches/1258/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1258/", "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": "<20190522210220.1631-4-paul.elder@ideasonboard.com>", "date": "2019-05-22T21:02:18", "name": "[libcamera-devel,RFC,3/5] libcamera: ipa_manager: implement class for managing IPA modules", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "f2275bc57380b08c29f0af085a935201ea772c80", "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/1258/mbox/", "series": [ { "id": 317, "url": "https://patchwork.libcamera.org/api/series/317/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=317", "date": "2019-05-22T21:02:15", "name": "Add IPAManager", "version": 1, "mbox": "https://patchwork.libcamera.org/series/317/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1258/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1258/checks/", "tags": {}, "headers": { "Return-Path": "<paul.elder@ideasonboard.com>", "Received": [ "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5AEFC60E4A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 22 May 2019 23:02:41 +0200 (CEST)", "from localhost.localdomain (unknown [96.44.9.117])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A6EB1443;\n\tWed, 22 May 2019 23:02:40 +0200 (CEST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1558558961;\n\tbh=G94e9MT1naILw08thfETTIfIasLgC0OOp4cpJL0n4EA=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=HwQLXZfs4MqY4E1JcjaK+AcIYVnrnRgqRu+FngvqQZcVGRzxaMl0nN6iRRd2aG+/U\n\tbwjRtTa1l+ek6bVuDigpwYLyH2Irtf0Ezv8aTb5g7RfOyhqEvAv4BAp9fWxcIFYZKv\n\tRh8qQ8HHo2hcsRRxFIo6LdNygoPjpqfYFxUXEt/c=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 22 May 2019 17:02:18 -0400", "Message-Id": "<20190522210220.1631-4-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190522210220.1631-1-paul.elder@ideasonboard.com>", "References": "<20190522210220.1631-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [RFC PATCH 3/5] 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": "Wed, 22 May 2019 21:02:42 -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 pipelines to aquire an IPA.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n---\n src/libcamera/include/ipa_manager.h | 38 +++++++++++\n src/libcamera/ipa_manager.cpp | 102 ++++++++++++++++++++++++++++\n src/libcamera/meson.build | 2 +\n 3 files changed, 142 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..9fbd74f\n--- /dev/null\n+++ b/src/libcamera/include/ipa_manager.h\n@@ -0,0 +1,38 @@\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_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 std::unique_ptr<IPAManager> create();\n+\n+\tint addDir(const std::string &libDir);\n+\n+\tconst IPAModule *acquireIPA(const struct IPAModuleInfo &info) const;\n+\n+private:\n+\tstd::string libDir_;\n+\n+\tstd::list<IPAModule *> modules_;\n+\n+\tbool match(const IPAModule *ipa, const struct IPAModuleInfo &info) 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..430e8a5\n--- /dev/null\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -0,0 +1,102 @@\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 <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+std::unique_ptr<IPAManager> IPAManager::create()\n+{\n+\treturn utils::make_unique<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 libDir and tries to create an IPAModule instance for every\n+ * found shared object. Skips invalid IPA modules.\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 0;\n+}\n+\n+/**\n+ * \\brief Retrieve an IPA module for a given pipeline handler\n+ *\n+ * \\return IPAModule\n+ */\n+const IPAModule\n+*IPAManager::acquireIPA(const struct IPAModuleInfo &info) const\n+{\n+\tIPAModule *m = nullptr;\n+\n+\tfor (struct IPAModule *module : modules_) {\n+\t\tif (module->acquired())\n+\t\t\tcontinue;\n+\n+\t\tif (match(module, info) && module->acquire()) {\n+\t\t\tm = module;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\treturn m;\n+}\n+\n+bool IPAManager::match(const IPAModule *ipa, const struct IPAModuleInfo &info) const\n+{\n+\treturn ipa->info().ipaAPIVersion == info.ipaAPIVersion &&\n+\t ipa->info().pipelineVersion <= info.pipelineVersion &&\n+\t !strcmp(ipa->info().pipelineName, info.pipelineName);\n+}\n+\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex e5b48f2..ee1b658 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -10,6 +10,7 @@ libcamera_sources = files([\n 'event_notifier.cpp',\n 'formats.cpp',\n 'geometry.cpp',\n+ 'ipa_manager.cpp',\n 'ipa_module.cpp',\n 'log.cpp',\n 'media_device.cpp',\n@@ -32,6 +33,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", "RFC", "3/5" ] }