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

pulse: set state to READY after format

Browse source 
Always start ACTIVE so that negotiation can happen.
When we get a format, calculate and update the latency, cork if needed
and then go to the READY state.

This is more in line with what pulse does and should improve
compatibility.

See #341
This commit is contained in:
Wim Taymans 2020-10-21 10:24:00 +02:00
parent 48c64f9084
commit 1af41254af
2 changed files with 31 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pipewire-pulseaudio/src/context.c
View file

@ -1233,10 +1233,8 @@ static void configure_device(pa_stream *s, struct global *g)
pw_log_debug("stream %p: linked to %d '%s'", s, s->device_index, s->device_name);
if (s->state == PA_STREAM_CREATING)
pa_stream_set_state(s, PA_STREAM_READY);
if (old != SPA_ID_INVALID && old != s->device_index && s->moved_callback)
if (old != SPA_ID_INVALID && old != s->device_index &&
s->state == PA_STREAM_READY && s->moved_callback)
s->moved_callback(s, s->moved_userdata);
}
@ -1253,14 +1251,10 @@ static void update_link(pa_context *c, uint32_t src_node_id, uint32_t dst_node_i
if (s->stream && s->stream->direct_on_input == dst_node_id) {
pw_log_debug("node %d linked to stream %d %p (%d)",
src_node_id, dst_node_id, s->stream, s->stream->state);
if (s->stream->state == PA_STREAM_CREATING)
pa_stream_set_state(s->stream, PA_STREAM_READY);
}
else if (d->stream && d->stream->direct_on_input == src_node_id) {
pw_log_debug("node %d linked to stream %d %p (%d)",
dst_node_id, src_node_id, d->stream, d->stream->state);
if (d->stream->state == PA_STREAM_CREATING)
pa_stream_set_state(d->stream, PA_STREAM_READY);
}
else if ((s->mask & (PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE)) &&
(d->mask & (PA_SUBSCRIPTION_MASK_SINK_INPUT | PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT))) {