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

port: fix client-side buffers again

Browse source 
Clear the ALLOC flag for the mixer use_buffers only when the node did
the allocation already.

Fixes #193
This commit is contained in:
Wim Taymans 2019-10-23 16:45:22 +02:00
parent 9f4df5ee40
commit e8464cf1b3
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/pipewire/port.c
View file

@ -1246,9 +1246,9 @@ int pw_port_use_buffers(struct pw_port *port, struct pw_port_mix *mix, uint32_t
{ {
int res = 0, res2; int res = 0, res2;
pw_log_debug(NAME" %p: %d:%d.%d: %d buffers state:%d n_mix:%d", port, pw_log_debug(NAME" %p: %d:%d.%d: %d buffers flags:%d state:%d n_mix:%d", port,
port->direction, port->port_id, mix->id, port->direction, port->port_id, mix->id,
n_buffers, port->state, port->n_mix); n_buffers, flags, port->state, port->n_mix);
if (n_buffers == 0 && port->state <= PW_PORT_STATE_READY) if (n_buffers == 0 && port->state <= PW_PORT_STATE_READY)
return 0; return 0;
@ -1274,11 +1274,12 @@ int pw_port_use_buffers(struct pw_port *port, struct pw_port_mix *mix, uint32_t
} else if (n_buffers > 0 && !SPA_RESULT_IS_ASYNC(res)) { } else if (n_buffers > 0 && !SPA_RESULT_IS_ASYNC(res)) {
pw_port_update_state(port, PW_PORT_STATE_PAUSED, NULL); pw_port_update_state(port, PW_PORT_STATE_PAUSED, NULL);
} }
} }
/* then use the buffers on the mixer */ /* then use the buffers on the mixer */
if (!SPA_FLAG_IS_SET(port->mix_flags, PW_PORT_MIX_FLAG_MIX_ONLY))
flags &= ~SPA_NODE_BUFFERS_FLAG_ALLOC; flags &= ~SPA_NODE_BUFFERS_FLAG_ALLOC;
res2 = spa_node_port_use_buffers(port->mix, res2 = spa_node_port_use_buffers(port->mix,
mix->port.direction, mix->port.port_id, flags, mix->port.direction, mix->port.port_id, flags,
buffers, n_buffers); buffers, n_buffers);