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

v4l2: respect allowed data types

Browse source 
Check if we can do DmaBuf as the data type before we attempt this.
Otherwise we don't get any data in clients that can't deal with
DmaBuf.
This commit is contained in:
Wim Taymans 2021-01-21 15:58:30 +01:00
parent 4fb967211e
commit af092a9a7e
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1392,6 +1392,7 @@ mmap_init(struct impl *this,
struct spa_v4l2_device *dev = &port->dev; struct spa_v4l2_device *dev = &port->dev;
struct v4l2_requestbuffers reqbuf; struct v4l2_requestbuffers reqbuf;
unsigned int i; unsigned int i;
bool use_expbuf = false;
port->memtype = V4L2_MEMORY_MMAP; port->memtype = V4L2_MEMORY_MMAP;
@ -1454,7 +1455,9 @@ mmap_init(struct impl *this,
d[0].chunk->stride = port->fmt.fmt.pix.bytesperline; d[0].chunk->stride = port->fmt.fmt.pix.bytesperline;
d[0].chunk->flags = 0; d[0].chunk->flags = 0;
if (port->have_expbuf) { spa_log_debug(this->log, "v4l2: data types %08x", d[0].type);
if (port->have_expbuf && (d[0].type & (1u << SPA_DATA_DmaBuf))) {
struct v4l2_exportbuffer expbuf; struct v4l2_exportbuffer expbuf;
spa_zero(expbuf); spa_zero(expbuf);
@ -1477,6 +1480,7 @@ mmap_init(struct impl *this,
d[0].data = NULL; d[0].data = NULL;
SPA_FLAG_SET(b->flags, BUFFER_FLAG_ALLOCATED); SPA_FLAG_SET(b->flags, BUFFER_FLAG_ALLOCATED);
spa_log_debug(this->log, "v4l2: EXPBUF fd:%d", expbuf.fd); spa_log_debug(this->log, "v4l2: EXPBUF fd:%d", expbuf.fd);
use_expbuf = true;
} else { } else {
fallback: fallback:
d[0].type = SPA_DATA_MemFd; d[0].type = SPA_DATA_MemFd;
@ -1495,11 +1499,12 @@ fallback:
b->ptr = d[0].data; b->ptr = d[0].data;
SPA_FLAG_SET(b->flags, BUFFER_FLAG_MAPPED); SPA_FLAG_SET(b->flags, BUFFER_FLAG_MAPPED);
spa_log_debug(this->log, "v4l2: mmap offset:%u data:%p", d[0].mapoffset, b->ptr); spa_log_debug(this->log, "v4l2: mmap offset:%u data:%p", d[0].mapoffset, b->ptr);
use_expbuf = false;
} }
spa_v4l2_buffer_recycle(this, i); spa_v4l2_buffer_recycle(this, i);
} }
spa_log_info(this->log, "v4l2: have %u buffers using %s", n_buffers, spa_log_info(this->log, "v4l2: have %u buffers using %s", n_buffers,
port->have_expbuf ? "EXPBUF" : "MMAP"); use_expbuf ? "EXPBUF" : "MMAP");
port->n_buffers = n_buffers; port->n_buffers = n_buffers;