From 5b491671f298afeffad234b289dd30c7bea67685 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 10 Nov 2022 16:32:28 +0100 Subject: [PATCH] Add patch to make Telegram playback work again --- ...lso-advance-read-pointer-in-underrun.patch | 36 +++++++++++++++++++ pipewire.spec | 6 +++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0001-pulse-server-also-advance-read-pointer-in-underrun.patch diff --git a/0001-pulse-server-also-advance-read-pointer-in-underrun.patch b/0001-pulse-server-also-advance-read-pointer-in-underrun.patch new file mode 100644 index 0000000..255a314 --- /dev/null +++ b/0001-pulse-server-also-advance-read-pointer-in-underrun.patch @@ -0,0 +1,36 @@ +From b720da771efa950cf380101bed42d5d5ee177908 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Thu, 10 Nov 2022 16:13:33 +0100 +Subject: [PATCH] pulse-server: also advance read pointer in underrun + +So that we ask for more data from the client. + +Also retested with #2799 that caused this regression. + +Fixes #2821 +--- + src/modules/module-protocol-pulse/pulse-server.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c +index b18273e98..07f664ba1 100644 +--- a/src/modules/module-protocol-pulse/pulse-server.c ++++ b/src/modules/module-protocol-pulse/pulse-server.c +@@ -1433,10 +1433,11 @@ static void stream_process(void *data) + stream->buffer, MAXLENGTH, + index % MAXLENGTH, + p, avail); +- index += avail; +- pd.read_inc = avail; +- spa_ringbuffer_read_update(&stream->ring, index); + } ++ index += size; ++ pd.read_inc = size; ++ spa_ringbuffer_read_update(&stream->ring, index); ++ + pd.playing_for = size; + } + pw_log_debug("%p: [%s] underrun read:%u avail:%d max:%u", +-- +2.38.1 + diff --git a/pipewire.spec b/pipewire.spec index 477d854..7f122ad 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -9,7 +9,7 @@ %global ms_version 0.4.1 # For rpmdev-bumpspec and releng automation -%global baserelease 2 +%global baserelease 3 #global snapdate 20210107 #global gitcommit b17db2cebc1a5ab2c01851d29c05f79cd2f262bb @@ -73,6 +73,7 @@ Source1: https://gitlab.freedesktop.org/pipewire/media-session/-/archive/ %endif ## upstream patches +Patch0001: 0001-pulse-server-also-advance-read-pointer-in-underrun.patch ## upstreamable patches @@ -616,6 +617,9 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %endif %changelog +* Thu Nov 10 2022 Wim Taymans - 0.3.60-3 +- Add patch to make Telegram playback work again + * Thu Nov 10 2022 Neal Gompa - 0.3.60-2 - Restore libusb support