jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-v4l2: Fix boolean and menu control types 

Previously, changing boolean or menu settings would send incorrect
values to the ioctl.  This change fixes the support.
master
Nathan-Huckleberry 2020-09-07 21:40:33 -05:00 committed by jp9000
parent 5978094fa0
commit b1bf31dbe7
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/linux-v4l2/v4l2-controls.c
View File

@ -46,7 +46,23 @@ static bool v4l2_control_changed(void *data, obs_properties_t *props,
struct v4l2_control control; struct v4l2_control control;
control.id = POINTER_TO_UINT(data); control.id = POINTER_TO_UINT(data);
control.value = obs_data_get_int(settings, obs_property_name(prop));
switch (obs_property_get_type(prop)) {
case OBS_PROPERTY_BOOL:
control.value =
obs_data_get_bool(settings, obs_property_name(prop));
break;
case OBS_PROPERTY_INT:
case OBS_PROPERTY_LIST:
control.value =
obs_data_get_int(settings, obs_property_name(prop));
break;
default:
blog(LOG_ERROR, "unknown property type for %s",
obs_property_name(prop));
v4l2_close(dev);
return ret;
}
if (0 != v4l2_ioctl(dev, VIDIOC_S_CTRL, &control)) { if (0 != v4l2_ioctl(dev, VIDIOC_S_CTRL, &control)) {
ret = true; ret = true;
@ -79,7 +95,7 @@ static int_fast32_t v4l2_update_controls_menu(int_fast32_t dev,
qmenu.index += qctrl->step) { qmenu.index += qctrl->step) {
if (0 == v4l2_ioctl(dev, VIDIOC_QUERYMENU, &qmenu)) { if (0 == v4l2_ioctl(dev, VIDIOC_QUERYMENU, &qmenu)) {
obs_property_list_add_int(prop, (char *)qmenu.name, obs_property_list_add_int(prop, (char *)qmenu.name,
qmenu.value); qmenu.index);
} }
} }