[PATCH v3 09/14] config: Look up RkISP1 tuning file in configuration file
Milan Zamazal
mzamazal at redhat.com
Thu Jun 27 16:51:46 CEST 2024
The configuration snippet:
configuration:
pipeline:
rkisp1:
tuning_file: FILE
This environment variable has not been documented.
Signed-off-by: Milan Zamazal <mzamazal at redhat.com>
---
src/libcamera/pipeline/rkisp1/rkisp1.cpp | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
index 4cbf105d..c244ac6e 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
@@ -36,6 +36,7 @@
#include "libcamera/internal/delayed_controls.h"
#include "libcamera/internal/device_enumerator.h"
#include "libcamera/internal/framebuffer.h"
+#include "libcamera/internal/global_configuration.h"
#include "libcamera/internal/ipa_manager.h"
#include "libcamera/internal/media_device.h"
#include "libcamera/internal/pipeline_handler.h"
@@ -349,8 +350,12 @@ int RkISP1CameraData::loadIPA(unsigned int hwRevision)
* environment variable overrides it.
*/
std::string ipaTuningFile;
- char const *configFromEnv = utils::secure_getenv("LIBCAMERA_RKISP1_TUNING_FILE");
- if (!configFromEnv || *configFromEnv == '\0') {
+ const std::string confPath =
+ std::string("pipelines.rkisp1.cameras.") + sensor_->id() + std::string(".tuning_file");
+ const auto confTuningFile =
+ GlobalConfiguration::envOption(
+ "LIBCAMERA_RKISP1_TUNING_FILE", confPath.c_str());
+ if (!confTuningFile.has_value() || confTuningFile.value() == "") {
ipaTuningFile = ipa_->configurationFile(sensor_->model() + ".yaml");
/*
* If the tuning file isn't found, fall back to the
@@ -359,7 +364,7 @@ int RkISP1CameraData::loadIPA(unsigned int hwRevision)
if (ipaTuningFile.empty())
ipaTuningFile = ipa_->configurationFile("uncalibrated.yaml");
} else {
- ipaTuningFile = std::string(configFromEnv);
+ ipaTuningFile = confTuningFile.value();
}
IPACameraSensorInfo sensorInfo{};
--
2.44.1
More information about the libcamera-devel
mailing list