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

pulse-server: keep stream latency around

Browse source
This commit is contained in:
Wim Taymans 2022-06-03 16:58:37 +02:00
parent ebe673aecb
commit be9c738661
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -586,6 +586,7 @@ static int reply_create_playback_stream(struct stream *stream, struct pw_manager
missing = stream_pop_missing(stream); missing = stream_pop_missing(stream);
stream->index = id_to_index(manager, stream->id); stream->index = id_to_index(manager, stream->id);
stream->lat_usec = lat_usec;
pw_log_info("[%s] reply CREATE_PLAYBACK_STREAM tag:%u index:%u missing:%u lat:%"PRIu64, pw_log_info("[%s] reply CREATE_PLAYBACK_STREAM tag:%u index:%u missing:%u lat:%"PRIu64,
client->name, stream->create_tag, stream->index, missing, lat_usec); client->name, stream->create_tag, stream->index, missing, lat_usec);
@ -732,6 +733,7 @@ static int reply_create_record_stream(struct stream *stream, struct pw_manager_o
lat_usec = set_record_buffer_attr(stream, &stream->attr); lat_usec = set_record_buffer_attr(stream, &stream->attr);
stream->index = id_to_index(manager, stream->id); stream->index = id_to_index(manager, stream->id);
stream->lat_usec = lat_usec;
pw_log_info("[%s] reply CREATE_RECORD_STREAM tag:%u index:%u latency:%"PRIu64, pw_log_info("[%s] reply CREATE_RECORD_STREAM tag:%u index:%u latency:%"PRIu64,
client->name, stream->create_tag, stream->index, lat_usec); client->name, stream->create_tag, stream->index, lat_usec);
@ -4459,7 +4461,6 @@ static int do_set_stream_buffer_attr(struct client *client, uint32_t command, ui
struct message *reply; struct message *reply;
struct buffer_attr attr; struct buffer_attr attr;
bool adjust_latency = false, early_requests = false; bool adjust_latency = false, early_requests = false;
uint64_t lat_usec;
if (message_get(m, if (message_get(m,
TAG_U32, &channel, TAG_U32, &channel,
@ -4513,7 +4514,7 @@ static int do_set_stream_buffer_attr(struct client *client, uint32_t command, ui
stream->early_requests = early_requests; stream->early_requests = early_requests;
if (command == COMMAND_SET_PLAYBACK_STREAM_BUFFER_ATTR) { if (command == COMMAND_SET_PLAYBACK_STREAM_BUFFER_ATTR) {
lat_usec = set_playback_buffer_attr(stream, &attr); stream->lat_usec = set_playback_buffer_attr(stream, &attr);
message_put(reply, message_put(reply,
TAG_U32, stream->attr.maxlength, TAG_U32, stream->attr.maxlength,
@ -4523,11 +4524,11 @@ static int do_set_stream_buffer_attr(struct client *client, uint32_t command, ui
TAG_INVALID); TAG_INVALID);
if (client->version >= 13) { if (client->version >= 13) {
message_put(reply, message_put(reply,
TAG_USEC, lat_usec, /* configured_sink_latency */ TAG_USEC, stream->lat_usec, /* configured_sink_latency */
TAG_INVALID); TAG_INVALID);
} }
} else { } else {
lat_usec = set_record_buffer_attr(stream, &attr); stream->lat_usec = set_record_buffer_attr(stream, &attr);
message_put(reply, message_put(reply,
TAG_U32, stream->attr.maxlength, TAG_U32, stream->attr.maxlength,
@ -4535,7 +4536,7 @@ static int do_set_stream_buffer_attr(struct client *client, uint32_t command, ui
TAG_INVALID); TAG_INVALID);
if (client->version >= 13) { if (client->version >= 13) {
message_put(reply, message_put(reply,
TAG_USEC, lat_usec, /* configured_source_latency */ TAG_USEC, stream->lat_usec, /* configured_source_latency */
TAG_INVALID); TAG_INVALID);
} }
} }

1
src/modules/module-protocol-pulse/stream.h
View file

@ -97,6 +97,7 @@ struct stream {
struct buffer_attr attr; struct buffer_attr attr;
uint32_t frame_size; uint32_t frame_size;
uint32_t rate; uint32_t rate;
uint64_t lat_usec;
struct volume volume; struct volume volume;
bool muted; bool muted;