diff --git a/0001-settings-remove-44.1KHz-from-allowed-rates-again.patch b/0001-settings-remove-44.1KHz-from-allowed-rates-again.patch new file mode 100644 index 0000000..d7166fd --- /dev/null +++ b/0001-settings-remove-44.1KHz-from-allowed-rates-again.patch @@ -0,0 +1,55 @@ +From 282b23cca5aa33c3d0f6b766bb837a868a7bde76 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Fri, 17 Jun 2022 09:02:13 +0200 +Subject: [PATCH] settings: remove 44.1KHz from allowed rates again + +It seems to cause too many problems. It people want rate switching they +can add an override themselves. +--- + src/daemon/minimal.conf.in | 2 +- + src/daemon/pipewire.conf.in | 2 +- + src/pipewire/settings.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/daemon/minimal.conf.in b/src/daemon/minimal.conf.in +index 49227dddf..8b3ba7640 100644 +--- a/src/daemon/minimal.conf.in ++++ b/src/daemon/minimal.conf.in +@@ -27,7 +27,7 @@ context.properties = { + + ## Properties for the DSP configuration. + #default.clock.rate = 48000 +- #default.clock.allowed-rates = [ 44100 48000 ] ++ #default.clock.allowed-rates = [ 48000 ] + #default.clock.quantum = 1024 + #default.clock.min-quantum = 32 + #default.clock.max-quantum = 2048 +diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in +index 787e45f42..3b9f611b7 100644 +--- a/src/daemon/pipewire.conf.in ++++ b/src/daemon/pipewire.conf.in +@@ -27,7 +27,7 @@ context.properties = { + + ## Properties for the DSP configuration. + #default.clock.rate = 48000 +- #default.clock.allowed-rates = [ 44100 48000 ] ++ #default.clock.allowed-rates = [ 48000 ] + #default.clock.quantum = 1024 + default.clock.min-quantum = 16 + #default.clock.max-quantum = 2048 +diff --git a/src/pipewire/settings.c b/src/pipewire/settings.c +index 92d297ca3..c512e9658 100644 +--- a/src/pipewire/settings.c ++++ b/src/pipewire/settings.c +@@ -41,7 +41,7 @@ + #define NAME "settings" + + #define DEFAULT_CLOCK_RATE 48000u +-#define DEFAULT_CLOCK_RATES "[ 44100 48000 ]" ++#define DEFAULT_CLOCK_RATES "[ 48000 ]" + #define DEFAULT_CLOCK_QUANTUM 1024u + #define DEFAULT_CLOCK_MIN_QUANTUM 32u + #define DEFAULT_CLOCK_MAX_QUANTUM 2048u +-- +2.36.1 + diff --git a/pipewire.spec b/pipewire.spec index 74578b6..19cedb7 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 3 +%global baserelease 4 #global snapdate 20210107 #global gitcommit b17db2cebc1a5ab2c01851d29c05f79cd2f262bb @@ -81,6 +81,7 @@ Source1: https://gitlab.freedesktop.org/pipewire/media-session/-/archive/ ## upstream patches Patch0001: 0001-pulse-server-Don-t-send-more-than-fragsize-chunks.patch +Patch0002: 0001-settings-remove-44.1KHz-from-allowed-rates-again.patch ## upstreamable patches @@ -618,6 +619,10 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %endif %changelog +* Thu Jun 23 2022 Wim Taymans - 0.3.52-4 +- Add patch to remove 44.1KHz from samplerates +- See rhbz#2096193 + * Wed Jun 15 2022 Wim Taymans - 0.3.52-3 - Add patch to fix stuttering in TeamSpeak. - Inc baserel to 3, previous build was accidentally done with 2