diff --git a/Documentation/runtime_configuration.rst b/Documentation/runtime_configuration.rst index e99ef2fb9561..a74a738803d6 100644 --- a/Documentation/runtime_configuration.rst +++ b/Documentation/runtime_configuration.rst @@ -139,6 +139,19 @@ LIBCAMERA__TUNING_FILE Example value: ``/usr/local/share/libcamera/ipa/rpi/vc4/custom_sensor.json`` +LIBCAMERA_LAYER_PATH, layer.path + Define custom search locations for Layer implementations. + + Example value: ``${HOME}/.libcamera/share/layer:/opt/libcamera/vendor/share/layer`` + +LIBCAMERA_LAYERS_ENABLE, layer.layers + Define an ordered list of Layers to load. The layer names are declared in the + 'name' field of their repsective LayerInfo structs. The layers declared first + are closer to the application, and the layers declared later are closer to + libcamera. + + Example value: ``inject_controls,sync`` + pipelines.simple.supported_devices.driver, pipelines.simple.supported_devices.software_isp Override whether software ISP is enabled for the given driver. diff --git a/include/libcamera/internal/camera_manager.h b/include/libcamera/internal/camera_manager.h index cc3ede02507f..00afcd2177e7 100644 --- a/include/libcamera/internal/camera_manager.h +++ b/include/libcamera/internal/camera_manager.h @@ -46,7 +46,7 @@ public: } IPAManager *ipaManager() const { return ipaManager_.get(); } - const LayerManager *layerManager() const { return &layerManager_; } + const LayerManager *layerManager() const { return layerManager_.get(); } protected: void run() override; @@ -73,7 +73,7 @@ private: std::unique_ptr enumerator_; std::unique_ptr ipaManager_; - LayerManager layerManager_; + std::unique_ptr layerManager_; const GlobalConfiguration configuration_; }; diff --git a/include/libcamera/internal/layer_manager.h b/include/libcamera/internal/layer_manager.h index 8427ec3eb5d9..82a6a1d82461 100644 --- a/include/libcamera/internal/layer_manager.h +++ b/include/libcamera/internal/layer_manager.h @@ -26,6 +26,8 @@ #include #include +#include "libcamera/internal/global_configuration.h" + namespace libcamera { LOG_DECLARE_CATEGORY(LayerLoaded) @@ -150,7 +152,9 @@ struct LayerInstance { class LayerController { public: - LayerController(const Camera *camera, const ControlList &properties, + LayerController(const Camera *camera, + const GlobalConfiguration &configuration, + const ControlList &properties, const ControlInfoMap &controlInfoMap, const std::map> &layers); ~LayerController(); @@ -190,7 +194,7 @@ private: class LayerManager { public: - LayerManager(); + LayerManager(const GlobalConfiguration &configuration); ~LayerManager() = default; std::unique_ptr @@ -200,6 +204,8 @@ public: private: std::map> layers_; + + const GlobalConfiguration &configuration_; }; } /* namespace libcamera */ diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp index 554cd935339a..a8e7cfe9daff 100644 --- a/src/libcamera/camera_manager.cpp +++ b/src/libcamera/camera_manager.cpp @@ -43,6 +43,7 @@ CameraManager::Private::Private() : Thread("CameraManager"), initialized_(false) { ipaManager_ = std::make_unique(this->configuration()); + layerManager_ = std::make_unique(this->configuration()); } int CameraManager::Private::start() diff --git a/src/libcamera/layer_manager.cpp b/src/libcamera/layer_manager.cpp index bef69f6bd04b..445e26234b23 100644 --- a/src/libcamera/layer_manager.cpp +++ b/src/libcamera/layer_manager.cpp @@ -25,6 +25,7 @@ #include #include +#include "libcamera/internal/global_configuration.h" #include "libcamera/internal/utils.h" /** @@ -276,6 +277,7 @@ LayerLoaded::LayerLoaded(const std::string &filename) /** * \brief Initialize the Layers * \param[in] camera The Camera for whom to initialize layers + * \param[in] configuration The global configuration * \param[in] properties The Camera properties * \param[in] controlInfoMap The Camera controls * \param[in] layers Map of available layers @@ -290,29 +292,26 @@ LayerLoaded::LayerLoaded(const std::string &filename) * efficiently returned at properties() and controls(), respectively. */ LayerController::LayerController(const Camera *camera, + const GlobalConfiguration &configuration, const ControlList &properties, const ControlInfoMap &controlInfoMap, const std::map> &layers) { /* Order the layers */ - /* \todo Document this. First is closer to application, last is closer to libcamera */ - /* \todo Get this from configuration file */ - const char *layerList = utils::secure_getenv("LIBCAMERA_LAYERS_ENABLE"); - if (layerList) { - for (const auto &layerName : utils::split(layerList, ",")) { - if (layerName.empty()) - continue; - - const auto &it = layers.find(layerName); - if (it == layers.end()) { - LOG(LayerController, Warning) - << "Requested layer '" << layerName - << "' not found"; - continue; - } - - executionQueue_.emplace_back(std::make_unique(it->second)); + std::vector configLayers = + configuration.envListOption("LIBCAMERA_LAYERS_ENABLE", { "layer", "layers" }, ",") + .value_or(std::vector()); + + for (const std::string &layerName : configLayers) { + const auto &it = layers.find(layerName); + if (it == layers.end()) { + LOG(LayerController, Warning) + << "Requested layer '" << layerName + << "' not found"; + continue; } + + executionQueue_.emplace_back(std::make_unique(it->second)); } for (std::unique_ptr &layer : executionQueue_) @@ -532,7 +531,8 @@ void LayerController::stop() * LayerController is responsible for organizing them into queues to be * executed, and for managing closures for each Camera that they belong to. */ -LayerManager::LayerManager() +LayerManager::LayerManager(const GlobalConfiguration &configuration) + : configuration_(configuration) { /* This is so that we can capture it in the lambda below */ std::map> &layers = layers_; @@ -560,19 +560,15 @@ LayerManager::LayerManager() }; /* User-specified paths take precedence. */ - /* \todo Document this */ - const char *layerPaths = utils::secure_getenv("LIBCAMERA_LAYER_PATH"); - if (layerPaths) { - for (const auto &dir : utils::split(layerPaths, ":")) { - if (dir.empty()) - continue; - - /* - * \todo Move the shared objects into one directory - * instead of each in their own subdir - */ - utils::findSharedObjects(dir.c_str(), 1, soHandler); - } + std::vector layerPaths = + configuration.envListOption("LIBCAMERA_LAYER_PATH", { "layer", "path" }) + .value_or(std::vector()); + for (const auto &dir : layerPaths) { + /* + * \todo Move the shared objects into one directory + * instead of each in their own subdir + */ + utils::findSharedObjects(dir.c_str(), 1, soHandler); } /* @@ -606,7 +602,8 @@ LayerManager::createController(const Camera *camera, const ControlList &properties, const ControlInfoMap &controlInfoMap) const { - return std::make_unique(camera, properties, controlInfoMap, layers_); + return std::make_unique(camera, configuration_, + properties, controlInfoMap, layers_); } } /* namespace libcamera */