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

device: some v4l2 cameras do not accept parameters unless streaming

Browse Source 
This fixes 3DO camera not accepting `--camera-options=focus_absolute=100`
and `--camera-options=focus_automatic_continuous=0`, and not properly
configuring the sensor.

The settings are applied twice (if failed) to ignore ordering problems
related to auto-focus and focus-absolute value command line order.
This commit is contained in:
Kamil Trzcinski 2023-11-20 21:28:31 +01:00
parent 82dea910bc
commit 3c116f2307
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
device/camera/camera.c
View File

@ -99,7 +99,15 @@ void camera_capture_add_callbacks(camera_t *camera, buffer_list_t *capture, link
int camera_set_params(camera_t *camera) int camera_set_params(camera_t *camera)
{ {
device_set_fps(camera->camera, camera->options.fps); device_set_fps(camera->camera, camera->options.fps);
// HACK:
// Some cameras require to be in streaming to apply settings
// This applies twice to avoid ordering issues (auto-focus vs focus value)
if (camera->camera->n_capture_list > 0)
buffer_list_set_stream(camera->camera->capture_lists[0], true);
if (device_set_option_list(camera->camera, camera->options.options) < 0)
device_set_option_list(camera->camera, camera->options.options); device_set_option_list(camera->camera, camera->options.options);
device_set_option_list(camera->isp, camera->options.isp.options); device_set_option_list(camera->isp, camera->options.isp.options);
if (camera->options.auto_focus) { if (camera->options.auto_focus) {

14
device/device.c
View File

@ -250,22 +250,26 @@ int device_set_option_string(device_t *dev, const char *key, const char *value)
return -1; return -1;
} }
void device_set_option_list(device_t *dev, const char *option_list) int device_set_option_list(device_t *dev, const char *option_list)
{ {
if (!dev || !option_list || !option_list[0]) { if (!dev || !option_list || !option_list[0]) {
return; return 0;
} }
char *start = strdup(option_list); char *start = strdup(option_list);
char *string = start; char *string = start;
char *option; char *option;
bool err = false;
int count = 0;
while ((option = strsep(&string, OPTION_VALUE_LIST_SEP)) != NULL) { while ((option = strsep(&string, OPTION_VALUE_LIST_SEP)) != NULL) {
char *value = option; char *value = option;
char *key = strsep(&value, "="); char *key = strsep(&value, "=");
if (value) { if (value) {
device_set_option_string(dev, key, value); if (device_set_option_string(dev, key, value) < 0) {
err = true;
}
} else { } else {
LOG_INFO(dev, "Missing 'key=value' for '%s'", option); LOG_INFO(dev, "Missing 'key=value' for '%s'", option);
continue; continue;
@ -273,9 +277,13 @@ void device_set_option_list(device_t *dev, const char *option_list)
// consume all separators // consume all separators
while (strsep(&value, "=")); while (strsep(&value, "="));
count++;
} }
free(start); free(start);
return err ? -count : count;
} }
int device_output_enqueued(device_t *dev) int device_output_enqueued(device_t *dev)

2
device/device.h
View File

@ -112,7 +112,7 @@ int device_dump_options2(device_t *dev, device_option_fn fn, void *opaque);
int device_set_fps(device_t *dev, int desired_fps); int device_set_fps(device_t *dev, int desired_fps);
int device_set_rotation(device_t *dev, bool vflip, bool hflip); int device_set_rotation(device_t *dev, bool vflip, bool hflip);
int device_set_option_string(device_t *dev, const char *option, const char *value); int device_set_option_string(device_t *dev, const char *option, const char *value);
void device_set_option_list(device_t *dev, const char *option_list); int device_set_option_list(device_t *dev, const char *option_list);
int device_output_enqueued(device_t *dev); int device_output_enqueued(device_t *dev);
int device_capture_enqueued(device_t *dev, int *max); int device_capture_enqueued(device_t *dev, int *max);