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

stream: EIO on format and buffers when disconnecting

Browse source
This commit is contained in:
Wim Taymans 2019-08-14 11:59:00 +02:00
parent 35f617157f
commit e3d19993e9
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pipewire/stream.c
View file

@ -546,8 +546,13 @@ static int impl_port_set_param(void *object,
uint32_t id, uint32_t flags, uint32_t id, uint32_t flags,
const struct spa_pod *param) const struct spa_pod *param)
{ {
struct stream *impl = object;
if (impl->disconnecting)
return param == NULL ? 0 : -EIO;
if (id == SPA_PARAM_Format) { if (id == SPA_PARAM_Format) {
return port_set_format(object, direction, port_id, flags, param); return port_set_format(impl, direction, port_id, flags, param);
} }
else else
return -ENOENT; return -ENOENT;
@ -622,6 +627,9 @@ static int impl_port_use_buffers(void *object,
int prot, res; int prot, res;
int size = 0; int size = 0;
if (impl->disconnecting)
return n_buffers == 0 ? 0 : -EIO;
prot = PROT_READ | (direction == SPA_DIRECTION_OUTPUT ? PROT_WRITE : 0); prot = PROT_READ | (direction == SPA_DIRECTION_OUTPUT ? PROT_WRITE : 0);
clear_buffers(stream); clear_buffers(stream);
@ -1437,6 +1445,7 @@ pw_stream_connect(struct pw_stream *stream,
if ((res = find_format(impl, direction, &impl->media_type, &impl->media_subtype)) < 0) if ((res = find_format(impl, direction, &impl->media_type, &impl->media_subtype)) < 0)
return res; return res;
impl->disconnecting = false;
stream_set_state(stream, PW_STREAM_STATE_CONNECTING, NULL); stream_set_state(stream, PW_STREAM_STATE_CONNECTING, NULL);
if (target_id != SPA_ID_INVALID) if (target_id != SPA_ID_INVALID)