blob: ed3c1b06e59ce36cd06c1757cdf7e3602500b426 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
From aa5de0cfc31df9cd8fb6d24367d2852dbbc8dcb9 Mon Sep 17 00:00:00 2001
From: George Kiagiadakis <george.kiagiadakis@collabora.com>
Date: Mon, 29 Jul 2019 16:12:45 +0300
Subject: [PATCH] audioconvert/fmtconvert: assume F32 on the other port when
listing formats
This allows picking F32LE as the default format on links that have
no restriction and it avoids failing negotiation when the restricted
end cannot handle S16/F32/F32P
For instance this pipeline would previously fail:
audio-dsp mode=merge ! audio-dsp mode=convert ! alsa-sink
old negotiation: S16LE S24_32LE
new negotiation: F32LE S24_32LE
The link between the audio-dsp nodes has no restriction, so previously
it would negotiate S16LE, which would then fail to negotiate with alsa-sink
because fmtconvert does not know how to convert S16LE to S24_32LE directly.
With this change, the middle link negotiates to F32LE, which can be
converted to anything.
Upstream-Status: Submitted [https://github.com/PipeWire/pipewire/pull/169]
---
spa/plugins/audioconvert/fmtconvert.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spa/plugins/audioconvert/fmtconvert.c b/spa/plugins/audioconvert/fmtconvert.c
index df4ffb6b..a330f68f 100644
--- a/spa/plugins/audioconvert/fmtconvert.c
+++ b/spa/plugins/audioconvert/fmtconvert.c
@@ -338,7 +338,7 @@ static int port_enum_formats(struct spa_node *node,
if (other->have_format)
info = other->format;
else
- info.info.raw.format = SPA_AUDIO_FORMAT_S16;
+ info.info.raw.format = SPA_AUDIO_FORMAT_F32;
if (info.info.raw.format == SPA_AUDIO_FORMAT_F32P ||
info.info.raw.format == SPA_AUDIO_FORMAT_F32) {
--
2.20.1
|
