diff --git a/0001-pulse-limit-get_writable_size.patch b/0001-pulse-limit-get_writable_size.patch new file mode 100644 index 0000000..5312733 --- /dev/null +++ b/0001-pulse-limit-get_writable_size.patch @@ -0,0 +1,61 @@ +From 62ef0145c3bffdca23c6087117d7cf7830b13a28 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +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 + diff --git a/pipewire.spec b/pipewire.spec index 9d636d2..8b7f9c5 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -33,7 +33,7 @@ Name: pipewire Summary: Media Sharing Server Version: 0.3.13 -Release: 2%{?snap:.%{snap}git%{shortcommit}}%{?dist} +Release: 3%{?snap:.%{snap}git%{shortcommit}}%{?dist} License: MIT URL: https://pipewire.org/ %if 0%{?gitrel} @@ -45,6 +45,7 @@ Source0: https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{version}/p %endif ## upstream patches +Patch1: 0001-pulse-limit-get_writable_size.patch ## upstreamable patches @@ -210,6 +211,7 @@ This package provides a PulseAudio implementation based on PipeWire %setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}} %patch0 -p1 -b .0000 +%patch1 -p1 -b .0001 %build %meson \ @@ -396,6 +398,9 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %endif %changelog +* Tue Sep 29 2020 Wim Taymans - 0.3.13-3 +- Add patch to improve pulse compatibility + * Mon Sep 28 2020 Jeff Law - 0.3.13-2 - Re-enable LTO as upstream GCC target/96939 has been fixed