From patchwork Wed Jul 3 08:00:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 1593 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 61D5661570 for ; Wed, 3 Jul 2019 10:00:33 +0200 (CEST) Received: from neptunite.flets-east.jp (p1871204-ipngn14001hodogaya.kanagawa.ocn.ne.jp [153.220.127.204]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id F40C324B; Wed, 3 Jul 2019 10:00:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1562140833; bh=TIn9hsceUOYFRKPXrMZHZymDLRt+xe3k7EcVlqe55ZU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I4pUwMg4PCSv9xu+gnW1BiMwMIeAQ56tiuybCymtEU/pm6IqLb+k4qdfSUnpkJLhn dtc5zlPBAmaDQ8KMPbT0CYI0e+JfqduRtcGMs282VZdkX2HyJVlGJ1Cfli1vXqgwCA ikmDzTxkBvBJ78pIUknEnlFVRRQ2LJ+12BR9/zRw= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Wed, 3 Jul 2019 17:00:05 +0900 Message-Id: <20190703080007.21376-6-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190703080007.21376-1-paul.elder@ideasonboard.com> References: <20190703080007.21376-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH v2 5/7] libcamera: ipa_manager: use proxy 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, 03 Jul 2019 08:00:33 -0000 Make IPAManager isolate an IPA in a Proxy if the IPA's license is not open source, before returning the IPA to the caller. For now, only use the default Linux proxy, and only GPL and LGPL are considered open source. Signed-off-by: Paul Elder --- New in v2 - replaces adding shims - since Proxies are not external shared objects like the shims in v1 were, there is no longer a list of shims that is treated like IPAModules - instead the matching is done by searching the list of proxy factories src/libcamera/ipa_manager.cpp | 48 +++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp index 532b77d..60cd84d 100644 --- a/src/libcamera/ipa_manager.cpp +++ b/src/libcamera/ipa_manager.cpp @@ -14,6 +14,7 @@ #include "ipa_module.h" #include "log.h" #include "pipeline_handler.h" +#include "ipa_proxy.h" #include "utils.h" /** @@ -25,6 +26,20 @@ namespace libcamera { LOG_DEFINE_CATEGORY(IPAManager) +namespace { + +bool isOpenSource(const char *license) +{ + if (!strncmp(license, "GPL", 3)) + return true; + if (!strncmp(license, "LGPL", 4)) + return true; + + return false; +} + +} /* namespace */ + /** * \class IPAManager * \brief Manager for IPA modules @@ -129,7 +144,7 @@ int IPAManager::addDir(const char *libDir) * \param[in] maxVersion Maximum acceptable version of IPA module * * \return A newly created IPA interface, or nullptr if no matching - * IPA module is found + * IPA module is found or if the IPA interface fails to initialize */ std::unique_ptr IPAManager::createIPA(PipelineHandler *pipe, uint32_t maxVersion, @@ -144,7 +159,36 @@ std::unique_ptr IPAManager::createIPA(PipelineHandler *pipe, } } - if (!m || !m->load()) + if (!m) + return nullptr; + + if (!isOpenSource(m->info().license)) { + ProxyFactory *pf = nullptr; + std::vector &factories = ProxyFactory::factories(); + + for (ProxyFactory *factory : factories) { + /* TODO: Better matching */ + if (!strcmp(factory->name().c_str(), "ProxyLinuxDefault")) { + pf = factory; + break; + } + } + + if (!pf) { + LOG(IPAManager, Error) << "Failed to get proxy factory"; + return nullptr; + } + + std::unique_ptr proxy = pf->create(m); + if (!proxy->isValid()) { + LOG(IPAManager, Error) << "Failed to load proxy"; + return nullptr; + } + + return proxy; + } + + if (!m->load()) return nullptr; return m->createInstance();