From d15bde3a59291a9b6c8c4bfe9c6519d4c25f35f4 Mon Sep 17 00:00:00 2001 From: Benjamin Peter Date: Fri, 30 Dec 2022 15:33:00 +0100 Subject: [PATCH] rpicamera: Initialize tuning file env var before lib init. Fixes #1344 (#1345) --- internal/rpicamera/exe/camera.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/rpicamera/exe/camera.cpp b/internal/rpicamera/exe/camera.cpp index 2aa22e7c..d022f9bf 100644 --- a/internal/rpicamera/exe/camera.cpp +++ b/internal/rpicamera/exe/camera.cpp @@ -85,6 +85,9 @@ static int get_v4l2_colorspace(std::optional const &cs) { } bool camera_create(parameters_t *params, camera_frame_cb frame_cb, camera_t **cam) { + // We make sure to set the environment variable before libcamera init + setenv("LIBCAMERA_RPI_TUNING_FILE", params->tuning_file, 1); + std::unique_ptr camp = std::make_unique(); camp->camera_manager = std::make_unique(); @@ -109,8 +112,6 @@ bool camera_create(parameters_t *params, camera_frame_cb frame_cb, camera_t **ca return false; } - setenv("LIBCAMERA_RPI_TUNING_FILE", params->tuning_file, 1); - ret = camp->camera->acquire(); if (ret != 0) { set_error("Camera.acquire() failed");