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

pulse-server: ensure positive stream delay in GET_PLAYBACK/RECORD_LATENCY

Browse source 
Pulseaudio protocol requires stream latency is uint64. Clamp the
Pipewire signed latency to the range, better than wrapping around.
This commit is contained in:
Pauli Virtanen 2024-11-19 22:00:57 +02:00
parent a997627906
commit e393e57a26
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2143,6 +2143,7 @@ static int do_get_playback_latency(struct client *client, uint32_t command, uint
uint32_t channel; uint32_t channel;
struct timeval tv, now; struct timeval tv, now;
struct stream *stream; struct stream *stream;
uint64_t delay;
int res; int res;
if ((res = message_get(m, if ((res = message_get(m,
@ -2164,9 +2165,11 @@ static int do_get_playback_latency(struct client *client, uint32_t command, uint
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
delay = SPA_CLAMP(stream->delay, 0, INT64_MAX);
reply = reply_new(client, tag); reply = reply_new(client, tag);
message_put(reply, message_put(reply,
TAG_USEC, stream->delay, /* sink latency + queued samples */ TAG_USEC, delay, /* sink latency + queued samples */
TAG_USEC, 0LL, /* always 0 */ TAG_USEC, 0LL, /* always 0 */
TAG_BOOLEAN, stream->playing_for > 0 && TAG_BOOLEAN, stream->playing_for > 0 &&
!stream->corked, /* playing state */ !stream->corked, /* playing state */
@ -2192,6 +2195,7 @@ static int do_get_record_latency(struct client *client, uint32_t command, uint32
uint32_t channel; uint32_t channel;
struct timeval tv, now; struct timeval tv, now;
struct stream *stream; struct stream *stream;
uint64_t delay;
int res; int res;
if ((res = message_get(m, if ((res = message_get(m,
@ -2211,10 +2215,13 @@ static int do_get_record_latency(struct client *client, uint32_t command, uint32
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
delay = SPA_CLAMP(stream->delay, 0, INT64_MAX);
reply = reply_new(client, tag); reply = reply_new(client, tag);
message_put(reply, message_put(reply,
TAG_USEC, 0LL, /* monitor latency */ TAG_USEC, 0LL, /* monitor latency */
TAG_USEC, stream->delay, /* source latency + queued */ TAG_USEC, delay, /* source latency + queued */
TAG_BOOLEAN, !stream->corked, /* playing state */ TAG_BOOLEAN, !stream->corked, /* playing state */
TAG_TIMEVAL, &tv, TAG_TIMEVAL, &tv,
TAG_TIMEVAL, &now, TAG_TIMEVAL, &now,