libcamera/libcamera.git - libcamera official repository

diff options

author	Barnabás Pőcze <barnabas.pocze@ideasonboard.com>	2025-01-28 12:40:56 +0100
committer	Barnabás Pőcze <barnabas.pocze@ideasonboard.com>	2025-04-01 16:13:00 +0200
commit	799982b6465a9389bf525b91dbb100e6dd1913c9 (patch)
tree	150d722319a6309f8263419d79ee5bac1bda629e /utils/raspberrypi/ctt/ctt_macbeth_locator.py
parent	5646307b71dbfeb3864788c8a57957c594a45975 (diff)

libcamera: pipeline: uvcvideo: Fix `ExposureTimeMode` control setup

`ControlInfo(Span<const int32_t>{...})` calls the incorrect constructor of `ControlInfo`. The intended constructor to be called is `ControlInfo(Span<const ControlValue>, ...)` however that is not called because a span of `const int32_t` is passed. Instead, the constructor `ControlInfo(const ControlValue &min, const ControlValue &max, ...)` will be called. Furthermore, since `values.back()` is used, only the last element of the array is actually set. To fix this, convert the array to contain `ControlValue` objects and use a separate variable to keep track of which element to set next. For each of `ExposureTimeMode{Auto,Manual}` save the V4L2 control value that is to be used when the libcamera control is set. Fixes: bad8d591f8acfa ("libcamera: uvcvideo: Register ExposureTimeMode control") Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>

Diffstat (limited to 'utils/raspberrypi/ctt/ctt_macbeth_locator.py')

0 files changed, 0 insertions, 0 deletions

/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* * Copyright (C) 2019, Google Inc. * * device_enumerator_sysfs.cpp - sysfs-based device enumerator */ #include "device_enumerator_sysfs.h" #include <dirent.h> #include <fcntl.h> #include <fstream> #include <stdlib.h> #include <string.h> #include <sys/ioctl.h> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> #include "log.h" #include "media_device.h" namespace libcamera { LOG_DECLARE_CATEGORY(DeviceEnumerator) int DeviceEnumeratorSysfs::init() { return 0; } int DeviceEnumeratorSysfs::enumerate() { struct dirent *ent; DIR *dir; int ret = 0; static const char * const sysfs_dirs[] = { "/sys/subsystem/media/devices", "/sys/bus/media/devices", "/sys/class/media/devices", }; for (const char *dirname : sysfs_dirs) { dir = opendir(dirname); if (dir) break; } if (!dir) { LOG(DeviceEnumerator, Error) << "No valid sysfs media device directory"; return -ENODEV; } while ((ent = readdir(dir)) != nullptr) { if (strncmp(ent->d_name, "media", 5)) continue; char *end; unsigned int idx = strtoul(ent->d_name + 5, &end, 10); if (*end != '\0') continue; std::string devnode = "/dev/media" + std::to_string(idx); /* Verify that the device node exists. */ struct stat devstat; if (stat(devnode.c_str(), &devstat) < 0) { LOG(DeviceEnumerator, Warning) << "Device node /dev/media" << idx << " should exist but doesn't"; continue; } std::shared_ptr<MediaDevice> media = createDevice(devnode); if (!media) { ret = -ENODEV; break; } if (populateMediaDevice(media) < 0) { ret = -ENODEV; break; } addDevice(media); } closedir(dir); return ret; } int DeviceEnumeratorSysfs::populateMediaDevice(const std::shared_ptr<MediaDevice> &media) { /* Associate entities to device node paths. */ for (MediaEntity *entity : media->entities()) { if (entity->deviceMajor() == 0 && entity->deviceMinor() == 0) continue; std::string deviceNode = lookupDeviceNode(entity->deviceMajor(), entity->deviceMinor()); if (deviceNode.empty()) return -EINVAL; int ret = entity->setDeviceNode(deviceNode); if (ret) return ret; } return 0; } /** * \brief Lookup device node path from device number * \param[in] major The device major number * \param[in] minor The device minor number * * Translate a device number given as \a major and \a minor to a device node * path. * * \return The device node path on success, or an empty string if the lookup * fails */ std::string DeviceEnumeratorSysfs::lookupDeviceNode(int major, int minor) { std::string deviceNode; std::string line; std::ifstream ueventFile; ueventFile.open("/sys/dev/char/" + std::to_string(major) + ":" + std::to_string(minor) + "/uevent"); if (!ueventFile) return std::string(); while (ueventFile >> line) { if (line.find("DEVNAME=") == 0) { deviceNode = "/dev/" + line.substr(strlen("DEVNAME=")); break; } } ueventFile.close(); return deviceNode; } } /* namespace libcamera */


context:
space:
mode: