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

buffer: add MAPPABLE data flag

Browse source 
Add a MAPPABLE data flag that hints that the fd in the data is mappable
with a simple mmap/munmap. Normally, DmaBuf is not mappable like that
unless explicitly indicated with this flag.

Set the MAPPABLE flag on the DmaBuf from v4l2 and libcamera fd.

When asked, mmap the buffer memory in all cases when the MAPPABLE
flag is set.

This solves the case where v4l2 has exported DmaBuf and is streaming to
node A and then node B links but doesn't get automatically mmaped
memory.

Fixes #3840
This commit is contained in:
Wim Taymans 2024-02-08 18:03:27 +01:00
parent 3d5b9ce3e8
commit acf9b67067
6 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
spa/include/spa/buffer/buffer.h
View file

@ -65,6 +65,9 @@ struct spa_data {
#define SPA_DATA_FLAG_WRITABLE (1u<<1) /**< data is writable */
#define SPA_DATA_FLAG_DYNAMIC (1u<<2) /**< data pointer can be changed */
#define SPA_DATA_FLAG_READWRITE (SPA_DATA_FLAG_READABLE|SPA_DATA_FLAG_WRITABLE)
#define SPA_DATA_FLAG_MAPPABLE (1u<<3) /**< data is mappable with simple mmap/munmap. Some memory
* types are not simply mappable (DmaBuf) unless explicitly
* specified with this flag. */
uint32_t flags; /**< data flags */
int64_t fd; /**< optional fd for data */
uint32_t mapoffset; /**< offset to map fd at */

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

@ -805,6 +805,7 @@ mmap_init(struct impl *impl, struct port *port,
if (port->memtype == SPA_DATA_DmaBuf ||
port->memtype == SPA_DATA_MemFd) {
d[j].flags |= SPA_DATA_FLAG_MAPPABLE;
d[j].fd = bufs[i]->planes()[j].fd.get();
spa_log_debug(impl->log, "Got fd = %ld for buffer: #%d", d[j].fd, i);
d[j].data = NULL;

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

@ -1652,7 +1652,7 @@ again:
d[0].type = SPA_DATA_DmaBuf;
else
d[0].type = SPA_DATA_MemFd;
d[0].flags = SPA_DATA_FLAG_READABLE;
d[0].flags = SPA_DATA_FLAG_READABLE | SPA_DATA_FLAG_MAPPABLE;
d[0].fd = expbuf.fd;
d[0].data = NULL;
SPA_FLAG_SET(b->flags, BUFFER_FLAG_ALLOCATED);