Remove everything related to the C API, including ipa_context, ipa_context_wrapper, and IPAInterfaceWrapper. Also remove relevant documentation. ipaCreate() provided by IPA implementations, and createInterface() provided by IPAModule (wrapper around IPA implementation) both now return a C++ object IPAInterface instead of struct ipa_context. Although IPAInterfaceWrapper is the only component of libipa, the skeleton and build files for libipa are retained. After converting the C API to the C++-only API, make all pipeline handlers and IPAs use the new API. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- This is a combination of 21 commits: --- libcamera: IPAModule: Replace ipa_context with IPAInterface With the new IPC infrastructure, we no longer need the C interface as provided by struct ipa_context. Make ipaCreate_() and createInterface() return IPAInterface. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: ipa_context_wrapper: Remove ipa_context_wrapper Since ipa_context has been replaced with custom IPAInterfaces, it is not longer needed. Remove it. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: IPAInterface: remove ipa_context and functions from documentation Remove all the documentation related to ipa_context and the C IPA API, as well as the documentation about the functions in the IPAInterface. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> --- libcamera: IPAInterface: Remove all functions from IPAInterface Now that all the functions in the IPA interface are defined in the data definition file and a specialized IPAInterface is generated per pipeline handler, remove all the functions from the base IPAInterface. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: IPAInterface: make ipaCreate return IPAInterface With the new IPC infrastructure, we no longer need the C interface as provided by struct ipa_context. Make ipaCreate return IPAinterface. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> --- ipa: remove IPAInterfaceWrapper As every pipeline has its own proxy, IPAInterfaceWrapper is no longer necessary. Remove it. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Acked-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> --- libcamera: IPAProxy: Remove stop() override Since stop() is part of the IPA interface, and the IPA interface is now generated based on the data definition file per pipeline, this no longer needs to be overrided by the base IPAProxy. Remove it. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: IPAProxy, IPAManager: Switch to one-proxy-per-pipeline scheme IPAProxy is changed in two major ways: - Every pipeline has its own proxy, to support each pipeline's IPA interface - IPAProxy implementations always encapsulate IPA modules, and switch internally for isolation or threaded The IPAProxy registration mechanism is removed, as each pipeline will have its own proxy, so the pipeline can pass the specialized class name of the IPAProxy to the IPAManager for construction. IPAManager is changed accordingly to support these changes: - createIPA is a template function that takes an IPAProxy class, and always returns an IPAProxy - IPAManager no longer decides on isolation, and simply creates an IPAProxy instance while passing the isolation flag Consequently, the old IPAProxy classes (IPAProxyThread and IPAProxyLinux) are removed. The IPAInterfaceTest is updated to use the new IPAManager interface, and to construct a ProcessManager as no single global instance is created anymore. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> --- libcamera: IPAProxy: Add isolate parameter to create() Since IPAProxy implementations now always encapsulate IPA modules, add a parameter to create() to signal if the proxy should isolate the IPA or not. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: IPAManager: Fetch IPAProxy corresponding to pipeline Now that each pipeline handler has its own IPAProxy implementation, make the IPAManager fetch the IPAProxy based on the pipeline handler name. Also, since the IPAProxy is used regardless of isolation or no isolation, remove the isolation check from the proxy selection. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> --- libcamera: IPAManager: add isolation flag to proxy creation When the IPA proxy is created, it needs to know whether to isolate or not. Feed the flag at creation of the IPA proxy. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: IPAManager: Make createIPA return proxy directly Since every pipeline knows the type of the proxy that it needs, and since all IPAs are to be wrapped in a proxy, IPAManager no longer needs to search in the factory list to fetch the proxy factory to construct a factory. Instead, we define createIPA as a template function, and the pipeline handler can declare the proxy type when it calls createIPA. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: IPAProxy: Remove registration mechanism Implementations of IPA proxies use a registration mechanism to register themselves with the main IPA proxy factory. This registration declares static objects, causing a risk of things being constructed before the proper libcamera facilities are ready. Since each pipeline handler has its own IPA proxy and knows the type, it isn't necessary to have a proxy factory. Remove it to alleviate the risk of early construction. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: proxy: Remove IPAProxyLinux and IPAProxyThread We have now changed the proxy from per-IPC mechanism to per-pipeline. The per-IPC mechanism proxies are thus no longer needed; remove them. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- tests: ipa_interface_test: Update to use new createIPA Update the IPA interface test to use the new createIPA function from IPAManager. Also create an instance of ProcessManager, as no single global instance is created automatically anymore. Update meson.build to to depend on the generated IPA interface headers. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: PipelineHandler: Remove IPA from base class Since pipeline handlers now have their own IPA interface types, it can no longer be defined in the base class, and each pipeline handler implementation must declare it and its type themselves. Remove it from the base class. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- ipa: raspberrypi: Add mojom data definition file Add a mojom data definition for raspberrypi pipeline handler's IPAs. This simplifies the API between the raspberrypi pipeline handler and the IPA, and is not a direct translation of what was used before with IPAOperationData. Also move the enums from raspberrypi.h to raspberrypi.mojom Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: pipeline, ipa: raspberrypi: Use new data definition Now that we can generate custom functions and data structures with mojo, switch the raspberrypi pipeline handler and IPA to use the custom data structures as defined in the mojom data definition file. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: pipeline, ipa: vimc: Support the new IPC mechanism Add support to vimc pipeline handler and IPA for the new IPC mechanism. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> --- libcamera: pipeline, ipa: rkisp1: Support the new IPC mechanism Add support to the rkisp1 pipeline handler and IPA for the new IPC mechanism. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: pipeline, ipa: ipu3: Support the new IPC mechanism Add support to ipu3 pipeline handler and IPA for the new IPC mechanism. [Original version] Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> [Fixed commit message and small changes] Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
217 lines
6.1 KiB
C++
217 lines
6.1 KiB
C++
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
|
/*
|
|
* Copyright (C) 2019, Google Inc.
|
|
*
|
|
* ipa_proxy.cpp - Image Processing Algorithm proxy
|
|
*/
|
|
|
|
#include "libcamera/internal/ipa_proxy.h"
|
|
|
|
#include <string.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
#include <unistd.h>
|
|
|
|
#include "libcamera/internal/ipa_module.h"
|
|
#include "libcamera/internal/log.h"
|
|
#include "libcamera/internal/utils.h"
|
|
|
|
/**
|
|
* \file ipa_proxy.h
|
|
* \brief IPA Proxy
|
|
*/
|
|
|
|
namespace libcamera {
|
|
|
|
LOG_DEFINE_CATEGORY(IPAProxy)
|
|
|
|
/**
|
|
* \class IPAProxy
|
|
* \brief IPA Proxy
|
|
*
|
|
* Isolate IPA into separate process.
|
|
*/
|
|
|
|
/**
|
|
* \brief Construct an IPAProxy instance
|
|
* \param[in] ipam The IPA module
|
|
*/
|
|
IPAProxy::IPAProxy(IPAModule *ipam)
|
|
: valid_(false), ipam_(ipam)
|
|
{
|
|
}
|
|
|
|
IPAProxy::~IPAProxy()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* \fn IPAProxy::isValid()
|
|
* \brief Check if the IPAProxy instance is valid
|
|
*
|
|
* An IPAProxy instance is valid if the IPA interface is successfully created in
|
|
* isolation, and IPC is successfully set up.
|
|
*
|
|
* \return True if the IPAProxy is valid, false otherwise
|
|
*/
|
|
|
|
/**
|
|
* \brief Retrieve the absolute path to an IPA configuration file
|
|
* \param[in] name The configuration file name
|
|
*
|
|
* This function locates the configuration file for an IPA and returns its
|
|
* absolute path. It searches the following directories, in order:
|
|
*
|
|
* - All directories specified in the colon-separated LIBCAMERA_IPA_CONFIG_PATH
|
|
* environment variable ; or
|
|
* - If libcamera is not installed, the src/ipa/ directory within the source
|
|
* tree ; otherwise
|
|
* - The system sysconf (etc/libcamera/ipa) and the data (share/libcamera/ipa/)
|
|
* directories.
|
|
*
|
|
* The system directories are not searched if libcamera is not installed.
|
|
*
|
|
* Within each of those directories, the function looks for a subdirectory
|
|
* named after the IPA module name, as reported in IPAModuleInfo::name, and for
|
|
* a file named \a name within that directory. The \a name is IPA-specific.
|
|
*
|
|
* \return The full path to the IPA configuration file, or an empty string if
|
|
* no configuration file can be found
|
|
*/
|
|
std::string IPAProxy::configurationFile(const std::string &name) const
|
|
{
|
|
struct stat statbuf;
|
|
int ret;
|
|
|
|
/*
|
|
* The IPA module name can be used as-is to build directory names as it
|
|
* has been validated when loading the module.
|
|
*/
|
|
std::string ipaName = ipam_->info().name;
|
|
|
|
/* Check the environment variable first. */
|
|
const char *confPaths = utils::secure_getenv("LIBCAMERA_IPA_CONFIG_PATH");
|
|
if (confPaths) {
|
|
for (const auto &dir : utils::split(confPaths, ":")) {
|
|
if (dir.empty())
|
|
continue;
|
|
|
|
std::string confPath = dir + "/" + ipaName + "/" + name;
|
|
ret = stat(confPath.c_str(), &statbuf);
|
|
if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)
|
|
return confPath;
|
|
}
|
|
}
|
|
|
|
std::string root = utils::libcameraSourcePath();
|
|
if (!root.empty()) {
|
|
/*
|
|
* When libcamera is used before it is installed, load
|
|
* configuration files from the source directory. The
|
|
* configuration files are then located in the 'data'
|
|
* subdirectory of the corresponding IPA module.
|
|
*/
|
|
std::string ipaConfDir = root + "src/ipa/" + ipaName + "/data";
|
|
|
|
LOG(IPAProxy, Info)
|
|
<< "libcamera is not installed. Loading IPA configuration from '"
|
|
<< ipaConfDir << "'";
|
|
|
|
std::string confPath = ipaConfDir + "/" + name;
|
|
ret = stat(confPath.c_str(), &statbuf);
|
|
if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)
|
|
return confPath;
|
|
|
|
} else {
|
|
/* Else look in the system locations. */
|
|
for (const auto &dir : utils::split(IPA_CONFIG_DIR, ":")) {
|
|
std::string confPath = dir + "/" + ipaName + "/" + name;
|
|
ret = stat(confPath.c_str(), &statbuf);
|
|
if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)
|
|
return confPath;
|
|
}
|
|
}
|
|
|
|
LOG(IPAProxy, Error)
|
|
<< "Configuration file '" << name
|
|
<< "' not found for IPA module '" << ipaName << "'";
|
|
|
|
return std::string();
|
|
}
|
|
|
|
/**
|
|
* \brief Find a valid full path for a proxy worker for a given executable name
|
|
* \param[in] file File name of proxy worker executable
|
|
*
|
|
* A proxy worker's executable could be found in either the global installation
|
|
* directory, or in the paths specified by the environment variable
|
|
* LIBCAMERA_IPA_PROXY_PATH. This method checks the global install directory
|
|
* first, then LIBCAMERA_IPA_PROXY_PATH in order, and returns the full path to
|
|
* the proxy worker executable that is specified by file. The proxy worker
|
|
* executable shall have exec permission.
|
|
*
|
|
* \return The full path to the proxy worker executable, or an empty string if
|
|
* no valid executable path
|
|
*/
|
|
std::string IPAProxy::resolvePath(const std::string &file) const
|
|
{
|
|
std::string proxyFile = "/" + file;
|
|
|
|
/* Check env variable first. */
|
|
const char *execPaths = utils::secure_getenv("LIBCAMERA_IPA_PROXY_PATH");
|
|
if (execPaths) {
|
|
for (const auto &dir : utils::split(execPaths, ":")) {
|
|
if (dir.empty())
|
|
continue;
|
|
|
|
std::string proxyPath = dir;
|
|
proxyPath += proxyFile;
|
|
if (!access(proxyPath.c_str(), X_OK))
|
|
return proxyPath;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* When libcamera is used before it is installed, load proxy workers
|
|
* from the same build directory as the libcamera directory itself.
|
|
* This requires identifying the path of the libcamera.so, and
|
|
* referencing a relative path for the proxy workers from that point.
|
|
*/
|
|
std::string root = utils::libcameraBuildPath();
|
|
if (!root.empty()) {
|
|
std::string ipaProxyDir = root + "src/libcamera/proxy/worker";
|
|
|
|
LOG(IPAProxy, Info)
|
|
<< "libcamera is not installed. Loading proxy workers from '"
|
|
<< ipaProxyDir << "'";
|
|
|
|
std::string proxyPath = ipaProxyDir + proxyFile;
|
|
if (!access(proxyPath.c_str(), X_OK))
|
|
return proxyPath;
|
|
|
|
return std::string();
|
|
}
|
|
|
|
/* Else try finding the exec target from the install directory. */
|
|
std::string proxyPath = std::string(IPA_PROXY_DIR) + proxyFile;
|
|
if (!access(proxyPath.c_str(), X_OK))
|
|
return proxyPath;
|
|
|
|
return std::string();
|
|
}
|
|
|
|
/**
|
|
* \var IPAProxy::valid_
|
|
* \brief Flag to indicate if the IPAProxy instance is valid
|
|
*
|
|
* A IPAProxy instance is valid if the IPA interface is successfully created in
|
|
* isolation, and IPC is successfully set up.
|
|
*
|
|
* This flag can be read via IPAProxy::isValid().
|
|
*
|
|
* Implementations of the IPAProxy class should set this flag upon successful
|
|
* construction.
|
|
*/
|
|
|
|
} /* namespace libcamera */
|