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

stream: only set MAPPED flag when mmaped

Browse source
This commit is contained in:
Wim Taymans 2020-06-15 17:54:37 +02:00
parent 4743a423e8
commit fd0ebdd74a
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pipewire/filter.c
View file

@ -677,6 +677,7 @@ static int impl_port_use_buffers(void *object,
d->type == SPA_DATA_DmaBuf) { d->type == SPA_DATA_DmaBuf) {
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);
} }
else if (d->data == NULL) { else if (d->data == NULL) {
pw_log_error(NAME" %p: invalid buffer mem", filter); pw_log_error(NAME" %p: invalid buffer mem", filter);
@ -684,7 +685,6 @@ static int impl_port_use_buffers(void *object,
} }
buf_size += d->maxsize; buf_size += d->maxsize;
} }
SPA_FLAG_SET(b->flags, BUFFER_FLAG_MAPPED);
if (size > 0 && buf_size != size) { if (size > 0 && buf_size != size) {
pw_log_error(NAME" %p: invalid buffer size %d", filter, buf_size); pw_log_error(NAME" %p: invalid buffer size %d", filter, buf_size);

2
src/pipewire/stream.c
View file

@ -669,6 +669,7 @@ static int impl_port_use_buffers(void *object,
d->type == SPA_DATA_DmaBuf) { d->type == SPA_DATA_DmaBuf) {
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);
} }
else if (d->data == NULL) { else if (d->data == NULL) {
pw_log_error(NAME" %p: invalid buffer mem", stream); pw_log_error(NAME" %p: invalid buffer mem", stream);
@ -676,7 +677,6 @@ static int impl_port_use_buffers(void *object,
} }
buf_size += d->maxsize; buf_size += d->maxsize;
} }
SPA_FLAG_SET(b->flags, BUFFER_FLAG_MAPPED);
if (size > 0 && buf_size != size) { if (size > 0 && buf_size != size) {
pw_log_error(NAME" %p: invalid buffer size %d", stream, buf_size); pw_log_error(NAME" %p: invalid buffer size %d", stream, buf_size);