Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
W
wireplumber
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pkg
wireplumber
Commits
35c5d872
Commit
35c5d872
authored
3 years ago
by
Simon McVittie
Committed by
Dylan Aïssi
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Import Debian changes 0.4.8-4
parent
00512c30
No related branches found
No related tags found
1 merge request
!22
Update from debian/bookworm for apertis/v2023dev2
Pipeline
#366726
canceled
2 years ago
Stage: build-env
Stage: update
Stage: merge
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
debian/changelog
+9
-0
9 additions, 0 deletions
debian/changelog
debian/patches/series
+1
-0
1 addition, 0 deletions
debian/patches/series
debian/patches/si-audio-adapter-relax-format-parsing.patch
+41
-0
41 additions, 0 deletions
debian/patches/si-audio-adapter-relax-format-parsing.patch
with
51 additions
and
0 deletions
debian/changelog
+
9
−
0
View file @
35c5d872
wireplumber (0.4.8-4) unstable; urgency=medium
* Team upload
* d/p/si-audio-adapter-relax-format-parsing.patch:
Add patch from upstream to fix interop with Pipewire 0.3.48
(Closes: #1007100)
-- Simon McVittie <smcv@debian.org> Fri, 11 Mar 2022 10:26:20 +0000
wireplumber (0.4.8-3) unstable; urgency=medium
* Team upload.
...
...
This diff is collapsed.
Click to expand it.
debian/patches/series
+
1
−
0
View file @
35c5d872
fix_va_list_APIs_for_different_arches.patch
si-audio-adapter-relax-format-parsing.patch
This diff is collapsed.
Click to expand it.
debian/patches/si-audio-adapter-relax-format-parsing.patch
0 → 100644
+
41
−
0
View file @
35c5d872
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 21 Feb 2022 15:21:36 +0100
Subject: si-audio-adapter: relax format parsing
Some nodes can omit the format/rate/channels to indicate that they can
deal with all possibilities and adapt to what they are linked to.
See pipewire#876
Origin: upstream, 0.4.9, commit:afbc0ce57aac7aee8dc1651de4620f15c73dbace
Bug-Debian: https://bugs.debian.org/1007100
---
modules/module-si-audio-adapter.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/modules/module-si-audio-adapter.c b/modules/module-si-audio-adapter.c
index f1f6218..84e393f 100644
--- a/modules/module-si-audio-adapter.c
+++ b/modules/module-si-audio-adapter.c
@@ -158,19 +158,12 @@
si_audio_adapter_find_format (WpSiAudioAdapter * self, WpNode * node)
struct spa_pod *position = NULL;
wp_spa_pod_fixate (pod);
- /* defaults */
spa_zero(raw_format);
- raw_format.format = SPA_AUDIO_FORMAT_F32;
- raw_format.rate = si_audio_adapter_get_default_clock_rate (self);
- raw_format.channels = 2;
- raw_format.position[0] = SPA_AUDIO_CHANNEL_FL;
- raw_format.position[1] = SPA_AUDIO_CHANNEL_FR;
-
if (spa_pod_parse_object(wp_spa_pod_get_spa_pod (pod),
SPA_TYPE_OBJECT_Format, NULL,
- SPA_FORMAT_AUDIO_format, SPA_POD_Id(&raw_format.format),
+ SPA_FORMAT_AUDIO_format, SPA_POD_OPT_Id(&raw_format.format),
SPA_FORMAT_AUDIO_rate, SPA_POD_OPT_Int(&raw_format.rate),
- SPA_FORMAT_AUDIO_channels, SPA_POD_Int(&raw_format.channels),
+ SPA_FORMAT_AUDIO_channels, SPA_POD_OPT_Int(&raw_format.channels),
SPA_FORMAT_AUDIO_position, SPA_POD_OPT_Pod(&position)) < 0)
continue;
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment