jordan/camera-streamer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

status: extend to provide all camera options and properties in JSON payload

Browse Source 
- control: add `device_option_is_equal`
- libcamera: provide human readable configurable options
- v4l2: include camera control values
- libcamera: store all applied controls
- libcamera: use `device_option_is_equal`
This commit is contained in:
Kamil Trzcinski
2023-06-01 23:42:18 +02:00
parent 8df8dcf2e5
commit 899f2c5e62
18 changed files with 800 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
device/libcamera/device.cc
View File

@ -1,63 +1,6 @@
#ifdef USE_LIBCAMERA
#include "libcamera.hh"
std::string libcamera_device_option_normalize(std::string key)
{
key.resize(device_option_normalize_name(key.data(), key.data()));
return key;
}
libcamera::ControlInfoMap::Map libcamera_control_list(device_t *dev)
{
libcamera::ControlInfoMap::Map controls_map;
for (auto const &control : dev->libcamera->camera->controls()) {
controls_map[control.first] = control.second;
}
return controls_map;
}
void libcamera_device_dump_options(device_t *dev, FILE *stream)
{
auto &properties = dev->libcamera->camera->properties();
auto idMap = properties.idMap();
fprintf(stream, "%s Properties:\n", dev->name);
for (auto const &control : properties) {
if (!control.first)
continue;
auto control_id = control.first;
auto control_value = control.second;
std::string control_id_name = "";
if (auto control_id_info = idMap ? idMap->at(control_id) : NULL) {
control_id_name = control_id_info->name();
}
fprintf(stream, "- property: %s (%08x, type=%d): %s\n",
control_id_name.c_str(), control_id, control_value.type(),
control_value.toString().c_str());
}
fprintf(stream, "\n");
fprintf(stream, "%s Options:\n", dev->name);
for (auto const &control : libcamera_control_list(dev)) {
if (!control.first)
continue;
auto control_id = control.first;
auto control_key = libcamera_device_option_normalize(control_id->name());
auto control_info = control.second;
fprintf(stream, "- available option: %s (%08x, type=%d): %s\n",
control_id->name().c_str(), control_id->id(), control_id->type(),
control_info.toString().c_str());
}
fprintf(stream, "\n");
}
void libcamera_print_cameras(device_t *dev)
{
if (dev->libcamera->camera_manager->cameras().size()) {
@ -153,99 +96,15 @@ int libcamera_device_set_rotation(device_t *dev, bool vflip, bool hflip)
return 0;
}
int libcamera_device_set_option(device_t *dev, const char *keyp, const char *value)
void libcamera_device_apply_controls(device_t *dev)
{
auto key = libcamera_device_option_normalize(keyp);
auto &controls = dev->libcamera->controls;
auto &applied_controls = dev->libcamera->applied_controls;
for (auto const &control : libcamera_control_list(dev)) {
if (!control.first)
continue;
auto control_id = control.first;
auto control_key = libcamera_device_option_normalize(control_id->name());
if (key != control_key)
continue;
libcamera::ControlValue control_value;
switch (control_id->type()) {
case libcamera::ControlTypeNone:
break;
case libcamera::ControlTypeBool:
control_value.set<bool>(atoi(value));
break;
case libcamera::ControlTypeByte:
control_value.set<unsigned char>(atoi(value));
break;
case libcamera::ControlTypeInteger32:
control_value.set<int32_t>(atoi(value));
break;
case libcamera::ControlTypeInteger64:
control_value.set<int64_t>(atoi(value));
break;
case libcamera::ControlTypeFloat:
control_value.set<float>(atof(value));
break;
case libcamera::ControlTypeRectangle:
static const char *RECTANGLE_PATTERNS[] = {
"(%d,%d)/%ux%u",
"%d,%d,%u,%u",
NULL
};
for (int i = 0; RECTANGLE_PATTERNS[i]; i++) {
libcamera::Rectangle rectangle;
if (4 == sscanf(value, RECTANGLE_PATTERNS[i],
&rectangle.x, &rectangle.y,
&rectangle.width, &rectangle.height)) {
control_value.set(rectangle);
break;
}
}
break;
case libcamera::ControlTypeSize:
static const char *SIZE_PATTERNS[] = {
"%ux%u",
"%u,%u",
NULL
};
for (int i = 0; SIZE_PATTERNS[i]; i++) {
libcamera::Size size;
if (2 == sscanf(value, SIZE_PATTERNS[i], &size.width, &size.height)) {
control_value.set(size);
break;
}
}
break;
case libcamera::ControlTypeString:
break;
}
if (control_value.isNone()) {
LOG_ERROR(dev, "The `%s` type `%d` is not supported.", control_key.c_str(), control_id->type());
}
LOG_INFO(dev, "Configuring option %s (%08x, type=%d) = %s",
control_key.c_str(), control_id->id(), control_id->type(),
control_value.toString().c_str());
dev->libcamera->controls.set(control_id->id(), control_value);
return 1;
for (auto &control : controls) {
applied_controls.set(control.first, control.second);
}
return 0;
error:
return -1;
controls.clear();
}
#endif // USE_LIBCAMERA