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-server: improve stream cleanup

Browse source 
Make sure we finish processing of the pending messages before
destroying the stream.
This commit is contained in:
Wim Taymans 2020-11-09 15:35:50 +01:00
parent f8186665d9
commit a0b2e5b498
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -745,6 +745,12 @@ static void stream_flush(struct stream *stream)
static void stream_free(struct stream *stream) static void stream_free(struct stream *stream)
{ {
struct client *client = stream->client; struct client *client = stream->client;
struct impl *impl = client->impl;
/* force processing of all pending messages before we destroy
* the stream */
pw_loop_invoke(impl->loop, NULL, 0, NULL, 0, false, client);
if (stream->channel != SPA_ID_INVALID) if (stream->channel != SPA_ID_INVALID)
pw_map_remove(&client->streams, stream->channel); pw_map_remove(&client->streams, stream->channel);
stream_flush(stream); stream_flush(stream);
@ -865,6 +871,8 @@ static void fix_playback_buffer_attr(struct stream *s, struct buffer_attr *attr)
attr->prebuf = max_prebuf; attr->prebuf = max_prebuf;
attr->prebuf -= attr->prebuf % frame_size; attr->prebuf -= attr->prebuf % frame_size;
attr->fragsize = 0;
pw_log_info(NAME" %p: maxlength:%u tlength:%u minreq:%u prebuf:%u", s, pw_log_info(NAME" %p: maxlength:%u tlength:%u minreq:%u prebuf:%u", s,
attr->maxlength, attr->tlength, attr->minreq, attr->prebuf); attr->maxlength, attr->tlength, attr->minreq, attr->prebuf);
} }
@ -979,6 +987,8 @@ static void fix_record_buffer_attr(struct stream *s, struct buffer_attr *attr)
if (attr->fragsize > attr->maxlength) if (attr->fragsize > attr->maxlength)
attr->fragsize = attr->maxlength; attr->fragsize = attr->maxlength;
attr->tlength = attr->minreq = attr->prebuf = 0;
pw_log_info(NAME" %p: maxlength:%u fragsize:%u minfrag:%u", s, pw_log_info(NAME" %p: maxlength:%u fragsize:%u minfrag:%u", s,
attr->maxlength, attr->fragsize, minfrag); attr->maxlength, attr->fragsize, minfrag);
} }