mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: improve debug

Browse source
This commit is contained in:
Wim Taymans 2021-11-03 16:44:13 +01:00
parent 0fd5e3fdb2
commit abacea5ca0
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,6 +39,8 @@ int spa_libcamera_open(struct impl *impl)
{ {
if (impl->acquired) if (impl->acquired)
return 0; return 0;
spa_log_info(impl->log, "open camera %s", impl->props.device);
impl->camera->acquire(); impl->camera->acquire();
impl->allocator = new FrameBufferAllocator(impl->camera); impl->allocator = new FrameBufferAllocator(impl->camera);
@ -55,6 +57,7 @@ int spa_libcamera_close(struct impl *impl)
if (impl->active || port->have_format) if (impl->active || port->have_format)
return 0; return 0;
spa_log_info(impl->log, "close camera %s", impl->props.device);
delete impl->allocator; delete impl->allocator;
impl->allocator = nullptr; impl->allocator = nullptr;
@ -508,8 +511,6 @@ mmap_init(struct impl *impl, struct port *port,
const std::vector<std::unique_ptr<FrameBuffer>> &bufs = const std::vector<std::unique_ptr<FrameBuffer>> &bufs =
impl->allocator->buffers(stream); impl->allocator->buffers(stream);
spa_log_info(impl->log, "In mmap_init()");
if (n_buffers > 0) { if (n_buffers > 0) {
if (bufs.size() != n_buffers) if (bufs.size() != n_buffers)
return -EINVAL; return -EINVAL;
@ -558,7 +559,7 @@ mmap_init(struct impl *impl, struct port *port,
if (port->memtype == SPA_DATA_DmaBuf || if (port->memtype == SPA_DATA_DmaBuf ||
port->memtype == SPA_DATA_MemFd) { port->memtype == SPA_DATA_MemFd) {
d[j].fd = bufs[i]->planes()[j].fd.fd(); d[j].fd = bufs[i]->planes()[j].fd.fd();
spa_log_info(impl->log, "Got fd = %ld for buffer: #%d", d[j].fd, i); spa_log_debug(impl->log, "Got fd = %ld for buffer: #%d", d[j].fd, i);
d[j].data = NULL; d[j].data = NULL;
SPA_FLAG_SET(b->flags, BUFFER_FLAG_ALLOCATED); SPA_FLAG_SET(b->flags, BUFFER_FLAG_ALLOCATED);
} }
@ -575,7 +576,7 @@ mmap_init(struct impl *impl, struct port *port,
} }
b->ptr = d[j].data; b->ptr = d[j].data;
SPA_FLAG_SET(b->flags, BUFFER_FLAG_MAPPED); SPA_FLAG_SET(b->flags, BUFFER_FLAG_MAPPED);
spa_log_info(impl->log, "mmap ptr:%p", d[j].data); spa_log_debug(impl->log, "mmap ptr:%p", d[j].data);
} else { } else {
spa_log_error(impl->log, "invalid buffer type"); spa_log_error(impl->log, "invalid buffer type");
return -EIO; return -EIO;
@ -584,7 +585,7 @@ mmap_init(struct impl *impl, struct port *port,
spa_libcamera_buffer_recycle(impl, port, i); spa_libcamera_buffer_recycle(impl, port, i);
} }
port->n_buffers = n_buffers; port->n_buffers = n_buffers;
spa_log_info(impl->log, "we have %d buffers", n_buffers); spa_log_debug(impl->log, "we have %d buffers", n_buffers);
return 0; return 0;
} }
@ -596,8 +597,6 @@ spa_libcamera_alloc_buffers(struct impl *impl, struct port *port,
{ {
int res; int res;
spa_log_info(impl->log, ". %d", port->n_buffers);
if (port->n_buffers > 0) if (port->n_buffers > 0)
return -EIO; return -EIO;
@ -616,7 +615,7 @@ void Impl::requestComplete(libcamera::Request *request)
uint32_t index, buffer_id; uint32_t index, buffer_id;
struct buffer *b; struct buffer *b;
spa_log_info(impl->log, "request complete"); spa_log_debug(impl->log, "request complete");
if ((request->status() == Request::RequestCancelled)) { if ((request->status() == Request::RequestCancelled)) {
spa_log_debug(impl->log, "Request was cancelled"); spa_log_debug(impl->log, "Request was cancelled");
@ -673,10 +672,9 @@ static int spa_libcamera_stream_on(struct impl *impl)
if (impl->active) if (impl->active)
return 0; return 0;
spa_log_info(impl->log, "connecting camera");
impl->camera->requestCompleted.connect(impl, &impl::requestComplete); impl->camera->requestCompleted.connect(impl, &impl::requestComplete);
spa_log_info(impl->log, "starting camera %s", impl->props.device);
if ((res = impl->camera->start()) < 0) if ((res = impl->camera->start()) < 0)
return res == -EACCES ? -EBUSY : res; return res == -EACCES ? -EBUSY : res;
@ -726,15 +724,12 @@ static int spa_libcamera_stream_off(struct impl *impl)
return 0; return 0;
} }
spa_log_info(impl->log, "stopping camera"); spa_log_info(impl->log, "stopping camera %s", impl->props.device);
impl->pendingRequests.clear(); impl->pendingRequests.clear();
if ((res = impl->camera->stop()) < 0) if ((res = impl->camera->stop()) < 0)
return res == -EACCES ? -EBUSY : res; return res == -EACCES ? -EBUSY : res;
spa_log_info(impl->log, "disconnecting camera");
impl->camera->requestCompleted.disconnect(impl, &impl::requestComplete); impl->camera->requestCompleted.disconnect(impl, &impl::requestComplete);
spa_loop_invoke(impl->data_loop, do_remove_source, 0, NULL, 0, true, impl); spa_loop_invoke(impl->data_loop, do_remove_source, 0, NULL, 0, true, impl);