1f145d25d6
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/pipewire#7a754f81002c002b9c5402b6788d8b0b30cda5b4
62 lines
1.8 KiB
Diff
62 lines
1.8 KiB
Diff
From 62ef0145c3bffdca23c6087117d7cf7830b13a28 Mon Sep 17 00:00:00 2001
|
|
From: Wim Taymans <wtaymans@redhat.com>
|
|
Date: Tue, 29 Sep 2020 09:56:14 +0200
|
|
Subject: [PATCH] pulse: limit get_writable_size()
|
|
|
|
Try to limit the amount of data we can write. Fixes chrome playback.
|
|
---
|
|
pipewire-pulseaudio/src/stream.c | 19 ++++++++++---------
|
|
1 file changed, 10 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/pipewire-pulseaudio/src/stream.c b/pipewire-pulseaudio/src/stream.c
|
|
index c30cd00e..0a398c66 100644
|
|
--- a/pipewire-pulseaudio/src/stream.c
|
|
+++ b/pipewire-pulseaudio/src/stream.c
|
|
@@ -493,8 +493,7 @@ static void stream_process(void *data)
|
|
s, queued, target, wanted, required);
|
|
|
|
if (s->write_callback && s->state == PA_STREAM_READY &&
|
|
- queued < wanted &&
|
|
- wanted >= required)
|
|
+ queued < wanted && wanted >= required)
|
|
s->write_callback(s, wanted, s->write_userdata);
|
|
}
|
|
else {
|
|
@@ -1283,7 +1282,7 @@ SPA_EXPORT
|
|
size_t pa_stream_writable_size(PA_CONST pa_stream *s)
|
|
{
|
|
const pa_timing_info *i;
|
|
- uint64_t now, then, queued, writable, elapsed, required;
|
|
+ uint64_t now, then, queued, target, wanted, elapsed, required;
|
|
struct timespec ts;
|
|
|
|
spa_assert(s);
|
|
@@ -1306,16 +1305,18 @@ size_t pa_stream_writable_size(PA_CONST pa_stream *s)
|
|
}
|
|
|
|
queued = queued_size(s, elapsed);
|
|
- writable = writable_size(s, queued);
|
|
+ target = target_queue(s);
|
|
+ wanted = wanted_size(s, queued, target);
|
|
required = required_size(s);
|
|
|
|
- pw_log_debug("stream %p: writable:%"PRIu64" queued:%"PRIu64" required:%"PRIu64, s,
|
|
- writable, queued, required);
|
|
+ pw_log_debug("stream %p: queued:%"PRIu64" target:%"PRIu64
|
|
+ " wanted:%"PRIu64" required:%"PRIu64, s,
|
|
+ queued, target, wanted, required);
|
|
|
|
- if (writable < required)
|
|
- writable = 0;
|
|
+ if (queued >= wanted || wanted < required)
|
|
+ wanted = 0;
|
|
|
|
- return writable;
|
|
+ return wanted;
|
|
}
|
|
|
|
SPA_EXPORT
|
|
--
|
|
2.26.2
|
|
|