<div dir="ltr"><div dir="ltr">Hi,<br><br>I should note that PipelineHandler::configurationFile() is not actually used in<br>this series any more since we now only optionally load a config file if one is<br>set in the environment variable. So this commit could possibly be dropped if we<br>prefer. However, I do think it has benefits to leave it in if the config file<br>was mandatory for other pipeline handlers.<br><br>Thanks,<br>Naush<br><div><br></div><div>On Tue, 6 Dec 2022 at 13:55, Naushir Patuck <<a href="mailto:naush@raspberrypi.com" target="_blank">naush@raspberrypi.com</a>> wrote:<br></div></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Add a new helper function PipelineHandler::configurationFile() that returns<br>
the full path of a named configuration file. This configuration file may be read<br>
by pipeline handlers for platform specific configuration parameters on<br>
initialisation.<br>
<br>
The mechanism for searching for the configuration file is similar to the IPA<br>
configuration file:<br>
<br>
- In the source tree if libcamera is not installed<br>
- Otherwise in standard system locations (etc and share directories).<br>
<br>
When stored in the source tree, configuration files shall be located in a 'data'<br>
subdirectory of their respective pipeline handler directory.<br>
<br>
Signed-off-by: Naushir Patuck <<a href="mailto:naush@raspberrypi.com" target="_blank">naush@raspberrypi.com</a>><br>
Reviewed-by: David Plowman <<a href="mailto:david.plowman@raspberrypi.com" target="_blank">david.plowman@raspberrypi.com</a>><br>
---<br>
include/libcamera/internal/pipeline_handler.h | 3 +<br>
src/libcamera/pipeline_handler.cpp | 60 +++++++++++++++++++<br>
2 files changed, 63 insertions(+)<br>
<br>
diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h<br>
index ec4f662d7399..4c4dfe62a680 100644<br>
--- a/include/libcamera/internal/pipeline_handler.h<br>
+++ b/include/libcamera/internal/pipeline_handler.h<br>
@@ -65,6 +65,9 @@ public:<br>
bool completeBuffer(Request *request, FrameBuffer *buffer);<br>
void completeRequest(Request *request);<br>
<br>
+ std::string configurationFile(const std::string &subdir,<br>
+ const std::string &name) const;<br>
+<br>
const char *name() const { return name_; }<br>
<br>
protected:<br>
diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp<br>
index cfade4908118..a515ad5ecffb 100644<br>
--- a/src/libcamera/pipeline_handler.cpp<br>
+++ b/src/libcamera/pipeline_handler.cpp<br>
@@ -8,6 +8,7 @@<br>
#include "libcamera/internal/pipeline_handler.h"<br>
<br>
#include <chrono><br>
+#include <sys/stat.h><br>
#include <sys/sysmacros.h><br>
<br>
#include <libcamera/base/log.h><br>
@@ -534,6 +535,65 @@ void PipelineHandler::completeRequest(Request *request)<br>
}<br>
}<br>
<br>
+/**<br>
+ * \brief Retrieve the absolute path to a platform configuration file<br>
+ * \param[in] subdir The pipeline handler specific subdirectory name<br>
+ * \param[in] name The configuration file name<br>
+ *<br>
+ * This function locates a named platform configuration file and returns<br>
+ * its absolute path to the pipeline handler. It searches the following<br>
+ * directories, in order:<br>
+ *<br>
+ * - If libcamera is not installed, the src/libcamera/pipeline/<subdir>/data/<br>
+ * directory within the source tree ; otherwise<br>
+ * - The system data (share/libcamera/pipeline/<subdir>) directory.<br>
+ *<br>
+ * The system directories are not searched if libcamera is not installed.<br>
+ *<br>
+ * \return The full path to the pipeline handler configuration file, or an empty<br>
+ * string if no configuration file can be found<br>
+ */<br>
+std::string PipelineHandler::configurationFile(const std::string &subdir,<br>
+ const std::string &name) const<br>
+{<br>
+ std::string confPath;<br>
+ struct stat statbuf;<br>
+ int ret;<br>
+<br>
+ std::string root = utils::libcameraSourcePath();<br>
+ if (!root.empty()) {<br>
+ /*<br>
+ * When libcamera is used before it is installed, load<br>
+ * configuration files from the source directory. The<br>
+ * configuration files are then located in the 'data'<br>
+ * subdirectory of the corresponding pipeline handler.<br>
+ */<br>
+ std::string confDir = root + "src/libcamera/pipeline/";<br>
+ confPath = confDir + subdir + "/data/" + name;<br>
+<br>
+ LOG(Pipeline, Info)<br>
+ << "libcamera is not installed. Loading platform configuration file from '"<br>
+ << confPath << "'";<br>
+<br>
+ ret = stat(confPath.c_str(), &statbuf);<br>
+ if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)<br>
+ return confPath;<br>
+ } else {<br>
+ /* Else look in the system locations. */<br>
+ confPath = std::string(LIBCAMERA_DATA_DIR)<br>
+ + "/pipeline/" + subdir + '/' + name;<br>
+ ret = stat(confPath.c_str(), &statbuf);<br>
+ if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)<br>
+ return confPath;<br>
+ }<br>
+<br>
+ LOG(Pipeline, Error)<br>
+ << "Configuration file '" << confPath<br>
+ << "' not found for pipeline handler '" << PipelineHandler::name() << "'";<br>
+<br>
+ return std::string();<br>
+}<br>
+<br>
/**<br>
* \brief Register a camera to the camera manager and pipeline handler<br>
* \param[in] camera The camera to be added<br>
-- <br>
2.25.1<br>
<br>
</blockquote></div></div>