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

spa: libcamera: source: do not close fd

Browse source 
Currently the plugin does not support importing memory and uses
`libcamera::FrameBufferAllocator` to allocate memory. Every file
descriptor is managed by that object, so they must not be closed
manually.

(cherry picked from commit 429c0e03a3)
This commit is contained in:
Barnabás Pőcze 2025-07-24 16:27:23 +02:00 • committed by Robert Mader
parent 192eab1fea
commit 47aacb2a84
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spa/plugins/libcamera/libcamera-source.cpp
View file

@ -50,8 +50,7 @@ namespace {
#define MASK_BUFFERS 31
#define BUFFER_FLAG_OUTSTANDING (1<<0)
#define BUFFER_FLAG_ALLOCATED (1<<1)
#define BUFFER_FLAG_MAPPED (1<<2)
#define BUFFER_FLAG_MAPPED (1<<1)
struct buffer {
uint32_t id;
@ -357,9 +356,7 @@ int spa_libcamera_clear_buffers(struct impl *impl, struct port *port)
munmap(SPA_PTROFF(b->ptr, -d[0].mapoffset, void),
d[0].maxsize - d[0].mapoffset);
}
if (SPA_FLAG_IS_SET(b->flags, BUFFER_FLAG_ALLOCATED)) {
close(d[0].fd);
}
d[0].type = SPA_ID_INVALID;
}
@ -1121,7 +1118,6 @@ spa_libcamera_alloc_buffers(struct impl *impl, struct port *port,
d[j].fd = bufs[i]->planes()[j].fd.get();
spa_log_debug(impl->log, "Got fd = %" PRId64 " for buffer: #%d", d[j].fd, i);
d[j].data = nullptr;
SPA_FLAG_SET(b->flags, BUFFER_FLAG_ALLOCATED);
}
else if (port->memtype == SPA_DATA_MemPtr) {
d[j].fd = -1;