From patchwork Wed May 22 21:02:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 1258 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5AEFC60E4A for ; Wed, 22 May 2019 23:02:41 +0200 (CEST) Received: from localhost.localdomain (unknown [96.44.9.117]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A6EB1443; Wed, 22 May 2019 23:02:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1558558961; bh=G94e9MT1naILw08thfETTIfIasLgC0OOp4cpJL0n4EA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HwQLXZfs4MqY4E1JcjaK+AcIYVnrnRgqRu+FngvqQZcVGRzxaMl0nN6iRRd2aG+/U bwjRtTa1l+ek6bVuDigpwYLyH2Irtf0Ezv8aTb5g7RfOyhqEvAv4BAp9fWxcIFYZKv Rh8qQ8HHo2hcsRRxFIo6LdNygoPjpqfYFxUXEt/c= From: Paul Elder 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 Subject: [libcamera-devel] [RFC PATCH 3/5] libcamera: ipa_manager: implement class for managing IPA modules X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 May 2019 21:02:42 -0000 IPAManager is a class that will search in given directories for IPA modules, and will load them into a list. It also provides an interface for pipelines to aquire an IPA. Signed-off-by: Paul Elder --- src/libcamera/include/ipa_manager.h | 38 +++++++++++ src/libcamera/ipa_manager.cpp | 102 ++++++++++++++++++++++++++++ src/libcamera/meson.build | 2 + 3 files changed, 142 insertions(+) create mode 100644 src/libcamera/include/ipa_manager.h create mode 100644 src/libcamera/ipa_manager.cpp diff --git a/src/libcamera/include/ipa_manager.h b/src/libcamera/include/ipa_manager.h new file mode 100644 index 0000000..9fbd74f --- /dev/null +++ b/src/libcamera/include/ipa_manager.h @@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * ipa_manager.h - Image Processing Algorithm module manager + */ +#ifndef __LIBCAMERA_IPA_MANAGER_H__ +#define __LIBCAMERA_IPA_MANAGER_H__ + +#include +#include +#include + +#include "ipa_module.h" +#include "pipeline_handler.h" + +namespace libcamera { + +class IPAManager +{ +public: + static std::unique_ptr create(); + + int addDir(const std::string &libDir); + + const IPAModule *acquireIPA(const struct IPAModuleInfo &info) const; + +private: + std::string libDir_; + + std::list modules_; + + bool match(const IPAModule *ipa, const struct IPAModuleInfo &info) const; +}; + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_IPA_MANAGER_H__ */ diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp new file mode 100644 index 0000000..430e8a5 --- /dev/null +++ b/src/libcamera/ipa_manager.cpp @@ -0,0 +1,102 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * ipa_manager.cpp - Image Processing Algorithm module manager + */ + +#include "ipa_manager.h" +#include "ipa_module.h" +#include "pipeline_handler.h" +#include "utils.h" + +#include +#include +#include + +#include "log.h" + +/** + * \file ipa_manager.h + * \brief Image Processing Algorithm module manager + */ + +namespace libcamera { + +LOG_DEFINE_CATEGORY(IPAManager) + +/** + * \class IPAManager + * \brief Manager for IPA modules + */ + +std::unique_ptr IPAManager::create() +{ + return utils::make_unique(); +} + +/** + * \brief Load IPA modules from a directory + * \param[in] libDir directory to search for IPA modules + * + * Goes through libDir and tries to create an IPAModule instance for every + * found shared object. Skips invalid IPA modules. + */ +int IPAManager::addDir(const std::string &libDir) +{ + struct dirent *ent; + DIR *dir; + + dir = opendir(libDir.c_str()); + if (!dir) { + int ret = -errno; + LOG(IPAManager, Error) << "Invalid path for IPA modules: " + << strerror(ret); + return ret; + } + + while ((ent = readdir(dir)) != nullptr) { + int offset = strlen(ent->d_name) - 3; + if (strncmp(&ent->d_name[offset], ".so", 3)) + continue; + + IPAModule *ipaModule = new IPAModule(libDir + "/" + ent->d_name); + if (ipaModule->isValid()) + modules_.push_back(ipaModule); + } + + closedir(dir); + return 0; +} + +/** + * \brief Retrieve an IPA module for a given pipeline handler + * + * \return IPAModule + */ +const IPAModule +*IPAManager::acquireIPA(const struct IPAModuleInfo &info) const +{ + IPAModule *m = nullptr; + + for (struct IPAModule *module : modules_) { + if (module->acquired()) + continue; + + if (match(module, info) && module->acquire()) { + m = module; + break; + } + } + + return m; +} + +bool IPAManager::match(const IPAModule *ipa, const struct IPAModuleInfo &info) const +{ + return ipa->info().ipaAPIVersion == info.ipaAPIVersion && + ipa->info().pipelineVersion <= info.pipelineVersion && + !strcmp(ipa->info().pipelineName, info.pipelineName); +} + +} /* namespace libcamera */ diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index e5b48f2..ee1b658 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -10,6 +10,7 @@ libcamera_sources = files([ 'event_notifier.cpp', 'formats.cpp', 'geometry.cpp', + 'ipa_manager.cpp', 'ipa_module.cpp', 'log.cpp', 'media_device.cpp', @@ -32,6 +33,7 @@ libcamera_headers = files([ 'include/device_enumerator_udev.h', 'include/event_dispatcher_poll.h', 'include/formats.h', + 'include/ipa_manager.h', 'include/ipa_module.h', 'include/log.h', 'include/media_device.h',