Browse Source

rpicamera: Initialize tuning file env var before lib init. Fixes #1344 (#1345)

pull/1364/head
Benjamin Peter 4 years ago committed by GitHub
parent
commit
d15bde3a59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      internal/rpicamera/exe/camera.cpp

5
internal/rpicamera/exe/camera.cpp

@ -85,6 +85,9 @@ static int get_v4l2_colorspace(std::optional<libcamera::ColorSpace> const &cs) {
} }
bool camera_create(parameters_t *params, camera_frame_cb frame_cb, camera_t **cam) { 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<CameraPriv> camp = std::make_unique<CameraPriv>(); std::unique_ptr<CameraPriv> camp = std::make_unique<CameraPriv>();
camp->camera_manager = std::make_unique<CameraManager>(); camp->camera_manager = std::make_unique<CameraManager>();
@ -109,8 +112,6 @@ bool camera_create(parameters_t *params, camera_frame_cb frame_cb, camera_t **ca
return false; return false;
} }
setenv("LIBCAMERA_RPI_TUNING_FILE", params->tuning_file, 1);
ret = camp->camera->acquire(); ret = camp->camera->acquire();
if (ret != 0) { if (ret != 0) {
set_error("Camera.acquire() failed"); set_error("Camera.acquire() failed");

Loading…
Cancel
Save