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

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 4715fa1775
commit 858d4e9e1c
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_WRITABLE (1u<<1) /**< data is writable */
#define SPA_DATA_FLAG_DYNAMIC (1u<<2) /**< data pointer can be changed */ #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_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 */ uint32_t flags; /**< data flags */
int64_t fd; /**< optional fd for data */ int64_t fd; /**< optional fd for data */
uint32_t mapoffset; /**< offset to map fd at */ 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 || if (port->memtype == SPA_DATA_DmaBuf ||
port->memtype == SPA_DATA_MemFd) { port->memtype == SPA_DATA_MemFd) {
d[j].flags |= SPA_DATA_FLAG_MAPPABLE;
d[j].fd = bufs[i]->planes()[j].fd.get(); d[j].fd = bufs[i]->planes()[j].fd.get();
spa_log_debug(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;

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

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

3
src/pipewire/filter.h
View file

@ -120,7 +120,8 @@ enum pw_filter_flags {
enum pw_filter_port_flags { enum pw_filter_port_flags {
PW_FILTER_PORT_FLAG_NONE = 0, /**< no flags */ PW_FILTER_PORT_FLAG_NONE = 0, /**< no flags */
PW_FILTER_PORT_FLAG_MAP_BUFFERS = (1 << 0), /**< mmap the buffers except DmaBuf */ PW_FILTER_PORT_FLAG_MAP_BUFFERS = (1 << 0), /**< mmap the buffers except DmaBuf that is not
* explicitly marked as mappable. */
PW_FILTER_PORT_FLAG_ALLOC_BUFFERS = (1 << 1), /**< the application will allocate buffer PW_FILTER_PORT_FLAG_ALLOC_BUFFERS = (1 << 1), /**< the application will allocate buffer
* memory. In the add_buffer event, the * memory. In the add_buffer event, the
* data of the buffer should be set */ * data of the buffer should be set */

3
src/pipewire/stream.c
View file

@ -995,7 +995,8 @@ static int impl_port_use_buffers(void *object,
if (SPA_FLAG_IS_SET(impl_flags, PW_STREAM_FLAG_MAP_BUFFERS)) { if (SPA_FLAG_IS_SET(impl_flags, PW_STREAM_FLAG_MAP_BUFFERS)) {
for (j = 0; j < buffers[i]->n_datas; j++) { for (j = 0; j < buffers[i]->n_datas; j++) {
struct spa_data *d = &buffers[i]->datas[j]; struct spa_data *d = &buffers[i]->datas[j];
if ((mappable_dataTypes & (1<<d->type)) > 0) { if (SPA_FLAG_IS_SET(d->flags, SPA_DATA_FLAG_MAPPABLE) ||
(mappable_dataTypes & (1<<d->type)) > 0) {
if ((res = map_data(impl, d, prot)) < 0) if ((res = map_data(impl, d, prot)) < 0)
return res; return res;
SPA_FLAG_SET(b->flags, BUFFER_FLAG_MAPPED); SPA_FLAG_SET(b->flags, BUFFER_FLAG_MAPPED);

3
src/pipewire/stream.h
View file

@ -394,7 +394,8 @@ enum pw_stream_flags {
PW_STREAM_FLAG_INACTIVE = (1 << 1), /**< start the stream inactive, PW_STREAM_FLAG_INACTIVE = (1 << 1), /**< start the stream inactive,
* pw_stream_set_active() needs to be * pw_stream_set_active() needs to be
* called explicitly */ * called explicitly */
PW_STREAM_FLAG_MAP_BUFFERS = (1 << 2), /**< mmap the buffers except DmaBuf */ PW_STREAM_FLAG_MAP_BUFFERS = (1 << 2), /**< mmap the buffers except DmaBuf that is not
* explicitly marked as mappable. */
PW_STREAM_FLAG_DRIVER = (1 << 3), /**< be a driver */ PW_STREAM_FLAG_DRIVER = (1 << 3), /**< be a driver */
PW_STREAM_FLAG_RT_PROCESS = (1 << 4), /**< call process from the realtime PW_STREAM_FLAG_RT_PROCESS = (1 << 4), /**< call process from the realtime
* thread. You MUST use RT safe functions * thread. You MUST use RT safe functions