pool/pipewire
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1036204 from home:alarrosa:branches:multimedia:libs

Browse Source 
- Add patch from upstream to fix some devices that don't seem to
  work in 48000Hz:
  * 0001-acp-do-probing-in-44100Hz-again.patch 
- Require pulseaudio-utils from pipewire-pulseaudio to have pactl
  available to load modules.

OBS-URL: https://build.opensuse.org/request/show/1036204
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pipewire?expand=0&rev=84
This commit is contained in:
Antonio Larrosa 2022-11-16 11:24:07 +00:00 committed by Git OBS Bridge
parent c1805357b9
commit d335319c05
3 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
0001-acp-do-probing-in-44100Hz-again.patch Normal file
View File

@ -0,0 +1,47 @@
From 50a24ac69e491512b7ada0690be5973d5bffa024 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 15 Nov 2022 16:30:26 +0100
Subject: [PATCH] acp: do probing in 44100 Hz again
Some devices don't seem to work when probed in 48000 so bring it back
to 44100 until we figure out what is going on.
Fixes #2718
---
spa/plugins/alsa/acp/acp.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/spa/plugins/alsa/acp/acp.c b/spa/plugins/alsa/acp/acp.c
index c49c9e088..4bbe5ee92 100644
--- a/spa/plugins/alsa/acp/acp.c
+++ b/spa/plugins/alsa/acp/acp.c
@@ -34,6 +34,8 @@ void *_acp_log_data;
struct spa_i18n *acp_i18n;
+#define DEFAULT_RATE 44100
+
#define VOLUME_ACCURACY (PA_VOLUME_NORM/100) /* don't require volume adjustments to be perfectly correct. don't necessarily extend granularity in software unless the differences get greater than this level */
static const uint32_t channel_table[PA_CHANNEL_POSITION_MAX] = {
@@ -312,7 +314,7 @@ static int add_pro_profile(pa_card *impl, uint32_t index)
snd_pcm_uframes_t try_period_size, try_buffer_size;
ss.format = PA_SAMPLE_S32LE;
- ss.rate = 48000;
+ ss.rate = DEFAULT_RATE;
ss.channels = 64;
ap = pa_xnew0(pa_alsa_profile, 1);
@@ -1571,7 +1573,7 @@ struct acp_card *acp_card_new(uint32_t index, const struct acp_dict *props)
}
impl->ucm.default_sample_spec.format = PA_SAMPLE_S16NE;
- impl->ucm.default_sample_spec.rate = 48000;
+ impl->ucm.default_sample_spec.rate = DEFAULT_RATE;
impl->ucm.default_sample_spec.channels = 2;
pa_channel_map_init_extend(&impl->ucm.default_channel_map,
impl->ucm.default_sample_spec.channels, PA_CHANNEL_MAP_ALSA);
--
GitLab

9
pipewire.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Nov 16 11:16:01 UTC 2022 - Antonio Larrosa <alarrosa@suse.com>
- Add patch from upstream to fix some devices that don't seem to
work in 48000Hz:
* 0001-acp-do-probing-in-44100Hz-again.patch
- Require pulseaudio-utils from pipewire-pulseaudio to have pactl
available to load modules.
-------------------------------------------------------------------
Thu Nov 10 16:07:42 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>

4
pipewire.spec
View File

@ -66,6 +66,8 @@ Source99: baselibs.conf
Patch0: reduce-meson-dependency.patch
# PATCH-FIX-UPSTREAM 0001-pulse-server-also-advance-read-pointer-in-underrun.patch
Patch1: 0001-pulse-server-also-advance-read-pointer-in-underrun.patch
# PATCH-FIX-UPSTREAM 0001-acp-do-probing-in-44100Hz-again.patch
Patch2: 0001-acp-do-probing-in-44100Hz-again.patch
BuildRequires: docutils
BuildRequires: doxygen
BuildRequires: fdupes
@ -316,6 +318,7 @@ Summary: PipeWire PulseAudio implementation
Group: Development/Libraries/C and C++
Requires: %{libpipewire} >= %{version}-%{release}
Requires: %{name} >= %{version}-%{release}
Requires: pulseaudio-utils
Recommends: pipewire-alsa
Conflicts: pulseaudio
Conflicts: pulseaudio-daemon
@ -338,6 +341,7 @@ This package provides a PulseAudio implementation based on PipeWire
%patch0 -p1
%endif
%patch1 -p1
%patch2 -p1
%build
%if %{pkg_vcmp gcc < 8}