mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: handle errors better

Browse source 
Make sure we disconnect the request complete handler when we failed
to start.
Stop the camera when we failed to queue our requests.
This commit is contained in:
Wim Taymans 2022-11-14 13:24:07 +01:00
parent b913f1b1a7
commit 4da154c3a9
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
spa/plugins/libcamera/libcamera-utils.cpp
View file

@ -857,11 +857,11 @@ static int spa_libcamera_stream_on(struct impl *impl)
spa_log_info(impl->log, "starting camera %s", impl->device_id.c_str());
if ((res = impl->camera->start()) < 0)
return res == -EACCES ? -EBUSY : res;
goto error;
for (Request *req : impl->pendingRequests) {
if ((res = impl->camera->queueRequest(req)) < 0)
return res == -EACCES ? -EBUSY : res;
goto error_stop;
}
impl->pendingRequests.clear();
@ -872,13 +872,20 @@ static int spa_libcamera_stream_on(struct impl *impl)
impl->source.rmask = 0;
if (impl->source.fd < 0) {
spa_log_error(impl->log, "Failed to create eventfd: %s", spa_strerror(impl->source.fd));
return impl->source.fd;
res = impl->source.fd;
goto error_stop;
}
spa_loop_add_source(impl->data_loop, &impl->source);
impl->active = true;
return 0;
error_stop:
impl->camera->stop();
error:
impl->camera->requestCompleted.disconnect(impl, &impl::requestComplete);
return res == -EACCES ? -EBUSY : res;
}
static int do_remove_source(struct spa_loop *loop,