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

stream: allow NULL param and 0 buffers in disconnect

Browse source 
When we are disconnecting, cleanup code might clear the params
and buffers, make sure we allow this to happen and the call the
right callbacks.
This commit is contained in:
Wim Taymans 2020-06-01 15:36:09 +02:00
parent 7f60ebff27
commit fbaa4ddedd
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pipewire/filter.c
View file

@ -611,8 +611,8 @@ static int impl_port_set_param(void *object,
struct port *port; struct port *port;
int res; int res;
if (impl->disconnecting) if (impl->disconnecting && param != NULL)
return param == NULL ? 0 : -EIO; return -EIO;
pw_log_debug(NAME" %p: param changed: %p %d", impl, param, impl->disconnecting); pw_log_debug(NAME" %p: param changed: %p %d", impl, param, impl->disconnecting);
@ -650,8 +650,8 @@ static int impl_port_use_buffers(void *object,
int prot, res; int prot, res;
int size = 0; int size = 0;
if (impl->disconnecting) if (impl->disconnecting && n_buffers > 0)
return n_buffers == 0 ? 0 : -EIO; return -EIO;
if ((port = get_port(impl, direction, port_id)) == NULL) if ((port = get_port(impl, direction, port_id)) == NULL)
return -EINVAL; return -EINVAL;

8
src/pipewire/stream.c
View file

@ -610,8 +610,8 @@ static int impl_port_set_param(void *object,
struct pw_stream *stream = &impl->this; struct pw_stream *stream = &impl->this;
int res; int res;
if (impl->disconnecting) if (impl->disconnecting && param != NULL)
return param == NULL ? 0 : -EIO; return -EIO;
pw_log_debug(NAME" %p: param id %d (%s) changed: %p", impl, id, pw_log_debug(NAME" %p: param id %d (%s) changed: %p", impl, id,
spa_debug_type_find_name(spa_type_param, id), param); spa_debug_type_find_name(spa_type_param, id), param);
@ -646,8 +646,8 @@ static int impl_port_use_buffers(void *object,
int prot, res; int prot, res;
int size = 0; int size = 0;
if (impl->disconnecting) if (impl->disconnecting && n_buffers > 0)
return n_buffers == 0 ? 0 : -EIO; return -EIO;
prot = PROT_READ | (direction == SPA_DIRECTION_OUTPUT ? PROT_WRITE : 0); prot = PROT_READ | (direction == SPA_DIRECTION_OUTPUT ? PROT_WRITE : 0);