mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

v4l2: handle and recover from control failure

Browse source 
When we fail to construct the labels of a control, reset and
continue without labels.
This commit is contained in:
Wim Taymans 2019-06-26 07:23:34 -04:00
parent 891c5fd79d
commit bee88e5279
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
spa/plugins/v4l2/v4l2-utils.c
View file

@ -1107,6 +1107,7 @@ spa_v4l2_enum_controls(struct impl *this, int seq,
case V4L2_CTRL_TYPE_MENU: case V4L2_CTRL_TYPE_MENU:
{ {
struct v4l2_querymenu querymenu; struct v4l2_querymenu querymenu;
struct spa_pod_builder_state state;
spa_pod_builder_push_object(&b, &f[0], SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo); spa_pod_builder_push_object(&b, &f[0], SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo);
spa_pod_builder_add(&b, spa_pod_builder_add(&b,
@ -1119,6 +1120,8 @@ spa_v4l2_enum_controls(struct impl *this, int seq,
querymenu.id = queryctrl.id; querymenu.id = queryctrl.id;
spa_pod_builder_prop(&b, SPA_PROP_INFO_labels, 0); spa_pod_builder_prop(&b, SPA_PROP_INFO_labels, 0);
spa_pod_builder_get_state(&b, &state);
spa_pod_builder_push_struct(&b, &f[1]); spa_pod_builder_push_struct(&b, &f[1]);
for (querymenu.index = queryctrl.minimum; for (querymenu.index = queryctrl.minimum;
querymenu.index <= queryctrl.maximum; querymenu.index <= queryctrl.maximum;
@ -1128,11 +1131,13 @@ spa_v4l2_enum_controls(struct impl *this, int seq,
spa_pod_builder_string(&b, (const char *)querymenu.name); spa_pod_builder_string(&b, (const char *)querymenu.name);
} }
} }
spa_pod_builder_pop(&b, &f[1]); if (spa_pod_builder_pop(&b, &f[1]) == NULL) {
param = spa_pod_builder_pop(&b, &f[0]);
if (param == NULL)
spa_log_warn(this->log, "can't create Control '%s' overflow %d", spa_log_warn(this->log, "can't create Control '%s' overflow %d",
queryctrl.name, b.state.offset); queryctrl.name, b.state.offset);
spa_pod_builder_reset(&b, &state);
spa_pod_builder_none(&b);
}
param = spa_pod_builder_pop(&b, &f[0]);
break; break;
} }
case V4L2_CTRL_TYPE_INTEGER_MENU: case V4L2_CTRL_TYPE_INTEGER_MENU: