From 39dd760c609f3bf9838bda3cd33643eb1371fb95 Mon Sep 17 00:00:00 2001
From: Jonas Holmberg <jonashg@axis.com>
Date: Tue, 20 Jan 2026 15:02:40 +0100
Subject: [PATCH 001/263] impl-port: Free capabilities

Free capabilities when destroying port.
---
 src/pipewire/impl-port.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pipewire/impl-port.c b/src/pipewire/impl-port.c
index 9d49a8097..ed6fe9f1e 100644
--- a/src/pipewire/impl-port.c
+++ b/src/pipewire/impl-port.c
@@ -1595,6 +1595,8 @@ void pw_impl_port_destroy(struct pw_impl_port *port)
 	pw_param_clear(&impl->pending_list, SPA_ID_INVALID);
 	free(port->tag[SPA_DIRECTION_INPUT]);
 	free(port->tag[SPA_DIRECTION_OUTPUT]);
+	free(port->cap[SPA_DIRECTION_INPUT]);
+	free(port->cap[SPA_DIRECTION_OUTPUT]);
 
 	pw_map_clear(&port->mix_port_map);
 

From ba3e564e3431078f6fea86190ee339e4f036c885 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 21 Jan 2026 13:36:32 +0100
Subject: [PATCH 002/263] filter-graph: notify about default numner of in/out

The filter graph has, after parsing, a default number of input and
output ports. This is based on the description or the first/last element
input and output ports. Pass this information in the properties when
we emit the info.

Don't use the number of configured input/output ports as the default
number of channels in filter-chain because this is only determined after
activating the graph. Instead, use the default input/output channels.

The result is that when you load filter-chain without any channel
layout, it will default to the number of input/outputs of the graph
instead of 0. This allows for the node to be visible in the pulseaudio
API.

Fixes #5084
---
 spa/plugins/filter-graph/filter-graph.c | 45 ++++++++++++++++++-------
 src/modules/module-filter-chain.c       | 27 +++++++++------
 2 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/spa/plugins/filter-graph/filter-graph.c b/spa/plugins/filter-graph/filter-graph.c
index 9271ace34..bf2a57f7f 100644
--- a/spa/plugins/filter-graph/filter-graph.c
+++ b/spa/plugins/filter-graph/filter-graph.c
@@ -193,6 +193,9 @@ struct graph {
 
 	struct volume volume[2];
 
+	uint32_t default_inputs;
+	uint32_t default_outputs;
+
 	uint32_t n_inputs;
 	uint32_t n_outputs;
 	uint32_t inputs_position[MAX_CHANNELS];
@@ -257,16 +260,23 @@ static void emit_filter_graph_info(struct impl *impl, bool full)
 		impl->info.change_mask = impl->info_all;
 	if (impl->info.change_mask || full) {
 		char n_inputs[64], n_outputs[64], latency[64];
+		char n_default_inputs[64], n_default_outputs[64];
 		struct spa_dict_item items[6];
 		struct spa_dict dict = SPA_DICT(items, 0);
 		char in_pos[MAX_CHANNELS * 8];
 		char out_pos[MAX_CHANNELS * 8];
 
+		/* these are the current graph inputs/outputs */
 		snprintf(n_inputs, sizeof(n_inputs), "%d", impl->graph.n_inputs);
 		snprintf(n_outputs, sizeof(n_outputs), "%d", impl->graph.n_outputs);
+		/* these are the default number of graph inputs/outputs */
+		snprintf(n_default_inputs, sizeof(n_default_inputs), "%d", impl->graph.default_inputs);
+		snprintf(n_default_outputs, sizeof(n_default_outputs), "%d", impl->graph.default_outputs);
 
 		items[dict.n_items++] = SPA_DICT_ITEM("n_inputs", n_inputs);
 		items[dict.n_items++] = SPA_DICT_ITEM("n_outputs", n_outputs);
+		items[dict.n_items++] = SPA_DICT_ITEM("n_default_inputs", n_default_inputs);
+		items[dict.n_items++] = SPA_DICT_ITEM("n_default_outputs", n_default_outputs);
 		if (graph->n_inputs_position) {
 			print_channels(in_pos, sizeof(in_pos),
 					graph->n_inputs_position, graph->inputs_position);
@@ -1796,19 +1806,8 @@ static int setup_graph(struct graph *graph)
 	first = spa_list_first(&graph->node_list, struct node, link);
 	last = spa_list_last(&graph->node_list, struct node, link);
 
-	/* calculate the number of inputs and outputs into the graph.
-	 * If we have a list of inputs/outputs, just use them. Otherwise
-	 * we count all input ports of the first node and all output
-	 * ports of the last node */
-	if (graph->n_input_names != 0)
-		n_input = graph->n_input_names;
-	else
-		n_input = first->desc->n_input;
-
-	if (graph->n_output_names != 0)
-		n_output = graph->n_output_names;
-	else
-		n_output = last->desc->n_output;
+	n_input = graph->default_inputs;
+	n_output = graph->default_outputs;
 
 	/* we allow unconnected ports when not explicitly given and the nodes support
 	 * NULL data */
@@ -2083,6 +2082,7 @@ static int load_graph(struct graph *graph, const struct spa_dict *props)
 	struct spa_json inputs, outputs, *pinputs = NULL, *poutputs = NULL;
 	struct spa_json ivolumes, ovolumes, *pivolumes = NULL, *povolumes = NULL;
 	struct spa_json nodes, *pnodes = NULL, links, *plinks = NULL;
+	struct node *first, *last;
 	const char *json, *val;
 	char key[256];
 	int res, len;
@@ -2232,6 +2232,25 @@ static int load_graph(struct graph *graph, const struct spa_dict *props)
 	}
 	if ((res = setup_graph_controls(graph)) < 0)
 		return res;
+
+	first = spa_list_first(&graph->node_list, struct node, link);
+	last = spa_list_last(&graph->node_list, struct node, link);
+
+	/* calculate the number of inputs and outputs into the graph.
+	 * If we have a list of inputs/outputs, just use them. Otherwise
+	 * we count all input ports of the first node and all output
+	 * ports of the last node */
+	if (graph->n_input_names != 0)
+		graph->default_inputs = graph->n_input_names;
+	else
+		graph->default_inputs = first->desc->n_input;
+
+	if (graph->n_output_names != 0)
+		graph->default_outputs = graph->n_output_names;
+	else
+		graph->default_outputs = last->desc->n_output;
+
+
 	return 0;
 }
 
diff --git a/src/modules/module-filter-chain.c b/src/modules/module-filter-chain.c
index eb6a6c8ef..9a723a859 100644
--- a/src/modules/module-filter-chain.c
+++ b/src/modules/module-filter-chain.c
@@ -1711,20 +1711,11 @@ static void graph_info(void *object, const struct spa_filter_graph_info *info)
 {
 	struct impl *impl = object;
 	struct spa_dict *props = info->props;
-	uint32_t i;
-
-	if (impl->capture_info.channels == 0)
-		impl->capture_info.channels = info->n_inputs;
-	if (impl->playback_info.channels == 0)
-		impl->playback_info.channels = info->n_outputs;
+	uint32_t i, val = 0;
 
 	impl->n_inputs = info->n_inputs;
 	impl->n_outputs = info->n_outputs;
 
-	if (impl->capture_info.channels == impl->playback_info.channels) {
-		copy_position(&impl->capture_info, &impl->playback_info);
-		copy_position(&impl->playback_info, &impl->capture_info);
-	}
 	for (i = 0; props && i < props->n_items; i++) {
 		const char *k = props->items[i].key;
 		const char *s = props->items[i].value;
@@ -1738,6 +1729,22 @@ static void graph_info(void *object, const struct spa_filter_graph_info *info)
 				}
 			}
 		}
+		else if (spa_streq(k, "n_default_inputs") &&
+		    impl->capture_info.channels == 0 &&
+		    spa_atou32(s, &val, 0)) {
+			pw_log_info("using default inputs %d", val);
+			impl->capture_info.channels = val;
+		}
+		else if (spa_streq(k, "n_default_outputs") &&
+		    impl->playback_info.channels == 0 &&
+		    spa_atou32(s, &val, 0)) {
+			pw_log_info("using default outputs %d", val);
+			impl->playback_info.channels = val;
+		}
+	}
+	if (impl->capture_info.channels == impl->playback_info.channels) {
+		copy_position(&impl->capture_info, &impl->playback_info);
+		copy_position(&impl->playback_info, &impl->capture_info);
 	}
 }
 

From a97c4d10af5ee95371717b268a1d5be120244c30 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 21 Jan 2026 13:51:38 +0100
Subject: [PATCH 003/263] filter-graph: allow 0 input and output ports

There is no reason to fail when there is no input or output port.
We can simply run the graph with what there is. Even if there is no
input or output at all, running one instance of the plugins is
possible.

Add a busy builtin plugin that has no ports and keeps the CPU IDLE or
busy for the give percent.
---
 spa/plugins/filter-graph/filter-graph.c   |  28 +++---
 spa/plugins/filter-graph/plugin_builtin.c | 104 ++++++++++++++++++++++
 src/modules/module-filter-chain.c         |  30 +++++++
 3 files changed, 144 insertions(+), 18 deletions(-)

diff --git a/spa/plugins/filter-graph/filter-graph.c b/spa/plugins/filter-graph/filter-graph.c
index bf2a57f7f..70de19d6b 100644
--- a/spa/plugins/filter-graph/filter-graph.c
+++ b/spa/plugins/filter-graph/filter-graph.c
@@ -1030,11 +1030,6 @@ static struct descriptor *descriptor_load(struct impl *impl, const char *type,
 			}
 		}
 	}
-	if (desc->n_input == 0 && desc->n_output == 0 && desc->n_control == 0 && desc->n_notify == 0) {
-		spa_log_error(impl->log, "plugin has no input and no output ports");
-		res = -ENOTSUP;
-		goto exit;
-	}
 	for (i = 0; i < desc->n_control; i++) {
 		p = desc->control[i];
 		desc->default_control[i] = get_default(impl, desc, p);
@@ -1794,7 +1789,7 @@ static int setup_graph(struct graph *graph)
 	struct port *port;
 	struct graph_port *gp;
 	struct graph_hndl *gh;
-	uint32_t i, j, n, n_input, n_output, n_hndl = 0;
+	uint32_t i, j, n, n_input, n_output, n_hndl = 0, n_out_hndl;
 	int res;
 	struct descriptor *desc;
 	const struct spa_fga_descriptor *d;
@@ -1815,16 +1810,11 @@ static int setup_graph(struct graph *graph)
 	    SPA_FLAG_IS_SET(first->desc->desc->flags, SPA_FGA_DESCRIPTOR_SUPPORTS_NULL_DATA) &&
 	    SPA_FLAG_IS_SET(last->desc->desc->flags, SPA_FGA_DESCRIPTOR_SUPPORTS_NULL_DATA);
 
-	if (n_input == 0) {
-		spa_log_error(impl->log, "no inputs");
-		res = -EINVAL;
-		goto error;
-	}
-	if (n_output == 0) {
-		spa_log_error(impl->log, "no outputs");
-		res = -EINVAL;
-		goto error;
-	}
+	if (n_input == 0)
+		n_input = n_output;
+	if (n_output == 0)
+		n_output = n_input;
+
 	if (graph->n_inputs == 0)
 		graph->n_inputs = impl->info.n_inputs;
 	if (graph->n_inputs == 0)
@@ -1835,12 +1825,14 @@ static int setup_graph(struct graph *graph)
 
 	/* compare to the requested number of inputs and duplicate the
 	 * graph n_hndl times when needed. */
-	n_hndl = graph->n_inputs / n_input;
+	n_hndl = n_input ? graph->n_inputs / n_input : 1;
 
 	if (graph->n_outputs == 0)
 		graph->n_outputs = n_output * n_hndl;
 
-	if (n_hndl != graph->n_outputs / n_output) {
+	n_out_hndl = n_output ? graph->n_outputs / n_output : 1;
+
+	if (n_hndl != n_out_hndl) {
 		spa_log_error(impl->log, "invalid ports. The input stream has %1$d ports and "
 				"the filter has %2$d inputs. The output stream has %3$d ports "
 				"and the filter has %4$d outputs. input:%1$d / input:%2$d != "
diff --git a/spa/plugins/filter-graph/plugin_builtin.c b/spa/plugins/filter-graph/plugin_builtin.c
index 8a964ccd7..69ed34fc2 100644
--- a/spa/plugins/filter-graph/plugin_builtin.c
+++ b/spa/plugins/filter-graph/plugin_builtin.c
@@ -14,6 +14,7 @@
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <fcntl.h>
+#include <time.h>
 
 #include <spa/utils/json.h>
 #include <spa/utils/result.h>
@@ -3115,6 +3116,107 @@ static const struct spa_fga_descriptor noisegate_desc = {
 	.cleanup = builtin_cleanup,
 };
 
+/* busy */
+struct busy_impl {
+	struct plugin *plugin;
+
+	struct spa_fga_dsp *dsp;
+	struct spa_log *log;
+
+	unsigned long rate;
+
+	float wait_scale;
+	float cpu_scale;
+};
+
+static void *busy_instantiate(const struct spa_fga_plugin *plugin, const struct spa_fga_descriptor * Descriptor,
+		unsigned long SampleRate, int index, const char *config)
+{
+	struct plugin *pl = SPA_CONTAINER_OF(plugin, struct plugin, plugin);
+	struct busy_impl *impl;
+	struct spa_json it[1];
+	const char *val;
+	char key[256];
+	float wait_percent = 0.0f, cpu_percent = 0.0f;
+	int len;
+
+	if (config != NULL) {
+		if (spa_json_begin_object(&it[0], config, strlen(config)) <= 0) {
+			spa_log_error(pl->log, "busy:config must be an object");
+			return NULL;
+		}
+
+		while ((len = spa_json_object_next(&it[0], key, sizeof(key), &val)) > 0) {
+			if (spa_streq(key, "wait-percent")) {
+				if (spa_json_parse_float(val, len, &wait_percent) <= 0) {
+					spa_log_error(pl->log, "busy:wait-percent requires a number");
+					return NULL;
+				}
+			} else if (spa_streq(key, "cpu-percent")) {
+				if (spa_json_parse_float(val, len, &cpu_percent) <= 0) {
+					spa_log_error(pl->log, "busy:cpu-percent requires a number");
+					return NULL;
+				}
+			} else {
+				spa_log_warn(pl->log, "busy: ignoring config key: '%s'", key);
+			}
+		}
+		if (wait_percent <= 0.0f)
+			wait_percent = 0.0f;
+		if (cpu_percent <= 0.0f)
+			cpu_percent = 0.0f;
+	}
+
+	impl = calloc(1, sizeof(*impl));
+	if (impl == NULL)
+		return NULL;
+
+	impl->plugin = pl;
+	impl->dsp = pl->dsp;
+	impl->log = pl->log;
+	impl->rate = SampleRate;
+	impl->wait_scale = wait_percent * SPA_NSEC_PER_SEC / (100.0f * SampleRate);
+	impl->cpu_scale = cpu_percent * SPA_NSEC_PER_SEC / (100.0f * SampleRate);
+	spa_log_info(impl->log, "wait-percent:%f cpu-percent:%f", wait_percent, cpu_percent);
+
+	return impl;
+}
+
+static void busy_run(void * Instance, unsigned long SampleCount)
+{
+	struct busy_impl *impl = Instance;
+	struct timespec ts;
+	uint64_t busy_nsec;
+
+	if (impl->wait_scale > 0.0f) {
+		busy_nsec = (uint64_t)(impl->wait_scale * SampleCount);
+		ts.tv_sec = busy_nsec / SPA_NSEC_PER_SEC;
+		ts.tv_nsec = busy_nsec % SPA_NSEC_PER_SEC;
+		clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, NULL);
+	}
+	if (impl->cpu_scale > 0.0f) {
+		clock_gettime(CLOCK_MONOTONIC, &ts);
+		busy_nsec = SPA_TIMESPEC_TO_NSEC(&ts);
+		busy_nsec += (uint64_t)(impl->cpu_scale * SampleCount);
+		do {
+			clock_gettime(CLOCK_MONOTONIC, &ts);
+		} while ((uint64_t)SPA_TIMESPEC_TO_NSEC(&ts) < busy_nsec);
+	}
+}
+
+static const struct spa_fga_descriptor busy_desc = {
+	.name = "busy",
+	.flags = SPA_FGA_DESCRIPTOR_SUPPORTS_NULL_DATA,
+
+	.n_ports = 0,
+	.ports = NULL,
+
+	.instantiate = busy_instantiate,
+	.connect_port = builtin_connect_port,
+	.run = busy_run,
+	.cleanup = builtin_cleanup,
+};
+
 static const struct spa_fga_descriptor * builtin_descriptor(unsigned long Index)
 {
 	switch(Index) {
@@ -3180,6 +3282,8 @@ static const struct spa_fga_descriptor * builtin_descriptor(unsigned long Index)
 		return &zeroramp_desc;
 	case 30:
 		return &noisegate_desc;
+	case 31:
+		return &busy_desc;
 	}
 	return NULL;
 }
diff --git a/src/modules/module-filter-chain.c b/src/modules/module-filter-chain.c
index 9a723a859..9ab3639bd 100644
--- a/src/modules/module-filter-chain.c
+++ b/src/modules/module-filter-chain.c
@@ -652,6 +652,36 @@ extern struct spa_handle_factory spa_filter_graph_factory;
  * of "Attack (s)" seconds. The noise gate stays open for at least "Hold (s)"
  * seconds before it can close again.
  *
+ * ### Busy
+ *
+ * The `busy` plugin has no input or output ports and it can be used to keep the
+ * CPU or graph busy for the given percent of time.
+ *
+ * The node requires a `config` section with extra configuration:
+ *
+ *\code{.unparsed}
+ * filter.graph = {
+ *     nodes = [
+ *         {
+ *             type   = builtin
+ *             name   = ...
+ *             label  = busy
+ *             config = {
+ *                 wait-percent = 0.0
+ *                 cpu-percent = 50.0
+ *             }
+ *             ...
+ *         }
+ *     }
+ *     ...
+ * }
+ *\endcode
+ *
+ * - `wait-percent` the percentage of time to wait. This keeps the graph busy but
+ *                  not the CPU. Default 0.0
+ * - `cpu-percent` the percentage of time to keep the CPU busy. This keeps both the
+ *                  graph and CPU busy. Default 0.0
+ *
  *
  * ## SOFA filters
  *

From 7f2cce1021acc0733695920b12fcd6b7e5939216 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 21 Jan 2026 16:14:45 +0100
Subject: [PATCH 004/263] filter-graph: add a null plugin

It discards all input.
---
 spa/plugins/filter-graph/plugin_builtin.c | 31 +++++++++++++++++++++++
 src/modules/module-filter-chain.c         |  4 +++
 2 files changed, 35 insertions(+)

diff --git a/spa/plugins/filter-graph/plugin_builtin.c b/spa/plugins/filter-graph/plugin_builtin.c
index 69ed34fc2..3bcde30c9 100644
--- a/spa/plugins/filter-graph/plugin_builtin.c
+++ b/spa/plugins/filter-graph/plugin_builtin.c
@@ -3217,6 +3217,35 @@ static const struct spa_fga_descriptor busy_desc = {
 	.cleanup = builtin_cleanup,
 };
 
+/* null */
+static void null_run(void * Instance, unsigned long SampleCount)
+{
+}
+
+static struct spa_fga_port null_ports[] = {
+	{ .index = 0,
+	  .name = "In",
+	  .flags = SPA_FGA_PORT_INPUT | SPA_FGA_PORT_AUDIO,
+	},
+	{ .index = 1,
+	  .name = "Control",
+	  .flags = SPA_FGA_PORT_INPUT | SPA_FGA_PORT_CONTROL,
+	},
+};
+
+static const struct spa_fga_descriptor null_desc = {
+	.name = "null",
+	.flags = SPA_FGA_DESCRIPTOR_SUPPORTS_NULL_DATA,
+
+	.n_ports = SPA_N_ELEMENTS(null_ports),
+	.ports = null_ports,
+
+	.instantiate = builtin_instantiate,
+	.connect_port = builtin_connect_port,
+	.run = null_run,
+	.cleanup = builtin_cleanup,
+};
+
 static const struct spa_fga_descriptor * builtin_descriptor(unsigned long Index)
 {
 	switch(Index) {
@@ -3284,6 +3313,8 @@ static const struct spa_fga_descriptor * builtin_descriptor(unsigned long Index)
 		return &noisegate_desc;
 	case 31:
 		return &busy_desc;
+	case 32:
+		return &null_desc;
 	}
 	return NULL;
 }
diff --git a/src/modules/module-filter-chain.c b/src/modules/module-filter-chain.c
index 9ab3639bd..ddb014315 100644
--- a/src/modules/module-filter-chain.c
+++ b/src/modules/module-filter-chain.c
@@ -682,6 +682,10 @@ extern struct spa_handle_factory spa_filter_graph_factory;
  * - `cpu-percent` the percentage of time to keep the CPU busy. This keeps both the
  *                  graph and CPU busy. Default 0.0
  *
+ * ### Null
+ *
+ * The `null` plugin has one data input "In" and one control input "Control" that
+ * simply discards the data.
  *
  * ## SOFA filters
  *

From 56a4ab5234857f50ac14aa541c8d3f9e3afcc558 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 21 Jan 2026 16:15:08 +0100
Subject: [PATCH 005/263] filter-chain: support no input or output streams

When the graph has no inputs and the channels is set to 0, don't create
a capture stream. Likewise, don't create a playback stream when there
are no graph outputs and the output channels is 0.

You can use this to make a sine source or a null sink.
---
 src/modules/module-filter-chain.c | 292 +++++++++++++++++-------------
 1 file changed, 163 insertions(+), 129 deletions(-)

diff --git a/src/modules/module-filter-chain.c b/src/modules/module-filter-chain.c
index ddb014315..6453baeee 100644
--- a/src/modules/module-filter-chain.c
+++ b/src/modules/module-filter-chain.c
@@ -193,6 +193,10 @@ extern struct spa_handle_factory spa_filter_graph_factory;
  * graph will then be duplicated as many times to match the number of input/output
  * channels of the streams.
  *
+ * If the graph has no inputs and the capture channels is set as 0, only the
+ * playback stream will be created. Likewise, if there are no outputs and the
+ * playback channels is 0, there will be no capture stream created.
+ *
  * ### Volumes
  *
  * Normally the volume of the sink/source is handled by the stream software volume.
@@ -1249,92 +1253,105 @@ static void capture_destroy(void *d)
 	impl->capture = NULL;
 }
 
-static void capture_process(void *d)
+static void do_process(struct impl *impl)
 {
-	struct impl *impl = d;
-	int res;
-	if ((res = pw_stream_trigger_process(impl->playback)) < 0) {
-		pw_log_debug("playback trigger error: %s", spa_strerror(res));
+	struct pw_buffer *in, *out;
+	uint32_t i, n_in = 0, n_out = 0, data_size = 0;
+	struct spa_data *bd;
+	const void *cin[128];
+	void *cout[128];
+
+	in = out = NULL;
+	if (impl->capture) {
 		while (true) {
 			struct pw_buffer *t;
 			if ((t = pw_stream_dequeue_buffer(impl->capture)) == NULL)
 				break;
-			/* playback part is not ready, consume, discard and recycle
-			 * the capture buffers */
-			pw_stream_queue_buffer(impl->capture, t);
+			if (in)
+				pw_stream_queue_buffer(impl->capture, in);
+			in = t;
 		}
+		if (in == NULL) {
+			pw_log_debug("%p: out of capture buffers: %m", impl);
+		} else {
+			for (i = 0; i < in->buffer->n_datas; i++) {
+				uint32_t offs, size;
+
+				bd = &in->buffer->datas[i];
+
+				offs = SPA_MIN(bd->chunk->offset, bd->maxsize);
+				size = SPA_MIN(bd->chunk->size, bd->maxsize - offs);
+
+				cin[n_in++] = SPA_PTROFF(bd->data, offs, void);
+
+				data_size = i == 0 ? size : SPA_MIN(data_size, size);
+			}
+		}
+	}
+	if (impl->playback) {
+		out = pw_stream_dequeue_buffer(impl->playback);
+		if (out == NULL) {
+			pw_log_debug("%p: out of playback buffers: %m", impl);
+		} else {
+			if (data_size == 0)
+				data_size = out->requested * sizeof(float);
+
+			for (i = 0; i < out->buffer->n_datas; i++) {
+				bd = &out->buffer->datas[i];
+
+				data_size = SPA_MIN(data_size, bd->maxsize);
+
+				cout[n_out++] = bd->data;
+
+				bd->chunk->offset = 0;
+				bd->chunk->size = data_size;
+				bd->chunk->stride = sizeof(float);
+			}
+		}
+		pw_log_trace_fp("%p: size:%d requested:%"PRIu64, impl,
+				data_size, out->requested);
+	}
+
+	for (; n_in < impl->n_inputs; i++)
+		cin[n_in++] = NULL;
+	for (; n_out < impl->n_outputs; i++)
+		cout[n_out++] = NULL;
+
+	if (impl->graph_active)
+		spa_filter_graph_process(impl->graph, cin, cout, data_size / sizeof(float));
+
+	if (in != NULL)
+		pw_stream_queue_buffer(impl->capture, in);
+	if (out != NULL)
+		pw_stream_queue_buffer(impl->playback, out);
+}
+
+static void capture_process(void *d)
+{
+	struct impl *impl = d;
+	int res;
+
+	if (impl->playback) {
+		if ((res = pw_stream_trigger_process(impl->playback)) < 0) {
+			pw_log_debug("playback trigger error: %s", spa_strerror(res));
+			while (impl->capture) {
+				struct pw_buffer *t;
+				if ((t = pw_stream_dequeue_buffer(impl->capture)) == NULL)
+					break;
+				/* playback part is not ready, consume, discard and recycle
+				 * the capture buffers */
+				pw_stream_queue_buffer(impl->capture, t);
+			}
+		}
+	} else {
+		do_process(impl);
 	}
 }
 
 static void playback_process(void *d)
 {
 	struct impl *impl = d;
-	struct pw_buffer *in, *out;
-	uint32_t i, data_size = 0;
-	int32_t stride = 0;
-	struct spa_data *bd;
-	const void *cin[128];
-	void *cout[128];
-
-	in = NULL;
-	while (true) {
-		struct pw_buffer *t;
-		if ((t = pw_stream_dequeue_buffer(impl->capture)) == NULL)
-			break;
-		if (in)
-			pw_stream_queue_buffer(impl->capture, in);
-		in = t;
-	}
-	if (in == NULL)
-		pw_log_debug("%p: out of capture buffers: %m", impl);
-
-	if ((out = pw_stream_dequeue_buffer(impl->playback)) == NULL)
-		pw_log_debug("%p: out of playback buffers: %m", impl);
-
-	if (in == NULL || out == NULL)
-		goto done;
-
-	for (i = 0; i < in->buffer->n_datas; i++) {
-		uint32_t offs, size;
-
-		bd = &in->buffer->datas[i];
-
-		offs = SPA_MIN(bd->chunk->offset, bd->maxsize);
-		size = SPA_MIN(bd->chunk->size, bd->maxsize - offs);
-
-		cin[i] = SPA_PTROFF(bd->data, offs, void);
-
-		data_size = i == 0 ? size : SPA_MIN(data_size, size);
-		stride = SPA_MAX(stride, bd->chunk->stride);
-	}
-	for (; i < impl->n_inputs; i++)
-		cin[i] = NULL;
-
-	for (i = 0; i < out->buffer->n_datas; i++) {
-		bd = &out->buffer->datas[i];
-
-		data_size = SPA_MIN(data_size, bd->maxsize);
-
-		cout[i] = bd->data;
-
-		bd->chunk->offset = 0;
-		bd->chunk->size = data_size;
-		bd->chunk->stride = stride;
-	}
-	for (; i < impl->n_outputs; i++)
-		cout[i] = NULL;
-
-	pw_log_trace_fp("%p: stride:%d size:%d requested:%"PRIu64" (%"PRIu64")", impl,
-			stride, data_size, out->requested, out->requested * stride);
-
-	if (impl->graph_active)
-		spa_filter_graph_process(impl->graph, cin, cout, data_size / sizeof(float));
-
-done:
-	if (in != NULL)
-		pw_stream_queue_buffer(impl->capture, in);
-	if (out != NULL)
-		pw_stream_queue_buffer(impl->playback, out);
+	do_process(impl);
 }
 
 static int activate_graph(struct impl *impl)
@@ -1403,6 +1420,9 @@ static void update_latency(struct impl *impl, enum spa_direction direction, bool
 	struct pw_stream *s = direction == SPA_DIRECTION_OUTPUT ?
 		impl->playback : impl->capture;
 
+	if (s == NULL)
+		return;
+
 	spa_pod_builder_init(&b, buffer, sizeof(buffer));
 	latency = impl->latency[direction];
 	spa_process_latency_info_add(&impl->process_latency, &latency);
@@ -1459,10 +1479,13 @@ static void param_tag_changed(struct impl *impl, const struct spa_pod *param,
 	if (param == 0 || spa_tag_parse(param, &tag, &state) < 0)
 		return;
 
-	if (tag.direction == SPA_DIRECTION_INPUT)
-		pw_stream_update_params(impl->capture, params, 1);
-	else
-		pw_stream_update_params(impl->playback, params, 1);
+	if (tag.direction == SPA_DIRECTION_INPUT) {
+		if (impl->capture)
+			pw_stream_update_params(impl->capture, params, 1);
+	} else {
+		if (impl->playback)
+			pw_stream_update_params(impl->playback, params, 1);
+	}
 }
 
 static void capture_state_changed(void *data, enum pw_stream_state old,
@@ -1539,8 +1562,7 @@ static void param_changed(struct impl *impl, uint32_t id, const struct spa_pod *
 	return;
 
 error:
-	pw_stream_set_error(direction == SPA_DIRECTION_INPUT ? impl->capture : impl->playback,
-			res, "can't start graph: %s", spa_strerror(res));
+	pw_stream_set_error(stream, res, "can't start graph: %s", spa_strerror(res));
 }
 
 static void capture_param_changed(void *data, uint32_t id, const struct spa_pod *param)
@@ -1599,7 +1621,7 @@ static void playback_state_changed(void *data, enum pw_stream_state old,
 	}
 	return;
 error:
-	pw_stream_set_error(impl->capture, res, "can't start graph: %s",
+	pw_stream_set_error(impl->playback, res, "can't start graph: %s",
 			spa_strerror(res));
 }
 
@@ -1628,43 +1650,39 @@ static const struct pw_stream_events out_stream_events = {
 static int setup_streams(struct impl *impl)
 {
 	int res;
-	uint32_t i, n_params, *offs;
+	uint32_t i, n_params, *offs, flags;
 	struct pw_array offsets;
 	const struct spa_pod **params = NULL;
 	struct spa_pod_dynamic_builder b;
 	struct spa_filter_graph *graph = impl->graph;
 
-	impl->capture = pw_stream_new(impl->core,
-			"filter capture", impl->capture_props);
-	impl->capture_props = NULL;
-	if (impl->capture == NULL)
-		return -errno;
+	if (impl->capture_info.channels > 0) {
+		impl->capture = pw_stream_new(impl->core,
+				"filter capture", impl->capture_props);
+		impl->capture_props = NULL;
+		if (impl->capture == NULL)
+			return -errno;
 
-	pw_stream_add_listener(impl->capture,
-			&impl->capture_listener,
-			&in_stream_events, impl);
+		pw_stream_add_listener(impl->capture,
+				&impl->capture_listener,
+				&in_stream_events, impl);
+	}
 
-	impl->playback = pw_stream_new(impl->core,
-			"filter playback", impl->playback_props);
-	impl->playback_props = NULL;
-	if (impl->playback == NULL)
-		return -errno;
+	if (impl->playback_info.channels > 0) {
+		impl->playback = pw_stream_new(impl->core,
+				"filter playback", impl->playback_props);
+		impl->playback_props = NULL;
+		if (impl->playback == NULL)
+			return -errno;
 
-	pw_stream_add_listener(impl->playback,
-			&impl->playback_listener,
-			&out_stream_events, impl);
+		pw_stream_add_listener(impl->playback,
+				&impl->playback_listener,
+				&out_stream_events, impl);
+	}
 
 	spa_pod_dynamic_builder_init(&b, NULL, 0, 4096);
 	pw_array_init(&offsets, 512);
 
-	if ((offs = pw_array_add(&offsets, sizeof(uint32_t))) == NULL) {
-		res = -errno;
-		goto done;
-	}
-	*offs = b.b.state.offset;
-	spa_format_audio_raw_build(&b.b,
-			SPA_PARAM_EnumFormat, &impl->capture_info);
-
 	for (i = 0;; i++) {
 		uint32_t save = b.b.state.offset;
 		if (spa_filter_graph_enum_prop_info(graph, i, &b.b, NULL) != 1)
@@ -1687,7 +1705,7 @@ static int setup_streams(struct impl *impl)
 		res = -ENOMEM;
 		goto done;
 	}
-	if ((params = calloc(n_params, sizeof(struct spa_pod*))) == NULL) {
+	if ((params = calloc(n_params+1, sizeof(struct spa_pod*))) == NULL) {
 		res = -errno;
 		goto done;
 	}
@@ -1696,32 +1714,44 @@ static int setup_streams(struct impl *impl)
 	for (i = 0; i < n_params; i++)
 		params[i] = spa_pod_builder_deref(&b.b, offs[i]);
 
-	res = pw_stream_connect(impl->capture,
-			PW_DIRECTION_INPUT,
-			PW_ID_ANY,
-			PW_STREAM_FLAG_AUTOCONNECT |
+	if (impl->capture) {
+		params[n_params++] = spa_format_audio_raw_build(&b.b,
+				SPA_PARAM_EnumFormat, &impl->capture_info);
+		flags = PW_STREAM_FLAG_AUTOCONNECT |
 			PW_STREAM_FLAG_MAP_BUFFERS |
-			PW_STREAM_FLAG_RT_PROCESS |
-			PW_STREAM_FLAG_ASYNC,
-			params, n_params);
+			PW_STREAM_FLAG_RT_PROCESS;
+		if (impl->playback)
+			flags |= PW_STREAM_FLAG_ASYNC;
 
-	spa_pod_dynamic_builder_clean(&b);
-	if (res < 0)
-		goto done;
+		res = pw_stream_connect(impl->capture,
+				PW_DIRECTION_INPUT,
+				PW_ID_ANY,
+				flags,
+				params, n_params);
 
-	n_params = 0;
-	spa_pod_dynamic_builder_init(&b, NULL, 0, 4096);
-	params[n_params++] = spa_format_audio_raw_build(&b.b,
-			SPA_PARAM_EnumFormat, &impl->playback_info);
+		spa_pod_dynamic_builder_clean(&b);
+		if (res < 0)
+			goto done;
 
-	res = pw_stream_connect(impl->playback,
-			PW_DIRECTION_OUTPUT,
-			PW_ID_ANY,
-			PW_STREAM_FLAG_AUTOCONNECT |
+		n_params = 0;
+		spa_pod_dynamic_builder_init(&b, NULL, 0, 4096);
+	}
+	if (impl->playback) {
+		params[n_params++] = spa_format_audio_raw_build(&b.b,
+				SPA_PARAM_EnumFormat, &impl->playback_info);
+
+		flags = PW_STREAM_FLAG_AUTOCONNECT |
 			PW_STREAM_FLAG_MAP_BUFFERS |
-			PW_STREAM_FLAG_RT_PROCESS  |
-			PW_STREAM_FLAG_TRIGGER,
-			params, n_params);
+			PW_STREAM_FLAG_RT_PROCESS;
+		if (impl->capture)
+			flags |= PW_STREAM_FLAG_TRIGGER;
+
+		res = pw_stream_connect(impl->playback,
+				PW_DIRECTION_OUTPUT,
+				PW_ID_ANY,
+				flags,
+				params, n_params);
+	}
 	spa_pod_dynamic_builder_clean(&b);
 
 done:
@@ -1801,7 +1831,11 @@ static void graph_props_changed(void *object, enum spa_direction direction)
 	spa_pod_dynamic_builder_init(&b, buffer, sizeof(buffer), 4096);
 	spa_filter_graph_get_props(graph, &b.b, (struct spa_pod **)&params[0]);
 
-	pw_stream_update_params(impl->capture, params, 1);
+	if (impl->capture)
+		pw_stream_update_params(impl->capture, params, 1);
+	else if (impl->playback)
+		pw_stream_update_params(impl->playback, params, 1);
+
 	spa_pod_dynamic_builder_clean(&b);
 }
 

From c634ef9610022c21630905c193cc9ecbcfd9a736 Mon Sep 17 00:00:00 2001
From: Sven Ulland <sven.ulland@gmail.com>
Date: Tue, 20 Jan 2026 17:15:36 +0100
Subject: [PATCH 006/263] pipewiresrc: Fix video crop metadata not being set

Since commit a1f33a99df changed buffer handling to create new GstBuffers
instead of reusing pool buffers, the video crop metadata was silently
lost. The code used gst_buffer_get_video_crop_meta() which returns NULL
on a fresh buffer, so the crop values from PipeWire were never applied.

Change to gst_buffer_add_video_crop_meta() to actually attach the
metadata to the buffer.

Also remove the now-obsolete call in gst_pipewire_pool_wrap_buffer.

This was discovered when using the XDG Desktop Portal's RemoteDesktop
interface: the full desktop was being delivered instead of just the
selected window, because the crop region metadata was not being
propagated to the GStreamer buffer.

Fixes: a1f33a99df ("gst: dequeue a shared buffer instead of original
pool buffer"), from merge request !1258

CC: @jameshilliard
---
 src/gst/gstpipewirepool.c | 2 --
 src/gst/gstpipewiresrc.c  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/gst/gstpipewirepool.c b/src/gst/gstpipewirepool.c
index 5581c64ac..3bcf99de7 100644
--- a/src/gst/gstpipewirepool.c
+++ b/src/gst/gstpipewirepool.c
@@ -209,8 +209,6 @@ void gst_pipewire_pool_wrap_buffer (GstPipeWirePool *pool, struct pw_buffer *b)
   data->b = b;
   data->buf = buf;
   data->crop = spa_buffer_find_meta_data (b->buffer, SPA_META_VideoCrop, sizeof(*data->crop));
-  if (data->crop)
-	  gst_buffer_add_video_crop_meta(buf);
   data->videotransform =
     spa_buffer_find_meta_data (b->buffer, SPA_META_VideoTransform, sizeof(*data->videotransform));
   data->cursor = spa_buffer_find_meta_data (b->buffer, SPA_META_Cursor, sizeof(*data->cursor));
diff --git a/src/gst/gstpipewiresrc.c b/src/gst/gstpipewiresrc.c
index 8bfd799a1..b0de17dfd 100644
--- a/src/gst/gstpipewiresrc.c
+++ b/src/gst/gstpipewiresrc.c
@@ -781,7 +781,7 @@ static GstBuffer *dequeue_buffer(GstPipeWireSrc *pwsrc)
 
   crop = data->crop;
   if (crop) {
-    GstVideoCropMeta *meta = gst_buffer_get_video_crop_meta(buf);
+    GstVideoCropMeta *meta = gst_buffer_add_video_crop_meta(buf);
     if (meta) {
       meta->x = crop->region.position.x;
       meta->y = crop->region.position.y;

From f82f4945b907602abf1fca0955178b8d303abf1f Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 21 Jan 2026 18:35:36 +0100
Subject: [PATCH 007/263] filter-graph: improve min/max checks for control

Clamp the control values to their min/max.

Remove the default_control array, we can just restore the default with
the port_set_control_value(). Do this when no value has been set on the
port when we set up the graph. The avantage is that we calculate the
default, min and max correctly when they depend on the graph rate.

Fixes #5088
---
 spa/plugins/filter-graph/filter-graph.c | 97 +++++++++++++------------
 1 file changed, 52 insertions(+), 45 deletions(-)

diff --git a/spa/plugins/filter-graph/filter-graph.c b/spa/plugins/filter-graph/filter-graph.c
index 70de19d6b..52609f2c6 100644
--- a/spa/plugins/filter-graph/filter-graph.c
+++ b/spa/plugins/filter-graph/filter-graph.c
@@ -80,7 +80,6 @@ struct descriptor {
 	unsigned long *output;
 	unsigned long *control;
 	unsigned long *notify;
-	float *default_control;
 };
 
 struct port {
@@ -94,6 +93,9 @@ struct port {
 	uint32_t n_links;
 	uint32_t external;
 
+	bool control_initialized;
+
+	float control_current;
 	float control_data[MAX_HNDL];
 	float *audio_data[MAX_HNDL];
 	void *audio_mem[MAX_HNDL];
@@ -349,12 +351,6 @@ static int impl_process(void *object,
 	return 0;
 }
 
-static float get_default(struct impl *impl, struct descriptor *desc, uint32_t p)
-{
-	struct spa_fga_port *port = &desc->desc->ports[p];
-	return port->def;
-}
-
 static struct node *find_node(struct graph *graph, const char *name)
 {
 	struct node *node;
@@ -443,6 +439,20 @@ static struct port *find_port(struct node *node, const char *name, int descripto
 	return NULL;
 }
 
+static void get_ranges(struct impl *impl, struct spa_fga_port *p,
+		float *def, float *min, float *max)
+{
+	uint32_t rate = impl->rate ? impl->rate : DEFAULT_RATE;
+	*def = p->def;
+	*min = p->min;
+	*max = p->max;
+	if (p->hint & SPA_FGA_HINT_SAMPLE_RATE) {
+		*def *= rate;
+		*min *= rate;
+		*max *= rate;
+	}
+}
+
 static int impl_enum_prop_info(void *object, uint32_t idx, struct spa_pod_builder *b,
 		struct spa_pod **param)
 {
@@ -457,7 +467,6 @@ static int impl_enum_prop_info(void *object, uint32_t idx, struct spa_pod_builde
 	struct spa_fga_port *p;
 	float def, min, max;
 	char name[512];
-	uint32_t rate = impl->rate ? impl->rate : DEFAULT_RATE;
 
 	if (idx >= graph->n_control)
 		return 0;
@@ -468,15 +477,7 @@ static int impl_enum_prop_info(void *object, uint32_t idx, struct spa_pod_builde
 	d = desc->desc;
 	p = &d->ports[port->p];
 
-	if (p->hint & SPA_FGA_HINT_SAMPLE_RATE) {
-		def = p->def * rate;
-		min = p->min * rate;
-		max = p->max * rate;
-	} else {
-		def = p->def;
-		min = p->min;
-		max = p->max;
-	}
+	get_ranges(impl, p, &def, &min, &max);
 
 	if (node->name[0] != '\0')
 		snprintf(name, sizeof(name), "%s:%s", node->name, p->name);
@@ -575,41 +576,58 @@ static int impl_get_props(void *object, struct spa_pod_builder *b, struct spa_po
 	return 1;
 }
 
-static int port_set_control_value(struct port *port, float *value, uint32_t id)
+static int port_id_set_control_value(struct port *port, uint32_t id, float value)
 {
 	struct node *node = port->node;
 	struct impl *impl = node->graph->impl;
-
 	struct descriptor *desc = node->desc;
+	struct spa_fga_port *p = &desc->desc->ports[port->p];
 	float old;
 	bool changed;
 
 	old = port->control_data[id];
-	port->control_data[id] = value ? *value : desc->default_control[port->idx];
+	port->control_data[id] = value;
+
 	spa_log_info(impl->log, "control %d %d ('%s') from %f to %f", port->idx, id,
-			desc->desc->ports[port->p].name, old, port->control_data[id]);
+			p->name, old, value);
+
 	changed = old != port->control_data[id];
 	node->control_changed |= changed;
+
 	return changed ? 1 : 0;
 }
 
+static int port_set_control_value(struct port *port, float *value)
+{
+	struct node *node = port->node;
+	struct impl *impl = node->graph->impl;
+	struct spa_fga_port *p;
+	float v, def, min, max;
+	uint32_t i;
+	int count = 0;
+
+	p = &node->desc->desc->ports[port->p];
+	get_ranges(impl, p, &def, &min, &max);
+	v = SPA_CLAMP(value ? *value : def, min, max);
+
+	port->control_current = v;
+	port->control_initialized = true;
+
+	for (i = 0; i < node->n_hndl; i++)
+		count += port_id_set_control_value(port, i, v);
+
+	return count;
+}
+
 static int set_control_value(struct node *node, const char *name, float *value)
 {
 	struct port *port;
-	int count = 0;
-	uint32_t i, n_hndl;
 
 	port = find_port(node, name, SPA_FGA_PORT_INPUT | SPA_FGA_PORT_CONTROL);
 	if (port == NULL)
 		return -ENOENT;
 
-	/* if we don't have any instances yet, set the first control value, we will
-	 * copy to other instances later */
-	n_hndl = SPA_MAX(1u, port->node->n_hndl);
-	for (i = 0; i < n_hndl; i++)
-		count += port_set_control_value(port, value, i);
-
-	return count;
+	return port_set_control_value(port, value);
 }
 
 static int parse_params(struct graph *graph, const struct spa_pod *pod)
@@ -716,7 +734,7 @@ static int sync_volume(struct graph *graph, struct volume *vol)
 		v = v * (vol->max[n_port] - vol->min[n_port]) + vol->min[n_port];
 
 		n_hndl = SPA_MAX(1u, p->node->n_hndl);
-		res += port_set_control_value(p, &v, i % n_hndl);
+		res += port_id_set_control_value(p, i % n_hndl, v);
 	}
 	return res;
 }
@@ -935,7 +953,6 @@ static void descriptor_unref(struct descriptor *desc)
 	free(desc->input);
 	free(desc->output);
 	free(desc->control);
-	free(desc->default_control);
 	free(desc->notify);
 	free(desc);
 }
@@ -946,7 +963,7 @@ static struct descriptor *descriptor_load(struct impl *impl, const char *type,
 	struct plugin *pl;
 	struct descriptor *desc;
 	const struct spa_fga_descriptor *d;
-	uint32_t i, n_input, n_output, n_control, n_notify;
+	uint32_t n_input, n_output, n_control, n_notify;
 	unsigned long p;
 	int res;
 
@@ -1000,7 +1017,6 @@ static struct descriptor *descriptor_load(struct impl *impl, const char *type,
 	desc->input = calloc(n_input, sizeof(unsigned long));
 	desc->output = calloc(n_output, sizeof(unsigned long));
 	desc->control = calloc(n_control, sizeof(unsigned long));
-	desc->default_control = calloc(n_control, sizeof(float));
 	desc->notify = calloc(n_notify, sizeof(unsigned long));
 
 	for (p = 0; p < d->n_ports; p++) {
@@ -1030,12 +1046,6 @@ static struct descriptor *descriptor_load(struct impl *impl, const char *type,
 			}
 		}
 	}
-	for (i = 0; i < desc->n_control; i++) {
-		p = desc->control[i];
-		desc->default_control[i] = get_default(impl, desc, p);
-		spa_log_info(impl->log, "control %d ('%s') default to %f", i,
-				d->ports[p].name, desc->default_control[i]);
-	}
 	spa_list_append(&pl->descriptor_list, &desc->link);
 
 	return desc;
@@ -1415,7 +1425,6 @@ static int load_node(struct graph *graph, struct spa_json *json)
 		port->external = SPA_ID_INVALID;
 		port->p = desc->control[i];
 		spa_list_init(&port->link_list);
-		port->control_data[0] = desc->default_control[i];
 	}
 	for (i = 0; i < desc->n_notify; i++) {
 		struct port *port = &node->notify_port[i];
@@ -2020,11 +2029,9 @@ static int setup_graph(struct graph *graph)
 			}
 		}
 		for (i = 0; i < desc->n_control; i++) {
-			/* any default values for the controls are set in the first instance
-			 * of the control data. Duplicate this to the other instances now. */
 			struct port *port = &node->control_port[i];
-			for (j = 1; j < n_hndl; j++)
-				port->control_data[j] = port->control_data[0];
+			port_set_control_value(port,
+				port->control_initialized ? &port->control_current : NULL);
 		}
 	}
 	res = 0;

From f978b702b13d042f481232ccc73a27c05257d035 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 22 Jan 2026 13:08:06 +0100
Subject: [PATCH 008/263] pw-cat: also look at simple formats for extension

The simple formats contain some common mappings for other extensions such
as mp3.

Makes pw-record test.mp3 actually write an mp3 instead of a wav file.
---
 src/tools/pw-cat.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/tools/pw-cat.c b/src/tools/pw-cat.c
index bdd44a255..ab72fd3d6 100644
--- a/src/tools/pw-cat.c
+++ b/src/tools/pw-cat.c
@@ -1700,6 +1700,25 @@ static void format_from_filename(SF_INFO *info, const char *filename)
 			break;
 		}
 	}
+	if (format == -1) {
+		if (sf_command(NULL, SFC_GET_SIMPLE_FORMAT_COUNT, &count, sizeof(int)) != 0)
+			count = 0;
+
+		for (i = 0; i < count; i++) {
+			SF_FORMAT_INFO fi;
+
+			spa_zero(fi);
+			fi.format = i;
+			if (sf_command(NULL, SFC_GET_SIMPLE_FORMAT, &fi, sizeof(fi)) != 0)
+				continue;
+
+			if (spa_strendswith(filename, fi.extension)) {
+				format = fi.format;
+				info->format = 0;
+				break;
+			}
+		}
+	}
 	if (format == -1)
 		format = spa_streq(filename, "-") ? SF_FORMAT_AU : SF_FORMAT_WAV;
 	if (format == SF_FORMAT_WAV && info->channels > 2)

From 04793138b50717cd543cdbdd1f5df663e4623eff Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arunr@valvesoftware.com>
Date: Wed, 21 Jan 2026 15:23:39 -0800
Subject: [PATCH 009/263] alsa-card-profiles: Add config for a couple of JBL
 gaming headsets

Similar to the existing SteelSeries and Logitech ones, but the order of
the playback endpoints is reversed, and only mono input is supported.
---
 spa/plugins/alsa/90-pipewire-alsa.rules       |  5 ++
 .../usb-gaming-headset-gamefirst.conf         | 70 +++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 spa/plugins/alsa/mixer/profile-sets/usb-gaming-headset-gamefirst.conf

diff --git a/spa/plugins/alsa/90-pipewire-alsa.rules b/spa/plugins/alsa/90-pipewire-alsa.rules
index b2e1f6886..8c986d070 100644
--- a/spa/plugins/alsa/90-pipewire-alsa.rules
+++ b/spa/plugins/alsa/90-pipewire-alsa.rules
@@ -187,6 +187,11 @@ ATTRS{idVendor}=="1395", ATTRS{idProduct}=="0300", ENV{ACP_PROFILE_SET}="usb-gam
 # Sennheiser GSP 670 USB headset
 ATTRS{idVendor}=="1395", ATTRS{idProduct}=="008a", ENV{ACP_PROFILE_SET}="usb-gaming-headset.conf"
 
+# JBL Quantum One
+ATTRS{idVendor}=="0ecb", ATTRS{idProduct}=="203a", ENV{ACP_PROFILE_SET}="usb-gaming-headset-gamefirst.conf"
+# JBL Quantum 810 Wireless
+ATTRS{idVendor}=="0ecb", ATTRS{idProduct}=="2069", ENV{ACP_PROFILE_SET}="usb-gaming-headset-gamefirst.conf"
+
 # Audioengine HD3 powered speakers support IEC958 but don't actually
 # have any digital outputs.
 ATTRS{idVendor}=="0a12", ATTRS{idProduct}=="4007", ENV{ACP_PROFILE_SET}="analog-only.conf"
diff --git a/spa/plugins/alsa/mixer/profile-sets/usb-gaming-headset-gamefirst.conf b/spa/plugins/alsa/mixer/profile-sets/usb-gaming-headset-gamefirst.conf
new file mode 100644
index 000000000..9192c6864
--- /dev/null
+++ b/spa/plugins/alsa/mixer/profile-sets/usb-gaming-headset-gamefirst.conf
@@ -0,0 +1,70 @@
+# This file is part of PulseAudio.
+#
+# PulseAudio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+#
+# PulseAudio is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+
+; USB gaming headset.
+; These headsets usually have two output devices. The first one is meant
+; for general audio, and the second one is meant for chat. There is also
+; a single input device for chat.
+; The purpose of this unusual design is to provide separate volume
+; controls for voice and other audio, which can be useful in gaming.
+;
+; Works with:
+; JBL Quantum 810 Wireless
+; JBL Quantum One
+;
+; Based on usb-gaming-headset.conf.
+;
+; See default.conf for an explanation on the directives used here.
+
+[General]
+auto-profiles = yes
+
+[Mapping mono-chat-output]
+description-key = gaming-headset-chat
+device-strings = hw:%f,1,0
+channel-map = mono
+paths-output = usb-gaming-headset-output-mono
+intended-roles = phone
+
+[Mapping stereo-chat-output]
+description-key = gaming-headset-chat
+device-strings = hw:%f,1,0
+channel-map = left,right
+paths-output = usb-gaming-headset-output-stereo
+intended-roles = phone
+
+[Mapping mono-chat-input]
+description-key = gaming-headset-chat
+device-strings = hw:%f,0,0
+channel-map = mono
+paths-input = usb-gaming-headset-input
+intended-roles = phone
+
+[Mapping stereo-game-output]
+description-key = gaming-headset-game
+device-strings = hw:%f,0,0
+channel-map = left,right
+paths-output = usb-gaming-headset-output-stereo
+direction = output
+
+[Profile output:mono-chat+output:stereo-game+input:mono-chat]
+output-mappings = mono-chat-output stereo-game-output
+input-mappings = mono-chat-input
+priority = 5100
+
+[Profile output:stereo-game+output:stereo-chat+input:mono-chat]
+output-mappings = stereo-game-output stereo-chat-output
+input-mappings = mono-chat-input
+priority = 5100

From 8600721de068d1bebce458ee5a97b3942fcd238c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 22 Jan 2026 14:39:46 +0100
Subject: [PATCH 010/263] stream: Change PW_CAPABILITY_DEVICE_ID_NEGOTIATION to
 a version number

This allows easier evolvement of the negotiation protocol.
---
 doc/dox/internals/dma-buf.dox    | 7 ++++---
 src/examples/video-play-fixate.c | 7 ++++---
 src/examples/video-src-fixate.c  | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/doc/dox/internals/dma-buf.dox b/doc/dox/internals/dma-buf.dox
index 273be930e..7815a8c42 100644
--- a/doc/dox/internals/dma-buf.dox
+++ b/doc/dox/internals/dma-buf.dox
@@ -313,12 +313,13 @@ performed.
 Device ID negotiation needs explicit support by both end points of a stream, thus, the
 first step of negotiation is discovering whether other peer has support for it. This is
 done by advertising a \ref SPA_PARAM_Capability with the key \ref
-PW_CAPABILITY_DEVICE_ID_NEGOTIATION and value `true`
+PW_CAPABILITY_DEVICE_ID_NEGOTIATION and value `1` which corresponds to the
+current negotiation API version.
 
 ```
 	spa_param_dict_build_dict(&b, SPA_PARAM_Capability,
 		&SPA_DICT_ITEMS(
-			SPA_DICT_ITEM(PW_CAPABILITY_DEVICE_ID_NEGOTIATION, "true")));
+			SPA_DICT_ITEM(PW_CAPABILITY_DEVICE_ID_NEGOTIATION, "1")));
 ```
 
 To do this, when connecting to the stream, the \ref PW_STREAM_FLAG_INACTIVE flag must be
@@ -369,7 +370,7 @@ To achieve this, the consumer adds another \ref SPA_PARAM_PeerCapability item wi
 ```
 	char *device_ids = ...; /* Base 64 encoding of a dev_t. */.
 	&SPA_DICT_ITEMS(
-		SPA_DICT_ITEM(PW_CAPABILITY_DEVICE_ID_NEGOTIATION, "true"),
+		SPA_DICT_ITEM(PW_CAPABILITY_DEVICE_ID_NEGOTIATION, "1"),
 		SPA_DICT_ITEM(PW_CAPABILITY_DEVICE_IDS, device_ids)));
 ```
 
diff --git a/src/examples/video-play-fixate.c b/src/examples/video-play-fixate.c
index 6fdc561e6..2ee71a941 100644
--- a/src/examples/video-play-fixate.c
+++ b/src/examples/video-play-fixate.c
@@ -438,8 +438,9 @@ discover_capabilities(struct data *data, const struct spa_pod *param)
 				return;
 
 			spa_dict_for_each(it, &dict) {
-				if (spa_streq(it->key, PW_CAPABILITY_DEVICE_ID_NEGOTIATION) &&
-				    spa_streq(it->value, "true")) {
+				if (spa_streq(it->key, PW_CAPABILITY_DEVICE_ID_NEGOTIATION)) {
+				    int version = atoi(it->value);
+				    if (version >= 1)
 					data->device_negotiation_supported = true;
 				} else if (spa_streq(it->key, PW_CAPABILITY_DEVICE_IDS)) {
 					collect_device_ids(data, it->value);
@@ -787,7 +788,7 @@ int main(int argc, char *argv[])
 	params[n_params++] =
 		spa_param_dict_build_dict(&b, SPA_PARAM_Capability,
 			&SPA_DICT_ITEMS(
-				SPA_DICT_ITEM(PW_CAPABILITY_DEVICE_ID_NEGOTIATION, "true")));
+				SPA_DICT_ITEM(PW_CAPABILITY_DEVICE_ID_NEGOTIATION, "1")));
 #endif
 
 	/* now connect the stream, we need a direction (input/output),
diff --git a/src/examples/video-src-fixate.c b/src/examples/video-src-fixate.c
index 0671ab1be..0e072c27b 100644
--- a/src/examples/video-src-fixate.c
+++ b/src/examples/video-src-fixate.c
@@ -450,8 +450,9 @@ discover_capabilities(struct data *data, const struct spa_pod *param)
 				return;
 
 			spa_dict_for_each(it, &dict) {
-				if (spa_streq(it->key, PW_CAPABILITY_DEVICE_ID_NEGOTIATION) &&
-				    spa_streq(it->value, "true")) {
+				if (spa_streq(it->key, PW_CAPABILITY_DEVICE_ID_NEGOTIATION)) {
+				    int version = atoi(it->value);
+				    if (version >= 1)
 					data->device_negotiation_supported = true;
 				}
 			}
@@ -799,7 +800,7 @@ int main(int argc, char *argv[])
 
 	params[n_params++] =
 		spa_param_dict_build_dict(&b, SPA_PARAM_Capability,
-			&SPA_DICT_ITEMS(SPA_DICT_ITEM(PW_CAPABILITY_DEVICE_ID_NEGOTIATION, "true"),
+			&SPA_DICT_ITEMS(SPA_DICT_ITEM(PW_CAPABILITY_DEVICE_ID_NEGOTIATION, "1"),
 #ifdef SUPPORT_DEVICE_IDS_LIST
 					SPA_DICT_ITEM(PW_CAPABILITY_DEVICE_IDS, device_ids)
 #endif /* SUPPORT_DEVICE_IDS_LIST */

From f2c4452e8dcf2b92f789185e3057b1effb5a3100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 22 Jan 2026 16:55:34 +0100
Subject: [PATCH 011/263] stream: Make capability device IDs an JSON object

Also change the encoding of the byte array to use hexadecimal encoding,
i.e. the byte array [100, 200] in becomes "64c8".
---
 doc/dox/internals/dma-buf.dox    |  7 +++-
 src/examples/base64.h            | 46 -----------------------
 src/examples/utils.h             | 60 ++++++++++++++++++++++++++++++
 src/examples/video-play-fixate.c | 64 ++++++++++++++++++--------------
 src/examples/video-src-fixate.c  | 13 ++++---
 5 files changed, 110 insertions(+), 80 deletions(-)
 delete mode 100644 src/examples/base64.h
 create mode 100644 src/examples/utils.h

diff --git a/doc/dox/internals/dma-buf.dox b/doc/dox/internals/dma-buf.dox
index 7815a8c42..5042f285c 100644
--- a/doc/dox/internals/dma-buf.dox
+++ b/doc/dox/internals/dma-buf.dox
@@ -365,10 +365,13 @@ with. This can be used to reduce the amount of devices that are queried for form
 metadata, which can be a time consuming task, if devices needs to be woken up.
 
 To achieve this, the consumer adds another \ref SPA_PARAM_PeerCapability item with the key
-\ref PW_CAPABILITY_DEVICE_IDS set to a string of base 64 encoded `dev_t` device IDs.
+\ref PW_CAPABILITY_DEVICE_IDS set to a JSON object describing what device IDs are supported.
+
+This JSON object as of version 1 contains a single key "available-devices" that contain
+a list of hexadecimal encoded `dev_t` device IDs.
 
 ```
-	char *device_ids = ...; /* Base 64 encoding of a dev_t. */.
+	char *device_ids = "{\"available-devices\": [\"6464000000000000\",\"c8c8000000000000\"]}";
 	&SPA_DICT_ITEMS(
 		SPA_DICT_ITEM(PW_CAPABILITY_DEVICE_ID_NEGOTIATION, "1"),
 		SPA_DICT_ITEM(PW_CAPABILITY_DEVICE_IDS, device_ids)));
diff --git a/src/examples/base64.h b/src/examples/base64.h
deleted file mode 100644
index 50e6d64b2..000000000
--- a/src/examples/base64.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* PipeWire */
-/* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans */
-/* SPDX-License-Identifier: MIT */
-
-static inline void base64_encode(const uint8_t *data, size_t len, char *enc, char pad)
-{
-	static const char tab[] =
-	    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-	size_t i;
-	for (i = 0; i < len; i += 3) {
-		uint32_t v;
-		v  =              data[i+0]      << 16;
-		v |= (i+1 < len ? data[i+1] : 0) << 8;
-		v |= (i+2 < len ? data[i+2] : 0);
-		*enc++ =             tab[(v >> (3*6)) & 0x3f];
-		*enc++ =             tab[(v >> (2*6)) & 0x3f];
-		*enc++ = i+1 < len ? tab[(v >> (1*6)) & 0x3f] : pad;
-		*enc++ = i+2 < len ? tab[(v >> (0*6)) & 0x3f] : pad;
-	}
-	*enc = '\0';
-}
-
-static inline size_t base64_decode(const char *data, size_t len, uint8_t *dec)
-{
-	uint8_t tab[] = {
-		62, -1, -1, -1, 63, 52, 53, 54, 55, 56,
-		57, 58, 59, 60, 61, -1, -1, -1, -1, -1,
-		-1, -1,  0,  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, -1, -1,
-		-1, -1, -1, -1, 26, 27, 28, 29, 30, 31,
-		32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
-		42, 43, 44, 45, 46, 47, 48, 49, 50, 51 };
-	size_t i, j;
-	for (i = 0, j = 0; i < len; i += 4) {
-		uint32_t v;
-		v =                          tab[data[i+0]-43]  << (3*6);
-		v |=                         tab[data[i+1]-43]  << (2*6);
-		v |= (data[i+2] == '=' ? 0 : tab[data[i+2]-43]) << (1*6);
-		v |= (data[i+3] == '=' ? 0 : tab[data[i+3]-43]);
-		                      dec[j++] = (v >> 16) & 0xff;
-		if (data[i+2] != '=') dec[j++] = (v >> 8)  & 0xff;
-		if (data[i+3] != '=') dec[j++] =  v        & 0xff;
-	}
-	return j;
-}
diff --git a/src/examples/utils.h b/src/examples/utils.h
new file mode 100644
index 000000000..079f22d55
--- /dev/null
+++ b/src/examples/utils.h
@@ -0,0 +1,60 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2026 Red Hat */
+/* SPDX-License-Identifier: MIT */
+
+static inline char *
+encode_hex(const uint8_t *data, size_t size)
+{
+	FILE *ms;
+	char *encoded = NULL;
+	size_t encoded_size = 0;
+	size_t i;
+
+	ms = open_memstream(&encoded, &encoded_size);
+	for (i = 0; i < size; i++) {
+		fprintf(ms, "%02x", data[i]);
+	}
+	fclose(ms);
+
+	return encoded;
+}
+
+static inline int8_t
+ascii_hex_to_hex(uint8_t ascii_hex)
+{
+	if (ascii_hex >= '0' && ascii_hex <= '9')
+		return ascii_hex - '0';
+	else if (ascii_hex >= 'a' && ascii_hex <= 'f')
+		return ascii_hex - 'a' + 10;
+	else if (ascii_hex >= 'A' && ascii_hex <= 'F')
+		return ascii_hex - 'A' + 10;
+	else
+		return -1;
+}
+
+static inline int
+decode_hex(const char *encoded, uint8_t *data, size_t size)
+{
+	size_t length;
+	size_t i;
+
+	length = strlen(encoded);
+
+	if (size < (length / 2) * sizeof(uint8_t))
+		return -1;
+
+	i = 0;
+	while (i < length) {
+		int8_t top = ascii_hex_to_hex(encoded[i]);
+		int8_t bottom = ascii_hex_to_hex(encoded[i + 1]);
+
+		if (top == -1 || bottom == -1)
+			return -1;
+
+		uint8_t el = top << 4 | bottom;
+		data[i / 2] = el;
+		i += 2;
+	}
+
+	return 1;
+}
diff --git a/src/examples/video-play-fixate.c b/src/examples/video-play-fixate.c
index 2ee71a941..13b617a59 100644
--- a/src/examples/video-play-fixate.c
+++ b/src/examples/video-play-fixate.c
@@ -29,7 +29,7 @@
 #include <pipewire/pipewire.h>
 #include <pipewire/capabilities.h>
 
-#include "base64.h"
+#include "utils.h"
 
 /* Comment out to test device ID negotation backward compatibility. */
 #define SUPPORT_DEVICE_ID_NEGOTIATION 1
@@ -372,46 +372,56 @@ collect_device_ids(struct data *data, const char *json)
 	int len;
 	const char *value;
 	struct spa_json sub;
+	char key[1024];
 
 	if ((len = spa_json_begin(&it, json, strlen(json), &value)) <= 0) {
 		fprintf(stderr, "invalid device IDs value\n");
 		return;
 	}
-	if (!spa_json_is_array(value, len)) {
-		fprintf(stderr, "device IDs not array\n");
+	if (!spa_json_is_object(value, len)) {
+		fprintf(stderr, "device IDs not object\n");
 		return;
 	}
 
 	spa_json_enter(&it, &sub);
-	while ((len = spa_json_next(&sub, &value)) > 0) {
-		char *string;
-		union {
-			dev_t device_id;
-			uint8_t buffer[1024];
-		} dec;
+	while ((len = spa_json_object_next(&sub, key, sizeof(key), &value)) > 0) {
+		struct spa_json devices_sub;
 
-		string = alloca(len + 1);
-
-		if (!spa_json_is_string(value, len)) {
-			fprintf(stderr, "device ID not string\n");
+		if (!spa_json_is_array(value, len)) {
+			fprintf(stderr, "available-devices not array\n");
 			return;
 		}
 
-		if (spa_json_parse_string(value, len, string) <= 0) {
-			fprintf(stderr, "invalid device ID string\n");
-			return;
+		spa_json_enter(&sub, &devices_sub);
+		while ((len = spa_json_next(&devices_sub, &value)) > 0) {
+			char *string;
+			union {
+				dev_t device_id;
+				uint8_t buffer[1024];
+			} dec;
+
+			string = alloca(len + 1);
+
+			if (!spa_json_is_string(value, len)) {
+				fprintf(stderr, "device ID not string\n");
+				return;
+			}
+
+			if (spa_json_parse_string(value, len, string) <= 0) {
+				fprintf(stderr, "invalid device ID string\n");
+				return;
+			}
+
+			if (decode_hex(string, dec.buffer, sizeof (dec.buffer)) < 0) {
+				fprintf(stderr, "invalid device ID string\n");
+				return;
+			}
+
+			fprintf(stderr, "discovered device ID %u:%u\n",
+				major(dec.device_id), minor(dec.device_id));
+
+			data->device_ids[data->n_device_ids++] = dec.device_id;
 		}
-
-		if (base64_decode(string, strlen(string),
-				  (uint8_t *)&dec.device_id) < sizeof(dev_t)) {
-			fprintf(stderr, "invalid device ID\n");
-			return;
-		}
-
-		fprintf(stderr, "discovered device ID %u:%u\n",
-			major(dec.device_id), minor(dec.device_id));
-
-		data->device_ids[data->n_device_ids++] = dec.device_id;
 	}
 }
 
diff --git a/src/examples/video-src-fixate.c b/src/examples/video-src-fixate.c
index 0e072c27b..6d08074de 100644
--- a/src/examples/video-src-fixate.c
+++ b/src/examples/video-src-fixate.c
@@ -30,7 +30,7 @@
 #include <pipewire/pipewire.h>
 #include <pipewire/capabilities.h>
 
-#include "base64.h"
+#include "utils.h"
 
 /* Comment out to test device ID negotation backward compatibility. */
 #define SUPPORT_DEVICE_ID_NEGOTIATION 1
@@ -784,17 +784,20 @@ int main(int argc, char *argv[])
 	size_t i;
 
 	ms = open_memstream(&device_ids, &device_ids_size);
-	fprintf(ms, "[");
+	fprintf(ms, "{\"available-devices\": [");
 	for (i = 0; i < SPA_N_ELEMENTS(devices); i++) {
 		dev_t device_id = makedev(devices[i].major, devices[i].minor);
-		char device_id_encoded[256];
+		char *device_id_encoded;
+
+		device_id_encoded = encode_hex((const uint8_t *) &device_id, sizeof (device_id));
 
-		base64_encode((const uint8_t *) &device_id, sizeof (device_id), device_id_encoded, '\0');
 		if (i > 0)
 			fprintf(ms, ",");
 		fprintf(ms, "\"%s\"", device_id_encoded);
+
+		free(device_id_encoded);
 	}
-	fprintf(ms, "]");
+	fprintf(ms, "]}");
 	fclose(ms);
 #endif /* SUPPORT_DEVICE_IDS_LIST */
 

From 35817c0d850f71f02b3c0e43037d394c5b892caf Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 22 Jan 2026 16:31:01 +0100
Subject: [PATCH 012/263] pw-cat: support some more formats

So that you can give an .oga extension and --format=opus to get an
opus ogg file.
---
 src/tools/pw-cat.c | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/tools/pw-cat.c b/src/tools/pw-cat.c
index ab72fd3d6..8bd3e343c 100644
--- a/src/tools/pw-cat.c
+++ b/src/tools/pw-cat.c
@@ -211,6 +211,12 @@ static const struct format_info {
 	{  "s32", SF_FORMAT_PCM_32, SPA_AUDIO_FORMAT_S32, 4 },
 	{  "f32", SF_FORMAT_FLOAT, SPA_AUDIO_FORMAT_F32, 4 },
 	{  "f64", SF_FORMAT_DOUBLE, SPA_AUDIO_FORMAT_F32, 8 },
+
+	{  "mp1", SF_FORMAT_MPEG_LAYER_I, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "mp2", SF_FORMAT_MPEG_LAYER_II, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "mp3", SF_FORMAT_MPEG_LAYER_III, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "vorbis", SF_FORMAT_VORBIS, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "opus", SF_FORMAT_OPUS, SPA_AUDIO_FORMAT_F32, 1 },
 };
 
 static const struct format_info *format_info_by_name(const char *str)
@@ -1678,12 +1684,6 @@ static void format_from_filename(SF_INFO *info, const char *filename)
 	int i, count = 0;
 	int format = -1;
 
-#if __BYTE_ORDER == __BIG_ENDIAN
-	info->format |= SF_ENDIAN_BIG;
-#else
-	info->format |= SF_ENDIAN_LITTLE;
-#endif
-
 	if (sf_command(NULL, SFC_GET_FORMAT_MAJOR_COUNT, &count, sizeof(int)) != 0)
 		count = 0;
 
@@ -1724,12 +1724,18 @@ static void format_from_filename(SF_INFO *info, const char *filename)
 	if (format == SF_FORMAT_WAV && info->channels > 2)
 		format = SF_FORMAT_WAVEX;
 
+	switch (format & SF_FORMAT_TYPEMASK) {
+	case SF_FORMAT_OGG:
+	case SF_FORMAT_FLAC:
+	case SF_FORMAT_MPEG:
+	case SF_FORMAT_AIFF:
+		info->format |= SF_ENDIAN_FILE;
+		break;
+	default:
+		info->format |= SF_ENDIAN_CPU;
+		break;
+	}
 	info->format |= format;
-
-	if (format == SF_FORMAT_OGG || format == SF_FORMAT_FLAC)
-		info->format = (info->format & ~SF_FORMAT_ENDMASK) | SF_ENDIAN_FILE;
-	if (format == SF_FORMAT_OGG)
-		info->format = (info->format & ~SF_FORMAT_SUBMASK) | SF_FORMAT_VORBIS;
 }
 
 #ifdef HAVE_PW_CAT_FFMPEG_INTEGRATION

From db7c74a042b89feb917313bd4347b6888a754a0c Mon Sep 17 00:00:00 2001
From: Mengshi Wu <mengshi.wu@oss.qualcomm.com>
Date: Fri, 16 Jan 2026 16:16:22 +0800
Subject: [PATCH 013/263] bluez5/backend-native: Add HFP/HSP hardware offload
 datapath configuration

Add support for configuring the SCO hardware offload data path for
HFP/HSP profiles using the Bluetooth SIG-specified procedure. This
enables vendor-specific SCO offload integrations.

Changes:
- Add `bluez5.hw-offload-datapath` configuration property (default: 0)
- Implement `sco_offload_btcodec()` to set BT_CODEC socket option
- Add `SPA_BT_FEATURE_HW_OFFLOAD` quirk feature flag
- Apply offload configuration when creating SCO sockets if quirk enabled
- Document new property in pipewire-props.7.md

The datapath ID is configurable via device parameters and only applied
when the hardware offload feature flag is set in quirks, allowing
platform-specific SCO offload implementations.
---
 doc/dox/config/pipewire-props.7.md  |  9 ++++++
 spa/plugins/bluez5/backend-native.c | 46 +++++++++++++++++++++++++++++
 spa/plugins/bluez5/defs.h           |  4 ++-
 spa/plugins/bluez5/quirks.c         |  6 ++++
 4 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/doc/dox/config/pipewire-props.7.md b/doc/dox/config/pipewire-props.7.md
index ed82b2f41..d7e75e33d 100644
--- a/doc/dox/config/pipewire-props.7.md
+++ b/doc/dox/config/pipewire-props.7.md
@@ -1171,6 +1171,15 @@ in a platform-specific way. See `tests/examples/bt-pinephone.lua` in WirePlumber
 Do not enable this setting if you don't know what all this means, as it won't work.
 \endparblock
 
+@PAR@ device-param bluez5.hw-offload-datapath # integer
+\parblock
+HFP/HSP hardware offload data path ID (default: 0).
+
+This feature configures the SCO hardware‑offload data path for HFP/HSP using the Bluetooth 
+SIG–specified procedure. It is intended for advanced setups and vendor integrations. Do not 
+edit this unless required; incorrect values can disable SCO offload.
+\endparblock
+
 @PAR@ monitor-prop  bluez5.a2dp.opus.pro.channels = 3   # integer
 PipeWire Opus Pro audio profile channel count.
 
diff --git a/spa/plugins/bluez5/backend-native.c b/spa/plugins/bluez5/backend-native.c
index 5c4a2b785..5dde972fc 100644
--- a/spa/plugins/bluez5/backend-native.c
+++ b/spa/plugins/bluez5/backend-native.c
@@ -112,6 +112,7 @@ struct impl {
 	int hfp_default_speaker_volume;
 
 	struct spa_source sco;
+	unsigned int hfphsp_sco_datapath;
 
 	const struct spa_bt_quirks *quirks;
 
@@ -297,6 +298,32 @@ static const struct media_codec *codec_list_best(struct impl *backend, struct sp
 	return NULL;
 }
 
+static int sco_offload_btcodec(struct impl *backend, int sock, bool msbc)
+{
+	int err;
+	char buffer[255];
+	struct bt_codecs *codecs;
+
+	spa_log_info(backend->log, "%s: sock(%d) msbc(%d)", __func__, sock, msbc);
+
+	memset(buffer, 0, sizeof(buffer));
+	codecs = (void *)buffer;
+	if (msbc)
+		codecs->codecs[0].id = 0x05;
+	else
+		codecs->codecs[0].id = 0x02;
+	codecs->num_codecs = 1;
+	codecs->codecs[0].data_path_id = backend->hfphsp_sco_datapath;
+	codecs->codecs[0].num_caps = 0x00;
+
+	err = setsockopt(sock, SOL_BLUETOOTH, BT_CODEC, codecs, sizeof(buffer));
+	if (err < 0)
+		spa_log_error(backend->log, "%s: ERROR: %s (%d)", __func__, strerror(errno), errno);
+	else
+		spa_log_info(backend->log, "%s: set offload codec succeeded", __func__);
+	return err;
+}
+
 static DBusHandlerResult profile_release(DBusConnection *conn, DBusMessage *m, void *userdata)
 {
 	if (!reply_with_error(conn, m, BLUEZ_PROFILE_INTERFACE ".Error.NotImplemented", "Method not implemented"))
@@ -2564,6 +2591,7 @@ static int sco_create_socket(struct impl *backend, struct spa_bt_adapter *adapte
 	struct sockaddr_sco addr;
 	socklen_t len;
 	bdaddr_t src;
+	uint32_t bt_features;
 
 	spa_autoclose int sock = socket(PF_BLUETOOTH, SOCK_SEQPACKET | SOCK_NONBLOCK, BTPROTO_SCO);
 	if (sock < 0) {
@@ -2595,6 +2623,11 @@ static int sco_create_socket(struct impl *backend, struct spa_bt_adapter *adapte
 		}
 	}
 
+	if (backend->quirks &&
+		(spa_bt_quirks_get_features(backend->quirks, NULL, NULL, &bt_features) == 0) &&
+		((bt_features & (SPA_BT_FEATURE_HW_OFFLOAD)) != 0))
+		sco_offload_btcodec(backend, sock, transparent);
+
 	return spa_steal_fd(sock);
 }
 
@@ -4101,6 +4134,18 @@ static void parse_hfp_default_volumes(struct impl *backend, const struct spa_dic
 		backend->hfp_default_speaker_volume = SPA_BT_VOLUME_HS_MAX;
 }
 
+static void parse_sco_datapath(struct impl *backend, const struct spa_dict *info)
+{
+	uint32_t tmp;
+	const char *str;
+
+	backend->hfphsp_sco_datapath = HFP_SCO_DEFAULT_DATAPATH;
+
+	if ((str = spa_dict_lookup(info, "bluez5.hw-offload-datapath")) != NULL &&
+	    (tmp = atoi(str)) > 0)
+		backend->hfphsp_sco_datapath = tmp;
+}
+
 static const struct spa_bt_backend_implementation backend_impl = {
 	SPA_VERSION_BT_BACKEND_IMPLEMENTATION,
 	.free = backend_native_free,
@@ -4163,6 +4208,7 @@ struct spa_bt_backend *backend_native_new(struct spa_bt_monitor *monitor,
 	parse_hfp_disable_nrec(backend, info);
 	parse_hfp_default_volumes(backend, info);
 	parse_hfp_pts(backend, info);
+	parse_sco_datapath(backend, info);
 
 #ifdef HAVE_BLUEZ_5_BACKEND_HSP_NATIVE
 	if (!dbus_connection_register_object_path(backend->conn,
diff --git a/spa/plugins/bluez5/defs.h b/spa/plugins/bluez5/defs.h
index 3efec465a..4bc4fa3bb 100644
--- a/spa/plugins/bluez5/defs.h
+++ b/spa/plugins/bluez5/defs.h
@@ -135,7 +135,8 @@ extern "C" {
 #define PROFILE_HFP_AG	"/Profile/HFPAG"
 #define PROFILE_HFP_HF	"/Profile/HFPHF"
 
-#define HSP_HS_DEFAULT_CHANNEL  3
+#define HSP_HS_DEFAULT_CHANNEL      3
+#define HFP_SCO_DEFAULT_DATAPATH    0
 
 #define SOURCE_ID_BLUETOOTH	0x1	/* Bluetooth SIG */
 #define SOURCE_ID_USB		0x2	/* USB Implementer's Forum */
@@ -809,6 +810,7 @@ enum spa_bt_feature {
 	SPA_BT_FEATURE_SBC_XQ		= (1 << 5),
 	SPA_BT_FEATURE_FASTSTREAM	= (1 << 6),
 	SPA_BT_FEATURE_A2DP_DUPLEX	= (1 << 7),
+	SPA_BT_FEATURE_HW_OFFLOAD	= (1 << 8),
 };
 
 struct spa_bt_quirks;
diff --git a/spa/plugins/bluez5/quirks.c b/spa/plugins/bluez5/quirks.c
index c4b293e68..2a1c5e860 100644
--- a/spa/plugins/bluez5/quirks.c
+++ b/spa/plugins/bluez5/quirks.c
@@ -52,6 +52,7 @@ struct spa_bt_quirks {
 	int force_sbc_xq;
 	int force_faststream;
 	int force_a2dp_duplex;
+	int force_hw_offload;
 
 	char *device_rules;
 	char *adapter_rules;
@@ -69,6 +70,7 @@ static enum spa_bt_feature parse_feature(const char *str)
 		{ "sbc-xq", SPA_BT_FEATURE_SBC_XQ },
 		{ "faststream", SPA_BT_FEATURE_FASTSTREAM },
 		{ "a2dp-duplex", SPA_BT_FEATURE_A2DP_DUPLEX },
+		{ "hw-offload", SPA_BT_FEATURE_HW_OFFLOAD },
 	};
 	SPA_FOR_EACH_ELEMENT_VAR(feature_keys, f) {
 		if (spa_streq(str, f->key))
@@ -228,6 +230,7 @@ struct spa_bt_quirks *spa_bt_quirks_create(const struct spa_dict *info, struct s
 	this->force_hw_volume = parse_force_flag(info, "bluez5.enable-hw-volume");
 	this->force_faststream = parse_force_flag(info, "bluez5.enable-faststream");
 	this->force_a2dp_duplex = parse_force_flag(info, "bluez5.enable-a2dp-duplex");
+	this->force_hw_offload = parse_force_flag(info, "bluez5.hw-offload-sco");
 
 	if ((str = spa_dict_lookup(info, "bluez5.hardware-database")) != NULL) {
 		spa_log_debug(this->log, "loading session manager provided data");
@@ -385,6 +388,9 @@ static int get_features(const struct spa_bt_quirks *this,
 	if (this->force_a2dp_duplex != -1)
 		SPA_FLAG_UPDATE(*features, SPA_BT_FEATURE_A2DP_DUPLEX, this->force_a2dp_duplex);
 
+	if (this->force_hw_offload != -1)
+		SPA_FLAG_UPDATE(*features, SPA_BT_FEATURE_HW_OFFLOAD, this->force_hw_offload);
+
 	return 0;
 }
 

From 2d6a7d2186e1ae383eb4a88eed33c55cb51fbe0e Mon Sep 17 00:00:00 2001
From: Mengshi Wu <mengshi.wu@oss.qualcomm.com>
Date: Sat, 17 Jan 2026 19:44:56 +0800
Subject: [PATCH 014/263] bluez5: fix format string in sco_offload_btcodec log
 message

---
 spa/plugins/bluez5/backend-native.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spa/plugins/bluez5/backend-native.c b/spa/plugins/bluez5/backend-native.c
index 5dde972fc..cba0fd4f3 100644
--- a/spa/plugins/bluez5/backend-native.c
+++ b/spa/plugins/bluez5/backend-native.c
@@ -304,7 +304,7 @@ static int sco_offload_btcodec(struct impl *backend, int sock, bool msbc)
 	char buffer[255];
 	struct bt_codecs *codecs;
 
-	spa_log_info(backend->log, "%s: sock(%d) msbc(%d)", __func__, sock, msbc);
+	spa_log_info(backend->log, "sock(%d) msbc(%d)", sock, msbc);
 
 	memset(buffer, 0, sizeof(buffer));
 	codecs = (void *)buffer;
@@ -318,9 +318,9 @@ static int sco_offload_btcodec(struct impl *backend, int sock, bool msbc)
 
 	err = setsockopt(sock, SOL_BLUETOOTH, BT_CODEC, codecs, sizeof(buffer));
 	if (err < 0)
-		spa_log_error(backend->log, "%s: ERROR: %s (%d)", __func__, strerror(errno), errno);
+		spa_log_error(backend->log, "ERROR: %s (%d)", strerror(errno), errno);
 	else
-		spa_log_info(backend->log, "%s: set offload codec succeeded", __func__);
+		spa_log_info(backend->log, "set offload codec succeeded");
 	return err;
 }
 

From 2b5d21da5b9c928f363ca2d6bb78c9278bd5bb0e Mon Sep 17 00:00:00 2001
From: Mengshi Wu <mengshi.wu@oss.qualcomm.com>
Date: Mon, 19 Jan 2026 15:04:46 +0800
Subject: [PATCH 015/263] bluez5: simplify SCO datapath parsing with spa_atou32

---
 spa/plugins/bluez5/backend-native.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/spa/plugins/bluez5/backend-native.c b/spa/plugins/bluez5/backend-native.c
index cba0fd4f3..312618081 100644
--- a/spa/plugins/bluez5/backend-native.c
+++ b/spa/plugins/bluez5/backend-native.c
@@ -4136,14 +4136,10 @@ static void parse_hfp_default_volumes(struct impl *backend, const struct spa_dic
 
 static void parse_sco_datapath(struct impl *backend, const struct spa_dict *info)
 {
-	uint32_t tmp;
-	const char *str;
-
 	backend->hfphsp_sco_datapath = HFP_SCO_DEFAULT_DATAPATH;
 
-	if ((str = spa_dict_lookup(info, "bluez5.hw-offload-datapath")) != NULL &&
-	    (tmp = atoi(str)) > 0)
-		backend->hfphsp_sco_datapath = tmp;
+	spa_atou32(spa_dict_lookup(info, "bluez5.hw-offload-datapath"),
+		&backend->hfphsp_sco_datapath, 10);
 }
 
 static const struct spa_bt_backend_implementation backend_impl = {

From 78f16bc04b9444a88e69ac52d2c918d9b2e08761 Mon Sep 17 00:00:00 2001
From: Mengshi Wu <mengshi.wu@oss.qualcomm.com>
Date: Mon, 19 Jan 2026 15:15:26 +0800
Subject: [PATCH 016/263] bluez5: Remove hw-offload feature flag check and
 associated quirks

The sco_offload_btcodec() function now returns void and only skips
offload setup when using the default datapath, simplifying the logic
and removing the need for explicit feature flag checks.
---
 spa/plugins/bluez5/backend-native.c | 11 +++++------
 spa/plugins/bluez5/defs.h           |  1 -
 spa/plugins/bluez5/quirks.c         |  6 ------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/spa/plugins/bluez5/backend-native.c b/spa/plugins/bluez5/backend-native.c
index 312618081..e5bd5eb1c 100644
--- a/spa/plugins/bluez5/backend-native.c
+++ b/spa/plugins/bluez5/backend-native.c
@@ -298,12 +298,15 @@ static const struct media_codec *codec_list_best(struct impl *backend, struct sp
 	return NULL;
 }
 
-static int sco_offload_btcodec(struct impl *backend, int sock, bool msbc)
+static void sco_offload_btcodec(struct impl *backend, int sock, bool msbc)
 {
 	int err;
 	char buffer[255];
 	struct bt_codecs *codecs;
 
+	if (backend->hfphsp_sco_datapath == HFP_SCO_DEFAULT_DATAPATH)
+		return;
+
 	spa_log_info(backend->log, "sock(%d) msbc(%d)", sock, msbc);
 
 	memset(buffer, 0, sizeof(buffer));
@@ -321,7 +324,6 @@ static int sco_offload_btcodec(struct impl *backend, int sock, bool msbc)
 		spa_log_error(backend->log, "ERROR: %s (%d)", strerror(errno), errno);
 	else
 		spa_log_info(backend->log, "set offload codec succeeded");
-	return err;
 }
 
 static DBusHandlerResult profile_release(DBusConnection *conn, DBusMessage *m, void *userdata)
@@ -2623,10 +2625,7 @@ static int sco_create_socket(struct impl *backend, struct spa_bt_adapter *adapte
 		}
 	}
 
-	if (backend->quirks &&
-		(spa_bt_quirks_get_features(backend->quirks, NULL, NULL, &bt_features) == 0) &&
-		((bt_features & (SPA_BT_FEATURE_HW_OFFLOAD)) != 0))
-		sco_offload_btcodec(backend, sock, transparent);
+	sco_offload_btcodec(backend, sock, transparent);
 
 	return spa_steal_fd(sock);
 }
diff --git a/spa/plugins/bluez5/defs.h b/spa/plugins/bluez5/defs.h
index 4bc4fa3bb..afc56c920 100644
--- a/spa/plugins/bluez5/defs.h
+++ b/spa/plugins/bluez5/defs.h
@@ -810,7 +810,6 @@ enum spa_bt_feature {
 	SPA_BT_FEATURE_SBC_XQ		= (1 << 5),
 	SPA_BT_FEATURE_FASTSTREAM	= (1 << 6),
 	SPA_BT_FEATURE_A2DP_DUPLEX	= (1 << 7),
-	SPA_BT_FEATURE_HW_OFFLOAD	= (1 << 8),
 };
 
 struct spa_bt_quirks;
diff --git a/spa/plugins/bluez5/quirks.c b/spa/plugins/bluez5/quirks.c
index 2a1c5e860..c4b293e68 100644
--- a/spa/plugins/bluez5/quirks.c
+++ b/spa/plugins/bluez5/quirks.c
@@ -52,7 +52,6 @@ struct spa_bt_quirks {
 	int force_sbc_xq;
 	int force_faststream;
 	int force_a2dp_duplex;
-	int force_hw_offload;
 
 	char *device_rules;
 	char *adapter_rules;
@@ -70,7 +69,6 @@ static enum spa_bt_feature parse_feature(const char *str)
 		{ "sbc-xq", SPA_BT_FEATURE_SBC_XQ },
 		{ "faststream", SPA_BT_FEATURE_FASTSTREAM },
 		{ "a2dp-duplex", SPA_BT_FEATURE_A2DP_DUPLEX },
-		{ "hw-offload", SPA_BT_FEATURE_HW_OFFLOAD },
 	};
 	SPA_FOR_EACH_ELEMENT_VAR(feature_keys, f) {
 		if (spa_streq(str, f->key))
@@ -230,7 +228,6 @@ struct spa_bt_quirks *spa_bt_quirks_create(const struct spa_dict *info, struct s
 	this->force_hw_volume = parse_force_flag(info, "bluez5.enable-hw-volume");
 	this->force_faststream = parse_force_flag(info, "bluez5.enable-faststream");
 	this->force_a2dp_duplex = parse_force_flag(info, "bluez5.enable-a2dp-duplex");
-	this->force_hw_offload = parse_force_flag(info, "bluez5.hw-offload-sco");
 
 	if ((str = spa_dict_lookup(info, "bluez5.hardware-database")) != NULL) {
 		spa_log_debug(this->log, "loading session manager provided data");
@@ -388,9 +385,6 @@ static int get_features(const struct spa_bt_quirks *this,
 	if (this->force_a2dp_duplex != -1)
 		SPA_FLAG_UPDATE(*features, SPA_BT_FEATURE_A2DP_DUPLEX, this->force_a2dp_duplex);
 
-	if (this->force_hw_offload != -1)
-		SPA_FLAG_UPDATE(*features, SPA_BT_FEATURE_HW_OFFLOAD, this->force_hw_offload);
-
 	return 0;
 }
 

From 254620676f929a38bade32fb4293760b9bffeb97 Mon Sep 17 00:00:00 2001
From: Mengshi Wu <mengshi.wu@oss.qualcomm.com>
Date: Mon, 19 Jan 2026 15:17:11 +0800
Subject: [PATCH 017/263] bluez5: Use named constants for Bluetooth codec IDs

Replace magic numbers (0x02, 0x05) with named constants BT_CODEC_CVSD
and BT_CODEC_MSBC for better code readability. Also remove redundant
zero initialization of num_caps field since the buffer is already
memset to zero.
---
 spa/plugins/bluez5/backend-native.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/spa/plugins/bluez5/backend-native.c b/spa/plugins/bluez5/backend-native.c
index e5bd5eb1c..a791dec4a 100644
--- a/spa/plugins/bluez5/backend-native.c
+++ b/spa/plugins/bluez5/backend-native.c
@@ -63,6 +63,9 @@ SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.native");
 
 #define RFCOMM_MESSAGE_MAX_LENGTH 256
 
+#define BT_CODEC_CVSD		0x02
+#define BT_CODEC_MSBC		0x05
+
 enum {
 	HFP_AG_INITIAL_CODEC_SETUP_NONE = 0,
 	HFP_AG_INITIAL_CODEC_SETUP_SEND,
@@ -312,12 +315,11 @@ static void sco_offload_btcodec(struct impl *backend, int sock, bool msbc)
 	memset(buffer, 0, sizeof(buffer));
 	codecs = (void *)buffer;
 	if (msbc)
-		codecs->codecs[0].id = 0x05;
+		codecs->codecs[0].id = BT_CODEC_MSBC;
 	else
-		codecs->codecs[0].id = 0x02;
+		codecs->codecs[0].id = BT_CODEC_CVSD;
 	codecs->num_codecs = 1;
 	codecs->codecs[0].data_path_id = backend->hfphsp_sco_datapath;
-	codecs->codecs[0].num_caps = 0x00;
 
 	err = setsockopt(sock, SOL_BLUETOOTH, BT_CODEC, codecs, sizeof(buffer));
 	if (err < 0)

From 332e35039d93780bfbc21fcb0f42cc29b7d42bbd Mon Sep 17 00:00:00 2001
From: Mengshi Wu <mengshi.wu@oss.qualcomm.com>
Date: Mon, 19 Jan 2026 15:46:55 +0800
Subject: [PATCH 018/263] doc: Fix bluez5.hw-offload-datapath property type in
 documentation

---
 doc/dox/config/pipewire-props.7.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/dox/config/pipewire-props.7.md b/doc/dox/config/pipewire-props.7.md
index d7e75e33d..52ac3e369 100644
--- a/doc/dox/config/pipewire-props.7.md
+++ b/doc/dox/config/pipewire-props.7.md
@@ -1171,7 +1171,7 @@ in a platform-specific way. See `tests/examples/bt-pinephone.lua` in WirePlumber
 Do not enable this setting if you don't know what all this means, as it won't work.
 \endparblock
 
-@PAR@ device-param bluez5.hw-offload-datapath # integer
+@PAR@ monitor-prop bluez5.hw-offload-datapath # integer
 \parblock
 HFP/HSP hardware offload data path ID (default: 0).
 

From bc53b6b34331435d395e17f405af588a85d2aed1 Mon Sep 17 00:00:00 2001
From: Mengshi Wu <mengshi.wu@oss.qualcomm.com>
Date: Tue, 20 Jan 2026 09:58:29 +0800
Subject: [PATCH 019/263] bluez5: Remove unused bt_features variable in
 sco_create_socket.

---
 spa/plugins/bluez5/backend-native.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spa/plugins/bluez5/backend-native.c b/spa/plugins/bluez5/backend-native.c
index a791dec4a..4d14183e7 100644
--- a/spa/plugins/bluez5/backend-native.c
+++ b/spa/plugins/bluez5/backend-native.c
@@ -2595,7 +2595,6 @@ static int sco_create_socket(struct impl *backend, struct spa_bt_adapter *adapte
 	struct sockaddr_sco addr;
 	socklen_t len;
 	bdaddr_t src;
-	uint32_t bt_features;
 
 	spa_autoclose int sock = socket(PF_BLUETOOTH, SOCK_SEQPACKET | SOCK_NONBLOCK, BTPROTO_SCO);
 	if (sock < 0) {

From 703380d62dc913e4b56ef2d060fbe6163403e1c1 Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arunr@valvesoftware.com>
Date: Mon, 26 Jan 2026 14:24:35 -0800
Subject: [PATCH 020/263] pulse-server: Fix querying after setting of mono
 mixdown

---
 src/modules/module-protocol-pulse/client.h          |  1 +
 src/modules/module-protocol-pulse/message-handler.c |  3 +++
 src/modules/module-protocol-pulse/pulse-server.c    | 11 ++++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/modules/module-protocol-pulse/client.h b/src/modules/module-protocol-pulse/client.h
index 2c413e51c..7998e5deb 100644
--- a/src/modules/module-protocol-pulse/client.h
+++ b/src/modules/module-protocol-pulse/client.h
@@ -62,6 +62,7 @@ struct client {
 
 	struct pw_manager_object *metadata_schema_sm_settings;
 	bool have_force_mono_audio;
+	bool default_force_mono_audio;
 	struct pw_manager_object *metadata_sm_settings;
 	bool force_mono_audio;
 
diff --git a/src/modules/module-protocol-pulse/message-handler.c b/src/modules/module-protocol-pulse/message-handler.c
index 48c7c7be3..c3868230d 100644
--- a/src/modules/module-protocol-pulse/message-handler.c
+++ b/src/modules/module-protocol-pulse/message-handler.c
@@ -110,12 +110,15 @@ static int core_object_force_mono_output(struct client *client, const char *para
 		if (spa_streq(params, "true")) {
 			ret = pw_manager_set_metadata(client->manager, client->metadata_sm_settings, PW_ID_CORE,
 					METADATA_FEATURES_AUDIO_MONO, "Spa:String:JSON", "true");
+			client->force_mono_audio = true;
 		} else if (spa_streq(params, "false")) {
 			ret = pw_manager_set_metadata(client->manager, client->metadata_sm_settings, PW_ID_CORE,
 					METADATA_FEATURES_AUDIO_MONO, "Spa:String:JSON", "false");
+			client->force_mono_audio = false;
 		} else if (spa_streq(params, "null")) {
 			ret = pw_manager_set_metadata(client->manager, client->metadata_sm_settings, PW_ID_CORE,
 					METADATA_FEATURES_AUDIO_MONO, NULL, NULL);
+			client->force_mono_audio = client->default_force_mono_audio;
 		} else {
 			fprintf(response, "Value must be true, false, or clear");
 			return -EINVAL;
diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c
index c22499718..830fbc371 100644
--- a/src/modules/module-protocol-pulse/pulse-server.c
+++ b/src/modules/module-protocol-pulse/pulse-server.c
@@ -973,8 +973,17 @@ static void manager_metadata(void *data, struct pw_manager_object *o,
 	if (subject == PW_ID_CORE && o == client->metadata_routes)
 		client_update_routes(client, key, value);
 	if (subject == PW_ID_CORE && o == client->metadata_schema_sm_settings) {
-		if (spa_streq(key, METADATA_FEATURES_AUDIO_MONO))
+		char default_[16];
+
+		if (spa_streq(key, METADATA_FEATURES_AUDIO_MONO)) {
 			client->have_force_mono_audio = true;
+
+			if (spa_json_str_object_find(value, strlen(value),
+						"default", default_, sizeof(default_)) < 0)
+				client->default_force_mono_audio = false;
+			else
+				client->default_force_mono_audio = spa_streq(default_, "true");
+		}
 	}
 	if (subject == PW_ID_CORE && o == client->metadata_sm_settings) {
 		if (spa_streq(key, METADATA_FEATURES_AUDIO_MONO))

From ed59342d28b0dd75a6f70b790cc1e9dd68678377 Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arunr@valvesoftware.com>
Date: Mon, 26 Jan 2026 14:44:30 -0800
Subject: [PATCH 021/263] pipewire-pulse: Expose bluetooth headset autoswitch
 config as a message

Makes it easier for libpulse-based clients to modify this setting if
they want.
---
 src/modules/module-protocol-pulse/client.h    |  3 +
 src/modules/module-protocol-pulse/defs.h      |  1 +
 .../module-protocol-pulse/message-handler.c   | 61 ++++++++++++++++---
 .../module-protocol-pulse/pulse-server.c      | 12 ++++
 4 files changed, 69 insertions(+), 8 deletions(-)

diff --git a/src/modules/module-protocol-pulse/client.h b/src/modules/module-protocol-pulse/client.h
index 7998e5deb..81d790b51 100644
--- a/src/modules/module-protocol-pulse/client.h
+++ b/src/modules/module-protocol-pulse/client.h
@@ -63,8 +63,11 @@ struct client {
 	struct pw_manager_object *metadata_schema_sm_settings;
 	bool have_force_mono_audio;
 	bool default_force_mono_audio;
+	bool have_bluetooth_headset_autoswitch;
+	bool default_bluetooth_headset_autoswitch;
 	struct pw_manager_object *metadata_sm_settings;
 	bool force_mono_audio;
+	bool bluetooth_headset_autoswitch;
 
 	uint32_t connect_tag;
 
diff --git a/src/modules/module-protocol-pulse/defs.h b/src/modules/module-protocol-pulse/defs.h
index 51e2453ff..c333f21f5 100644
--- a/src/modules/module-protocol-pulse/defs.h
+++ b/src/modules/module-protocol-pulse/defs.h
@@ -324,5 +324,6 @@ static inline uint32_t port_type_value(const char *port_type)
 #define METADATA_TARGET_NODE            "target.node"
 #define METADATA_TARGET_OBJECT          "target.object"
 #define METADATA_FEATURES_AUDIO_MONO    "node.features.audio.mono"
+#define METADATA_BLUETOOTH_HEADSET_AUTOSWITCH "bluetooth.autoswitch-to-headset-profile"
 
 #endif /* PULSE_SERVER_DEFS_H */
diff --git a/src/modules/module-protocol-pulse/message-handler.c b/src/modules/module-protocol-pulse/message-handler.c
index c3868230d..835a1d303 100644
--- a/src/modules/module-protocol-pulse/message-handler.c
+++ b/src/modules/module-protocol-pulse/message-handler.c
@@ -133,6 +133,48 @@ static int core_object_force_mono_output(struct client *client, const char *para
 	}
 }
 
+static int core_object_bluetooth_headset_autoswitch(struct client *client, const char *params, FILE *response)
+{
+	if (!client->have_bluetooth_headset_autoswitch) {
+		/* Not supported, return a null value to indicate that */
+		fprintf(response, "null");
+		return 0;
+	}
+
+	if (!params || params[0] == '\0') {
+		/* No parameter => query the current value */
+		fprintf(response, "%s", client->bluetooth_headset_autoswitch ? "true" : "false");
+		return 0;
+	} else {
+		/* The caller is trying to set a value or clear with a null */
+		int ret;
+
+		if (spa_streq(params, "true")) {
+			ret = pw_manager_set_metadata(client->manager, client->metadata_sm_settings, PW_ID_CORE,
+					METADATA_BLUETOOTH_HEADSET_AUTOSWITCH, "Spa:String:JSON", "true");
+			client->bluetooth_headset_autoswitch = true;
+		} else if (spa_streq(params, "false")) {
+			ret = pw_manager_set_metadata(client->manager, client->metadata_sm_settings, PW_ID_CORE,
+					METADATA_BLUETOOTH_HEADSET_AUTOSWITCH, "Spa:String:JSON", "false");
+			client->bluetooth_headset_autoswitch = false;
+		} else if (spa_streq(params, "null")) {
+			ret = pw_manager_set_metadata(client->manager, client->metadata_sm_settings, PW_ID_CORE,
+					METADATA_BLUETOOTH_HEADSET_AUTOSWITCH, NULL, NULL);
+			client->bluetooth_headset_autoswitch = client->default_bluetooth_headset_autoswitch;
+		} else {
+			fprintf(response, "Value must be true, false, or clear");
+			return -EINVAL;
+		}
+
+		if (ret < 0)
+			fprintf(response, "Could not set metadata: %s", spa_strerror(ret));
+		else
+			fprintf(response, "%s", params);
+
+		return ret;
+	}
+}
+
 static int core_object_message_handler(struct client *client, struct pw_manager_object *o, const char *message, const char *params, FILE *response)
 {
 	pw_log_debug(": core %p object message:'%s' params:'%s'", o, message, params);
@@ -141,14 +183,15 @@ static int core_object_message_handler(struct client *client, struct pw_manager_
 		fprintf(response,
 				"/core <command> [<params>]\n"
 				"available commands:\n"
-				"  help					this help\n"
-				"  list-handlers                  	show available object handlers\n"
-				"  pipewire-pulse:malloc-info     	show malloc_info\n"
-				"  pipewire-pulse:malloc-trim     	run malloc_trim\n"
-				"  pipewire-pulse:log-level       	update log level with <params>\n"
-				"  pipewire-pulse:list-modules    	list all module names\n"
-				"  pipewire-pulse:describe-module 	describe module info for <params>\n"
-				"  pipewire-pulse:force-mono-output	force mono mixdown on all hardware outputs"
+				"  help						this help\n"
+				"  list-handlers                  		show available object handlers\n"
+				"  pipewire-pulse:malloc-info     		show malloc_info\n"
+				"  pipewire-pulse:malloc-trim     		run malloc_trim\n"
+				"  pipewire-pulse:log-level       		update log level with <params>\n"
+				"  pipewire-pulse:list-modules    		list all module names\n"
+				"  pipewire-pulse:describe-module 		describe module info for <params>\n"
+				"  pipewire-pulse:force-mono-output		force mono mixdown on all hardware outputs\n"
+				"  pipewire-pulse:bluetooth-headset-autoswitch	use bluetooth headset mic if available"
 				);
 	} else if (spa_streq(message, "list-handlers")) {
 		bool first = true;
@@ -211,6 +254,8 @@ static int core_object_message_handler(struct client *client, struct pw_manager_
 		}
 	} else if (spa_streq(message, "pipewire-pulse:force-mono-output")) {
 		return core_object_force_mono_output(client, params, response);
+	} else if (spa_streq(message, "pipewire-pulse:bluetooth-headset-autoswitch")) {
+		return core_object_bluetooth_headset_autoswitch(client, params, response);
 	} else {
 		return -ENOSYS;
 	}
diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c
index 830fbc371..59610ef57 100644
--- a/src/modules/module-protocol-pulse/pulse-server.c
+++ b/src/modules/module-protocol-pulse/pulse-server.c
@@ -984,10 +984,22 @@ static void manager_metadata(void *data, struct pw_manager_object *o,
 			else
 				client->default_force_mono_audio = spa_streq(default_, "true");
 		}
+
+		if (spa_streq(key, METADATA_BLUETOOTH_HEADSET_AUTOSWITCH)) {
+			client->have_bluetooth_headset_autoswitch = true;
+
+			if (spa_json_str_object_find(value, strlen(value),
+						"default", default_, sizeof(default_)) < 0)
+				client->default_bluetooth_headset_autoswitch = false;
+			else
+				client->default_bluetooth_headset_autoswitch = spa_streq(default_, "true");
+		}
 	}
 	if (subject == PW_ID_CORE && o == client->metadata_sm_settings) {
 		if (spa_streq(key, METADATA_FEATURES_AUDIO_MONO))
 			client->force_mono_audio = spa_streq(value, "true");
+		if (spa_streq(key, METADATA_BLUETOOTH_HEADSET_AUTOSWITCH))
+			client->bluetooth_headset_autoswitch = spa_streq(value, "true");
 	}
 }
 

From 2aecb49f508abffbc67774c6d1bff3048f1687c2 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 27 Jan 2026 10:17:34 +0100
Subject: [PATCH 022/263] pulse-server: use null to clear the value

The message makes it seem that you can pass 'clear' to clear the setting
but in fact you should pass 'null'.
---
 src/modules/module-protocol-pulse/message-handler.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/module-protocol-pulse/message-handler.c b/src/modules/module-protocol-pulse/message-handler.c
index 835a1d303..b44d4f422 100644
--- a/src/modules/module-protocol-pulse/message-handler.c
+++ b/src/modules/module-protocol-pulse/message-handler.c
@@ -120,7 +120,7 @@ static int core_object_force_mono_output(struct client *client, const char *para
 					METADATA_FEATURES_AUDIO_MONO, NULL, NULL);
 			client->force_mono_audio = client->default_force_mono_audio;
 		} else {
-			fprintf(response, "Value must be true, false, or clear");
+			fprintf(response, "Value must be true, false, or null");
 			return -EINVAL;
 		}
 
@@ -162,7 +162,7 @@ static int core_object_bluetooth_headset_autoswitch(struct client *client, const
 					METADATA_BLUETOOTH_HEADSET_AUTOSWITCH, NULL, NULL);
 			client->bluetooth_headset_autoswitch = client->default_bluetooth_headset_autoswitch;
 		} else {
-			fprintf(response, "Value must be true, false, or clear");
+			fprintf(response, "Value must be true, false, or null");
 			return -EINVAL;
 		}
 

From 47dd57faa7253ba7161f4c75e6af472716566a2a Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 29 Jan 2026 16:50:52 +0100
Subject: [PATCH 023/263] filter-graph: handle other SOFA errors as errno

---
 spa/plugins/filter-graph/plugin_sofa.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spa/plugins/filter-graph/plugin_sofa.c b/spa/plugins/filter-graph/plugin_sofa.c
index 7ec73ea2b..14005dabd 100644
--- a/spa/plugins/filter-graph/plugin_sofa.c
+++ b/spa/plugins/filter-graph/plugin_sofa.c
@@ -168,11 +168,14 @@ static void * spatializer_instantiate(const struct spa_fga_plugin *plugin, const
 			reason = "Only sources with MC supported";
 			errno = ENOTSUP;
 			break;
-		default:
 		case MYSOFA_INTERNAL_ERROR:
 			errno = EIO;
 			reason = "Internal error";
 			break;
+		default:
+			errno = ret;
+			reason = strerror(errno);
+			break;
 		}
 		spa_log_error(impl->log, "Unable to load HRTF from %s: %s (%d)", filename, reason, ret);
 		goto error;

From 69d882230390df2512f85e77add7b98b068e01c8 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 29 Jan 2026 16:52:02 +0100
Subject: [PATCH 024/263] filter-chain: tweak spatializer gain

We're adding two signals together so half the gain to keep it at
the same volume.
---
 src/daemon/filter-chain/spatializer-7.1.conf | 26 ++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/daemon/filter-chain/spatializer-7.1.conf b/src/daemon/filter-chain/spatializer-7.1.conf
index 944ed6205..931e80975 100644
--- a/src/daemon/filter-chain/spatializer-7.1.conf
+++ b/src/daemon/filter-chain/spatializer-7.1.conf
@@ -118,8 +118,30 @@ context.modules = [
                         }
                     }
 
-                    { type = builtin label = mixer name = mixL }
-                    { type = builtin label = mixer name = mixR }
+                    { type = builtin label = mixer name = mixL
+                        control = {
+                            "Gain 1"    = 0.5
+                            "Gain 2"    = 0.5
+                            "Gain 3"    = 0.5
+                            "Gain 4"    = 0.5
+                            "Gain 5"    = 0.5
+                            "Gain 6"    = 0.5
+                            "Gain 7"    = 0.5
+                            "Gain 8"    = 0.5
+                        }
+		    }
+                    { type = builtin label = mixer name = mixR
+                        control = {
+                            "Gain 1"    = 0.5
+                            "Gain 2"    = 0.5
+                            "Gain 3"    = 0.5
+                            "Gain 4"    = 0.5
+                            "Gain 5"    = 0.5
+                            "Gain 6"    = 0.5
+                            "Gain 7"    = 0.5
+                            "Gain 8"    = 0.5
+                        }
+		    }
                 ]
                 links = [
                     # output

From 1a478c7147816db3672ede0ae6cb321512a219e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis@collabora.com>
Date: Fri, 30 Jan 2026 10:36:26 +0100
Subject: [PATCH 025/263] bluez5: Fix stack smashing crash in
 remote_endpoint_update_props()

Commit 2942bae0342259976dcb1344c6aa32fbc1e5534f introduced parsing of
"SupportedFeatures" which uses a third DBusMessageIter pointer.

*** stack smashing detected ***: terminated
==389050==
==389050== Process terminating with default action of signal 6 (SIGABRT)
==389050==    at 0x4F57B2C: __pthread_kill_implementation (pthread_kill.c:44)
==389050==    by 0x4F57B2C: __pthread_kill_internal (pthread_kill.c:78)
==389050==    by 0x4F57B2C: pthread_kill@@GLIBC_2.34 (pthread_kill.c:89)
==389050==    by 0x4EFE27D: raise (raise.c:26)
==389050==    by 0x4EE18FE: abort (abort.c:79)
==389050==    by 0x4EE27B5: __libc_message_impl.cold (libc_fatal.c:134)
==389050==    by 0x4FEFC48: __fortify_fail (fortify_fail.c:24)
==389050==    by 0x4FF0ED3: __stack_chk_fail (stack_chk_fail.c:24)
==389050==    by 0xBC1D1A1: remote_endpoint_update_props (bluez5-dbus.c:3137)
==389050==    by 0xB53609F: ???
==389050==    by 0x1DF: ???
==389050==    by 0x61C17BF: ??? (in /usr/lib/x86_64-linux-gnu/libdbus-1.so.3.32.4)
==389050==    by 0x1DF: ???
==389050==    by 0xC5ED113: ???
---
 spa/plugins/bluez5/bluez5-dbus.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spa/plugins/bluez5/bluez5-dbus.c b/spa/plugins/bluez5/bluez5-dbus.c
index 926b1b3c4..6b5fb173e 100644
--- a/spa/plugins/bluez5/bluez5-dbus.c
+++ b/spa/plugins/bluez5/bluez5-dbus.c
@@ -3102,11 +3102,13 @@ static int remote_endpoint_update_props(struct spa_bt_remote_endpoint *remote_en
 
 			spa_log_debug(monitor->log, "remote_endpoint %p: %s=%"PRIu64, remote_endpoint, key, remote_endpoint->hisyncid);
 		} else if (spa_streq(key, "SupportedFeatures")) {
+			DBusMessageIter iter;
+
 			if (!check_iter_signature(&it[1], "a{sv}"))
 				goto next;
 
-			dbus_message_iter_recurse(&it[1], &it[2]);
-			parse_supported_features(monitor, &it[2], &remote_endpoint->bap_features);
+			dbus_message_iter_recurse(&it[1], &iter);
+			parse_supported_features(monitor, &iter, &remote_endpoint->bap_features);
 		} else {
 unhandled:
 			spa_log_debug(monitor->log, "remote_endpoint %p: unhandled key %s", remote_endpoint, key);

From f34a87fe38347e4c85291ec4455c812e754a6de4 Mon Sep 17 00:00:00 2001
From: Alexander Sarmanow <asarmanow@gmail.com>
Date: Fri, 30 Jan 2026 16:39:25 +0100
Subject: [PATCH 026/263] bluez5: bap: add support for per adapter broadcast
 config

By setting the hci handle (e.g. hci0) of the desired adapter, the BIG
config will only applied on that adapter. In case no "adapter" entry in
the config is given, it will be applied on all adapters.

Signed-off-by: Alexander Sarmanow <a.sarmanow@televic.com>
---
 doc/dox/config/pipewire-props.7.md |  1 +
 spa/plugins/bluez5/bluez5-dbus.c   | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/doc/dox/config/pipewire-props.7.md b/doc/dox/config/pipewire-props.7.md
index 52ac3e369..9cf3943ed 100644
--- a/doc/dox/config/pipewire-props.7.md
+++ b/doc/dox/config/pipewire-props.7.md
@@ -1211,6 +1211,7 @@ PipeWire Opus Pro audio profile duplex max bitrate.
 PipeWire Opus Pro audio profile duplex frame duration (1/10 ms).
 
 @PAR@ monitor-prop  bluez5.bcast_source.config = []  # JSON
+For a per-adapter configuration of multiple BIGs use an "adapter" entry in the BIG with the HCI device name (e.g. hci0).
 \parblock
 Example:
 ```
diff --git a/spa/plugins/bluez5/bluez5-dbus.c b/spa/plugins/bluez5/bluez5-dbus.c
index 6b5fb173e..0bb5a1a88 100644
--- a/spa/plugins/bluez5/bluez5-dbus.c
+++ b/spa/plugins/bluez5/bluez5-dbus.c
@@ -194,6 +194,7 @@ struct spa_bt_bis {
 };
 
 #define BROADCAST_CODE_LEN	16
+#define HCI_DEV_NAME_LEN	8
 
 struct spa_bt_big {
 	struct spa_list link;
@@ -202,6 +203,7 @@ struct spa_bt_big {
 	struct spa_list bis_list;
 	int big_id;
 	int sync_factor;
+	char adapter[HCI_DEV_NAME_LEN];
 };
 
 /*
@@ -6244,8 +6246,20 @@ static void configure_bcast_source(struct spa_bt_monitor *monitor,
 {
 	struct spa_bt_big *big;
 	struct spa_bt_bis *bis;
+	char *pos;
 	/* Configure each BIS from a BIG */
 	spa_list_for_each(big, &monitor->bcast_source_config_list, link) {
+		/* Apply per adapter configuration if BIG has an adapter value stated,
+		 * otherwise apply the BIG config angnostically to each adapter
+		 */
+		if (strlen(big->adapter) > 0) {
+			pos = strstr(object_path, big->adapter);
+			if (pos == NULL)
+				continue;
+
+			spa_log_debug(monitor->log, "configuring BIG for adapter=%s", big->adapter);
+		}
+
 		spa_list_for_each(bis, &big->bis_list, link) {
 			configure_bis(monitor, codec, conn, object_path, interface_name,
 				big, bis, local_endpoint);
@@ -6989,6 +7003,7 @@ static void parse_broadcast_source_config(struct spa_bt_monitor *monitor, const
 	char bis_key[256];
 	char qos_key[256];
 	char bcode[BROADCAST_CODE_LEN + 3];
+	char adapter[HCI_DEV_NAME_LEN + 3];
 	int cursor;
 	int big_id = 0;
 	struct spa_json it[3], it_array[4];
@@ -7024,6 +7039,13 @@ static void parse_broadcast_source_config(struct spa_bt_monitor *monitor, const
 					goto parse_failed;
 				memcpy(big_entry->broadcast_code, bcode, strlen(bcode));
 				spa_log_debug(monitor->log, "big_entry->broadcast_code %s", big_entry->broadcast_code);
+			} else if (spa_streq(key, "adapter")) {
+				if (spa_json_get_string(&it[1], adapter, sizeof(adapter)) <= 0)
+					goto parse_failed;
+				if (strlen(adapter) > HCI_DEV_NAME_LEN)
+					goto parse_failed;
+				memcpy(big_entry->adapter, adapter, sizeof(adapter));
+				spa_log_debug(monitor->log, "big_entry->adapter %s", big_entry->adapter);
 			} else if (spa_streq(key, "encryption")) {
 				if (spa_json_get_bool(&it[0], &big_entry->encryption) <= 0)
 					goto parse_failed;

From a50e9a995e2dbddf31fd97e7ab100b4198f1f35c Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Sat, 31 Jan 2026 17:27:24 +0200
Subject: [PATCH 027/263] pulse-server: disconnect from server on EPROTO

If we get EPROTO, we likely have missed on some messages from the
server, and our state is now out of sync.

It's likely we can't recover (e.g. if error is due to fd limit hit), so
just drop the server connection in this case, similarly as if we got
EPIPE.
---
 src/modules/module-protocol-pulse/manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/module-protocol-pulse/manager.c b/src/modules/module-protocol-pulse/manager.c
index 5b597f4eb..72d51b020 100644
--- a/src/modules/module-protocol-pulse/manager.c
+++ b/src/modules/module-protocol-pulse/manager.c
@@ -718,7 +718,7 @@ static void on_core_error(void *data, uint32_t id, int seq, int res, const char
 {
 	struct manager *m = data;
 
-	if (id == PW_ID_CORE && res == -EPIPE) {
+	if (id == PW_ID_CORE && (res == -EPIPE || res == -EPROTO)) {
 		pw_log_debug("connection error: %d, %s", res, message);
 		manager_emit_disconnect(m);
 	}

From f60e03b4efd629591d8d73757b454f5301ed9374 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Sat, 31 Jan 2026 15:23:44 +0200
Subject: [PATCH 028/263] pulse-server: use timeout also for creating
 sample-play streams

Add 35 sec timeout for PLAY_SAMPLE streams to start streaming, similar
to what we do with normal streams, and fail playback if they don't
start.

This avoids pending sample playback using up resources indefinitely if
streams fail to start for some reason, e.g. session manager is not
linking them.
---
 src/modules/module-protocol-pulse/defs.h      |  2 ++
 .../module-protocol-pulse/sample-play.c       | 23 +++++++++++++++++++
 .../module-protocol-pulse/sample-play.h       |  3 +++
 src/modules/module-protocol-pulse/stream.c    |  2 +-
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/modules/module-protocol-pulse/defs.h b/src/modules/module-protocol-pulse/defs.h
index c333f21f5..f3e25f137 100644
--- a/src/modules/module-protocol-pulse/defs.h
+++ b/src/modules/module-protocol-pulse/defs.h
@@ -39,6 +39,8 @@
 #define MODULE_INDEX_MASK	0xfffffffu
 #define MODULE_FLAG		(1u << 29)
 
+#define STREAM_CREATE_TIMEOUT	(35 * SPA_NSEC_PER_SEC)
+
 #define DEFAULT_SINK		"@DEFAULT_SINK@"
 #define DEFAULT_SOURCE		"@DEFAULT_SOURCE@"
 #define DEFAULT_MONITOR		"@DEFAULT_MONITOR@"
diff --git a/src/modules/module-protocol-pulse/sample-play.c b/src/modules/module-protocol-pulse/sample-play.c
index db3893c0f..09b0e75cc 100644
--- a/src/modules/module-protocol-pulse/sample-play.c
+++ b/src/modules/module-protocol-pulse/sample-play.c
@@ -17,10 +17,12 @@
 #include <pipewire/properties.h>
 #include <pipewire/stream.h>
 
+#include "defs.h"
 #include "format.h"
 #include "log.h"
 #include "sample.h"
 #include "sample-play.h"
+#include "internal.h"
 
 static void sample_play_stream_state_changed(void *data, enum pw_stream_state old,
 					     enum pw_stream_state state, const char *error)
@@ -30,17 +32,32 @@ static void sample_play_stream_state_changed(void *data, enum pw_stream_state ol
 	switch (state) {
 	case PW_STREAM_STATE_UNCONNECTED:
 	case PW_STREAM_STATE_ERROR:
+		pw_timer_queue_cancel(&p->timer);
 		sample_play_emit_done(p, -EIO);
 		break;
 	case PW_STREAM_STATE_PAUSED:
 		p->id = pw_stream_get_node_id(p->stream);
 		sample_play_emit_ready(p, p->id);
 		break;
+	case PW_STREAM_STATE_STREAMING:
+		pw_timer_queue_cancel(&p->timer);
+		break;
 	default:
 		break;
 	}
 }
 
+static void sample_play_start_timeout(void *user_data)
+{
+	struct sample_play *p = user_data;
+
+	pw_log_info("timeout on sample %s", p->sample->name);
+
+	if (p->stream)
+		pw_stream_set_active(p->stream, false);
+	sample_play_emit_done(p, -ETIMEDOUT);
+}
+
 static void sample_play_stream_destroy(void *data)
 {
 	struct sample_play *p = data;
@@ -163,6 +180,10 @@ struct sample_play *sample_play_new(struct pw_core *core,
 	if (res < 0)
 		goto error_cleanup;
 
+	/* Time out if we don't get a link; same timeout as for normal streams */
+	pw_timer_queue_add(sample->impl->timer_queue, &p->timer, NULL,
+			STREAM_CREATE_TIMEOUT, sample_play_start_timeout, p);
+
 	return p;
 
 error_cleanup:
@@ -181,6 +202,8 @@ void sample_play_destroy(struct sample_play *p)
 
 	spa_hook_list_clean(&p->hooks);
 
+	pw_timer_queue_cancel(&p->timer);
+
 	free(p);
 }
 
diff --git a/src/modules/module-protocol-pulse/sample-play.h b/src/modules/module-protocol-pulse/sample-play.h
index a34ca9213..98af7ee29 100644
--- a/src/modules/module-protocol-pulse/sample-play.h
+++ b/src/modules/module-protocol-pulse/sample-play.h
@@ -11,6 +11,8 @@
 #include <spa/utils/list.h>
 #include <spa/utils/hook.h>
 
+#include <pipewire/pipewire.h>
+
 struct sample;
 struct pw_core;
 struct pw_loop;
@@ -41,6 +43,7 @@ struct sample_play {
 	uint32_t offset;
 	uint32_t stride;
 	struct spa_hook_list hooks;
+	struct pw_timer timer;
 	void *user_data;
 };
 
diff --git a/src/modules/module-protocol-pulse/stream.c b/src/modules/module-protocol-pulse/stream.c
index 496bcb52c..a6beb9fd7 100644
--- a/src/modules/module-protocol-pulse/stream.c
+++ b/src/modules/module-protocol-pulse/stream.c
@@ -107,7 +107,7 @@ struct stream *stream_new(struct client *client, enum stream_type type, uint32_t
 	/* Time out if we don't get a link and can't send a reply to create in 35s. Client will time out in
 	 * 30s and clean up its stream anyway. */
 	pw_timer_queue_add(stream->impl->timer_queue, &stream->timer, NULL,
-			35 * SPA_NSEC_PER_SEC, create_stream_timeout, stream);
+			STREAM_CREATE_TIMEOUT, create_stream_timeout, stream);
 
 	return stream;
 

From 3c80f0fb3efc46a9690bdf3f4750df04020311dc Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 2 Feb 2026 16:21:03 +0100
Subject: [PATCH 029/263] filter-graph: add gain option to sofa

So that we can apply the gain to the IR. This is more efficient than
doing a volume after the convolution.

See #5098
---
 spa/plugins/filter-graph/plugin_sofa.c       | 20 ++++++++-
 src/daemon/filter-chain/spatializer-7.1.conf | 43 ++++++++++++--------
 src/modules/module-filter-chain.c            |  8 ++--
 3 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/spa/plugins/filter-graph/plugin_sofa.c b/spa/plugins/filter-graph/plugin_sofa.c
index 14005dabd..2e3a1ea3b 100644
--- a/spa/plugins/filter-graph/plugin_sofa.c
+++ b/spa/plugins/filter-graph/plugin_sofa.c
@@ -32,6 +32,7 @@ struct spatializer_impl {
 	unsigned long rate;
 	float *port[7];
 	int n_samples, blocksize, tailsize;
+	float gain;
 	float *tmp[2];
 
 	struct MYSOFA_EASY *sofa;
@@ -71,6 +72,7 @@ static void * spatializer_instantiate(const struct spa_fga_plugin *plugin, const
 	impl->plugin = pl;
 	impl->dsp = pl->dsp;
 	impl->log = pl->log;
+	impl->gain = 1.0f;
 
 	while ((len = spa_json_object_next(&it[0], key, sizeof(key), &val)) > 0) {
 		if (spa_streq(key, "blocksize")) {
@@ -94,6 +96,13 @@ static void * spatializer_instantiate(const struct spa_fga_plugin *plugin, const
 				goto error;
 			}
 		}
+		else if (spa_streq(key, "gain")) {
+			if (spa_json_parse_float(val, len, &impl->gain) <= 0) {
+				spa_log_error(impl->log, "spatializer:gain requires a number");
+				errno = EINVAL;
+				goto error;
+			}
+		}
 	}
 	if (!filename[0]) {
 		spa_log_error(impl->log, "spatializer:filename was not given");
@@ -186,8 +195,8 @@ static void * spatializer_instantiate(const struct spa_fga_plugin *plugin, const
 	if (impl->tailsize <= 0)
 		impl->tailsize = SPA_CLAMP(4096, impl->blocksize, 32768);
 
-	spa_log_info(impl->log, "using n_samples:%u %d:%d blocksize sofa:%s", impl->n_samples,
-		impl->blocksize, impl->tailsize, filename);
+	spa_log_info(impl->log, "using n_samples:%u %d:%d blocksize gain:%f sofa:%s", impl->n_samples,
+		impl->blocksize, impl->tailsize, impl->gain, filename);
 
 	impl->tmp[0] = calloc(impl->plugin->quantum_limit, sizeof(float));
 	impl->tmp[1] = calloc(impl->plugin->quantum_limit, sizeof(float));
@@ -253,6 +262,13 @@ static void spatializer_reload(void * Instance)
 	if (impl->r_conv[2])
 		convolver_free(impl->r_conv[2]);
 
+	if (impl->gain != 1.0f) {
+		for (int i = 0; i < impl->n_samples; i++) {
+			left_ir[i] *= impl->gain;
+			right_ir[i] *= impl->gain;
+		}
+	}
+
 	impl->l_conv[2] = convolver_new(impl->dsp, impl->blocksize, impl->tailsize,
 			left_ir, impl->n_samples);
 	impl->r_conv[2] = convolver_new(impl->dsp, impl->blocksize, impl->tailsize,
diff --git a/src/daemon/filter-chain/spatializer-7.1.conf b/src/daemon/filter-chain/spatializer-7.1.conf
index 931e80975..bb19d5443 100644
--- a/src/daemon/filter-chain/spatializer-7.1.conf
+++ b/src/daemon/filter-chain/spatializer-7.1.conf
@@ -19,6 +19,8 @@ context.modules = [
                         name = spFL
                         config = {
                             filename = "~/.config/hrtf-sofa/hrtf b_nh724.sofa"
+                            # The gain depends on the .sofa file in use
+                            gain = 0.5
                         }
                         control = {
                             "Azimuth"    = 30.0
@@ -32,6 +34,7 @@ context.modules = [
                         name = spFR
                         config = {
                             filename = "~/.config/hrtf-sofa/hrtf b_nh724.sofa"
+                            gain = 0.5
                         }
                         control = {
                             "Azimuth"    = 330.0
@@ -45,6 +48,7 @@ context.modules = [
                         name = spFC
                         config = {
                             filename = "~/.config/hrtf-sofa/hrtf b_nh724.sofa"
+                            gain = 0.5
                         }
                         control = {
                             "Azimuth"    = 0.0
@@ -58,6 +62,7 @@ context.modules = [
                         name = spRL
                         config = {
                             filename = "~/.config/hrtf-sofa/hrtf b_nh724.sofa"
+                            gain = 0.5
                         }
                         control = {
                             "Azimuth"    = 150.0
@@ -71,6 +76,7 @@ context.modules = [
                         name = spRR
                         config = {
                             filename = "~/.config/hrtf-sofa/hrtf b_nh724.sofa"
+                            gain = 0.5
                         }
                         control = {
                             "Azimuth"    = 210.0
@@ -84,6 +90,7 @@ context.modules = [
                         name = spSL
                         config = {
                             filename = "~/.config/hrtf-sofa/hrtf b_nh724.sofa"
+                            gain = 0.5
                         }
                         control = {
                             "Azimuth"    = 90.0
@@ -97,6 +104,7 @@ context.modules = [
                         name = spSR
                         config = {
                             filename = "~/.config/hrtf-sofa/hrtf b_nh724.sofa"
+                            gain = 0.5
                         }
                         control = {
                             "Azimuth"    = 270.0
@@ -110,6 +118,7 @@ context.modules = [
                         name = spLFE
                         config = {
                             filename = "~/.config/hrtf-sofa/hrtf b_nh724.sofa"
+                            gain = 0.5
                         }
                         control = {
                             "Azimuth"    = 0.0
@@ -120,26 +129,28 @@ context.modules = [
 
                     { type = builtin label = mixer name = mixL
                         control = {
-                            "Gain 1"    = 0.5
-                            "Gain 2"    = 0.5
-                            "Gain 3"    = 0.5
-                            "Gain 4"    = 0.5
-                            "Gain 5"    = 0.5
-                            "Gain 6"    = 0.5
-                            "Gain 7"    = 0.5
-                            "Gain 8"    = 0.5
+                            # Set individual left mixer gain if needed
+                            #"Gain 1"    = 1.0
+                            #"Gain 2"    = 1.0
+                            #"Gain 3"    = 1.0
+                            #"Gain 4"    = 1.0
+                            #"Gain 5"    = 1.0
+                            #"Gain 6"    = 1.0
+                            #"Gain 7"    = 1.0
+                            #"Gain 8"    = 1.0
                         }
 		    }
                     { type = builtin label = mixer name = mixR
                         control = {
-                            "Gain 1"    = 0.5
-                            "Gain 2"    = 0.5
-                            "Gain 3"    = 0.5
-                            "Gain 4"    = 0.5
-                            "Gain 5"    = 0.5
-                            "Gain 6"    = 0.5
-                            "Gain 7"    = 0.5
-                            "Gain 8"    = 0.5
+                            # Set individual right mixer gain if needed
+                            #"Gain 1"    = 1.0
+                            #"Gain 2"    = 1.0
+                            #"Gain 3"    = 1.0
+                            #"Gain 4"    = 1.0
+                            #"Gain 5"    = 1.0
+                            #"Gain 6"    = 1.0
+                            #"Gain 7"    = 1.0
+                            #"Gain 8"    = 1.0
                         }
 		    }
                 ]
diff --git a/src/modules/module-filter-chain.c b/src/modules/module-filter-chain.c
index 6453baeee..64a92c5ac 100644
--- a/src/modules/module-filter-chain.c
+++ b/src/modules/module-filter-chain.c
@@ -717,6 +717,7 @@ extern struct spa_handle_factory spa_filter_graph_factory;
  *                 blocksize = ...
  *                 tailsize = ...
  *                 filename = ...
+ *                 gain = ...
  *             }
  *             control = {
  *                 "Azimuth" = ...
@@ -733,9 +734,10 @@ extern struct spa_handle_factory spa_filter_graph_factory;
  * - `blocksize` specifies the size of the blocks to use in the FFT. It is a value
  *               between 64 and 256. When not specified, this value is
  *               computed automatically from the number of samples in the file.
- * - `tailsize` specifies the size of the tail blocks to use in the FFT.
- * - `filename` The SOFA file to load. SOFA files usually end in the .sofa extension
- *              and contain the HRTF for the various spatial positions.
+ * - `tailsize`  specifies the size of the tail blocks to use in the FFT.
+ * - `filename`  The SOFA file to load. SOFA files usually end in the .sofa extension
+ *               and contain the HRTF for the various spatial positions.
+ * - `gain`      the overall gain to apply to the IR file.
  *
  * - `Azimuth`   controls the azimuth, this is the direction the sound is coming from
  *               in degrees between 0 and 360. 0 is straight ahead. 90 is left, 180

From cad1df748ee3b007f37ea08cbe340d59fc0079e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Mon, 2 Feb 2026 17:58:13 +0100
Subject: [PATCH 030/263] meson.build: define `SPA_AUDIO_MAX_CHANNELS` for C++
 as well

Previously the override was only present in `cc_flags`, meaning that
C++ source files, like `aec-webrtc.cpp`, would not have it.

Fixes: 6d74eee874ac ("spa: bump channels to 128 again")
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index e8b6f38dd..2e308cfa5 100644
--- a/meson.build
+++ b/meson.build
@@ -82,6 +82,7 @@ common_flags = [
   '-fvisibility=hidden',
   '-fno-strict-aliasing',
   '-fno-strict-overflow',
+  '-DSPA_AUDIO_MAX_CHANNELS=128u',
   '-Werror=suggest-attribute=format',
   '-Wsign-compare',
   '-Wpointer-arith',
@@ -115,7 +116,6 @@ cc_flags = common_flags + [
   '-Werror=old-style-definition',
   '-Werror=missing-parameter-type',
   '-Werror=strict-prototypes',
-  '-DSPA_AUDIO_MAX_CHANNELS=128u',
 ]
 add_project_arguments(cc.get_supported_arguments(cc_flags), language: 'c')
 add_project_arguments(cc_native.get_supported_arguments(cc_flags),

From a32e6e108c366580a08e00d616f60f299c1d9e8b Mon Sep 17 00:00:00 2001
From: Carlos Rafael Giani <crg7475@mailbox.org>
Date: Tue, 27 Jan 2026 21:24:43 +0100
Subject: [PATCH 031/263] Revert "module-rtp: Remove device_delay from
 timestamp math"

This reverts commit dcdc19238be3a2dc354f28adbfb0258042640704.

Reverting this because it caused big sync errors of ~62 ms in test setups.
Further discussions about this can be found here:

https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/2666

Followup commits modify the device delay application (by scaling it),
which is another reason why this needs to be reverted.
---
 src/modules/module-rtp/audio.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/modules/module-rtp/audio.c b/src/modules/module-rtp/audio.c
index 13873f29c..0f2936b24 100644
--- a/src/modules/module-rtp/audio.c
+++ b/src/modules/module-rtp/audio.c
@@ -98,12 +98,9 @@ static void rtp_audio_process_playback(void *data)
 		 * pace of the driver. */
 
 		if (impl->io_position) {
-			/* Use the clock position directly as the read index.
-			 * Do NOT add device_delay here - the sink's DLL handles
-			 * matching its hardware clock to the driver pace. Adding
-			 * device_delay would create a feedback loop since rate
-			 * adjustments affect both ringbuffer and device buffer. */
-			timestamp = impl->io_position->clock.position;
+			/* Shift clock position by stream delay to compensate
+			 * for processing and output delay. */
+			timestamp = impl->io_position->clock.position + device_delay;
 			spa_ringbuffer_read_update(&impl->ring, timestamp);
 		} else {
 			/* In the unlikely case that no spa_io_position pointer

From 95970e539efe9bd9476f91c00780d9586e431b40 Mon Sep 17 00:00:00 2001
From: Carlos Rafael Giani <crg7475@mailbox.org>
Date: Sat, 17 Jan 2026 10:55:21 +0100
Subject: [PATCH 032/263] module-rtp: Fix invalid ring buffer read attempts in
 direct timestamp mode

In corner cases where the read and write pointers are very close, it may
not be possible to read out all the wanted samples. This can for example
happen when there is a jump in the graph driver position. Currently, the
code reads the wanted number of samples out of the ring buffer regardless
of the write and read pointer positions. It does so even when the read
pointer is ahead of the write pointer (that is, an underrun occurs).

Fix this by checking the fill level and reading only the available amount
of samples if that amount is less than the wanted amount. The remaining
space in the target buffer is then filled with nullbytes.
---
 src/modules/module-rtp/audio.c | 78 +++++++++++++++++++++++-----------
 1 file changed, 54 insertions(+), 24 deletions(-)

diff --git a/src/modules/module-rtp/audio.c b/src/modules/module-rtp/audio.c
index 0f2936b24..8dd0cec37 100644
--- a/src/modules/module-rtp/audio.c
+++ b/src/modules/module-rtp/audio.c
@@ -61,6 +61,8 @@ static void rtp_audio_process_playback(void *data)
 	 * read or write index itself.) */
 
 	if (impl->direct_timestamp) {
+		uint32_t num_samples_to_read;
+
 		/* In direct timestamp mode, the focus lies on synchronized playback, not
 		 * on a constant latency. The ring buffer fill level is not of interest
 		 * here. The code in rtp_audio_receive() writes to the ring buffer at
@@ -89,19 +91,28 @@ static void rtp_audio_process_playback(void *data)
 		 * timestamp mode, since all of them shift the timestamp by the same
 		 * `sess.latency.msec` into the future.
 		 *
-		 * "Fill level" makes no sense in this mode, since a constant latency
-		 * is not important in this mode, so no DLL is needed. Also, matching
-		 * the pace of the synchronized clock is done by having the graph
-		 * driver be synchronized to that clock, which will in turn cause
-		 * any output sinks to adjust their DLLs (or similar control loop
-		 * mechanisms) to match the pace of their data consumption with the
-		 * pace of the driver. */
+		 * Since in this mode, a constant latency is not important, tracking
+		 * the fill level to keep it steady makes no sense. Consequently,
+		 * no DLL is needed. Also, matching the pace of the synchronized clock
+		 * is done by having the graph driver be synchronized to that clock,
+		 * which will in turn cause any output sinks to adjust their DLLs
+		 * (or similar control loop mechanisms) to match the pace of their
+		 * data consumption with the pace of the driver.
+		 *
+		 * The fill level is still important though to correctly handle corner
+		 * cases where the ring buffer is (almost) empty. If fewer samples
+		 * are available than what the read operation wants, the deficit
+		 * has to be compensated with nullbytes. To that end, the "avail"
+		 * quantity tracks how many samples are actually available. */
 
 		if (impl->io_position) {
+			uint32_t dummy_read_index;
+
 			/* Shift clock position by stream delay to compensate
 			 * for processing and output delay. */
 			timestamp = impl->io_position->clock.position + device_delay;
 			spa_ringbuffer_read_update(&impl->ring, timestamp);
+			avail = spa_ringbuffer_get_read_index(&impl->ring, &dummy_read_index);
 		} else {
 			/* In the unlikely case that no spa_io_position pointer
 			 * was passed yet by PipeWire to this node, resort to a
@@ -109,26 +120,45 @@ static void rtp_audio_process_playback(void *data)
 			 * This most likely is not in sync with other nodes,
 			 * but _something_ is needed as read index until the
 			 * spa_io_position is available. */
-			spa_ringbuffer_get_read_index(&impl->ring, &timestamp);
+			avail = spa_ringbuffer_get_read_index(&impl->ring, &timestamp);
 		}
 
-		spa_ringbuffer_read_data(&impl->ring,
-				impl->buffer,
-				impl->actual_max_buffer_size,
-				((uint64_t)timestamp * stride) % impl->actual_max_buffer_size,
-				d[0].data, wanted * stride);
+		/* If avail is 0, it means that the ring buffer is empty. <0 means
+		 * that there is an underrun, typically because the PTP time now
+		 * is ahead of the RTP data (this can happen when the PTP master
+		 * changes for example). And in cases where only a little bit of
+		 * data is left, it is important to not try to use more than what
+		 * is actually available. */
+		num_samples_to_read = (avail > 0) ? SPA_MIN((uint32_t)avail, wanted) : 0;
 
-		/* Clear the bytes that were just retrieved. Since the fill level
-		 * is not tracked in this buffer mode, it is possible that as soon
-		 * as actual playback ends, the RTP source node re-reads old data.
-		 * Make sure it reads silence when no actual new data is present
-		 * and the RTP source node still runs. Do this by filling the
-		 * region of the retrieved data with null bytes. */
-		ringbuffer_clear(&impl->ring,
-				impl->buffer,
-				impl->actual_max_buffer_size,
-				((uint64_t)timestamp * stride) % impl->actual_max_buffer_size,
-				wanted * stride);
+		if (num_samples_to_read > 0) {
+			spa_ringbuffer_read_data(&impl->ring,
+					impl->buffer,
+					impl->actual_max_buffer_size,
+					((uint64_t)timestamp * stride) % impl->actual_max_buffer_size,
+					d[0].data, num_samples_to_read * stride);
+
+			/* Clear the bytes that were just retrieved. Since the fill level
+			 * is not tracked in this buffer mode, it is possible that as soon
+			 * as actual playback ends, the RTP source node re-reads old data.
+			 * Make sure it reads silence when no actual new data is present
+			 * and the RTP source node still runs. Do this by filling the
+			 * region of the retrieved data with null bytes. */
+			ringbuffer_clear(&impl->ring,
+					impl->buffer,
+					impl->actual_max_buffer_size,
+					((uint64_t)timestamp * stride) % impl->actual_max_buffer_size,
+					num_samples_to_read * stride);
+		}
+
+		if (num_samples_to_read < wanted) {
+			/* If fewer samples were available than what was wanted,
+			 * fill the remaining space in the destination memory
+			 * with nullsamples. */
+			void *bytes_to_clear = SPA_PTROFF(d[0].data, num_samples_to_read * stride, void);
+			size_t num_bytes_to_clear = (wanted - num_samples_to_read) * stride;
+			spa_memzero(bytes_to_clear, num_bytes_to_clear);
+		}
 
 		if (!impl->io_position) {
 			/* In the unlikely case that no spa_io_position pointer

From 413f5762c46ff5bbc6084ea4a9c94e9895d41c83 Mon Sep 17 00:00:00 2001
From: Carlos Rafael Giani <crg7475@mailbox.org>
Date: Fri, 16 Jan 2026 23:40:36 +0100
Subject: [PATCH 033/263] module-rtp: Clear ringbuffer in constant delay mode

Clearing the ring buffer is important not only in the direct timestamp
mode, but also in the constant delay mode, since missed packets can lead
to gaps in the ring buffer. These gaps may have stale data inside if the
ringbuffer is not cleared after reading from it.
---
 src/modules/module-rtp/audio.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/modules/module-rtp/audio.c b/src/modules/module-rtp/audio.c
index 8dd0cec37..4b11edb69 100644
--- a/src/modules/module-rtp/audio.c
+++ b/src/modules/module-rtp/audio.c
@@ -249,6 +249,25 @@ static void rtp_audio_process_playback(void *data)
 					((uint64_t)timestamp * stride) % impl->actual_max_buffer_size,
 					d[0].data, wanted * stride);
 
+			/* Clear the bytes that were just retrieved. Unlike in the
+			 * direct timestamp mode, here, bytes are always read out
+			 * of the ring buffer in sequence - the read pointer does
+			 * not "jump around" (which can happen in direct timestamp
+			 * mode if the last iteration has been a while ago and the
+			 * driver clock time advanced significantly, or if the driver
+			 * time experienced a discontinuity). However, should there
+			 * be packet loss, it could lead to segments in the ring
+			 * buffer that should have been written to but weren't written
+			 * to. These segments would then contain old stale data. By
+			 * clearing data out of the ring buffer after reading it, it
+			 * is ensured that no stale data can exist - in the packet loss
+			 * case, the outcome would be a gap made of nullsamples instead. */
+			ringbuffer_clear(&impl->ring,
+					impl->buffer,
+					impl->actual_max_buffer_size,
+					((uint64_t)timestamp * stride) % impl->actual_max_buffer_size,
+					wanted * stride);
+
 			timestamp += wanted;
 			spa_ringbuffer_read_update(&impl->ring, timestamp);
 		}

From 543000151f67a0a40032fd45c2b4540e3942c324 Mon Sep 17 00:00:00 2001
From: Carlos Rafael Giani <crg7475@mailbox.org>
Date: Mon, 19 Jan 2026 12:25:51 +0100
Subject: [PATCH 034/263] module-rtp: Handle unsigned 32-bit integer overflow
 in constant delay mode

---
 src/modules/module-rtp/audio.c | 38 ++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/modules/module-rtp/audio.c b/src/modules/module-rtp/audio.c
index 4b11edb69..b1cae86c4 100644
--- a/src/modules/module-rtp/audio.c
+++ b/src/modules/module-rtp/audio.c
@@ -380,17 +380,43 @@ static int rtp_audio_receive(struct impl *impl, uint8_t *buffer, ssize_t len,
 		 * and not _appended_. In this example, `expected_write` would
 		 * be 100 (since `expected_write` is the current write index),
 		 * `write` would be 90, `samples` would be 10. In this case,
-		 * the inequality below does not hold, so data is being
-		 * _inserted_. By contrast, during normal operation, `write`
-		 * and `expected_write` are equal, so the inequality below
-		 * _does_ hold, meaning that data is being appended.
+		 * the (expected_write < (write + samples)) inequality does
+		 * not hold, so data is being _inserted_. By contrast, during
+		 * normal operation, `write` and `expected_write` are equal,
+		 * so the aforementioned inequality _does_ hold, meaning that
+		 * data is being appended.
+		 *
+		 * The code below handles this, and also handles a 32-bit
+		 * integer overflow corner case where the comparison has
+		 * to be done differently to account for the wrap-around.
 		 *
 		 * (Note that this write index update is only important if
 		 * the constant delay mode is active, or if no spa_io_position
 		 * was not provided yet. See the rtp_audio_process_playback()
 		 * code for more about this.) */
-		if (expected_write < (write + samples)) {
-			write += samples;
+
+		/* Compute new_write, handling potential 32-bit overflow.
+		 * In unsigned arithmetic, if write + samples exceeds UINT32_MAX,
+		 * it wraps around to a smaller value. We detect this by checking
+		 * if new_write < write (which can only happen on overflow). */
+		const uint32_t new_write = write + samples;
+		const bool wrapped_around = new_write < write;
+
+		/* Determine if new_write is ahead of expected_write.
+		 * We're appending (ahead) if:
+		 *
+		 * 1. Normal case: new_write > expected_write (forward progress)
+		 * 2. Wrap-around case: new_write wrapped around (wrapped_around == true),
+		 *    meaning we've cycled through the 32-bit index space and are
+		 *    continuing from the beginning. In this case, we're always ahead.
+		 *
+		 * We're NOT appending (inserting/behind) if:
+		 * - new_write <= expected_write AND no wrap-around occurred
+		 *   (we're filling a gap or writing behind the current position) */
+		const bool is_appending = wrapped_around || (new_write > expected_write);
+
+		if (is_appending) {
+			write = new_write;
 			spa_ringbuffer_write_update(&impl->ring, write);
 		}
 	}

From 9f0dc9c1af1aa2cccae153678b81b7b42633273c Mon Sep 17 00:00:00 2001
From: Carlos Rafael Giani <crg7475@mailbox.org>
Date: Mon, 19 Jan 2026 21:15:22 +0100
Subject: [PATCH 035/263] module-rtp: Update ringbuffer indices upon resync
 with proper API calls

---
 src/modules/module-rtp/audio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/module-rtp/audio.c b/src/modules/module-rtp/audio.c
index b1cae86c4..5730e3e41 100644
--- a/src/modules/module-rtp/audio.c
+++ b/src/modules/module-rtp/audio.c
@@ -641,7 +641,8 @@ static void rtp_audio_process_capture(void *data)
 	if (!impl->have_sync) {
 		pw_log_info("(re)sync to timestamp:%u seq:%u ts_offset:%u SSRC:%u",
 				actual_timestamp, impl->seq, impl->ts_offset, impl->ssrc);
-		impl->ring.readindex = impl->ring.writeindex = actual_timestamp;
+		spa_ringbuffer_read_update(&impl->ring, actual_timestamp);
+		spa_ringbuffer_write_update(&impl->ring, actual_timestamp);
 		memset(impl->buffer, 0, BUFFER_SIZE);
 		impl->have_sync = true;
 		expected_timestamp = actual_timestamp;

From 5d7f21f1304cb7b8ddb2a8364aec66f22e7a2894 Mon Sep 17 00:00:00 2001
From: Carlos Rafael Giani <crg7475@mailbox.org>
Date: Mon, 19 Jan 2026 21:03:48 +0100
Subject: [PATCH 036/263] module-rtp: Improve rtp_audio_flush_packets() logging

---
 src/modules/module-rtp/audio.c | 49 ++++++++++++++++++++++++++++------
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/modules/module-rtp/audio.c b/src/modules/module-rtp/audio.c
index 5730e3e41..045604b72 100644
--- a/src/modules/module-rtp/audio.c
+++ b/src/modules/module-rtp/audio.c
@@ -62,6 +62,7 @@ static void rtp_audio_process_playback(void *data)
 
 	if (impl->direct_timestamp) {
 		uint32_t num_samples_to_read;
+		uint32_t read_index;
 
 		/* In direct timestamp mode, the focus lies on synchronized playback, not
 		 * on a constant latency. The ring buffer fill level is not of interest
@@ -106,13 +107,11 @@ static void rtp_audio_process_playback(void *data)
 		 * quantity tracks how many samples are actually available. */
 
 		if (impl->io_position) {
-			uint32_t dummy_read_index;
-
 			/* Shift clock position by stream delay to compensate
 			 * for processing and output delay. */
 			timestamp = impl->io_position->clock.position + device_delay;
 			spa_ringbuffer_read_update(&impl->ring, timestamp);
-			avail = spa_ringbuffer_get_read_index(&impl->ring, &dummy_read_index);
+			avail = spa_ringbuffer_get_read_index(&impl->ring, &read_index);
 		} else {
 			/* In the unlikely case that no spa_io_position pointer
 			 * was passed yet by PipeWire to this node, resort to a
@@ -121,6 +120,7 @@ static void rtp_audio_process_playback(void *data)
 			 * but _something_ is needed as read index until the
 			 * spa_io_position is available. */
 			avail = spa_ringbuffer_get_read_index(&impl->ring, &timestamp);
+			read_index = timestamp;
 		}
 
 		/* If avail is 0, it means that the ring buffer is empty. <0 means
@@ -128,8 +128,34 @@ static void rtp_audio_process_playback(void *data)
 		 * is ahead of the RTP data (this can happen when the PTP master
 		 * changes for example). And in cases where only a little bit of
 		 * data is left, it is important to not try to use more than what
-		 * is actually available. */
-		num_samples_to_read = (avail > 0) ? SPA_MIN((uint32_t)avail, wanted) : 0;
+		 * is actually available.
+		 * Overruns would happen if the write pointer is further ahead than
+		 * what the ringbuffer size actually allows. This too can happen
+		 * if the PTP time jumps. No actual buffer overflow would happen
+		 * then, since the write operations always apply modulo to the
+		 * timestamps to wrap around the ringbuffer borders.
+		 */
+		bool has_underrun = (avail < 0);
+		bool has_overrun = !has_underrun && ((uint32_t)avail) > impl->actual_max_buffer_size;
+		num_samples_to_read = has_underrun ? 0 : SPA_MIN((uint32_t)avail, wanted);
+
+		/* Do some additional logging in the under/overrun cases. */
+		if (SPA_UNLIKELY(pw_log_topic_enabled(SPA_LOG_LEVEL_TRACE, PW_LOG_TOPIC_DEFAULT)))
+		{
+			uint32_t write_index;
+			int32_t filled = spa_ringbuffer_get_write_index(&impl->ring, &write_index);
+
+			if (has_underrun) {
+				pw_log_trace("Direct timestamp mode: Read index underrun: write_index: %"
+					     PRIu32 ", read_index: %" PRIu32 ", wanted: %u - filled: %" PRIi32,
+					     write_index, read_index, wanted, filled);
+			} else if (has_overrun) {
+				pw_log_trace("Direct timestamp mode: Read index overrun: write_index: %"
+					     PRIu32 ", read_index: %" PRIu32 ", wanted: %u - filled: %" PRIi32
+					     ", buffer size: %u", write_index, read_index, wanted, filled,
+					     impl->actual_max_buffer_size);
+			}
+		}
 
 		if (num_samples_to_read > 0) {
 			spa_ringbuffer_read_data(&impl->ring,
@@ -498,20 +524,27 @@ static void rtp_audio_flush_packets(struct impl *impl, uint32_t num_packets, uin
 	iov[0].iov_len = sizeof(header);
 
 	while (num_packets > 0) {
+		uint32_t rtp_timestamp;
+
 		if (impl->marker_on_first && impl->first)
 			header.m = 1;
 		else
 			header.m = 0;
+
+		rtp_timestamp = impl->ts_offset + (set_timestamp ? set_timestamp : timestamp);
+
 		header.sequence_number = htons(impl->seq);
-		header.timestamp = htonl(impl->ts_offset + (set_timestamp ? set_timestamp : timestamp));
+		header.timestamp = htonl(rtp_timestamp);
 
 		set_iovec(&impl->ring,
 			impl->buffer, impl->actual_max_buffer_size,
 			((uint64_t)timestamp * stride) % impl->actual_max_buffer_size,
 			&iov[1], tosend * stride);
 
-		pw_log_trace("sending %d packet:%d ts_offset:%d timestamp:%d",
-				tosend, num_packets, impl->ts_offset, timestamp);
+		pw_log_trace("sending %d packet:%d ts_offset:%d timestamp:%u (%f s)",
+				tosend, num_packets, impl->ts_offset, timestamp,
+				(double)timestamp * impl->io_position->clock.rate.num /
+				impl->io_position->clock.rate.denom);
 
 		rtp_stream_emit_send_packet(impl, iov, 3);
 

From a16485f8aa21dfb8e038b1c7e6a31adb25be7f85 Mon Sep 17 00:00:00 2001
From: Carlos Rafael Giani <crg7475@mailbox.org>
Date: Tue, 20 Jan 2026 12:50:35 +0100
Subject: [PATCH 037/263] module-rtp: Extract common RTP code into static
 library for better reuse

---
 src/modules/meson.build | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/modules/meson.build b/src/modules/meson.build
index 0605900e5..7ad232ac8 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -573,6 +573,22 @@ if build_module_zeroconf_discover
 endif
 summary({'zeroconf-discover': build_module_zeroconf_discover}, bool_yn: true, section: 'Optional Modules')
 
+# Several modules (rtp-sink, rtp-source, raop-sink) use the same code
+# for actual RTP transport. To not have to recompile the same code
+# multiple times, and to make the build script a little more robust
+# (by avoiding build script code duplication), create a static library
+# that contains that common code.
+pipewire_module_rtp_common_lib = static_library('pipewire-module-rtp-common-lib',
+  [ 'module-rtp/stream.c' ],
+  include_directories : [configinc],
+  install : false,
+  dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep, opus_dep],
+)
+pipewire_module_rtp_common_dep = declare_dependency(
+  link_with: pipewire_module_rtp_common_lib,
+  dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep, opus_dep],
+)
+
 build_module_raop_discover = avahi_dep.found()
 if build_module_raop_discover
   pipewire_module_raop_discover = shared_library('pipewire-module-raop-discover',
@@ -605,13 +621,12 @@ build_module_raop = openssl_lib.found()
 if build_module_raop
   pipewire_module_raop_sink = shared_library('pipewire-module-raop-sink',
     [ 'module-raop-sink.c',
-      'module-raop/rtsp-client.c',
-      'module-rtp/stream.c' ],
+      'module-raop/rtsp-client.c' ],
     include_directories : [configinc],
     install : true,
     install_dir : modules_install_dir,
     install_rpath: modules_install_dir,
-    dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep, opus_dep, openssl_lib],
+    dependencies : [pipewire_module_rtp_common_dep, openssl_lib],
   )
 endif
 summary({'raop-sink (requires OpenSSL)': build_module_raop}, bool_yn: true, section: 'Optional Modules')
@@ -620,36 +635,33 @@ roc_dep = dependency('roc', version: '>= 0.4.0', required: get_option('roc'))
 summary({'ROC': roc_dep.found()}, bool_yn: true, section: 'Streaming between daemons')
 
 pipewire_module_rtp_source = shared_library('pipewire-module-rtp-source',
-  [ 'module-rtp-source.c',
-    'module-rtp/stream.c' ],
+  [ 'module-rtp-source.c' ],
   include_directories : [configinc],
   install : true,
   install_dir : modules_install_dir,
   install_rpath: modules_install_dir,
-  dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep, opus_dep],
+  dependencies : [pipewire_module_rtp_common_dep],
 )
 
 pipewire_module_rtp_sink = shared_library('pipewire-module-rtp-sink',
-  [ 'module-rtp-sink.c',
-    'module-rtp/stream.c' ],
+  [ 'module-rtp-sink.c' ],
   include_directories : [configinc],
   install : true,
   install_dir : modules_install_dir,
   install_rpath: modules_install_dir,
-  dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep, opus_dep],
+  dependencies : [pipewire_module_rtp_common_dep],
 )
 
 build_module_rtp_session = avahi_dep.found()
 if build_module_rtp_session
   pipewire_module_rtp_session = shared_library('pipewire-module-rtp-session',
-    [ 'module-rtp/stream.c',
-      'module-zeroconf-discover/avahi-poll.c',
-     'module-rtp-session.c' ],
+    [ 'module-zeroconf-discover/avahi-poll.c',
+      'module-rtp-session.c' ],
     include_directories : [configinc],
     install : true,
     install_dir : modules_install_dir,
     install_rpath: modules_install_dir,
-    dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep, avahi_dep, opus_dep],
+    dependencies : [pipewire_module_rtp_common_dep, avahi_dep],
   )
 endif
 

From e874f705a9264d7b94e011a3cc5e7f080a56ced1 Mon Sep 17 00:00:00 2001
From: Stanislav Ruzani <stanislav.ruzani@streamunlimited.com>
Date: Sat, 27 Dec 2025 18:37:33 +0100
Subject: [PATCH 038/263] module-rtp: clear ringbuffer when stream stops to
 prevent old packets

Clear the ringbuffer in stream_stop() when processing stops to prevent old invalid packets
from being sent when processing resumes via rtp_audio_flush_packets().

This ensures a clean state when the stream restarts.
---
 src/modules/module-rtp/stream.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/modules/module-rtp/stream.c b/src/modules/module-rtp/stream.c
index e19d88a1f..d69b16524 100644
--- a/src/modules/module-rtp/stream.c
+++ b/src/modules/module-rtp/stream.c
@@ -454,6 +454,10 @@ static int stream_stop(struct impl *impl)
 	 * meaning that the timer was no longer running, and the connection
 	 * could be closed. */
 	if (!timer_running) {
+		/* Clear the ringbuffer to prevent old invalid packets from being
+		 * sent when processing resumes via rtp_audio_flush_packets() */
+		if (impl->reset_ringbuffer)
+			impl->reset_ringbuffer(impl);
 		set_internal_stream_state(impl, RTP_STREAM_INTERNAL_STATE_STOPPED);
 		pw_log_info("stream stopped");
 	}

From 6192c110385457df5c1655c313bd701595aac56d Mon Sep 17 00:00:00 2001
From: Carlos Rafael Giani <crg7475@mailbox.org>
Date: Mon, 19 Jan 2026 23:24:04 +0100
Subject: [PATCH 039/263] module-rtp: Convert clock pos to RTP time in RTP
 source and factor in ASRC

This can easily be overlooked if the RTP rate equals the clock rate, which
is fairly common (for example, RTP rate and clock rate both being 48 kHz).

And, if an ASRC is active, and converting the output of the RTP source
node, the resampler's delay need to be taken into the account as well.
---
 src/modules/module-rtp/audio.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/modules/module-rtp/audio.c b/src/modules/module-rtp/audio.c
index 045604b72..8c5517e46 100644
--- a/src/modules/module-rtp/audio.c
+++ b/src/modules/module-rtp/audio.c
@@ -22,6 +22,15 @@ static void ringbuffer_clear(struct spa_ringbuffer *rbuf SPA_UNUSED,
 	memset(iov[1].iov_base, 0, iov[1].iov_len);
 }
 
+static inline uint64_t scale_u64(uint64_t val, uint32_t num, uint32_t denom)
+{
+#if 0
+	return ((__uint128_t)val * num) / denom;
+#else
+	return (uint64_t)((double)val / denom * num);
+#endif
+}
+
 static void rtp_audio_process_playback(void *data)
 {
 	struct impl *impl = data;
@@ -107,9 +116,15 @@ static void rtp_audio_process_playback(void *data)
 		 * quantity tracks how many samples are actually available. */
 
 		if (impl->io_position) {
-			/* Shift clock position by stream delay to compensate
-			 * for processing and output delay. */
-			timestamp = impl->io_position->clock.position + device_delay;
+			uint32_t clock_rate = impl->io_position->clock.rate.denom;
+
+			/* Translate the clock position to an RTP timestamp and
+			 * shift it to compensate for device delay and ASRC delay.
+			 * The device delay is scaled along with the clock position,
+			 * since both are expressed in clock sample units, while
+			 * pwt.buffered is expressed in stream time. */
+			timestamp = scale_u64(impl->io_position->clock.position + device_delay,
+					      impl->rate, clock_rate) + pwt.buffered;
 			spa_ringbuffer_read_update(&impl->ring, timestamp);
 			avail = spa_ringbuffer_get_read_index(&impl->ring, &read_index);
 		} else {

From 642504f5f981440761f1cf2cd3873e283d8ea07e Mon Sep 17 00:00:00 2001
From: Carlos Rafael Giani <crg7475@mailbox.org>
Date: Wed, 21 Jan 2026 21:50:14 +0100
Subject: [PATCH 040/263] module-rtp: Compensate for stream resampler effects
 in RTP sink node

---
 src/modules/module-rtp/audio.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/modules/module-rtp/audio.c b/src/modules/module-rtp/audio.c
index 8c5517e46..d20e9a37c 100644
--- a/src/modules/module-rtp/audio.c
+++ b/src/modules/module-rtp/audio.c
@@ -620,6 +620,7 @@ static void rtp_audio_process_capture(void *data)
 	uint32_t pending, num_queued;
 	struct spa_io_position *pos;
 	uint64_t next_nsec, quantum;
+	struct pw_time pwt;
 
 	if (impl->separate_sender) {
 		/* apply the DLL rate */
@@ -637,6 +638,8 @@ static void rtp_audio_process_capture(void *data)
 	stride = impl->stride;
 	wanted = size / stride;
 
+	pw_stream_get_time_n(impl->stream, &pwt, sizeof(pwt));
+
 	filled = spa_ringbuffer_get_write_index(&impl->ring, &expected_timestamp);
 
 	pos = impl->io_position;
@@ -653,6 +656,21 @@ static void rtp_audio_process_capture(void *data)
 			impl->sink_resamp_delay = impl->io_rate_match->delay;
 			impl->sink_quantum = (uint64_t)(pos->clock.duration * SPA_NSEC_PER_SEC / rate);
 		}
+
+		/* Compensate for the stream resampler's delay. */
+		actual_timestamp -= pwt.buffered;
+
+		/* If we got a request for less than quantum worth of samples, it indicates that there
+		 * is a gap created by the resampler. We have to skip it to avoid timestamp discontinuity. */
+		if (pwt.buffered > 0) {
+			int32_t ideal_quantum = (int32_t)scale_u64(pos->clock.duration, impl->rate, rate);
+			if (wanted < ideal_quantum) {
+				int32_t num_samples_to_skip = ideal_quantum - wanted;
+				pw_log_info("wanted: %" PRId32 " < ideal quantum: %" PRId32 " - skipping %"
+					    PRId32" samples", wanted, ideal_quantum, num_samples_to_skip);
+				actual_timestamp += num_samples_to_skip;
+			}
+		}
 	} else {
 		actual_timestamp = expected_timestamp;
 		next_nsec = 0;

From ac7728097fadc64e0c235962acd25d4aad38dac0 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 3 Feb 2026 09:59:16 +0100
Subject: [PATCH 041/263] snapcast: support newer snapcast service type

Newer snapcast servers publish the service as _snapcast-ctrl._tcp so
listen for that as well.

Fixes #5104
---
 src/modules/module-snapcast-discover.c | 32 ++++++++++++++++++--------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/modules/module-snapcast-discover.c b/src/modules/module-snapcast-discover.c
index 596d5677b..3568d82d4 100644
--- a/src/modules/module-snapcast-discover.c
+++ b/src/modules/module-snapcast-discover.c
@@ -162,7 +162,8 @@ static const struct spa_dict_item module_props[] = {
 	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
 };
 
-#define SERVICE_TYPE_CONTROL "_snapcast-jsonrpc._tcp"
+#define SERVICE_TYPE_JSONRPC "_snapcast-jsonrpc._tcp"
+#define SERVICE_TYPE_CONTROL "_snapcast-ctrl._tcp"
 
 struct impl {
 	struct pw_context *context;
@@ -176,7 +177,8 @@ struct impl {
 
 	AvahiPoll *avahi_poll;
 	AvahiClient *client;
-	AvahiServiceBrowser *sink_browser;
+	AvahiServiceBrowser *jsonrpc_browser;
+	AvahiServiceBrowser *ctrl_browser;
 
 	struct spa_list tunnel_list;
 	uint32_t id;
@@ -252,8 +254,10 @@ static void impl_free(struct impl *impl)
 	spa_list_consume(t, &impl->tunnel_list, link)
 		free_tunnel(t);
 
-	if (impl->sink_browser)
-		avahi_service_browser_free(impl->sink_browser);
+	if (impl->jsonrpc_browser)
+		avahi_service_browser_free(impl->jsonrpc_browser);
+	if (impl->ctrl_browser)
+		avahi_service_browser_free(impl->ctrl_browser);
 	if (impl->client)
 		avahi_client_free(impl->client);
 	if (impl->avahi_poll)
@@ -818,9 +822,13 @@ static void client_callback(AvahiClient *c, AvahiClientState state, void *userda
 	case AVAHI_CLIENT_S_REGISTERING:
 	case AVAHI_CLIENT_S_RUNNING:
 	case AVAHI_CLIENT_S_COLLISION:
-		if (impl->sink_browser == NULL)
-			impl->sink_browser = make_browser(impl, SERVICE_TYPE_CONTROL);
-		if (impl->sink_browser == NULL)
+		if (impl->ctrl_browser == NULL)
+			impl->ctrl_browser = make_browser(impl, SERVICE_TYPE_CONTROL);
+		if (impl->ctrl_browser == NULL)
+			goto error;
+		if (impl->jsonrpc_browser == NULL)
+			impl->jsonrpc_browser = make_browser(impl, SERVICE_TYPE_JSONRPC);
+		if (impl->jsonrpc_browser == NULL)
 			goto error;
 		break;
 	case AVAHI_CLIENT_FAILURE:
@@ -829,9 +837,13 @@ static void client_callback(AvahiClient *c, AvahiClientState state, void *userda
 
 		SPA_FALLTHROUGH;
 	case AVAHI_CLIENT_CONNECTING:
-		if (impl->sink_browser) {
-			avahi_service_browser_free(impl->sink_browser);
-			impl->sink_browser = NULL;
+		if (impl->ctrl_browser) {
+			avahi_service_browser_free(impl->ctrl_browser);
+			impl->ctrl_browser = NULL;
+		}
+		if (impl->jsonrpc_browser) {
+			avahi_service_browser_free(impl->jsonrpc_browser);
+			impl->jsonrpc_browser = NULL;
 		}
 		break;
 	default:

From 2c0988ab4c19a04b1bd4044228559e5402d0c164 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 3 Feb 2026 10:16:22 +0100
Subject: [PATCH 042/263] bluez-dbus: fix adapter memcpy length

sizeof(adapter) is larger than the big_entry->adapter and so the code
would copy too much. Instead only copy the strlen of the parsed
adapter, which we checked above to be smaller than the available size.

This doesn't copy the 0 byte because the memory is assumed to be 0
filled already by the calloc.

If the address is exactly the HCI_DEV_NAME_LEN, it will result in a non-0
terminated string, which may or may not be a problem...
---
 spa/plugins/bluez5/bluez5-dbus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spa/plugins/bluez5/bluez5-dbus.c b/spa/plugins/bluez5/bluez5-dbus.c
index 0bb5a1a88..a17eedc84 100644
--- a/spa/plugins/bluez5/bluez5-dbus.c
+++ b/spa/plugins/bluez5/bluez5-dbus.c
@@ -7044,7 +7044,7 @@ static void parse_broadcast_source_config(struct spa_bt_monitor *monitor, const
 					goto parse_failed;
 				if (strlen(adapter) > HCI_DEV_NAME_LEN)
 					goto parse_failed;
-				memcpy(big_entry->adapter, adapter, sizeof(adapter));
+				memcpy(big_entry->adapter, adapter, strlen(adapter));
 				spa_log_debug(monitor->log, "big_entry->adapter %s", big_entry->adapter);
 			} else if (spa_streq(key, "encryption")) {
 				if (spa_json_get_bool(&it[0], &big_entry->encryption) <= 0)

From 57efceeb02bf72e372a3005a369218adebd855ff Mon Sep 17 00:00:00 2001
From: Hugo Osvaldo Barrera <hugo@whynothugo.nl>
Date: Mon, 2 Feb 2026 22:16:11 +0100
Subject: [PATCH 043/263] Implement socket activation without libsystemd

Socket activation uses sd_listen_fds from libsystemd, and can only be
compiled on systems with systemd.

This is an issue for Alpine / postmarketOS, where upstream has no
systemd package, but downstream depends on upstream's pipewire package
and wants to rely on socket activation. This also prevents using
socket-activation on other non-systemd distributions, including
non-Linux.

Implement equivalent functionality without a dependency on libsystemd.
---
 src/modules/meson.build                    |  4 --
 src/modules/module-protocol-native.c       | 15 ++---
 src/modules/module-protocol-pulse/server.c | 22 ++-----
 src/modules/network-utils.h                | 71 ++++++++++++++++++++++
 4 files changed, 82 insertions(+), 30 deletions(-)

diff --git a/src/modules/meson.build b/src/modules/meson.build
index 7ad232ac8..6b215f3a0 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -276,10 +276,6 @@ pipewire_module_link_factory = shared_library('pipewire-module-link-factory',
 
 pipewire_module_protocol_deps = [mathlib, dl_lib, pipewire_dep]
 
-if systemd_dep.found()
-  pipewire_module_protocol_deps += systemd_dep
-endif
-
 if selinux_dep.found()
   pipewire_module_protocol_deps += selinux_dep
 endif
diff --git a/src/modules/module-protocol-native.c b/src/modules/module-protocol-native.c
index 96e99f35e..2be92a847 100644
--- a/src/modules/module-protocol-native.c
+++ b/src/modules/module-protocol-native.c
@@ -34,10 +34,6 @@
 #include <spa/utils/json.h>
 #include <spa/debug/log.h>
 
-#ifdef HAVE_SYSTEMD
-#include <systemd/sd-daemon.h>
-#endif
-
 #ifdef HAVE_SELINUX
 #include <selinux/selinux.h>
 #endif
@@ -45,6 +41,7 @@
 #include <pipewire/impl.h>
 #include <pipewire/extensions/protocol-native.h>
 
+#include "network-utils.h"
 #include "pipewire/private.h"
 
 #include "modules/module-protocol-native/connection.h"
@@ -909,13 +906,12 @@ static int add_socket(struct pw_protocol *protocol, struct server *s, struct soc
 	int fd = -1, res;
 	bool activated = false;
 
-#ifdef HAVE_SYSTEMD
 	{
-		int i, n = sd_listen_fds(0);
+		int i, n = listen_fd();
 		for (i = 0; i < n; ++i) {
-			if (sd_is_socket_unix(SD_LISTEN_FDS_START + i, SOCK_STREAM,
-						1, s->addr.sun_path, 0) > 0) {
-				fd = SD_LISTEN_FDS_START + i;
+			if (is_socket_unix(LISTEN_FDS_START + i, SOCK_STREAM,
+						s->addr.sun_path) > 0) {
+				fd = LISTEN_FDS_START + i;
 				activated = true;
 				pw_log_info("server %p: Found socket activation socket for '%s'",
 						s, s->addr.sun_path);
@@ -923,7 +919,6 @@ static int add_socket(struct pw_protocol *protocol, struct server *s, struct soc
 			}
 		}
 	}
-#endif
 
 	if (fd < 0) {
 		struct stat socket_stat;
diff --git a/src/modules/module-protocol-pulse/server.c b/src/modules/module-protocol-pulse/server.c
index 4e744e33f..aeab710b0 100644
--- a/src/modules/module-protocol-pulse/server.c
+++ b/src/modules/module-protocol-pulse/server.c
@@ -21,9 +21,6 @@
 #include <netinet/ip.h>
 #include <unistd.h>
 
-#ifdef HAVE_SYSTEMD
-#include <systemd/sd-daemon.h>
-#endif
 
 #include <spa/utils/cleanup.h>
 #include <spa/utils/defs.h>
@@ -577,26 +574,19 @@ static bool is_stale_socket(int fd, const struct sockaddr_un *addr_un)
 	return false;
 }
 
-#ifdef HAVE_SYSTEMD
-static int check_systemd_activation(const char *path)
+static int check_socket_activation(const char *path)
 {
-	const int n = sd_listen_fds(0);
+	const int n = listen_fd();
 
 	for (int i = 0; i < n; i++) {
-		const int fd = SD_LISTEN_FDS_START + i;
+		const int fd = LISTEN_FDS_START + i;
 
-		if (sd_is_socket_unix(fd, SOCK_STREAM, 1, path, 0) > 0)
+		if (is_socket_unix(fd, SOCK_STREAM, path) > 0)
 			return fd;
 	}
 
 	return -1;
 }
-#else
-static inline int check_systemd_activation(SPA_UNUSED const char *path)
-{
-	return -1;
-}
-#endif
 
 static int start_unix_server(struct server *server, const struct sockaddr_storage *addr)
 {
@@ -606,10 +596,10 @@ static int start_unix_server(struct server *server, const struct sockaddr_storag
 
 	spa_assert(addr_un->sun_family == AF_UNIX);
 
-	fd = check_systemd_activation(addr_un->sun_path);
+	fd = check_socket_activation(addr_un->sun_path);
 	if (fd >= 0) {
 		server->activated = true;
-		pw_log_info("server %p: found systemd socket activation socket for '%s'",
+		pw_log_info("server %p: found socket activation socket for '%s'",
 			    server, addr_un->sun_path);
 		goto done;
 	}
diff --git a/src/modules/network-utils.h b/src/modules/network-utils.h
index 16f9d9273..a89b7d3bd 100644
--- a/src/modules/network-utils.h
+++ b/src/modules/network-utils.h
@@ -7,6 +7,12 @@
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <sys/un.h>
+
+#include <spa/utils/string.h>
 
 #ifdef __FreeBSD__
 #define ifr_ifindex ifr_index
@@ -131,5 +137,70 @@ static inline bool pw_net_addr_is_any(struct sockaddr_storage *addr)
 	return false;
 }
 
+#ifndef LISTEN_FDS_START
+#define LISTEN_FDS_START 3
+#endif
+
+/* Returns the number of file descriptors passed for socket activation.
+ * Returns 0 if none, -1 on error. */
+static inline int listen_fd(void)
+{
+	uint32_t n;
+	int i, flags;
+
+	if (!spa_atou32(getenv("LISTEN_FDS"), &n, 10) || n > INT_MAX - LISTEN_FDS_START) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	for (i = 0; i < (int)n; i++) {
+		flags = fcntl(LISTEN_FDS_START + i, F_GETFD);
+		if (flags == -1)
+			return -1;
+		if (fcntl(LISTEN_FDS_START + i, F_SETFD, flags | FD_CLOEXEC) == -1)
+			return -1;
+	}
+
+	unsetenv("LISTEN_FDS");
+
+	return (int)n;
+}
+
+/* Check if the fd is a listening unix socket of the given type,
+ * optionally bound to the given path. */
+static inline int is_socket_unix(int fd, int type, const char *path)
+{
+	struct sockaddr_un addr;
+	int val;
+	socklen_t len = sizeof(val);
+
+	if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &val, &len) < 0)
+		return -errno;
+	if (val != type)
+		return 0;
+
+	if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &val, &len) < 0)
+		return -errno;
+	if (!val)
+		return 0;
+
+	if (path) {
+		len = sizeof(addr);
+		memset(&addr, 0, sizeof(addr));
+		if (getsockname(fd, (struct sockaddr *)&addr, &len) < 0)
+			return -errno;
+		if (addr.sun_family != AF_UNIX)
+			return 0;
+		size_t length = strlen(path);
+		if (length > 0) {
+			if (len < offsetof(struct sockaddr_un, sun_path) + length)
+				return 0;
+			if (memcmp(addr.sun_path, path, length) != 0)
+				return 0;
+		}
+	}
+
+	return 1;
+}
 
 #endif /* NETWORK_UTILS_H */

From 84bfbd92a14fb239bf5193b4ac29fc14301edb1d Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Tue, 3 Feb 2026 19:10:25 +0200
Subject: [PATCH 044/263] bluez5: bap: prefer high-reliability qos for 44.1/48
 kHz

On some device combinations (MT7925 / Sony LinkBuds S) the low-latency
48 kHz QoS crackle.

It's probably better to default to high-reliability for those, until we
have proper quality vs. latency configuration in place.
---
 spa/plugins/bluez5/bap-codec-lc3.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/spa/plugins/bluez5/bap-codec-lc3.c b/spa/plugins/bluez5/bap-codec-lc3.c
index be08fd5a5..2581ba5d7 100644
--- a/spa/plugins/bluez5/bap-codec-lc3.c
+++ b/spa/plugins/bluez5/bap-codec-lc3.c
@@ -132,14 +132,14 @@ static const struct bap_qos bap_qos_configs[] = {
 	BAP_QOS("24_2_2",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_10,  false,  60, 13,  95, 40000,  2), /* 24_2_2 */
 	BAP_QOS("32_1_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_7_5, false,  60, 13,  75, 40000, 13), /* 32_1_2 */
 	BAP_QOS("32_2_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_10,  false,  80, 13,  95, 40000,  3), /* 32_2_2 */
-	BAP_QOS("441_1_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_7_5,  true,  97, 13,  80, 40000, 14), /* 441_1_2 */
-	BAP_QOS("441_2_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_10,   true, 130, 13,  85, 40000,  4), /* 441_2_2 */
-	BAP_QOS("48_1_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  75, 13,  75, 40000, 15), /* 48_1_2 */
-	BAP_QOS("48_2_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 100, 13,  95, 40000,  5), /* 48_2_2 */
-	BAP_QOS("48_3_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  90, 13,  75, 40000, 16), /* 48_3_2 */
-	BAP_QOS("48_4_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 120, 13, 100, 40000,  6), /* 48_4_2 */
-	BAP_QOS("48_5_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false, 117, 13,  75, 40000, 17), /* 48_5_2 */
-	BAP_QOS("48_6_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 155, 13, 100, 40000,  7), /* 48_6_2 */
+	BAP_QOS("441_1_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_7_5,  true,  97, 13,  80, 40000, 54), /* 441_1_2 */
+	BAP_QOS("441_2_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_10,   true, 130, 13,  85, 40000, 44), /* 441_2_2 */
+	BAP_QOS("48_1_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  75, 13,  75, 40000, 55), /* 48_1_2 */
+	BAP_QOS("48_2_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 100, 13,  95, 40000, 45), /* 48_2_2 */
+	BAP_QOS("48_3_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  90, 13,  75, 40000, 56), /* 48_3_2 */
+	BAP_QOS("48_4_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 120, 13, 100, 40000, 46), /* 48_4_2 */
+	BAP_QOS("48_5_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false, 117, 13,  75, 40000, 57), /* 48_5_2 */
+	BAP_QOS("48_6_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 155, 13, 100, 40000, 47), /* 48_6_2 */
 };
 
 static const struct bap_qos bap_bcast_qos_configs[] = {

From bac776f8b4a58c88d439e7fa0c2c0dd6f9662657 Mon Sep 17 00:00:00 2001
From: Carlos Rafael Giani <crg7475@mailbox.org>
Date: Thu, 5 Feb 2026 10:33:49 +0100
Subject: [PATCH 045/263] doc: spa: Explain the nsec and next_nsec values in
 the driver docs better

---
 doc/dox/internals/driver.dox | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/doc/dox/internals/driver.dox b/doc/dox/internals/driver.dox
index 4ab0d229b..fb717ab8b 100644
--- a/doc/dox/internals/driver.dox
+++ b/doc/dox/internals/driver.dox
@@ -32,8 +32,11 @@ updated as follows:
 
 - \ref spa_io_clock::nsec : Must be set to the time (according to the monotonic
   system clock) when the cycle that the driver is about to trigger started. To
-  minimize jitter, it is usually a good idea to increment this by a fixed amount
+  minimize jitter, it is usually a good idea to increment this by a computed
+  amount (instead of sampling a timestamp from the monotonic system clock)
   except for when the driver starts and when discontinuities occur in its clock.
+  The computed amount can be fixed, or varying over time, for example due to
+  adjustments made by a DLL (more on that below).
 - \ref spa_io_clock::rate : Set to a value that can translate samples to nanoseconds.
 - \ref spa_io_clock::position : Current cycle position, in samples. This is the
   ideal position of the graph cycle (this is explained in greater detail further below).
@@ -52,7 +55,7 @@ updated as follows:
   some cases, this may actually be in the past relative to nsec, for example, when
   some internal driver clock experienced a discontinuity. Consider setting the
   \ref SPA_IO_CLOCK_FLAG_DISCONT flag in such a case. Just like with nsec, to
-  minimize jitter, it is usually a good idea to increment this by a fixed amount
+  minimize jitter, it is usually a good idea to increment this by a computed amount
   except for when the driver starts and when discontinuities occur in its clock.
 
 The driver node signals the start of the graph cycle by calling \ref spa_node_call_ready
@@ -60,6 +63,11 @@ with the \ref SPA_STATUS_HAVE_DATA and \ref SPA_STATUS_NEED_DATA flags passed
 to that function call. That call must happen inside the thread that runs the
 data loop assigned to the driver node.
 
+Drivers must make sure that the next cycle is started at the time indicated by
+the \ref spa_io_clock::next_nsec timestamp. They do not have to use the monotonic
+clock itself for scheduling the next cycle. If for example the internal clock
+can directly be used with \c timerfd , the next cycle can be triggered that way.
+
 As mentioned above, the \ref spa_io_clock::position field is the _ideal_ position
 of the graph cycle, in samples. This contrasts with \ref spa_io_clock::nsec, which
 is the moment in monotonic clock time when the cycle _actually_ happens. This is an
@@ -103,11 +111,12 @@ expected position (in samples) and the actual position (derived from the current
 of the driver's internal clock), passes the delta between these two quantities into the
 DLL, and the DLL computes a correction factor (2.0 in the above example) which is used
 for scaling durations between \c timerfd timeouts. This forms a control loop, since the
-correction factor causes the durations between the timeouts to be adjusted such that the
-difference between the expected position and the actual position reaches zero. Keep in
-mind the notes above about \ref spa_io_clock::position being the ideal position of the
-graph cycle, meaning that even in this case, the duration it is incremented by is
-_not_ scaled by the correction factor; the duration in samples remains unchanged.
+correction factor causes the \ref spa_io_clock::next_nsec increments (that is, the
+durations between the timerfd timeouts) to be adjusted such that, over time, the difference
+between the expected position and the actual position reaches zero. Keep in mind the
+notes above about \ref spa_io_clock::position being the ideal position of the graph
+cycle, meaning that even in this case, the duration it is incremented by is _not_
+scaled by the correction factor; the duration in samples remains unchanged.
 
 (Other popular control loop mechanisms that are suitable alternatives to the DLL are
 PID controllers and Kalman filters.)

From 64e0a9cbd96f4eacf3b9f0435f59fbeda792f6f9 Mon Sep 17 00:00:00 2001
From: Stanislav Ruzani <stanislav.ruzani@streamunlimited.com>
Date: Sun, 28 Dec 2025 23:42:57 +0100
Subject: [PATCH 046/263] alsa-pcm: set rate_match rate to 1.0 when not
 matching

Only set rate_match rate to DLL correction when matching is active.
When ALSA is driver and not matching, set rate to 1.0 to indicate no rate adjustment needed.
DLL still runs for buffer level management but rate_match should not expose correction
when matching is inactive to avoid confusion during debugging.

Signed-off-by: Stanislav Ruzani <stanislav.ruzani@streamunlimited.com>
---
 spa/plugins/alsa/alsa-pcm.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/spa/plugins/alsa/alsa-pcm.c b/spa/plugins/alsa/alsa-pcm.c
index a12b2601a..ca31366dc 100644
--- a/spa/plugins/alsa/alsa-pcm.c
+++ b/spa/plugins/alsa/alsa-pcm.c
@@ -3040,10 +3040,17 @@ static int update_time(struct state *state, uint64_t current_time, snd_pcm_sfram
 	}
 
 	if (state->rate_match) {
-		if (state->stream == SND_PCM_STREAM_PLAYBACK)
-			state->rate_match->rate = corr;
-		else
-			state->rate_match->rate = 1.0/corr;
+		/* Only set rate_match rate when matching is active. When not matching,
+		 * set it to 1.0 to indicate no rate adjustment needed, even though DLL
+		 * may still be running for buffer level management. */
+		if (state->matching) {
+			if (state->stream == SND_PCM_STREAM_PLAYBACK)
+				state->rate_match->rate = corr;
+			else
+				state->rate_match->rate = 1.0/corr;
+		} else {
+			state->rate_match->rate = 1.0;
+		}
 
 		if (state->pitch_elem && state->matching)
 			spa_alsa_update_rate_match(state);

From 2770143f506a92e242f8a5b8b870929b515b48c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Sun, 8 Feb 2026 22:44:46 +0100
Subject: [PATCH 047/263] gst: pool: fix buffer release race condition

A call to `release_buffer()` may happen in a gstreamer thread concurrently
with the pipewire stream emitting the `remove_buffer` event in the thread
loop, which, in pipewiresink calls `gst_pipewire_pool_remove_buffer()`, which
in turn modifies the `GstPipeWirePoolData` object. Thus a data race occurs
when accessing its members, which can lead to `pw_stream_return_buffer()`
being called with a null pointer.

Fix that by locking the thread loop before checking the conditions.

Fixes: c0a6a7ea32f6 ("gst: handle flush event in pipewiresink")
---
 src/gst/gstpipewirepool.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/gst/gstpipewirepool.c b/src/gst/gstpipewirepool.c
index 3bcf99de7..5e201d315 100644
--- a/src/gst/gstpipewirepool.c
+++ b/src/gst/gstpipewirepool.c
@@ -432,26 +432,25 @@ release_buffer (GstBufferPool * pool, GstBuffer *buffer)
   GST_LOG_OBJECT (pool, "release buffer %p", buffer);
 
   GstPipeWirePoolData *data = gst_pipewire_pool_get_data(buffer);
+  GstPipeWirePool *p = GST_PIPEWIRE_POOL (pool);
+  g_autoptr (GstPipeWireStream) s = g_weak_ref_get (&p->stream);
 
   GST_OBJECT_LOCK (pool);
+  pw_thread_loop_lock (s->core->loop);
 
   if (!data->queued && data->b != NULL)
   {
-    GstPipeWirePool *p = GST_PIPEWIRE_POOL (pool);
-    g_autoptr (GstPipeWireStream) s = g_weak_ref_get (&p->stream);
     int res;
 
-    pw_thread_loop_lock (s->core->loop);
-
     if ((res = pw_stream_return_buffer (s->pwstream, data->b)) < 0) {
       GST_ERROR_OBJECT (pool,"can't return buffer %p; gstbuffer : %p, %s",data->b, buffer, spa_strerror(res));
     } else {
       data->queued = TRUE;
       GST_DEBUG_OBJECT (pool, "returned buffer %p; gstbuffer:%p", data->b, buffer);
     }
-
-    pw_thread_loop_unlock (s->core->loop);
   }
+
+  pw_thread_loop_unlock (s->core->loop);
   GST_OBJECT_UNLOCK (pool);
 }
 

From c4992550983c51d5f0add29f2050aaded39703c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis@collabora.com>
Date: Wed, 4 Feb 2026 17:03:53 +0100
Subject: [PATCH 048/263] bluez5: bap: Add device property to force target
 latency

Some PTS tests (e.g. BAP/UCL/SCC/BV-046-C or BAP/UCL/SCC/BV-077-C)
requests to select QoS from low-latency or high-reliabilty.

The bluez5.bap.force-target-latency device property allows to force it.
For other values than low-latency or high-reliabilty the QoS selection
will use both tables to find the more appropriate configuration.
---
 doc/dox/config/pipewire-props.7.md |   6 ++
 spa/plugins/bluez5/bap-codec-lc3.c | 145 +++++++++++++++--------------
 2 files changed, 83 insertions(+), 68 deletions(-)

diff --git a/doc/dox/config/pipewire-props.7.md b/doc/dox/config/pipewire-props.7.md
index 9cf3943ed..cbefba992 100644
--- a/doc/dox/config/pipewire-props.7.md
+++ b/doc/dox/config/pipewire-props.7.md
@@ -1373,6 +1373,12 @@ BAP QoS framing that needs to be applied for vendor defined preset
 This property is experimental.
 Default: as per QoS preset.
 
+@PAR@ device-prop  bluez5.bap.force-target-latency = "balanced" # string
+BAP QoS target latency profile forced for QoS configuration selection.
+If not set or set to "balanced", both low-latency and high-reliabilty QoS configuration table are used.
+This property is experimental.
+Available: low-latency, high-reliabilty, balanced
+
 ## Node properties
 
 @PAR@ node-prop  bluez5.media-source-role   # string
diff --git a/spa/plugins/bluez5/bap-codec-lc3.c b/spa/plugins/bluez5/bap-codec-lc3.c
index 2581ba5d7..74761f26b 100644
--- a/spa/plugins/bluez5/bap-codec-lc3.c
+++ b/spa/plugins/bluez5/bap-codec-lc3.c
@@ -55,6 +55,7 @@ struct settings {
 	int latency;
 	int64_t delay;
 	int framing;
+	char *force_target_latency;
 };
 
 struct pac_data {
@@ -76,6 +77,7 @@ struct bap_qos {
 	uint16_t latency;
 	uint32_t delay;
 	unsigned int priority;
+	char *tag;
 };
 
 typedef struct {
@@ -96,50 +98,50 @@ struct config_data {
 	struct settings settings;
 };
 
-#define BAP_QOS(name_, rate_, duration_, framing_, framelen_, rtn_, latency_, delay_, priority_) \
+#define BAP_QOS(name_, rate_, duration_, framing_, framelen_, rtn_, latency_, delay_, priority_, tag_) \
 	((struct bap_qos){ .name = (name_), .rate = (rate_), .frame_duration = (duration_), .framing = (framing_), \
 			 .framelen = (framelen_), .retransmission = (rtn_), .latency = (latency_),	\
-			 .delay = (delay_), .priority = (priority_) })
+			 .delay = (delay_), .priority = (priority_), .tag = (tag_) })
 
 static const struct bap_qos bap_qos_configs[] = {
 	/* Priority: low-latency > high-reliability, 7.5ms > 10ms,
 	 * bigger frequency and sdu better */
 
 	/* BAP v1.0.1 Table 5.2; low-latency */
-	BAP_QOS("8_1_1",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_7_5, false,  26, 2,  8, 40000, 30), /* 8_1_1 */
-	BAP_QOS("8_2_1",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_10,  false,  30, 2, 10, 40000, 20), /* 8_2_1 */
-	BAP_QOS("16_1_1",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_7_5, false,  30, 2,  8, 40000, 31), /* 16_1_1 */
-	BAP_QOS("16_2_1",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_10,  false,  40, 2, 10, 40000, 21), /* 16_2_1 (mandatory) */
-	BAP_QOS("24_1_1",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_7_5, false,  45, 2,  8, 40000, 32), /* 24_1_1 */
-	BAP_QOS("24_2_1",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_10,  false,  60, 2, 10, 40000, 22), /* 24_2_1 */
-	BAP_QOS("32_1_1",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_7_5, false,  60, 2,  8, 40000, 33), /* 32_1_1 */
-	BAP_QOS("32_2_1",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_10,  false,  80, 2, 10, 40000, 23), /* 32_2_1 */
-	BAP_QOS("441_1_1", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_7_5,  true,  97, 5, 24, 40000, 34), /* 441_1_1 */
-	BAP_QOS("441_2_1", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_10,   true, 130, 5, 31, 40000, 24), /* 441_2_1 */
-	BAP_QOS("48_1_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  75, 5, 15, 40000, 35), /* 48_1_1 */
-	BAP_QOS("48_2_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 100, 5, 20, 40000, 25), /* 48_2_1 */
-	BAP_QOS("48_3_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  90, 5, 15, 40000, 36), /* 48_3_1 */
-	BAP_QOS("48_4_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 120, 5, 20, 40000, 26), /* 48_4_1 */
-	BAP_QOS("48_5_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false, 117, 5, 15, 40000, 37), /* 48_5_1 */
-	BAP_QOS("48_6_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 155, 5, 20, 40000, 27), /* 48_6_1 */
+	BAP_QOS("8_1_1",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_7_5, false,  26, 2,  8, 40000, 30, "low-latency"), /* 8_1_1 */
+	BAP_QOS("8_2_1",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_10,  false,  30, 2, 10, 40000, 20, "low-latency"), /* 8_2_1 */
+	BAP_QOS("16_1_1",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_7_5, false,  30, 2,  8, 40000, 31, "low-latency"), /* 16_1_1 */
+	BAP_QOS("16_2_1",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_10,  false,  40, 2, 10, 40000, 21, "low-latency"), /* 16_2_1 (mandatory) */
+	BAP_QOS("24_1_1",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_7_5, false,  45, 2,  8, 40000, 32, "low-latency"), /* 24_1_1 */
+	BAP_QOS("24_2_1",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_10,  false,  60, 2, 10, 40000, 22, "low-latency"), /* 24_2_1 */
+	BAP_QOS("32_1_1",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_7_5, false,  60, 2,  8, 40000, 33, "low-latency"), /* 32_1_1 */
+	BAP_QOS("32_2_1",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_10,  false,  80, 2, 10, 40000, 23, "low-latency"), /* 32_2_1 */
+	BAP_QOS("441_1_1", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_7_5,  true,  97, 5, 24, 40000, 34, "low-latency"), /* 441_1_1 */
+	BAP_QOS("441_2_1", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_10,   true, 130, 5, 31, 40000, 24, "low-latency"), /* 441_2_1 */
+	BAP_QOS("48_1_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  75, 5, 15, 40000, 35, "low-latency"), /* 48_1_1 */
+	BAP_QOS("48_2_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 100, 5, 20, 40000, 25, "low-latency"), /* 48_2_1 */
+	BAP_QOS("48_3_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  90, 5, 15, 40000, 36, "low-latency"), /* 48_3_1 */
+	BAP_QOS("48_4_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 120, 5, 20, 40000, 26, "low-latency"), /* 48_4_1 */
+	BAP_QOS("48_5_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false, 117, 5, 15, 40000, 37, "low-latency"), /* 48_5_1 */
+	BAP_QOS("48_6_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 155, 5, 20, 40000, 27, "low-latency"), /* 48_6_1 */
 
 	/* BAP v1.0.1 Table 5.2; high-reliability */
-	BAP_QOS("8_1_2",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_7_5, false,  26, 13,  75, 40000, 10), /* 8_1_2 */
-	BAP_QOS("8_2_2",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_10,  false,  30, 13,  95, 40000,  0), /* 8_2_2 */
-	BAP_QOS("16_1_2",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_7_5, false,  30, 13,  75, 40000, 11), /* 16_1_2 */
-	BAP_QOS("16_2_2",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_10,  false,  40, 13,  95, 40000,  1), /* 16_2_2 */
-	BAP_QOS("24_1_2",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_7_5, false,  45, 13,  75, 40000, 12), /* 24_1_2 */
-	BAP_QOS("24_2_2",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_10,  false,  60, 13,  95, 40000,  2), /* 24_2_2 */
-	BAP_QOS("32_1_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_7_5, false,  60, 13,  75, 40000, 13), /* 32_1_2 */
-	BAP_QOS("32_2_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_10,  false,  80, 13,  95, 40000,  3), /* 32_2_2 */
-	BAP_QOS("441_1_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_7_5,  true,  97, 13,  80, 40000, 54), /* 441_1_2 */
-	BAP_QOS("441_2_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_10,   true, 130, 13,  85, 40000, 44), /* 441_2_2 */
-	BAP_QOS("48_1_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  75, 13,  75, 40000, 55), /* 48_1_2 */
-	BAP_QOS("48_2_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 100, 13,  95, 40000, 45), /* 48_2_2 */
-	BAP_QOS("48_3_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  90, 13,  75, 40000, 56), /* 48_3_2 */
-	BAP_QOS("48_4_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 120, 13, 100, 40000, 46), /* 48_4_2 */
-	BAP_QOS("48_5_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false, 117, 13,  75, 40000, 57), /* 48_5_2 */
-	BAP_QOS("48_6_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 155, 13, 100, 40000, 47), /* 48_6_2 */
+	BAP_QOS("8_1_2",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_7_5, false,  26, 13,  75, 40000, 10, "high-reliabilty"), /* 8_1_2 */
+	BAP_QOS("8_2_2",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_10,  false,  30, 13,  95, 40000,  0, "high-reliabilty"), /* 8_2_2 */
+	BAP_QOS("16_1_2",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_7_5, false,  30, 13,  75, 40000, 11, "high-reliabilty"), /* 16_1_2 */
+	BAP_QOS("16_2_2",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_10,  false,  40, 13,  95, 40000,  1, "high-reliabilty"), /* 16_2_2 */
+	BAP_QOS("24_1_2",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_7_5, false,  45, 13,  75, 40000, 12, "high-reliabilty"), /* 24_1_2 */
+	BAP_QOS("24_2_2",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_10,  false,  60, 13,  95, 40000,  2, "high-reliabilty"), /* 24_2_2 */
+	BAP_QOS("32_1_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_7_5, false,  60, 13,  75, 40000, 13, "high-reliabilty"), /* 32_1_2 */
+	BAP_QOS("32_2_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_10,  false,  80, 13,  95, 40000,  3, "high-reliabilty"), /* 32_2_2 */
+	BAP_QOS("441_1_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_7_5,  true,  97, 13,  80, 40000, 54, "high-reliabilty"), /* 441_1_2 */
+	BAP_QOS("441_2_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_10,   true, 130, 13,  85, 40000, 44, "high-reliabilty"), /* 441_2_2 */
+	BAP_QOS("48_1_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  75, 13,  75, 40000, 55, "high-reliabilty"), /* 48_1_2 */
+	BAP_QOS("48_2_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 100, 13,  95, 40000, 45, "high-reliabilty"), /* 48_2_2 */
+	BAP_QOS("48_3_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  90, 13,  75, 40000, 56, "high-reliabilty"), /* 48_3_2 */
+	BAP_QOS("48_4_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 120, 13, 100, 40000, 46, "high-reliabilty"), /* 48_4_2 */
+	BAP_QOS("48_5_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false, 117, 13,  75, 40000, 57, "high-reliabilty"), /* 48_5_2 */
+	BAP_QOS("48_6_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 155, 13, 100, 40000, 47, "high-reliabilty"), /* 48_6_2 */
 };
 
 static const struct bap_qos bap_bcast_qos_configs[] = {
@@ -147,40 +149,40 @@ static const struct bap_qos bap_bcast_qos_configs[] = {
 	 * bigger frequency and sdu better */
 
 	/* BAP v1.0.1 Table 6.4; low-latency */
-	BAP_QOS("8_1_1",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_7_5, false,  26, 2,  8, 40000, 30), /* 8_1_1 */
-	BAP_QOS("8_2_1",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_10,  false,  30, 2, 10, 40000, 20), /* 8_2_1 */
-	BAP_QOS("16_1_1",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_7_5, false,  30, 2,  8, 40000, 31), /* 16_1_1 */
-	BAP_QOS("16_2_1",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_10,  false,  40, 2, 10, 40000, 21), /* 16_2_1 (mandatory) */
-	BAP_QOS("24_1_1",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_7_5, false,  45, 2,  8, 40000, 32), /* 24_1_1 */
-	BAP_QOS("24_2_1",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_10,  false,  60, 2, 10, 40000, 22), /* 24_2_1 */
-	BAP_QOS("32_1_1",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_7_5, false,  60, 2,  8, 40000, 33), /* 32_1_1 */
-	BAP_QOS("32_2_1",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_10,  false,  80, 2, 10, 40000, 23), /* 32_2_1 */
-	BAP_QOS("441_1_1", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_7_5, true,   97, 4, 24, 40000, 34), /* 441_1_1 */
-	BAP_QOS("441_2_1", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_10,  true,  130, 4, 31, 40000, 24), /* 441_2_1 */
-	BAP_QOS("48_1_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  75, 4, 15, 40000, 35), /* 48_1_1 */
-	BAP_QOS("48_2_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 100, 4, 20, 40000, 25), /* 48_2_1 */
-	BAP_QOS("48_3_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  90, 4, 15, 40000, 36), /* 48_3_1 */
-	BAP_QOS("48_4_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 120, 4, 20, 40000, 26), /* 48_4_1 */
-	BAP_QOS("48_5_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false, 117, 4, 15, 40000, 37), /* 48_5_1 */
-	BAP_QOS("48_6_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 155, 4, 20, 40000, 27), /* 48_6_1 */
+	BAP_QOS("8_1_1",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_7_5, false,  26, 2,  8, 40000, 30, "low-latency"), /* 8_1_1 */
+	BAP_QOS("8_2_1",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_10,  false,  30, 2, 10, 40000, 20, "low-latency"), /* 8_2_1 */
+	BAP_QOS("16_1_1",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_7_5, false,  30, 2,  8, 40000, 31, "low-latency"), /* 16_1_1 */
+	BAP_QOS("16_2_1",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_10,  false,  40, 2, 10, 40000, 21, "low-latency"), /* 16_2_1 (mandatory) */
+	BAP_QOS("24_1_1",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_7_5, false,  45, 2,  8, 40000, 32, "low-latency"), /* 24_1_1 */
+	BAP_QOS("24_2_1",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_10,  false,  60, 2, 10, 40000, 22, "low-latency"), /* 24_2_1 */
+	BAP_QOS("32_1_1",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_7_5, false,  60, 2,  8, 40000, 33, "low-latency"), /* 32_1_1 */
+	BAP_QOS("32_2_1",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_10,  false,  80, 2, 10, 40000, 23, "low-latency"), /* 32_2_1 */
+	BAP_QOS("441_1_1", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_7_5, true,   97, 4, 24, 40000, 34, "low-latency"), /* 441_1_1 */
+	BAP_QOS("441_2_1", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_10,  true,  130, 4, 31, 40000, 24, "low-latency"), /* 441_2_1 */
+	BAP_QOS("48_1_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  75, 4, 15, 40000, 35, "low-latency"), /* 48_1_1 */
+	BAP_QOS("48_2_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 100, 4, 20, 40000, 25, "low-latency"), /* 48_2_1 */
+	BAP_QOS("48_3_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  90, 4, 15, 40000, 36, "low-latency"), /* 48_3_1 */
+	BAP_QOS("48_4_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 120, 4, 20, 40000, 26, "low-latency"), /* 48_4_1 */
+	BAP_QOS("48_5_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false, 117, 4, 15, 40000, 37, "low-latency"), /* 48_5_1 */
+	BAP_QOS("48_6_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 155, 4, 20, 40000, 27, "low-latency"), /* 48_6_1 */
 
 	/* BAP v1.0.1 Table 6.4; high-reliability */
-	BAP_QOS("8_1_2",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_7_5, false,  26, 4,  45, 40000, 10), /* 8_1_2 */
-	BAP_QOS("8_2_2",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_10,  false,  30, 4,  60, 40000,  0), /* 8_2_2 */
-	BAP_QOS("16_1_2",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_7_5, false,  30, 4,  45, 40000, 11), /* 16_1_2 */
-	BAP_QOS("16_2_2",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_10,  false,  40, 4,  60, 40000,  1), /* 16_2_2 */
-	BAP_QOS("24_1_2",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_7_5, false,  45, 4,  45, 40000, 12), /* 24_1_2 */
-	BAP_QOS("24_2_2",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_10,  false,  60, 4,  60, 40000,  2), /* 24_2_2 */
-	BAP_QOS("32_1_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_7_5, false,  60, 4,  45, 40000, 13), /* 32_1_2 */
-	BAP_QOS("32_2_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_10,  false,  80, 4,  60, 40000,  3), /* 32_2_2 */
-	BAP_QOS("441_1_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_7_5, true,   97, 4,  54, 40000, 14), /* 441_1_2 */
-	BAP_QOS("441_2_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_10,  true,  130, 4,  60, 40000,  4), /* 441_2_2 */
-	BAP_QOS("48_1_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  75, 4,  50, 40000, 15), /* 48_1_2 */
-	BAP_QOS("48_2_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 100, 4,  65, 40000,  5), /* 48_2_2 */
-	BAP_QOS("48_3_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  90, 4,  50, 40000, 16), /* 48_3_2 */
-	BAP_QOS("48_4_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 120, 4,  65, 40000,  6), /* 48_4_2 */
-	BAP_QOS("48_5_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false, 117, 4,  50, 40000, 17), /* 48_5_2 */
-	BAP_QOS("48_6_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 155, 4,  65, 40000,  7), /* 48_6_2 */
+	BAP_QOS("8_1_2",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_7_5, false,  26, 4,  45, 40000, 10, "high-reliabilty"), /* 8_1_2 */
+	BAP_QOS("8_2_2",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_10,  false,  30, 4,  60, 40000,  0, "high-reliabilty"), /* 8_2_2 */
+	BAP_QOS("16_1_2",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_7_5, false,  30, 4,  45, 40000, 11, "high-reliabilty"), /* 16_1_2 */
+	BAP_QOS("16_2_2",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_10,  false,  40, 4,  60, 40000,  1, "high-reliabilty"), /* 16_2_2 */
+	BAP_QOS("24_1_2",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_7_5, false,  45, 4,  45, 40000, 12, "high-reliabilty"), /* 24_1_2 */
+	BAP_QOS("24_2_2",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_10,  false,  60, 4,  60, 40000,  2, "high-reliabilty"), /* 24_2_2 */
+	BAP_QOS("32_1_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_7_5, false,  60, 4,  45, 40000, 13, "high-reliabilty"), /* 32_1_2 */
+	BAP_QOS("32_2_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_10,  false,  80, 4,  60, 40000,  3, "high-reliabilty"), /* 32_2_2 */
+	BAP_QOS("441_1_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_7_5, true,   97, 4,  54, 40000, 14, "high-reliabilty"), /* 441_1_2 */
+	BAP_QOS("441_2_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_10,  true,  130, 4,  60, 40000,  4, "high-reliabilty"), /* 441_2_2 */
+	BAP_QOS("48_1_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  75, 4,  50, 40000, 15, "high-reliabilty"), /* 48_1_2 */
+	BAP_QOS("48_2_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 100, 4,  65, 40000,  5, "high-reliabilty"), /* 48_2_2 */
+	BAP_QOS("48_3_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  90, 4,  50, 40000, 16, "high-reliabilty"), /* 48_3_2 */
+	BAP_QOS("48_4_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 120, 4,  65, 40000,  6, "high-reliabilty"), /* 48_4_2 */
+	BAP_QOS("48_5_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false, 117, 4,  50, 40000, 17, "high-reliabilty"), /* 48_5_2 */
+	BAP_QOS("48_6_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 155, 4,  65, 40000,  7, "high-reliabilty"), /* 48_6_2 */
 };
 
 static unsigned int get_rate_mask(uint8_t rate) {
@@ -476,6 +478,9 @@ static bool select_bap_qos(struct bap_qos *conf,
 		else if (c.priority < conf->priority)
 			continue;
 
+		if (s->force_target_latency && !spa_streq(s->force_target_latency, c.tag))
+			continue;
+
 		if (s->retransmission >= 0)
 			c.retransmission = s->retransmission;
 		if (s->latency >= 0)
@@ -844,6 +849,9 @@ static void parse_settings(struct settings *s, const struct spa_dict *settings,
 	if ((str = spa_dict_lookup(settings, "bluez5.bap.preset")))
 		s->qos_name = strdup(str);
 
+	if ((str = spa_dict_lookup(settings, "bluez5.bap.force-target-latency")))
+		s->force_target_latency = strdup(str);
+
 	if (spa_atou32(spa_dict_lookup(settings, "bluez5.bap.rtn"), &value, 0))
 		s->retransmission = value;
 
@@ -881,11 +889,11 @@ static void parse_settings(struct settings *s, const struct spa_dict *settings,
 
 	spa_debugc(&debug_ctx->ctx,
 			"BAP LC3 settings: preset:%s rtn:%d latency:%d delay:%d framing:%d "
-			"locations:%x chnalloc:%x sink:%d duplex:%d",
+			"locations:%x chnalloc:%x sink:%d duplex:%d force-target-latency:%s",
 			s->qos_name ? s->qos_name : "auto",
 			s->retransmission, s->latency, (int)s->delay, s->framing,
 			(unsigned int)s->locations, (unsigned int)s->channel_allocation,
-			(int)s->sink, (int)s->duplex);
+			(int)s->sink, (int)s->duplex, s->force_target_latency);
 }
 
 static void free_config_data(struct config_data *d)
@@ -893,6 +901,7 @@ static void free_config_data(struct config_data *d)
 	if (!d)
 		return;
 	free(d->settings.qos_name);
+	free(d->settings.force_target_latency);
 	free(d);
 }
 

From 0470f96887cba29c52d47352dbf1bb6a666533c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis@collabora.com>
Date: Fri, 6 Feb 2026 12:49:58 +0100
Subject: [PATCH 049/263] bluez: bap: Select correct settings for
 select_config()

Depending on the codec kind, select appropriate settings to pass
to select_config().

This allows to pass the bluez5.bap.force-target-latency property,
and so to select the same configuration.
---
 spa/plugins/bluez5/bluez5-dbus.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/spa/plugins/bluez5/bluez5-dbus.c b/spa/plugins/bluez5/bluez5-dbus.c
index a17eedc84..651d410c9 100644
--- a/spa/plugins/bluez5/bluez5-dbus.c
+++ b/spa/plugins/bluez5/bluez5-dbus.c
@@ -736,6 +736,11 @@ static void bap_features_clear(struct bap_features *feat)
 	spa_zero(*feat);
 }
 
+const struct spa_dict *get_device_codec_settings(struct spa_bt_device *device, bool bap)
+{
+    return bap ? device->settings : &device->monitor->global_settings;
+}
+
 static DBusHandlerResult endpoint_select_configuration(DBusConnection *conn, DBusMessage *m, void *userdata)
 {
 	struct spa_bt_monitor *monitor = userdata;
@@ -2760,6 +2765,7 @@ bool spa_bt_device_supports_media_codec(struct spa_bt_device *device, const stru
 		{ SPA_BLUETOOTH_AUDIO_CODEC_FASTSTREAM_DUPLEX, SPA_BT_FEATURE_A2DP_DUPLEX },
 	};
 	bool is_a2dp = codec->kind == MEDIA_CODEC_A2DP;
+	bool is_bap = codec->kind == MEDIA_CODEC_BAP;
 	size_t i;
 
 	codec_target_profile = get_codec_target_profile(monitor, codec);
@@ -2801,7 +2807,8 @@ bool spa_bt_device_supports_media_codec(struct spa_bt_device *device, const stru
 			continue;
 
 		if (media_codec_check_caps(codec, ep->codec, ep->capabilities, ep->capabilities_len,
-						&ep->monitor->default_audio_info, &monitor->global_settings))
+						&ep->monitor->default_audio_info,
+						get_device_codec_settings(device, is_bap)))
 			return true;
 	}
 
@@ -4655,7 +4662,7 @@ static bool codec_switch_check_endpoint(struct spa_bt_remote_endpoint *ep,
 
 	if (!media_codec_check_caps(codec, ep->codec, ep->capabilities, ep->capabilities_len,
 					&ep->device->monitor->default_audio_info,
-					&ep->device->monitor->global_settings))
+					get_device_codec_settings(ep->device, codec->kind == MEDIA_CODEC_BAP)))
 		return false;
 
 	if (ep_profile & (SPA_BT_PROFILE_A2DP_SINK | SPA_BT_PROFILE_BAP_SINK)) {

From a2df2820869110775dffa1d474ac682815ab8f53 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 9 Feb 2026 13:44:40 +0100
Subject: [PATCH 050/263] pw-cat: add a container option and some --list
 options

Add a container option to override the extension check and force a
container when saving.

Add some more formats that are supported by libsndfile.

Add some options to list all supported formats, extensions/containers,
layouts and channel names.

Fixes #5117
---
 doc/dox/programs/pw-cat.1.md |  72 +++++++++++++----
 src/tools/pw-cat.c           | 145 +++++++++++++++++++++++++++++++----
 2 files changed, 188 insertions(+), 29 deletions(-)

diff --git a/doc/dox/programs/pw-cat.1.md b/doc/dox/programs/pw-cat.1.md
index b6e259a6f..b681e54a1 100644
--- a/doc/dox/programs/pw-cat.1.md
+++ b/doc/dox/programs/pw-cat.1.md
@@ -24,9 +24,9 @@ Play and record media with PipeWire
 
 **pw-cat** is a simple tool for playing back or capturing raw or encoded
 media files on a PipeWire server. It understands all audio file formats
-supported by `libsndfile` for PCM capture and playback. When capturing
-PCM, the filename extension is used to guess the file format with the
-WAV file format as the default.
+supported by `libsndfile` for PCM capture and playback. When no container
+is specified for capturing PCM, the filename extension is used to guess
+the file format with the WAV file format as the default.
 
 It understands standard MIDI files and MIDI 2.0 clip files for playback
 and recording. This tool will not render MIDI files, it will simply make
@@ -37,8 +37,15 @@ DSD playback is supported with the DSF file format. This tool will only
 work with native DSD capable hardware and will produce an error when no
 such hardware was found.
 
-When the *FILE* is - input and output will be raw data from STDIN and
-STDOUT respectively.
+When the *FILE* is - input will be from STDIN. If no format is specified,
+libsndfile will attempt to parse and stream the format from STDIN. For
+some formats, this is not possible and libsndfile will give an error.
+Raw, MIDI and DSD formats are all streamable from STDIN.
+
+When the *FILE* is - output will be to STDOUT. If no format is specified,
+libsndfile is instructed to output the .au format, which is streamble and
+preserves the format, rate and channels.
+Raw and DSD formats are all streamable to STDOUT.
 
 # OPTIONS
 
@@ -87,6 +94,11 @@ DSD mode. *FILE* is a DSF file. If the tool is called under the name
 render the DSD audio. You need a DSD capable device to play DSD content
 or this program will exit with an error.
 
+\par -s | \--sysex
+SysEx mode. *FILE* is a File that contains a raw SysEx MIDI message.
+If the tool is called under the name **pw-sysex** this is the default.
+The File is read and sent as a MIDI control message into the graph.
+
 \par \--media-type=VALUE
 Set the media type property (default Audio/Midi depending on mode). The
 media type is used by the session manager to select a suitable target to
@@ -138,6 +150,17 @@ does not match the samplerate of the server, the data will be resampled.
 Higher quality uses more CPU. Values between 0 and 15 are allowed, the
 default quality is 4.
 
+\par -a | \--raw
+Raw samples will be read or written. The \--rate, \--format, \--channels
+and \--channelmap can be used to specify the raw format.
+
+\par -M | \--force-midi
+Force midi format, one of "midi" or "ump", (default ump).
+When reading or writing midi, for one of midi or UMP.
+
+\par -n | \--sample-count=COUNT
+Stop after COUNT samples.
+
 \par \--rate=VALUE
 The sample rate, default 48000.
 
@@ -145,19 +168,38 @@ The sample rate, default 48000.
 The number of channels, default 2.
 
 \par \--channel-map=VALUE
-The channelmap. Possible values include: **mono**, **stereo**,
+The channelmap. Possible values include are either a channel layout
+such as **mono**, **stereo**,
 **surround-21**, **quad**, **surround-22**, **surround-40**,
-**surround-31**, **surround-41**, **surround-50**, **surround-51**,
-**surround-51r**, **surround-70**, **surround-71** or a comma separated
-list of channel names: **FL**, **FR**, **FC**, **LFE**, **SL**, **SR**,
-**FLC**, **FRC**, **RC**, **RL**, **RR**, **TC**, **TFL**, **TFC**,
-**TFR**, **TRL**, **TRC**, **TRR**, **RLC**, **RRC**, **FLW**, **FRW**,
-**LFE2**, **FLH**, **FCH**, **FRH**, **TFLC**, **TFRC**, **TSL**,
-**TSR**, **LLFR**, **RLFE**, **BC**, **BLC**, **BRC**
+or comma separated array of channel names such as **FL,FR**.
+See \--list-layouts and \--list-channel-names to get a complete
+list of possible values.
+
+\par \--list-layouts
+List all known channel layouts. One of these can be used as the
+\--channel-map value.
+
+\par \--list-channel-names
+List all known channel names. An array of these can be used as the
+\--channel-map value.
 
 \par \--format=VALUE
-The sample format to use. One of: **u8**, **s8**, **s16** (default),
-**s24**, **s32**, **f32**, **f64**.
+The sample format to use. Some possible values include: **u8**, **s8**,
+**s16** (default), **s24**, **s32**, **f32**, **f64**. See
+\--list-formats to get a complete list of values.
+
+\par \--list-formats
+List all known format values.
+
+\par \--container=VALUE
+Specify the container to use when saving. This is usually guessed from
+the filename extension but can be specified explicitly. When using
+STDOUT and no container is specified, the AU container will be used.
+Then using a filename and the container was not specified and it could
+not be derived from the filename, the WAV container is used.
+
+\par \--list-containers
+List all known container values.
 
 \par \--volume=VALUE
 The stream volume, default 1.000. Depending on the locale you have
diff --git a/src/tools/pw-cat.c b/src/tools/pw-cat.c
index 8bd3e343c..f90ebffc9 100644
--- a/src/tools/pw-cat.c
+++ b/src/tools/pw-cat.c
@@ -120,6 +120,7 @@ struct data {
 	const char *media_role;
 	const char *channel_map;
 	const char *format;
+	const char *container;
 	const char *target;
 	const char *latency;
 	struct pw_properties *props;
@@ -194,8 +195,6 @@ struct data {
 	uint64_t samples_processed;
 };
 
-#define STR_FMTS "(ulaw|alaw|u8|s8|s16|s32|f32|f64)"
-
 static const struct format_info {
 	const char *name;
 	int sf_format;
@@ -217,6 +216,29 @@ static const struct format_info {
 	{  "mp3", SF_FORMAT_MPEG_LAYER_III, SPA_AUDIO_FORMAT_F32, 1 },
 	{  "vorbis", SF_FORMAT_VORBIS, SPA_AUDIO_FORMAT_F32, 1 },
 	{  "opus", SF_FORMAT_OPUS, SPA_AUDIO_FORMAT_F32, 1 },
+
+	{  "ima-adpcm", SF_FORMAT_IMA_ADPCM, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "ms-adpcm", SF_FORMAT_MS_ADPCM, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "nms-adpcm-16", SF_FORMAT_NMS_ADPCM_16, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "nms-adpcm-24", SF_FORMAT_NMS_ADPCM_24, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "nms-adpcm-32", SF_FORMAT_NMS_ADPCM_32, SPA_AUDIO_FORMAT_F32, 1 },
+
+	{  "alac-16", SF_FORMAT_ALAC_16, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "alac-20", SF_FORMAT_ALAC_20, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "alac-24", SF_FORMAT_ALAC_24, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "alac-32", SF_FORMAT_ALAC_32, SPA_AUDIO_FORMAT_F32, 1 },
+
+	{  "gsm610", SF_FORMAT_GSM610, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "g721-32", SF_FORMAT_G721_32, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "g723-24", SF_FORMAT_G723_24, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "g723-40", SF_FORMAT_G723_40, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "dwvw-12", SF_FORMAT_DWVW_12, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "dwvw-16", SF_FORMAT_DWVW_16, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "dwvw-24", SF_FORMAT_DWVW_24, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "vox", SF_FORMAT_VOX_ADPCM, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "dpcm-16", SF_FORMAT_DPCM_16, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "dpcm-8", SF_FORMAT_DPCM_8, SPA_AUDIO_FORMAT_F32, 1 },
+
 };
 
 static const struct format_info *format_info_by_name(const char *str)
@@ -236,6 +258,14 @@ static const struct format_info *format_info_by_sf_format(int format)
 	return NULL;
 }
 
+static void list_formats(struct data *d)
+{
+
+	fprintf(stdout, _("Supported formats:\n"));
+	SPA_FOR_EACH_ELEMENT_VAR(format_info, i)
+		fprintf(stdout, "  %s\n", i->name);
+}
+
 static int sf_playback_fill_x8(struct data *d, void *dest, unsigned int n_frames, bool *null_frame)
 {
 	sf_count_t rn;
@@ -714,6 +744,34 @@ static int parse_channelmap(const char *channel_map, struct spa_audio_layout_inf
 	return 0;
 }
 
+static void list_layouts(struct data *d)
+{
+	fprintf(stderr, _("Supported channel layouts:\n"));
+	SPA_FOR_EACH_ELEMENT_VAR(spa_type_audio_layout_info, i) {
+		if (i->name == NULL)
+			break;
+		fprintf(stdout, "    %s: [", i->name);
+		for (uint32_t j = 0; j < i->layout.n_channels; j++)
+			fprintf(stdout, "%s%s", j == 0 ? " " : ", ",
+				spa_type_audio_channel_to_short_name(i->layout.position[j]));
+		fprintf(stdout, " ]\n");
+	}
+	fprintf(stderr, _("Supported channel layout aliases:\n"));
+	SPA_FOR_EACH_ELEMENT_VAR(maps, m)
+		fprintf(stdout, _("    %s -> %s\n"), m->name, m->alias);
+}
+
+static void list_channel_names(struct data *d)
+{
+	fprintf(stderr, _("Supported channel names:\n"));
+	SPA_FOR_EACH_ELEMENT_VAR(spa_type_audio_channel, i) {
+		if (i->name == NULL || SPA_AUDIO_CHANNEL_IS_AUX(i->type))
+			break;
+		fprintf(stdout, "    %s\n", spa_type_short_name(i->name));
+	}
+	fprintf(stderr, "    AUX0 ... AUX4095\n");
+}
+
 static int channelmap_default(struct spa_audio_layout_info *map, int n_channels)
 {
 	switch(n_channels) {
@@ -1054,6 +1112,11 @@ enum {
 	OPT_CHANNELMAP,
 	OPT_FORMAT,
 	OPT_VOLUME,
+	OPT_CONTAINER,
+	OPT_LISTFORMATS,
+	OPT_LISTCONTAINERS,
+	OPT_LISTLAYOUTS,
+	OPT_LISTCHANNELNAMES,
 };
 
 #ifdef HAVE_PW_CAT_FFMPEG_INTEGRATION
@@ -1088,13 +1151,18 @@ static const struct option long_options[] = {
 	{ "rate",		required_argument, NULL, OPT_RATE },
 	{ "channels",		required_argument, NULL, OPT_CHANNELS },
 	{ "channel-map",	required_argument, NULL, OPT_CHANNELMAP },
+	{ "list-layouts",	no_argument,       NULL, OPT_LISTLAYOUTS },
+	{ "list-channel-names",	no_argument,       NULL, OPT_LISTCHANNELNAMES },
 	{ "format",		required_argument, NULL, OPT_FORMAT },
+	{ "list-formats",	no_argument,       NULL, OPT_LISTFORMATS },
+	{ "container",		required_argument, NULL, OPT_CONTAINER },
+	{ "list-containers",	no_argument,       NULL, OPT_LISTCONTAINERS },
 	{ "volume",		required_argument, NULL, OPT_VOLUME },
 	{ "quality",		required_argument, NULL, 'q' },
-	{ "raw",		no_argument, NULL, 'a' },
+	{ "raw",		no_argument,       NULL, 'a' },
 	{ "force-midi",		required_argument, NULL, 'M' },
 	{ "sample-count",	required_argument, NULL, 'n' },
-	{ "midi-clip",		no_argument, NULL, 'c' },
+	{ "midi-clip",		no_argument,       NULL, 'c' },
 
 	{ NULL, 0, NULL, 0 }
 };
@@ -1131,12 +1199,17 @@ static void show_usage(const char *name, bool is_error)
 	     DEFAULT_TARGET, DEFAULT_LATENCY_PLAY);
 
 	fprintf(fp,
-	   _("      --rate                            Sample rate (req. for rec) (default %u)\n"
-	     "      --channels                        Number of channels (req. for rec) (default %u)\n"
+	   _("      --rate                            Sample rate (default %u)\n"
+	     "      --channels                        Number of channels (default %u)\n"
 	     "      --channel-map                     Channel map\n"
-	     "                                            one of: \"Stereo\", \"5.1\",... or\n"
+	     "                                            a channel layout: \"Stereo\", \"5.1\",... or\n"
 	     "                                            comma separated list of channel names: eg. \"FL,FR\"\n"
-	     "      --format                          Sample format %s (req. for rec) (default %s)\n"
+	     "      --list-layouts                    List supported channel layouts\n"
+	     "      --list-channel-names              List supported channel maps\n"
+	     "      --format                          Sample format (default %s)\n"
+	     "      --list-formats                    List supported sample formats\n"
+	     "      --container                       Container format\n"
+	     "      --list-containers                 List supported containers and extensions\n"
 	     "      --volume                          Stream volume 0-1.0 (default %.3f)\n"
 	     "  -q  --quality                         Resampler quality (0 - 15) (default %d)\n"
 	     "  -a, --raw                             RAW mode\n"
@@ -1145,7 +1218,7 @@ static void show_usage(const char *name, bool is_error)
 	     "\n"),
 	     DEFAULT_RATE,
 	     DEFAULT_CHANNELS,
-	     STR_FMTS, DEFAULT_FORMAT,
+	     DEFAULT_FORMAT,
 	     DEFAULT_VOLUME,
 	     DEFAULT_QUALITY);
 
@@ -1679,11 +1752,20 @@ static int fill_properties(struct data *data)
 
 	return 0;
 }
-static void format_from_filename(SF_INFO *info, const char *filename)
+static void format_from_filename(SF_INFO *info, const char *filename, const char *container)
 {
 	int i, count = 0;
 	int format = -1;
+	const char *extension;
 
+	if (spa_streq(filename, "-"))
+		extension = container ? container : "au";
+	else if (container)
+		extension = container;
+	else
+		extension = filename;
+
+	fprintf(stderr, "%s\n", filename);
 	if (sf_command(NULL, SFC_GET_FORMAT_MAJOR_COUNT, &count, sizeof(int)) != 0)
 		count = 0;
 
@@ -1695,7 +1777,7 @@ static void format_from_filename(SF_INFO *info, const char *filename)
 		if (sf_command(NULL, SFC_GET_FORMAT_MAJOR, &fi, sizeof(fi)) != 0)
 			continue;
 
-		if (spa_strendswith(filename, fi.extension)) {
+		if (spa_strendswith(extension, fi.extension)) {
 			format = fi.format;
 			break;
 		}
@@ -1712,7 +1794,7 @@ static void format_from_filename(SF_INFO *info, const char *filename)
 			if (sf_command(NULL, SFC_GET_SIMPLE_FORMAT, &fi, sizeof(fi)) != 0)
 				continue;
 
-			if (spa_strendswith(filename, fi.extension)) {
+			if (spa_strendswith(extension, fi.extension)) {
 				format = fi.format;
 				info->format = 0;
 				break;
@@ -1720,7 +1802,7 @@ static void format_from_filename(SF_INFO *info, const char *filename)
 		}
 	}
 	if (format == -1)
-		format = spa_streq(filename, "-") ? SF_FORMAT_AU : SF_FORMAT_WAV;
+		format = SF_FORMAT_WAV;
 	if (format == SF_FORMAT_WAV && info->channels > 2)
 		format = SF_FORMAT_WAVEX;
 
@@ -1738,6 +1820,26 @@ static void format_from_filename(SF_INFO *info, const char *filename)
 	info->format |= format;
 }
 
+static void list_containers(struct data *d)
+{
+	int i, count = 0;
+
+	fprintf(stderr, _("Supported containers and extensions:\n"));
+	if (sf_command(NULL, SFC_GET_FORMAT_MAJOR_COUNT, &count, sizeof(int)) != 0)
+		count = 0;
+
+	for (i = 0; i < count; i++) {
+		SF_FORMAT_INFO fi;
+
+		spa_zero(fi);
+		fi.format = i;
+		if (sf_command(NULL, SFC_GET_FORMAT_MAJOR, &fi, sizeof(fi)) != 0)
+			continue;
+
+		fprintf(stderr, "    %s: %s\n", fi.extension, fi.name);
+	}
+}
+
 #ifdef HAVE_PW_CAT_FFMPEG_INTEGRATION
 static int setup_encodedfile(struct data *data)
 {
@@ -1859,7 +1961,7 @@ static int setup_sndfile(struct data *data)
 		info.samplerate = data->rate;
 		info.channels = data->channels;
 		info.format = fi->sf_format;
-		format_from_filename(&info, data->filename);
+		format_from_filename(&info, data->filename, data->container);
 	}
 
 	data->sndfile.file = sf_open(data->filename,
@@ -2220,6 +2322,9 @@ int main(int argc, char *argv[])
 		case OPT_FORMAT:
 			data.format = optarg;
 			break;
+		case OPT_CONTAINER:
+			data.container = optarg;
+			break;
 
 		case OPT_VOLUME:
 			if (!spa_atof(optarg, &data.volume))
@@ -2231,6 +2336,18 @@ int main(int argc, char *argv[])
 		case 'c':
 			data.data_type = TYPE_MIDI2;
 			break;
+		case OPT_LISTFORMATS:
+			list_formats(&data);
+			return EXIT_SUCCESS;
+		case OPT_LISTCONTAINERS:
+			list_containers(&data);
+			return EXIT_SUCCESS;
+		case OPT_LISTLAYOUTS:
+			list_layouts(&data);
+			return EXIT_SUCCESS;
+		case OPT_LISTCHANNELNAMES:
+			list_channel_names(&data);
+			return EXIT_SUCCESS;
 		default:
 			goto error_usage;
 		}

From 494d72710872a594f919739f8c3492e98a3e6649 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 10 Feb 2026 13:18:01 +0100
Subject: [PATCH 051/263] channelmix: improve debug

Instead of printing lines and lines of numbers, format everything as
a matrix. Only do the work when debug is enabled.
---
 spa/plugins/audioconvert/channelmix-ops.c | 27 +++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/spa/plugins/audioconvert/channelmix-ops.c b/spa/plugins/audioconvert/channelmix-ops.c
index 4aa9e58c8..d832edf8c 100644
--- a/spa/plugins/audioconvert/channelmix-ops.c
+++ b/spa/plugins/audioconvert/channelmix-ops.c
@@ -825,7 +825,6 @@ static void impl_channelmix_set_volume(struct channelmix *mix, float volume, boo
 	for (i = 0; i < dst_chan; i++) {
 		for (j = 0; j < src_chan; j++) {
 			float v = mix->matrix[i][j];
-			spa_log_debug(mix->log, "%d %d: %f", i, j, v);
 			if (i == 0 && j == 0)
 				t = v;
 			else if (t != v)
@@ -840,7 +839,31 @@ static void impl_channelmix_set_volume(struct channelmix *mix, float volume, boo
 	SPA_FLAG_UPDATE(mix->flags, CHANNELMIX_FLAG_IDENTITY,
 			dst_chan == src_chan && SPA_FLAG_IS_SET(mix->flags, CHANNELMIX_FLAG_COPY));
 
-	spa_log_debug(mix->log, "flags:%08x", mix->flags);
+	if (SPA_UNLIKELY(spa_log_level_topic_enabled(mix->log,
+			SPA_LOG_TOPIC_DEFAULT, SPA_LOG_LEVEL_DEBUG))) {
+		char str1[1024], str2[1024];
+		struct spa_strbuf sb1, sb2;
+		spa_strbuf_init(&sb2, str2, sizeof(str2));
+		for (i = 0; i < dst_chan; i++) {
+			spa_strbuf_init(&sb1, str1, sizeof(str1));
+			for (j = 0; j < src_chan; j++) {
+				float v = mix->matrix[i][j];
+				if (i == 0)
+					spa_strbuf_append(&sb2, " %03d  ", j);
+				if (v == 0.0f)
+					spa_strbuf_append(&sb1, "      ");
+				else
+					spa_strbuf_append(&sb1, "%1.3f ", v);
+			}
+			if (i == 0 && sb2.pos > 0)
+				spa_log_debug(mix->log, "      %s", str2);
+			if (sb1.pos > 0)
+				spa_log_debug(mix->log, "%03d  %s %03d", i, str1, i);
+		}
+		if (sb2.pos > 0)
+			spa_log_debug(mix->log, "      %s", str2);
+		spa_log_debug(mix->log, "flags:%08x", mix->flags);
+	}
 }
 
 static void impl_channelmix_free(struct channelmix *mix)

From 47de1e15a47b058e0bc434a35b002535af4b2aa6 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 10 Feb 2026 13:34:44 +0100
Subject: [PATCH 052/263] channelmix: handle more than 64 channels

When setting up the mix matrix, don't just iterate over the first 64
(CHANNEL_BITS) positions because then we will never be able to configure
more than 64 channels in the matrix.

Instead iterate until we have filled all src and dst entries in the
matrix. For the first 64 positions we might need to check the channel
mask to get the right positions in our source matrix.

Fixes the channel mixer for >64 channels where the positions above 64
where 0 in the matrix and muted.

Fixes #5118
---
 spa/plugins/audioconvert/channelmix-ops.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/spa/plugins/audioconvert/channelmix-ops.c b/spa/plugins/audioconvert/channelmix-ops.c
index d832edf8c..12edb4b5a 100644
--- a/spa/plugins/audioconvert/channelmix-ops.c
+++ b/spa/plugins/audioconvert/channelmix-ops.c
@@ -720,7 +720,7 @@ done:
 	if (src_paired == 0)
 		src_paired = ~0LU;
 
-	for (jc = 0, ic = 0, i = 0; i < CHANNEL_BITS; i++) {
+	for (jc = 0, ic = 0, i = 0; ic < dst_chan; i++) {
 		float sum = 0.0f;
 		char str1[1024], str2[1024];
 		struct spa_strbuf sb1, sb2;
@@ -728,12 +728,10 @@ done:
 		spa_strbuf_init(&sb1, str1, sizeof(str1));
 		spa_strbuf_init(&sb2, str2, sizeof(str2));
 
-		if ((dst_paired & (1UL << i)) == 0)
+		if (i < CHANNEL_BITS && (dst_paired & (1UL << i)) == 0)
 			continue;
-		for (jc = 0, j = 0; j < CHANNEL_BITS; j++) {
-			if ((src_paired & (1UL << j)) == 0)
-				continue;
-			if (ic >= dst_chan || jc >= src_chan)
+		for (jc = 0, j = 0; jc < src_chan; j++) {
+			if (j < CHANNEL_BITS && (src_paired & (1UL << j)) == 0)
 				continue;
 
 			if (ic == 0)
@@ -752,7 +750,7 @@ done:
 		if (sb2.pos > 0)
 			spa_log_info(mix->log, "     %s", str2);
 		if (sb1.pos > 0) {
-			spa_log_info(mix->log, "%-4.4s %s   %f",
+			spa_log_info(mix->log, "%03d %-4.4s %s   %f", ic,
 					dst_mask == 0 ? "UNK" :
 					spa_debug_type_find_short_name(spa_type_audio_channel, i + _SH),
 					str1, sum);

From 12fb9ab831795acc928985dde00a4bec942a5fe7 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Wed, 11 Feb 2026 18:53:32 +0200
Subject: [PATCH 053/263] bluez5: use correct A2DP profile in codec switch

We can only switch within currently connected A2DP profiles, as
generally remote endpoints are available only for the connected ones.
---
 spa/plugins/bluez5/bluez5-device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spa/plugins/bluez5/bluez5-device.c b/spa/plugins/bluez5/bluez5-device.c
index a63361146..fc659f655 100644
--- a/spa/plugins/bluez5/bluez5-device.c
+++ b/spa/plugins/bluez5/bluez5-device.c
@@ -1485,7 +1485,7 @@ static int set_profile(struct impl *this, uint32_t profile, enum spa_bluetooth_a
 			profiles = this->bt_dev->profiles & SPA_BT_PROFILE_BAP_DUPLEX;
 			break;
 		case DEVICE_PROFILE_A2DP:
-			profiles = this->bt_dev->profiles & SPA_BT_PROFILE_A2DP_DUPLEX;
+			profiles = this->bt_dev->connected_profiles & SPA_BT_PROFILE_A2DP_DUPLEX;
 			break;
 		default:
 			profiles = 0;

From 11d5e071ecacf7aaf27e73b065dd50c8ba685054 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 12 Feb 2026 12:20:14 +0100
Subject: [PATCH 054/263] stream: return -EIO when doing get_time in !=
 STREAMING

The stream should be streaming before the get_time call is meaningful.

Various places in the code already check this an fall back to a default
value, we just need to return an error here.
---
 src/pipewire/filter.c   | 3 ++-
 src/pipewire/stream.c   | 3 ++-
 src/pipewire/stream.h   | 5 +++--
 src/tests/test-stream.c | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pipewire/filter.c b/src/pipewire/filter.c
index bb23c9d5c..85d16a6b1 100644
--- a/src/pipewire/filter.c
+++ b/src/pipewire/filter.c
@@ -1986,7 +1986,8 @@ int pw_filter_get_time(struct pw_filter *filter, struct pw_time *time)
 	pw_log_trace("%p: %"PRIi64" %"PRIi64" %"PRIu64" %d/%d ", filter,
 			time->now, time->delay, time->ticks,
 			time->rate.num, time->rate.denom);
-	return 0;
+
+	return filter->state == PW_FILTER_STATE_STREAMING ? 0 : -EIO;
 }
 
 SPA_EXPORT
diff --git a/src/pipewire/stream.c b/src/pipewire/stream.c
index 477861f61..4ee2138bc 100644
--- a/src/pipewire/stream.c
+++ b/src/pipewire/stream.c
@@ -2504,7 +2504,8 @@ int pw_stream_get_time_n(struct pw_stream *stream, struct pw_time *time, size_t
 			impl->dequeued.outcount, impl->dequeued.incount,
 			impl->queued.outcount, impl->queued.incount,
 			avail_buffers, impl->n_buffers);
-	return 0;
+
+	return stream->state == PW_STREAM_STATE_STREAMING ? 0 : -EIO;
 }
 
 SPA_EXPORT
diff --git a/src/pipewire/stream.h b/src/pipewire/stream.h
index 28b4eba1f..d5cd87188 100644
--- a/src/pipewire/stream.h
+++ b/src/pipewire/stream.h
@@ -293,7 +293,8 @@ struct pw_stream_control {
  * Use pw_stream_get_time_n() to get an updated time snapshot of the stream.
  * The time snapshot can give information about the time in the driver of the
  * graph, the delay to the edge of the graph and the internal queuing in the
- * stream.
+ * stream. This function should only be called in the STREAMING state and will
+ * return an error when called in any other state.
  *
  * pw_time.ticks gives a monotonic increasing counter of the time in the graph
  * driver. I can be used to generate a timeline to schedule samples as well
@@ -594,7 +595,7 @@ const struct pw_stream_control *pw_stream_get_control(struct pw_stream *stream,
 /** Set control values */
 int pw_stream_set_control(struct pw_stream *stream, uint32_t id, uint32_t n_values, float *values, ...);
 
-/** Query the time on the stream, RT safe */
+/** Query the time on the stream. Returns an error when the stream is not running. RT safe */
 int pw_stream_get_time_n(struct pw_stream *stream, struct pw_time *time, size_t size);
 
 /** Get the current time in nanoseconds. This value can be compared with
diff --git a/src/tests/test-stream.c b/src/tests/test-stream.c
index d56b6c85b..b5061e927 100644
--- a/src/tests/test-stream.c
+++ b/src/tests/test-stream.c
@@ -151,7 +151,7 @@ static void test_create(void)
 	/* check id, only when connected */
 	spa_assert_se(pw_stream_get_node_id(stream) == SPA_ID_INVALID);
 
-	spa_assert_se(pw_stream_get_time_n(stream, &tm, sizeof(tm)) == 0);
+	spa_assert_se(pw_stream_get_time_n(stream, &tm, sizeof(tm)) == -EIO);
 	spa_assert_se(tm.now == 0);
 	spa_assert_se(tm.rate.num == 0);
 	spa_assert_se(tm.rate.denom == 0);

From 7f08c0d404728a31c191a0f4bdfa315c7b0efbf4 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 12 Feb 2026 13:46:04 +0100
Subject: [PATCH 055/263] doc: fix a typo

---
 doc/dox/programs/pw-top.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/dox/programs/pw-top.1.md b/doc/dox/programs/pw-top.1.md
index e1a866b55..1207e3205 100644
--- a/doc/dox/programs/pw-top.1.md
+++ b/doc/dox/programs/pw-top.1.md
@@ -13,7 +13,7 @@ node and device statistics.
 
 A hierarchical view is shown of Driver nodes and follower nodes. The
 Driver nodes are actively using a timer to schedule dataflow in the
-followers. The followers of a driver node as shown below their driver
+followers. The followers of a driver node are shown below their driver
 with a + sign (or = for async nodes) in a tree-like representation.
 
 The columns presented are as follows:

From ca4fa88598fadcf723abd3c989ee93e43ac7d722 Mon Sep 17 00:00:00 2001
From: Jonas Holmberg <jonashg@axis.com>
Date: Thu, 12 Feb 2026 17:15:33 +0100
Subject: [PATCH 056/263] context: set time in position for drivers

Set time in position for drivers to make sure an old time isn't copied
by followers before the driver is started.
---
 src/pipewire/context.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pipewire/context.c b/src/pipewire/context.c
index ddcdd2cba..1c30be70a 100644
--- a/src/pipewire/context.c
+++ b/src/pipewire/context.c
@@ -1800,6 +1800,9 @@ again:
 			n->target_rate = n->rt.position->clock.target_rate;
 		}
 
+		if (n->info.state < PW_NODE_STATE_RUNNING)
+			n->rt.position->clock.nsec = get_time_ns(n->rt.target.system);
+
 		SPA_FLAG_UPDATE(n->rt.position->clock.flags,
 				SPA_IO_CLOCK_FLAG_LAZY, have_request && n->supports_lazy > 0);
 

From b0b6f6ca37fe758b77dbb93e58fe1498766e2418 Mon Sep 17 00:00:00 2001
From: lumingzh <lumingzh@qq.com>
Date: Fri, 13 Feb 2026 09:40:40 +0800
Subject: [PATCH 057/263] update Chinese translation

---
 po/zh_CN.po | 157 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 97 insertions(+), 60 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4181ef3df..8be588b03 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,15 +6,15 @@
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2010, 2012.
 # Frank Hill <hxf.prc@gmail.com>, 2015.
 # Mingye Wang (Arthur2e5) <arthur200126@gmail.com>, 2015.
-# lumingzh <lumingzh@qq.com>, 2024-2025.
+# lumingzh <lumingzh@qq.com>, 2024-2026.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pipewire.master-tx\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pipewire/pipewire/-/"
 "issues\n"
-"POT-Creation-Date: 2025-11-25 15:35+0000\n"
-"PO-Revision-Date: 2025-11-26 10:19+0800\n"
+"POT-Creation-Date: 2026-02-11 16:53+0000\n"
+"PO-Revision-Date: 2026-02-13 09:36+0800\n"
 "Last-Translator: lumingzh <lumingzh@qq.com>\n"
 "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -65,21 +65,46 @@ msgstr "虚拟输出"
 msgid "Tunnel for %s@%s"
 msgstr "用于 %s@%s 的隧道"
 
-#: src/modules/module-zeroconf-discover.c:320
+#: src/modules/module-zeroconf-discover.c:326
 msgid "Unknown device"
 msgstr "未知设备"
 
-#: src/modules/module-zeroconf-discover.c:332
+#: src/modules/module-zeroconf-discover.c:338
 #, c-format
 msgid "%s on %s@%s"
 msgstr "%2$s@%3$s 上的 %1$s"
 
-#: src/modules/module-zeroconf-discover.c:336
+#: src/modules/module-zeroconf-discover.c:342
 #, c-format
 msgid "%s on %s"
 msgstr "%2$s 上的 %1$s"
 
-#: src/tools/pw-cat.c:1088
+#: src/tools/pw-cat.c:264
+#, c-format
+msgid "Supported formats:\n"
+msgstr "支持的格式：\n"
+
+#: src/tools/pw-cat.c:749
+#, c-format
+msgid "Supported channel layouts:\n"
+msgstr "支持的声道布局：\n"
+
+#: src/tools/pw-cat.c:759
+#, c-format
+msgid "Supported channel layout aliases:\n"
+msgstr "支持的声道布局别名：\n"
+
+#: src/tools/pw-cat.c:761
+#, c-format
+msgid "    %s -> %s\n"
+msgstr "    %s -> %s\n"
+
+#: src/tools/pw-cat.c:766
+#, c-format
+msgid "Supported channel names:\n"
+msgstr "支持的声道名称：\n"
+
+#: src/tools/pw-cat.c:1177
 #, c-format
 msgid ""
 "%s [options] [<file>|-]\n"
@@ -94,7 +119,7 @@ msgstr ""
 "  -v, --verbose                         输出详细操作\n"
 "\n"
 
-#: src/tools/pw-cat.c:1095
+#: src/tools/pw-cat.c:1184
 #, c-format
 msgid ""
 "  -R, --remote                          Remote daemon name\n"
@@ -126,20 +151,23 @@ msgstr ""
 "  -P  --properties                      设置节点属性\n"
 "\n"
 
-#: src/tools/pw-cat.c:1113
+#: src/tools/pw-cat.c:1202
 #, c-format
 msgid ""
-"      --rate                            Sample rate (req. for rec) (default "
-"%u)\n"
-"      --channels                        Number of channels (req. for rec) "
-"(default %u)\n"
+"      --rate                            Sample rate (default %u)\n"
+"      --channels                        Number of channels (default %u)\n"
 "      --channel-map                     Channel map\n"
-"                                            one of: \"Stereo\", \"5.1\",... "
-"or\n"
+"                                            a channel layout: \"Stereo\", "
+"\"5.1\",... or\n"
 "                                            comma separated list of channel "
 "names: eg. \"FL,FR\"\n"
-"      --format                          Sample format %s (req. for rec) "
-"(default %s)\n"
+"      --list-layouts                    List supported channel layouts\n"
+"      --list-channel-names              List supported channel maps\n"
+"      --format                          Sample format (default %s)\n"
+"      --list-formats                    List supported sample formats\n"
+"      --container                       Container format\n"
+"      --list-containers                 List supported containers and "
+"extensions\n"
 "      --volume                          Stream volume 0-1.0 (default %.3f)\n"
 "  -q  --quality                         Resampler quality (0 - 15) (default "
 "%d)\n"
@@ -149,15 +177,19 @@ msgid ""
 "  -n, --sample-count COUNT              Stop after COUNT samples\n"
 "\n"
 msgstr ""
-"      --rate                            采样率 (录制模式需要) (默认 %u)\n"
-"      --channels                        通道数 (录制模式需要) (默认 %u)\n"
-"      --channel-map                     通道映射\n"
-"                                            \"stereo\", \"5.1\",... 中的其一"
-"或\n"
-"                                            以英文逗号分隔的通道名列表: 如 "
+"      --rate                            采样率 (默认 %u)\n"
+"      --channels                        声道数 (默认 %u)\n"
+"      --channel-map                     声道映射\n"
+"                                            声道布局：\"stereo\", "
+"\"5.1\",... 或\n"
+"                                            以英文逗号分隔的声道名列表: 如 "
 "\"FL,FR\"\n"
-"      --format                          采样格式 %s (录制模式需要) (默认 "
-"%s)\n"
+"      --list-layouts                    列出支持的声道布局\n"
+"      --list-channel-names              列出支持的声道映射\n"
+"      --format                          采样格式 (默认 %s)\n"
+"      --list-formats                    列出支持的采样格式\n"
+"      --container                       容器格式\n"
+"      --list-containers                 列出支持的容器和扩展\n"
 "      --volume                          媒体流音量 0-1.0 (默认 %.3f)\n"
 "  -q  --quality                         重采样质量 (0 - 15) (默认 %d)\n"
 "  -a, --raw                             原生模式\n"
@@ -166,7 +198,7 @@ msgstr ""
 "  -n, --sample-count COUNT              计数采样后停止\n"
 "\n"
 
-#: src/tools/pw-cat.c:1133
+#: src/tools/pw-cat.c:1227
 msgid ""
 "  -p, --playback                        Playback mode\n"
 "  -r, --record                          Recording mode\n"
@@ -186,6 +218,11 @@ msgstr ""
 "  -c, --midi-clip                       MIDI 剪辑模式\n"
 "\n"
 
+#: src/tools/pw-cat.c:1827
+#, c-format
+msgid "Supported containers and extensions:\n"
+msgstr "支持的容器和扩展：\n"
+
 #: src/tools/pw-cli.c:2386
 #, c-format
 msgid ""
@@ -209,7 +246,7 @@ msgid "Pro Audio"
 msgstr "专业音频"
 
 #: spa/plugins/alsa/acp/acp.c:537 spa/plugins/alsa/acp/alsa-mixer.c:4699
-#: spa/plugins/bluez5/bluez5-device.c:1976
+#: spa/plugins/bluez5/bluez5-device.c:2021
 msgid "Off"
 msgstr "关"
 
@@ -241,7 +278,7 @@ msgstr "输入插孔"
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:2726
 #: spa/plugins/alsa/acp/alsa-mixer.c:2810
-#: spa/plugins/bluez5/bluez5-device.c:2374
+#: spa/plugins/bluez5/bluez5-device.c:2422
 msgid "Microphone"
 msgstr "话筒"
 
@@ -307,15 +344,15 @@ msgid "No Bass Boost"
 msgstr "无重低音增强"
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:2741
-#: spa/plugins/bluez5/bluez5-device.c:2380
+#: spa/plugins/bluez5/bluez5-device.c:2428
 msgid "Speaker"
 msgstr "扬声器"
 
 #. Don't call it "headset", the HF one has the mic
 #: spa/plugins/alsa/acp/alsa-mixer.c:2742
 #: spa/plugins/alsa/acp/alsa-mixer.c:2820
-#: spa/plugins/bluez5/bluez5-device.c:2386
-#: spa/plugins/bluez5/bluez5-device.c:2453
+#: spa/plugins/bluez5/bluez5-device.c:2434
+#: spa/plugins/bluez5/bluez5-device.c:2501
 msgid "Headphones"
 msgstr "模拟耳机"
 
@@ -425,7 +462,7 @@ msgstr "立体声"
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:4535
 #: spa/plugins/alsa/acp/alsa-mixer.c:4693
-#: spa/plugins/bluez5/bluez5-device.c:2362
+#: spa/plugins/bluez5/bluez5-device.c:2410
 msgid "Headset"
 msgstr "耳机"
 
@@ -620,101 +657,101 @@ msgstr "内置音频"
 msgid "Modem"
 msgstr "调制解调器"
 
-#: spa/plugins/bluez5/bluez5-device.c:1987
+#: spa/plugins/bluez5/bluez5-device.c:2032
 msgid "Audio Gateway (A2DP Source & HSP/HFP AG)"
 msgstr "音频网关 (A2DP 信源 或 HSP/HFP 网关)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2016
+#: spa/plugins/bluez5/bluez5-device.c:2061
 msgid "Audio Streaming for Hearing Aids (ASHA Sink)"
 msgstr "助听器音频流 (ASHA 信宿)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2059
+#: spa/plugins/bluez5/bluez5-device.c:2104
 #, c-format
 msgid "High Fidelity Playback (A2DP Sink, codec %s)"
 msgstr "高保真回放 (A2DP 信宿, 编码 %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2062
+#: spa/plugins/bluez5/bluez5-device.c:2107
 #, c-format
 msgid "High Fidelity Duplex (A2DP Source/Sink, codec %s)"
 msgstr "高保真双工 (A2DP 信源/信宿, 编码 %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2070
+#: spa/plugins/bluez5/bluez5-device.c:2115
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "高保真回放 (A2DP 信宿)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2072
+#: spa/plugins/bluez5/bluez5-device.c:2117
 msgid "High Fidelity Duplex (A2DP Source/Sink)"
 msgstr "高保真双工 (A2DP 信源/信宿)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2146
+#: spa/plugins/bluez5/bluez5-device.c:2194
 #, c-format
 msgid "High Fidelity Playback (BAP Sink, codec %s)"
 msgstr "高保真回放 (BAP 信宿, 编码 %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2151
+#: spa/plugins/bluez5/bluez5-device.c:2199
 #, c-format
 msgid "High Fidelity Input (BAP Source, codec %s)"
 msgstr "高保真输入 (BAP 信源, 编码 %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2155
+#: spa/plugins/bluez5/bluez5-device.c:2203
 #, c-format
 msgid "High Fidelity Duplex (BAP Source/Sink, codec %s)"
 msgstr "高保真双工 (BAP 信源/信宿, 编码 %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2164
+#: spa/plugins/bluez5/bluez5-device.c:2212
 msgid "High Fidelity Playback (BAP Sink)"
 msgstr "高保真回放 (BAP 信宿)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2168
+#: spa/plugins/bluez5/bluez5-device.c:2216
 msgid "High Fidelity Input (BAP Source)"
 msgstr "高保真输入 (BAP 信源)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2171
+#: spa/plugins/bluez5/bluez5-device.c:2219
 msgid "High Fidelity Duplex (BAP Source/Sink)"
 msgstr "高保真双工 (BAP 信源/信宿)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2211
+#: spa/plugins/bluez5/bluez5-device.c:2259
 #, c-format
 msgid "Headset Head Unit (HSP/HFP, codec %s)"
 msgstr "头戴式耳机单元 (HSP/HFP, 编码 %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2363
-#: spa/plugins/bluez5/bluez5-device.c:2368
-#: spa/plugins/bluez5/bluez5-device.c:2375
-#: spa/plugins/bluez5/bluez5-device.c:2381
-#: spa/plugins/bluez5/bluez5-device.c:2387
-#: spa/plugins/bluez5/bluez5-device.c:2393
-#: spa/plugins/bluez5/bluez5-device.c:2399
-#: spa/plugins/bluez5/bluez5-device.c:2405
 #: spa/plugins/bluez5/bluez5-device.c:2411
+#: spa/plugins/bluez5/bluez5-device.c:2416
+#: spa/plugins/bluez5/bluez5-device.c:2423
+#: spa/plugins/bluez5/bluez5-device.c:2429
+#: spa/plugins/bluez5/bluez5-device.c:2435
+#: spa/plugins/bluez5/bluez5-device.c:2441
+#: spa/plugins/bluez5/bluez5-device.c:2447
+#: spa/plugins/bluez5/bluez5-device.c:2453
+#: spa/plugins/bluez5/bluez5-device.c:2459
 msgid "Handsfree"
 msgstr "免提"
 
-#: spa/plugins/bluez5/bluez5-device.c:2369
+#: spa/plugins/bluez5/bluez5-device.c:2417
 msgid "Handsfree (HFP)"
 msgstr "免提（HFP）"
 
-#: spa/plugins/bluez5/bluez5-device.c:2392
+#: spa/plugins/bluez5/bluez5-device.c:2440
 msgid "Portable"
 msgstr "便携式"
 
-#: spa/plugins/bluez5/bluez5-device.c:2398
+#: spa/plugins/bluez5/bluez5-device.c:2446
 msgid "Car"
 msgstr "车内"
 
-#: spa/plugins/bluez5/bluez5-device.c:2404
+#: spa/plugins/bluez5/bluez5-device.c:2452
 msgid "HiFi"
 msgstr "高保真"
 
-#: spa/plugins/bluez5/bluez5-device.c:2410
+#: spa/plugins/bluez5/bluez5-device.c:2458
 msgid "Phone"
 msgstr "电话"
 
-#: spa/plugins/bluez5/bluez5-device.c:2417
+#: spa/plugins/bluez5/bluez5-device.c:2465
 msgid "Bluetooth"
 msgstr "蓝牙"
 
-#: spa/plugins/bluez5/bluez5-device.c:2418
+#: spa/plugins/bluez5/bluez5-device.c:2466
 msgid "Bluetooth Handsfree"
 msgstr "蓝牙免提"
 

From 5f12dd99a3b0da3ee2768ea8b12b7018571b58d0 Mon Sep 17 00:00:00 2001
From: Alexander Sarmanow <a.sarmanow@televic.com>
Date: Tue, 10 Feb 2026 18:34:27 +0100
Subject: [PATCH 058/263] bluez5: add adapter reference to remote_endpoint

This should make adapter members easier accessible via remote endpoints.
---
 spa/plugins/bluez5/bluez5-dbus.c | 42 +++++++++++++++++++++++++-------
 spa/plugins/bluez5/defs.h        |  1 +
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/spa/plugins/bluez5/bluez5-dbus.c b/spa/plugins/bluez5/bluez5-dbus.c
index 651d410c9..43a108b2d 100644
--- a/spa/plugins/bluez5/bluez5-dbus.c
+++ b/spa/plugins/bluez5/bluez5-dbus.c
@@ -148,6 +148,7 @@ struct spa_bt_monitor {
 struct spa_bt_remote_endpoint {
 	struct spa_list link;
 	struct spa_list device_link;
+	struct spa_list adapter_link;
 	struct spa_bt_monitor *monitor;
 	char *path;
 	char *transport_path;
@@ -155,6 +156,7 @@ struct spa_bt_remote_endpoint {
 	char *uuid;
 	unsigned int codec;
 	struct spa_bt_device *device;
+	struct spa_bt_adapter *adapter;
 	uint8_t *capabilities;
 	size_t capabilities_len;
 	uint8_t *metadata;
@@ -1641,6 +1643,8 @@ static struct spa_bt_adapter *adapter_create(struct spa_bt_monitor *monitor, con
 	d->monitor = monitor;
 	d->path = strdup(path);
 
+	spa_list_init(&d->remote_endpoint_list);
+
 	spa_list_prepend(&monitor->adapter_list, &d->link);
 
 	adapter_init_bus_type(monitor, d);
@@ -1655,6 +1659,7 @@ static void adapter_free(struct spa_bt_adapter *adapter)
 {
 	struct spa_bt_monitor *monitor = adapter->monitor;
 	struct spa_bt_device *d, *td;
+	struct spa_bt_remote_endpoint *ep, *tep;
 
 	spa_log_debug(monitor->log, "%p", adapter);
 
@@ -1663,6 +1668,13 @@ static void adapter_free(struct spa_bt_adapter *adapter)
 		if (d->adapter == adapter)
 			device_free(d);
 
+	spa_list_for_each_safe(ep, tep, &adapter->remote_endpoint_list, adapter_link) {
+		if (ep->adapter == adapter) {
+			spa_list_remove(&ep->adapter_link);
+			ep->adapter = NULL;
+		}
+	}
+
 	spa_bt_player_destroy(adapter->dummy_player);
 
 	spa_list_remove(&adapter->link);
@@ -3024,19 +3036,31 @@ static int remote_endpoint_update_props(struct spa_bt_remote_endpoint *remote_en
 			}
 			else if (spa_streq(key, "Device")) {
 				struct spa_bt_device *device;
+				struct spa_bt_adapter *adapter;
 
 				device = spa_bt_device_find(monitor, value);
-				if (device == NULL)
-					goto next;
+				adapter = adapter_find(monitor, value);
+				if (device != NULL) {
+					spa_log_debug(monitor->log, "remote_endpoint %p: device -> %p", remote_endpoint, device);
 
-				spa_log_debug(monitor->log, "remote_endpoint %p: device -> %p", remote_endpoint, device);
+					if (remote_endpoint->device != device) {
+						if (remote_endpoint->device != NULL)
+							spa_list_remove(&remote_endpoint->device_link);
+						remote_endpoint->device = device;
+						if (device != NULL)
+							spa_list_append(&device->remote_endpoint_list, &remote_endpoint->device_link);
+					}
+				}
+				if (adapter != NULL) {
+					spa_log_debug(monitor->log, "remote_endpoint %p: adapter -> %p", remote_endpoint, adapter);
 
-				if (remote_endpoint->device != device) {
-					if (remote_endpoint->device != NULL)
-						spa_list_remove(&remote_endpoint->device_link);
-					remote_endpoint->device = device;
-					if (device != NULL)
-						spa_list_append(&device->remote_endpoint_list, &remote_endpoint->device_link);
+					if (remote_endpoint->adapter != adapter) {
+						if (remote_endpoint->adapter != NULL)
+							spa_list_remove(&remote_endpoint->adapter_link);
+						remote_endpoint->adapter = adapter;
+						if (adapter != NULL)
+							spa_list_append(&adapter->remote_endpoint_list, &remote_endpoint->adapter_link);
+					}
 				}
 			} else if (spa_streq(key, "Transport")) {
 				/* For ASHA */
diff --git a/spa/plugins/bluez5/defs.h b/spa/plugins/bluez5/defs.h
index afc56c920..24a85a5c9 100644
--- a/spa/plugins/bluez5/defs.h
+++ b/spa/plugins/bluez5/defs.h
@@ -379,6 +379,7 @@ struct spa_bt_adapter {
 	unsigned int has_media1_interface:1;
 	unsigned int le_audio_bcast_supported:1;
 	unsigned int tx_timestamping_supported:1;
+	struct spa_list remote_endpoint_list;
 };
 
 enum spa_bt_form_factor {

From 5c9b3ee05a18cfca72a7d161ed6cbb1ecf845cbe Mon Sep 17 00:00:00 2001
From: Alexander Sarmanow <a.sarmanow@televic.com>
Date: Tue, 10 Feb 2026 18:36:45 +0100
Subject: [PATCH 059/263] bluez5: bap: use BD address for per-adapter BIG
 config

HCI indexed names are not stable. The adapters BD address is here a
better approach to map the configuration.
---
 doc/dox/config/pipewire-props.7.md |  2 +-
 spa/plugins/bluez5/bluez5-dbus.c   | 25 +++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/doc/dox/config/pipewire-props.7.md b/doc/dox/config/pipewire-props.7.md
index cbefba992..e561979d5 100644
--- a/doc/dox/config/pipewire-props.7.md
+++ b/doc/dox/config/pipewire-props.7.md
@@ -1211,7 +1211,7 @@ PipeWire Opus Pro audio profile duplex max bitrate.
 PipeWire Opus Pro audio profile duplex frame duration (1/10 ms).
 
 @PAR@ monitor-prop  bluez5.bcast_source.config = []  # JSON
-For a per-adapter configuration of multiple BIGs use an "adapter" entry in the BIG with the HCI device name (e.g. hci0).
+For a per-adapter configuration of multiple BIGs use an "adapter" entry in the BIG with the BD address.
 \parblock
 Example:
 ```
diff --git a/spa/plugins/bluez5/bluez5-dbus.c b/spa/plugins/bluez5/bluez5-dbus.c
index 43a108b2d..21ab69dcf 100644
--- a/spa/plugins/bluez5/bluez5-dbus.c
+++ b/spa/plugins/bluez5/bluez5-dbus.c
@@ -196,7 +196,7 @@ struct spa_bt_bis {
 };
 
 #define BROADCAST_CODE_LEN	16
-#define HCI_DEV_NAME_LEN	8
+#define BD_ADDR_STR_LEN		17
 
 struct spa_bt_big {
 	struct spa_list link;
@@ -205,7 +205,7 @@ struct spa_bt_big {
 	struct spa_list bis_list;
 	int big_id;
 	int sync_factor;
-	char adapter[HCI_DEV_NAME_LEN];
+	char adapter[BD_ADDR_STR_LEN + 3];
 };
 
 /*
@@ -6269,6 +6269,7 @@ static void configure_bis(struct spa_bt_monitor *monitor,
 }
 
 static void configure_bcast_source(struct spa_bt_monitor *monitor,
+				struct spa_bt_remote_endpoint *ep,
 				const struct media_codec *codec,
 				DBusConnection *conn,
 				const char *object_path,
@@ -6277,15 +6278,19 @@ static void configure_bcast_source(struct spa_bt_monitor *monitor,
 {
 	struct spa_bt_big *big;
 	struct spa_bt_bis *bis;
-	char *pos;
+
 	/* Configure each BIS from a BIG */
 	spa_list_for_each(big, &monitor->bcast_source_config_list, link) {
 		/* Apply per adapter configuration if BIG has an adapter value stated,
 		 * otherwise apply the BIG config angnostically to each adapter
 		 */
-		if (strlen(big->adapter) > 0) {
-			pos = strstr(object_path, big->adapter);
-			if (pos == NULL)
+		if ((strlen(big->adapter) > 0) && (ep->adapter != NULL)) {
+			if (!ep->adapter->address) {
+				spa_log_warn(monitor->log, "this adapter is not associated with any BD address. BIG config will applied agnostically to any adapter!");
+				continue;
+			}
+
+			if (strcasecmp(ep->adapter->address, big->adapter))
 				continue;
 
 			spa_log_debug(monitor->log, "configuring BIG for adapter=%s", big->adapter);
@@ -6414,7 +6419,7 @@ static void interface_added(struct spa_bt_monitor *monitor,
 			}
 
 			if (local_endpoint != NULL)
-				configure_bcast_source(monitor, monitor->media_codecs[i], conn, object_path, interface_name, local_endpoint);
+				configure_bcast_source(monitor, ep, monitor->media_codecs[i], conn, object_path, interface_name, local_endpoint);
 		}
 	}
 }
@@ -7034,7 +7039,6 @@ static void parse_broadcast_source_config(struct spa_bt_monitor *monitor, const
 	char bis_key[256];
 	char qos_key[256];
 	char bcode[BROADCAST_CODE_LEN + 3];
-	char adapter[HCI_DEV_NAME_LEN + 3];
 	int cursor;
 	int big_id = 0;
 	struct spa_json it[3], it_array[4];
@@ -7071,11 +7075,8 @@ static void parse_broadcast_source_config(struct spa_bt_monitor *monitor, const
 				memcpy(big_entry->broadcast_code, bcode, strlen(bcode));
 				spa_log_debug(monitor->log, "big_entry->broadcast_code %s", big_entry->broadcast_code);
 			} else if (spa_streq(key, "adapter")) {
-				if (spa_json_get_string(&it[1], adapter, sizeof(adapter)) <= 0)
+				if (spa_json_get_string(&it[1], big_entry->adapter, sizeof(big_entry->adapter)) <= 0)
 					goto parse_failed;
-				if (strlen(adapter) > HCI_DEV_NAME_LEN)
-					goto parse_failed;
-				memcpy(big_entry->adapter, adapter, strlen(adapter));
 				spa_log_debug(monitor->log, "big_entry->adapter %s", big_entry->adapter);
 			} else if (spa_streq(key, "encryption")) {
 				if (spa_json_get_bool(&it[0], &big_entry->encryption) <= 0)

From 63129dd3dc2eda1a41ee5935e3412be5cc246249 Mon Sep 17 00:00:00 2001
From: Alexander Sarmanow <a.sarmanow@televic.com>
Date: Thu, 12 Feb 2026 10:51:38 +0100
Subject: [PATCH 060/263] fixup

---
 spa/plugins/bluez5/bluez5-dbus.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/spa/plugins/bluez5/bluez5-dbus.c b/spa/plugins/bluez5/bluez5-dbus.c
index 21ab69dcf..4b06093fa 100644
--- a/spa/plugins/bluez5/bluez5-dbus.c
+++ b/spa/plugins/bluez5/bluez5-dbus.c
@@ -3040,6 +3040,7 @@ static int remote_endpoint_update_props(struct spa_bt_remote_endpoint *remote_en
 
 				device = spa_bt_device_find(monitor, value);
 				adapter = adapter_find(monitor, value);
+
 				if (device != NULL) {
 					spa_log_debug(monitor->log, "remote_endpoint %p: device -> %p", remote_endpoint, device);
 
@@ -3047,8 +3048,7 @@ static int remote_endpoint_update_props(struct spa_bt_remote_endpoint *remote_en
 						if (remote_endpoint->device != NULL)
 							spa_list_remove(&remote_endpoint->device_link);
 						remote_endpoint->device = device;
-						if (device != NULL)
-							spa_list_append(&device->remote_endpoint_list, &remote_endpoint->device_link);
+						spa_list_append(&device->remote_endpoint_list, &remote_endpoint->device_link);
 					}
 				}
 				if (adapter != NULL) {
@@ -3058,8 +3058,7 @@ static int remote_endpoint_update_props(struct spa_bt_remote_endpoint *remote_en
 						if (remote_endpoint->adapter != NULL)
 							spa_list_remove(&remote_endpoint->adapter_link);
 						remote_endpoint->adapter = adapter;
-						if (adapter != NULL)
-							spa_list_append(&adapter->remote_endpoint_list, &remote_endpoint->adapter_link);
+						spa_list_append(&adapter->remote_endpoint_list, &remote_endpoint->adapter_link);
 					}
 				}
 			} else if (spa_streq(key, "Transport")) {
@@ -3197,6 +3196,9 @@ static void remote_endpoint_free(struct spa_bt_remote_endpoint *remote_endpoint)
 	if (remote_endpoint->device)
 		spa_list_remove(&remote_endpoint->device_link);
 
+	if (remote_endpoint->adapter)
+		spa_list_remove(&remote_endpoint->adapter_link);
+
 	bap_features_clear(&remote_endpoint->bap_features);
 
 	spa_list_remove(&remote_endpoint->link);

From 7dd2c60b12b8295206bfbe231fcbaa4e3a6f9adb Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Mon, 24 Nov 2025 14:36:32 +0100
Subject: [PATCH 061/263] bluez5: synchronize transport state after acquire of
 an acquired transport

With keepalive enabled, we need to emit state change event on acquire
similarly as we do if refcount was already positive.

Co-authored-by: Martin Geier <martin.geier@streamunlimited.com>
---
 spa/plugins/bluez5/bluez5-dbus.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spa/plugins/bluez5/bluez5-dbus.c b/spa/plugins/bluez5/bluez5-dbus.c
index 4b06093fa..21a5e53de 100644
--- a/spa/plugins/bluez5/bluez5-dbus.c
+++ b/spa/plugins/bluez5/bluez5-dbus.c
@@ -3419,8 +3419,12 @@ int spa_bt_transport_acquire(struct spa_bt_transport *transport, bool optional)
 
 	if (!transport->acquired)
 		res = spa_bt_transport_impl(transport, acquire, 0, optional);
-	else
-		res = 0;
+	else {
+		/* keepalive */
+		transport->acquire_refcount = 1;
+		spa_bt_transport_emit_state_changed(transport, transport->state, transport->state);
+		return 0;
+	}
 
 	if (res >= 0) {
 		transport->acquire_refcount = 1;

From fc723d7b156ccd0d37036d267e3a024e6963801e Mon Sep 17 00:00:00 2001
From: Yedaya Katsman <yedaya.ka@gmail.com>
Date: Sun, 15 Feb 2026 10:18:34 +0000
Subject: [PATCH 062/263] pw-mon: Fix help message for --hide-params

---
 src/tools/pw-mon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/pw-mon.c b/src/tools/pw-mon.c
index e66de979c..b4601b906 100644
--- a/src/tools/pw-mon.c
+++ b/src/tools/pw-mon.c
@@ -780,7 +780,7 @@ static void show_help(const char *name, bool error)
 		"  -N, --no-colors                       disable color output\n"
 		"  -C, --color[=WHEN]                    whether to enable color support. WHEN is `never`, `always`, or `auto`\n"
 		"  -o, --hide-props                      hide node properties\n"
-		"  -a, --hide-params                     hide node properties\n"
+		"  -a, --hide-params                     hide node parameters\n"
 		"  -p, --print-separator                 print empty line after every event to help streaming parser\n",
 		name);
 }

From de778e623504d614f4ccca21a5acefce95ed6565 Mon Sep 17 00:00:00 2001
From: filmsi <miles@filmsi.net>
Date: Sun, 15 Feb 2026 15:28:34 +0000
Subject: [PATCH 063/263] Replace sl.po

---
 po/sl.po | 155 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 95 insertions(+), 60 deletions(-)

diff --git a/po/sl.po b/po/sl.po
index ae85f043f..cf92eaffc 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,23 +2,21 @@
 # Copyright (C) 2024 PipeWire's COPYRIGHT HOLDER
 # This file is distributed under the same license as the PipeWire package.
 #
-# Martin <miles@filmsi.net>, 2024, 2025.
+# Martin <miles@filmsi.net>, 2024, 2025, 2026.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PipeWire master\n"
-"Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pipewire/pipewire/-/"
-"issues\n"
-"POT-Creation-Date: 2025-12-04 15:34+0000\n"
-"PO-Revision-Date: 2025-12-07 08:53+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues\n"
+"POT-Creation-Date: 2026-02-09 12:55+0000\n"
+"PO-Revision-Date: 2026-02-15 16:18+0100\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: Slovenian <gnome-si@googlegroups.com>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100>=3 && n"
-"%100<=4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100>=3 && n%100<=4 ? 2 : 3);\n"
 "X-Generator: Poedit 2.2.1\n"
 
 #: src/daemon/pipewire.c:29
@@ -35,8 +33,7 @@ msgstr ""
 "  -h, --help                            Pokaži to pomoč\n"
 "  -v, --verbose                         Povečaj opisnost za eno raven\n"
 "      --version                         Pokaži različico\n"
-"  -c, --config                          Naloži prilagoditev config (privzeto "
-"%s)\n"
+"  -c, --config                          Naloži prilagoditev config (privzeto %s)\n"
 "  -P  --properties                      Določi lastnosti konteksta\n"
 
 #: src/daemon/pipewire.desktop.in:3
@@ -62,21 +59,46 @@ msgstr "Lažni izhod"
 msgid "Tunnel for %s@%s"
 msgstr "Prehod za %s@%s"
 
-#: src/modules/module-zeroconf-discover.c:320
+#: src/modules/module-zeroconf-discover.c:326
 msgid "Unknown device"
 msgstr "Neznana naprava"
 
-#: src/modules/module-zeroconf-discover.c:332
+#: src/modules/module-zeroconf-discover.c:338
 #, c-format
 msgid "%s on %s@%s"
 msgstr "%s na %s@%s"
 
-#: src/modules/module-zeroconf-discover.c:336
+#: src/modules/module-zeroconf-discover.c:342
 #, c-format
 msgid "%s on %s"
 msgstr "%s na %s"
 
-#: src/tools/pw-cat.c:1103
+#: src/tools/pw-cat.c:264
+#, c-format
+msgid "Supported formats:\n"
+msgstr "Podprti zapisi:\n"
+
+#: src/tools/pw-cat.c:749
+#, c-format
+msgid "Supported channel layouts:\n"
+msgstr "Podprte postavitve kanalov:\n"
+
+#: src/tools/pw-cat.c:759
+#, c-format
+msgid "Supported channel layout aliases:\n"
+msgstr "Podprti vzdevki postavitev kanalov:\n"
+
+#: src/tools/pw-cat.c:761
+#, c-format
+msgid "    %s -> %s\n"
+msgstr "    %s -> %s\n"
+
+#: src/tools/pw-cat.c:766
+#, c-format
+msgid "Supported channel names:\n"
+msgstr "Podprta imena kanalov:\n"
+
+#: src/tools/pw-cat.c:1177
 #, c-format
 msgid ""
 "%s [options] [<file>|-]\n"
@@ -92,7 +114,7 @@ msgstr ""
 "\n"
 "</file>\n"
 
-#: src/tools/pw-cat.c:1110
+#: src/tools/pw-cat.c:1184
 #, c-format
 msgid ""
 "  -R, --remote                          Remote daemon name\n"
@@ -129,20 +151,23 @@ msgstr ""
 "  -P  --properties                      Nastavi lastnosti vozlišča\n"
 "\n"
 
-#: src/tools/pw-cat.c:1128
+#: src/tools/pw-cat.c:1202
 #, c-format
 msgid ""
-"      --rate                            Sample rate (req. for rec) (default "
-"%u)\n"
-"      --channels                        Number of channels (req. for rec) "
-"(default %u)\n"
+"      --rate                            Sample rate (default %u)\n"
+"      --channels                        Number of channels (default %u)\n"
 "      --channel-map                     Channel map\n"
-"                                            one of: \"Stereo\", \"5.1\",... "
-"or\n"
+"                                            a channel layout: \"Stereo\", "
+"\"5.1\",... or\n"
 "                                            comma separated list of channel "
 "names: eg. \"FL,FR\"\n"
-"      --format                          Sample format %s (req. for rec) "
-"(default %s)\n"
+"      --list-layouts                    List supported channel layouts\n"
+"      --list-channel-names              List supported channel maps\n"
+"      --format                          Sample format (default %s)\n"
+"      --list-formats                    List supported sample formats\n"
+"      --container                       Container format\n"
+"      --list-containers                 List supported containers and "
+"extensions\n"
 "      --volume                          Stream volume 0-1.0 (default %.3f)\n"
 "  -q  --quality                         Resampler quality (0 - 15) (default "
 "%d)\n"
@@ -161,8 +186,13 @@ msgstr ""
 "\"5.1\",... ali\n"
 "                                            seznam imen kanalov, ločen z "
 "vejico: npr. \"FL,FR\"\n"
-"      --format                          Vzorčne oblike zapisa %s (zahtevano "
-"za rec) (privzeto %s)\n"
+"      —list-layouts                    Izpiše podprte postavitve kanalov\n"
+"      —list-channel-names              Izpiše podprte preslikave kanalov\n"
+"      --format                          Oblika zapisa vzorcev (privzeto %s)\n"
+"      —list-formats                    Izpiše podprte zapise vzorcev\n"
+"      —container                       Oblika vsebnika\n"
+"      —list-containers                 Seznam podprtih vsebnikov in "
+"razširitev\n"
 "      --volume                          Glasnost toka 0-1.0 (privzeto %.3f)\n"
 "  -q  --quality                         Kakovost prevzorčenja (0 - 15) "
 "(privzeto %d)\n"
@@ -172,7 +202,7 @@ msgstr ""
 "  -n, --sample-count ŠTEVEC              Ustavi po ŠTEVEC vzorcih\n"
 "\n"
 
-#: src/tools/pw-cat.c:1148
+#: src/tools/pw-cat.c:1227
 msgid ""
 "  -p, --playback                        Playback mode\n"
 "  -r, --record                          Recording mode\n"
@@ -192,6 +222,11 @@ msgstr ""
 "  -c, --midi-clip                       Način posnetka MIDI\n"
 "\n"
 
+#: src/tools/pw-cat.c:1827
+#, c-format
+msgid "Supported containers and extensions:\n"
+msgstr "Podprti vsebniki in razširitve:\n"
+
 #: src/tools/pw-cli.c:2386
 #, c-format
 msgid ""
@@ -217,7 +252,7 @@ msgid "Pro Audio"
 msgstr "Profesionalni zvok"
 
 #: spa/plugins/alsa/acp/acp.c:537 spa/plugins/alsa/acp/alsa-mixer.c:4699
-#: spa/plugins/bluez5/bluez5-device.c:1976
+#: spa/plugins/bluez5/bluez5-device.c:2021
 msgid "Off"
 msgstr "Izklopljeno"
 
@@ -249,7 +284,7 @@ msgstr "Linijski vhod"
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:2726
 #: spa/plugins/alsa/acp/alsa-mixer.c:2810
-#: spa/plugins/bluez5/bluez5-device.c:2374
+#: spa/plugins/bluez5/bluez5-device.c:2422
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -315,15 +350,15 @@ msgid "No Bass Boost"
 msgstr "Brez ojačitve nizkih tonov"
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:2741
-#: spa/plugins/bluez5/bluez5-device.c:2380
+#: spa/plugins/bluez5/bluez5-device.c:2428
 msgid "Speaker"
 msgstr "Zvočnik"
 
 #. Don't call it "headset", the HF one has the mic
 #: spa/plugins/alsa/acp/alsa-mixer.c:2742
 #: spa/plugins/alsa/acp/alsa-mixer.c:2820
-#: spa/plugins/bluez5/bluez5-device.c:2386
-#: spa/plugins/bluez5/bluez5-device.c:2453
+#: spa/plugins/bluez5/bluez5-device.c:2434
+#: spa/plugins/bluez5/bluez5-device.c:2501
 msgid "Headphones"
 msgstr "Slušalke"
 
@@ -433,7 +468,7 @@ msgstr "Stereo"
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:4535
 #: spa/plugins/alsa/acp/alsa-mixer.c:4693
-#: spa/plugins/bluez5/bluez5-device.c:2362
+#: spa/plugins/bluez5/bluez5-device.c:2410
 msgid "Headset"
 msgstr "Slušalka"
 
@@ -680,100 +715,100 @@ msgstr "Vgrajen zvok"
 msgid "Modem"
 msgstr "Modem"
 
-#: spa/plugins/bluez5/bluez5-device.c:1987
+#: spa/plugins/bluez5/bluez5-device.c:2032
 msgid "Audio Gateway (A2DP Source & HSP/HFP AG)"
 msgstr "Zvožni prehod (vir A2DP in HSP/HFP AG)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2016
+#: spa/plugins/bluez5/bluez5-device.c:2061
 msgid "Audio Streaming for Hearing Aids (ASHA Sink)"
 msgstr "Pretakanje zvoka za slušne aparate (ponor ASHA)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2059
+#: spa/plugins/bluez5/bluez5-device.c:2104
 #, c-format
 msgid "High Fidelity Playback (A2DP Sink, codec %s)"
 msgstr "Predvajanje visoke ločljivosti (ponor A2DP, kodek %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2062
+#: spa/plugins/bluez5/bluez5-device.c:2107
 #, c-format
 msgid "High Fidelity Duplex (A2DP Source/Sink, codec %s)"
 msgstr "Dupleks visoke ločljivosti (vir/ponor A2DP, kodek %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2070
+#: spa/plugins/bluez5/bluez5-device.c:2115
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Predvajanje visoke ločljivosti (ponor A2DP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2072
+#: spa/plugins/bluez5/bluez5-device.c:2117
 msgid "High Fidelity Duplex (A2DP Source/Sink)"
 msgstr "Dupleks visoke ločljivosti (vir/ponor A2DP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2146
+#: spa/plugins/bluez5/bluez5-device.c:2194
 #, c-format
 msgid "High Fidelity Playback (BAP Sink, codec %s)"
 msgstr "Predvajanje visoke ločljivosti (ponor BAP, kodek %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2151
+#: spa/plugins/bluez5/bluez5-device.c:2199
 #, c-format
 msgid "High Fidelity Input (BAP Source, codec %s)"
 msgstr "Vhod visoke ločljivosti (vir BAP, kodek %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2155
+#: spa/plugins/bluez5/bluez5-device.c:2203
 #, c-format
 msgid "High Fidelity Duplex (BAP Source/Sink, codec %s)"
 msgstr "Dupleks visoke ločljivosti (vir/ponor BAP, kodek %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2164
+#: spa/plugins/bluez5/bluez5-device.c:2212
 msgid "High Fidelity Playback (BAP Sink)"
 msgstr "Predvajanje visoke ločljivosti (ponor BAP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2168
+#: spa/plugins/bluez5/bluez5-device.c:2216
 msgid "High Fidelity Input (BAP Source)"
 msgstr "Vhod visoke ločljivosti (vir BAP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2171
+#: spa/plugins/bluez5/bluez5-device.c:2219
 msgid "High Fidelity Duplex (BAP Source/Sink)"
 msgstr "Dupleks visoke ločljivosti (vir/ponor BAP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2211
+#: spa/plugins/bluez5/bluez5-device.c:2259
 #, c-format
 msgid "Headset Head Unit (HSP/HFP, codec %s)"
 msgstr "Naglavna enota slušalk (HSP/HFP, kodek %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2363
-#: spa/plugins/bluez5/bluez5-device.c:2368
-#: spa/plugins/bluez5/bluez5-device.c:2375
-#: spa/plugins/bluez5/bluez5-device.c:2381
-#: spa/plugins/bluez5/bluez5-device.c:2387
-#: spa/plugins/bluez5/bluez5-device.c:2393
-#: spa/plugins/bluez5/bluez5-device.c:2399
-#: spa/plugins/bluez5/bluez5-device.c:2405
 #: spa/plugins/bluez5/bluez5-device.c:2411
+#: spa/plugins/bluez5/bluez5-device.c:2416
+#: spa/plugins/bluez5/bluez5-device.c:2423
+#: spa/plugins/bluez5/bluez5-device.c:2429
+#: spa/plugins/bluez5/bluez5-device.c:2435
+#: spa/plugins/bluez5/bluez5-device.c:2441
+#: spa/plugins/bluez5/bluez5-device.c:2447
+#: spa/plugins/bluez5/bluez5-device.c:2453
+#: spa/plugins/bluez5/bluez5-device.c:2459
 msgid "Handsfree"
 msgstr "Prostoročno telefoniranje"
 
-#: spa/plugins/bluez5/bluez5-device.c:2369
+#: spa/plugins/bluez5/bluez5-device.c:2417
 msgid "Handsfree (HFP)"
 msgstr "Prostoročno telefoniranje (HFP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2392
+#: spa/plugins/bluez5/bluez5-device.c:2440
 msgid "Portable"
 msgstr "Prenosna naprava"
 
-#: spa/plugins/bluez5/bluez5-device.c:2398
+#: spa/plugins/bluez5/bluez5-device.c:2446
 msgid "Car"
 msgstr "Avtomobil"
 
-#: spa/plugins/bluez5/bluez5-device.c:2404
+#: spa/plugins/bluez5/bluez5-device.c:2452
 msgid "HiFi"
 msgstr "HiFi"
 
-#: spa/plugins/bluez5/bluez5-device.c:2410
+#: spa/plugins/bluez5/bluez5-device.c:2458
 msgid "Phone"
 msgstr "Telefon"
 
-#: spa/plugins/bluez5/bluez5-device.c:2417
+#: spa/plugins/bluez5/bluez5-device.c:2465
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: spa/plugins/bluez5/bluez5-device.c:2418
+#: spa/plugins/bluez5/bluez5-device.c:2466
 msgid "Bluetooth Handsfree"
 msgstr "Bluetooth - prostoročno"

From ab70dae0a81261141df37eecb6d5b978b4d2e004 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 16 Feb 2026 10:36:29 +0100
Subject: [PATCH 064/263] modules: add PRIORITY_SESSION

For driver nodes, priority.session is needed to be able to change the
default device.

Fixes #5125
---
 src/modules/module-jack-tunnel.c                               | 2 ++
 src/modules/module-netjack2-driver.c                           | 2 ++
 src/modules/module-protocol-pulse/modules/module-pipe-source.c | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/modules/module-jack-tunnel.c b/src/modules/module-jack-tunnel.c
index 760da1669..0c0cee034 100644
--- a/src/modules/module-jack-tunnel.c
+++ b/src/modules/module-jack-tunnel.c
@@ -1157,11 +1157,13 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 
 	pw_properties_set(impl->sink.props, PW_KEY_MEDIA_CLASS, "Audio/Sink");
 	pw_properties_set(impl->sink.props, PW_KEY_PRIORITY_DRIVER, "30001");
+	pw_properties_set(impl->sink.props, PW_KEY_PRIORITY_SESSION, "2001");
 	pw_properties_set(impl->sink.props, PW_KEY_NODE_NAME, "jack_sink");
 	pw_properties_set(impl->sink.props, PW_KEY_NODE_DESCRIPTION, "JACK Sink");
 
 	pw_properties_set(impl->source.props, PW_KEY_MEDIA_CLASS, "Audio/Source");
 	pw_properties_set(impl->source.props, PW_KEY_PRIORITY_DRIVER, "30000");
+	pw_properties_set(impl->source.props, PW_KEY_PRIORITY_SESSION, "2000");
 	pw_properties_set(impl->source.props, PW_KEY_NODE_NAME, "jack_source");
 	pw_properties_set(impl->source.props, PW_KEY_NODE_DESCRIPTION, "JACK Source");
 
diff --git a/src/modules/module-netjack2-driver.c b/src/modules/module-netjack2-driver.c
index 07a756266..ca4e70195 100644
--- a/src/modules/module-netjack2-driver.c
+++ b/src/modules/module-netjack2-driver.c
@@ -1319,9 +1319,11 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 		pw_properties_set(props, PW_KEY_NODE_ALWAYS_PROCESS, "true");
 
 	pw_properties_set(impl->sink.props, PW_KEY_PRIORITY_DRIVER, "40000");
+	pw_properties_set(impl->sink.props, PW_KEY_PRIORITY_SESSION, "2000");
 	pw_properties_set(impl->sink.props, PW_KEY_NODE_NAME, "netjack2_driver_send");
 
 	pw_properties_set(impl->source.props, PW_KEY_PRIORITY_DRIVER, "40001");
+	pw_properties_set(impl->source.props, PW_KEY_PRIORITY_SESSION, "2001");
 	pw_properties_set(impl->source.props, PW_KEY_NODE_NAME, "netjack2_driver_receive");
 
 	if ((str = pw_properties_get(props, "sink.props")) != NULL)
diff --git a/src/modules/module-protocol-pulse/modules/module-pipe-source.c b/src/modules/module-protocol-pulse/modules/module-pipe-source.c
index c9c31f106..ff44f3c38 100644
--- a/src/modules/module-protocol-pulse/modules/module-pipe-source.c
+++ b/src/modules/module-protocol-pulse/modules/module-pipe-source.c
@@ -172,6 +172,8 @@ static int module_pipe_source_prepare(struct module * const module)
 		pw_properties_set(stream_props, PW_KEY_NODE_DRIVER, "true");
 	if ((str = pw_properties_get(stream_props, PW_KEY_PRIORITY_DRIVER)) == NULL)
 		pw_properties_set(stream_props, PW_KEY_PRIORITY_DRIVER, "50000");
+	if ((str = pw_properties_get(stream_props, PW_KEY_PRIORITY_SESSION)) == NULL)
+		pw_properties_set(stream_props, PW_KEY_PRIORITY_SESSION, "2000");
 
 	d->module = module;
 	d->stream_props = stream_props;

From 0e80287625661f09f8e99da0171efa65a0293e18 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 17 Feb 2026 13:02:03 +0100
Subject: [PATCH 065/263] RAOP: also support link-local addresses for IPv4

Patch by Lairton Lelis da Fonseca Junior (@lairton)

Remove the hard skip for IPv4 link-local addresses and add an interface
binding (matching the existing IPv6 link-local behavior).

The host needs a link-local address on the interface (ip addr add
169.254.x.x/16 dev wlan0 or via NetworkManager +ipv4.addresses).

Fixes #4830
---
 src/modules/module-raop-discover.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/modules/module-raop-discover.c b/src/modules/module-raop-discover.c
index 53032d0be..436972ac0 100644
--- a/src/modules/module-raop-discover.c
+++ b/src/modules/module-raop-discover.c
@@ -384,10 +384,8 @@ static void resolver_cb(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiPr
 	}
 
 	avahi_address_snprint(at, sizeof(at), a);
-	if (spa_strstartswith(at, link_local_range)) {
-		pw_log_info("found link-local ip address %s - skipping tunnel creation", at);
-		goto done;
-	}
+	if (spa_strstartswith(at, link_local_range))
+		pw_log_info("found link-local ip address %s for '%s'", at, name);
 
 	tinfo = TUNNEL_INFO(.name = name);
 
@@ -414,6 +412,11 @@ static void resolver_cb(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiPr
 	    (a->data.ipv6.address[1] & 0xc0) == 0x80)
 		snprintf(if_suffix, sizeof(if_suffix), "%%%d", interface);
 
+	/* For IPv4 link-local, bind to the discovery interface */
+	if (a->proto == AVAHI_PROTO_INET &&
+	    spa_strstartswith(at, link_local_range))
+		snprintf(if_suffix, sizeof(if_suffix), "%%%d", interface);
+
 	pw_properties_setf(props, "raop.ip", "%s%s", at, if_suffix);
 	pw_properties_setf(props, "raop.ifindex", "%d", interface);
 	pw_properties_setf(props, "raop.port", "%u", port);

From 7956d7ceaf9026f304a1c10a3c0c2b49f29a7674 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 17 Feb 2026 13:08:56 +0100
Subject: [PATCH 066/263] snapcast: support IPv4 link-local addresses

---
 src/modules/module-snapcast-discover.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/modules/module-snapcast-discover.c b/src/modules/module-snapcast-discover.c
index 3568d82d4..e929be9c0 100644
--- a/src/modules/module-snapcast-discover.c
+++ b/src/modules/module-snapcast-discover.c
@@ -640,10 +640,9 @@ static void resolver_cb(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiPr
 	}
 
 	avahi_address_snprint(at, sizeof(at), a);
-	if (spa_strstartswith(at, link_local_range)) {
-		pw_log_info("found link-local ip address %s - skipping tunnel creation", at);
-		goto done;
-	}
+	if (spa_strstartswith(at, link_local_range))
+		pw_log_info("found link-local ip address %s for '%s'", at, name);
+
 	pw_log_info("%s %s", name, at);
 
 	tinfo = TUNNEL_INFO(.name = name, .port = port);
@@ -671,6 +670,11 @@ static void resolver_cb(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiPr
 	    (a->data.ipv6.address[1] & 0xc0) == 0x80)
 		snprintf(if_suffix, sizeof(if_suffix), "%%%d", interface);
 
+	/* For IPv4 link-local, bind to the discovery interface */
+	if (a->proto == AVAHI_PROTO_INET &&
+	    spa_strstartswith(at, link_local_range))
+		snprintf(if_suffix, sizeof(if_suffix), "%%%d", interface);
+
 	pw_properties_setf(props, "snapcast.ip", "%s%s", at, if_suffix);
 	pw_properties_setf(props, "snapcast.ifindex", "%d", interface);
 	pw_properties_setf(props, "snapcast.port", "%u", port);

From 88cbe2420169185b0489cc38b43116e107395822 Mon Sep 17 00:00:00 2001
From: Damien Espitallier <damien.espitallier@drb-conception.fr>
Date: Tue, 17 Feb 2026 19:19:52 +0100
Subject: [PATCH 067/263] alsa-udev: Allow ACTION_REMOVE on ignored cards

Move the card->ignored check to only apply to ACTION_CHANGE, not ACTION_REMOVE. This ensures that ignored cards can still be properly removed when they are unplugged.
---
 spa/plugins/alsa/alsa-udev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spa/plugins/alsa/alsa-udev.c b/spa/plugins/alsa/alsa-udev.c
index 7d1ae9a3a..8537c9760 100644
--- a/spa/plugins/alsa/alsa-udev.c
+++ b/spa/plugins/alsa/alsa-udev.c
@@ -725,11 +725,11 @@ static bool check_access(struct impl *this, struct card *card)
 
 static void process_card(struct impl *this, enum action action, struct card *card)
 {
-	if (card->ignored)
-		return;
-
 	switch (action) {
 	case ACTION_CHANGE: {
+		if (card->ignored)
+			return;
+
 		check_access(this, card);
 		if (card->accessible && !card->emitted) {
 			int res = emit_added_object_info(this, card);

From b9922d8ed59897f482527f1c1847ce8411c49fad Mon Sep 17 00:00:00 2001
From: Misha Baranov <baranov.mv@gmail.com>
Date: Mon, 16 Feb 2026 22:35:14 +0100
Subject: [PATCH 068/263] module-roc: forward roc-toolkit logs to pipewire logs

Roc-toolkit log records are captured via a callback and
written to PipeWire log with corresponding verbosity level.
The log.level config parameter limits record verbosity at
the roc-toolkit level.
---
 src/modules/meson.build         |  4 +--
 src/modules/module-roc-sink.c   | 23 ++++++++++--
 src/modules/module-roc-source.c | 22 ++++++++++--
 src/modules/module-roc/common.c | 21 +++++++++++
 src/modules/module-roc/common.h | 63 +++++++++++++++++++++++++++++++++
 5 files changed, 127 insertions(+), 6 deletions(-)
 create mode 100644 src/modules/module-roc/common.c

diff --git a/src/modules/meson.build b/src/modules/meson.build
index 6b215f3a0..59f46ae13 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -693,7 +693,7 @@ pipewire_module_vban_recv = shared_library('pipewire-module-vban-recv',
 build_module_roc = roc_dep.found()
 if build_module_roc
   pipewire_module_roc_sink = shared_library('pipewire-module-roc-sink',
-    [ 'module-roc-sink.c' ],
+    [ 'module-roc-sink.c', 'module-roc/common.c'],
     include_directories : [configinc],
     install : true,
     install_dir : modules_install_dir,
@@ -702,7 +702,7 @@ if build_module_roc
   )
 
   pipewire_module_roc_source = shared_library('pipewire-module-roc-source',
-    [ 'module-roc-source.c' ],
+    [ 'module-roc-source.c', 'module-roc/common.c' ],
     include_directories : [configinc],
     install : true,
     install_dir : modules_install_dir,
diff --git a/src/modules/module-roc-sink.c b/src/modules/module-roc-sink.c
index 1cca69592..39ca2bce1 100644
--- a/src/modules/module-roc-sink.c
+++ b/src/modules/module-roc-sink.c
@@ -46,6 +46,9 @@
  * - `remote.repair.port = <str>`: remote receiver TCP/UDP port for receiver packets
  * - `remote.control.port = <str>`: remote receiver TCP/UDP port for control packets
  * - `fec.code = <str>`: Possible values: `disable`, `rs8m`, `ldpc`
+ * - `log.level = <str>`: log level for roc-toolkit. Possible values: `DEFAULT`,
+ *       `NONE`, `ERROR`, `INFO`, `DEBUG`, `TRACE`; `DEFAULT` follows the log
+ * level of the PipeWire context.
  *
  * ## General options
  *
@@ -75,6 +78,7 @@
  *             node.name = "roc-sink"
  *          }
  *          audio.position = [ FL FR ]
+ *          log.level = DEFAULT
  *      }
  *  }
  *]
@@ -84,8 +88,9 @@
 
 #define NAME "roc-sink"
 
-PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
+PW_LOG_TOPIC(mod_topic, "mod." NAME);
 #define PW_LOG_TOPIC_DEFAULT mod_topic
+PW_LOG_TOPIC_EXTERN(roc_log_topic);
 
 struct module_roc_sink_data {
 	struct pw_impl_module *module;
@@ -115,6 +120,8 @@ struct module_roc_sink_data {
 
 	roc_endpoint *remote_control_addr;
 	int remote_control_port;
+
+	roc_log_level loglevel;
 };
 
 static void stream_destroy(void *d)
@@ -300,6 +307,8 @@ static int roc_sink_setup(struct module_roc_sink_data *data)
 
 	pw_properties_setf(data->capture_props, PW_KEY_NODE_RATE, "1/%d", info.rate);
 
+	pw_roc_log_init();
+
 	res = roc_sender_open(data->context, &sender_config, &data->sender);
 	if (res) {
 		pw_log_error("failed to create roc sender: %d", res);
@@ -382,7 +391,8 @@ static const struct spa_dict_item module_roc_sink_info[] = {
 				"( remote.repair.port=<remote receiver port for repair packets> ) "
 				"( remote.control.port=<remote receiver port for control packets> ) "
 				"( audio.position=<channel map, default:"PW_ROC_STEREO_POSITIONS"> ) "
-				"( sink.props= { key=val ... } ) " },
+				"( sink.props= { key=val ... } ) "
+				"( log.level=<empty>|DEFAULT|NONE|RROR|INFO|DEBUG|TRACE ) " },
 	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
 };
 
@@ -396,6 +406,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 	int res = 0;
 
 	PW_LOG_TOPIC_INIT(mod_topic);
+	PW_LOG_TOPIC_INIT(roc_log_topic);
 
 	data = calloc(1, sizeof(struct module_roc_sink_data));
 	if (data == NULL)
@@ -502,6 +513,14 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 		pw_log_error("can't connect: %m");
 		goto out;
 	}
+	if ((str = pw_properties_get(props, "log.level")) != NULL) {
+		const struct spa_log *log_conf = pw_log_get();
+		const roc_log_level default_level = pw_roc_log_level_pw_2_roc(log_conf->level);
+		if (pw_roc_parse_log_level(&data->loglevel, str, default_level)) {
+			pw_log_error("Invalid log level %s, using default", str);
+			data->loglevel = default_level;
+		}
+	}
 
 	pw_proxy_add_listener((struct pw_proxy*)data->core,
 			&data->core_proxy_listener,
diff --git a/src/modules/module-roc-source.c b/src/modules/module-roc-source.c
index 6c67a037c..2173c6af1 100644
--- a/src/modules/module-roc-source.c
+++ b/src/modules/module-roc-source.c
@@ -56,6 +56,9 @@
  * - `fec.code = <str>`: Possible values: `default`, `disable`, `rs8m`, `ldpc`
  *
  * - `resampler.profile = <str>`: Deprecated, use roc.resampler.profile
+ * - `log.level = <str>`: log level for roc-toolkit. Possible values: `DEFAULT`,
+ *       `NONE`, `ERROR`, `INFO`, `DEBUG`, `TRACE`; `DEFAULT` follows the log
+ * level of the PipeWire context.
  *
  * ## General options
  *
@@ -89,6 +92,7 @@
  *             node.name = "roc-source"
  *          }
  *          audio.position = [ FL FR ]
+ *          log.level = DEFAULT
  *      }
  *  }
  *]
@@ -98,8 +102,9 @@
 
 #define NAME "roc-source"
 
-PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
+PW_LOG_TOPIC(mod_topic, "mod." NAME);
 #define PW_LOG_TOPIC_DEFAULT mod_topic
+PW_LOG_TOPIC_EXTERN(roc_log_topic);
 
 struct module_roc_source_data {
 	struct pw_impl_module *module;
@@ -135,6 +140,8 @@ struct module_roc_source_data {
 
 	roc_endpoint *local_control_addr;
 	int local_control_port;
+
+	roc_log_level loglevel;
 };
 
 static void stream_destroy(void *d)
@@ -333,6 +340,8 @@ static int roc_source_setup(struct module_roc_source_data *data)
 	 */
 	receiver_config.target_latency = (unsigned long long)data->sess_latency_msec * SPA_NSEC_PER_MSEC;
 
+	pw_roc_log_init();
+
 	res = roc_receiver_open(data->context, &receiver_config, &data->receiver);
 	if (res) {
 		pw_log_error("failed to create roc receiver: %d", res);
@@ -421,7 +430,8 @@ static const struct spa_dict_item module_roc_source_info[] = {
 				"( local.repair.port=<local receiver port for repair packets> ) "
 				"( local.control.port=<local receiver port for control packets> ) "
 				"( audio.position=<channel map, default:"PW_ROC_STEREO_POSITIONS"> ) "
-				"( source.props= { key=value ... } ) " },
+				"( source.props= { key=value ... } ) "
+				"( log.level=<empty>|DEFAULT|NONE|RROR|INFO|DEBUG|TRACE ) " },
 	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
 };
 
@@ -557,6 +567,14 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 	} else {
 		data->fec_code = ROC_FEC_ENCODING_DEFAULT;
 	}
+	if ((str = pw_properties_get(props, "log.level")) != NULL) {
+		const struct spa_log *log_conf = pw_log_get();
+		const roc_log_level default_level = pw_roc_log_level_pw_2_roc(log_conf->level);
+		if (pw_roc_parse_log_level(&data->loglevel, str, default_level)) {
+			pw_log_error("Invalid log level %s, using default", str);
+			data->loglevel = default_level;
+		}
+	}
 
 	data->core = pw_context_get_object(data->module_context, PW_TYPE_INTERFACE_Core);
 	if (data->core == NULL) {
diff --git a/src/modules/module-roc/common.c b/src/modules/module-roc/common.c
new file mode 100644
index 000000000..244c203dd
--- /dev/null
+++ b/src/modules/module-roc/common.c
@@ -0,0 +1,21 @@
+#include <pipewire/log.h>
+#include <roc/log.h>
+
+#include "common.h"
+
+PW_LOG_TOPIC(roc_log_topic, "mod.roc.lib");
+
+void pw_roc_log_init(void)
+{
+	roc_log_set_handler(pw_roc_log_handler, NULL);
+	roc_log_set_level(pw_roc_log_level_pw_2_roc(roc_log_topic->has_custom_level ? roc_log_topic->level : pw_log_level));
+}
+
+void pw_roc_log_handler(const roc_log_message *message, void *argument)
+{
+	const enum spa_log_level log_level = pw_roc_log_level_roc_2_pw(message->level);
+	if (SPA_UNLIKELY(pw_log_topic_enabled(log_level, roc_log_topic))) {
+		pw_log_logt(log_level, roc_log_topic, message->file, message->line, message->module, message->text, "");
+	}
+}
+
diff --git a/src/modules/module-roc/common.h b/src/modules/module-roc/common.h
index 69153659e..c94ac69a8 100644
--- a/src/modules/module-roc/common.h
+++ b/src/modules/module-roc/common.h
@@ -3,8 +3,10 @@
 
 #include <roc/config.h>
 #include <roc/endpoint.h>
+#include <roc/log.h>
 
 #include <spa/utils/string.h>
+#include <spa/support/log.h>
 
 #define PW_ROC_DEFAULT_IP "0.0.0.0"
 #define PW_ROC_DEFAULT_SOURCE_PORT 10001
@@ -18,6 +20,9 @@
 #define PW_ROC_MULTITRACK_ENCODING_ID 100
 #define PW_ROC_STEREO_POSITIONS "[ FL FR ]"
 
+void pw_roc_log_init(void);
+void pw_roc_log_handler(const roc_log_message *message, void *argument);
+
 static inline int pw_roc_parse_fec_encoding(roc_fec_encoding *out, const char *str)
 {
 	if (!str || !*str || spa_streq(str, "default"))
@@ -132,4 +137,62 @@ static inline void pw_roc_fec_encoding_to_proto(roc_fec_encoding fec_code, roc_p
 	}
 }
 
+static inline roc_log_level pw_roc_log_level_pw_2_roc(const enum spa_log_level pw_log_level)
+{
+	switch (pw_log_level) {
+	case SPA_LOG_LEVEL_NONE:
+		return ROC_LOG_NONE;
+	case SPA_LOG_LEVEL_ERROR:
+		return ROC_LOG_ERROR;
+	case SPA_LOG_LEVEL_WARN:
+		return ROC_LOG_ERROR;
+	case SPA_LOG_LEVEL_INFO:
+		return ROC_LOG_INFO;
+	case SPA_LOG_LEVEL_DEBUG:
+		return ROC_LOG_DEBUG;
+	case SPA_LOG_LEVEL_TRACE:
+		return ROC_LOG_TRACE;
+	default:
+		return ROC_LOG_NONE;
+	}
+}
+
+static inline enum spa_log_level pw_roc_log_level_roc_2_pw(const roc_log_level roc_log_level)
+{
+	switch (roc_log_level) {
+	case ROC_LOG_NONE:
+		return SPA_LOG_LEVEL_NONE;
+	case ROC_LOG_ERROR:
+		return SPA_LOG_LEVEL_ERROR;
+	case ROC_LOG_INFO:
+		return SPA_LOG_LEVEL_INFO;
+	case ROC_LOG_DEBUG:
+		return SPA_LOG_LEVEL_DEBUG;
+	case ROC_LOG_TRACE:
+		return SPA_LOG_LEVEL_TRACE;
+	default:
+		return SPA_LOG_LEVEL_NONE;
+	}
+}
+
+static inline int pw_roc_parse_log_level(roc_log_level *loglevel, const char *str,
+																				 roc_log_level default_level)
+{
+	if (spa_streq(str, "DEFAULT"))
+		*loglevel = default_level;
+	else if (spa_streq(str, "NONE"))
+		*loglevel = ROC_LOG_NONE;
+	else if (spa_streq(str, "ERROR"))
+		*loglevel = ROC_LOG_ERROR;
+	else if (spa_streq(str, "INFO"))
+		*loglevel = ROC_LOG_INFO;
+	else if (spa_streq(str, "DEBUG"))
+		*loglevel = ROC_LOG_DEBUG;
+	else if (spa_streq(str, "TRACE"))
+		*loglevel = ROC_LOG_TRACE;
+	else
+		return -EINVAL;
+	return 0;
+}
+
 #endif /* MODULE_ROC_COMMON_H */

From 700cea78dbe7564131d51b21a7795e2567ee048a Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 27 Jan 2026 14:10:44 +0100
Subject: [PATCH 069/263] 1.6.0

---
 NEWS        | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 meson.build |   2 +-
 2 files changed, 100 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 3acc6e6be..1f0a39a28 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,102 @@
+# PipeWire 1.6.0 (2026-02-19)
+
+This is the 1.6 release that is API and ABI compatible with previous
+1.4.x releases.
+
+This release contains some of the bigger changes that happened since
+the 1.4 release last year, including:
+
+  * An LDAC decoder was added for bluetooth.
+  * SpanDSP for bluetooth packet loss concealment.
+  * Safe parsing and building of PODs in shared memory.
+  * Added support for metadata features. This is used to signal that
+    the sync_timeline metadata supports the RELEASE operation.
+  * Node commands and events can contain extra user data.
+  * Support for more compressed format helper functions to create
+    and parse formats.
+  * Support for compile time max channels. The max channels was
+    increased to 128.
+  * Support for audio channel layouts was added. This makes it possible
+    to set "audio.layout" = "5.1" instead of the more verbose
+    audio.position = [ FL, FR, FC, LFE, SL, SR ]
+  * Support for Capability Params was added. This can be used to
+    negotiate capabilities on a link before format and buffer
+    negotiation takes place.
+  * More HDR colortypes are added.
+  * Loops now have locking with priority inversion. Most code was adapted
+    to use the faster locks instead of epoll/eventfd to update shared state.
+  * Channel position are parsed from EDID data.
+  * Channel maps are now set on ALSA.
+  * The resampler now supports configurable window functions such
+    as blackman and kaiser windows. The phases are now also calculated
+    with fixed point math, which makes it more accurate.
+  * Many bluetooth updates and improvements.
+  * The filter-graph has an ffmpeg and ONNX plugin. The ffmpeg plugin
+    can run an audio AVFilterGraph. The ONNX plugin can run some models
+    such as the silero VAD.
+  * Many AVB updates. Work is ongoing to merge the Milan protocol.
+  * Support for v0 clients was removed.
+  * The jack-tunnel module can now autoconnect ports.
+  * ROC support multitrack layouts now.
+  * Many RTP updates.
+  * rlimits can now be set in the config file.
+  * Thread reset on fork can now be configured. JACK clients expect this
+    to be disabled.
+  * node.exclusive is now enforced.
+  * node.reliable enables reliable transport.
+  * pw-cat supports sysex and midiclip as well as some more uncompressed
+    formats. Options were added to set the container and codec formats
+    as well as list the supported containers, codecs, layouts and channel
+    names.
+  * Documentation updates.
+
+
+## Highlights (since the previous 1.5.85 prerelease)
+  - Fix a 64 channel limit in the channel mixer.
+  - Fix an fd leak in pulse-server in some error cases.
+  - Some small fixes and improvements.
+
+
+## PipeWire
+  - Fix Capability leaks.
+  - Return an error in pw-stream get-time when not STREAMING.
+  - Set the current time in the driver position before starting.
+    Some followers might look at it.
+
+## Modules
+  - Improve default channel handling in module-filter-chain.
+  - Support source and sink only module-filter-chain.
+  - Tweak the filter-chain spatializer example gains.
+  - Handle new snapcast service type. (#5104)
+  - Implement socket activation without depending on libsystemd.
+  - Support ipv4 link-local addresses in RAOP and snapcast. (#4830)
+  - Forward ROC-toolkit logs to pipewire.
+
+## SPA
+  - Improve default channel handling in filter-graph. (#5084)
+  - Clamp control values to min/max. (#5088)
+  - Support mode JBL gaming headsets.
+  - Handle some SOFA errors and add gain option.
+  - Really handle more than 64 channels in the channelmixer. (#5118)
+  - Allow removal in ALSA-udev of ignored cards.
+
+# pulse-server
+  - Fix mono mixdown query.
+  - Expose headset autoswitch message.
+  - Handle EPROTO errors by disconnecting.
+  - Handle timeouts in play-sample streams. (#5099)
+
+## GStreamer
+  - Fix crop metadata.
+  - Fix a race in the buffer release function.
+
+## Tools
+  - Improve format support and detection in pw-cat.
+  - Add some more options to pw-cat to list supported containers
+    and formats. (#5117)
+
+Older versions:
+
 # PipeWire 1.5.85 (2026-01-19)
 
 This is the fifth and hopefully last 1.6 release candidate that
@@ -57,9 +156,6 @@ releases.
 ## Docs
   - Document the resampler properties better.
 
-
-Older versions:
-
 # PipeWire 1.5.84 (2025-11-27)
 
 This is the fourth 1.6 release candidate that is API and ABI
diff --git a/meson.build b/meson.build
index 2e308cfa5..c954a644c 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('pipewire', ['c' ],
-  version : '1.5.85',
+  version : '1.6.0',
   license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ],
   meson_version : '>= 0.61.1',
   default_options : [ 'warning_level=3',

From b8b2c58cdab4fdfa9e61d5b5693a17c90b3fec75 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 19 Feb 2026 11:09:50 +0100
Subject: [PATCH 070/263] Development continues as 1.7.0

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index c954a644c..5f9ffa39d 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('pipewire', ['c' ],
-  version : '1.6.0',
+  version : '1.7.0',
   license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ],
   meson_version : '>= 0.61.1',
   default_options : [ 'warning_level=3',

From 6eb44830697dc90dacfedc7b30ed026d2d600889 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 28 Jan 2026 13:20:38 +0100
Subject: [PATCH 071/263] pulse-server: add client props to
 sink_input/source_output

Instead of adding the client props to the stream props when we create
it, add them when we enumerate the streams.

This makes it possible to also have the client props in the stream props
for streams that are not created with the pulse API.

Fixes #5090
---
 .../module-protocol-pulse/pulse-server.c      | 53 +++++++++++++++----
 1 file changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c
index 59610ef57..58dbb221a 100644
--- a/src/modules/module-protocol-pulse/pulse-server.c
+++ b/src/modules/module-protocol-pulse/pulse-server.c
@@ -1621,7 +1621,7 @@ static int do_create_playback_stream(struct client *client, uint32_t command, ui
 	struct pw_manager_object *o;
 	bool is_monitor;
 
-	props = pw_properties_copy(client->props);
+	props = pw_properties_new(NULL, NULL);
 	if (props == NULL)
 		goto error_errno;
 
@@ -1907,7 +1907,7 @@ static int do_create_record_stream(struct client *client, uint32_t command, uint
 	struct pw_manager_object *o;
 	bool is_monitor = false;
 
-	props = pw_properties_copy(client->props);
+	props = pw_properties_new(NULL, NULL);
 	if (props == NULL)
 		goto error_errno;
 
@@ -2298,7 +2298,7 @@ static int do_create_upload_stream(struct client *client, uint32_t command, uint
 	struct message *reply;
 	int res;
 
-	if ((props = pw_properties_copy(client->props)) == NULL)
+	if ((props = pw_properties_new(NULL, NULL)) == NULL)
 		goto error_errno;
 
 	if ((res = message_get(m,
@@ -4068,6 +4068,25 @@ static const char *get_media_name(struct pw_node_info *info)
 	return media_name;
 }
 
+static int fill_node_info_proplist(struct message *m, const struct spa_dict *node_props,
+		const struct pw_manager_object *client)
+{
+	struct pw_client_info *client_info = client ? client->info : NULL;
+	spa_autoptr(pw_properties) props = NULL;
+
+	if (client_info && client_info->props) {
+		props = pw_properties_new_dict(node_props);
+		if (props == NULL)
+			return -ENOMEM;
+
+		pw_properties_add(props, client_info->props);
+
+		node_props = &props->dict;
+	}
+	message_put(m, TAG_PROPLIST, node_props, TAG_INVALID);
+	return 0;
+}
+
 static int fill_sink_input_info(struct client *client, struct message *m,
 		struct pw_manager_object *o)
 {
@@ -4128,10 +4147,16 @@ static int fill_sink_input_info(struct client *client, struct message *m,
 		message_put(m,
 			TAG_BOOLEAN, dev_info.volume_info.mute,	/* muted */
 			TAG_INVALID);
-	if (client->version >= 13)
-		message_put(m,
-			TAG_PROPLIST, info->props,
-			TAG_INVALID);
+	if (client->version >= 13) {
+		int res;
+		struct pw_manager_object *c = NULL;
+		if (client_id != SPA_ID_INVALID) {
+			struct selector sel = { .id = client_id, .type = pw_manager_object_is_client, };
+			c = select_object(manager, &sel);
+		}
+		if ((res = fill_node_info_proplist(m, info->props, c)) < 0)
+			return res;
+	}
 	if (client->version >= 19)
 		message_put(m,
 			TAG_BOOLEAN, corked,		/* corked */
@@ -4207,10 +4232,16 @@ static int fill_source_output_info(struct client *client, struct message *m,
 		TAG_STRING, "PipeWire",			/* resample method */
 		TAG_STRING, "PipeWire",			/* driver */
 		TAG_INVALID);
-	if (client->version >= 13)
-		message_put(m,
-			TAG_PROPLIST, info->props,
-			TAG_INVALID);
+	if (client->version >= 13) {
+		int res;
+		struct pw_manager_object *c = NULL;
+		if (client_id != SPA_ID_INVALID) {
+			struct selector sel = { .id = client_id, .type = pw_manager_object_is_client, };
+			c = select_object(manager, &sel);
+		}
+		if ((res = fill_node_info_proplist(m, info->props, c)) < 0)
+			return res;
+	}
 	if (client->version >= 19)
 		message_put(m,
 			TAG_BOOLEAN, corked,		/* corked */

From be0e037809de61cd9e9707310aafebcf44b6be10 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 19 Feb 2026 13:03:50 +0100
Subject: [PATCH 072/263] pulse-server: avoid doing allocations and string
 copies

We can just concatenate the stream and client dict on the stack, reusing
all the strings without having to do allocations or copies.

Also filter out the object.id and object.serial from the client, we want
to keep the ones from the streams.
---
 .../module-protocol-pulse/pulse-server.c      | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c
index 58dbb221a..24251942a 100644
--- a/src/modules/module-protocol-pulse/pulse-server.c
+++ b/src/modules/module-protocol-pulse/pulse-server.c
@@ -4072,18 +4072,38 @@ static int fill_node_info_proplist(struct message *m, const struct spa_dict *nod
 		const struct pw_manager_object *client)
 {
 	struct pw_client_info *client_info = client ? client->info : NULL;
-	spa_autoptr(pw_properties) props = NULL;
+	uint32_t n_items, n;
+	struct spa_dict dict, *client_props = NULL;
+	const struct spa_dict_item *it;
+	struct spa_dict_item *items, *it2;
 
+	n_items = node_props->n_items;
 	if (client_info && client_info->props) {
-		props = pw_properties_new_dict(node_props);
-		if (props == NULL)
-			return -ENOMEM;
-
-		pw_properties_add(props, client_info->props);
-
-		node_props = &props->dict;
+		client_props = client_info->props;
+		n_items += client_props->n_items;
 	}
-	message_put(m, TAG_PROPLIST, node_props, TAG_INVALID);
+
+	dict.n_items = n = 0;
+	dict.items = items = alloca(n_items * sizeof(struct spa_dict_item));
+
+	spa_dict_for_each(it, node_props)
+		items[n++] = *it;
+	dict.n_items = n;
+
+	if (client_props) {
+		spa_dict_for_each(it, client_props) {
+			if (spa_streq(it->key, PW_KEY_OBJECT_ID) ||
+			    spa_streq(it->key, PW_KEY_OBJECT_SERIAL))
+				continue;
+
+			if ((it2 = (struct spa_dict_item*)spa_dict_lookup_item(&dict, it->key)))
+				it2->value = it->value;
+			else
+				items[n++] = *it;
+		}
+		dict.n_items = n;
+	}
+	message_put(m, TAG_PROPLIST, &dict, TAG_INVALID);
 	return 0;
 }
 

From e7ca02c4d820eedb50a78b4b73af1b807b21d012 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 10 Dec 2025 11:35:27 +0100
Subject: [PATCH 073/263] filter-graph: sync control updates with data thread.

don't read the control ports from the processing thread and check for
updates. Use the control_changed signal to check and update the
parameters of the biquad atimically.

See #5019
---
 spa/plugins/filter-graph/plugin_builtin.c | 27 ++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/spa/plugins/filter-graph/plugin_builtin.c b/spa/plugins/filter-graph/plugin_builtin.c
index 3bcde30c9..c8597cf10 100644
--- a/spa/plugins/filter-graph/plugin_builtin.c
+++ b/spa/plugins/filter-graph/plugin_builtin.c
@@ -21,6 +21,7 @@
 #include <spa/utils/cleanup.h>
 #include <spa/support/cpu.h>
 #include <spa/support/log.h>
+#include <spa/support/loop.h>
 #include <spa/plugins/audioconvert/resample.h>
 #include <spa/debug/log.h>
 
@@ -38,6 +39,7 @@ struct plugin {
 
 	struct spa_fga_dsp *dsp;
 	struct spa_log *log;
+	struct spa_loop *data_loop;
 };
 
 struct builtin {
@@ -542,7 +544,14 @@ static void bq_run(void *Instance, unsigned long samples)
 	struct biquad *bq = &impl->bq;
 	float *out = impl->port[0];
 	float *in = impl->port[1];
+	spa_fga_dsp_biquad_run(impl->dsp, bq, 1, 0, &out, (const float **)&in, 1, samples);
+}
 
+static int
+do_bq_control_changed(struct spa_loop *loop, bool async, uint32_t seq, const void *data,
+		size_t size, void *user_data)
+{
+	struct builtin *impl = user_data;
 	if (impl->type == BQ_NONE) {
 		float b0, b1, b2, a0, a1, a2;
 		b0 = impl->port[5][0];
@@ -562,7 +571,13 @@ static void bq_run(void *Instance, unsigned long samples)
 		if (impl->freq != freq || impl->Q != Q || impl->gain != gain)
 			bq_freq_update(impl, impl->type, freq, Q, gain);
 	}
-	spa_fga_dsp_biquad_run(impl->dsp, bq, 1, 0, &out, (const float **)&in, 1, samples);
+	return 0;
+}
+
+static void bq_control_changed(void * Instance)
+{
+	struct builtin *impl = Instance;
+	spa_loop_locked(impl->plugin->data_loop, do_bq_control_changed, 1, NULL, 0, impl);
 }
 
 /** bq_lowpass */
@@ -574,6 +589,7 @@ static const struct spa_fga_descriptor bq_lowpass_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
+	.control_changed = bq_control_changed,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -588,6 +604,7 @@ static const struct spa_fga_descriptor bq_highpass_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
+	.control_changed = bq_control_changed,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -602,6 +619,7 @@ static const struct spa_fga_descriptor bq_bandpass_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
+	.control_changed = bq_control_changed,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -616,6 +634,7 @@ static const struct spa_fga_descriptor bq_lowshelf_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
+	.control_changed = bq_control_changed,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -630,6 +649,7 @@ static const struct spa_fga_descriptor bq_highshelf_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
+	.control_changed = bq_control_changed,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -644,6 +664,7 @@ static const struct spa_fga_descriptor bq_peaking_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
+	.control_changed = bq_control_changed,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -658,6 +679,7 @@ static const struct spa_fga_descriptor bq_notch_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
+	.control_changed = bq_control_changed,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -673,6 +695,7 @@ static const struct spa_fga_descriptor bq_allpass_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
+	.control_changed = bq_control_changed,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -687,6 +710,7 @@ static const struct spa_fga_descriptor bq_raw_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
+	.control_changed = bq_control_changed,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -3387,6 +3411,7 @@ impl_init(const struct spa_handle_factory *factory,
 
 	impl->log = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_Log);
 	impl->dsp = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_FILTER_GRAPH_AudioDSP);
+	impl->data_loop = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_DataLoop);
 
 	for (uint32_t i = 0; info && i < info->n_items; i++) {
 		const char *k = info->items[i].key;

From 7887c365d1aac086ebfb15112e9d437f44d498cc Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 10 Dec 2025 12:15:38 +0100
Subject: [PATCH 074/263] filter-graph: Make a new control_sync function

This function is run for all the nodes with the data loop locked. It can
be used to atomically update multiple node controls.

We can't use the control_changed function because this one runs without
the lock and might do slow things, like what the sofa plugin currently
does.

See #5019
---
 spa/plugins/filter-graph/audio-plugin.h   |  1 +
 spa/plugins/filter-graph/filter-graph.c   | 56 ++++++++++++++++-------
 spa/plugins/filter-graph/plugin_builtin.c | 33 +++++--------
 3 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/spa/plugins/filter-graph/audio-plugin.h b/spa/plugins/filter-graph/audio-plugin.h
index 9f9d1bce6..fffdc0de5 100644
--- a/spa/plugins/filter-graph/audio-plugin.h
+++ b/spa/plugins/filter-graph/audio-plugin.h
@@ -69,6 +69,7 @@ struct spa_fga_descriptor {
 
 	void (*connect_port) (void *instance, unsigned long port, void *data);
 	void (*control_changed) (void *instance);
+	void (*control_sync) (void *instance);
 
 	void (*activate) (void *instance);
 	void (*deactivate) (void *instance);
diff --git a/spa/plugins/filter-graph/filter-graph.c b/spa/plugins/filter-graph/filter-graph.c
index 52609f2c6..0e4ca98ce 100644
--- a/spa/plugins/filter-graph/filter-graph.c
+++ b/spa/plugins/filter-graph/filter-graph.c
@@ -19,6 +19,7 @@
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
 #include <spa/support/cpu.h>
+#include <spa/support/loop.h>
 #include <spa/support/plugin-loader.h>
 #include <spa/param/latency-utils.h>
 #include <spa/param/tag-utils.h>
@@ -221,6 +222,7 @@ struct impl {
 	struct spa_cpu *cpu;
 	struct spa_fga_dsp *dsp;
 	struct spa_plugin_loader *loader;
+	struct spa_loop *data_loop;
 
 	uint64_t info_all;
 	struct spa_filter_graph_info info;
@@ -698,21 +700,46 @@ static int impl_reset(void *object)
 	return 0;
 }
 
-static void node_control_changed(struct node *node)
+static int
+do_emit_node_control_sync(struct spa_loop *loop, bool async, uint32_t seq, const void *data,
+		size_t size, void *user_data)
 {
-	const struct spa_fga_descriptor *d = node->desc->desc;
+	struct impl *impl = user_data;
+	struct graph *graph = &impl->graph;
+	struct node *node;
+	uint32_t i;
+	spa_list_for_each(node, &graph->node_list, link) {
+		const struct spa_fga_descriptor *d = node->desc->desc;
+		if (!node->control_changed || d->control_sync == NULL)
+			continue;
+		for (i = 0; i < node->n_hndl; i++) {
+			if (node->hndl[i] != NULL)
+				d->control_sync(node->hndl[i]);
+		}
+	}
+	return 0;
+}
+
+static void emit_node_control_changed(struct impl *impl)
+{
+	struct graph *graph = &impl->graph;
+	struct node *node;
 	uint32_t i;
 
-	if (!node->control_changed)
-		return;
+	spa_loop_locked(impl->data_loop, do_emit_node_control_sync, 1, NULL, 0, impl);
 
-	for (i = 0; i < node->n_hndl; i++) {
-		if (node->hndl[i] == NULL)
+	spa_list_for_each(node, &graph->node_list, link) {
+		const struct spa_fga_descriptor *d = node->desc->desc;
+		if (!node->control_changed)
 			continue;
-		if (d->control_changed)
-			d->control_changed(node->hndl[i]);
+		if (d->control_changed != NULL) {
+			for (i = 0; i < node->n_hndl; i++) {
+				if (node->hndl[i] != NULL)
+					d->control_changed(node->hndl[i]);
+			}
+		}
+		node->control_changed = false;
 	}
-	node->control_changed = false;
 }
 
 static int sync_volume(struct graph *graph, struct volume *vol)
@@ -826,11 +853,7 @@ static int impl_set_props(void *object, enum spa_direction direction, const stru
 	spa_pod_dynamic_builder_clean(&b);
 
 	if (changed > 0) {
-		struct node *node;
-
-		spa_list_for_each(node, &graph->node_list, link)
-			node_control_changed(node);
-
+		emit_node_control_changed(impl);
 		spa_filter_graph_emit_props_changed(&impl->hooks, SPA_DIRECTION_INPUT);
 	}
 	return 0;
@@ -1695,10 +1718,10 @@ static int impl_activate(void *object, const struct spa_dict *props)
 		for (i = 0; i < node->n_hndl; i++) {
 			if (d->activate)
 				d->activate(node->hndl[i]);
-			if (node->control_changed && d->control_changed)
-				d->control_changed(node->hndl[i]);
 		}
 	}
+	emit_node_control_changed(impl);
+
 	/* calculate latency */
 	sort_reset(graph);
 	while ((node = sort_next_node(graph)) != NULL) {
@@ -2346,6 +2369,7 @@ impl_init(const struct spa_handle_factory *factory,
 	spa_log_topic_init(impl->log, &log_topic);
 
 	impl->cpu = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_CPU);
+	impl->data_loop = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_DataLoop);
 	impl->max_align = spa_cpu_get_max_align(impl->cpu);
 
 	impl->dsp = spa_fga_dsp_new(impl->cpu ? spa_cpu_get_flags(impl->cpu) : 0);
diff --git a/spa/plugins/filter-graph/plugin_builtin.c b/spa/plugins/filter-graph/plugin_builtin.c
index c8597cf10..a16e4a7fc 100644
--- a/spa/plugins/filter-graph/plugin_builtin.c
+++ b/spa/plugins/filter-graph/plugin_builtin.c
@@ -39,7 +39,6 @@ struct plugin {
 
 	struct spa_fga_dsp *dsp;
 	struct spa_log *log;
-	struct spa_loop *data_loop;
 };
 
 struct builtin {
@@ -547,11 +546,9 @@ static void bq_run(void *Instance, unsigned long samples)
 	spa_fga_dsp_biquad_run(impl->dsp, bq, 1, 0, &out, (const float **)&in, 1, samples);
 }
 
-static int
-do_bq_control_changed(struct spa_loop *loop, bool async, uint32_t seq, const void *data,
-		size_t size, void *user_data)
+static void bq_control_sync(void * Instance)
 {
-	struct builtin *impl = user_data;
+	struct builtin *impl = Instance;
 	if (impl->type == BQ_NONE) {
 		float b0, b1, b2, a0, a1, a2;
 		b0 = impl->port[5][0];
@@ -571,13 +568,6 @@ do_bq_control_changed(struct spa_loop *loop, bool async, uint32_t seq, const voi
 		if (impl->freq != freq || impl->Q != Q || impl->gain != gain)
 			bq_freq_update(impl, impl->type, freq, Q, gain);
 	}
-	return 0;
-}
-
-static void bq_control_changed(void * Instance)
-{
-	struct builtin *impl = Instance;
-	spa_loop_locked(impl->plugin->data_loop, do_bq_control_changed, 1, NULL, 0, impl);
 }
 
 /** bq_lowpass */
@@ -589,7 +579,7 @@ static const struct spa_fga_descriptor bq_lowpass_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
-	.control_changed = bq_control_changed,
+	.control_sync = bq_control_sync,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -604,7 +594,7 @@ static const struct spa_fga_descriptor bq_highpass_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
-	.control_changed = bq_control_changed,
+	.control_sync = bq_control_sync,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -619,7 +609,7 @@ static const struct spa_fga_descriptor bq_bandpass_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
-	.control_changed = bq_control_changed,
+	.control_sync = bq_control_sync,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -634,7 +624,7 @@ static const struct spa_fga_descriptor bq_lowshelf_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
-	.control_changed = bq_control_changed,
+	.control_sync = bq_control_sync,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -649,7 +639,7 @@ static const struct spa_fga_descriptor bq_highshelf_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
-	.control_changed = bq_control_changed,
+	.control_sync = bq_control_sync,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -664,7 +654,7 @@ static const struct spa_fga_descriptor bq_peaking_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
-	.control_changed = bq_control_changed,
+	.control_sync = bq_control_sync,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -679,7 +669,7 @@ static const struct spa_fga_descriptor bq_notch_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
-	.control_changed = bq_control_changed,
+	.control_sync = bq_control_sync,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -695,7 +685,7 @@ static const struct spa_fga_descriptor bq_allpass_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
-	.control_changed = bq_control_changed,
+	.control_sync = bq_control_sync,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -710,7 +700,7 @@ static const struct spa_fga_descriptor bq_raw_desc = {
 
 	.instantiate = bq_instantiate,
 	.connect_port = builtin_connect_port,
-	.control_changed = bq_control_changed,
+	.control_sync = bq_control_sync,
 	.activate = bq_activate,
 	.run = bq_run,
 	.cleanup = builtin_cleanup,
@@ -3411,7 +3401,6 @@ impl_init(const struct spa_handle_factory *factory,
 
 	impl->log = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_Log);
 	impl->dsp = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_FILTER_GRAPH_AudioDSP);
-	impl->data_loop = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_DataLoop);
 
 	for (uint32_t i = 0; info && i < info->n_items; i++) {
 		const char *k = info->items[i].key;

From 2fb38af3e0464fcb2656ec40c16935f541570afc Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 19 Feb 2026 14:25:03 +0100
Subject: [PATCH 075/263] modules: move the scheduler to a module

Mostly because we can but also because there are more ways of doing
the scheduling and this opens the door for some experimentation.
---
 src/daemon/minimal.conf.in        |    4 +
 src/daemon/pipewire.conf.in       |    4 +
 src/modules/meson.build           |   10 +
 src/modules/module-scheduler-v1.c | 1009 +++++++++++++++++++++++++++++
 src/pipewire/context.c            |  847 +-----------------------
 src/pipewire/context.h            |    5 +-
 src/pipewire/impl-link.c          |    1 +
 src/pipewire/private.h            |    3 +
 8 files changed, 1041 insertions(+), 842 deletions(-)
 create mode 100644 src/modules/module-scheduler-v1.c

diff --git a/src/daemon/minimal.conf.in b/src/daemon/minimal.conf.in
index 82647e9ca..6def01bcf 100644
--- a/src/daemon/minimal.conf.in
+++ b/src/daemon/minimal.conf.in
@@ -100,6 +100,10 @@ context.modules = [
         }
         flags = [ ifexists nofail ]
     }
+    # the graph scheduler
+    { name = libpipewire-module-scheduler-v1
+        condition = [ { module.scheduler-v1 = !false } ]
+    }
 
     # The native communication protocol.
     { name = libpipewire-module-protocol-native }
diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
index c3eb7120f..a9142cede 100644
--- a/src/daemon/pipewire.conf.in
+++ b/src/daemon/pipewire.conf.in
@@ -121,6 +121,10 @@ context.modules = [
         flags = [ ifexists nofail ]
         condition = [ { module.rt = !false } ]
     }
+    # the graph scheduler
+    { name = libpipewire-module-scheduler-v1
+        condition = [ { module.scheduler-v1 = !false } ]
+    }
 
     # The native communication protocol.
     { name = libpipewire-module-protocol-native
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 59f46ae13..8636286e6 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -46,6 +46,7 @@ module_sources = [
   'module-vban-recv.c',
   'module-vban-send.c',
   'module-session-manager.c',
+  'module-scheduler-v1.c',
   'module-zeroconf-discover.c',
   'module-roc-source.c',
   'module-roc-sink.c',
@@ -532,6 +533,15 @@ pipewire_module_adapter = shared_library('pipewire-module-adapter',
   dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep],
 )
 
+pipewire_module_scheduler_v1 = shared_library('pipewire-module-scheduler-v1',
+  [ 'module-scheduler-v1.c' ],
+  include_directories : [configinc],
+  install : true,
+  install_dir : modules_install_dir,
+  install_rpath: modules_install_dir,
+  dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep],
+)
+
 pipewire_module_session_manager = shared_library('pipewire-module-session-manager',
   [ 'module-session-manager.c',
     'module-session-manager/client-endpoint/client-endpoint.c',
diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
new file mode 100644
index 000000000..22965b257
--- /dev/null
+++ b/src/modules/module-scheduler-v1.c
@@ -0,0 +1,1009 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
+/* SPDX-License-Identifier: MIT */
+
+#include "config.h"
+
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <limits.h>
+
+#ifdef HAVE_SYS_VFS_H
+#include <sys/vfs.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+
+#include <spa/utils/cleanup.h>
+#include <spa/utils/result.h>
+#include <spa/utils/string.h>
+#include <spa/utils/json.h>
+
+#include <pipewire/impl.h>
+#include <pipewire/private.h>
+
+/** \page page_module_scheduler_v1 SchedulerV1
+ *
+ *
+ * ## Module Name
+ *
+ * `libpipewire-module-scheduler-v1`
+ *
+ * ## Module Options
+ *
+ * Options specific to the behavior of this module
+ *
+ * ## General options
+ *
+ * Options with well-known behavior:
+ *
+ * ## Config override
+ *
+ * A `module.scheduler-v1.args` config section can be added
+ * to override the module arguments.
+ *
+ *\code{.unparsed}
+ * # ~/.config/pipewire/pipewire.conf.d/my-scheduler-v1-args.conf
+ *
+ * module.scheduler-v1.args = {
+ * }
+ *\endcode
+ *
+ * ## Example configuration
+ *
+ *\code{.unparsed}
+ * context.modules = [
+ *  {   name = libpipewire-module-scheduler-v1
+ *      args = {
+ *      }
+ *  }
+ *]
+ *\endcode
+ *
+ * Since: 1.7.0
+ */
+
+#define NAME "scheduler-v1"
+
+PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
+#define PW_LOG_TOPIC_DEFAULT mod_topic
+
+#define MODULE_USAGE	""
+
+static const struct spa_dict_item module_props[] = {
+	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@proton.me>" },
+	{ PW_KEY_MODULE_DESCRIPTION, "Implement the Scheduler V1" },
+	{ PW_KEY_MODULE_USAGE, MODULE_USAGE },
+	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
+};
+
+#define MAX_HOPS	64
+#define MAX_SYNC	4u
+
+struct impl {
+	struct pw_context *context;
+
+	struct pw_properties *props;
+
+	struct spa_hook context_listener;
+	struct spa_hook module_listener;
+};
+
+static int ensure_state(struct pw_impl_node *node, bool running)
+{
+	enum pw_node_state state = node->info.state;
+	if (node->active && node->runnable &&
+	    !SPA_FLAG_IS_SET(node->spa_flags, SPA_NODE_FLAG_NEED_CONFIGURE) && running)
+		state = PW_NODE_STATE_RUNNING;
+	else if (state > PW_NODE_STATE_IDLE)
+		state = PW_NODE_STATE_IDLE;
+	return pw_impl_node_set_state(node, state);
+}
+
+/* From a node (that is runnable) follow all prepared links in the given direction
+ * and groups to active nodes and make them recursively runnable as well.
+ */
+static inline int run_nodes(struct pw_context *context, struct pw_impl_node *node,
+		struct spa_list *nodes, enum pw_direction direction, int hop)
+{
+	struct pw_impl_node *t;
+	struct pw_impl_port *p;
+	struct pw_impl_link *l;
+
+	if (hop == MAX_HOPS) {
+		pw_log_warn("exceeded hops (%d)", hop);
+		return -EIO;
+	}
+
+	pw_log_debug("node %p: '%s' direction:%s", node, node->name,
+			pw_direction_as_string(direction));
+
+	SPA_FLAG_SET(node->checked, 1u<<direction);
+
+	if (direction == PW_DIRECTION_INPUT) {
+		spa_list_for_each(p, &node->input_ports, link) {
+			spa_list_for_each(l, &p->links, input_link) {
+				t = l->output->node;
+
+				if (!t->active || !l->prepared ||
+				    (!t->driving && SPA_FLAG_IS_SET(t->checked, 1u<<direction)))
+					continue;
+				if (t->driving && p->node == t)
+					continue;
+
+				pw_log_debug("  peer %p: '%s'", t, t->name);
+				t->runnable = true;
+				run_nodes(context, t, nodes, direction, hop + 1);
+			}
+		}
+	} else {
+		spa_list_for_each(p, &node->output_ports, link) {
+			spa_list_for_each(l, &p->links, output_link) {
+				t = l->input->node;
+
+				if (!t->active || !l->prepared ||
+				    (!t->driving && SPA_FLAG_IS_SET(t->checked, 1u<<direction)))
+					continue;
+				if (t->driving && p->node == t)
+					continue;
+
+				pw_log_debug("  peer %p: '%s'", t, t->name);
+				t->runnable = true;
+				run_nodes(context, t, nodes, direction, hop + 1);
+			}
+		}
+	}
+	/* now go through all the nodes that have the same link group and
+	 * that are not yet visited. Note how nodes with the same group
+	 * don't get included here. They were added to the same driver but
+	 * need to otherwise stay idle unless some non-passive link activates
+	 * them. */
+	if (node->link_groups != NULL) {
+		spa_list_for_each(t, nodes, sort_link) {
+			if (t->exported || !t->active ||
+			    SPA_FLAG_IS_SET(t->checked, 1u<<direction))
+				continue;
+			if (pw_strv_find_common(t->link_groups, node->link_groups) < 0)
+				continue;
+
+			pw_log_debug("  group %p: '%s'", t, t->name);
+			t->runnable = true;
+			if (!t->driving)
+				run_nodes(context, t, nodes, direction, hop + 1);
+		}
+	}
+	return 0;
+}
+
+/* Follow all prepared links and groups from node, activate the links.
+ * If a non-passive link is found, we set the peer runnable flag.
+ *
+ * After this is done, we end up with a list of nodes in collect that are all
+ * linked to node.
+ * Some of the nodes have the runnable flag set. We then start from those nodes
+ * and make all linked nodes and groups runnable as well. (see run_nodes).
+ *
+ * This ensures that we only activate the paths from the runnable nodes to the
+ * driver nodes and leave the other nodes idle.
+ */
+static int collect_nodes(struct pw_context *context, struct pw_impl_node *node, struct spa_list *collect)
+{
+	struct spa_list queue;
+	struct pw_impl_node *n, *t;
+	struct pw_impl_port *p;
+	struct pw_impl_link *l;
+	uint32_t n_sync;
+	char *sync[MAX_SYNC+1];
+
+	pw_log_debug("node %p: '%s'", node, node->name);
+
+	/* start with node in the queue */
+	spa_list_init(&queue);
+	spa_list_append(&queue, &node->sort_link);
+	node->visited = true;
+
+	n_sync = 0;
+	sync[0] = NULL;
+
+	/* now follow all the links from the nodes in the queue
+	 * and add the peers to the queue. */
+	spa_list_consume(n, &queue, sort_link) {
+		spa_list_remove(&n->sort_link);
+		spa_list_append(collect, &n->sort_link);
+
+		pw_log_debug(" next node %p: '%s' runnable:%u active:%d",
+				n, n->name, n->runnable, n->active);
+
+		if (!n->active)
+			continue;
+
+		if (n->sync) {
+			for (uint32_t i = 0; n->sync_groups[i]; i++) {
+				if (n_sync >= MAX_SYNC)
+					break;
+				if (pw_strv_find(sync, n->sync_groups[i]) >= 0)
+					continue;
+				sync[n_sync++] = n->sync_groups[i];
+				sync[n_sync] = NULL;
+			}
+		}
+
+		spa_list_for_each(p, &n->input_ports, link) {
+			spa_list_for_each(l, &p->links, input_link) {
+				t = l->output->node;
+
+				if (!t->active)
+					continue;
+
+				pw_impl_link_prepare(l);
+
+				if (!l->prepared)
+					continue;
+
+				if (!l->passive)
+					t->runnable = true;
+
+				if (!t->visited) {
+					t->visited = true;
+					spa_list_append(&queue, &t->sort_link);
+				}
+			}
+		}
+		spa_list_for_each(p, &n->output_ports, link) {
+			spa_list_for_each(l, &p->links, output_link) {
+				t = l->input->node;
+
+				if (!t->active)
+					continue;
+
+				pw_impl_link_prepare(l);
+
+				if (!l->prepared)
+					continue;
+
+				if (!l->passive)
+					t->runnable = true;
+
+				if (!t->visited) {
+					t->visited = true;
+					spa_list_append(&queue, &t->sort_link);
+				}
+			}
+		}
+		/* now go through all the nodes that have the same group and
+		 * that are not yet visited */
+		if (n->groups != NULL || n->link_groups != NULL || sync[0] != NULL) {
+			spa_list_for_each(t, &context->node_list, link) {
+				if (t->exported || !t->active || t->visited)
+					continue;
+				/* the other node will be scheduled with this one if it's in
+				 * the same group or link group */
+				if (pw_strv_find_common(t->groups, n->groups) < 0 &&
+				    pw_strv_find_common(t->link_groups, n->link_groups) < 0 &&
+				    pw_strv_find_common(t->sync_groups, sync) < 0)
+					continue;
+
+				pw_log_debug("%p: %s join group of %s",
+						t, t->name, n->name);
+				t->visited = true;
+				spa_list_append(&queue, &t->sort_link);
+			}
+		}
+		pw_log_debug(" next node %p: '%s' runnable:%u %p %p %p", n, n->name, n->runnable,
+				n->groups, n->link_groups, sync);
+	}
+	/* All non-driver runnable nodes (ie. reachable with a non-passive link) now make
+	 * all linked nodes up and downstream runnable as well */
+	spa_list_for_each(n, collect, sort_link) {
+		if (!n->driver && n->runnable) {
+			run_nodes(context, n, collect, PW_DIRECTION_OUTPUT, 0);
+			run_nodes(context, n, collect, PW_DIRECTION_INPUT, 0);
+		}
+	}
+	/* now we might have made a driver runnable, if the node is not runnable at this point
+	 * it means it was linked to the driver with passives links and some other node
+	 * made the driver active. If the node is a leaf it can not be activated in any other
+	 * way and we will also make it, and all its peers, runnable */
+	spa_list_for_each(n, collect, sort_link) {
+		if (!n->driver && n->driver_node->runnable && !n->runnable && n->leaf && n->active) {
+			n->runnable = true;
+			run_nodes(context, n, collect, PW_DIRECTION_OUTPUT, 0);
+			run_nodes(context, n, collect, PW_DIRECTION_INPUT, 0);
+		}
+	}
+
+	return 0;
+}
+
+static void move_to_driver(struct pw_context *context, struct spa_list *nodes,
+		struct pw_impl_node *driver)
+{
+	struct pw_impl_node *n;
+	pw_log_debug("driver: %p %s runnable:%u", driver, driver->name, driver->runnable);
+	spa_list_consume(n, nodes, sort_link) {
+		spa_list_remove(&n->sort_link);
+
+		driver->runnable |= n->runnable;
+
+		pw_log_debug(" follower: %p %s runnable:%u driver-runnable:%u", n, n->name,
+				n->runnable, driver->runnable);
+		pw_impl_node_set_driver(n, driver);
+	}
+}
+static void remove_from_driver(struct pw_context *context, struct spa_list *nodes)
+{
+	struct pw_impl_node *n;
+	spa_list_consume(n, nodes, sort_link) {
+		spa_list_remove(&n->sort_link);
+		pw_impl_node_set_driver(n, NULL);
+		ensure_state(n, false);
+	}
+}
+
+static inline void get_quantums(struct pw_context *context, uint32_t *def,
+		uint32_t *min, uint32_t *max, uint32_t *rate, uint32_t *floor, uint32_t *ceil)
+{
+	struct settings *s = &context->settings;
+	if (s->clock_force_quantum != 0) {
+		*def = *min = *max = s->clock_force_quantum;
+		*rate = 0;
+	} else {
+		*def = s->clock_quantum;
+		*min = s->clock_min_quantum;
+		*max = s->clock_max_quantum;
+		*rate = s->clock_rate;
+	}
+	*floor = s->clock_quantum_floor;
+	*ceil = s->clock_quantum_limit;
+}
+
+static inline const uint32_t *get_rates(struct pw_context *context, uint32_t *def, uint32_t *n_rates,
+		bool *force)
+{
+	struct settings *s = &context->settings;
+	if (s->clock_force_rate != 0) {
+		*force = true;
+		*n_rates = 1;
+		*def = s->clock_force_rate;
+		return &s->clock_force_rate;
+	} else {
+		*force = false;
+		*n_rates = s->n_clock_rates;
+		*def = s->clock_rate;
+		return s->clock_rates;
+	}
+}
+static void reconfigure_driver(struct pw_context *context, struct pw_impl_node *n)
+{
+	struct pw_impl_node *s;
+
+	spa_list_for_each(s, &n->follower_list, follower_link) {
+		if (s == n)
+			continue;
+		pw_log_debug("%p: follower %p: '%s' suspend",
+				context, s, s->name);
+		pw_impl_node_set_state(s, PW_NODE_STATE_SUSPENDED);
+	}
+	pw_log_debug("%p: driver %p: '%s' suspend",
+			context, n, n->name);
+
+	if (n->info.state >= PW_NODE_STATE_IDLE)
+		n->need_resume = !n->pause_on_idle;
+	pw_impl_node_set_state(n, PW_NODE_STATE_SUSPENDED);
+}
+
+/* find smaller power of 2 */
+static uint32_t flp2(uint32_t x)
+{
+	x = x | (x >> 1);
+	x = x | (x >> 2);
+	x = x | (x >> 4);
+	x = x | (x >> 8);
+	x = x | (x >> 16);
+	return x - (x >> 1);
+}
+
+/* cmp fractions, avoiding overflows */
+static int fraction_compare(const struct spa_fraction *a, const struct spa_fraction *b)
+{
+	uint64_t fa = (uint64_t)a->num * (uint64_t)b->denom;
+	uint64_t fb = (uint64_t)b->num * (uint64_t)a->denom;
+	return fa < fb ? -1 : (fa > fb ? 1 : 0);
+}
+
+static inline uint32_t calc_gcd(uint32_t a, uint32_t b)
+{
+	while (b != 0) {
+		uint32_t temp = a;
+		a = b;
+		b = temp % b;
+	}
+	return a;
+}
+
+struct rate_info {
+	uint32_t rate;
+	uint32_t gcd;
+	uint32_t diff;
+};
+
+static inline void update_highest_rate(struct rate_info *best, struct rate_info *current)
+{
+	/* find highest rate */
+	if (best->rate == 0 || best->rate < current->rate)
+		*best = *current;
+}
+
+static inline void update_nearest_gcd(struct rate_info *best, struct rate_info *current)
+{
+	/* find nearest GCD */
+	if (best->rate == 0 ||
+	    (best->gcd < current->gcd) ||
+	    (best->gcd == current->gcd && best->diff > current->diff))
+		*best = *current;
+}
+static inline void update_nearest_rate(struct rate_info *best, struct rate_info *current)
+{
+	/* find nearest rate */
+	if (best->rate == 0 || best->diff > current->diff)
+		*best = *current;
+}
+
+static uint32_t find_best_rate(const uint32_t *rates, uint32_t n_rates, uint32_t rate, uint32_t def)
+{
+	uint32_t i, limit;
+	struct rate_info best;
+	struct rate_info info[n_rates];
+
+	for (i = 0; i < n_rates; i++) {
+		info[i].rate = rates[i];
+		info[i].gcd = calc_gcd(rate, rates[i]);
+		info[i].diff = SPA_ABS((int32_t)rate - (int32_t)rates[i]);
+	}
+
+	/* first find higher nearest GCD. This tries to find next bigest rate that
+	 * requires the least amount of resample filter banks. Usually these are
+	 * rates that are multiples of each other or multiples of a common rate.
+	 *
+	 * 44100 and [ 32000 56000 88200 96000 ]  -> 88200
+	 * 48000 and [ 32000 56000 88200 96000 ]  -> 96000
+	 * 88200 and [ 44100 48000 96000 192000 ]  -> 96000
+	 * 32000 and [ 44100 192000 ] -> 44100
+	 * 8000 and [ 44100 48000 ] -> 48000
+	 * 8000 and [ 44100 192000 ] -> 44100
+	 * 11025 and [ 44100 48000 ] -> 44100
+	 * 44100 and [ 48000 176400 ] -> 48000
+	 * 144 and [ 44100 48000 88200 96000] -> 48000
+	 */
+	spa_zero(best);
+	/* Don't try to do excessive upsampling by limiting the max rate
+	 * for desired < default to default*2. For other rates allow
+	 * a x3 upsample rate max. For values lower than half of the default,
+	 * limit to the default.  */
+	limit = rate < def/2 ? def : rate < def ? def*2 : rate*3;
+	for (i = 0; i < n_rates; i++) {
+		if (info[i].rate >= rate && info[i].rate <= limit)
+			update_nearest_gcd(&best, &info[i]);
+	}
+	if (best.rate != 0)
+		return best.rate;
+
+	/* we would need excessive upsampling, pick a nearest higher rate */
+	spa_zero(best);
+	for (i = 0; i < n_rates; i++) {
+		if (info[i].rate >= rate)
+			update_nearest_rate(&best, &info[i]);
+	}
+	if (best.rate != 0)
+		return best.rate;
+
+	/* There is nothing above the rate, we need to downsample. Try to downsample
+	 * but only to something that is from a common rate family. Also don't
+	 * try to downsample to something that will sound worse (< 44100).
+	 *
+	 * 88200 and [ 22050 44100 48000 ] -> 44100
+	 * 88200 and [ 22050 48000 ] -> 48000
+	 */
+	spa_zero(best);
+	for (i = 0; i < n_rates; i++) {
+		if (info[i].rate >= 44100)
+			update_nearest_gcd(&best, &info[i]);
+	}
+	if (best.rate != 0)
+		return best.rate;
+
+	/* There is nothing to downsample above our threshold. Downsample to whatever
+	 * is the highest rate then. */
+	spa_zero(best);
+	for (i = 0; i < n_rates; i++)
+		update_highest_rate(&best, &info[i]);
+	if (best.rate != 0)
+		return best.rate;
+
+	return def;
+}
+
+/* here we evaluate the complete state of the graph.
+ *
+ * It roughly operates in 3 stages:
+ *
+ * 1. go over all drivers and collect the nodes that need to be scheduled with the
+ *    driver. This include all nodes that have an active link with the driver or
+ *    with a node already scheduled with the driver.
+ *
+ * 2. go over all nodes that are not assigned to a driver. The ones that require
+ *    a driver are moved to some random active driver found in step 1.
+ *
+ * 3. go over all drivers again, collect the quantum/rate of all followers, select
+ *    the desired final value and activate the followers and then the driver.
+ *
+ * A complete graph evaluation is performed for each change that is made to the
+ * graph, such as making/destroying links, adding/removing nodes, property changes such
+ * as quantum/rate changes or metadata changes.
+ */
+static void context_recalc_graph(void *data)
+{
+	struct impl *impl = data;
+	struct pw_context *context = impl->context;
+	struct settings *settings = &context->settings;
+	struct pw_impl_node *n, *s, *target, *fallback;
+	const uint32_t *rates;
+	uint32_t max_quantum, min_quantum, def_quantum, rate_quantum, floor_quantum, ceil_quantum;
+	uint32_t n_rates, def_rate, transport;
+	bool freewheel, global_force_rate, global_force_quantum;
+	struct spa_list collect;
+
+again:
+	freewheel = false;
+
+	/* clean up the flags first */
+	spa_list_for_each(n, &context->node_list, link) {
+		n->visited = false;
+		n->checked = 0;
+		n->runnable = n->always_process && n->active;
+	}
+
+	get_quantums(context, &def_quantum, &min_quantum, &max_quantum, &rate_quantum,
+			&floor_quantum, &ceil_quantum);
+	rates = get_rates(context, &def_rate, &n_rates, &global_force_rate);
+
+	global_force_quantum = rate_quantum == 0;
+
+	/* start from all drivers and group all nodes that are linked
+	 * to it. Some nodes are not (yet) linked to anything and they
+	 * will end up 'unassigned' to a driver. Other nodes are drivers
+	 * and if they have active followers, we can use them to schedule
+	 * the unassigned nodes. */
+	target = fallback = NULL;
+	spa_list_for_each(n, &context->driver_list, driver_link) {
+		if (n->exported)
+			continue;
+
+		if (!n->visited) {
+			spa_list_init(&collect);
+			collect_nodes(context, n, &collect);
+			move_to_driver(context, &collect, n);
+		}
+		/* from now on we are only interested in active driving nodes
+		 * with a driver_priority. We're going to see if there are
+		 * active followers. */
+		if (!n->driving || !n->active || n->priority_driver <= 0)
+			continue;
+
+		/* first active driving node is fallback */
+		if (fallback == NULL)
+			fallback = n;
+
+		if (!n->runnable)
+			continue;
+
+		spa_list_for_each(s, &n->follower_list, follower_link) {
+			pw_log_debug("%p: driver %p: follower %p %s: active:%d",
+					context, n, s, s->name, s->active);
+			if (s != n && s->active) {
+				/* if the driving node has active followers, it
+				 * is a target for our unassigned nodes */
+				if (target == NULL)
+					target = n;
+				if (n->freewheel)
+					freewheel = true;
+				break;
+			}
+		}
+	}
+	/* no active node, use fallback driving node */
+	if (target == NULL)
+		target = fallback;
+
+	/* update the freewheel status */
+	pw_context_set_freewheel(context, freewheel);
+
+	/* now go through all available nodes. The ones we didn't visit
+	 * in collect_nodes() are not linked to any driver. We assign them
+	 * to either an active driver or the first driver if they are in a
+	 * group that needs a driver. Else we remove them from a driver
+	 * and stop them. */
+	spa_list_for_each(n, &context->node_list, link) {
+		struct pw_impl_node *t, *driver;
+
+		if (n->exported || n->visited)
+			continue;
+
+		pw_log_debug("%p: unassigned node %p: '%s' active:%d want_driver:%d target:%p",
+				context, n, n->name, n->active, n->want_driver, target);
+
+		/* collect all nodes in this group */
+		spa_list_init(&collect);
+		collect_nodes(context, n, &collect);
+
+		driver = NULL;
+		spa_list_for_each(t, &collect, sort_link) {
+			/* is any active and want a driver */
+			if ((t->want_driver && t->active && t->runnable) ||
+			    t->always_process) {
+				driver = target;
+				break;
+			}
+		}
+		if (driver != NULL) {
+			driver->runnable = true;
+			/* driver needed for this group */
+			move_to_driver(context, &collect, driver);
+		} else {
+			/* no driver, make sure the nodes stop */
+			remove_from_driver(context, &collect);
+		}
+	}
+
+	/* assign final quantum and set state for followers and drivers */
+	spa_list_for_each(n, &context->driver_list, driver_link) {
+		bool running = false, lock_quantum = false, lock_rate = false;
+		struct spa_fraction latency = SPA_FRACTION(0, 0);
+		struct spa_fraction max_latency = SPA_FRACTION(0, 0);
+		struct spa_fraction rate = SPA_FRACTION(0, 0);
+		uint32_t target_quantum, target_rate, current_rate, current_quantum;
+		uint64_t quantum_stamp = 0, rate_stamp = 0;
+		bool force_rate, force_quantum, restore_rate = false, restore_quantum = false;
+		bool do_reconfigure = false, need_resume, was_target_pending;
+		bool have_request = false;
+		const uint32_t *node_rates;
+		uint32_t node_n_rates, node_def_rate;
+		uint32_t node_max_quantum, node_min_quantum, node_def_quantum, node_rate_quantum;
+
+		if (!n->driving || n->exported)
+			continue;
+
+		node_def_quantum = def_quantum;
+		node_min_quantum = min_quantum;
+		node_max_quantum = max_quantum;
+		node_rate_quantum = rate_quantum;
+		force_quantum = global_force_quantum;
+
+		node_def_rate = def_rate;
+		node_n_rates = n_rates;
+		node_rates = rates;
+		force_rate = global_force_rate;
+
+		/* collect quantum and rate */
+		spa_list_for_each(s, &n->follower_list, follower_link) {
+
+			if (!s->moved) {
+				/* We only try to enforce the lock flags for nodes that
+				 * are not recently moved between drivers. The nodes that
+				 * are moved should try to enforce their quantum on the
+				 * new driver. */
+				lock_quantum |= s->lock_quantum;
+				lock_rate |= s->lock_rate;
+			}
+			if (!global_force_quantum && s->force_quantum > 0 &&
+			    s->stamp > quantum_stamp) {
+				node_def_quantum = node_min_quantum = node_max_quantum = s->force_quantum;
+				node_rate_quantum = 0;
+				quantum_stamp = s->stamp;
+				force_quantum = true;
+			}
+			if (!global_force_rate && s->force_rate > 0 &&
+			    s->stamp > rate_stamp) {
+				node_def_rate = s->force_rate;
+				node_n_rates = 1;
+				node_rates = &s->force_rate;
+				force_rate = true;
+				rate_stamp = s->stamp;
+			}
+
+			/* smallest latencies */
+			if (latency.denom == 0 ||
+			    (s->latency.denom > 0 &&
+			     fraction_compare(&s->latency, &latency) < 0))
+				latency = s->latency;
+			if (max_latency.denom == 0 ||
+			    (s->max_latency.denom > 0 &&
+			     fraction_compare(&s->max_latency, &max_latency) < 0))
+				max_latency = s->max_latency;
+
+			/* largest rate, which is in fact the smallest fraction */
+			if (rate.denom == 0 ||
+			    (s->rate.denom > 0 &&
+			     fraction_compare(&s->rate, &rate) < 0))
+				rate = s->rate;
+
+			if (s->active)
+				running = n->runnable;
+
+			pw_log_debug("%p: follower %p running:%d runnable:%d rate:%u/%u latency %u/%u '%s'",
+				context, s, running, s->runnable, rate.num, rate.denom,
+				latency.num, latency.denom, s->name);
+
+			if (running && s != n && s->supports_request > 0)
+				have_request = true;
+
+			s->moved = false;
+		}
+
+		if (n->forced_rate && !force_rate && n->runnable) {
+			/* A node that was forced to a rate but is no longer being
+			 * forced can restore its rate */
+			pw_log_info("(%s-%u) restore rate", n->name, n->info.id);
+			restore_rate = true;
+		}
+		if (n->forced_quantum && !force_quantum && n->runnable) {
+			/* A node that was forced to a quantum but is no longer being
+			 * forced can restore its quantum */
+			pw_log_info("(%s-%u) restore quantum", n->name, n->info.id);
+			restore_quantum = true;
+		}
+
+		if (force_quantum)
+			lock_quantum = false;
+		if (force_rate)
+			lock_rate = false;
+
+		need_resume = n->need_resume;
+		if (need_resume) {
+			running = true;
+			n->need_resume = false;
+		}
+
+		current_rate = n->target_rate.denom;
+		if (!restore_rate &&
+		   (lock_rate || need_resume || !running ||
+		    (!force_rate && (n->info.state > PW_NODE_STATE_IDLE)))) {
+			pw_log_debug("%p: keep rate:1/%u restore:%u lock:%u resume:%u "
+					"running:%u force:%u state:%s", context,
+					current_rate, restore_rate, lock_rate, need_resume,
+					running, force_rate,
+					pw_node_state_as_string(n->info.state));
+
+			/* when we don't need to restore or rate and
+			 * when someone wants us to lock the rate of this driver or
+			 * when we are in the process of reconfiguring the driver or
+			 * when we are not running any followers or
+			 * when the driver is busy and we don't need to force a rate,
+			 * keep the current rate */
+			target_rate = current_rate;
+		}
+		else {
+			/* Here we are allowed to change the rate of the driver.
+			 * Start with the default rate. If the desired rate is
+			 * allowed, switch to it */
+			if (rate.denom != 0 && rate.num == 1)
+				target_rate = rate.denom;
+			else
+				target_rate = node_def_rate;
+
+			target_rate = find_best_rate(node_rates, node_n_rates,
+						target_rate, node_def_rate);
+
+			pw_log_debug("%p: def_rate:%d target_rate:%d rate:%d/%d", context,
+					node_def_rate, target_rate, rate.num, rate.denom);
+		}
+
+		was_target_pending = n->target_pending;
+
+		if (target_rate != current_rate) {
+			/* we doing a rate switch */
+			pw_log_info("(%s-%u) state:%s new rate:%u/(%u)->%u",
+					n->name, n->info.id,
+					pw_node_state_as_string(n->info.state),
+					n->target_rate.denom, current_rate,
+					target_rate);
+
+			if (force_rate) {
+				if (settings->clock_rate_update_mode == CLOCK_RATE_UPDATE_MODE_HARD)
+					do_reconfigure |= !was_target_pending;
+			} else {
+				if (n->info.state >= PW_NODE_STATE_SUSPENDED)
+					do_reconfigure |= !was_target_pending;
+			}
+			/* we're setting the pending rate. This will become the new
+			 * current rate in the next iteration of the graph. */
+			n->target_rate = SPA_FRACTION(1, target_rate);
+			n->forced_rate = force_rate;
+			n->target_pending = true;
+			current_rate = target_rate;
+		}
+
+		if (node_rate_quantum != 0 && current_rate != node_rate_quantum) {
+			/* the quantum values are scaled with the current rate */
+			node_def_quantum = SPA_SCALE32(node_def_quantum, current_rate, node_rate_quantum);
+			node_min_quantum = SPA_SCALE32(node_min_quantum, current_rate, node_rate_quantum);
+			node_max_quantum = SPA_SCALE32(node_max_quantum, current_rate, node_rate_quantum);
+		}
+
+		/* calculate desired quantum. Don't limit to the max_latency when we are
+		 * going to force a quantum or rate and reconfigure the nodes. */
+		if (max_latency.denom != 0 && !force_quantum && !force_rate) {
+			uint32_t tmp = SPA_SCALE32(max_latency.num, current_rate, max_latency.denom);
+			if (tmp < node_max_quantum)
+				node_max_quantum = tmp;
+		}
+
+		current_quantum = n->target_quantum;
+		if (!restore_quantum && (lock_quantum || need_resume || !running)) {
+			pw_log_debug("%p: keep quantum:%u restore:%u lock:%u resume:%u "
+					"running:%u force:%u state:%s", context,
+					current_quantum, restore_quantum, lock_quantum, need_resume,
+					running, force_quantum,
+					pw_node_state_as_string(n->info.state));
+			target_quantum = current_quantum;
+		}
+		else {
+			target_quantum = node_def_quantum;
+			if (latency.denom != 0)
+				target_quantum = SPA_SCALE32(latency.num, current_rate, latency.denom);
+			target_quantum = SPA_CLAMP(target_quantum, node_min_quantum, node_max_quantum);
+			target_quantum = SPA_CLAMP(target_quantum, floor_quantum, ceil_quantum);
+
+			if (settings->clock_power_of_two_quantum && !force_quantum)
+				target_quantum = flp2(target_quantum);
+		}
+
+		if (target_quantum != current_quantum) {
+			pw_log_info("(%s-%u) new quantum:%"PRIu64"->%u",
+					n->name, n->info.id,
+					n->target_quantum,
+					target_quantum);
+			/* this is the new pending quantum */
+			n->target_quantum = target_quantum;
+			n->forced_quantum = force_quantum;
+			n->target_pending = true;
+
+			if (force_quantum)
+				do_reconfigure |= !was_target_pending;
+		}
+
+		if (n->target_pending) {
+			if (do_reconfigure) {
+				reconfigure_driver(context, n);
+				/* we might be suspended now and the links need to be prepared again */
+				goto again;
+			}
+			/* we have a pending change. We place the new values in the
+			 * pending fields so that they are picked up by the driver in
+			 * the next cycle */
+			pw_log_debug("%p: apply duration:%"PRIu64" rate:%u/%u", context,
+					n->target_quantum, n->target_rate.num,
+					n->target_rate.denom);
+			SPA_SEQ_WRITE(n->rt.position->clock.target_seq);
+			n->rt.position->clock.target_duration = n->target_quantum;
+			n->rt.position->clock.target_rate = n->target_rate;
+			SPA_SEQ_WRITE(n->rt.position->clock.target_seq);
+
+			if (n->info.state < PW_NODE_STATE_RUNNING) {
+				n->rt.position->clock.duration = n->target_quantum;
+				n->rt.position->clock.rate = n->target_rate;
+			}
+			n->target_pending = false;
+		} else {
+			n->target_quantum = n->rt.position->clock.target_duration;
+			n->target_rate = n->rt.position->clock.target_rate;
+		}
+
+		if (n->info.state < PW_NODE_STATE_RUNNING)
+			n->rt.position->clock.nsec = get_time_ns(n->rt.target.system);
+
+		SPA_FLAG_UPDATE(n->rt.position->clock.flags,
+				SPA_IO_CLOCK_FLAG_LAZY, have_request && n->supports_lazy > 0);
+
+		pw_log_debug("%p: driver %p running:%d runnable:%d quantum:%u rate:%u (%"PRIu64"/%u)'%s'",
+				context, n, running, n->runnable, target_quantum, target_rate,
+				n->rt.position->clock.target_duration,
+				n->rt.position->clock.target_rate.denom, n->name);
+
+		transport = PW_NODE_ACTIVATION_COMMAND_NONE;
+
+		/* first change the node states of the followers to the new target */
+		spa_list_for_each(s, &n->follower_list, follower_link) {
+			if (s->transport != PW_NODE_ACTIVATION_COMMAND_NONE) {
+				transport = s->transport;
+				s->transport = PW_NODE_ACTIVATION_COMMAND_NONE;
+			}
+			if (s == n)
+				continue;
+			pw_log_debug("%p: follower %p: active:%d '%s'",
+					context, s, s->active, s->name);
+			ensure_state(s, running);
+		}
+
+		if (transport != PW_NODE_ACTIVATION_COMMAND_NONE) {
+			pw_log_info("%s: transport %d", n->name, transport);
+			SPA_ATOMIC_STORE(n->rt.target.activation->command, transport);
+		}
+
+		/* now that all the followers are ready, start the driver */
+		ensure_state(n, running);
+	}
+}
+
+static const struct pw_context_events context_events = {
+	PW_VERSION_CONTEXT_EVENTS,
+	.recalc_graph = context_recalc_graph,
+};
+
+static void module_destroy(void *data)
+{
+	struct impl *impl = data;
+
+	if (impl->context) {
+		spa_hook_remove(&impl->context_listener);
+		spa_hook_remove(&impl->module_listener);
+	}
+
+	pw_properties_free(impl->props);
+
+	free(impl);
+}
+
+static const struct pw_impl_module_events module_events = {
+	PW_VERSION_IMPL_MODULE_EVENTS,
+	.destroy = module_destroy,
+};
+
+SPA_EXPORT
+int pipewire__module_init(struct pw_impl_module *module, const char *args_str)
+{
+	struct pw_context *context = pw_impl_module_get_context(module);
+	struct pw_properties *args;
+	struct impl *impl;
+	int res;
+
+	PW_LOG_TOPIC_INIT(mod_topic);
+
+	impl = calloc(1, sizeof(struct impl));
+	if (impl == NULL)
+		return -errno;
+
+	pw_log_debug("module %p: new %s", impl, args_str);
+
+	if (args_str)
+		args = pw_properties_new_string(args_str);
+	else
+		args = pw_properties_new(NULL, NULL);
+
+	if (!args) {
+		res = -errno;
+		goto error;
+	}
+
+	pw_context_conf_update_props(context, "module."NAME".args", args);
+
+	impl->props = args;
+	impl->context = context;
+
+	pw_context_add_listener(context, &impl->context_listener, &context_events, impl);
+	pw_impl_module_add_listener(module, &impl->module_listener, &module_events, impl);
+
+	pw_impl_module_update_properties(module, &SPA_DICT_INIT_ARRAY(module_props));
+
+	return 0;
+
+error:
+	module_destroy(impl);
+	return res;
+}
diff --git a/src/pipewire/context.c b/src/pipewire/context.c
index 1c30be70a..40ed031bb 100644
--- a/src/pipewire/context.c
+++ b/src/pipewire/context.c
@@ -36,8 +36,6 @@
 PW_LOG_TOPIC_EXTERN(log_context);
 #define PW_LOG_TOPIC_DEFAULT log_context
 
-#define MAX_HOPS	64
-#define MAX_SYNC	4u
 #define MAX_LOOPS	64u
 
 #define DEFAULT_DATA_LOOPS	1
@@ -112,13 +110,17 @@ static void fill_core_properties(struct pw_context *context)
 	pw_properties_set(properties, PW_KEY_CORE_NAME, context->core->info.name);
 }
 
-static int context_set_freewheel(struct pw_context *context, bool freewheel)
+SPA_EXPORT
+int pw_context_set_freewheel(struct pw_context *context, bool freewheel)
 {
 	struct impl *impl = SPA_CONTAINER_OF(context, struct impl, this);
 	struct spa_thread *thr;
 	uint32_t i;
 	int res = 0;
 
+	if (context->freewheeling == freewheel)
+		return 0;
+
 	for (i = 0; i < impl->n_data_loops; i++) {
 		if (impl->data_loops[i].impl == NULL ||
 		    (thr = pw_data_loop_get_thread(impl->data_loops[i].impl)) == NULL)
@@ -982,468 +984,9 @@ SPA_PRINTF_FUNC(7, 8) int pw_context_debug_port_params(struct pw_context *this,
         return 0;
 }
 
-static int ensure_state(struct pw_impl_node *node, bool running)
-{
-	enum pw_node_state state = node->info.state;
-	if (node->active && node->runnable &&
-	    !SPA_FLAG_IS_SET(node->spa_flags, SPA_NODE_FLAG_NEED_CONFIGURE) && running)
-		state = PW_NODE_STATE_RUNNING;
-	else if (state > PW_NODE_STATE_IDLE)
-		state = PW_NODE_STATE_IDLE;
-	return pw_impl_node_set_state(node, state);
-}
-
-/* From a node (that is runnable) follow all prepared links in the given direction
- * and groups to active nodes and make them recursively runnable as well.
- */
-static inline int run_nodes(struct pw_context *context, struct pw_impl_node *node,
-		struct spa_list *nodes, enum pw_direction direction, int hop)
-{
-	struct pw_impl_node *t;
-	struct pw_impl_port *p;
-	struct pw_impl_link *l;
-
-	if (hop == MAX_HOPS) {
-		pw_log_warn("exceeded hops (%d)", hop);
-		return -EIO;
-	}
-
-	pw_log_debug("node %p: '%s' direction:%s", node, node->name,
-			pw_direction_as_string(direction));
-
-	SPA_FLAG_SET(node->checked, 1u<<direction);
-
-	if (direction == PW_DIRECTION_INPUT) {
-		spa_list_for_each(p, &node->input_ports, link) {
-			spa_list_for_each(l, &p->links, input_link) {
-				t = l->output->node;
-
-				if (!t->active || !l->prepared ||
-				    (!t->driving && SPA_FLAG_IS_SET(t->checked, 1u<<direction)))
-					continue;
-				if (t->driving && p->node == t)
-					continue;
-
-				pw_log_debug("  peer %p: '%s'", t, t->name);
-				t->runnable = true;
-				run_nodes(context, t, nodes, direction, hop + 1);
-			}
-		}
-	} else {
-		spa_list_for_each(p, &node->output_ports, link) {
-			spa_list_for_each(l, &p->links, output_link) {
-				t = l->input->node;
-
-				if (!t->active || !l->prepared ||
-				    (!t->driving && SPA_FLAG_IS_SET(t->checked, 1u<<direction)))
-					continue;
-				if (t->driving && p->node == t)
-					continue;
-
-				pw_log_debug("  peer %p: '%s'", t, t->name);
-				t->runnable = true;
-				run_nodes(context, t, nodes, direction, hop + 1);
-			}
-		}
-	}
-	/* now go through all the nodes that have the same link group and
-	 * that are not yet visited. Note how nodes with the same group
-	 * don't get included here. They were added to the same driver but
-	 * need to otherwise stay idle unless some non-passive link activates
-	 * them. */
-	if (node->link_groups != NULL) {
-		spa_list_for_each(t, nodes, sort_link) {
-			if (t->exported || !t->active ||
-			    SPA_FLAG_IS_SET(t->checked, 1u<<direction))
-				continue;
-			if (pw_strv_find_common(t->link_groups, node->link_groups) < 0)
-				continue;
-
-			pw_log_debug("  group %p: '%s'", t, t->name);
-			t->runnable = true;
-			if (!t->driving)
-				run_nodes(context, t, nodes, direction, hop + 1);
-		}
-	}
-	return 0;
-}
-
-/* Follow all prepared links and groups from node, activate the links.
- * If a non-passive link is found, we set the peer runnable flag.
- *
- * After this is done, we end up with a list of nodes in collect that are all
- * linked to node.
- * Some of the nodes have the runnable flag set. We then start from those nodes
- * and make all linked nodes and groups runnable as well. (see run_nodes).
- *
- * This ensures that we only activate the paths from the runnable nodes to the
- * driver nodes and leave the other nodes idle.
- */
-static int collect_nodes(struct pw_context *context, struct pw_impl_node *node, struct spa_list *collect)
-{
-	struct spa_list queue;
-	struct pw_impl_node *n, *t;
-	struct pw_impl_port *p;
-	struct pw_impl_link *l;
-	uint32_t n_sync;
-	char *sync[MAX_SYNC+1];
-
-	pw_log_debug("node %p: '%s'", node, node->name);
-
-	/* start with node in the queue */
-	spa_list_init(&queue);
-	spa_list_append(&queue, &node->sort_link);
-	node->visited = true;
-
-	n_sync = 0;
-	sync[0] = NULL;
-
-	/* now follow all the links from the nodes in the queue
-	 * and add the peers to the queue. */
-	spa_list_consume(n, &queue, sort_link) {
-		spa_list_remove(&n->sort_link);
-		spa_list_append(collect, &n->sort_link);
-
-		pw_log_debug(" next node %p: '%s' runnable:%u active:%d",
-				n, n->name, n->runnable, n->active);
-
-		if (!n->active)
-			continue;
-
-		if (n->sync) {
-			for (uint32_t i = 0; n->sync_groups[i]; i++) {
-				if (n_sync >= MAX_SYNC)
-					break;
-				if (pw_strv_find(sync, n->sync_groups[i]) >= 0)
-					continue;
-				sync[n_sync++] = n->sync_groups[i];
-				sync[n_sync] = NULL;
-			}
-		}
-
-		spa_list_for_each(p, &n->input_ports, link) {
-			spa_list_for_each(l, &p->links, input_link) {
-				t = l->output->node;
-
-				if (!t->active)
-					continue;
-
-				pw_impl_link_prepare(l);
-
-				if (!l->prepared)
-					continue;
-
-				if (!l->passive)
-					t->runnable = true;
-
-				if (!t->visited) {
-					t->visited = true;
-					spa_list_append(&queue, &t->sort_link);
-				}
-			}
-		}
-		spa_list_for_each(p, &n->output_ports, link) {
-			spa_list_for_each(l, &p->links, output_link) {
-				t = l->input->node;
-
-				if (!t->active)
-					continue;
-
-				pw_impl_link_prepare(l);
-
-				if (!l->prepared)
-					continue;
-
-				if (!l->passive)
-					t->runnable = true;
-
-				if (!t->visited) {
-					t->visited = true;
-					spa_list_append(&queue, &t->sort_link);
-				}
-			}
-		}
-		/* now go through all the nodes that have the same group and
-		 * that are not yet visited */
-		if (n->groups != NULL || n->link_groups != NULL || sync[0] != NULL) {
-			spa_list_for_each(t, &context->node_list, link) {
-				if (t->exported || !t->active || t->visited)
-					continue;
-				/* the other node will be scheduled with this one if it's in
-				 * the same group or link group */
-				if (pw_strv_find_common(t->groups, n->groups) < 0 &&
-				    pw_strv_find_common(t->link_groups, n->link_groups) < 0 &&
-				    pw_strv_find_common(t->sync_groups, sync) < 0)
-					continue;
-
-				pw_log_debug("%p: %s join group of %s",
-						t, t->name, n->name);
-				t->visited = true;
-				spa_list_append(&queue, &t->sort_link);
-			}
-		}
-		pw_log_debug(" next node %p: '%s' runnable:%u %p %p %p", n, n->name, n->runnable,
-				n->groups, n->link_groups, sync);
-	}
-	/* All non-driver runnable nodes (ie. reachable with a non-passive link) now make
-	 * all linked nodes up and downstream runnable as well */
-	spa_list_for_each(n, collect, sort_link) {
-		if (!n->driver && n->runnable) {
-			run_nodes(context, n, collect, PW_DIRECTION_OUTPUT, 0);
-			run_nodes(context, n, collect, PW_DIRECTION_INPUT, 0);
-		}
-	}
-	/* now we might have made a driver runnable, if the node is not runnable at this point
-	 * it means it was linked to the driver with passives links and some other node
-	 * made the driver active. If the node is a leaf it can not be activated in any other
-	 * way and we will also make it, and all its peers, runnable */
-	spa_list_for_each(n, collect, sort_link) {
-		if (!n->driver && n->driver_node->runnable && !n->runnable && n->leaf && n->active) {
-			n->runnable = true;
-			run_nodes(context, n, collect, PW_DIRECTION_OUTPUT, 0);
-			run_nodes(context, n, collect, PW_DIRECTION_INPUT, 0);
-		}
-	}
-
-	return 0;
-}
-
-static void move_to_driver(struct pw_context *context, struct spa_list *nodes,
-		struct pw_impl_node *driver)
-{
-	struct pw_impl_node *n;
-	pw_log_debug("driver: %p %s runnable:%u", driver, driver->name, driver->runnable);
-	spa_list_consume(n, nodes, sort_link) {
-		spa_list_remove(&n->sort_link);
-
-		driver->runnable |= n->runnable;
-
-		pw_log_debug(" follower: %p %s runnable:%u driver-runnable:%u", n, n->name,
-				n->runnable, driver->runnable);
-		pw_impl_node_set_driver(n, driver);
-	}
-}
-static void remove_from_driver(struct pw_context *context, struct spa_list *nodes)
-{
-	struct pw_impl_node *n;
-	spa_list_consume(n, nodes, sort_link) {
-		spa_list_remove(&n->sort_link);
-		pw_impl_node_set_driver(n, NULL);
-		ensure_state(n, false);
-	}
-}
-
-static inline void get_quantums(struct pw_context *context, uint32_t *def,
-		uint32_t *min, uint32_t *max, uint32_t *rate, uint32_t *floor, uint32_t *ceil)
-{
-	struct settings *s = &context->settings;
-	if (s->clock_force_quantum != 0) {
-		*def = *min = *max = s->clock_force_quantum;
-		*rate = 0;
-	} else {
-		*def = s->clock_quantum;
-		*min = s->clock_min_quantum;
-		*max = s->clock_max_quantum;
-		*rate = s->clock_rate;
-	}
-	*floor = s->clock_quantum_floor;
-	*ceil = s->clock_quantum_limit;
-}
-
-static inline const uint32_t *get_rates(struct pw_context *context, uint32_t *def, uint32_t *n_rates,
-		bool *force)
-{
-	struct settings *s = &context->settings;
-	if (s->clock_force_rate != 0) {
-		*force = true;
-		*n_rates = 1;
-		*def = s->clock_force_rate;
-		return &s->clock_force_rate;
-	} else {
-		*force = false;
-		*n_rates = s->n_clock_rates;
-		*def = s->clock_rate;
-		return s->clock_rates;
-	}
-}
-static void reconfigure_driver(struct pw_context *context, struct pw_impl_node *n)
-{
-	struct pw_impl_node *s;
-
-	spa_list_for_each(s, &n->follower_list, follower_link) {
-		if (s == n)
-			continue;
-		pw_log_debug("%p: follower %p: '%s' suspend",
-				context, s, s->name);
-		pw_impl_node_set_state(s, PW_NODE_STATE_SUSPENDED);
-	}
-	pw_log_debug("%p: driver %p: '%s' suspend",
-			context, n, n->name);
-
-	if (n->info.state >= PW_NODE_STATE_IDLE)
-		n->need_resume = !n->pause_on_idle;
-	pw_impl_node_set_state(n, PW_NODE_STATE_SUSPENDED);
-}
-
-/* find smaller power of 2 */
-static uint32_t flp2(uint32_t x)
-{
-	x = x | (x >> 1);
-	x = x | (x >> 2);
-	x = x | (x >> 4);
-	x = x | (x >> 8);
-	x = x | (x >> 16);
-	return x - (x >> 1);
-}
-
-/* cmp fractions, avoiding overflows */
-static int fraction_compare(const struct spa_fraction *a, const struct spa_fraction *b)
-{
-	uint64_t fa = (uint64_t)a->num * (uint64_t)b->denom;
-	uint64_t fb = (uint64_t)b->num * (uint64_t)a->denom;
-	return fa < fb ? -1 : (fa > fb ? 1 : 0);
-}
-
-static inline uint32_t calc_gcd(uint32_t a, uint32_t b)
-{
-	while (b != 0) {
-		uint32_t temp = a;
-		a = b;
-		b = temp % b;
-	}
-	return a;
-}
-
-struct rate_info {
-	uint32_t rate;
-	uint32_t gcd;
-	uint32_t diff;
-};
-
-static inline void update_highest_rate(struct rate_info *best, struct rate_info *current)
-{
-	/* find highest rate */
-	if (best->rate == 0 || best->rate < current->rate)
-		*best = *current;
-}
-
-static inline void update_nearest_gcd(struct rate_info *best, struct rate_info *current)
-{
-	/* find nearest GCD */
-	if (best->rate == 0 ||
-	    (best->gcd < current->gcd) ||
-	    (best->gcd == current->gcd && best->diff > current->diff))
-		*best = *current;
-}
-static inline void update_nearest_rate(struct rate_info *best, struct rate_info *current)
-{
-	/* find nearest rate */
-	if (best->rate == 0 || best->diff > current->diff)
-		*best = *current;
-}
-
-static uint32_t find_best_rate(const uint32_t *rates, uint32_t n_rates, uint32_t rate, uint32_t def)
-{
-	uint32_t i, limit;
-	struct rate_info best;
-	struct rate_info info[n_rates];
-
-	for (i = 0; i < n_rates; i++) {
-		info[i].rate = rates[i];
-		info[i].gcd = calc_gcd(rate, rates[i]);
-		info[i].diff = SPA_ABS((int32_t)rate - (int32_t)rates[i]);
-	}
-
-	/* first find higher nearest GCD. This tries to find next bigest rate that
-	 * requires the least amount of resample filter banks. Usually these are
-	 * rates that are multiples of each other or multiples of a common rate.
-	 *
-	 * 44100 and [ 32000 56000 88200 96000 ]  -> 88200
-	 * 48000 and [ 32000 56000 88200 96000 ]  -> 96000
-	 * 88200 and [ 44100 48000 96000 192000 ]  -> 96000
-	 * 32000 and [ 44100 192000 ] -> 44100
-	 * 8000 and [ 44100 48000 ] -> 48000
-	 * 8000 and [ 44100 192000 ] -> 44100
-	 * 11025 and [ 44100 48000 ] -> 44100
-	 * 44100 and [ 48000 176400 ] -> 48000
-	 * 144 and [ 44100 48000 88200 96000] -> 48000
-	 */
-	spa_zero(best);
-	/* Don't try to do excessive upsampling by limiting the max rate
-	 * for desired < default to default*2. For other rates allow
-	 * a x3 upsample rate max. For values lower than half of the default,
-	 * limit to the default.  */
-	limit = rate < def/2 ? def : rate < def ? def*2 : rate*3;
-	for (i = 0; i < n_rates; i++) {
-		if (info[i].rate >= rate && info[i].rate <= limit)
-			update_nearest_gcd(&best, &info[i]);
-	}
-	if (best.rate != 0)
-		return best.rate;
-
-	/* we would need excessive upsampling, pick a nearest higher rate */
-	spa_zero(best);
-	for (i = 0; i < n_rates; i++) {
-		if (info[i].rate >= rate)
-			update_nearest_rate(&best, &info[i]);
-	}
-	if (best.rate != 0)
-		return best.rate;
-
-	/* There is nothing above the rate, we need to downsample. Try to downsample
-	 * but only to something that is from a common rate family. Also don't
-	 * try to downsample to something that will sound worse (< 44100).
-	 *
-	 * 88200 and [ 22050 44100 48000 ] -> 44100
-	 * 88200 and [ 22050 48000 ] -> 48000
-	 */
-	spa_zero(best);
-	for (i = 0; i < n_rates; i++) {
-		if (info[i].rate >= 44100)
-			update_nearest_gcd(&best, &info[i]);
-	}
-	if (best.rate != 0)
-		return best.rate;
-
-	/* There is nothing to downsample above our threshold. Downsample to whatever
-	 * is the highest rate then. */
-	spa_zero(best);
-	for (i = 0; i < n_rates; i++)
-		update_highest_rate(&best, &info[i]);
-	if (best.rate != 0)
-		return best.rate;
-
-	return def;
-}
-
-/* here we evaluate the complete state of the graph.
- *
- * It roughly operates in 3 stages:
- *
- * 1. go over all drivers and collect the nodes that need to be scheduled with the
- *    driver. This include all nodes that have an active link with the driver or
- *    with a node already scheduled with the driver.
- *
- * 2. go over all nodes that are not assigned to a driver. The ones that require
- *    a driver are moved to some random active driver found in step 1.
- *
- * 3. go over all drivers again, collect the quantum/rate of all followers, select
- *    the desired final value and activate the followers and then the driver.
- *
- * A complete graph evaluation is performed for each change that is made to the
- * graph, such as making/destroying links, adding/removing nodes, property changes such
- * as quantum/rate changes or metadata changes.
- */
 int pw_context_recalc_graph(struct pw_context *context, const char *reason)
 {
 	struct impl *impl = SPA_CONTAINER_OF(context, struct impl, this);
-	struct settings *settings = &context->settings;
-	struct pw_impl_node *n, *s, *target, *fallback;
-	const uint32_t *rates;
-	uint32_t max_quantum, min_quantum, def_quantum, rate_quantum, floor_quantum, ceil_quantum;
-	uint32_t n_rates, def_rate, transport;
-	bool freewheel, global_force_rate, global_force_quantum;
-	struct spa_list collect;
 
 	pw_log_info("%p: busy:%d reason:%s", context, impl->recalc, reason);
 
@@ -1454,392 +997,14 @@ int pw_context_recalc_graph(struct pw_context *context, const char *reason)
 
 again:
 	impl->recalc = true;
-	freewheel = false;
 
-	/* clean up the flags first */
-	spa_list_for_each(n, &context->node_list, link) {
-		n->visited = false;
-		n->checked = 0;
-		n->runnable = n->always_process && n->active;
-	}
+	pw_context_emit_recalc_graph(context);
 
-	get_quantums(context, &def_quantum, &min_quantum, &max_quantum, &rate_quantum,
-			&floor_quantum, &ceil_quantum);
-	rates = get_rates(context, &def_rate, &n_rates, &global_force_rate);
-
-	global_force_quantum = rate_quantum == 0;
-
-	/* start from all drivers and group all nodes that are linked
-	 * to it. Some nodes are not (yet) linked to anything and they
-	 * will end up 'unassigned' to a driver. Other nodes are drivers
-	 * and if they have active followers, we can use them to schedule
-	 * the unassigned nodes. */
-	target = fallback = NULL;
-	spa_list_for_each(n, &context->driver_list, driver_link) {
-		if (n->exported)
-			continue;
-
-		if (!n->visited) {
-			spa_list_init(&collect);
-			collect_nodes(context, n, &collect);
-			move_to_driver(context, &collect, n);
-		}
-		/* from now on we are only interested in active driving nodes
-		 * with a driver_priority. We're going to see if there are
-		 * active followers. */
-		if (!n->driving || !n->active || n->priority_driver <= 0)
-			continue;
-
-		/* first active driving node is fallback */
-		if (fallback == NULL)
-			fallback = n;
-
-		if (!n->runnable)
-			continue;
-
-		spa_list_for_each(s, &n->follower_list, follower_link) {
-			pw_log_debug("%p: driver %p: follower %p %s: active:%d",
-					context, n, s, s->name, s->active);
-			if (s != n && s->active) {
-				/* if the driving node has active followers, it
-				 * is a target for our unassigned nodes */
-				if (target == NULL)
-					target = n;
-				if (n->freewheel)
-					freewheel = true;
-				break;
-			}
-		}
-	}
-	/* no active node, use fallback driving node */
-	if (target == NULL)
-		target = fallback;
-
-	/* update the freewheel status */
-	if (context->freewheeling != freewheel)
-		context_set_freewheel(context, freewheel);
-
-	/* now go through all available nodes. The ones we didn't visit
-	 * in collect_nodes() are not linked to any driver. We assign them
-	 * to either an active driver or the first driver if they are in a
-	 * group that needs a driver. Else we remove them from a driver
-	 * and stop them. */
-	spa_list_for_each(n, &context->node_list, link) {
-		struct pw_impl_node *t, *driver;
-
-		if (n->exported || n->visited)
-			continue;
-
-		pw_log_debug("%p: unassigned node %p: '%s' active:%d want_driver:%d target:%p",
-				context, n, n->name, n->active, n->want_driver, target);
-
-		/* collect all nodes in this group */
-		spa_list_init(&collect);
-		collect_nodes(context, n, &collect);
-
-		driver = NULL;
-		spa_list_for_each(t, &collect, sort_link) {
-			/* is any active and want a driver */
-			if ((t->want_driver && t->active && t->runnable) ||
-			    t->always_process) {
-				driver = target;
-				break;
-			}
-		}
-		if (driver != NULL) {
-			driver->runnable = true;
-			/* driver needed for this group */
-			move_to_driver(context, &collect, driver);
-		} else {
-			/* no driver, make sure the nodes stop */
-			remove_from_driver(context, &collect);
-		}
-	}
-
-	/* assign final quantum and set state for followers and drivers */
-	spa_list_for_each(n, &context->driver_list, driver_link) {
-		bool running = false, lock_quantum = false, lock_rate = false;
-		struct spa_fraction latency = SPA_FRACTION(0, 0);
-		struct spa_fraction max_latency = SPA_FRACTION(0, 0);
-		struct spa_fraction rate = SPA_FRACTION(0, 0);
-		uint32_t target_quantum, target_rate, current_rate, current_quantum;
-		uint64_t quantum_stamp = 0, rate_stamp = 0;
-		bool force_rate, force_quantum, restore_rate = false, restore_quantum = false;
-		bool do_reconfigure = false, need_resume, was_target_pending;
-		bool have_request = false;
-		const uint32_t *node_rates;
-		uint32_t node_n_rates, node_def_rate;
-		uint32_t node_max_quantum, node_min_quantum, node_def_quantum, node_rate_quantum;
-
-		if (!n->driving || n->exported)
-			continue;
-
-		node_def_quantum = def_quantum;
-		node_min_quantum = min_quantum;
-		node_max_quantum = max_quantum;
-		node_rate_quantum = rate_quantum;
-		force_quantum = global_force_quantum;
-
-		node_def_rate = def_rate;
-		node_n_rates = n_rates;
-		node_rates = rates;
-		force_rate = global_force_rate;
-
-		/* collect quantum and rate */
-		spa_list_for_each(s, &n->follower_list, follower_link) {
-
-			if (!s->moved) {
-				/* We only try to enforce the lock flags for nodes that
-				 * are not recently moved between drivers. The nodes that
-				 * are moved should try to enforce their quantum on the
-				 * new driver. */
-				lock_quantum |= s->lock_quantum;
-				lock_rate |= s->lock_rate;
-			}
-			if (!global_force_quantum && s->force_quantum > 0 &&
-			    s->stamp > quantum_stamp) {
-				node_def_quantum = node_min_quantum = node_max_quantum = s->force_quantum;
-				node_rate_quantum = 0;
-				quantum_stamp = s->stamp;
-				force_quantum = true;
-			}
-			if (!global_force_rate && s->force_rate > 0 &&
-			    s->stamp > rate_stamp) {
-				node_def_rate = s->force_rate;
-				node_n_rates = 1;
-				node_rates = &s->force_rate;
-				force_rate = true;
-				rate_stamp = s->stamp;
-			}
-
-			/* smallest latencies */
-			if (latency.denom == 0 ||
-			    (s->latency.denom > 0 &&
-			     fraction_compare(&s->latency, &latency) < 0))
-				latency = s->latency;
-			if (max_latency.denom == 0 ||
-			    (s->max_latency.denom > 0 &&
-			     fraction_compare(&s->max_latency, &max_latency) < 0))
-				max_latency = s->max_latency;
-
-			/* largest rate, which is in fact the smallest fraction */
-			if (rate.denom == 0 ||
-			    (s->rate.denom > 0 &&
-			     fraction_compare(&s->rate, &rate) < 0))
-				rate = s->rate;
-
-			if (s->active)
-				running = n->runnable;
-
-			pw_log_debug("%p: follower %p running:%d runnable:%d rate:%u/%u latency %u/%u '%s'",
-				context, s, running, s->runnable, rate.num, rate.denom,
-				latency.num, latency.denom, s->name);
-
-			if (running && s != n && s->supports_request > 0)
-				have_request = true;
-
-			s->moved = false;
-		}
-
-		if (n->forced_rate && !force_rate && n->runnable) {
-			/* A node that was forced to a rate but is no longer being
-			 * forced can restore its rate */
-			pw_log_info("(%s-%u) restore rate", n->name, n->info.id);
-			restore_rate = true;
-		}
-		if (n->forced_quantum && !force_quantum && n->runnable) {
-			/* A node that was forced to a quantum but is no longer being
-			 * forced can restore its quantum */
-			pw_log_info("(%s-%u) restore quantum", n->name, n->info.id);
-			restore_quantum = true;
-		}
-
-		if (force_quantum)
-			lock_quantum = false;
-		if (force_rate)
-			lock_rate = false;
-
-		need_resume = n->need_resume;
-		if (need_resume) {
-			running = true;
-			n->need_resume = false;
-		}
-
-		current_rate = n->target_rate.denom;
-		if (!restore_rate &&
-		   (lock_rate || need_resume || !running ||
-		    (!force_rate && (n->info.state > PW_NODE_STATE_IDLE)))) {
-			pw_log_debug("%p: keep rate:1/%u restore:%u lock:%u resume:%u "
-					"running:%u force:%u state:%s", context,
-					current_rate, restore_rate, lock_rate, need_resume,
-					running, force_rate,
-					pw_node_state_as_string(n->info.state));
-
-			/* when we don't need to restore or rate and
-			 * when someone wants us to lock the rate of this driver or
-			 * when we are in the process of reconfiguring the driver or
-			 * when we are not running any followers or
-			 * when the driver is busy and we don't need to force a rate,
-			 * keep the current rate */
-			target_rate = current_rate;
-		}
-		else {
-			/* Here we are allowed to change the rate of the driver.
-			 * Start with the default rate. If the desired rate is
-			 * allowed, switch to it */
-			if (rate.denom != 0 && rate.num == 1)
-				target_rate = rate.denom;
-			else
-				target_rate = node_def_rate;
-
-			target_rate = find_best_rate(node_rates, node_n_rates,
-						target_rate, node_def_rate);
-
-			pw_log_debug("%p: def_rate:%d target_rate:%d rate:%d/%d", context,
-					node_def_rate, target_rate, rate.num, rate.denom);
-		}
-
-		was_target_pending = n->target_pending;
-
-		if (target_rate != current_rate) {
-			/* we doing a rate switch */
-			pw_log_info("(%s-%u) state:%s new rate:%u/(%u)->%u",
-					n->name, n->info.id,
-					pw_node_state_as_string(n->info.state),
-					n->target_rate.denom, current_rate,
-					target_rate);
-
-			if (force_rate) {
-				if (settings->clock_rate_update_mode == CLOCK_RATE_UPDATE_MODE_HARD)
-					do_reconfigure |= !was_target_pending;
-			} else {
-				if (n->info.state >= PW_NODE_STATE_SUSPENDED)
-					do_reconfigure |= !was_target_pending;
-			}
-			/* we're setting the pending rate. This will become the new
-			 * current rate in the next iteration of the graph. */
-			n->target_rate = SPA_FRACTION(1, target_rate);
-			n->forced_rate = force_rate;
-			n->target_pending = true;
-			current_rate = target_rate;
-		}
-
-		if (node_rate_quantum != 0 && current_rate != node_rate_quantum) {
-			/* the quantum values are scaled with the current rate */
-			node_def_quantum = SPA_SCALE32(node_def_quantum, current_rate, node_rate_quantum);
-			node_min_quantum = SPA_SCALE32(node_min_quantum, current_rate, node_rate_quantum);
-			node_max_quantum = SPA_SCALE32(node_max_quantum, current_rate, node_rate_quantum);
-		}
-
-		/* calculate desired quantum. Don't limit to the max_latency when we are
-		 * going to force a quantum or rate and reconfigure the nodes. */
-		if (max_latency.denom != 0 && !force_quantum && !force_rate) {
-			uint32_t tmp = SPA_SCALE32(max_latency.num, current_rate, max_latency.denom);
-			if (tmp < node_max_quantum)
-				node_max_quantum = tmp;
-		}
-
-		current_quantum = n->target_quantum;
-		if (!restore_quantum && (lock_quantum || need_resume || !running)) {
-			pw_log_debug("%p: keep quantum:%u restore:%u lock:%u resume:%u "
-					"running:%u force:%u state:%s", context,
-					current_quantum, restore_quantum, lock_quantum, need_resume,
-					running, force_quantum,
-					pw_node_state_as_string(n->info.state));
-			target_quantum = current_quantum;
-		}
-		else {
-			target_quantum = node_def_quantum;
-			if (latency.denom != 0)
-				target_quantum = SPA_SCALE32(latency.num, current_rate, latency.denom);
-			target_quantum = SPA_CLAMP(target_quantum, node_min_quantum, node_max_quantum);
-			target_quantum = SPA_CLAMP(target_quantum, floor_quantum, ceil_quantum);
-
-			if (settings->clock_power_of_two_quantum && !force_quantum)
-				target_quantum = flp2(target_quantum);
-		}
-
-		if (target_quantum != current_quantum) {
-			pw_log_info("(%s-%u) new quantum:%"PRIu64"->%u",
-					n->name, n->info.id,
-					n->target_quantum,
-					target_quantum);
-			/* this is the new pending quantum */
-			n->target_quantum = target_quantum;
-			n->forced_quantum = force_quantum;
-			n->target_pending = true;
-
-			if (force_quantum)
-				do_reconfigure |= !was_target_pending;
-		}
-
-		if (n->target_pending) {
-			if (do_reconfigure) {
-				reconfigure_driver(context, n);
-				/* we might be suspended now and the links need to be prepared again */
-				goto again;
-			}
-			/* we have a pending change. We place the new values in the
-			 * pending fields so that they are picked up by the driver in
-			 * the next cycle */
-			pw_log_debug("%p: apply duration:%"PRIu64" rate:%u/%u", context,
-					n->target_quantum, n->target_rate.num,
-					n->target_rate.denom);
-			SPA_SEQ_WRITE(n->rt.position->clock.target_seq);
-			n->rt.position->clock.target_duration = n->target_quantum;
-			n->rt.position->clock.target_rate = n->target_rate;
-			SPA_SEQ_WRITE(n->rt.position->clock.target_seq);
-
-			if (n->info.state < PW_NODE_STATE_RUNNING) {
-				n->rt.position->clock.duration = n->target_quantum;
-				n->rt.position->clock.rate = n->target_rate;
-			}
-			n->target_pending = false;
-		} else {
-			n->target_quantum = n->rt.position->clock.target_duration;
-			n->target_rate = n->rt.position->clock.target_rate;
-		}
-
-		if (n->info.state < PW_NODE_STATE_RUNNING)
-			n->rt.position->clock.nsec = get_time_ns(n->rt.target.system);
-
-		SPA_FLAG_UPDATE(n->rt.position->clock.flags,
-				SPA_IO_CLOCK_FLAG_LAZY, have_request && n->supports_lazy > 0);
-
-		pw_log_debug("%p: driver %p running:%d runnable:%d quantum:%u rate:%u (%"PRIu64"/%u)'%s'",
-				context, n, running, n->runnable, target_quantum, target_rate,
-				n->rt.position->clock.target_duration,
-				n->rt.position->clock.target_rate.denom, n->name);
-
-		transport = PW_NODE_ACTIVATION_COMMAND_NONE;
-
-		/* first change the node states of the followers to the new target */
-		spa_list_for_each(s, &n->follower_list, follower_link) {
-			if (s->transport != PW_NODE_ACTIVATION_COMMAND_NONE) {
-				transport = s->transport;
-				s->transport = PW_NODE_ACTIVATION_COMMAND_NONE;
-			}
-			if (s == n)
-				continue;
-			pw_log_debug("%p: follower %p: active:%d '%s'",
-					context, s, s->active, s->name);
-			ensure_state(s, running);
-		}
-
-		if (transport != PW_NODE_ACTIVATION_COMMAND_NONE) {
-			pw_log_info("%s: transport %d", n->name, transport);
-			SPA_ATOMIC_STORE(n->rt.target.activation->command, transport);
-		}
-
-		/* now that all the followers are ready, start the driver */
-		ensure_state(n, running);
-	}
 	impl->recalc = false;
 	if (impl->recalc_pending) {
 		impl->recalc_pending = false;
 		goto again;
 	}
-
 	return 0;
 }
 
diff --git a/src/pipewire/context.h b/src/pipewire/context.h
index 61c6662c4..5eaa8de30 100644
--- a/src/pipewire/context.h
+++ b/src/pipewire/context.h
@@ -51,7 +51,7 @@ struct pw_impl_node;
 
 /** context events emitted by the context object added with \ref pw_context_add_listener */
 struct pw_context_events {
-#define PW_VERSION_CONTEXT_EVENTS	1
+#define PW_VERSION_CONTEXT_EVENTS	2
 	uint32_t version;
 
 	/** The context is being destroyed */
@@ -69,6 +69,9 @@ struct pw_context_events {
 	void (*driver_added) (void *data, struct pw_impl_node *node);
 	/** a driver was removed, since 0.3.75 version:1 */
 	void (*driver_removed) (void *data, struct pw_impl_node *node);
+
+	/** recalculate the graph state, since 1.7.0 version:2 */
+	void (*recalc_graph) (void *data);
 };
 
 /** Make a new context object for a given main_loop. Ownership of the properties is taken, even
diff --git a/src/pipewire/impl-link.c b/src/pipewire/impl-link.c
index a77dcf35f..610a6d620 100644
--- a/src/pipewire/impl-link.c
+++ b/src/pipewire/impl-link.c
@@ -969,6 +969,7 @@ static void output_remove(struct pw_impl_link *this)
 	this->output = NULL;
 }
 
+SPA_EXPORT
 int pw_impl_link_prepare(struct pw_impl_link *this)
 {
 	struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
diff --git a/src/pipewire/private.h b/src/pipewire/private.h
index 5582709ad..95a1a4646 100644
--- a/src/pipewire/private.h
+++ b/src/pipewire/private.h
@@ -364,6 +364,7 @@ pw_core_resource_errorf(struct pw_resource *resource, uint32_t id, int seq,
 #define pw_context_emit_global_removed(c,g)	pw_context_emit(c, global_removed, 0, g)
 #define pw_context_emit_driver_added(c,n)	pw_context_emit(c, driver_added, 1, n)
 #define pw_context_emit_driver_removed(c,n)	pw_context_emit(c, driver_removed, 1, n)
+#define pw_context_emit_recalc_graph(c)		pw_context_emit(c, recalc_graph, 2)
 
 struct pw_context {
 	struct pw_impl_core *core;		/**< core object */
@@ -1269,6 +1270,8 @@ int pw_context_debug_port_params(struct pw_context *context,
 		struct spa_node *node, enum spa_direction direction,
 		uint32_t port_id, uint32_t id, int err, const char *debug, ...);
 
+int pw_context_set_freewheel(struct pw_context *context, bool freewheel);
+
 int pw_proxy_init(struct pw_proxy *proxy, struct pw_core *core, const char *type, uint32_t version);
 
 void pw_proxy_remove(struct pw_proxy *proxy);

From 987579b7b7df4a6ea4aa278d3aab9f91a94fbd64 Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arunr@valvesoftware.com>
Date: Thu, 19 Feb 2026 10:43:45 -0800
Subject: [PATCH 076/263] tests: Update context events test

New field and version, update the test.
---
 test/test-context.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/test-context.c b/test/test-context.c
index 093e7b388..e35de484c 100644
--- a/test/test-context.c
+++ b/test/test-context.c
@@ -29,6 +29,7 @@ PWTEST(context_abi)
 		void (*global_removed) (void *data, struct pw_global *global);
 		void (*driver_added) (void *data, struct pw_impl_node *node);
 		void (*driver_removed) (void *data, struct pw_impl_node *node);
+		void (*recalc_graph) (void *data);
 	} test = { PW_VERSION_CONTEXT_EVENTS, NULL };
 
 	pw_init(0, NULL);
@@ -41,7 +42,7 @@ PWTEST(context_abi)
 	TEST_FUNC(ev, test, driver_added);
 	TEST_FUNC(ev, test, driver_removed);
 
-	pwtest_int_eq(PW_VERSION_CONTEXT_EVENTS, 1);
+	pwtest_int_eq(PW_VERSION_CONTEXT_EVENTS, 2);
 	pwtest_int_eq(sizeof(ev), sizeof(test));
 
 	pw_deinit();

From 569c2dce5577a9414166253a0c27794e5a7a53d1 Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arunr@valvesoftware.com>
Date: Thu, 19 Feb 2026 10:57:24 -0800
Subject: [PATCH 077/263] doc: Add module scheduler subpage

---
 doc/dox/modules.dox | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/dox/modules.dox b/doc/dox/modules.dox
index 4e9358197..7ad81dabc 100644
--- a/doc/dox/modules.dox
+++ b/doc/dox/modules.dox
@@ -81,6 +81,7 @@ List of known modules:
 - \subpage page_module_raop_discover
 - \subpage page_module_roc_sink
 - \subpage page_module_roc_source
+- \subpage page_module_scheduler_v1
 - \subpage page_module_rtp_sap
 - \subpage page_module_rtp_sink
 - \subpage page_module_rtp_source

From f5107f3e836f907cba39bf1de86c85f645eee8da Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arunr@valvesoftware.com>
Date: Thu, 19 Feb 2026 10:58:03 -0800
Subject: [PATCH 078/263] ci: Fix doccheck error message

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 448bfa06e..a75b2a140 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -658,7 +658,7 @@ doccheck:
     - cat pipewire_module_pages
     - |
       for page in $(cat pipewire_module_pages); do
-          git grep -q -e "\\\subpage $page" || (echo "\\page $page is missing \\subpage entry in doc/pipewire-modules.dox" && false)
+          git grep -q -e "\\\subpage $page" || (echo "\\page $page is missing \\subpage entry in doc/dox/modules.dox" && false)
       done
 
 check_missing_headers:

From c244fbf945a4e240f40bdf0fe6baf0dfc4ddde13 Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arunr@valvesoftware.com>
Date: Tue, 17 Feb 2026 14:17:30 -0800
Subject: [PATCH 079/263] spa: json: Add a helper method to shrink an object
 string

---
 spa/include/spa/utils/json.h | 105 +++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)

diff --git a/spa/include/spa/utils/json.h b/spa/include/spa/utils/json.h
index 212637dab..5021290bf 100644
--- a/spa/include/spa/utils/json.h
+++ b/spa/include/spa/utils/json.h
@@ -212,6 +212,111 @@ SPA_API_JSON_UTILS int spa_json_str_array_uint32(const char *arr, size_t arr_len
 	spa_json_make_str_array_unpack(32,uint32_t, atoi);
 }
 
+/* convenience */
+
+#define _SPA_STR_APPEND(str, len, idx, value )		\
+{							\
+	if ((idx) >= (len))				\
+		return -1;				\
+	(str)[(idx)++] = (value);			\
+}
+
+static int _spa_json_str_object_reduce(struct spa_json *json, char *out, size_t out_size, const char *value, size_t len)
+{
+	struct spa_json sub;
+	size_t idx = 0;
+	int count = 0, res;
+
+	if (spa_json_is_object(value, len)) {
+		char key[1024];
+
+		_SPA_STR_APPEND(out, out_size, idx, '{');
+
+		spa_json_enter(json, &sub);
+		while ((len = spa_json_object_next(&sub, key, sizeof(key), &value)) > 0) {
+			_SPA_STR_APPEND(out, out_size, idx, '"');
+			if (idx + strlen(key) >= out_size)
+				return -1;
+			strcpy(&out[idx], key);
+			idx += strlen(key);
+			_SPA_STR_APPEND(out, out_size, idx, '"');
+			_SPA_STR_APPEND(out, out_size, idx, ':');
+
+			res = _spa_json_str_object_reduce(&sub, &out[idx], out_size - idx, value, len);
+			if (res < 0)
+				return res;
+
+			idx += res;
+			_SPA_STR_APPEND(out, out_size, idx, ',');
+			count++;
+		}
+
+		/* Remove trailing comma */
+		if (count)
+			idx--;
+		_SPA_STR_APPEND(out, out_size, idx, '}');
+	} else if (spa_json_is_array(value, len)) {
+		_SPA_STR_APPEND(out, out_size, idx, '[');
+
+		spa_json_enter(json, &sub);
+		while ((len = spa_json_next(&sub, &value)) > 0) {
+			res = _spa_json_str_object_reduce(&sub, &out[idx], out_size - idx, value, len);
+			if (res < 0)
+				return res;
+
+			idx += res;
+			_SPA_STR_APPEND(out, out_size, idx, ',');
+			count++;
+		}
+
+		/* Remove trailing comma */
+		if (count)
+			idx--;
+		_SPA_STR_APPEND(out, out_size, idx, ']');
+	} else if (spa_json_is_string(value, len) ||
+	    spa_json_is_null(value, len) ||
+	    spa_json_is_bool(value, len) ||
+	    spa_json_is_int(value, len) ||
+	    spa_json_is_float(value, len)) {
+		/* Object type we understand */
+		if (len >= out_size)
+			return -1;
+		strcpy(out, value);
+		idx += len;
+	} else {
+		/* Naked value, treat as string */
+		_SPA_STR_APPEND(out, out_size, idx, '"');
+		if (idx + len >= out_size)
+			return -1;
+		strncpy(&out[idx], value, len);
+		idx += len;
+		_SPA_STR_APPEND(out, out_size, idx, '"');
+	}
+
+	return idx;
+}
+
+/* Parse a JSON object string and strip all whitespaces */
+SPA_API_JSON_UTILS int spa_json_str_object_reduce_inplace(char *str)
+{
+	struct spa_json json;
+	size_t size = strlen(str) + 1, len;
+	char temp[size];
+	const char *value;
+	int res;
+
+	len = spa_json_begin(&json, str, size, &value);
+
+	res = _spa_json_str_object_reduce(&json, temp, size, value, len);
+	if (res < 0)
+		return res;
+	temp[res] = '\0';
+
+	strncpy(str, temp, size);
+
+	return res;
+}
+
 /**
  * \}
  */

From d4329600d1ae774c0a5d23523472806341c4441b Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arunr@valvesoftware.com>
Date: Tue, 17 Feb 2026 15:29:23 -0800
Subject: [PATCH 080/263] audioconvert: Report loaded filter graphs in props

Makes it easier to know what filters have been loaded.
---
 spa/plugins/audioconvert/audioconvert.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/spa/plugins/audioconvert/audioconvert.c b/spa/plugins/audioconvert/audioconvert.c
index e9355ca41..5a4153770 100644
--- a/spa/plugins/audioconvert/audioconvert.c
+++ b/spa/plugins/audioconvert/audioconvert.c
@@ -268,6 +268,7 @@ struct impl {
 	struct spa_list active_graphs;
 	struct filter_graph graphs[MAX_GRAPH];
 	struct spa_process_latency_info latency;
+	char *graph_descs[MAX_GRAPH];
 
 	int in_filter_props;
 	int filter_props_count;
@@ -846,6 +847,7 @@ static int node_param_props(struct impl *this, uint32_t id, uint32_t index,
 {
 	struct props *p = &this->props;
 	struct spa_pod_frame f[2];
+	struct filter_graph *g;
 
 	switch (index) {
 	case 0:
@@ -918,8 +920,12 @@ static int node_param_props(struct impl *this, uint32_t id, uint32_t index,
 		spa_pod_builder_bool(b, p->lock_volumes);
 		spa_pod_builder_string(b, "audioconvert.filter-graph.disable");
 		spa_pod_builder_bool(b, p->filter_graph_disabled);
-		spa_pod_builder_string(b, "audioconvert.filter-graph");
-		spa_pod_builder_string(b, "");
+		spa_list_for_each(g, &this->active_graphs, link) {
+		        char key[64];
+		        snprintf(key, sizeof(key), "audioconvert.filter-graph.%d", g->order);
+		        spa_pod_builder_string(b, key);
+		        spa_pod_builder_string(b, this->graph_descs[g->order]);
+		}
 		spa_pod_builder_pop(b, &f[1]);
 		*param = spa_pod_builder_pop(b, &f[0]);
 		break;
@@ -953,7 +959,7 @@ static int impl_node_enum_params(void *object, int seq,
 	struct impl *this = object;
 	struct spa_pod *param;
 	struct spa_pod_builder b = { 0 };
-	uint8_t buffer[4096];
+	uint8_t buffer[16384];
 	struct spa_result_node_params result;
 	uint32_t count = 0;
 	int res = 0;
@@ -1409,6 +1415,7 @@ static int load_filter_graph(struct impl *impl, const char *graph, int order)
 			g->removing = true;
 			spa_log_info(impl->log, "removing filter-graph order:%d", order);
 		}
+		free(impl->graph_descs[order]);
 	}
 
 	if (graph != NULL && graph[0] != '\0') {
@@ -1434,6 +1441,9 @@ static int load_filter_graph(struct impl *impl, const char *graph, int order)
 		spa_list_remove(&pending->link);
 		insert_graph(&impl->active_graphs, pending);
 
+		impl->graph_descs[order] = strdup(graph);
+		spa_json_str_object_reduce_inplace(impl->graph_descs[order]);
+
 		spa_log_info(impl->log, "loading filter-graph order:%d", order);
 	}
 	if (impl->setup)
@@ -4234,6 +4244,7 @@ static void free_dir(struct dir *dir)
 static int impl_clear(struct spa_handle *handle)
 {
 	struct impl *this;
+	int i;
 
 	spa_return_val_if_fail(handle != NULL, -EINVAL);
 
@@ -4245,6 +4256,10 @@ static int impl_clear(struct spa_handle *handle)
 	free_tmp(this);
 
 	clean_filter_handles(this, true);
+	for (i = 0; i < MAX_GRAPH; i++) {
+	        if (this->graph_descs[i])
+	                free(this->graph_descs[i]);
+	}
 
 	if (this->resample.free)
 		resample_free(&this->resample);
@@ -4299,6 +4314,7 @@ impl_init(const struct spa_handle_factory *factory,
 		struct filter_graph *g = &this->graphs[i];
 		g->impl = this;
 		spa_list_append(&this->free_graphs, &g->link);
+		this->graph_descs[i] = NULL;
 	}
 
 	this->rate_limit.interval = 2 * SPA_NSEC_PER_SEC;

From d8b06f94ee0a5bc9f70371fd57937643cc7c8775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Thu, 19 Feb 2026 20:11:08 +0100
Subject: [PATCH 081/263] pipewire: module-roc-{sink,source}: remove logging
 related unused code

!2699 has been merged a bit prematurely and it contained things that are
not used. So remove the unused member variables, functions, fix module
usage strings, and move some functions from headers.
---
 src/modules/module-roc-sink.c   | 13 +------
 src/modules/module-roc-source.c | 13 +------
 src/modules/module-roc/common.c | 45 ++++++++++++++++++++++---
 src/modules/module-roc/common.h | 60 ---------------------------------
 4 files changed, 43 insertions(+), 88 deletions(-)

diff --git a/src/modules/module-roc-sink.c b/src/modules/module-roc-sink.c
index 39ca2bce1..66a2c716b 100644
--- a/src/modules/module-roc-sink.c
+++ b/src/modules/module-roc-sink.c
@@ -120,8 +120,6 @@ struct module_roc_sink_data {
 
 	roc_endpoint *remote_control_addr;
 	int remote_control_port;
-
-	roc_log_level loglevel;
 };
 
 static void stream_destroy(void *d)
@@ -391,8 +389,7 @@ static const struct spa_dict_item module_roc_sink_info[] = {
 				"( remote.repair.port=<remote receiver port for repair packets> ) "
 				"( remote.control.port=<remote receiver port for control packets> ) "
 				"( audio.position=<channel map, default:"PW_ROC_STEREO_POSITIONS"> ) "
-				"( sink.props= { key=val ... } ) "
-				"( log.level=<empty>|DEFAULT|NONE|RROR|INFO|DEBUG|TRACE ) " },
+				"( sink.props= { key=val ... } ) " },
 	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
 };
 
@@ -513,14 +510,6 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 		pw_log_error("can't connect: %m");
 		goto out;
 	}
-	if ((str = pw_properties_get(props, "log.level")) != NULL) {
-		const struct spa_log *log_conf = pw_log_get();
-		const roc_log_level default_level = pw_roc_log_level_pw_2_roc(log_conf->level);
-		if (pw_roc_parse_log_level(&data->loglevel, str, default_level)) {
-			pw_log_error("Invalid log level %s, using default", str);
-			data->loglevel = default_level;
-		}
-	}
 
 	pw_proxy_add_listener((struct pw_proxy*)data->core,
 			&data->core_proxy_listener,
diff --git a/src/modules/module-roc-source.c b/src/modules/module-roc-source.c
index 2173c6af1..a46189e5d 100644
--- a/src/modules/module-roc-source.c
+++ b/src/modules/module-roc-source.c
@@ -140,8 +140,6 @@ struct module_roc_source_data {
 
 	roc_endpoint *local_control_addr;
 	int local_control_port;
-
-	roc_log_level loglevel;
 };
 
 static void stream_destroy(void *d)
@@ -430,8 +428,7 @@ static const struct spa_dict_item module_roc_source_info[] = {
 				"( local.repair.port=<local receiver port for repair packets> ) "
 				"( local.control.port=<local receiver port for control packets> ) "
 				"( audio.position=<channel map, default:"PW_ROC_STEREO_POSITIONS"> ) "
-				"( source.props= { key=value ... } ) "
-				"( log.level=<empty>|DEFAULT|NONE|RROR|INFO|DEBUG|TRACE ) " },
+				"( source.props= { key=value ... } ) " },
 	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
 };
 
@@ -567,14 +564,6 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 	} else {
 		data->fec_code = ROC_FEC_ENCODING_DEFAULT;
 	}
-	if ((str = pw_properties_get(props, "log.level")) != NULL) {
-		const struct spa_log *log_conf = pw_log_get();
-		const roc_log_level default_level = pw_roc_log_level_pw_2_roc(log_conf->level);
-		if (pw_roc_parse_log_level(&data->loglevel, str, default_level)) {
-			pw_log_error("Invalid log level %s, using default", str);
-			data->loglevel = default_level;
-		}
-	}
 
 	data->core = pw_context_get_object(data->module_context, PW_TYPE_INTERFACE_Core);
 	if (data->core == NULL) {
diff --git a/src/modules/module-roc/common.c b/src/modules/module-roc/common.c
index 244c203dd..1cbd786a8 100644
--- a/src/modules/module-roc/common.c
+++ b/src/modules/module-roc/common.c
@@ -5,13 +5,45 @@
 
 PW_LOG_TOPIC(roc_log_topic, "mod.roc.lib");
 
-void pw_roc_log_init(void)
+static inline roc_log_level pw_roc_log_level_pw_2_roc(const enum spa_log_level pw_log_level)
 {
-	roc_log_set_handler(pw_roc_log_handler, NULL);
-	roc_log_set_level(pw_roc_log_level_pw_2_roc(roc_log_topic->has_custom_level ? roc_log_topic->level : pw_log_level));
+	switch (pw_log_level) {
+	case SPA_LOG_LEVEL_NONE:
+		return ROC_LOG_NONE;
+	case SPA_LOG_LEVEL_ERROR:
+		return ROC_LOG_ERROR;
+	case SPA_LOG_LEVEL_WARN:
+		return ROC_LOG_ERROR;
+	case SPA_LOG_LEVEL_INFO:
+		return ROC_LOG_INFO;
+	case SPA_LOG_LEVEL_DEBUG:
+		return ROC_LOG_DEBUG;
+	case SPA_LOG_LEVEL_TRACE:
+		return ROC_LOG_TRACE;
+	default:
+		return ROC_LOG_NONE;
+	}
 }
 
-void pw_roc_log_handler(const roc_log_message *message, void *argument)
+static inline enum spa_log_level pw_roc_log_level_roc_2_pw(const roc_log_level roc_log_level)
+{
+	switch (roc_log_level) {
+	case ROC_LOG_NONE:
+		return SPA_LOG_LEVEL_NONE;
+	case ROC_LOG_ERROR:
+		return SPA_LOG_LEVEL_ERROR;
+	case ROC_LOG_INFO:
+		return SPA_LOG_LEVEL_INFO;
+	case ROC_LOG_DEBUG:
+		return SPA_LOG_LEVEL_DEBUG;
+	case ROC_LOG_TRACE:
+		return SPA_LOG_LEVEL_TRACE;
+	default:
+		return SPA_LOG_LEVEL_NONE;
+	}
+}
+
+static void pw_roc_log_handler(const roc_log_message *message, void *argument)
 {
 	const enum spa_log_level log_level = pw_roc_log_level_roc_2_pw(message->level);
 	if (SPA_UNLIKELY(pw_log_topic_enabled(log_level, roc_log_topic))) {
@@ -19,3 +51,8 @@ void pw_roc_log_handler(const roc_log_message *message, void *argument)
 	}
 }
 
+void pw_roc_log_init(void)
+{
+	roc_log_set_handler(pw_roc_log_handler, NULL);
+	roc_log_set_level(pw_roc_log_level_pw_2_roc(roc_log_topic->has_custom_level ? roc_log_topic->level : pw_log_level));
+}
diff --git a/src/modules/module-roc/common.h b/src/modules/module-roc/common.h
index c94ac69a8..d49e392fe 100644
--- a/src/modules/module-roc/common.h
+++ b/src/modules/module-roc/common.h
@@ -3,7 +3,6 @@
 
 #include <roc/config.h>
 #include <roc/endpoint.h>
-#include <roc/log.h>
 
 #include <spa/utils/string.h>
 #include <spa/support/log.h>
@@ -21,7 +20,6 @@
 #define PW_ROC_STEREO_POSITIONS "[ FL FR ]"
 
 void pw_roc_log_init(void);
-void pw_roc_log_handler(const roc_log_message *message, void *argument);
 
 static inline int pw_roc_parse_fec_encoding(roc_fec_encoding *out, const char *str)
 {
@@ -137,62 +135,4 @@ static inline void pw_roc_fec_encoding_to_proto(roc_fec_encoding fec_code, roc_p
 	}
 }
 
-static inline roc_log_level pw_roc_log_level_pw_2_roc(const enum spa_log_level pw_log_level)
-{
-	switch (pw_log_level) {
-	case SPA_LOG_LEVEL_NONE:
-		return ROC_LOG_NONE;
-	case SPA_LOG_LEVEL_ERROR:
-		return ROC_LOG_ERROR;
-	case SPA_LOG_LEVEL_WARN:
-		return ROC_LOG_ERROR;
-	case SPA_LOG_LEVEL_INFO:
-		return ROC_LOG_INFO;
-	case SPA_LOG_LEVEL_DEBUG:
-		return ROC_LOG_DEBUG;
-	case SPA_LOG_LEVEL_TRACE:
-		return ROC_LOG_TRACE;
-	default:
-		return ROC_LOG_NONE;
-	}
-}
-
-static inline enum spa_log_level pw_roc_log_level_roc_2_pw(const roc_log_level roc_log_level)
-{
-	switch (roc_log_level) {
-	case ROC_LOG_NONE:
-		return SPA_LOG_LEVEL_NONE;
-	case ROC_LOG_ERROR:
-		return SPA_LOG_LEVEL_ERROR;
-	case ROC_LOG_INFO:
-		return SPA_LOG_LEVEL_INFO;
-	case ROC_LOG_DEBUG:
-		return SPA_LOG_LEVEL_DEBUG;
-	case ROC_LOG_TRACE:
-		return SPA_LOG_LEVEL_TRACE;
-	default:
-		return SPA_LOG_LEVEL_NONE;
-	}
-}
-
-static inline int pw_roc_parse_log_level(roc_log_level *loglevel, const char *str,
-																				 roc_log_level default_level)
-{
-	if (spa_streq(str, "DEFAULT"))
-		*loglevel = default_level;
-	else if (spa_streq(str, "NONE"))
-		*loglevel = ROC_LOG_NONE;
-	else if (spa_streq(str, "ERROR"))
-		*loglevel = ROC_LOG_ERROR;
-	else if (spa_streq(str, "INFO"))
-		*loglevel = ROC_LOG_INFO;
-	else if (spa_streq(str, "DEBUG"))
-		*loglevel = ROC_LOG_DEBUG;
-	else if (spa_streq(str, "TRACE"))
-		*loglevel = ROC_LOG_TRACE;
-	else
-		return -EINVAL;
-	return 0;
-}
-
 #endif /* MODULE_ROC_COMMON_H */

From d7c3e8c2bc7f8fcef9e42d84b66f57795443a43d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Thu, 19 Feb 2026 20:24:00 +0100
Subject: [PATCH 082/263] pipewire: module-roc-{sink,source}: fix log format
 string issues

Passing an unknown string as the format string is unsafe, so don't do it.

Fixes: b9922d8ed59897 ("module-roc: forward roc-toolkit logs to pipewire logs")
---
 src/modules/module-roc/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/module-roc/common.c b/src/modules/module-roc/common.c
index 1cbd786a8..475c5f40f 100644
--- a/src/modules/module-roc/common.c
+++ b/src/modules/module-roc/common.c
@@ -47,7 +47,7 @@ static void pw_roc_log_handler(const roc_log_message *message, void *argument)
 {
 	const enum spa_log_level log_level = pw_roc_log_level_roc_2_pw(message->level);
 	if (SPA_UNLIKELY(pw_log_topic_enabled(log_level, roc_log_topic))) {
-		pw_log_logt(log_level, roc_log_topic, message->file, message->line, message->module, message->text, "");
+		pw_log_logt(log_level, roc_log_topic, message->file, message->line, message->module, "%s", message->text);
 	}
 }
 

From e46bfe67b60458e444ee2495209144b49e97d2f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Thu, 19 Feb 2026 20:56:36 +0100
Subject: [PATCH 083/263] treewide: fix some `-Wdiscarded-qualifiers`

Newer glibc versions have made certain `str*()` functions into macros
that ensure that the const-ness of the argument is propagated to the
return type.
---
 pipewire-jack/src/pipewire-jack.c | 2 +-
 spa/plugins/bluez5/bluez5-dbus.c  | 7 ++-----
 spa/plugins/support/logger.c      | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
index 1bef74283..73627a67e 100644
--- a/pipewire-jack/src/pipewire-jack.c
+++ b/pipewire-jack/src/pipewire-jack.c
@@ -5318,7 +5318,7 @@ int jack_set_freewheel(jack_client_t* client, int onoff)
 	pw_thread_loop_lock(c->context.loop);
 	str = pw_properties_get(c->props, PW_KEY_NODE_GROUP);
 	if (str != NULL) {
-		char *p = strstr(str, ",pipewire.freewheel");
+		const char *p = strstr(str, ",pipewire.freewheel");
 		if (p == NULL)
 			p = strstr(str, "pipewire.freewheel");
 		if (p == NULL && onoff)
diff --git a/spa/plugins/bluez5/bluez5-dbus.c b/spa/plugins/bluez5/bluez5-dbus.c
index 21a5e53de..7dfe45911 100644
--- a/spa/plugins/bluez5/bluez5-dbus.c
+++ b/spa/plugins/bluez5/bluez5-dbus.c
@@ -720,14 +720,12 @@ static const char *bap_features_get_uuid(struct bap_features *feat, size_t i)
 /** Get feature name at \a i, or NULL if uuid doesn't match */
 static const char *bap_features_get_name(struct bap_features *feat, size_t i, const char *uuid)
 {
-	char *pos;
-
 	if (i >= feat->dict.n_items)
 		return NULL;
 	if (!spa_streq(feat->dict.items[i].value, uuid))
 		return NULL;
 
-	pos = strchr(feat->dict.items[i].key, ':');
+	const char *pos = strchr(feat->dict.items[i].key, ':');
 	if (!pos)
 		return NULL;
 	return pos + 1;
@@ -1336,7 +1334,6 @@ static struct spa_bt_adapter *adapter_find(struct spa_bt_monitor *monitor, const
 static int parse_modalias(const char *modalias, uint16_t *source, uint16_t *vendor,
 		uint16_t *product, uint16_t *version)
 {
-	char *pos;
 	unsigned int src, i, j, k;
 
 	if (spa_strstartswith(modalias, "bluetooth:"))
@@ -1346,7 +1343,7 @@ static int parse_modalias(const char *modalias, uint16_t *source, uint16_t *vend
 	else
 		return -EINVAL;
 
-	pos = strchr(modalias, ':');
+	const char *pos = strchr(modalias, ':');
 	if (pos == NULL)
 		return -EINVAL;
 
diff --git a/spa/plugins/support/logger.c b/spa/plugins/support/logger.c
index c6e6ca4b8..6ea5f31b5 100644
--- a/spa/plugins/support/logger.c
+++ b/spa/plugins/support/logger.c
@@ -73,7 +73,7 @@ impl_log_logtv(void *object,
 	char timestamp[18] = {0};
 	char topicstr[32] = {0};
 	char filename[64] = {0};
-	char location[1000 + RESERVED_LENGTH], *p, *s;
+	char location[1000 + RESERVED_LENGTH], *p;
 	static const char * const levels[] = { "-", "E", "W", "I", "D", "T", "*T*" };
 	const char *prefix = "", *suffix = "";
 	int size, len;
@@ -118,7 +118,7 @@ impl_log_logtv(void *object,
 
 
 	if (impl->line && line != 0) {
-		s = strrchr(file, '/');
+		const char *s = strrchr(file, '/');
 		spa_scnprintf(filename, sizeof(filename), "[%16.16s:%5i %s()]",
 			s ? s + 1 : file, line, func);
 	}

From 5bd93b97adfb5a8352daf8fed1c7eb26dc8d1f6f Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arunr@valvesoftware.com>
Date: Thu, 19 Feb 2026 11:50:42 -0800
Subject: [PATCH 084/263] Revert "spa: json: Add a helper method to shrink an
 object string"

Drop this until we have better API for building/visiting JSON.

This reverts commit c244fbf945a4e240f40bdf0fe6baf0dfc4ddde13.
---
 spa/include/spa/utils/json.h            | 105 ------------------------
 spa/plugins/audioconvert/audioconvert.c |   1 -
 2 files changed, 106 deletions(-)

diff --git a/spa/include/spa/utils/json.h b/spa/include/spa/utils/json.h
index 5021290bf..212637dab 100644
--- a/spa/include/spa/utils/json.h
+++ b/spa/include/spa/utils/json.h
@@ -212,111 +212,6 @@ SPA_API_JSON_UTILS int spa_json_str_array_uint32(const char *arr, size_t arr_len
 	spa_json_make_str_array_unpack(32,uint32_t, atoi);
 }
 
-/* convenience */
-
-#define _SPA_STR_APPEND(str, len, idx, value )		\
-{							\
-	if ((idx) >= (len))				\
-		return -1;				\
-	(str)[(idx)++] = (value);			\
-}
-
-static int _spa_json_str_object_reduce(struct spa_json *json, char *out, size_t out_size, const char *value, size_t len)
-{
-	struct spa_json sub;
-	size_t idx = 0;
-	int count = 0, res;
-
-	if (spa_json_is_object(value, len)) {
-		char key[1024];
-
-		_SPA_STR_APPEND(out, out_size, idx, '{');
-
-		spa_json_enter(json, &sub);
-		while ((len = spa_json_object_next(&sub, key, sizeof(key), &value)) > 0) {
-			_SPA_STR_APPEND(out, out_size, idx, '"');
-			if (idx + strlen(key) >= out_size)
-				return -1;
-			strcpy(&out[idx], key);
-			idx += strlen(key);
-			_SPA_STR_APPEND(out, out_size, idx, '"');
-			_SPA_STR_APPEND(out, out_size, idx, ':');
-
-			res = _spa_json_str_object_reduce(&sub, &out[idx], out_size - idx, value, len);
-			if (res < 0)
-				return res;
-
-			idx += res;
-			_SPA_STR_APPEND(out, out_size, idx, ',');
-			count++;
-		}
-
-		/* Remove trailing comma */
-		if (count)
-			idx--;
-		_SPA_STR_APPEND(out, out_size, idx, '}');
-	} else if (spa_json_is_array(value, len)) {
-		_SPA_STR_APPEND(out, out_size, idx, '[');
-
-		spa_json_enter(json, &sub);
-		while ((len = spa_json_next(&sub, &value)) > 0) {
-			res = _spa_json_str_object_reduce(&sub, &out[idx], out_size - idx, value, len);
-			if (res < 0)
-				return res;
-
-			idx += res;
-			_SPA_STR_APPEND(out, out_size, idx, ',');
-			count++;
-		}
-
-		/* Remove trailing comma */
-		if (count)
-			idx--;
-		_SPA_STR_APPEND(out, out_size, idx, ']');
-	} else if (spa_json_is_string(value, len) ||
-	    spa_json_is_null(value, len) ||
-	    spa_json_is_bool(value, len) ||
-	    spa_json_is_int(value, len) ||
-	    spa_json_is_float(value, len)) {
-		/* Object type we understand */
-		if (len >= out_size)
-			return -1;
-		strcpy(out, value);
-		idx += len;
-	} else {
-		/* Naked value, treat as string */
-		_SPA_STR_APPEND(out, out_size, idx, '"');
-		if (idx + len >= out_size)
-			return -1;
-		strncpy(&out[idx], value, len);
-		idx += len;
-		_SPA_STR_APPEND(out, out_size, idx, '"');
-	}
-
-	return idx;
-}
-
-/* Parse a JSON object string and strip all whitespaces */
-SPA_API_JSON_UTILS int spa_json_str_object_reduce_inplace(char *str)
-{
-	struct spa_json json;
-	size_t size = strlen(str) + 1, len;
-	char temp[size];
-	const char *value;
-	int res;
-
-	len = spa_json_begin(&json, str, size, &value);
-
-	res = _spa_json_str_object_reduce(&json, temp, size, value, len);
-	if (res < 0)
-		return res;
-	temp[res] = '\0';
-
-	strncpy(str, temp, size);
-
-	return res;
-}
-
 /**
  * \}
  */
diff --git a/spa/plugins/audioconvert/audioconvert.c b/spa/plugins/audioconvert/audioconvert.c
index 5a4153770..da5396f61 100644
--- a/spa/plugins/audioconvert/audioconvert.c
+++ b/spa/plugins/audioconvert/audioconvert.c
@@ -1442,7 +1442,6 @@ static int load_filter_graph(struct impl *impl, const char *graph, int order)
 		insert_graph(&impl->active_graphs, pending);
 
 		impl->graph_descs[order] = strdup(graph);
-		spa_json_str_object_reduce_inplace(impl->graph_descs[order]);
 
 		spa_log_info(impl->log, "loading filter-graph order:%d", order);
 	}

From 8f3d8d77abcb3fb81573bf902deee75bc8a7efb4 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 20 Feb 2026 10:12:27 +0100
Subject: [PATCH 085/263] impl-link: prepare a link right after creating it

There is no reason to delay preparing the link (by the scheduler) when
both nodes are active, we can do that right from the start.

This makes things a bit more symetrical because deactivating a node does
not unprepare a link.

This however changes things a bit because you can no longer delay link
prepare until you activate the node. I don't know if this is actually in
use and it would probably be to delay format negotiation. The right way
do delay format negotiation is to wait until an EnumFormat is set but
that is something to improve later.
---
 src/modules/module-scheduler-v1.c |  4 ----
 src/pipewire/impl-link.c          | 18 +++---------------
 src/pipewire/private.h            |  3 ---
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
index 22965b257..0be38f572 100644
--- a/src/modules/module-scheduler-v1.c
+++ b/src/modules/module-scheduler-v1.c
@@ -241,8 +241,6 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node,
 				if (!t->active)
 					continue;
 
-				pw_impl_link_prepare(l);
-
 				if (!l->prepared)
 					continue;
 
@@ -262,8 +260,6 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node,
 				if (!t->active)
 					continue;
 
-				pw_impl_link_prepare(l);
-
 				if (!l->prepared)
 					continue;
 
diff --git a/src/pipewire/impl-link.c b/src/pipewire/impl-link.c
index 610a6d620..1c90cedb2 100644
--- a/src/pipewire/impl-link.c
+++ b/src/pipewire/impl-link.c
@@ -969,8 +969,7 @@ static void output_remove(struct pw_impl_link *this)
 	this->output = NULL;
 }
 
-SPA_EXPORT
-int pw_impl_link_prepare(struct pw_impl_link *this)
+static int link_prepare(struct pw_impl_link *this)
 {
 	struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
 
@@ -978,9 +977,6 @@ int pw_impl_link_prepare(struct pw_impl_link *this)
 			this, this->prepared, this->preparing,
 			impl->input.node->active, impl->output.node->active, this->passive);
 
-	if (!impl->input.node->active || !impl->output.node->active)
-		return 0;
-
 	if (this->destroyed || this->preparing || this->prepared)
 		return 0;
 
@@ -1092,7 +1088,7 @@ static void port_param_changed(struct pw_impl_link *this, uint32_t id,
 	pw_log_info("%p: format changed", this);
 	this->preparing = this->prepared = false;
 	link_update_state(this, PW_LINK_STATE_INIT, 0, NULL);
-	pw_impl_link_prepare(this);
+	link_prepare(this);
 }
 
 static void input_port_param_changed(void *data, uint32_t id)
@@ -1220,12 +1216,6 @@ static void output_node_result(void *data, int seq, int res, uint32_t type, cons
 	node_result(impl, &impl->output, seq, res, type, result);
 }
 
-static void node_active_changed(void *data, bool active)
-{
-	struct impl *impl = data;
-	pw_impl_link_prepare(&impl->this);
-}
-
 static void node_driver_changed(void *data, struct pw_impl_node *old, struct pw_impl_node *driver)
 {
 	struct impl *impl = data;
@@ -1240,14 +1230,12 @@ static void node_driver_changed(void *data, struct pw_impl_node *old, struct pw_
 static const struct pw_impl_node_events input_node_events = {
 	PW_VERSION_IMPL_NODE_EVENTS,
 	.result = input_node_result,
-	.active_changed = node_active_changed,
 	.driver_changed = node_driver_changed,
 };
 
 static const struct pw_impl_node_events output_node_events = {
 	PW_VERSION_IMPL_NODE_EVENTS,
 	.result = output_node_result,
-	.active_changed = node_active_changed,
 	.driver_changed = node_driver_changed,
 };
 
@@ -1720,7 +1708,7 @@ int pw_impl_link_register(struct pw_impl_link *link,
 	pw_global_add_listener(link->global, &link->global_listener, &global_events, link);
 	pw_global_register(link->global);
 
-	pw_impl_link_prepare(link);
+	link_prepare(link);
 
 	return 0;
 
diff --git a/src/pipewire/private.h b/src/pipewire/private.h
index 95a1a4646..3aceb3f02 100644
--- a/src/pipewire/private.h
+++ b/src/pipewire/private.h
@@ -1358,9 +1358,6 @@ int pw_impl_node_set_io(struct pw_impl_node *node, uint32_t id, void *data, size
 int pw_impl_node_add_target(struct pw_impl_node *node, struct pw_node_target *t);
 int pw_impl_node_remove_target(struct pw_impl_node *node, struct pw_node_target *t);
 
-/** Prepare a link
-  * Starts the negotiation of formats and buffers on \a link */
-int pw_impl_link_prepare(struct pw_impl_link *link);
 /** starts streaming on a link */
 int pw_impl_link_activate(struct pw_impl_link *link);
 

From ce18660127798c624f576cd0750dfaeec0ae148b Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 20 Feb 2026 10:34:58 +0100
Subject: [PATCH 086/263] tests: fix test

---
 test/test-context.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/test-context.c b/test/test-context.c
index e35de484c..967c631fb 100644
--- a/test/test-context.c
+++ b/test/test-context.c
@@ -41,6 +41,7 @@ PWTEST(context_abi)
 	TEST_FUNC(ev, test, global_removed);
 	TEST_FUNC(ev, test, driver_added);
 	TEST_FUNC(ev, test, driver_removed);
+	TEST_FUNC(ev, test, recalc_graph);
 
 	pwtest_int_eq(PW_VERSION_CONTEXT_EVENTS, 2);
 	pwtest_int_eq(sizeof(ev), sizeof(test));

From 9e82e49446d4bf27779c8266356e182a74c3f14b Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Sat, 21 Feb 2026 16:12:42 +0100
Subject: [PATCH 087/263] scheduler: rework the runnable state calculation

Move the runnable state calculation out of the collect_nodes function.
They are really two different steps that doin't overlap much.

The runnable state of a node is very easy to calculate. A node is
runnable if it is linked to another node without a passive port. When we
find two runnable nodes, make them runnable, which makes all nodes
linked to them runnable, stopping at passive ports.

We don't have to check the active state of the nodes or links to group
them together. This ensures we don't swap nodes around too much when the
node or link state changes.
---
 src/modules/module-scheduler-v1.c | 241 ++++++++++++++++--------------
 1 file changed, 128 insertions(+), 113 deletions(-)

diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
index 0be38f572..d1797388c 100644
--- a/src/modules/module-scheduler-v1.c
+++ b/src/modules/module-scheduler-v1.c
@@ -106,91 +106,134 @@ static int ensure_state(struct pw_impl_node *node, bool running)
 	return pw_impl_node_set_state(node, state);
 }
 
-/* From a node (that is runnable) follow all prepared links in the given direction
- * and groups to active nodes and make them recursively runnable as well.
+/* make a node runnable. This will automatically also make all non-passive peer nodes
+ * runnable and the nodes that belong to the same groups, link_groups or sync groups
+ *
+ * We have 4 cases for the links:
+ * (p) marks a passive port. we don't follow the peer from this port.
+ *
+ *  A   ->   B   ==> B can also be runnable
+ *  A  p->   B   ==> B can also be runnable
+ *  A   ->p  B   ==> B can not be runnable
+ *  A  p->p  B   ==> B can not be runnable
  */
-static inline int run_nodes(struct pw_context *context, struct pw_impl_node *node,
-		struct spa_list *nodes, enum pw_direction direction, int hop)
+static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 {
-	struct pw_impl_node *t;
 	struct pw_impl_port *p;
 	struct pw_impl_link *l;
+	struct pw_impl_node *n;
+	uint32_t n_sync = 0;
+	char *sync[MAX_SYNC+1] = { NULL };
 
-	if (hop == MAX_HOPS) {
-		pw_log_warn("exceeded hops (%d)", hop);
-		return -EIO;
+	if (!node->runnable) {
+		pw_log_warn("%s is runnable", node->name);
+		node->runnable = true;
 	}
 
-	pw_log_debug("node %p: '%s' direction:%s", node, node->name,
-			pw_direction_as_string(direction));
-
-	SPA_FLAG_SET(node->checked, 1u<<direction);
-
-	if (direction == PW_DIRECTION_INPUT) {
-		spa_list_for_each(p, &node->input_ports, link) {
-			spa_list_for_each(l, &p->links, input_link) {
-				t = l->output->node;
-
-				if (!t->active || !l->prepared ||
-				    (!t->driving && SPA_FLAG_IS_SET(t->checked, 1u<<direction)))
-					continue;
-				if (t->driving && p->node == t)
-					continue;
-
-				pw_log_debug("  peer %p: '%s'", t, t->name);
-				t->runnable = true;
-				run_nodes(context, t, nodes, direction, hop + 1);
-			}
-		}
-	} else {
-		spa_list_for_each(p, &node->output_ports, link) {
-			spa_list_for_each(l, &p->links, output_link) {
-				t = l->input->node;
-
-				if (!t->active || !l->prepared ||
-				    (!t->driving && SPA_FLAG_IS_SET(t->checked, 1u<<direction)))
-					continue;
-				if (t->driving && p->node == t)
-					continue;
-
-				pw_log_debug("  peer %p: '%s'", t, t->name);
-				t->runnable = true;
-				run_nodes(context, t, nodes, direction, hop + 1);
-			}
-		}
-	}
-	/* now go through all the nodes that have the same link group and
-	 * that are not yet visited. Note how nodes with the same group
-	 * don't get included here. They were added to the same driver but
-	 * need to otherwise stay idle unless some non-passive link activates
-	 * them. */
-	if (node->link_groups != NULL) {
-		spa_list_for_each(t, nodes, sort_link) {
-			if (t->exported || !t->active ||
-			    SPA_FLAG_IS_SET(t->checked, 1u<<direction))
+	if (node->sync) {
+		for (uint32_t i = 0; node->sync_groups[i]; i++) {
+			if (n_sync >= MAX_SYNC)
+				break;
+			if (pw_strv_find(sync, node->sync_groups[i]) >= 0)
 				continue;
-			if (pw_strv_find_common(t->link_groups, node->link_groups) < 0)
+			sync[n_sync++] = node->sync_groups[i];
+			sync[n_sync] = NULL;
+		}
+	}
+	spa_list_for_each(p, &node->output_ports, link) {
+		spa_list_for_each(l, &p->links, output_link) {
+			n = l->input->node;
+			if (!l->prepared || !n->active || l->input->passive)
+				continue;
+			if (!n->runnable)
+				make_runnable(context, n);
+		}
+	}
+	spa_list_for_each(p, &node->input_ports, link) {
+		spa_list_for_each(l, &p->links, input_link) {
+			n = l->output->node;
+			if (!l->prepared || !n->active || l->output->passive)
+				continue;
+			if (!n->runnable)
+				make_runnable(context, n);
+		}
+	}
+	/* now go through all the nodes that share groups, link_groups or
+	 * sync groups that are not yet runnable */
+	if (node->groups != NULL || node->link_groups != NULL || sync[0] != NULL) {
+		spa_list_for_each(n, &context->node_list, link) {
+			if (n->exported || !n->active || n->runnable)
+				continue;
+			/* the other node will be scheduled with this one if it's in
+			 * the same group or link group */
+			if (pw_strv_find_common(n->groups, node->groups) < 0 &&
+			    pw_strv_find_common(n->link_groups, node->link_groups) < 0 &&
+			    pw_strv_find_common(n->sync_groups, sync) < 0)
 				continue;
 
-			pw_log_debug("  group %p: '%s'", t, t->name);
-			t->runnable = true;
-			if (!t->driving)
-				run_nodes(context, t, nodes, direction, hop + 1);
+			make_runnable(context, n);
 		}
 	}
-	return 0;
 }
 
-/* Follow all prepared links and groups from node, activate the links.
- * If a non-passive link is found, we set the peer runnable flag.
+/* check if a node and its peer can run. They can both run if there is a non-passive
+ * link between them.
+ *
+ * There are 4 cases:
+ *
+ * (p) marks a passive port. we don't follow the peer from this port.
+ * A can not be a driver
+ *
+ *  A   ->   B   ==> both nodes can run
+ *  A   ->p  B   ==> both nodes can run
+ *  A  p->   B   ==> nodes don't run, port A is passive and doesn't activate B
+ *  A  p->p  B   ==> nodes don't run
+ *
+ *  Once we decide the two nodes should be made runnable we cann make_runnable()
+ *
+ * */
+static void check_runnable(struct pw_context *context, struct pw_impl_node *node)
+{
+	struct pw_impl_port *p;
+	struct pw_impl_link *l;
+	struct pw_impl_node *n;
+
+	spa_list_for_each(p, &node->output_ports, link) {
+		spa_list_for_each(l, &p->links, output_link) {
+			n = l->input->node;
+			/* we can only check the peer when the link is ready and
+			 * the peer is active */
+			if (!l->prepared || !n->active)
+				continue;
+
+			if (!p->passive) {
+				make_runnable(context, node);
+				make_runnable(context, n);
+			}
+		}
+	}
+	spa_list_for_each(p, &node->input_ports, link) {
+		spa_list_for_each(l, &p->links, input_link) {
+			n = l->output->node;
+			if (!l->prepared || !n->active)
+				continue;
+
+			if (!p->passive) {
+				make_runnable(context, node);
+				make_runnable(context, n);
+			}
+		}
+	}
+}
+
+/* Follow all links and groups from node.
  *
  * After this is done, we end up with a list of nodes in collect that are all
  * linked to node.
- * Some of the nodes have the runnable flag set. We then start from those nodes
- * and make all linked nodes and groups runnable as well. (see run_nodes).
  *
- * This ensures that we only activate the paths from the runnable nodes to the
- * driver nodes and leave the other nodes idle.
+ * We don't need to care about active nodes or links, we just follow and group everything.
+ * The inactive nodes or links will simply not be runnable but will already be grouped
+ * correctly when they do become active and prepared.
  */
 static int collect_nodes(struct pw_context *context, struct pw_impl_node *node, struct spa_list *collect)
 {
@@ -237,16 +280,6 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node,
 		spa_list_for_each(p, &n->input_ports, link) {
 			spa_list_for_each(l, &p->links, input_link) {
 				t = l->output->node;
-
-				if (!t->active)
-					continue;
-
-				if (!l->prepared)
-					continue;
-
-				if (!l->passive)
-					t->runnable = true;
-
 				if (!t->visited) {
 					t->visited = true;
 					spa_list_append(&queue, &t->sort_link);
@@ -256,16 +289,6 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node,
 		spa_list_for_each(p, &n->output_ports, link) {
 			spa_list_for_each(l, &p->links, output_link) {
 				t = l->input->node;
-
-				if (!t->active)
-					continue;
-
-				if (!l->prepared)
-					continue;
-
-				if (!l->passive)
-					t->runnable = true;
-
 				if (!t->visited) {
 					t->visited = true;
 					spa_list_append(&queue, &t->sort_link);
@@ -276,7 +299,7 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node,
 		 * that are not yet visited */
 		if (n->groups != NULL || n->link_groups != NULL || sync[0] != NULL) {
 			spa_list_for_each(t, &context->node_list, link) {
-				if (t->exported || !t->active || t->visited)
+				if (t->exported || t->visited)
 					continue;
 				/* the other node will be scheduled with this one if it's in
 				 * the same group or link group */
@@ -294,26 +317,6 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node,
 		pw_log_debug(" next node %p: '%s' runnable:%u %p %p %p", n, n->name, n->runnable,
 				n->groups, n->link_groups, sync);
 	}
-	/* All non-driver runnable nodes (ie. reachable with a non-passive link) now make
-	 * all linked nodes up and downstream runnable as well */
-	spa_list_for_each(n, collect, sort_link) {
-		if (!n->driver && n->runnable) {
-			run_nodes(context, n, collect, PW_DIRECTION_OUTPUT, 0);
-			run_nodes(context, n, collect, PW_DIRECTION_INPUT, 0);
-		}
-	}
-	/* now we might have made a driver runnable, if the node is not runnable at this point
-	 * it means it was linked to the driver with passives links and some other node
-	 * made the driver active. If the node is a leaf it can not be activated in any other
-	 * way and we will also make it, and all its peers, runnable */
-	spa_list_for_each(n, collect, sort_link) {
-		if (!n->driver && n->driver_node->runnable && !n->runnable && n->leaf && n->active) {
-			n->runnable = true;
-			run_nodes(context, n, collect, PW_DIRECTION_OUTPUT, 0);
-			run_nodes(context, n, collect, PW_DIRECTION_INPUT, 0);
-		}
-	}
-
 	return 0;
 }
 
@@ -527,16 +530,18 @@ static uint32_t find_best_rate(const uint32_t *rates, uint32_t n_rates, uint32_t
 
 /* here we evaluate the complete state of the graph.
  *
- * It roughly operates in 3 stages:
+ * It roughly operates in 4 stages:
  *
- * 1. go over all drivers and collect the nodes that need to be scheduled with the
+ * 1. go over all nodes and check if they should be scheduled (runnable) or not.
+ *
+ * 2. go over all drivers and collect the nodes that need to be scheduled with the
  *    driver. This include all nodes that have an active link with the driver or
  *    with a node already scheduled with the driver.
  *
- * 2. go over all nodes that are not assigned to a driver. The ones that require
- *    a driver are moved to some random active driver found in step 1.
+ * 3. go over all nodes that are not assigned to a driver. The ones that require
+ *    a driver are moved to some random active driver found in step 2.
  *
- * 3. go over all drivers again, collect the quantum/rate of all followers, select
+ * 4. go over all drivers again, collect the quantum/rate of all followers, select
  *    the desired final value and activate the followers and then the driver.
  *
  * A complete graph evaluation is performed for each change that is made to the
@@ -571,6 +576,16 @@ again:
 
 	global_force_quantum = rate_quantum == 0;
 
+	/* first look at all nodes and decide which one should be runnable */
+	spa_list_for_each(n, &context->node_list, link) {
+		/* we don't check drivers, they need to be made runnable
+		 * from other nodes */
+		if (n->exported || !n->active || n->driver)
+			continue;
+
+		check_runnable(context, n);
+	}
+
 	/* start from all drivers and group all nodes that are linked
 	 * to it. Some nodes are not (yet) linked to anything and they
 	 * will end up 'unassigned' to a driver. Other nodes are drivers

From 973f48dde74f1be4b84bec2f48a4ad33e7543762 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Sat, 21 Feb 2026 16:32:30 +0100
Subject: [PATCH 088/263] scheduler: make always_process nodes runnable

Don't just set the flag but call make_runnable for always_process node
so that the peers also get activated.
---
 src/modules/module-scheduler-v1.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
index d1797388c..8bfbab21c 100644
--- a/src/modules/module-scheduler-v1.c
+++ b/src/modules/module-scheduler-v1.c
@@ -126,7 +126,7 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 	char *sync[MAX_SYNC+1] = { NULL };
 
 	if (!node->runnable) {
-		pw_log_warn("%s is runnable", node->name);
+		pw_log_debug("%s is runnable", node->name);
 		node->runnable = true;
 	}
 
@@ -198,6 +198,9 @@ static void check_runnable(struct pw_context *context, struct pw_impl_node *node
 	struct pw_impl_link *l;
 	struct pw_impl_node *n;
 
+	if (node->always_process && !node->runnable)
+		make_runnable(context, node);
+
 	spa_list_for_each(p, &node->output_ports, link) {
 		spa_list_for_each(l, &p->links, output_link) {
 			n = l->input->node;
@@ -567,7 +570,7 @@ again:
 	spa_list_for_each(n, &context->node_list, link) {
 		n->visited = false;
 		n->checked = 0;
-		n->runnable = n->always_process && n->active;
+		n->runnable = false;
 	}
 
 	get_quantums(context, &def_quantum, &min_quantum, &max_quantum, &rate_quantum,

From 476220c18b93912b5cbddee3f841df7dd865de8a Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Sat, 21 Feb 2026 16:33:21 +0100
Subject: [PATCH 089/263] scheduler: don't take active state into account for
 grouping

The grouping of the node does not depend on the active state.
---
 src/modules/module-scheduler-v1.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
index 8bfbab21c..7f9501073 100644
--- a/src/modules/module-scheduler-v1.c
+++ b/src/modules/module-scheduler-v1.c
@@ -266,9 +266,6 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node,
 		pw_log_debug(" next node %p: '%s' runnable:%u active:%d",
 				n, n->name, n->runnable, n->active);
 
-		if (!n->active)
-			continue;
-
 		if (n->sync) {
 			for (uint32_t i = 0; n->sync_groups[i]; i++) {
 				if (n_sync >= MAX_SYNC)
@@ -585,7 +582,6 @@ again:
 		 * from other nodes */
 		if (n->exported || !n->active || n->driver)
 			continue;
-
 		check_runnable(context, n);
 	}
 

From 846096d435c1199415b8f54508953edb19dcc9ae Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Sat, 21 Feb 2026 17:25:54 +0100
Subject: [PATCH 090/263] scheduler: prepare link before usage

A link might become unprepared because a node suspended. When we want
to make the nodes runnable, make sure the link is prepared again.
---
 src/modules/module-scheduler-v1.c | 29 +++++++++++++++--------------
 src/pipewire/impl-link.c          |  7 ++++---
 src/pipewire/private.h            |  3 +++
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
index 7f9501073..215ef0fef 100644
--- a/src/modules/module-scheduler-v1.c
+++ b/src/modules/module-scheduler-v1.c
@@ -204,27 +204,28 @@ static void check_runnable(struct pw_context *context, struct pw_impl_node *node
 	spa_list_for_each(p, &node->output_ports, link) {
 		spa_list_for_each(l, &p->links, output_link) {
 			n = l->input->node;
-			/* we can only check the peer when the link is ready and
-			 * the peer is active */
-			if (!l->prepared || !n->active)
+			/* the peer needs to be active and we are linked to it
+			 * with a non-passive link */
+			if (!n->active || p->passive)
 				continue;
-
-			if (!p->passive) {
-				make_runnable(context, node);
-				make_runnable(context, n);
-			}
+			/* explicitly prepare the link in case it was suspended */
+			pw_impl_link_prepare(l);
+			if (!l->prepared)
+				continue;
+			make_runnable(context, node);
+			make_runnable(context, n);
 		}
 	}
 	spa_list_for_each(p, &node->input_ports, link) {
 		spa_list_for_each(l, &p->links, input_link) {
 			n = l->output->node;
-			if (!l->prepared || !n->active)
+			if (!n->active || p->passive)
 				continue;
-
-			if (!p->passive) {
-				make_runnable(context, node);
-				make_runnable(context, n);
-			}
+			pw_impl_link_prepare(l);
+			if (!l->prepared)
+				continue;
+			make_runnable(context, node);
+			make_runnable(context, n);
 		}
 	}
 }
diff --git a/src/pipewire/impl-link.c b/src/pipewire/impl-link.c
index 1c90cedb2..ea979d8ba 100644
--- a/src/pipewire/impl-link.c
+++ b/src/pipewire/impl-link.c
@@ -969,7 +969,8 @@ static void output_remove(struct pw_impl_link *this)
 	this->output = NULL;
 }
 
-static int link_prepare(struct pw_impl_link *this)
+SPA_EXPORT
+int pw_impl_link_prepare(struct pw_impl_link *this)
 {
 	struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
 
@@ -1088,7 +1089,7 @@ static void port_param_changed(struct pw_impl_link *this, uint32_t id,
 	pw_log_info("%p: format changed", this);
 	this->preparing = this->prepared = false;
 	link_update_state(this, PW_LINK_STATE_INIT, 0, NULL);
-	link_prepare(this);
+	pw_impl_link_prepare(this);
 }
 
 static void input_port_param_changed(void *data, uint32_t id)
@@ -1708,7 +1709,7 @@ int pw_impl_link_register(struct pw_impl_link *link,
 	pw_global_add_listener(link->global, &link->global_listener, &global_events, link);
 	pw_global_register(link->global);
 
-	link_prepare(link);
+	pw_impl_link_prepare(link);
 
 	return 0;
 
diff --git a/src/pipewire/private.h b/src/pipewire/private.h
index 3aceb3f02..95a1a4646 100644
--- a/src/pipewire/private.h
+++ b/src/pipewire/private.h
@@ -1358,6 +1358,9 @@ int pw_impl_node_set_io(struct pw_impl_node *node, uint32_t id, void *data, size
 int pw_impl_node_add_target(struct pw_impl_node *node, struct pw_node_target *t);
 int pw_impl_node_remove_target(struct pw_impl_node *node, struct pw_node_target *t);
 
+/** Prepare a link
+  * Starts the negotiation of formats and buffers on \a link */
+int pw_impl_link_prepare(struct pw_impl_link *link);
 /** starts streaming on a link */
 int pw_impl_link_activate(struct pw_impl_link *link);
 

From 367ce4626c98d0262c10af05336e1b75d00143d5 Mon Sep 17 00:00:00 2001
From: Ripley Tom <discofan420@protonmail.com>
Date: Sat, 21 Feb 2026 20:55:17 +0100
Subject: [PATCH 091/263] src/modules/module-rtp-source.c: Fix alignment
 requirement for 32 bit build

---
 src/modules/module-rtp-source.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/module-rtp-source.c b/src/modules/module-rtp-source.c
index 8f911c62a..2110385b8 100644
--- a/src/modules/module-rtp-source.c
+++ b/src/modules/module-rtp-source.c
@@ -231,7 +231,7 @@ struct impl {
 	/* Monotonic timestamp of the last time a packet was
 	 * received. This is accessed with atomic accessors
 	 * to avoid race conditions. */
-	uint64_t last_packet_time;
+	SPA_ALIGNED(8) uint64_t last_packet_time;
 
 	struct pw_timer standby_timer;
 	/* This timer is used when the first stream_start() call fails because

From c847b8162959c29b783585e0dcadbfb096e7cb73 Mon Sep 17 00:00:00 2001
From: Ripley Tom <discofan420@protonmail.com>
Date: Sat, 21 Feb 2026 19:33:11 +0100
Subject: [PATCH 092/263] spa/plugins/alsa/acp/compat.h: Fix missed
 -Wdiscarded-qualifiers warning

---
 spa/plugins/alsa/acp/compat.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spa/plugins/alsa/acp/compat.h b/spa/plugins/alsa/acp/compat.h
index f7592e1a6..0f7b959df 100644
--- a/spa/plugins/alsa/acp/compat.h
+++ b/spa/plugins/alsa/acp/compat.h
@@ -429,9 +429,9 @@ static PA_PRINTF_FUNC(1,0) inline char *pa_vsprintf_malloc(const char *fmt, va_l
 
 #define pa_fopen_cloexec(f,m)	fopen(f,m"e")
 
-static inline char *pa_path_get_filename(const char *p)
+static inline const char *pa_path_get_filename(const char *p)
 {
-    char *fn;
+    const char *fn;
     if (!p)
         return NULL;
     if ((fn = strrchr(p, PA_PATH_SEP_CHAR)))

From ff04b47942809e910d07858d5bd9c937e5c48bba Mon Sep 17 00:00:00 2001
From: Ripley Tom <discofan420@protonmail.com>
Date: Sat, 21 Feb 2026 20:19:04 +0100
Subject: [PATCH 093/263] meson.build: Add -Werror=discarded-qualifiers

---
 meson.build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meson.build b/meson.build
index 5f9ffa39d..bca2c7a27 100644
--- a/meson.build
+++ b/meson.build
@@ -116,6 +116,7 @@ cc_flags = common_flags + [
   '-Werror=old-style-definition',
   '-Werror=missing-parameter-type',
   '-Werror=strict-prototypes',
+  '-Werror=discarded-qualifiers',
 ]
 add_project_arguments(cc.get_supported_arguments(cc_flags), language: 'c')
 add_project_arguments(cc_native.get_supported_arguments(cc_flags),

From 426a5be235ca48955e14dd4404e093ca996110a9 Mon Sep 17 00:00:00 2001
From: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date: Sun, 22 Feb 2026 21:50:02 +0100
Subject: [PATCH 094/263] po: Update Swedish translation

---
 po/sv.po | 382 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 215 insertions(+), 167 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index 0bc2796a4..1474f5084 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,9 +1,9 @@
 # Swedish translation for pipewire.
-# Copyright © 2008-2025 Free Software Foundation, Inc.
+# Copyright © 2008-2026 Free Software Foundation, Inc.
 # This file is distributed under the same license as the pipewire package.
 # Daniel Nylander <po@danielnylander.se>, 2008, 2012.
 # Josef Andersson <josef.andersson@fripost.org>, 2014, 2017.
-# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2021, 2022, 2023, 2024, 2025.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2021, 2022, 2023, 2024, 2025, 2026.
 #
 # Termer:
 # input/output: ingång/utgång (det handlar om ljud)
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: pipewire\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pipewire/pipewire/-/"
 "issues\n"
-"POT-Creation-Date: 2025-04-16 15:31+0000\n"
-"PO-Revision-Date: 2025-04-22 10:43+0200\n"
+"POT-Creation-Date: 2026-02-09 12:55+0000\n"
+"PO-Revision-Date: 2026-02-22 21:48+0100\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -28,7 +28,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.8\n"
 
 #: src/daemon/pipewire.c:29
 #, c-format
@@ -47,11 +47,11 @@ msgstr ""
 "  -c, --config                          Läs in konfig (standard %s)\n"
 "  -P  --properties                      Ställ in kontextegenskaper\n"
 
-#: src/daemon/pipewire.desktop.in:4
+#: src/daemon/pipewire.desktop.in:3
 msgid "PipeWire Media System"
 msgstr "PipeWire mediasystem"
 
-#: src/daemon/pipewire.desktop.in:5
+#: src/daemon/pipewire.desktop.in:4
 msgid "Start the PipeWire Media System"
 msgstr "Starta mediasystemet PipeWire"
 
@@ -65,26 +65,51 @@ msgstr "Tunnel till %s%s%s"
 msgid "Dummy Output"
 msgstr "Attrapputgång"
 
-#: src/modules/module-pulse-tunnel.c:760
+#: src/modules/module-pulse-tunnel.c:761
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Tunnel för %s@%s"
 
-#: src/modules/module-zeroconf-discover.c:320
+#: src/modules/module-zeroconf-discover.c:326
 msgid "Unknown device"
 msgstr "Okänd enhet"
 
-#: src/modules/module-zeroconf-discover.c:332
+#: src/modules/module-zeroconf-discover.c:338
 #, c-format
 msgid "%s on %s@%s"
 msgstr "%s på %s@%s"
 
-#: src/modules/module-zeroconf-discover.c:336
+#: src/modules/module-zeroconf-discover.c:342
 #, c-format
 msgid "%s on %s"
 msgstr "%s på %s"
 
-#: src/tools/pw-cat.c:973
+#: src/tools/pw-cat.c:264
+#, c-format
+msgid "Supported formats:\n"
+msgstr "Format som stöds:\n"
+
+#: src/tools/pw-cat.c:749
+#, c-format
+msgid "Supported channel layouts:\n"
+msgstr "Kanallayouter som stöds:\n"
+
+#: src/tools/pw-cat.c:759
+#, c-format
+msgid "Supported channel layout aliases:\n"
+msgstr "Kanallayoutalias som stöds:\n"
+
+#: src/tools/pw-cat.c:761
+#, c-format
+msgid "    %s -> %s\n"
+msgstr "    %s -> %s\n"
+
+#: src/tools/pw-cat.c:766
+#, c-format
+msgid "Supported channel names:\n"
+msgstr "Kanalnamn som stöds:\n"
+
+#: src/tools/pw-cat.c:1177
 #, c-format
 msgid ""
 "%s [options] [<file>|-]\n"
@@ -99,7 +124,7 @@ msgstr ""
 "  -v, --verbose                         Aktivera utförliga operationer\n"
 "\n"
 
-#: src/tools/pw-cat.c:980
+#: src/tools/pw-cat.c:1184
 #, c-format
 msgid ""
 "  -R, --remote                          Remote daemon name\n"
@@ -131,50 +156,64 @@ msgstr ""
 "  -P  --properties                      Sätt nodegenskaper\n"
 "\n"
 
-#: src/tools/pw-cat.c:998
+#: src/tools/pw-cat.c:1202
 #, c-format
 msgid ""
-"      --rate                            Sample rate (req. for rec) (default "
-"%u)\n"
-"      --channels                        Number of channels (req. for rec) "
-"(default %u)\n"
+"      --rate                            Sample rate (default %u)\n"
+"      --channels                        Number of channels (default %u)\n"
 "      --channel-map                     Channel map\n"
-"                                            one of: \"stereo\", "
-"\"surround-51\",... or\n"
+"                                            a channel layout: \"Stereo\", "
+"\"5.1\",... or\n"
 "                                            comma separated list of channel "
 "names: eg. \"FL,FR\"\n"
-"      --format                          Sample format %s (req. for rec) "
-"(default %s)\n"
+"      --list-layouts                    List supported channel layouts\n"
+"      --list-channel-names              List supported channel maps\n"
+"      --format                          Sample format (default %s)\n"
+"      --list-formats                    List supported sample formats\n"
+"      --container                       Container format\n"
+"      --list-containers                 List supported containers and "
+"extensions\n"
 "      --volume                          Stream volume 0-1.0 (default %.3f)\n"
 "  -q  --quality                         Resampler quality (0 - 15) (default "
 "%d)\n"
 "  -a, --raw                             RAW mode\n"
+"  -M, --force-midi                      Force midi format, one of \"midi\" "
+"or \"ump\", (default ump)\n"
+"  -n, --sample-count COUNT              Stop after COUNT samples\n"
 "\n"
 msgstr ""
-"      --rate                            Samplingsfrekvens (krävs för insp.) "
-"(standard %u)\n"
-"      --channels                        Antal kanaler (krävs för insp.) "
-"(standard %u)\n"
+"      --rate                            Samplingsfrekvens (standard %u)\n"
+"      --channels                        Antal kanaler (standard %u)\n"
 "      --channel-map                     Kanalmappning\n"
-"                                            en av: \"stereo\", "
-"\"surround-51\",... eller\n"
+"                                            en kanallayout: \"Stereo\", "
+"\"5.1\",... eller\n"
 "                                            kommaseparerad lista av "
 "kanalnamn: t.ex. \"FL,FR\"\n"
-"      --format                          Samplingsformat %s (krävs för insp.) "
-"(standard %s)\n"
+"      --list-layouts                    Lista kanallayouter som stöds\n"
+"      --list-channel-names              Lista kanalmappningar som stöds\n"
+"      --format                          Samplingsformat (standard %s)\n"
+"      --list-formats                    Lista samplingsformat som stöds\n"
+"      --container                       Behållarformat\n"
+"      --list-containers                 Lista behållare och tillägg som "
+"stöds\n"
 "      --volume                          Strömvolym 0-1.0 (standard %.3f)\n"
 "  -q  --quality                         Omsamplarkvalitet (0 - 15) (standard "
 "%d)\n"
 "  -a, --raw                             RAW-läge\n"
+"  -M, --force-midi                      Tvinga midi-format, en av \"midi\" "
+"eller \"ump\", (standard ump)\n"
+"  -n, --sample-count ANTAL              Stoppa efter ANTAL samplar\n"
 "\n"
 
-#: src/tools/pw-cat.c:1016
+#: src/tools/pw-cat.c:1227
 msgid ""
 "  -p, --playback                        Playback mode\n"
 "  -r, --record                          Recording mode\n"
 "  -m, --midi                            Midi mode\n"
 "  -d, --dsd                             DSD mode\n"
 "  -o, --encoded                         Encoded mode\n"
+"  -s, --sysex                           SysEx mode\n"
+"  -c, --midi-clip                       MIDI clip mode\n"
 "\n"
 msgstr ""
 "  -p, --playback                        Uppspelningsläge\n"
@@ -182,9 +221,16 @@ msgstr ""
 "  -m, --midi                            Midiläge\n"
 "  -d, --dsd                             DSD-läge\n"
 "  -o, --encoded                         Kodat läge\n"
+"  -s, --sysex                           SysEx-läge\n"
+"  -c, --midi-clip                       MIDI-klippläge\n"
 "\n"
 
-#: src/tools/pw-cli.c:2306
+#: src/tools/pw-cat.c:1827
+#, c-format
+msgid "Supported containers and extensions:\n"
+msgstr "Behållare och tillägg som stöds:\n"
+
+#: src/tools/pw-cli.c:2386
 #, c-format
 msgid ""
 "%s [options] [command]\n"
@@ -203,200 +249,203 @@ msgstr ""
 "  -m, --monitor                         Övervaka aktivitet\n"
 "\n"
 
-#: spa/plugins/alsa/acp/acp.c:350
+#: spa/plugins/alsa/acp/acp.c:361
 msgid "Pro Audio"
 msgstr "Professionellt ljud"
 
-#: spa/plugins/alsa/acp/acp.c:511 spa/plugins/alsa/acp/alsa-mixer.c:4635
-#: spa/plugins/bluez5/bluez5-device.c:1802
+#: spa/plugins/alsa/acp/acp.c:537 spa/plugins/alsa/acp/alsa-mixer.c:4699
+#: spa/plugins/bluez5/bluez5-device.c:2021
 msgid "Off"
 msgstr "Av"
 
-#: spa/plugins/alsa/acp/acp.c:593
+#: spa/plugins/alsa/acp/acp.c:620
 #, c-format
 msgid "%s [ALSA UCM error]"
 msgstr "%s [ALSA UCM-fel]"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2652
+#: spa/plugins/alsa/acp/alsa-mixer.c:2721
 msgid "Input"
 msgstr "Ingång"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2653
+#: spa/plugins/alsa/acp/alsa-mixer.c:2722
 msgid "Docking Station Input"
 msgstr "Ingång för dockningsstation"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2654
+#: spa/plugins/alsa/acp/alsa-mixer.c:2723
 msgid "Docking Station Microphone"
 msgstr "Mikrofon för dockningsstation"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2655
+#: spa/plugins/alsa/acp/alsa-mixer.c:2724
 msgid "Docking Station Line In"
 msgstr "Linje in för dockningsstation"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2656
-#: spa/plugins/alsa/acp/alsa-mixer.c:2747
+#: spa/plugins/alsa/acp/alsa-mixer.c:2725
+#: spa/plugins/alsa/acp/alsa-mixer.c:2816
 msgid "Line In"
 msgstr "Linje in"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2657
-#: spa/plugins/alsa/acp/alsa-mixer.c:2741
-#: spa/plugins/bluez5/bluez5-device.c:2146
+#: spa/plugins/alsa/acp/alsa-mixer.c:2726
+#: spa/plugins/alsa/acp/alsa-mixer.c:2810
+#: spa/plugins/bluez5/bluez5-device.c:2422
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2658
-#: spa/plugins/alsa/acp/alsa-mixer.c:2742
+#: spa/plugins/alsa/acp/alsa-mixer.c:2727
+#: spa/plugins/alsa/acp/alsa-mixer.c:2811
 msgid "Front Microphone"
 msgstr "Frontmikrofon"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2659
-#: spa/plugins/alsa/acp/alsa-mixer.c:2743
+#: spa/plugins/alsa/acp/alsa-mixer.c:2728
+#: spa/plugins/alsa/acp/alsa-mixer.c:2812
 msgid "Rear Microphone"
 msgstr "Bakre mikrofon"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2660
+#: spa/plugins/alsa/acp/alsa-mixer.c:2729
 msgid "External Microphone"
 msgstr "Extern mikrofon"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2661
-#: spa/plugins/alsa/acp/alsa-mixer.c:2745
+#: spa/plugins/alsa/acp/alsa-mixer.c:2730
+#: spa/plugins/alsa/acp/alsa-mixer.c:2814
 msgid "Internal Microphone"
 msgstr "Intern mikrofon"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2662
-#: spa/plugins/alsa/acp/alsa-mixer.c:2748
+#: spa/plugins/alsa/acp/alsa-mixer.c:2731
+#: spa/plugins/alsa/acp/alsa-mixer.c:2817
 msgid "Radio"
 msgstr "Radio"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2663
-#: spa/plugins/alsa/acp/alsa-mixer.c:2749
+#: spa/plugins/alsa/acp/alsa-mixer.c:2732
+#: spa/plugins/alsa/acp/alsa-mixer.c:2818
 msgid "Video"
 msgstr "Video"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2664
+#: spa/plugins/alsa/acp/alsa-mixer.c:2733
 msgid "Automatic Gain Control"
 msgstr "Automatisk förstärkningskontroll"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2665
+#: spa/plugins/alsa/acp/alsa-mixer.c:2734
 msgid "No Automatic Gain Control"
 msgstr "Ingen automatisk förstärkningskontroll"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2666
+#: spa/plugins/alsa/acp/alsa-mixer.c:2735
 msgid "Boost"
 msgstr "Ökning"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2667
+#: spa/plugins/alsa/acp/alsa-mixer.c:2736
 msgid "No Boost"
 msgstr "Ingen ökning"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2668
+#: spa/plugins/alsa/acp/alsa-mixer.c:2737
 msgid "Amplifier"
 msgstr "Förstärkare"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2669
+#: spa/plugins/alsa/acp/alsa-mixer.c:2738
 msgid "No Amplifier"
 msgstr "Ingen förstärkare"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2670
+#: spa/plugins/alsa/acp/alsa-mixer.c:2739
 msgid "Bass Boost"
 msgstr "Basökning"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2671
+#: spa/plugins/alsa/acp/alsa-mixer.c:2740
 msgid "No Bass Boost"
 msgstr "Ingen basökning"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2672
-#: spa/plugins/bluez5/bluez5-device.c:2152
+#: spa/plugins/alsa/acp/alsa-mixer.c:2741
+#: spa/plugins/bluez5/bluez5-device.c:2428
 msgid "Speaker"
 msgstr "Högtalare"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2673
-#: spa/plugins/alsa/acp/alsa-mixer.c:2751
+#. Don't call it "headset", the HF one has the mic
+#: spa/plugins/alsa/acp/alsa-mixer.c:2742
+#: spa/plugins/alsa/acp/alsa-mixer.c:2820
+#: spa/plugins/bluez5/bluez5-device.c:2434
+#: spa/plugins/bluez5/bluez5-device.c:2501
 msgid "Headphones"
 msgstr "Hörlurar"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2740
+#: spa/plugins/alsa/acp/alsa-mixer.c:2809
 msgid "Analog Input"
 msgstr "Analog ingång"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2744
+#: spa/plugins/alsa/acp/alsa-mixer.c:2813
 msgid "Dock Microphone"
 msgstr "Dockmikrofon"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2746
+#: spa/plugins/alsa/acp/alsa-mixer.c:2815
 msgid "Headset Microphone"
 msgstr "Headset-mikrofon"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2750
+#: spa/plugins/alsa/acp/alsa-mixer.c:2819
 msgid "Analog Output"
 msgstr "Analog utgång"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2752
+#: spa/plugins/alsa/acp/alsa-mixer.c:2821
 msgid "Headphones 2"
 msgstr "Hörlurar 2"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2753
+#: spa/plugins/alsa/acp/alsa-mixer.c:2822
 msgid "Headphones Mono Output"
 msgstr "Monoutgång för hörlurar"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2754
+#: spa/plugins/alsa/acp/alsa-mixer.c:2823
 msgid "Line Out"
 msgstr "Linje ut"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2755
+#: spa/plugins/alsa/acp/alsa-mixer.c:2824
 msgid "Analog Mono Output"
 msgstr "Analog monoutgång"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2756
+#: spa/plugins/alsa/acp/alsa-mixer.c:2825
 msgid "Speakers"
 msgstr "Högtalare"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2757
+#: spa/plugins/alsa/acp/alsa-mixer.c:2826
 msgid "HDMI / DisplayPort"
 msgstr "HDMI / DisplayPort"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2758
+#: spa/plugins/alsa/acp/alsa-mixer.c:2827
 msgid "Digital Output (S/PDIF)"
 msgstr "Digital utgång (S/PDIF)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2759
+#: spa/plugins/alsa/acp/alsa-mixer.c:2828
 msgid "Digital Input (S/PDIF)"
 msgstr "Digital ingång (S/PDIF)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2760
+#: spa/plugins/alsa/acp/alsa-mixer.c:2829
 msgid "Multichannel Input"
 msgstr "Multikanalingång"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2761
+#: spa/plugins/alsa/acp/alsa-mixer.c:2830
 msgid "Multichannel Output"
 msgstr "Multikanalutgång"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2762
+#: spa/plugins/alsa/acp/alsa-mixer.c:2831
 msgid "Game Output"
 msgstr "Spelutgång"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2763
-#: spa/plugins/alsa/acp/alsa-mixer.c:2764
+#: spa/plugins/alsa/acp/alsa-mixer.c:2832
+#: spa/plugins/alsa/acp/alsa-mixer.c:2833
 msgid "Chat Output"
 msgstr "Chatt-utgång"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2765
+#: spa/plugins/alsa/acp/alsa-mixer.c:2834
 msgid "Chat Input"
 msgstr "Chatt-ingång"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2766
+#: spa/plugins/alsa/acp/alsa-mixer.c:2835
 msgid "Virtual Surround 7.1"
 msgstr "Virtual surround 7.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4458
+#: spa/plugins/alsa/acp/alsa-mixer.c:4522
 msgid "Analog Mono"
 msgstr "Analog mono"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4459
+#: spa/plugins/alsa/acp/alsa-mixer.c:4523
 msgid "Analog Mono (Left)"
 msgstr "Analog mono (vänster)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4460
+#: spa/plugins/alsa/acp/alsa-mixer.c:4524
 msgid "Analog Mono (Right)"
 msgstr "Analog mono (höger)"
 
@@ -405,142 +454,142 @@ msgstr "Analog mono (höger)"
 #. * here would lead to the source name to become "Analog Stereo Input
 #. * Input". The same logic applies to analog-stereo-output,
 #. * multichannel-input and multichannel-output.
-#: spa/plugins/alsa/acp/alsa-mixer.c:4461
-#: spa/plugins/alsa/acp/alsa-mixer.c:4469
-#: spa/plugins/alsa/acp/alsa-mixer.c:4470
+#: spa/plugins/alsa/acp/alsa-mixer.c:4525
+#: spa/plugins/alsa/acp/alsa-mixer.c:4533
+#: spa/plugins/alsa/acp/alsa-mixer.c:4534
 msgid "Analog Stereo"
 msgstr "Analog stereo"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4462
+#: spa/plugins/alsa/acp/alsa-mixer.c:4526
 msgid "Mono"
 msgstr "Mono"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4463
+#: spa/plugins/alsa/acp/alsa-mixer.c:4527
 msgid "Stereo"
 msgstr "Stereo"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4471
-#: spa/plugins/alsa/acp/alsa-mixer.c:4629
-#: spa/plugins/bluez5/bluez5-device.c:2134
+#: spa/plugins/alsa/acp/alsa-mixer.c:4535
+#: spa/plugins/alsa/acp/alsa-mixer.c:4693
+#: spa/plugins/bluez5/bluez5-device.c:2410
 msgid "Headset"
 msgstr "Headset"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4472
-#: spa/plugins/alsa/acp/alsa-mixer.c:4630
+#: spa/plugins/alsa/acp/alsa-mixer.c:4536
+#: spa/plugins/alsa/acp/alsa-mixer.c:4694
 msgid "Speakerphone"
 msgstr "Högtalartelefon"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4473
-#: spa/plugins/alsa/acp/alsa-mixer.c:4474
+#: spa/plugins/alsa/acp/alsa-mixer.c:4537
+#: spa/plugins/alsa/acp/alsa-mixer.c:4538
 msgid "Multichannel"
 msgstr "Multikanal"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4475
+#: spa/plugins/alsa/acp/alsa-mixer.c:4539
 msgid "Analog Surround 2.1"
 msgstr "Analog surround 2.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4476
+#: spa/plugins/alsa/acp/alsa-mixer.c:4540
 msgid "Analog Surround 3.0"
 msgstr "Analog surround 3.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4477
+#: spa/plugins/alsa/acp/alsa-mixer.c:4541
 msgid "Analog Surround 3.1"
 msgstr "Analog surround 3.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4478
+#: spa/plugins/alsa/acp/alsa-mixer.c:4542
 msgid "Analog Surround 4.0"
 msgstr "Analog surround 4.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4479
+#: spa/plugins/alsa/acp/alsa-mixer.c:4543
 msgid "Analog Surround 4.1"
 msgstr "Analog surround 4.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4480
+#: spa/plugins/alsa/acp/alsa-mixer.c:4544
 msgid "Analog Surround 5.0"
 msgstr "Analog surround 5.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4481
+#: spa/plugins/alsa/acp/alsa-mixer.c:4545
 msgid "Analog Surround 5.1"
 msgstr "Analog surround 5.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4482
+#: spa/plugins/alsa/acp/alsa-mixer.c:4546
 msgid "Analog Surround 6.0"
 msgstr "Analog surround 6.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4483
+#: spa/plugins/alsa/acp/alsa-mixer.c:4547
 msgid "Analog Surround 6.1"
 msgstr "Analog surround 6.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4484
+#: spa/plugins/alsa/acp/alsa-mixer.c:4548
 msgid "Analog Surround 7.0"
 msgstr "Analog surround 7.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4485
+#: spa/plugins/alsa/acp/alsa-mixer.c:4549
 msgid "Analog Surround 7.1"
 msgstr "Analog surround 7.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4486
+#: spa/plugins/alsa/acp/alsa-mixer.c:4550
 msgid "Digital Stereo (IEC958)"
 msgstr "Digital stereo (IEC958)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4487
+#: spa/plugins/alsa/acp/alsa-mixer.c:4551
 msgid "Digital Surround 4.0 (IEC958/AC3)"
 msgstr "Digital surround 4.0 (IEC958/AC3)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4488
+#: spa/plugins/alsa/acp/alsa-mixer.c:4552
 msgid "Digital Surround 5.1 (IEC958/AC3)"
 msgstr "Digital surround 5.1 (IEC958/AC3)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4489
+#: spa/plugins/alsa/acp/alsa-mixer.c:4553
 msgid "Digital Surround 5.1 (IEC958/DTS)"
 msgstr "Digital surround 5.1 (IEC958/DTS)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4490
+#: spa/plugins/alsa/acp/alsa-mixer.c:4554
 msgid "Digital Stereo (HDMI)"
 msgstr "Digital stereo (HDMI)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4491
+#: spa/plugins/alsa/acp/alsa-mixer.c:4555
 msgid "Digital Surround 5.1 (HDMI)"
 msgstr "Digital surround 5.1 (HDMI)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4492
+#: spa/plugins/alsa/acp/alsa-mixer.c:4556
 msgid "Chat"
 msgstr "Chatt"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4493
+#: spa/plugins/alsa/acp/alsa-mixer.c:4557
 msgid "Game"
 msgstr "Spel"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4627
+#: spa/plugins/alsa/acp/alsa-mixer.c:4691
 msgid "Analog Mono Duplex"
 msgstr "Analog mono duplex"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4628
+#: spa/plugins/alsa/acp/alsa-mixer.c:4692
 msgid "Analog Stereo Duplex"
 msgstr "Analog stereo duplex"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4631
+#: spa/plugins/alsa/acp/alsa-mixer.c:4695
 msgid "Digital Stereo Duplex (IEC958)"
 msgstr "Digital stereo duplex (IEC958)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4632
+#: spa/plugins/alsa/acp/alsa-mixer.c:4696
 msgid "Multichannel Duplex"
 msgstr "Multikanalduplex"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4633
+#: spa/plugins/alsa/acp/alsa-mixer.c:4697
 msgid "Stereo Duplex"
 msgstr "Stereo duplex"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4634
+#: spa/plugins/alsa/acp/alsa-mixer.c:4698
 msgid "Mono Chat + 7.1 Surround"
 msgstr "Mono Chatt + 7.1 Surround"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4735
+#: spa/plugins/alsa/acp/alsa-mixer.c:4799
 #, c-format
 msgid "%s Output"
 msgstr "%s-utgång"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4743
+#: spa/plugins/alsa/acp/alsa-mixer.c:4807
 #, c-format
 msgid "%s Input"
 msgstr "%s-ingång"
@@ -627,116 +676,115 @@ msgstr[1] ""
 "Förmodligen är detta ett fel i ALSA-drivrutinen ”%s”. Vänligen rapportera "
 "problemet till ALSA-utvecklarna."
 
-#: spa/plugins/alsa/acp/channelmap.h:457
+#: spa/plugins/alsa/acp/channelmap.h:460
 msgid "(invalid)"
 msgstr "(ogiltig)"
 
-#: spa/plugins/alsa/acp/compat.c:193
+#: spa/plugins/alsa/acp/compat.c:194
 msgid "Built-in Audio"
 msgstr "Inbyggt ljud"
 
-#: spa/plugins/alsa/acp/compat.c:198
+#: spa/plugins/alsa/acp/compat.c:199
 msgid "Modem"
 msgstr "Modem"
 
-#: spa/plugins/bluez5/bluez5-device.c:1813
+#: spa/plugins/bluez5/bluez5-device.c:2032
 msgid "Audio Gateway (A2DP Source & HSP/HFP AG)"
 msgstr "Audio gateway (A2DP-källa & HSP/HFP AG)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1841
+#: spa/plugins/bluez5/bluez5-device.c:2061
 msgid "Audio Streaming for Hearing Aids (ASHA Sink)"
 msgstr "Ljudströmning för hörhjälpmedel (ASHA-utgång)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1881
+#: spa/plugins/bluez5/bluez5-device.c:2104
 #, c-format
 msgid "High Fidelity Playback (A2DP Sink, codec %s)"
 msgstr "High fidelity-uppspelning (A2DP-utgång, kodek %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1884
+#: spa/plugins/bluez5/bluez5-device.c:2107
 #, c-format
 msgid "High Fidelity Duplex (A2DP Source/Sink, codec %s)"
 msgstr "High fidelity duplex (A2DP-källa/utgång, kodek %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1892
+#: spa/plugins/bluez5/bluez5-device.c:2115
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "High fidelity-uppspelning (A2DP-utgång)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1894
+#: spa/plugins/bluez5/bluez5-device.c:2117
 msgid "High Fidelity Duplex (A2DP Source/Sink)"
 msgstr "High fidelity duplex (A2DP-källa/utgång)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1944
+#: spa/plugins/bluez5/bluez5-device.c:2194
 #, c-format
 msgid "High Fidelity Playback (BAP Sink, codec %s)"
 msgstr "High fidelity-uppspelning (BAP-utgång, kodek %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1949
+#: spa/plugins/bluez5/bluez5-device.c:2199
 #, c-format
 msgid "High Fidelity Input (BAP Source, codec %s)"
 msgstr "High fidelity-ingång (BAP-källa, kodek %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1953
+#: spa/plugins/bluez5/bluez5-device.c:2203
 #, c-format
 msgid "High Fidelity Duplex (BAP Source/Sink, codec %s)"
 msgstr "High fidelity duplex (BAP-källa/utgång, kodek %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1962
+#: spa/plugins/bluez5/bluez5-device.c:2212
 msgid "High Fidelity Playback (BAP Sink)"
 msgstr "High fidelity-uppspelning (BAP-utgång)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1966
+#: spa/plugins/bluez5/bluez5-device.c:2216
 msgid "High Fidelity Input (BAP Source)"
 msgstr "High fidelity-ingång (BAP-källa)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1969
+#: spa/plugins/bluez5/bluez5-device.c:2219
 msgid "High Fidelity Duplex (BAP Source/Sink)"
 msgstr "High fidelity duplex (BAP-källa/utgång)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2015
+#: spa/plugins/bluez5/bluez5-device.c:2259
 #, c-format
 msgid "Headset Head Unit (HSP/HFP, codec %s)"
 msgstr "Headset-huvudenhet (HSP/HFP, kodek %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2135
-#: spa/plugins/bluez5/bluez5-device.c:2140
-#: spa/plugins/bluez5/bluez5-device.c:2147
-#: spa/plugins/bluez5/bluez5-device.c:2153
-#: spa/plugins/bluez5/bluez5-device.c:2159
-#: spa/plugins/bluez5/bluez5-device.c:2165
-#: spa/plugins/bluez5/bluez5-device.c:2171
-#: spa/plugins/bluez5/bluez5-device.c:2177
-#: spa/plugins/bluez5/bluez5-device.c:2183
+#: spa/plugins/bluez5/bluez5-device.c:2411
+#: spa/plugins/bluez5/bluez5-device.c:2416
+#: spa/plugins/bluez5/bluez5-device.c:2423
+#: spa/plugins/bluez5/bluez5-device.c:2429
+#: spa/plugins/bluez5/bluez5-device.c:2435
+#: spa/plugins/bluez5/bluez5-device.c:2441
+#: spa/plugins/bluez5/bluez5-device.c:2447
+#: spa/plugins/bluez5/bluez5-device.c:2453
+#: spa/plugins/bluez5/bluez5-device.c:2459
 msgid "Handsfree"
 msgstr "Handsfree"
 
-#: spa/plugins/bluez5/bluez5-device.c:2141
+#: spa/plugins/bluez5/bluez5-device.c:2417
 msgid "Handsfree (HFP)"
 msgstr "Handsfree (HFP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2158
-msgid "Headphone"
-msgstr "Hörlurar"
-
-#: spa/plugins/bluez5/bluez5-device.c:2164
+#: spa/plugins/bluez5/bluez5-device.c:2440
 msgid "Portable"
 msgstr "Bärbar"
 
-#: spa/plugins/bluez5/bluez5-device.c:2170
+#: spa/plugins/bluez5/bluez5-device.c:2446
 msgid "Car"
 msgstr "Bil"
 
-#: spa/plugins/bluez5/bluez5-device.c:2176
+#: spa/plugins/bluez5/bluez5-device.c:2452
 msgid "HiFi"
 msgstr "HiFi"
 
-#: spa/plugins/bluez5/bluez5-device.c:2182
+#: spa/plugins/bluez5/bluez5-device.c:2458
 msgid "Phone"
 msgstr "Telefon"
 
-#: spa/plugins/bluez5/bluez5-device.c:2189
+#: spa/plugins/bluez5/bluez5-device.c:2465
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: spa/plugins/bluez5/bluez5-device.c:2190
-msgid "Bluetooth (HFP)"
-msgstr "Bluetooth (HFP)"
+#: spa/plugins/bluez5/bluez5-device.c:2466
+msgid "Bluetooth Handsfree"
+msgstr "Bluetooth-handsfree"
+
+#~ msgid "Headphone"
+#~ msgstr "Hörlurar"

From 5a285602e27c5e6d95c1ac14c177310e9553414c Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 23 Feb 2026 11:32:40 +0100
Subject: [PATCH 095/263] scheduler: sync-groups don't define the node runnable
 state

The sync-groups are only to group nodes with the same driver but don't
make them runnable.

This avoid making v4l2 runnable (without a link) when running ardour
because ardour uses the transport, which activates the sync group.
---
 src/modules/module-scheduler-v1.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
index 215ef0fef..0d5027cb5 100644
--- a/src/modules/module-scheduler-v1.c
+++ b/src/modules/module-scheduler-v1.c
@@ -107,7 +107,8 @@ static int ensure_state(struct pw_impl_node *node, bool running)
 }
 
 /* make a node runnable. This will automatically also make all non-passive peer nodes
- * runnable and the nodes that belong to the same groups, link_groups or sync groups
+ * runnable and the nodes that belong to the same groups or link_groups. We stop when
+ * we reach a passive port.
  *
  * We have 4 cases for the links:
  * (p) marks a passive port. we don't follow the peer from this port.
@@ -158,8 +159,10 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 				make_runnable(context, n);
 		}
 	}
-	/* now go through all the nodes that share groups, link_groups or
-	 * sync groups that are not yet runnable */
+	/* now go through all the nodes that share groups and link_groups
+	 * that are not yet runnable. We don't include sync-groups because they
+	 * are only used to group the node with a driver, not to determine the
+	 * runnable state of a node. */
 	if (node->groups != NULL || node->link_groups != NULL || sync[0] != NULL) {
 		spa_list_for_each(n, &context->node_list, link) {
 			if (n->exported || !n->active || n->runnable)
@@ -167,8 +170,7 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 			/* the other node will be scheduled with this one if it's in
 			 * the same group or link group */
 			if (pw_strv_find_common(n->groups, node->groups) < 0 &&
-			    pw_strv_find_common(n->link_groups, node->link_groups) < 0 &&
-			    pw_strv_find_common(n->sync_groups, sync) < 0)
+			    pw_strv_find_common(n->link_groups, node->link_groups) < 0)
 				continue;
 
 			make_runnable(context, n);
@@ -177,7 +179,7 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 }
 
 /* check if a node and its peer can run. They can both run if there is a non-passive
- * link between them.
+ * link between them. The passive link is between 1 or more passive ports.
  *
  * There are 4 cases:
  *
@@ -185,13 +187,14 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
  * A can not be a driver
  *
  *  A   ->   B   ==> both nodes can run
- *  A   ->p  B   ==> both nodes can run
+ *  A   ->p  B   ==> both nodes can run (B is passive so it can't activate A, but
+ *                   A can activate B)
  *  A  p->   B   ==> nodes don't run, port A is passive and doesn't activate B
  *  A  p->p  B   ==> nodes don't run
  *
- *  Once we decide the two nodes should be made runnable we cann make_runnable()
- *
- * */
+ *  Once we decide the two nodes should be made runnable we do make_runnable()
+ *  on both.
+ */
 static void check_runnable(struct pw_context *context, struct pw_impl_node *node)
 {
 	struct pw_impl_port *p;
@@ -296,14 +299,14 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node,
 				}
 			}
 		}
-		/* now go through all the nodes that have the same group and
+		/* now go through all the nodes that have the same groups and
 		 * that are not yet visited */
 		if (n->groups != NULL || n->link_groups != NULL || sync[0] != NULL) {
 			spa_list_for_each(t, &context->node_list, link) {
 				if (t->exported || t->visited)
 					continue;
 				/* the other node will be scheduled with this one if it's in
-				 * the same group or link group */
+				 * the same group, link group or sync group */
 				if (pw_strv_find_common(t->groups, n->groups) < 0 &&
 				    pw_strv_find_common(t->link_groups, n->link_groups) < 0 &&
 				    pw_strv_find_common(t->sync_groups, sync) < 0)

From 6961bfeaa1a50291adc663e5b923d9f8b06422ab Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 24 Feb 2026 15:12:43 +0100
Subject: [PATCH 096/263] examples: adapt samplerate in audio-dsp-src

Follow the graph rate to generate the sine wav instead of using a
hardcoded value.

See #5135
---
 src/examples/audio-dsp-src.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/examples/audio-dsp-src.c b/src/examples/audio-dsp-src.c
index 135d2e27e..0ef4a0e53 100644
--- a/src/examples/audio-dsp-src.c
+++ b/src/examples/audio-dsp-src.c
@@ -18,7 +18,6 @@
 
 #define M_PI_M2f (float)(M_PI+M_PI)
 
-#define DEFAULT_RATE		44100
 #define DEFAULT_FREQ		440
 #define DEFAULT_VOLUME		0.7f
 
@@ -61,7 +60,9 @@ static void on_process(void *userdata, struct spa_io_position *position)
 		return;
 
 	for (i = 0; i < n_samples; i++) {
-		out_port->accumulator += M_PI_M2f * DEFAULT_FREQ / DEFAULT_RATE;
+		out_port->accumulator += M_PI_M2f * DEFAULT_FREQ *
+			position->clock.rate.num / position->clock.rate.denom;
+
 		if (out_port->accumulator >= M_PI_M2f)
 			out_port->accumulator -= M_PI_M2f;
 

From 848ac24490683a38d15e3e921d1dd2181fccdc8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Tue, 24 Feb 2026 14:34:11 +0100
Subject: [PATCH 097/263] spa: libcamera: source: fix stop sequence

Currently it is possible for the request completion handler (`impl::requestComplete`)
to observe `impl::source.fd` while it is being modified in `impl::stop()`.

Fix that by closing the eventfd after the camera has been stopped.

Fixes: 3e28f3e8594efa ("spa: libcamera: source: rework startup sequence")
---
 spa/plugins/libcamera/libcamera-source.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spa/plugins/libcamera/libcamera-source.cpp b/spa/plugins/libcamera/libcamera-source.cpp
index f0eaa68f0..c23a6fb9d 100644
--- a/spa/plugins/libcamera/libcamera-source.cpp
+++ b/spa/plugins/libcamera/libcamera-source.cpp
@@ -184,9 +184,6 @@ struct impl {
 			0, nullptr, 0, this
 		);
 
-		if (source.fd >= 0)
-			spa_system_close(system, std::exchange(source.fd, -1));
-
 		camera->requestCompleted.disconnect(this, &impl::requestComplete);
 
 		if (int res = camera->stop(); res < 0) {
@@ -194,6 +191,9 @@ struct impl {
 					 camera->id().c_str(), spa_strerror(res));
 		}
 
+		if (source.fd >= 0)
+			spa_system_close(system, std::exchange(source.fd, -1));
+
 		completed_requests_rb = SPA_RINGBUFFER_INIT();
 		active = false;
 

From 692590b30a29acad9e8d29ab1b238f06c5732a23 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 25 Feb 2026 17:59:08 +0100
Subject: [PATCH 098/263] json: a container start also ends a bare string

This stops the parser from seeing foo{bar as a single string.

This also makes a valid test work, add another small test.
---
 spa/include/spa/utils/json-core.h | 2 +-
 test/test-spa-json.c              | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/spa/include/spa/utils/json-core.h b/spa/include/spa/utils/json-core.h
index 5616bffe1..aa36e2d51 100644
--- a/spa/include/spa/utils/json-core.h
+++ b/spa/include/spa/utils/json-core.h
@@ -232,7 +232,7 @@ SPA_API_JSON int spa_json_next(struct spa_json * iter, const char **value)
 			switch (cur) {
 			case '\0':
 			case '\t': case ' ': case '\r': case '\n':
-			case '"': case '#':
+			case '"': case '#': case '{': case '[':
 			case ':': case ',': case '=': case ']': case '}':
 				iter->state = __STRUCT | flag;
 				if (iter->depth > 0)
diff --git a/test/test-spa-json.c b/test/test-spa-json.c
index 0c3c46f59..75fde8d38 100644
--- a/test/test-spa-json.c
+++ b/test/test-spa-json.c
@@ -350,6 +350,12 @@ PWTEST(json_parse)
 	expect_string(&it[0], "hello");
 	expect_end(&it[0]);
 
+	json = "xy{}";
+	spa_json_init(&it[0], json, strlen(json));
+	expect_string_or_bare(&it[0], "xy");
+	expect_object(&it[0], &it[1]);
+	expect_end(&it[0]);
+
 	/* top-level context */
 	json = "x y x y";
 	spa_json_init(&it[0], json, strlen(json));
@@ -944,6 +950,7 @@ PWTEST(json_data)
 		"n_array_missing_value.json",
 		"n_array_number_and_comma.json",
 		"n_array_number_and_several_commas.json",
+		"n_array_inner_array_no_comma.json",
 		"n_object_comma_instead_of_colon.json",
 		"n_object_double_colon.json",
 		"n_object_missing_semicolon.json",

From 6753c51ab8db14fd8e359f519678035968f73f14 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 26 Feb 2026 10:48:53 +0100
Subject: [PATCH 099/263] spa: add a new json-builder helper

It keeps track of the json bits like commas and indentation, supports
colors and recursive reformatting. It also supports a simple mode that
implements the SPA syntax.
---
 spa/include/spa/utils/json-builder.h | 440 +++++++++++++++++++++++++++
 spa/include/spa/utils/json-core.h    |  44 +++
 2 files changed, 484 insertions(+)
 create mode 100644 spa/include/spa/utils/json-builder.h

diff --git a/spa/include/spa/utils/json-builder.h b/spa/include/spa/utils/json-builder.h
new file mode 100644
index 000000000..554136b90
--- /dev/null
+++ b/spa/include/spa/utils/json-builder.h
@@ -0,0 +1,440 @@
+/* Simple Plugin API */
+/* SPDX-FileCopyrightText: Copyright © 2026 Wim Taymans */
+/* SPDX-License-Identifier: MIT */
+
+#ifndef SPA_UTILS_JSON_BUILDER_H
+#define SPA_UTILS_JSON_BUILDER_H
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <math.h>
+#include <float.h>
+#include <inttypes.h>
+#include <limits.h>
+
+#include <spa/utils/defs.h>
+#include <spa/utils/ansi.h>
+#include <spa/utils/json.h>
+
+#ifdef __cplusplus
+extern "C" {
+#else
+#include <stdbool.h>
+#endif
+
+#ifndef SPA_API_JSON_BUILDER
+ #ifdef SPA_API_IMPL
+  #define SPA_API_JSON_BUILDER SPA_API_IMPL
+ #else
+  #define SPA_API_JSON_BUILDER static inline
+ #endif
+#endif
+
+/** \defgroup spa_json_builder JSON builder
+ * JSON builder functions
+ */
+
+/**
+ * \addtogroup spa_json_builder
+ * \{
+ */
+
+struct spa_json_builder {
+	FILE *f;
+#define SPA_JSON_BUILDER_FLAG_CLOSE	(1<<0)
+#define SPA_JSON_BUILDER_FLAG_INDENT	(1<<1)
+#define SPA_JSON_BUILDER_FLAG_SPACE	(1<<2)
+#define SPA_JSON_BUILDER_FLAG_PRETTY	(SPA_JSON_BUILDER_FLAG_INDENT|SPA_JSON_BUILDER_FLAG_SPACE)
+#define SPA_JSON_BUILDER_FLAG_COLOR	(1<<3)
+#define SPA_JSON_BUILDER_FLAG_SIMPLE	(1<<4)
+	uint32_t flags;
+	uint32_t indent_off;
+	uint32_t level;
+	uint32_t indent;
+	uint32_t count;
+	const char *delim;
+	const char *comma;
+	const char *key_sep;
+#define SPA_JSON_BUILDER_COLOR_NORMAL		0
+#define SPA_JSON_BUILDER_COLOR_KEY		1
+#define SPA_JSON_BUILDER_COLOR_LITERAL		2
+#define SPA_JSON_BUILDER_COLOR_NUMBER		3
+#define SPA_JSON_BUILDER_COLOR_STRING		4
+#define SPA_JSON_BUILDER_COLOR_CONTAINER	5
+	const char *color[8];
+};
+
+SPA_API_JSON_BUILDER int spa_json_builder_file(struct spa_json_builder *b, FILE *f, uint32_t flags)
+{
+	bool color = flags & SPA_JSON_BUILDER_FLAG_COLOR;
+	bool simple = flags & SPA_JSON_BUILDER_FLAG_SIMPLE;
+	bool space = flags & SPA_JSON_BUILDER_FLAG_SPACE;
+	b->f = f;
+	b->flags = flags;
+	b->level = 0;
+	b->indent_off = 0;
+	b->indent = 2;
+	b->count = 0;
+	b->delim = "";
+	b->comma = simple ? space ? "" : " " : ",";
+	b->key_sep = simple ? space ? " =" : "=" : ":";
+	b->color[0] = (color ? SPA_ANSI_RESET : "");
+	b->color[1] = (color ? SPA_ANSI_BRIGHT_BLUE : "");
+	b->color[2] = (color ? SPA_ANSI_BRIGHT_MAGENTA : "");
+	b->color[3] = (color ? SPA_ANSI_BRIGHT_CYAN : "");
+	b->color[4] = (color ? SPA_ANSI_BRIGHT_GREEN : "");
+	b->color[5] = (color ? SPA_ANSI_BRIGHT_YELLOW : "");
+	return 0;
+}
+
+SPA_API_JSON_BUILDER int spa_json_builder_memstream(struct spa_json_builder *b,
+		char **mem, size_t *size, uint32_t flags)
+{
+	FILE *f;
+	if ((f = open_memstream(mem, size)) == NULL)
+		return -errno;
+	return spa_json_builder_file(b, f, flags | SPA_JSON_BUILDER_FLAG_CLOSE);
+}
+
+SPA_API_JSON_BUILDER int spa_json_builder_membuf(struct spa_json_builder *b,
+		char *mem, size_t size, uint32_t flags)
+{
+	FILE *f;
+	if ((f = fmemopen(mem, size, "w")) == NULL)
+		return -errno;
+	return spa_json_builder_file(b, f, flags | SPA_JSON_BUILDER_FLAG_CLOSE);
+}
+
+SPA_API_JSON_BUILDER void spa_json_builder_close(struct spa_json_builder *b)
+{
+	if (b->flags & SPA_JSON_BUILDER_FLAG_CLOSE)
+		fclose(b->f);
+}
+
+SPA_API_JSON_BUILDER int spa_json_builder_encode_string(struct spa_json_builder *b,
+		bool raw, const char *before, const char *val, int size, const char *after)
+{
+	FILE *f = b->f;
+	int i, len;
+	if (raw) {
+		len = fprintf(f, "%s%.*s%s", before, size, val, after) - 1;
+	} else {
+		len = fprintf(f, "%s\"", before);
+		for (i = 0; i < size && val[i]; i++) {
+			char v = val[i];
+			switch (v) {
+			case '\n': len += fprintf(f, "\\n"); break;
+			case '\r': len += fprintf(f, "\\r"); break;
+			case '\b': len += fprintf(f, "\\b"); break;
+			case '\t': len += fprintf(f, "\\t"); break;
+			case '\f': len += fprintf(f, "\\f"); break;
+			case '\\':
+			case '"': len += fprintf(f, "\\%c", v); break;
+			default:
+				if (v > 0 && v < 0x20)
+					len += fprintf(f, "\\u%04x", v);
+				else
+					len += fprintf(f, "%c", v);
+				break;
+			}
+		}
+		len += fprintf(f, "\"%s", after);
+	}
+	return len-1;
+}
+
+SPA_API_JSON_BUILDER
+void spa_json_builder_add_simple(struct spa_json_builder *b, const char *key, int key_len,
+		char type, const char *val, int val_len)
+{
+	bool indent = b->indent_off == 0 && (b->flags & SPA_JSON_BUILDER_FLAG_INDENT);
+	bool space = b->flags & SPA_JSON_BUILDER_FLAG_SPACE;
+	bool raw = true, simple = b->flags & SPA_JSON_BUILDER_FLAG_SIMPLE;
+	int color;
+
+	if (val == NULL || val_len == 0) {
+		val = "null";
+		val_len = 4;
+		type = 'l';
+	}
+	if (type == 0) {
+		if (spa_json_is_container(val, val_len))
+			type = simple ? 'C' : 'S';
+		else if (val_len > 0 && (*val == '}'  || *val == ']'))
+			type = 'e';
+		else if (spa_json_is_null(val, val_len) ||
+			 spa_json_is_bool(val, val_len))
+			type = 'l';
+		else if (spa_json_is_float(val, val_len) ||
+			 spa_json_is_int(val, val_len))
+			type = 'd';
+		else if (spa_json_is_string(val, val_len))
+			type = 's';
+		else
+			type = 'S';
+	}
+	switch (type) {
+	case 'e':
+		b->level -= b->indent;
+		b->delim = "";
+		break;
+	}
+
+	fprintf(b->f, "%s%s%*s", b->delim, indent ? b->count == 0 ? "" : "\n" : space ? " " : "",
+			indent ? b->level : 0, "");
+	if (key) {
+		bool key_raw = (simple && spa_json_make_simple_string(&key, &key_len)) ||
+					spa_json_is_string(key, key_len);
+		spa_json_builder_encode_string(b, key_raw,
+				b->color[1], key, key_len, b->color[0]);
+		fprintf(b->f, "%s%s", b->key_sep, space ? " " : "");
+	}
+	b->delim = b->comma;
+	switch (type) {
+	case 'c':
+		color = SPA_JSON_BUILDER_COLOR_NORMAL;
+		val_len = 1;
+		b->delim = "";
+		b->level += b->indent;
+		if (val[1] == '-') b->indent_off++;
+		break;
+	case 'e':
+		color = SPA_JSON_BUILDER_COLOR_NORMAL;
+		val_len = 1;
+		if (val[1] == '-') b->indent_off--;
+		break;
+	case 'l':
+		color = SPA_JSON_BUILDER_COLOR_LITERAL;
+		break;
+	case 'd':
+		color = SPA_JSON_BUILDER_COLOR_NUMBER;
+		break;
+	case 's':
+		color = SPA_JSON_BUILDER_COLOR_STRING;
+		break;
+	case 'C':
+		color = SPA_JSON_BUILDER_COLOR_CONTAINER;
+		break;
+	default:
+		color = SPA_JSON_BUILDER_COLOR_STRING;
+		raw = simple && spa_json_make_simple_string(&val, &val_len);
+		break;
+	}
+	spa_json_builder_encode_string(b, raw, b->color[color], val, val_len, b->color[0]);
+	b->count++;
+}
+
+SPA_API_JSON_BUILDER void spa_json_builder_object_push(struct spa_json_builder *b,
+		const char *key, const char *val)
+{
+	spa_json_builder_add_simple(b, key, INT_MAX, 'c', val, INT_MAX);
+}
+SPA_API_JSON_BUILDER void spa_json_builder_pop(struct spa_json_builder *b,
+		const char *val)
+{
+	spa_json_builder_add_simple(b, NULL, 0, 'e', val, INT_MAX);
+}
+SPA_API_JSON_BUILDER void spa_json_builder_object_null(struct spa_json_builder *b,
+		const char *key)
+{
+	spa_json_builder_add_simple(b, key, INT_MAX, 'l', "null", 4);
+}
+SPA_API_JSON_BUILDER void spa_json_builder_object_bool(struct spa_json_builder *b,
+		const char *key, bool val)
+{
+	spa_json_builder_add_simple(b, key, INT_MAX, 'l', val ? "true" : "false", INT_MAX);
+}
+SPA_API_JSON_BUILDER void spa_json_builder_object_int(struct spa_json_builder *b,
+		const char *key, int64_t val)
+{
+	char str[128];
+	snprintf(str, sizeof(str), "%" PRIi64, val);
+	spa_json_builder_add_simple(b, key, INT_MAX, 'd', str, INT_MAX);
+}
+SPA_API_JSON_BUILDER void spa_json_builder_object_uint(struct spa_json_builder *b,
+		const char *key, uint64_t val)
+{
+	char str[128];
+	snprintf(str, sizeof(str), "%" PRIu64, val);
+	spa_json_builder_add_simple(b, key, INT_MAX, 'd', str, INT_MAX);
+}
+
+SPA_API_JSON_BUILDER void spa_json_builder_object_double(struct spa_json_builder *b,
+		const char *key, double val)
+{
+	char str[64];
+	spa_json_format_float(str, sizeof(str), (float)val);
+	spa_json_builder_add_simple(b, key, INT_MAX, 'd', str, INT_MAX);
+}
+
+SPA_API_JSON_BUILDER void spa_json_builder_object_string(struct spa_json_builder *b,
+		const char *key, const char *val)
+{
+	spa_json_builder_add_simple(b, key, INT_MAX, 'S', val, INT_MAX);
+}
+SPA_API_JSON_BUILDER SPA_PRINTF_FUNC(3,0)
+void spa_json_builder_object_stringv(struct spa_json_builder *b,
+		const char *key, const char *fmt, va_list va)
+{
+	char *val;
+	vasprintf(&val, fmt, va);
+	spa_json_builder_object_string(b, key, val);
+	free(val);
+}
+
+SPA_API_JSON_BUILDER SPA_PRINTF_FUNC(3,4)
+void spa_json_builder_object_stringf(struct spa_json_builder *b,
+		const char *key, const char *fmt, ...)
+{
+	va_list va;
+	va_start(va, fmt);
+	spa_json_builder_object_stringv(b, key, fmt, va);
+	va_end(va);
+}
+
+SPA_API_JSON_BUILDER void spa_json_builder_object_value_iter(struct spa_json_builder *b,
+		struct spa_json *it, const char *key, int key_len, const char *val, int len)
+{
+	struct spa_json sub;
+	if (spa_json_is_array(val, len)) {
+		spa_json_builder_add_simple(b, key, key_len, 'c', "[", 1);
+		spa_json_enter(it, &sub);
+		while ((len = spa_json_next(&sub, &val)) > 0)
+			spa_json_builder_object_value_iter(b, &sub, NULL, 0, val, len);
+		spa_json_builder_pop(b, "]");
+	}
+	else if (spa_json_is_object(val, len)) {
+		const char *k;
+		int kl;
+		spa_json_builder_add_simple(b, key, key_len, 'c', "{", 1);
+		spa_json_enter(it, &sub);
+		while ((kl = spa_json_next(&sub, &k)) > 0) {
+			if ((len = spa_json_next(&sub, &val)) < 0)
+				break;
+			spa_json_builder_object_value_iter(b, &sub, k, kl, val, len);
+		}
+		spa_json_builder_pop(b, "}");
+	}
+	else {
+		spa_json_builder_add_simple(b, key, key_len, 0, val, len);
+	}
+}
+SPA_API_JSON_BUILDER void spa_json_builder_object_value_full(struct spa_json_builder *b,
+		bool recurse, const char *key, int key_len, const char *val, int val_len)
+{
+	if (!recurse || val == NULL) {
+		spa_json_builder_add_simple(b, key, key_len, 0, val, val_len);
+	} else  {
+		struct spa_json it[1];
+		const char *v;
+		if (spa_json_begin(&it[0], val, val_len, &v) >= 0)
+			spa_json_builder_object_value_iter(b, &it[0], key, key_len, val, val_len);
+	}
+}
+SPA_API_JSON_BUILDER void spa_json_builder_object_value(struct spa_json_builder *b,
+		bool recurse, const char *key, const char *val)
+{
+	spa_json_builder_object_value_full(b, recurse, key, key ? strlen(key) : 0,
+			val, val ? strlen(val) : 0);
+}
+SPA_API_JSON_BUILDER SPA_PRINTF_FUNC(4,5)
+void spa_json_builder_object_valuef(struct spa_json_builder *b,
+		bool recurse, const char *key, const char *fmt, ...)
+{
+	va_list va;
+	char *val;
+	va_start(va, fmt);
+	vasprintf(&val, fmt, va);
+	va_end(va);
+	spa_json_builder_object_value(b, recurse, key, val);
+	free(val);
+}
+
+
+/* array functions */
+SPA_API_JSON_BUILDER void spa_json_builder_array_push(struct spa_json_builder *b,
+		const char *val)
+{
+	spa_json_builder_object_push(b, NULL, val);
+}
+SPA_API_JSON_BUILDER void spa_json_builder_array_null(struct spa_json_builder *b)
+{
+	spa_json_builder_object_null(b, NULL);
+}
+SPA_API_JSON_BUILDER void spa_json_builder_array_bool(struct spa_json_builder *b,
+		bool val)
+{
+	spa_json_builder_object_bool(b, NULL, val);
+}
+SPA_API_JSON_BUILDER void spa_json_builder_array_int(struct spa_json_builder *b,
+		int64_t val)
+{
+	spa_json_builder_object_int(b, NULL, val);
+}
+SPA_API_JSON_BUILDER void spa_json_builder_array_uint(struct spa_json_builder *b,
+		uint64_t val)
+{
+	spa_json_builder_object_uint(b, NULL, val);
+}
+SPA_API_JSON_BUILDER void spa_json_builder_array_double(struct spa_json_builder *b,
+		double val)
+{
+	spa_json_builder_object_double(b, NULL, val);
+}
+SPA_API_JSON_BUILDER void spa_json_builder_array_string(struct spa_json_builder *b,
+		const char *val)
+{
+	spa_json_builder_object_string(b, NULL, val);
+}
+SPA_API_JSON_BUILDER SPA_PRINTF_FUNC(2,3)
+void spa_json_builder_array_stringf(struct spa_json_builder *b,
+		const char *fmt, ...)
+{
+	va_list va;
+	va_start(va, fmt);
+	spa_json_builder_object_stringv(b, NULL, fmt, va);
+	va_end(va);
+}
+SPA_API_JSON_BUILDER void spa_json_builder_array_value(struct spa_json_builder *b,
+		bool recurse, const char *val)
+{
+	spa_json_builder_object_value(b, recurse, NULL, val);
+}
+SPA_API_JSON_BUILDER SPA_PRINTF_FUNC(3,4)
+void spa_json_builder_array_valuef(struct spa_json_builder *b, bool recurse, const char *fmt, ...)
+{
+	va_list va;
+	char *val;
+	va_start(va, fmt);
+	vasprintf(&val, fmt, va);
+	va_end(va);
+	spa_json_builder_object_value(b, recurse, NULL, val);
+	free(val);
+}
+
+SPA_API_JSON_BUILDER char *spa_json_builder_reformat(const char *json, uint32_t flags)
+{
+	struct spa_json_builder b;
+	char *mem;
+	size_t size;
+	int res;
+	if ((res = spa_json_builder_memstream(&b, &mem, &size, flags)) < 0) {
+		errno = -res;
+		return NULL;
+	}
+	spa_json_builder_array_value(&b, true, json);
+	spa_json_builder_close(&b);
+	return mem;
+}
+
+/**
+ * \}
+ */
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* SPA_UTILS_JSON_BUILDER_H */
diff --git a/spa/include/spa/utils/json-core.h b/spa/include/spa/utils/json-core.h
index aa36e2d51..eed208db6 100644
--- a/spa/include/spa/utils/json-core.h
+++ b/spa/include/spa/utils/json-core.h
@@ -399,6 +399,10 @@ SPA_API_JSON int spa_json_is_container(const char *val, int len)
 {
 	return len > 0 && (*val == '{'  || *val == '[');
 }
+SPA_API_JSON int spa_json_is_container_end(const char *val, int len)
+{
+	return len > 0 && (*val == '}'  || *val == '}');
+}
 
 /* object */
 SPA_API_JSON int spa_json_is_object(const char *val, int len)
@@ -510,6 +514,46 @@ SPA_API_JSON bool spa_json_is_string(const char *val, int len)
 {
 	return len > 1 && *val == '"';
 }
+SPA_API_JSON bool spa_json_is_simple_string(const char *val, int size)
+{
+	int i;
+	static const char *REJECT = "\"\\'=:,{}[]()#";
+	for (i = 0; i < size && val[i]; i++) {
+		if (val[i] <= 0x20 || strchr(REJECT, val[i]) != NULL)
+			return false;
+	}
+	return true;
+}
+SPA_API_JSON bool spa_json_make_simple_string(const char **val, int *len)
+{
+	int i, l = *len;
+	const char *v = *val;
+	static const char *REJECT = "\"\\'=:,{}[]()#";
+	int trimmed = 0, bad = 0;
+	for (i = 0; i < l && v[i]; i++) {
+		if (i == 0 && v[0] == '\"')
+			trimmed++;
+		else if ((i+1 == l || !v[i+1]) && v[i] == '\"')
+			trimmed++;
+		else if (v[i] <= 0x20 || strchr(REJECT, v[i]) != NULL)
+			bad++;
+	}
+	if (trimmed == 0 && bad == 0 && i > 0)
+		return true;
+	else if (trimmed == 2) {
+		if (bad == 0 && i > 2 &&
+		    !spa_json_is_null(&v[1], i-2) &&
+		    !spa_json_is_bool(&v[1], i-2) &&
+		    !spa_json_is_float(&v[1], i-2) &&
+		    !spa_json_is_container(&v[1], i-2) &&
+		    !spa_json_is_container_end(&v[1], i-2)) {
+			(*len) = i-2;
+			(*val)++;
+		}
+		return true;
+	}
+	return false;
+}
 
 SPA_API_JSON int spa_json_parse_hex(const char *p, int num, uint32_t *res)
 {

From ed361a856fad425ca3d4e98988f5fa10cb03fcf7 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 26 Feb 2026 10:51:17 +0100
Subject: [PATCH 100/263] tools: port various tools to the new json-builder

Remove custom json serialization code and use the new json-builder
from various tools.

spa-json-dump now has color and raw mode and can probably be simplified
a bit more.

The properties can now serialize arbitrarily large keys, which makes
a unit test work. It also has a new 'simple' option for SPA output,
which is added and used in pw-config.
---
 spa/tools/spa-json-dump.c | 164 ++++++---------
 src/pipewire/properties.c | 158 ++------------
 src/pipewire/properties.h |   1 +
 src/tools/pw-config.c     |  12 +-
 src/tools/pw-dump.c       | 420 +++++++++++++-------------------------
 test/test-properties.c    |   2 +-
 6 files changed, 230 insertions(+), 527 deletions(-)

diff --git a/spa/tools/spa-json-dump.c b/spa/tools/spa-json-dump.c
index ee3b42da7..ed81330d4 100644
--- a/spa/tools/spa-json-dump.c
+++ b/spa/tools/spa-json-dump.c
@@ -15,27 +15,28 @@
 
 #include <spa/utils/result.h>
 #include <spa/utils/json.h>
+#include <spa/utils/json-builder.h>
 #include <spa/debug/file.h>
 
 #define DEFAULT_INDENT	2
 
 struct data {
 	const char *filename;
-	FILE *file;
+
+	FILE *out;
+	struct spa_json_builder builder;
 
 	void *data;
 	size_t size;
-
-	int indent;
-	bool simple_string;
-	const char *comma;
-	const char *key_sep;
 };
 
-#define OPTIONS		"hi:s"
+#define OPTIONS		"hNC:Ri:s"
 static const struct option long_options[] = {
 	{ "help",	no_argument,		NULL, 'h'},
 
+	{ "no-colors",	no_argument,		NULL, 'N' },
+	{ "color",	optional_argument,	NULL, 'C' },
+	{ "raw",	no_argument,		NULL, 'R' },
 	{ "indent",	required_argument,	NULL, 'i' },
 	{ "spa",	no_argument,		NULL, 's' },
 
@@ -53,72 +54,21 @@ static void show_usage(struct data *d, const char *name, bool is_error)
 		"  -h, --help                            Show this help\n"
 		"\n");
 	fprintf(fp,
+		"  -N, --no-colors                       disable color output\n"
+		"  -C, --color[=WHEN]                    whether to enable color support. WHEN is `never`, `always`, or `auto`\n"
+		"  -R, --raw                             force raw output\n"
 		"  -i  --indent                          set indent (default %d)\n"
 		"  -s  --spa                             use simplified SPA JSON\n"
 		"\n",
 		DEFAULT_INDENT);
 }
 
-#define REJECT	"\"\\'=:,{}[]()#"
-
-static bool is_simple_string(const char *val, int len)
+static int dump(struct data *d, struct spa_json *it, const char *key, const char *value, int len)
 {
-	int i;
-	for (i = 0; i < len; i++) {
-		if (val[i] < 0x20 || strchr(REJECT, val[i]) != NULL)
-			return false;
-	}
-	return true;
-}
-
-static void encode_string(struct data *d, const char *val, int len)
-{
-	FILE *f = d->file;
-	int i;
-	if (d->simple_string && is_simple_string(val, len)) {
-		fprintf(f, "%.*s", len, val);
-		return;
-	}
-	fprintf(f, "\"");
-	for (i = 0; i < len; i++) {
-		char v = val[i];
-		switch (v) {
-		case '\n':
-			fprintf(f, "\\n");
-			break;
-		case '\r':
-			fprintf(f, "\\r");
-			break;
-		case '\b':
-			fprintf(f, "\\b");
-			break;
-		case '\t':
-			fprintf(f, "\\t");
-			break;
-		case '\f':
-			fprintf(f, "\\f");
-			break;
-		case '\\': case '"':
-			fprintf(f, "\\%c", v);
-			break;
-		default:
-			if (v > 0 && v < 0x20)
-				fprintf(f, "\\u%04x", v);
-			else
-				fprintf(f, "%c", v);
-			break;
-		}
-	}
-	fprintf(f, "\"");
-}
-
-static int dump(struct data *d, int indent, struct spa_json *it, const char *value, int len)
-{
-	FILE *file = d->file;
+	struct spa_json_builder *b = &d->builder;
 	struct spa_json sub;
 	bool toplevel = false;
-	int count = 0, res;
-	char key[1024];
+	int res;
 
 	if (!value) {
 		toplevel = true;
@@ -127,29 +77,22 @@ static int dump(struct data *d, int indent, struct spa_json *it, const char *val
 	}
 
 	if (spa_json_is_array(value, len)) {
-		fprintf(file, "[");
+		spa_json_builder_object_push(b, key, "[");
 		spa_json_enter(it, &sub);
 		while ((len = spa_json_next(&sub, &value)) > 0) {
-			fprintf(file, "%s\n%*s", count++ > 0 ? d->comma : "",
-					indent+d->indent, "");
-			if ((res = dump(d, indent+d->indent, &sub, value, len)) < 0)
+			if ((res = dump(d, &sub, NULL, value, len)) < 0)
 				return res;
 		}
-		fprintf(file, "%s%*s]", count > 0 ? "\n" : "",
-				count > 0 ? indent : 0, "");
+		spa_json_builder_pop(b, "]");
 	} else if (spa_json_is_object(value, len)) {
-		fprintf(file, "{");
+		char k[1024];
+		spa_json_builder_object_push(b, key, "{");
 		if (!toplevel)
 			spa_json_enter(it, &sub);
 		else
 			sub = *it;
-		while ((len = spa_json_object_next(&sub, key, sizeof(key), &value)) > 0) {
-			fprintf(file, "%s\n%*s",
-					count++ > 0 ? d->comma : "",
-					indent+d->indent, "");
-			encode_string(d, key, strlen(key));
-			fprintf(file, "%s ", d->key_sep);
-			res = dump(d, indent+d->indent, &sub, value, len);
+		while ((len = spa_json_object_next(&sub, k, sizeof(k), &value)) > 0) {
+			res = dump(d, &sub, k, value, len);
 			if (res < 0) {
 				if (toplevel)
 					*it = sub;
@@ -158,18 +101,10 @@ static int dump(struct data *d, int indent, struct spa_json *it, const char *val
 		}
 		if (toplevel)
 			*it = sub;
-		fprintf(file, "%s%*s}", count > 0 ? "\n" : "",
-				count > 0 ? indent : 0, "");
-	} else if (spa_json_is_string(value, len) ||
-	    spa_json_is_null(value, len) ||
-	    spa_json_is_bool(value, len) ||
-	    spa_json_is_int(value, len) ||
-	    spa_json_is_float(value, len)) {
-		fprintf(file, "%.*s", len, value);
+		spa_json_builder_pop(b, "}");
 	} else {
-		encode_string(d, value, len);
+		spa_json_builder_add_simple(b, key, INT_MAX, 0, value, len);
 	}
-
 	if (spa_json_get_error(it, NULL, NULL))
 		return -EINVAL;
 
@@ -192,12 +127,12 @@ static int process_json(struct data *d)
 		len = 0;
 	}
 
-	res = dump(d, 0, &it, value, len);
+	res = dump(d, &it, NULL, value, len);
 	if (spa_json_next(&it, &value) < 0)
 		res = -EINVAL;
 
-	fprintf(d->file, "\n");
-	fflush(d->file);
+	fprintf(d->builder.f, "\n");
+	fflush(d->builder.f);
 
 	if (res < 0) {
 		struct spa_error_location loc;
@@ -257,30 +192,50 @@ int main(int argc, char *argv[])
 	int c;
 	int longopt_index = 0;
 	int fd, res, exit_code = EXIT_FAILURE;
+	int flags = 0, indent = -1;
 	struct data d;
 	struct stat sbuf;
+	bool raw = false, colors = false;
 
 	spa_zero(d);
-	d.file = stdout;
 
 	d.filename = "-";
-	d.simple_string = false;
-	d.comma = ",";
-	d.key_sep = ":";
-	d.indent = DEFAULT_INDENT;
+	d.out = stdout;
+
+	if (getenv("NO_COLOR") == NULL && isatty(fileno(d.out)))
+		colors = true;
+	setlinebuf(d.out);
 
 	while ((c = getopt_long(argc, argv, OPTIONS, long_options, &longopt_index)) != -1) {
 		switch (c) {
 		case 'h' :
 			show_usage(&d, argv[0], false);
 			return 0;
+		case 'N' :
+			colors = false;
+			break;
+		case 'C' :
+			if (optarg == NULL || !strcmp(optarg, "auto"))
+				break; /* nothing to do, tty detection was done
+					  before parsing options */
+			else if (!strcmp(optarg, "never"))
+				colors = false;
+			else if (!strcmp(optarg, "always"))
+				colors = true;
+			else {
+				fprintf(stderr, "Unknown color: %s\n", optarg);
+				show_usage(&d, argv[0], true);
+				return -1;
+			}
+			break;
+		case 'R':
+			raw = true;
+			break;
 		case 'i':
-			d.indent = atoi(optarg);
+			indent = atoi(optarg);
 			break;
 		case 's':
-			d.simple_string = true;
-			d.comma = "";
-			d.key_sep = " =";
+			flags |= SPA_JSON_BUILDER_FLAG_SIMPLE;
 			break;
 		default:
 			show_usage(&d, argv[0], true);
@@ -308,6 +263,15 @@ int main(int argc, char *argv[])
 	}
 	d.size = sbuf.st_size;
 
+	if (!raw)
+		flags |= SPA_JSON_BUILDER_FLAG_PRETTY;
+	if (colors)
+		flags |= SPA_JSON_BUILDER_FLAG_COLOR;
+
+	spa_json_builder_file(&d.builder, d.out, flags);
+	if (indent >= 0)
+		d.builder.indent = indent;
+
 	res = process_json(&d);
 	if (res < 0)
 		exit_code = EXIT_FAILURE;
diff --git a/src/pipewire/properties.c b/src/pipewire/properties.c
index ac0aac0d0..3d7686f7a 100644
--- a/src/pipewire/properties.c
+++ b/src/pipewire/properties.c
@@ -6,7 +6,7 @@
 #include <stdarg.h>
 
 #include <spa/utils/ansi.h>
-#include <spa/utils/json.h>
+#include <spa/utils/json-builder.h>
 #include <spa/utils/string.h>
 #include <spa/utils/cleanup.h>
 #include <spa/utils/result.h>
@@ -800,156 +800,32 @@ const char *pw_properties_iterate(const struct pw_properties *properties, void *
 	return pw_array_get_unchecked(&impl->items, index, struct spa_dict_item)->key;
 }
 
-#define NORMAL(c)	((c)->colors ? SPA_ANSI_RESET : "")
-#define LITERAL(c)	((c)->colors ? SPA_ANSI_BRIGHT_MAGENTA : "")
-#define NUMBER(c)	((c)->colors ? SPA_ANSI_BRIGHT_CYAN : "")
-#define STRING(c)	((c)->colors ? SPA_ANSI_BRIGHT_GREEN : "")
-#define KEY(c)		((c)->colors ? SPA_ANSI_BRIGHT_BLUE : "")
-#define CONTAINER(c)	((c)->colors ? SPA_ANSI_BRIGHT_YELLOW : "")
-
-struct dump_config {
-	FILE *file;
-	int indent;
-	const char *sep;
-	bool colors;
-	bool recurse;
-};
-
-static int encode_string(struct dump_config *c, const char *before,
-		const char *val, int size, const char *after)
-{
-	FILE *f = c->file;
-	int i, len = 0;
-	len += fprintf(f, "%s\"", before);
-	for (i = 0; i < size; i++) {
-		char v = val[i];
-		switch (v) {
-		case '\n':
-			len += fprintf(f, "\\n");
-			break;
-		case '\r':
-			len += fprintf(f, "\\r");
-			break;
-		case '\b':
-			len += fprintf(f, "\\b");
-			break;
-		case '\t':
-			len += fprintf(f, "\\t");
-			break;
-		case '\f':
-			len += fprintf(f, "\\f");
-			break;
-		case '\\': case '"':
-			len += fprintf(f, "\\%c", v);
-			break;
-		default:
-			if (v > 0 && v < 0x20)
-				len += fprintf(f, "\\u%04x", v);
-			else
-				len += fprintf(f, "%c", v);
-			break;
-		}
-	}
-	len += fprintf(f, "\"%s", after);
-	return len-1;
-}
-
-static int dump(struct dump_config *c, int indent, struct spa_json *it, const char *value, int len)
-{
-	FILE *file = c->file;
-	struct spa_json sub;
-	int count = 0;
-	char key[1024];
-
-	if (value == NULL || len == 0) {
-		fprintf(file, "%snull%s", LITERAL(c), NORMAL(c));
-	} else if (spa_json_is_container(value, len) && !c->recurse) {
-		spa_json_enter_container(it, &sub, value[0]);
-		if (spa_json_container_len(&sub, value, len) == len)
-			fprintf(file, "%s%.*s%s", CONTAINER(c), len, value, NORMAL(c));
-		else
-			encode_string(c, STRING(c), value, len, NORMAL(c));
-	} else if (spa_json_is_array(value, len)) {
-		fprintf(file, "[");
-		spa_json_enter(it, &sub);
-		indent += c->indent;
-		while ((len = spa_json_next(&sub, &value)) > 0) {
-			fprintf(file, "%s%s%*s", count++ > 0 ? "," : "",
-					c->sep, indent, "");
-			dump(c, indent, &sub, value, len);
-		}
-		indent -= c->indent;
-		fprintf(file, "%s%*s]", count > 0 ? c->sep : "",
-				count > 0 ? indent : 0, "");
-	} else if (spa_json_is_object(value, len)) {
-		fprintf(file, "{");
-		spa_json_enter(it, &sub);
-		indent += c->indent;
-		while ((len = spa_json_object_next(&sub, key, sizeof(key), &value)) > 0) {
-			fprintf(file, "%s%s%*s",
-					count++ > 0 ? "," : "",
-					c->sep, indent, "");
-			encode_string(c, KEY(c), key, strlen(key), NORMAL(c));
-			fprintf(file, ": ");
-			dump(c, indent, &sub, value, len);
-		}
-		indent -= c->indent;
-		fprintf(file, "%s%*s}", count > 0 ? c->sep : "",
-				count > 0 ? indent : 0, "");
-	} else if (spa_json_is_null(value, len) ||
-	    spa_json_is_bool(value, len)) {
-		fprintf(file, "%s%.*s%s", LITERAL(c), len, value, NORMAL(c));
-	} else if (spa_json_is_int(value, len) ||
-	    spa_json_is_float(value, len)) {
-		fprintf(file, "%s%.*s%s", NUMBER(c), len, value, NORMAL(c));
-	} else if (spa_json_is_string(value, len)) {
-		fprintf(file, "%s%.*s%s", STRING(c), len, value, NORMAL(c));
-	} else {
-		encode_string(c, STRING(c), value, len, NORMAL(c));
-	}
-	return 0;
-}
-
 SPA_EXPORT
 int pw_properties_serialize_dict(FILE *f, const struct spa_dict *dict, uint32_t flags)
 {
 	const struct spa_dict_item *it;
-	int count = 0;
-	struct dump_config cfg = {
-		.file = f,
-		.indent = flags & PW_PROPERTIES_FLAG_NL ? 2 : 0,
-		.sep = flags & PW_PROPERTIES_FLAG_NL ? "\n" : " ",
-		.colors = SPA_FLAG_IS_SET(flags, PW_PROPERTIES_FLAG_COLORS),
-		.recurse = SPA_FLAG_IS_SET(flags, PW_PROPERTIES_FLAG_RECURSE),
-	}, *c = &cfg;
-	const char *enc = flags & PW_PROPERTIES_FLAG_ARRAY ? "[]" : "{}";
+	int count = 0, fl = 0;
+	struct spa_json_builder b;
+	bool array = flags & PW_PROPERTIES_FLAG_ARRAY;
+	bool recurse = flags & PW_PROPERTIES_FLAG_RECURSE;
+
+	if (flags & PW_PROPERTIES_FLAG_NL)
+		fl |= SPA_JSON_BUILDER_FLAG_PRETTY;
+	if (flags & PW_PROPERTIES_FLAG_COLORS)
+		fl |= SPA_JSON_BUILDER_FLAG_COLOR;
+	if (flags & PW_PROPERTIES_FLAG_SIMPLE)
+		fl |= SPA_JSON_BUILDER_FLAG_SIMPLE;
+
+	spa_json_builder_file(&b, f, fl);
 
 	if (SPA_FLAG_IS_SET(flags, PW_PROPERTIES_FLAG_ENCLOSE))
-		fprintf(f, "%c", enc[0]);
+		spa_json_builder_array_push(&b, array ? "[" : "{");
 
 	spa_dict_for_each(it, dict) {
-		char key[1024];
-		int len;
-		const char *value;
-		struct spa_json sub;
-
-		fprintf(f, "%s%s%*s", count == 0 ? "" : ",", c->sep, c->indent, "");
-
-		if (!(flags & PW_PROPERTIES_FLAG_ARRAY)) {
-			if (spa_json_encode_string(key, sizeof(key)-1, it->key) >= (int)sizeof(key)-1)
-				continue;
-			fprintf(f, "%s%s%s: ", KEY(c), key, NORMAL(c));
-		}
-		value = it->value;
-		len = value ? strlen(value) : 0;
-		spa_json_init(&sub, value, len);
-		if (c->recurse && spa_json_next(&sub, &value) < 0)
-			break;
-
-		dump(c, c->indent, &sub, value, len);
+		spa_json_builder_object_value(&b, recurse, array ? NULL : it->key, it->value);
 		count++;
 	}
 	if (SPA_FLAG_IS_SET(flags, PW_PROPERTIES_FLAG_ENCLOSE))
-		fprintf(f, "%s%c", c->sep, enc[1]);
+		spa_json_builder_pop(&b, array ? "]" : "}");
 	return count;
 }
diff --git a/src/pipewire/properties.h b/src/pipewire/properties.h
index 5dbcc283f..3138a8e15 100644
--- a/src/pipewire/properties.h
+++ b/src/pipewire/properties.h
@@ -154,6 +154,7 @@ pw_properties_iterate(const struct pw_properties *properties, void **state);
 #define PW_PROPERTIES_FLAG_ENCLOSE	(1<<2)
 #define PW_PROPERTIES_FLAG_ARRAY	(1<<3)
 #define PW_PROPERTIES_FLAG_COLORS	(1<<4)
+#define PW_PROPERTIES_FLAG_SIMPLE	(1<<5)
 int pw_properties_serialize_dict(FILE *f, const struct spa_dict *dict, uint32_t flags);
 
 PW_API_PROPERTIES bool pw_properties_parse_bool(const char *value) {
diff --git a/src/tools/pw-config.c b/src/tools/pw-config.c
index bfc64e427..ef8a345fd 100644
--- a/src/tools/pw-config.c
+++ b/src/tools/pw-config.c
@@ -25,6 +25,7 @@ struct data {
 	bool opt_recurse;
 	bool opt_newline;
 	bool opt_colors;
+	bool opt_simple;
 	struct pw_properties *conf;
 	struct pw_properties *assemble;
 	int count;
@@ -39,6 +40,7 @@ static void print_all_properties(struct data *d, struct pw_properties *props)
 			(d->opt_recurse ? PW_PROPERTIES_FLAG_RECURSE : 0) |
 			(d->opt_colors ? PW_PROPERTIES_FLAG_COLORS : 0) |
 			(d->array ? PW_PROPERTIES_FLAG_ARRAY : 0) |
+			(d->opt_simple ? PW_PROPERTIES_FLAG_SIMPLE : 0) |
 			PW_PROPERTIES_FLAG_ENCLOSE);
 	fprintf(stdout, "\n");
 }
@@ -128,7 +130,8 @@ static void show_help(const char *name, bool error)
 		"  -L, --no-newline                      Omit newlines after values\n"
 		"  -r, --recurse                         Reformat config sections recursively\n"
 		"  -N, --no-colors                       disable color output\n"
-		"  -C, --color[=WHEN]                    whether to enable color support. WHEN is `never`, `always`, or `auto`\n",
+		"  -C, --color[=WHEN]                    whether to enable color support. WHEN is `never`, `always`, or `auto`\n"
+		"  -s, --spa                             SPA JSON output\n",
 		name, DEFAULT_NAME, DEFAULT_PREFIX);
 }
 
@@ -146,6 +149,7 @@ int main(int argc, char *argv[])
 		{ "recurse",	no_argument,		NULL, 'r' },
 		{ "no-colors",	no_argument,		NULL, 'N' },
 		{ "color",	optional_argument,	NULL, 'C' },
+		{ "spa",	no_argument,		NULL, 's' },
 		{ NULL, 0, NULL, 0}
 	};
 
@@ -153,13 +157,14 @@ int main(int argc, char *argv[])
 	d.opt_prefix = NULL;
 	d.opt_recurse = false;
 	d.opt_newline = true;
+	d.opt_simple = false;
 	if (getenv("NO_COLOR") == NULL && isatty(fileno(stdout)))
 		d.opt_colors = true;
 	d.opt_cmd = "paths";
 
 	pw_init(&argc, &argv);
 
-	while ((c = getopt_long(argc, argv, "hVn:p:LrNC", long_options, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "hVn:p:LrNCs", long_options, NULL)) != -1) {
 		switch (c) {
 		case 'h':
 			show_help(argv[0], false);
@@ -201,6 +206,9 @@ int main(int argc, char *argv[])
 				return -1;
 			}
 			break;
+		case 's' :
+			d.opt_simple = true;
+			break;
 		default:
 			show_help(argv[0], true);
 			return -1;
diff --git a/src/tools/pw-dump.c b/src/tools/pw-dump.c
index e72e7d257..d1c53b900 100644
--- a/src/tools/pw-dump.c
+++ b/src/tools/pw-dump.c
@@ -22,6 +22,7 @@
 #include <spa/pod/iter.h>
 #include <spa/debug/types.h>
 #include <spa/utils/json.h>
+#include <spa/utils/json-builder.h>
 #include <spa/utils/ansi.h>
 #include <spa/utils/string.h>
 
@@ -30,15 +31,6 @@
 
 #define INDENT 2
 
-static bool colors = false;
-static bool raw = false;
-
-#define NORMAL	(colors ? SPA_ANSI_RESET : "")
-#define LITERAL	(colors ? SPA_ANSI_BRIGHT_MAGENTA : "")
-#define NUMBER	(colors ? SPA_ANSI_BRIGHT_CYAN : "")
-#define STRING	(colors ? SPA_ANSI_BRIGHT_GREEN : "")
-#define KEY	(colors ? SPA_ANSI_BRIGHT_BLUE : "")
-
 struct data {
 	struct pw_main_loop *loop;
 	struct pw_context *context;
@@ -55,20 +47,13 @@ struct data {
 
 	const char *pattern;
 
+	struct spa_json_builder builder;
+
 	FILE *out;
-	int level;
-	int indent;
-#define STATE_KEY	(1<<0)
-#define STATE_COMMA	(1<<1)
-#define STATE_FIRST	(1<<2)
-#define STATE_MASK	0xffff0000
-#define STATE_SIMPLE	(1<<16)
 	uint32_t state;
-	const char *comma_char;
-	const char *keysep_char;
-	bool simple_string;
 
 	unsigned int monitor:1;
+	unsigned int recurse:1;
 };
 
 struct param {
@@ -217,133 +202,25 @@ static void object_destroy(struct object *o)
 	free(o);
 }
 
-static void put_key(struct data *d, const char *key);
-
-#define REJECT	"\"\\'=:,{}[]()#"
-
-static bool is_simple_string(const char *val)
-{
-	int i;
-	for (i = 0; val[i]; i++) {
-		if (val[i] < 0x20 || strchr(REJECT, val[i]) != NULL)
-			return false;
-	}
-	return true;
-}
-
-static SPA_PRINTF_FUNC(3,4) void put_fmt(struct data *d, const char *key, const char *fmt, ...)
-{
-	va_list va;
-	if (key)
-		put_key(d, key);
-	fprintf(d->out, "%s%s%*s",
-			d->state & STATE_COMMA ? d->comma_char : "",
-			d->state & (STATE_MASK | STATE_KEY) ? " " : (d->state & STATE_FIRST) || raw ? "" : "\n",
-			d->state & (STATE_MASK | STATE_KEY) ? 0 : d->level, "");
-	va_start(va, fmt);
-	vfprintf(d->out, fmt, va);
-	va_end(va);
-	d->state = (d->state & STATE_MASK) + STATE_COMMA;
-}
-
-static void put_key(struct data *d, const char *key)
-{
-	int size = (strlen(key) + 1) * 4;
-	if (d->simple_string && is_simple_string(key)) {
-		put_fmt(d, NULL, "%s%s%s%s", KEY, key, NORMAL, d->keysep_char);
-	} else {
-		char *str = alloca(size);
-		spa_json_encode_string(str, size, key);
-		put_fmt(d, NULL, "%s%s%s%s", KEY, str, NORMAL, d->keysep_char);
-	}
-	d->state = (d->state & STATE_MASK) + STATE_KEY;
-}
-
-static void put_begin(struct data *d, const char *key, const char *type, uint32_t flags)
-{
-	put_fmt(d, key, "%s", type);
-	d->level += d->indent;
-	d->state = (d->state & STATE_MASK) + (flags & STATE_SIMPLE);
-}
-
-static void put_end(struct data *d, const char *type, uint32_t flags)
-{
-	d->level -= d->indent;
-	d->state = d->state & STATE_MASK;
-	put_fmt(d, NULL, "%s", type);
-	d->state = (d->state & STATE_MASK) + STATE_COMMA - (flags & STATE_SIMPLE);
-}
-
-static void put_encoded_string(struct data *d, const char *key, const char *val)
-{
-	put_fmt(d, key, "%s%s%s", STRING, val, NORMAL);
-}
-static void put_string(struct data *d, const char *key, const char *val)
-{
-	int size = (strlen(val) + 1) * 4;
-	if (d->simple_string && is_simple_string(val)) {
-		put_encoded_string(d, key, val);
-	} else {
-		char *str = alloca(size);
-		spa_json_encode_string(str, size, val);
-		put_encoded_string(d, key, str);
-	}
-}
-
-static void put_literal(struct data *d, const char *key, const char *val)
-{
-	put_fmt(d, key, "%s%s%s", LITERAL, val, NORMAL);
-}
-
-static void put_int(struct data *d, const char *key, int64_t val)
-{
-	put_fmt(d, key, "%s%"PRIi64"%s", NUMBER, val, NORMAL);
-}
-
-static void put_double(struct data *d, const char *key, double val)
-{
-	char buf[128];
-	put_fmt(d, key, "%s%s%s", NUMBER,
-			spa_json_format_float(buf, sizeof(buf), (float)val), NORMAL);
-}
-
-static void put_value(struct data *d, const char *key, const char *val)
-{
-	int64_t li;
-	float fv;
-
-	if (val == NULL)
-		put_literal(d, key, "null");
-	else if (spa_streq(val, "true") || spa_streq(val, "false"))
-		put_literal(d, key, val);
-	else if (spa_atoi64(val, &li, 10))
-		put_int(d, key, li);
-	else if (spa_json_parse_float(val, strlen(val), &fv))
-		put_double(d, key, fv);
-	else
-		put_string(d, key, val);
-}
 
 static void put_dict(struct data *d, const char *key, struct spa_dict *dict)
 {
 	const struct spa_dict_item *it;
 	spa_dict_qsort(dict);
-	put_begin(d, key, "{", 0);
+	spa_json_builder_object_push(&d->builder, key, "{");
 	spa_dict_for_each(it, dict)
-		put_value(d, it->key, it->value);
-	put_end(d, "}", 0);
+		spa_json_builder_object_value(&d->builder, d->recurse, it->key, it->value);
+	spa_json_builder_pop(&d->builder, "}");
 }
 
 static void put_pod_value(struct data *d, const char *key, const struct spa_type_info *info,
 		uint32_t type, void *body, uint32_t size)
 {
-	if (key)
-		put_key(d, key);
 	switch (type) {
 	case SPA_TYPE_Bool:
 		if (size < sizeof(int32_t))
 			break;
-		put_value(d, NULL, *(int32_t*)body ? "true" : "false");
+		spa_json_builder_object_bool(&d->builder, key, *(int32_t*)body);
 		break;
 	case SPA_TYPE_Id:
 	{
@@ -357,34 +234,34 @@ static void put_pod_value(struct data *d, const char *key, const struct spa_type
 			snprintf(fallback, sizeof(fallback), "id-%08x", id);
 			str = fallback;
 		}
-		put_value(d, NULL, str);
+		spa_json_builder_object_string(&d->builder, key, str);
 		break;
 	}
 	case SPA_TYPE_Int:
 		if (size < sizeof(int32_t))
 			break;
-		put_int(d, NULL, *(int32_t*)body);
+		spa_json_builder_object_int(&d->builder, key, *(int32_t*)body);
 		break;
 	case SPA_TYPE_Fd:
 	case SPA_TYPE_Long:
 		if (size < sizeof(int64_t))
 			break;
-		put_int(d, NULL, *(int64_t*)body);
+		spa_json_builder_object_int(&d->builder, key, *(int64_t*)body);
 		break;
 	case SPA_TYPE_Float:
 		if (size < sizeof(float))
 			break;
-		put_double(d, NULL, *(float*)body);
+		spa_json_builder_object_double(&d->builder, key, *(float*)body);
 		break;
 	case SPA_TYPE_Double:
 		if (size < sizeof(double))
 			break;
-		put_double(d, NULL, *(double*)body);
+		spa_json_builder_object_double(&d->builder, key, *(double*)body);
 		break;
 	case SPA_TYPE_String:
 		if (size < 1 || ((const char *)body)[size - 1])
 			break;
-		put_string(d, NULL, (const char*)body);
+		spa_json_builder_object_string(&d->builder, key, (const char*)body);
 		break;
 	case SPA_TYPE_Rectangle:
 	{
@@ -393,10 +270,10 @@ static void put_pod_value(struct data *d, const char *key, const struct spa_type
 		if (size < sizeof(*r))
 			break;
 		r = (struct spa_rectangle *)body;
-		put_begin(d, NULL, "{", STATE_SIMPLE);
-		put_int(d, "width", r->width);
-		put_int(d, "height", r->height);
-		put_end(d, "}", STATE_SIMPLE);
+		spa_json_builder_object_push(&d->builder, key, "{-");
+		spa_json_builder_object_int(&d->builder,  "width", r->width);
+		spa_json_builder_object_int(&d->builder,  "height", r->height);
+		spa_json_builder_pop(&d->builder, "}-");
 		break;
 	}
 	case SPA_TYPE_Fraction:
@@ -406,10 +283,10 @@ static void put_pod_value(struct data *d, const char *key, const struct spa_type
 		if (size < sizeof(*f))
 			break;
 		f = (struct spa_fraction *)body;
-		put_begin(d, NULL, "{", STATE_SIMPLE);
-		put_int(d, "num", f->num);
-		put_int(d, "denom", f->denom);
-		put_end(d, "}", STATE_SIMPLE);
+		spa_json_builder_object_push(&d->builder, key, "{-");
+		spa_json_builder_object_int(&d->builder,  "num", f->num);
+		spa_json_builder_object_int(&d->builder,  "denom", f->denom);
+		spa_json_builder_pop(&d->builder, "}-");
 		break;
 	}
 	case SPA_TYPE_Array:
@@ -421,10 +298,10 @@ static void put_pod_value(struct data *d, const char *key, const struct spa_type
 			break;
 		b = (struct spa_pod_array_body *)body;
 		info = info && info->values ? info->values: info;
-		put_begin(d, NULL, "[", STATE_SIMPLE);
+		spa_json_builder_object_push(&d->builder, key, "[-");
 		SPA_POD_ARRAY_BODY_FOREACH(b, size, p)
 			put_pod_value(d, NULL, info, b->child.type, p, b->child.size);
-		put_end(d, "]", STATE_SIMPLE);
+		spa_json_builder_pop(&d->builder, "]-");
 		break;
 	}
 	case SPA_TYPE_Choice:
@@ -452,12 +329,12 @@ static void put_pod_value(struct data *d, const char *key, const struct spa_type
 			case SPA_CHOICE_Range:
 				labels = range_labels;
 				max_labels = 3;
-				flags |= STATE_SIMPLE;
+				flags++;
 				break;
 			case SPA_CHOICE_Step:
 				labels = step_labels;
 				max_labels = 4;
-				flags |= STATE_SIMPLE;
+				flags++;
 				break;
 			case SPA_CHOICE_Enum:
 				labels = enum_labels;
@@ -474,7 +351,7 @@ static void put_pod_value(struct data *d, const char *key, const struct spa_type
 			if (labels == NULL)
 				break;
 
-			put_begin(d, NULL, "{", flags);
+			spa_json_builder_object_push(&d->builder, key, flags ? "{-" : "{");
 			SPA_POD_CHOICE_BODY_FOREACH(b, size, p) {
 				if ((label = labels[SPA_CLAMP(index, 0, max_labels)]) == NULL)
 					break;
@@ -482,13 +359,13 @@ static void put_pod_value(struct data *d, const char *key, const struct spa_type
 				put_pod_value(d, buffer, info, b->child.type, p, b->child.size);
 				index++;
 			}
-			put_end(d, "}", flags);
+			spa_json_builder_pop(&d->builder, flags ? "}-" : "}");
 		}
 		break;
 	}
 	case SPA_TYPE_Object:
 	{
-		put_begin(d, NULL, "{", 0);
+		spa_json_builder_object_push(&d->builder, key, "{");
 		struct spa_pod_object_body *b = (struct spa_pod_object_body *)body;
 		struct spa_pod_prop *p;
 		const struct spa_type_info *ti, *ii;
@@ -515,27 +392,27 @@ static void put_pod_value(struct data *d, const char *key, const struct spa_type
 					SPA_POD_CONTENTS(struct spa_pod_prop, p),
 					p->value.size);
 		}
-		put_end(d, "}", 0);
+		spa_json_builder_pop(&d->builder, "}");
 		break;
 	}
 	case SPA_TYPE_Struct:
 	{
 		struct spa_pod *b = (struct spa_pod *)body, *p;
-		put_begin(d, NULL, "[", 0);
+		spa_json_builder_object_push(&d->builder, key, "[");
 		SPA_POD_FOREACH(b, size, p)
 			put_pod_value(d, NULL, info, p->type, SPA_POD_BODY(p), p->size);
-		put_end(d, "]", 0);
+		spa_json_builder_pop(&d->builder, "]");
 		break;
 	}
 	case SPA_TYPE_None:
-		put_value(d, NULL, NULL);
+		spa_json_builder_object_null(&d->builder, key);
 		break;
 	}
 }
 static void put_pod(struct data *d, const char *key, const struct spa_pod *pod)
 {
 	if (pod == NULL) {
-		put_value(d, key, NULL);
+		spa_json_builder_object_null(&d->builder, key);
 	} else {
 		put_pod_value(d, key, SPA_TYPE_ROOT, pod->type,
 		              SPA_POD_BODY(pod), pod->size);
@@ -548,23 +425,24 @@ static void put_params(struct data *d, const char *key,
 {
 	uint32_t i;
 
-	put_begin(d, key, "{", 0);
+	spa_json_builder_object_push(&d->builder, key, "{");
 	for (i = 0; i < n_params; i++) {
 		struct spa_param_info *pi = &params[i];
 		struct param *p;
 		uint32_t flags;
 
-		flags = pi->flags & SPA_PARAM_INFO_READ ? 0 : STATE_SIMPLE;
+		flags = pi->flags & SPA_PARAM_INFO_READ ? 0 : 1;
 
-		put_begin(d, spa_debug_type_find_short_name(spa_type_param, pi->id),
-				"[", flags);
+		spa_json_builder_object_push(&d->builder,
+				spa_debug_type_find_short_name(spa_type_param, pi->id),
+				flags ? "[-" : "[");
 		spa_list_for_each(p, list, link) {
 			if (p->id == pi->id)
 				put_pod(d, NULL, p->param);
 		}
-		put_end(d, "]", flags);
+		spa_json_builder_pop(&d->builder, flags ? "]-" : "]");
 	}
-	put_end(d, "}", 0);
+	spa_json_builder_pop(&d->builder, "}");
 }
 
 struct flags_info {
@@ -576,12 +454,12 @@ static void put_flags(struct data *d, const char *key,
 		uint64_t flags, const struct flags_info *info)
 {
 	uint32_t i;
-	put_begin(d, key, "[", STATE_SIMPLE);
+	spa_json_builder_object_push(&d->builder, key, "[-");
 	for (i = 0; info[i].name != NULL; i++) {
 		if (info[i].mask & flags)
-			put_string(d, NULL, info[i].name);
+			spa_json_builder_array_string(&d->builder, info[i].name);
 	}
-	put_end(d, "]", STATE_SIMPLE);
+	spa_json_builder_pop(&d->builder, "]-");
 }
 
 /* core */
@@ -595,15 +473,15 @@ static void core_dump(struct object *o)
 	struct data *d = o->data;
 	struct pw_core_info *i = d->info;
 
-	put_begin(d, "info", "{", 0);
-	put_int(d, "cookie", i->cookie);
-	put_value(d, "user-name", i->user_name);
-	put_value(d, "host-name", i->host_name);
-	put_value(d, "version", i->version);
-	put_value(d, "name", i->name);
+	spa_json_builder_object_push(&d->builder, "info", "{");
+	spa_json_builder_object_int(&d->builder, "cookie", i->cookie);
+	spa_json_builder_object_string(&d->builder, "user-name", i->user_name);
+	spa_json_builder_object_string(&d->builder, "host-name", i->host_name);
+	spa_json_builder_object_string(&d->builder, "version", i->version);
+	spa_json_builder_object_string(&d->builder, "name", i->name);
 	put_flags(d, "change-mask", i->change_mask, fl);
 	put_dict(d, "props", i->props);
-	put_end(d, "}", 0);
+	spa_json_builder_pop(&d->builder, "}");
 }
 
 static const struct class core_class = {
@@ -624,10 +502,10 @@ static void client_dump(struct object *o)
 	struct data *d = o->data;
 	struct pw_client_info *i = o->info;
 
-	put_begin(d, "info", "{", 0);
+	spa_json_builder_object_push(&d->builder, "info", "{");
 	put_flags(d, "change-mask", i->change_mask, fl);
 	put_dict(d, "props", i->props);
-	put_end(d, "}", 0);
+	spa_json_builder_pop(&d->builder, "}");
 }
 
 static void client_event_info(void *data, const struct pw_client_info *info)
@@ -683,13 +561,13 @@ static void module_dump(struct object *o)
 	struct data *d = o->data;
 	struct pw_module_info *i = o->info;
 
-	put_begin(d, "info", "{", 0);
-	put_value(d, "name", i->name);
-	put_value(d, "filename", i->filename);
-	put_value(d, "args", i->args);
+	spa_json_builder_object_push(&d->builder, "info", "{");
+	spa_json_builder_object_string(&d->builder, "name", i->name);
+	spa_json_builder_object_string(&d->builder, "filename", i->filename);
+	spa_json_builder_object_value(&d->builder, d->recurse, "args", i->args);
 	put_flags(d, "change-mask", i->change_mask, fl);
 	put_dict(d, "props", i->props);
-	put_end(d, "}", 0);
+	spa_json_builder_pop(&d->builder, "}");
 }
 
 static void module_event_info(void *data, const struct pw_module_info *info)
@@ -745,13 +623,13 @@ static void factory_dump(struct object *o)
 	struct data *d = o->data;
 	struct pw_factory_info *i = o->info;
 
-	put_begin(d, "info", "{", 0);
-	put_value(d, "name", i->name);
-	put_value(d, "type", i->type);
-	put_int(d, "version", i->version);
+	spa_json_builder_object_push(&d->builder, "info", "{");
+	spa_json_builder_object_string(&d->builder, "name", i->name);
+	spa_json_builder_object_string(&d->builder, "type", i->type);
+	spa_json_builder_object_int(&d->builder, "version", i->version);
 	put_flags(d, "change-mask", i->change_mask, fl);
 	put_dict(d, "props", i->props);
-	put_end(d, "}", 0);
+	spa_json_builder_pop(&d->builder, "}");
 }
 
 static void factory_event_info(void *data, const struct pw_factory_info *info)
@@ -808,11 +686,11 @@ static void device_dump(struct object *o)
 	struct data *d = o->data;
 	struct pw_device_info *i = o->info;
 
-	put_begin(d, "info", "{", 0);
+	spa_json_builder_object_push(&d->builder, "info", "{");
 	put_flags(d, "change-mask", i->change_mask, fl);
 	put_dict(d, "props", i->props);
 	put_params(d, "params", i->params, i->n_params, &o->param_list);
-	put_end(d, "}", 0);
+	spa_json_builder_pop(&d->builder, "}");
 }
 
 static void device_event_info(void *data, const struct pw_device_info *info)
@@ -904,17 +782,17 @@ static void node_dump(struct object *o)
 	struct data *d = o->data;
 	struct pw_node_info *i = o->info;
 
-	put_begin(d, "info", "{", 0);
-	put_int(d, "max-input-ports", i->max_input_ports);
-	put_int(d, "max-output-ports", i->max_output_ports);
+	spa_json_builder_object_push(&d->builder, "info", "{");
+	spa_json_builder_object_int(&d->builder, "max-input-ports", i->max_input_ports);
+	spa_json_builder_object_int(&d->builder, "max-output-ports", i->max_output_ports);
 	put_flags(d, "change-mask", i->change_mask, fl);
-	put_int(d, "n-input-ports", i->n_input_ports);
-	put_int(d, "n-output-ports", i->n_output_ports);
-	put_value(d, "state", pw_node_state_as_string(i->state));
-	put_value(d, "error", i->error);
+	spa_json_builder_object_int(&d->builder, "n-input-ports", i->n_input_ports);
+	spa_json_builder_object_int(&d->builder, "n-output-ports", i->n_output_ports);
+	spa_json_builder_object_string(&d->builder, "state", pw_node_state_as_string(i->state));
+	spa_json_builder_object_string(&d->builder, "error", i->error);
 	put_dict(d, "props", i->props);
 	put_params(d, "params", i->params, i->n_params, &o->param_list);
-	put_end(d, "}", 0);
+	spa_json_builder_pop(&d->builder, "}");
 }
 
 static void node_event_info(void *data, const struct pw_node_info *info)
@@ -1006,12 +884,12 @@ static void port_dump(struct object *o)
 	struct data *d = o->data;
 	struct pw_port_info *i = o->info;
 
-	put_begin(d, "info", "{", 0);
-	put_value(d, "direction", pw_direction_as_string(i->direction));
+	spa_json_builder_object_push(&d->builder, "info", "{");
+	spa_json_builder_object_string(&d->builder, "direction", pw_direction_as_string(i->direction));
 	put_flags(d, "change-mask", i->change_mask, fl);
 	put_dict(d, "props", i->props);
 	put_params(d, "params", i->params, i->n_params, &o->param_list);
-	put_end(d, "}", 0);
+	spa_json_builder_pop(&d->builder, "}");
 }
 
 static void port_event_info(void *data, const struct pw_port_info *info)
@@ -1101,17 +979,17 @@ static void link_dump(struct object *o)
 	struct data *d = o->data;
 	struct pw_link_info *i = o->info;
 
-	put_begin(d, "info", "{", 0);
-	put_int(d, "output-node-id", i->output_node_id);
-	put_int(d, "output-port-id", i->output_port_id);
-	put_int(d, "input-node-id", i->input_node_id);
-	put_int(d, "input-port-id", i->input_port_id);
+	spa_json_builder_object_push(&d->builder, "info", "{");
+	spa_json_builder_object_int(&d->builder, "output-node-id", i->output_node_id);
+	spa_json_builder_object_int(&d->builder, "output-port-id", i->output_port_id);
+	spa_json_builder_object_int(&d->builder, "input-node-id", i->input_node_id);
+	spa_json_builder_object_int(&d->builder, "input-port-id", i->input_port_id);
 	put_flags(d, "change-mask", i->change_mask, fl);
-	put_value(d, "state", pw_link_state_as_string(i->state));
-	put_value(d, "error", i->error);
+	spa_json_builder_object_string(&d->builder, "state", pw_link_state_as_string(i->state));
+	spa_json_builder_object_string(&d->builder, "error", i->error);
 	put_pod(d, "format", i->format);
 	put_dict(d, "props", i->props);
-	put_end(d, "}", 0);
+	spa_json_builder_pop(&d->builder, "}");
 }
 
 static void link_event_info(void *data, const struct pw_link_info *info)
@@ -1161,39 +1039,6 @@ static const struct class link_class = {
 	.dump = link_dump,
 };
 
-static void json_dump_val(struct data *d, const char *key, struct spa_json *it, const char *value, int len)
-{
-	struct spa_json sub;
-	if (spa_json_is_array(value, len)) {
-		put_begin(d, key, "[", STATE_SIMPLE);
-		spa_json_enter(it, &sub);
-		while ((len = spa_json_next(&sub, &value)) > 0) {
-			json_dump_val(d, NULL, &sub, value, len);
-		}
-		put_end(d, "]", STATE_SIMPLE);
-	} else if (spa_json_is_object(value, len)) {
-		char val[1024];
-		put_begin(d, key, "{", STATE_SIMPLE);
-		spa_json_enter(it, &sub);
-		while ((len = spa_json_object_next(&sub, val, sizeof(val), &value)) > 0)
-			json_dump_val(d, val, &sub, value, len);
-		put_end(d, "}", STATE_SIMPLE);
-	} else if (spa_json_is_string(value, len)) {
-		put_encoded_string(d, key, strndupa(value, len));
-	} else {
-		put_value(d, key, strndupa(value, len));
-	}
-}
-
-static void json_dump(struct data *d, const char *key, const char *value)
-{
-	struct spa_json it[1];
-	int len;
-	const char *val;
-	if ((len = spa_json_begin(&it[0], value, strlen(value), &val)) >= 0)
-		json_dump_val(d, key, &it[0], val, len);
-}
-
 /* metadata */
 
 struct metadata_entry {
@@ -1210,22 +1055,21 @@ static void metadata_dump(struct object *o)
 	struct data *d = o->data;
 	struct metadata_entry *e;
 	put_dict(d, "props", &o->props->dict);
-	put_begin(d, "metadata", "[", 0);
+	spa_json_builder_object_push(&d->builder, "metadata", "[");
 	spa_list_for_each(e, &o->data_list, link) {
+		bool recurse = false;
 		if (e->changed == 0)
 			continue;
-		put_begin(d, NULL, "{", STATE_SIMPLE);
-		put_int(d, "subject", e->subject);
-		put_value(d, "key", e->key);
-		put_value(d, "type", e->type);
-		if (e->type != NULL && spa_streq(e->type, "Spa:String:JSON"))
-			json_dump(d, "value", e->value);
-		else
-			put_value(d, "value", e->value);
-		put_end(d, "}", STATE_SIMPLE);
+		spa_json_builder_array_push(&d->builder, "{-");
+		spa_json_builder_object_int(&d->builder, "subject", e->subject);
+		spa_json_builder_object_string(&d->builder, "key", e->key);
+		spa_json_builder_object_string(&d->builder, "type", e->type);
+		recurse =  (e->type != NULL && spa_streq(e->type, "Spa:String:JSON"));
+		spa_json_builder_object_value(&d->builder, recurse, "value", e->value);
+		spa_json_builder_pop(&d->builder, "}-");
 		e->changed = 0;
 	}
-	put_end(d, "]", 0);
+	spa_json_builder_pop(&d->builder, "]");
 }
 
 static struct metadata_entry *metadata_find(struct object *o, uint32_t subject, const char *key)
@@ -1442,18 +1286,20 @@ static void registry_event_global_remove(void *data, uint32_t id)
 		return;
 
 	if (d->monitor && (!d->pattern || object_matches(o, d->pattern))) {
-		d->state = STATE_FIRST;
-		if (d->state == STATE_FIRST)
-			put_begin(d, NULL, "[", 0);
-		put_begin(d, NULL, "{", 0);
-		put_int(d, "id", o->id);
+		d->state = 0;
+		if (d->state++ == 0)
+			spa_json_builder_array_push(&d->builder, "[");
+		spa_json_builder_array_push(&d->builder, "{");
+		spa_json_builder_object_int(&d->builder, "id", o->id);
 		if (o->class && o->class->dump)
-			put_value(d, "info", NULL);
+			spa_json_builder_object_null(&d->builder, "info");
 		else if (o->props)
-			put_value(d, "props", NULL);
-		put_end(d, "}", 0);
-		if (d->state != STATE_FIRST)
-			put_end(d, "]\n", 0);
+			spa_json_builder_object_null(&d->builder, "props");
+		spa_json_builder_pop(&d->builder, "}");
+		if (d->state != 0) {
+			spa_json_builder_pop(&d->builder, "]");
+			fputs("\n", d->builder.f);
+		}
 	}
 
 	object_destroy(o);
@@ -1478,28 +1324,30 @@ static void dump_objects(struct data *d)
 
 	struct object *o;
 
-	d->state = STATE_FIRST;
+	d->state = 0;
 	spa_list_for_each(o, &d->object_list, link) {
 		if (d->pattern != NULL && !object_matches(o, d->pattern))
 			continue;
 		if (o->changed == 0)
 			continue;
-		if (d->state == STATE_FIRST)
-			put_begin(d, NULL, "[", 0);
-		put_begin(d, NULL, "{", 0);
-		put_int(d, "id", o->id);
-		put_value(d, "type", o->type);
-		put_int(d, "version", o->version);
+		if (d->state++ == 0)
+			spa_json_builder_array_push(&d->builder, "[");
+		spa_json_builder_array_push(&d->builder, "{");
+		spa_json_builder_object_int(&d->builder, "id", o->id);
+		spa_json_builder_object_string(&d->builder, "type", o->type);
+		spa_json_builder_object_int(&d->builder, "version", o->version);
 		put_flags(d, "permissions", o->permissions, fl);
 		if (o->class && o->class->dump)
 			o->class->dump(o);
 		else if (o->props)
 			put_dict(d, "props", &o->props->dict);
-		put_end(d, "}", 0);
+		spa_json_builder_pop(&d->builder, "}");
 		o->changed = 0;
 	}
-	if (d->state != STATE_FIRST)
-		put_end(d, "]\n", 0);
+	if (d->state != 0) {
+		spa_json_builder_pop(&d->builder, "]");
+		fputs("\n", d->builder.f);
+	}
 }
 
 static void on_core_error(void *data, uint32_t id, int seq, int res, const char *message)
@@ -1564,7 +1412,8 @@ static void show_help(struct data *data, const char *name, bool error)
 		"  -C, --color[=WHEN]                    whether to enable color support. WHEN is `never`, `always`, or `auto`\n"
 		"  -R, --raw                             force raw output\n"
 		"  -i, --indent                          indentation amount (default 2)\n"
-		"  -s, --spa                             SPA JSON output\n",
+		"  -s, --spa                             SPA JSON output\n"
+		"  -c, --recurse                         Reformat values recursively\n",
 		name);
 }
 
@@ -1584,9 +1433,11 @@ int main(int argc, char *argv[])
 		{ "raw",	no_argument,		NULL, 'R' },
 		{ "indent",	required_argument,	NULL, 'i' },
 		{ "spa",	no_argument,		NULL, 's' },
+		{ "recurse",	no_argument,		NULL, 'c' },
 		{ NULL, 0, NULL, 0}
 	};
-	int c;
+	int c, flags = 0, indent = -1;
+	bool colors = false, raw = false;
 
 	setlocale(LC_ALL, "");
 	pw_init(&argc, &argv);
@@ -1596,11 +1447,7 @@ int main(int argc, char *argv[])
 		colors = true;
 	setlinebuf(data.out);
 
-	data.comma_char = ",";
-	data.keysep_char = ":";
-	data.indent = INDENT;
-
-	while ((c = getopt_long(argc, argv, "hVr:mNC::Ri:s", long_options, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "hVr:mNC::Ri:sc", long_options, NULL)) != -1) {
 		switch (c) {
 		case 'h' :
 			show_help(&data, argv[0], false);
@@ -1640,20 +1487,27 @@ int main(int argc, char *argv[])
 			}
 			break;
 		case 'i' :
-			data.indent = atoi(optarg);
+			indent = atoi(optarg);
 			break;
 		case 's' :
-			data.comma_char = "";
-			data.keysep_char = " =";
-			data.simple_string = true;
+			flags |= SPA_JSON_BUILDER_FLAG_SIMPLE;
+			break;
+		case 'c' :
+			data.recurse = true;
 			break;
 		default:
 			show_help(&data, argv[0], true);
 			return -1;
 		}
 	}
-	if (raw)
-		data.indent = 0;
+	if (!raw)
+		flags |= SPA_JSON_BUILDER_FLAG_PRETTY;
+	if (colors)
+		flags |= SPA_JSON_BUILDER_FLAG_COLOR;
+
+	spa_json_builder_file(&data.builder, data.out, flags);
+	if (indent >= 0)
+		data.builder.indent = indent;
 
 	if (optind < argc)
 		data.pattern = argv[optind++];
diff --git a/test/test-properties.c b/test/test-properties.c
index 459e1e15e..48d7858db 100644
--- a/test/test-properties.c
+++ b/test/test-properties.c
@@ -466,7 +466,7 @@ PWTEST(properties_serialize_dict_stack_overflow)
 	fp = fopen(tmpfile, "we");
 	pwtest_ptr_notnull(fp);
 	r = pw_properties_serialize_dict(fp, &dict, 0);
-	pwtest_int_eq(r, 1);
+	pwtest_int_eq(r, 2);
 
 	fclose(fp);
 	free(long_value);

From 7dd924797bbb86f2b6678945dff928b341af6378 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 26 Feb 2026 10:59:57 +0100
Subject: [PATCH 101/263] audioconver: reformat the graph description for
 properties

---
 spa/plugins/audioconvert/audioconvert.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spa/plugins/audioconvert/audioconvert.c b/spa/plugins/audioconvert/audioconvert.c
index da5396f61..6b4243b2a 100644
--- a/spa/plugins/audioconvert/audioconvert.c
+++ b/spa/plugins/audioconvert/audioconvert.c
@@ -16,6 +16,7 @@
 #include <spa/utils/result.h>
 #include <spa/utils/list.h>
 #include <spa/utils/json.h>
+#include <spa/utils/json-builder.h>
 #include <spa/utils/names.h>
 #include <spa/utils/string.h>
 #include <spa/utils/ratelimit.h>
@@ -1441,7 +1442,7 @@ static int load_filter_graph(struct impl *impl, const char *graph, int order)
 		spa_list_remove(&pending->link);
 		insert_graph(&impl->active_graphs, pending);
 
-		impl->graph_descs[order] = strdup(graph);
+		impl->graph_descs[order] = spa_json_builder_reformat(graph, 0);
 
 		spa_log_info(impl->log, "loading filter-graph order:%d", order);
 	}

From bdbb5f6d2715f5519acf9cdd13ce13d27e9e704e Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 26 Feb 2026 11:09:13 +0100
Subject: [PATCH 102/263] json-builder: add raw mode that leaves keys/strings
 like they are

---
 spa/include/spa/utils/json-builder.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/spa/include/spa/utils/json-builder.h b/spa/include/spa/utils/json-builder.h
index 554136b90..3fa6b7dc8 100644
--- a/spa/include/spa/utils/json-builder.h
+++ b/spa/include/spa/utils/json-builder.h
@@ -49,6 +49,7 @@ struct spa_json_builder {
 #define SPA_JSON_BUILDER_FLAG_PRETTY	(SPA_JSON_BUILDER_FLAG_INDENT|SPA_JSON_BUILDER_FLAG_SPACE)
 #define SPA_JSON_BUILDER_FLAG_COLOR	(1<<3)
 #define SPA_JSON_BUILDER_FLAG_SIMPLE	(1<<4)
+#define SPA_JSON_BUILDER_FLAG_RAW	(1<<5)
 	uint32_t flags;
 	uint32_t indent_off;
 	uint32_t level;
@@ -151,6 +152,7 @@ void spa_json_builder_add_simple(struct spa_json_builder *b, const char *key, in
 {
 	bool indent = b->indent_off == 0 && (b->flags & SPA_JSON_BUILDER_FLAG_INDENT);
 	bool space = b->flags & SPA_JSON_BUILDER_FLAG_SPACE;
+	bool force_raw = b->flags & SPA_JSON_BUILDER_FLAG_RAW;
 	bool raw = true, simple = b->flags & SPA_JSON_BUILDER_FLAG_SIMPLE;
 	int color;
 
@@ -185,8 +187,8 @@ void spa_json_builder_add_simple(struct spa_json_builder *b, const char *key, in
 	fprintf(b->f, "%s%s%*s", b->delim, indent ? b->count == 0 ? "" : "\n" : space ? " " : "",
 			indent ? b->level : 0, "");
 	if (key) {
-		bool key_raw = (simple && spa_json_make_simple_string(&key, &key_len)) ||
-					spa_json_is_string(key, key_len);
+		bool key_raw = force_raw || (simple && spa_json_make_simple_string(&key, &key_len)) ||
+			spa_json_is_string(key, key_len);
 		spa_json_builder_encode_string(b, key_raw,
 				b->color[1], key, key_len, b->color[0]);
 		fprintf(b->f, "%s%s", b->key_sep, space ? " " : "");
@@ -219,7 +221,7 @@ void spa_json_builder_add_simple(struct spa_json_builder *b, const char *key, in
 		break;
 	default:
 		color = SPA_JSON_BUILDER_COLOR_STRING;
-		raw = simple && spa_json_make_simple_string(&val, &val_len);
+		raw = force_raw || (simple && spa_json_make_simple_string(&val, &val_len));
 		break;
 	}
 	spa_json_builder_encode_string(b, raw, b->color[color], val, val_len, b->color[0]);

From 03662b3dfe9605a47f33cc4931721e9aa310c65c Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 26 Feb 2026 11:17:17 +0100
Subject: [PATCH 103/263] json-builder: avoid indent on the first item

Avoids putting a \n or (now also) space as the first item.
---
 spa/include/spa/utils/json-builder.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spa/include/spa/utils/json-builder.h b/spa/include/spa/utils/json-builder.h
index 3fa6b7dc8..473723026 100644
--- a/spa/include/spa/utils/json-builder.h
+++ b/spa/include/spa/utils/json-builder.h
@@ -184,7 +184,7 @@ void spa_json_builder_add_simple(struct spa_json_builder *b, const char *key, in
 		break;
 	}
 
-	fprintf(b->f, "%s%s%*s", b->delim, indent ? b->count == 0 ? "" : "\n" : space ? " " : "",
+	fprintf(b->f, "%s%s%*s", b->delim, b->count == 0 ? "" : indent ? "\n" : space ? " " : "",
 			indent ? b->level : 0, "");
 	if (key) {
 		bool key_raw = force_raw || (simple && spa_json_make_simple_string(&key, &key_len)) ||

From be3c63d55e008198a41fda242ce83448b280064e Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 6 Feb 2026 10:12:11 +0100
Subject: [PATCH 104/263] module-raop: move base64 to separate file

---
 src/modules/module-raop-sink.c   | 56 ++++-------------------------
 src/modules/module-raop/base64.h | 62 ++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 49 deletions(-)
 create mode 100644 src/modules/module-raop/base64.h

diff --git a/src/modules/module-raop-sink.c b/src/modules/module-raop-sink.c
index e217ff5b2..2eee70a2e 100644
--- a/src/modules/module-raop-sink.c
+++ b/src/modules/module-raop-sink.c
@@ -45,6 +45,7 @@
 #include "network-utils.h"
 
 #include "module-raop/rtsp-client.h"
+#include "module-raop/base64.h"
 #include "module-rtp/rtp.h"
 #include "module-rtp/stream.h"
 
@@ -703,49 +704,6 @@ on_control_source_io(void *data, int fd, uint32_t mask)
 	}
 }
 
-static void base64_encode(const uint8_t *data, size_t len, char *enc, char pad)
-{
-	static const char tab[] =
-	    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-	size_t i;
-	for (i = 0; i < len; i += 3) {
-		uint32_t v;
-		v  =              data[i+0]      << 16;
-		v |= (i+1 < len ? data[i+1] : 0) << 8;
-		v |= (i+2 < len ? data[i+2] : 0);
-		*enc++ =             tab[(v >> (3*6)) & 0x3f];
-		*enc++ =             tab[(v >> (2*6)) & 0x3f];
-		*enc++ = i+1 < len ? tab[(v >> (1*6)) & 0x3f] : pad;
-		*enc++ = i+2 < len ? tab[(v >> (0*6)) & 0x3f] : pad;
-	}
-	*enc = '\0';
-}
-
-static size_t base64_decode(const char *data, size_t len, uint8_t *dec)
-{
-	uint8_t tab[] = {
-		62, -1, -1, -1, 63, 52, 53, 54, 55, 56,
-		57, 58, 59, 60, 61, -1, -1, -1, -1, -1,
-		-1, -1,  0,  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, -1, -1,
-		-1, -1, -1, -1, 26, 27, 28, 29, 30, 31,
-		32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
-		42, 43, 44, 45, 46, 47, 48, 49, 50, 51 };
-	size_t i, j;
-	for (i = 0, j = 0; i < len; i += 4) {
-		uint32_t v;
-		v =                          tab[data[i+0]-43]  << (3*6);
-		v |=                         tab[data[i+1]-43]  << (2*6);
-		v |= (data[i+2] == '=' ? 0 : tab[data[i+2]-43]) << (1*6);
-		v |= (data[i+3] == '=' ? 0 : tab[data[i+3]-43]);
-		                      dec[j++] = (v >> 16) & 0xff;
-		if (data[i+2] != '=') dec[j++] = (v >> 8)  & 0xff;
-		if (data[i+3] != '=') dec[j++] =  v        & 0xff;
-	}
-	return j;
-}
-
 SPA_PRINTF_FUNC(2,3)
 static int MD5_hash(char hash[MD5_HASH_LENGTH+1], const char *fmt, ...)
 {
@@ -778,7 +736,7 @@ static int rtsp_add_raop_auth_header(struct impl *impl, const char *method)
 		char buf[256];
 		char enc[512];
 		spa_scnprintf(buf, sizeof(buf), "%s:%s", RAOP_AUTH_USER_NAME, impl->password);
-		base64_encode((uint8_t*)buf, strlen(buf), enc, '=');
+		pw_base64_encode((uint8_t*)buf, strlen(buf), enc, '=');
 		spa_scnprintf(auth, sizeof(auth), "Basic %s", enc);
 	}
 	else if (spa_streq(impl->auth_method, "Digest")) {
@@ -1136,8 +1094,8 @@ static int rsa_encrypt(uint8_t *data, int len, uint8_t *enc)
 		"imNVvYFZeCXg/IdTQ+x4IRdiXNv5hEew==";
 	char e[] = "AQAB";
 
-	msize = base64_decode(n, strlen(n), modulus);
-	esize = base64_decode(e, strlen(e), exponent);
+	msize = pw_base64_decode(n, strlen(n), modulus);
+	esize = pw_base64_decode(e, strlen(e), exponent);
 
 #if OPENSSL_API_LEVEL >= 30000
 	EVP_PKEY *pkey = NULL;
@@ -1263,15 +1221,15 @@ static int rtsp_do_announce(struct impl *impl)
 		    (res = pw_getrandom(impl->aes_iv, sizeof(impl->aes_iv), 0)) < 0)
 			return res;
 
-		base64_encode(rac, sizeof(rac), sac, '\0');
+		pw_base64_encode(rac, sizeof(rac), sac, '\0');
 		pw_properties_set(impl->headers, "Apple-Challenge", sac);
 
 		rsa_len = rsa_encrypt(impl->aes_key, 16, rsakey);
 		if (rsa_len < 0)
 			return -rsa_len;
 
-		base64_encode(rsakey, rsa_len, key, '=');
-		base64_encode(impl->aes_iv, 16, iv, '=');
+		pw_base64_encode(rsakey, rsa_len, key, '=');
+		pw_base64_encode(impl->aes_iv, 16, iv, '=');
 
 		sdp = spa_aprintf("v=0\r\n"
 				"o=iTunes %s 0 IN IP%d %s\r\n"
diff --git a/src/modules/module-raop/base64.h b/src/modules/module-raop/base64.h
new file mode 100644
index 000000000..d8906c287
--- /dev/null
+++ b/src/modules/module-raop/base64.h
@@ -0,0 +1,62 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2026 Wim Taymans */
+/* SPDX-License-Identifier: MIT */
+
+#ifndef PIPEWIRE_BASE64_H
+#define PIPEWIRE_BASE64_H
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static inline void pw_base64_encode(const uint8_t *data, size_t len, char *enc, char pad)
+{
+	static const char tab[] =
+	    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+	size_t i;
+	for (i = 0; i < len; i += 3) {
+		uint32_t v;
+		v  =              data[i+0]      << 16;
+		v |= (i+1 < len ? data[i+1] : 0) << 8;
+		v |= (i+2 < len ? data[i+2] : 0);
+		*enc++ =             tab[(v >> (3*6)) & 0x3f];
+		*enc++ =             tab[(v >> (2*6)) & 0x3f];
+		*enc++ = i+1 < len ? tab[(v >> (1*6)) & 0x3f] : pad;
+		*enc++ = i+2 < len ? tab[(v >> (0*6)) & 0x3f] : pad;
+	}
+	*enc = '\0';
+}
+
+static inline size_t pw_base64_decode(const char *data, size_t len, uint8_t *dec)
+{
+	uint8_t tab[] = {
+		62, -1, -1, -1, 63, 52, 53, 54, 55, 56,
+		57, 58, 59, 60, 61, -1, -1, -1, -1, -1,
+		-1, -1,  0,  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, -1, -1,
+		-1, -1, -1, -1, 26, 27, 28, 29, 30, 31,
+		32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+		42, 43, 44, 45, 46, 47, 48, 49, 50, 51 };
+	size_t i, j;
+	for (i = 0, j = 0; i < len; i += 4) {
+		uint32_t v;
+		v =                          tab[data[i+0]-43]  << (3*6);
+		v |=                         tab[data[i+1]-43]  << (2*6);
+		v |= (data[i+2] == '=' ? 0 : tab[data[i+2]-43]) << (1*6);
+		v |= (data[i+3] == '=' ? 0 : tab[data[i+3]-43]);
+		                      dec[j++] = (v >> 16) & 0xff;
+		if (data[i+2] != '=') dec[j++] = (v >> 8)  & 0xff;
+		if (data[i+3] != '=') dec[j++] =  v        & 0xff;
+	}
+	return j;
+}
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PIPEWIRE_BASE64_H */

From 6daa8ccc0d294071624127562f1c9bf9a753571b Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 26 Feb 2026 12:08:26 +0100
Subject: [PATCH 105/263] json-builder: zero the struct

---
 spa/include/spa/utils/json-builder.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spa/include/spa/utils/json-builder.h b/spa/include/spa/utils/json-builder.h
index 473723026..883931bcd 100644
--- a/spa/include/spa/utils/json-builder.h
+++ b/spa/include/spa/utils/json-builder.h
@@ -72,12 +72,10 @@ SPA_API_JSON_BUILDER int spa_json_builder_file(struct spa_json_builder *b, FILE
 	bool color = flags & SPA_JSON_BUILDER_FLAG_COLOR;
 	bool simple = flags & SPA_JSON_BUILDER_FLAG_SIMPLE;
 	bool space = flags & SPA_JSON_BUILDER_FLAG_SPACE;
+	spa_zero(*b);
 	b->f = f;
 	b->flags = flags;
-	b->level = 0;
-	b->indent_off = 0;
 	b->indent = 2;
-	b->count = 0;
 	b->delim = "";
 	b->comma = simple ? space ? "" : " " : ",";
 	b->key_sep = simple ? space ? " =" : "=" : ":";
@@ -94,6 +92,7 @@ SPA_API_JSON_BUILDER int spa_json_builder_memstream(struct spa_json_builder *b,
 		char **mem, size_t *size, uint32_t flags)
 {
 	FILE *f;
+	spa_zero(*b);
 	if ((f = open_memstream(mem, size)) == NULL)
 		return -errno;
 	return spa_json_builder_file(b, f, flags | SPA_JSON_BUILDER_FLAG_CLOSE);
@@ -103,6 +102,7 @@ SPA_API_JSON_BUILDER int spa_json_builder_membuf(struct spa_json_builder *b,
 		char *mem, size_t size, uint32_t flags)
 {
 	FILE *f;
+	spa_zero(*b);
 	if ((f = fmemopen(mem, size, "w")) == NULL)
 		return -errno;
 	return spa_json_builder_file(b, f, flags | SPA_JSON_BUILDER_FLAG_CLOSE);

From d6654e84a74faa7936e23f5e8a2f066c0919319d Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 4 Feb 2026 13:32:12 +0100
Subject: [PATCH 106/263] sendspin: add sendspin sender and receiver

The sender makes an input stream for each connected client. This makes
it easier to do the per client conversion using the adapter and send
different channels to clients.

The receiver uses linear regression to map ringbuffer indexes to server
timestamps and server timestamps to client timestamps. It can then
schedule playback against its own clock.
---
 spa/include/spa/utils/json-builder.h     |    2 -
 src/modules/meson.build                  |   32 +
 src/modules/module-sendspin-recv.c       | 1189 ++++++++++++++++++
 src/modules/module-sendspin-send.c       | 1389 ++++++++++++++++++++++
 src/modules/module-sendspin/regress.h    |   58 +
 src/modules/module-sendspin/sendspin.h   |   27 +
 src/modules/module-sendspin/teeny-sha1.c |  201 ++++
 src/modules/module-sendspin/websocket.c  | 1060 +++++++++++++++++
 src/modules/module-sendspin/websocket.h  |   85 ++
 src/modules/module-sendspin/zeroconf.c   |  558 +++++++++
 src/modules/module-sendspin/zeroconf.h   |   45 +
 11 files changed, 4644 insertions(+), 2 deletions(-)
 create mode 100644 src/modules/module-sendspin-recv.c
 create mode 100644 src/modules/module-sendspin-send.c
 create mode 100644 src/modules/module-sendspin/regress.h
 create mode 100644 src/modules/module-sendspin/sendspin.h
 create mode 100644 src/modules/module-sendspin/teeny-sha1.c
 create mode 100644 src/modules/module-sendspin/websocket.c
 create mode 100644 src/modules/module-sendspin/websocket.h
 create mode 100644 src/modules/module-sendspin/zeroconf.c
 create mode 100644 src/modules/module-sendspin/zeroconf.h

diff --git a/spa/include/spa/utils/json-builder.h b/spa/include/spa/utils/json-builder.h
index 883931bcd..6a4775c60 100644
--- a/spa/include/spa/utils/json-builder.h
+++ b/spa/include/spa/utils/json-builder.h
@@ -262,7 +262,6 @@ SPA_API_JSON_BUILDER void spa_json_builder_object_uint(struct spa_json_builder *
 	snprintf(str, sizeof(str), "%" PRIu64, val);
 	spa_json_builder_add_simple(b, key, INT_MAX, 'd', str, INT_MAX);
 }
-
 SPA_API_JSON_BUILDER void spa_json_builder_object_double(struct spa_json_builder *b,
 		const char *key, double val)
 {
@@ -270,7 +269,6 @@ SPA_API_JSON_BUILDER void spa_json_builder_object_double(struct spa_json_builder
 	spa_json_format_float(str, sizeof(str), (float)val);
 	spa_json_builder_add_simple(b, key, INT_MAX, 'd', str, INT_MAX);
 }
-
 SPA_API_JSON_BUILDER void spa_json_builder_object_string(struct spa_json_builder *b,
 		const char *key, const char *val)
 {
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 8636286e6..5a024be1a 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -700,6 +700,38 @@ pipewire_module_vban_recv = shared_library('pipewire-module-vban-recv',
   dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep],
 )
 
+ pipewire_module_sendspin_sources = []
+ pipewire_module_sendspin_deps = [ mathlib, dl_lib, rt_lib, pipewire_dep ]
+
+if avahi_dep.found()
+  pipewire_module_sendspin_sources += [
+    'module-sendspin/zeroconf.c',
+    'module-zeroconf-discover/avahi-poll.c',
+  ]
+  pipewire_module_sendspin_deps += avahi_dep
+endif
+
+pipewire_module_sendspin_recv = shared_library('pipewire-module-sendspin-recv',
+  [ 'module-sendspin-recv.c',
+    'module-sendspin/websocket.c',
+    pipewire_module_sendspin_sources ],
+  include_directories : [configinc],
+  install : true,
+  install_dir : modules_install_dir,
+  install_rpath: modules_install_dir,
+  dependencies : pipewire_module_sendspin_deps,
+)
+pipewire_module_sendspin_send = shared_library('pipewire-module-sendspin-send',
+  [ 'module-sendspin-send.c',
+    'module-sendspin/websocket.c',
+    pipewire_module_sendspin_sources ],
+  include_directories : [configinc],
+  install : true,
+  install_dir : modules_install_dir,
+  install_rpath: modules_install_dir,
+  dependencies : pipewire_module_sendspin_deps,
+)
+
 build_module_roc = roc_dep.found()
 if build_module_roc
   pipewire_module_roc_sink = shared_library('pipewire-module-roc-sink',
diff --git a/src/modules/module-sendspin-recv.c b/src/modules/module-sendspin-recv.c
new file mode 100644
index 000000000..7e71a1397
--- /dev/null
+++ b/src/modules/module-sendspin-recv.c
@@ -0,0 +1,1189 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2026 Wim Taymans <wim.taymans@proton.me> */
+/* SPDX-License-Identifier: MIT */
+
+#include "config.h"
+
+#include <limits.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <net/if.h>
+#include <ctype.h>
+
+#include <spa/utils/hook.h>
+#include <spa/utils/result.h>
+#include <spa/utils/ringbuffer.h>
+#include <spa/utils/defs.h>
+#include <spa/utils/dll.h>
+#include <spa/utils/json.h>
+#include <spa/utils/json-builder.h>
+#include <spa/param/audio/format-utils.h>
+#include <spa/control/control.h>
+#include <spa/debug/types.h>
+#include <spa/debug/mem.h>
+
+#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>
+
+#include "module-sendspin/sendspin.h"
+#include "module-sendspin/zeroconf.h"
+#include "module-sendspin/websocket.h"
+#include "module-sendspin/regress.h"
+#include "network-utils.h"
+
+/** \page page_module_sendspin_recv sendspin receiver
+ *
+ * The `sendspin-recv` module creates a PipeWire source that receives audio
+ * packets using the sendspin protocol.
+ *
+ * The receive will listen on a specific port (8928) and create a stream for the
+ * data on the port.
+ *
+ * ## Module Name
+ *
+ * `libpipewire-module-sendspin-recv`
+ *
+ * ## Module Options
+ *
+ * Options specific to the behavior of this module
+ *
+ * - `local.ifname = <str>`: interface name to use
+ * - `source.ip = <str>`: the source ip address to listen on, default 127.0.0.1
+ * - `source.port = <int>`: the source port to listen on, default 8928
+ * - `source.path = <str>`: the path to listen on, default "/sendspin"
+ * - `sendspin.ip`: the IP address of the sendspin server
+ * - `sendspin.port`: the port of the sendspin server, default 8927
+ * - `sendspin.path`: the path on the sendspin server, default "/sendspin"
+ * - `sendspin.client-id`: the client id, default "pipewire-$(hostname)"
+ * - `sendspin.client-name`: the client name, default "$(hostname)"
+ * - `node.always-process = <bool>`: true to receive even when not running
+ * - `stream.props = {}`: properties to be passed to all the stream
+ *
+ * ## General options
+ *
+ * Options with well-known behavior:
+ *
+ * - \ref PW_KEY_REMOTE_NAME
+ * - \ref SPA_KEY_AUDIO_LAYOUT
+ * - \ref SPA_KEY_AUDIO_POSITION
+ * - \ref PW_KEY_MEDIA_NAME
+ * - \ref PW_KEY_MEDIA_CLASS
+ * - \ref PW_KEY_NODE_NAME
+ * - \ref PW_KEY_NODE_DESCRIPTION
+ * - \ref PW_KEY_NODE_GROUP
+ * - \ref PW_KEY_NODE_LATENCY
+ * - \ref PW_KEY_NODE_VIRTUAL
+ *
+ * ## Example configuration
+ *\code{.unparsed}
+ * # ~/.config/pipewire/pipewire.conf.d/my-sendspin-recv.conf
+ *
+ * context.modules = [
+ * {   name = libpipewire-module-sendspin-recv
+ *     args = {
+ *         #local.ifname = eth0
+ *         #source.ip = 127.0.0.1
+ *         #source.port = 8928
+ *         #source.path = "/sendspin"
+ *         #sendspin.ip = 127.0.0.1
+ *         #sendspin.port = 8927
+ *         #sendspin.path = "/sendspin"
+ *         #sendspin.client-id = "pipewire-test"
+ *         #node.always-process = false
+ *         #audio.position = [ FL FR ]
+ *         stream.props = {
+ *            #media.class = "Audio/Source"
+ *            #node.name = "sendspin-receiver"
+ *         }
+ *     }
+ * }
+ * ]
+ *\endcode
+ *
+ * \since 1.6.0
+ */
+
+#define NAME "sendspin-recv"
+
+PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
+#define PW_LOG_TOPIC_DEFAULT mod_topic
+
+#define DEFAULT_SOURCE_IP	"127.0.0.1"
+#define DEFAULT_SOURCE_PORT	PW_SENDSPIN_DEFAULT_CLIENT_PORT
+#define DEFAULT_SOURCE_PATH	PW_SENDSPIN_DEFAULT_PATH
+
+#define DEFAULT_SERVER_PORT	PW_SENDSPIN_DEFAULT_SERVER_PORT
+#define DEFAULT_SENDSPIN_PATH	PW_SENDSPIN_DEFAULT_PATH
+
+
+#define DEFAULT_POSITION	"[ FL FR ]"
+
+#define USAGE   "( local.ifname=<local interface name to use> ) "						\
+		"( source.ip=<source IP address, default:"DEFAULT_SOURCE_IP"> ) "				\
+ 		"( source.port=<int, source port, default:"SPA_STRINGIFY(DEFAULT_SOURCE_PORT)"> "		\
+		"( audio.position=<channel map, default:"DEFAULT_POSITION"> ) "					\
+		"( stream.props= { key=value ... } ) "
+
+static const struct spa_dict_item module_info[] = {
+	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@proton.me>" },
+	{ PW_KEY_MODULE_DESCRIPTION, "sendspin Receiver" },
+	{ PW_KEY_MODULE_USAGE,	USAGE },
+	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
+};
+
+struct stream {
+	struct impl *impl;
+	struct spa_list link;
+
+	struct pw_websocket_connection *conn;
+	struct spa_hook conn_listener;
+
+	struct spa_audio_info info;
+	struct pw_stream *stream;
+	struct spa_hook stream_listener;
+
+	struct pw_timer timer;
+	int timeout_count;
+
+	uint32_t stride;
+	struct spa_ringbuffer ring;
+	void *buffer;
+	uint32_t buffer_size;
+
+#define ROLE_PLAYER		(1<<0)
+#define ROLE_METADATA		(1<<1)
+	uint32_t active_roles;
+#define REASON_DISCOVERY	(0)
+#define REASON_PLAYBACK		(1)
+	uint32_t connection_reason;
+
+	struct spa_regress regress_index;
+	struct spa_regress regress_time;
+
+	bool resync;
+	struct spa_dll dll;
+};
+
+struct impl {
+	struct pw_impl_module *module;
+	struct spa_hook module_listener;
+	struct pw_properties *props;
+	struct pw_context *context;
+
+	struct pw_loop *main_loop;
+	struct pw_loop *data_loop;
+	struct pw_timer_queue *timer_queue;
+
+	struct pw_core *core;
+	struct spa_hook core_listener;
+	struct spa_hook core_proxy_listener;
+	unsigned int do_disconnect:1;
+
+	struct pw_zeroconf *zeroconf;
+	struct spa_hook zeroconf_listener;
+
+	bool always_process;
+
+	struct pw_properties *stream_props;
+
+	struct pw_websocket *websocket;
+	struct spa_hook websocket_listener;
+
+	struct spa_list streams;
+};
+
+static void on_stream_destroy(void *d)
+{
+	struct stream *stream = d;
+	spa_hook_remove(&stream->stream_listener);
+	stream->stream = NULL;
+}
+
+static void on_stream_state_changed(void *d, enum pw_stream_state old,
+		enum pw_stream_state state, const char *error)
+{
+	struct stream *stream = d;
+	switch (state) {
+	case PW_STREAM_STATE_ERROR:
+	case PW_STREAM_STATE_UNCONNECTED:
+		pw_impl_module_schedule_destroy(stream->impl->module);
+		break;
+	case PW_STREAM_STATE_PAUSED:
+	case PW_STREAM_STATE_STREAMING:
+		break;
+	default:
+		break;
+	}
+}
+
+static void on_capture_stream_process(void *d)
+{
+	struct stream *stream = d;
+	struct pw_buffer *b;
+	struct spa_buffer *buf;
+	uint8_t *p;
+	uint32_t index = 0, n_frames, n_bytes;
+	int32_t avail, stride;
+	struct pw_time ts;
+	double err, corr, target, current_time;
+
+	if ((b = pw_stream_dequeue_buffer(stream->stream)) == NULL) {
+		pw_log_debug("out of buffers: %m");
+		return;
+	}
+
+	buf = b->buffer;
+	if ((p = buf->datas[0].data) == NULL)
+		return;
+
+	stride = stream->stride;
+	n_frames = buf->datas[0].maxsize / stride;
+	if (b->requested)
+		n_frames = SPA_MIN(b->requested, n_frames);
+	n_bytes = n_frames * stride;
+
+	avail = spa_ringbuffer_get_read_index(&stream->ring, &index);
+
+	if (stream->timeout_count > 4 && stream->timeout_count > 4) {
+		pw_stream_get_time_n(stream->stream, &ts, sizeof(ts));
+
+		/* index to server time */
+		target = spa_regress_calc_y(&stream->regress_index, index);
+		/* server time to client time */
+		target = spa_regress_calc_y(&stream->regress_time, target);
+
+		current_time = ts.now / 1000.0;
+		current_time -= (ts.buffered * 1000000.0 / stream->info.info.raw.rate) +
+			((ts.delay) * 1000000.0 * ts.rate.num / ts.rate.denom);
+		err = target - (double)current_time;
+
+		if (stream->resync) {
+			if (target < current_time) {
+				target = spa_regress_calc_x(&stream->regress_time, current_time);
+				index = (uint32_t)spa_regress_calc_x(&stream->regress_index, target);
+				index = SPA_ROUND_DOWN(index, stride);
+
+				pw_log_info("resync %u %f %f %f", index, target,
+						current_time, target - current_time);
+
+				spa_ringbuffer_read_update(&stream->ring, index);
+				avail = spa_ringbuffer_get_read_index(&stream->ring, &index);
+
+				err = 0.0;
+				stream->resync = false;
+			} else {
+				avail = 0;
+			}
+		}
+	} else {
+		avail = 0;
+	}
+	if (avail < (int32_t)n_bytes) {
+		avail = 0;
+		stream->resync = true;
+	}
+	else if (avail > (int32_t)stream->buffer_size) {
+		index += avail - stream->buffer_size;
+		avail = stream->buffer_size;
+		stream->resync = true;
+	}
+	if (avail > 0) {
+		n_bytes = SPA_MIN(n_bytes, (uint32_t)avail);
+
+		corr = spa_dll_update(&stream->dll, SPA_CLAMPD(err, -1000, 1000));
+
+		pw_log_trace("%u %f %f %f %f", index, current_time, target, err, corr);
+
+		pw_stream_set_rate(stream->stream, 1.0 / corr);
+
+		spa_ringbuffer_read_data(&stream->ring,
+				stream->buffer, stream->buffer_size,
+				index % stream->buffer_size,
+				p, n_bytes);
+		spa_ringbuffer_read_update(&stream->ring, index + n_bytes);
+	} else {
+		memset(p, 0, n_bytes);
+	}
+
+	buf->datas[0].chunk->offset = 0;
+	buf->datas[0].chunk->stride = stride;
+	buf->datas[0].chunk->size = n_bytes;
+
+	pw_stream_queue_buffer(stream->stream, b);
+}
+
+static const struct pw_stream_events capture_stream_events = {
+	PW_VERSION_STREAM_EVENTS,
+	.destroy = on_stream_destroy,
+	.state_changed = on_stream_state_changed,
+	.process = on_capture_stream_process
+};
+
+static int create_stream(struct stream *stream)
+{
+	struct impl *impl = stream->impl;
+	int res;
+	uint32_t n_params;
+	const struct spa_pod *params[1];
+	uint8_t buffer[1024];
+	struct spa_pod_builder b;
+	const char *server_id, *ip, *port, *server_name;
+	struct pw_properties *props = pw_properties_copy(impl->stream_props);
+
+	ip = pw_properties_get(impl->props, "sendspin.ip");
+	port = pw_properties_get(impl->props, "sendspin.port");
+	server_id = pw_properties_get(props, "sendspin.server-id");
+	server_name = pw_properties_get(props, "sendspin.server-name");
+
+	if (pw_properties_get(props, PW_KEY_NODE_NAME) == NULL)
+		pw_properties_setf(props, PW_KEY_NODE_NAME, "sendspin.%s.%s.%s", server_id, ip, port);
+	if (pw_properties_get(props, PW_KEY_NODE_DESCRIPTION) == NULL)
+		pw_properties_setf(props, PW_KEY_NODE_DESCRIPTION, "Sendspin from %s", server_name);
+	if (pw_properties_get(props, PW_KEY_MEDIA_NAME) == NULL)
+		pw_properties_setf(props, PW_KEY_MEDIA_NAME, "Sendspin from %s", server_name);
+
+	stream->stream = pw_stream_new(impl->core, "sendspin receiver", props);
+	if (stream->stream == NULL)
+		return -errno;
+
+	spa_ringbuffer_init(&stream->ring);
+	stream->buffer_size = 1024 * 1024;
+	stream->buffer = calloc(1, stream->buffer_size * stream->stride);
+
+	pw_stream_add_listener(stream->stream,
+			&stream->stream_listener,
+			&capture_stream_events, stream);
+
+	n_params = 0;
+	spa_pod_builder_init(&b, buffer, sizeof(buffer));
+	params[n_params++] = spa_format_audio_build(&b,
+			SPA_PARAM_EnumFormat, &stream->info);
+
+	if ((res = pw_stream_connect(stream->stream,
+			PW_DIRECTION_OUTPUT,
+			PW_ID_ANY,
+			PW_STREAM_FLAG_AUTOCONNECT |
+			PW_STREAM_FLAG_MAP_BUFFERS |
+			PW_STREAM_FLAG_RT_PROCESS,
+			params, n_params)) < 0)
+		return res;
+
+	return 0;
+}
+
+static void add_format(struct spa_json_builder *b, const char *codec, int channels, int rate, int depth)
+{
+	spa_json_builder_array_push(b,  "{");
+	spa_json_builder_object_string(b, "codec", codec);
+	spa_json_builder_object_int(b,    "channels", channels);
+	spa_json_builder_object_int(b,    "sample_rate", rate);
+	spa_json_builder_object_int(b,    "bit_depth", depth);
+	spa_json_builder_pop(b,         "}");
+}
+static void add_playerv1_support(struct stream *stream, struct spa_json_builder *b)
+{
+	spa_json_builder_object_push(b, "player@v1_support", "{");
+	spa_json_builder_object_push(b,   "supported_formats", "[");
+	add_format(b,                       "pcm", 2, 48000, 16);
+	add_format(b,                       "pcm", 1, 48000, 16);
+	spa_json_builder_pop(b,           "]");
+	spa_json_builder_object_int(b,    "buffer_capacity", 32000000);
+	spa_json_builder_object_push(b,   "supported_commands", "[");
+	spa_json_builder_array_string(b,    "volume");
+	spa_json_builder_array_string(b,    "mute");
+	spa_json_builder_pop(b,           "]");
+	spa_json_builder_pop(b,         "}");
+}
+static int send_client_hello(struct stream *stream)
+{
+	struct impl *impl = stream->impl;
+	struct spa_json_builder b;
+	int res;
+	char *mem;
+	size_t size;
+
+	spa_json_builder_memstream(&b, &mem, &size, 0);
+	spa_json_builder_array_push(&b,  "{");
+	spa_json_builder_object_string(&b, "type", "client/hello");
+	spa_json_builder_object_push(&b,   "payload", "{");
+	spa_json_builder_object_string(&b,   "client_id", pw_properties_get(impl->props, "sendspin.client-id"));
+	spa_json_builder_object_string(&b,   "name", pw_properties_get(impl->props, "sendspin.client-name"));
+	spa_json_builder_object_int(&b,      "version", 1);
+	spa_json_builder_object_push(&b,     "supported_roles", "[");
+	spa_json_builder_array_string(&b,      "player@v1");
+	spa_json_builder_array_string(&b,      "metadata@v1");
+	spa_json_builder_pop(&b,             "]");
+	spa_json_builder_object_push(&b,     "device_info", "{");
+	spa_json_builder_object_string(&b,     "product_name", "Linux"); /* Use os-release */
+	spa_json_builder_object_stringf(&b,    "software_version", "PipeWire %s", pw_get_library_version());
+	spa_json_builder_pop(&b,             "}");
+	add_playerv1_support(stream, &b);
+	spa_json_builder_pop(&b,           "}");
+	spa_json_builder_pop(&b,         "}");
+	spa_json_builder_close(&b);
+
+	res = pw_websocket_connection_send_text(stream->conn, mem, size);
+	free(mem);
+
+	return res;
+}
+
+static int send_client_state(struct stream *stream)
+{
+	struct spa_json_builder b;
+	int res;
+	char *mem;
+	size_t size;
+
+	spa_json_builder_memstream(&b, &mem, &size, 0);
+	spa_json_builder_array_push(&b,  "{");
+	spa_json_builder_object_string(&b, "type", "client/state");
+	spa_json_builder_object_push(&b,   "payload", "{");
+	spa_json_builder_object_push(&b,     "player", "{");
+	spa_json_builder_object_string(&b,     "state", "synchronized");
+	spa_json_builder_object_int(&b,        "volume", 100);
+	spa_json_builder_object_bool(&b,       "muted", false);
+	spa_json_builder_pop(&b,             "}");
+	spa_json_builder_pop(&b,           "}");
+	spa_json_builder_pop(&b,         "}");
+	spa_json_builder_close(&b);
+
+	res = pw_websocket_connection_send_text(stream->conn, mem, size);
+	free(mem);
+	return res;
+}
+
+static uint64_t get_time_us(struct stream *stream)
+{
+	struct timespec now;
+	if (clock_gettime(CLOCK_MONOTONIC, &now) < 0)
+		return 0;
+	return SPA_TIMESPEC_TO_USEC(&now);
+}
+
+static int send_client_time(struct stream *stream)
+{
+	struct spa_json_builder b;
+	int res;
+	uint64_t now;
+	char *mem;
+	size_t size;
+
+	now = get_time_us(stream);
+
+	spa_json_builder_memstream(&b, &mem, &size, 0);
+	spa_json_builder_array_push(&b,  "{");
+	spa_json_builder_object_string(&b, "type", "client/time");
+	spa_json_builder_object_push(&b,   "payload", "{");
+	spa_json_builder_object_uint(&b,     "client_transmitted", now);
+	spa_json_builder_pop(&b,           "}");
+	spa_json_builder_pop(&b,         "}");
+	spa_json_builder_close(&b);
+
+	res = pw_websocket_connection_send_text(stream->conn, mem, size);
+	free(mem);
+	return res;
+}
+
+static void do_stream_timer(void *data)
+{
+	struct stream *stream = data;
+	send_client_time(stream);
+}
+
+#if 0
+static int send_client_command(struct stream *stream)
+{
+	return 0;
+}
+#endif
+static int send_client_goodbye(struct stream *stream, const char *reason)
+{
+	struct spa_json_builder b;
+	int res;
+	char *mem;
+	size_t size;
+
+	spa_json_builder_memstream(&b, &mem, &size, 0);
+	spa_json_builder_array_push(&b,  "{");
+	spa_json_builder_object_string(&b, "type", "client/goodbye");
+	spa_json_builder_object_push(&b,   "payload", "{");
+	spa_json_builder_object_string(&b,   "reason", reason);
+	spa_json_builder_pop(&b,           "}");
+	spa_json_builder_pop(&b,         "}");
+	spa_json_builder_close(&b);
+
+	res = pw_websocket_connection_send_text(stream->conn, mem, size);
+	pw_websocket_connection_disconnect(stream->conn, true);
+	free(mem);
+	return res;
+}
+
+#if 0
+static int send_stream_request_format(struct stream *stream)
+{
+	return 0;
+}
+#endif
+
+static int handle_server_hello(struct stream *stream, struct spa_json *payload)
+{
+	struct impl *impl = stream->impl;
+	struct spa_json it[1];
+	char key[256], *t;
+        const char *v;
+	int l, version = 0;
+	struct stream *s, *st;
+
+	while ((l = spa_json_object_next(payload, key, sizeof(key), &v)) > 0) {
+		if (spa_streq(key, "server_id")) {
+			t = alloca(l+1);
+			spa_json_parse_stringn(v, l, t, l+1);
+			pw_properties_set(impl->stream_props, "sendspin.server-id", t);
+		}
+		else if (spa_streq(key, "name")) {
+			t = alloca(l+1);
+			spa_json_parse_stringn(v, l, t, l+1);
+			pw_properties_set(impl->stream_props, "sendspin.server-name", t);
+		}
+		else if (spa_streq(key, "version")) {
+			if (spa_json_parse_int(v, l, &version) <= 0)
+                                return -EINVAL;
+		}
+		else if (spa_streq(key, "active_roles")) {
+			if (!spa_json_is_array(v, l))
+				return -EPROTO;
+
+			spa_json_enter(payload, &it[0]);
+			while ((l = spa_json_next(&it[0], &v)) > 0) {
+				t = alloca(l+1);
+				spa_json_parse_stringn(v, l, t, l+1);
+
+				if (spa_streq(t, "player@v1"))
+					stream->active_roles |= ROLE_PLAYER;
+				else if (spa_streq(t, "metadata@v1"))
+					stream->active_roles |= ROLE_METADATA;
+			}
+		}
+		else if (spa_streq(key, "connection_reason")) {
+			t = alloca(l+1);
+			spa_json_parse_stringn(v, l, t, l+1);
+
+			if (spa_streq(t, "discovery"))
+				stream->connection_reason = REASON_DISCOVERY;
+			else if (spa_streq(t, "playback"))
+				stream->connection_reason = REASON_PLAYBACK;
+
+			pw_properties_set(impl->stream_props, "sendspin.connection-reason", t);
+		}
+	}
+	if (version != 1)
+		return -ENOTSUP;
+
+	if (stream->connection_reason == REASON_PLAYBACK) {
+		/* keep this server, destroy others */
+		spa_list_for_each_safe(s, st, &impl->streams, link) {
+			if (s == stream)
+				continue;
+			send_client_goodbye(s, "another_server");
+		}
+	} else {
+		/* keep other servers, destroy this one */
+		spa_list_for_each_safe(s, st, &impl->streams, link) {
+			if (s == stream)
+				continue;
+			return send_client_goodbye(stream, "another_server");
+		}
+	}
+	return send_client_state(stream);
+}
+
+static int handle_server_state(struct stream *stream, struct spa_json *payload)
+{
+	return 0;
+}
+
+static int parse_uint64(const char *val, int len, uint64_t *result)
+{
+        char buf[64];
+        char *end;
+
+        if (len <= 0 || len >= (int)sizeof(buf))
+                return 0;
+
+        memcpy(buf, val, len);
+        buf[len] = '\0';
+
+        *result = strtoull(buf, &end, 0);
+        return len > 0 && end == buf + len;
+}
+
+static int handle_server_time(struct stream *stream, struct spa_json *payload)
+{
+	struct impl *impl = stream->impl;
+	char key[256];
+        const char *v;
+	int l;
+	uint64_t t1 = 0, t2 = 0, t3 = 0, t4 = 0, timeout;
+
+	t4 = get_time_us(stream);
+
+	while ((l = spa_json_object_next(payload, key, sizeof(key), &v)) > 0) {
+		if (spa_streq(key, "client_transmitted")) {
+			if (parse_uint64(v, l, &t1) <= 0)
+                                return -EINVAL;
+		}
+		else if (spa_streq(key, "server_received")) {
+			if (parse_uint64(v, l, &t2) <= 0)
+                                return -EINVAL;
+		}
+		else if (spa_streq(key, "server_transmitted")) {
+			if (parse_uint64(v, l, &t3) <= 0)
+                                return -EINVAL;
+		}
+	}
+
+	spa_regress_update(&stream->regress_time, (t2+t3)/2, (t1+t4)/2);
+
+	if (stream->timeout_count < 4)
+		timeout = 200 * SPA_MSEC_PER_SEC;
+	else if (stream->timeout_count < 10)
+		timeout = SPA_NSEC_PER_SEC;
+	else if (stream->timeout_count < 20)
+		timeout = 2 * SPA_NSEC_PER_SEC;
+	else
+		timeout = 5 * SPA_NSEC_PER_SEC;
+
+	stream->timeout_count++;
+	pw_timer_queue_add(impl->timer_queue, &stream->timer,
+			&stream->timer.timeout, timeout,
+			do_stream_timer, stream);
+	return 0;
+}
+
+static int handle_server_command(struct stream *stream, struct spa_json *payload)
+{
+	return 0;
+}
+
+/* {"codec":"pcm","sample_rate":44100,"channels":2,"bit_depth":16} */
+static int parse_player(struct stream *stream, struct spa_json *player)
+{
+	char key[256], codec[64] = "";
+        const char *v;
+	int l, sample_rate = 0, channels = 0, bit_depth = 0;
+
+	spa_zero(stream->info);
+	stream->info.media_type = SPA_MEDIA_TYPE_audio;
+	while ((l = spa_json_object_next(player, key, sizeof(key), &v)) > 0) {
+		if (spa_streq(key, "codec")) {
+			if (spa_json_parse_stringn(v, l, codec, sizeof(codec)) <= 0)
+                                return -EINVAL;
+		}
+		else if (spa_streq(key, "sample_rate")) {
+			if (spa_json_parse_int(v, l, &sample_rate) <= 0)
+                                return -EINVAL;
+		}
+		else if (spa_streq(key, "channels")) {
+			if (spa_json_parse_int(v, l, &channels) <= 0)
+                                return -EINVAL;
+		}
+		else if (spa_streq(key, "bit_depth")) {
+			if (spa_json_parse_int(v, l, &bit_depth) <= 0)
+                                return -EINVAL;
+		}
+		else if (spa_streq(key, "codec_header")) {
+		}
+	}
+	if (sample_rate == 0 || channels == 0)
+		return -EINVAL;
+
+	if (spa_streq(codec, "pcm")) {
+		stream->info.media_subtype = SPA_MEDIA_SUBTYPE_raw;
+		stream->info.info.raw.rate = sample_rate;
+		stream->info.info.raw.channels = channels;
+		switch (bit_depth) {
+		case 16:
+			stream->info.info.raw.format = SPA_AUDIO_FORMAT_S16_LE;
+			stream->stride = 2 * channels;
+			break;
+		case 24:
+			stream->info.info.raw.format = SPA_AUDIO_FORMAT_S24_LE;
+			stream->stride = 3 * channels;
+			break;
+		default:
+			return -EINVAL;
+		}
+	}
+	else if (spa_streq(codec, "opus")) {
+		stream->info.media_subtype = SPA_MEDIA_SUBTYPE_opus;
+		stream->info.info.opus.rate = sample_rate;
+		stream->info.info.opus.channels = channels;
+	}
+	else if (spa_streq(codec, "flac")) {
+		stream->info.media_subtype = SPA_MEDIA_SUBTYPE_flac;
+		stream->info.info.flac.rate = sample_rate;
+		stream->info.info.flac.channels = channels;
+	}
+	else
+		return -EINVAL;
+
+	spa_dll_set_bw(&stream->dll, SPA_DLL_BW_MIN, 1000, sample_rate);
+
+	return 0;
+}
+
+/* {"player":{}} */
+static int handle_stream_start(struct stream *stream, struct spa_json *payload)
+{
+	struct impl *impl = stream->impl;
+	struct spa_json it[1];
+	char key[256];
+        const char *v;
+	int l;
+
+	while ((l = spa_json_object_next(payload, key, sizeof(key), &v)) > 0) {
+		if (spa_streq(key, "player")) {
+			if (!spa_json_is_object(v, l))
+				return -EPROTO;
+			spa_json_enter(payload, &it[0]);
+			parse_player(stream, &it[0]);
+		}
+	}
+
+	if (stream->stream == NULL) {
+		create_stream(stream);
+
+		pw_timer_queue_cancel(&stream->timer);
+		pw_timer_queue_add(impl->timer_queue, &stream->timer,
+			NULL, 0, do_stream_timer, stream);
+	} else {
+	}
+
+	return 0;
+}
+
+static void stream_clear(struct stream *stream)
+{
+	spa_ringbuffer_init(&stream->ring);
+	memset(stream->buffer, 0, stream->buffer_size);
+}
+
+static int handle_stream_clear(struct stream *stream, struct spa_json *payload)
+{
+	stream_clear(stream);
+	return 0;
+}
+static int handle_stream_end(struct stream *stream, struct spa_json *payload)
+{
+	if (stream->stream != NULL) {
+		pw_stream_destroy(stream->stream);
+		stream->stream = NULL;
+		stream_clear(stream);
+	}
+	return 0;
+}
+
+static int handle_group_update(struct stream *stream, struct spa_json *payload)
+{
+	return 0;
+}
+
+/* { "type":... "payload":{...} } */
+static int do_parse_text(struct stream *stream, const char *content, int size)
+{
+	struct spa_json it[2], *payload = NULL;
+	char key[256], type[256] = "";
+        const char *v;
+	int res, l;
+
+	pw_log_info("received text %.*s", size, content);
+
+	if (spa_json_begin_object(&it[0], content, size) <= 0)
+		return -EINVAL;
+
+	while ((l = spa_json_object_next(&it[0], key, sizeof(key), &v)) > 0) {
+		if (spa_streq(key, "payload")) {
+			if (!spa_json_is_object(v, l))
+				return -EPROTO;
+
+			spa_json_enter(&it[0], &it[1]);
+			payload = &it[1];
+		}
+		else if (spa_streq(key, "type")) {
+			if (spa_json_parse_stringn(v, l, type, sizeof(type)) <= 0)
+				continue;
+		}
+	}
+	if (spa_streq(type, "server/hello"))
+		res = handle_server_hello(stream, payload);
+	else if (spa_streq(type, "server/state"))
+		res = handle_server_state(stream, payload);
+	else if (spa_streq(type, "server/time"))
+		res = handle_server_time(stream, payload);
+	else if (spa_streq(type, "server/command"))
+		res = handle_server_command(stream, payload);
+	else if (spa_streq(type, "stream/start"))
+		res = handle_stream_start(stream, payload);
+	else if (spa_streq(type, "stream/end"))
+		res = handle_stream_end(stream, payload);
+	else if (spa_streq(type, "stream/clear"))
+		res = handle_stream_clear(stream, payload);
+	else if (spa_streq(type, "group/update"))
+		res = handle_group_update(stream, payload);
+	else
+		res = 0;
+
+	return res;
+}
+
+static int do_handle_binary(struct stream *stream, const uint8_t *payload, int size)
+{
+	struct impl *impl = stream->impl;
+	int32_t filled;
+	uint32_t index, length = size - 9;
+	uint64_t timestamp;
+
+	if (payload[0] != 4 || stream->stream == NULL)
+		return 0;
+
+	timestamp  = ((uint64_t)payload[1]) << 56;
+	timestamp |= ((uint64_t)payload[2]) << 48;
+	timestamp |= ((uint64_t)payload[3]) << 40;
+	timestamp |= ((uint64_t)payload[4]) << 32;
+	timestamp |= ((uint64_t)payload[5]) << 24;
+	timestamp |= ((uint64_t)payload[6]) << 16;
+	timestamp |= ((uint64_t)payload[7]) <<  8;
+	timestamp |= ((uint64_t)payload[8]);
+
+	filled = spa_ringbuffer_get_write_index(&stream->ring, &index);
+	if (filled < 0) {
+		pw_log_warn("%p: underrun write:%u filled:%d",
+				stream, index, filled);
+	} else if (filled + length > stream->buffer_size) {
+		pw_log_debug("%p: overrun write:%u filled:%d",
+				stream, index, filled);
+	}
+
+	spa_ringbuffer_write_data(&stream->ring,
+			stream->buffer, stream->buffer_size,
+			index % stream->buffer_size,
+			&payload[9], length);
+
+	spa_ringbuffer_write_update(&stream->ring, index + length);
+
+	pw_loop_lock(impl->data_loop);
+	spa_regress_update(&stream->regress_index, index, timestamp);
+	pw_loop_unlock(impl->data_loop);
+
+	return 0;
+}
+
+static void on_connection_message(void *data, int opcode, void *payload, size_t size)
+{
+	struct stream *stream = data;
+	if (opcode == PW_WEBSOCKET_OPCODE_TEXT) {
+		do_parse_text(stream, payload, size);
+	} else if (opcode == PW_WEBSOCKET_OPCODE_BINARY) {
+		do_handle_binary(stream, payload, size);
+	} else {
+		pw_log_warn("%02x unknown %08x", opcode, (int)size);
+	}
+}
+
+static void stream_destroy(struct stream *stream)
+{
+	handle_stream_end(stream, NULL);
+	if (stream->conn) {
+		spa_hook_remove(&stream->conn_listener);
+		pw_websocket_connection_destroy(stream->conn);
+	}
+	pw_timer_queue_cancel(&stream->timer);
+	spa_list_remove(&stream->link);
+	free(stream->buffer);
+	free(stream);
+}
+
+static void on_connection_destroy(void *data)
+{
+	struct stream *stream = data;
+	stream->conn = NULL;
+	pw_log_info("connection %p destroy", stream);
+}
+static void on_connection_error(void *data, int res, const char *reason)
+{
+	struct stream *stream = data;
+	pw_log_error("connection %p error %d %s", stream, res, reason);
+}
+
+static void on_connection_disconnected(void *data)
+{
+	struct stream *stream = data;
+	stream_destroy(stream);
+}
+
+static const struct pw_websocket_connection_events websocket_connection_events = {
+	PW_VERSION_WEBSOCKET_CONNECTION_EVENTS,
+	.destroy = on_connection_destroy,
+	.error = on_connection_error,
+	.disconnected = on_connection_disconnected,
+	.message = on_connection_message,
+};
+
+static struct stream *stream_new(struct impl *impl, struct pw_websocket_connection *conn)
+{
+	struct stream *stream;
+
+	stream = calloc(1, sizeof(*stream));
+	if (stream == NULL)
+		return NULL;
+
+	stream->impl = impl;
+	spa_list_append(&impl->streams, &stream->link);
+
+	stream->conn = conn;
+	pw_websocket_connection_add_listener(stream->conn, &stream->conn_listener,
+			&websocket_connection_events, stream);
+
+	spa_regress_init(&stream->regress_index, 5);
+	spa_regress_init(&stream->regress_time, 5);
+
+	spa_dll_init(&stream->dll);
+	stream->resync = true;
+
+	return stream;
+}
+
+static void on_websocket_connected(void *data, void *user,
+		struct pw_websocket_connection *conn, const char *path)
+{
+	struct impl *impl = data;
+	struct stream *stream;
+	pw_log_info("connected to %s", path);
+	stream = stream_new(impl, conn);
+	send_client_hello(stream);
+}
+
+static const struct pw_websocket_events websocket_events = {
+	PW_VERSION_WEBSOCKET_EVENTS,
+	.connected = on_websocket_connected,
+};
+
+static void on_zeroconf_added(void *data, void *user, const struct spa_dict *info)
+{
+}
+
+static void on_zeroconf_removed(void *data, void *user, const struct spa_dict *info)
+{
+}
+
+static const struct pw_zeroconf_events zeroconf_events = {
+	PW_VERSION_ZEROCONF_EVENTS,
+	.added = on_zeroconf_added,
+	.removed = on_zeroconf_removed,
+};
+
+static void core_destroy(void *d)
+{
+	struct impl *impl = d;
+	spa_hook_remove(&impl->core_listener);
+	impl->core = NULL;
+	pw_impl_module_schedule_destroy(impl->module);
+}
+
+static const struct pw_proxy_events core_proxy_events = {
+	.destroy = core_destroy,
+};
+
+static void impl_destroy(struct impl *impl)
+{
+	struct stream *s;
+
+	spa_list_consume(s, &impl->streams, link)
+		stream_destroy(s);
+
+	if (impl->core && impl->do_disconnect)
+		pw_core_disconnect(impl->core);
+
+	if (impl->data_loop)
+		pw_context_release_loop(impl->context, impl->data_loop);
+
+	pw_properties_free(impl->stream_props);
+	pw_properties_free(impl->props);
+
+	free(impl);
+}
+
+static void module_destroy(void *d)
+{
+	struct impl *impl = d;
+	spa_hook_remove(&impl->module_listener);
+	impl_destroy(impl);
+}
+
+static const struct pw_impl_module_events module_events = {
+	PW_VERSION_IMPL_MODULE_EVENTS,
+	.destroy = module_destroy,
+};
+
+static void on_core_error(void *d, uint32_t id, int seq, int res, const char *message)
+{
+	struct impl *impl = d;
+
+	pw_log_error("error id:%u seq:%d res:%d (%s): %s",
+			id, seq, res, spa_strerror(res), message);
+
+	if (id == PW_ID_CORE && res == -EPIPE)
+		pw_impl_module_schedule_destroy(impl->module);
+}
+
+static const struct pw_core_events core_events = {
+	PW_VERSION_CORE_EVENTS,
+	.error = on_core_error,
+};
+
+static void copy_props(struct impl *impl, struct pw_properties *props, const char *key)
+{
+	const char *str;
+	if ((str = pw_properties_get(props, key)) != NULL) {
+		if (pw_properties_get(impl->stream_props, key) == NULL)
+			pw_properties_set(impl->stream_props, key, str);
+	}
+}
+
+SPA_EXPORT
+int pipewire__module_init(struct pw_impl_module *module, const char *args)
+{
+	struct pw_context *context = pw_impl_module_get_context(module);
+	struct impl *impl;
+	const char *str, *hostname, *port, *path;
+	struct pw_properties *props, *stream_props;
+	int res = 0;
+
+	PW_LOG_TOPIC_INIT(mod_topic);
+
+	impl = calloc(1, sizeof(struct impl));
+	if (impl == NULL)
+		return -errno;
+
+	if (args == NULL)
+		args = "";
+
+	props = impl->props = pw_properties_new_string(args);
+	stream_props = impl->stream_props = pw_properties_new(NULL, NULL);
+	if (props == NULL || stream_props == NULL) {
+		res = -errno;
+		pw_log_error( "can't create properties: %m");
+		goto out;
+	}
+
+	impl->module = module;
+	impl->context = context;
+	impl->main_loop = pw_context_get_main_loop(context);
+	impl->data_loop = pw_context_acquire_loop(context, &props->dict);
+	impl->timer_queue = pw_context_get_timer_queue(context);
+	spa_list_init(&impl->streams);
+
+	pw_properties_set(props, PW_KEY_NODE_LOOP_NAME, impl->data_loop->name);
+
+	if ((str = pw_properties_get(props, "stream.props")) != NULL)
+		pw_properties_update_string(stream_props, str, strlen(str));
+
+	copy_props(impl, props, PW_KEY_NODE_LOOP_NAME);
+	copy_props(impl, props, SPA_KEY_AUDIO_LAYOUT);
+	copy_props(impl, props, SPA_KEY_AUDIO_POSITION);
+	copy_props(impl, props, PW_KEY_NODE_NAME);
+	copy_props(impl, props, PW_KEY_NODE_DESCRIPTION);
+	copy_props(impl, props, PW_KEY_NODE_GROUP);
+	copy_props(impl, props, PW_KEY_NODE_LATENCY);
+	copy_props(impl, props, PW_KEY_NODE_VIRTUAL);
+	copy_props(impl, props, PW_KEY_NODE_CHANNELNAMES);
+	copy_props(impl, props, PW_KEY_MEDIA_NAME);
+	copy_props(impl, props, PW_KEY_MEDIA_CLASS);
+
+	impl->always_process = pw_properties_get_bool(stream_props,
+			PW_KEY_NODE_ALWAYS_PROCESS, true);
+
+	if ((str = pw_properties_get(props, "sendspin.client-name")) == NULL)
+		pw_properties_set(props, "sendspin.client-name", pw_get_host_name());
+	if ((str = pw_properties_get(props, "sendspin.client-id")) == NULL)
+		pw_properties_setf(props, "sendspin.client-id", "pipewire-%s", pw_get_host_name());
+
+	impl->core = pw_context_get_object(impl->context, PW_TYPE_INTERFACE_Core);
+	if (impl->core == NULL) {
+		str = pw_properties_get(props, PW_KEY_REMOTE_NAME);
+		impl->core = pw_context_connect(impl->context,
+				pw_properties_new(
+					PW_KEY_REMOTE_NAME, str,
+					NULL),
+				0);
+		impl->do_disconnect = true;
+	}
+	if (impl->core == NULL) {
+		res = -errno;
+		pw_log_error("can't connect: %m");
+		goto out;
+	}
+
+	pw_proxy_add_listener((struct pw_proxy*)impl->core,
+			&impl->core_proxy_listener,
+			&core_proxy_events, impl);
+	pw_core_add_listener(impl->core,
+			&impl->core_listener,
+			&core_events, impl);
+
+	impl->websocket = pw_websocket_new(impl->main_loop, &props->dict);
+	pw_websocket_add_listener(impl->websocket, &impl->websocket_listener,
+			&websocket_events, impl);
+
+	if ((impl->zeroconf = pw_zeroconf_new(context, NULL)) != NULL) {
+		pw_zeroconf_add_listener(impl->zeroconf, &impl->zeroconf_listener,
+				&zeroconf_events, impl);
+	}
+
+	hostname = pw_properties_get(props, "sendspin.ip");
+	if (hostname != NULL) {
+		port = pw_properties_get(props, "sendspin.port");
+		if (port == NULL)
+			port = SPA_STRINGIFY(DEFAULT_SERVER_PORT);
+		if ((path = pw_properties_get(props, "sendspin.path")) == NULL)
+			path = DEFAULT_SENDSPIN_PATH;
+
+		pw_websocket_connect(impl->websocket, NULL, hostname, port, path);
+	} else {
+		if ((hostname = pw_properties_get(props, "source.ip")) == NULL)
+			hostname = DEFAULT_SOURCE_IP;
+		if ((port = pw_properties_get(props, "source.port")) == NULL)
+			port = SPA_STRINGIFY(DEFAULT_SOURCE_PORT);
+		if ((path = pw_properties_get(props, "source.path")) == NULL)
+			path = DEFAULT_SOURCE_PATH;
+
+		pw_websocket_listen(impl->websocket, NULL, hostname, port, path);
+
+		if (impl->zeroconf) {
+			str = pw_properties_get(props, "sendspin.client-id");
+			pw_zeroconf_set_announce(impl->zeroconf, NULL,
+				&SPA_DICT_ITEMS(
+					SPA_DICT_ITEM("zeroconf.service", PW_SENDSPIN_CLIENT_SERVICE),
+					SPA_DICT_ITEM("zeroconf.session", str),
+					SPA_DICT_ITEM("zeroconf.port", port),
+					SPA_DICT_ITEM("path", path)));
+		}
+	}
+
+	pw_impl_module_add_listener(module, &impl->module_listener, &module_events, impl);
+
+	pw_impl_module_update_properties(module, &SPA_DICT_INIT_ARRAY(module_info));
+
+	pw_log_info("Successfully loaded module-sendspin-recv");
+
+	return 0;
+out:
+	impl_destroy(impl);
+	return res;
+}
diff --git a/src/modules/module-sendspin-send.c b/src/modules/module-sendspin-send.c
new file mode 100644
index 000000000..9bc7195ce
--- /dev/null
+++ b/src/modules/module-sendspin-send.c
@@ -0,0 +1,1389 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2026 Wim Taymans <wim.taymans@proton.me> */
+/* SPDX-License-Identifier: MIT */
+
+#include "config.h"
+
+#include <limits.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <net/if.h>
+#include <ctype.h>
+
+#include <spa/utils/hook.h>
+#include <spa/utils/result.h>
+#include <spa/utils/ringbuffer.h>
+#include <spa/utils/defs.h>
+#include <spa/utils/dll.h>
+#include <spa/utils/json.h>
+#include <spa/utils/json-builder.h>
+#include <spa/param/audio/format-utils.h>
+#include <spa/control/control.h>
+#include <spa/debug/types.h>
+#include <spa/debug/mem.h>
+
+#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>
+
+#include "module-sendspin/sendspin.h"
+#include "module-sendspin/websocket.h"
+#include "module-sendspin/zeroconf.h"
+#include "network-utils.h"
+
+/** \page page_module_sendspin_send sendspin sender
+ *
+ * The `sendspin-send` module creates a PipeWire sink that sends audio
+ * packets using the sendspin protocol to a client.
+ *
+ * The sender will listen on a specific port (8927) and create a stream for
+ * each connection.
+ *
+ * In combination with a virtual sink, each of the client streams can be sent
+ * the same data in the client specific format.
+ *
+ * ## Module Name
+ *
+ * `libpipewire-module-sendspin-send`
+ *
+ * ## Module Options
+ *
+ * Options specific to the behavior of this module
+ *
+ * - `local.ifname = <str>`: interface name to use
+ * - `local.ifaddress = <str>`: interface address to use
+ * - `source.ip = <str>`: the source ip address to listen on, default "127.0.0.1"
+ * - `source.port = <int>`: the source port to listen on, default 8927
+ * - `source.path = <str>`: comma separated list of paths to listen on,
+ *                  default "/sendspin"
+ * - `sendspin.ip`: an array of IP addresses of sendspin clients to connect to
+ * - `sendspin.port`: the port of the sendspin client to connect to, default 8928
+ * - `sendspin.path`: the path of the sendspin client to connect to, default "/sendspin"
+ * - `sendspin.group-id`: the group-id of the server, default random
+ * - `sendspin.group-name`: the group-name of the server, default "PipeWire"
+ * - `sendspin.delay`: the delay to add to clients in seconds. Default 5.0
+ * - `node.always-process = <bool>`: true to send silence even when not connected.
+ * - `stream.props = {}`: properties to be passed to all the stream
+ * - `stream.rules` = <rules>: match rules, use the create-stream action to
+ *                    make a stream for the client.
+ *
+ * ## General options
+ *
+ * Options with well-known behavior:
+ *
+ * - \ref PW_KEY_REMOTE_NAME
+ * - \ref SPA_KEY_AUDIO_LAYOUT
+ * - \ref SPA_KEY_AUDIO_POSITION
+ * - \ref PW_KEY_MEDIA_NAME
+ * - \ref PW_KEY_MEDIA_CLASS
+ * - \ref PW_KEY_NODE_NAME
+ * - \ref PW_KEY_NODE_DESCRIPTION
+ * - \ref PW_KEY_NODE_GROUP
+ * - \ref PW_KEY_NODE_LATENCY
+ * - \ref PW_KEY_NODE_VIRTUAL
+ *
+ * ## Example configuration
+ *\code{.unparsed}
+ * # ~/.config/pipewire/pipewire.conf.d/my-sendspin-send.conf
+ *
+ * context.modules = [
+ * {   name = libpipewire-module-sendspin-send
+ *     args = {
+ *         #local.ifname = eth0
+ *         #source.ip = 127.0.0.1
+ *         #source.port = 8927
+ *         #source.path = "/sendspin"
+ *         #sendspin.ip = [ 127.0.0.1 ]
+ *         #sendspin.port = 8928
+ *         #sendspin.path = "/sendspin"
+ *         #sendspin.group-id = "abcded"
+ *         #sendspin.group-name = "PipeWire"
+ *         #sendspin.delay = 5.0
+ *         #node.always-process = false
+ *         #audio.position = [ FL FR ]
+ *         stream.props = {
+ *            #media.class = "Audio/sink"
+ *            #node.name = "sendspin-send"
+ *         }
+ *         stream.rules = [
+ *             {   matches = [
+ *                     {    sendspin.ip = "~.*"
+ *                          #sendspin.port = 8928
+ *                          #sendspin.path = "/sendspin"
+ *                          #zeroconf.ifindex = 0
+ *                          #zeroconf.name = ""
+ *                          #zeroconf.type = "_sendspin._tcp"
+ *                          #zeroconf.domain = "local"
+ *                          #zeroconf.hostname = ""
+ *                     }
+ *                 ]
+ *                 actions = {
+ *                     create-stream = {
+ *                         stream.props = {
+ *                             #target.object = ""
+ *                             #media.class = "Audio/Sink"
+ *                         }
+ *                     }
+ *                 }
+ *             }
+ *         ]
+ *     }
+ * }
+ * ]
+ *\endcode
+ *
+ * \since 1.6.0
+ */
+
+#define NAME "sendspin-send"
+
+PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
+#define PW_LOG_TOPIC_DEFAULT mod_topic
+
+#define DEFAULT_SOURCE_IP	"127.0.0.1"
+#define DEFAULT_SOURCE_PORT	PW_SENDSPIN_DEFAULT_SERVER_PORT
+#define DEFAULT_SOURCE_PATH	PW_SENDSPIN_DEFAULT_PATH
+
+#define DEFAULT_CLIENT_PORT	PW_SENDSPIN_DEFAULT_CLIENT_PORT
+#define DEFAULT_SENDSPIN_PATH	PW_SENDSPIN_DEFAULT_PATH
+
+#define DEFAULT_SENDSPIN_DELAY	5.0
+
+#define DEFAULT_POSITION	"[ FL FR ]"
+
+#define DEFAULT_CREATE_RULES	\
+        "[ { matches = [ { sendspin.ip = \"~.*\" } ] actions = { create-stream = { } } } ] "
+
+#define USAGE   "( local.ifname=<local interface name to use> ) "						\
+		"( source.ip=<source IP address, default:"DEFAULT_SOURCE_IP"> ) "				\
+ 		"( source.port=<int, source port, default:"SPA_STRINGIFY(DEFAULT_SOURCE_PORT)"> "		\
+		"( audio.position=<channel map, default:"DEFAULT_POSITION"> ) "					\
+		"( stream.props= { key=value ... } ) "
+
+static const struct spa_dict_item module_info[] = {
+	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@proton.me>" },
+	{ PW_KEY_MODULE_DESCRIPTION, "Sendspin sender" },
+	{ PW_KEY_MODULE_USAGE,	USAGE },
+	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
+};
+
+struct client {
+	struct impl *impl;
+	struct spa_list link;
+
+	char *name;
+	struct pw_properties *props;
+
+	struct pw_websocket_connection *conn;
+	struct spa_hook conn_listener;
+
+	struct spa_audio_info info;
+	struct pw_stream *stream;
+	struct spa_hook stream_listener;
+
+	struct spa_io_position *io_position;
+	struct pw_timer timer;
+
+	uint64_t delay_usec;
+	uint32_t stride;
+
+	int buffer_capacity;
+#define ROLE_PLAYER	(1<<0)
+#define ROLE_METADATA	(1<<1)
+	uint32_t supported_roles;
+#define COMMAND_VOLUME	(1<<0)
+#define COMMAND_MUTE	(1<<1)
+	uint32_t supported_commands;
+
+	bool playing;
+};
+
+struct impl {
+	struct pw_impl_module *module;
+	struct spa_hook module_listener;
+	struct pw_properties *props;
+	struct pw_context *context;
+
+	struct pw_loop *main_loop;
+	struct pw_loop *data_loop;
+	struct pw_timer_queue *timer_queue;
+
+	struct pw_core *core;
+	struct spa_hook core_listener;
+	struct spa_hook core_proxy_listener;
+	unsigned int do_disconnect:1;
+
+	struct pw_zeroconf *zeroconf;
+	struct spa_hook zeroconf_listener;
+
+	float delay;
+	bool always_process;
+
+	struct pw_properties *stream_props;
+
+	struct pw_websocket *websocket;
+	struct spa_hook websocket_listener;
+
+	struct spa_list clients;
+
+};
+
+static int send_group_update(struct client *c, bool playing);
+static int send_stream_start(struct client *c);
+static int send_server_state(struct client *c);
+
+static void on_stream_destroy(void *d)
+{
+	struct client *c = d;
+	spa_hook_remove(&c->stream_listener);
+	c->stream = NULL;
+}
+
+static void on_stream_state_changed(void *d, enum pw_stream_state old,
+		enum pw_stream_state state, const char *error)
+{
+	struct client *c = d;
+	switch (state) {
+	case PW_STREAM_STATE_ERROR:
+	case PW_STREAM_STATE_UNCONNECTED:
+		//pw_impl_module_schedule_destroy(c->impl->module);
+		break;
+	case PW_STREAM_STATE_PAUSED:
+		send_group_update(c, false);
+		break;
+	case PW_STREAM_STATE_STREAMING:
+		send_group_update(c, true);
+		break;
+	default:
+		break;
+	}
+}
+
+static uint64_t get_time_us(struct client *c)
+{
+	struct timespec now;
+	if (clock_gettime(CLOCK_MONOTONIC, &now) < 0)
+		return 0;
+	return SPA_TIMESPEC_TO_USEC(&now);
+}
+
+static void on_playback_stream_process(void *d)
+{
+	struct client *c = d;
+	struct pw_buffer *b;
+	struct spa_buffer *buf;
+	uint8_t *p;
+	struct iovec iov[2];
+	uint8_t header[9];
+	uint64_t timestamp;
+
+	if ((b = pw_stream_dequeue_buffer(c->stream)) == NULL) {
+		pw_log_debug("out of buffers: %m");
+		return;
+	}
+
+	if (c->playing) {
+		buf = b->buffer;
+		if ((p = buf->datas[0].data) == NULL)
+			return;
+
+		timestamp = c->io_position ?
+			c->io_position->clock.nsec / 1000 :
+			get_time_us(c);
+		timestamp += c->delay_usec;
+
+		header[0] = 4;
+		header[1] = (timestamp >> 56) & 0xff;
+		header[2] = (timestamp >> 48) & 0xff;
+		header[3] = (timestamp >> 40) & 0xff;
+		header[4] = (timestamp >> 32) & 0xff;
+		header[5] = (timestamp >> 24) & 0xff;
+		header[6] = (timestamp >> 16) & 0xff;
+		header[7] = (timestamp >>  8) & 0xff;
+		header[8] = (timestamp      ) & 0xff;
+
+		iov[0].iov_base = header;
+		iov[0].iov_len = sizeof(header);
+		iov[1].iov_base = p;
+		iov[1].iov_len = buf->datas[0].chunk->size;
+
+		pw_websocket_connection_send(c->conn,
+				PW_WEBSOCKET_OPCODE_BINARY, iov, 2);
+	}
+	pw_stream_queue_buffer(c->stream, b);
+}
+
+static void
+on_stream_param_changed(void *d, uint32_t id, const struct spa_pod *param)
+{
+	struct client *c = d;
+
+	if (param == NULL)
+		return;
+
+	switch (id) {
+	case SPA_PARAM_Format:
+		if (spa_format_audio_parse(param, &c->info) < 0)
+			return;
+		send_stream_start(c);
+		break;
+	case SPA_PARAM_Tag:
+		send_server_state(c);
+		break;
+	}
+}
+
+static void on_stream_io_changed(void *d, uint32_t id, void *area, uint32_t size)
+{
+	struct client *c = d;
+	switch (id) {
+	case SPA_IO_Position:
+		c->io_position = area;
+		break;
+	}
+}
+
+static const struct pw_stream_events playback_stream_events = {
+	PW_VERSION_STREAM_EVENTS,
+	.destroy = on_stream_destroy,
+	.io_changed = on_stream_io_changed,
+	.state_changed = on_stream_state_changed,
+	.param_changed = on_stream_param_changed,
+	.process = on_playback_stream_process
+};
+
+static int create_stream(struct client *c)
+{
+	struct impl *impl = c->impl;
+	int res;
+	uint32_t n_params;
+	const struct spa_pod *params[1];
+	uint8_t buffer[1024];
+	struct spa_pod_builder b;
+	const char *client_id, *ip, *port, *client_name;
+	struct pw_properties *props = pw_properties_copy(c->props);
+
+	ip = pw_properties_get(props, "sendspin.ip");
+	port = pw_properties_get(props, "sendspin.port");
+	client_id = pw_properties_get(props, "sendspin.client-id");
+	client_name = pw_properties_get(props, "sendspin.client-name");
+
+	if (pw_properties_get(props, PW_KEY_NODE_NAME) == NULL)
+		pw_properties_setf(props, PW_KEY_NODE_NAME, "sendspin.%s.%s.%s", client_id, ip, port);
+	if (pw_properties_get(props, PW_KEY_NODE_DESCRIPTION) == NULL)
+		pw_properties_setf(props, PW_KEY_NODE_DESCRIPTION, "Sendspin to %s", client_name);
+	if (pw_properties_get(props, PW_KEY_MEDIA_NAME) == NULL)
+		pw_properties_setf(props, PW_KEY_MEDIA_NAME, "Sendspin to %s", client_name);
+
+
+	c->stream = pw_stream_new(impl->core, "sendspin sender", props);
+	if (c->stream == NULL)
+		return -errno;
+
+	pw_stream_add_listener(c->stream,
+			&c->stream_listener,
+			&playback_stream_events, c);
+
+	n_params = 0;
+	spa_pod_builder_init(&b, buffer, sizeof(buffer));
+	params[n_params++] = spa_format_audio_build(&b,
+			SPA_PARAM_EnumFormat, &c->info);
+
+	if ((res = pw_stream_connect(c->stream,
+			PW_DIRECTION_INPUT,
+			PW_ID_ANY,
+			PW_STREAM_FLAG_AUTOCONNECT |
+			PW_STREAM_FLAG_MAP_BUFFERS |
+			PW_STREAM_FLAG_RT_PROCESS,
+			params, n_params)) < 0)
+		return res;
+
+	return 0;
+}
+
+static int send_server_hello(struct client *c)
+{
+	struct impl *impl = c->impl;
+	struct spa_json_builder b;
+	int res;
+	size_t size;
+	char *mem;
+
+	spa_json_builder_memstream(&b, &mem, &size, 0);
+	spa_json_builder_array_push(&b,   "{");
+	spa_json_builder_object_string(&b,  "type", "server/hello");
+	spa_json_builder_object_push(&b,    "payload", "{");
+	spa_json_builder_object_string(&b,    "server_id", pw_properties_get(impl->props, "sendspin.server-id"));
+	spa_json_builder_object_string(&b,    "name", pw_properties_get(impl->props, "sendspin.server-name"));
+	spa_json_builder_object_int(&b,       "version", 1);
+	spa_json_builder_object_push(&b,      "active_roles", "[");
+	if (c->supported_roles & ROLE_PLAYER)
+		spa_json_builder_array_string(&b, "player@v1");
+	if (c->supported_roles & ROLE_METADATA)
+		spa_json_builder_array_string(&b, "metadata@v1");
+	spa_json_builder_pop(&b,              "]");
+	spa_json_builder_object_string(&b,    "connection_reason", "discovery");
+	spa_json_builder_pop(&b,            "}");
+	spa_json_builder_pop(&b,          "}");
+	spa_json_builder_close(&b);
+
+	res = pw_websocket_connection_send_text(c->conn, mem, size);
+	free(mem);
+
+	return res;
+}
+
+static int send_server_state(struct client *c)
+{
+	struct spa_json_builder b;
+	int res;
+	size_t size;
+	char *mem;
+
+	if (!SPA_FLAG_IS_SET(c->supported_roles, ROLE_METADATA))
+		return 0;
+
+	spa_json_builder_memstream(&b, &mem, &size, 0);
+	spa_json_builder_array_push(&b,  "{");
+	spa_json_builder_object_string(&b, "type", "server/state");
+	spa_json_builder_object_push(&b,   "payload", "{");
+	spa_json_builder_object_push(&b,     "metadata", "{");
+	spa_json_builder_object_uint(&b,       "timestamp", get_time_us(c));
+	spa_json_builder_pop(&b,             "}");
+	spa_json_builder_pop(&b,           "}");
+	spa_json_builder_pop(&b,         "}");
+	spa_json_builder_close(&b);
+
+	res = pw_websocket_connection_send_text(c->conn, mem, size);
+	free(mem);
+	return res;
+}
+
+static int send_server_time(struct client *c, uint64_t t1, uint64_t t2)
+{
+	struct spa_json_builder b;
+	int res;
+	uint64_t t3;
+	size_t size;
+	char *mem;
+
+	t3 = get_time_us(c);
+
+	spa_json_builder_memstream(&b, &mem, &size, 0);
+	spa_json_builder_array_push(&b,  "{");
+	spa_json_builder_object_string(&b, "type", "server/time");
+	spa_json_builder_object_push(&b,   "payload", "{");
+	spa_json_builder_object_uint(&b,     "client_transmitted", t1);
+	spa_json_builder_object_uint(&b,     "server_received", t2);
+	spa_json_builder_object_uint(&b,     "server_transmitted", t3);
+	spa_json_builder_pop(&b,           "}");
+	spa_json_builder_pop(&b,         "}");
+	spa_json_builder_close(&b);
+
+	res = pw_websocket_connection_send_text(c->conn, mem, size);
+	free(mem);
+	return res;
+}
+
+#if 0
+static int send_server_command(struct client *c)
+{
+	return 0;
+}
+#endif
+
+static int send_stream_start(struct client *c)
+{
+	struct spa_json_builder b;
+	int res, channels, rate, depth = 0;
+	const char *codec;
+	size_t size;
+	char *mem;
+
+	switch (c->info.media_subtype) {
+	case SPA_MEDIA_SUBTYPE_raw:
+		codec = "pcm";
+		channels = c->info.info.raw.channels;
+		rate = c->info.info.raw.rate;
+		switch (c->info.info.raw.format) {
+		case SPA_AUDIO_FORMAT_S16_LE:
+			depth = 16;
+			break;
+		case SPA_AUDIO_FORMAT_S24_LE:
+			depth = 24;
+			break;
+		default:
+			return -ENOTSUP;
+		}
+		break;
+	case SPA_MEDIA_SUBTYPE_opus:
+		codec = "opus";
+		channels = c->info.info.opus.channels;
+		rate = c->info.info.opus.rate;
+		break;
+	case SPA_MEDIA_SUBTYPE_flac:
+		codec = "flac";
+		channels = c->info.info.flac.channels;
+		rate = c->info.info.flac.rate;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	spa_json_builder_memstream(&b, &mem, &size, 0);
+	spa_json_builder_array_push(&b,   "{");
+	spa_json_builder_object_string(&b,  "type", "stream/start");
+	spa_json_builder_object_push(&b,    "payload", "{");
+	spa_json_builder_object_push(&b,      "player", "{");
+	spa_json_builder_object_string(&b,      "codec", codec);
+	spa_json_builder_object_int(&b,         "channels", channels);
+	spa_json_builder_object_int(&b,         "sample_rate", rate);
+	if (depth)
+		spa_json_builder_object_int(&b, "bit_depth", depth);
+	spa_json_builder_pop(&b,              "}");
+	spa_json_builder_pop(&b,            "}");
+	spa_json_builder_pop(&b,          "}");
+	spa_json_builder_close(&b);
+
+	res = pw_websocket_connection_send_text(c->conn, mem, size);
+	free(mem);
+	return res;
+}
+
+#if 0
+static int send_stream_end(struct client *c)
+{
+	struct spa_json_builder b;
+	int res;
+	size_t size;
+	char *mem;
+
+	spa_json_builder_memstream(&b, &mem, &size, 0);
+	spa_json_builder_array_push(&b,  "{");
+	spa_json_builder_object_string(&b, "type", "stream/end");
+	spa_json_builder_object_push(&b,   "payload", "{");
+	spa_json_builder_object_push(&b,     "roles", "[");
+	spa_json_builder_array_string(&b,      "player");
+	spa_json_builder_array_string(&b,      "metadata");
+	spa_json_builder_pop(&b,             "]");
+	spa_json_builder_pop(&b,           "}");
+	spa_json_builder_pop(&b,         "}");
+	spa_json_builder_close(&b);
+
+	res = pw_websocket_connection_send_text(c->conn, mem, size);
+	free(mem);
+	return res;
+}
+#endif
+
+static int send_group_update(struct client *c, bool playing)
+{
+	struct impl *impl = c->impl;
+	struct spa_json_builder b;
+	int res;
+	char *mem;
+	size_t size;
+
+	spa_json_builder_memstream(&b, &mem, &size, 0);
+	spa_json_builder_array_push(&b,  "{");
+	spa_json_builder_object_string(&b, "type", "group/update");
+	spa_json_builder_object_push(&b,   "payload", "{");
+	spa_json_builder_object_string(&b,   "playback_state", playing ? "playing" : "stopped");
+	spa_json_builder_object_string(&b,   "group_id", pw_properties_get(impl->props, "sendspin.group-id"));
+	spa_json_builder_object_string(&b,   "group_name", pw_properties_get(impl->props, "sendspin.group-name"));
+	spa_json_builder_pop(&b,           "}");
+	spa_json_builder_pop(&b,         "}");
+	spa_json_builder_close(&b);
+
+	c->playing = playing;
+
+	res = pw_websocket_connection_send_text(c->conn, mem, size);
+	free(mem);
+	return res;
+}
+
+/* {"codec":"pcm","sample_rate":44100,"channels":2,"bit_depth":16} */
+static int parse_codec(struct client *c, struct spa_json *object, struct spa_audio_info *info)
+{
+	char key[256], codec[64] = "";
+        const char *v;
+	int l, sample_rate = 0, channels = 0, bit_depth = 0;
+
+	spa_zero(*info);
+	info->media_type = SPA_MEDIA_TYPE_audio;
+	while ((l = spa_json_object_next(object, key, sizeof(key), &v)) > 0) {
+		if (spa_streq(key, "codec")) {
+			if (spa_json_parse_stringn(v, l, codec, sizeof(codec)) <= 0)
+                                return -EINVAL;
+		}
+		else if (spa_streq(key, "sample_rate")) {
+			if (spa_json_parse_int(v, l, &sample_rate) <= 0)
+                                return -EINVAL;
+		}
+		else if (spa_streq(key, "channels")) {
+			if (spa_json_parse_int(v, l, &channels) <= 0)
+                                return -EINVAL;
+		}
+		else if (spa_streq(key, "bit_depth")) {
+			if (spa_json_parse_int(v, l, &bit_depth) <= 0)
+                                return -EINVAL;
+		}
+		else if (spa_streq(key, "codec_header")) {
+		}
+	}
+	if (sample_rate == 0 || channels == 0)
+		return -EINVAL;
+
+	if (spa_streq(codec, "pcm")) {
+		info->media_subtype = SPA_MEDIA_SUBTYPE_raw;
+		info->info.raw.rate = sample_rate;
+		info->info.raw.channels = channels;
+		switch (bit_depth) {
+		case 16:
+			info->info.raw.format = SPA_AUDIO_FORMAT_S16_LE;
+			break;
+		case 24:
+			info->info.raw.format = SPA_AUDIO_FORMAT_S24_LE;
+			break;
+		default:
+			return -EINVAL;
+		}
+	}
+	else if (spa_streq(codec, "opus")) {
+		info->media_subtype = SPA_MEDIA_SUBTYPE_opus;
+		info->info.opus.rate = sample_rate;
+		info->info.opus.channels = channels;
+	}
+	else if (spa_streq(codec, "flac")) {
+		info->media_subtype = SPA_MEDIA_SUBTYPE_flac;
+		info->info.flac.rate = sample_rate;
+		info->info.flac.channels = channels;
+	}
+	else
+		return -EINVAL;
+
+	return 0;
+}
+
+static int parse_player_v1_support(struct client *c, struct spa_json *payload)
+{
+	struct spa_json it[2];
+	char key[256], *t;
+        const char *v;
+	int l, res;
+
+	while ((l = spa_json_object_next(payload, key, sizeof(key), &v)) > 0) {
+		if (spa_streq(key, "supported_formats")) {
+			int count = 0;
+
+			if (!spa_json_is_array(v, l))
+				return -EPROTO;
+			spa_json_enter(payload, &it[0]);
+
+			while ((l = spa_json_next(&it[0], &v)) > 0) {
+				struct spa_audio_info info;
+				if (!spa_json_is_object(v, l))
+					return -EPROTO;
+
+				spa_json_enter(&it[0], &it[1]);
+				if ((res = parse_codec(c, &it[1], &info)) < 0)
+					return res;
+
+				if (count++ == 0)
+					c->info = info;
+			}
+		}
+		else if (spa_streq(key, "buffer_capacity")) {
+			if (spa_json_parse_int(v, l, &c->buffer_capacity) <= 0)
+                                return -EINVAL;
+		}
+		else if (spa_streq(key, "supported_commands")) {
+			if (!spa_json_is_array(v, l))
+				return -EPROTO;
+			spa_json_enter(payload, &it[0]);
+
+			while ((l = spa_json_next(&it[0], &v)) > 0) {
+				t = alloca(l+1);
+				spa_json_parse_stringn(v, l, t, l+1);
+				if (spa_streq(t, "volume"))
+					c->supported_commands |= COMMAND_VOLUME;
+				else if (spa_streq(t, "mute"))
+					c->supported_commands |= COMMAND_MUTE;
+			}
+		}
+	}
+	return 0;
+}
+
+static int handle_client_hello(struct client *c, struct spa_json *payload)
+{
+	struct spa_json it[1];
+	char key[256], *t;
+        const char *v;
+	int res, l, version = 0;
+
+	while ((l = spa_json_object_next(payload, key, sizeof(key), &v)) > 0) {
+		if (spa_streq(key, "client_id")) {
+			t = alloca(l+1);
+			spa_json_parse_stringn(v, l, t, l+1);
+			pw_properties_set(c->props, "sendspin.client-id", t);
+		}
+		else if (spa_streq(key, "name")) {
+			t = alloca(l+1);
+			spa_json_parse_stringn(v, l, t, l+1);
+			pw_properties_set(c->props, "sendspin.client-name", t);
+		}
+		else if (spa_streq(key, "version")) {
+			if (spa_json_parse_int(v, l, &version) <= 0)
+                                return -EINVAL;
+		}
+		else if (spa_streq(key, "supported_roles")) {
+			if (!spa_json_is_array(v, l))
+				return -EPROTO;
+
+			spa_json_enter(payload, &it[0]);
+			while ((l = spa_json_next(&it[0], &v)) > 0) {
+				t = alloca(l+1);
+				spa_json_parse_stringn(v, l, t, l+1);
+
+				if (spa_streq(t, "player@v1"))
+					c->supported_roles |= ROLE_PLAYER;
+				else if (spa_streq(t, "metadata@v1"))
+					c->supported_roles |= ROLE_METADATA;
+			}
+		}
+		else if (spa_streq(key, "player_support") ||
+		    spa_streq(key, "player@v1_support")) {
+			if (!spa_json_is_object(v, l))
+				return -EPROTO;
+			spa_json_enter(payload, &it[0]);
+			if ((res = parse_player_v1_support(c, &it[0])) < 0)
+				return res;
+		}
+	}
+	if (version != 1)
+		return -ENOTSUP;
+
+	return send_server_hello(c);
+}
+
+static int handle_client_state(struct client *c, struct spa_json *payload)
+{
+	struct spa_json it[1];
+	char key[256];
+        const char *v;
+	int l;
+
+	while ((l = spa_json_object_next(payload, key, sizeof(key), &v)) > 0) {
+		if (spa_streq(key, "player")) {
+			if (!spa_json_is_object(v, l))
+				return -EPROTO;
+			spa_json_enter(payload, &it[0]);
+			while ((l = spa_json_object_next(&it[0], key, sizeof(key), &v)) > 0) {
+				if (spa_streq(key, "state")) {
+				}
+				else if (spa_streq(key, "volume")) {
+				}
+				else if (spa_streq(key, "mute")) {
+				}
+			}
+		}
+	}
+	if (c->stream == NULL)
+		create_stream(c);
+	return 0;
+}
+
+static int parse_uint64(const char *val, int len, uint64_t *result)
+{
+        char buf[64];
+        char *end;
+
+        if (len <= 0 || len >= (int)sizeof(buf))
+                return 0;
+
+        memcpy(buf, val, len);
+        buf[len] = '\0';
+
+        *result = strtoull(buf, &end, 0);
+        return len > 0 && end == buf + len;
+}
+
+static int handle_client_time(struct client *c, struct spa_json *payload)
+{
+	char key[256];
+        const char *v;
+	int l;
+	uint64_t t1 = 0,t2;
+
+	t2 = get_time_us(c);
+
+	while ((l = spa_json_object_next(payload, key, sizeof(key), &v)) > 0) {
+		if (spa_streq(key, "client_transmitted")) {
+			if (parse_uint64(v, l, &t1) <= 0)
+                                return -EINVAL;
+		}
+	}
+	if (t1 == 0)
+		return -EPROTO;
+
+	return send_server_time(c, t1, t2);
+}
+
+static int handle_client_command(struct client *c, struct spa_json *payload)
+{
+	return 0;
+}
+
+/* {"player":{}} */
+static int handle_stream_request_format(struct client *c, struct spa_json *payload)
+{
+	struct spa_json it[1];
+	char key[256];
+        const char *v;
+	int l;
+
+	while ((l = spa_json_object_next(payload, key, sizeof(key), &v)) > 0) {
+		if (spa_streq(key, "player")) {
+			if (!spa_json_is_object(v, l))
+				return -EPROTO;
+			spa_json_enter(payload, &it[0]);
+			parse_codec(c, &it[0], &c->info);
+		}
+	}
+	return 0;
+}
+
+static int handle_client_goodbye(struct client *c, struct spa_json *payload)
+{
+	if (c->stream != NULL) {
+		pw_stream_destroy(c->stream);
+		c->stream = NULL;
+	}
+	return 0;
+}
+
+/* { "type":... "payload":{...} } */
+static int do_parse_text(struct client *c, const char *content, int size)
+{
+	struct spa_json it[2], *payload = NULL;
+	char key[256], type[256] = "";
+        const char *v;
+	int res, l;
+
+	pw_log_info("received text %.*s", size, content);
+
+	if (spa_json_begin_object(&it[0], content, size) <= 0)
+		return -EINVAL;
+
+	while ((l = spa_json_object_next(&it[0], key, sizeof(key), &v)) > 0) {
+		if (spa_streq(key, "payload")) {
+			if (!spa_json_is_object(v, l))
+				return -EPROTO;
+
+			spa_json_enter(&it[0], &it[1]);
+			payload = &it[1];
+		}
+		else if (spa_streq(key, "type")) {
+			if (spa_json_parse_stringn(v, l, type, sizeof(type)) <= 0)
+				continue;
+		}
+	}
+	if (spa_streq(type, "client/hello"))
+		res = handle_client_hello(c, payload);
+	else if (spa_streq(type, "client/state"))
+		res = handle_client_state(c, payload);
+	else if (spa_streq(type, "client/time"))
+		res = handle_client_time(c, payload);
+	else if (spa_streq(type, "client/command"))
+		res = handle_client_command(c, payload);
+	else if (spa_streq(type, "client/goodbye"))
+		res = handle_client_goodbye(c, payload);
+	else if (spa_streq(type, "stream/request-format"))
+		res = handle_stream_request_format(c, payload);
+	else
+		res = 0;
+
+	return res;
+}
+
+static void on_connection_message(void *data, int opcode, void *payload, size_t size)
+{
+	struct client *c = data;
+	if (opcode == PW_WEBSOCKET_OPCODE_TEXT) {
+		do_parse_text(c, payload, size);
+	} else {
+		pw_log_warn("%02x unknown %08x", opcode, (int)size);
+	}
+}
+
+static void client_free(struct client *c)
+{
+	struct impl *impl = c->impl;
+
+	handle_client_goodbye(c, NULL);
+	if (c->conn) {
+		spa_hook_remove(&c->conn_listener);
+		pw_websocket_connection_destroy(c->conn);
+	} else {
+		pw_websocket_cancel(impl->websocket, c);
+	}
+	pw_timer_queue_cancel(&c->timer);
+	spa_list_remove(&c->link);
+	free(c);
+}
+
+static void on_connection_destroy(void *data)
+{
+	struct client *c = data;
+	c->conn = NULL;
+	pw_log_info("connection %p destroy", c);
+}
+
+static void on_connection_error(void *data, int res, const char *reason)
+{
+	struct client *c = data;
+	pw_log_error("connection %p error %d %s", c, res, reason);
+}
+
+static void on_connection_disconnected(void *data)
+{
+	struct client *c = data;
+	client_free(c);
+}
+
+static const struct pw_websocket_connection_events websocket_connection_events = {
+	PW_VERSION_WEBSOCKET_CONNECTION_EVENTS,
+	.destroy = on_connection_destroy,
+	.error = on_connection_error,
+	.disconnected = on_connection_disconnected,
+	.message = on_connection_message,
+};
+
+static struct client *client_new(struct impl *impl, const char *name, struct pw_properties *props)
+{
+	struct client *c;
+
+	if ((c = calloc(1, sizeof(*c))) == NULL)
+		goto error;
+
+	c->impl = impl;
+	spa_list_append(&impl->clients, &c->link);
+
+	c->props = props;
+	c->name = name ? strdup(name) : NULL;
+	c->delay_usec = (uint64_t)(impl->delay * SPA_USEC_PER_SEC);
+
+	return c;
+error:
+	pw_properties_free(props);
+	return NULL;
+}
+
+static int client_connect(struct client *c)
+{
+	struct impl *impl = c->impl;
+	const char *addr, *port, *path;
+	addr = pw_properties_get(c->props, "sendspin.ip");
+	port = pw_properties_get(c->props, "sendspin.port");
+	path = pw_properties_get(c->props, "sendspin.path");
+	return pw_websocket_connect(impl->websocket, c, addr, port, path);
+}
+
+static void client_connected(struct client *c, struct pw_websocket_connection *conn)
+{
+	if (c->conn) {
+		spa_hook_remove(&c->conn_listener);
+		pw_websocket_connection_destroy(c->conn);
+	}
+	c->conn = conn;
+	if (conn)
+		pw_websocket_connection_add_listener(c->conn, &c->conn_listener,
+				&websocket_connection_events, c);
+}
+
+static struct client *client_find(struct impl *impl, const char *name)
+{
+	struct client *c;
+	spa_list_for_each(c, &impl->clients, link) {
+		if (spa_streq(c->name, name))
+			return c;
+	}
+	return NULL;
+}
+
+struct match_info {
+	struct impl *impl;
+	const char *name;
+	struct pw_properties *props;
+	struct pw_websocket_connection *conn;
+	bool matched;
+};
+
+static int rule_matched(void *data, const char *location, const char *action,
+                        const char *str, size_t len)
+{
+	struct match_info *i = data;
+	struct impl *impl = i->impl;
+	int res = 0;
+
+	i->matched = true;
+	if (spa_streq(action, "create-stream")) {
+		struct client *c;
+
+		pw_properties_update_string(i->props, str, len);
+		if ((c = client_new(impl, i->name, spa_steal_ptr(i->props))) == NULL)
+			return -errno;
+		if (i->conn)
+			client_connected(c, i->conn);
+		else
+			client_connect(c);
+	}
+	return res;
+}
+
+static int match_client(struct impl *impl, const char *name, struct pw_properties *props,
+		struct pw_websocket_connection *conn)
+{
+	const char *str;
+	struct match_info minfo = {
+		.impl = impl,
+		.name = name,
+		.props = props,
+		.conn = conn,
+	};
+
+	if ((str = pw_properties_get(impl->props, "stream.rules")) == NULL)
+		str = DEFAULT_CREATE_RULES;
+
+	pw_conf_match_rules(str, strlen(str), NAME, &props->dict,
+			rule_matched, &minfo);
+
+	if (!minfo.matched) {
+		pw_log_info("unmatched client found %s", str);
+		if (conn)
+			pw_websocket_connection_destroy(conn);
+		pw_properties_free(props);
+	}
+	return minfo.matched;
+}
+
+static void on_websocket_connected(void *data, void *user,
+		struct pw_websocket_connection *conn, const char *path)
+{
+	struct impl *impl = data;
+	struct client *c = user;
+
+	pw_log_info("connected to %s", path);
+	if (c == NULL) {
+		struct sockaddr_storage addr;
+		char ip[128];
+		uint16_t port = 0;
+		bool ipv4;
+		struct pw_properties *props;
+
+		pw_websocket_connection_address(conn,
+				(struct sockaddr*)&addr, sizeof(addr));
+
+		props = pw_properties_copy(impl->stream_props);
+		if (pw_net_get_ip(&addr, ip, sizeof(ip), &ipv4, &port) >= 0) {
+			pw_properties_set(props, "sendspin.ip", ip);
+			pw_properties_setf(props, "sendspin.port", "%u", port);
+		}
+		pw_properties_set(props, "sendspin.path", path);
+
+		match_client(impl, "", props, conn);
+	} else {
+		client_connected(c, conn);
+	}
+}
+
+static const struct pw_websocket_events websocket_events = {
+	PW_VERSION_WEBSOCKET_EVENTS,
+	.connected = on_websocket_connected,
+};
+
+static void on_zeroconf_added(void *data, void *user, const struct spa_dict *info)
+{
+	struct impl *impl = data;
+	const char *name, *addr, *port, *path;
+	struct client *c;
+	struct pw_properties *props;
+
+	name = spa_dict_lookup(info, "zeroconf.hostname");
+
+	if ((c = client_find(impl, name)) != NULL)
+		return;
+
+	props = pw_properties_copy(impl->stream_props);
+	pw_properties_update(props, info);
+
+	addr = spa_dict_lookup(info, "zeroconf.address");
+	port = spa_dict_lookup(info, "zeroconf.port");
+	path = spa_dict_lookup(info, "path");
+
+	pw_properties_set(props, "sendspin.ip", addr);
+	pw_properties_set(props, "sendspin.port", port);
+	pw_properties_set(props, "sendspin.path", path);
+
+	match_client(impl, name, props, NULL);
+}
+
+static void on_zeroconf_removed(void *data, void *user, const struct spa_dict *info)
+{
+	struct impl *impl = data;
+	const char *name;
+	struct client *c;
+
+	name = spa_dict_lookup(info, "zeroconf.hostname");
+
+	if ((c = client_find(impl, name)) == NULL)
+		return;
+
+	client_free(c);
+}
+
+static const struct pw_zeroconf_events zeroconf_events = {
+	PW_VERSION_ZEROCONF_EVENTS,
+	.added = on_zeroconf_added,
+	.removed = on_zeroconf_removed,
+};
+
+static void core_destroy(void *d)
+{
+	struct impl *impl = d;
+	spa_hook_remove(&impl->core_listener);
+	impl->core = NULL;
+	pw_impl_module_schedule_destroy(impl->module);
+}
+
+static const struct pw_proxy_events core_proxy_events = {
+	.destroy = core_destroy,
+};
+
+static void impl_destroy(struct impl *impl)
+{
+	struct client *c;
+	spa_list_consume(c, &impl->clients, link)
+		client_free(c);
+
+	if (impl->core && impl->do_disconnect)
+		pw_core_disconnect(impl->core);
+
+	if (impl->data_loop)
+		pw_context_release_loop(impl->context, impl->data_loop);
+
+	if (impl->zeroconf)
+		pw_zeroconf_destroy(impl->zeroconf);
+
+	pw_properties_free(impl->stream_props);
+	pw_properties_free(impl->props);
+
+	free(impl);
+}
+
+static void module_destroy(void *d)
+{
+	struct impl *impl = d;
+	spa_hook_remove(&impl->module_listener);
+	impl_destroy(impl);
+}
+
+static const struct pw_impl_module_events module_events = {
+	PW_VERSION_IMPL_MODULE_EVENTS,
+	.destroy = module_destroy,
+};
+
+static void on_core_error(void *d, uint32_t id, int seq, int res, const char *message)
+{
+	struct impl *impl = d;
+
+	pw_log_error("error id:%u seq:%d res:%d (%s): %s",
+			id, seq, res, spa_strerror(res), message);
+
+	if (id == PW_ID_CORE && res == -EPIPE)
+		pw_impl_module_schedule_destroy(impl->module);
+}
+
+static const struct pw_core_events core_events = {
+	PW_VERSION_CORE_EVENTS,
+	.error = on_core_error,
+};
+
+static void copy_props(struct impl *impl, struct pw_properties *props, const char *key)
+{
+	const char *str;
+	if ((str = pw_properties_get(props, key)) != NULL) {
+		if (pw_properties_get(impl->stream_props, key) == NULL)
+			pw_properties_set(impl->stream_props, key, str);
+	}
+}
+
+SPA_EXPORT
+int pipewire__module_init(struct pw_impl_module *module, const char *args)
+{
+	struct pw_context *context = pw_impl_module_get_context(module);
+	struct impl *impl;
+	const char *str, *hostname, *port, *path;
+	struct pw_properties *props, *stream_props;
+	int res = 0;
+
+	PW_LOG_TOPIC_INIT(mod_topic);
+
+	impl = calloc(1, sizeof(struct impl));
+	if (impl == NULL)
+		return -errno;
+
+	if (args == NULL)
+		args = "";
+
+	props = impl->props = pw_properties_new_string(args);
+	stream_props = impl->stream_props = pw_properties_new(NULL, NULL);
+	if (props == NULL || stream_props == NULL) {
+		res = -errno;
+		pw_log_error( "can't create properties: %m");
+		goto out;
+	}
+
+	impl->module = module;
+	impl->context = context;
+	impl->main_loop = pw_context_get_main_loop(context);
+	impl->data_loop = pw_context_acquire_loop(context, &props->dict);
+	impl->timer_queue = pw_context_get_timer_queue(context);
+	spa_list_init(&impl->clients);
+
+	pw_properties_set(props, PW_KEY_NODE_LOOP_NAME, impl->data_loop->name);
+
+	if ((str = pw_properties_get(props, "stream.props")) != NULL)
+		pw_properties_update_string(stream_props, str, strlen(str));
+
+	copy_props(impl, props, PW_KEY_NODE_LOOP_NAME);
+	copy_props(impl, props, SPA_KEY_AUDIO_LAYOUT);
+	copy_props(impl, props, SPA_KEY_AUDIO_POSITION);
+	copy_props(impl, props, PW_KEY_NODE_NAME);
+	copy_props(impl, props, PW_KEY_NODE_DESCRIPTION);
+	copy_props(impl, props, PW_KEY_NODE_GROUP);
+	copy_props(impl, props, PW_KEY_NODE_LATENCY);
+	copy_props(impl, props, PW_KEY_NODE_VIRTUAL);
+	copy_props(impl, props, PW_KEY_NODE_CHANNELNAMES);
+	copy_props(impl, props, PW_KEY_MEDIA_NAME);
+	copy_props(impl, props, PW_KEY_MEDIA_CLASS);
+
+	impl->always_process = pw_properties_get_bool(stream_props,
+			PW_KEY_NODE_ALWAYS_PROCESS, true);
+
+	if ((str = pw_properties_get(props, "sendspin.group-id")) == NULL) {
+		uint64_t group_id;
+		pw_random(&group_id, sizeof(group_id));
+		pw_properties_setf(props, "sendspin.group-id", "%016"PRIx64, group_id);
+	}
+	if ((str = pw_properties_get(props, "sendspin.group-name")) == NULL)
+		pw_properties_set(props, "sendspin.group-name", "PipeWire");
+	if ((str = pw_properties_get(props, "sendspin.server-name")) == NULL)
+		pw_properties_set(props, "sendspin.server-name", pw_get_host_name());
+	if ((str = pw_properties_get(props, "sendspin.server-id")) == NULL)
+		pw_properties_setf(props, "sendspin.server-id", "pipewire-%s", pw_get_host_name());
+
+	impl->core = pw_context_get_object(impl->context, PW_TYPE_INTERFACE_Core);
+	if (impl->core == NULL) {
+		str = pw_properties_get(props, PW_KEY_REMOTE_NAME);
+		impl->core = pw_context_connect(impl->context,
+				pw_properties_new(
+					PW_KEY_REMOTE_NAME, str,
+					NULL),
+				0);
+		impl->do_disconnect = true;
+	}
+	if (impl->core == NULL) {
+		res = -errno;
+		pw_log_error("can't connect: %m");
+		goto out;
+	}
+
+	pw_proxy_add_listener((struct pw_proxy*)impl->core,
+			&impl->core_proxy_listener,
+			&core_proxy_events, impl);
+	pw_core_add_listener(impl->core,
+			&impl->core_listener,
+			&core_events, impl);
+
+	impl->websocket = pw_websocket_new(impl->main_loop, &props->dict);
+	pw_websocket_add_listener(impl->websocket, &impl->websocket_listener,
+			&websocket_events, impl);
+
+	if ((str = pw_properties_get(props, "sendspin.delay")) == NULL)
+		str = SPA_STRINGIFY(DEFAULT_SENDSPIN_DELAY);
+	impl->delay = pw_properties_parse_float(str);
+
+	if ((impl->zeroconf = pw_zeroconf_new(context, NULL)) != NULL) {
+		pw_zeroconf_add_listener(impl->zeroconf, &impl->zeroconf_listener,
+				&zeroconf_events, impl);
+	}
+
+	hostname = pw_properties_get(props, "sendspin.ip");
+	if (hostname != NULL) {
+		struct spa_json iter;
+		char v[256];
+
+		port = pw_properties_get(props, "sendspin.port");
+		if (port == NULL)
+			port = SPA_STRINGIFY(DEFAULT_CLIENT_PORT);
+		if ((path = pw_properties_get(props, "sendspin.path")) == NULL)
+			path = DEFAULT_SENDSPIN_PATH;
+
+		if (spa_json_begin_array_relax(&iter, hostname, strlen(hostname)) <= 0) {
+			res = -EINVAL;
+			pw_log_error("can't parse sendspin.ip %s", hostname);
+			goto out;
+		}
+		while (spa_json_get_string(&iter, v, sizeof(v)) > 0) {
+			struct client *c;
+			struct pw_properties *p = pw_properties_copy(impl->stream_props);
+
+			pw_properties_set(p, "sendspin.ip", v);
+			pw_properties_set(p, "sendspin.port", port);
+			pw_properties_set(p, "sendspin.path", path);
+
+			if ((c = client_new(impl, "", p)) != NULL)
+				client_connect(c);
+		}
+	} else {
+		if ((hostname = pw_properties_get(props, "source.ip")) == NULL)
+			hostname = DEFAULT_SOURCE_IP;
+		if ((port = pw_properties_get(props, "source.port")) == NULL)
+			port = SPA_STRINGIFY(DEFAULT_SOURCE_PORT);
+		if ((path = pw_properties_get(props, "source.path")) == NULL)
+			path = DEFAULT_SOURCE_PATH;
+
+		pw_websocket_listen(impl->websocket, NULL, hostname, port, path);
+
+		if (impl->zeroconf) {
+			str = pw_properties_get(props, "sendspin.group-name");
+			pw_zeroconf_set_announce(impl->zeroconf, NULL,
+				&SPA_DICT_ITEMS(
+					SPA_DICT_ITEM("zeroconf.service", PW_SENDSPIN_SERVER_SERVICE),
+					SPA_DICT_ITEM("zeroconf.session", str),
+					SPA_DICT_ITEM("zeroconf.port", port),
+					SPA_DICT_ITEM("path", path)));
+		}
+	}
+	if (impl->zeroconf) {
+		pw_zeroconf_set_browse(impl->zeroconf, NULL,
+			&SPA_DICT_ITEMS(
+				SPA_DICT_ITEM("zeroconf.service", PW_SENDSPIN_CLIENT_SERVICE)));
+	}
+	pw_impl_module_add_listener(module, &impl->module_listener, &module_events, impl);
+
+	pw_impl_module_update_properties(module, &SPA_DICT_INIT_ARRAY(module_info));
+
+	pw_log_info("Successfully loaded module-sendspin-send");
+
+	return 0;
+out:
+	impl_destroy(impl);
+	return res;
+}
diff --git a/src/modules/module-sendspin/regress.h b/src/modules/module-sendspin/regress.h
new file mode 100644
index 000000000..1b6919906
--- /dev/null
+++ b/src/modules/module-sendspin/regress.h
@@ -0,0 +1,58 @@
+
+struct spa_regress {
+	double meanX;
+	double meanY;
+	double varX;
+	double covXY;
+	uint32_t n;
+	uint32_t m;
+	double a;
+};
+
+static inline void spa_regress_init(struct spa_regress *r, uint32_t m)
+{
+	memset(r, 0, sizeof(*r));
+	r->m = m;
+	r->a = 1.0/m;
+}
+static inline void spa_regress_update(struct spa_regress *r, double x, double y)
+{
+	double a, dx, dy;
+
+	if (r->n == 0) {
+		r->meanX = x;
+		r->meanY = y;
+		r->n++;
+		a = 1.0;
+	} else if (r->n < r->m) {
+		a = 1.0/r->n;
+		r->n++;
+	} else {
+		a = r->a;
+	}
+	dx = x - r->meanX;
+	dy = y - r->meanY;
+
+	r->varX += ((1.0 - a) * dx * dx - r->varX) * a;
+	r->covXY += ((1.0 - a) * dx * dy - r->covXY) * a;
+	r->meanX += dx * a;
+	r->meanY += dy * a;
+}
+static inline void spa_regress_get(struct spa_regress *r, double *a, double *b)
+{
+	*a = r->covXY/r->varX;
+	*b = r->meanY - *a * r->meanX;
+}
+static inline double spa_regress_calc_y(struct spa_regress *r, double x)
+{
+	double a, b;
+	spa_regress_get(r, &a, &b);
+	return x * a + b;
+}
+static inline double spa_regress_calc_x(struct spa_regress *r, double y)
+{
+	double a, b;
+	spa_regress_get(r, &a, &b);
+	return (y - b) / a;
+}
+
diff --git a/src/modules/module-sendspin/sendspin.h b/src/modules/module-sendspin/sendspin.h
new file mode 100644
index 000000000..b6260d27c
--- /dev/null
+++ b/src/modules/module-sendspin/sendspin.h
@@ -0,0 +1,27 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2026 Wim Taymans */
+/* SPDX-License-Identifier: MIT */
+
+#ifndef PIPEWIRE_SENDSPIN_H
+#define PIPEWIRE_SENDSPIN_H
+
+#include <stdarg.h>
+
+#include <pipewire/pipewire.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define PW_SENDSPIN_SERVER_SERVICE	"_sendspin-server._tcp"
+#define PW_SENDSPIN_CLIENT_SERVICE	"_sendspin._tcp"
+
+#define PW_SENDSPIN_DEFAULT_SERVER_PORT	8927
+#define PW_SENDSPIN_DEFAULT_CLIENT_PORT	8928
+#define PW_SENDSPIN_DEFAULT_PATH	"/sendspin"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PIPEWIRE_SENDSPIN_H */
diff --git a/src/modules/module-sendspin/teeny-sha1.c b/src/modules/module-sendspin/teeny-sha1.c
new file mode 100644
index 000000000..fa5a56753
--- /dev/null
+++ b/src/modules/module-sendspin/teeny-sha1.c
@@ -0,0 +1,201 @@
+/*******************************************************************************
+ * Teeny SHA-1
+ *
+ * The below sha1digest() calculates a SHA-1 hash value for a
+ * specified data buffer and generates a hex representation of the
+ * result.  This implementation is a re-forming of the SHA-1 code at
+ * https://github.com/jinqiangshou/EncryptionLibrary.
+ *
+ * Copyright (c) 2017 CTrabant
+ *
+ * License: MIT, see included LICENSE file for details.
+ *
+ * To use the sha1digest() function either copy it into an existing
+ * project source code file or include this file in a project and put
+ * the declaration (example below) in the sources files where needed.
+ ******************************************************************************/
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* Declaration:
+extern int sha1digest(uint8_t *digest, char *hexdigest, const uint8_t *data, size_t databytes);
+*/
+
+/*******************************************************************************
+ * sha1digest: https://github.com/CTrabant/teeny-sha1
+ *
+ * Calculate the SHA-1 value for supplied data buffer and generate a
+ * text representation in hexadecimal.
+ *
+ * Based on https://github.com/jinqiangshou/EncryptionLibrary, credit
+ * goes to @jinqiangshou, all new bugs are mine.
+ *
+ * @input:
+ *    data      -- data to be hashed
+ *    databytes -- bytes in data buffer to be hashed
+ *
+ * @output:
+ *    digest    -- the result, MUST be at least 20 bytes
+ *    hexdigest -- the result in hex, MUST be at least 41 bytes
+ *
+ * At least one of the output buffers must be supplied.  The other, if not 
+ * desired, may be set to NULL.
+ *
+ * @return: 0 on success and non-zero on error.
+ ******************************************************************************/
+static inline int
+sha1digest(uint8_t *digest, char *hexdigest, const uint8_t *data, size_t databytes)
+{
+#define SHA1ROTATELEFT(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+  uint32_t W[80];
+  uint32_t H[] = {0x67452301,
+                  0xEFCDAB89,
+                  0x98BADCFE,
+                  0x10325476,
+                  0xC3D2E1F0};
+  uint32_t a;
+  uint32_t b;
+  uint32_t c;
+  uint32_t d;
+  uint32_t e;
+  uint32_t f = 0;
+  uint32_t k = 0;
+
+  uint32_t idx;
+  uint32_t lidx;
+  uint32_t widx;
+  uint32_t didx = 0;
+
+  int32_t wcount;
+  uint32_t temp;
+  uint64_t databits = ((uint64_t)databytes) * 8;
+  uint32_t loopcount = (databytes + 8) / 64 + 1;
+  uint32_t tailbytes = 64 * loopcount - databytes;
+  uint8_t datatail[128] = {0};
+
+  if (!digest && !hexdigest)
+    return -1;
+
+  if (!data)
+    return -1;
+
+  /* Pre-processing of data tail (includes padding to fill out 512-bit chunk):
+     Add bit '1' to end of message (big-endian)
+     Add 64-bit message length in bits at very end (big-endian) */
+  datatail[0] = 0x80;
+  datatail[tailbytes - 8] = (uint8_t) (databits >> 56 & 0xFF);
+  datatail[tailbytes - 7] = (uint8_t) (databits >> 48 & 0xFF);
+  datatail[tailbytes - 6] = (uint8_t) (databits >> 40 & 0xFF);
+  datatail[tailbytes - 5] = (uint8_t) (databits >> 32 & 0xFF);
+  datatail[tailbytes - 4] = (uint8_t) (databits >> 24 & 0xFF);
+  datatail[tailbytes - 3] = (uint8_t) (databits >> 16 & 0xFF);
+  datatail[tailbytes - 2] = (uint8_t) (databits >> 8 & 0xFF);
+  datatail[tailbytes - 1] = (uint8_t) (databits >> 0 & 0xFF);
+
+  /* Process each 512-bit chunk */
+  for (lidx = 0; lidx < loopcount; lidx++)
+  {
+    /* Compute all elements in W */
+    memset (W, 0, 80 * sizeof (uint32_t));
+
+    /* Break 512-bit chunk into sixteen 32-bit, big endian words */
+    for (widx = 0; widx <= 15; widx++)
+    {
+      wcount = 24;
+
+      /* Copy byte-per byte from specified buffer */
+      while (didx < databytes && wcount >= 0)
+      {
+        W[widx] += (((uint32_t)data[didx]) << wcount);
+        didx++;
+        wcount -= 8;
+      }
+      /* Fill out W with padding as needed */
+      while (wcount >= 0)
+      {
+        W[widx] += (((uint32_t)datatail[didx - databytes]) << wcount);
+        didx++;
+        wcount -= 8;
+      }
+    }
+
+    /* Extend the sixteen 32-bit words into eighty 32-bit words, with potential optimization from:
+       "Improving the Performance of the Secure Hash Algorithm (SHA-1)" by Max Locktyukhin */
+    for (widx = 16; widx <= 31; widx++)
+    {
+      W[widx] = SHA1ROTATELEFT ((W[widx - 3] ^ W[widx - 8] ^ W[widx - 14] ^ W[widx - 16]), 1);
+    }
+    for (widx = 32; widx <= 79; widx++)
+    {
+      W[widx] = SHA1ROTATELEFT ((W[widx - 6] ^ W[widx - 16] ^ W[widx - 28] ^ W[widx - 32]), 2);
+    }
+
+    /* Main loop */
+    a = H[0];
+    b = H[1];
+    c = H[2];
+    d = H[3];
+    e = H[4];
+
+    for (idx = 0; idx <= 79; idx++)
+    {
+      if (idx <= 19)
+      {
+        f = (b & c) | ((~b) & d);
+        k = 0x5A827999;
+      }
+      else if (idx >= 20 && idx <= 39)
+      {
+        f = b ^ c ^ d;
+        k = 0x6ED9EBA1;
+      }
+      else if (idx >= 40 && idx <= 59)
+      {
+        f = (b & c) | (b & d) | (c & d);
+        k = 0x8F1BBCDC;
+      }
+      else if (idx >= 60 && idx <= 79)
+      {
+        f = b ^ c ^ d;
+        k = 0xCA62C1D6;
+      }
+      temp = SHA1ROTATELEFT (a, 5) + f + e + k + W[idx];
+      e = d;
+      d = c;
+      c = SHA1ROTATELEFT (b, 30);
+      b = a;
+      a = temp;
+    }
+
+    H[0] += a;
+    H[1] += b;
+    H[2] += c;
+    H[3] += d;
+    H[4] += e;
+  }
+
+  /* Store binary digest in supplied buffer */
+  if (digest)
+  {
+    for (idx = 0; idx < 5; idx++)
+    {
+      digest[idx * 4 + 0] = (uint8_t) (H[idx] >> 24);
+      digest[idx * 4 + 1] = (uint8_t) (H[idx] >> 16);
+      digest[idx * 4 + 2] = (uint8_t) (H[idx] >> 8);
+      digest[idx * 4 + 3] = (uint8_t) (H[idx]);
+    }
+  }
+
+  /* Store hex version of digest in supplied buffer */
+  if (hexdigest)
+  {
+    snprintf (hexdigest, 41, "%08x%08x%08x%08x%08x",
+              H[0],H[1],H[2],H[3],H[4]);
+  }
+
+  return 0;
+}  /* End of sha1digest() */
diff --git a/src/modules/module-sendspin/websocket.c b/src/modules/module-sendspin/websocket.c
new file mode 100644
index 000000000..959706d79
--- /dev/null
+++ b/src/modules/module-sendspin/websocket.c
@@ -0,0 +1,1060 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans */
+/* SPDX-License-Identifier: MIT */
+
+#include <unistd.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#include <netdb.h>
+
+#include <spa/utils/result.h>
+#include <spa/debug/mem.h>
+
+#include "config.h"
+
+#include "websocket.h"
+#include "teeny-sha1.c"
+#include "../network-utils.h"
+#include "../module-raop/base64.h"
+
+#define pw_websocket_emit(o,m,v,...) 	spa_hook_list_call(&o->listener_list, struct pw_websocket_events, m, v, ##__VA_ARGS__)
+#define pw_websocket_emit_destroy(w)		pw_websocket_emit(w, destroy, 0)
+#define pw_websocket_emit_connected(w,u,c,p)	pw_websocket_emit(w, connected, 0, u, c, p)
+
+#define pw_websocket_connection_emit(o,m,v,...) 	spa_hook_list_call(&o->listener_list, struct pw_websocket_connection_events, m, v, ##__VA_ARGS__)
+#define pw_websocket_connection_emit_destroy(w)		pw_websocket_connection_emit(w, destroy, 0)
+#define pw_websocket_connection_emit_error(w,r,m)	pw_websocket_connection_emit(w, error, 0, r, m)
+#define pw_websocket_connection_emit_disconnected(w)	pw_websocket_connection_emit(w, disconnected, 0)
+#define pw_websocket_connection_emit_drained(w)		pw_websocket_connection_emit(w, drained, 0)
+#define pw_websocket_connection_emit_message(w,...)	pw_websocket_connection_emit(w, message, 0, __VA_ARGS__)
+
+#define MAX_CONNECTIONS		64
+
+struct message {
+	struct spa_list link;
+	size_t len;
+	size_t offset;
+	uint32_t seq;
+	int (*reply) (void *user_data, int status);
+	void *user_data;
+	unsigned char data[];
+};
+
+struct server {
+	struct pw_websocket *ws;
+	struct spa_list link;
+
+	struct sockaddr_storage addr;
+	struct spa_source *source;
+
+	void *user;
+	char **paths;
+
+	struct spa_list connections;
+	uint32_t n_connections;
+};
+
+struct pw_websocket_connection {
+	struct pw_websocket *ws;
+	struct spa_list link;
+
+	int refcount;
+
+	void *user;
+	struct server *server;
+
+	struct spa_hook_list listener_list;
+
+	struct spa_source *source;
+	unsigned int connecting:1;
+	unsigned int need_flush:1;
+
+	char *host;
+	char *path;
+	char name[128];
+	bool ipv4;
+	uint16_t port;
+
+	struct sockaddr_storage addr;
+
+	uint8_t maskbit;
+
+	int status;
+	char message[128];
+	char key[25];
+	size_t content_length;
+
+	uint32_t send_seq;
+	uint32_t recv_seq;
+	bool draining;
+
+	struct spa_list messages;
+	struct spa_list pending;
+
+	struct pw_array data;
+	size_t data_wanted;
+	size_t data_cursor;
+	size_t data_state;
+	int (*have_data) (struct pw_websocket_connection *conn,
+			void *data, size_t size, size_t current);
+};
+
+struct pw_websocket {
+	struct pw_loop *loop;
+
+	struct spa_hook_list listener_list;
+
+	struct spa_source *source;
+
+	char *ifname;
+	char *ifaddress;
+	char *user_agent;
+	char *server_name;
+
+	struct spa_list connections;
+	struct spa_list servers;
+};
+
+void pw_websocket_connection_disconnect(struct pw_websocket_connection *conn, bool drain)
+{
+	struct message *msg;
+
+	if (drain && !spa_list_is_empty(&conn->messages)) {
+		conn->draining = true;
+		return;
+	}
+
+	if (conn->source != NULL) {
+		pw_loop_destroy_source(conn->ws->loop, conn->source);
+		conn->source = NULL;
+	}
+	spa_list_insert_list(&conn->messages, &conn->pending);
+	spa_list_consume(msg, &conn->messages, link) {
+		spa_list_remove(&msg->link);
+		free(msg);
+	}
+	if (conn->server) {
+		conn->server->n_connections--;
+		conn->server = NULL;
+	}
+	pw_websocket_connection_emit_disconnected(conn);
+}
+
+static void websocket_connection_unref(struct pw_websocket_connection *conn)
+{
+	if (--conn->refcount > 0)
+		return;
+	pw_array_clear(&conn->data);
+	free(conn->host);
+	free(conn->path);
+	free(conn);
+}
+
+void pw_websocket_connection_destroy(struct pw_websocket_connection *conn)
+{
+	pw_log_debug("destroy connection %p", conn);
+	spa_list_remove(&conn->link);
+
+	pw_websocket_connection_emit_destroy(conn);
+
+	pw_websocket_connection_disconnect(conn, false);
+	spa_hook_list_clean(&conn->listener_list);
+
+	websocket_connection_unref(conn);
+}
+
+void pw_websocket_connection_add_listener(struct pw_websocket_connection *conn,
+		struct spa_hook *listener,
+		const struct pw_websocket_connection_events *events, void *data)
+{
+	spa_hook_list_append(&conn->listener_list, listener, events, data);
+}
+
+struct pw_websocket *pw_websocket_new(struct pw_loop *main_loop, struct spa_dict *props)
+{
+	struct pw_websocket *ws;
+	uint32_t i;
+
+	if ((ws = calloc(1, sizeof(*ws))) == NULL)
+		return NULL;
+
+	for (i = 0; props && i < props->n_items; i++) {
+		const char *k = props->items[i].key;
+		const char *s = props->items[i].value;
+		if (spa_streq(k, "local.ifname"))
+			ws->ifname = s ? strdup(s) : NULL;
+		if (spa_streq(k, "local.ifaddress"))
+			ws->ifaddress = s ? strdup(s) : NULL;
+		if (spa_streq(k, "http.user-agent"))
+			ws->user_agent = s ? strdup(s) : NULL;
+		if (spa_streq(k, "http.server-name"))
+			ws->server_name = s ? strdup(s) : NULL;
+	}
+	if (ws->user_agent == NULL)
+		ws->user_agent = spa_aprintf("PipeWire/%s", PACKAGE_VERSION);
+	if (ws->server_name == NULL)
+		ws->server_name = spa_aprintf("PipeWire/%s", PACKAGE_VERSION);
+
+	ws->loop = main_loop;
+	spa_hook_list_init(&ws->listener_list);
+
+	spa_list_init(&ws->connections);
+	spa_list_init(&ws->servers);
+	return ws;
+}
+
+static void server_free(struct server *server)
+{
+	struct pw_websocket *ws = server->ws;
+	struct pw_websocket_connection *conn;
+
+	pw_log_debug("%p: free server %p", ws, server);
+
+	spa_list_remove(&server->link);
+	spa_list_consume(conn, &server->connections, link)
+		pw_websocket_connection_destroy(conn);
+	if (server->source)
+		pw_loop_destroy_source(ws->loop, server->source);
+	pw_free_strv(server->paths);
+	free(server);
+}
+
+void pw_websocket_destroy(struct pw_websocket *ws)
+{
+	struct server *server;
+	struct pw_websocket_connection *conn;
+
+	pw_log_info("destroy sebsocket %p", ws);
+	pw_websocket_emit_destroy(ws);
+
+	spa_list_consume(server, &ws->servers, link)
+		server_free(server);
+	spa_list_consume(conn, &ws->connections, link)
+		pw_websocket_connection_destroy(conn);
+
+	spa_hook_list_clean(&ws->listener_list);
+	free(ws->ifname);
+	free(ws->ifaddress);
+	free(ws->user_agent);
+	free(ws->server_name);
+	free(ws);
+}
+
+void pw_websocket_add_listener(struct pw_websocket *ws,
+		struct spa_hook *listener,
+		const struct pw_websocket_events *events, void *data)
+{
+	spa_hook_list_append(&ws->listener_list, listener, events, data);
+}
+
+static int update_io(struct pw_websocket_connection *conn, int io, bool active)
+{
+	if (conn->source) {
+		uint32_t mask = conn->source->mask;
+		SPA_FLAG_UPDATE(mask, io, active);
+		if (mask != conn->source->mask)
+			pw_loop_update_io(conn->ws->loop, conn->source, mask);
+	}
+	return 0;
+}
+
+static int receiver_expect(struct pw_websocket_connection *conn, size_t wanted,
+		int (*have_data) (struct pw_websocket_connection *conn,
+			void *data, size_t size, size_t current))
+{
+	pw_array_reset(&conn->data);
+	conn->data_wanted = wanted;
+	conn->data_cursor = 0;
+	conn->data_state = 0;
+	conn->have_data = have_data;
+	return update_io(conn, SPA_IO_IN, wanted);
+}
+
+static int queue_message(struct pw_websocket_connection *conn, struct message *msg)
+{
+	spa_list_append(&conn->messages, &msg->link);
+	conn->need_flush = true;
+	return update_io(conn, SPA_IO_OUT, true);
+}
+
+static int receive_websocket(struct pw_websocket_connection *conn,
+		void *data, size_t size, size_t current)
+{
+	uint8_t *d = data;
+	int need = 0, header = 0, i;
+	if (conn->data_state == 0) {
+		/* header done */
+		conn->status = d[0] & 0xf;
+		if (d[1] & 0x80)
+			header =+ 4;
+		if ((d[1] & 0x7f) == 126)
+			header += 2;
+		else if ((d[1] & 0x7f) == 127)
+			header += 8;
+		else
+			need += d[1] & 0x7f;
+		conn->data_cursor = 2 + header;
+		need += header;
+		conn->data_state++;
+	}
+	else if (conn->data_state == 1) {
+		/* extra length and mask */
+		size_t payload_len = 0;
+		if ((d[1] & 0x7f) == 126)
+			header = 2;
+		else if ((d[1] & 0x7f) == 127)
+			header = 8;
+		for (i = 0; i < header; i++)
+			payload_len = (payload_len << 8) | d[i + 2];
+		need += payload_len;
+		conn->data_state++;
+	}
+	if (need == 0) {
+		uint8_t *payload = &d[conn->data_cursor];
+		size_t i, payload_size = conn->data.size - conn->data_cursor;
+		struct iovec iov[1] = {{ payload, payload_size }};
+
+		if (d[1] & 0x80) {
+			uint8_t *mask = &d[conn->data_cursor - 4];
+			for (i = 0; i < payload_size; i++)
+				payload[i] ^= mask[i & 3];
+		}
+
+		switch (conn->status) {
+		case PW_WEBSOCKET_OPCODE_PING:
+			pw_log_info("received ping");
+			pw_websocket_connection_send(conn, PW_WEBSOCKET_OPCODE_PONG, iov, 1);
+			break;
+		case PW_WEBSOCKET_OPCODE_CLOSE:
+			pw_log_info("received close");
+			pw_websocket_connection_send(conn, PW_WEBSOCKET_OPCODE_CLOSE, iov, 1);
+			pw_websocket_connection_disconnect(conn, true);
+			break;
+		default:
+			pw_log_debug("received message %02x", conn->status);
+			pw_websocket_connection_emit_message(conn, conn->status,
+					payload, payload_size);
+		}
+		receiver_expect(conn, 2, receive_websocket);
+	}
+	return need;
+}
+
+static int connection_upgrade_failed(struct pw_websocket_connection *conn,
+		int status, const char *message)
+{
+	FILE *f;
+	size_t len;
+	struct message *msg;
+
+	if ((f = open_memstream((char**)&msg, &len)) == NULL)
+		return -errno;
+
+	fseek(f, offsetof(struct message, data), SEEK_SET);
+	fprintf(f, "HTTP/1.1 %d %s\r\n", status, message);
+	fprintf(f, "Transfer-Encoding: chunked\r\n");
+	fprintf(f, "Content-Type: application/octet-stream\r\n");
+	fprintf(f, "Server: %s\r\n", conn->ws->server_name);
+	fprintf(f, "\r\n");
+	fclose(f);
+
+	msg->len = len - offsetof(struct message, data);
+	pw_log_info("send error %d %s", status, message);
+	return queue_message(conn, msg);
+}
+
+static void make_accept(const char *key, char *accept)
+{
+	static const char *str = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+	uint8_t tmp[24 + 36], sha1[20];
+	memcpy(&tmp[ 0], key, 24);
+	memcpy(&tmp[24], str, 36);
+	sha1digest(sha1, NULL, tmp, sizeof(tmp));
+	pw_base64_encode(sha1, sizeof(sha1), accept, '=');
+}
+
+static int connection_upgraded_send(struct pw_websocket_connection *conn)
+{
+	FILE *f;
+	size_t len;
+	struct message *msg;
+	char accept[29];
+
+	if ((f = open_memstream((char**)&msg, &len)) == NULL)
+		return -errno;
+
+	make_accept(conn->key, accept);
+
+	fseek(f, offsetof(struct message, data), SEEK_SET);
+	fprintf(f, "HTTP/1.1 101 Switching Protocols\r\n");
+	fprintf(f, "Upgrade: websocket\r\n");
+	fprintf(f, "Connection: Upgrade\r\n");
+	fprintf(f, "Sec-WebSocket-Accept: %s\r\n", accept);
+	fprintf(f, "\r\n");
+	fclose(f);
+
+	msg->len = len - offsetof(struct message, data);
+	pw_log_info("send upgrade %s", msg->data);
+	return queue_message(conn, msg);
+}
+
+static int complete_upgrade(struct pw_websocket_connection *conn)
+{
+	pw_websocket_emit_connected(conn->ws, conn->user, conn, conn->path);
+	return receiver_expect(conn, 2, receive_websocket);
+}
+
+static int header_key_val(char *buf, char **key, char **val)
+{
+	char *v;
+	*key = buf;
+	if ((v = strstr(buf, ":")) == NULL)
+		return -EPROTO;
+	*v++ = '\0';
+	*val = pw_strip(v, " ");
+	return 0;
+}
+
+static int receive_http_request(struct pw_websocket_connection *conn,
+		void *data, size_t size, size_t current)
+{
+	char *d = data, *l;
+	char c = d[current];
+	int need = 1;
+
+	if (conn->data_state == 0) {
+		if (c == '\n') {
+			int v1, v2;
+			d[current] = '\0';
+			l = pw_strip(&d[conn->data_cursor], "\n\r ");
+			conn->data_cursor = current+1;
+			if (sscanf(l, "GET %ms HTTP/%d.%d", &conn->path, &v1, &v2) != 3)
+				return -EPROTO;
+			conn->data_state++;
+		}
+	}
+	else if (conn->data_state == 1) {
+		if (c == '\n') {
+			char *key, *val;
+			d[current] = '\0';
+			l = pw_strip(&d[conn->data_cursor], "\n\r ");
+			if (strlen(l) > 0) {
+				conn->data_cursor = current+1;
+				if (header_key_val(l, &key, &val) < 0)
+					return -EPROTO;
+				if (spa_streq(key, "Sec-WebSocket-Key"))
+					strncpy(conn->key, val, sizeof(conn->key)-1);
+			} else {
+				conn->data_state++;
+				need = 0;
+			}
+		}
+	}
+	if (need == 0) {
+		if (conn->server && conn->server->paths &&
+		    pw_strv_find(conn->server->paths, conn->path) < 0) {
+			connection_upgrade_failed(conn, 404, "Not Found");
+		} else {
+			connection_upgraded_send(conn);
+			complete_upgrade(conn);
+		}
+	}
+	return need;
+}
+
+static struct message *find_pending(struct pw_websocket_connection *conn, uint32_t seq)
+{
+	struct message *msg;
+	spa_list_for_each(msg, &conn->pending, link) {
+		if (msg->seq == seq)
+			return msg;
+	}
+	return NULL;
+}
+
+static int receive_http_reply(struct pw_websocket_connection *conn,
+		void *data, size_t size, size_t current)
+{
+	char *d = data, *l;
+	char c = d[current];
+	int need = 1;
+
+	if (conn->data_state == 0) {
+		if (c == '\n') {
+			int v1, v2, status, message;
+			/* status complete */
+			d[current] = '\0';
+			l = pw_strip(&d[conn->data_cursor], "\n\r ");
+			conn->data_cursor = current+1;
+			if (sscanf(l, "HTTP/%d.%d %n%d", &v1, &v2, &message, &status) != 3)
+				return -EPROTO;
+			conn->status = status;
+			strcpy(conn->message, &l[message]);
+			conn->content_length = 0;
+			conn->data_state++;
+		}
+	}
+	else if (conn->data_state == 1) {
+		if (c == '\n') {
+			/* header line complete */
+			d[current] = '\0';
+			l = pw_strip(&d[conn->data_cursor], "\n\r ");
+			conn->data_cursor = current+1;
+			if (strlen(l) > 0) {
+				char *key, *value;
+				if (header_key_val(l, &key, &value) < 0)
+					return -EPROTO;
+				if (spa_streq(key, "Sec-WebSocket-Accept")) {
+					char accept[29];
+					make_accept(conn->key, accept);
+					if (!spa_streq(value, accept)) {
+						pw_log_error("got Accept:%s expected:%s", value, accept);
+						return -EPROTO;
+					}
+				}
+				else if (spa_streq(key, "Content-Length"))
+					conn->content_length = atoi(value);
+			} else {
+				conn->data_state++;
+				need = conn->content_length;
+			}
+		}
+	}
+	if (need == 0) {
+		/* message completed */
+		uint32_t seq;
+		int res;
+		struct message *msg;
+
+		seq = conn->recv_seq++;
+
+		pw_log_info("received reply to request with seq:%" PRIu32, seq);
+
+		if ((msg = find_pending(conn, seq)) != NULL) {
+			res = msg->reply(msg->user_data, conn->status);
+			spa_list_remove(&msg->link);
+			free(msg);
+
+			if (res < 0)
+				pw_websocket_connection_emit_error(conn, res, conn->message);
+		}
+	}
+	return need;
+}
+
+static int on_upgrade_reply(void *user_data, int status)
+{
+	struct pw_websocket_connection *conn = user_data;
+	if (status != 101)
+		return -EPROTO;
+	return complete_upgrade(conn);
+}
+
+static int handle_connect(struct pw_websocket_connection *conn, int fd)
+{
+	int res = 0;
+	socklen_t res_len;
+	FILE *f;
+	size_t len;
+	struct message *msg;
+	uint8_t key[16];
+
+	len = sizeof(res);
+	if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &res, &res_len) < 0) {
+		pw_log_error("getsockopt: %m");
+		return -errno;
+	}
+	if (res != 0)
+		return -res;
+
+	pw_log_info("connected to %s:%u", conn->name, conn->port);
+
+	conn->connecting = false;
+	conn->status = 0;
+
+	if ((f = open_memstream((char**)&msg, &len)) == NULL)
+		return -errno;
+
+	fseek(f, offsetof(struct message, data), SEEK_SET);
+
+	/* make a key */
+	pw_random(key, sizeof(key));
+	pw_base64_encode(key, sizeof(key), conn->key, '=');
+
+	fprintf(f, "GET %s HTTP/1.1\r\n", conn->path);
+	fprintf(f, "Host: %s\r\n", conn->host);
+	fprintf(f, "Upgrade: websocket\r\n");
+	fprintf(f, "Connection: Upgrade\r\n");
+	fprintf(f, "Sec-WebSocket-Version: 13\r\n");
+	fprintf(f, "Sec-WebSocket-Key: %s\r\n", conn->key);
+	fprintf(f, "Accept: */*\r\n");
+	fprintf(f, "User-Agent: %s\r\n", conn->ws->user_agent);
+	fprintf(f, "\r\n");
+	fclose(f);
+
+	msg->len = len - offsetof(struct message, data);
+	msg->reply = on_upgrade_reply;
+	msg->user_data = conn;
+	msg->seq = conn->send_seq++;
+
+	pw_log_info("%s", msg->data);
+
+	receiver_expect(conn, 1, receive_http_reply);
+
+	return queue_message(conn, msg);
+}
+
+static int handle_input(struct pw_websocket_connection *conn)
+{
+	int res;
+
+	while (conn->data.size < conn->data_wanted) {
+		size_t current = conn->data.size;
+		size_t pending = conn->data_wanted - current;
+		void *b;
+
+		if (conn->source == NULL)
+			return -EPIPE;
+
+		if ((res = pw_array_ensure_size(&conn->data, pending)) < 0)
+			return res;
+		b = SPA_PTROFF(conn->data.data, current, void);
+
+		res = read(conn->source->fd, b, pending);
+		if (res == 0)
+			return 0;
+		if (res < 0) {
+			res = -errno;
+			if (res == -EINTR)
+				continue;
+			if (res != -EAGAIN && res != -EWOULDBLOCK)
+				return res;
+			return -EAGAIN;
+		}
+		conn->data.size += res;
+		if (conn->data.size == conn->data_wanted) {
+			if ((res = conn->have_data(conn,
+					conn->data.data,
+					conn->data.size,
+					current)) < 0)
+				return res;
+
+			conn->data_wanted += res;
+		}
+	}
+	return 0;
+}
+
+static int flush_output(struct pw_websocket_connection *conn)
+{
+	int res;
+
+	conn->need_flush = false;
+
+	if (conn->source == NULL)
+		return -EPIPE;
+
+	while (true) {
+		struct message *msg;
+		void *data;
+		size_t size;
+
+		if (spa_list_is_empty(&conn->messages)) {
+			if (conn->draining)
+				pw_websocket_connection_disconnect(conn, false);
+			break;
+		}
+		msg = spa_list_first(&conn->messages, struct message, link);
+
+		if (msg->offset < msg->len) {
+			data = SPA_PTROFF(msg->data, msg->offset, void);
+			size = msg->len - msg->offset;
+		} else {
+			spa_list_remove(&msg->link);
+			if (msg->reply != NULL)
+				spa_list_append(&conn->pending, &msg->link);
+			else
+				free(msg);
+			continue;
+		}
+
+		while (true) {
+			res = send(conn->source->fd, data, size, MSG_NOSIGNAL | MSG_DONTWAIT);
+			if (res < 0) {
+				res = -errno;
+				if (res == -EINTR)
+					continue;
+				if (res != -EAGAIN && res != -EWOULDBLOCK)
+					pw_log_warn("conn %p: send %zu, error %d: %m",
+							conn, size, res);
+				return res;
+			}
+			msg->offset += res;
+			break;
+		}
+	}
+	return 0;
+}
+
+static void
+on_source_io(void *data, int fd, uint32_t mask)
+{
+	struct pw_websocket_connection *conn = data;
+	int res;
+
+	conn->refcount++;
+
+	if (mask & (SPA_IO_ERR | SPA_IO_HUP)) {
+		res = -EPIPE;
+		goto error;
+	}
+	if (mask & SPA_IO_IN) {
+		if ((res = handle_input(conn)) != -EAGAIN)
+			goto error;
+	}
+	if (mask & SPA_IO_OUT || conn->need_flush) {
+		if (conn->connecting) {
+			if ((res = handle_connect(conn, fd)) < 0)
+				goto error;
+		}
+		res = flush_output(conn);
+		if (res >= 0) {
+			if (conn->source)
+				pw_loop_update_io(conn->ws->loop, conn->source,
+					conn->source->mask & ~SPA_IO_OUT);
+		} else if (res != -EAGAIN)
+			goto error;
+	}
+done:
+	websocket_connection_unref(conn);
+	return;
+error:
+	if (res < 0) {
+		pw_log_error("%p: %s got connection error %d (%s)", conn,
+				conn->name, res, spa_strerror(res));
+		snprintf(conn->message, sizeof(conn->message), "%s", spa_strerror(res));
+		pw_websocket_connection_emit_error(conn, res, conn->message);
+	} else {
+		pw_log_info("%p: %s connection closed", conn, conn->name);
+	}
+	pw_websocket_connection_disconnect(conn, false);
+	goto done;
+}
+
+int pw_websocket_connection_address(struct pw_websocket_connection *conn,
+		struct sockaddr *addr, socklen_t addr_len)
+{
+	memcpy(addr, &conn->addr, SPA_MIN(addr_len, sizeof(conn->addr)));
+	return 0;
+}
+
+static struct pw_websocket_connection *connection_new(struct pw_websocket *ws, void *user,
+		struct sockaddr *addr, socklen_t addr_len, int fd, struct server *server)
+{
+	struct pw_websocket_connection *conn;
+
+	if ((conn = calloc(1, sizeof(*conn))) == NULL)
+		goto error;
+
+	if ((conn->source = pw_loop_add_io(ws->loop, spa_steal_fd(fd),
+					SPA_IO_ERR | SPA_IO_HUP | SPA_IO_OUT,
+					true, on_source_io, conn)) == NULL)
+		goto error;
+
+	memcpy(&conn->addr, addr, SPA_MIN(addr_len, sizeof(conn->addr)));
+	conn->ws = ws;
+	conn->server = server;
+	conn->user = user;
+	if (server)
+		spa_list_append(&server->connections, &conn->link);
+	else
+		spa_list_append(&ws->connections, &conn->link);
+
+	conn->refcount = 1;
+	if (pw_net_get_ip(&conn->addr, conn->name, sizeof(conn->name),
+				&conn->ipv4, &conn->port) < 0)
+		snprintf(conn->name, sizeof(conn->name), "connection %p", conn);
+
+	spa_list_init(&conn->messages);
+	spa_list_init(&conn->pending);
+	spa_hook_list_init(&conn->listener_list);
+	pw_array_init(&conn->data, 4096);
+
+	pw_log_debug("new websocket %p connection %p %s:%u", ws,
+			conn, conn->name, conn->port);
+
+	return conn;
+error:
+	if (fd != -1)
+		close(fd);
+	free(conn);
+	return NULL;
+}
+
+static int make_tcp_socket(struct server *server, const char *name, uint16_t port, const char *ifname,
+		const char *ifaddress)
+{
+	struct sockaddr_storage addr;
+	int res, on;
+	socklen_t len = 0;
+	spa_autoclose int fd = -1;
+
+	if ((res = pw_net_parse_address_port(name, ifaddress, port, &addr, &len)) < 0) {
+		pw_log_error("%p: can't parse address %s: %s", server,
+				name, spa_strerror(res));
+		goto error;
+	}
+
+	if ((fd = socket(addr.ss_family, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)) < 0) {
+		res = -errno;
+		pw_log_error("%p: socket() failed: %m", server);
+		goto error;
+	}
+#ifdef SO_BINDTODEVICE
+	if (ifname && setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, ifname, strlen(ifname)) < 0) {
+		res = -errno;
+		pw_log_error("%p: setsockopt(SO_BINDTODEVICE) failed: %m", server);
+		goto error;
+	}
+#endif
+	on = 1;
+	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const void *) &on, sizeof(on)) < 0)
+		pw_log_warn("%p: setsockopt(): %m", server);
+
+	if (bind(fd, (struct sockaddr *) &addr, len) < 0) {
+		res = -errno;
+		pw_log_error("%p: bind() failed: %m", server);
+		goto error;
+	}
+	if (listen(fd, 5) < 0) {
+		res = -errno;
+		pw_log_error("%p: listen() failed: %m", server);
+		goto error;
+	}
+	if (getsockname(fd, (struct sockaddr *)&addr, &len) < 0) {
+		res = -errno;
+		pw_log_error("%p: getsockname() failed: %m", server);
+		goto error;
+	}
+
+	server->addr = addr;
+
+	return spa_steal_fd(fd);
+error:
+	return res;
+}
+
+static void
+on_server_connect(void *data, int fd, uint32_t mask)
+{
+	struct server *server = data;
+	struct pw_websocket *ws = server->ws;
+	struct sockaddr_storage addr;
+	socklen_t addrlen;
+	spa_autoclose int conn_fd = -1;
+	int val;
+	struct pw_websocket_connection *conn = NULL;
+
+	addrlen = sizeof(addr);
+	if ((conn_fd = accept4(fd, (struct sockaddr*)&addr, &addrlen,
+					SOCK_NONBLOCK | SOCK_CLOEXEC)) < 0)
+		goto error;
+
+	if (server->n_connections >= MAX_CONNECTIONS)
+		goto error_refused;
+
+	if ((conn = connection_new(ws, server->user, (struct sockaddr*)&addr, sizeof(addr),
+			spa_steal_fd(conn_fd), server)) == NULL)
+		goto error;
+
+	server->n_connections++;
+
+	pw_log_info("%p: connection:%p %s:%u connected", ws,
+			conn, conn->name, conn->port);
+
+	val = 1;
+	if (setsockopt(conn->source->fd, IPPROTO_TCP, TCP_NODELAY,
+				(const void *) &val, sizeof(val)) < 0)
+		pw_log_warn("TCP_NODELAY failed: %m");
+
+	val = IPTOS_LOWDELAY;
+	if (setsockopt(conn->source->fd, IPPROTO_IP, IP_TOS,
+				(const void *) &val, sizeof(val)) < 0)
+		pw_log_warn("IP_TOS failed: %m");
+
+	receiver_expect(conn, 1, receive_http_request);
+	return;
+
+error_refused:
+	errno = ECONNREFUSED;
+error:
+	pw_log_error("%p: failed to create connection: %m", ws);
+	return;
+}
+
+int pw_websocket_listen(struct pw_websocket *ws, void *user,
+		const char *hostname, const char *service, const char *paths)
+{
+	int res;
+	struct server *server;
+	uint16_t port = atoi(service);
+
+	if ((server = calloc(1, sizeof(struct server))) == NULL)
+		return -errno;
+
+	server->ws = ws;
+	spa_list_append(&ws->servers, &server->link);
+
+	server->user = user;
+	spa_list_init(&server->connections);
+
+	if ((res = make_tcp_socket(server, hostname, port, ws->ifname, ws->ifaddress)) < 0)
+		goto error;
+
+	if ((server->source = pw_loop_add_io(ws->loop, res, SPA_IO_IN,
+			true, on_server_connect, server)) == NULL) {
+		res = -errno;
+		goto error;
+	}
+	if (paths)
+		server->paths = pw_strv_parse(paths, strlen(paths), INT_MAX, NULL);
+
+	pw_log_info("%p: listen %s:%u %s", ws, hostname, port, paths);
+	return 0;
+error:
+	pw_log_error("%p: can't create server: %s", ws, spa_strerror(res));
+	server_free(server);
+	return res;
+}
+
+int pw_websocket_cancel(struct pw_websocket *ws, void *user)
+{
+	struct server *s, *ts;
+	struct pw_websocket_connection *c, *tc;
+	int count = 0;
+
+	spa_list_for_each_safe(s, ts, &ws->servers, link) {
+		if (s->user == user) {
+			server_free(s);
+			count++;
+		}
+	}
+	spa_list_for_each_safe(c, tc, &ws->connections, link) {
+		if (c->user == user) {
+			pw_websocket_connection_destroy(c);
+			count++;
+		}
+	}
+	return count;
+}
+
+int pw_websocket_connect(struct pw_websocket *ws, void *user,
+		const char *hostname, const char *service, const char *path)
+{
+	struct addrinfo hints;
+	struct addrinfo *result, *rp;
+	int res, fd;
+	struct pw_websocket_connection *conn = NULL;
+
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = AF_UNSPEC;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_flags = 0;
+	hints.ai_protocol = 0;
+
+	if ((res = getaddrinfo(hostname, service, &hints, &result)) != 0) {
+		pw_log_error("getaddrinfo: %s", gai_strerror(res));
+		return -EINVAL;
+	}
+	res = -ENOENT;
+	for (rp = result; rp != NULL; rp = rp->ai_next) {
+		if ((fd = socket(rp->ai_family,
+				rp->ai_socktype | SOCK_CLOEXEC | SOCK_NONBLOCK,
+				rp->ai_protocol)) == -1)
+			continue;
+
+		res = connect(fd, rp->ai_addr, rp->ai_addrlen);
+		if (res == 0 || (res < 0 && errno == EINPROGRESS))
+			break;
+
+		res = -errno;
+		close(fd);
+	}
+	if (rp == NULL) {
+		pw_log_error("Could not connect to %s:%s: %s", hostname, service,
+				spa_strerror(res));
+	} else {
+		if ((conn = connection_new(ws, user, rp->ai_addr, rp->ai_addrlen, fd, NULL)) == NULL)
+			res = -errno;
+	}
+	freeaddrinfo(result);
+	if (conn == NULL)
+		return res;
+
+	conn->connecting = true;
+	conn->maskbit = 0x80;
+	conn->path = strdup(path);
+	asprintf(&conn->host, "%s:%s", hostname, service);
+
+	pw_log_info("%p: connecting to %s:%u path:%s", conn,
+			conn->name, conn->port, path);
+	return 0;
+}
+
+int pw_websocket_connection_send(struct pw_websocket_connection *conn, uint8_t opcode,
+		const struct iovec *iov, size_t iov_len)
+{
+	struct message *msg;
+	size_t len = 2, i, j, k;
+	uint8_t *d, *mask = NULL, maskbit = conn->maskbit;
+	size_t payload_length = 0;
+
+	for (i = 0; i < iov_len; i++)
+		payload_length += iov[i].iov_len;
+
+	if ((msg = calloc(1, sizeof(*msg) + 14 + payload_length)) == NULL)
+		return -errno;
+
+	d = msg->data;
+	d[0] = 0x80 | opcode;
+
+	if (payload_length < 126)
+		k = 0;
+	else  if (payload_length < 65536)
+		k = 2;
+	else
+		k = 8;
+
+	d[1] = maskbit | (k == 0 ? payload_length : (k == 2 ? 126 : 127));
+	for (i = 0, j = (k-1)*8 ; i < k; i++, j -= 8)
+		d[len++] = (payload_length >> j) & 0xff;
+
+	if (maskbit) {
+		mask = &d[len];
+		pw_random(mask, 4);
+		len += 4;
+	}
+	for (i = 0, k = 0; i < iov_len; i++) {
+		if (maskbit)
+			for (j = 0; j < iov[i].iov_len; j++, k++)
+				d[len+j] = ((uint8_t*)iov[i].iov_base)[j] ^ mask[k & 3];
+		else
+			memcpy(&d[len], iov[i].iov_base, iov[i].iov_len);
+
+		len += iov[i].iov_len;
+	}
+	msg->len = len;
+
+	return queue_message(conn, msg);
+}
+
+int pw_websocket_connection_send_text(struct pw_websocket_connection *conn,
+		const char *payload, size_t payload_len)
+{
+	struct iovec iov[1] = {{ (void*)payload, payload_len }};
+	pw_log_info("send text %.*s", (int)payload_len, payload);
+	return pw_websocket_connection_send(conn, PW_WEBSOCKET_OPCODE_TEXT, iov, 1);
+}
diff --git a/src/modules/module-sendspin/websocket.h b/src/modules/module-sendspin/websocket.h
new file mode 100644
index 000000000..0f0da36e7
--- /dev/null
+++ b/src/modules/module-sendspin/websocket.h
@@ -0,0 +1,85 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2026 Wim Taymans */
+/* SPDX-License-Identifier: MIT */
+
+#ifndef PIPEWIRE_WEBSOCKET_H
+#define PIPEWIRE_WEBSOCKET_H
+
+#include <stdarg.h>
+
+#include <pipewire/pipewire.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct pw_websocket;
+struct pw_websocket_connection;
+
+#define PW_WEBSOCKET_OPCODE_TEXT	0x1
+#define PW_WEBSOCKET_OPCODE_BINARY	0x2
+#define PW_WEBSOCKET_OPCODE_CLOSE	0x8
+#define PW_WEBSOCKET_OPCODE_PING	0x9
+#define PW_WEBSOCKET_OPCODE_PONG	0xa
+
+struct pw_websocket_connection_events {
+#define PW_VERSION_WEBSOCKET_CONNECTION_EVENTS	0
+	uint32_t version;
+
+	void (*destroy) (void *data);
+	void (*error) (void *data, int res, const char *reason);
+	void (*disconnected) (void *data);
+
+	void (*message) (void *data,
+			int opcode, void *payload, size_t size);
+};
+
+void pw_websocket_connection_add_listener(struct pw_websocket_connection *conn,
+		struct spa_hook *listener,
+		const struct pw_websocket_connection_events *events, void *data);
+
+void pw_websocket_connection_destroy(struct pw_websocket_connection *conn);
+void pw_websocket_connection_disconnect(struct pw_websocket_connection *conn, bool drain);
+
+int pw_websocket_connection_address(struct pw_websocket_connection *conn,
+		struct sockaddr *addr, socklen_t addr_len);
+
+int pw_websocket_connection_send(struct pw_websocket_connection *conn,
+		uint8_t opcode, const struct iovec *iov, size_t iov_len);
+
+int pw_websocket_connection_send_text(struct pw_websocket_connection *conn,
+		const char *payload, size_t payload_len);
+
+
+struct pw_websocket_events {
+#define PW_VERSION_WEBSOCKET_EVENTS	0
+	uint32_t version;
+
+	void (*destroy) (void *data);
+
+	void (*connected) (void *data, void *user,
+			struct pw_websocket_connection *conn, const char *path);
+};
+
+struct pw_websocket * pw_websocket_new(struct pw_loop *main_loop,
+				struct spa_dict *props);
+
+void pw_websocket_destroy(struct pw_websocket *ws);
+
+void pw_websocket_add_listener(struct pw_websocket *ws,
+		struct spa_hook *listener,
+		const struct pw_websocket_events *events, void *data);
+
+int pw_websocket_connect(struct pw_websocket *ws, void *user,
+		const char *hostname, const char *service, const char *path);
+
+int pw_websocket_listen(struct pw_websocket *ws, void *user,
+		const char *hostname, const char *service, const char *paths);
+
+int pw_websocket_cancel(struct pw_websocket *ws, void *user);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PIPEWIRE_WEBSOCKET_H */
diff --git a/src/modules/module-sendspin/zeroconf.c b/src/modules/module-sendspin/zeroconf.c
new file mode 100644
index 000000000..fb1c5a221
--- /dev/null
+++ b/src/modules/module-sendspin/zeroconf.c
@@ -0,0 +1,558 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans */
+/* SPDX-License-Identifier: MIT */
+
+#include <unistd.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#include <netdb.h>
+
+#include "config.h"
+
+#include <spa/utils/result.h>
+#include <spa/utils/json.h>
+
+#include <avahi-client/lookup.h>
+#include <avahi-client/publish.h>
+#include <avahi-common/error.h>
+#include <avahi-common/malloc.h>
+
+#include "../module-zeroconf-discover/avahi-poll.h"
+
+#include "zeroconf.h"
+
+#define pw_zeroconf_emit(o,m,v,...) 	spa_hook_list_call(&o->listener_list, struct pw_zeroconf_events, m, v, ##__VA_ARGS__)
+#define pw_zeroconf_emit_destroy(c)		pw_zeroconf_emit(c, destroy, 0)
+#define pw_zeroconf_emit_error(c,e,m)		pw_zeroconf_emit(c, error, 0, e, m)
+#define pw_zeroconf_emit_added(c,id,i)		pw_zeroconf_emit(c, added, 0, id, i)
+#define pw_zeroconf_emit_removed(c,id,i)	pw_zeroconf_emit(c, removed, 0, id, i)
+
+struct service_info {
+	AvahiIfIndex interface;
+	AvahiProtocol protocol;
+	const char *name;
+	const char *type;
+	const char *domain;
+	const char *host_name;
+	AvahiAddress address;
+	uint16_t port;
+};
+
+#define SERVICE_INFO(...) ((struct service_info){ __VA_ARGS__ })
+
+struct entry {
+	struct pw_zeroconf *zc;
+	struct spa_list link;
+
+#define TYPE_ANNOUNCE	0
+#define TYPE_BROWSE	1
+	uint32_t type;
+	void *user;
+
+	struct pw_properties *props;
+
+	AvahiEntryGroup *group;
+	AvahiServiceBrowser *browser;
+
+	struct spa_list services;
+};
+
+struct service {
+	struct entry *e;
+	struct spa_list link;
+
+	struct service_info info;
+
+	struct pw_properties *props;
+};
+
+struct pw_zeroconf {
+	int refcount;
+	struct pw_context *context;
+
+	struct pw_properties *props;
+
+	struct spa_hook_list listener_list;
+
+	AvahiPoll *poll;
+	AvahiClient *client;
+	AvahiClientState state;
+
+	struct spa_list entries;
+
+	bool discover_local;
+};
+
+static struct service *service_find(struct entry *e, const struct service_info *info)
+{
+	struct service *s;
+	spa_list_for_each(s, &e->services, link) {
+		if (s->info.interface == info->interface &&
+		    s->info.protocol == info->protocol &&
+		    spa_streq(s->info.name, info->name) &&
+		    spa_streq(s->info.type, info->type) &&
+		    spa_streq(s->info.domain, info->domain))
+			return s;
+	}
+	return NULL;
+}
+
+static void service_free(struct service *s)
+{
+	spa_list_remove(&s->link);
+	free((void*)s->info.name);
+	free((void*)s->info.type);
+	free((void*)s->info.domain);
+	free((void*)s->info.host_name);
+	pw_properties_free(s->props);
+	free(s);
+}
+
+struct entry *entry_find(struct pw_zeroconf *zc, uint32_t type, void *user)
+{
+	struct entry *e;
+	spa_list_for_each(e, &zc->entries, link)
+		if (e->type == type && e->user == user)
+			return e;
+	return NULL;
+}
+
+static void entry_free(struct entry *e)
+{
+	struct service *s;
+
+	spa_list_remove(&e->link);
+	if (e->group)
+		avahi_entry_group_free(e->group);
+	spa_list_consume(s, &e->services, link)
+		service_free(s);
+	pw_properties_free(e->props);
+	free(e);
+}
+
+static void zeroconf_free(struct pw_zeroconf *zc)
+{
+	struct entry *a;
+
+	spa_list_consume(a, &zc->entries, link)
+		entry_free(a);
+
+	if (zc->client)
+                avahi_client_free(zc->client);
+	if (zc->poll)
+		pw_avahi_poll_free(zc->poll);
+	pw_properties_free(zc->props);
+	free(zc);
+}
+
+static void zeroconf_unref(struct pw_zeroconf *zc)
+{
+	if (--zc->refcount == 0)
+		zeroconf_free(zc);
+}
+
+void pw_zeroconf_destroy(struct pw_zeroconf *zc)
+{
+	pw_zeroconf_emit_destroy(zc);
+
+	zeroconf_unref(zc);
+}
+
+static struct service *service_new(struct entry *e,
+		const struct service_info *info, AvahiStringList *txt)
+{
+	struct service *s;
+	struct pw_zeroconf *zc = e->zc;
+	const AvahiAddress *a = &info->address;
+	static const char *link_local_range = "169.254.";
+	AvahiStringList *l;
+	char at[AVAHI_ADDRESS_STR_MAX], if_suffix[16] = "";
+
+	if ((s = calloc(1, sizeof(*s))) == NULL)
+		goto error;
+
+	s->e = e;
+	spa_list_append(&e->services, &s->link);
+
+	s->info.interface = info->interface;
+	s->info.protocol = info->protocol;
+	s->info.name = strdup(info->name);
+	s->info.type = strdup(info->type);
+	s->info.domain = strdup(info->domain);
+	s->info.host_name = strdup(info->host_name);
+	s->info.address = info->address;
+	s->info.port = info->port;
+
+	if ((s->props = pw_properties_new(NULL, NULL)) == NULL)
+		goto error;
+
+	if (a->proto == AVAHI_PROTO_INET6 &&
+	    a->data.ipv6.address[0] == 0xfe &&
+	    (a->data.ipv6.address[1] & 0xc0) == 0x80)
+		snprintf(if_suffix, sizeof(if_suffix), "%%%d", info->interface);
+
+	avahi_address_snprint(at, sizeof(at), a);
+	if (a->proto == AVAHI_PROTO_INET &&
+	    spa_strstartswith(at, link_local_range))
+		snprintf(if_suffix, sizeof(if_suffix), "%%%d", info->interface);
+
+	pw_properties_setf(s->props, "zeroconf.ifindex", "%d", info->interface);
+	pw_properties_setf(s->props, "zeroconf.name", "%s", info->name);
+	pw_properties_setf(s->props, "zeroconf.type", "%s", info->type);
+	pw_properties_setf(s->props, "zeroconf.domain", "%s", info->domain);
+	pw_properties_setf(s->props, "zeroconf.hostname", "%s", info->host_name);
+	pw_properties_setf(s->props, "zeroconf.address", "%s%s", at, if_suffix);
+	pw_properties_setf(s->props, "zeroconf.port", "%u", info->port);
+
+	for (l = txt; l; l = l->next) {
+		char *key, *value;
+
+		if (avahi_string_list_get_pair(l, &key, &value, NULL) != 0)
+			break;
+
+		pw_properties_set(s->props, key, value);
+		avahi_free(key);
+		avahi_free(value);
+	}
+
+	pw_log_info("new %s %s %s %s", info->name, info->type, info->domain, info->host_name);
+	pw_zeroconf_emit_added(zc, e->user, &s->props->dict);
+
+	return s;
+
+error:
+	if (s)
+		service_free(s);
+	return NULL;
+}
+
+static void resolver_cb(AvahiServiceResolver *r, AvahiIfIndex interface,
+		AvahiProtocol protocol, AvahiResolverEvent event,
+		const char *name, const char *type, const char *domain,
+		const char *host_name, const AvahiAddress *a, uint16_t port,
+		AvahiStringList *txt, AvahiLookupResultFlags flags,
+		void *userdata)
+{
+	struct entry *e = userdata;
+	struct pw_zeroconf *zc = e->zc;
+	struct service_info info;
+
+	if (event != AVAHI_RESOLVER_FOUND) {
+		pw_log_error("Resolving of '%s' failed: %s", name,
+				avahi_strerror(avahi_client_errno(zc->client)));
+		goto done;
+	}
+
+	info = SERVICE_INFO(.interface = interface,
+			.protocol = protocol,
+			.name = name,
+			.type = type,
+			.domain = domain,
+			.host_name = host_name,
+			.address = *a,
+			.port = port);
+
+	service_new(e, &info, txt);
+done:
+	avahi_service_resolver_free(r);
+}
+
+static void browser_cb(AvahiServiceBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol,
+	AvahiBrowserEvent event, const char *name, const char *type, const char *domain,
+	AvahiLookupResultFlags flags, void *userdata)
+{
+        struct entry *e = userdata;
+	struct pw_zeroconf *zc = e->zc;
+	struct service_info info;
+	struct service *s;
+
+	if ((flags & AVAHI_LOOKUP_RESULT_LOCAL) && !zc->discover_local)
+		return;
+
+	info = SERVICE_INFO(.interface = interface,
+			.protocol = protocol,
+			.name = name,
+			.type = type,
+			.domain = domain);
+
+	s = service_find(e, &info);
+
+	switch (event) {
+	case AVAHI_BROWSER_NEW:
+		if (s != NULL)
+			return;
+		if (!(avahi_service_resolver_new(zc->client,
+						interface, protocol,
+						name, type, domain,
+						AVAHI_PROTO_UNSPEC, 0,
+						resolver_cb, e))) {
+			int res = avahi_client_errno(zc->client);
+			pw_log_error("can't make service resolver: %s", avahi_strerror(res));
+			pw_zeroconf_emit_error(zc, res, avahi_strerror(res));
+		}
+		break;
+	case AVAHI_BROWSER_REMOVE:
+		if (s == NULL)
+			return;
+		pw_log_info("removed %s %s %s", name, type, domain);
+		pw_zeroconf_emit_removed(zc, e->user, &s->props->dict);
+		service_free(s);
+		break;
+	default:
+		break;
+	}
+}
+
+static int do_browse(struct pw_zeroconf *zc, struct entry *e)
+{
+	const struct spa_dict_item *it;
+	const char *service_name = NULL;
+	int res;
+
+	if (e->browser == NULL) {
+		spa_dict_for_each(it, &e->props->dict) {
+			if (spa_streq(it->key, "zeroconf.service"))
+				service_name = it->value;
+		}
+		if (service_name == NULL) {
+			res = -EINVAL;
+			pw_log_error("no service provided");
+			pw_zeroconf_emit_error(zc, res, spa_strerror(res));
+			return res;
+		}
+		e->browser = avahi_service_browser_new(zc->client,
+				AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
+				service_name, NULL, 0,
+				browser_cb, e);
+	        if (e->browser == NULL) {
+			res = avahi_client_errno(zc->client);
+			pw_log_error("can't make browser: %s", avahi_strerror(res));
+			pw_zeroconf_emit_error(zc, res, avahi_strerror(res));
+			return -EIO;
+		}
+	}
+	return 0;
+}
+
+static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata)
+{
+	struct entry *e = userdata;
+	struct pw_zeroconf *zc = e->zc;
+	int res;
+
+	zc->refcount++;
+
+	switch (state) {
+	case AVAHI_ENTRY_GROUP_ESTABLISHED:
+		pw_log_info("Service successfully established");
+		break;
+	case AVAHI_ENTRY_GROUP_COLLISION:
+		pw_log_error("Service name collision");
+		break;
+	case AVAHI_ENTRY_GROUP_FAILURE:
+		res = avahi_client_errno(zc->client);
+		pw_log_error("Entry group failure: %s", avahi_strerror(res));
+		pw_zeroconf_emit_error(zc, res, avahi_strerror(res));
+		break;
+	case AVAHI_ENTRY_GROUP_UNCOMMITED:
+	case AVAHI_ENTRY_GROUP_REGISTERING:
+		break;
+	}
+	zeroconf_unref(zc);
+}
+
+static int do_announce(struct pw_zeroconf *zc, struct entry *e)
+{
+	AvahiStringList *txt = NULL;
+	int res;
+	const struct spa_dict_item *it;
+	const char *session_name = "unnamed", *service = NULL;
+	uint16_t port = 0;
+
+	if (e->group == NULL) {
+		e->group = avahi_entry_group_new(zc->client,
+					entry_group_callback, e);
+	        if (e->group == NULL) {
+			res = avahi_client_errno(zc->client);
+			pw_log_error("can't make group: %s", avahi_strerror(res));
+			pw_zeroconf_emit_error(zc, res, avahi_strerror(res));
+			return -EIO;
+		}
+	}
+	avahi_entry_group_reset(e->group);
+
+	spa_dict_for_each(it, &e->props->dict) {
+		if (spa_streq(it->key, "zeroconf.session"))
+			session_name = it->value;
+		else if (spa_streq(it->key, "zeroconf.port"))
+			port = atoi(it->value);
+		else if (spa_streq(it->key, "zeroconf.service"))
+			service = it->value;
+		else
+			txt = avahi_string_list_add_pair(txt, it->key, it->value);
+	}
+	if (service == NULL) {
+		res = -EINVAL;
+		pw_log_error("no service provided");
+		pw_zeroconf_emit_error(zc, res, spa_strerror(res));
+		return res;
+	}
+	res = avahi_entry_group_add_service_strlst(e->group,
+			AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
+			(AvahiPublishFlags)0, session_name,
+			service, NULL, NULL, port, txt);
+	avahi_string_list_free(txt);
+
+	if (res < 0) {
+		res = avahi_client_errno(zc->client);
+		pw_log_error("can't add service: %s", avahi_strerror(res));
+		pw_zeroconf_emit_error(zc, res, avahi_strerror(res));
+		return -EIO;
+	}
+	if ((res = avahi_entry_group_commit(e->group)) < 0) {
+		res = avahi_client_errno(zc->client);
+		pw_log_error("can't commit group: %s", avahi_strerror(res));
+		pw_zeroconf_emit_error(zc, res, avahi_strerror(res));
+		return -EIO;
+	}
+	return 0;
+}
+
+static int entry_start(struct pw_zeroconf *zc, struct entry *e)
+{
+	if (zc->state != AVAHI_CLIENT_S_REGISTERING &&
+	    zc->state != AVAHI_CLIENT_S_RUNNING &&
+	    zc->state != AVAHI_CLIENT_S_COLLISION)
+		return 0;
+
+	if (e->type == TYPE_ANNOUNCE)
+		return do_announce(zc, e);
+	else
+		return do_browse(zc, e);
+}
+
+static void client_callback(AvahiClient *c, AvahiClientState state, void *d)
+{
+	struct pw_zeroconf *zc = d;
+	struct entry *e;
+
+	zc->client = c;
+	zc->refcount++;
+	zc->state = state;
+
+	switch (state) {
+	case AVAHI_CLIENT_S_REGISTERING:
+	case AVAHI_CLIENT_S_RUNNING:
+	case AVAHI_CLIENT_S_COLLISION:
+		spa_list_for_each(e, &zc->entries, link)
+			entry_start(zc, e);
+		break;
+	case AVAHI_CLIENT_FAILURE:
+	{
+                int err = avahi_client_errno(c);
+		pw_zeroconf_emit_error(zc, err, avahi_strerror(err));
+		break;
+	}
+	case AVAHI_CLIENT_CONNECTING:
+	default:
+		break;
+	}
+	zeroconf_unref(zc);
+}
+
+static struct entry *entry_new(struct pw_zeroconf *zc, uint32_t type, void *user, const struct spa_dict *info)
+{
+	struct entry *e;
+
+	if ((e = calloc(1, sizeof(*e))) == NULL)
+		return NULL;
+
+	e->zc = zc;
+	e->type = type;
+	e->user = user;
+	e->props = pw_properties_new_dict(info);
+	spa_list_append(&zc->entries, &e->link);
+	spa_list_init(&e->services);
+	pw_log_info("created %s", type == TYPE_ANNOUNCE ? "announce" : "browse");
+	return e;
+}
+
+static int set_entry(struct pw_zeroconf *zc, uint32_t type, void *user, const struct spa_dict *info)
+{
+	struct entry *e;
+
+	e = entry_find(zc, type, user);
+	if (e == NULL) {
+		if (info == NULL)
+			return 0;
+		e = entry_new(zc, type, user, info);
+		entry_start(zc, e);
+	} else {
+		if (info == NULL)
+			entry_free(e);
+		else {
+			pw_properties_update(e->props, info);
+			entry_start(zc, e);
+		}
+	}
+	return 0;
+}
+int pw_zeroconf_set_announce(struct pw_zeroconf *zc, void *user, const struct spa_dict *info)
+{
+	return set_entry(zc, TYPE_ANNOUNCE, user, info);
+}
+int pw_zeroconf_set_browse(struct pw_zeroconf *zc, void *user, const struct spa_dict *info)
+{
+	return set_entry(zc, TYPE_BROWSE, user, info);
+}
+
+struct pw_zeroconf * pw_zeroconf_new(struct pw_context *context,
+				struct spa_dict *props)
+{
+	struct pw_zeroconf *zc;
+	uint32_t i;
+	int res;
+
+	if ((zc = calloc(1, sizeof(*zc))) == NULL)
+		return NULL;
+
+	zc->refcount = 1;
+	zc->context = context;
+	spa_hook_list_init(&zc->listener_list);
+	spa_list_init(&zc->entries);
+	zc->props = props ? pw_properties_new_dict(props) : pw_properties_new(NULL, NULL);
+	zc->discover_local = true;
+
+	for (i = 0; props && i < props->n_items; i++) {
+		const char *k = props->items[i].key;
+		const char *v = props->items[i].value;
+
+		if (spa_streq(k, "zeroconf.disable-local"))
+			zc->discover_local = spa_atob(v);
+	}
+
+	zc->poll = pw_avahi_poll_new(context);
+	if (zc->poll == NULL)
+		goto error;
+
+	zc->client = avahi_client_new(zc->poll, AVAHI_CLIENT_NO_FAIL,
+			client_callback, zc, &res);
+	if (!zc->client) {
+		pw_log_error("failed to create avahi client: %s", avahi_strerror(res));
+		goto error;
+	}
+	return zc;
+error:
+	zeroconf_free(zc);
+	return NULL;
+}
+
+void pw_zeroconf_add_listener(struct pw_zeroconf *zc,
+		struct spa_hook *listener,
+		const struct pw_zeroconf_events *events, void *data)
+{
+	spa_hook_list_append(&zc->listener_list, listener, events, data);
+}
diff --git a/src/modules/module-sendspin/zeroconf.h b/src/modules/module-sendspin/zeroconf.h
new file mode 100644
index 000000000..a5de62787
--- /dev/null
+++ b/src/modules/module-sendspin/zeroconf.h
@@ -0,0 +1,45 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2026 Wim Taymans */
+/* SPDX-License-Identifier: MIT */
+
+#ifndef PIPEWIRE_ZEROCONF_H
+#define PIPEWIRE_ZEROCONF_H
+
+#include <stdarg.h>
+
+#include <pipewire/pipewire.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct pw_zeroconf;
+
+struct pw_zeroconf_events {
+#define PW_VERSION_ZEROCONF_EVENTS	0
+	uint32_t version;
+
+	void (*destroy) (void *data);
+	void (*error) (void *data, int err, const char *message);
+
+	void (*added) (void *data, void *user, const struct spa_dict *info);
+	void (*removed) (void *data, void *user, const struct spa_dict *info);
+};
+
+struct pw_zeroconf * pw_zeroconf_new(struct pw_context *context,
+				struct spa_dict *props);
+
+void pw_zeroconf_destroy(struct pw_zeroconf *zc);
+
+int pw_zeroconf_set_announce(struct pw_zeroconf *zc, void *user, const struct spa_dict *info);
+int pw_zeroconf_set_browse(struct pw_zeroconf *zc, void *user, const struct spa_dict *info);
+
+void pw_zeroconf_add_listener(struct pw_zeroconf *zc,
+		struct spa_hook *listener,
+		const struct pw_zeroconf_events *events, void *data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PIPEWIRE_ZEROCONF_H */

From 4a399172b6124c54993e44db343d9800d5b03e54 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 26 Feb 2026 16:22:00 +0100
Subject: [PATCH 107/263] sendspin: implement receiver zeroconf connect

Let a receiver connect to the zeroconf server. Add option to connect to
multiple serves with rules.

Fix some leaks.

Fixes #5095
---
 src/modules/module-sendspin-recv.c | 625 +++++++++++++++++++----------
 src/modules/module-sendspin-send.c |   5 +-
 2 files changed, 416 insertions(+), 214 deletions(-)

diff --git a/src/modules/module-sendspin-recv.c b/src/modules/module-sendspin-recv.c
index 7e71a1397..76da7194d 100644
--- a/src/modules/module-sendspin-recv.c
+++ b/src/modules/module-sendspin-recv.c
@@ -61,6 +61,10 @@
  * - `sendspin.path`: the path on the sendspin server, default "/sendspin"
  * - `sendspin.client-id`: the client id, default "pipewire-$(hostname)"
  * - `sendspin.client-name`: the client name, default "$(hostname)"
+ * - `sendspin.autoconnect`: Use zeroconf to connect to an available server, default false.
+ * - `sendspin.announce`: Use zeroconf to announce the client, default true unless
+ *                      sendspin.autoconnect or sendspin.ip is given.
+ * - `sendspin.single-server`: Allow only a single server to connect, default true
  * - `node.always-process = <bool>`: true to receive even when not running
  * - `stream.props = {}`: properties to be passed to all the stream
  *
@@ -94,6 +98,10 @@
  *         #sendspin.port = 8927
  *         #sendspin.path = "/sendspin"
  *         #sendspin.client-id = "pipewire-test"
+ *         #sendspin.client-name = "PipeWire Test"
+ *         #sendspin.autoconnect = false
+ *         #sendspin.announce = true
+ *         #sendspin.single-server = true
  *         #node.always-process = false
  *         #audio.position = [ FL FR ]
  *         stream.props = {
@@ -120,6 +128,8 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 #define DEFAULT_SERVER_PORT	PW_SENDSPIN_DEFAULT_SERVER_PORT
 #define DEFAULT_SENDSPIN_PATH	PW_SENDSPIN_DEFAULT_PATH
 
+#define DEFAULT_CREATE_RULES	\
+        "[ { matches = [ { sendspin.ip = \"~.*\" } ] actions = { create-stream = { } } } ] "
 
 #define DEFAULT_POSITION	"[ FL FR ]"
 
@@ -136,10 +146,12 @@ static const struct spa_dict_item module_info[] = {
 	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
 };
 
-struct stream {
+struct client {
 	struct impl *impl;
 	struct spa_list link;
 
+	char *name;
+	struct pw_properties *props;
 	struct pw_websocket_connection *conn;
 	struct spa_hook conn_listener;
 
@@ -188,30 +200,31 @@ struct impl {
 	struct spa_hook zeroconf_listener;
 
 	bool always_process;
+	bool single_server;
 
 	struct pw_properties *stream_props;
 
 	struct pw_websocket *websocket;
 	struct spa_hook websocket_listener;
 
-	struct spa_list streams;
+	struct spa_list clients;
 };
 
 static void on_stream_destroy(void *d)
 {
-	struct stream *stream = d;
-	spa_hook_remove(&stream->stream_listener);
-	stream->stream = NULL;
+	struct client *client = d;
+	spa_hook_remove(&client->stream_listener);
+	client->stream = NULL;
 }
 
 static void on_stream_state_changed(void *d, enum pw_stream_state old,
 		enum pw_stream_state state, const char *error)
 {
-	struct stream *stream = d;
+	struct client *client = d;
 	switch (state) {
 	case PW_STREAM_STATE_ERROR:
 	case PW_STREAM_STATE_UNCONNECTED:
-		pw_impl_module_schedule_destroy(stream->impl->module);
+		pw_impl_module_schedule_destroy(client->impl->module);
 		break;
 	case PW_STREAM_STATE_PAUSED:
 	case PW_STREAM_STATE_STREAMING:
@@ -223,7 +236,7 @@ static void on_stream_state_changed(void *d, enum pw_stream_state old,
 
 static void on_capture_stream_process(void *d)
 {
-	struct stream *stream = d;
+	struct client *client = d;
 	struct pw_buffer *b;
 	struct spa_buffer *buf;
 	uint8_t *p;
@@ -232,7 +245,7 @@ static void on_capture_stream_process(void *d)
 	struct pw_time ts;
 	double err, corr, target, current_time;
 
-	if ((b = pw_stream_dequeue_buffer(stream->stream)) == NULL) {
+	if ((b = pw_stream_dequeue_buffer(client->stream)) == NULL) {
 		pw_log_debug("out of buffers: %m");
 		return;
 	}
@@ -241,41 +254,41 @@ static void on_capture_stream_process(void *d)
 	if ((p = buf->datas[0].data) == NULL)
 		return;
 
-	stride = stream->stride;
+	stride = client->stride;
 	n_frames = buf->datas[0].maxsize / stride;
 	if (b->requested)
 		n_frames = SPA_MIN(b->requested, n_frames);
 	n_bytes = n_frames * stride;
 
-	avail = spa_ringbuffer_get_read_index(&stream->ring, &index);
+	avail = spa_ringbuffer_get_read_index(&client->ring, &index);
 
-	if (stream->timeout_count > 4 && stream->timeout_count > 4) {
-		pw_stream_get_time_n(stream->stream, &ts, sizeof(ts));
+	if (client->timeout_count > 4 && client->timeout_count > 4) {
+		pw_stream_get_time_n(client->stream, &ts, sizeof(ts));
 
 		/* index to server time */
-		target = spa_regress_calc_y(&stream->regress_index, index);
+		target = spa_regress_calc_y(&client->regress_index, index);
 		/* server time to client time */
-		target = spa_regress_calc_y(&stream->regress_time, target);
+		target = spa_regress_calc_y(&client->regress_time, target);
 
 		current_time = ts.now / 1000.0;
-		current_time -= (ts.buffered * 1000000.0 / stream->info.info.raw.rate) +
+		current_time -= (ts.buffered * 1000000.0 / client->info.info.raw.rate) +
 			((ts.delay) * 1000000.0 * ts.rate.num / ts.rate.denom);
 		err = target - (double)current_time;
 
-		if (stream->resync) {
+		if (client->resync) {
 			if (target < current_time) {
-				target = spa_regress_calc_x(&stream->regress_time, current_time);
-				index = (uint32_t)spa_regress_calc_x(&stream->regress_index, target);
+				target = spa_regress_calc_x(&client->regress_time, current_time);
+				index = (uint32_t)spa_regress_calc_x(&client->regress_index, target);
 				index = SPA_ROUND_DOWN(index, stride);
 
 				pw_log_info("resync %u %f %f %f", index, target,
 						current_time, target - current_time);
 
-				spa_ringbuffer_read_update(&stream->ring, index);
-				avail = spa_ringbuffer_get_read_index(&stream->ring, &index);
+				spa_ringbuffer_read_update(&client->ring, index);
+				avail = spa_ringbuffer_get_read_index(&client->ring, &index);
 
 				err = 0.0;
-				stream->resync = false;
+				client->resync = false;
 			} else {
 				avail = 0;
 			}
@@ -285,27 +298,27 @@ static void on_capture_stream_process(void *d)
 	}
 	if (avail < (int32_t)n_bytes) {
 		avail = 0;
-		stream->resync = true;
+		client->resync = true;
 	}
-	else if (avail > (int32_t)stream->buffer_size) {
-		index += avail - stream->buffer_size;
-		avail = stream->buffer_size;
-		stream->resync = true;
+	else if (avail > (int32_t)client->buffer_size) {
+		index += avail - client->buffer_size;
+		avail = client->buffer_size;
+		client->resync = true;
 	}
 	if (avail > 0) {
 		n_bytes = SPA_MIN(n_bytes, (uint32_t)avail);
 
-		corr = spa_dll_update(&stream->dll, SPA_CLAMPD(err, -1000, 1000));
+		corr = spa_dll_update(&client->dll, SPA_CLAMPD(err, -1000, 1000));
 
 		pw_log_trace("%u %f %f %f %f", index, current_time, target, err, corr);
 
-		pw_stream_set_rate(stream->stream, 1.0 / corr);
+		pw_stream_set_rate(client->stream, 1.0 / corr);
 
-		spa_ringbuffer_read_data(&stream->ring,
-				stream->buffer, stream->buffer_size,
-				index % stream->buffer_size,
+		spa_ringbuffer_read_data(&client->ring,
+				client->buffer, client->buffer_size,
+				index % client->buffer_size,
 				p, n_bytes);
-		spa_ringbuffer_read_update(&stream->ring, index + n_bytes);
+		spa_ringbuffer_read_update(&client->ring, index + n_bytes);
 	} else {
 		memset(p, 0, n_bytes);
 	}
@@ -314,7 +327,7 @@ static void on_capture_stream_process(void *d)
 	buf->datas[0].chunk->stride = stride;
 	buf->datas[0].chunk->size = n_bytes;
 
-	pw_stream_queue_buffer(stream->stream, b);
+	pw_stream_queue_buffer(client->stream, b);
 }
 
 static const struct pw_stream_events capture_stream_events = {
@@ -324,19 +337,19 @@ static const struct pw_stream_events capture_stream_events = {
 	.process = on_capture_stream_process
 };
 
-static int create_stream(struct stream *stream)
+static int create_stream(struct client *client)
 {
-	struct impl *impl = stream->impl;
+	struct impl *impl = client->impl;
 	int res;
 	uint32_t n_params;
 	const struct spa_pod *params[1];
 	uint8_t buffer[1024];
 	struct spa_pod_builder b;
 	const char *server_id, *ip, *port, *server_name;
-	struct pw_properties *props = pw_properties_copy(impl->stream_props);
+	struct pw_properties *props = pw_properties_copy(client->props);
 
-	ip = pw_properties_get(impl->props, "sendspin.ip");
-	port = pw_properties_get(impl->props, "sendspin.port");
+	ip = pw_properties_get(props, "sendspin.ip");
+	port = pw_properties_get(props, "sendspin.port");
 	server_id = pw_properties_get(props, "sendspin.server-id");
 	server_name = pw_properties_get(props, "sendspin.server-name");
 
@@ -347,24 +360,24 @@ static int create_stream(struct stream *stream)
 	if (pw_properties_get(props, PW_KEY_MEDIA_NAME) == NULL)
 		pw_properties_setf(props, PW_KEY_MEDIA_NAME, "Sendspin from %s", server_name);
 
-	stream->stream = pw_stream_new(impl->core, "sendspin receiver", props);
-	if (stream->stream == NULL)
+	client->stream = pw_stream_new(impl->core, "sendspin receiver", props);
+	if (client->stream == NULL)
 		return -errno;
 
-	spa_ringbuffer_init(&stream->ring);
-	stream->buffer_size = 1024 * 1024;
-	stream->buffer = calloc(1, stream->buffer_size * stream->stride);
+	spa_ringbuffer_init(&client->ring);
+	client->buffer_size = 1024 * 1024;
+	client->buffer = calloc(1, client->buffer_size * client->stride);
 
-	pw_stream_add_listener(stream->stream,
-			&stream->stream_listener,
-			&capture_stream_events, stream);
+	pw_stream_add_listener(client->stream,
+			&client->stream_listener,
+			&capture_stream_events, client);
 
 	n_params = 0;
 	spa_pod_builder_init(&b, buffer, sizeof(buffer));
 	params[n_params++] = spa_format_audio_build(&b,
-			SPA_PARAM_EnumFormat, &stream->info);
+			SPA_PARAM_EnumFormat, &client->info);
 
-	if ((res = pw_stream_connect(stream->stream,
+	if ((res = pw_stream_connect(client->stream,
 			PW_DIRECTION_OUTPUT,
 			PW_ID_ANY,
 			PW_STREAM_FLAG_AUTOCONNECT |
@@ -385,7 +398,7 @@ static void add_format(struct spa_json_builder *b, const char *codec, int channe
 	spa_json_builder_object_int(b,    "bit_depth", depth);
 	spa_json_builder_pop(b,         "}");
 }
-static void add_playerv1_support(struct stream *stream, struct spa_json_builder *b)
+static void add_playerv1_support(struct client *client, struct spa_json_builder *b)
 {
 	spa_json_builder_object_push(b, "player@v1_support", "{");
 	spa_json_builder_object_push(b,   "supported_formats", "[");
@@ -399,9 +412,9 @@ static void add_playerv1_support(struct stream *stream, struct spa_json_builder
 	spa_json_builder_pop(b,           "]");
 	spa_json_builder_pop(b,         "}");
 }
-static int send_client_hello(struct stream *stream)
+static int send_client_hello(struct client *client)
 {
-	struct impl *impl = stream->impl;
+	struct impl *impl = client->impl;
 	struct spa_json_builder b;
 	int res;
 	char *mem;
@@ -422,18 +435,18 @@ static int send_client_hello(struct stream *stream)
 	spa_json_builder_object_string(&b,     "product_name", "Linux"); /* Use os-release */
 	spa_json_builder_object_stringf(&b,    "software_version", "PipeWire %s", pw_get_library_version());
 	spa_json_builder_pop(&b,             "}");
-	add_playerv1_support(stream, &b);
+	add_playerv1_support(client, &b);
 	spa_json_builder_pop(&b,           "}");
 	spa_json_builder_pop(&b,         "}");
 	spa_json_builder_close(&b);
 
-	res = pw_websocket_connection_send_text(stream->conn, mem, size);
+	res = pw_websocket_connection_send_text(client->conn, mem, size);
 	free(mem);
 
 	return res;
 }
 
-static int send_client_state(struct stream *stream)
+static int send_client_state(struct client *client)
 {
 	struct spa_json_builder b;
 	int res;
@@ -453,12 +466,12 @@ static int send_client_state(struct stream *stream)
 	spa_json_builder_pop(&b,         "}");
 	spa_json_builder_close(&b);
 
-	res = pw_websocket_connection_send_text(stream->conn, mem, size);
+	res = pw_websocket_connection_send_text(client->conn, mem, size);
 	free(mem);
 	return res;
 }
 
-static uint64_t get_time_us(struct stream *stream)
+static uint64_t get_time_us(struct client *client)
 {
 	struct timespec now;
 	if (clock_gettime(CLOCK_MONOTONIC, &now) < 0)
@@ -466,7 +479,7 @@ static uint64_t get_time_us(struct stream *stream)
 	return SPA_TIMESPEC_TO_USEC(&now);
 }
 
-static int send_client_time(struct stream *stream)
+static int send_client_time(struct client *client)
 {
 	struct spa_json_builder b;
 	int res;
@@ -474,7 +487,7 @@ static int send_client_time(struct stream *stream)
 	char *mem;
 	size_t size;
 
-	now = get_time_us(stream);
+	now = get_time_us(client);
 
 	spa_json_builder_memstream(&b, &mem, &size, 0);
 	spa_json_builder_array_push(&b,  "{");
@@ -485,24 +498,24 @@ static int send_client_time(struct stream *stream)
 	spa_json_builder_pop(&b,         "}");
 	spa_json_builder_close(&b);
 
-	res = pw_websocket_connection_send_text(stream->conn, mem, size);
+	res = pw_websocket_connection_send_text(client->conn, mem, size);
 	free(mem);
 	return res;
 }
 
-static void do_stream_timer(void *data)
+static void do_client_timer(void *data)
 {
-	struct stream *stream = data;
-	send_client_time(stream);
+	struct client *client = data;
+	send_client_time(client);
 }
 
 #if 0
-static int send_client_command(struct stream *stream)
+static int send_client_command(struct client *client)
 {
 	return 0;
 }
 #endif
-static int send_client_goodbye(struct stream *stream, const char *reason)
+static int send_client_goodbye(struct client *client, const char *reason)
 {
 	struct spa_json_builder b;
 	int res;
@@ -518,38 +531,38 @@ static int send_client_goodbye(struct stream *stream, const char *reason)
 	spa_json_builder_pop(&b,         "}");
 	spa_json_builder_close(&b);
 
-	res = pw_websocket_connection_send_text(stream->conn, mem, size);
-	pw_websocket_connection_disconnect(stream->conn, true);
+	res = pw_websocket_connection_send_text(client->conn, mem, size);
+	pw_websocket_connection_disconnect(client->conn, true);
 	free(mem);
 	return res;
 }
 
 #if 0
-static int send_stream_request_format(struct stream *stream)
+static int send_stream_request_format(struct client *client)
 {
 	return 0;
 }
 #endif
 
-static int handle_server_hello(struct stream *stream, struct spa_json *payload)
+static int handle_server_hello(struct client *client, struct spa_json *payload)
 {
-	struct impl *impl = stream->impl;
+	struct impl *impl = client->impl;
 	struct spa_json it[1];
 	char key[256], *t;
         const char *v;
 	int l, version = 0;
-	struct stream *s, *st;
+	struct client *c, *ct;
 
 	while ((l = spa_json_object_next(payload, key, sizeof(key), &v)) > 0) {
 		if (spa_streq(key, "server_id")) {
 			t = alloca(l+1);
 			spa_json_parse_stringn(v, l, t, l+1);
-			pw_properties_set(impl->stream_props, "sendspin.server-id", t);
+			pw_properties_set(client->props, "sendspin.server-id", t);
 		}
 		else if (spa_streq(key, "name")) {
 			t = alloca(l+1);
 			spa_json_parse_stringn(v, l, t, l+1);
-			pw_properties_set(impl->stream_props, "sendspin.server-name", t);
+			pw_properties_set(client->props, "sendspin.server-name", t);
 		}
 		else if (spa_streq(key, "version")) {
 			if (spa_json_parse_int(v, l, &version) <= 0)
@@ -565,9 +578,9 @@ static int handle_server_hello(struct stream *stream, struct spa_json *payload)
 				spa_json_parse_stringn(v, l, t, l+1);
 
 				if (spa_streq(t, "player@v1"))
-					stream->active_roles |= ROLE_PLAYER;
+					client->active_roles |= ROLE_PLAYER;
 				else if (spa_streq(t, "metadata@v1"))
-					stream->active_roles |= ROLE_METADATA;
+					client->active_roles |= ROLE_METADATA;
 			}
 		}
 		else if (spa_streq(key, "connection_reason")) {
@@ -575,35 +588,37 @@ static int handle_server_hello(struct stream *stream, struct spa_json *payload)
 			spa_json_parse_stringn(v, l, t, l+1);
 
 			if (spa_streq(t, "discovery"))
-				stream->connection_reason = REASON_DISCOVERY;
+				client->connection_reason = REASON_DISCOVERY;
 			else if (spa_streq(t, "playback"))
-				stream->connection_reason = REASON_PLAYBACK;
+				client->connection_reason = REASON_PLAYBACK;
 
-			pw_properties_set(impl->stream_props, "sendspin.connection-reason", t);
+			pw_properties_set(client->props, "sendspin.connection-reason", t);
 		}
 	}
 	if (version != 1)
 		return -ENOTSUP;
 
-	if (stream->connection_reason == REASON_PLAYBACK) {
-		/* keep this server, destroy others */
-		spa_list_for_each_safe(s, st, &impl->streams, link) {
-			if (s == stream)
-				continue;
-			send_client_goodbye(s, "another_server");
-		}
-	} else {
-		/* keep other servers, destroy this one */
-		spa_list_for_each_safe(s, st, &impl->streams, link) {
-			if (s == stream)
-				continue;
-			return send_client_goodbye(stream, "another_server");
+	if (impl->single_server) {
+		if (client->connection_reason == REASON_PLAYBACK) {
+			/* keep this server, destroy others */
+			spa_list_for_each_safe(c, ct, &impl->clients, link) {
+				if (c == client)
+					continue;
+				send_client_goodbye(c, "another_server");
+			}
+		} else {
+			/* keep other servers, destroy this one */
+			spa_list_for_each_safe(c, ct, &impl->clients, link) {
+				if (c == client)
+					continue;
+				return send_client_goodbye(client, "another_server");
+			}
 		}
 	}
-	return send_client_state(stream);
+	return send_client_state(client);
 }
 
-static int handle_server_state(struct stream *stream, struct spa_json *payload)
+static int handle_server_state(struct client *client, struct spa_json *payload)
 {
 	return 0;
 }
@@ -623,15 +638,15 @@ static int parse_uint64(const char *val, int len, uint64_t *result)
         return len > 0 && end == buf + len;
 }
 
-static int handle_server_time(struct stream *stream, struct spa_json *payload)
+static int handle_server_time(struct client *client, struct spa_json *payload)
 {
-	struct impl *impl = stream->impl;
+	struct impl *impl = client->impl;
 	char key[256];
         const char *v;
 	int l;
 	uint64_t t1 = 0, t2 = 0, t3 = 0, t4 = 0, timeout;
 
-	t4 = get_time_us(stream);
+	t4 = get_time_us(client);
 
 	while ((l = spa_json_object_next(payload, key, sizeof(key), &v)) > 0) {
 		if (spa_streq(key, "client_transmitted")) {
@@ -648,38 +663,38 @@ static int handle_server_time(struct stream *stream, struct spa_json *payload)
 		}
 	}
 
-	spa_regress_update(&stream->regress_time, (t2+t3)/2, (t1+t4)/2);
+	spa_regress_update(&client->regress_time, (t2+t3)/2, (t1+t4)/2);
 
-	if (stream->timeout_count < 4)
+	if (client->timeout_count < 4)
 		timeout = 200 * SPA_MSEC_PER_SEC;
-	else if (stream->timeout_count < 10)
+	else if (client->timeout_count < 10)
 		timeout = SPA_NSEC_PER_SEC;
-	else if (stream->timeout_count < 20)
+	else if (client->timeout_count < 20)
 		timeout = 2 * SPA_NSEC_PER_SEC;
 	else
 		timeout = 5 * SPA_NSEC_PER_SEC;
 
-	stream->timeout_count++;
-	pw_timer_queue_add(impl->timer_queue, &stream->timer,
-			&stream->timer.timeout, timeout,
-			do_stream_timer, stream);
+	client->timeout_count++;
+	pw_timer_queue_add(impl->timer_queue, &client->timer,
+			&client->timer.timeout, timeout,
+			do_client_timer, client);
 	return 0;
 }
 
-static int handle_server_command(struct stream *stream, struct spa_json *payload)
+static int handle_server_command(struct client *client, struct spa_json *payload)
 {
 	return 0;
 }
 
 /* {"codec":"pcm","sample_rate":44100,"channels":2,"bit_depth":16} */
-static int parse_player(struct stream *stream, struct spa_json *player)
+static int parse_player(struct client *client, struct spa_json *player)
 {
 	char key[256], codec[64] = "";
         const char *v;
 	int l, sample_rate = 0, channels = 0, bit_depth = 0;
 
-	spa_zero(stream->info);
-	stream->info.media_type = SPA_MEDIA_TYPE_audio;
+	spa_zero(client->info);
+	client->info.media_type = SPA_MEDIA_TYPE_audio;
 	while ((l = spa_json_object_next(player, key, sizeof(key), &v)) > 0) {
 		if (spa_streq(key, "codec")) {
 			if (spa_json_parse_stringn(v, l, codec, sizeof(codec)) <= 0)
@@ -704,44 +719,44 @@ static int parse_player(struct stream *stream, struct spa_json *player)
 		return -EINVAL;
 
 	if (spa_streq(codec, "pcm")) {
-		stream->info.media_subtype = SPA_MEDIA_SUBTYPE_raw;
-		stream->info.info.raw.rate = sample_rate;
-		stream->info.info.raw.channels = channels;
+		client->info.media_subtype = SPA_MEDIA_SUBTYPE_raw;
+		client->info.info.raw.rate = sample_rate;
+		client->info.info.raw.channels = channels;
 		switch (bit_depth) {
 		case 16:
-			stream->info.info.raw.format = SPA_AUDIO_FORMAT_S16_LE;
-			stream->stride = 2 * channels;
+			client->info.info.raw.format = SPA_AUDIO_FORMAT_S16_LE;
+			client->stride = 2 * channels;
 			break;
 		case 24:
-			stream->info.info.raw.format = SPA_AUDIO_FORMAT_S24_LE;
-			stream->stride = 3 * channels;
+			client->info.info.raw.format = SPA_AUDIO_FORMAT_S24_LE;
+			client->stride = 3 * channels;
 			break;
 		default:
 			return -EINVAL;
 		}
 	}
 	else if (spa_streq(codec, "opus")) {
-		stream->info.media_subtype = SPA_MEDIA_SUBTYPE_opus;
-		stream->info.info.opus.rate = sample_rate;
-		stream->info.info.opus.channels = channels;
+		client->info.media_subtype = SPA_MEDIA_SUBTYPE_opus;
+		client->info.info.opus.rate = sample_rate;
+		client->info.info.opus.channels = channels;
 	}
 	else if (spa_streq(codec, "flac")) {
-		stream->info.media_subtype = SPA_MEDIA_SUBTYPE_flac;
-		stream->info.info.flac.rate = sample_rate;
-		stream->info.info.flac.channels = channels;
+		client->info.media_subtype = SPA_MEDIA_SUBTYPE_flac;
+		client->info.info.flac.rate = sample_rate;
+		client->info.info.flac.channels = channels;
 	}
 	else
 		return -EINVAL;
 
-	spa_dll_set_bw(&stream->dll, SPA_DLL_BW_MIN, 1000, sample_rate);
+	spa_dll_set_bw(&client->dll, SPA_DLL_BW_MIN, 1000, sample_rate);
 
 	return 0;
 }
 
 /* {"player":{}} */
-static int handle_stream_start(struct stream *stream, struct spa_json *payload)
+static int handle_stream_start(struct client *client, struct spa_json *payload)
 {
-	struct impl *impl = stream->impl;
+	struct impl *impl = client->impl;
 	struct spa_json it[1];
 	char key[256];
         const char *v;
@@ -752,50 +767,50 @@ static int handle_stream_start(struct stream *stream, struct spa_json *payload)
 			if (!spa_json_is_object(v, l))
 				return -EPROTO;
 			spa_json_enter(payload, &it[0]);
-			parse_player(stream, &it[0]);
+			parse_player(client, &it[0]);
 		}
 	}
 
-	if (stream->stream == NULL) {
-		create_stream(stream);
+	if (client->stream == NULL) {
+		create_stream(client);
 
-		pw_timer_queue_cancel(&stream->timer);
-		pw_timer_queue_add(impl->timer_queue, &stream->timer,
-			NULL, 0, do_stream_timer, stream);
+		pw_timer_queue_cancel(&client->timer);
+		pw_timer_queue_add(impl->timer_queue, &client->timer,
+			NULL, 0, do_client_timer, client);
 	} else {
 	}
 
 	return 0;
 }
 
-static void stream_clear(struct stream *stream)
+static void stream_clear(struct client *client)
 {
-	spa_ringbuffer_init(&stream->ring);
-	memset(stream->buffer, 0, stream->buffer_size);
+	spa_ringbuffer_init(&client->ring);
+	memset(client->buffer, 0, client->buffer_size);
 }
 
-static int handle_stream_clear(struct stream *stream, struct spa_json *payload)
+static int handle_stream_clear(struct client *client, struct spa_json *payload)
 {
-	stream_clear(stream);
+	stream_clear(client);
 	return 0;
 }
-static int handle_stream_end(struct stream *stream, struct spa_json *payload)
+static int handle_stream_end(struct client *client, struct spa_json *payload)
 {
-	if (stream->stream != NULL) {
-		pw_stream_destroy(stream->stream);
-		stream->stream = NULL;
-		stream_clear(stream);
+	if (client->stream != NULL) {
+		pw_stream_destroy(client->stream);
+		client->stream = NULL;
+		stream_clear(client);
 	}
 	return 0;
 }
 
-static int handle_group_update(struct stream *stream, struct spa_json *payload)
+static int handle_group_update(struct client *client, struct spa_json *payload)
 {
 	return 0;
 }
 
 /* { "type":... "payload":{...} } */
-static int do_parse_text(struct stream *stream, const char *content, int size)
+static int do_parse_text(struct client *client, const char *content, int size)
 {
 	struct spa_json it[2], *payload = NULL;
 	char key[256], type[256] = "";
@@ -821,35 +836,35 @@ static int do_parse_text(struct stream *stream, const char *content, int size)
 		}
 	}
 	if (spa_streq(type, "server/hello"))
-		res = handle_server_hello(stream, payload);
+		res = handle_server_hello(client, payload);
 	else if (spa_streq(type, "server/state"))
-		res = handle_server_state(stream, payload);
+		res = handle_server_state(client, payload);
 	else if (spa_streq(type, "server/time"))
-		res = handle_server_time(stream, payload);
+		res = handle_server_time(client, payload);
 	else if (spa_streq(type, "server/command"))
-		res = handle_server_command(stream, payload);
+		res = handle_server_command(client, payload);
 	else if (spa_streq(type, "stream/start"))
-		res = handle_stream_start(stream, payload);
+		res = handle_stream_start(client, payload);
 	else if (spa_streq(type, "stream/end"))
-		res = handle_stream_end(stream, payload);
+		res = handle_stream_end(client, payload);
 	else if (spa_streq(type, "stream/clear"))
-		res = handle_stream_clear(stream, payload);
+		res = handle_stream_clear(client, payload);
 	else if (spa_streq(type, "group/update"))
-		res = handle_group_update(stream, payload);
+		res = handle_group_update(client, payload);
 	else
 		res = 0;
 
 	return res;
 }
 
-static int do_handle_binary(struct stream *stream, const uint8_t *payload, int size)
+static int do_handle_binary(struct client *client, const uint8_t *payload, int size)
 {
-	struct impl *impl = stream->impl;
+	struct impl *impl = client->impl;
 	int32_t filled;
 	uint32_t index, length = size - 9;
 	uint64_t timestamp;
 
-	if (payload[0] != 4 || stream->stream == NULL)
+	if (payload[0] != 4 || client->stream == NULL)
 		return 0;
 
 	timestamp  = ((uint64_t)payload[1]) << 56;
@@ -861,24 +876,24 @@ static int do_handle_binary(struct stream *stream, const uint8_t *payload, int s
 	timestamp |= ((uint64_t)payload[7]) <<  8;
 	timestamp |= ((uint64_t)payload[8]);
 
-	filled = spa_ringbuffer_get_write_index(&stream->ring, &index);
+	filled = spa_ringbuffer_get_write_index(&client->ring, &index);
 	if (filled < 0) {
 		pw_log_warn("%p: underrun write:%u filled:%d",
-				stream, index, filled);
-	} else if (filled + length > stream->buffer_size) {
+				client, index, filled);
+	} else if (filled + length > client->buffer_size) {
 		pw_log_debug("%p: overrun write:%u filled:%d",
-				stream, index, filled);
+				client, index, filled);
 	}
 
-	spa_ringbuffer_write_data(&stream->ring,
-			stream->buffer, stream->buffer_size,
-			index % stream->buffer_size,
+	spa_ringbuffer_write_data(&client->ring,
+			client->buffer, client->buffer_size,
+			index % client->buffer_size,
 			&payload[9], length);
 
-	spa_ringbuffer_write_update(&stream->ring, index + length);
+	spa_ringbuffer_write_update(&client->ring, index + length);
 
 	pw_loop_lock(impl->data_loop);
-	spa_regress_update(&stream->regress_index, index, timestamp);
+	spa_regress_update(&client->regress_index, index, timestamp);
 	pw_loop_unlock(impl->data_loop);
 
 	return 0;
@@ -886,45 +901,53 @@ static int do_handle_binary(struct stream *stream, const uint8_t *payload, int s
 
 static void on_connection_message(void *data, int opcode, void *payload, size_t size)
 {
-	struct stream *stream = data;
+	struct client *client = data;
 	if (opcode == PW_WEBSOCKET_OPCODE_TEXT) {
-		do_parse_text(stream, payload, size);
+		do_parse_text(client, payload, size);
 	} else if (opcode == PW_WEBSOCKET_OPCODE_BINARY) {
-		do_handle_binary(stream, payload, size);
+		do_handle_binary(client, payload, size);
 	} else {
 		pw_log_warn("%02x unknown %08x", opcode, (int)size);
 	}
 }
 
-static void stream_destroy(struct stream *stream)
+static void client_free(struct client *client)
 {
-	handle_stream_end(stream, NULL);
-	if (stream->conn) {
-		spa_hook_remove(&stream->conn_listener);
-		pw_websocket_connection_destroy(stream->conn);
+	struct impl *impl = client->impl;
+
+	spa_list_remove(&client->link);
+
+	handle_stream_end(client, NULL);
+	if (client->conn) {
+		spa_hook_remove(&client->conn_listener);
+		pw_websocket_connection_destroy(client->conn);
+	} else {
+		pw_websocket_cancel(impl->websocket, client);
 	}
-	pw_timer_queue_cancel(&stream->timer);
-	spa_list_remove(&stream->link);
-	free(stream->buffer);
-	free(stream);
+	pw_timer_queue_cancel(&client->timer);
+
+	pw_properties_free(client->props);
+	free(client->buffer);
+	free(client->name);
+	free(client);
 }
 
 static void on_connection_destroy(void *data)
 {
-	struct stream *stream = data;
-	stream->conn = NULL;
-	pw_log_info("connection %p destroy", stream);
+	struct client *client = data;
+	client->conn = NULL;
+	pw_log_info("connection %p destroy", client);
 }
 static void on_connection_error(void *data, int res, const char *reason)
 {
-	struct stream *stream = data;
-	pw_log_error("connection %p error %d %s", stream, res, reason);
+	struct client *client = data;
+	pw_log_error("connection %p error %d %s", client, res, reason);
 }
 
 static void on_connection_disconnected(void *data)
 {
-	struct stream *stream = data;
-	stream_destroy(stream);
+	struct client *client = data;
+	client_free(client);
 }
 
 static const struct pw_websocket_connection_events websocket_connection_events = {
@@ -935,38 +958,150 @@ static const struct pw_websocket_connection_events websocket_connection_events =
 	.message = on_connection_message,
 };
 
-static struct stream *stream_new(struct impl *impl, struct pw_websocket_connection *conn)
+static struct client *client_new(struct impl *impl, const char *name, struct pw_properties *props)
 {
-	struct stream *stream;
+	struct client *client;
 
-	stream = calloc(1, sizeof(*stream));
-	if (stream == NULL)
-		return NULL;
+	client = calloc(1, sizeof(*client));
+	if (client == NULL)
+		goto error;
 
-	stream->impl = impl;
-	spa_list_append(&impl->streams, &stream->link);
+	client->impl = impl;
+	spa_list_append(&impl->clients, &client->link);
 
-	stream->conn = conn;
-	pw_websocket_connection_add_listener(stream->conn, &stream->conn_listener,
-			&websocket_connection_events, stream);
+	client->name = name ? strdup(name) : NULL;
+	client->props = props;
+	spa_regress_init(&client->regress_index, 5);
+	spa_regress_init(&client->regress_time, 5);
 
-	spa_regress_init(&stream->regress_index, 5);
-	spa_regress_init(&stream->regress_time, 5);
+	spa_dll_init(&client->dll);
+	client->resync = true;
 
-	spa_dll_init(&stream->dll);
-	stream->resync = true;
+	return client;
+error:
+	pw_properties_free(props);
+	return NULL;
+}
 
-	return stream;
+static int client_connect(struct client *c)
+{
+	struct impl *impl = c->impl;
+	const char *addr, *port, *path;
+	addr = pw_properties_get(c->props, "sendspin.ip");
+	port = pw_properties_get(c->props, "sendspin.port");
+	path = pw_properties_get(c->props, "sendspin.path");
+	return pw_websocket_connect(impl->websocket, c, addr, port, path);
+}
+
+static void client_connected(struct client *c, struct pw_websocket_connection *conn)
+{
+	if (c->conn) {
+		spa_hook_remove(&c->conn_listener);
+		pw_websocket_connection_destroy(c->conn);
+	}
+	c->conn = conn;
+	if (conn)
+		pw_websocket_connection_add_listener(c->conn, &c->conn_listener,
+				&websocket_connection_events, c);
+}
+
+static struct client *client_find(struct impl *impl, const char *name)
+{
+	struct client *c;
+	spa_list_for_each(c, &impl->clients, link) {
+		if (spa_streq(c->name, name))
+			return c;
+	}
+	return NULL;
+}
+
+struct match_info {
+	struct impl *impl;
+	const char *name;
+	struct pw_properties *props;
+	struct pw_websocket_connection *conn;
+	bool matched;
+};
+
+static int rule_matched(void *data, const char *location, const char *action,
+                        const char *str, size_t len)
+{
+	struct match_info *i = data;
+	struct impl *impl = i->impl;
+	int res = 0;
+
+	i->matched = true;
+	if (spa_streq(action, "create-stream")) {
+		struct client *c;
+
+		pw_properties_update_string(i->props, str, len);
+		if ((c = client_new(impl, i->name, spa_steal_ptr(i->props))) == NULL)
+			return -errno;
+		if (i->conn)
+			client_connected(c, i->conn);
+		else
+			client_connect(c);
+	}
+	return res;
+}
+
+static int match_client(struct impl *impl, const char *name, struct pw_properties *props,
+		struct pw_websocket_connection *conn)
+{
+	const char *str;
+	struct match_info minfo = {
+		.impl = impl,
+		.name = name,
+		.props = props,
+		.conn = conn,
+	};
+
+	if ((str = pw_properties_get(impl->props, "stream.rules")) == NULL)
+		str = DEFAULT_CREATE_RULES;
+
+	pw_conf_match_rules(str, strlen(str), NAME, &props->dict,
+			rule_matched, &minfo);
+
+	if (!minfo.matched) {
+		pw_log_info("unmatched client found %s", str);
+		if (conn)
+			pw_websocket_connection_destroy(conn);
+		pw_properties_free(props);
+	}
+	return minfo.matched;
 }
 
 static void on_websocket_connected(void *data, void *user,
 		struct pw_websocket_connection *conn, const char *path)
 {
 	struct impl *impl = data;
-	struct stream *stream;
+	struct client *c = user;
+
 	pw_log_info("connected to %s", path);
-	stream = stream_new(impl, conn);
-	send_client_hello(stream);
+	if (c == NULL) {
+		struct sockaddr_storage addr;
+		char ip[128];
+		uint16_t port = 0;
+		bool ipv4;
+		struct pw_properties *props;
+
+		pw_websocket_connection_address(conn,
+				(struct sockaddr*)&addr, sizeof(addr));
+
+		props = pw_properties_copy(impl->stream_props);
+		if (pw_net_get_ip(&addr, ip, sizeof(ip), &ipv4, &port) >= 0) {
+			pw_properties_set(props, "sendspin.ip", ip);
+			pw_properties_setf(props, "sendspin.port", "%u", port);
+		}
+		pw_properties_set(props, "sendspin.path", path);
+
+		if ((c = client_new(impl, "", props)) == NULL) {
+			pw_log_error("can't create new client: %m");
+			return;
+		}
+	}
+	client_connected(c, conn);
+	send_client_hello(c);
 }
 
 static const struct pw_websocket_events websocket_events = {
@@ -976,10 +1111,45 @@ static const struct pw_websocket_events websocket_events = {
 
 static void on_zeroconf_added(void *data, void *user, const struct spa_dict *info)
 {
+	struct impl *impl = data;
+	const char *name, *addr, *port, *path;
+	struct client *c;
+	struct pw_properties *props;
+
+	name = spa_dict_lookup(info, "zeroconf.hostname");
+
+	if (impl->single_server && !spa_list_is_empty(&impl->clients))
+		return;
+
+	if ((c = client_find(impl, name)) != NULL)
+		return;
+
+	props = pw_properties_copy(impl->stream_props);
+	pw_properties_update(props, info);
+
+	addr = spa_dict_lookup(info, "zeroconf.address");
+	port = spa_dict_lookup(info, "zeroconf.port");
+	path = spa_dict_lookup(info, "path");
+
+	pw_properties_set(props, "sendspin.ip", addr);
+	pw_properties_set(props, "sendspin.port", port);
+	pw_properties_set(props, "sendspin.path", path);
+
+	match_client(impl, name, props, NULL);
 }
 
 static void on_zeroconf_removed(void *data, void *user, const struct spa_dict *info)
 {
+	struct impl *impl = data;
+	const char *name;
+	struct client *c;
+
+	name = spa_dict_lookup(info, "zeroconf.hostname");
+
+	if ((c = client_find(impl, name)) == NULL)
+		return;
+
+	client_free(c);
 }
 
 static const struct pw_zeroconf_events zeroconf_events = {
@@ -1002,10 +1172,10 @@ static const struct pw_proxy_events core_proxy_events = {
 
 static void impl_destroy(struct impl *impl)
 {
-	struct stream *s;
+	struct client *c;
 
-	spa_list_consume(s, &impl->streams, link)
-		stream_destroy(s);
+	spa_list_consume(c, &impl->clients, link)
+		client_free(c);
 
 	if (impl->core && impl->do_disconnect)
 		pw_core_disconnect(impl->core);
@@ -1064,6 +1234,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 	const char *str, *hostname, *port, *path;
 	struct pw_properties *props, *stream_props;
 	int res = 0;
+	bool autoconnect, announce;
 
 	PW_LOG_TOPIC_INIT(mod_topic);
 
@@ -1087,7 +1258,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 	impl->main_loop = pw_context_get_main_loop(context);
 	impl->data_loop = pw_context_acquire_loop(context, &props->dict);
 	impl->timer_queue = pw_context_get_timer_queue(context);
-	spa_list_init(&impl->streams);
+	spa_list_init(&impl->clients);
 
 	pw_properties_set(props, PW_KEY_NODE_LOOP_NAME, impl->data_loop->name);
 
@@ -1109,6 +1280,11 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 	impl->always_process = pw_properties_get_bool(stream_props,
 			PW_KEY_NODE_ALWAYS_PROCESS, true);
 
+	autoconnect = pw_properties_get_bool(props, "sendspin.autoconnect", false);
+	announce = pw_properties_get_bool(props, "sendspin.announce", true);
+	impl->single_server = pw_properties_get_bool(props,
+			"sendspin.single-server", true);
+
 	if ((str = pw_properties_get(props, "sendspin.client-name")) == NULL)
 		pw_properties_set(props, "sendspin.client-name", pw_get_host_name());
 	if ((str = pw_properties_get(props, "sendspin.client-id")) == NULL)
@@ -1147,15 +1323,10 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 	}
 
 	hostname = pw_properties_get(props, "sendspin.ip");
-	if (hostname != NULL) {
-		port = pw_properties_get(props, "sendspin.port");
-		if (port == NULL)
-			port = SPA_STRINGIFY(DEFAULT_SERVER_PORT);
-		if ((path = pw_properties_get(props, "sendspin.path")) == NULL)
-			path = DEFAULT_SENDSPIN_PATH;
-
-		pw_websocket_connect(impl->websocket, NULL, hostname, port, path);
-	} else {
+	/* a client should either connect itself or advertize itself and listen
+	 * for connections, not both */
+	if (!autoconnect && hostname == NULL){
+		/* listen for server connection */
 		if ((hostname = pw_properties_get(props, "source.ip")) == NULL)
 			hostname = DEFAULT_SOURCE_IP;
 		if ((port = pw_properties_get(props, "source.port")) == NULL)
@@ -1165,7 +1336,8 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 
 		pw_websocket_listen(impl->websocket, NULL, hostname, port, path);
 
-		if (impl->zeroconf) {
+		if (impl->zeroconf && announce) {
+			/* optionally announce ourselves */
 			str = pw_properties_get(props, "sendspin.client-id");
 			pw_zeroconf_set_announce(impl->zeroconf, NULL,
 				&SPA_DICT_ITEMS(
@@ -1175,6 +1347,33 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 					SPA_DICT_ITEM("path", path)));
 		}
 	}
+	else {
+		if (hostname != NULL) {
+			struct client *c;
+			struct pw_properties *p;
+
+			/* connect to hardcoded server */
+			port = pw_properties_get(props, "sendspin.port");
+			if (port == NULL)
+				port = SPA_STRINGIFY(DEFAULT_SERVER_PORT);
+			if ((path = pw_properties_get(props, "sendspin.path")) == NULL)
+				path = DEFAULT_SENDSPIN_PATH;
+
+			p = pw_properties_copy(impl->stream_props);
+			pw_properties_set(p, "sendspin.ip", hostname);
+			pw_properties_set(p, "sendspin.port", port);
+			pw_properties_set(p, "sendspin.path", path);
+
+			if ((c = client_new(impl, "", p)) != NULL)
+				client_connect(c);
+		}
+		/* connect to zeroconf server if we can */
+		if (impl->zeroconf) {
+			pw_zeroconf_set_browse(impl->zeroconf, NULL,
+				&SPA_DICT_ITEMS(
+					SPA_DICT_ITEM("zeroconf.service", PW_SENDSPIN_SERVER_SERVICE)));
+		}
+	}
 
 	pw_impl_module_add_listener(module, &impl->module_listener, &module_events, impl);
 
diff --git a/src/modules/module-sendspin-send.c b/src/modules/module-sendspin-send.c
index 9bc7195ce..3acf7ea4e 100644
--- a/src/modules/module-sendspin-send.c
+++ b/src/modules/module-sendspin-send.c
@@ -925,6 +925,8 @@ static void client_free(struct client *c)
 {
 	struct impl *impl = c->impl;
 
+	spa_list_remove(&c->link);
+
 	handle_client_goodbye(c, NULL);
 	if (c->conn) {
 		spa_hook_remove(&c->conn_listener);
@@ -933,7 +935,8 @@ static void client_free(struct client *c)
 		pw_websocket_cancel(impl->websocket, c);
 	}
 	pw_timer_queue_cancel(&c->timer);
-	spa_list_remove(&c->link);
+	pw_properties_free(c->props);
+	free(c->name);
 	free(c);
 }
 

From fa04146cfb49a01c6cae6d1229d189fee2af51de Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 26 Feb 2026 17:09:45 +0100
Subject: [PATCH 108/263] modules: move zeroconf code to zeroconf-utils

---
 src/modules/meson.build                            | 14 +++++++-------
 .../modules/module-zeroconf-publish.c              |  2 +-
 src/modules/module-raop-discover.c                 |  2 +-
 src/modules/module-rtp-session.c                   |  2 +-
 src/modules/module-sendspin-recv.c                 |  2 +-
 src/modules/module-sendspin-send.c                 |  2 +-
 src/modules/module-snapcast-discover.c             |  2 +-
 src/modules/module-zeroconf-discover.c             |  2 +-
 .../avahi-poll.c                                   |  0
 .../avahi-poll.h                                   |  0
 .../{module-sendspin => zeroconf-utils}/zeroconf.c |  3 +--
 .../{module-sendspin => zeroconf-utils}/zeroconf.h |  0
 12 files changed, 15 insertions(+), 16 deletions(-)
 rename src/modules/{module-zeroconf-discover => zeroconf-utils}/avahi-poll.c (100%)
 rename src/modules/{module-zeroconf-discover => zeroconf-utils}/avahi-poll.h (100%)
 rename src/modules/{module-sendspin => zeroconf-utils}/zeroconf.c (99%)
 rename src/modules/{module-sendspin => zeroconf-utils}/zeroconf.h (100%)

diff --git a/src/modules/meson.build b/src/modules/meson.build
index 5a024be1a..1a530472d 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -372,7 +372,7 @@ endif
 if avahi_dep.found()
   pipewire_module_protocol_pulse_sources += [
     'module-protocol-pulse/modules/module-zeroconf-publish.c',
-    'module-zeroconf-discover/avahi-poll.c',
+    'zeroconf-utils/avahi-poll.c',
   ]
   pipewire_module_protocol_pulse_deps += avahi_dep
   cdata.set('HAVE_AVAHI', true)
@@ -569,7 +569,7 @@ if build_module_zeroconf_discover
   pipewire_module_zeroconf_discover = shared_library('pipewire-module-zeroconf-discover',
     [ 'module-zeroconf-discover.c',
       'module-protocol-pulse/format.c',
-      'module-zeroconf-discover/avahi-poll.c' ],
+      'zeroconf-utils/avahi-poll.c' ],
     include_directories : [configinc],
     install : true,
     install_dir : modules_install_dir,
@@ -599,7 +599,7 @@ build_module_raop_discover = avahi_dep.found()
 if build_module_raop_discover
   pipewire_module_raop_discover = shared_library('pipewire-module-raop-discover',
     [ 'module-raop-discover.c',
-      'module-zeroconf-discover/avahi-poll.c' ],
+      'zeroconf-utils/avahi-poll.c' ],
     include_directories : [configinc],
     install : true,
     install_dir : modules_install_dir,
@@ -613,7 +613,7 @@ build_module_snapcast_discover = avahi_dep.found()
 if build_module_snapcast_discover
   pipewire_module_snapcast_discover = shared_library('pipewire-module-snapcast-discover',
     [ 'module-snapcast-discover.c',
-      'module-zeroconf-discover/avahi-poll.c' ],
+      'zeroconf-utils/avahi-poll.c' ],
     include_directories : [configinc],
     install : true,
     install_dir : modules_install_dir,
@@ -661,7 +661,7 @@ pipewire_module_rtp_sink = shared_library('pipewire-module-rtp-sink',
 build_module_rtp_session = avahi_dep.found()
 if build_module_rtp_session
   pipewire_module_rtp_session = shared_library('pipewire-module-rtp-session',
-    [ 'module-zeroconf-discover/avahi-poll.c',
+    [ 'zeroconf-utils/avahi-poll.c',
       'module-rtp-session.c' ],
     include_directories : [configinc],
     install : true,
@@ -705,8 +705,8 @@ pipewire_module_vban_recv = shared_library('pipewire-module-vban-recv',
 
 if avahi_dep.found()
   pipewire_module_sendspin_sources += [
-    'module-sendspin/zeroconf.c',
-    'module-zeroconf-discover/avahi-poll.c',
+    'zeroconf-utils/zeroconf.c',
+    'zeroconf-utils/avahi-poll.c',
   ]
   pipewire_module_sendspin_deps += avahi_dep
 endif
diff --git a/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c b/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c
index d4425a3fe..f8ad9212b 100644
--- a/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c
+++ b/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c
@@ -15,7 +15,7 @@
 #include "../module.h"
 #include "../pulse-server.h"
 #include "../server.h"
-#include "../../module-zeroconf-discover/avahi-poll.h"
+#include "../../zeroconf-utils/avahi-poll.h"
 
 #include <avahi-client/client.h>
 #include <avahi-client/publish.h>
diff --git a/src/modules/module-raop-discover.c b/src/modules/module-raop-discover.c
index 436972ac0..cbfa1da1b 100644
--- a/src/modules/module-raop-discover.c
+++ b/src/modules/module-raop-discover.c
@@ -23,8 +23,8 @@
 #include <avahi-common/error.h>
 #include <avahi-common/malloc.h>
 
+#include "zeroconf-utils/avahi-poll.h"
 #include "module-protocol-pulse/format.h"
-#include "module-zeroconf-discover/avahi-poll.h"
 
 /** \page page_module_raop_discover RAOP Discover
  *
diff --git a/src/modules/module-rtp-session.c b/src/modules/module-rtp-session.c
index 63470c539..ff190aae0 100644
--- a/src/modules/module-rtp-session.c
+++ b/src/modules/module-rtp-session.c
@@ -32,7 +32,7 @@
 #include <avahi-common/error.h>
 #include <avahi-common/malloc.h>
 
-#include "module-zeroconf-discover/avahi-poll.h"
+#include "zeroconf-utils/avahi-poll.h"
 
 #include <module-rtp/rtp.h>
 #include <module-rtp/apple-midi.h>
diff --git a/src/modules/module-sendspin-recv.c b/src/modules/module-sendspin-recv.c
index 76da7194d..517679fba 100644
--- a/src/modules/module-sendspin-recv.c
+++ b/src/modules/module-sendspin-recv.c
@@ -30,8 +30,8 @@
 #include <pipewire/pipewire.h>
 #include <pipewire/impl.h>
 
+#include "zeroconf-utils/zeroconf.h"
 #include "module-sendspin/sendspin.h"
-#include "module-sendspin/zeroconf.h"
 #include "module-sendspin/websocket.h"
 #include "module-sendspin/regress.h"
 #include "network-utils.h"
diff --git a/src/modules/module-sendspin-send.c b/src/modules/module-sendspin-send.c
index 3acf7ea4e..c10a9aba9 100644
--- a/src/modules/module-sendspin-send.c
+++ b/src/modules/module-sendspin-send.c
@@ -32,7 +32,7 @@
 
 #include "module-sendspin/sendspin.h"
 #include "module-sendspin/websocket.h"
-#include "module-sendspin/zeroconf.h"
+#include "zeroconf-utils/zeroconf.h"
 #include "network-utils.h"
 
 /** \page page_module_sendspin_send sendspin sender
diff --git a/src/modules/module-snapcast-discover.c b/src/modules/module-snapcast-discover.c
index e929be9c0..b9df21a3a 100644
--- a/src/modules/module-snapcast-discover.c
+++ b/src/modules/module-snapcast-discover.c
@@ -34,7 +34,7 @@
 #include <avahi-common/malloc.h>
 
 #include "module-protocol-pulse/format.h"
-#include "module-zeroconf-discover/avahi-poll.h"
+#include "zeroconf-utils/avahi-poll.h"
 
 #include "network-utils.h"
 
diff --git a/src/modules/module-zeroconf-discover.c b/src/modules/module-zeroconf-discover.c
index 177556637..a07dfbee8 100644
--- a/src/modules/module-zeroconf-discover.c
+++ b/src/modules/module-zeroconf-discover.c
@@ -25,7 +25,7 @@
 #include <avahi-common/malloc.h>
 
 #include "module-protocol-pulse/format.h"
-#include "module-zeroconf-discover/avahi-poll.h"
+#include "zeroconf-utils/avahi-poll.h"
 
 /** \page page_module_zeroconf_discover Zeroconf Discover
  *
diff --git a/src/modules/module-zeroconf-discover/avahi-poll.c b/src/modules/zeroconf-utils/avahi-poll.c
similarity index 100%
rename from src/modules/module-zeroconf-discover/avahi-poll.c
rename to src/modules/zeroconf-utils/avahi-poll.c
diff --git a/src/modules/module-zeroconf-discover/avahi-poll.h b/src/modules/zeroconf-utils/avahi-poll.h
similarity index 100%
rename from src/modules/module-zeroconf-discover/avahi-poll.h
rename to src/modules/zeroconf-utils/avahi-poll.h
diff --git a/src/modules/module-sendspin/zeroconf.c b/src/modules/zeroconf-utils/zeroconf.c
similarity index 99%
rename from src/modules/module-sendspin/zeroconf.c
rename to src/modules/zeroconf-utils/zeroconf.c
index fb1c5a221..cdd7a0231 100644
--- a/src/modules/module-sendspin/zeroconf.c
+++ b/src/modules/zeroconf-utils/zeroconf.c
@@ -20,8 +20,7 @@
 #include <avahi-common/error.h>
 #include <avahi-common/malloc.h>
 
-#include "../module-zeroconf-discover/avahi-poll.h"
-
+#include "avahi-poll.h"
 #include "zeroconf.h"
 
 #define pw_zeroconf_emit(o,m,v,...) 	spa_hook_list_call(&o->listener_list, struct pw_zeroconf_events, m, v, ##__VA_ARGS__)
diff --git a/src/modules/module-sendspin/zeroconf.h b/src/modules/zeroconf-utils/zeroconf.h
similarity index 100%
rename from src/modules/module-sendspin/zeroconf.h
rename to src/modules/zeroconf-utils/zeroconf.h

From b67937f2474ebe942f144f901bf77ed800e553a5 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 26 Feb 2026 18:13:37 +0100
Subject: [PATCH 109/263] module-raop: port to new zeroconf helper

---
 src/modules/meson.build               |  45 +--
 src/modules/module-raop-discover.c    | 406 +++++++++-----------------
 src/modules/zeroconf-utils/zeroconf.c |   2 +-
 3 files changed, 168 insertions(+), 285 deletions(-)

diff --git a/src/modules/meson.build b/src/modules/meson.build
index 1a530472d..5db179097 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -296,6 +296,17 @@ pipewire_module_protocol_native = shared_library('pipewire-module-protocol-nativ
   dependencies : pipewire_module_protocol_deps,
 )
 
+zeroconf_sources = []
+zeroconf_deps = []
+if avahi_dep.found()
+  zeroconf_sources += [
+    'zeroconf-utils/zeroconf.c',
+    'zeroconf-utils/avahi-poll.c',
+  ]
+  zeroconf_deps += avahi_dep
+  cdata.set('HAVE_AVAHI', true)
+endif
+
 pipewire_module_protocol_pulse_deps = pipewire_module_protocol_deps
 
 pipewire_module_protocol_pulse_sources = [
@@ -372,10 +383,9 @@ endif
 if avahi_dep.found()
   pipewire_module_protocol_pulse_sources += [
     'module-protocol-pulse/modules/module-zeroconf-publish.c',
-    'zeroconf-utils/avahi-poll.c',
+    zeroconf_sources,
   ]
-  pipewire_module_protocol_pulse_deps += avahi_dep
-  cdata.set('HAVE_AVAHI', true)
+  pipewire_module_protocol_pulse_deps += zeroconf_deps
 endif
 
 if gsettings_gio_dep.found()
@@ -569,12 +579,12 @@ if build_module_zeroconf_discover
   pipewire_module_zeroconf_discover = shared_library('pipewire-module-zeroconf-discover',
     [ 'module-zeroconf-discover.c',
       'module-protocol-pulse/format.c',
-      'zeroconf-utils/avahi-poll.c' ],
+      zeroconf_sources ],
     include_directories : [configinc],
     install : true,
     install_dir : modules_install_dir,
     install_rpath: modules_install_dir,
-    dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep, avahi_dep],
+    dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep, zeroconf_deps],
   )
 endif
 summary({'zeroconf-discover': build_module_zeroconf_discover}, bool_yn: true, section: 'Optional Modules')
@@ -599,12 +609,12 @@ build_module_raop_discover = avahi_dep.found()
 if build_module_raop_discover
   pipewire_module_raop_discover = shared_library('pipewire-module-raop-discover',
     [ 'module-raop-discover.c',
-      'zeroconf-utils/avahi-poll.c' ],
+      zeroconf_sources ],
     include_directories : [configinc],
     install : true,
     install_dir : modules_install_dir,
     install_rpath: modules_install_dir,
-    dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep, avahi_dep],
+    dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep, zeroconf_deps],
   )
 endif
 summary({'raop-discover (needs Avahi)': build_module_raop_discover}, bool_yn: true, section: 'Optional Modules')
@@ -613,12 +623,12 @@ build_module_snapcast_discover = avahi_dep.found()
 if build_module_snapcast_discover
   pipewire_module_snapcast_discover = shared_library('pipewire-module-snapcast-discover',
     [ 'module-snapcast-discover.c',
-      'zeroconf-utils/avahi-poll.c' ],
+      zeroconf_sources ],
     include_directories : [configinc],
     install : true,
     install_dir : modules_install_dir,
     install_rpath: modules_install_dir,
-    dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep, avahi_dep],
+    dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep, zeroconf_deps],
   )
 endif
 summary({'snapcast-discover (needs Avahi)': build_module_snapcast_discover}, bool_yn: true, section: 'Optional Modules')
@@ -661,13 +671,13 @@ pipewire_module_rtp_sink = shared_library('pipewire-module-rtp-sink',
 build_module_rtp_session = avahi_dep.found()
 if build_module_rtp_session
   pipewire_module_rtp_session = shared_library('pipewire-module-rtp-session',
-    [ 'zeroconf-utils/avahi-poll.c',
-      'module-rtp-session.c' ],
+    [ 'module-rtp-session.c',
+      zeroconf_sources ],
     include_directories : [configinc],
     install : true,
     install_dir : modules_install_dir,
     install_rpath: modules_install_dir,
-    dependencies : [pipewire_module_rtp_common_dep, avahi_dep],
+    dependencies : [pipewire_module_rtp_common_dep, zeroconf_deps],
   )
 endif
 
@@ -700,15 +710,12 @@ pipewire_module_vban_recv = shared_library('pipewire-module-vban-recv',
   dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep],
 )
 
- pipewire_module_sendspin_sources = []
- pipewire_module_sendspin_deps = [ mathlib, dl_lib, rt_lib, pipewire_dep ]
+pipewire_module_sendspin_sources = []
+pipewire_module_sendspin_deps = [ mathlib, dl_lib, rt_lib, pipewire_dep ]
 
 if avahi_dep.found()
-  pipewire_module_sendspin_sources += [
-    'zeroconf-utils/zeroconf.c',
-    'zeroconf-utils/avahi-poll.c',
-  ]
-  pipewire_module_sendspin_deps += avahi_dep
+  pipewire_module_sendspin_sources += zeroconf_sources
+  pipewire_module_sendspin_deps += zeroconf_deps
 endif
 
 pipewire_module_sendspin_recv = shared_library('pipewire-module-sendspin-recv',
diff --git a/src/modules/module-raop-discover.c b/src/modules/module-raop-discover.c
index cbfa1da1b..60e5e0077 100644
--- a/src/modules/module-raop-discover.c
+++ b/src/modules/module-raop-discover.c
@@ -19,11 +19,7 @@
 #include <pipewire/impl.h>
 #include <pipewire/i18n.h>
 
-#include <avahi-client/lookup.h>
-#include <avahi-common/error.h>
-#include <avahi-common/malloc.h>
-
-#include "zeroconf-utils/avahi-poll.h"
+#include "zeroconf-utils/zeroconf.h"
 #include "module-protocol-pulse/format.h"
 
 /** \page page_module_raop_discover RAOP Discover
@@ -129,29 +125,20 @@ struct impl {
 
 	struct pw_properties *properties;
 
-	AvahiPoll *avahi_poll;
-	AvahiClient *client;
-	AvahiServiceBrowser *sink_browser;
+	struct pw_zeroconf *zeroconf;
+	struct spa_hook zeroconf_listener;
 
 	struct spa_list tunnel_list;
 };
 
-struct tunnel_info {
-	const char *name;
-};
-
-#define TUNNEL_INFO(...) ((struct tunnel_info){ __VA_ARGS__ })
-
 struct tunnel {
 	struct spa_list link;
-	struct tunnel_info info;
+	char *name;
 	struct pw_impl_module *module;
 	struct spa_hook module_listener;
 };
 
-static int start_client(struct impl *impl);
-
-static struct tunnel *make_tunnel(struct impl *impl, const struct tunnel_info *info)
+static struct tunnel *tunnel_new(struct impl *impl, const char *name)
 {
 	struct tunnel *t;
 
@@ -159,28 +146,28 @@ static struct tunnel *make_tunnel(struct impl *impl, const struct tunnel_info *i
 	if (t == NULL)
 		return NULL;
 
-	t->info.name = strdup(info->name);
+	t->name = strdup(name);
 	spa_list_append(&impl->tunnel_list, &t->link);
 
 	return t;
 }
 
-static struct tunnel *find_tunnel(struct impl *impl, const struct tunnel_info *info)
+static struct tunnel *find_tunnel(struct impl *impl, const char *name)
 {
 	struct tunnel *t;
 	spa_list_for_each(t, &impl->tunnel_list, link) {
-		if (spa_streq(t->info.name, info->name))
+		if (spa_streq(t->name, name))
 			return t;
 	}
 	return NULL;
 }
 
-static void free_tunnel(struct tunnel *t)
+static void tunnel_free(struct tunnel *t)
 {
 	spa_list_remove(&t->link);
 	if (t->module)
 		pw_impl_module_destroy(t->module);
-	free((char *) t->info.name);
+	free(t->name);
 	free(t);
 }
 
@@ -189,14 +176,9 @@ static void impl_free(struct impl *impl)
 	struct tunnel *t;
 
 	spa_list_consume(t, &impl->tunnel_list, link)
-		free_tunnel(t);
-
-	if (impl->sink_browser)
-		avahi_service_browser_free(impl->sink_browser);
-	if (impl->client)
-		avahi_client_free(impl->client);
-	if (impl->avahi_poll)
-		pw_avahi_poll_free(impl->avahi_poll);
+		tunnel_free(t);
+	if (impl->zeroconf)
+		pw_zeroconf_destroy(impl->zeroconf);
 	pw_properties_free(impl->properties);
 	free(impl);
 }
@@ -224,75 +206,6 @@ static bool str_in_list(const char *haystack, const char *delimiters, const char
 	return false;
 }
 
-static void pw_properties_from_avahi_string(const char *key, const char *value,
-		struct pw_properties *props)
-{
-	if (spa_streq(key, "device")) {
-		pw_properties_set(props, "raop.device", value);
-	}
-	else if (spa_streq(key, "tp")) {
-		/* transport protocol, "UDP", "TCP", "UDP,TCP" */
-		if (str_in_list(value, ",", "UDP"))
-			value = "udp";
-		else if (str_in_list(value, ",", "TCP"))
-			value = "tcp";
-		pw_properties_set(props, "raop.transport", value);
-	} else if (spa_streq(key, "et")) {
-		/* RAOP encryption types:
-		 *  0 = none,
-		 *  1 = RSA,
-		 *  3 = FairPlay,
-		 *  4 = MFiSAP (/auth-setup),
-		 *  5 = FairPlay SAPv2.5 */
-		if (str_in_list(value, ",", "5"))
-			value = "fp_sap25";
-		else if (str_in_list(value, ",", "4"))
-			value = "auth_setup";
-		else if (str_in_list(value, ",", "1"))
-			value = "RSA";
-		else
-			value = "none";
-		pw_properties_set(props, "raop.encryption.type", value);
-	} else if (spa_streq(key, "cn")) {
-		/* Supported audio codecs:
-		 *  0 = PCM,
-		 *  1 = ALAC,
-		 *  2 = AAC,
-		 *  3 = AAC ELD. */
-		if (str_in_list(value, ",", "0"))
-			value = "PCM";
-		else if (str_in_list(value, ",", "1"))
-			value = "ALAC";
-		else if (str_in_list(value, ",", "2"))
-			value = "AAC";
-		else if (str_in_list(value, ",", "3"))
-			value = "AAC-ELD";
-		else
-			value = "unknown";
-		pw_properties_set(props, "raop.audio.codec", value);
-	} else if (spa_streq(key, "ch")) {
-		/* Number of channels */
-		pw_properties_set(props, PW_KEY_AUDIO_CHANNELS, value);
-	} else if (spa_streq(key, "ss")) {
-		/* Sample size */
-		if (spa_streq(value, "16"))
-			value = "S16";
-		else if (spa_streq(value, "24"))
-			value = "S24";
-		else if (spa_streq(value, "32"))
-			value = "S32";
-		else
-			value = "UNKNOWN";
-		pw_properties_set(props, PW_KEY_AUDIO_FORMAT, value);
-	} else if (spa_streq(key, "sr")) {
-		/* Sample rate */
-		pw_properties_set(props, PW_KEY_AUDIO_RATE, value);
-	} else if (spa_streq(key, "am")) {
-		/* Device model */
-		pw_properties_set(props, "device.model", value);
-        }
-}
-
 static void submodule_destroy(void *data)
 {
 	struct tunnel *t = data;
@@ -364,76 +277,124 @@ static int rule_matched(void *data, const char *location, const char *action,
 	return res;
 }
 
-static void resolver_cb(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiProtocol protocol,
-	AvahiResolverEvent event, const char *name, const char *type, const char *domain,
-	const char *host_name, const AvahiAddress *a, uint16_t port, AvahiStringList *txt,
-	AvahiLookupResultFlags flags, void *userdata)
+static void pw_properties_from_zeroconf(const char *key, const char *value,
+		struct pw_properties *props)
 {
-	struct impl *impl = userdata;
-	struct tunnel_info tinfo;
-	struct tunnel *t;
-	const char *str, *link_local_range = "169.254.";
-	AvahiStringList *l;
-	struct pw_properties *props = NULL;
-	char at[AVAHI_ADDRESS_STR_MAX], if_suffix[16] = "";
-
-	if (event != AVAHI_RESOLVER_FOUND) {
-		pw_log_error("Resolving of '%s' failed: %s", name,
-				avahi_strerror(avahi_client_errno(impl->client)));
-		goto done;
+	if (spa_streq(key, "zeroconf.ifindex")) {
+		pw_properties_set(props, "raop.ifindex", value);
 	}
+	else if (spa_streq(key, "zeroconf.address")) {
+		pw_properties_set(props, "raop.ip", value);
+	}
+	else if (spa_streq(key, "zeroconf.port")) {
+		pw_properties_set(props, "raop.port", value);
+	}
+	else if (spa_streq(key, "zeroconf.name")) {
+		pw_properties_set(props, "raop.name", value);
+	}
+	else if (spa_streq(key, "zeroconf.hostname")) {
+		pw_properties_set(props, "raop.hostname", value);
+	}
+	else if (spa_streq(key, "zeroconf.domain")) {
+		pw_properties_set(props, "raop.domain", value);
+	}
+	else if (spa_streq(key, "device")) {
+		pw_properties_set(props, "raop.device", value);
+	}
+	else if (spa_streq(key, "tp")) {
+		/* transport protocol, "UDP", "TCP", "UDP,TCP" */
+		if (str_in_list(value, ",", "UDP"))
+			value = "udp";
+		else if (str_in_list(value, ",", "TCP"))
+			value = "tcp";
+		pw_properties_set(props, "raop.transport", value);
+	} else if (spa_streq(key, "et")) {
+		/* RAOP encryption types:
+		 *  0 = none,
+		 *  1 = RSA,
+		 *  3 = FairPlay,
+		 *  4 = MFiSAP (/auth-setup),
+		 *  5 = FairPlay SAPv2.5 */
+		if (str_in_list(value, ",", "5"))
+			value = "fp_sap25";
+		else if (str_in_list(value, ",", "4"))
+			value = "auth_setup";
+		else if (str_in_list(value, ",", "1"))
+			value = "RSA";
+		else
+			value = "none";
+		pw_properties_set(props, "raop.encryption.type", value);
+	} else if (spa_streq(key, "cn")) {
+		/* Supported audio codecs:
+		 *  0 = PCM,
+		 *  1 = ALAC,
+		 *  2 = AAC,
+		 *  3 = AAC ELD. */
+		if (str_in_list(value, ",", "0"))
+			value = "PCM";
+		else if (str_in_list(value, ",", "1"))
+			value = "ALAC";
+		else if (str_in_list(value, ",", "2"))
+			value = "AAC";
+		else if (str_in_list(value, ",", "3"))
+			value = "AAC-ELD";
+		else
+			value = "unknown";
+		pw_properties_set(props, "raop.audio.codec", value);
+	} else if (spa_streq(key, "ch")) {
+		/* Number of channels */
+		pw_properties_set(props, PW_KEY_AUDIO_CHANNELS, value);
+	} else if (spa_streq(key, "ss")) {
+		/* Sample size */
+		if (spa_streq(value, "16"))
+			value = "S16";
+		else if (spa_streq(value, "24"))
+			value = "S24";
+		else if (spa_streq(value, "32"))
+			value = "S32";
+		else
+			value = "UNKNOWN";
+		pw_properties_set(props, PW_KEY_AUDIO_FORMAT, value);
+	} else if (spa_streq(key, "sr")) {
+		/* Sample rate */
+		pw_properties_set(props, PW_KEY_AUDIO_RATE, value);
+	} else if (spa_streq(key, "am")) {
+		/* Device model */
+		pw_properties_set(props, "device.model", value);
+        }
+}
 
-	avahi_address_snprint(at, sizeof(at), a);
-	if (spa_strstartswith(at, link_local_range))
-		pw_log_info("found link-local ip address %s for '%s'", at, name);
+static void on_zeroconf_added(void *data, void *user, const struct spa_dict *info)
+{
+	struct impl *impl = data;
+	const char *name, *str;
+	struct tunnel *t;
+	const struct spa_dict_item *it;
+	struct pw_properties *props = NULL;
 
-	tinfo = TUNNEL_INFO(.name = name);
+	name = spa_dict_lookup(info, "zeroconf.name");
 
-	t = find_tunnel(impl, &tinfo);
-	if (t == NULL)
-		t = make_tunnel(impl, &tinfo);
+	t = find_tunnel(impl, name);
 	if (t == NULL) {
-		pw_log_error("Can't make tunnel: %m");
-		goto done;
+		if ((t = tunnel_new(impl, name)) == NULL) {
+			pw_log_error("Can't make tunnel: %m");
+			goto done;
+		}
 	}
 	if (t->module != NULL) {
-		pw_log_info("found duplicate mdns entry for %s on IP %s - skipping tunnel creation", name, at);
+		pw_log_info("found duplicate mdns entry for %s on IP %s - "
+				"skipping tunnel creation", name,
+				spa_dict_lookup(info, "zeroconf.address"));
 		goto done;
 	}
 
-	props = pw_properties_new(NULL, NULL);
-	if (props == NULL) {
+	if ((props = pw_properties_new(NULL, NULL)) == NULL) {
 		pw_log_error("Can't allocate properties: %m");
 		goto done;
 	}
 
-	if (a->proto == AVAHI_PROTO_INET6 &&
-	    a->data.ipv6.address[0] == 0xfe &&
-	    (a->data.ipv6.address[1] & 0xc0) == 0x80)
-		snprintf(if_suffix, sizeof(if_suffix), "%%%d", interface);
-
-	/* For IPv4 link-local, bind to the discovery interface */
-	if (a->proto == AVAHI_PROTO_INET &&
-	    spa_strstartswith(at, link_local_range))
-		snprintf(if_suffix, sizeof(if_suffix), "%%%d", interface);
-
-	pw_properties_setf(props, "raop.ip", "%s%s", at, if_suffix);
-	pw_properties_setf(props, "raop.ifindex", "%d", interface);
-	pw_properties_setf(props, "raop.port", "%u", port);
-	pw_properties_setf(props, "raop.name", "%s", name);
-	pw_properties_setf(props, "raop.hostname", "%s", host_name);
-	pw_properties_setf(props, "raop.domain", "%s", domain);
-
-	for (l = txt; l; l = l->next) {
-		char *key, *value;
-
-		if (avahi_string_list_get_pair(l, &key, &value, NULL) != 0)
-			break;
-
-		pw_properties_from_avahi_string(key, value, props);
-		avahi_free(key);
-		avahi_free(value);
-	}
+	spa_dict_for_each(it, info)
+		pw_properties_from_zeroconf(it->key, it->value, props);
 
 	if ((str = pw_properties_get(impl->properties, "raop.latency.ms")) != NULL)
 		pw_properties_set(props, "raop.latency.ms", str);
@@ -452,123 +413,28 @@ static void resolver_cb(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiPr
 		if (!minfo.matched)
 			pw_log_info("unmatched service found %s", str);
 	}
-
 done:
-	avahi_service_resolver_free(r);
 	pw_properties_free(props);
 }
 
-
-static void browser_cb(AvahiServiceBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol,
-	AvahiBrowserEvent event, const char *name, const char *type, const char *domain,
-	AvahiLookupResultFlags flags, void *userdata)
+static void on_zeroconf_removed(void *data, void *user, const struct spa_dict *info)
 {
-	struct impl *impl = userdata;
-	struct tunnel_info info;
+	struct impl *impl = data;
+	const char *name;
 	struct tunnel *t;
 
-	if ((flags & AVAHI_LOOKUP_RESULT_LOCAL) && !impl->discover_local)
+	name = spa_dict_lookup(info, "zeroconf.name");
+
+	if ((t = find_tunnel(impl, name)) == NULL)
 		return;
 
-	info = TUNNEL_INFO(.name = name);
-
-	t = find_tunnel(impl, &info);
-
-	switch (event) {
-	case AVAHI_BROWSER_NEW:
-		if (t != NULL) {
-			pw_log_info("found duplicate mdns entry - skipping tunnel creation");
-			return;
-		}
-		if (!(avahi_service_resolver_new(impl->client,
-						interface, protocol,
-						name, type, domain,
-						AVAHI_PROTO_UNSPEC, 0,
-						resolver_cb, impl)))
-			pw_log_error("can't make service resolver: %s",
-					avahi_strerror(avahi_client_errno(impl->client)));
-		break;
-	case AVAHI_BROWSER_REMOVE:
-		if (t == NULL)
-			return;
-		free_tunnel(t);
-		break;
-	default:
-		break;
-	}
-}
-
-
-static struct AvahiServiceBrowser *make_browser(struct impl *impl, const char *service_type)
-{
-	struct AvahiServiceBrowser *s;
-
-	s = avahi_service_browser_new(impl->client,
-                              AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
-                              service_type, NULL, 0,
-                              browser_cb, impl);
-	if (s == NULL) {
-		pw_log_error("can't make browser for %s: %s", service_type,
-				avahi_strerror(avahi_client_errno(impl->client)));
-	}
-	return s;
-}
-
-static void client_callback(AvahiClient *c, AvahiClientState state, void *userdata)
-{
-	struct impl *impl = userdata;
-
-	impl->client = c;
-
-	switch (state) {
-	case AVAHI_CLIENT_S_REGISTERING:
-	case AVAHI_CLIENT_S_RUNNING:
-	case AVAHI_CLIENT_S_COLLISION:
-		if (impl->sink_browser == NULL)
-			impl->sink_browser = make_browser(impl, SERVICE_TYPE_SINK);
-		if (impl->sink_browser == NULL)
-			goto error;
-		break;
-	case AVAHI_CLIENT_FAILURE:
-		if (avahi_client_errno(c) == AVAHI_ERR_DISCONNECTED)
-			start_client(impl);
-
-		SPA_FALLTHROUGH;
-	case AVAHI_CLIENT_CONNECTING:
-		if (impl->sink_browser) {
-			avahi_service_browser_free(impl->sink_browser);
-			impl->sink_browser = NULL;
-		}
-		break;
-	default:
-		break;
-	}
-	return;
-error:
-	pw_impl_module_schedule_destroy(impl->module);
-}
-
-static int start_client(struct impl *impl)
-{
-	int res;
-	if ((impl->client = avahi_client_new(impl->avahi_poll,
-					AVAHI_CLIENT_NO_FAIL,
-					client_callback, impl,
-					&res)) == NULL) {
-		pw_log_error("can't create client: %s", avahi_strerror(res));
-		pw_impl_module_schedule_destroy(impl->module);
-		return -EIO;
-	}
-	return 0;
-}
-
-static int start_avahi(struct impl *impl)
-{
-
-	impl->avahi_poll = pw_avahi_poll_new(impl->context);
-
-	return start_client(impl);
+	tunnel_free(t);
 }
+static const struct pw_zeroconf_events zeroconf_events = {
+	PW_VERSION_ZEROCONF_EVENTS,
+	.added = on_zeroconf_added,
+	.removed = on_zeroconf_removed,
+};
 
 SPA_EXPORT
 int pipewire__module_init(struct pw_impl_module *module, const char *args)
@@ -576,6 +442,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 	struct pw_context *context = pw_impl_module_get_context(module);
 	struct pw_properties *props;
 	struct impl *impl;
+	const char *local;
 	int res;
 
 	PW_LOG_TOPIC_INIT(mod_topic);
@@ -599,15 +466,24 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 	impl->context = context;
 	impl->properties = props;
 
-	impl->discover_local =  pw_properties_get_bool(impl->properties,
-			"raop.discover-local", false);
+	if ((local = pw_properties_get(impl->properties, "raop.discover-local")) == NULL)
+		local = "false";
+	pw_properties_set(impl->properties, "zeroconf.discover-local", local);
 
 	pw_impl_module_add_listener(module, &impl->module_listener, &module_events, impl);
 
 	pw_impl_module_update_properties(module, &SPA_DICT_INIT_ARRAY(module_props));
 
-	start_avahi(impl);
+	if ((impl->zeroconf = pw_zeroconf_new(context, &props->dict)) == NULL) {
+		pw_log_error("can't create zeroconf: %m");
+		goto error_errno;
+	}
+	pw_zeroconf_add_listener(impl->zeroconf, &impl->zeroconf_listener,
+			&zeroconf_events, impl);
 
+	pw_zeroconf_set_browse(impl->zeroconf, NULL,
+		&SPA_DICT_ITEMS(
+			SPA_DICT_ITEM("zeroconf.service", SERVICE_TYPE_SINK)));
 	return 0;
 
 error_errno:
diff --git a/src/modules/zeroconf-utils/zeroconf.c b/src/modules/zeroconf-utils/zeroconf.c
index cdd7a0231..4a6a46c25 100644
--- a/src/modules/zeroconf-utils/zeroconf.c
+++ b/src/modules/zeroconf-utils/zeroconf.c
@@ -529,7 +529,7 @@ struct pw_zeroconf * pw_zeroconf_new(struct pw_context *context,
 		const char *k = props->items[i].key;
 		const char *v = props->items[i].value;
 
-		if (spa_streq(k, "zeroconf.disable-local"))
+		if (spa_streq(k, "zeroconf.discover-local"))
 			zc->discover_local = spa_atob(v);
 	}
 

From 79d8e7f61dc5fd6f5fe79c805665a2e009cd87f4 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 26 Feb 2026 18:39:41 +0100
Subject: [PATCH 110/263] modules: port zeroconf-discover to new helper

---
 src/modules/module-zeroconf-discover.c | 227 +++++++------------------
 src/modules/zeroconf-utils/zeroconf.c  |   2 +-
 2 files changed, 58 insertions(+), 171 deletions(-)

diff --git a/src/modules/module-zeroconf-discover.c b/src/modules/module-zeroconf-discover.c
index a07dfbee8..f6f1ce087 100644
--- a/src/modules/module-zeroconf-discover.c
+++ b/src/modules/module-zeroconf-discover.c
@@ -25,7 +25,7 @@
 #include <avahi-common/malloc.h>
 
 #include "module-protocol-pulse/format.h"
-#include "zeroconf-utils/avahi-poll.h"
+#include "zeroconf-utils/zeroconf.h"
 
 /** \page page_module_zeroconf_discover Zeroconf Discover
  *
@@ -84,11 +84,8 @@ struct impl {
 
 	struct pw_properties *properties;
 
-	bool discover_local;
-	AvahiPoll *avahi_poll;
-	AvahiClient *client;
-	AvahiServiceBrowser *sink_browser;
-	AvahiServiceBrowser *source_browser;
+	struct pw_zeroconf *zeroconf;
+	struct spa_hook zeroconf_listener;
 
 	struct spa_list tunnel_list;
 };
@@ -107,9 +104,7 @@ struct tunnel {
 	struct spa_hook module_listener;
 };
 
-static int start_client(struct impl *impl);
-
-static struct tunnel *make_tunnel(struct impl *impl, const struct tunnel_info *info)
+static struct tunnel *tunnel_new(struct impl *impl, const struct tunnel_info *info)
 {
 	struct tunnel *t;
 
@@ -135,7 +130,7 @@ static struct tunnel *find_tunnel(struct impl *impl, const struct tunnel_info *i
 	return NULL;
 }
 
-static void free_tunnel(struct tunnel *t)
+static void tunnel_free(struct tunnel *t)
 {
 	spa_list_remove(&t->link);
 	if (t->module)
@@ -151,16 +146,10 @@ static void impl_free(struct impl *impl)
 	struct tunnel *t;
 
 	spa_list_consume(t, &impl->tunnel_list, link)
-		free_tunnel(t);
+		tunnel_free(t);
 
-	if (impl->sink_browser)
-		avahi_service_browser_free(impl->sink_browser);
-	if (impl->source_browser)
-		avahi_service_browser_free(impl->source_browser);
-	if (impl->client)
-		avahi_client_free(impl->client);
-	if (impl->avahi_poll)
-		pw_avahi_poll_free(impl->avahi_poll);
+	if (impl->zeroconf)
+		pw_zeroconf_destroy(impl->zeroconf);
 	pw_properties_free(impl->properties);
 	free(impl);
 }
@@ -177,7 +166,7 @@ static const struct pw_impl_module_events module_events = {
 	.destroy = module_destroy,
 };
 
-static void pw_properties_from_avahi_string(const char *key, const char *value,
+static void pw_properties_from_zeroconf(const char *key, const char *value,
 		struct pw_properties *props)
 {
 	if (spa_streq(key, "device")) {
@@ -241,38 +230,28 @@ static const struct pw_impl_module_events submodule_events = {
 	.destroy = submodule_destroy,
 };
 
-static void resolver_cb(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiProtocol protocol,
-	AvahiResolverEvent event, const char *name, const char *type, const char *domain,
-	const char *host_name, const AvahiAddress *a, uint16_t port, AvahiStringList *txt,
-	AvahiLookupResultFlags flags, void *userdata)
+static void on_zeroconf_added(void *data, void *user_data, const struct spa_dict *info)
 {
-	struct impl *impl = userdata;
+	struct impl *impl = data;
+	const char *name, *type, *mode, *device, *host_name, *desc, *fqdn, *user, *str;
 	struct tunnel *t;
 	struct tunnel_info tinfo;
-	const char *str, *device, *desc, *fqdn, *user, *mode;
-	char if_suffix[16] = "";
-	char at[AVAHI_ADDRESS_STR_MAX];
-	AvahiStringList *l;
+	const struct spa_dict_item *it;
 	FILE *f;
 	char *args;
 	size_t size;
 	struct pw_impl_module *mod;
 	struct pw_properties *props = NULL;
 
-
-	if (event != AVAHI_RESOLVER_FOUND) {
-		pw_log_error("Resolving of '%s' failed: %s", name,
-				avahi_strerror(avahi_client_errno(impl->client)));
-		goto done;
-	}
-
+	name = spa_dict_lookup(info, "zeroconf.name");
+	type = spa_dict_lookup(info, "zeroconf.type");
 	mode = strstr(type, "sink") ? "sink" : "source";
 
 	tinfo = TUNNEL_INFO(.name = name, .mode = mode);
 
 	t = find_tunnel(impl, &tinfo);
 	if (t == NULL)
-		t = make_tunnel(impl, &tinfo);
+		t = tunnel_new(impl, &tinfo);
 	if (t == NULL) {
 		pw_log_error("Can't make tunnel: %m");
 		goto done;
@@ -288,16 +267,10 @@ static void resolver_cb(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiPr
 		goto done;
 	}
 
-	for (l = txt; l; l = l->next) {
-		char *key, *value;
+	spa_dict_for_each(it, info)
+		pw_properties_from_zeroconf(it->key, it->value, props);
 
-		if (avahi_string_list_get_pair(l, &key, &value, NULL) != 0)
-			break;
-
-		pw_properties_from_avahi_string(key, value, props);
-		avahi_free(key);
-		avahi_free(value);
-	}
+	host_name = spa_dict_lookup(info, "zeroconf.hostname");
 
 	if ((device = pw_properties_get(props, PW_KEY_TARGET_OBJECT)) != NULL)
 		pw_properties_setf(props, PW_KEY_NODE_NAME,
@@ -308,14 +281,9 @@ static void resolver_cb(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiPr
 
 	pw_properties_set(props, "tunnel.mode", mode);
 
-	if (a->proto == AVAHI_PROTO_INET6 &&
-	    a->data.ipv6.address[0] == 0xfe &&
-	    (a->data.ipv6.address[1] & 0xc0) == 0x80)
-		snprintf(if_suffix, sizeof(if_suffix), "%%%d", interface);
-
-	pw_properties_setf(props, "pulse.server.address", " [%s%s]:%u",
-			avahi_address_snprint(at, sizeof(at), a),
-			if_suffix, port);
+	pw_properties_setf(props, "pulse.server.address", " [%s]:%s",
+			spa_dict_lookup(info, "zeroconf.address"),
+			spa_dict_lookup(info, "zeroconf.port"));
 
 	desc = pw_properties_get(props, "tunnel.remote.description");
 	if (desc == NULL)
@@ -373,130 +341,33 @@ static void resolver_cb(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiPr
 	t->module = mod;
 
 done:
-	avahi_service_resolver_free(r);
 	pw_properties_free(props);
 }
 
-
-static void browser_cb(AvahiServiceBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol,
-	AvahiBrowserEvent event, const char *name, const char *type, const char *domain,
-	AvahiLookupResultFlags flags, void *userdata)
+static void on_zeroconf_removed(void *data, void *user, const struct spa_dict *info)
 {
-	struct impl *impl = userdata;
-	struct tunnel_info info;
+	struct impl *impl = data;
+	const char *name, *type, *mode;
 	struct tunnel *t;
+	struct tunnel_info tinfo;
 
-	if ((flags & AVAHI_LOOKUP_RESULT_LOCAL) && !impl->discover_local)
+	name = spa_dict_lookup(info, "zeroconf.name");
+	type = spa_dict_lookup(info, "zeroconf.type");
+	mode = strstr(type, "sink") ? "sink" : "source";
+
+	tinfo = TUNNEL_INFO(.name = name, .mode = mode);
+
+	if ((t = find_tunnel(impl, &tinfo)) == NULL)
 		return;
 
-	info = TUNNEL_INFO(.name = name);
-
-	t = find_tunnel(impl, &info);
-
-	switch (event) {
-	case AVAHI_BROWSER_NEW:
-		if (t != NULL) {
-			pw_log_info("found duplicate mdns entry - skipping tunnel creation");
-			return;
-		}
-		if (!(avahi_service_resolver_new(impl->client,
-						interface, protocol,
-						name, type, domain,
-						AVAHI_PROTO_UNSPEC, 0,
-						resolver_cb, impl)))
-			pw_log_error("can't make service resolver: %s",
-					avahi_strerror(avahi_client_errno(impl->client)));
-		break;
-	case AVAHI_BROWSER_REMOVE:
-		if (t == NULL)
-			return;
-		free_tunnel(t);
-		break;
-	default:
-		break;
-	}
+	tunnel_free(t);
 }
 
-
-static struct AvahiServiceBrowser *make_browser(struct impl *impl, const char *service_type)
-{
-	struct AvahiServiceBrowser *s;
-
-	s = avahi_service_browser_new(impl->client,
-                              AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
-                              service_type, NULL, 0,
-                              browser_cb, impl);
-	if (s == NULL) {
-		pw_log_error("can't make browser for %s: %s", service_type,
-				avahi_strerror(avahi_client_errno(impl->client)));
-	}
-	return s;
-}
-
-static void client_callback(AvahiClient *c, AvahiClientState state, void *userdata)
-{
-	struct impl *impl = userdata;
-
-	impl->client = c;
-
-	switch (state) {
-	case AVAHI_CLIENT_S_REGISTERING:
-	case AVAHI_CLIENT_S_RUNNING:
-	case AVAHI_CLIENT_S_COLLISION:
-		if (impl->sink_browser == NULL)
-			impl->sink_browser = make_browser(impl, SERVICE_TYPE_SINK);
-		if (impl->sink_browser == NULL)
-			goto error;
-
-		if (impl->source_browser == NULL)
-			impl->source_browser = make_browser(impl, SERVICE_TYPE_SOURCE);
-		if (impl->source_browser == NULL)
-			goto error;
-
-		break;
-	case AVAHI_CLIENT_FAILURE:
-		if (avahi_client_errno(c) == AVAHI_ERR_DISCONNECTED)
-			start_client(impl);
-
-		SPA_FALLTHROUGH;
-	case AVAHI_CLIENT_CONNECTING:
-		if (impl->sink_browser) {
-			avahi_service_browser_free(impl->sink_browser);
-			impl->sink_browser = NULL;
-		}
-		if (impl->source_browser) {
-			avahi_service_browser_free(impl->source_browser);
-			impl->source_browser = NULL;
-		}
-		break;
-	default:
-		break;
-	}
-	return;
-error:
-	pw_impl_module_schedule_destroy(impl->module);
-}
-
-static int start_client(struct impl *impl)
-{
-	int res;
-	if ((impl->client = avahi_client_new(impl->avahi_poll,
-					AVAHI_CLIENT_NO_FAIL,
-					client_callback, impl,
-					&res)) == NULL) {
-		pw_log_error("can't create client: %s", avahi_strerror(res));
-		pw_impl_module_schedule_destroy(impl->module);
-		return -EIO;
-	}
-	return 0;
-}
-
-static int start_avahi(struct impl *impl)
-{
-	impl->avahi_poll = pw_avahi_poll_new(impl->context);
-
-	return start_client(impl);
-}
+static const struct pw_zeroconf_events zeroconf_events = {
+	PW_VERSION_ZEROCONF_EVENTS,
+	.added = on_zeroconf_added,
+	.removed = on_zeroconf_removed,
+};
 
 SPA_EXPORT
 int pipewire__module_init(struct pw_impl_module *module, const char *args)
@@ -504,6 +375,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 	struct pw_context *context = pw_impl_module_get_context(module);
 	struct pw_properties *props;
 	struct impl *impl;
+	bool discover_local;
 	int res;
 
 	PW_LOG_TOPIC_INIT(mod_topic);
@@ -527,14 +399,29 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 	impl->context = context;
 	impl->properties = props;
 
-	impl->discover_local =  pw_properties_get_bool(impl->properties,
+	discover_local = pw_properties_get_bool(impl->properties,
 			"pulse.discover-local", false);
+	pw_properties_setf(impl->properties, "zeroconf.discover-local",
+			discover_local ? "true" : "false");
 
 	pw_impl_module_add_listener(module, &impl->module_listener, &module_events, impl);
 
 	pw_impl_module_update_properties(module, &SPA_DICT_INIT_ARRAY(module_props));
 
-	start_avahi(impl);
+	if ((impl->zeroconf = pw_zeroconf_new(context, &props->dict)) == NULL) {
+		pw_log_error("can't create zeroconf: %m");
+		goto error_errno;
+	}
+	pw_zeroconf_add_listener(impl->zeroconf, &impl->zeroconf_listener,
+			&zeroconf_events, impl);
+
+	pw_zeroconf_set_browse(impl->zeroconf, SERVICE_TYPE_SINK,
+		&SPA_DICT_ITEMS(
+			SPA_DICT_ITEM("zeroconf.service", SERVICE_TYPE_SINK)));
+
+	pw_zeroconf_set_browse(impl->zeroconf, SERVICE_TYPE_SOURCE,
+		&SPA_DICT_ITEMS(
+			SPA_DICT_ITEM("zeroconf.service", SERVICE_TYPE_SOURCE)));
 
 	return 0;
 
diff --git a/src/modules/zeroconf-utils/zeroconf.c b/src/modules/zeroconf-utils/zeroconf.c
index 4a6a46c25..a70c58e8f 100644
--- a/src/modules/zeroconf-utils/zeroconf.c
+++ b/src/modules/zeroconf-utils/zeroconf.c
@@ -529,7 +529,7 @@ struct pw_zeroconf * pw_zeroconf_new(struct pw_context *context,
 		const char *k = props->items[i].key;
 		const char *v = props->items[i].value;
 
-		if (spa_streq(k, "zeroconf.discover-local"))
+		if (spa_streq(k, "zeroconf.discover-local") && v)
 			zc->discover_local = spa_atob(v);
 	}
 

From cd77dd0e620a52a5bf22783d082a9a5865c1ec53 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 26 Feb 2026 23:16:27 +0100
Subject: [PATCH 111/263] zeroconf: add some more error checking

Also publish domain and host when we can and fix a memleak.
---
 src/modules/zeroconf-utils/zeroconf.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/modules/zeroconf-utils/zeroconf.c b/src/modules/zeroconf-utils/zeroconf.c
index a70c58e8f..3aea045d9 100644
--- a/src/modules/zeroconf-utils/zeroconf.c
+++ b/src/modules/zeroconf-utils/zeroconf.c
@@ -369,6 +369,7 @@ static int do_announce(struct pw_zeroconf *zc, struct entry *e)
 	int res;
 	const struct spa_dict_item *it;
 	const char *session_name = "unnamed", *service = NULL;
+	const char *domain = NULL, *host = NULL;
 	uint16_t port = 0;
 
 	if (e->group == NULL) {
@@ -390,6 +391,10 @@ static int do_announce(struct pw_zeroconf *zc, struct entry *e)
 			port = atoi(it->value);
 		else if (spa_streq(it->key, "zeroconf.service"))
 			service = it->value;
+		else if (spa_streq(it->key, "zeroconf.domain"))
+			domain = it->value;
+		else if (spa_streq(it->key, "zeroconf.host"))
+			host = it->value;
 		else
 			txt = avahi_string_list_add_pair(txt, it->key, it->value);
 	}
@@ -397,12 +402,13 @@ static int do_announce(struct pw_zeroconf *zc, struct entry *e)
 		res = -EINVAL;
 		pw_log_error("no service provided");
 		pw_zeroconf_emit_error(zc, res, spa_strerror(res));
+		avahi_string_list_free(txt);
 		return res;
 	}
 	res = avahi_entry_group_add_service_strlst(e->group,
 			AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
 			(AvahiPublishFlags)0, session_name,
-			service, NULL, NULL, port, txt);
+			service, domain, host, port, txt);
 	avahi_string_list_free(txt);
 
 	if (res < 0) {
@@ -482,22 +488,24 @@ static struct entry *entry_new(struct pw_zeroconf *zc, uint32_t type, void *user
 static int set_entry(struct pw_zeroconf *zc, uint32_t type, void *user, const struct spa_dict *info)
 {
 	struct entry *e;
+	int res = 0;
 
 	e = entry_find(zc, type, user);
 	if (e == NULL) {
 		if (info == NULL)
 			return 0;
-		e = entry_new(zc, type, user, info);
-		entry_start(zc, e);
+		if ((e = entry_new(zc, type, user, info)) == NULL)
+			return -errno;
+		res = entry_start(zc, e);
 	} else {
 		if (info == NULL)
 			entry_free(e);
 		else {
 			pw_properties_update(e->props, info);
-			entry_start(zc, e);
+			res = entry_start(zc, e);
 		}
 	}
-	return 0;
+	return res;
 }
 int pw_zeroconf_set_announce(struct pw_zeroconf *zc, void *user, const struct spa_dict *info)
 {

From c09bcfdc9731330bc31609545d9713de9d91d5f8 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 27 Feb 2026 12:22:24 +0100
Subject: [PATCH 112/263] zeroconf: support proto, ifindex and subtypes

Also improve debug a little.
---
 src/modules/zeroconf-utils/zeroconf.c | 63 ++++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 12 deletions(-)

diff --git a/src/modules/zeroconf-utils/zeroconf.c b/src/modules/zeroconf-utils/zeroconf.c
index 3aea045d9..7932c17cf 100644
--- a/src/modules/zeroconf-utils/zeroconf.c
+++ b/src/modules/zeroconf-utils/zeroconf.c
@@ -188,17 +188,21 @@ static struct service *service_new(struct entry *e,
 	if ((s->props = pw_properties_new(NULL, NULL)) == NULL)
 		goto error;
 
-	if (a->proto == AVAHI_PROTO_INET6 &&
+	if (a->proto == AVAHI_PROTO_INET6 && info->interface != AVAHI_IF_UNSPEC &&
 	    a->data.ipv6.address[0] == 0xfe &&
 	    (a->data.ipv6.address[1] & 0xc0) == 0x80)
 		snprintf(if_suffix, sizeof(if_suffix), "%%%d", info->interface);
 
 	avahi_address_snprint(at, sizeof(at), a);
-	if (a->proto == AVAHI_PROTO_INET &&
+	if (a->proto == AVAHI_PROTO_INET && info->interface != AVAHI_IF_UNSPEC &&
 	    spa_strstartswith(at, link_local_range))
 		snprintf(if_suffix, sizeof(if_suffix), "%%%d", info->interface);
 
-	pw_properties_setf(s->props, "zeroconf.ifindex", "%d", info->interface);
+	if (a->proto != AVAHI_PROTO_UNSPEC)
+		pw_properties_setf(s->props, "zeroconf.proto", "%s",
+				a->proto == AVAHI_PROTO_INET ? "4" : "6");
+	if (info->interface != AVAHI_IF_UNSPEC)
+		pw_properties_setf(s->props, "zeroconf.ifindex", "%d", info->interface);
 	pw_properties_setf(s->props, "zeroconf.name", "%s", info->name);
 	pw_properties_setf(s->props, "zeroconf.type", "%s", info->type);
 	pw_properties_setf(s->props, "zeroconf.domain", "%s", info->domain);
@@ -318,7 +322,7 @@ static int do_browse(struct pw_zeroconf *zc, struct entry *e)
 		}
 		if (service_name == NULL) {
 			res = -EINVAL;
-			pw_log_error("no service provided");
+			pw_log_error("can't make browser: no service provided");
 			pw_zeroconf_emit_error(zc, res, spa_strerror(res));
 			return res;
 		}
@@ -340,20 +344,23 @@ static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state,
 {
 	struct entry *e = userdata;
 	struct pw_zeroconf *zc = e->zc;
+	const char *name;
 	int res;
 
 	zc->refcount++;
 
+	name = pw_properties_get(e->props, "zeroconf.session");
+
 	switch (state) {
 	case AVAHI_ENTRY_GROUP_ESTABLISHED:
-		pw_log_info("Service successfully established");
+		pw_log_debug("Entry \"%s\" added", name);
 		break;
 	case AVAHI_ENTRY_GROUP_COLLISION:
-		pw_log_error("Service name collision");
+		pw_log_error("Entry \"%s\" name collision", name);
 		break;
 	case AVAHI_ENTRY_GROUP_FAILURE:
 		res = avahi_client_errno(zc->client);
-		pw_log_error("Entry group failure: %s", avahi_strerror(res));
+		pw_log_error("Entry \"%s\" failure: %s", name, avahi_strerror(res));
 		pw_zeroconf_emit_error(zc, res, avahi_strerror(res));
 		break;
 	case AVAHI_ENTRY_GROUP_UNCOMMITED:
@@ -366,9 +373,9 @@ static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state,
 static int do_announce(struct pw_zeroconf *zc, struct entry *e)
 {
 	AvahiStringList *txt = NULL;
-	int res;
+	int res, ifindex = AVAHI_IF_UNSPEC, proto = AVAHI_PROTO_UNSPEC;
 	const struct spa_dict_item *it;
-	const char *session_name = "unnamed", *service = NULL;
+	const char *session_name = "unnamed", *service = NULL, *subtypes = NULL;
 	const char *domain = NULL, *host = NULL;
 	uint16_t port = 0;
 
@@ -395,18 +402,24 @@ static int do_announce(struct pw_zeroconf *zc, struct entry *e)
 			domain = it->value;
 		else if (spa_streq(it->key, "zeroconf.host"))
 			host = it->value;
+		else if (spa_streq(it->key, "zeroconf.ifindex"))
+			ifindex = atoi(it->value);
+		else if (spa_streq(it->key, "zeroconf.proto"))
+			proto = atoi(it->value) == 6 ? AVAHI_PROTO_INET6 : AVAHI_PROTO_INET;
+		else if (spa_streq(it->key, "zeroconf.subtypes"))
+			subtypes = it->value;
 		else
 			txt = avahi_string_list_add_pair(txt, it->key, it->value);
 	}
 	if (service == NULL) {
 		res = -EINVAL;
-		pw_log_error("no service provided");
+		pw_log_error("can't announce: no service provided");
 		pw_zeroconf_emit_error(zc, res, spa_strerror(res));
 		avahi_string_list_free(txt);
 		return res;
 	}
 	res = avahi_entry_group_add_service_strlst(e->group,
-			AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
+			ifindex, proto,
 			(AvahiPublishFlags)0, session_name,
 			service, domain, host, port, txt);
 	avahi_string_list_free(txt);
@@ -417,6 +430,30 @@ static int do_announce(struct pw_zeroconf *zc, struct entry *e)
 		pw_zeroconf_emit_error(zc, res, avahi_strerror(res));
 		return -EIO;
 	}
+
+	if (subtypes) {
+		struct spa_json iter;
+		char v[512];
+
+		if (spa_json_begin_array_relax(&iter, subtypes, strlen(subtypes)) <= 0) {
+			res = -EINVAL;
+			pw_log_error("invalid subtypes: %s", subtypes);
+			pw_zeroconf_emit_error(zc, res, spa_strerror(res));
+			return res;
+		}
+		while (spa_json_get_string(&iter, v, sizeof(v)) > 0) {
+			res = avahi_entry_group_add_service_subtype(e->group,
+					ifindex, proto,
+					(AvahiPublishFlags)0, session_name,
+					service, domain, v);
+			if (res < 0) {
+				res = avahi_client_errno(zc->client);
+				pw_log_error("can't add subtype: %s", avahi_strerror(res));
+				pw_zeroconf_emit_error(zc, res, avahi_strerror(res));
+				return -EIO;
+			}
+		}
+	}
 	if ((res = avahi_entry_group_commit(e->group)) < 0) {
 		res = avahi_client_errno(zc->client);
 		pw_log_error("can't commit group: %s", avahi_strerror(res));
@@ -481,7 +518,9 @@ static struct entry *entry_new(struct pw_zeroconf *zc, uint32_t type, void *user
 	e->props = pw_properties_new_dict(info);
 	spa_list_append(&zc->entries, &e->link);
 	spa_list_init(&e->services);
-	pw_log_info("created %s", type == TYPE_ANNOUNCE ? "announce" : "browse");
+	pw_log_debug("created %s for \"%s\"",
+			type == TYPE_ANNOUNCE ? "announce" : "browse",
+			pw_properties_get(e->props, "zeroconf.session"));
 	return e;
 }
 

From a1db2b8d358db21324f6594d09f9a23a85edb91f Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 27 Feb 2026 12:22:52 +0100
Subject: [PATCH 113/263] pulse-server: port zeroconf publish to helper

---
 .../modules/module-zeroconf-publish.c         | 471 +++++-------------
 1 file changed, 136 insertions(+), 335 deletions(-)

diff --git a/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c b/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c
index f8ad9212b..6a420b2af 100644
--- a/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c
+++ b/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c
@@ -15,14 +15,7 @@
 #include "../module.h"
 #include "../pulse-server.h"
 #include "../server.h"
-#include "../../zeroconf-utils/avahi-poll.h"
-
-#include <avahi-client/client.h>
-#include <avahi-client/publish.h>
-#include <avahi-common/alternative.h>
-#include <avahi-common/error.h>
-#include <avahi-common/domain.h>
-#include <avahi-common/malloc.h>
+#include "../../zeroconf-utils/zeroconf.h"
 
 /** \page page_pulse_module_zeroconf_publish Zeroconf Publish
  *
@@ -52,32 +45,17 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 
 #define SERVICE_DATA_ID "module-zeroconf-publish.service"
 
-enum service_subtype {
-	SUBTYPE_HARDWARE,
-	SUBTYPE_VIRTUAL,
-	SUBTYPE_MONITOR
-};
-
 struct service {
 	struct spa_list link;
 
 	struct module_zeroconf_publish_data *userdata;
 
-	AvahiEntryGroup *entry_group;
-	AvahiStringList *txt;
 	struct server *server;
 
-	const char *service_type;
-	enum service_subtype subtype;
-
-	char *name;
-	bool is_sink;
-
 	struct sample_spec ss;
 	struct channel_map cm;
 	struct pw_properties *props;
 
-	char service_name[AVAHI_LABEL_MAX];
 	unsigned published:1;
 };
 
@@ -91,8 +69,8 @@ struct module_zeroconf_publish_data {
 	struct spa_hook manager_listener;
 	struct spa_hook impl_listener;
 
-	AvahiPoll *avahi_poll;
-	AvahiClient *client;
+	struct pw_zeroconf *zeroconf;
+	struct spa_hook zeroconf_listener;
 
 	/* lists of services */
 	struct spa_list pending;
@@ -116,47 +94,43 @@ static const struct pw_core_events core_events = {
 	.error = on_core_error,
 };
 
-static void get_service_name(struct pw_manager_object *o, char *buf, size_t length)
+static void unpublish_service(struct service *s)
 {
-	const char *hn, *un, *n;
+	const char *device;
 
-	hn = pw_get_host_name();
-	un = pw_get_user_name();
-	n = pw_properties_get(o->props, PW_KEY_NODE_DESCRIPTION);
+	spa_list_remove(&s->link);
+	spa_list_append(&s->userdata->pending, &s->link);
+	s->published = false;
+	s->server = NULL;
 
-	snprintf(buf, length, "%s@%s: %s", un, hn, n);
+	device = pw_properties_get(s->props, "device");
+
+	pw_log_info("unpublished service: %s", device);
+
+	pw_zeroconf_set_announce(s->userdata->zeroconf, s, NULL);
+}
+
+static void unpublish_all_services(struct module_zeroconf_publish_data *d)
+{
+	struct service *s;
+	spa_list_consume(s, &d->published, link)
+		unpublish_service(s);
 }
 
 static void service_free(struct service *s)
 {
 	pw_log_debug("service %p: free", s);
 
-	if (s->entry_group)
-		avahi_entry_group_free(s->entry_group);
-
-	if (s->name)
-		free(s->name);
+	if (s->published)
+		unpublish_service(s);
 
 	pw_properties_free(s->props);
-	avahi_string_list_free(s->txt);
 	spa_list_remove(&s->link);
+	/* no need to free, the service is added as custom
+	 * data on the object */
 }
 
-static void unpublish_service(struct service *s)
-{
-	spa_list_remove(&s->link);
-	spa_list_append(&s->userdata->pending, &s->link);
-	s->published = false;
-	s->server = NULL;
-}
-
-static void unpublish_all_services(struct module_zeroconf_publish_data *d)
-{
-	struct service *s;
-
-	spa_list_consume(s, &d->published, link)
-		unpublish_service(s);
-}
+#define PA_CHANNEL_MAP_SNPRINT_MAX (CHANNELS_MAX * 32)
 
 static char* channel_map_snprint(char *s, size_t l, const struct channel_map *map)
 {
@@ -188,6 +162,39 @@ static char* channel_map_snprint(char *s, size_t l, const struct channel_map *ma
 	return s;
 }
 
+static void txt_record_server_data(struct pw_core_info *info, struct pw_properties *props)
+{
+	struct utsname u;
+
+	spa_assert(info);
+
+	pw_properties_set(props, "server-version", PACKAGE_NAME" "PACKAGE_VERSION);
+	pw_properties_set(props, "user-name", pw_get_user_name());
+	pw_properties_set(props, "fqdn", pw_get_host_name());
+	pw_properties_setf(props, "cookie", "0x%08x", info->cookie);
+	if (uname(&u) >= 0)
+		pw_properties_setf(props, "uname", "%s %s %s", u.sysname, u.machine, u.release);
+}
+
+static void fill_service_txt(const struct service *s, const struct pw_properties *props)
+{
+	static const struct mapping {
+		const char *pw_key, *txt_key;
+	} mappings[] = {
+		{ PW_KEY_NODE_DESCRIPTION, "description" },
+		{ PW_KEY_DEVICE_VENDOR_NAME, "vendor-name" },
+		{ PW_KEY_DEVICE_PRODUCT_NAME, "product-name" },
+		{ PW_KEY_DEVICE_CLASS, "class" },
+		{ PW_KEY_DEVICE_FORM_FACTOR, "form-factor" },
+		{ PW_KEY_DEVICE_ICON_NAME, "icon-name" },
+	};
+	SPA_FOR_EACH_ELEMENT_VAR(mappings, m) {
+		const char *value = pw_properties_get(props, m->pw_key);
+		if (value != NULL)
+			pw_properties_set(s->props, m->txt_key, value);
+	}
+}
+
 static void fill_service_data(struct module_zeroconf_publish_data *d, struct service *s,
 				struct pw_manager_object *o)
 {
@@ -200,6 +207,10 @@ static void fill_service_data(struct module_zeroconf_publish_data *d, struct ser
 	struct card_info card_info = CARD_INFO_INIT;
 	struct device_info dev_info;
 	uint32_t flags = 0;
+	const char *service_type, *subtype, *subtype_service[2];
+	uint32_t n_subtype = 0;
+	char cm[PA_CHANNEL_MAP_SNPRINT_MAX];
+
 
 	if (info == NULL || info->props == NULL)
 		return;
@@ -228,19 +239,49 @@ static void fill_service_data(struct module_zeroconf_publish_data *d, struct ser
 
 	s->ss = dev_info.ss;
 	s->cm = dev_info.map;
-	s->name = strdup(name);
-	s->props = pw_properties_copy(o->props);
+
+	s->props = pw_properties_new(NULL, NULL);
+
+	txt_record_server_data(s->userdata->manager->info, s->props);
 
 	if (is_sink) {
-		s->is_sink = true;
-		s->service_type = SERVICE_TYPE_SINK;
-		s->subtype = flags & SINK_HARDWARE ? SUBTYPE_HARDWARE : SUBTYPE_VIRTUAL;
+		service_type = SERVICE_TYPE_SINK;
+		if (flags & SINK_HARDWARE) {
+			subtype = "hardware";
+			subtype_service[n_subtype++] = SERVICE_SUBTYPE_SINK_HARDWARE;
+		} else {
+			subtype = "virtual";
+			subtype_service[n_subtype++] = SERVICE_SUBTYPE_SINK_VIRTUAL;
+		}
 	} else if (is_source) {
-		s->is_sink = false;
-		s->service_type = SERVICE_TYPE_SOURCE;
-		s->subtype = flags & SOURCE_HARDWARE ? SUBTYPE_HARDWARE : SUBTYPE_VIRTUAL;
+		service_type = SERVICE_TYPE_SOURCE;
+		if (flags & SOURCE_HARDWARE) {
+			subtype = "hardware";
+			subtype_service[n_subtype++] = SERVICE_SUBTYPE_SOURCE_HARDWARE;
+		} else {
+			subtype = "virtual";
+			subtype_service[n_subtype++] = SERVICE_SUBTYPE_SOURCE_VIRTUAL;
+		}
+		subtype_service[n_subtype++] = SERVICE_SUBTYPE_SOURCE_NON_MONITOR;
 	} else
 		spa_assert_not_reached();
+
+	pw_properties_set(s->props, "device", name);
+	pw_properties_setf(s->props, "rate", "%u", s->ss.rate);
+	pw_properties_setf(s->props, "channels", "%u", s->ss.channels);
+	pw_properties_set(s->props, "format", format_id2paname(s->ss.format));
+	pw_properties_set(s->props, "channel_map", channel_map_snprint(cm, sizeof(cm), &s->cm));
+	pw_properties_set(s->props, "subtype", subtype);
+
+	pw_properties_setf(s->props, "zeroconf.session", "%s@%s: %s",
+			pw_get_user_name(), pw_get_host_name(), desc);
+	pw_properties_set(s->props, "zeroconf.service", service_type);
+	pw_properties_setf(s->props, "zeroconf.subtypes", "[ %s%s%s ]",
+			n_subtype > 0 ? subtype_service[0] : "",
+			n_subtype > 1 ? ", " : "",
+			n_subtype > 1 ? subtype_service[1] : "");
+
+	fill_service_txt(s, o->props);
 }
 
 static struct service *create_service(struct module_zeroconf_publish_data *d, struct pw_manager_object *o)
@@ -252,8 +293,6 @@ static struct service *create_service(struct module_zeroconf_publish_data *d, st
 		return NULL;
 
 	s->userdata = d;
-	s->entry_group = NULL;
-	get_service_name(o, s->service_name, sizeof(s->service_name));
 	spa_list_append(&d->pending, &s->link);
 
 	fill_service_data(d, s, o);
@@ -263,127 +302,6 @@ static struct service *create_service(struct module_zeroconf_publish_data *d, st
 	return s;
 }
 
-static AvahiStringList* txt_record_server_data(struct pw_core_info *info, AvahiStringList *l)
-{
-	const char *t;
-	struct utsname u;
-
-	spa_assert(info);
-
-	l = avahi_string_list_add_pair(l, "server-version", PACKAGE_NAME" "PACKAGE_VERSION);
-
-	t = pw_get_user_name();
-	l = avahi_string_list_add_pair(l, "user-name", t);
-
-	if (uname(&u) >= 0) {
-		char sysname[sizeof(u.sysname) + sizeof(u.machine) + sizeof(u.release)];
-
-		snprintf(sysname, sizeof(sysname), "%s %s %s", u.sysname, u.machine, u.release);
-		l = avahi_string_list_add_pair(l, "uname", sysname);
-	}
-
-	t = pw_get_host_name();
-	l = avahi_string_list_add_pair(l, "fqdn", t);
-	l = avahi_string_list_add_printf(l, "cookie=0x%08x", info->cookie);
-
-	return l;
-}
-
-static void clear_entry_group(struct service *s)
-{
-	if (s->entry_group == NULL)
-		return;
-
-	avahi_entry_group_free(s->entry_group);
-	s->entry_group = NULL;
-}
-
-static void publish_service(struct service *s);
-
-static void service_entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata)
-{
-	struct service *s = userdata;
-
-	spa_assert(s);
-	if (!s->published) {
-		pw_log_info("cancel unpublished service: %s", s->service_name);
-		clear_entry_group(s);
-		return;
-	}
-
-	switch (state) {
-	case AVAHI_ENTRY_GROUP_ESTABLISHED:
-		pw_log_info("established service: %s", s->service_name);
-		break;
-	case AVAHI_ENTRY_GROUP_COLLISION:
-	{
-		char *t;
-
-		t = avahi_alternative_service_name(s->service_name);
-		pw_log_info("service name collision: renaming '%s' to '%s'", s->service_name, t);
-		snprintf(s->service_name, sizeof(s->service_name), "%s", t);
-		avahi_free(t);
-
-		unpublish_service(s);
-		publish_service(s);
-		break;
-	}
-	case AVAHI_ENTRY_GROUP_FAILURE:
-		pw_log_error("failed to establish service '%s': %s",
-			     s->service_name,
-			     avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g))));
-		unpublish_service(s);
-		clear_entry_group(s);
-		break;
-
-	case AVAHI_ENTRY_GROUP_UNCOMMITED:
-	case AVAHI_ENTRY_GROUP_REGISTERING:
-		break;
-	}
-}
-
-#define PA_CHANNEL_MAP_SNPRINT_MAX (CHANNELS_MAX * 32)
-
-static AvahiStringList *get_service_txt(const struct service *s)
-{
-	static const char * const subtype_text[] = {
-		[SUBTYPE_HARDWARE] = "hardware",
-		[SUBTYPE_VIRTUAL] = "virtual",
-		[SUBTYPE_MONITOR] = "monitor"
-	};
-
-	static const struct mapping {
-		const char *pw_key, *txt_key;
-	} mappings[] = {
-		{ PW_KEY_NODE_DESCRIPTION, "description" },
-		{ PW_KEY_DEVICE_VENDOR_NAME, "vendor-name" },
-		{ PW_KEY_DEVICE_PRODUCT_NAME, "product-name" },
-		{ PW_KEY_DEVICE_CLASS, "class" },
-		{ PW_KEY_DEVICE_FORM_FACTOR, "form-factor" },
-		{ PW_KEY_DEVICE_ICON_NAME, "icon-name" },
-	};
-
-	char cm[PA_CHANNEL_MAP_SNPRINT_MAX];
-	AvahiStringList *txt = NULL;
-
-	txt = txt_record_server_data(s->userdata->manager->info, txt);
-
-	txt = avahi_string_list_add_pair(txt, "device", s->name);
-	txt = avahi_string_list_add_printf(txt, "rate=%u", s->ss.rate);
-	txt = avahi_string_list_add_printf(txt, "channels=%u", s->ss.channels);
-	txt = avahi_string_list_add_pair(txt, "format", format_id2paname(s->ss.format));
-	txt = avahi_string_list_add_pair(txt, "channel_map", channel_map_snprint(cm, sizeof(cm), &s->cm));
-	txt = avahi_string_list_add_pair(txt, "subtype", subtype_text[s->subtype]);
-
-	SPA_FOR_EACH_ELEMENT_VAR(mappings, m) {
-		const char *value = pw_properties_get(s->props, m->pw_key);
-		if (value != NULL)
-			txt = avahi_string_list_add_pair(txt, m->txt_key, value);
-	}
-
-	return txt;
-}
-
 static struct server *find_server(struct service *s, int *proto, uint16_t *port)
 {
 	struct module_zeroconf_publish_data *d = s->userdata;
@@ -392,109 +310,47 @@ static struct server *find_server(struct service *s, int *proto, uint16_t *port)
 
 	spa_list_for_each(server, &impl->servers, link) {
 		if (server->addr.ss_family == AF_INET) {
-			*proto = AVAHI_PROTO_INET;
+			*proto = 4;
 			*port = ntohs(((struct sockaddr_in*) &server->addr)->sin_port);
 			return server;
 		} else if (server->addr.ss_family == AF_INET6) {
-			*proto = AVAHI_PROTO_INET6;
+			*proto = 6;
 			*port = ntohs(((struct sockaddr_in6*) &server->addr)->sin6_port);
 			return server;
 		}
 	}
-
 	return NULL;
 }
 
 static void publish_service(struct service *s)
 {
 	struct module_zeroconf_publish_data *d = s->userdata;
-	int proto;
+	int proto, res;
 	uint16_t port;
-
 	struct server *server = find_server(s, &proto, &port);
+	const char *device;
+
 	if (!server)
 		return;
 
+	device = pw_properties_get(s->props, "device");
+
 	pw_log_debug("found server:%p proto:%d port:%d", server, proto, port);
 
-	if (!d->client || avahi_client_get_state(d->client) != AVAHI_CLIENT_S_RUNNING)
+	pw_properties_setf(s->props, "zeroconf.proto", "%d", proto);
+	pw_properties_setf(s->props, "zeroconf.port", "%d", port);
+
+	if ((res = pw_zeroconf_set_announce(s->userdata->zeroconf, s, &s->props->dict)) < 0) {
+		pw_log_error("failed to announce service %s: %s", device, spa_strerror(res));
 		return;
-
-	s->published = true;
-	if (!s->entry_group) {
-		s->entry_group = avahi_entry_group_new(d->client, service_entry_group_callback, s);
-		if (s->entry_group == NULL) {
-			pw_log_error("avahi_entry_group_new(): %s",
-					avahi_strerror(avahi_client_errno(d->client)));
-			goto error;
-		}
-	} else {
-		avahi_entry_group_reset(s->entry_group);
-	}
-
-	if (s->txt == NULL)
-		s->txt = get_service_txt(s);
-
-	if (avahi_entry_group_add_service_strlst(
-				s->entry_group,
-				AVAHI_IF_UNSPEC, proto,
-				0,
-				s->service_name,
-				s->service_type,
-				NULL,
-				NULL,
-				port,
-				s->txt) < 0) {
-		pw_log_error("avahi_entry_group_add_service_strlst(): %s",
-			avahi_strerror(avahi_client_errno(d->client)));
-		goto error;
-	}
-
-	if (avahi_entry_group_add_service_subtype(
-				s->entry_group,
-				AVAHI_IF_UNSPEC, proto,
-				0,
-				s->service_name,
-				s->service_type,
-				NULL,
-				s->is_sink ? (s->subtype == SUBTYPE_HARDWARE ? SERVICE_SUBTYPE_SINK_HARDWARE : SERVICE_SUBTYPE_SINK_VIRTUAL) :
-				(s->subtype == SUBTYPE_HARDWARE ? SERVICE_SUBTYPE_SOURCE_HARDWARE : (s->subtype == SUBTYPE_VIRTUAL ? SERVICE_SUBTYPE_SOURCE_VIRTUAL : SERVICE_SUBTYPE_SOURCE_MONITOR))) < 0) {
-
-		pw_log_error("avahi_entry_group_add_service_subtype(): %s",
-			avahi_strerror(avahi_client_errno(d->client)));
-		goto error;
-	}
-
-	if (!s->is_sink && s->subtype != SUBTYPE_MONITOR) {
-		if (avahi_entry_group_add_service_subtype(
-					s->entry_group,
-					AVAHI_IF_UNSPEC, proto,
-					0,
-					s->service_name,
-					SERVICE_TYPE_SOURCE,
-					NULL,
-					SERVICE_SUBTYPE_SOURCE_NON_MONITOR) < 0) {
-			pw_log_error("avahi_entry_group_add_service_subtype(): %s",
-					avahi_strerror(avahi_client_errno(d->client)));
-			goto error;
-		}
-	}
-
-	if (avahi_entry_group_commit(s->entry_group) < 0) {
-		pw_log_error("avahi_entry_group_commit(): %s",
-				avahi_strerror(avahi_client_errno(d->client)));
-		goto error;
 	}
 
 	spa_list_remove(&s->link);
 	spa_list_append(&d->published, &s->link);
+	s->published = true;
 	s->server = server;
 
-	pw_log_info("created service: %s", s->service_name);
-	return;
-
-error:
-	s->published = false;
+	pw_log_info("published service: %s", device);
 	return;
 }
 
@@ -506,62 +362,6 @@ static void publish_pending(struct module_zeroconf_publish_data *data)
 		publish_service(s);
 }
 
-static void clear_pending_entry_groups(struct module_zeroconf_publish_data *data)
-{
-	struct service *s;
-
-	spa_list_for_each(s, &data->pending, link)
-		clear_entry_group(s);
-}
-
-static void client_callback(AvahiClient *c, AvahiClientState state, void *d)
-{
-	struct module_zeroconf_publish_data *data = d;
-
-	spa_assert(c);
-	spa_assert(data);
-
-	data->client = c;
-
-	switch (state) {
-	case AVAHI_CLIENT_S_RUNNING:
-		pw_log_info("the avahi daemon is up and running");
-		publish_pending(data);
-		break;
-	case AVAHI_CLIENT_S_COLLISION:
-		pw_log_error("host name collision");
-		unpublish_all_services(d);
-		break;
-	case AVAHI_CLIENT_FAILURE:
-	{
-		int err = avahi_client_errno(data->client);
-
-		pw_log_error("avahi client failure: %s", avahi_strerror(err));
-
-		unpublish_all_services(data);
-		clear_pending_entry_groups(data);
-		avahi_client_free(data->client);
-		data->client = NULL;
-
-		if (err == AVAHI_ERR_DISCONNECTED) {
-			data->client = avahi_client_new(data->avahi_poll, AVAHI_CLIENT_NO_FAIL, client_callback, data, &err);
-			if (data->client == NULL)
-				pw_log_error("failed to create avahi client: %s", avahi_strerror(err));
-		}
-
-		if (data->client == NULL)
-			module_schedule_unload(data->module);
-
-		break;
-	}
-	case AVAHI_CLIENT_CONNECTING:
-		pw_log_info("connecting to the avahi daemon...");
-		break;
-	default:
-		break;
-	}
-}
-
 static void manager_removed(void *d, struct pw_manager_object *o)
 {
 	if (!pw_manager_object_is_sink(o) && !pw_manager_object_is_source(o))
@@ -624,7 +424,6 @@ static void impl_server_stopped(void *data, struct server *server)
 		if (s->server == server)
 			unpublish_service(s);
 	}
-
 	publish_pending(d);
 }
 
@@ -634,10 +433,18 @@ static const struct impl_events impl_events = {
 	.server_stopped = impl_server_stopped,
 };
 
+static void on_zeroconf_error(void *data, int err, const char *message)
+{
+	pw_log_error("got zeroconf error %d: %s", err, message);
+}
+static const struct pw_zeroconf_events zeroconf_events = {
+	PW_VERSION_ZEROCONF_EVENTS,
+	.error = on_zeroconf_error,
+};
+
 static int module_zeroconf_publish_load(struct module *module)
 {
 	struct module_zeroconf_publish_data *data = module->user_data;
-	int error;
 
 	data->core = pw_context_connect(module->impl->context, NULL, 0);
 	if (data->core == NULL) {
@@ -649,24 +456,22 @@ static int module_zeroconf_publish_load(struct module *module)
 			&data->core_listener,
 			&core_events, data);
 
-	data->avahi_poll = pw_avahi_poll_new(module->impl->context);
-
-	data->client = avahi_client_new(data->avahi_poll, AVAHI_CLIENT_NO_FAIL,
-			client_callback, data, &error);
-	if (!data->client) {
-		pw_log_error("failed to create avahi client: %s", avahi_strerror(error));
-		return -errno;
-	}
-
 	data->manager = pw_manager_new(data->core);
 	if (data->manager == NULL) {
 		pw_log_error("failed to create pipewire manager: %m");
 		return -errno;
 	}
-
 	pw_manager_add_listener(data->manager, &data->manager_listener,
 			&manager_events, data);
 
+	data->zeroconf = pw_zeroconf_new(module->impl->context, NULL);
+	if (!data->zeroconf) {
+		pw_log_error("failed to create zeroconf: %m");
+		return -errno;
+	}
+	pw_zeroconf_add_listener(data->zeroconf, &data->zeroconf_listener,
+			&zeroconf_events, data);
+
 	impl_add_listener(module->impl, &data->impl_listener, &impl_events, data);
 
 	return 0;
@@ -684,22 +489,18 @@ static int module_zeroconf_publish_unload(struct module *module)
 	spa_list_consume(s, &d->pending, link)
 		service_free(s);
 
-	if (d->client)
-		avahi_client_free(d->client);
-
-	if (d->avahi_poll)
-		pw_avahi_poll_free(d->avahi_poll);
-
+	if (d->zeroconf) {
+		spa_hook_remove(&d->zeroconf_listener);
+		pw_zeroconf_destroy(d->zeroconf);
+	}
 	if (d->manager != NULL) {
 		spa_hook_remove(&d->manager_listener);
 		pw_manager_destroy(d->manager);
 	}
-
 	if (d->core != NULL) {
 		spa_hook_remove(&d->core_listener);
 		pw_core_disconnect(d->core);
 	}
-
 	return 0;
 }
 

From db713c82649aba3ef6abab40d2e1b2056d375bb8 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 27 Feb 2026 13:50:49 +0100
Subject: [PATCH 114/263] modules: port rtp-session to new zeroconf helper

---
 src/modules/module-rtp-session.c | 433 +++++++++++--------------------
 1 file changed, 154 insertions(+), 279 deletions(-)

diff --git a/src/modules/module-rtp-session.c b/src/modules/module-rtp-session.c
index ff190aae0..ffff2a517 100644
--- a/src/modules/module-rtp-session.c
+++ b/src/modules/module-rtp-session.c
@@ -27,12 +27,7 @@
 #include <pipewire/pipewire.h>
 #include <pipewire/impl.h>
 
-#include <avahi-client/publish.h>
-#include <avahi-client/lookup.h>
-#include <avahi-common/error.h>
-#include <avahi-common/malloc.h>
-
-#include "zeroconf-utils/avahi-poll.h"
+#include "zeroconf-utils/zeroconf.h"
 
 #include <module-rtp/rtp.h>
 #include <module-rtp/apple-midi.h>
@@ -160,31 +155,21 @@ static const struct spa_dict_item module_info[] = {
 };
 
 struct service_info {
-	AvahiIfIndex interface;
-	AvahiProtocol protocol;
+	int ifindex;
+	int protocol;
 	const char *name;
 	const char *type;
 	const char *domain;
-	const char *host_name;
-	AvahiAddress address;
-	uint16_t port;
 };
 
 #define SERVICE_INFO(...) ((struct service_info){ __VA_ARGS__ })
 
-struct service {
-	struct service_info info;
-
-	struct spa_list link;
-	struct impl *impl;
-
-	struct session *sess;
-};
-
 struct session {
 	struct impl *impl;
 	struct spa_list link;
 
+	struct service_info info;
+
 	struct sockaddr_storage ctrl_addr;
 	socklen_t ctrl_len;
 	struct sockaddr_storage data_addr;
@@ -229,11 +214,8 @@ struct impl {
 	struct pw_properties *props;
 
 	bool discover_local;
-	AvahiPoll *avahi_poll;
-	AvahiClient *client;
-	AvahiServiceBrowser *browser;
-	AvahiEntryGroup *group;
-	struct spa_list service_list;
+	struct pw_zeroconf *zeroconf;
+	struct spa_hook zeroconf_listener;
 
 	struct pw_properties *stream_props;
 
@@ -595,6 +577,9 @@ static void free_session(struct session *sess)
 	if (sess->recv)
 		rtp_stream_destroy(sess->recv);
 	free(sess->name);
+	free((char *) sess->info.name);
+	free((char *) sess->info.type);
+	free((char *) sess->info.domain);
 	free(sess);
 }
 
@@ -612,7 +597,8 @@ static bool cmp_ip(const struct sockaddr_storage *sa, const struct sockaddr_stor
 	return false;
 }
 
-static struct session *make_session(struct impl *impl, struct pw_properties *props)
+static struct session *make_session(struct impl *impl, struct service_info *info,
+		struct pw_properties *props)
 {
 	struct session *sess;
 	const char *str;
@@ -627,6 +613,11 @@ static struct session *make_session(struct impl *impl, struct pw_properties *pro
 
 	sess->impl = impl;
 	sess->ssrc = pw_rand32();
+	sess->info.ifindex = info->ifindex;
+	sess->info.protocol = info->protocol;
+	sess->info.name = strdup(info->name);
+	sess->info.type = strdup(info->type);
+	sess->info.domain = strdup(info->domain);
 
 	str = pw_properties_get(props, "sess.name");
 	sess->name = str ? strdup(str) : strdup("RTP Session");
@@ -669,6 +660,21 @@ error:
 	return NULL;
 }
 
+static struct session *find_session_by_info(struct impl *impl,
+		const struct service_info *info)
+{
+	struct session *s;
+	spa_list_for_each(s, &impl->sessions, link) {
+	if (s->info.ifindex == info->ifindex &&
+	    s->info.protocol == info->protocol &&
+	    spa_streq(s->info.name, info->name) &&
+	    spa_streq(s->info.type, info->type) &&
+	    spa_streq(s->info.domain, info->domain))
+		return s;
+	}
+	return NULL;
+}
+
 static struct session *find_session_by_addr_name(struct impl *impl,
 		const struct sockaddr_storage *sa, const char *name)
 {
@@ -1220,8 +1226,8 @@ static void impl_destroy(struct impl *impl)
 	if (impl->data_source)
 		pw_loop_destroy_source(impl->data_loop, impl->data_source);
 
-	if (impl->client)
-		avahi_client_free(impl->client);
+	if (impl->zeroconf)
+		pw_zeroconf_destroy(impl->zeroconf);
 
 	if (impl->data_loop)
 		pw_context_release_loop(impl->context, impl->data_loop);
@@ -1263,20 +1269,6 @@ static const struct pw_core_events core_events = {
 	.error = on_core_error,
 };
 
-static void free_service(struct service *s)
-{
-	spa_list_remove(&s->link);
-
-	if (s->sess)
-		free_session(s->sess);
-
-	free((char *) s->info.name);
-	free((char *) s->info.type);
-	free((char *) s->info.domain);
-	free((char *) s->info.host_name);
-	free(s);
-}
-
 static const char *get_service_name(struct impl *impl)
 {
 	const char *str;
@@ -1288,21 +1280,36 @@ static const char *get_service_name(struct impl *impl)
 	return NULL;
 }
 
-static struct service *make_service(struct impl *impl, const struct service_info *info,
-		AvahiStringList *txt)
+static void on_zeroconf_added(void *data, void *user, const struct spa_dict *info)
 {
-	struct service *s = NULL;
-	char at[AVAHI_ADDRESS_STR_MAX], if_suffix[16] = "";
+	struct impl *impl = data;
+	const char *str, *service_name, *address, *hostname;
+	struct service_info sinfo;
 	struct session *sess;
-	int res, ipv;
+	int ifindex = -1, protocol = 0, res, port = 0;
 	struct pw_properties *props = NULL;
-	const char *service_name, *str;
-	AvahiStringList *l;
 	bool compatible = true;
 
+	if ((str = spa_dict_lookup(info, "zeroconf.ifindex")))
+		ifindex = atoi(str);
+	if ((str = spa_dict_lookup(info, "zeroconf.protocol")))
+		protocol = atoi(str);
+	if ((str = spa_dict_lookup(info, "zeroconf.port")))
+		port = atoi(str);
+
+	sinfo = SERVICE_INFO(.ifindex = ifindex,
+			.protocol = protocol,
+			.name = spa_dict_lookup(info, "zeroconf.session"),
+			.type = spa_dict_lookup(info, "zeroconf.service"),
+			.domain = spa_dict_lookup(info, "zeroconf.domain"));
+
+	sess = find_session_by_info(impl, &sinfo);
+	if (sess != NULL)
+		return;
+
 	/* check for compatible session */
 	service_name = get_service_name(impl);
-	compatible = spa_streq(service_name, info->type);
+	compatible = spa_streq(service_name, sinfo.type);
 
 	props = pw_properties_copy(impl->stream_props);
 	if (props == NULL) {
@@ -1312,53 +1319,51 @@ static struct service *make_service(struct impl *impl, const struct service_info
 
 	if (spa_streq(service_name, "_pipewire-audio._udp")) {
 		uint32_t mask = 0;
-		for (l = txt; l && compatible; l = l->next) {
+		const struct spa_dict_item *it;
+		spa_dict_for_each(it, info) {
 			const char *k = NULL;
-			char *key, *value;
 
-			if (avahi_string_list_get_pair(l, &key, &value, NULL) != 0)
+			if (!compatible)
 				break;
 
-			if (spa_streq(key, "subtype")) {
+			if (spa_streq(it->key, "subtype")) {
 				k = "sess.media";
 				mask |= 1<<0;
-			} else if (spa_streq(key, "format")) {
+			} else if (spa_streq(it->key, "format")) {
 				k = PW_KEY_AUDIO_FORMAT;
 				mask |= 1<<1;
-			} else if (spa_streq(key, "rate")) {
+			} else if (spa_streq(it->key, "rate")) {
 				k = PW_KEY_AUDIO_RATE;
 				mask |= 1<<2;
-			} else if (spa_streq(key, "channels")) {
+			} else if (spa_streq(it->key, "channels")) {
 				k = PW_KEY_AUDIO_CHANNELS;
 				mask |= 1<<3;
-			} else if (spa_streq(key, "position")) {
+			} else if (spa_streq(it->key, "position")) {
 				pw_properties_set(props,
-						SPA_KEY_AUDIO_POSITION, value);
-			} else if (spa_streq(key, "layout")) {
+						SPA_KEY_AUDIO_POSITION, it->value);
+			} else if (spa_streq(it->key, "layout")) {
 				pw_properties_set(props,
-						SPA_KEY_AUDIO_LAYOUT, value);
-			} else if (spa_streq(key, "channelnames")) {
+						SPA_KEY_AUDIO_LAYOUT, it->value);
+			} else if (spa_streq(it->key, "channelnames")) {
 				pw_properties_set(props,
-						PW_KEY_NODE_CHANNELNAMES, value);
-			} else if (spa_streq(key, "ts-refclk")) {
+						PW_KEY_NODE_CHANNELNAMES, it->value);
+			} else if (spa_streq(it->key, "ts-refclk")) {
 				pw_properties_set(props,
-					"sess.ts-refclk", value);
-				if (spa_streq(value, impl->ts_refclk))
+					"sess.ts-refclk", it->value);
+				if (spa_streq(it->value, impl->ts_refclk))
 					pw_properties_set(props,
 						"sess.ts-direct", "true");
-			} else if (spa_streq(key, "ts-offset")) {
+			} else if (spa_streq(it->key, "ts-offset")) {
 				uint32_t v;
-				if (spa_atou32(value, &v, 0))
+				if (spa_atou32(it->value, &v, 0))
 					pw_properties_setf(props,
 						"rtp.receiver-ts-offset", "%u", v);
 			}
 			if (k != NULL) {
 				str = pw_properties_get(props, k);
-				if (str == NULL || !spa_streq(str, value))
+				if (str == NULL || !spa_streq(str, it->value))
 					compatible = false;
 			}
-			avahi_free(key);
-			avahi_free(value);
 		}
 		str = pw_properties_get(props, "sess.media");
 		if (spa_streq(str, "opus") && mask != 0xd)
@@ -1368,281 +1373,147 @@ static struct service *make_service(struct impl *impl, const struct service_info
 	}
 	if (!compatible) {
 		pw_log_info("found incompatible session IP%d:%s",
-				info->protocol == AVAHI_PROTO_INET ? 4 : 6,
-				info->name);
+				sinfo.protocol, sinfo.name);
 		res = 0;
 		goto error;
 	}
 
-	s = calloc(1, sizeof(*s));
-	if (s == NULL) {
-		res = -errno;
-		goto error;
-	}
+	address = spa_dict_lookup(info, "zeroconf.address");
+	hostname = spa_dict_lookup(info, "zeroconf.hostname");
 
-	s->impl = impl;
-	spa_list_append(&impl->service_list, &s->link);
+	pw_log_info("create session: %s %s:%u %s", sinfo.name, address, port, sinfo.type);
 
-	s->info.interface = info->interface;
-	s->info.protocol = info->protocol;
-	s->info.name = strdup(info->name);
-	s->info.type = strdup(info->type);
-	s->info.domain = strdup(info->domain);
-	s->info.host_name = strdup(info->host_name);
-	s->info.address = info->address;
-	s->info.port = info->port;
-
-	avahi_address_snprint(at, sizeof(at), &s->info.address);
-	pw_log_info("create session: %s %s:%u %s", s->info.name, at, s->info.port, s->info.type);
-
-	if (s->info.protocol == AVAHI_PROTO_INET6 &&
-	    s->info.address.data.ipv6.address[0] == 0xfe &&
-	    (s->info.address.data.ipv6.address[1] & 0xc0) == 0x80)
-		snprintf(if_suffix, sizeof(if_suffix), "%%%d", s->info.interface);
-
-	ipv = s->info.protocol == AVAHI_PROTO_INET ? 4 : 6;
-	pw_properties_set(props, "sess.name", s->info.name);
-	pw_properties_setf(props, "destination.ip", "%s%s", at, if_suffix);
-	pw_properties_setf(props, "destination.ifindex", "%u", s->info.interface);
-	pw_properties_setf(props, "destination.port", "%u", s->info.port);
+	pw_properties_set(props, "sess.name", sinfo.name);
+	pw_properties_set(props, "destination.ip", address);
+	pw_properties_setf(props, "destination.ifindex", "%u", sinfo.ifindex);
+	pw_properties_setf(props, "destination.port", "%u", port);
 
 	if (pw_properties_get(props, PW_KEY_NODE_NAME) == NULL)
 		pw_properties_setf(props, PW_KEY_NODE_NAME, "rtp_session.%s.%s.ipv%d",
-				s->info.name, s->info.host_name, ipv);
+				sinfo.name, hostname, sinfo.protocol);
 	if (pw_properties_get(props, PW_KEY_NODE_DESCRIPTION) == NULL)
 		pw_properties_setf(props, PW_KEY_NODE_DESCRIPTION, "%s (IPv%d)",
-				s->info.name, ipv);
+				sinfo.name, sinfo.protocol);
 	if (pw_properties_get(props, PW_KEY_MEDIA_NAME) == NULL)
 		pw_properties_setf(props, PW_KEY_MEDIA_NAME, "RTP Session with %s (IPv%d)",
-				s->info.name, ipv);
+				sinfo.name, sinfo.protocol);
 
-	sess = make_session(impl, props);
-	props = NULL;
+	sess = make_session(impl, &sinfo, spa_steal_ptr(props));
 	if (sess == NULL) {
 		res = -errno;
 		pw_log_error("can't create session: %m");
 		goto error;
 	}
-	s->sess = sess;
 
-	if ((res = pw_net_parse_address(at, s->info.port, &sess->ctrl_addr, &sess->ctrl_len)) < 0) {
-		pw_log_error("invalid address %s: %s", at, spa_strerror(res));
+	if ((res = pw_net_parse_address(address, port, &sess->ctrl_addr, &sess->ctrl_len)) < 0) {
+		pw_log_error("invalid address %s: %s", address, spa_strerror(res));
 	}
-	if ((res = pw_net_parse_address(at, s->info.port+1, &sess->data_addr, &sess->data_len)) < 0) {
-		pw_log_error("invalid address %s: %s", at, spa_strerror(res));
+	if ((res = pw_net_parse_address(address, port+1, &sess->data_addr, &sess->data_len)) < 0) {
+		pw_log_error("invalid address %s: %s", address, spa_strerror(res));
 	}
-	return s;
+	return;
 error:
 	pw_properties_free(props);
-	if (s != NULL)
-		free_service(s);
-	errno = -res;
-	return NULL;
+	return;
 }
 
-static struct service *find_service(struct impl *impl, const struct service_info *info)
+static void on_zeroconf_removed(void *data, void *user, const struct spa_dict *info)
 {
-	struct service *s;
-	spa_list_for_each(s, &impl->service_list, link) {
-		if (s->info.interface == info->interface &&
-		    s->info.protocol == info->protocol &&
-		    spa_streq(s->info.name, info->name) &&
-		    spa_streq(s->info.type, info->type) &&
-		    spa_streq(s->info.domain, info->domain))
-			return s;
-	}
-	return NULL;
-}
-
-static void resolver_cb(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiProtocol protocol,
-	AvahiResolverEvent event, const char *name, const char *type, const char *domain,
-	const char *host_name, const AvahiAddress *a, uint16_t port, AvahiStringList *txt,
-	AvahiLookupResultFlags flags, void *userdata)
-{
-	struct impl *impl = userdata;
+	struct impl *impl = data;
 	struct service_info sinfo;
+	struct session *sess;
+	const char *str;
+	int ifindex = -1, protocol = 0;
 
-	if (event != AVAHI_RESOLVER_FOUND) {
-		pw_log_error("Resolving of '%s' failed: %s", name,
-				avahi_strerror(avahi_client_errno(impl->client)));
-		goto done;
-	}
+	if ((str = spa_dict_lookup(info, "zeroconf.ifindex")))
+		ifindex = atoi(str);
+	if ((str = spa_dict_lookup(info, "zeroconf.protocol")))
+		protocol = atoi(str);
 
-	sinfo = SERVICE_INFO(.interface = interface,
+	sinfo = SERVICE_INFO(.ifindex = ifindex,
 			.protocol = protocol,
-			.name = name,
-			.type = type,
-			.domain = domain,
-			.host_name = host_name,
-			.address = *a,
-			.port = port);
+			.name = spa_dict_lookup(info, "zeroconf.session"),
+			.type = spa_dict_lookup(info, "zeroconf.service"),
+			.domain = spa_dict_lookup(info, "zeroconf.domain"));
 
-	make_service(impl, &sinfo, txt);
-done:
-	avahi_service_resolver_free(r);
-}
-
-static void browser_cb(AvahiServiceBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol,
-	AvahiBrowserEvent event, const char *name, const char *type, const char *domain,
-	AvahiLookupResultFlags flags, void *userdata)
-{
-	struct impl *impl = userdata;
-	struct service_info info;
-	struct service *s;
-
-	if ((flags & AVAHI_LOOKUP_RESULT_LOCAL) && !impl->discover_local)
+	sess = find_session_by_info(impl, &sinfo);
+	if (sess == NULL)
 		return;
 
-	info = SERVICE_INFO(.interface = interface,
-			.protocol = protocol,
-			.name = name,
-			.type = type,
-			.domain = domain);
-
-	s = find_service(impl, &info);
-
-	switch (event) {
-	case AVAHI_BROWSER_NEW:
-		if (s != NULL)
-			return;
-		if (!(avahi_service_resolver_new(impl->client,
-						interface, protocol,
-						name, type, domain,
-						AVAHI_PROTO_UNSPEC, 0,
-						resolver_cb, impl)))
-			pw_log_error("can't make service resolver: %s",
-					avahi_strerror(avahi_client_errno(impl->client)));
-		break;
-	case AVAHI_BROWSER_REMOVE:
-		if (s == NULL)
-			return;
-		free_service(s);
-		break;
-	default:
-		break;
-	}
+	free_session(sess);
 }
 
 static int make_browser(struct impl *impl)
 {
 	const char *service_name;
+	int res;
 
 	service_name = get_service_name(impl);
 	if (service_name == NULL)
 		return -EINVAL;
 
-	if (impl->browser == NULL) {
-		impl->browser = avahi_service_browser_new(impl->client,
-				AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
-				service_name, NULL, 0,
-				browser_cb, impl);
-	}
-	if (impl->browser == NULL) {
-		pw_log_error("can't make browser: %s",
-			avahi_strerror(avahi_client_errno(impl->client)));
-		return -EIO;
+	if ((res = pw_zeroconf_set_browse(impl->zeroconf, impl,
+		&SPA_DICT_ITEMS(
+			SPA_DICT_ITEM("zeroconf.service", service_name)))) < 0) {
+		pw_log_error("can't make browser for %s: %s",
+				service_name, spa_strerror(res));
+		return res;
 	}
 	return 0;
 }
 
-static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata)
-{
-	switch (state) {
-	case AVAHI_ENTRY_GROUP_ESTABLISHED:
-		pw_log_info("Service successfully established");
-		break;
-	case AVAHI_ENTRY_GROUP_COLLISION:
-		pw_log_error("Service name collision");
-		break;
-	case AVAHI_ENTRY_GROUP_FAILURE:
-		pw_log_error("Entry group failure: %s",
-			avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g))));
-		break;
-	case AVAHI_ENTRY_GROUP_UNCOMMITED:
-	case AVAHI_ENTRY_GROUP_REGISTERING:;
-		break;
-	}
-}
-
 static int make_announce(struct impl *impl)
 {
 	int res;
 	const char *service_name, *str;
-	AvahiStringList *txt = NULL;
+	struct pw_properties *props;
+
+	props = pw_properties_new(NULL, NULL);
 
 	if ((service_name = get_service_name(impl)) == NULL)
 		return -ENOTSUP;
 
-	if (impl->group == NULL) {
-		impl->group = avahi_entry_group_new(impl->client,
-					entry_group_callback, impl);
-	}
-	if (impl->group == NULL) {
-		pw_log_error("can't make group: %s",
-			avahi_strerror(avahi_client_errno(impl->client)));
-		return -EIO;
-	}
-	avahi_entry_group_reset(impl->group);
-
 	if (spa_streq(service_name, "_pipewire-audio._udp")) {
 		str = pw_properties_get(impl->props, "sess.media");
-		txt = avahi_string_list_add_pair(txt, "subtype", str);
+		pw_properties_set(props, "subtype", str);
 		if ((str = pw_properties_get(impl->stream_props, PW_KEY_AUDIO_FORMAT)) != NULL)
-			txt = avahi_string_list_add_pair(txt, "format", str);
+			pw_properties_set(props, "format", str);
 		if ((str = pw_properties_get(impl->stream_props, PW_KEY_AUDIO_RATE)) != NULL)
-			txt = avahi_string_list_add_pair(txt, "rate", str);
+			pw_properties_set(props, "rate", str);
 		if ((str = pw_properties_get(impl->stream_props, PW_KEY_AUDIO_CHANNELS)) != NULL)
-			txt = avahi_string_list_add_pair(txt, "channels", str);
+			pw_properties_set(props, "channels", str);
 		if ((str = pw_properties_get(impl->stream_props, SPA_KEY_AUDIO_POSITION)) != NULL)
-			txt = avahi_string_list_add_pair(txt, "position", str);
+			pw_properties_set(props, "position", str);
 		if ((str = pw_properties_get(impl->stream_props, SPA_KEY_AUDIO_LAYOUT)) != NULL)
-			txt = avahi_string_list_add_pair(txt, "layout", str);
+			pw_properties_set(props, "layout", str);
 		if ((str = pw_properties_get(impl->stream_props, PW_KEY_NODE_CHANNELNAMES)) != NULL)
-			txt = avahi_string_list_add_pair(txt, "channelnames", str);
+			pw_properties_set(props, "channelnames", str);
 		if (impl->ts_refclk != NULL) {
-			txt = avahi_string_list_add_pair(txt, "ts-refclk", impl->ts_refclk);
-			txt = avahi_string_list_add_printf(txt, "ts-offset=%u", impl->ts_offset);
+			pw_properties_set(props, "ts-refclk", impl->ts_refclk);
+			pw_properties_setf(props, "ts-offset", "%u", impl->ts_offset);
 		}
 	}
-	res = avahi_entry_group_add_service_strlst(impl->group,
-			AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
-			(AvahiPublishFlags)0, impl->session_name,
-			service_name, NULL, NULL,
-			impl->ctrl_port, txt);
 
-	avahi_string_list_free(txt);
+	pw_properties_set(props, "zeroconf.session", impl->session_name);
+	pw_properties_set(props, "zeroconf.service", service_name);
+	pw_properties_setf(props, "zeroconf.port", "%u", impl->ctrl_port);
+
+	res = pw_zeroconf_set_announce(impl->zeroconf, impl, &props->dict);
+
+	pw_properties_free(props);
 
 	if (res < 0) {
-		pw_log_error("can't add service: %s",
-			avahi_strerror(avahi_client_errno(impl->client)));
-		return -EIO;
-	}
-	if ((res = avahi_entry_group_commit(impl->group)) < 0) {
-		pw_log_error("can't commit group: %s",
-			avahi_strerror(avahi_client_errno(impl->client)));
-		return -EIO;
+		pw_log_error("can't add service: %s", spa_strerror(res));
+		return res;
 	}
 	return 0;
 }
-static void client_callback(AvahiClient *c, AvahiClientState state, void *userdata)
-{
-	struct impl *impl = userdata;
-	impl->client = c;
 
-	switch (state) {
-	case AVAHI_CLIENT_S_REGISTERING:
-	case AVAHI_CLIENT_S_RUNNING:
-	case AVAHI_CLIENT_S_COLLISION:
-		make_browser(impl);
-		make_announce(impl);
-		break;
-	case AVAHI_CLIENT_FAILURE:
-	case AVAHI_CLIENT_CONNECTING:
-		break;
-	default:
-		break;
-	}
-}
+static const struct pw_zeroconf_events zeroconf_events = {
+	PW_VERSION_ZEROCONF_EVENTS,
+	.added = on_zeroconf_added,
+	.removed = on_zeroconf_removed,
+};
 
 static void copy_props(struct impl *impl, struct pw_properties *props, const char *key)
 {
@@ -1673,7 +1544,6 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 		args = "";
 
 	spa_list_init(&impl->sessions);
-	spa_list_init(&impl->service_list);
 
 	props = pw_properties_new_string(args);
 	if (props == NULL) {
@@ -1685,6 +1555,8 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 
 	impl->discover_local =  pw_properties_get_bool(impl->props,
 			"sess.discover-local", false);
+	pw_properties_set(impl->props, "zeroconf.discover-local",
+			impl->discover_local ? "true" : "false");
 
 	stream_props = pw_properties_new(NULL, NULL);
 	if (stream_props == NULL) {
@@ -1804,14 +1676,17 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 	if ((res = setup_apple_session(impl)) < 0)
 		goto out;
 
-	impl->avahi_poll = pw_avahi_poll_new(impl->context);
-	if ((impl->client = avahi_client_new(impl->avahi_poll,
-					AVAHI_CLIENT_NO_FAIL,
-					client_callback, impl,
-					&res)) == NULL) {
-		pw_log_error("can't create avahi client: %s", avahi_strerror(res));
+	impl->zeroconf = pw_zeroconf_new(impl->context, &impl->props->dict);
+	if (impl->zeroconf == NULL) {
+		res = -errno;
+		pw_log_error("can't create zeroconf: %m");
 		goto out;
 	}
+	pw_zeroconf_add_listener(impl->zeroconf, &impl->zeroconf_listener,
+			&zeroconf_events, impl);
+
+	make_browser(impl);
+	make_announce(impl);
 
 	pw_impl_module_add_listener(module, &impl->module_listener, &module_events, impl);
 

From a065cff8c1d65b2558a2381095c15a1dfba43f5c Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 27 Feb 2026 16:06:33 +0100
Subject: [PATCH 115/263] zeroconf: pass user data as const

---
 src/modules/module-raop-discover.c     |  4 ++--
 src/modules/module-rtp-session.c       |  4 ++--
 src/modules/module-sendspin-recv.c     |  4 ++--
 src/modules/module-sendspin-send.c     |  4 ++--
 src/modules/module-zeroconf-discover.c |  8 ++------
 src/modules/zeroconf-utils/zeroconf.c  | 12 ++++++------
 src/modules/zeroconf-utils/zeroconf.h  |  8 ++++----
 7 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/modules/module-raop-discover.c b/src/modules/module-raop-discover.c
index 60e5e0077..abe9b3dd8 100644
--- a/src/modules/module-raop-discover.c
+++ b/src/modules/module-raop-discover.c
@@ -364,7 +364,7 @@ static void pw_properties_from_zeroconf(const char *key, const char *value,
         }
 }
 
-static void on_zeroconf_added(void *data, void *user, const struct spa_dict *info)
+static void on_zeroconf_added(void *data, const void *user, const struct spa_dict *info)
 {
 	struct impl *impl = data;
 	const char *name, *str;
@@ -417,7 +417,7 @@ done:
 	pw_properties_free(props);
 }
 
-static void on_zeroconf_removed(void *data, void *user, const struct spa_dict *info)
+static void on_zeroconf_removed(void *data, const void *user, const struct spa_dict *info)
 {
 	struct impl *impl = data;
 	const char *name;
diff --git a/src/modules/module-rtp-session.c b/src/modules/module-rtp-session.c
index ffff2a517..f1f56d121 100644
--- a/src/modules/module-rtp-session.c
+++ b/src/modules/module-rtp-session.c
@@ -1280,7 +1280,7 @@ static const char *get_service_name(struct impl *impl)
 	return NULL;
 }
 
-static void on_zeroconf_added(void *data, void *user, const struct spa_dict *info)
+static void on_zeroconf_added(void *data, const void *user, const struct spa_dict *info)
 {
 	struct impl *impl = data;
 	const char *str, *service_name, *address, *hostname;
@@ -1417,7 +1417,7 @@ error:
 	return;
 }
 
-static void on_zeroconf_removed(void *data, void *user, const struct spa_dict *info)
+static void on_zeroconf_removed(void *data, const void *user, const struct spa_dict *info)
 {
 	struct impl *impl = data;
 	struct service_info sinfo;
diff --git a/src/modules/module-sendspin-recv.c b/src/modules/module-sendspin-recv.c
index 517679fba..a31681f24 100644
--- a/src/modules/module-sendspin-recv.c
+++ b/src/modules/module-sendspin-recv.c
@@ -1109,7 +1109,7 @@ static const struct pw_websocket_events websocket_events = {
 	.connected = on_websocket_connected,
 };
 
-static void on_zeroconf_added(void *data, void *user, const struct spa_dict *info)
+static void on_zeroconf_added(void *data, const void *user, const struct spa_dict *info)
 {
 	struct impl *impl = data;
 	const char *name, *addr, *port, *path;
@@ -1138,7 +1138,7 @@ static void on_zeroconf_added(void *data, void *user, const struct spa_dict *inf
 	match_client(impl, name, props, NULL);
 }
 
-static void on_zeroconf_removed(void *data, void *user, const struct spa_dict *info)
+static void on_zeroconf_removed(void *data, const void *user, const struct spa_dict *info)
 {
 	struct impl *impl = data;
 	const char *name;
diff --git a/src/modules/module-sendspin-send.c b/src/modules/module-sendspin-send.c
index c10a9aba9..c67abcc06 100644
--- a/src/modules/module-sendspin-send.c
+++ b/src/modules/module-sendspin-send.c
@@ -1110,7 +1110,7 @@ static const struct pw_websocket_events websocket_events = {
 	.connected = on_websocket_connected,
 };
 
-static void on_zeroconf_added(void *data, void *user, const struct spa_dict *info)
+static void on_zeroconf_added(void *data, const void *user, const struct spa_dict *info)
 {
 	struct impl *impl = data;
 	const char *name, *addr, *port, *path;
@@ -1136,7 +1136,7 @@ static void on_zeroconf_added(void *data, void *user, const struct spa_dict *inf
 	match_client(impl, name, props, NULL);
 }
 
-static void on_zeroconf_removed(void *data, void *user, const struct spa_dict *info)
+static void on_zeroconf_removed(void *data, const void *user, const struct spa_dict *info)
 {
 	struct impl *impl = data;
 	const char *name;
diff --git a/src/modules/module-zeroconf-discover.c b/src/modules/module-zeroconf-discover.c
index f6f1ce087..52b407687 100644
--- a/src/modules/module-zeroconf-discover.c
+++ b/src/modules/module-zeroconf-discover.c
@@ -20,10 +20,6 @@
 #include <pipewire/impl.h>
 #include <pipewire/i18n.h>
 
-#include <avahi-client/lookup.h>
-#include <avahi-common/error.h>
-#include <avahi-common/malloc.h>
-
 #include "module-protocol-pulse/format.h"
 #include "zeroconf-utils/zeroconf.h"
 
@@ -230,7 +226,7 @@ static const struct pw_impl_module_events submodule_events = {
 	.destroy = submodule_destroy,
 };
 
-static void on_zeroconf_added(void *data, void *user_data, const struct spa_dict *info)
+static void on_zeroconf_added(void *data, const void *user_data, const struct spa_dict *info)
 {
 	struct impl *impl = data;
 	const char *name, *type, *mode, *device, *host_name, *desc, *fqdn, *user, *str;
@@ -344,7 +340,7 @@ done:
 	pw_properties_free(props);
 }
 
-static void on_zeroconf_removed(void *data, void *user, const struct spa_dict *info)
+static void on_zeroconf_removed(void *data, const void *user, const struct spa_dict *info)
 {
 	struct impl *impl = data;
 	const char *name, *type, *mode;
diff --git a/src/modules/zeroconf-utils/zeroconf.c b/src/modules/zeroconf-utils/zeroconf.c
index 7932c17cf..49ed0e70e 100644
--- a/src/modules/zeroconf-utils/zeroconf.c
+++ b/src/modules/zeroconf-utils/zeroconf.c
@@ -49,7 +49,7 @@ struct entry {
 #define TYPE_ANNOUNCE	0
 #define TYPE_BROWSE	1
 	uint32_t type;
-	void *user;
+	const void *user;
 
 	struct pw_properties *props;
 
@@ -110,7 +110,7 @@ static void service_free(struct service *s)
 	free(s);
 }
 
-struct entry *entry_find(struct pw_zeroconf *zc, uint32_t type, void *user)
+struct entry *entry_find(struct pw_zeroconf *zc, uint32_t type, const void *user)
 {
 	struct entry *e;
 	spa_list_for_each(e, &zc->entries, link)
@@ -505,7 +505,7 @@ static void client_callback(AvahiClient *c, AvahiClientState state, void *d)
 	zeroconf_unref(zc);
 }
 
-static struct entry *entry_new(struct pw_zeroconf *zc, uint32_t type, void *user, const struct spa_dict *info)
+static struct entry *entry_new(struct pw_zeroconf *zc, uint32_t type, const void *user, const struct spa_dict *info)
 {
 	struct entry *e;
 
@@ -524,7 +524,7 @@ static struct entry *entry_new(struct pw_zeroconf *zc, uint32_t type, void *user
 	return e;
 }
 
-static int set_entry(struct pw_zeroconf *zc, uint32_t type, void *user, const struct spa_dict *info)
+static int set_entry(struct pw_zeroconf *zc, uint32_t type, const void *user, const struct spa_dict *info)
 {
 	struct entry *e;
 	int res = 0;
@@ -546,11 +546,11 @@ static int set_entry(struct pw_zeroconf *zc, uint32_t type, void *user, const st
 	}
 	return res;
 }
-int pw_zeroconf_set_announce(struct pw_zeroconf *zc, void *user, const struct spa_dict *info)
+int pw_zeroconf_set_announce(struct pw_zeroconf *zc, const void *user, const struct spa_dict *info)
 {
 	return set_entry(zc, TYPE_ANNOUNCE, user, info);
 }
-int pw_zeroconf_set_browse(struct pw_zeroconf *zc, void *user, const struct spa_dict *info)
+int pw_zeroconf_set_browse(struct pw_zeroconf *zc, const void *user, const struct spa_dict *info)
 {
 	return set_entry(zc, TYPE_BROWSE, user, info);
 }
diff --git a/src/modules/zeroconf-utils/zeroconf.h b/src/modules/zeroconf-utils/zeroconf.h
index a5de62787..1b27e5d5b 100644
--- a/src/modules/zeroconf-utils/zeroconf.h
+++ b/src/modules/zeroconf-utils/zeroconf.h
@@ -22,8 +22,8 @@ struct pw_zeroconf_events {
 	void (*destroy) (void *data);
 	void (*error) (void *data, int err, const char *message);
 
-	void (*added) (void *data, void *user, const struct spa_dict *info);
-	void (*removed) (void *data, void *user, const struct spa_dict *info);
+	void (*added) (void *data, const void *user, const struct spa_dict *info);
+	void (*removed) (void *data, const void *user, const struct spa_dict *info);
 };
 
 struct pw_zeroconf * pw_zeroconf_new(struct pw_context *context,
@@ -31,8 +31,8 @@ struct pw_zeroconf * pw_zeroconf_new(struct pw_context *context,
 
 void pw_zeroconf_destroy(struct pw_zeroconf *zc);
 
-int pw_zeroconf_set_announce(struct pw_zeroconf *zc, void *user, const struct spa_dict *info);
-int pw_zeroconf_set_browse(struct pw_zeroconf *zc, void *user, const struct spa_dict *info);
+int pw_zeroconf_set_announce(struct pw_zeroconf *zc, const void *user, const struct spa_dict *info);
+int pw_zeroconf_set_browse(struct pw_zeroconf *zc, const void *user, const struct spa_dict *info);
 
 void pw_zeroconf_add_listener(struct pw_zeroconf *zc,
 		struct spa_hook *listener,

From 3a1b790588b4d61696dfb42c255200a5d7864e0d Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 27 Feb 2026 16:06:48 +0100
Subject: [PATCH 116/263] modules: port snapcast to zeroconf helper

---
 src/modules/module-snapcast-discover.c | 253 +++++++------------------
 1 file changed, 69 insertions(+), 184 deletions(-)

diff --git a/src/modules/module-snapcast-discover.c b/src/modules/module-snapcast-discover.c
index b9df21a3a..ecd5dc069 100644
--- a/src/modules/module-snapcast-discover.c
+++ b/src/modules/module-snapcast-discover.c
@@ -29,12 +29,8 @@
 #include <pipewire/impl.h>
 #include <pipewire/i18n.h>
 
-#include <avahi-client/lookup.h>
-#include <avahi-common/error.h>
-#include <avahi-common/malloc.h>
-
 #include "module-protocol-pulse/format.h"
-#include "zeroconf-utils/avahi-poll.h"
+#include "zeroconf-utils/zeroconf.h"
 
 #include "network-utils.h"
 
@@ -175,10 +171,8 @@ struct impl {
 	bool discover_local;
 	struct pw_loop *loop;
 
-	AvahiPoll *avahi_poll;
-	AvahiClient *client;
-	AvahiServiceBrowser *jsonrpc_browser;
-	AvahiServiceBrowser *ctrl_browser;
+	struct pw_zeroconf *zeroconf;
+	struct spa_hook zeroconf_listener;
 
 	struct spa_list tunnel_list;
 	uint32_t id;
@@ -206,8 +200,6 @@ struct tunnel {
 	bool need_flush;
 };
 
-static int start_client(struct impl *impl);
-
 static struct tunnel *make_tunnel(struct impl *impl, const struct tunnel_info *info)
 {
 	struct tunnel *t;
@@ -254,14 +246,8 @@ static void impl_free(struct impl *impl)
 	spa_list_consume(t, &impl->tunnel_list, link)
 		free_tunnel(t);
 
-	if (impl->jsonrpc_browser)
-		avahi_service_browser_free(impl->jsonrpc_browser);
-	if (impl->ctrl_browser)
-		avahi_service_browser_free(impl->ctrl_browser);
-	if (impl->client)
-		avahi_client_free(impl->client);
-	if (impl->avahi_poll)
-		pw_avahi_poll_free(impl->avahi_poll);
+	if (impl->zeroconf)
+		pw_zeroconf_destroy(impl->zeroconf);
 	pw_properties_free(impl->properties);
 	free(impl);
 }
@@ -278,7 +264,7 @@ static const struct pw_impl_module_events module_events = {
 	.destroy = module_destroy,
 };
 
-static void pw_properties_from_avahi_string(const char *key, const char *value,
+static void pw_properties_from_zeroconf(const char *key, const char *value,
 		struct pw_properties *props)
 {
 }
@@ -616,34 +602,26 @@ static int rule_matched(void *data, const char *location, const char *action,
 	return res;
 }
 
-static void resolver_cb(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiProtocol protocol,
-	AvahiResolverEvent event, const char *name, const char *type, const char *domain,
-	const char *host_name, const AvahiAddress *a, uint16_t port, AvahiStringList *txt,
-	AvahiLookupResultFlags flags, void *userdata)
+static void on_zeroconf_added(void *data, const void *user, const struct spa_dict *info)
 {
-	struct impl *impl = userdata;
+	struct impl *impl = data;
 	struct tunnel_info tinfo;
 	struct tunnel *t;
-	const char *str, *link_local_range = "169.254.";
-	AvahiStringList *l;
+	const char *name, *address, *str;
 	struct pw_properties *props = NULL;
-	char at[AVAHI_ADDRESS_STR_MAX];
 	char hbuf[NI_MAXHOST];
-	char if_suffix[16] = "";
 	struct ifreq ifreq;
-	int res, family;
+	int res, family, port = 0, ifindex = 0, protocol = 4;
+	const struct spa_dict_item *it;
 
-	if (event != AVAHI_RESOLVER_FOUND) {
-		pw_log_error("Resolving of '%s' failed: %s", name,
-				avahi_strerror(avahi_client_errno(impl->client)));
-		goto done;
-	}
-
-	avahi_address_snprint(at, sizeof(at), a);
-	if (spa_strstartswith(at, link_local_range))
-		pw_log_info("found link-local ip address %s for '%s'", at, name);
-
-	pw_log_info("%s %s", name, at);
+	name = spa_dict_lookup(info, "zeroconf.name");
+	address = spa_dict_lookup(info, "zeroconf.address");
+	if ((str = spa_dict_lookup(info, "zeroconf.protocol")))
+		protocol = atoi(str);
+	if ((str = spa_dict_lookup(info, "zeroconf.port")))
+		port = atoi(str);
+	if ((str = spa_dict_lookup(info, "zeroconf.ifindex")))
+		ifindex = atoi(str);
 
 	tinfo = TUNNEL_INFO(.name = name, .port = port);
 
@@ -655,7 +633,8 @@ static void resolver_cb(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiPr
 		goto done;
 	}
 	if (t->module != NULL) {
-		pw_log_info("found duplicate mdns entry for %s on IP %s - skipping tunnel creation", name, at);
+		pw_log_info("found duplicate mdns entry for %s on IP %s - skipping tunnel creation",
+				name, address);
 		goto done;
 	}
 
@@ -665,33 +644,23 @@ static void resolver_cb(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiPr
 		goto done;
 	}
 
-	if (a->proto == AVAHI_PROTO_INET6 &&
-	    a->data.ipv6.address[0] == 0xfe &&
-	    (a->data.ipv6.address[1] & 0xc0) == 0x80)
-		snprintf(if_suffix, sizeof(if_suffix), "%%%d", interface);
-
-	/* For IPv4 link-local, bind to the discovery interface */
-	if (a->proto == AVAHI_PROTO_INET &&
-	    spa_strstartswith(at, link_local_range))
-		snprintf(if_suffix, sizeof(if_suffix), "%%%d", interface);
-
-	pw_properties_setf(props, "snapcast.ip", "%s%s", at, if_suffix);
-	pw_properties_setf(props, "snapcast.ifindex", "%d", interface);
+	pw_properties_set(props, "snapcast.ip", address);
+	pw_properties_setf(props, "snapcast.ifindex", "%u", ifindex);
 	pw_properties_setf(props, "snapcast.port", "%u", port);
-	pw_properties_setf(props, "snapcast.name", "%s", name);
-	pw_properties_setf(props, "snapcast.hostname", "%s", host_name);
-	pw_properties_setf(props, "snapcast.domain", "%s", domain);
+	pw_properties_set(props, "snapcast.name", name);
+	pw_properties_set(props, "snapcast.hostname", spa_dict_lookup(info, "zeroconf.hostname"));
+	pw_properties_set(props, "snapcast.domain", spa_dict_lookup(info, "zeroconf.domain"));
 
 	free((char*)t->info.host);
 	t->info.host = strdup(pw_properties_get(props, "snapcast.ip"));
 
-	family = protocol == AVAHI_PROTO_INET ? AF_INET : AF_INET6;
+	family = protocol == 4 ? AF_INET : AF_INET6;
 
 	spa_zero(ifreq);
-	ifreq.ifr_ifindex = interface;
-	if_indextoname(interface, ifreq.ifr_name);
-	pw_properties_setf(props, "snapcast.ifname", "%s", ifreq.ifr_name);
-	pw_properties_setf(props, "local.ifname", "%s", ifreq.ifr_name);
+	ifreq.ifr_ifindex = ifindex;
+	if_indextoname(ifindex, ifreq.ifr_name);
+	pw_properties_set(props, "snapcast.ifname", ifreq.ifr_name);
+	pw_properties_set(props, "local.ifname", ifreq.ifr_name);
 
 	struct ifaddrs *if_addr, *ifp;
 	if (getifaddrs(&if_addr) < 0)
@@ -725,16 +694,8 @@ static void resolver_cb(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiPr
 	}
 	freeifaddrs(if_addr);
 
-	for (l = txt; l; l = l->next) {
-		char *key, *value;
-
-		if (avahi_string_list_get_pair(l, &key, &value, NULL) != 0)
-			break;
-
-		pw_properties_from_avahi_string(key, value, props);
-		avahi_free(key);
-		avahi_free(value);
-	}
+	spa_dict_for_each(it, info)
+		pw_properties_from_zeroconf(it->key, it->value, props);
 
 	if ((str = pw_properties_get(impl->properties, "stream.rules")) == NULL)
 		str = DEFAULT_CREATE_RULES;
@@ -752,133 +713,46 @@ static void resolver_cb(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiPr
 	}
 
 done:
-	avahi_service_resolver_free(r);
 	pw_properties_free(props);
 }
 
 
-static void browser_cb(AvahiServiceBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol,
-	AvahiBrowserEvent event, const char *name, const char *type, const char *domain,
-	AvahiLookupResultFlags flags, void *userdata)
+static void on_zeroconf_removed(void *data, const void *user, const struct spa_dict *info)
 {
-	struct impl *impl = userdata;
-	struct tunnel_info info;
+	struct impl *impl = data;
 	struct tunnel *t;
+	struct tunnel_info tinfo;
+	const char *name;
 
-	if ((flags & AVAHI_LOOKUP_RESULT_LOCAL) && !impl->discover_local)
+	name = spa_dict_lookup(info, "zeroconf.name");
+
+	tinfo = TUNNEL_INFO(.name = name);
+
+	t = find_tunnel(impl, &tinfo);
+	if (t == NULL)
 		return;
 
-	/* snapcast does not seem to work well with IPv6 */
-	if (protocol == AVAHI_PROTO_INET6)
-		return;
-
-	info = TUNNEL_INFO(.name = name);
-
-	t = find_tunnel(impl, &info);
-
-	switch (event) {
-	case AVAHI_BROWSER_NEW:
-		if (t != NULL) {
-			pw_log_info("found duplicate mdns entry - skipping tunnel creation");
-			return;
-		}
-		if (!(avahi_service_resolver_new(impl->client,
-						interface, protocol,
-						name, type, domain,
-						AVAHI_PROTO_UNSPEC, 0,
-						resolver_cb, impl)))
-			pw_log_error("can't make service resolver: %s",
-					avahi_strerror(avahi_client_errno(impl->client)));
-		break;
-	case AVAHI_BROWSER_REMOVE:
-		if (t == NULL)
-			return;
-		free_tunnel(t);
-		break;
-	default:
-		break;
-	}
+	free_tunnel(t);
 }
 
-
-static struct AvahiServiceBrowser *make_browser(struct impl *impl, const char *service_type)
-{
-	struct AvahiServiceBrowser *s;
-
-	s = avahi_service_browser_new(impl->client,
-                              AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
-                              service_type, NULL, 0,
-                              browser_cb, impl);
-	if (s == NULL) {
-		pw_log_error("can't make browser for %s: %s", service_type,
-				avahi_strerror(avahi_client_errno(impl->client)));
-	}
-	return s;
-}
-
-static void client_callback(AvahiClient *c, AvahiClientState state, void *userdata)
-{
-	struct impl *impl = userdata;
-
-	impl->client = c;
-
-	switch (state) {
-	case AVAHI_CLIENT_S_REGISTERING:
-	case AVAHI_CLIENT_S_RUNNING:
-	case AVAHI_CLIENT_S_COLLISION:
-		if (impl->ctrl_browser == NULL)
-			impl->ctrl_browser = make_browser(impl, SERVICE_TYPE_CONTROL);
-		if (impl->ctrl_browser == NULL)
-			goto error;
-		if (impl->jsonrpc_browser == NULL)
-			impl->jsonrpc_browser = make_browser(impl, SERVICE_TYPE_JSONRPC);
-		if (impl->jsonrpc_browser == NULL)
-			goto error;
-		break;
-	case AVAHI_CLIENT_FAILURE:
-		if (avahi_client_errno(c) == AVAHI_ERR_DISCONNECTED)
-			start_client(impl);
-
-		SPA_FALLTHROUGH;
-	case AVAHI_CLIENT_CONNECTING:
-		if (impl->ctrl_browser) {
-			avahi_service_browser_free(impl->ctrl_browser);
-			impl->ctrl_browser = NULL;
-		}
-		if (impl->jsonrpc_browser) {
-			avahi_service_browser_free(impl->jsonrpc_browser);
-			impl->jsonrpc_browser = NULL;
-		}
-		break;
-	default:
-		break;
-	}
-	return;
-error:
-	pw_impl_module_schedule_destroy(impl->module);
-}
-
-static int start_client(struct impl *impl)
+static int make_browser(struct impl *impl, const char *service_type)
 {
 	int res;
-	if ((impl->client = avahi_client_new(impl->avahi_poll,
-					AVAHI_CLIENT_NO_FAIL,
-					client_callback, impl,
-					&res)) == NULL) {
-		pw_log_error("can't create client: %s", avahi_strerror(res));
-		pw_impl_module_schedule_destroy(impl->module);
-		return -EIO;
+	if ((res = pw_zeroconf_set_browse(impl->zeroconf, service_type,
+		&SPA_DICT_ITEMS(
+			SPA_DICT_ITEM("zeroconf.service", service_type)))) < 0) {
+		pw_log_error("can't make browser for %s: %s",
+				service_type, spa_strerror(res));
+		return res;
 	}
 	return 0;
 }
 
-static int start_avahi(struct impl *impl)
-{
-
-	impl->avahi_poll = pw_avahi_poll_new(impl->context);
-
-	return start_client(impl);
-}
+static const struct pw_zeroconf_events zeroconf_events = {
+	PW_VERSION_ZEROCONF_EVENTS,
+	.added = on_zeroconf_added,
+	.removed = on_zeroconf_removed,
+};
 
 SPA_EXPORT
 int pipewire__module_init(struct pw_impl_module *module, const char *args)
@@ -912,13 +786,24 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 
 	impl->discover_local =  pw_properties_get_bool(impl->properties,
 			"snapcast.discover-local", false);
+	pw_properties_set(props, "zeroconf.discover-local",
+			impl->discover_local ? "true" : "false");
+
+	impl->zeroconf = pw_zeroconf_new(impl->context, &props->dict);
+	if (impl->zeroconf == NULL) {
+		pw_log_error("can't create zeroconf: %m");
+		goto error_errno;
+	}
+	pw_zeroconf_add_listener(impl->zeroconf, &impl->zeroconf_listener,
+			&zeroconf_events, impl);
+
+	make_browser(impl, SERVICE_TYPE_CONTROL);
+	make_browser(impl, SERVICE_TYPE_JSONRPC);
 
 	pw_impl_module_add_listener(module, &impl->module_listener, &module_events, impl);
 
 	pw_impl_module_update_properties(module, &SPA_DICT_INIT_ARRAY(module_props));
 
-	start_avahi(impl);
-
 	return 0;
 
 error_errno:

From dee2d5ee067a4f278b3810638e0dbb3a052d117a Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 27 Feb 2026 17:20:26 +0100
Subject: [PATCH 117/263] zeroconf: sanitize the properties

Use some constants for the zeroconf properties. Make the right ones are
used in all places.
---
 .../modules/module-zeroconf-publish.c         |  10 +-
 src/modules/module-raop-discover.c            |  22 ++--
 src/modules/module-rtp-session.c              |  60 +++++-----
 src/modules/module-sendspin-recv.c            |  16 +--
 src/modules/module-sendspin-send.c            |  16 +--
 src/modules/module-sendspin/sendspin.h        |   4 +-
 src/modules/module-snapcast-discover.c        |  24 ++--
 src/modules/module-zeroconf-discover.c        |  20 ++--
 src/modules/zeroconf-utils/zeroconf.c         | 112 ++++++++++--------
 src/modules/zeroconf-utils/zeroconf.h         |  14 +++
 10 files changed, 165 insertions(+), 133 deletions(-)

diff --git a/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c b/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c
index 6a420b2af..ffb5aa0fe 100644
--- a/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c
+++ b/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c
@@ -273,10 +273,10 @@ static void fill_service_data(struct module_zeroconf_publish_data *d, struct ser
 	pw_properties_set(s->props, "channel_map", channel_map_snprint(cm, sizeof(cm), &s->cm));
 	pw_properties_set(s->props, "subtype", subtype);
 
-	pw_properties_setf(s->props, "zeroconf.session", "%s@%s: %s",
+	pw_properties_setf(s->props, PW_KEY_ZEROCONF_NAME, "%s@%s: %s",
 			pw_get_user_name(), pw_get_host_name(), desc);
-	pw_properties_set(s->props, "zeroconf.service", service_type);
-	pw_properties_setf(s->props, "zeroconf.subtypes", "[ %s%s%s ]",
+	pw_properties_set(s->props, PW_KEY_ZEROCONF_TYPE, service_type);
+	pw_properties_setf(s->props, PW_KEY_ZEROCONF_SUBTYPES, "[ %s%s%s ]",
 			n_subtype > 0 ? subtype_service[0] : "",
 			n_subtype > 1 ? ", " : "",
 			n_subtype > 1 ? subtype_service[1] : "");
@@ -337,8 +337,8 @@ static void publish_service(struct service *s)
 
 	pw_log_debug("found server:%p proto:%d port:%d", server, proto, port);
 
-	pw_properties_setf(s->props, "zeroconf.proto", "%d", proto);
-	pw_properties_setf(s->props, "zeroconf.port", "%d", port);
+	pw_properties_setf(s->props, PW_KEY_ZEROCONF_PROTO, "%d", proto);
+	pw_properties_setf(s->props, PW_KEY_ZEROCONF_PORT, "%d", port);
 
 	if ((res = pw_zeroconf_set_announce(s->userdata->zeroconf, s, &s->props->dict)) < 0) {
 		pw_log_error("failed to announce service %s: %s", device, spa_strerror(res));
diff --git a/src/modules/module-raop-discover.c b/src/modules/module-raop-discover.c
index abe9b3dd8..3675b003e 100644
--- a/src/modules/module-raop-discover.c
+++ b/src/modules/module-raop-discover.c
@@ -280,22 +280,22 @@ static int rule_matched(void *data, const char *location, const char *action,
 static void pw_properties_from_zeroconf(const char *key, const char *value,
 		struct pw_properties *props)
 {
-	if (spa_streq(key, "zeroconf.ifindex")) {
+	if (spa_streq(key, PW_KEY_ZEROCONF_IFINDEX)) {
 		pw_properties_set(props, "raop.ifindex", value);
 	}
-	else if (spa_streq(key, "zeroconf.address")) {
+	else if (spa_streq(key, PW_KEY_ZEROCONF_ADDRESS)) {
 		pw_properties_set(props, "raop.ip", value);
 	}
-	else if (spa_streq(key, "zeroconf.port")) {
+	else if (spa_streq(key, PW_KEY_ZEROCONF_PORT)) {
 		pw_properties_set(props, "raop.port", value);
 	}
-	else if (spa_streq(key, "zeroconf.name")) {
+	else if (spa_streq(key, PW_KEY_ZEROCONF_NAME)) {
 		pw_properties_set(props, "raop.name", value);
 	}
-	else if (spa_streq(key, "zeroconf.hostname")) {
+	else if (spa_streq(key, PW_KEY_ZEROCONF_HOSTNAME)) {
 		pw_properties_set(props, "raop.hostname", value);
 	}
-	else if (spa_streq(key, "zeroconf.domain")) {
+	else if (spa_streq(key, PW_KEY_ZEROCONF_DOMAIN)) {
 		pw_properties_set(props, "raop.domain", value);
 	}
 	else if (spa_streq(key, "device")) {
@@ -372,7 +372,7 @@ static void on_zeroconf_added(void *data, const void *user, const struct spa_dic
 	const struct spa_dict_item *it;
 	struct pw_properties *props = NULL;
 
-	name = spa_dict_lookup(info, "zeroconf.name");
+	name = spa_dict_lookup(info, PW_KEY_ZEROCONF_NAME);
 
 	t = find_tunnel(impl, name);
 	if (t == NULL) {
@@ -384,7 +384,7 @@ static void on_zeroconf_added(void *data, const void *user, const struct spa_dic
 	if (t->module != NULL) {
 		pw_log_info("found duplicate mdns entry for %s on IP %s - "
 				"skipping tunnel creation", name,
-				spa_dict_lookup(info, "zeroconf.address"));
+				spa_dict_lookup(info, PW_KEY_ZEROCONF_ADDRESS));
 		goto done;
 	}
 
@@ -423,7 +423,7 @@ static void on_zeroconf_removed(void *data, const void *user, const struct spa_d
 	const char *name;
 	struct tunnel *t;
 
-	name = spa_dict_lookup(info, "zeroconf.name");
+	name = spa_dict_lookup(info, PW_KEY_ZEROCONF_NAME);
 
 	if ((t = find_tunnel(impl, name)) == NULL)
 		return;
@@ -468,7 +468,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 
 	if ((local = pw_properties_get(impl->properties, "raop.discover-local")) == NULL)
 		local = "false";
-	pw_properties_set(impl->properties, "zeroconf.discover-local", local);
+	pw_properties_set(impl->properties, PW_KEY_ZEROCONF_DISCOVER_LOCAL, local);
 
 	pw_impl_module_add_listener(module, &impl->module_listener, &module_events, impl);
 
@@ -483,7 +483,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 
 	pw_zeroconf_set_browse(impl->zeroconf, NULL,
 		&SPA_DICT_ITEMS(
-			SPA_DICT_ITEM("zeroconf.service", SERVICE_TYPE_SINK)));
+			SPA_DICT_ITEM(PW_KEY_ZEROCONF_TYPE, SERVICE_TYPE_SINK)));
 	return 0;
 
 error_errno:
diff --git a/src/modules/module-rtp-session.c b/src/modules/module-rtp-session.c
index f1f56d121..2dca681d6 100644
--- a/src/modules/module-rtp-session.c
+++ b/src/modules/module-rtp-session.c
@@ -1269,7 +1269,7 @@ static const struct pw_core_events core_events = {
 	.error = on_core_error,
 };
 
-static const char *get_service_name(struct impl *impl)
+static const char *get_service_type(struct impl *impl)
 {
 	const char *str;
 	str = pw_properties_get(impl->props, "sess.media");
@@ -1283,33 +1283,33 @@ static const char *get_service_name(struct impl *impl)
 static void on_zeroconf_added(void *data, const void *user, const struct spa_dict *info)
 {
 	struct impl *impl = data;
-	const char *str, *service_name, *address, *hostname;
+	const char *str, *service_type, *address, *hostname;
 	struct service_info sinfo;
 	struct session *sess;
 	int ifindex = -1, protocol = 0, res, port = 0;
 	struct pw_properties *props = NULL;
 	bool compatible = true;
 
-	if ((str = spa_dict_lookup(info, "zeroconf.ifindex")))
+	if ((str = spa_dict_lookup(info, PW_KEY_ZEROCONF_IFINDEX)))
 		ifindex = atoi(str);
-	if ((str = spa_dict_lookup(info, "zeroconf.protocol")))
+	if ((str = spa_dict_lookup(info, PW_KEY_ZEROCONF_PROTO)))
 		protocol = atoi(str);
-	if ((str = spa_dict_lookup(info, "zeroconf.port")))
+	if ((str = spa_dict_lookup(info, PW_KEY_ZEROCONF_PORT)))
 		port = atoi(str);
 
 	sinfo = SERVICE_INFO(.ifindex = ifindex,
 			.protocol = protocol,
-			.name = spa_dict_lookup(info, "zeroconf.session"),
-			.type = spa_dict_lookup(info, "zeroconf.service"),
-			.domain = spa_dict_lookup(info, "zeroconf.domain"));
+			.name = spa_dict_lookup(info, PW_KEY_ZEROCONF_NAME),
+			.type = spa_dict_lookup(info, PW_KEY_ZEROCONF_TYPE),
+			.domain = spa_dict_lookup(info, PW_KEY_ZEROCONF_DOMAIN));
 
 	sess = find_session_by_info(impl, &sinfo);
 	if (sess != NULL)
 		return;
 
 	/* check for compatible session */
-	service_name = get_service_name(impl);
-	compatible = spa_streq(service_name, sinfo.type);
+	service_type = get_service_type(impl);
+	compatible = spa_streq(service_type, sinfo.type);
 
 	props = pw_properties_copy(impl->stream_props);
 	if (props == NULL) {
@@ -1317,7 +1317,7 @@ static void on_zeroconf_added(void *data, const void *user, const struct spa_dic
 		goto error;
 	}
 
-	if (spa_streq(service_name, "_pipewire-audio._udp")) {
+	if (spa_streq(service_type, "_pipewire-audio._udp")) {
 		uint32_t mask = 0;
 		const struct spa_dict_item *it;
 		spa_dict_for_each(it, info) {
@@ -1378,8 +1378,8 @@ static void on_zeroconf_added(void *data, const void *user, const struct spa_dic
 		goto error;
 	}
 
-	address = spa_dict_lookup(info, "zeroconf.address");
-	hostname = spa_dict_lookup(info, "zeroconf.hostname");
+	address = spa_dict_lookup(info, PW_KEY_ZEROCONF_ADDRESS);
+	hostname = spa_dict_lookup(info, PW_KEY_ZEROCONF_HOSTNAME);
 
 	pw_log_info("create session: %s %s:%u %s", sinfo.name, address, port, sinfo.type);
 
@@ -1425,16 +1425,16 @@ static void on_zeroconf_removed(void *data, const void *user, const struct spa_d
 	const char *str;
 	int ifindex = -1, protocol = 0;
 
-	if ((str = spa_dict_lookup(info, "zeroconf.ifindex")))
+	if ((str = spa_dict_lookup(info, PW_KEY_ZEROCONF_IFINDEX)))
 		ifindex = atoi(str);
-	if ((str = spa_dict_lookup(info, "zeroconf.protocol")))
+	if ((str = spa_dict_lookup(info, PW_KEY_ZEROCONF_PROTO)))
 		protocol = atoi(str);
 
 	sinfo = SERVICE_INFO(.ifindex = ifindex,
 			.protocol = protocol,
-			.name = spa_dict_lookup(info, "zeroconf.session"),
-			.type = spa_dict_lookup(info, "zeroconf.service"),
-			.domain = spa_dict_lookup(info, "zeroconf.domain"));
+			.name = spa_dict_lookup(info, PW_KEY_ZEROCONF_NAME),
+			.type = spa_dict_lookup(info, PW_KEY_ZEROCONF_TYPE),
+			.domain = spa_dict_lookup(info, PW_KEY_ZEROCONF_DOMAIN));
 
 	sess = find_session_by_info(impl, &sinfo);
 	if (sess == NULL)
@@ -1445,18 +1445,18 @@ static void on_zeroconf_removed(void *data, const void *user, const struct spa_d
 
 static int make_browser(struct impl *impl)
 {
-	const char *service_name;
+	const char *service_type;
 	int res;
 
-	service_name = get_service_name(impl);
-	if (service_name == NULL)
+	service_type = get_service_type(impl);
+	if (service_type == NULL)
 		return -EINVAL;
 
 	if ((res = pw_zeroconf_set_browse(impl->zeroconf, impl,
 		&SPA_DICT_ITEMS(
-			SPA_DICT_ITEM("zeroconf.service", service_name)))) < 0) {
+			SPA_DICT_ITEM(PW_KEY_ZEROCONF_TYPE, service_type)))) < 0) {
 		pw_log_error("can't make browser for %s: %s",
-				service_name, spa_strerror(res));
+				service_type, spa_strerror(res));
 		return res;
 	}
 	return 0;
@@ -1465,15 +1465,15 @@ static int make_browser(struct impl *impl)
 static int make_announce(struct impl *impl)
 {
 	int res;
-	const char *service_name, *str;
+	const char *service_type, *str;
 	struct pw_properties *props;
 
 	props = pw_properties_new(NULL, NULL);
 
-	if ((service_name = get_service_name(impl)) == NULL)
+	if ((service_type = get_service_type(impl)) == NULL)
 		return -ENOTSUP;
 
-	if (spa_streq(service_name, "_pipewire-audio._udp")) {
+	if (spa_streq(service_type, "_pipewire-audio._udp")) {
 		str = pw_properties_get(impl->props, "sess.media");
 		pw_properties_set(props, "subtype", str);
 		if ((str = pw_properties_get(impl->stream_props, PW_KEY_AUDIO_FORMAT)) != NULL)
@@ -1494,9 +1494,9 @@ static int make_announce(struct impl *impl)
 		}
 	}
 
-	pw_properties_set(props, "zeroconf.session", impl->session_name);
-	pw_properties_set(props, "zeroconf.service", service_name);
-	pw_properties_setf(props, "zeroconf.port", "%u", impl->ctrl_port);
+	pw_properties_set(props, PW_KEY_ZEROCONF_NAME, impl->session_name);
+	pw_properties_set(props, PW_KEY_ZEROCONF_TYPE, service_type);
+	pw_properties_setf(props, PW_KEY_ZEROCONF_PORT, "%u", impl->ctrl_port);
 
 	res = pw_zeroconf_set_announce(impl->zeroconf, impl, &props->dict);
 
@@ -1555,7 +1555,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 
 	impl->discover_local =  pw_properties_get_bool(impl->props,
 			"sess.discover-local", false);
-	pw_properties_set(impl->props, "zeroconf.discover-local",
+	pw_properties_set(impl->props, PW_KEY_ZEROCONF_DISCOVER_LOCAL,
 			impl->discover_local ? "true" : "false");
 
 	stream_props = pw_properties_new(NULL, NULL);
diff --git a/src/modules/module-sendspin-recv.c b/src/modules/module-sendspin-recv.c
index a31681f24..4875cd597 100644
--- a/src/modules/module-sendspin-recv.c
+++ b/src/modules/module-sendspin-recv.c
@@ -1116,7 +1116,7 @@ static void on_zeroconf_added(void *data, const void *user, const struct spa_dic
 	struct client *c;
 	struct pw_properties *props;
 
-	name = spa_dict_lookup(info, "zeroconf.hostname");
+	name = spa_dict_lookup(info, PW_KEY_ZEROCONF_NAME);
 
 	if (impl->single_server && !spa_list_is_empty(&impl->clients))
 		return;
@@ -1127,8 +1127,8 @@ static void on_zeroconf_added(void *data, const void *user, const struct spa_dic
 	props = pw_properties_copy(impl->stream_props);
 	pw_properties_update(props, info);
 
-	addr = spa_dict_lookup(info, "zeroconf.address");
-	port = spa_dict_lookup(info, "zeroconf.port");
+	addr = spa_dict_lookup(info, PW_KEY_ZEROCONF_ADDRESS);
+	port = spa_dict_lookup(info, PW_KEY_ZEROCONF_PORT);
 	path = spa_dict_lookup(info, "path");
 
 	pw_properties_set(props, "sendspin.ip", addr);
@@ -1144,7 +1144,7 @@ static void on_zeroconf_removed(void *data, const void *user, const struct spa_d
 	const char *name;
 	struct client *c;
 
-	name = spa_dict_lookup(info, "zeroconf.hostname");
+	name = spa_dict_lookup(info, PW_KEY_ZEROCONF_NAME);
 
 	if ((c = client_find(impl, name)) == NULL)
 		return;
@@ -1341,9 +1341,9 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 			str = pw_properties_get(props, "sendspin.client-id");
 			pw_zeroconf_set_announce(impl->zeroconf, NULL,
 				&SPA_DICT_ITEMS(
-					SPA_DICT_ITEM("zeroconf.service", PW_SENDSPIN_CLIENT_SERVICE),
-					SPA_DICT_ITEM("zeroconf.session", str),
-					SPA_DICT_ITEM("zeroconf.port", port),
+					SPA_DICT_ITEM(PW_KEY_ZEROCONF_TYPE, PW_SENDSPIN_CLIENT_SERVICE_TYPE),
+					SPA_DICT_ITEM(PW_KEY_ZEROCONF_NAME, str),
+					SPA_DICT_ITEM(PW_KEY_ZEROCONF_PORT, port),
 					SPA_DICT_ITEM("path", path)));
 		}
 	}
@@ -1371,7 +1371,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 		if (impl->zeroconf) {
 			pw_zeroconf_set_browse(impl->zeroconf, NULL,
 				&SPA_DICT_ITEMS(
-					SPA_DICT_ITEM("zeroconf.service", PW_SENDSPIN_SERVER_SERVICE)));
+					SPA_DICT_ITEM(PW_KEY_ZEROCONF_TYPE, PW_SENDSPIN_SERVER_SERVICE_TYPE)));
 		}
 	}
 
diff --git a/src/modules/module-sendspin-send.c b/src/modules/module-sendspin-send.c
index c67abcc06..3b6093307 100644
--- a/src/modules/module-sendspin-send.c
+++ b/src/modules/module-sendspin-send.c
@@ -1117,7 +1117,7 @@ static void on_zeroconf_added(void *data, const void *user, const struct spa_dic
 	struct client *c;
 	struct pw_properties *props;
 
-	name = spa_dict_lookup(info, "zeroconf.hostname");
+	name = spa_dict_lookup(info, PW_KEY_ZEROCONF_NAME);
 
 	if ((c = client_find(impl, name)) != NULL)
 		return;
@@ -1125,8 +1125,8 @@ static void on_zeroconf_added(void *data, const void *user, const struct spa_dic
 	props = pw_properties_copy(impl->stream_props);
 	pw_properties_update(props, info);
 
-	addr = spa_dict_lookup(info, "zeroconf.address");
-	port = spa_dict_lookup(info, "zeroconf.port");
+	addr = spa_dict_lookup(info, PW_KEY_ZEROCONF_ADDRESS);
+	port = spa_dict_lookup(info, PW_KEY_ZEROCONF_PORT);
 	path = spa_dict_lookup(info, "path");
 
 	pw_properties_set(props, "sendspin.ip", addr);
@@ -1142,7 +1142,7 @@ static void on_zeroconf_removed(void *data, const void *user, const struct spa_d
 	const char *name;
 	struct client *c;
 
-	name = spa_dict_lookup(info, "zeroconf.hostname");
+	name = spa_dict_lookup(info, PW_KEY_ZEROCONF_NAME);
 
 	if ((c = client_find(impl, name)) == NULL)
 		return;
@@ -1368,16 +1368,16 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 			str = pw_properties_get(props, "sendspin.group-name");
 			pw_zeroconf_set_announce(impl->zeroconf, NULL,
 				&SPA_DICT_ITEMS(
-					SPA_DICT_ITEM("zeroconf.service", PW_SENDSPIN_SERVER_SERVICE),
-					SPA_DICT_ITEM("zeroconf.session", str),
-					SPA_DICT_ITEM("zeroconf.port", port),
+					SPA_DICT_ITEM(PW_KEY_ZEROCONF_TYPE, PW_SENDSPIN_SERVER_SERVICE_TYPE),
+					SPA_DICT_ITEM(PW_KEY_ZEROCONF_NAME, str),
+					SPA_DICT_ITEM(PW_KEY_ZEROCONF_PORT, port),
 					SPA_DICT_ITEM("path", path)));
 		}
 	}
 	if (impl->zeroconf) {
 		pw_zeroconf_set_browse(impl->zeroconf, NULL,
 			&SPA_DICT_ITEMS(
-				SPA_DICT_ITEM("zeroconf.service", PW_SENDSPIN_CLIENT_SERVICE)));
+				SPA_DICT_ITEM(PW_KEY_ZEROCONF_TYPE, PW_SENDSPIN_CLIENT_SERVICE_TYPE)));
 	}
 	pw_impl_module_add_listener(module, &impl->module_listener, &module_events, impl);
 
diff --git a/src/modules/module-sendspin/sendspin.h b/src/modules/module-sendspin/sendspin.h
index b6260d27c..dab9d36f3 100644
--- a/src/modules/module-sendspin/sendspin.h
+++ b/src/modules/module-sendspin/sendspin.h
@@ -13,8 +13,8 @@
 extern "C" {
 #endif
 
-#define PW_SENDSPIN_SERVER_SERVICE	"_sendspin-server._tcp"
-#define PW_SENDSPIN_CLIENT_SERVICE	"_sendspin._tcp"
+#define PW_SENDSPIN_SERVER_SERVICE_TYPE	"_sendspin-server._tcp"
+#define PW_SENDSPIN_CLIENT_SERVICE_TYPE	"_sendspin._tcp"
 
 #define PW_SENDSPIN_DEFAULT_SERVER_PORT	8927
 #define PW_SENDSPIN_DEFAULT_CLIENT_PORT	8928
diff --git a/src/modules/module-snapcast-discover.c b/src/modules/module-snapcast-discover.c
index ecd5dc069..2561a7304 100644
--- a/src/modules/module-snapcast-discover.c
+++ b/src/modules/module-snapcast-discover.c
@@ -614,14 +614,14 @@ static void on_zeroconf_added(void *data, const void *user, const struct spa_dic
 	int res, family, port = 0, ifindex = 0, protocol = 4;
 	const struct spa_dict_item *it;
 
-	name = spa_dict_lookup(info, "zeroconf.name");
-	address = spa_dict_lookup(info, "zeroconf.address");
-	if ((str = spa_dict_lookup(info, "zeroconf.protocol")))
-		protocol = atoi(str);
-	if ((str = spa_dict_lookup(info, "zeroconf.port")))
-		port = atoi(str);
-	if ((str = spa_dict_lookup(info, "zeroconf.ifindex")))
+	if ((str = spa_dict_lookup(info, PW_KEY_ZEROCONF_IFINDEX)))
 		ifindex = atoi(str);
+	if ((str = spa_dict_lookup(info, PW_KEY_ZEROCONF_PROTO)))
+		protocol = atoi(str);
+	name = spa_dict_lookup(info, PW_KEY_ZEROCONF_NAME);
+	address = spa_dict_lookup(info, PW_KEY_ZEROCONF_ADDRESS);
+	if ((str = spa_dict_lookup(info, PW_KEY_ZEROCONF_PORT)))
+		port = atoi(str);
 
 	tinfo = TUNNEL_INFO(.name = name, .port = port);
 
@@ -648,8 +648,8 @@ static void on_zeroconf_added(void *data, const void *user, const struct spa_dic
 	pw_properties_setf(props, "snapcast.ifindex", "%u", ifindex);
 	pw_properties_setf(props, "snapcast.port", "%u", port);
 	pw_properties_set(props, "snapcast.name", name);
-	pw_properties_set(props, "snapcast.hostname", spa_dict_lookup(info, "zeroconf.hostname"));
-	pw_properties_set(props, "snapcast.domain", spa_dict_lookup(info, "zeroconf.domain"));
+	pw_properties_set(props, "snapcast.hostname", spa_dict_lookup(info, PW_KEY_ZEROCONF_HOSTNAME));
+	pw_properties_set(props, "snapcast.domain", spa_dict_lookup(info, PW_KEY_ZEROCONF_DOMAIN));
 
 	free((char*)t->info.host);
 	t->info.host = strdup(pw_properties_get(props, "snapcast.ip"));
@@ -724,7 +724,7 @@ static void on_zeroconf_removed(void *data, const void *user, const struct spa_d
 	struct tunnel_info tinfo;
 	const char *name;
 
-	name = spa_dict_lookup(info, "zeroconf.name");
+	name = spa_dict_lookup(info, PW_KEY_ZEROCONF_NAME);
 
 	tinfo = TUNNEL_INFO(.name = name);
 
@@ -740,7 +740,7 @@ static int make_browser(struct impl *impl, const char *service_type)
 	int res;
 	if ((res = pw_zeroconf_set_browse(impl->zeroconf, service_type,
 		&SPA_DICT_ITEMS(
-			SPA_DICT_ITEM("zeroconf.service", service_type)))) < 0) {
+			SPA_DICT_ITEM(PW_KEY_ZEROCONF_TYPE, service_type)))) < 0) {
 		pw_log_error("can't make browser for %s: %s",
 				service_type, spa_strerror(res));
 		return res;
@@ -786,7 +786,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 
 	impl->discover_local =  pw_properties_get_bool(impl->properties,
 			"snapcast.discover-local", false);
-	pw_properties_set(props, "zeroconf.discover-local",
+	pw_properties_set(props, PW_KEY_ZEROCONF_DISCOVER_LOCAL,
 			impl->discover_local ? "true" : "false");
 
 	impl->zeroconf = pw_zeroconf_new(impl->context, &props->dict);
diff --git a/src/modules/module-zeroconf-discover.c b/src/modules/module-zeroconf-discover.c
index 52b407687..61108d424 100644
--- a/src/modules/module-zeroconf-discover.c
+++ b/src/modules/module-zeroconf-discover.c
@@ -239,8 +239,8 @@ static void on_zeroconf_added(void *data, const void *user_data, const struct sp
 	struct pw_impl_module *mod;
 	struct pw_properties *props = NULL;
 
-	name = spa_dict_lookup(info, "zeroconf.name");
-	type = spa_dict_lookup(info, "zeroconf.type");
+	name = spa_dict_lookup(info, PW_KEY_ZEROCONF_NAME);
+	type = spa_dict_lookup(info, PW_KEY_ZEROCONF_TYPE);
 	mode = strstr(type, "sink") ? "sink" : "source";
 
 	tinfo = TUNNEL_INFO(.name = name, .mode = mode);
@@ -266,7 +266,7 @@ static void on_zeroconf_added(void *data, const void *user_data, const struct sp
 	spa_dict_for_each(it, info)
 		pw_properties_from_zeroconf(it->key, it->value, props);
 
-	host_name = spa_dict_lookup(info, "zeroconf.hostname");
+	host_name = spa_dict_lookup(info, PW_KEY_ZEROCONF_HOSTNAME);
 
 	if ((device = pw_properties_get(props, PW_KEY_TARGET_OBJECT)) != NULL)
 		pw_properties_setf(props, PW_KEY_NODE_NAME,
@@ -278,8 +278,8 @@ static void on_zeroconf_added(void *data, const void *user_data, const struct sp
 	pw_properties_set(props, "tunnel.mode", mode);
 
 	pw_properties_setf(props, "pulse.server.address", " [%s]:%s",
-			spa_dict_lookup(info, "zeroconf.address"),
-			spa_dict_lookup(info, "zeroconf.port"));
+			spa_dict_lookup(info, PW_KEY_ZEROCONF_ADDRESS),
+			spa_dict_lookup(info, PW_KEY_ZEROCONF_PORT));
 
 	desc = pw_properties_get(props, "tunnel.remote.description");
 	if (desc == NULL)
@@ -347,8 +347,8 @@ static void on_zeroconf_removed(void *data, const void *user, const struct spa_d
 	struct tunnel *t;
 	struct tunnel_info tinfo;
 
-	name = spa_dict_lookup(info, "zeroconf.name");
-	type = spa_dict_lookup(info, "zeroconf.type");
+	name = spa_dict_lookup(info, PW_KEY_ZEROCONF_NAME);
+	type = spa_dict_lookup(info, PW_KEY_ZEROCONF_TYPE);
 	mode = strstr(type, "sink") ? "sink" : "source";
 
 	tinfo = TUNNEL_INFO(.name = name, .mode = mode);
@@ -397,7 +397,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 
 	discover_local = pw_properties_get_bool(impl->properties,
 			"pulse.discover-local", false);
-	pw_properties_setf(impl->properties, "zeroconf.discover-local",
+	pw_properties_setf(impl->properties, PW_KEY_ZEROCONF_DISCOVER_LOCAL,
 			discover_local ? "true" : "false");
 
 	pw_impl_module_add_listener(module, &impl->module_listener, &module_events, impl);
@@ -413,11 +413,11 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 
 	pw_zeroconf_set_browse(impl->zeroconf, SERVICE_TYPE_SINK,
 		&SPA_DICT_ITEMS(
-			SPA_DICT_ITEM("zeroconf.service", SERVICE_TYPE_SINK)));
+			SPA_DICT_ITEM(PW_KEY_ZEROCONF_TYPE, SERVICE_TYPE_SINK)));
 
 	pw_zeroconf_set_browse(impl->zeroconf, SERVICE_TYPE_SOURCE,
 		&SPA_DICT_ITEMS(
-			SPA_DICT_ITEM("zeroconf.service", SERVICE_TYPE_SOURCE)));
+			SPA_DICT_ITEM(PW_KEY_ZEROCONF_TYPE, SERVICE_TYPE_SOURCE)));
 
 	return 0;
 
diff --git a/src/modules/zeroconf-utils/zeroconf.c b/src/modules/zeroconf-utils/zeroconf.c
index 49ed0e70e..a3ec5f4a8 100644
--- a/src/modules/zeroconf-utils/zeroconf.c
+++ b/src/modules/zeroconf-utils/zeroconf.c
@@ -42,6 +42,8 @@ struct service_info {
 
 #define SERVICE_INFO(...) ((struct service_info){ __VA_ARGS__ })
 
+#define STR_TO_PROTO(s)  (atoi(s) == 6 ? AVAHI_PROTO_INET6 : AVAHI_PROTO_INET)
+
 struct entry {
 	struct pw_zeroconf *zc;
 	struct spa_list link;
@@ -198,17 +200,18 @@ static struct service *service_new(struct entry *e,
 	    spa_strstartswith(at, link_local_range))
 		snprintf(if_suffix, sizeof(if_suffix), "%%%d", info->interface);
 
-	if (a->proto != AVAHI_PROTO_UNSPEC)
-		pw_properties_setf(s->props, "zeroconf.proto", "%s",
-				a->proto == AVAHI_PROTO_INET ? "4" : "6");
 	if (info->interface != AVAHI_IF_UNSPEC)
-		pw_properties_setf(s->props, "zeroconf.ifindex", "%d", info->interface);
-	pw_properties_setf(s->props, "zeroconf.name", "%s", info->name);
-	pw_properties_setf(s->props, "zeroconf.type", "%s", info->type);
-	pw_properties_setf(s->props, "zeroconf.domain", "%s", info->domain);
-	pw_properties_setf(s->props, "zeroconf.hostname", "%s", info->host_name);
-	pw_properties_setf(s->props, "zeroconf.address", "%s%s", at, if_suffix);
-	pw_properties_setf(s->props, "zeroconf.port", "%u", info->port);
+		pw_properties_setf(s->props, PW_KEY_ZEROCONF_IFINDEX, "%d", info->interface);
+	if (a->proto != AVAHI_PROTO_UNSPEC)
+		pw_properties_set(s->props, PW_KEY_ZEROCONF_PROTO,
+				a->proto == AVAHI_PROTO_INET ? "4" : "6");
+
+	pw_properties_set(s->props, PW_KEY_ZEROCONF_NAME, info->name);
+	pw_properties_set(s->props, PW_KEY_ZEROCONF_TYPE, info->type);
+	pw_properties_set(s->props, PW_KEY_ZEROCONF_DOMAIN, info->domain);
+	pw_properties_set(s->props, PW_KEY_ZEROCONF_HOSTNAME, info->host_name);
+	pw_properties_setf(s->props, PW_KEY_ZEROCONF_ADDRESS, "%s%s", at, if_suffix);
+	pw_properties_setf(s->props, PW_KEY_ZEROCONF_PORT, "%u", info->port);
 
 	for (l = txt; l; l = l->next) {
 		char *key, *value;
@@ -271,6 +274,8 @@ static void browser_cb(AvahiServiceBrowser *b, AvahiIfIndex interface, AvahiProt
 	struct pw_zeroconf *zc = e->zc;
 	struct service_info info;
 	struct service *s;
+	int aproto = AVAHI_PROTO_UNSPEC;
+	const char *str;
 
 	if ((flags & AVAHI_LOOKUP_RESULT_LOCAL) && !zc->discover_local)
 		return;
@@ -287,10 +292,14 @@ static void browser_cb(AvahiServiceBrowser *b, AvahiIfIndex interface, AvahiProt
 	case AVAHI_BROWSER_NEW:
 		if (s != NULL)
 			return;
+
+		if ((str = pw_properties_get(e->props, PW_KEY_ZEROCONF_RESOLVE_PROTO)))
+			aproto = STR_TO_PROTO(str);
+
 		if (!(avahi_service_resolver_new(zc->client,
 						interface, protocol,
 						name, type, domain,
-						AVAHI_PROTO_UNSPEC, 0,
+						aproto, 0,
 						resolver_cb, e))) {
 			int res = avahi_client_errno(zc->client);
 			pw_log_error("can't make service resolver: %s", avahi_strerror(res));
@@ -312,23 +321,28 @@ static void browser_cb(AvahiServiceBrowser *b, AvahiIfIndex interface, AvahiProt
 static int do_browse(struct pw_zeroconf *zc, struct entry *e)
 {
 	const struct spa_dict_item *it;
-	const char *service_name = NULL;
-	int res;
+	const char *type = NULL, *domain = NULL;
+	int res, ifindex = AVAHI_IF_UNSPEC, proto = AVAHI_PROTO_UNSPEC;
 
 	if (e->browser == NULL) {
 		spa_dict_for_each(it, &e->props->dict) {
-			if (spa_streq(it->key, "zeroconf.service"))
-				service_name = it->value;
+			if (spa_streq(it->key, PW_KEY_ZEROCONF_IFINDEX))
+				ifindex = atoi(it->value);
+			else if (spa_streq(it->key, PW_KEY_ZEROCONF_PROTO))
+				proto = STR_TO_PROTO(it->value);
+			else if (spa_streq(it->key, PW_KEY_ZEROCONF_TYPE))
+				type = it->value;
+			else if (spa_streq(it->key, PW_KEY_ZEROCONF_DOMAIN))
+				domain = it->value;
 		}
-		if (service_name == NULL) {
+		if (type == NULL) {
 			res = -EINVAL;
-			pw_log_error("can't make browser: no service provided");
+			pw_log_error("can't make browser: no "PW_KEY_ZEROCONF_TYPE" provided");
 			pw_zeroconf_emit_error(zc, res, spa_strerror(res));
 			return res;
 		}
 		e->browser = avahi_service_browser_new(zc->client,
-				AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
-				service_name, NULL, 0,
+				ifindex, proto, type, domain, 0,
 				browser_cb, e);
 	        if (e->browser == NULL) {
 			res = avahi_client_errno(zc->client);
@@ -349,7 +363,7 @@ static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state,
 
 	zc->refcount++;
 
-	name = pw_properties_get(e->props, "zeroconf.session");
+	name = pw_properties_get(e->props, PW_KEY_ZEROCONF_NAME);
 
 	switch (state) {
 	case AVAHI_ENTRY_GROUP_ESTABLISHED:
@@ -375,7 +389,7 @@ static int do_announce(struct pw_zeroconf *zc, struct entry *e)
 	AvahiStringList *txt = NULL;
 	int res, ifindex = AVAHI_IF_UNSPEC, proto = AVAHI_PROTO_UNSPEC;
 	const struct spa_dict_item *it;
-	const char *session_name = "unnamed", *service = NULL, *subtypes = NULL;
+	const char *name = "unnamed", *type = NULL, *subtypes = NULL;
 	const char *domain = NULL, *host = NULL;
 	uint16_t port = 0;
 
@@ -392,36 +406,36 @@ static int do_announce(struct pw_zeroconf *zc, struct entry *e)
 	avahi_entry_group_reset(e->group);
 
 	spa_dict_for_each(it, &e->props->dict) {
-		if (spa_streq(it->key, "zeroconf.session"))
-			session_name = it->value;
-		else if (spa_streq(it->key, "zeroconf.port"))
-			port = atoi(it->value);
-		else if (spa_streq(it->key, "zeroconf.service"))
-			service = it->value;
-		else if (spa_streq(it->key, "zeroconf.domain"))
-			domain = it->value;
-		else if (spa_streq(it->key, "zeroconf.host"))
-			host = it->value;
-		else if (spa_streq(it->key, "zeroconf.ifindex"))
+		if (spa_streq(it->key, PW_KEY_ZEROCONF_IFINDEX))
 			ifindex = atoi(it->value);
-		else if (spa_streq(it->key, "zeroconf.proto"))
-			proto = atoi(it->value) == 6 ? AVAHI_PROTO_INET6 : AVAHI_PROTO_INET;
-		else if (spa_streq(it->key, "zeroconf.subtypes"))
+		else if (spa_streq(it->key, PW_KEY_ZEROCONF_PROTO))
+			proto = STR_TO_PROTO(it->value);
+		else if (spa_streq(it->key, PW_KEY_ZEROCONF_NAME))
+			name = it->value;
+		else if (spa_streq(it->key, PW_KEY_ZEROCONF_TYPE))
+			type = it->value;
+		else if (spa_streq(it->key, PW_KEY_ZEROCONF_DOMAIN))
+			domain = it->value;
+		else if (spa_streq(it->key, PW_KEY_ZEROCONF_HOST))
+			host = it->value;
+		else if (spa_streq(it->key, PW_KEY_ZEROCONF_PORT))
+			port = atoi(it->value);
+		else if (spa_streq(it->key, PW_KEY_ZEROCONF_SUBTYPES))
 			subtypes = it->value;
-		else
+		else if (!spa_strstartswith(it->key, "zeroconf."))
 			txt = avahi_string_list_add_pair(txt, it->key, it->value);
 	}
-	if (service == NULL) {
+	if (type == NULL) {
 		res = -EINVAL;
-		pw_log_error("can't announce: no service provided");
+		pw_log_error("can't announce: no "PW_KEY_ZEROCONF_TYPE" provided");
 		pw_zeroconf_emit_error(zc, res, spa_strerror(res));
 		avahi_string_list_free(txt);
 		return res;
 	}
 	res = avahi_entry_group_add_service_strlst(e->group,
 			ifindex, proto,
-			(AvahiPublishFlags)0, session_name,
-			service, domain, host, port, txt);
+			(AvahiPublishFlags)0, name,
+			type, domain, host, port, txt);
 	avahi_string_list_free(txt);
 
 	if (res < 0) {
@@ -444,11 +458,11 @@ static int do_announce(struct pw_zeroconf *zc, struct entry *e)
 		while (spa_json_get_string(&iter, v, sizeof(v)) > 0) {
 			res = avahi_entry_group_add_service_subtype(e->group,
 					ifindex, proto,
-					(AvahiPublishFlags)0, session_name,
-					service, domain, v);
+					(AvahiPublishFlags)0, name,
+					type, domain, v);
 			if (res < 0) {
 				res = avahi_client_errno(zc->client);
-				pw_log_error("can't add subtype: %s", avahi_strerror(res));
+				pw_log_error("can't add subtype %s: %s", v, avahi_strerror(res));
 				pw_zeroconf_emit_error(zc, res, avahi_strerror(res));
 				return -EIO;
 			}
@@ -518,9 +532,13 @@ static struct entry *entry_new(struct pw_zeroconf *zc, uint32_t type, const void
 	e->props = pw_properties_new_dict(info);
 	spa_list_append(&zc->entries, &e->link);
 	spa_list_init(&e->services);
-	pw_log_debug("created %s for \"%s\"",
-			type == TYPE_ANNOUNCE ? "announce" : "browse",
-			pw_properties_get(e->props, "zeroconf.session"));
+
+	if (type == TYPE_ANNOUNCE)
+		pw_log_debug("created announce for \"%s\"",
+				pw_properties_get(e->props, PW_KEY_ZEROCONF_NAME));
+	else
+		pw_log_debug("created browse for \"%s\"",
+				pw_properties_get(e->props, PW_KEY_ZEROCONF_TYPE));
 	return e;
 }
 
@@ -576,7 +594,7 @@ struct pw_zeroconf * pw_zeroconf_new(struct pw_context *context,
 		const char *k = props->items[i].key;
 		const char *v = props->items[i].value;
 
-		if (spa_streq(k, "zeroconf.discover-local") && v)
+		if (spa_streq(k, PW_KEY_ZEROCONF_DISCOVER_LOCAL) && v)
 			zc->discover_local = spa_atob(v);
 	}
 
diff --git a/src/modules/zeroconf-utils/zeroconf.h b/src/modules/zeroconf-utils/zeroconf.h
index 1b27e5d5b..3fbd0bde8 100644
--- a/src/modules/zeroconf-utils/zeroconf.h
+++ b/src/modules/zeroconf-utils/zeroconf.h
@@ -13,6 +13,20 @@
 extern "C" {
 #endif
 
+#define PW_KEY_ZEROCONF_DISCOVER_LOCAL	"zeroconf.discover-local"	/* discover local services, true by default */
+
+#define PW_KEY_ZEROCONF_IFINDEX		"zeroconf.ifindex"		/* interface index */
+#define PW_KEY_ZEROCONF_PROTO		"zeroconf.proto"		/* protocol version, "4" ot "6" */
+#define PW_KEY_ZEROCONF_NAME		"zeroconf.name"			/* session name */
+#define PW_KEY_ZEROCONF_TYPE		"zeroconf.type"			/* service type, like "_http._tcp", not NULL */
+#define PW_KEY_ZEROCONF_DOMAIN		"zeroconf.domain"		/* domain to register in, recommended NULL */
+#define PW_KEY_ZEROCONF_HOST		"zeroconf.host"			/* host to register on, recommended NULL */
+#define PW_KEY_ZEROCONF_SUBTYPES	"zeroconf.subtypes"		/* subtypes to register, array of strings */
+#define PW_KEY_ZEROCONF_RESOLVE_PROTO	"zeroconf.resolve-proto"	/* protocol to resolve to, "4" or "6" */
+#define PW_KEY_ZEROCONF_HOSTNAME	"zeroconf.hostname"		/* hostname of resolved service */
+#define PW_KEY_ZEROCONF_PORT		"zeroconf.port"			/* port of resolved service */
+#define PW_KEY_ZEROCONF_ADDRESS		"zeroconf.address"		/* address of resolved service */
+
 struct pw_zeroconf;
 
 struct pw_zeroconf_events {

From 9ad5ca2e5a2ebc90954ed76458803a8ef55160b0 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 27 Feb 2026 17:58:51 +0100
Subject: [PATCH 118/263] websocket: fix some overflows

Fix some integer and buffer overflows as suggested by Sami Farin.
---
 src/modules/module-sendspin/websocket.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/modules/module-sendspin/websocket.c b/src/modules/module-sendspin/websocket.c
index 959706d79..b6ddf629f 100644
--- a/src/modules/module-sendspin/websocket.c
+++ b/src/modules/module-sendspin/websocket.c
@@ -289,7 +289,7 @@ static int receive_websocket(struct pw_websocket_connection *conn,
 		/* header done */
 		conn->status = d[0] & 0xf;
 		if (d[1] & 0x80)
-			header =+ 4;
+			header += 4;
 		if ((d[1] & 0x7f) == 126)
 			header += 2;
 		else if ((d[1] & 0x7f) == 127)
@@ -309,7 +309,9 @@ static int receive_websocket(struct pw_websocket_connection *conn,
 			header = 8;
 		for (i = 0; i < header; i++)
 			payload_len = (payload_len << 8) | d[i + 2];
-		need += payload_len;
+		if (payload_len > (size_t)(INT_MAX - need))
+		        return -EMSGSIZE;
+		need += (int)payload_len;
 		conn->data_state++;
 	}
 	if (need == 0) {
@@ -492,7 +494,7 @@ static int receive_http_reply(struct pw_websocket_connection *conn,
 			if (sscanf(l, "HTTP/%d.%d %n%d", &v1, &v2, &message, &status) != 3)
 				return -EPROTO;
 			conn->status = status;
-			strcpy(conn->message, &l[message]);
+			snprintf(conn->message, sizeof(conn->message), "%s", &l[message]);
 			conn->content_length = 0;
 			conn->data_state++;
 		}
@@ -642,6 +644,8 @@ static int handle_input(struct pw_websocket_connection *conn)
 					current)) < 0)
 				return res;
 
+			if (conn->data_wanted > SIZE_MAX - res)
+				return -EOVERFLOW;
 			conn->data_wanted += res;
 		}
 	}
@@ -1012,8 +1016,13 @@ int pw_websocket_connection_send(struct pw_websocket_connection *conn, uint8_t o
 	uint8_t *d, *mask = NULL, maskbit = conn->maskbit;
 	size_t payload_length = 0;
 
-	for (i = 0; i < iov_len; i++)
+	for (i = 0; i < iov_len; i++) {
+		if (payload_length > SIZE_MAX - iov[i].iov_len)
+			return -EOVERFLOW;
 		payload_length += iov[i].iov_len;
+	}
+	if (payload_length > SIZE_MAX - sizeof(*msg) - 14)
+		return -EOVERFLOW;
 
 	if ((msg = calloc(1, sizeof(*msg) + 14 + payload_length)) == NULL)
 		return -errno;

From ee18160c4eb6f47a5519562fb2eb85737c5ec7fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis@collabora.com>
Date: Fri, 27 Feb 2026 16:32:26 +0100
Subject: [PATCH 119/263] bluez5: bap: Fix typos

---
 doc/dox/config/pipewire-props.7.md |  4 +-
 spa/plugins/bluez5/bap-codec-lc3.c | 64 +++++++++++++++---------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/doc/dox/config/pipewire-props.7.md b/doc/dox/config/pipewire-props.7.md
index e561979d5..5555e3408 100644
--- a/doc/dox/config/pipewire-props.7.md
+++ b/doc/dox/config/pipewire-props.7.md
@@ -1375,9 +1375,9 @@ Default: as per QoS preset.
 
 @PAR@ device-prop  bluez5.bap.force-target-latency = "balanced" # string
 BAP QoS target latency profile forced for QoS configuration selection.
-If not set or set to "balanced", both low-latency and high-reliabilty QoS configuration table are used.
+If not set or set to "balanced", both low-latency and high-reliability QoS configuration table are used.
 This property is experimental.
-Available: low-latency, high-reliabilty, balanced
+Available: low-latency, high-reliability, balanced
 
 ## Node properties
 
diff --git a/spa/plugins/bluez5/bap-codec-lc3.c b/spa/plugins/bluez5/bap-codec-lc3.c
index 74761f26b..b1b12cb78 100644
--- a/spa/plugins/bluez5/bap-codec-lc3.c
+++ b/spa/plugins/bluez5/bap-codec-lc3.c
@@ -126,22 +126,22 @@ static const struct bap_qos bap_qos_configs[] = {
 	BAP_QOS("48_6_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 155, 5, 20, 40000, 27, "low-latency"), /* 48_6_1 */
 
 	/* BAP v1.0.1 Table 5.2; high-reliability */
-	BAP_QOS("8_1_2",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_7_5, false,  26, 13,  75, 40000, 10, "high-reliabilty"), /* 8_1_2 */
-	BAP_QOS("8_2_2",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_10,  false,  30, 13,  95, 40000,  0, "high-reliabilty"), /* 8_2_2 */
-	BAP_QOS("16_1_2",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_7_5, false,  30, 13,  75, 40000, 11, "high-reliabilty"), /* 16_1_2 */
-	BAP_QOS("16_2_2",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_10,  false,  40, 13,  95, 40000,  1, "high-reliabilty"), /* 16_2_2 */
-	BAP_QOS("24_1_2",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_7_5, false,  45, 13,  75, 40000, 12, "high-reliabilty"), /* 24_1_2 */
-	BAP_QOS("24_2_2",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_10,  false,  60, 13,  95, 40000,  2, "high-reliabilty"), /* 24_2_2 */
-	BAP_QOS("32_1_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_7_5, false,  60, 13,  75, 40000, 13, "high-reliabilty"), /* 32_1_2 */
-	BAP_QOS("32_2_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_10,  false,  80, 13,  95, 40000,  3, "high-reliabilty"), /* 32_2_2 */
-	BAP_QOS("441_1_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_7_5,  true,  97, 13,  80, 40000, 54, "high-reliabilty"), /* 441_1_2 */
-	BAP_QOS("441_2_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_10,   true, 130, 13,  85, 40000, 44, "high-reliabilty"), /* 441_2_2 */
-	BAP_QOS("48_1_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  75, 13,  75, 40000, 55, "high-reliabilty"), /* 48_1_2 */
-	BAP_QOS("48_2_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 100, 13,  95, 40000, 45, "high-reliabilty"), /* 48_2_2 */
-	BAP_QOS("48_3_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  90, 13,  75, 40000, 56, "high-reliabilty"), /* 48_3_2 */
-	BAP_QOS("48_4_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 120, 13, 100, 40000, 46, "high-reliabilty"), /* 48_4_2 */
-	BAP_QOS("48_5_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false, 117, 13,  75, 40000, 57, "high-reliabilty"), /* 48_5_2 */
-	BAP_QOS("48_6_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 155, 13, 100, 40000, 47, "high-reliabilty"), /* 48_6_2 */
+	BAP_QOS("8_1_2",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_7_5, false,  26, 13,  75, 40000, 10, "high-reliability"), /* 8_1_2 */
+	BAP_QOS("8_2_2",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_10,  false,  30, 13,  95, 40000,  0, "high-reliability"), /* 8_2_2 */
+	BAP_QOS("16_1_2",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_7_5, false,  30, 13,  75, 40000, 11, "high-reliability"), /* 16_1_2 */
+	BAP_QOS("16_2_2",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_10,  false,  40, 13,  95, 40000,  1, "high-reliability"), /* 16_2_2 */
+	BAP_QOS("24_1_2",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_7_5, false,  45, 13,  75, 40000, 12, "high-reliability"), /* 24_1_2 */
+	BAP_QOS("24_2_2",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_10,  false,  60, 13,  95, 40000,  2, "high-reliability"), /* 24_2_2 */
+	BAP_QOS("32_1_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_7_5, false,  60, 13,  75, 40000, 13, "high-reliability"), /* 32_1_2 */
+	BAP_QOS("32_2_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_10,  false,  80, 13,  95, 40000,  3, "high-reliability"), /* 32_2_2 */
+	BAP_QOS("441_1_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_7_5,  true,  97, 13,  80, 40000, 54, "high-reliability"), /* 441_1_2 */
+	BAP_QOS("441_2_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_10,   true, 130, 13,  85, 40000, 44, "high-reliability"), /* 441_2_2 */
+	BAP_QOS("48_1_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  75, 13,  75, 40000, 55, "high-reliability"), /* 48_1_2 */
+	BAP_QOS("48_2_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 100, 13,  95, 40000, 45, "high-reliability"), /* 48_2_2 */
+	BAP_QOS("48_3_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  90, 13,  75, 40000, 56, "high-reliability"), /* 48_3_2 */
+	BAP_QOS("48_4_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 120, 13, 100, 40000, 46, "high-reliability"), /* 48_4_2 */
+	BAP_QOS("48_5_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false, 117, 13,  75, 40000, 57, "high-reliability"), /* 48_5_2 */
+	BAP_QOS("48_6_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 155, 13, 100, 40000, 47, "high-reliability"), /* 48_6_2 */
 };
 
 static const struct bap_qos bap_bcast_qos_configs[] = {
@@ -167,22 +167,22 @@ static const struct bap_qos bap_bcast_qos_configs[] = {
 	BAP_QOS("48_6_1",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 155, 4, 20, 40000, 27, "low-latency"), /* 48_6_1 */
 
 	/* BAP v1.0.1 Table 6.4; high-reliability */
-	BAP_QOS("8_1_2",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_7_5, false,  26, 4,  45, 40000, 10, "high-reliabilty"), /* 8_1_2 */
-	BAP_QOS("8_2_2",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_10,  false,  30, 4,  60, 40000,  0, "high-reliabilty"), /* 8_2_2 */
-	BAP_QOS("16_1_2",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_7_5, false,  30, 4,  45, 40000, 11, "high-reliabilty"), /* 16_1_2 */
-	BAP_QOS("16_2_2",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_10,  false,  40, 4,  60, 40000,  1, "high-reliabilty"), /* 16_2_2 */
-	BAP_QOS("24_1_2",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_7_5, false,  45, 4,  45, 40000, 12, "high-reliabilty"), /* 24_1_2 */
-	BAP_QOS("24_2_2",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_10,  false,  60, 4,  60, 40000,  2, "high-reliabilty"), /* 24_2_2 */
-	BAP_QOS("32_1_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_7_5, false,  60, 4,  45, 40000, 13, "high-reliabilty"), /* 32_1_2 */
-	BAP_QOS("32_2_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_10,  false,  80, 4,  60, 40000,  3, "high-reliabilty"), /* 32_2_2 */
-	BAP_QOS("441_1_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_7_5, true,   97, 4,  54, 40000, 14, "high-reliabilty"), /* 441_1_2 */
-	BAP_QOS("441_2_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_10,  true,  130, 4,  60, 40000,  4, "high-reliabilty"), /* 441_2_2 */
-	BAP_QOS("48_1_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  75, 4,  50, 40000, 15, "high-reliabilty"), /* 48_1_2 */
-	BAP_QOS("48_2_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 100, 4,  65, 40000,  5, "high-reliabilty"), /* 48_2_2 */
-	BAP_QOS("48_3_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  90, 4,  50, 40000, 16, "high-reliabilty"), /* 48_3_2 */
-	BAP_QOS("48_4_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 120, 4,  65, 40000,  6, "high-reliabilty"), /* 48_4_2 */
-	BAP_QOS("48_5_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false, 117, 4,  50, 40000, 17, "high-reliabilty"), /* 48_5_2 */
-	BAP_QOS("48_6_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 155, 4,  65, 40000,  7, "high-reliabilty"), /* 48_6_2 */
+	BAP_QOS("8_1_2",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_7_5, false,  26, 4,  45, 40000, 10, "high-reliability"), /* 8_1_2 */
+	BAP_QOS("8_2_2",   LC3_CONFIG_FREQ_8KHZ,  LC3_CONFIG_DURATION_10,  false,  30, 4,  60, 40000,  0, "high-reliability"), /* 8_2_2 */
+	BAP_QOS("16_1_2",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_7_5, false,  30, 4,  45, 40000, 11, "high-reliability"), /* 16_1_2 */
+	BAP_QOS("16_2_2",  LC3_CONFIG_FREQ_16KHZ, LC3_CONFIG_DURATION_10,  false,  40, 4,  60, 40000,  1, "high-reliability"), /* 16_2_2 */
+	BAP_QOS("24_1_2",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_7_5, false,  45, 4,  45, 40000, 12, "high-reliability"), /* 24_1_2 */
+	BAP_QOS("24_2_2",  LC3_CONFIG_FREQ_24KHZ, LC3_CONFIG_DURATION_10,  false,  60, 4,  60, 40000,  2, "high-reliability"), /* 24_2_2 */
+	BAP_QOS("32_1_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_7_5, false,  60, 4,  45, 40000, 13, "high-reliability"), /* 32_1_2 */
+	BAP_QOS("32_2_2",  LC3_CONFIG_FREQ_32KHZ, LC3_CONFIG_DURATION_10,  false,  80, 4,  60, 40000,  3, "high-reliability"), /* 32_2_2 */
+	BAP_QOS("441_1_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_7_5, true,   97, 4,  54, 40000, 14, "high-reliability"), /* 441_1_2 */
+	BAP_QOS("441_2_2", LC3_CONFIG_FREQ_44KHZ, LC3_CONFIG_DURATION_10,  true,  130, 4,  60, 40000,  4, "high-reliability"), /* 441_2_2 */
+	BAP_QOS("48_1_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  75, 4,  50, 40000, 15, "high-reliability"), /* 48_1_2 */
+	BAP_QOS("48_2_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 100, 4,  65, 40000,  5, "high-reliability"), /* 48_2_2 */
+	BAP_QOS("48_3_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false,  90, 4,  50, 40000, 16, "high-reliability"), /* 48_3_2 */
+	BAP_QOS("48_4_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 120, 4,  65, 40000,  6, "high-reliability"), /* 48_4_2 */
+	BAP_QOS("48_5_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_7_5, false, 117, 4,  50, 40000, 17, "high-reliability"), /* 48_5_2 */
+	BAP_QOS("48_6_2",  LC3_CONFIG_FREQ_48KHZ, LC3_CONFIG_DURATION_10,  false, 155, 4,  65, 40000,  7, "high-reliability"), /* 48_6_2 */
 };
 
 static unsigned int get_rate_mask(uint8_t rate) {

From 8eed27820c6f4c429f90baba3142bdf26e2aae94 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 27 Feb 2026 18:23:45 +0100
Subject: [PATCH 120/263] meson: try to fix the doc build

---
 src/modules/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/meson.build b/src/modules/meson.build
index 5db179097..11b29a117 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -383,8 +383,8 @@ endif
 if avahi_dep.found()
   pipewire_module_protocol_pulse_sources += [
     'module-protocol-pulse/modules/module-zeroconf-publish.c',
-    zeroconf_sources,
   ]
+  pipewire_module_protocol_pulse_sources += zeroconf_sources
   pipewire_module_protocol_pulse_deps += zeroconf_deps
 endif
 

From b05fcdbfbde83936f4f2c322bfd5fbb9e87495cf Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 27 Feb 2026 20:36:37 +0100
Subject: [PATCH 121/263] modules: fix compilation without avahi

---
 src/modules/module-sendspin-recv.c | 41 ++++++++++++++++++++----------
 src/modules/module-sendspin-send.c | 37 +++++++++++++++++++--------
 2 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/src/modules/module-sendspin-recv.c b/src/modules/module-sendspin-recv.c
index 4875cd597..526a56912 100644
--- a/src/modules/module-sendspin-recv.c
+++ b/src/modules/module-sendspin-recv.c
@@ -30,12 +30,15 @@
 #include <pipewire/pipewire.h>
 #include <pipewire/impl.h>
 
-#include "zeroconf-utils/zeroconf.h"
 #include "module-sendspin/sendspin.h"
 #include "module-sendspin/websocket.h"
 #include "module-sendspin/regress.h"
 #include "network-utils.h"
 
+#ifdef HAVE_AVAHI
+#include "zeroconf-utils/zeroconf.h"
+#endif
+
 /** \page page_module_sendspin_recv sendspin receiver
  *
  * The `sendspin-recv` module creates a PipeWire source that receives audio
@@ -196,8 +199,10 @@ struct impl {
 	struct spa_hook core_proxy_listener;
 	unsigned int do_disconnect:1;
 
+#ifdef HAVE_AVAHI
 	struct pw_zeroconf *zeroconf;
 	struct spa_hook zeroconf_listener;
+#endif
 
 	bool always_process;
 	bool single_server;
@@ -1005,16 +1010,6 @@ static void client_connected(struct client *c, struct pw_websocket_connection *c
 				&websocket_connection_events, c);
 }
 
-static struct client *client_find(struct impl *impl, const char *name)
-{
-	struct client *c;
-	spa_list_for_each(c, &impl->clients, link) {
-		if (spa_streq(c->name, name))
-			return c;
-	}
-	return NULL;
-}
-
 struct match_info {
 	struct impl *impl;
 	const char *name;
@@ -1045,7 +1040,7 @@ static int rule_matched(void *data, const char *location, const char *action,
 	return res;
 }
 
-static int match_client(struct impl *impl, const char *name, struct pw_properties *props,
+static inline int match_client(struct impl *impl, const char *name, struct pw_properties *props,
 		struct pw_websocket_connection *conn)
 {
 	const char *str;
@@ -1109,6 +1104,17 @@ static const struct pw_websocket_events websocket_events = {
 	.connected = on_websocket_connected,
 };
 
+#ifdef HAVE_AVAHI
+static struct client *client_find(struct impl *impl, const char *name)
+{
+	struct client *c;
+	spa_list_for_each(c, &impl->clients, link) {
+		if (spa_streq(c->name, name))
+			return c;
+	}
+	return NULL;
+}
+
 static void on_zeroconf_added(void *data, const void *user, const struct spa_dict *info)
 {
 	struct impl *impl = data;
@@ -1157,6 +1163,7 @@ static const struct pw_zeroconf_events zeroconf_events = {
 	.added = on_zeroconf_added,
 	.removed = on_zeroconf_removed,
 };
+#endif
 
 static void core_destroy(void *d)
 {
@@ -1234,7 +1241,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 	const char *str, *hostname, *port, *path;
 	struct pw_properties *props, *stream_props;
 	int res = 0;
-	bool autoconnect, announce;
+	bool autoconnect;
 
 	PW_LOG_TOPIC_INIT(mod_topic);
 
@@ -1281,7 +1288,6 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 			PW_KEY_NODE_ALWAYS_PROCESS, true);
 
 	autoconnect = pw_properties_get_bool(props, "sendspin.autoconnect", false);
-	announce = pw_properties_get_bool(props, "sendspin.announce", true);
 	impl->single_server = pw_properties_get_bool(props,
 			"sendspin.single-server", true);
 
@@ -1317,10 +1323,12 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 	pw_websocket_add_listener(impl->websocket, &impl->websocket_listener,
 			&websocket_events, impl);
 
+#ifdef HAVE_AVAHI
 	if ((impl->zeroconf = pw_zeroconf_new(context, NULL)) != NULL) {
 		pw_zeroconf_add_listener(impl->zeroconf, &impl->zeroconf_listener,
 				&zeroconf_events, impl);
 	}
+#endif
 
 	hostname = pw_properties_get(props, "sendspin.ip");
 	/* a client should either connect itself or advertize itself and listen
@@ -1336,6 +1344,8 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 
 		pw_websocket_listen(impl->websocket, NULL, hostname, port, path);
 
+#ifdef HAVE_AVAHI
+		bool announce = pw_properties_get_bool(props, "sendspin.announce", true);
 		if (impl->zeroconf && announce) {
 			/* optionally announce ourselves */
 			str = pw_properties_get(props, "sendspin.client-id");
@@ -1346,6 +1356,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 					SPA_DICT_ITEM(PW_KEY_ZEROCONF_PORT, port),
 					SPA_DICT_ITEM("path", path)));
 		}
+#endif
 	}
 	else {
 		if (hostname != NULL) {
@@ -1368,11 +1379,13 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 				client_connect(c);
 		}
 		/* connect to zeroconf server if we can */
+#ifdef HAVE_AVAHI
 		if (impl->zeroconf) {
 			pw_zeroconf_set_browse(impl->zeroconf, NULL,
 				&SPA_DICT_ITEMS(
 					SPA_DICT_ITEM(PW_KEY_ZEROCONF_TYPE, PW_SENDSPIN_SERVER_SERVICE_TYPE)));
 		}
+#endif
 	}
 
 	pw_impl_module_add_listener(module, &impl->module_listener, &module_events, impl);
diff --git a/src/modules/module-sendspin-send.c b/src/modules/module-sendspin-send.c
index 3b6093307..6947ebb3c 100644
--- a/src/modules/module-sendspin-send.c
+++ b/src/modules/module-sendspin-send.c
@@ -32,9 +32,12 @@
 
 #include "module-sendspin/sendspin.h"
 #include "module-sendspin/websocket.h"
-#include "zeroconf-utils/zeroconf.h"
 #include "network-utils.h"
 
+#ifdef HAVE_AVAHI
+#include "zeroconf-utils/zeroconf.h"
+#endif
+
 /** \page page_module_sendspin_send sendspin sender
  *
  * The `sendspin-send` module creates a PipeWire sink that sends audio
@@ -217,8 +220,10 @@ struct impl {
 	struct spa_hook core_proxy_listener;
 	unsigned int do_disconnect:1;
 
+#ifdef HAVE_AVAHI
 	struct pw_zeroconf *zeroconf;
 	struct spa_hook zeroconf_listener;
+#endif
 
 	float delay;
 	bool always_process;
@@ -1009,16 +1014,6 @@ static void client_connected(struct client *c, struct pw_websocket_connection *c
 				&websocket_connection_events, c);
 }
 
-static struct client *client_find(struct impl *impl, const char *name)
-{
-	struct client *c;
-	spa_list_for_each(c, &impl->clients, link) {
-		if (spa_streq(c->name, name))
-			return c;
-	}
-	return NULL;
-}
-
 struct match_info {
 	struct impl *impl;
 	const char *name;
@@ -1110,6 +1105,17 @@ static const struct pw_websocket_events websocket_events = {
 	.connected = on_websocket_connected,
 };
 
+#ifdef HAVE_AVAHI
+static struct client *client_find(struct impl *impl, const char *name)
+{
+	struct client *c;
+	spa_list_for_each(c, &impl->clients, link) {
+		if (spa_streq(c->name, name))
+			return c;
+	}
+	return NULL;
+}
+
 static void on_zeroconf_added(void *data, const void *user, const struct spa_dict *info)
 {
 	struct impl *impl = data;
@@ -1155,6 +1161,7 @@ static const struct pw_zeroconf_events zeroconf_events = {
 	.added = on_zeroconf_added,
 	.removed = on_zeroconf_removed,
 };
+#endif
 
 static void core_destroy(void *d)
 {
@@ -1180,8 +1187,10 @@ static void impl_destroy(struct impl *impl)
 	if (impl->data_loop)
 		pw_context_release_loop(impl->context, impl->data_loop);
 
+#ifdef HAVE_AVAHI
 	if (impl->zeroconf)
 		pw_zeroconf_destroy(impl->zeroconf);
+#endif
 
 	pw_properties_free(impl->stream_props);
 	pw_properties_free(impl->props);
@@ -1322,10 +1331,12 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 		str = SPA_STRINGIFY(DEFAULT_SENDSPIN_DELAY);
 	impl->delay = pw_properties_parse_float(str);
 
+#ifdef HAVE_AVAHI
 	if ((impl->zeroconf = pw_zeroconf_new(context, NULL)) != NULL) {
 		pw_zeroconf_add_listener(impl->zeroconf, &impl->zeroconf_listener,
 				&zeroconf_events, impl);
 	}
+#endif
 
 	hostname = pw_properties_get(props, "sendspin.ip");
 	if (hostname != NULL) {
@@ -1364,6 +1375,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 
 		pw_websocket_listen(impl->websocket, NULL, hostname, port, path);
 
+#ifdef HAVE_AVAHI
 		if (impl->zeroconf) {
 			str = pw_properties_get(props, "sendspin.group-name");
 			pw_zeroconf_set_announce(impl->zeroconf, NULL,
@@ -1373,12 +1385,15 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 					SPA_DICT_ITEM(PW_KEY_ZEROCONF_PORT, port),
 					SPA_DICT_ITEM("path", path)));
 		}
+#endif
 	}
+#ifdef HAVE_AVAHI
 	if (impl->zeroconf) {
 		pw_zeroconf_set_browse(impl->zeroconf, NULL,
 			&SPA_DICT_ITEMS(
 				SPA_DICT_ITEM(PW_KEY_ZEROCONF_TYPE, PW_SENDSPIN_CLIENT_SERVICE_TYPE)));
 	}
+#endif
 	pw_impl_module_add_listener(module, &impl->module_listener, &module_events, impl);
 
 	pw_impl_module_update_properties(module, &SPA_DICT_INIT_ARRAY(module_info));

From 354ec08b9b808db4795b18edc649f41a57108a32 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 27 Feb 2026 20:43:45 +0100
Subject: [PATCH 122/263] doc: add sendspin modules to doc

---
 doc/dox/modules.dox | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/dox/modules.dox b/doc/dox/modules.dox
index 7ad81dabc..85b0a1418 100644
--- a/doc/dox/modules.dox
+++ b/doc/dox/modules.dox
@@ -91,6 +91,8 @@ List of known modules:
 - \subpage page_module_spa_node_factory
 - \subpage page_module_spa_device
 - \subpage page_module_spa_device_factory
+- \subpage page_module_sendspin_recv
+- \subpage page_module_sendspin_send
 - \subpage page_module_session_manager
 - \subpage page_module_snapcast_discover
 - \subpage page_module_vban_recv

From 8ceb671cc8788c2cf7945ae084b758d88589d045 Mon Sep 17 00:00:00 2001
From: thewrz <adam@wrzeski.net>
Date: Fri, 27 Feb 2026 21:54:22 -0800
Subject: [PATCH 123/263] module-vban: derive write position from frame counter

Instead of writing packets sequentially and losing sync on any
frame gap, compute the write position from the VBAN header's
n_frames field. Out-of-order packets land at the correct
ringbuffer offset, matching how module-rtp handles this.

Only advance the writeindex when a packet extends the frontier
so that late arrivals fill gaps without moving the pointer
backwards.

Fixes: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/5145
---
 src/modules/module-vban/audio.c  | 39 ++++++++++++++++++++------------
 src/modules/module-vban/stream.c |  1 +
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/modules/module-vban/audio.c b/src/modules/module-vban/audio.c
index 099246895..40a6415dc 100644
--- a/src/modules/module-vban/audio.c
+++ b/src/modules/module-vban/audio.c
@@ -98,38 +98,43 @@ static int vban_audio_receive(struct impl *impl, uint8_t *buffer, ssize_t len)
 	samples = SPA_MIN(hdr->format_nbs+1, plen / stride);
 
 	n_frames = hdr->n_frames;
-	if (impl->have_sync && impl->n_frames != n_frames) {
-		pw_log_info("unexpected frame (%d != %d)",
-				n_frames, impl->n_frames);
+
+	if (impl->samples_per_frame == 0) {
+		impl->samples_per_frame = samples;
+	} else if (samples != impl->samples_per_frame) {
+		pw_log_warn("samples_per_frame changed (%u != %u)",
+				samples, impl->samples_per_frame);
+		impl->samples_per_frame = samples;
 		impl->have_sync = false;
 	}
+
+	if (impl->have_sync && impl->n_frames != n_frames) {
+		pw_log_info("unexpected frame (%u != %u)",
+				n_frames, impl->n_frames);
+	}
 	impl->n_frames = n_frames + 1;
 
-	timestamp = impl->timestamp;
-	impl->timestamp += samples;
+	/* derive write position from frame counter, like module-rtp */
+	timestamp = n_frames * impl->samples_per_frame;
+	write = timestamp + impl->target_buffer;
 
 	filled = spa_ringbuffer_get_write_index(&impl->ring, &expected_write);
 
-	/* we always write to timestamp + delay */
-	write = timestamp + impl->target_buffer;
-
 	if (!impl->have_sync) {
-		pw_log_info("sync to timestamp:%u target:%u",
-				timestamp, impl->target_buffer);
+		pw_log_info("sync to n_frames:%u timestamp:%u target:%u",
+				n_frames, timestamp, impl->target_buffer);
 
 		/* we read from timestamp, keeping target_buffer of data
 		 * in the ringbuffer. */
 		impl->ring.readindex = timestamp;
 		impl->ring.writeindex = write;
 		filled = impl->target_buffer;
+		expected_write = write;
 
 		spa_dll_init(&impl->dll);
 		spa_dll_set_bw(&impl->dll, SPA_DLL_BW_MAX, 128, impl->rate);
 		memset(impl->buffer, 0, BUFFER_SIZE);
 		impl->have_sync = true;
-	} else if (expected_write != write) {
-		pw_log_debug("unexpected write (%u != %u)",
-				write, expected_write);
 	}
 
 	if (filled + samples > BUFFER_SIZE / stride) {
@@ -137,14 +142,17 @@ static int vban_audio_receive(struct impl *impl, uint8_t *buffer, ssize_t len)
 				BUFFER_SIZE / stride);
 		impl->have_sync = false;
 	} else {
-		pw_log_trace("got samples:%u", samples);
+		pw_log_trace("got n_frames:%u samples:%u", n_frames, samples);
 		spa_ringbuffer_write_data(&impl->ring,
 				impl->buffer,
 				BUFFER_SIZE,
 				(write * stride) & BUFFER_MASK,
 				&buffer[hlen], (samples * stride));
+
+		/* only advance writeindex if this extends the frontier */
 		write += samples;
-		spa_ringbuffer_write_update(&impl->ring, write);
+		if ((int32_t)(write - expected_write) > 0)
+			spa_ringbuffer_write_update(&impl->ring, write);
 	}
 	return 0;
 }
@@ -262,5 +270,6 @@ static int vban_audio_init(struct impl *impl, enum spa_direction direction)
 	else
 		impl->stream_events.process = vban_audio_process_playback;
 	impl->receive_vban = vban_audio_receive;
+	impl->samples_per_frame = 0;
 	return 0;
 }
diff --git a/src/modules/module-vban/stream.c b/src/modules/module-vban/stream.c
index da3469583..168ecc837 100644
--- a/src/modules/module-vban/stream.c
+++ b/src/modules/module-vban/stream.c
@@ -61,6 +61,7 @@ struct impl {
 	struct vban_header header;
 	uint32_t timestamp;
 	uint32_t n_frames;
+	uint32_t samples_per_frame;
 
 	struct spa_ringbuffer ring;
 	uint8_t buffer[BUFFER_SIZE];

From 06f336a5818dcdf438ad2458c852206fc8e6126c Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Sun, 1 Mar 2026 12:40:34 +0100
Subject: [PATCH 124/263] json-builder: handle allocation failures in vasprintf

---
 spa/include/spa/utils/json-builder.h | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/spa/include/spa/utils/json-builder.h b/spa/include/spa/utils/json-builder.h
index 6a4775c60..5308140cc 100644
--- a/spa/include/spa/utils/json-builder.h
+++ b/spa/include/spa/utils/json-builder.h
@@ -279,9 +279,10 @@ void spa_json_builder_object_stringv(struct spa_json_builder *b,
 		const char *key, const char *fmt, va_list va)
 {
 	char *val;
-	vasprintf(&val, fmt, va);
-	spa_json_builder_object_string(b, key, val);
-	free(val);
+	if (vasprintf(&val, fmt, va) > 0) {
+		spa_json_builder_object_string(b, key, val);
+		free(val);
+	}
 }
 
 SPA_API_JSON_BUILDER SPA_PRINTF_FUNC(3,4)
@@ -346,10 +347,11 @@ void spa_json_builder_object_valuef(struct spa_json_builder *b,
 	va_list va;
 	char *val;
 	va_start(va, fmt);
-	vasprintf(&val, fmt, va);
+	if (vasprintf(&val, fmt, va) > 0) {
+		spa_json_builder_object_value(b, recurse, key, val);
+		free(val);
+	}
 	va_end(va);
-	spa_json_builder_object_value(b, recurse, key, val);
-	free(val);
 }
 
 
@@ -408,10 +410,11 @@ void spa_json_builder_array_valuef(struct spa_json_builder *b, bool recurse, con
 	va_list va;
 	char *val;
 	va_start(va, fmt);
-	vasprintf(&val, fmt, va);
+	if (vasprintf(&val, fmt, va) > 0) {
+		spa_json_builder_object_value(b, recurse, NULL, val);
+		free(val);
+	}
 	va_end(va);
-	spa_json_builder_object_value(b, recurse, NULL, val);
-	free(val);
 }
 
 SPA_API_JSON_BUILDER char *spa_json_builder_reformat(const char *json, uint32_t flags)

From d206b06c708c8d941f65597e5cf9929b7b44a81f Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Sun, 1 Mar 2026 12:49:24 +0100
Subject: [PATCH 125/263] sendspin: cleanup receive sync and logging

don't check the same thing twice.

Make sure values are set before we log them.
---
 src/modules/module-sendspin-recv.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/modules/module-sendspin-recv.c b/src/modules/module-sendspin-recv.c
index 526a56912..fe6525767 100644
--- a/src/modules/module-sendspin-recv.c
+++ b/src/modules/module-sendspin-recv.c
@@ -267,7 +267,7 @@ static void on_capture_stream_process(void *d)
 
 	avail = spa_ringbuffer_get_read_index(&client->ring, &index);
 
-	if (client->timeout_count > 4 && client->timeout_count > 4) {
+	if (client->timeout_count > 4) {
 		pw_stream_get_time_n(client->stream, &ts, sizeof(ts));
 
 		/* index to server time */
@@ -298,6 +298,12 @@ static void on_capture_stream_process(void *d)
 				avail = 0;
 			}
 		}
+
+		corr = spa_dll_update(&client->dll, SPA_CLAMPD(err, -1000, 1000));
+
+		pw_stream_set_rate(client->stream, 1.0 / corr);
+
+		pw_log_trace("%u %f %f %f %f", index, current_time, target, err, corr);
 	} else {
 		avail = 0;
 	}
@@ -313,12 +319,6 @@ static void on_capture_stream_process(void *d)
 	if (avail > 0) {
 		n_bytes = SPA_MIN(n_bytes, (uint32_t)avail);
 
-		corr = spa_dll_update(&client->dll, SPA_CLAMPD(err, -1000, 1000));
-
-		pw_log_trace("%u %f %f %f %f", index, current_time, target, err, corr);
-
-		pw_stream_set_rate(client->stream, 1.0 / corr);
-
 		spa_ringbuffer_read_data(&client->ring,
 				client->buffer, client->buffer_size,
 				index % client->buffer_size,

From f4e174870eb8cbe60c922d3bf181f3eb2347523c Mon Sep 17 00:00:00 2001
From: Jonas Holmberg <jonashg@axis.com>
Date: Mon, 2 Mar 2026 10:28:26 +0100
Subject: [PATCH 126/263] module-protocol-native: Fix socket activation

Fix path comparison in is_socket_unix() and don't unset LISTEN_FDS since
the function that uses it is called more than once and it was not unset
when sd_listen_fds() was used.

Fixes #5140
---
 src/modules/module-protocol-native.c       |  2 +-
 src/modules/module-protocol-pulse/server.c |  2 +-
 src/modules/network-utils.h                | 14 +++++---------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/modules/module-protocol-native.c b/src/modules/module-protocol-native.c
index 2be92a847..98a43829b 100644
--- a/src/modules/module-protocol-native.c
+++ b/src/modules/module-protocol-native.c
@@ -907,7 +907,7 @@ static int add_socket(struct pw_protocol *protocol, struct server *s, struct soc
 	bool activated = false;
 
 	{
-		int i, n = listen_fd();
+		int i, n = listen_fds();
 		for (i = 0; i < n; ++i) {
 			if (is_socket_unix(LISTEN_FDS_START + i, SOCK_STREAM,
 						s->addr.sun_path) > 0) {
diff --git a/src/modules/module-protocol-pulse/server.c b/src/modules/module-protocol-pulse/server.c
index aeab710b0..637757dfd 100644
--- a/src/modules/module-protocol-pulse/server.c
+++ b/src/modules/module-protocol-pulse/server.c
@@ -576,7 +576,7 @@ static bool is_stale_socket(int fd, const struct sockaddr_un *addr_un)
 
 static int check_socket_activation(const char *path)
 {
-	const int n = listen_fd();
+	const int n = listen_fds();
 
 	for (int i = 0; i < n; i++) {
 		const int fd = LISTEN_FDS_START + i;
diff --git a/src/modules/network-utils.h b/src/modules/network-utils.h
index a89b7d3bd..6ff80dd7a 100644
--- a/src/modules/network-utils.h
+++ b/src/modules/network-utils.h
@@ -143,7 +143,7 @@ static inline bool pw_net_addr_is_any(struct sockaddr_storage *addr)
 
 /* Returns the number of file descriptors passed for socket activation.
  * Returns 0 if none, -1 on error. */
-static inline int listen_fd(void)
+static inline int listen_fds(void)
 {
 	uint32_t n;
 	int i, flags;
@@ -161,8 +161,6 @@ static inline int listen_fd(void)
 			return -1;
 	}
 
-	unsetenv("LISTEN_FDS");
-
 	return (int)n;
 }
 
@@ -192,12 +190,10 @@ static inline int is_socket_unix(int fd, int type, const char *path)
 		if (addr.sun_family != AF_UNIX)
 			return 0;
 		size_t length = strlen(path);
-		if (length > 0) {
-			if (len < offsetof(struct sockaddr_un, sun_path) + length)
-				return 0;
-			if (memcmp(addr.sun_path, path, length) != 0)
-				return 0;
-		}
+		if (len < offsetof(struct sockaddr_un, sun_path) + length + 1)
+			return 0;
+		if (memcmp(addr.sun_path, path, length + 1) != 0)
+			return 0;
 	}
 
 	return 1;

From 87087a4629464e374d5f2458f6e3e0082b6c50c1 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 2 Mar 2026 11:41:21 +0100
Subject: [PATCH 127/263] jack: never return NULL from jack_port_by_id()

JACK will never return NULL from jack_port_by_id() because the id
and the port_t are the same for JACK.

In PipeWire however we use the serial number as the id and so it can
be removed and become invalid. In this case, return a dummy port
from the client that can be used for some of the basic operations
you can do on a port_t, like get the name etc.

Also make sure that port_name() doesn't return NULL in case we use the
dummy port (which has the client set to NULL).

Fixes #3512
---
 pipewire-jack/src/pipewire-jack.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
index 73627a67e..906fc96f1 100644
--- a/pipewire-jack/src/pipewire-jack.c
+++ b/pipewire-jack/src/pipewire-jack.c
@@ -492,6 +492,8 @@ struct client {
 	jack_position_t jack_position;
 	jack_transport_state_t jack_state;
 	struct frame_times jack_times;
+
+	struct object dummy_port;
 };
 
 #define return_val_if_fail(expr, val)				\
@@ -4468,6 +4470,11 @@ jack_client_t * jack_client_open (const char *client_name,
 			0, NULL, &client->info);
 	client->info.change_mask = 0;
 
+	client->dummy_port.type = INTERFACE_Port;
+	snprintf(client->dummy_port.port.name, sizeof(client->dummy_port.port.name), "%s:dummy", client_name);
+	snprintf(client->dummy_port.port.alias1, sizeof(client->dummy_port.port.alias1), "%s:dummy", client_name);
+	snprintf(client->dummy_port.port.alias2, sizeof(client->dummy_port.port.alias2), "%s:dummy", client_name);
+
 	client->show_monitor = pw_properties_get_bool(client->props, "jack.show-monitor", true);
 	client->show_midi = pw_properties_get_bool(client->props, "jack.show-midi", true);
 	client->merge_monitor = pw_properties_get_bool(client->props, "jack.merge-monitor", true);
@@ -5951,9 +5958,7 @@ static const char *port_name(struct object *o)
 {
 	const char *name;
 	struct client *c = o->client;
-	if (c == NULL)
-		return NULL;
-	if (c->default_as_system && is_port_default(c, o))
+	if (c != NULL && c->default_as_system && is_port_default(c, o))
 		name = o->port.system;
 	else
 		name = o->port.name;
@@ -6999,13 +7004,11 @@ jack_port_t * jack_port_by_id (jack_client_t *client,
 
 	pthread_mutex_lock(&c->context.lock);
 	res = find_by_serial(c, port_id);
-	if (res && res->type != INTERFACE_Port)
-		res = NULL;
-	pw_log_debug("%p: port %d -> %p", c, port_id, res);
 	pthread_mutex_unlock(&c->context.lock);
+	if (res == NULL || res->type != INTERFACE_Port)
+		res = &c->dummy_port;
 
-	if (res == NULL)
-		pw_log_info("%p: port %d not found", c, port_id);
+	pw_log_debug("%p: port %d -> %p", c, port_id, res);
 
 	return object_to_port(res);
 }

From 6e2522b657aafe08b1ffe66531c49db07d793907 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 2 Mar 2026 12:13:22 +0100
Subject: [PATCH 128/263] modules: improve error reporting

Instead of reporting -EPIPE, get the error from the socket and report
that instead.
---
 src/modules/module-raop/rtsp-client.c   | 7 ++++++-
 src/modules/module-sendspin/websocket.c | 7 ++++++-
 src/modules/module-snapcast-discover.c  | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/modules/module-raop/rtsp-client.c b/src/modules/module-raop/rtsp-client.c
index fae71977c..574f9f3e4 100644
--- a/src/modules/module-raop/rtsp-client.c
+++ b/src/modules/module-raop/rtsp-client.c
@@ -445,7 +445,12 @@ on_source_io(void *data, int fd, uint32_t mask)
 	int res;
 
 	if (mask & (SPA_IO_ERR | SPA_IO_HUP)) {
-		res = -EPIPE;
+		socklen_t len = sizeof(res);
+		if ((mask & SPA_IO_HUP) ||
+		    getsockopt(fd, SOL_SOCKET, SO_ERROR, &res, &len) < 0)
+			res = -EPIPE;
+		else
+			res = -res;
 		goto error;
 	}
 	if (mask & SPA_IO_IN) {
diff --git a/src/modules/module-sendspin/websocket.c b/src/modules/module-sendspin/websocket.c
index b6ddf629f..e0d5a717d 100644
--- a/src/modules/module-sendspin/websocket.c
+++ b/src/modules/module-sendspin/websocket.c
@@ -712,7 +712,12 @@ on_source_io(void *data, int fd, uint32_t mask)
 	conn->refcount++;
 
 	if (mask & (SPA_IO_ERR | SPA_IO_HUP)) {
-		res = -EPIPE;
+		socklen_t len = sizeof(res);
+		if ((mask & SPA_IO_HUP) ||
+		    getsockopt(fd, SOL_SOCKET, SO_ERROR, &res, &len) < 0)
+			res = -EPIPE;
+		else
+			res = -res;
 		goto error;
 	}
 	if (mask & SPA_IO_IN) {
diff --git a/src/modules/module-snapcast-discover.c b/src/modules/module-snapcast-discover.c
index 2561a7304..0e9fef1a1 100644
--- a/src/modules/module-snapcast-discover.c
+++ b/src/modules/module-snapcast-discover.c
@@ -381,7 +381,12 @@ on_source_io(void *data, int fd, uint32_t mask)
 	int res;
 
 	if (mask & (SPA_IO_ERR | SPA_IO_HUP)) {
-		res = -EPIPE;
+		socklen_t len = sizeof(res);
+		if ((mask & SPA_IO_HUP) ||
+		    getsockopt(fd, SOL_SOCKET, SO_ERROR, &res, &len) < 0)
+			res = -EPIPE;
+		else
+			res = -res;
 		goto error;
 	}
 	if (mask & SPA_IO_IN) {

From b8e27cc02bdca36df6af184d48679e155850b8e9 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 2 Mar 2026 12:22:30 +0100
Subject: [PATCH 129/263] modules: IO_HUP also has an error

---
 src/modules/module-raop/rtsp-client.c   | 3 +--
 src/modules/module-sendspin/websocket.c | 3 +--
 src/modules/module-snapcast-discover.c  | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/modules/module-raop/rtsp-client.c b/src/modules/module-raop/rtsp-client.c
index 574f9f3e4..ff487388c 100644
--- a/src/modules/module-raop/rtsp-client.c
+++ b/src/modules/module-raop/rtsp-client.c
@@ -446,8 +446,7 @@ on_source_io(void *data, int fd, uint32_t mask)
 
 	if (mask & (SPA_IO_ERR | SPA_IO_HUP)) {
 		socklen_t len = sizeof(res);
-		if ((mask & SPA_IO_HUP) ||
-		    getsockopt(fd, SOL_SOCKET, SO_ERROR, &res, &len) < 0)
+		if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &res, &len) < 0)
 			res = -EPIPE;
 		else
 			res = -res;
diff --git a/src/modules/module-sendspin/websocket.c b/src/modules/module-sendspin/websocket.c
index e0d5a717d..d1d234bd9 100644
--- a/src/modules/module-sendspin/websocket.c
+++ b/src/modules/module-sendspin/websocket.c
@@ -713,8 +713,7 @@ on_source_io(void *data, int fd, uint32_t mask)
 
 	if (mask & (SPA_IO_ERR | SPA_IO_HUP)) {
 		socklen_t len = sizeof(res);
-		if ((mask & SPA_IO_HUP) ||
-		    getsockopt(fd, SOL_SOCKET, SO_ERROR, &res, &len) < 0)
+		if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &res, &len) < 0)
 			res = -EPIPE;
 		else
 			res = -res;
diff --git a/src/modules/module-snapcast-discover.c b/src/modules/module-snapcast-discover.c
index 0e9fef1a1..d00a558a5 100644
--- a/src/modules/module-snapcast-discover.c
+++ b/src/modules/module-snapcast-discover.c
@@ -382,8 +382,7 @@ on_source_io(void *data, int fd, uint32_t mask)
 
 	if (mask & (SPA_IO_ERR | SPA_IO_HUP)) {
 		socklen_t len = sizeof(res);
-		if ((mask & SPA_IO_HUP) ||
-		    getsockopt(fd, SOL_SOCKET, SO_ERROR, &res, &len) < 0)
+		if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &res, &len) < 0)
 			res = -EPIPE;
 		else
 			res = -res;

From 797cdbc72f176c2c90cae46d5e3bc56d6a36501c Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 2 Mar 2026 17:19:41 +0100
Subject: [PATCH 130/263] impl-link: link.passive is no longer used

---
 src/pipewire/impl-link.c | 14 ++------------
 src/pipewire/private.h   |  1 -
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/pipewire/impl-link.c b/src/pipewire/impl-link.c
index ea979d8ba..dc3974290 100644
--- a/src/pipewire/impl-link.c
+++ b/src/pipewire/impl-link.c
@@ -974,9 +974,9 @@ int pw_impl_link_prepare(struct pw_impl_link *this)
 {
 	struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
 
-	pw_log_debug("%p: prepared:%d preparing:%d in_active:%d out_active:%d passive:%u",
+	pw_log_debug("%p: prepared:%d preparing:%d in_active:%d out_active:%d",
 			this, this->prepared, this->preparing,
-			impl->input.node->active, impl->output.node->active, this->passive);
+			impl->input.node->active, impl->output.node->active);
 
 	if (this->destroyed || this->preparing || this->prepared)
 		return 0;
@@ -1466,7 +1466,6 @@ struct pw_impl_link *pw_context_create_link(struct pw_context *context,
 	struct impl *impl;
 	struct pw_impl_link *this;
 	struct pw_impl_node *input_node, *output_node;
-	const char *str;
 	int res;
 
 	if (output == input)
@@ -1516,15 +1515,6 @@ struct pw_impl_link *pw_context_create_link(struct pw_context *context,
 	this->output = output;
 	this->input = input;
 
-	/* passive means that this link does not make the nodes active */
-	str = pw_properties_get(properties, PW_KEY_LINK_PASSIVE);
-	this->passive = str ? spa_atob(str) :
-		(output->passive && input_node->can_suspend) ||
-		(input->passive && output_node->can_suspend) ||
-		(input->passive && output->passive);
-	if (this->passive && str == NULL)
-		 pw_properties_set(properties, PW_KEY_LINK_PASSIVE, "true");
-
 	this->async = (output_node->async || input_node->async) &&
 		SPA_FLAG_IS_SET(output->flags, PW_IMPL_PORT_FLAG_ASYNC) &&
 		SPA_FLAG_IS_SET(input->flags, PW_IMPL_PORT_FLAG_ASYNC);
diff --git a/src/pipewire/private.h b/src/pipewire/private.h
index 95a1a4646..3eda9ed4e 100644
--- a/src/pipewire/private.h
+++ b/src/pipewire/private.h
@@ -1041,7 +1041,6 @@ struct pw_impl_link {
 	unsigned int feedback:1;
 	unsigned int preparing:1;
 	unsigned int prepared:1;
-	unsigned int passive:1;
 	unsigned int destroyed:1;
 };
 

From ea21281f38120ce609b12b7c379a073c3ac49a6a Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 2 Mar 2026 17:22:05 +0100
Subject: [PATCH 131/263] scheduler: skip checking runnable from suspendable
 nodes

We used to skip the runnable state from driver nodes because we assume
that they will be activated from other nodes. We however need to make
this more general to all suspendable nodes.

This makes pw-play -> loopback1-sink loopback1-out -> loopback2-sink
loopback-out -> sink also work correctly because the loopback2-sink does
not activate loopback1-out then.
---
 src/modules/module-scheduler-v1.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
index 0d5027cb5..25a219ea1 100644
--- a/src/modules/module-scheduler-v1.c
+++ b/src/modules/module-scheduler-v1.c
@@ -582,9 +582,9 @@ again:
 
 	/* first look at all nodes and decide which one should be runnable */
 	spa_list_for_each(n, &context->node_list, link) {
-		/* we don't check drivers, they need to be made runnable
-		 * from other nodes */
-		if (n->exported || !n->active || n->driver)
+		/* we don't check suspendable nodes, they need to be made
+		 * runnable from other nodes */
+		if (n->exported || !n->active || n->can_suspend)
 			continue;
 		check_runnable(context, n);
 	}

From 182f52603c4cb27fe8a0a42299600068abf1ce8f Mon Sep 17 00:00:00 2001
From: qaqland <anguoli@uniontech.com>
Date: Mon, 2 Mar 2026 10:37:31 +0800
Subject: [PATCH 132/263] meson.build: bump sndfile version to 1.1.0

This commit follows 35817c0d850f71f02b3c0e43037d394c5b892caf

Bump required sndfile version to 1.1.0 for SF_FORMAT_MPEG_LAYER
and other formats added in commit 35817c0d8c.
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index bca2c7a27..df1b412f8 100644
--- a/meson.build
+++ b/meson.build
@@ -368,7 +368,7 @@ cdata.set('HAVE_OPUS', opus_dep.found())
 summary({'readline (for pw-cli)': readline_dep.found()}, bool_yn: true, section: 'Misc dependencies')
 cdata.set('HAVE_READLINE', readline_dep.found())
 ncurses_dep = dependency('ncursesw', required : false)
-sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : get_option('sndfile'))
+sndfile_dep = dependency('sndfile', version : '>= 1.1.0', required : get_option('sndfile'))
 summary({'sndfile': sndfile_dep.found()}, bool_yn: true, section: 'pw-cat/pw-play/pw-dump/filter-chain')
 cdata.set('HAVE_SNDFILE', sndfile_dep.found())
 pulseaudio_dep = dependency('libpulse', required : get_option('libpulse'))

From 95e89f786aad1077dab59f5b1bde572ceab12b7a Mon Sep 17 00:00:00 2001
From: Elliot Chen <elliot.chen@nxp.com>
Date: Sat, 28 Feb 2026 14:47:22 +0900
Subject: [PATCH 133/263] pipewiresrc: update per-plane stride and offset
 according to chunk info

---
 meson.build              |  2 +-
 src/gst/gstpipewiresrc.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index df1b412f8..37badca51 100644
--- a/meson.build
+++ b/meson.build
@@ -412,7 +412,7 @@ gst_deps_def = {
   'gio-unix-2.0': {},
   'gstreamer-1.0': {'version': '>= 1.10.0'},
   'gstreamer-base-1.0': {},
-  'gstreamer-video-1.0': {},
+  'gstreamer-video-1.0': {'version': '>= 1.22.0'},
   'gstreamer-audio-1.0': {},
   'gstreamer-allocators-1.0': {},
 }
diff --git a/src/gst/gstpipewiresrc.c b/src/gst/gstpipewiresrc.c
index b0de17dfd..1755a8d4f 100644
--- a/src/gst/gstpipewiresrc.c
+++ b/src/gst/gstpipewiresrc.c
@@ -838,6 +838,17 @@ static GstBuffer *dequeue_buffer(GstPipeWireSrc *pwsrc)
 
       video_size += d->chunk->size;
     }
+
+    /* If the buffer number is smaller than the plane number,
+     * update the stride and offset for the remaining planes.
+     */
+    if (n_datas && n_datas < n_planes) {
+      for (i = n_datas; i < n_planes; i++) {
+        meta->stride[i] = gst_video_format_info_extrapolate_stride (info->finfo, i, b->buffer->datas[0].chunk->stride);
+        meta->offset[i] = meta->offset[i-1] +
+            meta->stride[i-1] * GST_VIDEO_FORMAT_INFO_SCALE_HEIGHT (info->finfo, i-1, GST_VIDEO_INFO_HEIGHT(info));
+      }
+    }
   }
 
   if (b->buffer->n_datas != gst_buffer_n_memory(data->buf)) {

From a3853c2c3d9179fff114b7e063ebc822db69dd86 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 3 Mar 2026 11:55:16 +0100
Subject: [PATCH 134/263] scheduler: activate links also in make_runnable

Also make sure we unset the preparing flag when the port state
changes.
---
 src/modules/module-scheduler-v1.c | 21 +++++++++++++++++++--
 src/pipewire/impl-link.c          |  4 ++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
index 25a219ea1..80a797cfa 100644
--- a/src/modules/module-scheduler-v1.c
+++ b/src/modules/module-scheduler-v1.c
@@ -144,7 +144,12 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 	spa_list_for_each(p, &node->output_ports, link) {
 		spa_list_for_each(l, &p->links, output_link) {
 			n = l->input->node;
-			if (!l->prepared || !n->active || l->input->passive)
+			pw_log_trace(" out-port %p: link %p passive:%d prepared:%d active:%d runn:%d", p,
+					l, l->input->passive, l->prepared, n->active, n->runnable);
+			if (!n->active || l->input->passive)
+				continue;
+			pw_impl_link_prepare(l);
+			if (!l->prepared)
 				continue;
 			if (!n->runnable)
 				make_runnable(context, n);
@@ -153,7 +158,12 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 	spa_list_for_each(p, &node->input_ports, link) {
 		spa_list_for_each(l, &p->links, input_link) {
 			n = l->output->node;
-			if (!l->prepared || !n->active || l->output->passive)
+			pw_log_trace(" in-port %p: link %p passive:%d prepared:%d active:%d runn:%d", p,
+					l, l->output->passive, l->prepared, n->active, n->runnable);
+			if (!n->active || l->output->passive)
+				continue;
+			pw_impl_link_prepare(l);
+			if (!l->prepared)
 				continue;
 			if (!n->runnable)
 				make_runnable(context, n);
@@ -201,6 +211,9 @@ static void check_runnable(struct pw_context *context, struct pw_impl_node *node
 	struct pw_impl_link *l;
 	struct pw_impl_node *n;
 
+	pw_log_trace("node %p: '%s' always-process:%d runnable:%u active:%d", node,
+			node->name, node->always_process, node->runnable, node->active);
+
 	if (node->always_process && !node->runnable)
 		make_runnable(context, node);
 
@@ -209,6 +222,8 @@ static void check_runnable(struct pw_context *context, struct pw_impl_node *node
 			n = l->input->node;
 			/* the peer needs to be active and we are linked to it
 			 * with a non-passive link */
+			pw_log_trace(" out-port %p: link %p passive:%d prepared:%d active:%d", p,
+					l, p->passive, l->prepared, n->active);
 			if (!n->active || p->passive)
 				continue;
 			/* explicitly prepare the link in case it was suspended */
@@ -222,6 +237,8 @@ static void check_runnable(struct pw_context *context, struct pw_impl_node *node
 	spa_list_for_each(p, &node->input_ports, link) {
 		spa_list_for_each(l, &p->links, input_link) {
 			n = l->output->node;
+			pw_log_trace(" in-port %p: link %p passive:%d prepared:%d active:%d", p,
+					l, p->passive, l->prepared, n->active);
 			if (!n->active || p->passive)
 				continue;
 			pw_impl_link_prepare(l);
diff --git a/src/pipewire/impl-link.c b/src/pipewire/impl-link.c
index dc3974290..4d63a1620 100644
--- a/src/pipewire/impl-link.c
+++ b/src/pipewire/impl-link.c
@@ -1051,13 +1051,13 @@ static void port_state_changed(struct pw_impl_link *this, struct pw_impl_port *p
 	case PW_IMPL_PORT_STATE_INIT:
 	case PW_IMPL_PORT_STATE_CONFIGURE:
 		if (this->prepared || state < old) {
-			this->prepared = false;
+			this->prepared = this->preparing = false;
 			link_update_state(this, PW_LINK_STATE_INIT, 0, NULL);
 		}
 		break;
 	case PW_IMPL_PORT_STATE_READY:
 		if (this->prepared || state < old) {
-			this->prepared = false;
+			this->prepared = this->preparing = false;
 			link_update_state(this, PW_LINK_STATE_NEGOTIATING, 0, NULL);
 		}
 		break;

From 49300d8ee0e997ecd67de73d9bfecaf0b952bf5b Mon Sep 17 00:00:00 2001
From: Robert Mader <robert.mader@collabora.com>
Date: Tue, 3 Mar 2026 20:51:58 +0100
Subject: [PATCH 135/263] pipewiresrc: Take a copy instead of a reference for
 last_buffer

Buffer timestamps get adjusted by the base class, GstBaseSrc, even if we
take an additional ref. Arguably the base class should check if buffers
are writable (gst_buffer_make_writable()), which would trigger a buffer
copy. That is currently not the case, though, thus do so on our side.

Notes:
1. Usually a buffer copy doesn't copy the underlying memory, i.e.
copying is cheap.
2. The copy holds a reference to the copied buffer, preventing the
buffer from getting recycled as before.
---
 src/gst/gstpipewiresrc.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/gst/gstpipewiresrc.c b/src/gst/gstpipewiresrc.c
index 1755a8d4f..2896d7f75 100644
--- a/src/gst/gstpipewiresrc.c
+++ b/src/gst/gstpipewiresrc.c
@@ -1603,22 +1603,23 @@ gst_pipewire_src_create (GstPushSrc * psrc, GstBuffer ** buffer)
     if (pwsrc->eos) {
       if (pwsrc->last_buffer == NULL)
         goto streaming_eos;
-      buf = pwsrc->last_buffer;
-      pwsrc->last_buffer = NULL;
+      buf = gst_buffer_steal (&pwsrc->last_buffer);
       update_time = TRUE;
       GST_LOG_OBJECT (pwsrc, "EOS, send last buffer");
       break;
     } else if (timeout && pwsrc->last_buffer != NULL) {
+      buf = gst_buffer_copy (pwsrc->last_buffer);
       update_time = TRUE;
-      buf = gst_buffer_ref(pwsrc->last_buffer);
       GST_LOG_OBJECT (pwsrc, "timeout, send keepalive buffer");
       break;
     } else {
       buf = dequeue_buffer (pwsrc);
       GST_LOG_OBJECT (pwsrc, "popped buffer %p", buf);
       if (buf != NULL) {
-        if (pwsrc->resend_last || pwsrc->keepalive_time > 0)
-          gst_buffer_replace (&pwsrc->last_buffer, buf);
+        if (pwsrc->resend_last || pwsrc->keepalive_time > 0) {
+          gst_buffer_take (&pwsrc->last_buffer, gst_buffer_copy (buf));
+          gst_buffer_add_parent_buffer_meta (pwsrc->last_buffer, buf);
+        }
         break;
       }
     }

From efd15264230b5b644a18a5f1a0c330dcdf5fb969 Mon Sep 17 00:00:00 2001
From: Robert Mader <robert.mader@collabora.com>
Date: Tue, 3 Mar 2026 01:52:55 +0100
Subject: [PATCH 136/263] pipewiresrc: Use clock time difference to update
 last_buffer time

Setting the current clock time when resending buffers is often wrong.
Especially for pseudo-live sources - the default mode - it discards
the original buffer time, which again is used by the base-class to
adjust the timestamps further, ultimately resulting in very wrong
timestamps.

Instead, try to calculate the delta between when we originally got the
buffer and now.
---
 src/gst/gstpipewiresrc.c | 35 +++++++++++++++++++++++++++++------
 src/gst/gstpipewiresrc.h |  1 +
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/gst/gstpipewiresrc.c b/src/gst/gstpipewiresrc.c
index 2896d7f75..c28094b04 100644
--- a/src/gst/gstpipewiresrc.c
+++ b/src/gst/gstpipewiresrc.c
@@ -531,6 +531,7 @@ gst_pipewire_src_init (GstPipeWireSrc * src)
   src->autoconnect = DEFAULT_AUTOCONNECT;
   src->min_latency = 0;
   src->max_latency = GST_CLOCK_TIME_NONE;
+  src->last_buffer_clock_time = GST_CLOCK_TIME_NONE;
   src->n_buffers = 0;
   src->flushing_on_remove_buffer = FALSE;
   src->on_disconnect = DEFAULT_ON_DISCONNECT;
@@ -1617,8 +1618,18 @@ gst_pipewire_src_create (GstPushSrc * psrc, GstBuffer ** buffer)
       GST_LOG_OBJECT (pwsrc, "popped buffer %p", buf);
       if (buf != NULL) {
         if (pwsrc->resend_last || pwsrc->keepalive_time > 0) {
+          GstClock *clock;
+
           gst_buffer_take (&pwsrc->last_buffer, gst_buffer_copy (buf));
           gst_buffer_add_parent_buffer_meta (pwsrc->last_buffer, buf);
+
+          clock = gst_element_get_clock (GST_ELEMENT_CAST (pwsrc));
+          if (clock != NULL) {
+            pwsrc->last_buffer_clock_time = gst_clock_get_time (clock);
+            gst_object_unref (clock);
+          } else {
+            pwsrc->last_buffer_clock_time = GST_CLOCK_TIME_NONE;
+          }
         }
         break;
       }
@@ -1644,21 +1655,33 @@ gst_pipewire_src_create (GstPushSrc * psrc, GstBuffer ** buffer)
 
   if (update_time) {
     GstClock *clock;
-    GstClockTime pts, dts;
+    GstClockTime current_clock_time;
 
     clock = gst_element_get_clock (GST_ELEMENT_CAST (pwsrc));
     if (clock != NULL) {
-      pts = dts = gst_clock_get_time (clock);
+      current_clock_time = gst_clock_get_time (clock);
       gst_object_unref (clock);
     } else {
-      pts = dts = GST_CLOCK_TIME_NONE;
+      current_clock_time = GST_CLOCK_TIME_NONE;
     }
 
-    GST_BUFFER_PTS (*buffer) = pts;
-    GST_BUFFER_DTS (*buffer) = dts;
+    if (GST_CLOCK_TIME_IS_VALID (current_clock_time) &&
+        GST_CLOCK_TIME_IS_VALID (pwsrc->last_buffer_clock_time) &&
+        GST_CLOCK_TIME_IS_VALID (GST_BUFFER_PTS (*buffer)) &&
+        GST_CLOCK_TIME_IS_VALID (GST_BUFFER_DTS (*buffer))) {
+      GstClockTime diff;
+
+      diff = current_clock_time - pwsrc->last_buffer_clock_time;
+
+      GST_BUFFER_PTS (*buffer) += diff;
+      GST_BUFFER_DTS (*buffer) += diff;
+    } else {
+      GST_BUFFER_PTS (*buffer) = GST_BUFFER_DTS (*buffer) = current_clock_time;
+    }
 
     GST_LOG_OBJECT (pwsrc, "Sending keepalive buffer pts/dts: %" GST_TIME_FORMAT
-      " (%" G_GUINT64_FORMAT ")", GST_TIME_ARGS (pts), pts);
+      " (%" G_GUINT64_FORMAT ")", GST_TIME_ARGS (current_clock_time),
+      current_clock_time);
   }
 
   return GST_FLOW_OK;
diff --git a/src/gst/gstpipewiresrc.h b/src/gst/gstpipewiresrc.h
index 869877fcb..4b0f57e0e 100644
--- a/src/gst/gstpipewiresrc.h
+++ b/src/gst/gstpipewiresrc.h
@@ -83,6 +83,7 @@ struct _GstPipeWireSrc {
   GstClockTime max_latency;
 
   GstBuffer *last_buffer;
+  GstClockTime last_buffer_clock_time;
 
   enum spa_meta_videotransform_value transform_value;
 

From e6a5951a47170d8c760d03ed7df0fb4194cec204 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 4 Mar 2026 17:55:53 +0100
Subject: [PATCH 137/263] gst: fix compilation on older GStreamer

These functions are since 1.28, which is a little too new.
---
 src/gst/gstpipewiresrc.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gst/gstpipewiresrc.c b/src/gst/gstpipewiresrc.c
index c28094b04..57cb355a7 100644
--- a/src/gst/gstpipewiresrc.c
+++ b/src/gst/gstpipewiresrc.c
@@ -1604,7 +1604,8 @@ gst_pipewire_src_create (GstPushSrc * psrc, GstBuffer ** buffer)
     if (pwsrc->eos) {
       if (pwsrc->last_buffer == NULL)
         goto streaming_eos;
-      buf = gst_buffer_steal (&pwsrc->last_buffer);
+      buf = pwsrc->last_buffer;
+      pwsrc->last_buffer = NULL;
       update_time = TRUE;
       GST_LOG_OBJECT (pwsrc, "EOS, send last buffer");
       break;
@@ -1619,8 +1620,11 @@ gst_pipewire_src_create (GstPushSrc * psrc, GstBuffer ** buffer)
       if (buf != NULL) {
         if (pwsrc->resend_last || pwsrc->keepalive_time > 0) {
           GstClock *clock;
+          GstBuffer *old;
 
-          gst_buffer_take (&pwsrc->last_buffer, gst_buffer_copy (buf));
+          old = pwsrc->last_buffer;
+          pwsrc->last_buffer = gst_buffer_copy (buf);
+          gst_buffer_unref (old);
           gst_buffer_add_parent_buffer_meta (pwsrc->last_buffer, buf);
 
           clock = gst_element_get_clock (GST_ELEMENT_CAST (pwsrc));

From 106b4a37d4c4092647c0a562a713e4ac79543ba3 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 5 Mar 2026 14:32:41 +0100
Subject: [PATCH 138/263] node: remove node.link-group from drivers

Sink/Source pairs should not have the same link-group otherwise the
session manager will not be able to autoconnect them with a loopback or
some other internally linked stream.
---
 spa/plugins/alsa/acp/acp.c            | 2 --
 src/modules/module-ffado-driver.c     | 2 --
 src/modules/module-netjack2-manager.c | 2 --
 3 files changed, 6 deletions(-)

diff --git a/spa/plugins/alsa/acp/acp.c b/spa/plugins/alsa/acp/acp.c
index bee8d1ef4..8f5ea18c2 100644
--- a/spa/plugins/alsa/acp/acp.c
+++ b/spa/plugins/alsa/acp/acp.c
@@ -485,13 +485,11 @@ static int add_pro_profile(pa_card *impl, uint32_t index)
 	if ((n_capture == 1 && n_playback == 1) || is_firewire) {
 		PA_IDXSET_FOREACH(m, ap->output_mappings, idx) {
 			pa_proplist_setf(m->output_proplist, "node.group", "pro-audio-%u", index);
-			pa_proplist_setf(m->output_proplist, "node.link-group", "pro-audio-%u", index);
 			pa_proplist_setf(m->output_proplist, "api.alsa.auto-link", "true");
 			pa_proplist_setf(m->output_proplist, "api.alsa.disable-tsched", "true");
 		}
 		PA_IDXSET_FOREACH(m, ap->input_mappings, idx) {
 			pa_proplist_setf(m->input_proplist, "node.group", "pro-audio-%u", index);
-			pa_proplist_setf(m->input_proplist, "node.link-group", "pro-audio-%u", index);
 			pa_proplist_setf(m->input_proplist, "api.alsa.auto-link", "true");
 			pa_proplist_setf(m->input_proplist, "api.alsa.disable-tsched", "true");
 		}
diff --git a/src/modules/module-ffado-driver.c b/src/modules/module-ffado-driver.c
index f6a76bed0..05b9218ce 100644
--- a/src/modules/module-ffado-driver.c
+++ b/src/modules/module-ffado-driver.c
@@ -1556,8 +1556,6 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 		pw_properties_set(props, PW_KEY_NODE_VIRTUAL, "true");
 	if (pw_properties_get(props, PW_KEY_NODE_GROUP) == NULL)
 		pw_properties_set(props, PW_KEY_NODE_GROUP, "ffado-group");
-	if (pw_properties_get(props, PW_KEY_NODE_LINK_GROUP) == NULL)
-		pw_properties_set(props, PW_KEY_NODE_LINK_GROUP, "ffado-group");
 	if (pw_properties_get(props, PW_KEY_NODE_PAUSE_ON_IDLE) == NULL)
 		pw_properties_set(props, PW_KEY_NODE_PAUSE_ON_IDLE, "false");
 
diff --git a/src/modules/module-netjack2-manager.c b/src/modules/module-netjack2-manager.c
index 0ff62d93b..a9af6a9b0 100644
--- a/src/modules/module-netjack2-manager.c
+++ b/src/modules/module-netjack2-manager.c
@@ -1393,8 +1393,6 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 		pw_properties_set(props, PW_KEY_NODE_VIRTUAL, "true");
 	if (pw_properties_get(props, PW_KEY_NODE_NETWORK) == NULL)
 		pw_properties_set(props, PW_KEY_NODE_NETWORK, "true");
-	if (pw_properties_get(props, PW_KEY_NODE_LINK_GROUP) == NULL)
-		pw_properties_set(props, PW_KEY_NODE_LINK_GROUP, "jack-group");
 	if (pw_properties_get(props, PW_KEY_NODE_ALWAYS_PROCESS) == NULL)
 		pw_properties_set(props, PW_KEY_NODE_ALWAYS_PROCESS, "true");
 	if (pw_properties_get(props, PW_KEY_NODE_LOCK_QUANTUM) == NULL)

From 437a8d32f265b284525a4e522fa541a461dbc91f Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 5 Mar 2026 15:03:30 +0100
Subject: [PATCH 139/263] impl-node: remove the leaf node check

This was a hack around some scheduler issues that we should be able to
handle better now.

One of the cases is:

  Source -> (p)pw-record

Which would never work otherwise because pw-record does not activate the
Source and when the Source is activated in any other way, pw-record
would not follow.

This will still fail with the current scheduler, but the leaf check is
not so great because it doesn't work in this case:

  Source -> (p)loopback-in|loopback-out(p) -> Sink

What is probably required is a passive mode that doesn't activate but
does follows the peer.
---
 src/pipewire/impl-node.c | 4 ----
 src/pipewire/private.h   | 1 -
 2 files changed, 5 deletions(-)

diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c
index 85bf452b0..f5dd7c96b 100644
--- a/src/pipewire/impl-node.c
+++ b/src/pipewire/impl-node.c
@@ -1325,10 +1325,6 @@ static void check_properties(struct pw_impl_node *node)
 		}
 	}
 	node->lock_rate = pw_properties_get_bool(node->properties, PW_KEY_NODE_LOCK_RATE, false);
-	/* the leaf node is one that only produces/consumes the data. We can deduce this from the
-	 * absence of a link-group and the fact that it has no output/input ports. */
-	node->leaf = node->link_groups == NULL &&
-			(node->info.max_input_ports == 0 || node->info.max_output_ports == 0);
 
 	value = pw_properties_get_uint32(node->properties, PW_KEY_NODE_FORCE_RATE, SPA_ID_INVALID);
 	if (value == 0)
diff --git a/src/pipewire/private.h b/src/pipewire/private.h
index 3eda9ed4e..25a2928fe 100644
--- a/src/pipewire/private.h
+++ b/src/pipewire/private.h
@@ -786,7 +786,6 @@ struct pw_impl_node {
 	unsigned int async:1;		/**< async processing, one cycle latency */
 	unsigned int lazy:1;		/**< the graph is lazy scheduling */
 	unsigned int exclusive:1;	/**< ports can only be linked once */
-	unsigned int leaf:1;		/**< node only produces/consumes data */
 	unsigned int reliable:1;	/**< ports need reliable tee */
 
 	uint32_t transport;		/**< latest transport request */

From 118d8574c827c9a404cef1052e8051373e26f520 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 6 Mar 2026 09:35:17 +0100
Subject: [PATCH 140/263] impl-port: support mode port.passive values

Add a port.passive = follow mode and the node.passive equivalents
out-follow, in-follow, follow.

This makes it possible to control how a port influences the state of
the peer and how the peer influences the state of the node independently.

In passive mode, the port will not make the peer runnable and will also
not become runnable when the peer activates.

In the follow mode, the port will not make the peer runnable but it will
become runnable when the peer is active.

This makes it possible to do new things like (f for follow):

  Source -> (f)loopback1-in|loopback1-out(f) -> Sink

It will not make the source and sink run but when one of them start, all
will become runnable.

Or you can now better do the leak node hack that was previously used:

  Source -> (f)pw-record

That will only start running when the source is activated by something
else.

With port.passive = true|false|follow there is a potential 4th case
which would activate the peer but not be activated by the peer, which is
not something that makes sense.
---
 doc/dox/config/pipewire-props.7.md | 21 +++++++++++++++++-
 src/modules/module-scheduler-v1.c  | 22 +++++++++----------
 src/pipewire/impl-node.c           | 35 +++++++++++++++++++++++++-----
 src/pipewire/impl-port.c           | 23 ++++++++++++++++----
 src/pipewire/keys.h                |  9 +++++---
 src/pipewire/private.h             |  8 ++++---
 6 files changed, 90 insertions(+), 28 deletions(-)

diff --git a/doc/dox/config/pipewire-props.7.md b/doc/dox/config/pipewire-props.7.md
index 5555e3408..a215c6f21 100644
--- a/doc/dox/config/pipewire-props.7.md
+++ b/doc/dox/config/pipewire-props.7.md
@@ -450,11 +450,25 @@ Whether the node target may be changed using metadata.
 
 @PAR@ node-prop  node.passive = false
 \parblock
-This is a passive node and so it should not keep sinks/sources busy. This property makes the session manager create passive links to the sink/sources. If the node is not otherwise linked (via a non-passive link), the node and the sink it is linked to are idle (and eventually suspended).
+This can be used to configure the port.passive property for all ports of this node.
+
+Possible values are:
+
+ * "out": output ports are passive, They will not make the peers active and active peers will
+          not make this node active.
+ * "in": input ports are passive, They will not make the peers active and active peers will
+          not make this node active.
+ * "true": A combination in "in" and "out", both input and output ports are passive.
+ * "out-follow": output ports will not make the peer active but when the peer is activated via
+                 some other way, this node will also become active.
+ * "in-follow": input ports will not make the peer active but when the peer is activated via
+                 some other way, this node will also become active.
+ * "follow": A combination of "in-follow" and "out-follow".
 
 This is used for filter nodes that sit in front of sinks/sources and need to suspend together with the sink/source.
 \endparblock
 
+
 @PAR@ node-prop  node.link-group = ID
 Add the node to a certain link group. Nodes from the same link group are not automatically linked to each other by the session manager. And example is a coupled stream where you don't want the output to link to the input streams, making a useless loop.
 
@@ -1420,6 +1434,11 @@ them. Below are some port properties may interesting for users:
 \copydoc PW_KEY_PORT_ALIAS
 \endparblock
 
+@PAR@ port-prop  port.passive # string
+\parblock
+\copydoc PW_KEY_PORT_PASSIVE
+\endparblock
+
 \see pw_keys in the API documentation for a full list.
 
 # LINK PROPERTIES  @IDX@ props
diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
index 80a797cfa..9eb8f3467 100644
--- a/src/modules/module-scheduler-v1.c
+++ b/src/modules/module-scheduler-v1.c
@@ -108,10 +108,10 @@ static int ensure_state(struct pw_impl_node *node, bool running)
 
 /* make a node runnable. This will automatically also make all non-passive peer nodes
  * runnable and the nodes that belong to the same groups or link_groups. We stop when
- * we reach a passive port.
+ * we reach a passive_into port.
  *
  * We have 4 cases for the links:
- * (p) marks a passive port. we don't follow the peer from this port.
+ * (p) marks a passive_into port. we don't follow the peer from this port.
  *
  *  A   ->   B   ==> B can also be runnable
  *  A  p->   B   ==> B can also be runnable
@@ -145,8 +145,8 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 		spa_list_for_each(l, &p->links, output_link) {
 			n = l->input->node;
 			pw_log_trace(" out-port %p: link %p passive:%d prepared:%d active:%d runn:%d", p,
-					l, l->input->passive, l->prepared, n->active, n->runnable);
-			if (!n->active || l->input->passive)
+					l, l->input->passive_into, l->prepared, n->active, n->runnable);
+			if (!n->active || l->input->passive_into)
 				continue;
 			pw_impl_link_prepare(l);
 			if (!l->prepared)
@@ -159,8 +159,8 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 		spa_list_for_each(l, &p->links, input_link) {
 			n = l->output->node;
 			pw_log_trace(" in-port %p: link %p passive:%d prepared:%d active:%d runn:%d", p,
-					l, l->output->passive, l->prepared, n->active, n->runnable);
-			if (!n->active || l->output->passive)
+					l, l->output->passive_into, l->prepared, n->active, n->runnable);
+			if (!n->active || l->output->passive_into)
 				continue;
 			pw_impl_link_prepare(l);
 			if (!l->prepared)
@@ -193,7 +193,7 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
  *
  * There are 4 cases:
  *
- * (p) marks a passive port. we don't follow the peer from this port.
+ * (p) marks a passive_away port. we don't follow the peer from this port.
  * A can not be a driver
  *
  *  A   ->   B   ==> both nodes can run
@@ -223,8 +223,8 @@ static void check_runnable(struct pw_context *context, struct pw_impl_node *node
 			/* the peer needs to be active and we are linked to it
 			 * with a non-passive link */
 			pw_log_trace(" out-port %p: link %p passive:%d prepared:%d active:%d", p,
-					l, p->passive, l->prepared, n->active);
-			if (!n->active || p->passive)
+					l, p->passive_away, l->prepared, n->active);
+			if (!n->active || p->passive_away)
 				continue;
 			/* explicitly prepare the link in case it was suspended */
 			pw_impl_link_prepare(l);
@@ -238,8 +238,8 @@ static void check_runnable(struct pw_context *context, struct pw_impl_node *node
 		spa_list_for_each(l, &p->links, input_link) {
 			n = l->output->node;
 			pw_log_trace(" in-port %p: link %p passive:%d prepared:%d active:%d", p,
-					l, p->passive, l->prepared, n->active);
-			if (!n->active || p->passive)
+					l, p->passive_away, l->prepared, n->active);
+			if (!n->active || p->passive_away)
 				continue;
 			pw_impl_link_prepare(l);
 			if (!l->prepared)
diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c
index f5dd7c96b..c7591afd2 100644
--- a/src/pipewire/impl-node.c
+++ b/src/pipewire/impl-node.c
@@ -1269,12 +1269,35 @@ static void check_properties(struct pw_impl_node *node)
 	}
 	if ((str = pw_properties_get(node->properties, PW_KEY_NODE_PASSIVE)) == NULL)
 		str = "false";
-	if (spa_streq(str, "out"))
-		node->out_passive = true;
-	else if (spa_streq(str, "in"))
-		node->in_passive = true;
-	else
-		node->in_passive = node->out_passive = spa_atob(str);
+
+	if (spa_streq(str, "out")) {
+		node->passive_away[SPA_DIRECTION_OUTPUT] = true;
+		node->passive_into[SPA_DIRECTION_OUTPUT]= true;
+	}
+	if (spa_streq(str, "out-follow")) {
+		node->passive_away[SPA_DIRECTION_OUTPUT] = true;
+		node->passive_into[SPA_DIRECTION_OUTPUT] = false;
+	}
+	else if (spa_streq(str, "in")) {
+		node->passive_away[SPA_DIRECTION_INPUT] = true;
+		node->passive_into[SPA_DIRECTION_INPUT]= true;
+	}
+	else if (spa_streq(str, "in-follow")) {
+		node->passive_away[SPA_DIRECTION_INPUT] = true;
+		node->passive_into[SPA_DIRECTION_INPUT] = false;
+	}
+	else if (spa_streq(str, "follow")) {
+		node->passive_away[SPA_DIRECTION_INPUT] = true;
+		node->passive_into[SPA_DIRECTION_INPUT] = false;
+		node->passive_away[SPA_DIRECTION_OUTPUT] = true;
+		node->passive_into[SPA_DIRECTION_OUTPUT] = false;
+	}
+	else {
+		node->passive_away[SPA_DIRECTION_OUTPUT] =
+			node->passive_into[SPA_DIRECTION_OUTPUT] =
+			node->passive_away[SPA_DIRECTION_INPUT] =
+			node->passive_into[SPA_DIRECTION_INPUT] = spa_atob(str);
+	}
 
 	node->want_driver = pw_properties_get_bool(node->properties, PW_KEY_NODE_WANT_DRIVER, false);
 	node->always_process = pw_properties_get_bool(node->properties, PW_KEY_NODE_ALWAYS_PROCESS, false);
diff --git a/src/pipewire/impl-port.c b/src/pipewire/impl-port.c
index ed6fe9f1e..3b87c8c0b 100644
--- a/src/pipewire/impl-port.c
+++ b/src/pipewire/impl-port.c
@@ -537,10 +537,25 @@ static int check_properties(struct pw_impl_port *port)
 			&schedule_tee_node;
 	}
 
-	/* inherit passive state from parent node */
-	port->passive = pw_properties_get_bool(port->properties, PW_KEY_PORT_PASSIVE,
-			port->direction == PW_DIRECTION_INPUT ?
-			node->in_passive : node->out_passive);
+
+	if ((str = pw_properties_get(port->properties, PW_KEY_PORT_PASSIVE)) == NULL) {
+		/* inherit passive state from parent node */
+		port->passive_into = node->passive_into[port->direction];
+		port->passive_away = node->passive_away[port->direction];
+	} else {
+		if (spa_streq(str, "true")) {
+			port->passive_into = true;
+			port->passive_away = true;
+		}
+		else if (spa_streq(str, "follow")) {
+			port->passive_into = false;
+			port->passive_away = true;
+		} else {
+			port->passive_into = false;
+			port->passive_away = false;
+		}
+
+	}
 
 	if (media_class != NULL &&
 	    (strstr(media_class, "Sink") != NULL ||
diff --git a/src/pipewire/keys.h b/src/pipewire/keys.h
index 13694bc29..a7afd398e 100644
--- a/src/pipewire/keys.h
+++ b/src/pipewire/keys.h
@@ -213,7 +213,8 @@ extern "C" {
 								  *  object */
 #define PW_KEY_NODE_PASSIVE		"node.passive"		/**< indicate that a node wants passive links
 								  *  on output/input/all ports when the value is
-								  *  "out"/"in"/"true" respectively */
+								  *  "out"/"out-follow"/"in"/"in-follow"/
+								  *  "true"/"follow" */
 #define PW_KEY_NODE_LINK_GROUP		"node.link-group"	/**< the node is internally linked to
 								  *  nodes with the same link-group. Can be an
 								  *  array of group names. */
@@ -247,7 +248,8 @@ extern "C" {
 #define PW_KEY_PORT_CACHE_PARAMS	"port.cache-params"	/**< cache the node port params */
 #define PW_KEY_PORT_EXTRA		"port.extra"		/**< api specific extra port info, API name
 								  *  should be prefixed. "jack:flags:56" */
-#define PW_KEY_PORT_PASSIVE		"port.passive"		/**< the ports wants passive links, since 0.3.67 */
+#define PW_KEY_PORT_PASSIVE		"port.passive"		/**< the ports wants passive links. Values
+								  *  can be "true" or "follow". Since 0.3.67 */
 #define PW_KEY_PORT_IGNORE_LATENCY	"port.ignore-latency"	/**< latency ignored by peers, since 0.3.71 */
 #define PW_KEY_PORT_GROUP		"port.group"		/**< the port group of the port 1.2.0 */
 #define PW_KEY_PORT_EXCLUSIVE		"port.exclusive"	/**< link port only once 1.6.0 */
@@ -261,7 +263,8 @@ extern "C" {
 #define PW_KEY_LINK_OUTPUT_PORT		"link.output.port"	/**< output port id of a link */
 #define PW_KEY_LINK_PASSIVE		"link.passive"		/**< indicate that a link is passive and
 								  *  does not cause the graph to be
-								  *  runnable. */
+								  *  runnable. Deprecated look at
+								  *  port.passive properties. */
 #define PW_KEY_LINK_FEEDBACK		"link.feedback"		/**< indicate that a link is a feedback
 								  *  link and the target will receive data
 								  *  in the next cycle */
diff --git a/src/pipewire/private.h b/src/pipewire/private.h
index 25a2928fe..58801bc27 100644
--- a/src/pipewire/private.h
+++ b/src/pipewire/private.h
@@ -762,8 +762,6 @@ struct pw_impl_node {
 					  *  is selected to drive the graph */
 	unsigned int visited:1;		/**< for sorting */
 	unsigned int want_driver:1;	/**< this node wants to be assigned to a driver */
-	unsigned int in_passive:1;	/**< node input links should be passive */
-	unsigned int out_passive:1;	/**< node output links should be passive */
 	unsigned int runnable:1;	/**< node is runnable */
 	unsigned int freewheel:1;	/**< if this is the freewheel driver */
 	unsigned int loopchecked:1;	/**< for feedback loop checking */
@@ -788,6 +786,9 @@ struct pw_impl_node {
 	unsigned int exclusive:1;	/**< ports can only be linked once */
 	unsigned int reliable:1;	/**< ports need reliable tee */
 
+	bool passive_away[2];	/**< node input links should be passive */
+	bool passive_into[2];	/**< node input links should be passive */
+
 	uint32_t transport;		/**< latest transport request */
 
 	uint32_t port_user_data_size;	/**< extra size for port user data */
@@ -962,7 +963,8 @@ struct pw_impl_port {
 		bool added;
 	} rt;					/**< data only accessed from the data thread */
 	unsigned int destroying:1;
-	unsigned int passive:1;
+	unsigned int passive_into:1;
+	unsigned int passive_away:1;
 	unsigned int auto_path:1;		/* path was automatically generated */
 	unsigned int auto_name:1;		/* name was automatically generated */
 	unsigned int auto_alias:1;		/* alias was automatically generated */

From 784ad934a40971007ab013e3919ec7ea95bc77fb Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 6 Mar 2026 10:42:00 +0100
Subject: [PATCH 141/263] impl-node: remove the can_suspend boolean

Sink and Sources can now be implemented as the follow passive mode,
they won't activate anything themselves but follow the state of the
peer.
---
 src/modules/module-scheduler-v1.c |  4 +---
 src/pipewire/impl-node.c          | 13 ++++++-------
 src/pipewire/private.h            |  1 -
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
index 9eb8f3467..0203cdada 100644
--- a/src/modules/module-scheduler-v1.c
+++ b/src/modules/module-scheduler-v1.c
@@ -599,9 +599,7 @@ again:
 
 	/* first look at all nodes and decide which one should be runnable */
 	spa_list_for_each(n, &context->node_list, link) {
-		/* we don't check suspendable nodes, they need to be made
-		 * runnable from other nodes */
-		if (n->exported || !n->active || n->can_suspend)
+		if (n->exported || !n->active)
 			continue;
 		check_runnable(context, n);
 	}
diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c
index c7591afd2..b9913d508 100644
--- a/src/pipewire/impl-node.c
+++ b/src/pipewire/impl-node.c
@@ -1261,14 +1261,13 @@ static void check_properties(struct pw_impl_node *node)
 		SPA_FLAG_UPDATE(node->rt.target.activation->flags, PW_NODE_ACTIVATION_FLAG_ASYNC, async);
 	}
 
-	if ((str = pw_properties_get(node->properties, PW_KEY_MEDIA_CLASS)) != NULL &&
-	    (strstr(str, "/Sink") != NULL || strstr(str, "/Source") != NULL)) {
-		node->can_suspend = true;
-	} else {
-		node->can_suspend = false;
+	if ((str = pw_properties_get(node->properties, PW_KEY_NODE_PASSIVE)) == NULL) {
+		if ((str = pw_properties_get(node->properties, PW_KEY_MEDIA_CLASS)) != NULL &&
+		    (strstr(str, "/Sink") != NULL || strstr(str, "/Source") != NULL))
+			str = "follow";
+		else
+			str = "false";
 	}
-	if ((str = pw_properties_get(node->properties, PW_KEY_NODE_PASSIVE)) == NULL)
-		str = "false";
 
 	if (spa_streq(str, "out")) {
 		node->passive_away[SPA_DIRECTION_OUTPUT] = true;
diff --git a/src/pipewire/private.h b/src/pipewire/private.h
index 58801bc27..51b71edd3 100644
--- a/src/pipewire/private.h
+++ b/src/pipewire/private.h
@@ -778,7 +778,6 @@ struct pw_impl_node {
 	unsigned int forced_quantum:1;
 	unsigned int trigger:1;		/**< has the TRIGGER property and needs an extra
 					  *  trigger to start processing. */
-	unsigned int can_suspend:1;
 	unsigned int checked;		/**< for sorting */
 	unsigned int sync:1;		/**< the sync-groups are active */
 	unsigned int async:1;		/**< async processing, one cycle latency */

From a179e8c695f4a5326c089ccbdbe4c0336d912823 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 6 Mar 2026 11:24:21 +0100
Subject: [PATCH 142/263] sendspin: implement parsing of client state

---
 src/modules/module-sendspin-send.c | 48 ++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/modules/module-sendspin-send.c b/src/modules/module-sendspin-send.c
index 6947ebb3c..162f9f47d 100644
--- a/src/modules/module-sendspin-send.c
+++ b/src/modules/module-sendspin-send.c
@@ -201,6 +201,13 @@ struct client {
 #define COMMAND_VOLUME	(1<<0)
 #define COMMAND_MUTE	(1<<1)
 	uint32_t supported_commands;
+#define STATE_UNKNOWN		0
+#define STATE_SYNCHRONIZED	1
+#define STATE_ERROR		2
+	uint32_t state;
+
+	int volume;
+	bool mute;
 
 	bool playing;
 };
@@ -495,9 +502,33 @@ static int send_server_time(struct client *c, uint64_t t1, uint64_t t2)
 }
 
 #if 0
-static int send_server_command(struct client *c)
+static int send_server_command(struct client *c, int command, int value)
 {
-	return 0;
+	struct spa_json_builder b;
+	size_t size;
+	char *mem;
+	int res;
+
+	spa_json_builder_memstream(&b, &mem, &size, 0);
+	spa_json_builder_array_push(&b,   "{");
+	spa_json_builder_object_string(&b,  "type", "server/command");
+	spa_json_builder_object_push(&b,    "payload", "{");
+	spa_json_builder_object_push(&b,      "player", "{");
+	if (command == COMMAND_VOLUME) {
+		spa_json_builder_object_string(&b, "command", "volume");
+		spa_json_builder_object_int(&b,    "volume", value);
+	} else {
+		spa_json_builder_object_string(&b, "command", "mute");
+		spa_json_builder_object_int(&b,    "mute", value ? true : false);
+	}
+	spa_json_builder_pop(&b,              "}");
+	spa_json_builder_pop(&b,            "}");
+	spa_json_builder_pop(&b,          "}");
+	spa_json_builder_close(&b);
+
+	res = pw_websocket_connection_send_text(c->conn, mem, size);
+	free(mem);
+	return res;
 }
 #endif
 
@@ -779,7 +810,7 @@ static int handle_client_hello(struct client *c, struct spa_json *payload)
 static int handle_client_state(struct client *c, struct spa_json *payload)
 {
 	struct spa_json it[1];
-	char key[256];
+	char key[256], val[128];
         const char *v;
 	int l;
 
@@ -790,10 +821,21 @@ static int handle_client_state(struct client *c, struct spa_json *payload)
 			spa_json_enter(payload, &it[0]);
 			while ((l = spa_json_object_next(&it[0], key, sizeof(key), &v)) > 0) {
 				if (spa_streq(key, "state")) {
+					spa_json_parse_stringn(v, l, val, sizeof(val));
+					if (spa_streq(val, "synchronized"))
+						c->state = STATE_SYNCHRONIZED;
+					else if (spa_streq(val, "error"))
+						c->state = STATE_ERROR;
+					else
+						c->state = STATE_UNKNOWN;
 				}
 				else if (spa_streq(key, "volume")) {
+					if (spa_json_parse_int(v, l, &c->volume) <= 0)
+		                                return -EINVAL;
 				}
 				else if (spa_streq(key, "mute")) {
+					if (spa_json_parse_bool(v, l, &c->mute) <= 0)
+		                                return -EINVAL;
 				}
 			}
 		}

From 70b7b42f5d8cc4c4eefc6e8ff56e484c6324a8f9 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 6 Mar 2026 17:03:20 +0100
Subject: [PATCH 143/263] pw-cat: fix encoded format playback

We keep a mapping between the sndfile formats and the format we would
like to decode them to for encoded formats. Make sure we don't mix up
the sample widths between them.

Make sure we don't send encoded formats as raw.

Debug the uncompressed format name correctly.

Fixes #5155
---
 src/tools/pw-cat.c | 96 ++++++++++++++++++++++++----------------------
 1 file changed, 51 insertions(+), 45 deletions(-)

diff --git a/src/tools/pw-cat.c b/src/tools/pw-cat.c
index f90ebffc9..6b1916d55 100644
--- a/src/tools/pw-cat.c
+++ b/src/tools/pw-cat.c
@@ -196,55 +196,60 @@ struct data {
 };
 
 static const struct format_info {
-	const char *name;
+	const char *sf_name;
 	int sf_format;
+	uint32_t sf_width;
+	const char *spa_name;
 	uint32_t spa_format;
-	uint32_t width;
+	uint32_t spa_width;
+#define FORMAT_ENCODED	(1<<0)
+	uint32_t flags;
 } format_info[] = {
-	{  "ulaw", SF_FORMAT_ULAW, SPA_AUDIO_FORMAT_ULAW, 1 },
-	{  "alaw", SF_FORMAT_ULAW, SPA_AUDIO_FORMAT_ALAW, 1 },
-	{  "s8", SF_FORMAT_PCM_S8, SPA_AUDIO_FORMAT_S8, 1 },
-	{  "u8", SF_FORMAT_PCM_U8, SPA_AUDIO_FORMAT_U8, 1 },
-	{  "s16", SF_FORMAT_PCM_16, SPA_AUDIO_FORMAT_S16, 2 },
-	{  "s24", SF_FORMAT_PCM_24, SPA_AUDIO_FORMAT_S24, 3 },
-	{  "s32", SF_FORMAT_PCM_32, SPA_AUDIO_FORMAT_S32, 4 },
-	{  "f32", SF_FORMAT_FLOAT, SPA_AUDIO_FORMAT_F32, 4 },
-	{  "f64", SF_FORMAT_DOUBLE, SPA_AUDIO_FORMAT_F32, 8 },
+	{  "ulaw", SF_FORMAT_ULAW, 1, "ulaw", SPA_AUDIO_FORMAT_ULAW, 1, 0 },
+	{  "alaw", SF_FORMAT_ULAW, 1, "alaw", SPA_AUDIO_FORMAT_ALAW, 1, 0 },
+	{  "s8", SF_FORMAT_PCM_S8, 1, "s8", SPA_AUDIO_FORMAT_S8, 1, 0 },
+	{  "u8", SF_FORMAT_PCM_U8, 1, "u8", SPA_AUDIO_FORMAT_U8, 1, 0 },
+	{  "s16", SF_FORMAT_PCM_16, 2, "s16", SPA_AUDIO_FORMAT_S16, 2, 0 },
+	/* we read and write S24 as S32 with sndfile */
+	{  "s24", SF_FORMAT_PCM_24, 3, "s32", SPA_AUDIO_FORMAT_S32, 4, 0 },
+	{  "s32", SF_FORMAT_PCM_32, 4, "s32", SPA_AUDIO_FORMAT_S32, 4, 0 },
+	{  "f32", SF_FORMAT_FLOAT, 4, "f32", SPA_AUDIO_FORMAT_F32, 4, 0 },
+	{  "f64", SF_FORMAT_DOUBLE, 8, "f64", SPA_AUDIO_FORMAT_F32, 8, 0 },
 
-	{  "mp1", SF_FORMAT_MPEG_LAYER_I, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "mp2", SF_FORMAT_MPEG_LAYER_II, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "mp3", SF_FORMAT_MPEG_LAYER_III, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "vorbis", SF_FORMAT_VORBIS, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "opus", SF_FORMAT_OPUS, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "mp1", SF_FORMAT_MPEG_LAYER_I, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "mp2", SF_FORMAT_MPEG_LAYER_II, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "mp3", SF_FORMAT_MPEG_LAYER_III, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "vorbis", SF_FORMAT_VORBIS, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "opus", SF_FORMAT_OPUS, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
 
-	{  "ima-adpcm", SF_FORMAT_IMA_ADPCM, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "ms-adpcm", SF_FORMAT_MS_ADPCM, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "nms-adpcm-16", SF_FORMAT_NMS_ADPCM_16, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "nms-adpcm-24", SF_FORMAT_NMS_ADPCM_24, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "nms-adpcm-32", SF_FORMAT_NMS_ADPCM_32, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "ima-adpcm", SF_FORMAT_IMA_ADPCM, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "ms-adpcm", SF_FORMAT_MS_ADPCM, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "nms-adpcm-16", SF_FORMAT_NMS_ADPCM_16, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "nms-adpcm-24", SF_FORMAT_NMS_ADPCM_24, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "nms-adpcm-32", SF_FORMAT_NMS_ADPCM_32, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
 
-	{  "alac-16", SF_FORMAT_ALAC_16, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "alac-20", SF_FORMAT_ALAC_20, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "alac-24", SF_FORMAT_ALAC_24, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "alac-32", SF_FORMAT_ALAC_32, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "alac-16", SF_FORMAT_ALAC_16, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "alac-20", SF_FORMAT_ALAC_20, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "alac-24", SF_FORMAT_ALAC_24, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "alac-32", SF_FORMAT_ALAC_32, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
 
-	{  "gsm610", SF_FORMAT_GSM610, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "g721-32", SF_FORMAT_G721_32, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "g723-24", SF_FORMAT_G723_24, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "g723-40", SF_FORMAT_G723_40, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "dwvw-12", SF_FORMAT_DWVW_12, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "dwvw-16", SF_FORMAT_DWVW_16, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "dwvw-24", SF_FORMAT_DWVW_24, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "vox", SF_FORMAT_VOX_ADPCM, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "dpcm-16", SF_FORMAT_DPCM_16, SPA_AUDIO_FORMAT_F32, 1 },
-	{  "dpcm-8", SF_FORMAT_DPCM_8, SPA_AUDIO_FORMAT_F32, 1 },
+	{  "gsm610", SF_FORMAT_GSM610, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "g721-32", SF_FORMAT_G721_32, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "g723-24", SF_FORMAT_G723_24, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "g723-40", SF_FORMAT_G723_40, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "dwvw-12", SF_FORMAT_DWVW_12, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "dwvw-16", SF_FORMAT_DWVW_16, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "dwvw-24", SF_FORMAT_DWVW_24, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "vox", SF_FORMAT_VOX_ADPCM, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "dpcm-16", SF_FORMAT_DPCM_16, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
+	{  "dpcm-8", SF_FORMAT_DPCM_8, 1, "f32", SPA_AUDIO_FORMAT_F32, 4, FORMAT_ENCODED },
 
 };
 
 static const struct format_info *format_info_by_name(const char *str)
 {
 	SPA_FOR_EACH_ELEMENT_VAR(format_info, i)
-		if (spa_streq(str, i->name))
+		if (spa_streq(str, i->sf_name))
 			return i;
 	return NULL;
 }
@@ -263,7 +268,7 @@ static void list_formats(struct data *d)
 
 	fprintf(stdout, _("Supported formats:\n"));
 	SPA_FOR_EACH_ELEMENT_VAR(format_info, i)
-		fprintf(stdout, "  %s\n", i->name);
+		fprintf(stdout, "  %s\n", i->sf_name);
 }
 
 static int sf_playback_fill_x8(struct data *d, void *dest, unsigned int n_frames, bool *null_frame)
@@ -1676,8 +1681,13 @@ static int setup_raw(struct data *data)
 	if (info == NULL)
 		return -EINVAL;
 
+	if (info->flags & FORMAT_ENCODED) {
+		fprintf(stderr, "raw: raw encoded format %s not supported\n", info->sf_name);
+		return -ENOTSUP;
+	}
+
 	data->spa_format = info->spa_format;
-	data->stride = info->width * data->channels;
+	data->stride = info->spa_width * data->channels;
 	data->fill = data->mode == mode_playback ?  raw_play : raw_record;
 
 	if (spa_streq(data->filename, "-")) {
@@ -1696,7 +1706,7 @@ static int setup_raw(struct data *data)
 	if (data->verbose)
 		fprintf(stderr, "raw: rate=%u channels=%u fmt=%s samplesize=%u stride=%u\n",
 				data->rate, data->channels,
-				info->name, info->width, data->stride);
+				info->spa_name, info->spa_width, data->stride);
 
 	return 0;
 }
@@ -2034,14 +2044,10 @@ static int setup_sndfile(struct data *data)
 
 	if (data->verbose)
 		fprintf(stderr, "PCM: fmt:%s rate:%u channels:%u width:%u\n",
-				fi->name, data->rate, data->channels, fi->width);
-
-	/* we read and write S24 as S32 with sndfile */
-	if (fi->spa_format == SPA_AUDIO_FORMAT_S24)
-		fi = format_info_by_sf_format(SF_FORMAT_PCM_32);
+				fi->spa_name, data->rate, data->channels, fi->spa_width);
 
 	data->spa_format = fi->spa_format;
-	data->stride = fi->width * data->channels;
+	data->stride = fi->spa_width * data->channels;
 	data->fill = data->mode == mode_playback ?
 			playback_fill_fn(data->spa_format) :
 			record_fill_fn(data->spa_format);

From d1c372f5eea5b92a1eadba52a878c79b1a4bde87 Mon Sep 17 00:00:00 2001
From: qaqland <anguoli@uniontech.com>
Date: Sat, 7 Mar 2026 13:25:28 +0800
Subject: [PATCH 144/263] alsa-udev: support alsa.ignore-dB

Some sound cards are only adapted for Android/macOS and other
systems, without considering Linux. The hardware-reported dB
volume is incorrect (while the percentage volume is normal).
Add support for the ignore-dB option to simplify compatibility.

For example, the 3206:0798 HP SIMGOT GEW1 Sound Card reports:

numid=4,iface=MIXER,name='PCM Playback Volume'
  ; type=INTEGER,access=rw---R--,values=2,min=0,max=100,step=0
  : values=100,100
  | dBminmax-min=0.00dB,max=0.39dB

This dB value does not match actual audio perception, and the
vendor attributed this issue to non-target system compatibility.
---
 spa/plugins/alsa/alsa-udev.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spa/plugins/alsa/alsa-udev.c b/spa/plugins/alsa/alsa-udev.c
index 8537c9760..fdc255864 100644
--- a/spa/plugins/alsa/alsa-udev.c
+++ b/spa/plugins/alsa/alsa-udev.c
@@ -538,6 +538,9 @@ static int emit_added_object_info(struct impl *this, struct card *card)
 		if ((str = udev_device_get_property_value(udev_device, "ACP_PROFILE_SET")) && *str)
 			items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_PROFILE_SET, str);
 
+		if ((str = udev_device_get_property_value(udev_device, "ACP_IGNORE_DB")) && *str)
+			items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_API_ALSA_IGNORE_DB, str);
+
 		if ((str = udev_device_get_property_value(udev_device, "SOUND_CLASS")) && *str)
 			items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_CLASS, str);
 

From 48c22e2aa76a51d3f53c2e441f177ad4a56c96b9 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 9 Mar 2026 13:19:43 +0100
Subject: [PATCH 145/263] pw-dump: place key before None choice values

See #5161
---
 src/tools/pw-dump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/pw-dump.c b/src/tools/pw-dump.c
index d1c53b900..c939b7302 100644
--- a/src/tools/pw-dump.c
+++ b/src/tools/pw-dump.c
@@ -310,7 +310,7 @@ static void put_pod_value(struct data *d, const char *key, const struct spa_type
 		int index = 0;
 
 		if (b->type == SPA_CHOICE_None) {
-			put_pod_value(d, NULL, info, b->child.type,
+			put_pod_value(d, key, info, b->child.type,
 					SPA_POD_CONTENTS(struct spa_pod, &b->child),
 					b->child.size);
 		} else {

From 3a2d16a3bc57b383025a29f5b4816dd09007aa0e Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 9 Mar 2026 13:33:20 +0100
Subject: [PATCH 146/263] json-builder: do better json number check

If we are going to produce valid JSON we need to do a better JSON number
check because our own float and int parser can accept more variants
and will let through numbers that are not valid JSON.

See #5161
---
 spa/include/spa/utils/json-builder.h |  8 +++--
 spa/include/spa/utils/json-core.h    | 38 ++++++++++++++++++++++
 test/test-spa-json.c                 | 47 ++++++++++++++++++++--------
 3 files changed, 77 insertions(+), 16 deletions(-)

diff --git a/spa/include/spa/utils/json-builder.h b/spa/include/spa/utils/json-builder.h
index 5308140cc..b41ea9774 100644
--- a/spa/include/spa/utils/json-builder.h
+++ b/spa/include/spa/utils/json-builder.h
@@ -169,11 +169,13 @@ void spa_json_builder_add_simple(struct spa_json_builder *b, const char *key, in
 		else if (spa_json_is_null(val, val_len) ||
 			 spa_json_is_bool(val, val_len))
 			type = 'l';
-		else if (spa_json_is_float(val, val_len) ||
-			 spa_json_is_int(val, val_len))
-			type = 'd';
 		else if (spa_json_is_string(val, val_len))
 			type = 's';
+		else if (spa_json_is_json_number(val, val_len))
+			type = 'd';
+		else if (simple && (spa_json_is_float(val, val_len) ||
+			 spa_json_is_int(val, val_len)))
+			type = 'd';
 		else
 			type = 'S';
 	}
diff --git a/spa/include/spa/utils/json-core.h b/spa/include/spa/utils/json-core.h
index eed208db6..68309aaa9 100644
--- a/spa/include/spa/utils/json-core.h
+++ b/spa/include/spa/utils/json-core.h
@@ -484,6 +484,44 @@ SPA_API_JSON bool spa_json_is_int(const char *val, int len)
 	return spa_json_parse_int(val, len, &dummy);
 }
 
+SPA_API_JSON bool spa_json_is_json_number(const char *val, int len)
+{
+        int pos = 0, first;
+        /* integer */
+        if (len == 0)
+                return 0;
+        if (pos < len && val[pos] == '-')
+                pos++;
+	first = pos;
+        while(pos < len && val[pos] >= '0' && val[pos] <= '9')
+		pos++;
+	if (pos == first || (first + 1 < pos && val[first] == '0'))
+		return 0;
+        /* fraction */
+        if (pos == len)
+                return 1;
+        if (val[pos++] != '.')
+                return 0;
+	first = pos;
+        while(pos < len && val[pos] >= '0' && val[pos] <= '9')
+		pos++;
+	if (pos == first)
+		return 0;
+        /* exponent */
+        if (pos == len)
+                return 1;
+        if (val[pos] != 'e' && val[pos] != 'E')
+                return 0;
+	pos++;
+        if (val[pos] == '-' || val[pos] == '+')
+		pos++;
+        while(pos < len && val[pos] >= '0' && val[pos] <= '9')
+		pos++;
+        if (pos != len)
+                return 0;
+        return 1;
+}
+
 /* bool */
 SPA_API_JSON bool spa_json_is_true(const char *val, int len)
 {
diff --git a/test/test-spa-json.c b/test/test-spa-json.c
index 75fde8d38..9e38dde18 100644
--- a/test/test-spa-json.c
+++ b/test/test-spa-json.c
@@ -708,21 +708,39 @@ PWTEST(json_float_check)
 	struct {
 		const char *str;
 		int res;
+		int jsonres;
 	} val[] = {
-		{ "0.0", 1 },
-		{ ".0", 1 },
-		{ "+.0E0", 1 },
-		{ "-.0e0", 1 },
+		{ "0.0", 1, 1},
+		{ ".0", 1, 0 },
+		{ "+.0E0", 1, 0 },
+		{ "-.0e0", 1, 0 },
+
+		{ "0,0", 0, 0 },
+		{ "0.0.5", 0, 0 },
+		{ "0x0", 0, 0 },
+		{ "0x0.0", 0, 0 },
+		{ "E10", 0, 0 },
+		{ "e20", 0, 0 },
+		{ " 0.0", 0, 0 },
+		{ "0.0 ", 0, 0 },
+		{ " 0.0 ", 0, 0 },
+
+		{ "+", 0, 0 },
+		{ "+0", 1, 0 },
+		{ "-", 0, 0 },
+		{ "-0", 1, 1 },
+		{ "-0", 1, 1 },
+		{ "-01", 1, 0 },
+		{ "-00", 1, 0 },
+		{ "-1", 1, 1 },
+		{ "-10", 1, 1 },
+		{ "-.", 0, 0 },
+		{ "-0.", 1, 0 },
+		{ "-01.", 1, 0 },
+		{ "-1.", 1, 0 },
+
+		{ "-.0", 1, 0 },
 
-		{ "0,0", 0 },
-		{ "0.0.5", 0 },
-		{ "0x0", 0 },
-		{ "0x0.0", 0 },
-		{ "E10", 0 },
-		{ "e20", 0 },
-		{ " 0.0", 0 },
-		{ "0.0 ", 0 },
-		{ " 0.0 ", 0 },
 	};
 	unsigned i;
 	float v;
@@ -730,6 +748,9 @@ PWTEST(json_float_check)
 	for (i = 0; i < SPA_N_ELEMENTS(val); i++) {
 		pwtest_int_eq(spa_json_parse_float(val[i].str, strlen(val[i].str), &v), val[i].res);
 	}
+	for (i = 0; i < SPA_N_ELEMENTS(val); i++) {
+		pwtest_int_eq(spa_json_is_json_number(val[i].str, strlen(val[i].str)), val[i].jsonres);
+	}
 	return PWTEST_PASS;
 }
 

From 6f73e42d05c2c92b9c28cb11edc2cfcca0f72f98 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 9 Mar 2026 13:50:38 +0100
Subject: [PATCH 147/263] v4l2: use 0x as the prefix for hex values

fixes #5161
---
 spa/plugins/v4l2/v4l2-device.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spa/plugins/v4l2/v4l2-device.c b/spa/plugins/v4l2/v4l2-device.c
index 2379d2105..f29252d16 100644
--- a/spa/plugins/v4l2/v4l2-device.c
+++ b/spa/plugins/v4l2/v4l2-device.c
@@ -98,9 +98,9 @@ static int emit_info(struct impl *this, bool full)
 			(this->dev.cap.version >> 8) & 0xFF,
 			(this->dev.cap.version) & 0xFF);
 	ADD_ITEM(SPA_KEY_API_V4L2_CAP_VERSION, version);
-	snprintf(capabilities, sizeof(capabilities), "%08x", this->dev.cap.capabilities);
+	snprintf(capabilities, sizeof(capabilities), "0x%08x", this->dev.cap.capabilities);
 	ADD_ITEM(SPA_KEY_API_V4L2_CAP_CAPABILITIES, capabilities);
-	snprintf(device_caps, sizeof(device_caps), "%08x", this->dev.cap.device_caps);
+	snprintf(device_caps, sizeof(device_caps), "0x%08x", this->dev.cap.device_caps);
 	ADD_ITEM(SPA_KEY_API_V4L2_CAP_DEVICE_CAPS, device_caps);
 #undef ADD_ITEM
 	info.props = &SPA_DICT_INIT(items, n_items);

From 231a41a22fa5372267b23925cd5fa93bc36a8ff9 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 9 Mar 2026 16:18:58 +0100
Subject: [PATCH 148/263] impl-link: fix shared mem test

We can only use non-shared memory when both nodes live in the same
process _and_ we can be sure the output port is never going to be linked
to a remote node because it is exclusive.

This fixes the case where a null-sink is loaded inside the process space
of the server and linked to the ALSA sink. This would create a link
without shared mem and then as soon as something else (out of process)
wants to link to the null-sink output, it would get a -22 EINVAL
negotiation error because the memory can't be shared.

Fixes #5159
---
 src/pipewire/impl-link.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pipewire/impl-link.c b/src/pipewire/impl-link.c
index 4d63a1620..6eae5e6c7 100644
--- a/src/pipewire/impl-link.c
+++ b/src/pipewire/impl-link.c
@@ -701,7 +701,10 @@ static int do_allocation(struct pw_impl_link *this)
 		/* always enable async mode */
 		alloc_flags = PW_BUFFERS_FLAG_ASYNC;
 
-		if (output->node->remote || input->node->remote)
+		/* shared mem can only be used if both nodes are in the same process
+		 * and we are sure that the buffers are never going to be shared
+		 * because of the exclusive flag */
+		if (output->node->remote || input->node->remote || !output->exclusive)
 			alloc_flags |= PW_BUFFERS_FLAG_SHARED;
 
 		if (output->node->driver)

From ddf63e0863b6e872d61a269459f2f88714928f12 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 9 Mar 2026 16:48:05 +0100
Subject: [PATCH 149/263] json: relax float parsing some more

We already support more float variants than standard JSON in the relaxed
format, adding extra restrictions does not actually help much. If you
need to know if this is a value JSON number, there is now a function to
check that instead.
---
 spa/include/spa/utils/json-core.h | 14 ++------------
 test/test-spa-json.c              | 12 +++++++++---
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/spa/include/spa/utils/json-core.h b/spa/include/spa/utils/json-core.h
index 68309aaa9..6d9cbe566 100644
--- a/spa/include/spa/utils/json-core.h
+++ b/spa/include/spa/utils/json-core.h
@@ -425,20 +425,11 @@ SPA_API_JSON bool spa_json_is_null(const char *val, int len)
 /* float */
 SPA_API_JSON int spa_json_parse_float(const char *val, int len, float *result)
 {
-	char buf[96];
-	char *end;
-	int pos;
+	char buf[96], *end;
 
 	if (len <= 0 || len >= (int)sizeof(buf))
 		return 0;
 
-	for (pos = 0; pos < len; ++pos) {
-		switch (val[pos]) {
-		case '+': case '-': case '0' ... '9': case '.': case 'e': case 'E': break;
-		default: return 0;
-		}
-	}
-
 	memcpy(buf, val, len);
 	buf[len] = '\0';
 
@@ -466,8 +457,7 @@ SPA_API_JSON char *spa_json_format_float(char *str, int size, float val)
 /* int */
 SPA_API_JSON int spa_json_parse_int(const char *val, int len, int *result)
 {
-	char buf[64];
-	char *end;
+	char buf[64], *end;
 
 	if (len <= 0 || len >= (int)sizeof(buf))
 		return 0;
diff --git a/test/test-spa-json.c b/test/test-spa-json.c
index 9e38dde18..907192844 100644
--- a/test/test-spa-json.c
+++ b/test/test-spa-json.c
@@ -717,11 +717,11 @@ PWTEST(json_float_check)
 
 		{ "0,0", 0, 0 },
 		{ "0.0.5", 0, 0 },
-		{ "0x0", 0, 0 },
-		{ "0x0.0", 0, 0 },
+		{ "0x0", 1, 0 },
+		{ "0x0.0", 1, 0 },
 		{ "E10", 0, 0 },
 		{ "e20", 0, 0 },
-		{ " 0.0", 0, 0 },
+		{ " 0.0", 1, 0 },
 		{ "0.0 ", 0, 0 },
 		{ " 0.0 ", 0, 0 },
 
@@ -1002,6 +1002,12 @@ PWTEST(json_data)
 		"n_number_-2..json",
 		"n_number_hex_1_digit.json",
 		"n_number_hex_2_digits.json",
+		"n_number_infinity.json",
+		"n_number_+Inf.json",
+		"n_number_Inf.json",
+		"n_number_minus_infinity.json",
+		"n_number_-NaN.json",
+		"n_number_NaN.json",
 		"n_number_neg_int_starting_with_zero.json",
 		"n_number_neg_real_without_int_part.json",
 		"n_number_real_without_fractional_part.json",

From f9e2b1d8b9af0dbee010260887a067813137276f Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Wed, 25 Feb 2026 23:29:39 +0200
Subject: [PATCH 150/263] bluez5: backend-native: don't crash without dbus
 session bus

When there is no DBus session bus, creation of the telephony backend
fails, and we later crash on null ptr deref.

In this case, avoid crash trying to create telephony_ag or iterate its
call list.
---
 spa/plugins/bluez5/backend-native.c | 35 ++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/spa/plugins/bluez5/backend-native.c b/spa/plugins/bluez5/backend-native.c
index 4d14183e7..64a4c25c1 100644
--- a/spa/plugins/bluez5/backend-native.c
+++ b/spa/plugins/bluez5/backend-native.c
@@ -1969,6 +1969,9 @@ static void hfp_hf_remove_disconnected_calls(struct rfcomm *rfcomm)
 	struct updated_call *updated_call;
 	bool found;
 
+	if (!rfcomm->telephony_ag)
+		return;
+
 	spa_list_for_each_safe(call, call_tmp, &rfcomm->telephony_ag->call_list, link) {
 		found = false;
 		spa_list_for_each(updated_call, &rfcomm->updated_call_list, link) {
@@ -2097,6 +2100,8 @@ static bool rfcomm_hfp_hf(struct rfcomm *rfcomm, char* token)
 
 			if (spa_streq(rfcomm->hf_indicators[indicator], "battchg")) {
 				spa_bt_device_report_battery_level(rfcomm->device, value * 100 / 5);
+			} else if (!rfcomm->telephony_ag) {
+				/* noop */
 			} else if (spa_streq(rfcomm->hf_indicators[indicator], "callsetup")) {
 				if (rfcomm->hfp_hf_clcc) {
 					rfcomm_send_cmd(rfcomm, hfp_hf_clcc_update, NULL, "AT+CLCC");
@@ -2245,7 +2250,8 @@ static bool rfcomm_hfp_hf(struct rfcomm *rfcomm, char* token)
 				rfcomm->hfp_hf_in_progress = false;
 			}
 		}
-	} else if (sscanf(token, "+CLIP: \"%16[^\"]\",%u", number, &type) == 2) {
+	} else if (sscanf(token, "+CLIP: \"%16[^\"]\",%u", number, &type) == 2
+			&& rfcomm->telephony_ag) {
 		struct spa_bt_telephony_call *call;
 		spa_list_for_each(call, &rfcomm->telephony_ag->call_list, link) {
 			if (call->state == CALL_STATE_INCOMING && !spa_streq(number, call->line_identification)) {
@@ -2256,7 +2262,8 @@ static bool rfcomm_hfp_hf(struct rfcomm *rfcomm, char* token)
 				break;
 			}
 		}
-	} else if (sscanf(token, "+CCWA: \"%16[^\"]\",%u", number, &type) == 2) {
+	} else if (sscanf(token, "+CCWA: \"%16[^\"]\",%u", number, &type) == 2
+			&& rfcomm->telephony_ag) {
 		struct spa_bt_telephony_call *call;
 		bool found = false;
 
@@ -2273,7 +2280,7 @@ static bool rfcomm_hfp_hf(struct rfcomm *rfcomm, char* token)
 			if (call == NULL)
 				spa_log_warn(backend->log, "failed to create waiting call");
 		}
-	} else if (spa_strstartswith(token, "+CLCC:")) {
+	} else if (spa_strstartswith(token, "+CLCC:") && rfcomm->telephony_ag) {
 		struct spa_bt_telephony_call *call;
 		size_t pos;
 		char *token_end;
@@ -2421,17 +2428,19 @@ static bool rfcomm_hfp_hf(struct rfcomm *rfcomm, char* token)
 					}
 				}
 
-				rfcomm->telephony_ag = telephony_ag_new(backend->telephony, 0);
-				rfcomm->telephony_ag->address = strdup(rfcomm->device->address);
-				rfcomm->telephony_ag->volume[SPA_BT_VOLUME_ID_RX] = rfcomm->volumes[SPA_BT_VOLUME_ID_RX].hw_volume = backend->hfp_default_speaker_volume;
-				rfcomm->telephony_ag->volume[SPA_BT_VOLUME_ID_TX] = rfcomm->volumes[SPA_BT_VOLUME_ID_TX].hw_volume = backend->hfp_default_mic_volume;
-				telephony_ag_set_callbacks(rfcomm->telephony_ag,
+				if (backend->telephony) {
+					rfcomm->telephony_ag = telephony_ag_new(backend->telephony, 0);
+					rfcomm->telephony_ag->address = strdup(rfcomm->device->address);
+					rfcomm->telephony_ag->volume[SPA_BT_VOLUME_ID_RX] = rfcomm->volumes[SPA_BT_VOLUME_ID_RX].hw_volume = backend->hfp_default_speaker_volume;
+					rfcomm->telephony_ag->volume[SPA_BT_VOLUME_ID_TX] = rfcomm->volumes[SPA_BT_VOLUME_ID_TX].hw_volume = backend->hfp_default_mic_volume;
+					telephony_ag_set_callbacks(rfcomm->telephony_ag,
 							&telephony_ag_callbacks, rfcomm);
-				if (rfcomm->transport) {
-					rfcomm->telephony_ag->transport.codec = rfcomm->transport->media_codec->codec_id;
-					rfcomm->telephony_ag->transport.state = rfcomm->transport->state;
+					if (rfcomm->transport) {
+						rfcomm->telephony_ag->transport.codec = rfcomm->transport->media_codec->codec_id;
+						rfcomm->telephony_ag->transport.state = rfcomm->transport->state;
+					}
+					telephony_ag_register(rfcomm->telephony_ag);
 				}
-				telephony_ag_register(rfcomm->telephony_ag);
 
 				rfcomm_send_cmd(rfcomm, hfp_hf_clip, NULL, "AT+CLIP=1");
 				break;
@@ -2478,7 +2487,7 @@ static bool rfcomm_hfp_hf(struct rfcomm *rfcomm, char* token)
 				break;
 			case hfp_hf_chld1_hangup:
 				/* For HFP/HF/TWC/BV-03-C - see 0e92ab9307e05758b3f70b4c0648e29c1d1e50be */
-				if (!rfcomm->hfp_hf_clcc) {
+				if (!rfcomm->hfp_hf_clcc && rfcomm->telephony_ag) {
 					struct spa_bt_telephony_call *call, *tcall;
 					spa_list_for_each_safe(call, tcall, &rfcomm->telephony_ag->call_list, link) {
 						if (call->state == CALL_STATE_ACTIVE) {

From 5f8ece7017babe740bea5c8c466c7018c395d89a Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Fri, 13 Feb 2026 22:11:14 +0200
Subject: [PATCH 151/263] bluez5: aac: coerce non-spec compliant freq/channels
 to single choice

Some non-spec compliant devices (Sony XB100) set multiple bits
in all AAC field, including the frequency & channels.

Although they set multiple bits, these devices appear to intend that the
sender picks some specific format and uses it, and don't work correctly
with the others.

validate_config() already picks one configuration, so use the result in
enum_config(), instead of allowing also other settings.

Assume devices generally want preferably 44.1 kHz stereo.

Note we cannot reject the configuration, as BlueZ does not necessarily
retry, leaving the device connected but with no audio.
---
 spa/plugins/bluez5/a2dp-codec-aac.c | 106 +++++++++-------------------
 1 file changed, 34 insertions(+), 72 deletions(-)

diff --git a/spa/plugins/bluez5/a2dp-codec-aac.c b/spa/plugins/bluez5/a2dp-codec-aac.c
index c49f7a616..a19cdb093 100644
--- a/spa/plugins/bluez5/a2dp-codec-aac.c
+++ b/spa/plugins/bluez5/a2dp-codec-aac.c
@@ -106,8 +106,8 @@ static int codec_fill_caps(const struct media_codec *codec, uint32_t flags,
 
 static const struct media_codec_config
 aac_frequencies[] = {
-	{ AAC_SAMPLING_FREQ_48000, 48000, 11 },
 	{ AAC_SAMPLING_FREQ_44100, 44100, 10 },
+	{ AAC_SAMPLING_FREQ_48000, 48000, 11 },
 	{ AAC_SAMPLING_FREQ_96000, 96000, 9 },
 	{ AAC_SAMPLING_FREQ_88200, 88200, 8 },
 	{ AAC_SAMPLING_FREQ_64000, 64000, 7 },
@@ -194,75 +194,6 @@ static int codec_select_config(const struct media_codec *codec, uint32_t flags,
 	return sizeof(conf);
 }
 
-static int codec_enum_config(const struct media_codec *codec, uint32_t flags,
-		const void *caps, size_t caps_size, uint32_t id, uint32_t idx,
-		struct spa_pod_builder *b, struct spa_pod **param)
-{
-	a2dp_aac_t conf;
-	struct spa_pod_frame f[2];
-	struct spa_pod_choice *choice;
-	uint32_t position[2];
-	uint32_t i = 0;
-
-	if (caps_size < sizeof(conf))
-		return -EINVAL;
-
-	memcpy(&conf, caps, sizeof(conf));
-
-	if (idx > 0)
-		return 0;
-
-	spa_pod_builder_push_object(b, &f[0], SPA_TYPE_OBJECT_Format, id);
-	spa_pod_builder_add(b,
-			SPA_FORMAT_mediaType,      SPA_POD_Id(SPA_MEDIA_TYPE_audio),
-			SPA_FORMAT_mediaSubtype,   SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
-			SPA_FORMAT_AUDIO_format,   SPA_POD_Id(SPA_AUDIO_FORMAT_S16),
-			0);
-	spa_pod_builder_prop(b, SPA_FORMAT_AUDIO_rate, 0);
-
-	spa_pod_builder_push_choice(b, &f[1], SPA_CHOICE_None, 0);
-	choice = (struct spa_pod_choice*)spa_pod_builder_frame(b, &f[1]);
-	i = 0;
-	SPA_FOR_EACH_ELEMENT_VAR(aac_frequencies, f) {
-		if (AAC_GET_FREQUENCY(conf) & f->config) {
-			if (i++ == 0)
-				spa_pod_builder_int(b, f->value);
-			spa_pod_builder_int(b, f->value);
-		}
-	}
-	if (i > 1)
-		choice->body.type = SPA_CHOICE_Enum;
-	spa_pod_builder_pop(b, &f[1]);
-
-	if (i == 0)
-		return -EINVAL;
-
-	if (SPA_FLAG_IS_SET(conf.channels, AAC_CHANNELS_1 | AAC_CHANNELS_2)) {
-		spa_pod_builder_add(b,
-				SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(2, 1, 2),
-				0);
-	} else if (conf.channels & AAC_CHANNELS_1) {
-		position[0] = SPA_AUDIO_CHANNEL_MONO;
-		spa_pod_builder_add(b,
-				SPA_FORMAT_AUDIO_channels, SPA_POD_Int(1),
-				SPA_FORMAT_AUDIO_position, SPA_POD_Array(sizeof(uint32_t),
-					SPA_TYPE_Id, 1, position),
-				0);
-	} else if (conf.channels & AAC_CHANNELS_2) {
-		position[0] = SPA_AUDIO_CHANNEL_FL;
-		position[1] = SPA_AUDIO_CHANNEL_FR;
-		spa_pod_builder_add(b,
-				SPA_FORMAT_AUDIO_channels, SPA_POD_Int(2),
-				SPA_FORMAT_AUDIO_position, SPA_POD_Array(sizeof(uint32_t),
-					SPA_TYPE_Id, 2, position),
-				0);
-	} else
-		return -EINVAL;
-
-	*param = spa_pod_builder_pop(b, &f[0]);
-	return *param == NULL ? -EIO : 1;
-}
-
 static int codec_validate_config(const struct media_codec *codec, uint32_t flags,
 			const void *caps, size_t caps_size,
 			struct spa_audio_info *info)
@@ -283,8 +214,10 @@ static int codec_validate_config(const struct media_codec *codec, uint32_t flags
 	/*
 	 * A2DP v1.3.2, 4.5.2: only one bit shall be set in bitfields.
 	 * However, there is a report (#1342) of device setting multiple
-	 * bits for AAC object type. It's not clear if this was due to
-	 * a BlueZ bug, but we can be lax here and below in codec_init.
+	 * bits for AAC object type. In addition AirPods set multiple bits.
+	 *
+	 * Some devices also set multiple bits in frequencies & channels.
+	 * For these, pick a "preferred" choice.
 	 */
 	if (!(conf.object_type & (AAC_OBJECT_TYPE_MPEG2_AAC_LC |
 					AAC_OBJECT_TYPE_MPEG4_AAC_LC |
@@ -315,6 +248,35 @@ static int codec_validate_config(const struct media_codec *codec, uint32_t flags
 	return 0;
 }
 
+static int codec_enum_config(const struct media_codec *codec, uint32_t flags,
+		const void *caps, size_t caps_size, uint32_t id, uint32_t idx,
+		struct spa_pod_builder *b, struct spa_pod **param)
+{
+	struct spa_audio_info info;
+	struct spa_pod_frame f[1];
+	int res;
+
+	if ((res = codec_validate_config(codec, flags, caps, caps_size, &info)) < 0)
+		return res;
+
+	if (idx > 0)
+		return 0;
+
+	spa_pod_builder_push_object(b, &f[0], SPA_TYPE_OBJECT_Format, id);
+	spa_pod_builder_add(b,
+			SPA_FORMAT_mediaType,      SPA_POD_Id(info.media_type),
+			SPA_FORMAT_mediaSubtype,   SPA_POD_Id(info.media_subtype),
+			SPA_FORMAT_AUDIO_format,   SPA_POD_Id(info.info.raw.format),
+			SPA_FORMAT_AUDIO_rate,     SPA_POD_Int(info.info.raw.rate),
+			SPA_FORMAT_AUDIO_channels, SPA_POD_Int(info.info.raw.channels),
+			SPA_FORMAT_AUDIO_position, SPA_POD_Array(sizeof(uint32_t),
+					SPA_TYPE_Id, info.info.raw.channels, info.info.raw.position),
+			0);
+
+	*param = spa_pod_builder_pop(b, &f[0]);
+	return *param == NULL ? -EIO : 1;
+}
+
 static void *codec_init_props(const struct media_codec *codec, uint32_t flags, const struct spa_dict *settings)
 {
 	struct props *p = calloc(1, sizeof(struct props));

From 67b4732c2601c97afad51524b125cbcdd919aeb4 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Sat, 14 Feb 2026 09:59:38 +0200
Subject: [PATCH 152/263] bluez5: aac: for multiple bits in aot, normalize to
 mandatory

Non-spec compliant devices may set multiple bits in AAC AOT, which is
invalid.

In this case, we should normalize to MPEG-2 AAC LC which is the
mandatory value in spec, not to MPEG-4 AAC LC. In select_config() we
also prefer MPEG-2 over MPEG-4.
---
 spa/plugins/bluez5/a2dp-codec-aac.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spa/plugins/bluez5/a2dp-codec-aac.c b/spa/plugins/bluez5/a2dp-codec-aac.c
index a19cdb093..a82efe983 100644
--- a/spa/plugins/bluez5/a2dp-codec-aac.c
+++ b/spa/plugins/bluez5/a2dp-codec-aac.c
@@ -331,14 +331,14 @@ static void *codec_init(const struct media_codec *codec, uint32_t flags,
 		goto error;
 
 	/* If object type has multiple bits set (invalid per spec, see above),
-	 * assume the device usually means AAC-LC.
+	 * assume the device usually means MPEG2 AAC LC which is mandatory.
 	 */
-	if (conf->object_type & AAC_OBJECT_TYPE_MPEG4_AAC_LC) {
-		res = aacEncoder_SetParam(this->aacenc, AACENC_AOT, AOT_AAC_LC);
+	if (conf->object_type & AAC_OBJECT_TYPE_MPEG2_AAC_LC) {
+		res = aacEncoder_SetParam(this->aacenc, AACENC_AOT, AOT_MP2_AAC_LC);
 		if (res != AACENC_OK)
 			goto error;
-	} else if (conf->object_type & AAC_OBJECT_TYPE_MPEG2_AAC_LC) {
-		res = aacEncoder_SetParam(this->aacenc, AACENC_AOT, AOT_MP2_AAC_LC);
+	} else if (conf->object_type & AAC_OBJECT_TYPE_MPEG4_AAC_LC) {
+		res = aacEncoder_SetParam(this->aacenc, AACENC_AOT, AOT_AAC_LC);
 		if (res != AACENC_OK)
 			goto error;
 	} else if (conf->object_type & AAC_OBJECT_TYPE_MPEG4_AAC_ELD) {

From d42646e91fb64fe9422f550b9759c2c06389335c Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Sat, 14 Feb 2026 09:48:41 +0200
Subject: [PATCH 153/263] bluez5: sbc: clean up codec_enum_config

Non-spec compliant devices may set multiple bits in code config, which
we currently reject in validate_config().

enum_config() does work to deal with multiple bits set, but this is
never used, so write the code in a simpler way to return a single
configuration.
---
 spa/plugins/bluez5/a2dp-codec-sbc.c | 74 +++++------------------------
 1 file changed, 12 insertions(+), 62 deletions(-)

diff --git a/spa/plugins/bluez5/a2dp-codec-sbc.c b/spa/plugins/bluez5/a2dp-codec-sbc.c
index b4ebfc2a2..f1b86e76b 100644
--- a/spa/plugins/bluez5/a2dp-codec-sbc.c
+++ b/spa/plugins/bluez5/a2dp-codec-sbc.c
@@ -343,77 +343,27 @@ static int codec_enum_config(const struct media_codec *codec, uint32_t flags,
 		const void *caps, size_t caps_size, uint32_t id, uint32_t idx,
 		struct spa_pod_builder *b, struct spa_pod **param)
 {
-	a2dp_sbc_t conf;
-        struct spa_pod_frame f[2];
-	struct spa_pod_choice *choice;
-	uint32_t i = 0;
-	uint32_t position[2];
+	struct spa_audio_info info;
+	struct spa_pod_frame f[1];
+	int res;
 
-	if (caps_size < sizeof(conf))
-		return -EINVAL;
-
-	memcpy(&conf, caps, sizeof(conf));
+	if ((res = codec_validate_config(codec, flags, caps, caps_size, &info)) < 0)
+		return res;
 
 	if (idx > 0)
 		return 0;
 
 	spa_pod_builder_push_object(b, &f[0], SPA_TYPE_OBJECT_Format, id);
 	spa_pod_builder_add(b,
-			SPA_FORMAT_mediaType,      SPA_POD_Id(SPA_MEDIA_TYPE_audio),
-			SPA_FORMAT_mediaSubtype,   SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
-			SPA_FORMAT_AUDIO_format,   SPA_POD_Id(SPA_AUDIO_FORMAT_S16),
+			SPA_FORMAT_mediaType,      SPA_POD_Id(info.media_type),
+			SPA_FORMAT_mediaSubtype,   SPA_POD_Id(info.media_subtype),
+			SPA_FORMAT_AUDIO_format,   SPA_POD_Id(info.info.raw.format),
+			SPA_FORMAT_AUDIO_rate,     SPA_POD_Int(info.info.raw.rate),
+			SPA_FORMAT_AUDIO_channels, SPA_POD_Int(info.info.raw.channels),
+			SPA_FORMAT_AUDIO_position, SPA_POD_Array(sizeof(uint32_t),
+					SPA_TYPE_Id, info.info.raw.channels, info.info.raw.position),
 			0);
-	spa_pod_builder_prop(b, SPA_FORMAT_AUDIO_rate, 0);
 
-	spa_pod_builder_push_choice(b, &f[1], SPA_CHOICE_None, 0);
-	choice = (struct spa_pod_choice*)spa_pod_builder_frame(b, &f[1]);
-	i = 0;
-	if (conf.frequency & SBC_SAMPLING_FREQ_48000) {
-		if (i++ == 0)
-			spa_pod_builder_int(b, 48000);
-		spa_pod_builder_int(b, 48000);
-	}
-	if (conf.frequency & SBC_SAMPLING_FREQ_44100) {
-		if (i++ == 0)
-			spa_pod_builder_int(b, 44100);
-		spa_pod_builder_int(b, 44100);
-	}
-	if (conf.frequency & SBC_SAMPLING_FREQ_32000) {
-		if (i++ == 0)
-			spa_pod_builder_int(b, 32000);
-		spa_pod_builder_int(b, 32000);
-	}
-	if (conf.frequency & SBC_SAMPLING_FREQ_16000) {
-		if (i++ == 0)
-			spa_pod_builder_int(b, 16000);
-		spa_pod_builder_int(b, 16000);
-	}
-	if (i > 1)
-		choice->body.type = SPA_CHOICE_Enum;
-	spa_pod_builder_pop(b, &f[1]);
-
-	if (conf.channel_mode & SBC_CHANNEL_MODE_MONO &&
-	    conf.channel_mode & (SBC_CHANNEL_MODE_JOINT_STEREO |
-		    SBC_CHANNEL_MODE_STEREO | SBC_CHANNEL_MODE_DUAL_CHANNEL)) {
-		spa_pod_builder_add(b,
-				SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(2, 1, 2),
-				0);
-	} else if (conf.channel_mode & SBC_CHANNEL_MODE_MONO) {
-		position[0] = SPA_AUDIO_CHANNEL_MONO;
-		spa_pod_builder_add(b,
-				SPA_FORMAT_AUDIO_channels, SPA_POD_Int(1),
-				SPA_FORMAT_AUDIO_position, SPA_POD_Array(sizeof(uint32_t),
-					SPA_TYPE_Id, 1, position),
-				0);
-	} else {
-		position[0] = SPA_AUDIO_CHANNEL_FL;
-		position[1] = SPA_AUDIO_CHANNEL_FR;
-		spa_pod_builder_add(b,
-				SPA_FORMAT_AUDIO_channels, SPA_POD_Int(2),
-				SPA_FORMAT_AUDIO_position, SPA_POD_Array(sizeof(uint32_t),
-					SPA_TYPE_Id, 2, position),
-				0);
-	}
 	*param = spa_pod_builder_pop(b, &f[0]);
 	return *param == NULL ? -EIO : 1;
 }

From 99079dd95538051a2f652f25a4f6a107d941f9a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 9 Mar 2026 16:22:42 +0100
Subject: [PATCH 154/263] docs/dma-buf: Document the correct device ID
 negotation key

The correct key is PW_CAPABILITY_DEVICE_ID_NEGOTIATION which contains a
number.
---
 doc/dox/internals/dma-buf.dox | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/dox/internals/dma-buf.dox b/doc/dox/internals/dma-buf.dox
index 5042f285c..ec02b9da7 100644
--- a/doc/dox/internals/dma-buf.dox
+++ b/doc/dox/internals/dma-buf.dox
@@ -349,10 +349,10 @@ rectangles. For example
 	params[n_params++] = spa_pod_builder_pop(&b, &f);
 ```
 
-After having received the first \ref SPA_PARAM_PeerCapability param, if it contained the \ref
-PW_CAPABILITY_DEVICE_ID set to `true`, the full set of formats can be sent using \ref
-pw_stream_update_params following by activating the stream using
-`pw_stream_set_active(stream, true)`.
+After having received the first \ref SPA_PARAM_PeerCapability param, if it contained the
+\ref PW_CAPABILITY_DEVICE_ID_NEGOTIATION set to a supported API version number, the full
+set of formats can be sent using \ref pw_stream_update_params following by activating the
+stream usina supported API version numberstream_set_active(stream, true)`.
 
 Note that the first \ref SPA_PARAM_Format received may be the result of the initial format
 negotian with bare minimum parameters, and will be superseded by the result of the format

From f7bb4c95ed0ce04fe00075b52bc3bc1456dfe4a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 9 Mar 2026 16:23:35 +0100
Subject: [PATCH 155/263] pipewire/capabilities: Update device ID negotation
 according to API docs

It was was documenting a previous iteration of the protocol which used a
boolean and a base64 encoded list.
---
 src/pipewire/capabilities.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pipewire/capabilities.h b/src/pipewire/capabilities.h
index d3040b761..b8431ac85 100644
--- a/src/pipewire/capabilities.h
+++ b/src/pipewire/capabilities.h
@@ -21,11 +21,14 @@ extern "C" {
  * \{
  */
 
-/**< Link capable of device ID negotiation. The value is either "true" or "false" */
+/**< Link capable of device ID negotiation. The value is to the version of the
+ * API specification. */
 #define PW_CAPABILITY_DEVICE_ID_NEGOTIATION	"pipewire.device-id-negotiation"
 /**< Link with device ID negotition capability supports negotiating with
- * provided list of devices. The value consists of a JSON encoded string array
- * of base64 encoded dev_t values. */
+ * a specific set of devices. The value of API version 1 consists of a JSON
+ * object containing a single key "available-devices" that contain a list of
+ * hexadecimal encoded `dev_t` device IDs.
+ */
 #define PW_CAPABILITY_DEVICE_IDS		"pipewire.device-ids"
 
 #define PW_CAPABILITY_DEVICE_ID		"pipewire.device-id"	/**< Link capable of device Id negotation */

From c745582ef56b7a352931ef3ffa0ab9f49729bee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 9 Mar 2026 16:24:10 +0100
Subject: [PATCH 156/263] pipewire/capabilities: Remove left-over macro
 defiition

This was used for a previous iteration, that used tags, and was replaced
with PW_CAPABILITY_DEVICE_ID_NEGOTIATION.
---
 src/pipewire/capabilities.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pipewire/capabilities.h b/src/pipewire/capabilities.h
index b8431ac85..3bb6c7b20 100644
--- a/src/pipewire/capabilities.h
+++ b/src/pipewire/capabilities.h
@@ -31,8 +31,6 @@ extern "C" {
  */
 #define PW_CAPABILITY_DEVICE_IDS		"pipewire.device-ids"
 
-#define PW_CAPABILITY_DEVICE_ID		"pipewire.device-id"	/**< Link capable of device Id negotation */
-
 /** \}
  */
 

From f6939a1cf0d48611e02b3b1434f5eeada7e0513e Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 9 Mar 2026 18:17:04 +0100
Subject: [PATCH 157/263] json: Use state machine and fix 1E10 parsing

Use a state machine to check for valid numbers and fix the 1E10
parsing case.

With help from Claude.
---
 spa/include/spa/utils/json-core.h | 57 +++++++++++++------------------
 test/test-spa-json.c              |  1 +
 2 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/spa/include/spa/utils/json-core.h b/spa/include/spa/utils/json-core.h
index 6d9cbe566..1a82df4bf 100644
--- a/spa/include/spa/utils/json-core.h
+++ b/spa/include/spa/utils/json-core.h
@@ -476,40 +476,29 @@ SPA_API_JSON bool spa_json_is_int(const char *val, int len)
 
 SPA_API_JSON bool spa_json_is_json_number(const char *val, int len)
 {
-        int pos = 0, first;
-        /* integer */
-        if (len == 0)
-                return 0;
-        if (pos < len && val[pos] == '-')
-                pos++;
-	first = pos;
-        while(pos < len && val[pos] >= '0' && val[pos] <= '9')
-		pos++;
-	if (pos == first || (first + 1 < pos && val[first] == '0'))
-		return 0;
-        /* fraction */
-        if (pos == len)
-                return 1;
-        if (val[pos++] != '.')
-                return 0;
-	first = pos;
-        while(pos < len && val[pos] >= '0' && val[pos] <= '9')
-		pos++;
-	if (pos == first)
-		return 0;
-        /* exponent */
-        if (pos == len)
-                return 1;
-        if (val[pos] != 'e' && val[pos] != 'E')
-                return 0;
-	pos++;
-        if (val[pos] == '-' || val[pos] == '+')
-		pos++;
-        while(pos < len && val[pos] >= '0' && val[pos] <= '9')
-		pos++;
-        if (pos != len)
-                return 0;
-        return 1;
+	static const int8_t trans[9][7] = {
+	/*      '1-9'  '0'  '-'  '+'  '.'  'eE'  other */
+	/* 0 */ {-1,  -1,   -1,  -1,   6,   7,   -1 },  /* after '0' */
+	/* 1 */ { 1,   1,   -1,  -1,   6,   7,   -1 },  /* in integer */
+	/* 2 */ { 2,   2,   -1,  -1,  -1,   7,   -1 },  /* in fraction */
+	/* 3 */ { 3,   3,   -1,  -1,  -1,  -1,   -1 },  /* in exponent */
+	/* 4 */ { 1,   0,    5,  -1,  -1,  -1,   -1 },  /* start */
+	/* 5 */ { 1,   0,   -1,  -1,  -1,  -1,   -1 },  /* after '-' */
+	/* 6 */ { 2,   2,   -1,  -1,  -1,  -1,   -1 },  /* after '.' */
+	/* 7 */ { 3,   3,    8,   8,  -1,  -1,   -1 },  /* after 'e'/'E' */
+	/* 8 */ { 3,   3,   -1,  -1,  -1,  -1,   -1 },  /* after exp sign */
+	};
+	int i, state = 4;
+
+	for (i = 0; i < len; i++) {
+		char v = val[i];
+		int cls = (v >= '1' && v <= '9') ? 0 : v == '0' ? 1 :
+		          v == '-' ? 2 : v == '+' ? 3 : v == '.' ? 4 :
+		          (v == 'e' || v == 'E') ? 5 : 6;
+		if ((state = trans[state][cls]) < 0)
+			return false;
+	}
+	return state < 4;
 }
 
 /* bool */
diff --git a/test/test-spa-json.c b/test/test-spa-json.c
index 907192844..1c0aada16 100644
--- a/test/test-spa-json.c
+++ b/test/test-spa-json.c
@@ -740,6 +740,7 @@ PWTEST(json_float_check)
 		{ "-1.", 1, 0 },
 
 		{ "-.0", 1, 0 },
+		{ "-1E10", 1, 1 },
 
 	};
 	unsigned i;

From 2548fcad25415ca15e35e7a3eaa84a5044ff796c Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 9 Mar 2026 18:33:32 +0100
Subject: [PATCH 158/263] spa: update lib.c

---
 spa/lib/lib.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spa/lib/lib.c b/spa/lib/lib.c
index 0aa35fae3..3ded776ad 100644
--- a/spa/lib/lib.c
+++ b/spa/lib/lib.c
@@ -2,7 +2,6 @@
 #undef SPA_AUDIO_MAX_CHANNELS
 
 #define SPA_API_IMPL	SPA_EXPORT
-#include <spa/utils/defs.h>
 #include <spa/buffer/alloc.h>
 #include <spa/buffer/buffer.h>
 #include <spa/buffer/type-info.h>
@@ -126,16 +125,17 @@
 #include <spa/param/video/raw-types.h>
 #include <spa/param/video/raw-utils.h>
 #include <spa/param/video/type-info.h>
+#include <spa/pod/body.h>
 #include <spa/pod/builder.h>
 #include <spa/pod/command.h>
 #include <spa/pod/compare.h>
 #include <spa/pod/dynamic.h>
 #include <spa/pod/event.h>
 #include <spa/pod/filter.h>
-#include <spa/pod/body.h>
 #include <spa/pod/iter.h>
 #include <spa/pod/parser.h>
 #include <spa/pod/pod.h>
+#include <spa/pod/simplify.h>
 #include <spa/pod/vararg.h>
 #include <spa/support/cpu.h>
 #include <spa/support/dbus.h>
@@ -158,6 +158,7 @@
 #include <spa/utils/hook.h>
 #include <spa/utils/json-core.h>
 #include <spa/utils/json.h>
+#include <spa/utils/json-builder.h>
 #include <spa/utils/json-pod.h>
 #include <spa/utils/keys.h>
 #include <spa/utils/list.h>

From 75c3d3ecf8d7ef188b00e2ac000070528c42565a Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Mon, 9 Mar 2026 20:39:44 +0200
Subject: [PATCH 159/263] bluez5: fix spa_bt_device_supports_media_codec() for
 HFP codecs

HFP codecs don't have a direction dependent "target" profile, and this
function was returning false if A2DP is disabled.

Don't check target profile for HFP, leave checks to backend.

Fixes HFP-only configurations, which were missing profiles.
---
 spa/plugins/bluez5/bluez5-dbus.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/spa/plugins/bluez5/bluez5-dbus.c b/spa/plugins/bluez5/bluez5-dbus.c
index 7dfe45911..6e4af5be2 100644
--- a/spa/plugins/bluez5/bluez5-dbus.c
+++ b/spa/plugins/bluez5/bluez5-dbus.c
@@ -2777,16 +2777,18 @@ bool spa_bt_device_supports_media_codec(struct spa_bt_device *device, const stru
 	bool is_bap = codec->kind == MEDIA_CODEC_BAP;
 	size_t i;
 
-	codec_target_profile = get_codec_target_profile(monitor, codec);
-	if (!codec_target_profile)
-		return false;
-
 	if (codec->kind == MEDIA_CODEC_HFP) {
 		if (!(profile & SPA_BT_PROFILE_HEADSET_AUDIO))
 			return false;
+		if (!is_media_codec_enabled(monitor, codec))
+			return false;
 		return spa_bt_backend_supports_codec(monitor->backend, device, codec->codec_id) == 1;
 	}
 
+	codec_target_profile = get_codec_target_profile(monitor, codec);
+	if (!codec_target_profile)
+		return false;
+
 	if (!device->adapter->a2dp_application_registered && is_a2dp) {
 		/* Codec switching not supported: only plain SBC allowed */
 		return (codec->codec_id == A2DP_CODEC_SBC && spa_streq(codec->name, "sbc") &&

From 22a5fad902959a42ac9159e8814221ce95ff7713 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Mon, 9 Mar 2026 21:30:36 +0200
Subject: [PATCH 160/263] bluez5: cleanup get_codec_profile()

Check codec kinds for each direction properly when mapping to profiles
corresponding to it. Being sloppy here masked another bug, so best fix
it.
---
 spa/plugins/bluez5/bluez5-dbus.c | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/spa/plugins/bluez5/bluez5-dbus.c b/spa/plugins/bluez5/bluez5-dbus.c
index 6e4af5be2..db1d8272c 100644
--- a/spa/plugins/bluez5/bluez5-dbus.c
+++ b/spa/plugins/bluez5/bluez5-dbus.c
@@ -587,18 +587,35 @@ static enum spa_bt_profile get_codec_profile(const struct media_codec *codec,
 {
 	switch (direction) {
 	case SPA_BT_MEDIA_SOURCE:
-		return codec->kind == MEDIA_CODEC_BAP ? SPA_BT_PROFILE_BAP_SOURCE : SPA_BT_PROFILE_A2DP_SOURCE;
+		if (codec->kind == MEDIA_CODEC_A2DP)
+			return SPA_BT_PROFILE_A2DP_SOURCE;
+		else if (codec->kind == MEDIA_CODEC_BAP)
+			return SPA_BT_PROFILE_BAP_SOURCE;
+		else if (codec->kind == MEDIA_CODEC_HFP)
+			return SPA_BT_PROFILE_HEADSET_AUDIO;
+		else
+			return SPA_BT_PROFILE_NULL;
 	case SPA_BT_MEDIA_SINK:
-		if (codec->kind == MEDIA_CODEC_ASHA)
+		if (codec->kind == MEDIA_CODEC_A2DP)
+			return SPA_BT_PROFILE_A2DP_SINK;
+		else if (codec->kind == MEDIA_CODEC_ASHA)
 			return SPA_BT_PROFILE_ASHA_SINK;
 		else if (codec->kind == MEDIA_CODEC_BAP)
 			return SPA_BT_PROFILE_BAP_SINK;
+		else if (codec->kind == MEDIA_CODEC_HFP)
+			return SPA_BT_PROFILE_HEADSET_AUDIO;
 		else
-			return SPA_BT_PROFILE_A2DP_SINK;
+			return SPA_BT_PROFILE_NULL;
 	case SPA_BT_MEDIA_SOURCE_BROADCAST:
-		return SPA_BT_PROFILE_BAP_BROADCAST_SOURCE;
+		if (codec->kind == MEDIA_CODEC_BAP)
+			return SPA_BT_PROFILE_BAP_BROADCAST_SOURCE;
+		else
+			return SPA_BT_PROFILE_NULL;
 	case SPA_BT_MEDIA_SINK_BROADCAST:
-		return SPA_BT_PROFILE_BAP_BROADCAST_SINK;
+		if (codec->kind == MEDIA_CODEC_BAP)
+			return SPA_BT_PROFILE_BAP_BROADCAST_SINK;
+		else
+			return SPA_BT_PROFILE_NULL;
 	default:
 		spa_assert_not_reached();
 	}

From 5e37d438815d279fb1cf19337aafdb1f95484b89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Mon, 9 Mar 2026 20:50:53 +0100
Subject: [PATCH 161/263] pipewire: impl-{node,port}: do not cache failed param
 enumerations

If the param enumeration fails, do not set `spa_param_info::user` to 1
indicating that the result is cached. Doing so can lead to the first
(uncached) call failing, while the rest will succeed (with 0 params).
---
 src/pipewire/impl-node.c | 9 +++++++--
 src/pipewire/impl-port.c | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c
index b9913d508..f590f36bc 100644
--- a/src/pipewire/impl-node.c
+++ b/src/pipewire/impl-node.c
@@ -2653,8 +2653,13 @@ int pw_impl_node_for_each_param(struct pw_impl_node *node,
 		spa_hook_remove(&listener);
 
 		if (user_data.cache) {
-			pw_param_update(&impl->param_list, &impl->pending_list, 0, NULL);
-			pi->user = 1;
+			if (SPA_RESULT_IS_OK(res) && !SPA_RESULT_IS_ASYNC(res)) {
+				pw_param_update(&impl->param_list, &impl->pending_list, 0, NULL);
+				pi->user = 1;
+			}
+			else {
+				pw_param_clear(&impl->pending_list, SPA_ID_INVALID);
+			}
 		}
 	}
 	return res;
diff --git a/src/pipewire/impl-port.c b/src/pipewire/impl-port.c
index 3b87c8c0b..7731264db 100644
--- a/src/pipewire/impl-port.c
+++ b/src/pipewire/impl-port.c
@@ -1740,8 +1740,13 @@ int pw_impl_port_for_each_param(struct pw_impl_port *port,
 		spa_hook_remove(&listener);
 
 		if (user_data.cache) {
-			pw_param_update(&impl->param_list, &impl->pending_list, 0, NULL);
-			pi->user = 1;
+			if (SPA_RESULT_IS_OK(res) && !SPA_RESULT_IS_ASYNC(res)) {
+				pw_param_update(&impl->param_list, &impl->pending_list, 0, NULL);
+				pi->user = 1;
+			}
+			else {
+				pw_param_clear(&impl->pending_list, SPA_ID_INVALID);
+			}
 		}
 	}
 

From abf37dbddef96518f7e93f39d910fd4e38cc887b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Mon, 9 Mar 2026 21:21:02 +0100
Subject: [PATCH 162/263] pipewire: module-client-node: use
 `pw_param_info_find()` to check validity

Previously when parameters were enumarated, it was checked if at least one
param was known for `id`. If not, `-ENOENT` was returned to signal that
this param id is not supported.

This is not necessarily true, since a param id might be supported, but it
might have zero params at the moment, in which case an unexpected error
would be returned.

Fix that by using `pw_param_info_find()` with the underlying impl object
to check if the param id is actually supported.
---
 src/modules/module-client-node/client-node.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/modules/module-client-node/client-node.c b/src/modules/module-client-node/client-node.c
index 0253591cf..107d7363e 100644
--- a/src/modules/module-client-node/client-node.c
+++ b/src/modules/module-client-node/client-node.c
@@ -330,11 +330,13 @@ static int impl_node_enum_params(void *object, int seq,
 	struct spa_pod_dynamic_builder b;
 	struct spa_result_node_params result;
 	uint32_t count = 0;
-	bool found = false;
 
 	spa_return_val_if_fail(impl != NULL, -EINVAL);
 	spa_return_val_if_fail(num != 0, -EINVAL);
 
+	if (!pw_param_info_find(impl->this.node->info.params, impl->this.node->info.n_params, id))
+		return -ENOENT;
+
 	result.id = id;
 	result.next = 0;
 
@@ -350,8 +352,6 @@ static int impl_node_enum_params(void *object, int seq,
 		if (param == NULL || !spa_pod_is_object_id(param, id))
 			continue;
 
-		found = true;
-
 		if (result.index < start)
 			continue;
 
@@ -366,7 +366,8 @@ static int impl_node_enum_params(void *object, int seq,
 		if (count == num)
 			break;
 	}
-	return found ? 0 : -ENOENT;
+
+	return 0;
 }
 
 static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
@@ -598,7 +599,6 @@ node_port_enum_params(struct impl *impl, int seq,
 	struct spa_pod_dynamic_builder b;
 	struct spa_result_node_params result;
 	uint32_t count = 0;
-	bool found = false;
 
 	spa_return_val_if_fail(impl != NULL, -EINVAL);
 	spa_return_val_if_fail(num != 0, -EINVAL);
@@ -609,6 +609,9 @@ node_port_enum_params(struct impl *impl, int seq,
 	pw_log_debug("%p: seq:%d port %d.%d id:%u start:%u num:%u n_params:%d",
 			impl, seq, direction, port_id, id, start, num, port->params.n_params);
 
+	if (!pw_param_info_find(port->port->info.params, port->port->info.n_params, id))
+		return -ENOENT;
+
 	result.id = id;
 	result.next = 0;
 
@@ -624,8 +627,6 @@ node_port_enum_params(struct impl *impl, int seq,
 		if (param == NULL || !spa_pod_is_object_id(param, id))
 			continue;
 
-		found = true;
-
 		if (result.index < start)
 			continue;
 
@@ -640,7 +641,8 @@ node_port_enum_params(struct impl *impl, int seq,
 		if (count == num)
 			break;
 	}
-	return found ? 0 : -ENOENT;
+
+	return 0;
 }
 
 static int

From dc1738ce5786e3304d25cd5c43b0b5cf434b489a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Mon, 9 Mar 2026 21:52:02 +0100
Subject: [PATCH 163/263] spa: support: loop: more mutex lock checks

Check the return values of `pthread_mutex_{,un}lock()` in more places
to diagnose misbehaving applications.

See #5148
---
 spa/plugins/support/loop.c | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/spa/plugins/support/loop.c b/spa/plugins/support/loop.c
index e5e49849f..57b87010c 100644
--- a/spa/plugins/support/loop.c
+++ b/spa/plugins/support/loop.c
@@ -462,12 +462,12 @@ again:
 		 * this invoking thread but we need to serialize the flushing here with
 		 * a mutex */
 		if (loop_thread == 0)
-			pthread_mutex_lock(&impl->lock);
+			spa_assert_se(pthread_mutex_lock(&impl->lock) == 0);
 
 		flush_all_queues(impl);
 
 		if (loop_thread == 0)
-			pthread_mutex_unlock(&impl->lock);
+			spa_assert_se(pthread_mutex_unlock(&impl->lock) == 0);
 
 		res = item->res;
 	} else {
@@ -482,9 +482,9 @@ again:
 				recurse = impl->recurse;
 				while (impl->recurse > 0) {
 					impl->recurse--;
-					pthread_mutex_unlock(&impl->lock);
+					spa_assert_se(pthread_mutex_unlock(&impl->lock) == 0);
 				}
-				pthread_mutex_unlock(&impl->lock);
+				spa_assert_se(pthread_mutex_unlock(&impl->lock) == 0);
 			}
 
 			if ((res = spa_system_eventfd_read(impl->system, queue->ack_fd, &count)) < 0)
@@ -492,7 +492,7 @@ again:
 						queue, queue->ack_fd, spa_strerror(res));
 
 			for (i = 0; i < recurse; i++) {
-				pthread_mutex_lock(&impl->lock);
+				spa_assert_se(pthread_mutex_lock(&impl->lock) == 0);
 				impl->recurse++;
 			}
 
@@ -569,9 +569,14 @@ static int loop_locked(void *object, spa_invoke_func_t func, uint32_t seq,
 {
 	struct impl *impl = object;
 	int res;
-	pthread_mutex_lock(&impl->lock);
+
+	res = pthread_mutex_lock(&impl->lock);
+	if (res)
+		return -res;
+
 	res = func(&impl->loop, false, seq, data, size, user_data);
-	pthread_mutex_unlock(&impl->lock);
+	spa_assert_se(pthread_mutex_unlock(&impl->lock) == 0);
+
 	return res;
 }
 
@@ -598,7 +603,7 @@ static void loop_enter(void *object)
 	struct impl *impl = object;
 	pthread_t thread_id = pthread_self();
 
-	pthread_mutex_lock(&impl->lock);
+	spa_assert_se(pthread_mutex_lock(&impl->lock) == 0);
 	if (impl->enter_count == 0) {
 		spa_return_if_fail(impl->thread == 0);
 		impl->thread = thread_id;
@@ -625,7 +630,7 @@ static void loop_leave(void *object)
 		impl->thread = 0;
 		flush_all_queues(impl);
 	}
-	pthread_mutex_unlock(&impl->lock);
+	spa_assert_se(pthread_mutex_unlock(&impl->lock) == 0);
 }
 
 static int loop_check(void *object)
@@ -644,7 +649,7 @@ static int loop_check(void *object)
 
 	/* we could take the lock, check if we actually locked it somewhere */
 	res = impl->recurse > 0 ? 1 : -EPERM;
-	pthread_mutex_unlock(&impl->lock);
+	spa_assert_se(pthread_mutex_unlock(&impl->lock) == 0);
 	return res;
 }
 static int loop_lock(void *object)
@@ -748,11 +753,11 @@ static int loop_iterate_cancel(void *object, int timeout)
 
 	remove_count = impl->remove_count;
 	spa_loop_control_hook_before(&impl->hooks_list);
-	pthread_mutex_unlock(&impl->lock);
+	spa_assert_se(pthread_mutex_unlock(&impl->lock) == 0);
 
 	nfds = spa_system_pollfd_wait(impl->system, impl->poll_fd, ep, SPA_N_ELEMENTS(ep), timeout);
 
-	pthread_mutex_lock(&impl->lock);
+	spa_assert_se(pthread_mutex_lock(&impl->lock) == 0);
 	spa_loop_control_hook_after(&impl->hooks_list);
 	if (remove_count != impl->remove_count)
 		nfds = 0;
@@ -796,11 +801,11 @@ static int loop_iterate(void *object, int timeout)
 
 	remove_count = impl->remove_count;
 	spa_loop_control_hook_before(&impl->hooks_list);
-	pthread_mutex_unlock(&impl->lock);
+	spa_assert_se(pthread_mutex_unlock(&impl->lock) == 0);
 
 	nfds = spa_system_pollfd_wait(impl->system, impl->poll_fd, ep, SPA_N_ELEMENTS(ep), timeout);
 
-	pthread_mutex_lock(&impl->lock);
+	spa_assert_se(pthread_mutex_lock(&impl->lock) == 0);
 	spa_loop_control_hook_after(&impl->hooks_list);
 	if (remove_count != impl->remove_count)
 		return 0;

From a661f14d2c7b010334989018e3ebe12dde3ee49f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Mon, 9 Mar 2026 21:59:43 +0100
Subject: [PATCH 164/263] spa: support: loop: check `enter_count` before
 iterating

Calling "iterate()" on a loop that has not been entered by the
calling thread is invalid. So try to diagnose misbehaving applications
on a "best effort" basis by checking `impl::enter_count`.

This is not a foolproof check, and can also technically cause data
races while reading the variable.

See #5148
---
 spa/plugins/support/loop.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spa/plugins/support/loop.c b/spa/plugins/support/loop.c
index 57b87010c..88364b7b3 100644
--- a/spa/plugins/support/loop.c
+++ b/spa/plugins/support/loop.c
@@ -751,6 +751,8 @@ static int loop_iterate_cancel(void *object, int timeout)
 	int i, nfds;
 	uint32_t remove_count;
 
+	spa_return_val_if_fail(impl->enter_count > 0, -EPERM);
+
 	remove_count = impl->remove_count;
 	spa_loop_control_hook_before(&impl->hooks_list);
 	spa_assert_se(pthread_mutex_unlock(&impl->lock) == 0);
@@ -799,6 +801,8 @@ static int loop_iterate(void *object, int timeout)
 	int i, nfds;
 	uint32_t remove_count;
 
+	spa_return_val_if_fail(impl->enter_count > 0, -EPERM);
+
 	remove_count = impl->remove_count;
 	spa_loop_control_hook_before(&impl->hooks_list);
 	spa_assert_se(pthread_mutex_unlock(&impl->lock) == 0);

From 810617997b0374b63b501c91f960848b1770139e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Mon, 9 Mar 2026 21:40:23 +0100
Subject: [PATCH 165/263] spa: libcamera: source: `SPA_PARAM_Props` is
 write-only

There are no readable `SPA_PARAM_Props` on the node, so mark it write-only.
---
 spa/plugins/libcamera/libcamera-source.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spa/plugins/libcamera/libcamera-source.cpp b/spa/plugins/libcamera/libcamera-source.cpp
index c23a6fb9d..fba3d8b0b 100644
--- a/spa/plugins/libcamera/libcamera-source.cpp
+++ b/spa/plugins/libcamera/libcamera-source.cpp
@@ -2163,7 +2163,7 @@ impl::impl(spa_log *log, spa_loop *data_loop, spa_system *system,
 			&impl_node, this);
 
 	params[NODE_PropInfo] = SPA_PARAM_INFO(SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ);
-	params[NODE_Props] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE);
+	params[NODE_Props] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_WRITE);
 	params[NODE_EnumFormat] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
 	params[NODE_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
 

From d33066cdd71b4449b443425fd2034d447289e874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Tue, 10 Mar 2026 12:08:33 +0100
Subject: [PATCH 166/263] pipewire: module-client-node: use `pw_log_*()`

Use the `pw_log_*()` macros instead of the `spa_log_*()` ones since
this is a pipewire module, and otherwise not the expected log topic
would be used.
---
 src/modules/module-client-node/client-node.c | 42 ++++++++++----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/modules/module-client-node/client-node.c b/src/modules/module-client-node/client-node.c
index 107d7363e..9bf1c798b 100644
--- a/src/modules/module-client-node/client-node.c
+++ b/src/modules/module-client-node/client-node.c
@@ -92,7 +92,6 @@ struct impl {
 
 	struct spa_node node;
 
-	struct spa_log *log;
 	struct spa_loop *data_loop;
 	struct spa_system *data_system;
 
@@ -282,7 +281,7 @@ static int clear_buffers(struct impl *impl, struct mix *mix)
 	for (i = 0; i < mix->n_buffers; i++) {
 		struct buffer *b = &mix->buffers[i];
 
-		spa_log_debug(impl->log, "%p: clear buffer %d", impl, i);
+		pw_log_debug("%p: clear buffer %d", impl, i);
 		clear_buffer(impl, &b->buffer);
 		pw_memblock_unref(b->mem);
 	}
@@ -299,7 +298,7 @@ static void free_mix(struct port *p, struct mix *mix)
 
 	if (mix->n_buffers) {
 		/* this shouldn't happen */
-		spa_log_warn(impl->log, "%p: mix port-id:%u freeing leaked buffers", impl, mix->mix_id - 1u);
+		pw_log_warn("%p: mix port-id:%u freeing leaked buffers", impl, mix->mix_id - 1u);
 	}
 
 	clear_buffers(impl, mix);
@@ -509,7 +508,7 @@ do_update_port(struct impl *impl,
 	       const struct spa_port_info *info)
 {
 	if (change_mask & PW_CLIENT_NODE_PORT_UPDATE_PARAMS) {
-		spa_log_debug(impl->log, "%p: port %u update %d params", impl, port->id, n_params);
+		pw_log_debug("%p: port %u update %d params", impl, port->id, n_params);
 		update_params(&port->params, n_params, params);
 	}
 
@@ -543,7 +542,7 @@ static int mix_clear_cb(void *item, void *data)
 static void
 clear_port(struct impl *impl, struct port *port)
 {
-	spa_log_debug(impl->log, "%p: clear port %p", impl, port);
+	pw_log_debug("%p: clear port %p", impl, port);
 
 	do_update_port(impl, port,
 		       PW_CLIENT_NODE_PORT_UPDATE_PARAMS |
@@ -783,7 +782,7 @@ do_port_use_buffers(struct impl *impl,
 	if (n_buffers > MAX_BUFFERS)
 		return -ENOSPC;
 
-	spa_log_debug(impl->log, "%p: %s port %d.%d use buffers %p %u flags:%08x", impl,
+	pw_log_debug("%p: %s port %d.%d use buffers %p %u flags:%08x", impl,
 			direction == SPA_DIRECTION_INPUT ? "input" : "output",
 			port_id, mix_id, buffers, n_buffers, flags);
 
@@ -853,7 +852,7 @@ do_port_use_buffers(struct impl *impl,
 		mb[i].mem_id = m->id;
 		mb[i].offset = SPA_PTRDIFF(baseptr, mem->map->ptr);
 		mb[i].size = SPA_PTRDIFF(endptr, baseptr);
-		spa_log_debug(impl->log, "%p: buffer %d %d %d %d", impl, i, mb[i].mem_id,
+		pw_log_debug("%p: buffer %d %d %d %d", impl, i, mb[i].mem_id,
 				mb[i].offset, mb[i].size);
 
 		b->buffer.n_metas = SPA_MIN(buffers[i]->n_metas, MAX_METAS);
@@ -883,7 +882,7 @@ do_port_use_buffers(struct impl *impl,
 				if (d->flags & SPA_DATA_FLAG_WRITABLE)
 					flags |= PW_MEMBLOCK_FLAG_WRITABLE;
 
-				spa_log_debug(impl->log, "mem %d type:%d fd:%d", j, d->type, (int)d->fd);
+				pw_log_debug("mem %d type:%d fd:%d", j, d->type, (int)d->fd);
 				m = pw_mempool_import(impl->client_pool,
 					flags, d->type, d->fd);
 				if (m == NULL)
@@ -894,14 +893,14 @@ do_port_use_buffers(struct impl *impl,
 				break;
 			}
 			case SPA_DATA_MemPtr:
-				spa_log_debug(impl->log, "mem %d %zd", j, SPA_PTRDIFF(d->data, baseptr));
+				pw_log_debug("mem %d %zd", j, SPA_PTRDIFF(d->data, baseptr));
 				b->datas[j].data = SPA_INT_TO_PTR(SPA_PTRDIFF(d->data, baseptr));
 				SPA_FLAG_CLEAR(b->datas[j].flags, SPA_DATA_FLAG_MAPPABLE);
 				break;
 			default:
 				b->datas[j].type = SPA_ID_INVALID;
 				b->datas[j].data = NULL;
-				spa_log_error(impl->log, "invalid memory type %d", d->type);
+				pw_log_error("invalid memory type %d", d->type);
 				break;
 			}
 		}
@@ -937,7 +936,7 @@ impl_node_port_reuse_buffer(void *object, uint32_t port_id, uint32_t buffer_id)
 	spa_return_val_if_fail(impl != NULL, -EINVAL);
 	spa_return_val_if_fail(CHECK_PORT(impl, SPA_DIRECTION_OUTPUT, port_id), -EINVAL);
 
-	spa_log_trace_fp(impl->log, "reuse buffer %d", buffer_id);
+	pw_log_trace_fp("reuse buffer %d", buffer_id);
 
 	return -ENOTSUP;
 }
@@ -950,7 +949,7 @@ static int impl_node_process(void *object)
 
 	/* this should not be called, we call the exported node
 	 * directly */
-	spa_log_warn(impl->log, "exported node activation");
+	pw_log_warn("exported node activation");
 	spa_system_clock_gettime(impl->data_system, CLOCK_MONOTONIC, &ts);
 	n->rt.target.activation->status = PW_NODE_ACTIVATION_TRIGGERED;
 	n->rt.target.activation->signal_time = SPA_TIMESPEC_TO_NSEC(&ts);
@@ -1011,7 +1010,7 @@ client_node_port_update(void *data,
 	struct port *port;
 	bool remove;
 
-	spa_log_debug(impl->log, "%p: got port update change:%08x params:%d",
+	pw_log_debug("%p: got port update change:%08x params:%d",
 			impl, change_mask, n_params);
 
 	remove = (change_mask == 0);
@@ -1049,7 +1048,7 @@ client_node_port_update(void *data,
 static int client_node_set_active(void *data, bool active)
 {
 	struct impl *impl = data;
-	spa_log_debug(impl->log, "%p: active:%d", impl, active);
+	pw_log_debug("%p: active:%d", impl, active);
 	return pw_impl_node_set_active(impl->this.node, active);
 }
 
@@ -1072,7 +1071,7 @@ static int client_node_port_buffers(void *data,
 	struct mix *mix;
 	uint32_t i, j;
 
-	spa_log_debug(impl->log, "%p: %s port %d.%d buffers %p %u", impl,
+	pw_log_debug("%p: %s port %d.%d buffers %p %u", impl,
 			direction == SPA_DIRECTION_INPUT ? "input" : "output",
 			port_id, mix_id, buffers, n_buffers);
 
@@ -1100,7 +1099,7 @@ static int client_node_port_buffers(void *data,
 		oldbuf = b->outbuf;
 		newbuf = buffers[i];
 
-		spa_log_debug(impl->log, "buffer %d n_datas:%d", i, newbuf->n_datas);
+		pw_log_debug("buffer %d n_datas:%d", i, newbuf->n_datas);
 
 		for (j = 0; j < b->buffer.n_datas; j++) {
 			struct spa_chunk *oldchunk = oldbuf->datas[j].chunk;
@@ -1109,7 +1108,7 @@ static int client_node_port_buffers(void *data,
 
 			if (d->type == SPA_DATA_MemFd &&
 			    !SPA_FLAG_IS_SET(flags, SPA_DATA_FLAG_MAPPABLE)) {
-				spa_log_debug(impl->log, "buffer:%d data:%d has non mappable MemFd, "
+				pw_log_debug("buffer:%d data:%d has non mappable MemFd, "
 						"fixing to ensure backwards compatibility.",
 						i, j);
 				flags |= SPA_DATA_FLAG_MAPPABLE;
@@ -1124,7 +1123,7 @@ static int client_node_port_buffers(void *data,
 			b->datas[j].flags = flags;
 			b->datas[j].fd = d->fd;
 
-			spa_log_debug(impl->log, " data %d type:%d fl:%08x fd:%d, offs:%d max:%d",
+			pw_log_debug(" data %d type:%d fl:%08x fd:%d, offs:%d max:%d",
 					j, d->type, flags, (int) d->fd, d->mapoffset,
 					d->maxsize);
 		}
@@ -1151,7 +1150,7 @@ static void node_on_data_fd_events(struct spa_source *source)
 	struct impl *impl = source->data;
 
 	if (SPA_UNLIKELY(source->rmask & (SPA_IO_ERR | SPA_IO_HUP))) {
-		spa_log_warn(impl->log, "%p: got error", impl);
+		pw_log_warn("%p: got error", impl);
 		return;
 	}
 	if (SPA_LIKELY(source->rmask & SPA_IO_IN)) {
@@ -1168,10 +1167,10 @@ static void node_on_data_fd_events(struct spa_source *source)
 		if (impl->resource && impl->resource->version < 5) {
 			struct pw_node_activation *a = node->rt.target.activation;
 			int status = a->state[0].status;
-			spa_log_trace_fp(impl->log, "%p: got ready %d", impl, status);
+			pw_log_trace_fp("%p: got ready %d", impl, status);
 			spa_node_call_ready(&impl->callbacks, status);
 		} else {
-			spa_log_trace_fp(impl->log, "%p: got complete", impl);
+			pw_log_trace_fp("%p: got complete", impl);
 			pw_impl_node_rt_emit_complete(node);
 		}
 	}
@@ -1772,7 +1771,6 @@ struct pw_impl_client_node *pw_impl_client_node_new(struct pw_resource *resource
 	pw_log_debug("%p: new", &impl->node);
 
 	impl_init(impl, NULL);
-	impl->log = pw_log_get();
 	impl->resource = resource;
 	impl->client = client;
 	impl->client_pool = pw_impl_client_get_mempool(client);

From 5c67ab2a7a8a2415ed13cce50f44ce9b3d95a7f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Tue, 10 Mar 2026 12:24:31 +0100
Subject: [PATCH 167/263] pipewire: mem: log if `close()` fails

If a file descriptor is expected to be closed by the associated `pw_memblock`,
and closing fails, then that usually signals a more serious issue in the memory
accounting. So add a log message when that happens.
---
 src/pipewire/mem.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pipewire/mem.c b/src/pipewire/mem.c
index 642a6b78e..e398a8f09 100644
--- a/src/pipewire/mem.c
+++ b/src/pipewire/mem.c
@@ -15,6 +15,7 @@
 #include <sys/syscall.h>
 #include <sys/stat.h>
 
+#include <spa/utils/cleanup.h>
 #include <spa/utils/list.h>
 #include <spa/buffer/buffer.h>
 
@@ -856,8 +857,10 @@ void pw_memblock_free(struct pw_memblock *block)
 	}
 
 	if (block->fd != -1 && !(block->flags & PW_MEMBLOCK_FLAG_DONT_CLOSE)) {
-		pw_log_debug("%p: close fd:%d", pool, block->fd);
-		close(block->fd);
+		int fd = spa_steal_fd(block->fd);
+		pw_log_debug("%p: block:%p close fd:%d", pool, block, fd);
+		if (close(fd) < 0)
+			pw_log_error("%p: block:%p close fd:%d failed: %m", pool, block, fd);
 	}
 
 	spa_hook_list_clean(&b->listener_list);

From 8f22785cf0c01baaf0f9d647ba9ebf2a0ae4d915 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 10 Mar 2026 09:40:27 +0100
Subject: [PATCH 168/263] json-core: use table to classify chars for number
 check

---
 spa/include/spa/utils/json-core.h | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/spa/include/spa/utils/json-core.h b/spa/include/spa/utils/json-core.h
index 1a82df4bf..0ffb21abf 100644
--- a/spa/include/spa/utils/json-core.h
+++ b/spa/include/spa/utils/json-core.h
@@ -488,14 +488,20 @@ SPA_API_JSON bool spa_json_is_json_number(const char *val, int len)
 	/* 7 */ { 3,   3,    8,   8,  -1,  -1,   -1 },  /* after 'e'/'E' */
 	/* 8 */ { 3,   3,   -1,  -1,  -1,  -1,   -1 },  /* after exp sign */
 	};
+	static const int8_t char_class[128] = {
+		6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,  /* 0-15 */
+		6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,  /* 16-31 */
+		6,6,6,6,6,6,6,6,6,6,6,3,6,2,4,6,  /* 32-47: + - . */
+		1,0,0,0,0,0,0,0,0,0,6,6,6,6,6,6,  /* 48-63: 0-9 */
+		6,6,6,6,6,5,6,6,6,6,6,6,6,6,6,6,  /* 64-79: E */
+		6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,  /* 80-95 */
+		6,6,6,6,6,5,6,6,6,6,6,6,6,6,6,6,  /* 96-111: e */
+		6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,  /* 112-127 */
+	};
 	int i, state = 4;
 
 	for (i = 0; i < len; i++) {
-		char v = val[i];
-		int cls = (v >= '1' && v <= '9') ? 0 : v == '0' ? 1 :
-		          v == '-' ? 2 : v == '+' ? 3 : v == '.' ? 4 :
-		          (v == 'e' || v == 'E') ? 5 : 6;
-		if ((state = trans[state][cls]) < 0)
+		if ((state = trans[state][char_class[val[i]&0x7f]]) < 0)
 			return false;
 	}
 	return state < 4;

From 6a3ac7f7b02c83a883c9e28ef88ec990cd84ecae Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 10 Mar 2026 12:26:21 +0100
Subject: [PATCH 169/263] examples: support REQUEST like video-src

---
 src/examples/video-src-alloc.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/examples/video-src-alloc.c b/src/examples/video-src-alloc.c
index add9597ed..c89ce8d78 100644
--- a/src/examples/video-src-alloc.c
+++ b/src/examples/video-src-alloc.c
@@ -192,7 +192,11 @@ static void on_stream_state_changed(void *_data, enum pw_stream_state old, enum
 		interval.tv_sec = 0;
 		interval.tv_nsec = 40 * SPA_NSEC_PER_MSEC;
 
-		if (pw_stream_is_driving(data->stream))
+		printf("driving:%d lazy:%d\n",
+				pw_stream_is_driving(data->stream),
+				pw_stream_is_lazy(data->stream));
+
+		if (pw_stream_is_driving(data->stream) != pw_stream_is_lazy(data->stream))
 			pw_loop_update_timer(pw_thread_loop_get_loop(data->loop),
 					data->timer, &timeout, &interval, false);
 		break;
@@ -390,6 +394,7 @@ int main(int argc, char *argv[])
 			"video-src-alloc",
 			pw_properties_new(
 				PW_KEY_MEDIA_CLASS, "Video/Source",
+				PW_KEY_NODE_SUPPORTS_REQUEST, "1",
 				NULL),
 			&stream_events,
 			&data);

From 7ecd51dc80262526d16560373c0c76408dfd946f Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 10 Mar 2026 14:25:07 +0100
Subject: [PATCH 170/263] client-node: avoid using invalid fd or mem in
 clear_data

Don't close an -1 fd in clear_data.

If we let the client allocate buffer, set our fd and data to invalid
values. If the client decides to renegotiate before we get the buffer
data we might otherwise try to clear the mem_id (default 0) or
close the fd (also default 0).

Fixes #5162
---
 src/modules/module-client-node/client-node.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/modules/module-client-node/client-node.c b/src/modules/module-client-node/client-node.c
index 9bf1c798b..bd9a1dde2 100644
--- a/src/modules/module-client-node/client-node.c
+++ b/src/modules/module-client-node/client-node.c
@@ -263,7 +263,8 @@ static void clear_data(struct impl *impl, struct spa_data *d)
 	case SPA_DATA_DmaBuf:
 	case SPA_DATA_SyncObj:
 		pw_log_debug("%p: close fd:%d", impl, (int)d->fd);
-		close(d->fd);
+		if (d->fd != -1)
+			close(d->fd);
 		break;
 	}
 }
@@ -865,8 +866,11 @@ do_port_use_buffers(struct impl *impl,
 
 			memcpy(&b->datas[j], d, sizeof(struct spa_data));
 
-			if (flags & SPA_NODE_BUFFERS_FLAG_ALLOC)
+			if (flags & SPA_NODE_BUFFERS_FLAG_ALLOC) {
+				b->datas[j].fd = -1;
+				b->datas[j].data = SPA_UINT32_TO_PTR(SPA_ID_INVALID);
 				continue;
+			}
 
 			switch (d->type) {
 			case SPA_DATA_DmaBuf:

From 5f4b422ab1bfec0b82c948bf0a3ff623424b88aa Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 10 Mar 2026 16:46:29 +0100
Subject: [PATCH 171/263] loop: improve cancellation handling

Now that the loop_leave function will assert when the unlock fails we
need to be extra careful with the cancellable loop. If it cancels inside
the poll or one of the before/after callbacks we need to make sure that
we lock the loop correctly again or we will create an assert later on.

Do this by pushing the cleanup earlier and then record all the things we
managed to do before we get canceled. If we ever get canceled and the
lock was unlocked but not locked again, fix this up.

Fix fixes issues when using the JACK API causing assertions when the
data loop is stopped/cancelled.
---
 spa/plugins/support/loop.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/spa/plugins/support/loop.c b/spa/plugins/support/loop.c
index 88364b7b3..1ec2b21c2 100644
--- a/spa/plugins/support/loop.c
+++ b/spa/plugins/support/loop.c
@@ -727,13 +727,20 @@ static int loop_accept(void *object)
 }
 
 struct cancellation_handler_data {
+	struct impl *impl;
 	struct spa_poll_event *ep;
 	int ep_count;
+	int unlocked;
+	int locked;
 };
 
 static void cancellation_handler(void *closure)
 {
 	const struct cancellation_handler_data *data = closure;
+	struct impl *impl = data->impl;
+
+	if (data->unlocked && !data->locked)
+		spa_assert_se(pthread_mutex_lock(&impl->lock) == 0);
 
 	for (int i = 0; i < data->ep_count; i++) {
 		struct spa_source *s = data->ep[i].data;
@@ -750,22 +757,24 @@ static int loop_iterate_cancel(void *object, int timeout)
 	struct spa_poll_event ep[MAX_EP], *e;
 	int i, nfds;
 	uint32_t remove_count;
+	struct cancellation_handler_data cdata = { impl, ep, 0, 0, 0 };
 
 	spa_return_val_if_fail(impl->enter_count > 0, -EPERM);
 
+	pthread_cleanup_push(cancellation_handler, &cdata);
+
 	remove_count = impl->remove_count;
 	spa_loop_control_hook_before(&impl->hooks_list);
-	spa_assert_se(pthread_mutex_unlock(&impl->lock) == 0);
+	spa_assert_se((cdata.unlocked = (pthread_mutex_unlock(&impl->lock) == 0)));
 
 	nfds = spa_system_pollfd_wait(impl->system, impl->poll_fd, ep, SPA_N_ELEMENTS(ep), timeout);
 
-	spa_assert_se(pthread_mutex_lock(&impl->lock) == 0);
+	spa_assert_se((cdata.locked = (pthread_mutex_lock(&impl->lock) == 0)));
 	spa_loop_control_hook_after(&impl->hooks_list);
 	if (remove_count != impl->remove_count)
 		nfds = 0;
 
-	struct cancellation_handler_data cdata = { ep, nfds };
-	pthread_cleanup_push(cancellation_handler, &cdata);
+	cdata.ep_count = nfds;
 
 	/* first we set all the rmasks, then call the callbacks. The reason is that
 	 * some callback might also want to look at other sources it manages and

From 5cc63c1b347b85b19cb280823196d1c7e4f892e3 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 11 Mar 2026 12:36:39 +0100
Subject: [PATCH 172/263] audiomixer: only add the input port to mix_list

Adding the output port is not a problem because there is never a buffer
to consume and mix but it wastes cycles.
---
 spa/plugins/audiomixer/audiomixer.c | 2 +-
 spa/plugins/audiomixer/mixer-dsp.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spa/plugins/audiomixer/audiomixer.c b/spa/plugins/audiomixer/audiomixer.c
index 99b0658a0..54549bce8 100644
--- a/spa/plugins/audiomixer/audiomixer.c
+++ b/spa/plugins/audiomixer/audiomixer.c
@@ -725,7 +725,7 @@ static int do_port_set_io(struct spa_loop *loop, bool async, uint32_t seq,
 			port->io[0] = info->data;
 			port->io[1] = info->data;
 		}
-		if (!port->active) {
+		if (port->direction == SPA_DIRECTION_INPUT && !port->active) {
 			spa_list_append(&info->impl->mix_list, &port->mix_link);
 			port->active = true;
 		}
diff --git a/spa/plugins/audiomixer/mixer-dsp.c b/spa/plugins/audiomixer/mixer-dsp.c
index 5bd4e1a1e..698426d21 100644
--- a/spa/plugins/audiomixer/mixer-dsp.c
+++ b/spa/plugins/audiomixer/mixer-dsp.c
@@ -718,7 +718,7 @@ static int do_port_set_io(struct spa_loop *loop, bool async, uint32_t seq,
 			port->io[0] = info->data;
 			port->io[1] = info->data;
 		}
-		if (!port->active) {
+		if (port->direction == SPA_DIRECTION_INPUT && !port->active) {
 			spa_list_append(&info->impl->mix_list, &port->mix_link);
 			port->active = true;
 		}

From f45e6195590b20cd35eb2209a1d6f52c46b5848f Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 11 Mar 2026 12:39:46 +0100
Subject: [PATCH 173/263] filter-graph: emit control change after loading

Always do a control change to the instances when they are created. This
is to make sure the internal state is synced to the control values.

The sofa filter and biquads need this to correctly configure themselves
after a suspend.

Fixes #5152
---
 spa/plugins/filter-graph/filter-graph.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spa/plugins/filter-graph/filter-graph.c b/spa/plugins/filter-graph/filter-graph.c
index 0e4ca98ce..7cafac9ff 100644
--- a/spa/plugins/filter-graph/filter-graph.c
+++ b/spa/plugins/filter-graph/filter-graph.c
@@ -1645,6 +1645,7 @@ static int impl_activate(void *object, const struct spa_dict *props)
 				goto error;
 			}
 		}
+		node->control_changed = true;
 	}
 
 	/* then link ports */

From 00f1d6c3d8c464b6612e340f95daf0291685fe3d Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 11 Mar 2026 12:42:06 +0100
Subject: [PATCH 174/263] modules: improve debug in profiler

Also log the node that we are inspecting.
---
 src/modules/module-profiler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/module-profiler.c b/src/modules/module-profiler.c
index b49629ba9..1709ec9a5 100644
--- a/src/modules/module-profiler.c
+++ b/src/modules/module-profiler.c
@@ -166,7 +166,7 @@ static void do_flush_event(void *data, uint64_t count)
 
 		avail = spa_ringbuffer_get_read_index(&n->buffer, &idx);
 
-		pw_log_trace("%p: avail %d", impl, avail);
+		pw_log_trace("%p: node:%p avail %d", n, impl, avail);
 
 		if (avail > 0) {
 			size_t size = total + avail + sizeof(struct spa_pod_struct);

From 6e332a5d32fd506b669261a95618ffbde1c155dc Mon Sep 17 00:00:00 2001
From: Kisaragi Hiu <mail@kisaragi-hiu.com>
Date: Wed, 11 Mar 2026 22:05:24 +0900
Subject: [PATCH 175/263] po: update Chinese (Taiwan) translation

---
 po/zh_TW.po | 540 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 355 insertions(+), 185 deletions(-)

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1a768a992..ab41369cf 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4,110 +4,221 @@
 #
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2010, 2012.
 # pan93412 <pan93412@gmail.com>, 2020.
+# SPDX-FileCopyrightText: 2026 Kisaragi Hiu <mail@kisaragi-hiu.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: PipeWire Volume Control\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pipewire/pipewire/"
 "issues/new\n"
-"POT-Creation-Date: 2021-04-18 16:54+0800\n"
-"PO-Revision-Date: 2020-01-11 13:49+0800\n"
-"Last-Translator: pan93412 <pan93412@gmail.com>\n"
-"Language-Team: Chinese <zh-l10n@lists.linux.org.tw>\n"
+"POT-Creation-Date: 2026-03-11 22:03+0900\n"
+"PO-Revision-Date: 2026-03-11 21:24+0900\n"
+"Last-Translator: Kisaragi Hiu <mail@kisaragi-hiu.com>\n"
+"Language-Team: Chinese (Taiwan) <zh-l10n@lists.slat.org>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 19.12.0\n"
+"X-Generator: Lokalize 26.03.70\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/daemon/pipewire.c:43
+#: src/daemon/pipewire.c:29
 #, c-format
 msgid ""
 "%s [options]\n"
 "  -h, --help                            Show this help\n"
+"  -v, --verbose                         Increase verbosity by one level\n"
 "      --version                         Show version\n"
 "  -c, --config                          Load config (Default %s)\n"
+"  -P  --properties                      Set context properties\n"
 msgstr ""
+"%s [選項]\n"
+"  -h, --help                            顯示此說明\n"
+"  -v, --verbose                         提高訊息詳細程度一階\n"
+"      --version                         顯示版本\n"
+"  -c, --config                          載入設定檔案（預設 %s）\n"
+"  -P  --properties                      設定前後文屬性\n"
 
 #: src/daemon/pipewire.desktop.in:4
 msgid "PipeWire Media System"
-msgstr ""
+msgstr "PipeWire 媒體系統"
 
 #: src/daemon/pipewire.desktop.in:5
 msgid "Start the PipeWire Media System"
-msgstr ""
+msgstr "啟動 PipeWire 媒體系統"
 
-#: src/examples/media-session/alsa-monitor.c:526
-#: spa/plugins/alsa/acp/compat.c:187
-msgid "Built-in Audio"
-msgstr "內部音效"
+#: src/modules/module-protocol-pulse/modules/module-tunnel-sink.c:159
+#: src/modules/module-protocol-pulse/modules/module-tunnel-source.c:159
+#, c-format
+msgid "Tunnel to %s%s%s"
+msgstr "穿隧到 %s%s%s"
 
-#: src/examples/media-session/alsa-monitor.c:530
-#: spa/plugins/alsa/acp/compat.c:192
-msgid "Modem"
-msgstr "數據機"
+#: src/modules/module-fallback-sink.c:40
+msgid "Dummy Output"
+msgstr "虛擬輸出"
 
-#: src/examples/media-session/alsa-monitor.c:539
+#: src/modules/module-pulse-tunnel.c:761
+#, c-format
+msgid "Tunnel for %s@%s"
+msgstr "%s@%s 的穿隧道"
+
+#: src/modules/module-zeroconf-discover.c:290
 msgid "Unknown device"
-msgstr ""
+msgstr "未知裝置"
 
-#: src/tools/pw-cat.c:991
+#: src/modules/module-zeroconf-discover.c:302
+#, c-format
+msgid "%s on %s@%s"
+msgstr "%s 於 %s@%s"
+
+#: src/modules/module-zeroconf-discover.c:306
+#, c-format
+msgid "%s on %s"
+msgstr "%s 於 %s"
+
+#: src/tools/pw-cat.c:269
+#, c-format
+msgid "Supported formats:\n"
+msgstr "支援的格式：\n"
+
+#: src/tools/pw-cat.c:754
+#, c-format
+msgid "Supported channel layouts:\n"
+msgstr "支援的頻道配置：\n"
+
+#: src/tools/pw-cat.c:764
+#, c-format
+msgid "Supported channel layout aliases:\n"
+msgstr "支援的頻道配置別名：\n"
+
+#: src/tools/pw-cat.c:766
+#, c-format
+msgid "    %s -> %s\n"
+msgstr "    %s -> %s\n"
+
+#: src/tools/pw-cat.c:771
+#, c-format
+msgid "Supported channel names:\n"
+msgstr "支援的頻道名稱：\n"
+
+#: src/tools/pw-cat.c:1182
 #, c-format
 msgid ""
-"%s [options] <file>\n"
+"%s [options] [<file>|-]\n"
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
 "  -v, --verbose                         Enable verbose operations\n"
 "\n"
 msgstr ""
+"%s [選項] [<檔案>|-]\n"
+"  -h, --help                            顯示此說明\n"
+"      --version                         顯示版本\n"
+"  -v, --verbose                         操作進行時顯示詳細訊息\n"
+"\n"
 
-#: src/tools/pw-cat.c:998
+#: src/tools/pw-cat.c:1189
 #, c-format
 msgid ""
 "  -R, --remote                          Remote daemon name\n"
 "      --media-type                      Set media type (default %s)\n"
 "      --media-category                  Set media category (default %s)\n"
 "      --media-role                      Set media role (default %s)\n"
-"      --target                          Set node target (default %s)\n"
+"      --target                          Set node target serial or name "
+"(default %s)\n"
 "                                          0 means don't link\n"
 "      --latency                         Set node latency (default %s)\n"
 "                                          Xunit (unit = s, ms, us, ns)\n"
 "                                          or direct samples (256)\n"
 "                                          the rate is the one of the source "
 "file\n"
-"      --list-targets                    List available targets for --target\n"
+"  -P  --properties                      Set node properties\n"
 "\n"
 msgstr ""
+"  -R, --remote                          遠端守護程式名稱\n"
+"      --media-type                      設定媒體型態（預設 %s）\n"
+"      --media-category                  設定媒體分類（預設 %s）\n"
+"      --media-role                      設定媒體角色（預設 %s）\n"
+"      --target                          設定節點目標序號或名稱（預設 %s）\n"
+"                                          0 代表不要連結\n"
+"      --latency                         設定節點延遲（預設 %s）\n"
+"                                          X單位（單位為 s, ms, us 或 ns）\n"
+"                                          或直接指定樣本數 (256)\n"
+"                                          取樣率取自來源檔案\n"
+"  -P  --properties                      設定節點屬性\n"
+"\n"
 
-#: src/tools/pw-cat.c:1016
+#: src/tools/pw-cat.c:1207
 #, c-format
 msgid ""
-"      --rate                            Sample rate (req. for rec) (default "
-"%u)\n"
-"      --channels                        Number of channels (req. for rec) "
-"(default %u)\n"
+"      --rate                            Sample rate (default %u)\n"
+"      --channels                        Number of channels (default %u)\n"
 "      --channel-map                     Channel map\n"
-"                                            one of: \"stereo\", "
-"\"surround-51\",... or\n"
+"                                            a channel layout: \"Stereo\", "
+"\"5.1\",... or\n"
 "                                            comma separated list of channel "
 "names: eg. \"FL,FR\"\n"
-"      --format                          Sample format %s (req. for rec) "
-"(default %s)\n"
+"      --list-layouts                    List supported channel layouts\n"
+"      --list-channel-names              List supported channel maps\n"
+"      --format                          Sample format (default %s)\n"
+"      --list-formats                    List supported sample formats\n"
+"      --container                       Container format\n"
+"      --list-containers                 List supported containers and "
+"extensions\n"
 "      --volume                          Stream volume 0-1.0 (default %.3f)\n"
 "  -q  --quality                         Resampler quality (0 - 15) (default "
 "%d)\n"
+"  -a, --raw                             RAW mode\n"
+"  -M, --force-midi                      Force midi format, one of \"midi\" "
+"or \"ump\", (default ump)\n"
+"  -n, --sample-count COUNT              Stop after COUNT samples\n"
 "\n"
 msgstr ""
+"      --rate                            取樣率（預設 %u）\n"
+"      --channels                        頻道數量（預設 %u）\n"
+"      --channel-map                     頻道映射\n"
+"                                            可以是頻道配置名稱，像是 "
+"\"Stereo\"、\"5.1\" 等等，或是\n"
+"                                            以逗號分隔的頻道名稱清單，像是 "
+"\"FL,FR\"\n"
+"      --list-layouts                    列出支援的頻道配置\n"
+"      --list-channel-names              列出支援的頻道映射\n"
+"      --format                          取樣格式（預設 %s）\n"
+"      --list-formats                    列出支援的取樣格式\n"
+"      --container                       容器格式\n"
+"      --list-containers                 列出支援的容器與副檔名\n"
+"      --volume                          串流音量 0-1.0（預設 %.3f）\n"
+"  -q  --quality                         重新取樣器品質 0-15（預設 %d）\n"
+"  -a, --raw                             原始模式\n"
+"  -M, --force-midi                      強制使用 midi 格式，可選擇 \"midi\" "
+"或 \"ump\"（預設 ump）\n"
+"  -n, --sample-count 樣本數              在「樣本數」個樣本之後停止\n"
+"\n"
 
-#: src/tools/pw-cat.c:1033
+#: src/tools/pw-cat.c:1232
 msgid ""
 "  -p, --playback                        Playback mode\n"
 "  -r, --record                          Recording mode\n"
 "  -m, --midi                            Midi mode\n"
+"  -d, --dsd                             DSD mode\n"
+"  -o, --encoded                         Encoded mode\n"
+"  -s, --sysex                           SysEx mode\n"
+"  -c, --midi-clip                       MIDI clip mode\n"
 "\n"
 msgstr ""
+"  -p, --playback                        播放模式\n"
+"  -r, --record                          錄製模式\n"
+"  -m, --midi                            Midi 模式\n"
+"  -d, --dsd                             DSD 模式\n"
+"  -o, --encoded                         已編碼模式\n"
+"  -s, --sysex                           SysEx 模式\n"
+"  -c, --midi-clip                       MIDI 素材模式\n"
+"\n"
 
-#: src/tools/pw-cli.c:2932
+#: src/tools/pw-cat.c:1837
+#, c-format
+msgid "Supported containers and extensions:\n"
+msgstr "支援的容器與副檔名：\n"
+
+#: src/tools/pw-cli.c:2386
 #, c-format
 msgid ""
 "%s [options] [command]\n"
@@ -115,357 +226,363 @@ msgid ""
 "      --version                         Show version\n"
 "  -d, --daemon                          Start as daemon (Default false)\n"
 "  -r, --remote                          Remote daemon name\n"
+"  -m, --monitor                         Monitor activity\n"
 "\n"
 msgstr ""
+"%s [選項] [指令]\n"
+"  -h, --help                            顯示此說明\n"
+"      --version                         顯示版本\n"
+"  -d, --daemon                          作為守護程式啟動（預設為否）\n"
+"  -r, --remote                          遠端守護程式名稱\n"
+"  -m, --monitor                         監控活動\n"
+"\n"
 
-#: spa/plugins/alsa/acp/acp.c:290
+#: spa/plugins/alsa/acp/acp.c:361
 msgid "Pro Audio"
-msgstr ""
+msgstr "Pro Audio"
 
-#: spa/plugins/alsa/acp/acp.c:411 spa/plugins/alsa/acp/alsa-mixer.c:4704
-#: spa/plugins/bluez5/bluez5-device.c:1000
+#: spa/plugins/alsa/acp/acp.c:535 spa/plugins/alsa/acp/alsa-mixer.c:4699
+#: spa/plugins/bluez5/bluez5-device.c:2021
 msgid "Off"
 msgstr "關閉"
 
-#: spa/plugins/alsa/acp/channelmap.h:466
-msgid "(invalid)"
-msgstr "(無效)"
+#: spa/plugins/alsa/acp/acp.c:618
+#, c-format
+msgid "%s [ALSA UCM error]"
+msgstr "%s [ALSA UCM 錯誤]"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2709
+#: spa/plugins/alsa/acp/alsa-mixer.c:2721
 msgid "Input"
 msgstr "輸入"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2710
+#: spa/plugins/alsa/acp/alsa-mixer.c:2722
 msgid "Docking Station Input"
 msgstr "Docking Station 輸入"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2711
+#: spa/plugins/alsa/acp/alsa-mixer.c:2723
 msgid "Docking Station Microphone"
 msgstr "Docking Station 麥克風"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2712
+#: spa/plugins/alsa/acp/alsa-mixer.c:2724
 msgid "Docking Station Line In"
 msgstr "Docking Station 線路輸入"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2713
-#: spa/plugins/alsa/acp/alsa-mixer.c:2804
+#: spa/plugins/alsa/acp/alsa-mixer.c:2725
+#: spa/plugins/alsa/acp/alsa-mixer.c:2816
 msgid "Line In"
 msgstr "線路輸入"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2714
-#: spa/plugins/alsa/acp/alsa-mixer.c:2798
-#: spa/plugins/bluez5/bluez5-device.c:1145
+#: spa/plugins/alsa/acp/alsa-mixer.c:2726
+#: spa/plugins/alsa/acp/alsa-mixer.c:2810
+#: spa/plugins/bluez5/bluez5-device.c:2422
 msgid "Microphone"
 msgstr "麥克風"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2715
-#: spa/plugins/alsa/acp/alsa-mixer.c:2799
+#: spa/plugins/alsa/acp/alsa-mixer.c:2727
+#: spa/plugins/alsa/acp/alsa-mixer.c:2811
 msgid "Front Microphone"
 msgstr "前方麥克風"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2716
-#: spa/plugins/alsa/acp/alsa-mixer.c:2800
+#: spa/plugins/alsa/acp/alsa-mixer.c:2728
+#: spa/plugins/alsa/acp/alsa-mixer.c:2812
 msgid "Rear Microphone"
 msgstr "後方麥克風"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2717
+#: spa/plugins/alsa/acp/alsa-mixer.c:2729
 msgid "External Microphone"
 msgstr "外接麥克風"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2718
-#: spa/plugins/alsa/acp/alsa-mixer.c:2802
+#: spa/plugins/alsa/acp/alsa-mixer.c:2730
+#: spa/plugins/alsa/acp/alsa-mixer.c:2814
 msgid "Internal Microphone"
 msgstr "內建麥克風"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2719
-#: spa/plugins/alsa/acp/alsa-mixer.c:2805
+#: spa/plugins/alsa/acp/alsa-mixer.c:2731
+#: spa/plugins/alsa/acp/alsa-mixer.c:2817
 msgid "Radio"
 msgstr "無線電"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2720
-#: spa/plugins/alsa/acp/alsa-mixer.c:2806
+#: spa/plugins/alsa/acp/alsa-mixer.c:2732
+#: spa/plugins/alsa/acp/alsa-mixer.c:2818
 msgid "Video"
 msgstr "視訊"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2721
+#: spa/plugins/alsa/acp/alsa-mixer.c:2733
 msgid "Automatic Gain Control"
 msgstr "自動增益控制"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2722
+#: spa/plugins/alsa/acp/alsa-mixer.c:2734
 msgid "No Automatic Gain Control"
 msgstr "無自動增益控制"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2723
+#: spa/plugins/alsa/acp/alsa-mixer.c:2735
 msgid "Boost"
 msgstr "增強"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2724
+#: spa/plugins/alsa/acp/alsa-mixer.c:2736
 msgid "No Boost"
 msgstr "無增強"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2725
+#: spa/plugins/alsa/acp/alsa-mixer.c:2737
 msgid "Amplifier"
 msgstr "擴大器"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2726
+#: spa/plugins/alsa/acp/alsa-mixer.c:2738
 msgid "No Amplifier"
 msgstr "無擴大器"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2727
+#: spa/plugins/alsa/acp/alsa-mixer.c:2739
 msgid "Bass Boost"
 msgstr "低音增強"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2728
+#: spa/plugins/alsa/acp/alsa-mixer.c:2740
 msgid "No Bass Boost"
 msgstr "無低音增強"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2729
-#: spa/plugins/bluez5/bluez5-device.c:1150
+#: spa/plugins/alsa/acp/alsa-mixer.c:2741
+#: spa/plugins/bluez5/bluez5-device.c:2428
 msgid "Speaker"
 msgstr "喇叭"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2730
-#: spa/plugins/alsa/acp/alsa-mixer.c:2808
+#. Don't call it "headset", the HF one has the mic
+#: spa/plugins/alsa/acp/alsa-mixer.c:2742
+#: spa/plugins/alsa/acp/alsa-mixer.c:2820
+#: spa/plugins/bluez5/bluez5-device.c:2434
+#: spa/plugins/bluez5/bluez5-device.c:2501
 msgid "Headphones"
 msgstr "頭戴式耳機"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2797
+#: spa/plugins/alsa/acp/alsa-mixer.c:2809
 msgid "Analog Input"
 msgstr "類比輸入"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2801
+#: spa/plugins/alsa/acp/alsa-mixer.c:2813
 msgid "Dock Microphone"
 msgstr "臺座麥克風"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2803
+#: spa/plugins/alsa/acp/alsa-mixer.c:2815
 msgid "Headset Microphone"
 msgstr "耳麥麥克風"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2807
+#: spa/plugins/alsa/acp/alsa-mixer.c:2819
 msgid "Analog Output"
 msgstr "類比輸出"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2809
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:2821
 msgid "Headphones 2"
-msgstr "頭戴式耳機"
+msgstr "頭戴式耳機 2"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2810
+#: spa/plugins/alsa/acp/alsa-mixer.c:2822
 msgid "Headphones Mono Output"
 msgstr "頭戴式耳機單聲道輸出"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2811
+#: spa/plugins/alsa/acp/alsa-mixer.c:2823
 msgid "Line Out"
 msgstr "線路輸出"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2812
+#: spa/plugins/alsa/acp/alsa-mixer.c:2824
 msgid "Analog Mono Output"
 msgstr "類比單聲道輸出"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2813
+#: spa/plugins/alsa/acp/alsa-mixer.c:2825
 msgid "Speakers"
 msgstr "喇叭"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2814
+#: spa/plugins/alsa/acp/alsa-mixer.c:2826
 msgid "HDMI / DisplayPort"
 msgstr "HDMI / DisplayPort"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2815
+#: spa/plugins/alsa/acp/alsa-mixer.c:2827
 msgid "Digital Output (S/PDIF)"
 msgstr "數位輸出 (S/PDIF)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2816
+#: spa/plugins/alsa/acp/alsa-mixer.c:2828
 msgid "Digital Input (S/PDIF)"
 msgstr "數位輸入 (S/PDIF)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2817
+#: spa/plugins/alsa/acp/alsa-mixer.c:2829
 msgid "Multichannel Input"
 msgstr "多聲道輸入"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2818
+#: spa/plugins/alsa/acp/alsa-mixer.c:2830
 msgid "Multichannel Output"
 msgstr "多聲道輸出"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2819
+#: spa/plugins/alsa/acp/alsa-mixer.c:2831
 msgid "Game Output"
 msgstr "遊戲輸出"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2820
-#: spa/plugins/alsa/acp/alsa-mixer.c:2821
+#: spa/plugins/alsa/acp/alsa-mixer.c:2832
+#: spa/plugins/alsa/acp/alsa-mixer.c:2833
 msgid "Chat Output"
 msgstr "聊天輸出"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2822
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:2834
 msgid "Chat Input"
-msgstr "聊天輸出"
+msgstr "聊天輸入"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2823
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:2835
 msgid "Virtual Surround 7.1"
-msgstr "虛擬環繞聲 sink"
+msgstr "虛擬環繞聲 7.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4527
+#: spa/plugins/alsa/acp/alsa-mixer.c:4522
 msgid "Analog Mono"
 msgstr "類比單聲道"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4528
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:4523
 msgid "Analog Mono (Left)"
-msgstr "類比單聲道"
+msgstr "類比單聲道（左）"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4529
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:4524
 msgid "Analog Mono (Right)"
-msgstr "類比單聲道"
+msgstr "類比單聲道（右）"
 
 #. Note: Not translated to "Analog Stereo Input", because the source
 #. * name gets "Input" appended to it automatically, so adding "Input"
 #. * here would lead to the source name to become "Analog Stereo Input
 #. * Input". The same logic applies to analog-stereo-output,
 #. * multichannel-input and multichannel-output.
-#: spa/plugins/alsa/acp/alsa-mixer.c:4530
-#: spa/plugins/alsa/acp/alsa-mixer.c:4538
-#: spa/plugins/alsa/acp/alsa-mixer.c:4539
+#: spa/plugins/alsa/acp/alsa-mixer.c:4525
+#: spa/plugins/alsa/acp/alsa-mixer.c:4533
+#: spa/plugins/alsa/acp/alsa-mixer.c:4534
 msgid "Analog Stereo"
 msgstr "類比立體聲"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4531
+#: spa/plugins/alsa/acp/alsa-mixer.c:4526
 msgid "Mono"
 msgstr "單聲道"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4532
+#: spa/plugins/alsa/acp/alsa-mixer.c:4527
 msgid "Stereo"
 msgstr "立體聲"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4540
-#: spa/plugins/alsa/acp/alsa-mixer.c:4698
-#: spa/plugins/bluez5/bluez5-device.c:1135
+#: spa/plugins/alsa/acp/alsa-mixer.c:4535
+#: spa/plugins/alsa/acp/alsa-mixer.c:4693
+#: spa/plugins/bluez5/bluez5-device.c:2410
 msgid "Headset"
 msgstr "耳麥"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4541
-#: spa/plugins/alsa/acp/alsa-mixer.c:4699
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:4536
+#: spa/plugins/alsa/acp/alsa-mixer.c:4694
 msgid "Speakerphone"
-msgstr "喇叭"
+msgstr "會議揚聲器"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4542
-#: spa/plugins/alsa/acp/alsa-mixer.c:4543
+#: spa/plugins/alsa/acp/alsa-mixer.c:4537
+#: spa/plugins/alsa/acp/alsa-mixer.c:4538
 msgid "Multichannel"
 msgstr "多聲道"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4544
+#: spa/plugins/alsa/acp/alsa-mixer.c:4539
 msgid "Analog Surround 2.1"
 msgstr "類比環繞聲 2.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4545
+#: spa/plugins/alsa/acp/alsa-mixer.c:4540
 msgid "Analog Surround 3.0"
 msgstr "類比環繞聲 3.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4546
+#: spa/plugins/alsa/acp/alsa-mixer.c:4541
 msgid "Analog Surround 3.1"
 msgstr "類比環繞聲 3.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4547
+#: spa/plugins/alsa/acp/alsa-mixer.c:4542
 msgid "Analog Surround 4.0"
 msgstr "類比環繞聲 4.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4548
+#: spa/plugins/alsa/acp/alsa-mixer.c:4543
 msgid "Analog Surround 4.1"
 msgstr "類比環繞聲 4.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4549
+#: spa/plugins/alsa/acp/alsa-mixer.c:4544
 msgid "Analog Surround 5.0"
 msgstr "類比環繞聲 5.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4550
+#: spa/plugins/alsa/acp/alsa-mixer.c:4545
 msgid "Analog Surround 5.1"
 msgstr "類比環繞聲 5.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4551
+#: spa/plugins/alsa/acp/alsa-mixer.c:4546
 msgid "Analog Surround 6.0"
 msgstr "類比環繞聲 6.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4552
+#: spa/plugins/alsa/acp/alsa-mixer.c:4547
 msgid "Analog Surround 6.1"
 msgstr "類比環繞聲 6.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4553
+#: spa/plugins/alsa/acp/alsa-mixer.c:4548
 msgid "Analog Surround 7.0"
 msgstr "類比環繞聲 7.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4554
+#: spa/plugins/alsa/acp/alsa-mixer.c:4549
 msgid "Analog Surround 7.1"
 msgstr "類比環繞聲 7.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4555
+#: spa/plugins/alsa/acp/alsa-mixer.c:4550
 msgid "Digital Stereo (IEC958)"
 msgstr "數位立體聲 (IEC958)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4556
+#: spa/plugins/alsa/acp/alsa-mixer.c:4551
 msgid "Digital Surround 4.0 (IEC958/AC3)"
 msgstr "數位環繞聲 4.0 (IEC958/AC3)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4557
+#: spa/plugins/alsa/acp/alsa-mixer.c:4552
 msgid "Digital Surround 5.1 (IEC958/AC3)"
 msgstr "數位環繞聲 5.1 (IEC958/AC3)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4558
+#: spa/plugins/alsa/acp/alsa-mixer.c:4553
 msgid "Digital Surround 5.1 (IEC958/DTS)"
 msgstr "數位環繞聲 5.1 (IEC958/DTS)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4559
+#: spa/plugins/alsa/acp/alsa-mixer.c:4554
 msgid "Digital Stereo (HDMI)"
 msgstr "數位立體聲 (HDMI)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4560
+#: spa/plugins/alsa/acp/alsa-mixer.c:4555
 msgid "Digital Surround 5.1 (HDMI)"
 msgstr "數位環繞聲 5.1 (HDMI)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4561
+#: spa/plugins/alsa/acp/alsa-mixer.c:4556
 msgid "Chat"
-msgstr ""
+msgstr "聊天"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4562
+#: spa/plugins/alsa/acp/alsa-mixer.c:4557
 msgid "Game"
-msgstr ""
+msgstr "遊戲"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4696
+#: spa/plugins/alsa/acp/alsa-mixer.c:4691
 msgid "Analog Mono Duplex"
 msgstr "類比單聲道雙工"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4697
+#: spa/plugins/alsa/acp/alsa-mixer.c:4692
 msgid "Analog Stereo Duplex"
 msgstr "類比立體聲雙工"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4700
+#: spa/plugins/alsa/acp/alsa-mixer.c:4695
 msgid "Digital Stereo Duplex (IEC958)"
 msgstr "數位立體聲雙工 (IEC958)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4701
+#: spa/plugins/alsa/acp/alsa-mixer.c:4696
 msgid "Multichannel Duplex"
 msgstr "多聲道雙工"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4702
+#: spa/plugins/alsa/acp/alsa-mixer.c:4697
 msgid "Stereo Duplex"
 msgstr "立體聲雙工"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4703
+#: spa/plugins/alsa/acp/alsa-mixer.c:4698
 msgid "Mono Chat + 7.1 Surround"
-msgstr ""
+msgstr "單聲道聊天 + 7.1 立體聲"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4806
+#: spa/plugins/alsa/acp/alsa-mixer.c:4799
 #, c-format
 msgid "%s Output"
 msgstr "%s 輸出"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4813
+#: spa/plugins/alsa/acp/alsa-mixer.c:4807
 #, c-format
 msgid "%s Input"
 msgstr "%s 輸入"
 
-#: spa/plugins/alsa/acp/alsa-util.c:1175 spa/plugins/alsa/acp/alsa-util.c:1269
+#: spa/plugins/alsa/acp/alsa-util.c:1233 spa/plugins/alsa/acp/alsa-util.c:1327
 #, c-format
 msgid ""
 "snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
@@ -481,23 +598,23 @@ msgstr[0] ""
 "snd_pcm_avail() 傳回超出預期的大值：%lu bytes (%lu ms)。\n"
 "這很能是 ALSA 驅動程式「%s」的臭蟲。請回報這個問題給 ALSA 開發者。"
 
-#: spa/plugins/alsa/acp/alsa-util.c:1241
+#: spa/plugins/alsa/acp/alsa-util.c:1299
 #, c-format
 msgid ""
-"snd_pcm_delay() returned a value that is exceptionally large: %li byte (%s"
-"%lu ms).\n"
+"snd_pcm_delay() returned a value that is exceptionally large: %li byte "
+"(%s%lu ms).\n"
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 msgid_plural ""
-"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s"
-"%lu ms).\n"
+"snd_pcm_delay() returned a value that is exceptionally large: %li bytes "
+"(%s%lu ms).\n"
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 msgstr[0] ""
 "snd_pcm_delay() 傳回超出預期的大值：%li bytes (%s%lu ms)。\n"
 "這很能是 ALSA 驅動程式「%s」的臭蟲。請回報這個問題給 ALSA 開發者。"
 
-#: spa/plugins/alsa/acp/alsa-util.c:1288
+#: spa/plugins/alsa/acp/alsa-util.c:1346
 #, c-format
 msgid ""
 "snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
@@ -508,7 +625,7 @@ msgstr ""
 "snd_pcm_avail_delay() 傳回超出預期的大值：延遲 %lu 少於可用的 %lu。\n"
 "這很能是 ALSA 驅動程式「%s」的臭蟲。請回報這個問題給 ALSA 開發者。"
 
-#: spa/plugins/alsa/acp/alsa-util.c:1331
+#: spa/plugins/alsa/acp/alsa-util.c:1389
 #, c-format
 msgid ""
 "snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
@@ -524,62 +641,115 @@ msgstr[0] ""
 "snd_pcm_mmap_begin() 傳回超出預期的大值：%lu bytes (%lu ms)。\n"
 "這很能是 ALSA 驅動程式「%s」的臭蟲。請回報這個問題給 ALSA 開發者。"
 
-#: spa/plugins/bluez5/bluez5-device.c:1010
-msgid "Audio Gateway (A2DP Source & HSP/HFP AG)"
-msgstr ""
+#: spa/plugins/alsa/acp/channelmap.h:460
+msgid "(invalid)"
+msgstr "(無效)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1033
+#: spa/plugins/alsa/acp/compat.c:194
+msgid "Built-in Audio"
+msgstr "內部音效"
+
+#: spa/plugins/alsa/acp/compat.c:199
+msgid "Modem"
+msgstr "數據機"
+
+#: spa/plugins/bluez5/bluez5-device.c:2032
+msgid "Audio Gateway (A2DP Source & HSP/HFP AG)"
+msgstr "音訊閘道 (A2DP Source & HSP/HFP AG)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2061
+msgid "Audio Streaming for Hearing Aids (ASHA Sink)"
+msgstr "助聽器的音訊串流 (ASHA Sink)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2104
 #, c-format
 msgid "High Fidelity Playback (A2DP Sink, codec %s)"
-msgstr ""
+msgstr "高傳真播放裝置 (A2DP Sink，編碼器 %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1035
+#: spa/plugins/bluez5/bluez5-device.c:2107
 #, c-format
 msgid "High Fidelity Duplex (A2DP Source/Sink, codec %s)"
-msgstr ""
+msgstr "高傳真雙工裝置 (A2DP Source/Sink，編碼器 %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1041
+#: spa/plugins/bluez5/bluez5-device.c:2115
 msgid "High Fidelity Playback (A2DP Sink)"
-msgstr ""
+msgstr "高傳真播放裝置 (A2DP Sink)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1043
+#: spa/plugins/bluez5/bluez5-device.c:2117
 msgid "High Fidelity Duplex (A2DP Source/Sink)"
-msgstr ""
+msgstr "高傳真雙工裝置 (A2DP Source/Sink)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1070
+#: spa/plugins/bluez5/bluez5-device.c:2194
+#, c-format
+msgid "High Fidelity Playback (BAP Sink, codec %s)"
+msgstr "高傳真播放裝置 (BAP Sink，編碼器 %s)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2199
+#, c-format
+msgid "High Fidelity Input (BAP Source, codec %s)"
+msgstr "高傳真輸入裝置 (BAP Source，編碼器 %s)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2203
+#, c-format
+msgid "High Fidelity Duplex (BAP Source/Sink, codec %s)"
+msgstr "高傳真雙工裝置 (BAP Source/Sink，編碼器 %s)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2212
+msgid "High Fidelity Playback (BAP Sink)"
+msgstr "高傳真播放裝置 (BAP Sink)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2216
+msgid "High Fidelity Input (BAP Source)"
+msgstr "高傳真輸入裝置 (BAP Source)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2219
+msgid "High Fidelity Duplex (BAP Source/Sink)"
+msgstr "高傳真雙工裝置 (BAP Source/Sink)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2259
 #, c-format
 msgid "Headset Head Unit (HSP/HFP, codec %s)"
-msgstr ""
+msgstr "耳麥頭戴單元 (HSP/HFP，編碼器 %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1074
-msgid "Headset Head Unit (HSP/HFP)"
-msgstr ""
-
-#: spa/plugins/bluez5/bluez5-device.c:1140
+#: spa/plugins/bluez5/bluez5-device.c:2411
+#: spa/plugins/bluez5/bluez5-device.c:2416
+#: spa/plugins/bluez5/bluez5-device.c:2423
+#: spa/plugins/bluez5/bluez5-device.c:2429
+#: spa/plugins/bluez5/bluez5-device.c:2435
+#: spa/plugins/bluez5/bluez5-device.c:2441
+#: spa/plugins/bluez5/bluez5-device.c:2447
+#: spa/plugins/bluez5/bluez5-device.c:2453
+#: spa/plugins/bluez5/bluez5-device.c:2459
 msgid "Handsfree"
 msgstr "免持裝置"
 
-#: spa/plugins/bluez5/bluez5-device.c:1155
-msgid "Headphone"
-msgstr "頭戴式耳機"
+#: spa/plugins/bluez5/bluez5-device.c:2417
+msgid "Handsfree (HFP)"
+msgstr "免持裝置 (HFP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1160
+#: spa/plugins/bluez5/bluez5-device.c:2440
 msgid "Portable"
 msgstr "可攜裝置"
 
-#: spa/plugins/bluez5/bluez5-device.c:1165
+#: spa/plugins/bluez5/bluez5-device.c:2446
 msgid "Car"
 msgstr "汽車"
 
-#: spa/plugins/bluez5/bluez5-device.c:1170
+#: spa/plugins/bluez5/bluez5-device.c:2452
 msgid "HiFi"
 msgstr "HiFi"
 
-#: spa/plugins/bluez5/bluez5-device.c:1175
+#: spa/plugins/bluez5/bluez5-device.c:2458
 msgid "Phone"
 msgstr "手機"
 
-#: spa/plugins/bluez5/bluez5-device.c:1181
-#, fuzzy
+#: spa/plugins/bluez5/bluez5-device.c:2465
 msgid "Bluetooth"
-msgstr "藍牙輸入"
+msgstr "藍牙"
+
+#: spa/plugins/bluez5/bluez5-device.c:2466
+msgid "Bluetooth Handsfree"
+msgstr "藍牙免持裝置"
+
+#~ msgid "Headphone"
+#~ msgstr "頭戴式耳機"

From 2f65cf712492f695288e192eb760e205074400c1 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 11 Mar 2026 16:09:24 +0100
Subject: [PATCH 176/263] modules: return the error of getsockopt instead of
 -EPIPE

---
 src/modules/module-raop/rtsp-client.c   | 5 ++---
 src/modules/module-sendspin/websocket.c | 5 ++---
 src/modules/module-snapcast-discover.c  | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/modules/module-raop/rtsp-client.c b/src/modules/module-raop/rtsp-client.c
index ff487388c..ee3ef43ae 100644
--- a/src/modules/module-raop/rtsp-client.c
+++ b/src/modules/module-raop/rtsp-client.c
@@ -447,9 +447,8 @@ on_source_io(void *data, int fd, uint32_t mask)
 	if (mask & (SPA_IO_ERR | SPA_IO_HUP)) {
 		socklen_t len = sizeof(res);
 		if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &res, &len) < 0)
-			res = -EPIPE;
-		else
-			res = -res;
+			res = errno;
+		res = -res;
 		goto error;
 	}
 	if (mask & SPA_IO_IN) {
diff --git a/src/modules/module-sendspin/websocket.c b/src/modules/module-sendspin/websocket.c
index d1d234bd9..7deb57e89 100644
--- a/src/modules/module-sendspin/websocket.c
+++ b/src/modules/module-sendspin/websocket.c
@@ -714,9 +714,8 @@ on_source_io(void *data, int fd, uint32_t mask)
 	if (mask & (SPA_IO_ERR | SPA_IO_HUP)) {
 		socklen_t len = sizeof(res);
 		if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &res, &len) < 0)
-			res = -EPIPE;
-		else
-			res = -res;
+			res = errno;
+		res = -res;
 		goto error;
 	}
 	if (mask & SPA_IO_IN) {
diff --git a/src/modules/module-snapcast-discover.c b/src/modules/module-snapcast-discover.c
index d00a558a5..5fe2dedd9 100644
--- a/src/modules/module-snapcast-discover.c
+++ b/src/modules/module-snapcast-discover.c
@@ -383,9 +383,8 @@ on_source_io(void *data, int fd, uint32_t mask)
 	if (mask & (SPA_IO_ERR | SPA_IO_HUP)) {
 		socklen_t len = sizeof(res);
 		if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &res, &len) < 0)
-			res = -EPIPE;
-		else
-			res = -res;
+			res = errno;
+		res = -res;
 		goto error;
 	}
 	if (mask & SPA_IO_IN) {

From 9c7aa4d4233f3af9f23120b1d178072aafbbfe43 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 11 Mar 2026 18:16:53 +0100
Subject: [PATCH 177/263] impl-port: don't send NULL tag to clear

NULL tags are never handled and so tags just keeps configured on the
ports. It's also hard to know the direction from the NULL data.

Instead, send an empty Tag with the direction to clear everything.
---
 src/pipewire/impl-port.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pipewire/impl-port.c b/src/pipewire/impl-port.c
index 7731264db..c0de46e92 100644
--- a/src/pipewire/impl-port.c
+++ b/src/pipewire/impl-port.c
@@ -1954,7 +1954,7 @@ int pw_impl_port_recalc_tag(struct pw_impl_port *port)
 			count++;
 		}
 	}
-	param = count == 0 ? NULL : spa_tag_build_end(&b.b, &f);
+	param = spa_tag_build_end(&b.b, &f);
 
 	old = port->tag[direction];
 

From 469929d4f6bad8e5204eead667f0c32d87898392 Mon Sep 17 00:00:00 2001
From: Siva Mahadevan <me@svmhdvn.name>
Date: Wed, 11 Mar 2026 14:20:46 -0400
Subject: [PATCH 178/263] pipewire: guard linux-specific RLIMIT_* inside #ifdef
 __linux__

---
 src/pipewire/context.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pipewire/context.c b/src/pipewire/context.c
index 40ed031bb..e3f65ad41 100644
--- a/src/pipewire/context.c
+++ b/src/pipewire/context.c
@@ -353,17 +353,19 @@ static int adjust_rlimits(const struct spa_dict *dict)
 		[RLIMIT_CPU]        = "cpu",
 		[RLIMIT_DATA]       = "data",
 		[RLIMIT_FSIZE]      = "fsize",
-		[RLIMIT_LOCKS]      = "locks",
 		[RLIMIT_MEMLOCK]    = "memlock",
-		[RLIMIT_MSGQUEUE]   = "msgqueue",
-		[RLIMIT_NICE]       = "nice",
 		[RLIMIT_NOFILE]     = "nofile",
 		[RLIMIT_NPROC]      = "nproc",
 		[RLIMIT_RSS]        = "rss",
+		[RLIMIT_STACK]      = "stack",
+#ifdef __linux__
+		[RLIMIT_LOCKS]      = "locks",
+		[RLIMIT_MSGQUEUE]   = "msgqueue",
+		[RLIMIT_NICE]       = "nice",
 		[RLIMIT_RTPRIO]     = "rtprio",
 		[RLIMIT_RTTIME]     = "rttime",
 		[RLIMIT_SIGPENDING] = "sigpending",
-		[RLIMIT_STACK]      = "stack",
+#endif
 	};
 	int res;
 	spa_dict_for_each(it, dict) {

From cd84d007cd783df0368e5f2ebe550a3339b2a0f7 Mon Sep 17 00:00:00 2001
From: Siva Mahadevan <me@svmhdvn.name>
Date: Wed, 11 Mar 2026 13:50:33 -0400
Subject: [PATCH 179/263] spa: replace ECHRNG with EINVAL

ECHRNG is linux-specific and does not exist on all OSes.
On the other hand, EINVAL is specified in POSIX[0] (and is thus cross-platform)
and is commonly used to signify an index out of bounds error.

https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/errno.h.html
---
 spa/include/spa/param/audio/dsd-utils.h    | 2 +-
 spa/include/spa/param/audio/layout-types.h | 4 ++--
 spa/include/spa/param/audio/raw-json.h     | 6 +++---
 spa/include/spa/param/audio/raw-utils.h    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spa/include/spa/param/audio/dsd-utils.h b/spa/include/spa/param/audio/dsd-utils.h
index 2dab7cc19..9af62d99d 100644
--- a/spa/include/spa/param/audio/dsd-utils.h
+++ b/spa/include/spa/param/audio/dsd-utils.h
@@ -44,7 +44,7 @@ spa_format_audio_dsd_parse(const struct spa_pod *format, struct spa_audio_info_d
 			SPA_FORMAT_AUDIO_channels,	SPA_POD_OPT_Int(&info->channels),
 			SPA_FORMAT_AUDIO_position,	SPA_POD_OPT_Pod(&position));
 	if (info->channels > max_position)
-		return -ECHRNG;
+		return -EINVAL;
 	if (position == NULL ||
 	    spa_pod_copy_array(position, SPA_TYPE_Id, info->position, max_position) != info->channels) {
 		SPA_FLAG_SET(info->flags, SPA_AUDIO_FLAG_UNPOSITIONED);
diff --git a/spa/include/spa/param/audio/layout-types.h b/spa/include/spa/param/audio/layout-types.h
index 33650202a..45cca3a6f 100644
--- a/spa/include/spa/param/audio/layout-types.h
+++ b/spa/include/spa/param/audio/layout-types.h
@@ -87,7 +87,7 @@ spa_audio_layout_info_parse_name(struct spa_audio_layout_info *layout, size_t si
 		uint32_t i, n_pos;
 		if (spa_atou32(name+3, &n_pos, 10)) {
 			if (n_pos > max_position)
-				return -ECHRNG;
+				return -EINVAL;
 			for (i = 0; i < 0x1000 && i < n_pos; i++)
 				layout->position[i] = SPA_AUDIO_CHANNEL_AUX0 + i;
 			for (; i < n_pos; i++)
@@ -99,7 +99,7 @@ spa_audio_layout_info_parse_name(struct spa_audio_layout_info *layout, size_t si
 	SPA_FOR_EACH_ELEMENT_VAR(spa_type_audio_layout_info, i) {
 		if (spa_streq(name, i->name)) {
 			if (i->layout.n_channels > max_position)
-				return -ECHRNG;
+				return -EINVAL;
 			*layout = i->layout;
 			return i->layout.n_channels;
 		}
diff --git a/spa/include/spa/param/audio/raw-json.h b/spa/include/spa/param/audio/raw-json.h
index 6b1b25164..11540a6b0 100644
--- a/spa/include/spa/param/audio/raw-json.h
+++ b/spa/include/spa/param/audio/raw-json.h
@@ -88,14 +88,14 @@ spa_audio_info_raw_ext_update(struct spa_audio_info_raw *info, size_t size,
 	} else if (spa_streq(key, SPA_KEY_AUDIO_CHANNELS)) {
 		if (spa_atou32(val, &v, 0) && (force || info->channels == 0)) {
 			if (v > max_position)
-				return -ECHRNG;
+				return -EINVAL;
 			info->channels = v;
 		}
 	} else if (spa_streq(key, SPA_KEY_AUDIO_LAYOUT)) {
 		if (force || info->channels == 0) {
 			if (spa_audio_parse_layout(val, info->position, max_position, &v) > 0) {
 				if (v > max_position)
-					return -ECHRNG;
+					return -EINVAL;
 				info->channels = v;
 				SPA_FLAG_CLEAR(info->flags, SPA_AUDIO_FLAG_UNPOSITIONED);
 			}
@@ -105,7 +105,7 @@ spa_audio_info_raw_ext_update(struct spa_audio_info_raw *info, size_t size,
 			if (spa_audio_parse_position_n(val, strlen(val), info->position,
 						max_position, &v) > 0) {
 				if (v > max_position)
-					return -ECHRNG;
+					return -EINVAL;
 				info->channels = v;
 				SPA_FLAG_CLEAR(info->flags, SPA_AUDIO_FLAG_UNPOSITIONED);
 			}
diff --git a/spa/include/spa/param/audio/raw-utils.h b/spa/include/spa/param/audio/raw-utils.h
index 3f81b4a92..1e4ae2758 100644
--- a/spa/include/spa/param/audio/raw-utils.h
+++ b/spa/include/spa/param/audio/raw-utils.h
@@ -46,7 +46,7 @@ spa_format_audio_raw_ext_parse(const struct spa_pod *format, struct spa_audio_in
 			SPA_FORMAT_AUDIO_channels,	SPA_POD_OPT_Int(&info->channels),
 			SPA_FORMAT_AUDIO_position,	SPA_POD_OPT_Pod(&position));
 	if (info->channels > max_position)
-		return -ECHRNG;
+		return -EINVAL;
 	if (position == NULL ||
 	    spa_pod_copy_array(position, SPA_TYPE_Id, info->position, max_position) != info->channels) {
 		SPA_FLAG_SET(info->flags, SPA_AUDIO_FLAG_UNPOSITIONED);

From d17e68c43f2140d3bf8d4cf1fde48f82ac67b362 Mon Sep 17 00:00:00 2001
From: Siva Mahadevan <me@svmhdvn.name>
Date: Wed, 11 Mar 2026 14:20:46 -0400
Subject: [PATCH 180/263] network-utils: add missing #include <netinet/in.h>

As stated in https://pubs.opengroup.org/onlinepubs/9799919799//basedefs/netinet_in.h.html,

> The <netinet/in.h> header shall define the sockaddr_in structure [...]

This fixes the following build error:

In file included from ../src/modules/module-protocol-native.c:44:
../src/modules/network-utils.h:96:35: error: incomplete definition of type 'struct sockaddr_in'
   96 |                 if (inet_ntop(sa->ss_family, &in->sin_addr, ip, len) == NULL)
      |                                               ~~^
---
 src/modules/network-utils.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/network-utils.h b/src/modules/network-utils.h
index 6ff80dd7a..3c93e201e 100644
--- a/src/modules/network-utils.h
+++ b/src/modules/network-utils.h
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <sys/un.h>
+#include <netinet/in.h>
 
 #include <spa/utils/string.h>
 

From 283052c15a3e956304ee7d6b678a7bf737f6e0d1 Mon Sep 17 00:00:00 2001
From: Siva Mahadevan <me@svmhdvn.name>
Date: Wed, 11 Mar 2026 14:20:46 -0400
Subject: [PATCH 181/263] examples: fix includes for makedev() macro

On non-linux, the makedev() macro comes from <sys/types.h>.
---
 src/examples/video-src-fixate.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/examples/video-src-fixate.c b/src/examples/video-src-fixate.c
index 6d08074de..b16d810ad 100644
--- a/src/examples/video-src-fixate.c
+++ b/src/examples/video-src-fixate.c
@@ -18,7 +18,11 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/mman.h>
+#ifdef __linux__
 #include <sys/sysmacros.h>
+#else
+#include <sys/types.h>
+#endif
 #include <assert.h>
 
 #include <spa/param/dict-utils.h>

From e447b46d36ed442a9f94eb8b5576739e738862c5 Mon Sep 17 00:00:00 2001
From: Siva Mahadevan <me@svmhdvn.name>
Date: Wed, 11 Mar 2026 17:44:23 -0400
Subject: [PATCH 182/263] spa/tests: remove unused #include <linux/limits.h>

---
 spa/tests/benchmark-aec.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spa/tests/benchmark-aec.c b/spa/tests/benchmark-aec.c
index 3ac0fc62e..37d4a8375 100644
--- a/spa/tests/benchmark-aec.c
+++ b/spa/tests/benchmark-aec.c
@@ -6,7 +6,6 @@
 
 #include <dlfcn.h>
 #include <fcntl.h>
-#include <linux/limits.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>

From b0065bfe9a8d34020e2ea6f4272f3a2b28601689 Mon Sep 17 00:00:00 2001
From: Nedko Arnaudov <nedko@nedk.org>
Date: Wed, 11 Mar 2026 17:57:15 +0200
Subject: [PATCH 183/263] pipewire-jack: emit foreign port registration
 callbacks on jack_activate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The jack_activate loop was only queuing NOTIFY_TYPE_PORTREGISTRATION
for the activating client's own ports. Ports belonging to other clients
— including all WirePlumber-managed ports and MIDI ports — were silently
skipped due to the o->port.port->client != c condition.

This caused two observable bugs for clients using libjackserver (e.g.
jackdbus):
- JackPortRegistrationCallback was not fired for any pre-existing
  foreign ports at activate time, leaving the patchbay empty unless
  the session manager happened to start after the client.
- JACK MIDI ports were never announced via callback, even though they
  are correctly returned by jack_get_ports().

The graph_order_callback fallback (used by jackdbus for initial port
enumeration) is also ineffective here because pipewire-jack only fires
it on connection events, not on activate.

Fix by iterating all non-removed foreign ports in the object list and
queuing registration callbacks for those whose node is active, matching
the semantics already implemented in node_info() for ports of nodes
that transition to running state after activate.
---
 pipewire-jack/src/pipewire-jack.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
index 906fc96f1..56191b93c 100644
--- a/pipewire-jack/src/pipewire-jack.c
+++ b/pipewire-jack/src/pipewire-jack.c
@@ -4886,9 +4886,15 @@ int jack_activate (jack_client_t *client)
 	c->activation->pending_new_pos = true;
 	c->activation->pending_sync = true;
 
+	/* emits all foreign active ports, skips own (already announced via jack_port_register) */
 	spa_list_for_each(o, &c->context.objects, link) {
-		if (o->type != INTERFACE_Port || o->port.port == NULL ||
-		    o->port.port->client != c || !o->port.port->valid)
+		if (o->type != INTERFACE_Port || o->removed)
+			continue;
+		/* own ports are handled by jack_port_register */
+		if (o->port.port != NULL && o->port.port->client == c)
+			continue;
+		/* only announce ports whose node is active */
+		if (o->port.node != NULL && !node_is_active(c, o->port.node))
 			continue;
 		o->registered = 0;
 		queue_notify(c, NOTIFY_TYPE_PORTREGISTRATION, o, 1, NULL);

From 7c5b5d12ed1497240f6b0a79ab93be9dcd1c1d0c Mon Sep 17 00:00:00 2001
From: Nedko Arnaudov <nedko@nedk.org>
Date: Wed, 11 Mar 2026 19:13:15 +0200
Subject: [PATCH 184/263] pipewire-jack: fix jack_port_type_id() to return
 jack1/jack2 compatible values

pipewire-jack defines TYPE_ID_VIDEO=1 between audio and MIDI, shifting
TYPE_ID_MIDI to 2. This caused jack_port_type_id() to return 2 for MIDI
ports, breaking compatibility with jack1/jack2 which return 1.

The jack_port_type_id() return value is part of the public JACK API and
consumers such as jackdbus rely on the conventional values established
by jack1/jack2: 0 for audio, 1 for MIDI.

Map internal TYPE_ID_* values to their jack1/jack2 compatible equivalents
before returning. All MIDI variants (MIDI, OSC, UMP) map to 1. Video has
no jack1/jack2 equivalent so maps to 3, beyond the conventional range.
---
 pipewire-jack/src/pipewire-jack.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
index 56191b93c..d34d96bd6 100644
--- a/pipewire-jack/src/pipewire-jack.c
+++ b/pipewire-jack/src/pipewire-jack.c
@@ -6018,7 +6018,16 @@ jack_port_type_id_t jack_port_type_id (const jack_port_t *port)
 	return_val_if_fail(o != NULL, 0);
 	if (o->type != INTERFACE_Port)
 		return TYPE_ID_OTHER;
-	return o->port.type_id;
+
+	/* map internal type IDs to jack1/jack2 compatible public values */
+	switch (o->port.type_id) {
+	case TYPE_ID_AUDIO: return 0;
+	case TYPE_ID_MIDI:
+	case TYPE_ID_OSC:
+	case TYPE_ID_UMP:   return 1;  /* all MIDI variants map to 1 */
+	case TYPE_ID_VIDEO: return 3;  /* video maps to 3 */
+	default:            return o->port.type_id;
+	}
 }
 
 SPA_EXPORT

From 9495e2b8a9790ddc8c0d1e6b486aec60843ea74d Mon Sep 17 00:00:00 2001
From: Siva Mahadevan <me@svmhdvn.name>
Date: Wed, 11 Mar 2026 14:00:05 -0400
Subject: [PATCH 185/263] pipewire/thread.c: only handle reset_on_fork if
 SCHED_RESET_ON_FORK is defined

This fixes a missing definition error in thread.c:

../src/pipewire/thread.c:129:30: error: use of undeclared identifier 'SCHED_RESET_ON_FORK'
  129 |         SPA_FLAG_UPDATE(new_policy, SCHED_RESET_ON_FORK, reset_on_fork);
---
 src/pipewire/thread.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/pipewire/thread.c b/src/pipewire/thread.c
index 3af0b4a44..1637a8af7 100644
--- a/src/pipewire/thread.c
+++ b/src/pipewire/thread.c
@@ -92,9 +92,8 @@ static struct spa_thread *impl_create(void *object,
 	pthread_t pt;
 	pthread_attr_t *attr = NULL, attributes;
 	const char *str;
-	int err, old_policy, new_policy;
+	int err;
 	int (*create_func)(pthread_t *, const pthread_attr_t *attr, void *(*start)(void*), void *) = NULL;
-	struct sched_param sp;
 	bool reset_on_fork = true;
 
 	attr = pw_thread_fill_attr(props, &attributes);
@@ -124,11 +123,19 @@ static struct spa_thread *impl_create(void *object,
 			reset_on_fork = spa_atob(str);
 	}
 
+#ifdef SCHED_RESET_ON_FORK
+	int old_policy, new_policy;
+	struct sched_param sp;
+
 	pthread_getschedparam(pt, &old_policy, &sp);
 	new_policy = old_policy;
 	SPA_FLAG_UPDATE(new_policy, SCHED_RESET_ON_FORK, reset_on_fork);
 	if (old_policy != new_policy)
 		pthread_setschedparam(pt, new_policy, &sp);
+#else
+	if (reset_on_fork)
+		pw_log_debug("SCHED_RESET_ON_FORK is not supported on this platform");
+#endif
 
 	return (struct spa_thread*)pt;
 }

From a671625637d8dea79654f4e3042a7fafc0b506ac Mon Sep 17 00:00:00 2001
From: Siva Mahadevan <me@svmhdvn.name>
Date: Wed, 11 Mar 2026 20:15:42 -0400
Subject: [PATCH 186/263] spa/plugins: revert "Disable alsa plugin on !Linux
 platforms."

This reverts commit 01096bf6695abff4933873b5ca7196a33bdda597.

The linux-specific headers are gone, it builds fine now with alsa enabled.
---
 spa/plugins/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spa/plugins/meson.build b/spa/plugins/meson.build
index 42aec7ed3..f774c1036 100644
--- a/spa/plugins/meson.build
+++ b/spa/plugins/meson.build
@@ -1,4 +1,4 @@
-if alsa_dep.found() and host_machine.system() == 'linux'
+if alsa_dep.found()
   subdir('alsa')
 endif
 if get_option('avb').require(host_machine.system() == 'linux', error_message: 'AVB support is only available on Linux').allowed()

From 357f27658e00639c771d4a03e7696461980d187e Mon Sep 17 00:00:00 2001
From: Siva Mahadevan <me@svmhdvn.name>
Date: Wed, 11 Mar 2026 20:10:34 -0400
Subject: [PATCH 187/263] spa/utils: remove FreeBSD workaround for bswap*

Both <endian.h> and <byteswap.h> have the things we need.
---
 spa/include/spa/utils/endian.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spa/include/spa/utils/endian.h b/spa/include/spa/utils/endian.h
index 2d002d453..0793ed412 100644
--- a/spa/include/spa/utils/endian.h
+++ b/spa/include/spa/utils/endian.h
@@ -5,7 +5,7 @@
 #ifndef SPA_ENDIAN_H
 #define SPA_ENDIAN_H
 
-#if defined(__FreeBSD__) || defined(__MidnightBSD__)
+#if defined(__MidnightBSD__)
 #include <sys/endian.h>
 #define bswap_16 bswap16
 #define bswap_32 bswap32

From 0393fd8a72e044a669ec4da0729dee52660c7397 Mon Sep 17 00:00:00 2001
From: Siva Mahadevan <me@svmhdvn.name>
Date: Wed, 11 Mar 2026 20:10:34 -0400
Subject: [PATCH 188/263] spa/plugins: include <stdlib.h> for alloca() on
 non-linux

---
 spa/plugins/alsa/acp-tool.c               | 2 ++
 spa/plugins/vulkan/vulkan-blit-utils.c    | 4 +++-
 spa/plugins/vulkan/vulkan-compute-utils.c | 4 +++-
 spa/plugins/vulkan/vulkan-utils.c         | 4 +++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/spa/plugins/alsa/acp-tool.c b/spa/plugins/alsa/acp-tool.c
index c12401100..824d69df6 100644
--- a/spa/plugins/alsa/acp-tool.c
+++ b/spa/plugins/alsa/acp-tool.c
@@ -10,7 +10,9 @@
 #include <time.h>
 #include <stdbool.h>
 #include <getopt.h>
+#ifdef __linux__
 #include <alloca.h>
+#endif
 
 #include <spa/debug/context.h>
 #include <spa/utils/string.h>
diff --git a/spa/plugins/vulkan/vulkan-blit-utils.c b/spa/plugins/vulkan/vulkan-blit-utils.c
index f8a60497e..e0bd6cfe5 100644
--- a/spa/plugins/vulkan/vulkan-blit-utils.c
+++ b/spa/plugins/vulkan/vulkan-blit-utils.c
@@ -12,8 +12,10 @@
 #include <fcntl.h>
 #include <string.h>
 #include <vulkan/vulkan_core.h>
-#if !defined(__FreeBSD__) && !defined(__MidnightBSD__)
+#ifdef __linux__
 #include <alloca.h>
+#else
+#include <stdlib.h>
 #endif
 #include <errno.h>
 #include <stdio.h>
diff --git a/spa/plugins/vulkan/vulkan-compute-utils.c b/spa/plugins/vulkan/vulkan-compute-utils.c
index 49705bee8..503542483 100644
--- a/spa/plugins/vulkan/vulkan-compute-utils.c
+++ b/spa/plugins/vulkan/vulkan-compute-utils.c
@@ -11,8 +11,10 @@
 #include <fcntl.h>
 #include <string.h>
 #include <vulkan/vulkan_core.h>
-#if !defined(__FreeBSD__) && !defined(__MidnightBSD__)
+#ifdef __linux__
 #include <alloca.h>
+#else
+#include <stdlib.h>
 #endif
 #include <errno.h>
 #include <stdio.h>
diff --git a/spa/plugins/vulkan/vulkan-utils.c b/spa/plugins/vulkan/vulkan-utils.c
index 6a0f693dc..88a230dd6 100644
--- a/spa/plugins/vulkan/vulkan-utils.c
+++ b/spa/plugins/vulkan/vulkan-utils.c
@@ -11,8 +11,10 @@
 #include <fcntl.h>
 #include <string.h>
 #include <poll.h>
-#if !defined(__FreeBSD__) && !defined(__MidnightBSD__)
+#ifdef __linux__
 #include <alloca.h>
+#else
+#include <stdlib.h>
 #endif
 #include <errno.h>
 #include <stdio.h>

From f11ab0da3e500ab6f3c9531696bfc67370752550 Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arunr@valvesoftware.com>
Date: Tue, 10 Mar 2026 15:47:29 -0700
Subject: [PATCH 189/263] spa: loop: Mark cancellation fields as volatile

Cancellation handlers use setjmp/longjmp, for which the C99
specification has the following note:

> 17.3.2.1 (3)
> All accessible objects have values, and all other components of the
> abstract machine) have state, as of the time the longjmp function was
> called, except that the values of objects of automatic storage
> duration that are local to the function containing the invocation of
> the corresponding setjmp macro that do not have volatile-qualified
> type and have been changed between the setjmp invocation and longjmp
> call are indeterminate.

While everything works fine with GCC, with Clang we see that the
cancellation handler doesn't seem to have an effect (loop-test fails
when it notices that its spa_source's priv and mask have not been
cleaned up).

The underlying cause is that the compiler can assume data.ep_count is
only used in loop_iterate_cancel(), and so can be cached in a register.
When we access that field in the cancellation handler, it was never
actually written to the memory on the stack, so the read in
cancellation_handler() does not see the current value.

We fix this by marking all fields on the stack that we expect to be
modified in loop_iterate_cancel() as volatile, forcing the memory to be
updated and correctly available to the cancellation handler.
---
 spa/plugins/support/loop.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spa/plugins/support/loop.c b/spa/plugins/support/loop.c
index 1ec2b21c2..5e35f6dcd 100644
--- a/spa/plugins/support/loop.c
+++ b/spa/plugins/support/loop.c
@@ -728,10 +728,10 @@ static int loop_accept(void *object)
 
 struct cancellation_handler_data {
 	struct impl *impl;
-	struct spa_poll_event *ep;
-	int ep_count;
-	int unlocked;
-	int locked;
+	const struct spa_poll_event *ep;
+	volatile int ep_count;
+	volatile int unlocked;
+	volatile int locked;
 };
 
 static void cancellation_handler(void *closure)

From ad195b289a5648afc4663edbd49355ee331d1fae Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 12 Mar 2026 12:13:43 +0100
Subject: [PATCH 190/263] modules: try to document the passive ports better

---
 src/modules/module-scheduler-v1.c | 45 ++++++++++++++++---------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
index 0203cdada..6531dc1d6 100644
--- a/src/modules/module-scheduler-v1.c
+++ b/src/modules/module-scheduler-v1.c
@@ -105,18 +105,17 @@ static int ensure_state(struct pw_impl_node *node, bool running)
 		state = PW_NODE_STATE_IDLE;
 	return pw_impl_node_set_state(node, state);
 }
-
-/* make a node runnable. This will automatically also make all non-passive peer nodes
- * runnable and the nodes that belong to the same groups or link_groups. We stop when
- * we reach a passive_into port.
+/* Make a node runnable. Peer nodes are also made runnable when the passive_into state
+ * of the port is false, which is only when the port is folow or non-passive.
  *
- * We have 4 cases for the links:
- * (p) marks a passive_into port. we don't follow the peer from this port.
+ *            away       into
+ * false   :  false      false
+ * true    :  true       true     <- passive_into peer ports skipped
+ * follow  :  true       false
  *
- *  A   ->   B   ==> B can also be runnable
- *  A  p->   B   ==> B can also be runnable
- *  A   ->p  B   ==> B can not be runnable
- *  A  p->p  B   ==> B can not be runnable
+ *  A (*) ->     B     if A running -> B set to running
+ *  A (*) -> (f) B     if A running -> B set to running
+ *  A (*) -> (p) B     if A running -> B no change
  */
 static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 {
@@ -188,22 +187,24 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 	}
 }
 
-/* check if a node and its peer can run. They can both run if there is a non-passive
- * link between them. The passive link is between 1 or more passive ports.
+/* check if a node and its peer can run.
  *
- * There are 4 cases:
+ * When looking at a node we only consider the non passive_away links, the
+ * passive_away links from the node don't make the peer or node runnable.
  *
- * (p) marks a passive_away port. we don't follow the peer from this port.
- * A can not be a driver
+ *            away       into
+ * false   :  false      false	<- !passive_away ports followed 
+ * true    :  true       true
+ * follow  :  true       false
  *
- *  A   ->   B   ==> both nodes can run
- *  A   ->p  B   ==> both nodes can run (B is passive so it can't activate A, but
- *                   A can activate B)
- *  A  p->   B   ==> nodes don't run, port A is passive and doesn't activate B
- *  A  p->p  B   ==> nodes don't run
+ * A port only has a passive_away link when the port is set to non-passive.
+ * All other port modes don't make A and B runnable.
  *
- *  Once we decide the two nodes should be made runnable we do make_runnable()
- *  on both.
+ *  A     ->     B     A + B both set to running
+ *  A     -> (p) B     A + B both set to running
+ *  A     -> (f) B     A + B both set to running
+ *  A (p) -> (*) B     A + B no change
+ *  A (f) -> (*) B     A + B no change
  */
 static void check_runnable(struct pw_context *context, struct pw_impl_node *node)
 {

From 45e3af5cdc71c44898f2cad81d478eccd3a93432 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 12 Mar 2026 13:46:49 +0100
Subject: [PATCH 191/263] impl-port: make passive mode as an enum

Hopefully easier to understand.
---
 src/modules/module-scheduler-v1.c | 36 +++++++++++--------------------
 src/pipewire/impl-node.c          | 25 ++++++++-------------
 src/pipewire/impl-port.c          | 17 +++++----------
 src/pipewire/private.h            | 10 +++++----
 4 files changed, 32 insertions(+), 56 deletions(-)

diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
index 6531dc1d6..f8575f718 100644
--- a/src/modules/module-scheduler-v1.c
+++ b/src/modules/module-scheduler-v1.c
@@ -105,13 +105,9 @@ static int ensure_state(struct pw_impl_node *node, bool running)
 		state = PW_NODE_STATE_IDLE;
 	return pw_impl_node_set_state(node, state);
 }
-/* Make a node runnable. Peer nodes are also made runnable when the passive_into state
- * of the port is false, which is only when the port is folow or non-passive.
- *
- *            away       into
- * false   :  false      false
- * true    :  true       true     <- passive_into peer ports skipped
- * follow  :  true       false
+
+/* Make a node runnable. Peer nodes are also made runnable when the passive_mode
+ * of the port is false or follow.
  *
  *  A (*) ->     B     if A running -> B set to running
  *  A (*) -> (f) B     if A running -> B set to running
@@ -144,8 +140,8 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 		spa_list_for_each(l, &p->links, output_link) {
 			n = l->input->node;
 			pw_log_trace(" out-port %p: link %p passive:%d prepared:%d active:%d runn:%d", p,
-					l, l->input->passive_into, l->prepared, n->active, n->runnable);
-			if (!n->active || l->input->passive_into)
+					l, l->input->passive_mode, l->prepared, n->active, n->runnable);
+			if (!n->active || l->input->passive_mode == PASSIVE_MODE_TRUE)
 				continue;
 			pw_impl_link_prepare(l);
 			if (!l->prepared)
@@ -158,8 +154,8 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 		spa_list_for_each(l, &p->links, input_link) {
 			n = l->output->node;
 			pw_log_trace(" in-port %p: link %p passive:%d prepared:%d active:%d runn:%d", p,
-					l, l->output->passive_into, l->prepared, n->active, n->runnable);
-			if (!n->active || l->output->passive_into)
+					l, l->output->passive_mode, l->prepared, n->active, n->runnable);
+			if (!n->active || l->output->passive_mode == PASSIVE_MODE_TRUE)
 				continue;
 			pw_impl_link_prepare(l);
 			if (!l->prepared)
@@ -189,15 +185,7 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 
 /* check if a node and its peer can run.
  *
- * When looking at a node we only consider the non passive_away links, the
- * passive_away links from the node don't make the peer or node runnable.
- *
- *            away       into
- * false   :  false      false	<- !passive_away ports followed 
- * true    :  true       true
- * follow  :  true       false
- *
- * A port only has a passive_away link when the port is set to non-passive.
+ * Only consider ports that have a PASSIVE_MODE_FALSE link.
  * All other port modes don't make A and B runnable.
  *
  *  A     ->     B     A + B both set to running
@@ -224,8 +212,8 @@ static void check_runnable(struct pw_context *context, struct pw_impl_node *node
 			/* the peer needs to be active and we are linked to it
 			 * with a non-passive link */
 			pw_log_trace(" out-port %p: link %p passive:%d prepared:%d active:%d", p,
-					l, p->passive_away, l->prepared, n->active);
-			if (!n->active || p->passive_away)
+					l, p->passive_mode, l->prepared, n->active);
+			if (!n->active || p->passive_mode != PASSIVE_MODE_FALSE)
 				continue;
 			/* explicitly prepare the link in case it was suspended */
 			pw_impl_link_prepare(l);
@@ -239,8 +227,8 @@ static void check_runnable(struct pw_context *context, struct pw_impl_node *node
 		spa_list_for_each(l, &p->links, input_link) {
 			n = l->output->node;
 			pw_log_trace(" in-port %p: link %p passive:%d prepared:%d active:%d", p,
-					l, p->passive_away, l->prepared, n->active);
-			if (!n->active || p->passive_away)
+					l, p->passive_mode, l->prepared, n->active);
+			if (!n->active || p->passive_mode != PASSIVE_MODE_FALSE)
 				continue;
 			pw_impl_link_prepare(l);
 			if (!l->prepared)
diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c
index f590f36bc..91b0295d4 100644
--- a/src/pipewire/impl-node.c
+++ b/src/pipewire/impl-node.c
@@ -1270,32 +1270,25 @@ static void check_properties(struct pw_impl_node *node)
 	}
 
 	if (spa_streq(str, "out")) {
-		node->passive_away[SPA_DIRECTION_OUTPUT] = true;
-		node->passive_into[SPA_DIRECTION_OUTPUT]= true;
+		node->passive_mode[SPA_DIRECTION_OUTPUT] = PASSIVE_MODE_TRUE;
 	}
 	if (spa_streq(str, "out-follow")) {
-		node->passive_away[SPA_DIRECTION_OUTPUT] = true;
-		node->passive_into[SPA_DIRECTION_OUTPUT] = false;
+		node->passive_mode[SPA_DIRECTION_OUTPUT] = PASSIVE_MODE_FOLLOW;
 	}
 	else if (spa_streq(str, "in")) {
-		node->passive_away[SPA_DIRECTION_INPUT] = true;
-		node->passive_into[SPA_DIRECTION_INPUT]= true;
+		node->passive_mode[SPA_DIRECTION_INPUT] = PASSIVE_MODE_TRUE;
 	}
 	else if (spa_streq(str, "in-follow")) {
-		node->passive_away[SPA_DIRECTION_INPUT] = true;
-		node->passive_into[SPA_DIRECTION_INPUT] = false;
+		node->passive_mode[SPA_DIRECTION_INPUT] = PASSIVE_MODE_FOLLOW;
 	}
 	else if (spa_streq(str, "follow")) {
-		node->passive_away[SPA_DIRECTION_INPUT] = true;
-		node->passive_into[SPA_DIRECTION_INPUT] = false;
-		node->passive_away[SPA_DIRECTION_OUTPUT] = true;
-		node->passive_into[SPA_DIRECTION_OUTPUT] = false;
+		node->passive_mode[SPA_DIRECTION_INPUT] = PASSIVE_MODE_FOLLOW;
+		node->passive_mode[SPA_DIRECTION_OUTPUT] = PASSIVE_MODE_FOLLOW;
 	}
 	else {
-		node->passive_away[SPA_DIRECTION_OUTPUT] =
-			node->passive_into[SPA_DIRECTION_OUTPUT] =
-			node->passive_away[SPA_DIRECTION_INPUT] =
-			node->passive_into[SPA_DIRECTION_INPUT] = spa_atob(str);
+		node->passive_mode[SPA_DIRECTION_OUTPUT] =
+			node->passive_mode[SPA_DIRECTION_INPUT] =
+			spa_atob(str) ? PASSIVE_MODE_TRUE : PASSIVE_MODE_FALSE;
 	}
 
 	node->want_driver = pw_properties_get_bool(node->properties, PW_KEY_NODE_WANT_DRIVER, false);
diff --git a/src/pipewire/impl-port.c b/src/pipewire/impl-port.c
index c0de46e92..074a93d12 100644
--- a/src/pipewire/impl-port.c
+++ b/src/pipewire/impl-port.c
@@ -540,21 +540,14 @@ static int check_properties(struct pw_impl_port *port)
 
 	if ((str = pw_properties_get(port->properties, PW_KEY_PORT_PASSIVE)) == NULL) {
 		/* inherit passive state from parent node */
-		port->passive_into = node->passive_into[port->direction];
-		port->passive_away = node->passive_away[port->direction];
+		port->passive_mode = node->passive_mode[port->direction];
 	} else {
-		if (spa_streq(str, "true")) {
-			port->passive_into = true;
-			port->passive_away = true;
-		}
-		else if (spa_streq(str, "follow")) {
-			port->passive_into = false;
-			port->passive_away = true;
+		if (spa_streq(str, "follow")) {
+			port->passive_mode = PASSIVE_MODE_FOLLOW;
 		} else {
-			port->passive_into = false;
-			port->passive_away = false;
+			port->passive_mode = spa_atob(str) ?
+				PASSIVE_MODE_TRUE : PASSIVE_MODE_FALSE;
 		}
-
 	}
 
 	if (media_class != NULL &&
diff --git a/src/pipewire/private.h b/src/pipewire/private.h
index 51b71edd3..897f990d9 100644
--- a/src/pipewire/private.h
+++ b/src/pipewire/private.h
@@ -785,8 +785,10 @@ struct pw_impl_node {
 	unsigned int exclusive:1;	/**< ports can only be linked once */
 	unsigned int reliable:1;	/**< ports need reliable tee */
 
-	bool passive_away[2];	/**< node input links should be passive */
-	bool passive_into[2];	/**< node input links should be passive */
+#define PASSIVE_MODE_FALSE	0
+#define PASSIVE_MODE_TRUE	1
+#define PASSIVE_MODE_FOLLOW	2
+	bool passive_mode[2];		/**< node input links should be passive */
 
 	uint32_t transport;		/**< latest transport request */
 
@@ -961,9 +963,9 @@ struct pw_impl_port {
 		struct spa_list node_link;
 		bool added;
 	} rt;					/**< data only accessed from the data thread */
+	int passive_mode;
+
 	unsigned int destroying:1;
-	unsigned int passive_into:1;
-	unsigned int passive_away:1;
 	unsigned int auto_path:1;		/* path was automatically generated */
 	unsigned int auto_name:1;		/* name was automatically generated */
 	unsigned int auto_alias:1;		/* alias was automatically generated */

From ca91b368c1b23df6c97fab66def75a07f7d47786 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 12 Mar 2026 14:40:04 +0100
Subject: [PATCH 192/263] impl-port: make a follow-suspend port mode

It's like the follow mode but when you link 2 follow-suspend ports
together, they will activate eachother.

This is to make Source -> Sink links work.
---
 src/modules/module-scheduler-v1.c | 27 ++++++++++++++++++++-------
 src/pipewire/impl-node.c          |  6 +++++-
 src/pipewire/impl-port.c          |  1 -
 src/pipewire/private.h            |  9 +++++----
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
index f8575f718..9a8fc13a0 100644
--- a/src/modules/module-scheduler-v1.c
+++ b/src/modules/module-scheduler-v1.c
@@ -188,12 +188,25 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
  * Only consider ports that have a PASSIVE_MODE_FALSE link.
  * All other port modes don't make A and B runnable.
  *
- *  A     ->     B     A + B both set to running
- *  A     -> (p) B     A + B both set to running
- *  A     -> (f) B     A + B both set to running
- *  A (p) -> (*) B     A + B no change
- *  A (f) -> (*) B     A + B no change
+ *  A      ->     B     A + B both set to running
+ *  A      -> (p) B     A + B both set to running
+ *  A      -> (f) B     A + B both set to running
+ *  A (p)  -> (*) B     A + B no change
+ *  A (f)  -> (*) B     A + B no change
+ *  A (fs) -> (*) B     A + B no change
+ *  A (fs) -> (fs) B    A + B both set to running
  */
+static inline bool may_follow(struct pw_impl_port *p, struct pw_impl_port *other)
+{
+	pw_log_warn("%s %s %d %d", p->node->name, other->node->name,
+			p->passive_mode, other->passive_mode);
+	if (p->passive_mode == PASSIVE_MODE_FALSE)
+		return true;
+	if (p->passive_mode == PASSIVE_MODE_FOLLOW_SUSPEND &&
+	    other->passive_mode == PASSIVE_MODE_FOLLOW_SUSPEND)
+		return true;
+	return false;
+}
 static void check_runnable(struct pw_context *context, struct pw_impl_node *node)
 {
 	struct pw_impl_port *p;
@@ -213,7 +226,7 @@ static void check_runnable(struct pw_context *context, struct pw_impl_node *node
 			 * with a non-passive link */
 			pw_log_trace(" out-port %p: link %p passive:%d prepared:%d active:%d", p,
 					l, p->passive_mode, l->prepared, n->active);
-			if (!n->active || p->passive_mode != PASSIVE_MODE_FALSE)
+			if (!n->active || !may_follow(p, l->input))
 				continue;
 			/* explicitly prepare the link in case it was suspended */
 			pw_impl_link_prepare(l);
@@ -228,7 +241,7 @@ static void check_runnable(struct pw_context *context, struct pw_impl_node *node
 			n = l->output->node;
 			pw_log_trace(" in-port %p: link %p passive:%d prepared:%d active:%d", p,
 					l, p->passive_mode, l->prepared, n->active);
-			if (!n->active || p->passive_mode != PASSIVE_MODE_FALSE)
+			if (!n->active || !may_follow(p, l->output))
 				continue;
 			pw_impl_link_prepare(l);
 			if (!l->prepared)
diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c
index 91b0295d4..ac362cc68 100644
--- a/src/pipewire/impl-node.c
+++ b/src/pipewire/impl-node.c
@@ -1264,7 +1264,7 @@ static void check_properties(struct pw_impl_node *node)
 	if ((str = pw_properties_get(node->properties, PW_KEY_NODE_PASSIVE)) == NULL) {
 		if ((str = pw_properties_get(node->properties, PW_KEY_MEDIA_CLASS)) != NULL &&
 		    (strstr(str, "/Sink") != NULL || strstr(str, "/Source") != NULL))
-			str = "follow";
+			str = "follow-suspend";
 		else
 			str = "false";
 	}
@@ -1285,6 +1285,10 @@ static void check_properties(struct pw_impl_node *node)
 		node->passive_mode[SPA_DIRECTION_INPUT] = PASSIVE_MODE_FOLLOW;
 		node->passive_mode[SPA_DIRECTION_OUTPUT] = PASSIVE_MODE_FOLLOW;
 	}
+	else if (spa_streq(str, "follow-suspend")) {
+		node->passive_mode[SPA_DIRECTION_INPUT] = PASSIVE_MODE_FOLLOW_SUSPEND;
+		node->passive_mode[SPA_DIRECTION_OUTPUT] = PASSIVE_MODE_FOLLOW_SUSPEND;
+	}
 	else {
 		node->passive_mode[SPA_DIRECTION_OUTPUT] =
 			node->passive_mode[SPA_DIRECTION_INPUT] =
diff --git a/src/pipewire/impl-port.c b/src/pipewire/impl-port.c
index 074a93d12..1e1d023b9 100644
--- a/src/pipewire/impl-port.c
+++ b/src/pipewire/impl-port.c
@@ -537,7 +537,6 @@ static int check_properties(struct pw_impl_port *port)
 			&schedule_tee_node;
 	}
 
-
 	if ((str = pw_properties_get(port->properties, PW_KEY_PORT_PASSIVE)) == NULL) {
 		/* inherit passive state from parent node */
 		port->passive_mode = node->passive_mode[port->direction];
diff --git a/src/pipewire/private.h b/src/pipewire/private.h
index 897f990d9..27eaaeb96 100644
--- a/src/pipewire/private.h
+++ b/src/pipewire/private.h
@@ -785,10 +785,11 @@ struct pw_impl_node {
 	unsigned int exclusive:1;	/**< ports can only be linked once */
 	unsigned int reliable:1;	/**< ports need reliable tee */
 
-#define PASSIVE_MODE_FALSE	0
-#define PASSIVE_MODE_TRUE	1
-#define PASSIVE_MODE_FOLLOW	2
-	bool passive_mode[2];		/**< node input links should be passive */
+#define PASSIVE_MODE_FALSE		0
+#define PASSIVE_MODE_TRUE		1
+#define PASSIVE_MODE_FOLLOW		2
+#define PASSIVE_MODE_FOLLOW_SUSPEND	3
+	int passive_mode[2];		/**< node input links should be passive */
 
 	uint32_t transport;		/**< latest transport request */
 

From 41520f10221f195e9bb228c71542abf1ce44a941 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 12 Mar 2026 14:44:34 +0100
Subject: [PATCH 193/263] modules: remove a warning

---
 src/modules/module-scheduler-v1.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
index 9a8fc13a0..89d6fa7c5 100644
--- a/src/modules/module-scheduler-v1.c
+++ b/src/modules/module-scheduler-v1.c
@@ -198,8 +198,6 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
  */
 static inline bool may_follow(struct pw_impl_port *p, struct pw_impl_port *other)
 {
-	pw_log_warn("%s %s %d %d", p->node->name, other->node->name,
-			p->passive_mode, other->passive_mode);
 	if (p->passive_mode == PASSIVE_MODE_FALSE)
 		return true;
 	if (p->passive_mode == PASSIVE_MODE_FOLLOW_SUSPEND &&

From 3e209f6d20a9008eb96571609d1f10c0aceb9c42 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 12 Mar 2026 14:57:23 +0100
Subject: [PATCH 194/263] modules: try to improve code readability some more

---
 src/modules/module-scheduler-v1.c | 41 +++++++++++++++++--------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
index 89d6fa7c5..b546aeca2 100644
--- a/src/modules/module-scheduler-v1.c
+++ b/src/modules/module-scheduler-v1.c
@@ -107,12 +107,17 @@ static int ensure_state(struct pw_impl_node *node, bool running)
 }
 
 /* Make a node runnable. Peer nodes are also made runnable when the passive_mode
- * of the port is false or follow.
+ * of the peer port is !TRUE.
  *
- *  A (*) ->     B     if A running -> B set to running
- *  A (*) -> (f) B     if A running -> B set to running
- *  A (*) -> (p) B     if A running -> B no change
+ *  A (*) ->      B     if A running -> B set to running
+ *  A (*) -> (f)  B     if A running -> B set to running
+ *  A (*) -> (fs) B     if A running -> B set to running
+ *  A (*) -> (p)  B     if A running -> B no change
  */
+static inline bool makes_runnable(struct pw_impl_port *a, struct pw_impl_port *b)
+{
+	return b->passive_mode != PASSIVE_MODE_TRUE;
+}
 static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 {
 	struct pw_impl_port *p;
@@ -141,7 +146,7 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 			n = l->input->node;
 			pw_log_trace(" out-port %p: link %p passive:%d prepared:%d active:%d runn:%d", p,
 					l, l->input->passive_mode, l->prepared, n->active, n->runnable);
-			if (!n->active || l->input->passive_mode == PASSIVE_MODE_TRUE)
+			if (!n->active || !makes_runnable(p, l->input))
 				continue;
 			pw_impl_link_prepare(l);
 			if (!l->prepared)
@@ -155,7 +160,7 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 			n = l->output->node;
 			pw_log_trace(" in-port %p: link %p passive:%d prepared:%d active:%d runn:%d", p,
 					l, l->output->passive_mode, l->prepared, n->active, n->runnable);
-			if (!n->active || l->output->passive_mode == PASSIVE_MODE_TRUE)
+			if (!n->active || !makes_runnable(p, l->output))
 				continue;
 			pw_impl_link_prepare(l);
 			if (!l->prepared)
@@ -188,20 +193,20 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
  * Only consider ports that have a PASSIVE_MODE_FALSE link.
  * All other port modes don't make A and B runnable.
  *
- *  A      ->     B     A + B both set to running
- *  A      -> (p) B     A + B both set to running
- *  A      -> (f) B     A + B both set to running
- *  A (p)  -> (*) B     A + B no change
- *  A (f)  -> (*) B     A + B no change
- *  A (fs) -> (*) B     A + B no change
+ *  A      ->      B    A + B both set to running
+ *  A      -> (p)  B    A + B both set to running
+ *  A      -> (f)  B    A + B both set to running
  *  A (fs) -> (fs) B    A + B both set to running
+ *  A (p)  -> (*)  B    A + B no change
+ *  A (f)  -> (*)  B    A + B no change
+ *  A (fs) -> (*)  B    A + B no change
  */
-static inline bool may_follow(struct pw_impl_port *p, struct pw_impl_port *other)
+static inline bool runnable_pair(struct pw_impl_port *a, struct pw_impl_port *b)
 {
-	if (p->passive_mode == PASSIVE_MODE_FALSE)
+	if (a->passive_mode == PASSIVE_MODE_FALSE)
 		return true;
-	if (p->passive_mode == PASSIVE_MODE_FOLLOW_SUSPEND &&
-	    other->passive_mode == PASSIVE_MODE_FOLLOW_SUSPEND)
+	if (a->passive_mode == PASSIVE_MODE_FOLLOW_SUSPEND &&
+	    b->passive_mode == PASSIVE_MODE_FOLLOW_SUSPEND)
 		return true;
 	return false;
 }
@@ -224,7 +229,7 @@ static void check_runnable(struct pw_context *context, struct pw_impl_node *node
 			 * with a non-passive link */
 			pw_log_trace(" out-port %p: link %p passive:%d prepared:%d active:%d", p,
 					l, p->passive_mode, l->prepared, n->active);
-			if (!n->active || !may_follow(p, l->input))
+			if (!n->active || !runnable_pair(p, l->input))
 				continue;
 			/* explicitly prepare the link in case it was suspended */
 			pw_impl_link_prepare(l);
@@ -239,7 +244,7 @@ static void check_runnable(struct pw_context *context, struct pw_impl_node *node
 			n = l->output->node;
 			pw_log_trace(" in-port %p: link %p passive:%d prepared:%d active:%d", p,
 					l, p->passive_mode, l->prepared, n->active);
-			if (!n->active || !may_follow(p, l->output))
+			if (!n->active || !runnable_pair(p, l->output))
 				continue;
 			pw_impl_link_prepare(l);
 			if (!l->prepared)

From f4558472df98a6c36547bdac45a2d1542f02b9d8 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 12 Mar 2026 15:00:34 +0100
Subject: [PATCH 195/263] Revert "pipewire-jack: emit foreign port registration
 callbacks on jack_activate"

This reverts commit b0065bfe9a8d34020e2ea6f4272f3a2b28601689.

This causes double ports in carla.
---
 pipewire-jack/src/pipewire-jack.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
index d34d96bd6..94482dbc0 100644
--- a/pipewire-jack/src/pipewire-jack.c
+++ b/pipewire-jack/src/pipewire-jack.c
@@ -4886,15 +4886,9 @@ int jack_activate (jack_client_t *client)
 	c->activation->pending_new_pos = true;
 	c->activation->pending_sync = true;
 
-	/* emits all foreign active ports, skips own (already announced via jack_port_register) */
 	spa_list_for_each(o, &c->context.objects, link) {
-		if (o->type != INTERFACE_Port || o->removed)
-			continue;
-		/* own ports are handled by jack_port_register */
-		if (o->port.port != NULL && o->port.port->client == c)
-			continue;
-		/* only announce ports whose node is active */
-		if (o->port.node != NULL && !node_is_active(c, o->port.node))
+		if (o->type != INTERFACE_Port || o->port.port == NULL ||
+		    o->port.port->client != c || !o->port.port->valid)
 			continue;
 		o->registered = 0;
 		queue_notify(c, NOTIFY_TYPE_PORTREGISTRATION, o, 1, NULL);

From 1344bec7bbd7bf47ae132e14aaca6377276ced8d Mon Sep 17 00:00:00 2001
From: Jonas Holmberg <jonashg@axis.com>
Date: Thu, 12 Mar 2026 15:24:14 +0100
Subject: [PATCH 196/263] filter-graph: set min, max and def values for ramp

Set min, max and def values for the control ports of ramp plugin to
avoid clamping all control values to 0.
---
 spa/plugins/filter-graph/plugin_builtin.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spa/plugins/filter-graph/plugin_builtin.c b/spa/plugins/filter-graph/plugin_builtin.c
index a16e4a7fc..f3a0a0946 100644
--- a/spa/plugins/filter-graph/plugin_builtin.c
+++ b/spa/plugins/filter-graph/plugin_builtin.c
@@ -2486,10 +2486,12 @@ static struct spa_fga_port ramp_ports[] = {
 	{ .index = 1,
 	  .name = "Start",
 	  .flags = SPA_FGA_PORT_INPUT | SPA_FGA_PORT_CONTROL,
+	  .def = 0.0f, .min = -FLT_MAX, .max = FLT_MAX
 	},
 	{ .index = 2,
 	  .name = "Stop",
 	  .flags = SPA_FGA_PORT_INPUT | SPA_FGA_PORT_CONTROL,
+	  .def = 1.0f, .min = -FLT_MAX, .max = FLT_MAX
 	},
 	{ .index = 3,
 	  .name = "Current",
@@ -2498,6 +2500,7 @@ static struct spa_fga_port ramp_ports[] = {
 	{ .index = 4,
 	  .name = "Duration (s)",
 	  .flags = SPA_FGA_PORT_INPUT | SPA_FGA_PORT_CONTROL,
+	  .def = 1.0f, .min = 0.0f, .max = FLT_MAX
 	},
 };
 

From 16bde0c61dd7ce9c122e2cceb699dd899f03bf89 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 12 Mar 2026 16:01:52 +0100
Subject: [PATCH 197/263] filter-graph: set some more def/min/max for control
 input

So that the values don't get clamped to 0.0
---
 spa/plugins/filter-graph/plugin_builtin.c | 9 ++++++++-
 spa/plugins/filter-graph/plugin_ebur128.c | 1 +
 spa/plugins/filter-graph/plugin_onnx.c    | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/spa/plugins/filter-graph/plugin_builtin.c b/spa/plugins/filter-graph/plugin_builtin.c
index f3a0a0946..3c15673db 100644
--- a/spa/plugins/filter-graph/plugin_builtin.c
+++ b/spa/plugins/filter-graph/plugin_builtin.c
@@ -1467,6 +1467,7 @@ static struct spa_fga_port clamp_ports[] = {
 	{ .index = 3,
 	  .name = "Control",
 	  .flags = SPA_FGA_PORT_INPUT | SPA_FGA_PORT_CONTROL,
+	  .def = 0.0f, .min = -FLT_MAX, .max = FLT_MAX
 	},
 	{ .index = 4,
 	  .name = "Min",
@@ -1524,6 +1525,7 @@ static struct spa_fga_port linear_ports[] = {
 	{ .index = 3,
 	  .name = "Control",
 	  .flags = SPA_FGA_PORT_INPUT | SPA_FGA_PORT_CONTROL,
+	  .def = 0.0f, .min = -FLT_MAX, .max = FLT_MAX
 	},
 	{ .index = 4,
 	  .name = "Mult",
@@ -1591,6 +1593,7 @@ static struct spa_fga_port recip_ports[] = {
 	{ .index = 3,
 	  .name = "Control",
 	  .flags = SPA_FGA_PORT_INPUT | SPA_FGA_PORT_CONTROL,
+	  .def = 0.0f, .min = -FLT_MAX, .max = FLT_MAX
 	},
 };
 
@@ -1640,6 +1643,7 @@ static struct spa_fga_port exp_ports[] = {
 	{ .index = 3,
 	  .name = "Control",
 	  .flags = SPA_FGA_PORT_INPUT | SPA_FGA_PORT_CONTROL,
+	  .def = 0.0f, .min = -FLT_MAX, .max = FLT_MAX
 	},
 	{ .index = 4,
 	  .name = "Base",
@@ -1697,6 +1701,7 @@ static struct spa_fga_port log_ports[] = {
 	{ .index = 3,
 	  .name = "Control",
 	  .flags = SPA_FGA_PORT_INPUT | SPA_FGA_PORT_CONTROL,
+	  .def = 0.0f, .min = -FLT_MAX, .max = FLT_MAX
 	},
 	{ .index = 4,
 	  .name = "Base",
@@ -2660,6 +2665,7 @@ static struct spa_fga_port debug_ports[] = {
 	{ .index = 2,
 	  .name = "Control",
 	  .flags = SPA_FGA_PORT_INPUT | SPA_FGA_PORT_CONTROL,
+	  .def = 0.0f, .min = -FLT_MAX, .max = FLT_MAX
 	},
 	{ .index = 3,
 	  .name = "Notify",
@@ -3006,7 +3012,7 @@ static struct spa_fga_port noisegate_ports[] = {
 	{ .index = 2,
 	  .name = "Level",
 	  .flags = SPA_FGA_PORT_INPUT | SPA_FGA_PORT_CONTROL,
-	  .def = NAN
+	  .def = NAN, .min = -FLT_MAX, .max = FLT_MAX
 	},
 	{ .index = 3,
 	  .name = "Open Threshold",
@@ -3247,6 +3253,7 @@ static struct spa_fga_port null_ports[] = {
 	{ .index = 1,
 	  .name = "Control",
 	  .flags = SPA_FGA_PORT_INPUT | SPA_FGA_PORT_CONTROL,
+	  .def = 0.0f, .min = -FLT_MAX, .max = FLT_MAX
 	},
 };
 
diff --git a/spa/plugins/filter-graph/plugin_ebur128.c b/spa/plugins/filter-graph/plugin_ebur128.c
index fb79de590..02fbcbe53 100644
--- a/spa/plugins/filter-graph/plugin_ebur128.c
+++ b/spa/plugins/filter-graph/plugin_ebur128.c
@@ -399,6 +399,7 @@ static struct spa_fga_port lufs2gain_ports[] = {
 	{ .index = 0,
 	  .name = "LUFS",
 	  .flags = SPA_FGA_PORT_INPUT | SPA_FGA_PORT_CONTROL,
+	  .def = 0.0f, .min = 0.0f, .max = FLT_MAX
 	},
 	{ .index = 1,
 	  .name = "Gain",
diff --git a/spa/plugins/filter-graph/plugin_onnx.c b/spa/plugins/filter-graph/plugin_onnx.c
index 3ef12e963..13fccee56 100644
--- a/spa/plugins/filter-graph/plugin_onnx.c
+++ b/spa/plugins/filter-graph/plugin_onnx.c
@@ -593,6 +593,10 @@ static const struct spa_fga_descriptor *onnx_plugin_make_desc(void *plugin, cons
 			fp->flags |= SPA_FGA_PORT_OUTPUT;
 
 		fp->name = ti->data_name;
+		fp->min = -FLT_MAX;
+		fp->max = FLT_MAX;
+		fp->def = 0.0f;
+
 		ti->data_index = desc->desc.n_ports;
 
 		desc->desc.n_ports++;

From e4e5f62d4406dabfb2af6af865168d2353e5de09 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 12 Mar 2026 17:25:36 +0100
Subject: [PATCH 198/263] impl-node: accept more node.passive values

So that we can set separate values for in and out ports.

The node.passive=follow mode is a good idea for a filter.
---
 src/examples/audio-dsp-filter.c |  1 +
 src/pipewire/impl-node.c        | 55 +++++++++++++++++----------------
 src/pipewire/keys.h             |  6 ++--
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/examples/audio-dsp-filter.c b/src/examples/audio-dsp-filter.c
index 8a43147a6..589646d61 100644
--- a/src/examples/audio-dsp-filter.c
+++ b/src/examples/audio-dsp-filter.c
@@ -108,6 +108,7 @@ int main(int argc, char *argv[])
 				PW_KEY_MEDIA_TYPE, "Audio",
 				PW_KEY_MEDIA_CATEGORY, "Filter",
 				PW_KEY_MEDIA_ROLE, "DSP",
+				PW_KEY_NODE_PASSIVE, "follow",
 				NULL),
 			&filter_events,
 			&data);
diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c
index ac362cc68..6f5066e82 100644
--- a/src/pipewire/impl-node.c
+++ b/src/pipewire/impl-node.c
@@ -1136,11 +1136,12 @@ static void check_properties(struct pw_impl_node *node)
 {
 	struct impl *impl = SPA_CONTAINER_OF(node, struct impl, this);
 	struct pw_context *context = node->context;
-	const char *str, *recalc_reason = NULL;
+	const char *str, *recalc_reason = NULL, *state = NULL, *s;
 	struct spa_fraction frac;
 	uint32_t value;
 	bool driver, trigger, sync, async;
 	struct match match;
+	size_t len;
 
 	match = MATCH_INIT(node);
 	pw_context_conf_section_match_rules(context, "node.rules",
@@ -1268,31 +1269,31 @@ static void check_properties(struct pw_impl_node *node)
 		else
 			str = "false";
 	}
+	while ((s = pw_split_walk(str, ",\0", &len, &state))) {
+		char v[16] = { 0 };
+		snprintf(v, sizeof(v), "%.*s", (int)len, s);
 
-	if (spa_streq(str, "out")) {
-		node->passive_mode[SPA_DIRECTION_OUTPUT] = PASSIVE_MODE_TRUE;
-	}
-	if (spa_streq(str, "out-follow")) {
-		node->passive_mode[SPA_DIRECTION_OUTPUT] = PASSIVE_MODE_FOLLOW;
-	}
-	else if (spa_streq(str, "in")) {
-		node->passive_mode[SPA_DIRECTION_INPUT] = PASSIVE_MODE_TRUE;
-	}
-	else if (spa_streq(str, "in-follow")) {
-		node->passive_mode[SPA_DIRECTION_INPUT] = PASSIVE_MODE_FOLLOW;
-	}
-	else if (spa_streq(str, "follow")) {
-		node->passive_mode[SPA_DIRECTION_INPUT] = PASSIVE_MODE_FOLLOW;
-		node->passive_mode[SPA_DIRECTION_OUTPUT] = PASSIVE_MODE_FOLLOW;
-	}
-	else if (spa_streq(str, "follow-suspend")) {
-		node->passive_mode[SPA_DIRECTION_INPUT] = PASSIVE_MODE_FOLLOW_SUSPEND;
-		node->passive_mode[SPA_DIRECTION_OUTPUT] = PASSIVE_MODE_FOLLOW_SUSPEND;
-	}
-	else {
-		node->passive_mode[SPA_DIRECTION_OUTPUT] =
-			node->passive_mode[SPA_DIRECTION_INPUT] =
-			spa_atob(str) ? PASSIVE_MODE_TRUE : PASSIVE_MODE_FALSE;
+		if (spa_streq(v, "out"))
+			node->passive_mode[SPA_DIRECTION_OUTPUT] = PASSIVE_MODE_TRUE;
+		else if (spa_streq(v, "out-follow"))
+			node->passive_mode[SPA_DIRECTION_OUTPUT] = PASSIVE_MODE_FOLLOW;
+		else if (spa_streq(v, "in-follow"))
+			node->passive_mode[SPA_DIRECTION_INPUT] = PASSIVE_MODE_FOLLOW;
+		else if (spa_streq(v, "in"))
+			node->passive_mode[SPA_DIRECTION_INPUT] = PASSIVE_MODE_TRUE;
+		else if (spa_streq(v, "follow-suspend")) {
+			node->passive_mode[SPA_DIRECTION_INPUT] = PASSIVE_MODE_FOLLOW_SUSPEND;
+			node->passive_mode[SPA_DIRECTION_OUTPUT] = PASSIVE_MODE_FOLLOW_SUSPEND;
+		}
+		else if (spa_streq(v, "follow")) {
+			node->passive_mode[SPA_DIRECTION_INPUT] = PASSIVE_MODE_FOLLOW;
+			node->passive_mode[SPA_DIRECTION_OUTPUT] = PASSIVE_MODE_FOLLOW;
+		}
+		else {
+			node->passive_mode[SPA_DIRECTION_OUTPUT] =
+				node->passive_mode[SPA_DIRECTION_INPUT] =
+				spa_atob(v) ? PASSIVE_MODE_TRUE : PASSIVE_MODE_FALSE;
+		}
 	}
 
 	node->want_driver = pw_properties_get_bool(node->properties, PW_KEY_NODE_WANT_DRIVER, false);
@@ -1358,8 +1359,8 @@ static void check_properties(struct pw_impl_node *node)
 		recalc_reason = "force rate changed";
 	}
 
-	pw_log_debug("%p: driver:%d recalc:%s active:%d", node, node->driver,
-			recalc_reason, node->active);
+	pw_log_debug("%p: driver:%d recalc:%s active:%d passive:%d:%d", node, node->driver,
+			recalc_reason, node->active, node->passive_mode[0], node->passive_mode[1]);
 
 	if (recalc_reason != NULL && node->active)
 		pw_context_recalc_graph(context, recalc_reason);
diff --git a/src/pipewire/keys.h b/src/pipewire/keys.h
index a7afd398e..08e6fb2df 100644
--- a/src/pipewire/keys.h
+++ b/src/pipewire/keys.h
@@ -212,9 +212,9 @@ extern "C" {
 #define PW_KEY_NODE_VIRTUAL		"node.virtual"		/**< the node is some sort of virtual
 								  *  object */
 #define PW_KEY_NODE_PASSIVE		"node.passive"		/**< indicate that a node wants passive links
-								  *  on output/input/all ports when the value is
-								  *  "out"/"out-follow"/"in"/"in-follow"/
-								  *  "true"/"follow" */
+								  *  on output/input/all ports. A ','-separated
+								  *  array of values  "out"/"out-follow"/"in"/
+								  *  "in-follow"/"true"/"follow" is accepted. */
 #define PW_KEY_NODE_LINK_GROUP		"node.link-group"	/**< the node is internally linked to
 								  *  nodes with the same link-group. Can be an
 								  *  array of group names. */

From 00148467ef9ca5dbc6f44212e736796ccdeef939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Thu, 12 Mar 2026 00:17:18 +0100
Subject: [PATCH 199/263] spa: utils: string: add `spa_strbuf_appendv()`

Add a function that makes it possible to pass a `va_list` when
printing into a `spa_strbuf`.
---
 spa/include/spa/utils/string.h | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/spa/include/spa/utils/string.h b/spa/include/spa/utils/string.h
index bab60de2b..35e4ea026 100644
--- a/spa/include/spa/utils/string.h
+++ b/spa/include/spa/utils/string.h
@@ -380,17 +380,26 @@ SPA_API_STRING void spa_strbuf_init(struct spa_strbuf *buf, char *buffer, size_t
 		buf->buffer[0] = '\0';
 }
 
+SPA_PRINTF_FUNC(2, 0)
+SPA_API_STRING int spa_strbuf_appendv(struct spa_strbuf *buf, const char *fmt, va_list args)
+{
+	size_t remain = buf->maxsize - buf->pos;
+	int written = vsnprintf(&buf->buffer[buf->pos], remain, fmt, args);
+	if (written > 0)
+		buf->pos += SPA_MIN(remain, (size_t)written);
+	return written;
+}
+
 SPA_PRINTF_FUNC(2, 3)
 SPA_API_STRING int spa_strbuf_append(struct spa_strbuf *buf, const char *fmt, ...)
 {
-	size_t remain = buf->maxsize - buf->pos;
-	ssize_t written;
 	va_list args;
+	int written;
+
 	va_start(args, fmt);
-	written = vsnprintf(&buf->buffer[buf->pos], remain, fmt, args);
+	written = spa_strbuf_appendv(buf, fmt, args);
 	va_end(args);
-	if (written > 0)
-		buf->pos += SPA_MIN(remain, (size_t)written);
+
 	return written;
 }
 

From 9098996b87a2bbf628095e1594e8a7bf5cb87bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Thu, 12 Mar 2026 00:19:27 +0100
Subject: [PATCH 200/263] spa: support: logger: use `spa_strbuf`

Using `spa_strbuf` simplifies a code a great deal by removing the manual
tracking of buffer sizes, and it also removes the need for the separate
strings for the timestamp, topic, etc.
---
 spa/plugins/support/logger.c | 65 +++++++++++++-----------------------
 1 file changed, 23 insertions(+), 42 deletions(-)

diff --git a/spa/plugins/support/logger.c b/spa/plugins/support/logger.c
index 6ea5f31b5..9a20ff241 100644
--- a/spa/plugins/support/logger.c
+++ b/spa/plugins/support/logger.c
@@ -67,16 +67,10 @@ impl_log_logtv(void *object,
 	      const char *fmt,
 	      va_list args)
 {
-#define RESERVED_LENGTH 24
-
 	struct impl *impl = object;
-	char timestamp[18] = {0};
-	char topicstr[32] = {0};
-	char filename[64] = {0};
-	char location[1000 + RESERVED_LENGTH], *p;
+	char location[1024];
 	static const char * const levels[] = { "-", "E", "W", "I", "D", "T", "*T*" };
 	const char *prefix = "", *suffix = "";
-	int size, len;
 	bool do_trace;
 
 	if ((do_trace = (level == SPA_LOG_LEVEL_TRACE && impl->have_source)))
@@ -93,8 +87,10 @@ impl_log_logtv(void *object,
 			suffix = SPA_ANSI_RESET;
 	}
 
-	p = location;
-	len = sizeof(location) - RESERVED_LENGTH;
+	struct spa_strbuf msg;
+	spa_strbuf_init(&msg, location, sizeof(location));
+
+	spa_strbuf_append(&msg, "%s[%s]", prefix, levels[level]);
 
 	if (impl->local_timestamp) {
 		char buf[64];
@@ -104,67 +100,52 @@ impl_log_logtv(void *object,
 		clock_gettime(impl->clock_id, &now);
 		localtime_r(&now.tv_sec, &now_tm);
 		strftime(buf, sizeof(buf), "%H:%M:%S", &now_tm);
-		spa_scnprintf(timestamp, sizeof(timestamp), "[%s.%06d]", buf,
+		spa_strbuf_append(&msg, "[%s.%06d]", buf,
 				(int)(now.tv_nsec / SPA_NSEC_PER_USEC));
 	} else if (impl->timestamp) {
 		struct timespec now;
 		clock_gettime(impl->clock_id, &now);
-		spa_scnprintf(timestamp, sizeof(timestamp), "[%05jd.%06jd]",
+		spa_strbuf_append(&msg, "[%05jd.%06jd]",
 			(intmax_t) (now.tv_sec & 0x1FFFFFFF) % 100000, (intmax_t) now.tv_nsec / 1000);
 	}
 
 	if (topic && topic->topic)
-		spa_scnprintf(topicstr, sizeof(topicstr), " %-12s | ", topic->topic);
+		spa_strbuf_append(&msg, " %-12s | ", topic->topic);
 
 
 	if (impl->line && line != 0) {
 		const char *s = strrchr(file, '/');
-		spa_scnprintf(filename, sizeof(filename), "[%16.16s:%5i %s()]",
+		spa_strbuf_append(&msg, "[%16.16s:%5i %s()]",
 			s ? s + 1 : file, line, func);
 	}
 
-	size = spa_scnprintf(p, len, "%s[%s]%s%s%s ", prefix, levels[level],
-			     timestamp, topicstr, filename);
-	/*
-	 * it is assumed that at this point `size` <= `len`,
-	 * which is reasonable as long as file names and function names
-	 * don't become very long
-	 */
-	size += spa_vscnprintf(p + size, len - size, fmt, args);
+	spa_strbuf_append(&msg, " ");
+	spa_strbuf_appendv(&msg, fmt, args);
+	spa_strbuf_append(&msg, "%s\n", suffix);
 
-	/*
-	 * `RESERVED_LENGTH` bytes are reserved for printing the suffix
-	 * (at the moment it's "... (truncated)\x1B[0m\n" at its longest - 21 bytes),
-	 * its length must be less than `RESERVED_LENGTH` (including the null byte),
-	 * otherwise a stack buffer overrun could ensue
-	 */
+	if (SPA_UNLIKELY(msg.pos >= msg.maxsize)) {
+		static const char truncated_text[] = "... (truncated)";
+		size_t suffix_length = strlen(suffix) + strlen(truncated_text) + 1 + 1;
 
-	/* if the message could not fit entirely... */
-	if (size >= len - 1) {
-		size = len - 1; /* index of the null byte */
-		len = sizeof(location);
-		size += spa_scnprintf(p + size, len - size, "... (truncated)");
+		spa_assert(msg.maxsize >= suffix_length);
+		msg.pos = msg.maxsize - suffix_length;
+
+		spa_strbuf_append(&msg, "%s%s\n", truncated_text, suffix);
+		spa_assert(msg.pos < msg.maxsize);
 	}
-	else {
-		len = sizeof(location);
-	}
-
-	size += spa_scnprintf(p + size, len - size, "%s\n", suffix);
 
 	if (SPA_UNLIKELY(do_trace)) {
 		uint32_t index;
 
 		spa_ringbuffer_get_write_index(&impl->trace_rb, &index);
 		spa_ringbuffer_write_data(&impl->trace_rb, impl->trace_data, TRACE_BUFFER,
-					  index & (TRACE_BUFFER - 1), location, size);
-		spa_ringbuffer_write_update(&impl->trace_rb, index + size);
+					  index & (TRACE_BUFFER - 1), msg.buffer, msg.pos);
+		spa_ringbuffer_write_update(&impl->trace_rb, index + msg.pos);
 
 		if (spa_system_eventfd_write(impl->system, impl->source.fd, 1) < 0)
 			fprintf(impl->file, "error signaling eventfd: %s\n", strerror(errno));
 	} else
-		fputs(location, impl->file);
-
-#undef RESERVED_LENGTH
+		fputs(msg.buffer, impl->file);
 }
 
 static SPA_PRINTF_FUNC(6,0) void

From 95eac7b4e5ebf1e0a02fa25258ba4764a51c9ec9 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 12 Mar 2026 18:12:42 +0100
Subject: [PATCH 201/263] scheduler: add comment about the FOLLOW_SUSPEND
 special case

---
 src/modules/module-scheduler-v1.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
index b546aeca2..184c45ff2 100644
--- a/src/modules/module-scheduler-v1.c
+++ b/src/modules/module-scheduler-v1.c
@@ -200,6 +200,9 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
  *  A (p)  -> (*)  B    A + B no change
  *  A (f)  -> (*)  B    A + B no change
  *  A (fs) -> (*)  B    A + B no change
+ *
+ *  There is a special case for FOLLOW_SUSPEND<->FOLLOW_SUSPEND to make
+ *  it possible to manually link a source to a sink
  */
 static inline bool runnable_pair(struct pw_impl_port *a, struct pw_impl_port *b)
 {

From 3273ba633310752d580f74590e6d5c9bd0c0a2c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Thu, 12 Mar 2026 00:21:08 +0100
Subject: [PATCH 202/263] spa: support: logger: print thread id for each
 message

The thread id is very useful for debugging, add it to the every log
message so that it does not have to be inferred from the content itself.

This is already done in the systemd journal logger, so implement
it here as well.

Before:

  [I][00:13:11.120303] pw.context   | [      pipewire.c:  585 pw_init()] version 1.7.0

After:

  [I][365073][00:13:11.120303] pw.context   | [      pipewire.c:  585 pw_init()] version 1.7.0
---
 spa/plugins/support/logger.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/spa/plugins/support/logger.c b/spa/plugins/support/logger.c
index 9a20ff241..7d0b14c1f 100644
--- a/spa/plugins/support/logger.c
+++ b/spa/plugins/support/logger.c
@@ -2,12 +2,16 @@
 /* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <stddef.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
 #include <time.h>
+#include <threads.h>
 #include <fnmatch.h>
 
 #include <spa/support/log.h>
@@ -92,6 +96,14 @@ impl_log_logtv(void *object,
 
 	spa_strbuf_append(&msg, "%s[%s]", prefix, levels[level]);
 
+#ifdef HAVE_GETTID
+	static thread_local pid_t tid;
+	if (SPA_UNLIKELY(tid == 0))
+		tid = gettid();
+
+	spa_strbuf_append(&msg, "[%jd]", (intmax_t) tid);
+#endif
+
 	if (impl->local_timestamp) {
 		char buf[64];
 		struct timespec now;

From 3c1b8dcdcc0d52db82a6a6877aa764268c09172e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 12 Mar 2026 22:21:41 +0100
Subject: [PATCH 203/263] spa/util/json-core: Fix condition checking for
 container end
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes the following warning:

    /usr/include/spa-0.2/spa/utils/json-core.h: In function ‘spa_json_is_container_end’:
    /usr/include/spa-0.2/spa/utils/json-core.h:404:41: warning: logical ‘or’ of equal expressions [-Wlogical-op]
      404 |         return len > 0 && (*val == '}'  || *val == '}');
          |                                         ^~
---
 spa/include/spa/utils/json-core.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spa/include/spa/utils/json-core.h b/spa/include/spa/utils/json-core.h
index 0ffb21abf..9745000cf 100644
--- a/spa/include/spa/utils/json-core.h
+++ b/spa/include/spa/utils/json-core.h
@@ -401,7 +401,7 @@ SPA_API_JSON int spa_json_is_container(const char *val, int len)
 }
 SPA_API_JSON int spa_json_is_container_end(const char *val, int len)
 {
-	return len > 0 && (*val == '}'  || *val == '}');
+	return len > 0 && (*val == '}'  || *val == ']');
 }
 
 /* object */

From 6544996a33cbe2150e27329d774ff3cd31b5f2a0 Mon Sep 17 00:00:00 2001
From: Nedko Arnaudov <nedko@nedk.org>
Date: Wed, 11 Mar 2026 17:57:15 +0200
Subject: [PATCH 204/263] pipewire-jack: emit foreign port registration
 callbacks on jack_activate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The jack_activate loop was only queuing NOTIFY_TYPE_PORTREGISTRATION
for the activating client's own ports. Ports belonging to other clients
— including all WirePlumber-managed ports and MIDI ports — were silently
skipped due to the o->port.port->client != c condition.

This caused two observable bugs for clients using libjackserver (e.g.
jackdbus):
- JackPortRegistrationCallback was not fired for any pre-existing
  foreign ports at activate time, leaving the patchbay empty unless
  the session manager happened to start after the client.
- JACK MIDI ports were never announced via callback, even though they
  are correctly returned by jack_get_ports().

The graph_order_callback fallback (used by jackdbus for initial port
enumeration) is also ineffective here because pipewire-jack only fires
it on connection events, not on activate.

Fix by iterating all non-removed foreign ports in the object list and
queuing registration callbacks for those whose node is active, matching
the semantics already implemented in node_info() for ports of nodes
that transition to running state after activate.

The change is libjackserver.so only. libjack.so behaviour is left
unmodifed, as carla is showing ports of each client twice.
---
 pipewire-jack/src/meson.build     |  2 +-
 pipewire-jack/src/pipewire-jack.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pipewire-jack/src/meson.build b/pipewire-jack/src/meson.build
index 0630d96a8..639405bb9 100644
--- a/pipewire-jack/src/meson.build
+++ b/pipewire-jack/src/meson.build
@@ -55,7 +55,7 @@ pipewire_jackserver = shared_library('jackserver',
     pipewire_jackserver_sources,
     soversion : soversion,
     version : libjackversion,
-    c_args : pipewire_jack_c_args,
+    c_args : pipewire_jack_c_args + '-DLIBJACKSERVER',
     include_directories : [configinc, jack_inc],
     dependencies : [pipewire_dep, mathlib],
     install : true,
diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
index 94482dbc0..c7017e936 100644
--- a/pipewire-jack/src/pipewire-jack.c
+++ b/pipewire-jack/src/pipewire-jack.c
@@ -4887,9 +4887,21 @@ int jack_activate (jack_client_t *client)
 	c->activation->pending_sync = true;
 
 	spa_list_for_each(o, &c->context.objects, link) {
+#if !defined(LIBJACKSERVER)
 		if (o->type != INTERFACE_Port || o->port.port == NULL ||
 		    o->port.port->client != c || !o->port.port->valid)
 			continue;
+#else
+		/* emits all foreign active ports, skips own (already announced via jack_port_register) */
+		if (o->type != INTERFACE_Port || o->removed)
+			continue;
+		/* own ports are handled by jack_port_register */
+		if (o->port.port != NULL && o->port.port->client == c)
+			continue;
+		/* only announce ports whose node is active */
+		if (o->port.node != NULL && !node_is_active(c, o->port.node))
+			continue;
+#endif
 		o->registered = 0;
 		queue_notify(c, NOTIFY_TYPE_PORTREGISTRATION, o, 1, NULL);
 	}

From b1b56533933bc1af3dcaa25d1c6b09187b9f6959 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 13 Mar 2026 12:03:11 +0100
Subject: [PATCH 205/263] sendspin: negotiate the first raw format

Flac and Opus are not supported yet.
---
 src/modules/module-sendspin-send.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/module-sendspin-send.c b/src/modules/module-sendspin-send.c
index 162f9f47d..2c9f6df22 100644
--- a/src/modules/module-sendspin-send.c
+++ b/src/modules/module-sendspin-send.c
@@ -729,8 +729,10 @@ static int parse_player_v1_support(struct client *c, struct spa_json *payload)
 				if ((res = parse_codec(c, &it[1], &info)) < 0)
 					return res;
 
-				if (count++ == 0)
+				if (count == 0 && info.media_subtype == SPA_MEDIA_SUBTYPE_raw) {
 					c->info = info;
+					count++;
+				}
 			}
 		}
 		else if (spa_streq(key, "buffer_capacity")) {

From 11d1f3653a87d245458ce2aae73b784a860f82fb Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 13 Mar 2026 13:15:16 +0100
Subject: [PATCH 206/263] doc: try to add 1.6 docs

---
 .gitlab-ci.yml        | 13 ++++++++++---
 doc/DoxygenLayout.xml |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a75b2a140..2918ce62e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -410,13 +410,15 @@ build_on_fedora_html_docs:
         -Dsndfile=enabled
         -Dsession-managers=[]
   before_script:
-    - git fetch origin 1.0 1.2 1.4 master
+    - git fetch origin 1.0 1.2 1.4 1.6 master
     - git branch -f 1.0 origin/1.0
     - git clone -b 1.0 . branch-1.0
     - git branch -f 1.2 origin/1.2
     - git clone -b 1.2 . branch-1.2
     - git branch -f 1.4 origin/1.4
     - git clone -b 1.4 . branch-1.4
+    - git branch -f 1.6 origin/1.6
+    - git clone -b 1.6 . branch-1.6
     - git branch -f master origin/master
     - git clone -b master . branch-master
     - !reference [.build, before_script]
@@ -433,6 +435,10 @@ build_on_fedora_html_docs:
     - meson setup builddir $MESON_OPTIONS
     - meson compile -C builddir doc/pipewire-docs
     - cd ..
+    - cd branch-1.6
+    - meson setup builddir $MESON_OPTIONS
+    - meson compile -C builddir doc/pipewire-docs
+    - cd ..
     - cd branch-master
     - meson setup builddir $MESON_OPTIONS
     - meson compile -C builddir doc/pipewire-docs
@@ -682,12 +688,13 @@ pages:
     - job: build_on_fedora_html_docs
       artifacts: true
   script:
-    - mkdir public public/1.0 public/1.2 public/1.4 public/devel
+    - mkdir public public/1.0 public/1.2 public/1.4 public/1.6 public/devel
     - cp -R branch-1.0/builddir/doc/html/* public/1.0/
     - cp -R branch-1.2/builddir/doc/html/* public/1.2/
     - cp -R branch-1.4/builddir/doc/html/* public/1.4/
+    - cp -R branch-1.6/builddir/doc/html/* public/1.6/
     - cp -R branch-master/builddir/doc/html/* public/devel/
-    - (cd public && ln -s 1.4/* .)
+    - (cd public && ln -s 1.6/* .)
   artifacts:
     paths:
       - public
diff --git a/doc/DoxygenLayout.xml b/doc/DoxygenLayout.xml
index 300c8400e..10da55da5 100644
--- a/doc/DoxygenLayout.xml
+++ b/doc/DoxygenLayout.xml
@@ -44,6 +44,7 @@
     <tab type="usergroup" title="PipeWire Versions">
       <tab type="user" url="https://docs.pipewire.org/1.2/" title="1.2.x"/>
       <tab type="user" url="https://docs.pipewire.org/1.4/" title="1.4.x"/>
+      <tab type="user" url="https://docs.pipewire.org/1.6/" title="1.6.x"/>
       <tab type="user" url="https://docs.pipewire.org/devel/" title="Development"/>
     </tab>
   </navindex>

From 90fd6fbc65a0f7bb7ad70dbac78aa079bbd34e26 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 16 Mar 2026 09:59:14 +0100
Subject: [PATCH 207/263] filter-graph: only use min/max when defined in LADSPA

Fixes #5170
---
 spa/plugins/filter-graph/filter-graph.c  |  4 ++--
 spa/plugins/filter-graph/plugin_ladspa.c | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/spa/plugins/filter-graph/filter-graph.c b/spa/plugins/filter-graph/filter-graph.c
index 7cafac9ff..c806da591 100644
--- a/spa/plugins/filter-graph/filter-graph.c
+++ b/spa/plugins/filter-graph/filter-graph.c
@@ -1058,8 +1058,8 @@ static struct descriptor *descriptor_load(struct impl *impl, const char *type,
 			}
 		} else if (SPA_FGA_IS_PORT_CONTROL(fp->flags)) {
 			if (SPA_FGA_IS_PORT_INPUT(fp->flags)) {
-				spa_log_info(impl->log, "using port %lu ('%s') as control %d", p,
-						fp->name, desc->n_control);
+				spa_log_info(impl->log, "using port %lu ('%s') as control %d %f/%f/%f", p,
+						fp->name, desc->n_control, fp->def, fp->min, fp->max);
 				desc->control[desc->n_control++] = p;
 			}
 			else if (SPA_FGA_IS_PORT_OUTPUT(fp->flags)) {
diff --git a/spa/plugins/filter-graph/plugin_ladspa.c b/spa/plugins/filter-graph/plugin_ladspa.c
index d5c8ef488..1aebafe35 100644
--- a/spa/plugins/filter-graph/plugin_ladspa.c
+++ b/spa/plugins/filter-graph/plugin_ladspa.c
@@ -7,6 +7,7 @@
 #include <dlfcn.h>
 #include <math.h>
 #include <limits.h>
+#include <float.h>
 
 #include <spa/utils/result.h>
 #include <spa/utils/defs.h>
@@ -113,8 +114,14 @@ static void ladspa_port_update_ranges(struct descriptor *dd, struct spa_fga_port
 	LADSPA_PortRangeHintDescriptor hint = d->PortRangeHints[p].HintDescriptor;
 	LADSPA_Data lower, upper;
 
-	lower = d->PortRangeHints[p].LowerBound;
-	upper = d->PortRangeHints[p].UpperBound;
+	if (hint & LADSPA_HINT_BOUNDED_BELOW)
+		lower = d->PortRangeHints[p].LowerBound;
+	else
+		lower = -FLT_MAX;
+	if (hint & LADSPA_HINT_BOUNDED_ABOVE)
+		upper = d->PortRangeHints[p].UpperBound;
+	else
+		upper = FLT_MAX;
 
 	port->hint = 0;
 	if (hint & LADSPA_HINT_TOGGLED)

From 653b8703bc0b532a352352b1b16b11940efc79c1 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 16 Mar 2026 12:19:57 +0100
Subject: [PATCH 208/263] filter-graph: fix up def/min/max values for lv2

lv2 filters can return NAN for the min/max and default values when not
specified. Handle them so that we don't end up clamping NAN numbers.

Fixes #5166
---
 spa/plugins/filter-graph/plugin_lv2.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/spa/plugins/filter-graph/plugin_lv2.c b/spa/plugins/filter-graph/plugin_lv2.c
index 712b728e2..b2d3fc6cc 100644
--- a/spa/plugins/filter-graph/plugin_lv2.c
+++ b/spa/plugins/filter-graph/plugin_lv2.c
@@ -560,6 +560,17 @@ static const struct spa_fga_descriptor *lv2_plugin_make_desc(void *plugin, const
 		fp->min = mins[i];
 		fp->max = maxes[i];
 		fp->def = controls[i];
+
+		if (isnan(fp->min))
+			fp->min = -FLT_MAX;
+		if (isnan(fp->max))
+			fp->max = FLT_MAX;
+		if (isnan(fp->def))
+			fp->def = 0.0f;
+		if (fp->max <= fp->min)
+			fp->max = FLT_MAX;
+		if (fp->def <= fp->min)
+			fp->min = -FLT_MAX;
 	}
 	return &desc->desc;
 }

From 1a37f445a20e67976c83360ab5830887fffe37e2 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Tue, 17 Mar 2026 03:17:15 +1100
Subject: [PATCH 209/263] spa/plugins/alsa/acp/compat.h: p is already const do
 not recast

---
 spa/plugins/alsa/acp/compat.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spa/plugins/alsa/acp/compat.h b/spa/plugins/alsa/acp/compat.h
index 0f7b959df..87151d197 100644
--- a/spa/plugins/alsa/acp/compat.h
+++ b/spa/plugins/alsa/acp/compat.h
@@ -436,7 +436,7 @@ static inline const char *pa_path_get_filename(const char *p)
         return NULL;
     if ((fn = strrchr(p, PA_PATH_SEP_CHAR)))
         return fn+1;
-    return (char*) p;
+    return p;
 }
 
 static inline bool pa_is_path_absolute(const char *fn)

From e5809ee052b93b6b74633dbcf532c79e84029790 Mon Sep 17 00:00:00 2001
From: Robert Rosengren <robertr@axis.com>
Date: Mon, 16 Mar 2026 12:53:39 +0100
Subject: [PATCH 210/263] pipewiresrc: fix wait_negotiated from change_state

Going from PLAYING to PAUSED will have basesrc calling unlock and
setting flushing to false. Going back to PLAYING may then fail in
wait_negotiated, as unlock_stop will be called after change_state.

Fix by remove the flushing check, since already in that "state".
---
 src/gst/gstpipewiresrc.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/gst/gstpipewiresrc.c b/src/gst/gstpipewiresrc.c
index 57cb355a7..3c57028b4 100644
--- a/src/gst/gstpipewiresrc.c
+++ b/src/gst/gstpipewiresrc.c
@@ -1085,10 +1085,6 @@ wait_negotiated (GstPipeWireSrc *this)
     GST_DEBUG_OBJECT (this, "waiting for NEGOTIATED, now %s", pw_stream_state_as_string (state));
     if (state == PW_STREAM_STATE_ERROR)
       break;
-    if (this->flushing) {
-      state = PW_STREAM_STATE_ERROR;
-      break;
-    }
 
     if (this->negotiated)
       break;

From f846879399dd12a149c4aafa5de12ce93daf0856 Mon Sep 17 00:00:00 2001
From: Baurzhan Muftakhidinov <baurthefirst@gmail.com>
Date: Mon, 16 Mar 2026 19:07:54 +0000
Subject: [PATCH 211/263] po: update Kazakh translation

---
 po/kk.po | 573 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 358 insertions(+), 215 deletions(-)

diff --git a/po/kk.po b/po/kk.po
index 6a00211f3..507c967e0 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -1,15 +1,14 @@
 # Kazakh translation of pipewire.
 # Copyright (C) 2020 The pipewire authors.
 # This file is distributed under the same license as the pipewire package.
-# Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2020.
+# Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2020-2026.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pipewire/pipewire/"
-"issues/new\n"
-"POT-Creation-Date: 2021-04-18 16:54+0800\n"
-"PO-Revision-Date: 2020-06-30 08:04+0500\n"
+"Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues\n"
+"POT-Creation-Date: 2026-03-09 12:19+0000\n"
+"PO-Revision-Date: 2026-03-17 00:04+0500\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: \n"
 "Language: kk\n"
@@ -17,96 +16,199 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.3.1\n"
+"X-Generator: Poedit 3.9\n"
 
-#: src/daemon/pipewire.c:43
+#: src/daemon/pipewire.c:29
 #, c-format
 msgid ""
 "%s [options]\n"
 "  -h, --help                            Show this help\n"
+"  -v, --verbose                         Increase verbosity by one level\n"
 "      --version                         Show version\n"
 "  -c, --config                          Load config (Default %s)\n"
+"  -P  --properties                      Set context properties\n"
 msgstr ""
+"%s [опциялар]\n"
+"  -h, --help                            Осы көмекті көрсету\n"
+"  -v, --verbose                         Ақпараттылығын бір деңгейге арттыру\n"
+"      --version                         Нұсқасын көрсету\n"
+"  -c, --config                          Конфигурацияны жүктеу (Бастапқы %s)\n"
+"  -P  --properties                      Контекст қасиеттерін орнату\n"
+
+#: src/daemon/pipewire.desktop.in:3
+msgid "PipeWire Media System"
+msgstr "PipeWire медиа жүйесі"
 
 #: src/daemon/pipewire.desktop.in:4
-msgid "PipeWire Media System"
-msgstr ""
-
-#: src/daemon/pipewire.desktop.in:5
 msgid "Start the PipeWire Media System"
-msgstr ""
+msgstr "PipeWire медиа жүйесін іске қосу"
 
-#: src/examples/media-session/alsa-monitor.c:526
-#: spa/plugins/alsa/acp/compat.c:187
-msgid "Built-in Audio"
-msgstr "Құрамындағы аудио"
+#: src/modules/module-protocol-pulse/modules/module-tunnel-sink.c:159
+#: src/modules/module-protocol-pulse/modules/module-tunnel-source.c:159
+#, c-format
+msgid "Tunnel to %s%s%s"
+msgstr "%s%s%s бағытына туннель"
 
-#: src/examples/media-session/alsa-monitor.c:530
-#: spa/plugins/alsa/acp/compat.c:192
-msgid "Modem"
-msgstr "Модем"
+#: src/modules/module-fallback-sink.c:40
+msgid "Dummy Output"
+msgstr "Жалған шығыс"
 
-#: src/examples/media-session/alsa-monitor.c:539
+#: src/modules/module-pulse-tunnel.c:761
+#, c-format
+msgid "Tunnel for %s@%s"
+msgstr "%s@%s үшін туннель"
+
+#: src/modules/module-zeroconf-discover.c:290
 msgid "Unknown device"
-msgstr ""
+msgstr "Белгісіз құрылғы"
 
-#: src/tools/pw-cat.c:991
+#: src/modules/module-zeroconf-discover.c:302
+#, c-format
+msgid "%s on %s@%s"
+msgstr "%s, %s@%s ішінде"
+
+#: src/modules/module-zeroconf-discover.c:306
+#, c-format
+msgid "%s on %s"
+msgstr "%s, %s ішінде"
+
+#: src/tools/pw-cat.c:269
+#, c-format
+msgid "Supported formats:\n"
+msgstr "Қолдау көрсетілетін пішімдер:\n"
+
+#: src/tools/pw-cat.c:754
+#, c-format
+msgid "Supported channel layouts:\n"
+msgstr "Қолдау көрсетілетін арна жаймалары:\n"
+
+#: src/tools/pw-cat.c:764
+#, c-format
+msgid "Supported channel layout aliases:\n"
+msgstr "Қолдау көрсетілетін арна жаймаларының алиастары:\n"
+
+#: src/tools/pw-cat.c:766
+#, c-format
+msgid "    %s -> %s\n"
+msgstr "    %s -> %s\n"
+
+#: src/tools/pw-cat.c:771
+#, c-format
+msgid "Supported channel names:\n"
+msgstr "Қолдау көрсетілетін арна атаулары:\n"
+
+#: src/tools/pw-cat.c:1182
 #, c-format
 msgid ""
-"%s [options] <file>\n"
+"%s [options] [<file>|-]\n"
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
 "  -v, --verbose                         Enable verbose operations\n"
 "\n"
 msgstr ""
+"%s [опциялар] [<файл>|-]\n"
+"  -h, --help                            Осы көмекті көрсету\n"
+"      --version                         Нұсқасын көрсету\n"
+"  -v, --verbose                         Толық ақпаратты іске қосу\n"
+"\n"
 
-#: src/tools/pw-cat.c:998
+#: src/tools/pw-cat.c:1189
 #, c-format
 msgid ""
 "  -R, --remote                          Remote daemon name\n"
 "      --media-type                      Set media type (default %s)\n"
 "      --media-category                  Set media category (default %s)\n"
 "      --media-role                      Set media role (default %s)\n"
-"      --target                          Set node target (default %s)\n"
+"      --target                          Set node target serial or name (default %s)\n"
 "                                          0 means don't link\n"
 "      --latency                         Set node latency (default %s)\n"
 "                                          Xunit (unit = s, ms, us, ns)\n"
 "                                          or direct samples (256)\n"
-"                                          the rate is the one of the source "
-"file\n"
-"      --list-targets                    List available targets for --target\n"
+"                                          the rate is the one of the source file\n"
+"  -P  --properties                      Set node properties\n"
 "\n"
 msgstr ""
+"  -R, --remote                          Қашықтағы қызмет атауы\n"
+"      --media-type                      Медиа түрін орнату (бастапқы %s)\n"
+"      --media-category                  Медиа категориясын орнату (бастапқы %s)\n"
+"      --media-role                      Медиа рөлін орнату (бастапқы %s)\n"
+"      --target                          Түйін мақсатының сериялық нөмірін немесе атын орнату (бастапқы "
+"%s)\n"
+"                                          0 байланыстырмауды білдіреді\n"
+"      --latency                         Түйін кідірісін орнату (бастапқы %s)\n"
+"                                          Xюнит (юнит = с, мс, мкс, нс)\n"
+"                                          немесе тікелей үлгілер (256)\n"
+"                                          жиілік бастапқы файлдың жиілігі болып табылады\n"
+"  -P  --properties                      Түйін қасиеттерін орнату\n"
+"\n"
 
-#: src/tools/pw-cat.c:1016
+#: src/tools/pw-cat.c:1207
 #, c-format
 msgid ""
-"      --rate                            Sample rate (req. for rec) (default "
-"%u)\n"
-"      --channels                        Number of channels (req. for rec) "
-"(default %u)\n"
+"      --rate                            Sample rate (default %u)\n"
+"      --channels                        Number of channels (default %u)\n"
 "      --channel-map                     Channel map\n"
-"                                            one of: \"stereo\", "
-"\"surround-51\",... or\n"
-"                                            comma separated list of channel "
-"names: eg. \"FL,FR\"\n"
-"      --format                          Sample format %s (req. for rec) "
-"(default %s)\n"
+"                                            a channel layout: \"Stereo\", \"5.1\",... or\n"
+"                                            comma separated list of channel names: eg. \"FL,FR\"\n"
+"      --list-layouts                    List supported channel layouts\n"
+"      --list-channel-names              List supported channel maps\n"
+"      --format                          Sample format (default %s)\n"
+"      --list-formats                    List supported sample formats\n"
+"      --container                       Container format\n"
+"      --list-containers                 List supported containers and extensions\n"
 "      --volume                          Stream volume 0-1.0 (default %.3f)\n"
-"  -q  --quality                         Resampler quality (0 - 15) (default "
-"%d)\n"
+"  -q  --quality                         Resampler quality (0 - 15) (default %d)\n"
+"  -a, --raw                             RAW mode\n"
+"  -M, --force-midi                      Force midi format, one of \"midi\" or \"ump\", (default ump)\n"
+"  -n, --sample-count COUNT              Stop after COUNT samples\n"
 "\n"
 msgstr ""
+"      --rate                            Дискреттеу жиілігі (бастапқы %u)\n"
+"      --channels                        Арналар саны (бастапқы %u)\n"
+"      --channel-map                     Арналар картасы\n"
+"                                            арна жаймасы: «Stereo», «5.1»,... немесе\n"
+"                                            үтірмен ажыратылған арна атауларының тізімі: мысалы, "
+"«FL,FR»\n"
+"      --list-layouts                    Қолдау көрсетілетін арна жаймаларын тізімдеу\n"
+"      --list-channel-names              Қолдау көрсетілетін арналар картасын тізімдеу\n"
+"      --format                          Дискреттеу пішімі (бастапқы %s)\n"
+"      --list-formats                    Қолдау көрсетілетін дискреттеу пішімдерін тізімдеу\n"
+"      --container                       Контейнер пішімі\n"
+"      --list-containers                 Қолдау көрсетілетін контейнерлер мен кеңейтулерді тізімдеу\n"
+"      --volume                          Ағын дыбыс деңгейі 0-1.0 (бастапқы %.3f)\n"
+"  -q  --quality                         Қайта дискреттеу сапасы (0 - 15) (бастапқы %d)\n"
+"  -a, --raw                             RAW режимі\n"
+"  -M, --force-midi                      Midi пішімін мәжбүрлеу, «midi» немесе «ump» біреуі, (бастапқы "
+"ump)\n"
+"  -n, --sample-count COUNT              COUNT үлгісінен кейін тоқтату\n"
+"\n"
 
-#: src/tools/pw-cat.c:1033
+#: src/tools/pw-cat.c:1232
 msgid ""
 "  -p, --playback                        Playback mode\n"
 "  -r, --record                          Recording mode\n"
 "  -m, --midi                            Midi mode\n"
+"  -d, --dsd                             DSD mode\n"
+"  -o, --encoded                         Encoded mode\n"
+"  -s, --sysex                           SysEx mode\n"
+"  -c, --midi-clip                       MIDI clip mode\n"
 "\n"
 msgstr ""
+"  -p, --playback                        Ойнату режимі\n"
+"  -r, --record                          Жазу режимі\n"
+"  -m, --midi                            Midi режимі\n"
+"  -d, --dsd                             DSD режимі\n"
+"  -o, --encoded                         Шифрленген режим\n"
+"  -s, --sysex                           SysEx режимі\n"
+"  -c, --midi-clip                       MIDI clip режимі\n"
+"\n"
 
-#: src/tools/pw-cli.c:2932
+#: src/tools/pw-cat.c:1837
+#, c-format
+msgid "Supported containers and extensions:\n"
+msgstr "Қолдау көрсетілетін контейнерлер мен кеңейтулер:\n"
+
+#: src/tools/pw-cli.c:2386
 #, c-format
 msgid ""
 "%s [options] [command]\n"
@@ -114,465 +216,506 @@ msgid ""
 "      --version                         Show version\n"
 "  -d, --daemon                          Start as daemon (Default false)\n"
 "  -r, --remote                          Remote daemon name\n"
+"  -m, --monitor                         Monitor activity\n"
 "\n"
 msgstr ""
+"%s [опциялар] [команда]\n"
+"  -h, --help                            Осы көмекті көрсету\n"
+"      --version                         Нұсқасын көрсету\n"
+"  -d, --daemon                          Қызмет ретінде іске қосу (Бастапқы false)\n"
+"  -r, --remote                          Қашықтағы қызмет атауы\n"
+"  -m, --monitor                         Белсенділікті бақылау\n"
+"\n"
 
-#: spa/plugins/alsa/acp/acp.c:290
+#: spa/plugins/alsa/acp/acp.c:361
 msgid "Pro Audio"
-msgstr ""
+msgstr "Кәсіби аудио"
 
-#: spa/plugins/alsa/acp/acp.c:411 spa/plugins/alsa/acp/alsa-mixer.c:4704
-#: spa/plugins/bluez5/bluez5-device.c:1000
+#: spa/plugins/alsa/acp/acp.c:535 spa/plugins/alsa/acp/alsa-mixer.c:4699
+#: spa/plugins/bluez5/bluez5-device.c:2021
 msgid "Off"
 msgstr "Сөнд."
 
-#: spa/plugins/alsa/acp/channelmap.h:466
-msgid "(invalid)"
-msgstr "(жарамсыз)"
+#: spa/plugins/alsa/acp/acp.c:618
+#, c-format
+msgid "%s [ALSA UCM error]"
+msgstr "%s [ALSA UCM қатесі]"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2709
+#: spa/plugins/alsa/acp/alsa-mixer.c:2721
 msgid "Input"
 msgstr "Кіріс"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2710
+#: spa/plugins/alsa/acp/alsa-mixer.c:2722
 msgid "Docking Station Input"
 msgstr "Док-станция кірісі"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2711
+#: spa/plugins/alsa/acp/alsa-mixer.c:2723
 msgid "Docking Station Microphone"
 msgstr "Док-станция микрофоны"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2712
+#: spa/plugins/alsa/acp/alsa-mixer.c:2724
 msgid "Docking Station Line In"
 msgstr "Док-станцияның сызықтық кірісі"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2713
-#: spa/plugins/alsa/acp/alsa-mixer.c:2804
+#: spa/plugins/alsa/acp/alsa-mixer.c:2725 spa/plugins/alsa/acp/alsa-mixer.c:2816
 msgid "Line In"
 msgstr "Сызықтық кіріс"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2714
-#: spa/plugins/alsa/acp/alsa-mixer.c:2798
-#: spa/plugins/bluez5/bluez5-device.c:1145
+#: spa/plugins/alsa/acp/alsa-mixer.c:2726 spa/plugins/alsa/acp/alsa-mixer.c:2810
+#: spa/plugins/bluez5/bluez5-device.c:2422
 msgid "Microphone"
 msgstr "Микрофон"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2715
-#: spa/plugins/alsa/acp/alsa-mixer.c:2799
+#: spa/plugins/alsa/acp/alsa-mixer.c:2727 spa/plugins/alsa/acp/alsa-mixer.c:2811
 msgid "Front Microphone"
 msgstr "Алдыңғы микрофон"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2716
-#: spa/plugins/alsa/acp/alsa-mixer.c:2800
+#: spa/plugins/alsa/acp/alsa-mixer.c:2728 spa/plugins/alsa/acp/alsa-mixer.c:2812
 msgid "Rear Microphone"
 msgstr "Артқы микрофон"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2717
+#: spa/plugins/alsa/acp/alsa-mixer.c:2729
 msgid "External Microphone"
 msgstr "Сыртқы микрофон"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2718
-#: spa/plugins/alsa/acp/alsa-mixer.c:2802
+#: spa/plugins/alsa/acp/alsa-mixer.c:2730 spa/plugins/alsa/acp/alsa-mixer.c:2814
 msgid "Internal Microphone"
 msgstr "Ішкі микрофон"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2719
-#: spa/plugins/alsa/acp/alsa-mixer.c:2805
+#: spa/plugins/alsa/acp/alsa-mixer.c:2731 spa/plugins/alsa/acp/alsa-mixer.c:2817
 msgid "Radio"
 msgstr "Радио"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2720
-#: spa/plugins/alsa/acp/alsa-mixer.c:2806
+#: spa/plugins/alsa/acp/alsa-mixer.c:2732 spa/plugins/alsa/acp/alsa-mixer.c:2818
 msgid "Video"
 msgstr "Видео"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2721
+#: spa/plugins/alsa/acp/alsa-mixer.c:2733
 msgid "Automatic Gain Control"
 msgstr "Күшейтуді автореттеу"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2722
+#: spa/plugins/alsa/acp/alsa-mixer.c:2734
 msgid "No Automatic Gain Control"
 msgstr "Күшейтуді автореттеу жоқ"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2723
+#: spa/plugins/alsa/acp/alsa-mixer.c:2735
 msgid "Boost"
 msgstr "Күшейту"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2724
+#: spa/plugins/alsa/acp/alsa-mixer.c:2736
 msgid "No Boost"
 msgstr "Күшейту жоқ"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2725
+#: spa/plugins/alsa/acp/alsa-mixer.c:2737
 msgid "Amplifier"
 msgstr "Күшейткіш"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2726
+#: spa/plugins/alsa/acp/alsa-mixer.c:2738
 msgid "No Amplifier"
 msgstr "Күшейткіш жоқ"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2727
+#: spa/plugins/alsa/acp/alsa-mixer.c:2739
 msgid "Bass Boost"
 msgstr "Бас күшейту"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2728
+#: spa/plugins/alsa/acp/alsa-mixer.c:2740
 msgid "No Bass Boost"
 msgstr "Бас күшейту жоқ"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2729
-#: spa/plugins/bluez5/bluez5-device.c:1150
+#: spa/plugins/alsa/acp/alsa-mixer.c:2741 spa/plugins/bluez5/bluez5-device.c:2428
 msgid "Speaker"
 msgstr "Динамик"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2730
-#: spa/plugins/alsa/acp/alsa-mixer.c:2808
+#. Don't call it "headset", the HF one has the mic
+#: spa/plugins/alsa/acp/alsa-mixer.c:2742 spa/plugins/alsa/acp/alsa-mixer.c:2820
+#: spa/plugins/bluez5/bluez5-device.c:2434 spa/plugins/bluez5/bluez5-device.c:2501
 msgid "Headphones"
 msgstr "Құлаққаптар"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2797
+#: spa/plugins/alsa/acp/alsa-mixer.c:2809
 msgid "Analog Input"
 msgstr "Аналогтық кіріс"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2801
+#: spa/plugins/alsa/acp/alsa-mixer.c:2813
 msgid "Dock Microphone"
 msgstr "Док-станция микрофоны"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2803
+#: spa/plugins/alsa/acp/alsa-mixer.c:2815
 msgid "Headset Microphone"
 msgstr "Гарнитура микрофоны"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2807
+#: spa/plugins/alsa/acp/alsa-mixer.c:2819
 msgid "Analog Output"
 msgstr "Аналогтық шығыс"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2809
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:2821
 msgid "Headphones 2"
-msgstr "Құлаққаптар"
+msgstr "Құлаққап 2"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2810
+#: spa/plugins/alsa/acp/alsa-mixer.c:2822
 msgid "Headphones Mono Output"
 msgstr "Құлаққаптардың моно шығысы"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2811
+#: spa/plugins/alsa/acp/alsa-mixer.c:2823
 msgid "Line Out"
 msgstr "Сызықтық шығыс"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2812
+#: spa/plugins/alsa/acp/alsa-mixer.c:2824
 msgid "Analog Mono Output"
 msgstr "Аналогтық моно шығысы"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2813
+#: spa/plugins/alsa/acp/alsa-mixer.c:2825
 msgid "Speakers"
 msgstr "Динамиктер"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2814
+#: spa/plugins/alsa/acp/alsa-mixer.c:2826
 msgid "HDMI / DisplayPort"
 msgstr "HDMI / DisplayPort"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2815
+#: spa/plugins/alsa/acp/alsa-mixer.c:2827
 msgid "Digital Output (S/PDIF)"
 msgstr "Цифрлық шығыс (S/PDIF)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2816
+#: spa/plugins/alsa/acp/alsa-mixer.c:2828
 msgid "Digital Input (S/PDIF)"
 msgstr "Цифрлық кіріс (S/PDIF)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2817
+#: spa/plugins/alsa/acp/alsa-mixer.c:2829
 msgid "Multichannel Input"
 msgstr "Көпарналы кіріс"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2818
+#: spa/plugins/alsa/acp/alsa-mixer.c:2830
 msgid "Multichannel Output"
 msgstr "Көпарналы шығыс"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2819
+#: spa/plugins/alsa/acp/alsa-mixer.c:2831
 msgid "Game Output"
 msgstr "Ойын шығысы"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2820
-#: spa/plugins/alsa/acp/alsa-mixer.c:2821
+#: spa/plugins/alsa/acp/alsa-mixer.c:2832 spa/plugins/alsa/acp/alsa-mixer.c:2833
 msgid "Chat Output"
 msgstr "Чат шығысы"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2822
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:2834
 msgid "Chat Input"
-msgstr "Чат шығысы"
+msgstr "Чат кірісі"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2823
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:2835
 msgid "Virtual Surround 7.1"
-msgstr "Виртуалды көлемді аудиоқабылдағыш"
+msgstr "Виртуалды көлемді дыбыс 7.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4527
+#: spa/plugins/alsa/acp/alsa-mixer.c:4522
 msgid "Analog Mono"
 msgstr "Аналогтық моно"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4528
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:4523
 msgid "Analog Mono (Left)"
-msgstr "Аналогтық моно"
+msgstr "Аналогты моно (Сол жақ)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4529
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:4524
 msgid "Analog Mono (Right)"
-msgstr "Аналогтық моно"
+msgstr "Аналогты моно (Оң жақ)"
 
 #. Note: Not translated to "Analog Stereo Input", because the source
 #. * name gets "Input" appended to it automatically, so adding "Input"
 #. * here would lead to the source name to become "Analog Stereo Input
 #. * Input". The same logic applies to analog-stereo-output,
 #. * multichannel-input and multichannel-output.
-#: spa/plugins/alsa/acp/alsa-mixer.c:4530
-#: spa/plugins/alsa/acp/alsa-mixer.c:4538
-#: spa/plugins/alsa/acp/alsa-mixer.c:4539
+#: spa/plugins/alsa/acp/alsa-mixer.c:4525 spa/plugins/alsa/acp/alsa-mixer.c:4533
+#: spa/plugins/alsa/acp/alsa-mixer.c:4534
 msgid "Analog Stereo"
 msgstr "Аналогтық стерео"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4531
+#: spa/plugins/alsa/acp/alsa-mixer.c:4526
 msgid "Mono"
 msgstr "Моно"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4532
+#: spa/plugins/alsa/acp/alsa-mixer.c:4527
 msgid "Stereo"
 msgstr "Стерео"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4540
-#: spa/plugins/alsa/acp/alsa-mixer.c:4698
-#: spa/plugins/bluez5/bluez5-device.c:1135
+#: spa/plugins/alsa/acp/alsa-mixer.c:4535 spa/plugins/alsa/acp/alsa-mixer.c:4693
+#: spa/plugins/bluez5/bluez5-device.c:2410
 msgid "Headset"
 msgstr "Гарнитура"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4541
-#: spa/plugins/alsa/acp/alsa-mixer.c:4699
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:4536 spa/plugins/alsa/acp/alsa-mixer.c:4694
 msgid "Speakerphone"
 msgstr "Динамик"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4542
-#: spa/plugins/alsa/acp/alsa-mixer.c:4543
+#: spa/plugins/alsa/acp/alsa-mixer.c:4537 spa/plugins/alsa/acp/alsa-mixer.c:4538
 msgid "Multichannel"
 msgstr "Көпарналы"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4544
+#: spa/plugins/alsa/acp/alsa-mixer.c:4539
 msgid "Analog Surround 2.1"
 msgstr "Аналогтық көлемді 2.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4545
+#: spa/plugins/alsa/acp/alsa-mixer.c:4540
 msgid "Analog Surround 3.0"
 msgstr "Аналогтық көлемді 3.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4546
+#: spa/plugins/alsa/acp/alsa-mixer.c:4541
 msgid "Analog Surround 3.1"
 msgstr "Аналогтық көлемді 3.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4547
+#: spa/plugins/alsa/acp/alsa-mixer.c:4542
 msgid "Analog Surround 4.0"
 msgstr "Аналогтық көлемді 4.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4548
+#: spa/plugins/alsa/acp/alsa-mixer.c:4543
 msgid "Analog Surround 4.1"
 msgstr "Аналогтық көлемді 4.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4549
+#: spa/plugins/alsa/acp/alsa-mixer.c:4544
 msgid "Analog Surround 5.0"
 msgstr "Аналогтық көлемді 5.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4550
+#: spa/plugins/alsa/acp/alsa-mixer.c:4545
 msgid "Analog Surround 5.1"
 msgstr "Аналогтық көлемді 5.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4551
+#: spa/plugins/alsa/acp/alsa-mixer.c:4546
 msgid "Analog Surround 6.0"
 msgstr "Аналогтық көлемді 6.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4552
+#: spa/plugins/alsa/acp/alsa-mixer.c:4547
 msgid "Analog Surround 6.1"
 msgstr "Аналогтық көлемді 6.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4553
+#: spa/plugins/alsa/acp/alsa-mixer.c:4548
 msgid "Analog Surround 7.0"
 msgstr "Аналогтық көлемді 7.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4554
+#: spa/plugins/alsa/acp/alsa-mixer.c:4549
 msgid "Analog Surround 7.1"
 msgstr "Аналогтық көлемді 7.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4555
+#: spa/plugins/alsa/acp/alsa-mixer.c:4550
 msgid "Digital Stereo (IEC958)"
 msgstr "Цифрлық стерео (IEC958)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4556
+#: spa/plugins/alsa/acp/alsa-mixer.c:4551
 msgid "Digital Surround 4.0 (IEC958/AC3)"
 msgstr "Цифрлық көлемді 4.0 (IEC958/AC3)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4557
+#: spa/plugins/alsa/acp/alsa-mixer.c:4552
 msgid "Digital Surround 5.1 (IEC958/AC3)"
 msgstr "Цифрлық көлемді 5.1 (IEC958/AC3)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4558
+#: spa/plugins/alsa/acp/alsa-mixer.c:4553
 msgid "Digital Surround 5.1 (IEC958/DTS)"
 msgstr "Цифрлық көлемді 5.1 (IEC958/DTS)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4559
+#: spa/plugins/alsa/acp/alsa-mixer.c:4554
 msgid "Digital Stereo (HDMI)"
 msgstr "Цифрлық стерео (HDMI)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4560
+#: spa/plugins/alsa/acp/alsa-mixer.c:4555
 msgid "Digital Surround 5.1 (HDMI)"
 msgstr "Цифрлық көлемді 5.1 (HDMI)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4561
+#: spa/plugins/alsa/acp/alsa-mixer.c:4556
 msgid "Chat"
-msgstr ""
+msgstr "Чат"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4562
+#: spa/plugins/alsa/acp/alsa-mixer.c:4557
 msgid "Game"
-msgstr ""
+msgstr "Ойын"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4696
+#: spa/plugins/alsa/acp/alsa-mixer.c:4691
 msgid "Analog Mono Duplex"
 msgstr "Аналогтық моно дуплекс"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4697
+#: spa/plugins/alsa/acp/alsa-mixer.c:4692
 msgid "Analog Stereo Duplex"
 msgstr "Аналогтық стерео дуплекс"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4700
+#: spa/plugins/alsa/acp/alsa-mixer.c:4695
 msgid "Digital Stereo Duplex (IEC958)"
 msgstr "Цифрлық стерео дуплекс (IEC958)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4701
+#: spa/plugins/alsa/acp/alsa-mixer.c:4696
 msgid "Multichannel Duplex"
 msgstr "Көпарналы дуплекс"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4702
+#: spa/plugins/alsa/acp/alsa-mixer.c:4697
 msgid "Stereo Duplex"
 msgstr "Стерео дуплекс"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4703
+#: spa/plugins/alsa/acp/alsa-mixer.c:4698
 msgid "Mono Chat + 7.1 Surround"
-msgstr ""
+msgstr "Моно чат + 7.1 көлемді дыбыс"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4806
+#: spa/plugins/alsa/acp/alsa-mixer.c:4799
 #, c-format
 msgid "%s Output"
 msgstr "%s шығысы"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4813
+#: spa/plugins/alsa/acp/alsa-mixer.c:4807
 #, c-format
 msgid "%s Input"
 msgstr "%s кірісі"
 
-#: spa/plugins/alsa/acp/alsa-util.c:1175 spa/plugins/alsa/acp/alsa-util.c:1269
+#: spa/plugins/alsa/acp/alsa-util.c:1233 spa/plugins/alsa/acp/alsa-util.c:1327
 #, c-format
 msgid ""
-"snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
-"ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."
 msgid_plural ""
-"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
-"ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."
 msgstr[0] ""
+"snd_pcm_avail() өте үлкен мән қайтарды: %lu байт (%lu мс).\n"
+"Бұл ALSA драйверіндегі («%s») қате болуы әбден мүмкін. Бұл мәселе туралы ALSA әзірлеушілеріне хабарлаңыз."
 msgstr[1] ""
+"snd_pcm_avail() өте үлкен мән қайтарды: %lu байт (%lu мс).\n"
+"Бұл ALSA драйверіндегі («%s») қате болуы әбден мүмкін. Бұл мәселе туралы ALSA әзірлеушілеріне хабарлаңыз."
 
-#: spa/plugins/alsa/acp/alsa-util.c:1241
+#: spa/plugins/alsa/acp/alsa-util.c:1299
 #, c-format
 msgid ""
-"snd_pcm_delay() returned a value that is exceptionally large: %li byte (%s"
-"%lu ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"snd_pcm_delay() returned a value that is exceptionally large: %li byte (%s%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."
 msgid_plural ""
-"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s"
-"%lu ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."
 msgstr[0] ""
+"snd_pcm_delay() өте үлкен мән қайтарды: %li байт (%s%lu мс).\n"
+"Бұл ALSA драйверіндегі («%s») қате болуы әбден мүмкін. Бұл мәселе туралы ALSA әзірлеушілеріне хабарлаңыз."
 msgstr[1] ""
+"snd_pcm_delay() өте үлкен мән қайтарды: %li байт (%s%lu мс).\n"
+"Бұл ALSA драйверіндегі («%s») қате болуы әбден мүмкін. Бұл мәселе туралы ALSA әзірлеушілеріне хабарлаңыз."
 
-#: spa/plugins/alsa/acp/alsa-util.c:1288
+#: spa/plugins/alsa/acp/alsa-util.c:1346
 #, c-format
 msgid ""
-"snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
-"%lu.\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"snd_pcm_avail_delay() returned strange values: delay %lu is less than avail %lu.\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."
 msgstr ""
+"snd_pcm_avail_delay() оғаш мәндер қайтарды: кідіріс %lu мәні қолжетімді %lu мәнінен аз.\n"
+"Бұл ALSA драйверіндегі («%s») қате болуы әбден мүмкін. Бұл мәселе туралы ALSA әзірлеушілеріне хабарлаңыз."
 
-#: spa/plugins/alsa/acp/alsa-util.c:1331
+#: spa/plugins/alsa/acp/alsa-util.c:1389
 #, c-format
 msgid ""
-"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
-"(%lu ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte (%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."
 msgid_plural ""
-"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
-"(%lu ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes (%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."
 msgstr[0] ""
+"snd_pcm_mmap_begin() өте үлкен мән қайтарды: %lu байт (%lu мс).\n"
+"Бұл ALSA драйверіндегі («%s») қате болуы әбден мүмкін. Бұл мәселе туралы ALSA әзірлеушілеріне хабарлаңыз."
 msgstr[1] ""
+"snd_pcm_mmap_begin() өте үлкен мән қайтарды: %lu байт (%lu мс).\n"
+"Бұл ALSA драйверіндегі («%s») қате болуы әбден мүмкін. Бұл мәселе туралы ALSA әзірлеушілеріне хабарлаңыз."
 
-#: spa/plugins/bluez5/bluez5-device.c:1010
+#: spa/plugins/alsa/acp/channelmap.h:460
+msgid "(invalid)"
+msgstr "(жарамсыз)"
+
+#: spa/plugins/alsa/acp/compat.c:194
+msgid "Built-in Audio"
+msgstr "Құрамындағы аудио"
+
+#: spa/plugins/alsa/acp/compat.c:199
+msgid "Modem"
+msgstr "Модем"
+
+#: spa/plugins/bluez5/bluez5-device.c:2032
 msgid "Audio Gateway (A2DP Source & HSP/HFP AG)"
-msgstr ""
+msgstr "Аудио шлюзі (A2DP бастапқы көзі және HSP/HFP AG)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1033
+#: spa/plugins/bluez5/bluez5-device.c:2061
+msgid "Audio Streaming for Hearing Aids (ASHA Sink)"
+msgstr "Есту аппараттарына арналған аудио ағыны (ASHA қабылдағышы)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2104
 #, c-format
 msgid "High Fidelity Playback (A2DP Sink, codec %s)"
-msgstr ""
+msgstr "Жоғары сапалы ойнату (A2DP қабылдағышы, кодек %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1035
+#: spa/plugins/bluez5/bluez5-device.c:2107
 #, c-format
 msgid "High Fidelity Duplex (A2DP Source/Sink, codec %s)"
-msgstr ""
+msgstr "Жоғары сапалы дуплекс (A2DP бастапқы көзі/қабылдағышы, кодек %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1041
+#: spa/plugins/bluez5/bluez5-device.c:2115
 msgid "High Fidelity Playback (A2DP Sink)"
-msgstr ""
+msgstr "Жоғары сапалы ойнату (A2DP қабылдағышы)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1043
+#: spa/plugins/bluez5/bluez5-device.c:2117
 msgid "High Fidelity Duplex (A2DP Source/Sink)"
-msgstr ""
+msgstr "Жоғары сапалы дуплекс (A2DP бастапқы көзі/қабылдағышы)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1070
+#: spa/plugins/bluez5/bluez5-device.c:2194
+#, c-format
+msgid "High Fidelity Playback (BAP Sink, codec %s)"
+msgstr "Жоғары сапалы ойнату (BAP қабылдағышы, кодек %s)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2199
+#, c-format
+msgid "High Fidelity Input (BAP Source, codec %s)"
+msgstr "Жоғары сапалы кіріс (BAP бастапқы көзі, кодек %s)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2203
+#, c-format
+msgid "High Fidelity Duplex (BAP Source/Sink, codec %s)"
+msgstr "Жоғары сапалы дуплекс (BAP бастапқы көзі/қабылдағышы, кодек %s)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2212
+msgid "High Fidelity Playback (BAP Sink)"
+msgstr "Жоғары сапалы ойнату (BAP қабылдағышы)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2216
+msgid "High Fidelity Input (BAP Source)"
+msgstr "Жоғары сапалы кіріс (BAP бастапқы көзі)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2219
+msgid "High Fidelity Duplex (BAP Source/Sink)"
+msgstr "Жоғары сапалы дуплекс (BAP бастапқы көзі/қабылдағышы)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2259
 #, c-format
 msgid "Headset Head Unit (HSP/HFP, codec %s)"
-msgstr ""
+msgstr "Гарнитура (HSP/HFP, кодек %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1074
-msgid "Headset Head Unit (HSP/HFP)"
-msgstr ""
-
-#: spa/plugins/bluez5/bluez5-device.c:1140
+#: spa/plugins/bluez5/bluez5-device.c:2411 spa/plugins/bluez5/bluez5-device.c:2416
+#: spa/plugins/bluez5/bluez5-device.c:2423 spa/plugins/bluez5/bluez5-device.c:2429
+#: spa/plugins/bluez5/bluez5-device.c:2435 spa/plugins/bluez5/bluez5-device.c:2441
+#: spa/plugins/bluez5/bluez5-device.c:2447 spa/plugins/bluez5/bluez5-device.c:2453
+#: spa/plugins/bluez5/bluez5-device.c:2459
 msgid "Handsfree"
 msgstr "Хендс-фри"
 
-#: spa/plugins/bluez5/bluez5-device.c:1155
-msgid "Headphone"
-msgstr "Құлаққап"
+#: spa/plugins/bluez5/bluez5-device.c:2417
+msgid "Handsfree (HFP)"
+msgstr "Гарнитура (HFP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1160
+#: spa/plugins/bluez5/bluez5-device.c:2440
 msgid "Portable"
 msgstr "Портативті динамик"
 
-#: spa/plugins/bluez5/bluez5-device.c:1165
+#: spa/plugins/bluez5/bluez5-device.c:2446
 msgid "Car"
 msgstr "Автомобильдік динамик"
 
-#: spa/plugins/bluez5/bluez5-device.c:1170
+#: spa/plugins/bluez5/bluez5-device.c:2452
 msgid "HiFi"
 msgstr "HiFi"
 
-#: spa/plugins/bluez5/bluez5-device.c:1175
+#: spa/plugins/bluez5/bluez5-device.c:2458
 msgid "Phone"
 msgstr "Телефон"
 
-#: spa/plugins/bluez5/bluez5-device.c:1181
+#: spa/plugins/bluez5/bluez5-device.c:2465
 msgid "Bluetooth"
 msgstr "Bluetooth"
+
+#: spa/plugins/bluez5/bluez5-device.c:2466
+msgid "Bluetooth Handsfree"
+msgstr "Bluetooth гарнитурасы"
+
+#~ msgid "Headphone"
+#~ msgstr "Құлаққап"

From edb074f4385cd6f3161750c67f1fb9b2407733d5 Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arunr@valvesoftware.com>
Date: Mon, 16 Mar 2026 14:40:16 -0700
Subject: [PATCH 212/263] spa: aec: Fix log topic name

---
 spa/plugins/aec/aec-webrtc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spa/plugins/aec/aec-webrtc.cpp b/spa/plugins/aec/aec-webrtc.cpp
index 7b8cafcde..08697288b 100644
--- a/spa/plugins/aec/aec-webrtc.cpp
+++ b/spa/plugins/aec/aec-webrtc.cpp
@@ -39,7 +39,7 @@ struct impl_data {
 	std::unique_ptr<float *[]> play_buffer, rec_buffer, out_buffer;
 };
 
-SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.eac.webrtc");
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.aec.webrtc");
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
 

From 36740e010029da084640250d09e352f829665585 Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arunr@valvesoftware.com>
Date: Mon, 16 Mar 2026 14:43:04 -0700
Subject: [PATCH 213/263] spa: aec: Add some channel config validation

This is checked in AudioProcessing, but will fail at processing time
rather than in initialisation.
---
 spa/plugins/aec/aec-webrtc.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/spa/plugins/aec/aec-webrtc.cpp b/spa/plugins/aec/aec-webrtc.cpp
index 08697288b..2e451d851 100644
--- a/spa/plugins/aec/aec-webrtc.cpp
+++ b/spa/plugins/aec/aec-webrtc.cpp
@@ -221,6 +221,11 @@ static int webrtc_init2(void *object, const struct spa_dict *args,
 	}};
 #endif
 
+	if (out_info->channels != 1 && rec_info->channels != out_info->channels) {
+		spa_log_error(impl->log, "Source channels must be equal to capture channels or 1");
+		return -EINVAL;
+	}
+
 #if defined(HAVE_WEBRTC)
 	auto apm = std::unique_ptr<webrtc::AudioProcessing>(webrtc::AudioProcessing::Create(config));
 #elif defined(HAVE_WEBRTC1)

From 8db115351910841998ece1905ae9913a99ffebf9 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 17 Mar 2026 13:52:48 +0100
Subject: [PATCH 214/263] modules: remove some unused fields

---
 src/modules/module-raop-sink.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/modules/module-raop-sink.c b/src/modules/module-raop-sink.c
index 2eee70a2e..f75da48a8 100644
--- a/src/modules/module-raop-sink.c
+++ b/src/modules/module-raop-sink.c
@@ -131,11 +131,6 @@
 PW_LOG_TOPIC(mod_topic, "mod." NAME);
 #define PW_LOG_TOPIC_DEFAULT mod_topic
 
-#define BUFFER_SIZE		(1u<<22)
-#define BUFFER_MASK		(BUFFER_SIZE-1)
-#define BUFFER_SIZE2		(BUFFER_SIZE>>1)
-#define BUFFER_MASK2		(BUFFER_SIZE2-1)
-
 #define FRAMES_PER_TCP_PACKET	4096
 #define FRAMES_PER_UDP_PACKET	352
 
@@ -274,13 +269,6 @@ struct impl {
 
 	bool mute;
 	float volume;
-
-	struct spa_ringbuffer ring;
-	uint8_t buffer[BUFFER_SIZE];
-
-	struct spa_io_position *io_position;
-
-	uint32_t filled;
 };
 
 static inline void bit_writer(uint8_t **p, int *pos, uint8_t data, int len)

From f4587ea434505d565dcb37c966fd085a5305bc6f Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 17 Mar 2026 13:53:23 +0100
Subject: [PATCH 215/263] modules: improve debug in RTP

---
 src/modules/module-raop-sink.c  | 2 +-
 src/modules/module-rtp/audio.c  | 2 +-
 src/modules/module-rtp/stream.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/module-raop-sink.c b/src/modules/module-raop-sink.c
index f75da48a8..5e25b3089 100644
--- a/src/modules/module-raop-sink.c
+++ b/src/modules/module-raop-sink.c
@@ -346,7 +346,7 @@ static int send_udp_sync_packet(struct impl *impl, uint32_t rtptime, unsigned in
 	res = sendmsg(impl->control_fd, &msg, MSG_NOSIGNAL);
 	if (res < 0) {
 		res = -errno;
-		pw_log_warn("error sending control packet: %d", res);
+		pw_log_warn("error sending control packet: %d (%m)", res);
 	}
 
 	pw_log_debug("raop control sync: first:%d latency:%u now:%"PRIx64" rtptime:%u",
diff --git a/src/modules/module-rtp/audio.c b/src/modules/module-rtp/audio.c
index d20e9a37c..27c4b218e 100644
--- a/src/modules/module-rtp/audio.c
+++ b/src/modules/module-rtp/audio.c
@@ -556,7 +556,7 @@ static void rtp_audio_flush_packets(struct impl *impl, uint32_t num_packets, uin
 			((uint64_t)timestamp * stride) % impl->actual_max_buffer_size,
 			&iov[1], tosend * stride);
 
-		pw_log_trace("sending %d packet:%d ts_offset:%d timestamp:%u (%f s)",
+		pw_log_trace_fp("sending %d packet:%d ts_offset:%d timestamp:%u (%f s)",
 				tosend, num_packets, impl->ts_offset, timestamp,
 				(double)timestamp * impl->io_position->clock.rate.num /
 				impl->io_position->clock.rate.denom);
diff --git a/src/modules/module-rtp/stream.c b/src/modules/module-rtp/stream.c
index d69b16524..5ca41eb12 100644
--- a/src/modules/module-rtp/stream.c
+++ b/src/modules/module-rtp/stream.c
@@ -426,7 +426,7 @@ static int stream_stop(struct impl *impl)
 	 * because a stop involves closing the connection. If the timer is still
 	 * running, it needs an open connection for sending out remaining packets. */
 	if (!timer_running) {
-		int res;
+		int res = 0;
 		pw_log_info("closing connection as part of stopping the stream");
 		rtp_stream_emit_close_connection(impl, &res);
 		if (res > 0) {

From 6bf81ebe592989b9b061cf652d639fcec82e9acd Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 17 Mar 2026 14:01:27 +0100
Subject: [PATCH 216/263] modules: align rtp_timestamps for sender

When the driver changes, the clock position can also change and there
would be a discont in the rtp_timestamp.

This is not usually a problem except in RAOP mode where the base rtp
timestamp is negotiated and anything that deviates too much is to be
discarded.

If we are not using direct_timestamp for the sender, make sure we always
keep the rtp_time aligned to avoid this problem.

See #5167
---
 src/modules/module-rtp/audio.c  | 8 +++++---
 src/modules/module-rtp/stream.c | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/modules/module-rtp/audio.c b/src/modules/module-rtp/audio.c
index 27c4b218e..eec37317f 100644
--- a/src/modules/module-rtp/audio.c
+++ b/src/modules/module-rtp/audio.c
@@ -546,7 +546,7 @@ static void rtp_audio_flush_packets(struct impl *impl, uint32_t num_packets, uin
 		else
 			header.m = 0;
 
-		rtp_timestamp = impl->ts_offset + (set_timestamp ? set_timestamp : timestamp);
+		rtp_timestamp = impl->ts_offset + impl->ts_align + (set_timestamp ? set_timestamp : timestamp);
 
 		header.sequence_number = htons(impl->seq);
 		header.timestamp = htonl(rtp_timestamp);
@@ -705,8 +705,10 @@ static void rtp_audio_process_capture(void *data)
 	 * that resynchronization is needed, then this will be done immediately below. */
 
 	if (!impl->have_sync) {
-		pw_log_info("(re)sync to timestamp:%u seq:%u ts_offset:%u SSRC:%u",
-				actual_timestamp, impl->seq, impl->ts_offset, impl->ssrc);
+		if (!impl->direct_timestamp)
+			impl->ts_align = actual_timestamp - impl->ring.readindex;
+		pw_log_info("(re)sync to timestamp:%u seq:%u ts_offset:%u ts_align:%u SSRC:%u",
+				actual_timestamp, impl->seq, impl->ts_offset, impl->ts_align, impl->ssrc);
 		spa_ringbuffer_read_update(&impl->ring, actual_timestamp);
 		spa_ringbuffer_write_update(&impl->ring, actual_timestamp);
 		memset(impl->buffer, 0, BUFFER_SIZE);
diff --git a/src/modules/module-rtp/stream.c b/src/modules/module-rtp/stream.c
index 5ca41eb12..992563aea 100644
--- a/src/modules/module-rtp/stream.c
+++ b/src/modules/module-rtp/stream.c
@@ -109,6 +109,7 @@ struct impl {
 	uint32_t mtu;
 	uint32_t header_size;
 	uint32_t payload_size;
+	uint32_t ts_align;
 
 	struct spa_ringbuffer ring;
 	uint8_t buffer[BUFFER_SIZE];

From e4693ebc8348fa40e867346501dd9d607c62a160 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 17 Mar 2026 14:13:01 +0100
Subject: [PATCH 217/263] audioconvert: avoid OOB mix matrix read

Patch by David Nowotny

In make_matrix (channelmix-ops.c), the matrix-filling loop at the done:
label allows the index i (and j in the inner loop) to grow beyond MAX_CHANNELS
when dst_paired/src_paired has sparse bits set. In that case the continue
fires for most values of i < CHANNEL_BITS, so i advances much faster than ic,
and matrix[i][j] reads off the end of the stack-allocated array.

Add bounds guards to both loop conditions so i and j cannot exceed
MAX_CHANNELS.

Fixes #5176
---
 spa/plugins/audioconvert/channelmix-ops.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spa/plugins/audioconvert/channelmix-ops.c b/spa/plugins/audioconvert/channelmix-ops.c
index 12edb4b5a..7bf046cf0 100644
--- a/spa/plugins/audioconvert/channelmix-ops.c
+++ b/spa/plugins/audioconvert/channelmix-ops.c
@@ -720,7 +720,7 @@ done:
 	if (src_paired == 0)
 		src_paired = ~0LU;
 
-	for (jc = 0, ic = 0, i = 0; ic < dst_chan; i++) {
+	for (jc = 0, ic = 0, i = 0; ic < dst_chan && i < MAX_CHANNELS; i++) {
 		float sum = 0.0f;
 		char str1[1024], str2[1024];
 		struct spa_strbuf sb1, sb2;
@@ -730,7 +730,7 @@ done:
 
 		if (i < CHANNEL_BITS && (dst_paired & (1UL << i)) == 0)
 			continue;
-		for (jc = 0, j = 0; jc < src_chan; j++) {
+		for (jc = 0, j = 0; jc < src_chan && j < MAX_CHANNELS; j++) {
 			if (j < CHANNEL_BITS && (src_paired & (1UL << j)) == 0)
 				continue;
 

From b16a2e41e8914c99efac11f910c70a61e3c3bdf1 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 18 Mar 2026 13:19:04 +0100
Subject: [PATCH 218/263] scheduler: remove sync group from runnable
 calculations

The sync group is only to group nodes when sync is enabled.
---
 src/modules/module-scheduler-v1.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/modules/module-scheduler-v1.c b/src/modules/module-scheduler-v1.c
index 184c45ff2..719a7c956 100644
--- a/src/modules/module-scheduler-v1.c
+++ b/src/modules/module-scheduler-v1.c
@@ -123,24 +123,12 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 	struct pw_impl_port *p;
 	struct pw_impl_link *l;
 	struct pw_impl_node *n;
-	uint32_t n_sync = 0;
-	char *sync[MAX_SYNC+1] = { NULL };
 
 	if (!node->runnable) {
 		pw_log_debug("%s is runnable", node->name);
 		node->runnable = true;
 	}
 
-	if (node->sync) {
-		for (uint32_t i = 0; node->sync_groups[i]; i++) {
-			if (n_sync >= MAX_SYNC)
-				break;
-			if (pw_strv_find(sync, node->sync_groups[i]) >= 0)
-				continue;
-			sync[n_sync++] = node->sync_groups[i];
-			sync[n_sync] = NULL;
-		}
-	}
 	spa_list_for_each(p, &node->output_ports, link) {
 		spa_list_for_each(l, &p->links, output_link) {
 			n = l->input->node;
@@ -173,7 +161,7 @@ static void make_runnable(struct pw_context *context, struct pw_impl_node *node)
 	 * that are not yet runnable. We don't include sync-groups because they
 	 * are only used to group the node with a driver, not to determine the
 	 * runnable state of a node. */
-	if (node->groups != NULL || node->link_groups != NULL || sync[0] != NULL) {
+	if (node->groups != NULL || node->link_groups != NULL) {
 		spa_list_for_each(n, &context->node_list, link) {
 			if (n->exported || !n->active || n->runnable)
 				continue;

From 41d8ce7fff2aac6db048d3df6af38457724b8531 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 19 Mar 2026 09:12:58 +0100
Subject: [PATCH 219/263] audioconvert: optimize some fallback paths

We can use vector operations in some parts.

Also Make a macro for common store multiple operations.
---
 spa/plugins/audioconvert/fmt-ops-avx2.c | 116 +++++++------
 spa/plugins/audioconvert/fmt-ops-sse2.c | 222 ++++++++++++++++--------
 2 files changed, 208 insertions(+), 130 deletions(-)

diff --git a/spa/plugins/audioconvert/fmt-ops-avx2.c b/spa/plugins/audioconvert/fmt-ops-avx2.c
index a939da458..af0af91f2 100644
--- a/spa/plugins/audioconvert/fmt-ops-avx2.c
+++ b/spa/plugins/audioconvert/fmt-ops-avx2.c
@@ -30,6 +30,38 @@
 		_mm256_srli_epi16(x, 8));				\
 })
 
+#define _MM_TRANS_1x4_PS(v0,v1,v2,v3)					\
+({									\
+	v1 = _mm_shuffle_ps(v0, v0, _MM_SHUFFLE(0, 3, 2, 1));		\
+	v2 = _mm_shuffle_ps(v0, v0, _MM_SHUFFLE(1, 0, 3, 2));		\
+	v3 = _mm_shuffle_ps(v0, v0, _MM_SHUFFLE(2, 1, 0, 3));		\
+})
+#define _MM_TRANS_1x4_EPI32(v0,v1,v2,v3)				\
+({									\
+	v1 = _mm_shuffle_epi32(v0, _MM_SHUFFLE(0, 3, 2, 1));		\
+	v2 = _mm_shuffle_epi32(v0, _MM_SHUFFLE(1, 0, 3, 2));		\
+	v3 = _mm_shuffle_epi32(v0, _MM_SHUFFLE(2, 1, 0, 3));		\
+})
+
+#define _MM_STOREM_PS(d0,d1,d2,d3,v)					\
+({									\
+	__m128 o[3];							\
+	_MM_TRANS_1x4_PS(v, o[0], o[1], o[2]);				\
+	_mm_store_ss(d0, v);						\
+	_mm_store_ss(d1, o[0]);						\
+	_mm_store_ss(d2, o[1]);						\
+	_mm_store_ss(d3, o[2]);						\
+})
+#define _MM_STOREM_EPI32(d0,d1,d2,d3,v)					\
+({									\
+	__m128i o[3];							\
+	_MM_TRANS_1x4_EPI32(v, o[0], o[1], o[2]);			\
+	*d0 = _mm_cvtsi128_si32(v);					\
+	*d1 = _mm_cvtsi128_si32(o[0]);					\
+	*d2 = _mm_cvtsi128_si32(o[1]);					\
+	*d3 = _mm_cvtsi128_si32(o[2]);					\
+})
+
 static void
 conv_s16_to_f32d_1s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
 		uint32_t n_channels, uint32_t n_samples)
@@ -397,18 +429,13 @@ conv_s24_to_f32d_4s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA
 		s += 12 * n_channels;
 	}
 	for(; n < n_samples; n++) {
-		out[0] = _mm_cvtsi32_ss(factor, s24_to_s32(*((int24_t*)s+0)));
-		out[1] = _mm_cvtsi32_ss(factor, s24_to_s32(*((int24_t*)s+1)));
-		out[2] = _mm_cvtsi32_ss(factor, s24_to_s32(*((int24_t*)s+2)));
-		out[3] = _mm_cvtsi32_ss(factor, s24_to_s32(*((int24_t*)s+3)));
-		out[0] = _mm_mul_ss(out[0], factor);
-		out[1] = _mm_mul_ss(out[1], factor);
-		out[2] = _mm_mul_ss(out[2], factor);
-		out[3] = _mm_mul_ss(out[3], factor);
-		_mm_store_ss(&d0[n], out[0]);
-		_mm_store_ss(&d1[n], out[1]);
-		_mm_store_ss(&d2[n], out[2]);
-		_mm_store_ss(&d3[n], out[3]);
+		in[0] = _mm_setr_epi32(s24_to_s32(*((int24_t*)s+0)),
+				s24_to_s32(*((int24_t*)s+1)),
+				s24_to_s32(*((int24_t*)s+2)),
+				s24_to_s32(*((int24_t*)s+3)));
+		out[0] = _mm_cvtepi32_ps(in[0]);
+		out[0] = _mm_mul_ps(out[0], factor);
+		_MM_STOREM_PS(&d0[n], &d1[n], &d2[n], &d3[n], out[0]);
 		s += 3 * n_channels;
 	}
 }
@@ -473,18 +500,11 @@ conv_s32_to_f32d_4s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA
 	}
 	for(; n < n_samples; n++) {
 		__m128 out[4], factor = _mm_set1_ps(1.0f / S32_SCALE_I2F);
-		out[0] = _mm_cvtsi32_ss(factor, s[0]);
-		out[1] = _mm_cvtsi32_ss(factor, s[1]);
-		out[2] = _mm_cvtsi32_ss(factor, s[2]);
-		out[3] = _mm_cvtsi32_ss(factor, s[3]);
-		out[0] = _mm_mul_ss(out[0], factor);
-		out[1] = _mm_mul_ss(out[1], factor);
-		out[2] = _mm_mul_ss(out[2], factor);
-		out[3] = _mm_mul_ss(out[3], factor);
-		_mm_store_ss(&d0[n], out[0]);
-		_mm_store_ss(&d1[n], out[1]);
-		_mm_store_ss(&d2[n], out[2]);
-		_mm_store_ss(&d3[n], out[3]);
+		__m128i in[1];
+		in[0] = _mm_setr_epi32(s[0], s[1], s[2], s[3]);
+		out[0] = _mm_cvtepi32_ps(in[0]);
+		out[0] = _mm_mul_ps(out[0], factor);
+		_MM_STOREM_PS(&d0[n], &d1[n], &d2[n], &d3[n], out[0]);
 		s += n_channels;
 	}
 }
@@ -612,14 +632,10 @@ conv_f32d_to_s32_1s_avx2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
 		in[0] = _mm_mul_ps(_mm_load_ps(&s0[n]), scale);
 		in[0] = _MM_CLAMP_PS(in[0], int_min, int_max);
 		out[0] = _mm_cvtps_epi32(in[0]);
-		out[1] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(0, 3, 2, 1));
-		out[2] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(1, 0, 3, 2));
-		out[3] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(2, 1, 0, 3));
-
-		d[0*n_channels] = _mm_cvtsi128_si32(out[0]);
-		d[1*n_channels] = _mm_cvtsi128_si32(out[1]);
-		d[2*n_channels] = _mm_cvtsi128_si32(out[2]);
-		d[3*n_channels] = _mm_cvtsi128_si32(out[3]);
+		_MM_STOREM_EPI32(&d[0*n_channels],
+				&d[1*n_channels],
+				&d[2*n_channels],
+				&d[3*n_channels], out[0]);
 		d += 4*n_channels;
 	}
 	for(; n < n_samples; n++) {
@@ -774,15 +790,7 @@ conv_f32d_to_s32_4s_avx2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
 		__m128 int_min = _mm_set1_ps(S32_MIN_F2I);
 		__m128 int_max = _mm_set1_ps(S32_MAX_F2I);
 
-		in[0] = _mm_load_ss(&s0[n]);
-		in[1] = _mm_load_ss(&s1[n]);
-		in[2] = _mm_load_ss(&s2[n]);
-		in[3] = _mm_load_ss(&s3[n]);
-
-		in[0] = _mm_unpacklo_ps(in[0], in[2]);
-		in[1] = _mm_unpacklo_ps(in[1], in[3]);
-		in[0] = _mm_unpacklo_ps(in[0], in[1]);
-
+		in[0] = _mm_setr_ps(s0[n], s1[n], s2[n], s3[n]);
 		in[0] = _mm_mul_ps(in[0], scale);
 		in[0] = _MM_CLAMP_PS(in[0], int_min, int_max);
 		out[0] = _mm_cvtps_epi32(in[0]);
@@ -972,18 +980,16 @@ conv_f32d_to_s16_4s_avx2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
 		__m128 int_max = _mm_set1_ps(S16_MAX);
 		__m128 int_min = _mm_set1_ps(S16_MIN);
 
-		in[0] = _mm_mul_ss(_mm_load_ss(&s0[n]), int_scale);
-		in[1] = _mm_mul_ss(_mm_load_ss(&s1[n]), int_scale);
-		in[2] = _mm_mul_ss(_mm_load_ss(&s2[n]), int_scale);
-		in[3] = _mm_mul_ss(_mm_load_ss(&s3[n]), int_scale);
-		in[0] = _MM_CLAMP_SS(in[0], int_min, int_max);
-		in[1] = _MM_CLAMP_SS(in[1], int_min, int_max);
-		in[2] = _MM_CLAMP_SS(in[2], int_min, int_max);
-		in[3] = _MM_CLAMP_SS(in[3], int_min, int_max);
+		in[0] = _mm_setr_ps(s0[n], s1[n], s2[n], s3[n]);
+		in[0] = _mm_mul_ps(in[0], int_scale);
+		in[0] = _MM_CLAMP_PS(in[0], int_min, int_max);
+
+		_MM_TRANS_1x4_PS(in[0], in[1], in[2], in[3]);
 		d[0] = _mm_cvtss_si32(in[0]);
 		d[1] = _mm_cvtss_si32(in[1]);
 		d[2] = _mm_cvtss_si32(in[2]);
 		d[3] = _mm_cvtss_si32(in[3]);
+
 		d += n_channels;
 	}
 }
@@ -1055,14 +1061,10 @@ conv_f32d_to_s16_4_avx2(struct convert *conv, void * SPA_RESTRICT dst[], const v
 		__m128 int_max = _mm_set1_ps(S16_MAX);
 		__m128 int_min = _mm_set1_ps(S16_MIN);
 
-		in[0] = _mm_mul_ss(_mm_load_ss(&s0[n]), int_scale);
-		in[1] = _mm_mul_ss(_mm_load_ss(&s1[n]), int_scale);
-		in[2] = _mm_mul_ss(_mm_load_ss(&s2[n]), int_scale);
-		in[3] = _mm_mul_ss(_mm_load_ss(&s3[n]), int_scale);
-		in[0] = _MM_CLAMP_SS(in[0], int_min, int_max);
-		in[1] = _MM_CLAMP_SS(in[1], int_min, int_max);
-		in[2] = _MM_CLAMP_SS(in[2], int_min, int_max);
-		in[3] = _MM_CLAMP_SS(in[3], int_min, int_max);
+		in[0] = _mm_setr_ps(s0[n], s1[n], s2[n], s3[n]);
+		in[0] = _mm_mul_ps(in[0], int_scale);
+		in[0] = _MM_CLAMP_PS(in[0], int_min, int_max);
+		_MM_TRANS_1x4_PS(in[0], in[1], in[2], in[3]);
 		d[0] = _mm_cvtss_si32(in[0]);
 		d[1] = _mm_cvtss_si32(in[1]);
 		d[2] = _mm_cvtss_si32(in[2]);
diff --git a/spa/plugins/audioconvert/fmt-ops-sse2.c b/spa/plugins/audioconvert/fmt-ops-sse2.c
index ee5c89c06..dff64fc8f 100644
--- a/spa/plugins/audioconvert/fmt-ops-sse2.c
+++ b/spa/plugins/audioconvert/fmt-ops-sse2.c
@@ -26,6 +26,72 @@
 	a = _mm_shufflehi_epi16(a, _MM_SHUFFLE(2, 3, 0, 1));		\
 })
 
+#define spa_read_unaligned(ptr, type) \
+__extension__ ({ \
+	__typeof__(type) _val; \
+	memcpy(&_val, (ptr), sizeof(_val)); \
+	_val; \
+})
+
+#define spa_write_unaligned(ptr, type, val) \
+__extension__ ({ \
+	__typeof__(type) _val = (val); \
+	memcpy((ptr), &_val, sizeof(_val)); \
+})
+
+#define _MM_TRANS_1x4_PS(v0,v1,v2,v3)					\
+({									\
+	v1 = _mm_shuffle_ps(v0, v0, _MM_SHUFFLE(0, 3, 2, 1));		\
+	v2 = _mm_shuffle_ps(v0, v0, _MM_SHUFFLE(1, 0, 3, 2));		\
+	v3 = _mm_shuffle_ps(v0, v0, _MM_SHUFFLE(2, 1, 0, 3));		\
+})
+
+#define _MM_TRANS_1x4_EPI32(v0,v1,v2,v3)				\
+({									\
+	v1 = _mm_shuffle_epi32(v0, _MM_SHUFFLE(0, 3, 2, 1));		\
+	v2 = _mm_shuffle_epi32(v0, _MM_SHUFFLE(1, 0, 3, 2));		\
+	v3 = _mm_shuffle_epi32(v0, _MM_SHUFFLE(2, 1, 0, 3));		\
+})
+#if 0
+#define _MM_STOREM_PS(d0,d1,d2,d3,v)					\
+({									\
+	*d0 = v[0]; 							\
+	*d1 = v[1]; 							\
+	*d2 = v[2]; 							\
+	*d3 = v[3]; 							\
+})
+#else
+#define _MM_STOREM_PS(d0,d1,d2,d3,v)					\
+({									\
+	__m128 o[3];							\
+	_MM_TRANS_1x4_PS(v, o[0], o[1], o[2]);				\
+	_mm_store_ss(d0, v);						\
+	_mm_store_ss(d1, o[0]);						\
+	_mm_store_ss(d2, o[1]);						\
+	_mm_store_ss(d3, o[2]);						\
+})
+#endif
+
+#define _MM_STOREM_EPI32(d0,d1,d2,d3,v)					\
+({									\
+	__m128i o[3];							\
+	_MM_TRANS_1x4_EPI32(v, o[0], o[1], o[2]);			\
+	*d0 = _mm_cvtsi128_si32(v);					\
+	*d1 = _mm_cvtsi128_si32(o[0]);					\
+	*d2 = _mm_cvtsi128_si32(o[1]);					\
+	*d3 = _mm_cvtsi128_si32(o[2]);					\
+})
+
+#define _MM_STOREUM_EPI32(d0,d1,d2,d3,v)				\
+({									\
+	__m128i o[3];							\
+	_MM_TRANS_1x4_EPI32(v, o[0], o[1], o[2]);			\
+	spa_write_unaligned(d0, uint32_t, _mm_cvtsi128_si32(v));	\
+	spa_write_unaligned(d1, uint32_t, _mm_cvtsi128_si32(o[0]));	\
+	spa_write_unaligned(d2, uint32_t, _mm_cvtsi128_si32(o[1]));	\
+	spa_write_unaligned(d3, uint32_t, _mm_cvtsi128_si32(o[2]));	\
+})
+
 static void
 conv_s16_to_f32d_1s_sse2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
 		uint32_t n_channels, uint32_t n_samples)
@@ -233,18 +299,6 @@ conv_s16s_to_f32d_2_sse2(struct convert *conv, void * SPA_RESTRICT dst[], const
 	}
 }
 
-#define spa_read_unaligned(ptr, type) \
-__extension__ ({ \
-	__typeof__(type) _val; \
-	memcpy(&_val, (ptr), sizeof(_val)); \
-	_val; \
-})
-
-#define spa_write_unaligned(ptr, type, val) \
-__extension__ ({ \
-	__typeof__(type) _val = (val); \
-	memcpy((ptr), &_val, sizeof(_val)); \
-})
 void
 conv_s24_to_f32d_1s_sse2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
 		uint32_t n_channels, uint32_t n_samples)
@@ -416,18 +470,13 @@ conv_s24_to_f32d_4s_sse2(void *data, void * SPA_RESTRICT dst[], const void * SPA
 		s += 4 * n_channels;
 	}
 	for(; n < n_samples; n++) {
-		out[0] = _mm_cvtsi32_ss(factor, s24_to_s32(*s));
-		out[1] = _mm_cvtsi32_ss(factor, s24_to_s32(*(s+1)));
-		out[2] = _mm_cvtsi32_ss(factor, s24_to_s32(*(s+2)));
-		out[3] = _mm_cvtsi32_ss(factor, s24_to_s32(*(s+3)));
-		out[0] = _mm_mul_ss(out[0], factor);
-		out[1] = _mm_mul_ss(out[1], factor);
-		out[2] = _mm_mul_ss(out[2], factor);
-		out[3] = _mm_mul_ss(out[3], factor);
-		_mm_store_ss(&d0[n], out[0]);
-		_mm_store_ss(&d1[n], out[1]);
-		_mm_store_ss(&d2[n], out[2]);
-		_mm_store_ss(&d3[n], out[3]);
+		in[0] = _mm_setr_epi32(s24_to_s32(*s),
+				s24_to_s32(*(s+1)),
+				s24_to_s32(*(s+2)),
+				s24_to_s32(*(s+3)));
+		out[0] = _mm_cvtepi32_ps(in[0]);
+		out[0] = _mm_mul_ps(out[0], factor);
+		_MM_STOREM_PS(&d0[n], &d1[n], &d2[n], &d3[n], out[0]);
 		s += n_channels;
 	}
 }
@@ -447,6 +496,59 @@ conv_s24_to_f32d_sse2(struct convert *conv, void * SPA_RESTRICT dst[], const voi
 		conv_s24_to_f32d_1s_sse2(conv, &dst[i], &s[3*i], n_channels, n_samples);
 }
 
+void
+conv_s32_to_f32d_4s_sse2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
+		uint32_t n_channels, uint32_t n_samples)
+{
+	const int32_t *s = src;
+	float *d0 = dst[0], *d1 = dst[1], *d2 = dst[2], *d3 = dst[3];
+	uint32_t n, unrolled;
+	__m128i in[4];
+	__m128 out[4], factor = _mm_set1_ps(1.0f / S32_SCALE_I2F);
+
+	if (SPA_IS_ALIGNED(d0, 16) &&
+	    SPA_IS_ALIGNED(d1, 16) &&
+	    SPA_IS_ALIGNED(d2, 16) &&
+	    SPA_IS_ALIGNED(d3, 16) &&
+	    SPA_IS_ALIGNED(s, 16) && (n_channels & 3) == 0)
+		unrolled = n_samples & ~3;
+	else
+		unrolled = 0;
+
+	for(n = 0; n < unrolled; n += 4) {
+		in[0] = _mm_load_si128((__m128i*)(s + 0*n_channels));
+		in[1] = _mm_load_si128((__m128i*)(s + 1*n_channels));
+		in[2] = _mm_load_si128((__m128i*)(s + 2*n_channels));
+		in[3] = _mm_load_si128((__m128i*)(s + 3*n_channels));
+
+		out[0] = _mm_cvtepi32_ps(in[0]);
+		out[1] = _mm_cvtepi32_ps(in[1]);
+		out[2] = _mm_cvtepi32_ps(in[2]);
+		out[3] = _mm_cvtepi32_ps(in[3]);
+
+		out[0] = _mm_mul_ps(out[0], factor);
+		out[1] = _mm_mul_ps(out[1], factor);
+		out[2] = _mm_mul_ps(out[2], factor);
+		out[3] = _mm_mul_ps(out[3], factor);
+
+		_MM_TRANSPOSE4_PS(out[0], out[1], out[2], out[3]);
+
+		_mm_store_ps(&d0[n], out[0]);
+		_mm_store_ps(&d1[n], out[1]);
+		_mm_store_ps(&d2[n], out[2]);
+		_mm_store_ps(&d3[n], out[3]);
+
+		s += 4*n_channels;
+	}
+	for(; n < n_samples; n++) {
+		in[0] = _mm_setr_epi32(s[0], s[1], s[2], s[3]);
+		out[0] = _mm_cvtepi32_ps(in[0]);
+		out[0] = _mm_mul_ps(out[0], factor);
+		_MM_STOREM_PS(&d0[n], &d1[n], &d2[n], &d3[n], out[0]);
+		s += n_channels;
+	}
+}
+
 static void
 conv_s32_to_f32d_1s_sse2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
 		uint32_t n_channels, uint32_t n_samples)
@@ -487,6 +589,8 @@ conv_s32_to_f32d_sse2(struct convert *conv, void * SPA_RESTRICT dst[], const voi
 	const int32_t *s = src[0];
 	uint32_t i = 0, n_channels = conv->n_channels;
 
+	for(; i + 3 < n_channels; i += 4)
+		conv_s32_to_f32d_4s_sse2(conv, &dst[i], &s[i], n_channels, n_samples);
 	for(; i < n_channels; i++)
 		conv_s32_to_f32d_1s_sse2(conv, &dst[i], &s[i], n_channels, n_samples);
 }
@@ -513,14 +617,10 @@ conv_f32d_to_s32_1s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
 		in[0] = _mm_mul_ps(_mm_load_ps(&s0[n]), scale);
 		in[0] = _MM_CLAMP_PS(in[0], int_min, int_max);
 		out[0] = _mm_cvtps_epi32(in[0]);
-		out[1] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(0, 3, 2, 1));
-		out[2] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(1, 0, 3, 2));
-		out[3] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(2, 1, 0, 3));
-
-		d[0*n_channels] = _mm_cvtsi128_si32(out[0]);
-		d[1*n_channels] = _mm_cvtsi128_si32(out[1]);
-		d[2*n_channels] = _mm_cvtsi128_si32(out[2]);
-		d[3*n_channels] = _mm_cvtsi128_si32(out[3]);
+		_MM_STOREM_EPI32(&d[0*n_channels],
+				&d[1*n_channels],
+				&d[2*n_channels],
+				&d[3*n_channels], out[0]);
 		d += 4*n_channels;
 	}
 	for(; n < n_samples; n++) {
@@ -630,15 +730,7 @@ conv_f32d_to_s32_4s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
 		d += 4*n_channels;
 	}
 	for(; n < n_samples; n++) {
-		in[0] = _mm_load_ss(&s0[n]);
-		in[1] = _mm_load_ss(&s1[n]);
-		in[2] = _mm_load_ss(&s2[n]);
-		in[3] = _mm_load_ss(&s3[n]);
-
-		in[0] = _mm_unpacklo_ps(in[0], in[2]);
-		in[1] = _mm_unpacklo_ps(in[1], in[3]);
-		in[0] = _mm_unpacklo_ps(in[0], in[1]);
-
+		in[0] = _mm_setr_ps(s0[n], s1[n], s2[n], s3[n]);
 		in[0] = _mm_mul_ps(in[0], scale);
 		in[0] = _MM_CLAMP_PS(in[0], int_min, int_max);
 		out[0] = _mm_cvtps_epi32(in[0]);
@@ -754,14 +846,10 @@ conv_f32d_to_s32_1s_noise_sse2(struct convert *conv, void * SPA_RESTRICT dst, co
 		in[0] = _mm_add_ps(in[0], _mm_load_ps(&noise[n]));
 		in[0] = _MM_CLAMP_PS(in[0], int_min, int_max);
 		out[0] = _mm_cvtps_epi32(in[0]);
-		out[1] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(0, 3, 2, 1));
-		out[2] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(1, 0, 3, 2));
-		out[3] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(2, 1, 0, 3));
-
-		d[0*n_channels] = _mm_cvtsi128_si32(out[0]);
-		d[1*n_channels] = _mm_cvtsi128_si32(out[1]);
-		d[2*n_channels] = _mm_cvtsi128_si32(out[2]);
-		d[3*n_channels] = _mm_cvtsi128_si32(out[3]);
+		_MM_STOREM_EPI32(&d[0*n_channels],
+				&d[1*n_channels],
+				&d[2*n_channels],
+				&d[3*n_channels], out[0]);
 		d += 4*n_channels;
 	}
 	for(; n < n_samples; n++) {
@@ -810,14 +898,10 @@ conv_interleave_32_1s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA
 
 	for(n = 0; n < unrolled; n += 4) {
 		out[0] = _mm_load_si128((__m128i*)&s0[n]);
-		out[1] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(0, 3, 2, 1));
-		out[2] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(1, 0, 3, 2));
-		out[3] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(2, 1, 0, 3));
-
-		d[0*n_channels] = _mm_cvtsi128_si32(out[0]);
-		d[1*n_channels] = _mm_cvtsi128_si32(out[1]);
-		d[2*n_channels] = _mm_cvtsi128_si32(out[2]);
-		d[3*n_channels] = _mm_cvtsi128_si32(out[3]);
+		_MM_STOREM_EPI32(&d[0*n_channels],
+				&d[1*n_channels],
+				&d[2*n_channels],
+				&d[3*n_channels], out[0]);
 		d += 4*n_channels;
 	}
 	for(; n < n_samples; n++) {
@@ -893,14 +977,10 @@ conv_interleave_32s_1s_sse2(void *data, void * SPA_RESTRICT dst, const void * SP
 	for(n = 0; n < unrolled; n += 4) {
 		out[0] = _mm_load_si128((__m128i*)&s0[n]);
 		out[0] = _MM_BSWAP_EPI32(out[0]);
-		out[1] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(0, 3, 2, 1));
-		out[2] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(1, 0, 3, 2));
-		out[3] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(2, 1, 0, 3));
-
-		d[0*n_channels] = _mm_cvtsi128_si32(out[0]);
-		d[1*n_channels] = _mm_cvtsi128_si32(out[1]);
-		d[2*n_channels] = _mm_cvtsi128_si32(out[2]);
-		d[3*n_channels] = _mm_cvtsi128_si32(out[3]);
+		_MM_STOREM_EPI32(&d[0*n_channels],
+				&d[1*n_channels],
+				&d[2*n_channels],
+				&d[3*n_channels], out[0]);
 		d += 4*n_channels;
 	}
 	for(; n < n_samples; n++) {
@@ -1257,14 +1337,10 @@ conv_f32d_to_s16_2s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
 		t[1] = _mm_packs_epi32(t[1], t[1]);
 
 		out[0] = _mm_unpacklo_epi16(t[0], t[1]);
-		out[1] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(0, 3, 2, 1));
-		out[2] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(1, 0, 3, 2));
-		out[3] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(2, 1, 0, 3));
-
-		spa_write_unaligned(d + 0*n_channels, uint32_t, _mm_cvtsi128_si32(out[0]));
-		spa_write_unaligned(d + 1*n_channels, uint32_t, _mm_cvtsi128_si32(out[1]));
-		spa_write_unaligned(d + 2*n_channels, uint32_t, _mm_cvtsi128_si32(out[2]));
-		spa_write_unaligned(d + 3*n_channels, uint32_t, _mm_cvtsi128_si32(out[3]));
+		_MM_STOREUM_EPI32(&d[0*n_channels],
+				&d[1*n_channels],
+				&d[2*n_channels],
+				&d[3*n_channels], out[0]);
 		d += 4*n_channels;
 	}
 	for(; n < n_samples; n++) {

From 244c3b597f9648ef61c811afd1c9e391eb65402c Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 19 Mar 2026 12:58:30 +0100
Subject: [PATCH 220/263] pipewire-jack: call timebase_callback with valid
 buffer_frames

Check if we have a valid buffer_frames before we call the timebase
callback.

Also set the buffer_frames to the invalid value of -1 in jack_activate
instead of 0. -1 is the invalid value we check everywhere else.
---
 pipewire-jack/src/pipewire-jack.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
index c7017e936..cf1b8c754 100644
--- a/pipewire-jack/src/pipewire-jack.c
+++ b/pipewire-jack/src/pipewire-jack.c
@@ -2172,7 +2172,7 @@ static inline void cycle_signal(struct client *c, int status)
 	struct pw_node_activation *driver = c->rt.driver_activation;
 	struct pw_node_activation *activation = c->activation;
 
-	if (SPA_LIKELY(status == 0)) {
+	if (SPA_LIKELY(status == 0 && c->buffer_frames != (uint32_t)-1)) {
 		if (c->timebase_callback && driver && driver->segment_owner[0] == c->node_id) {
 			if (activation->pending_new_pos ||
 			    c->jack_state == JackTransportRolling ||
@@ -4875,7 +4875,7 @@ int jack_activate (jack_client_t *client)
 	freeze_callbacks(c);
 
 	/* reemit buffer_frames */
-	c->buffer_frames = 0;
+	c->buffer_frames = (uint32_t)-1;
 
 	pw_data_loop_start(c->loop);
 	c->active = true;
@@ -5456,7 +5456,7 @@ SPA_EXPORT
 jack_nframes_t jack_get_buffer_size (jack_client_t *client)
 {
 	struct client *c = (struct client *) client;
-	jack_nframes_t res = -1;
+	uint32_t res = -1;
 
 	return_val_if_fail(c != NULL, 0);
 
@@ -5473,7 +5473,7 @@ jack_nframes_t jack_get_buffer_size (jack_client_t *client)
 	}
 	c->buffer_frames = res;
 	pw_log_debug("buffer_frames: %u", res);
-	return res;
+	return (jack_nframes_t)res;
 }
 
 SPA_EXPORT

From 5ade045654eef5166263a4dd16a8040b0fdb66c9 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 19 Mar 2026 13:14:50 +0100
Subject: [PATCH 221/263] pipewire-jack: only call timebase on 0 status

If the status passed to cycle_signal != 0 we should not call the
timebase callback. We already do this but we can use this fact to also
not call the timebase_callback when there was no buffer_frames
configured yet.

Do this by setting the fallback return value of process_callback to != 0.
When there is no buffer_frames yet, this will be used and we can then
avoid the buffer_frames check in cycle_signal.
---
 pipewire-jack/src/pipewire-jack.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
index cf1b8c754..55f2d0d56 100644
--- a/pipewire-jack/src/pipewire-jack.c
+++ b/pipewire-jack/src/pipewire-jack.c
@@ -2172,7 +2172,7 @@ static inline void cycle_signal(struct client *c, int status)
 	struct pw_node_activation *driver = c->rt.driver_activation;
 	struct pw_node_activation *activation = c->activation;
 
-	if (SPA_LIKELY(status == 0 && c->buffer_frames != (uint32_t)-1)) {
+	if (SPA_LIKELY(status == 0)) {
 		if (c->timebase_callback && driver && driver->segment_owner[0] == c->node_id) {
 			if (activation->pending_new_pos ||
 			    c->jack_state == JackTransportRolling ||
@@ -2210,7 +2210,7 @@ on_rtsocket_condition(void *data, int fd, uint32_t mask)
 		}
 	} else if (SPA_LIKELY(mask & SPA_IO_IN)) {
 		uint32_t buffer_frames;
-		int status = 0;
+		int status = -EBUSY;
 
 		buffer_frames = cycle_run(c);
 

From 3b422e31a218d6651b3796e8e40b756a3e393106 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 19 Mar 2026 16:21:35 +0100
Subject: [PATCH 222/263] cpu: add SLOW_GATHER flag

Intel Skylake (level 0x16) is the first model with fast gather
opcodes. Mark lower versions with the SLOW_GATHER flag.

Prefer the SSE2 version of the format conversion without gather when
SLOW_GATHER is set. Makes the conversion much faster on my Ivy
Bridge.
---
 spa/include/spa/support/cpu.h      | 1 +
 spa/plugins/audioconvert/fmt-ops.c | 6 ++++++
 spa/plugins/support/cpu-x86.c      | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/spa/include/spa/support/cpu.h b/spa/include/spa/support/cpu.h
index c69338855..2faf42154 100644
--- a/spa/include/spa/support/cpu.h
+++ b/spa/include/spa/support/cpu.h
@@ -62,6 +62,7 @@ struct spa_cpu { struct spa_interface iface; };
 #define SPA_CPU_FLAG_BMI2		(1<<18)	/**< Bit Manipulation Instruction Set 2 */
 #define SPA_CPU_FLAG_AVX512		(1<<19)	/**< AVX-512 */
 #define SPA_CPU_FLAG_SLOW_UNALIGNED	(1<<20)	/**< unaligned loads/stores are slow */
+#define SPA_CPU_FLAG_SLOW_GATHER	(1<<21)	/**< gather functions are slow */
 
 /* PPC specific */
 #define SPA_CPU_FLAG_ALTIVEC		(1<<0)	/**< standard */
diff --git a/spa/plugins/audioconvert/fmt-ops.c b/spa/plugins/audioconvert/fmt-ops.c
index 3fc2c5f0a..057f3294a 100644
--- a/spa/plugins/audioconvert/fmt-ops.c
+++ b/spa/plugins/audioconvert/fmt-ops.c
@@ -108,6 +108,9 @@ static struct conv_info conv_table[] =
 	MAKE(U32, F32, 0, conv_u32_to_f32_c),
 	MAKE(U32, F32P, 0, conv_u32_to_f32d_c),
 
+#if defined (HAVE_SSE2)
+	MAKE(S32, F32P, 0, conv_s32_to_f32d_sse2, SPA_CPU_FLAG_SSE2 | SPA_CPU_FLAG_SLOW_GATHER),
+#endif
 #if defined (HAVE_AVX2)
 	MAKE(S32, F32P, 0, conv_s32_to_f32d_avx2, SPA_CPU_FLAG_AVX2),
 #endif
@@ -129,6 +132,9 @@ static struct conv_info conv_table[] =
 
 	MAKE(S24, F32, 0, conv_s24_to_f32_c),
 	MAKE(S24P, F32P, 0, conv_s24d_to_f32d_c),
+#if defined (HAVE_SSE2)
+	MAKE(S24, F32P, 0, conv_s24_to_f32d_sse2, SPA_CPU_FLAG_SSE2 | SPA_CPU_FLAG_SLOW_GATHER),
+#endif
 #if defined (HAVE_AVX2)
 	MAKE(S24, F32P, 0, conv_s24_to_f32d_avx2, SPA_CPU_FLAG_AVX2),
 #endif
diff --git a/spa/plugins/support/cpu-x86.c b/spa/plugins/support/cpu-x86.c
index c1c53855d..0fb866671 100644
--- a/spa/plugins/support/cpu-x86.c
+++ b/spa/plugins/support/cpu-x86.c
@@ -78,6 +78,8 @@ x86_init(struct impl *impl)
 		if ((ebx & AVX512_BITS) == AVX512_BITS)
 			flags |= SPA_CPU_FLAG_AVX512;
 	}
+	if (max_level < 0x16)
+		flags |= SPA_CPU_FLAG_SLOW_GATHER;
 
 	/* Check cpuid level of extended features.  */
 	__cpuid (0x80000000, ext_level, ebx, ecx, edx);

From 115525d000753b17aeb4215014ba4611649821e9 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 19 Mar 2026 16:35:59 +0100
Subject: [PATCH 223/263] fmt-ops: make function static

---
 spa/plugins/audioconvert/fmt-ops-sse2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spa/plugins/audioconvert/fmt-ops-sse2.c b/spa/plugins/audioconvert/fmt-ops-sse2.c
index dff64fc8f..dcba6d2e1 100644
--- a/spa/plugins/audioconvert/fmt-ops-sse2.c
+++ b/spa/plugins/audioconvert/fmt-ops-sse2.c
@@ -496,7 +496,7 @@ conv_s24_to_f32d_sse2(struct convert *conv, void * SPA_RESTRICT dst[], const voi
 		conv_s24_to_f32d_1s_sse2(conv, &dst[i], &s[3*i], n_channels, n_samples);
 }
 
-void
+static void
 conv_s32_to_f32d_4s_sse2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
 		uint32_t n_channels, uint32_t n_samples)
 {

From 1dd8729d1320af5cb9f51d098698d74e48ef9cf8 Mon Sep 17 00:00:00 2001
From: Julian Bouzas <julian.bouzas@collabora.com>
Date: Tue, 17 Mar 2026 10:57:54 -0400
Subject: [PATCH 224/263] bluez: Add A2DP auto quality and latency profiles

These 2 new profiles will select the highest quality and lowest latency A2DP
codecs respectively, making it easier for users to know which codec is the best
based on their needs.

The priority for these 2 new profiles is 0, so the default behavior should not
change.
---
 spa/plugins/bluez5/bluez5-device.c | 192 +++++++++++++++++++++++++++--
 1 file changed, 184 insertions(+), 8 deletions(-)

diff --git a/spa/plugins/bluez5/bluez5-device.c b/spa/plugins/bluez5/bluez5-device.c
index fc659f655..15b34a78c 100644
--- a/spa/plugins/bluez5/bluez5-device.c
+++ b/spa/plugins/bluez5/bluez5-device.c
@@ -59,6 +59,8 @@ enum device_profile {
 	DEVICE_PROFILE_OFF = 0,
 	DEVICE_PROFILE_AG,
 	DEVICE_PROFILE_A2DP,
+	DEVICE_PROFILE_A2DP_AUTO_PREFER_QUALITY,
+	DEVICE_PROFILE_A2DP_AUTO_PREFER_LATENCY,
 	DEVICE_PROFILE_HSP_HFP,
 	DEVICE_PROFILE_BAP,
 	DEVICE_PROFILE_BAP_SINK,
@@ -67,6 +69,12 @@ enum device_profile {
 	DEVICE_PROFILE_LAST,
 };
 
+enum codec_order {
+	CODEC_ORDER_NONE = 0,
+	CODEC_ORDER_QUALITY,
+	CODEC_ORDER_LATENCY,
+};
+
 enum {
 	ROUTE_INPUT = 0,
 	ROUTE_OUTPUT,
@@ -204,9 +212,113 @@ static bool profile_is_bap(enum device_profile profile)
 	return false;
 }
 
-static void get_media_codecs(struct impl *this, enum spa_bluetooth_audio_codec id, const struct media_codec **codecs, size_t size)
+static bool profile_is_a2dp(enum device_profile profile)
+{
+	switch (profile) {
+	case DEVICE_PROFILE_A2DP:
+	case DEVICE_PROFILE_A2DP_AUTO_PREFER_QUALITY:
+	case DEVICE_PROFILE_A2DP_AUTO_PREFER_LATENCY:
+		return true;
+	default:
+		break;
+	}
+	return false;
+}
+
+static size_t get_media_codec_quality_priority (const struct media_codec *mc)
+{
+	/* From lowest quality to highest quality */
+	static const enum spa_bluetooth_audio_codec quality_priorities[] = {
+		SPA_BLUETOOTH_AUDIO_CODEC_START,
+		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_DUPLEX,
+		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05,
+		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_51,
+		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_71,
+		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_G,
+		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_PRO,
+		SPA_BLUETOOTH_AUDIO_CODEC_FASTSTREAM_DUPLEX,
+		SPA_BLUETOOTH_AUDIO_CODEC_FASTSTREAM,
+		SPA_BLUETOOTH_AUDIO_CODEC_MPEG,
+		SPA_BLUETOOTH_AUDIO_CODEC_APTX_LL_DUPLEX,
+		SPA_BLUETOOTH_AUDIO_CODEC_APTX_LL,
+		SPA_BLUETOOTH_AUDIO_CODEC_SBC,
+		SPA_BLUETOOTH_AUDIO_CODEC_APTX,
+		SPA_BLUETOOTH_AUDIO_CODEC_SBC_XQ,
+		SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD,
+		SPA_BLUETOOTH_AUDIO_CODEC_AAC,
+		SPA_BLUETOOTH_AUDIO_CODEC_LC3PLUS_HR,
+		SPA_BLUETOOTH_AUDIO_CODEC_APTX_HD,
+		SPA_BLUETOOTH_AUDIO_CODEC_LDAC
+	};
+	size_t i;
+
+	for (i = 0; SPA_N_ELEMENTS(quality_priorities); ++i) {
+		if (quality_priorities[i] == mc->id)
+			return i;
+	}
+
+	return 0;
+}
+
+static size_t get_media_codec_latency_priority (const struct media_codec *mc)
+{
+	/* From highest latency to lowest latency */
+	static const enum spa_bluetooth_audio_codec latency_priorities[] = {
+		SPA_BLUETOOTH_AUDIO_CODEC_START,
+		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_71,
+		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_51,
+		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_PRO,
+		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_G,
+		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05,
+		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_DUPLEX,
+		SPA_BLUETOOTH_AUDIO_CODEC_MPEG,
+		SPA_BLUETOOTH_AUDIO_CODEC_AAC,
+		SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD,
+		SPA_BLUETOOTH_AUDIO_CODEC_APTX_HD,
+		SPA_BLUETOOTH_AUDIO_CODEC_LDAC,
+		SPA_BLUETOOTH_AUDIO_CODEC_LC3PLUS_HR,
+		SPA_BLUETOOTH_AUDIO_CODEC_SBC,
+		SPA_BLUETOOTH_AUDIO_CODEC_APTX,
+		SPA_BLUETOOTH_AUDIO_CODEC_SBC_XQ,
+		SPA_BLUETOOTH_AUDIO_CODEC_FASTSTREAM_DUPLEX,
+		SPA_BLUETOOTH_AUDIO_CODEC_FASTSTREAM,
+		SPA_BLUETOOTH_AUDIO_CODEC_APTX_LL_DUPLEX,
+		SPA_BLUETOOTH_AUDIO_CODEC_APTX_LL,
+	};
+	size_t i;
+
+	for (i = 0; SPA_N_ELEMENTS(latency_priorities); ++i) {
+		if (latency_priorities[i] == mc->id)
+			return i;
+	}
+
+	return 0;
+}
+
+static int media_codec_quality_cmp(const void *a, const void *b) {
+	const struct media_codec *ca = *(const struct media_codec **)a;
+	const struct media_codec *cb = *(const struct media_codec **)b;
+	size_t ca_prio = get_media_codec_quality_priority (ca);
+	size_t cb_prio = get_media_codec_quality_priority (cb);
+	if (ca_prio > cb_prio) return -1;
+	if (ca_prio < cb_prio) return 1;
+	return 0;
+}
+
+static int media_codec_latency_cmp(const void *a, const void *b) {
+	const struct media_codec *ca = *(const struct media_codec **)a;
+	const struct media_codec *cb = *(const struct media_codec **)b;
+	size_t ca_prio = get_media_codec_latency_priority (ca);
+	size_t cb_prio = get_media_codec_latency_priority (cb);
+	if (ca_prio > cb_prio) return -1;
+	if (ca_prio < cb_prio) return 1;
+	return 0;
+}
+
+static void get_media_codecs(struct impl *this, enum codec_order order, enum spa_bluetooth_audio_codec id, const struct media_codec **codecs, size_t size)
 {
 	const struct media_codec * const *c;
+	size_t n = 0;
 
 	spa_assert(size > 0);
 	spa_assert(this->supported_codecs);
@@ -216,12 +328,24 @@ static void get_media_codecs(struct impl *this, enum spa_bluetooth_audio_codec i
 			continue;
 
 		if ((*c)->id == id || id == 0) {
-			*codecs++ = *c;
+			codecs[n++] = *c;
 			--size;
 		}
 	}
 
-	*codecs = NULL;
+	codecs[n] = NULL;
+
+	switch (order) {
+	case CODEC_ORDER_QUALITY:
+		qsort(codecs, n, sizeof(struct media_codec *), media_codec_quality_cmp);
+		break;
+	case CODEC_ORDER_LATENCY:
+		qsort(codecs, n, sizeof(struct media_codec *), media_codec_latency_cmp);
+		break;
+	case CODEC_ORDER_NONE:
+	default:
+		break;
+	}
 }
 
 static const struct media_codec *get_supported_media_codec(struct impl *this, enum spa_bluetooth_audio_codec id,
@@ -380,6 +504,8 @@ static bool node_update_volume_from_transport(struct node *node, bool reset)
 
 	/* PW is the controller for remote device. */
 	if (impl->profile != DEVICE_PROFILE_A2DP
+	    && impl->profile != DEVICE_PROFILE_A2DP_AUTO_PREFER_QUALITY
+	    && impl->profile != DEVICE_PROFILE_A2DP_AUTO_PREFER_LATENCY
 	    && impl->profile != DEVICE_PROFILE_BAP
 	    && impl->profile != DEVICE_PROFILE_BAP_SINK
 	    && impl->profile != DEVICE_PROFILE_BAP_SOURCE
@@ -1262,6 +1388,8 @@ static int emit_nodes(struct impl *this)
 		}
 		break;
 	case DEVICE_PROFILE_A2DP:
+	case DEVICE_PROFILE_A2DP_AUTO_PREFER_QUALITY:
+	case DEVICE_PROFILE_A2DP_AUTO_PREFER_LATENCY:
 		if (this->bt_dev->connected_profiles & SPA_BT_PROFILE_A2DP_SOURCE) {
 			t = find_transport(this, SPA_BT_PROFILE_A2DP_SOURCE);
 			if (t) {
@@ -1464,13 +1592,13 @@ static int set_profile(struct impl *this, uint32_t profile, enum spa_bluetooth_a
 	 * XXX: source-only case, as it will only switch the sink, and we only
 	 * XXX: list the sink codecs here. TODO: fix this
 	 */
-	if ((profile == DEVICE_PROFILE_A2DP || (profile_is_bap(profile) && is_bap_client(this)))
+	if ((profile_is_a2dp (profile) || (profile_is_bap(profile) && is_bap_client(this)))
 			&& !(this->bt_dev->connected_profiles & SPA_BT_PROFILE_A2DP_SOURCE)) {
 		int ret;
 		const struct media_codec *codecs[64];
 		uint32_t profiles;
 
-		get_media_codecs(this, codec, codecs, SPA_N_ELEMENTS(codecs));
+		get_media_codecs(this, CODEC_ORDER_NONE, codec, codecs, SPA_N_ELEMENTS(codecs));
 
 		this->switching_codec = true;
 
@@ -1487,6 +1615,14 @@ static int set_profile(struct impl *this, uint32_t profile, enum spa_bluetooth_a
 		case DEVICE_PROFILE_A2DP:
 			profiles = this->bt_dev->connected_profiles & SPA_BT_PROFILE_A2DP_DUPLEX;
 			break;
+		case DEVICE_PROFILE_A2DP_AUTO_PREFER_QUALITY:
+			get_media_codecs(this, CODEC_ORDER_QUALITY, 0, codecs, SPA_N_ELEMENTS(codecs));
+			profiles = this->bt_dev->connected_profiles & SPA_BT_PROFILE_A2DP_DUPLEX;
+			break;
+		case DEVICE_PROFILE_A2DP_AUTO_PREFER_LATENCY:
+			get_media_codecs(this, CODEC_ORDER_LATENCY, 0, codecs, SPA_N_ELEMENTS(codecs));
+			profiles = this->bt_dev->connected_profiles & SPA_BT_PROFILE_A2DP_DUPLEX;
+			break;
 		default:
 			profiles = 0;
 			break;
@@ -1646,6 +1782,8 @@ static void profiles_changed(void *userdata, uint32_t connected_change)
 			      nodes_changed);
 		break;
 	case DEVICE_PROFILE_A2DP:
+	case DEVICE_PROFILE_A2DP_AUTO_PREFER_QUALITY:
+	case DEVICE_PROFILE_A2DP_AUTO_PREFER_LATENCY:
 		nodes_changed = (connected_change & SPA_BT_PROFILE_A2DP_DUPLEX);
 		spa_log_debug(this->log, "profiles changed: A2DP nodes changed: %d",
 			      nodes_changed);
@@ -1801,6 +1939,8 @@ static uint32_t profile_direction_mask(struct impl *this, uint32_t index, enum s
 
 	switch (index) {
 	case DEVICE_PROFILE_A2DP:
+	case DEVICE_PROFILE_A2DP_AUTO_PREFER_QUALITY:
+	case DEVICE_PROFILE_A2DP_AUTO_PREFER_LATENCY:
 		if (device->connected_profiles & SPA_BT_PROFILE_A2DP_SINK)
 			have_output = true;
 
@@ -1850,6 +1990,8 @@ static uint32_t get_profile_from_index(struct impl *this, uint32_t index, uint32
 	switch (profile) {
 	case DEVICE_PROFILE_OFF:
 	case DEVICE_PROFILE_AG:
+	case DEVICE_PROFILE_A2DP_AUTO_PREFER_QUALITY:
+	case DEVICE_PROFILE_A2DP_AUTO_PREFER_LATENCY:
 		*codec = 0;
 		*next = (profile + 1) << 16;
 		return profile;
@@ -1884,6 +2026,8 @@ static uint32_t get_index_from_profile(struct impl *this, uint32_t profile, enum
 	switch (profile) {
 	case DEVICE_PROFILE_OFF:
 	case DEVICE_PROFILE_AG:
+	case DEVICE_PROFILE_A2DP_AUTO_PREFER_QUALITY:
+	case DEVICE_PROFILE_A2DP_AUTO_PREFER_LATENCY:
 		return (profile << 16);
 
 	case DEVICE_PROFILE_ASHA:
@@ -2123,6 +2267,36 @@ static struct spa_pod *build_profile(struct impl *this, struct spa_pod_builder *
 			n_source++;
 		break;
 	}
+	case DEVICE_PROFILE_A2DP_AUTO_PREFER_QUALITY:
+	case DEVICE_PROFILE_A2DP_AUTO_PREFER_LATENCY:
+	{
+		uint32_t profile;
+
+		/* make this device profile visible only if there is an A2DP sink */
+		profile = device->connected_profiles & (SPA_BT_PROFILE_A2DP_SINK | SPA_BT_PROFILE_A2DP_SOURCE);
+		if (!(profile & SPA_BT_PROFILE_A2DP_SINK))
+			return NULL;
+
+		switch (profile_index) {
+		case DEVICE_PROFILE_A2DP_AUTO_PREFER_QUALITY:
+			name = "a2dp-auto-prefer-quality";
+			desc = _("Auto: Prefer Quality (A2DP)");
+			break;
+		case DEVICE_PROFILE_A2DP_AUTO_PREFER_LATENCY:
+			name = "a2dp-auto-prefer-latency";
+			desc = _("Auto: Prefer Latency (A2DP)");
+			break;
+		default:
+			return NULL;
+		}
+
+		priority = 0;
+
+		n_sink++;
+		if (this->autoswitch_routes && (device->connected_profiles & SPA_BT_PROFILE_HEADSET_HEAD_UNIT))
+			n_source++;
+		break;
+	}
 	case DEVICE_PROFILE_BAP_SINK:
 	case DEVICE_PROFILE_BAP_SOURCE:
 		/* These are client-only */
@@ -2324,6 +2498,8 @@ static bool profile_has_route(uint32_t profile, uint32_t route)
 	case DEVICE_PROFILE_AG:
 		break;
 	case DEVICE_PROFILE_A2DP:
+	case DEVICE_PROFILE_A2DP_AUTO_PREFER_QUALITY:
+	case DEVICE_PROFILE_A2DP_AUTO_PREFER_LATENCY:
 		switch (route) {
 		case ROUTE_INPUT:
 		case ROUTE_OUTPUT:
@@ -2623,7 +2799,7 @@ static struct spa_pod *build_route(struct impl *this, struct spa_pod_builder *b,
 		spa_pod_builder_array(b, sizeof(uint32_t), SPA_TYPE_Id,
 				node->n_channels, node->channels);
 
-		if ((this->profile == DEVICE_PROFILE_A2DP || profile_is_bap(this->profile)) &&
+		if ((profile_is_a2dp (this->profile) || profile_is_bap(this->profile)) &&
 				(dev & SINK_ID_FLAG)) {
 			spa_pod_builder_prop(b, SPA_PROP_latencyOffsetNsec, 0);
 			spa_pod_builder_long(b, node->latency_offset);
@@ -2659,7 +2835,7 @@ next:
 
 	c = this->supported_codecs[*j];
 
-	if (!(this->profile == DEVICE_PROFILE_A2DP && c->kind == MEDIA_CODEC_A2DP) &&
+	if (!(profile_is_a2dp (this->profile) && c->kind == MEDIA_CODEC_A2DP) &&
 			!(profile_is_bap(this->profile) && c->kind == MEDIA_CODEC_BAP) &&
 			!(this->profile == DEVICE_PROFILE_HSP_HFP && c->kind == MEDIA_CODEC_HFP) &&
 			!(this->profile == DEVICE_PROFILE_ASHA && c->kind == MEDIA_CODEC_ASHA))
@@ -3240,7 +3416,7 @@ static int impl_set_param(void *object,
 			return 0;
 		}
 
-		if (this->profile == DEVICE_PROFILE_A2DP || profile_is_bap(this->profile) ||
+		if (profile_is_a2dp (this->profile) || profile_is_bap(this->profile) ||
 				this->profile == DEVICE_PROFILE_ASHA || this->profile == DEVICE_PROFILE_HSP_HFP) {
 			size_t j;
 			for (j = 0; j < this->supported_codec_count; ++j) {

From 3dff64364f5f1fec50a8b90ced093a6fe680c343 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Wed, 18 Mar 2026 19:14:04 +0200
Subject: [PATCH 225/263] bluez5: media-source: don't crash if BAP streams
 doesn't have iso_io

Don't crash in update_target_latency() if a BAP stream doesn't have
iso_io for some reason.
---
 spa/plugins/bluez5/media-source.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spa/plugins/bluez5/media-source.c b/spa/plugins/bluez5/media-source.c
index da2e57b5a..e1c01d90c 100644
--- a/spa/plugins/bluez5/media-source.c
+++ b/spa/plugins/bluez5/media-source.c
@@ -1784,7 +1784,7 @@ static uint32_t get_samples(struct impl *this, int64_t *duration_ns)
 static void update_target_latency(struct impl *this)
 {
 	struct port *port = &this->port;
-	int32_t target;
+	int32_t target = 0;
 	int samples;
 
 	if (this->transport == NULL || !port->have_format)
@@ -1803,7 +1803,7 @@ static void update_target_latency(struct impl *this)
 	 */
 	if (this->decode_buffer_target)
 		target = this->decode_buffer_target;
-	else
+	else if (this->transport->iso_io)
 		target = spa_bt_iso_io_get_source_target_latency(this->transport->iso_io);
 
 	spa_bt_decode_buffer_set_target_latency(&port->buffer, target);

From c02cdcb5ce9811ee1ee1471db71ebbb923fa7e10 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 20 Mar 2026 17:53:00 +0100
Subject: [PATCH 226/263] audioconvert: add avx2 optimized s32_to f32d

Add an alternative avx2 s32_to_f32d implementation that doesn't use the
gather function for when gather is slow.

Don't overwrite the orinal cpu_flags but store the selected flags in a
new variable. Use this to debug the selected function cpu flags.

Build libraries with defines from previous libraries so that we can
reuse functions from them.

We can then remove the SSE2 | SLOW_GATHER function selection from the
list. We will now select avx2 and it will then switch implementations
based on the CPU flags.
---
 spa/plugins/audioconvert/audioconvert.c    |   8 +-
 spa/plugins/audioconvert/channelmix-ops.c  |   2 +-
 spa/plugins/audioconvert/channelmix-ops.h  |   1 +
 spa/plugins/audioconvert/fmt-ops-avx2.c    | 217 +++++++++++++++++++--
 spa/plugins/audioconvert/fmt-ops.c         |   8 +-
 spa/plugins/audioconvert/fmt-ops.h         |   1 +
 spa/plugins/audioconvert/meson.build       |  10 +-
 spa/plugins/audioconvert/peaks-ops.c       |   2 +-
 spa/plugins/audioconvert/peaks-ops.h       |   1 +
 spa/plugins/audioconvert/resample-native.c |   2 +-
 spa/plugins/audioconvert/resample.h        |   1 +
 spa/plugins/audioconvert/volume-ops.c      |   2 +-
 spa/plugins/audioconvert/volume-ops.h      |   1 +
 13 files changed, 218 insertions(+), 38 deletions(-)

diff --git a/spa/plugins/audioconvert/audioconvert.c b/spa/plugins/audioconvert/audioconvert.c
index 6b4243b2a..dce1367f1 100644
--- a/spa/plugins/audioconvert/audioconvert.c
+++ b/spa/plugins/audioconvert/audioconvert.c
@@ -2125,7 +2125,7 @@ static int setup_in_convert(struct impl *this)
 		return res;
 
 	spa_log_debug(this->log, "%p: got converter features %08x:%08x passthrough:%d remap:%d %s", this,
-			this->cpu_flags, in->conv.cpu_flags, in->conv.is_passthrough,
+			this->cpu_flags, in->conv.func_cpu_flags, in->conv.is_passthrough,
 			remap, in->conv.func_name);
 
 	return 0;
@@ -2282,7 +2282,7 @@ static int setup_channelmix(struct impl *this, uint32_t channels, uint32_t *posi
 	set_volume(this);
 
 	spa_log_debug(this->log, "%p: got channelmix features %08x:%08x flags:%08x %s",
-			this, this->cpu_flags, this->mix.cpu_flags,
+			this, this->cpu_flags, this->mix.func_cpu_flags,
 			this->mix.flags, this->mix.func_name);
 	return 0;
 }
@@ -2330,7 +2330,7 @@ static int setup_resample(struct impl *this)
 		res = resample_native_init(&this->resample);
 
 	spa_log_debug(this->log, "%p: got resample features %08x:%08x %s",
-			this, this->cpu_flags, this->resample.cpu_flags,
+			this, this->cpu_flags, this->resample.func_cpu_flags,
 			this->resample.func_name);
 	return res;
 }
@@ -2422,7 +2422,7 @@ static int setup_out_convert(struct impl *this)
 
 	spa_log_debug(this->log, "%p: got converter features %08x:%08x quant:%d:%d"
 			" passthrough:%d remap:%d %s", this,
-			this->cpu_flags, out->conv.cpu_flags, out->conv.method,
+			this->cpu_flags, out->conv.func_cpu_flags, out->conv.method,
 			out->conv.noise_bits, out->conv.is_passthrough, remap, out->conv.func_name);
 
 	return 0;
diff --git a/spa/plugins/audioconvert/channelmix-ops.c b/spa/plugins/audioconvert/channelmix-ops.c
index 7bf046cf0..c8c01eb81 100644
--- a/spa/plugins/audioconvert/channelmix-ops.c
+++ b/spa/plugins/audioconvert/channelmix-ops.c
@@ -885,8 +885,8 @@ int channelmix_init(struct channelmix *mix)
 	mix->free = impl_channelmix_free;
 	mix->process = info->process;
 	mix->set_volume = impl_channelmix_set_volume;
-	mix->cpu_flags = info->cpu_flags;
 	mix->delay = (uint32_t)(mix->rear_delay * mix->freq / 1000.0f);
+	mix->func_cpu_flags = info->cpu_flags;
 	mix->func_name = info->name;
 
 	spa_zero(mix->taps_mem);
diff --git a/spa/plugins/audioconvert/channelmix-ops.h b/spa/plugins/audioconvert/channelmix-ops.h
index 6ea2b9451..155079cd2 100644
--- a/spa/plugins/audioconvert/channelmix-ops.h
+++ b/spa/plugins/audioconvert/channelmix-ops.h
@@ -44,6 +44,7 @@ struct channelmix {
 	uint32_t upmix;
 
 	struct spa_log *log;
+	uint32_t func_cpu_flags;
 	const char *func_name;
 
 #define CHANNELMIX_FLAG_ZERO		(1<<0)		/**< all zero components */
diff --git a/spa/plugins/audioconvert/fmt-ops-avx2.c b/spa/plugins/audioconvert/fmt-ops-avx2.c
index af0af91f2..9c3dce52d 100644
--- a/spa/plugins/audioconvert/fmt-ops-avx2.c
+++ b/spa/plugins/audioconvert/fmt-ops-avx2.c
@@ -4,6 +4,8 @@
 
 #include "fmt-ops.h"
 
+#include <spa/support/cpu.h>
+
 #include <immintrin.h>
 // GCC: workaround for missing AVX intrinsic: "_mm256_setr_m128()"
 //      (see https://stackoverflow.com/questions/32630458/setting-m256i-to-the-value-of-two-m128i-values)
@@ -285,7 +287,7 @@ conv_s16s_to_f32d_2_avx2(struct convert *conv, void * SPA_RESTRICT dst[], const
 }
 
 static void
-conv_s24_to_f32d_1s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
+conv_s24_to_f32d_1s_gather_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
 		uint32_t n_channels, uint32_t n_samples)
 {
 	const int8_t *s = src;
@@ -321,7 +323,7 @@ conv_s24_to_f32d_1s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA
 }
 
 static void
-conv_s24_to_f32d_2s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
+conv_s24_to_f32d_2s_gather_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
 		uint32_t n_channels, uint32_t n_samples)
 {
 	const int8_t *s = src;
@@ -373,7 +375,7 @@ conv_s24_to_f32d_2s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA
 	}
 }
 static void
-conv_s24_to_f32d_4s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
+conv_s24_to_f32d_4s_gather_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
 		uint32_t n_channels, uint32_t n_samples)
 {
 	const int8_t *s = src;
@@ -447,16 +449,22 @@ conv_s24_to_f32d_avx2(struct convert *conv, void * SPA_RESTRICT dst[], const voi
 	const int8_t *s = src[0];
 	uint32_t i = 0, n_channels = conv->n_channels;
 
-	for(; i + 3 < n_channels; i += 4)
-		conv_s24_to_f32d_4s_avx2(conv, &dst[i], &s[3*i], n_channels, n_samples);
-	for(; i + 1 < n_channels; i += 2)
-		conv_s24_to_f32d_2s_avx2(conv, &dst[i], &s[3*i], n_channels, n_samples);
-	for(; i < n_channels; i++)
-		conv_s24_to_f32d_1s_avx2(conv, &dst[i], &s[3*i], n_channels, n_samples);
+	if (conv->cpu_flags & SPA_CPU_FLAG_SLOW_GATHER) {
+#if defined (HAVE_SSE2)
+		conv_s24_to_f32d_sse2(conv, dst, src, n_samples);
+#endif
+	} else {
+		for(; i + 3 < n_channels; i += 4)
+			conv_s24_to_f32d_4s_gather_avx2(conv, &dst[i], &s[3*i], n_channels, n_samples);
+		for(; i + 1 < n_channels; i += 2)
+			conv_s24_to_f32d_2s_gather_avx2(conv, &dst[i], &s[3*i], n_channels, n_samples);
+		for(; i < n_channels; i++)
+			conv_s24_to_f32d_1s_gather_avx2(conv, &dst[i], &s[3*i], n_channels, n_samples);
+	}
 }
 
 static void
-conv_s32_to_f32d_4s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
+conv_s32_to_f32d_4s_gather_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
 		uint32_t n_channels, uint32_t n_samples)
 {
 	const int32_t *s = src;
@@ -510,7 +518,7 @@ conv_s32_to_f32d_4s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA
 }
 
 static void
-conv_s32_to_f32d_2s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
+conv_s32_to_f32d_2s_gather_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
 		uint32_t n_channels, uint32_t n_samples)
 {
 	const int32_t *s = src;
@@ -555,7 +563,7 @@ conv_s32_to_f32d_2s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA
 }
 
 static void
-conv_s32_to_f32d_1s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
+conv_s32_to_f32d_1s_gather_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
 		uint32_t n_channels, uint32_t n_samples)
 {
 	const int32_t *s = src;
@@ -595,6 +603,169 @@ conv_s32_to_f32d_1s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA
 	}
 }
 
+
+static void
+conv_s32_to_f32d_2s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
+		uint32_t n_channels, uint32_t n_samples)
+{
+	const int32_t *s = src;
+	float *d0 = dst[0], *d1 = dst[1];
+	uint32_t n, unrolled;
+	__m256i in[4];
+	__m256 out[4], t[4], factor = _mm256_set1_ps(1.0f / S32_SCALE_I2F);
+
+	if (SPA_IS_ALIGNED(d0, 32) &&
+	    SPA_IS_ALIGNED(d1, 32))
+		unrolled = n_samples & ~7;
+	else
+		unrolled = 0;
+
+	for(n = 0; n < unrolled; n += 8) {
+		in[0] = _mm256_setr_epi64x(
+				*((uint64_t*)&s[0*n_channels]),
+				*((uint64_t*)&s[1*n_channels]),
+				*((uint64_t*)&s[4*n_channels]),
+				*((uint64_t*)&s[5*n_channels]));
+		in[1] = _mm256_setr_epi64x(
+				*((uint64_t*)&s[2*n_channels]),
+				*((uint64_t*)&s[3*n_channels]),
+				*((uint64_t*)&s[6*n_channels]),
+				*((uint64_t*)&s[7*n_channels]));
+
+		out[0] = _mm256_cvtepi32_ps(in[0]);
+		out[1] = _mm256_cvtepi32_ps(in[1]);
+
+		out[0] = _mm256_mul_ps(out[0], factor); /* a0 b0 a1 b1 a4 b4 a5 b5 */
+		out[1] = _mm256_mul_ps(out[1], factor); /* a2 b2 a3 b3 a6 b6 a7 b7 */
+
+		t[0] = _mm256_unpacklo_ps(out[0], out[1]); /* a0 a2 b0 b2 a4 a6 b4 b6 */
+		t[1] = _mm256_unpackhi_ps(out[0], out[1]); /* a1 a3 b1 b3 a5 a7 b5 b7 */
+
+		out[0] = _mm256_unpacklo_ps(t[0], t[1]); /* a0 a1 a2 a3 a4 a5 a6 a7 */
+		out[1] = _mm256_unpackhi_ps(t[0], t[1]); /* b0 b1 b2 b3 b4 b5 b6 b7 */
+
+		_mm256_store_ps(&d0[n], out[0]);
+		_mm256_store_ps(&d1[n], out[1]);
+
+		s += 8*n_channels;
+	}
+	for(; n < n_samples; n++) {
+		__m128 out[2], factor = _mm_set1_ps(1.0f / S32_SCALE_I2F);
+		out[0] = _mm_cvtsi32_ss(factor, s[0]);
+		out[1] = _mm_cvtsi32_ss(factor, s[1]);
+		out[0] = _mm_mul_ss(out[0], factor);
+		out[1] = _mm_mul_ss(out[1], factor);
+		_mm_store_ss(&d0[n], out[0]);
+		_mm_store_ss(&d1[n], out[1]);
+		s += n_channels;
+	}
+}
+
+static void
+conv_s32_to_f32d_1s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
+		uint32_t n_channels, uint32_t n_samples)
+{
+	const int32_t *s = src;
+	float *d0 = dst[0];
+	uint32_t n, unrolled;
+	__m256i in[2];
+	__m256 out[2], factor = _mm256_set1_ps(1.0f / S32_SCALE_I2F);
+
+	if (SPA_IS_ALIGNED(d0, 32))
+		unrolled = n_samples & ~7;
+	else
+		unrolled = 0;
+
+	for(n = 0; n < unrolled; n += 8) {
+		in[0] = _mm256_setr_epi32(
+				s[0*n_channels], s[1*n_channels],
+				s[2*n_channels], s[3*n_channels],
+				s[4*n_channels], s[5*n_channels],
+				s[6*n_channels], s[7*n_channels]);
+		out[0] = _mm256_cvtepi32_ps(in[0]);
+		out[0] = _mm256_mul_ps(out[0], factor);
+		_mm256_store_ps(&d0[n+0], out[0]);
+		s += 8*n_channels;
+	}
+	for(; n < n_samples; n++) {
+		__m128 out, factor = _mm_set1_ps(1.0f / S32_SCALE_I2F);
+		out = _mm_cvtsi32_ss(factor, s[0]);
+		out = _mm_mul_ss(out, factor);
+		_mm_store_ss(&d0[n], out);
+		s += n_channels;
+	}
+}
+
+static void
+conv_s32_to_f32d_4s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
+		uint32_t n_channels, uint32_t n_samples)
+{
+	const int32_t *s = src;
+	float *d0 = dst[0], *d1 = dst[1], *d2 = dst[2], *d3 = dst[3];
+	uint32_t n, unrolled;
+	__m256i in[4];
+	__m256 out[4], t[4], factor = _mm256_set1_ps(1.0f / S32_SCALE_I2F);
+
+	if (SPA_IS_ALIGNED(d0, 32) &&
+	    SPA_IS_ALIGNED(d1, 32) &&
+	    SPA_IS_ALIGNED(d2, 32) &&
+	    SPA_IS_ALIGNED(d3, 32))
+		unrolled = n_samples & ~7;
+	else
+		unrolled = 0;
+
+	for(n = 0; n < unrolled; n += 8) {
+		in[0] = _mm256_setr_m128i(
+				_mm_loadu_si128((__m128i*)&s[0*n_channels]),
+				_mm_loadu_si128((__m128i*)&s[4*n_channels]));
+		in[1] = _mm256_setr_m128i(
+				_mm_loadu_si128((__m128i*)&s[1*n_channels]),
+				_mm_loadu_si128((__m128i*)&s[5*n_channels]));
+		in[2] = _mm256_setr_m128i(
+				_mm_loadu_si128((__m128i*)&s[2*n_channels]),
+				_mm_loadu_si128((__m128i*)&s[6*n_channels]));
+		in[3] = _mm256_setr_m128i(
+				_mm_loadu_si128((__m128i*)&s[3*n_channels]),
+				_mm_loadu_si128((__m128i*)&s[7*n_channels]));
+
+		out[0] = _mm256_cvtepi32_ps(in[0]);	/* a0 b0 c0 d0 a4 b4 c4 d4 */
+		out[1] = _mm256_cvtepi32_ps(in[1]);	/* a1 b1 c1 d1 a5 b5 c5 d5 */
+		out[2] = _mm256_cvtepi32_ps(in[2]);	/* a2 b2 c2 d2 a6 b6 c6 d6 */
+		out[3] = _mm256_cvtepi32_ps(in[3]);	/* a3 b3 c3 d3 a7 b7 c7 d7 */
+
+		out[0] = _mm256_mul_ps(out[0], factor);
+		out[1] = _mm256_mul_ps(out[1], factor);
+		out[2] = _mm256_mul_ps(out[2], factor);
+		out[3] = _mm256_mul_ps(out[3], factor);
+
+		t[0] = _mm256_unpacklo_ps(out[0], out[2]); /* a0 a2 b0 b2 a4 a6 b4 b6 */
+		t[1] = _mm256_unpackhi_ps(out[0], out[2]); /* c0 c2 d0 d2 c4 c6 d4 d6 */
+		t[2] = _mm256_unpacklo_ps(out[1], out[3]); /* a1 a3 b1 b3 a5 a7 b5 b7 */
+		t[3] = _mm256_unpackhi_ps(out[1], out[3]); /* c1 c3 d1 d3 c5 c7 d5 d7 */
+
+		out[0] = _mm256_unpacklo_ps(t[0], t[2]); /* a0 a1 a2 a3 a4 a5 a6 a7 */
+		out[1] = _mm256_unpackhi_ps(t[0], t[2]); /* b0 b1 b2 b3 b4 b5 b6 b7 */
+		out[2] = _mm256_unpacklo_ps(t[1], t[3]); /* c0 c1 c2 c3 c4 c5 c6 c7 */
+		out[3] = _mm256_unpackhi_ps(t[1], t[3]); /* d0 d1 d2 d3 d4 d5 d6 d7 */
+
+		_mm256_store_ps(&d0[n], out[0]);
+		_mm256_store_ps(&d1[n], out[1]);
+		_mm256_store_ps(&d2[n], out[2]);
+		_mm256_store_ps(&d3[n], out[3]);
+
+		s += 8*n_channels;
+	}
+	for(; n < n_samples; n++) {
+		__m128 out[4], factor = _mm_set1_ps(1.0f / S32_SCALE_I2F);
+		__m128i in[1];
+		in[0] = _mm_setr_epi32(s[0], s[1], s[2], s[3]);
+		out[0] = _mm_cvtepi32_ps(in[0]);
+		out[0] = _mm_mul_ps(out[0], factor);
+		_MM_STOREM_PS(&d0[n], &d1[n], &d2[n], &d3[n], out[0]);
+		s += n_channels;
+	}
+}
+
 void
 conv_s32_to_f32d_avx2(struct convert *conv, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src[],
 		uint32_t n_samples)
@@ -602,12 +773,21 @@ conv_s32_to_f32d_avx2(struct convert *conv, void * SPA_RESTRICT dst[], const voi
 	const int32_t *s = src[0];
 	uint32_t i = 0, n_channels = conv->n_channels;
 
-	for(; i + 3 < n_channels; i += 4)
-		conv_s32_to_f32d_4s_avx2(conv, &dst[i], &s[i], n_channels, n_samples);
-	for(; i + 1 < n_channels; i += 2)
-		conv_s32_to_f32d_2s_avx2(conv, &dst[i], &s[i], n_channels, n_samples);
-	for(; i < n_channels; i++)
-		conv_s32_to_f32d_1s_avx2(conv, &dst[i], &s[i], n_channels, n_samples);
+	if (conv->cpu_flags & SPA_CPU_FLAG_SLOW_GATHER) {
+		for(; i + 3 < n_channels; i += 4)
+			conv_s32_to_f32d_4s_avx2(conv, &dst[i], &s[i], n_channels, n_samples);
+		for(; i + 1 < n_channels; i += 2)
+			conv_s32_to_f32d_2s_avx2(conv, &dst[i], &s[i], n_channels, n_samples);
+		for(; i < n_channels; i++)
+			conv_s32_to_f32d_1s_avx2(conv, &dst[i], &s[i], n_channels, n_samples);
+	} else {
+		for(; i + 3 < n_channels; i += 4)
+			conv_s32_to_f32d_4s_gather_avx2(conv, &dst[i], &s[i], n_channels, n_samples);
+		for(; i + 1 < n_channels; i += 2)
+			conv_s32_to_f32d_2s_gather_avx2(conv, &dst[i], &s[i], n_channels, n_samples);
+		for(; i < n_channels; i++)
+			conv_s32_to_f32d_1s_gather_avx2(conv, &dst[i], &s[i], n_channels, n_samples);
+	}
 }
 
 static void
@@ -1187,3 +1367,4 @@ conv_f32d_to_s16s_2_avx2(struct convert *conv, void * SPA_RESTRICT dst[], const
 		d += 2;
 	}
 }
+
diff --git a/spa/plugins/audioconvert/fmt-ops.c b/spa/plugins/audioconvert/fmt-ops.c
index 057f3294a..34de40445 100644
--- a/spa/plugins/audioconvert/fmt-ops.c
+++ b/spa/plugins/audioconvert/fmt-ops.c
@@ -108,9 +108,6 @@ static struct conv_info conv_table[] =
 	MAKE(U32, F32, 0, conv_u32_to_f32_c),
 	MAKE(U32, F32P, 0, conv_u32_to_f32d_c),
 
-#if defined (HAVE_SSE2)
-	MAKE(S32, F32P, 0, conv_s32_to_f32d_sse2, SPA_CPU_FLAG_SSE2 | SPA_CPU_FLAG_SLOW_GATHER),
-#endif
 #if defined (HAVE_AVX2)
 	MAKE(S32, F32P, 0, conv_s32_to_f32d_avx2, SPA_CPU_FLAG_AVX2),
 #endif
@@ -132,9 +129,6 @@ static struct conv_info conv_table[] =
 
 	MAKE(S24, F32, 0, conv_s24_to_f32_c),
 	MAKE(S24P, F32P, 0, conv_s24d_to_f32d_c),
-#if defined (HAVE_SSE2)
-	MAKE(S24, F32P, 0, conv_s24_to_f32d_sse2, SPA_CPU_FLAG_SSE2 | SPA_CPU_FLAG_SLOW_GATHER),
-#endif
 #if defined (HAVE_AVX2)
 	MAKE(S24, F32P, 0, conv_s24_to_f32d_avx2, SPA_CPU_FLAG_AVX2),
 #endif
@@ -637,7 +631,7 @@ int convert_init(struct convert *conv)
 		conv->random[i] = random();
 
 	conv->is_passthrough = conv->src_fmt == conv->dst_fmt;
-	conv->cpu_flags = info->cpu_flags;
+	conv->func_cpu_flags = info->cpu_flags;
 	conv->update_noise = ninfo->noise;
 	conv->process = info->process;
 	conv->clear = cinfo ? cinfo->clear : NULL;
diff --git a/spa/plugins/audioconvert/fmt-ops.h b/spa/plugins/audioconvert/fmt-ops.h
index f738e3858..24b4b1aaf 100644
--- a/spa/plugins/audioconvert/fmt-ops.h
+++ b/spa/plugins/audioconvert/fmt-ops.h
@@ -219,6 +219,7 @@ struct convert {
 	uint32_t n_channels;
 	uint32_t rate;
 	uint32_t cpu_flags;
+	uint32_t func_cpu_flags;
 	const char *func_name;
 
 	unsigned int is_passthrough:1;
diff --git a/spa/plugins/audioconvert/meson.build b/spa/plugins/audioconvert/meson.build
index bd60872b6..559db4308 100644
--- a/spa/plugins/audioconvert/meson.build
+++ b/spa/plugins/audioconvert/meson.build
@@ -44,7 +44,7 @@ endif
 if have_sse2
   audioconvert_sse2 = static_library('audioconvert_sse2',
     ['fmt-ops-sse2.c' ],
-    c_args : [sse2_args, '-O3', '-DHAVE_SSE2'],
+    c_args : [sse2_args, '-O3', '-DHAVE_SSE2', simd_cargs],
     dependencies : [ spa_dep ],
     install : false
     )
@@ -55,7 +55,7 @@ if have_ssse3
   audioconvert_ssse3 = static_library('audioconvert_ssse3',
     ['fmt-ops-ssse3.c',
       'resample-native-ssse3.c' ],
-    c_args : [ssse3_args, '-O3', '-DHAVE_SSSE3'],
+    c_args : [ssse3_args, '-O3', '-DHAVE_SSSE3', simd_cargs],
     dependencies : [ spa_dep ],
     install : false
     )
@@ -65,7 +65,7 @@ endif
 if have_sse41
   audioconvert_sse41 = static_library('audioconvert_sse41',
     ['fmt-ops-sse41.c'],
-    c_args : [sse41_args, '-O3', '-DHAVE_SSE41'],
+    c_args : [sse41_args, '-O3', '-DHAVE_SSE41', simd_cargs],
     dependencies : [ spa_dep ],
     install : false
     )
@@ -75,7 +75,7 @@ endif
 if have_avx2 and have_fma
   audioconvert_avx2_fma = static_library('audioconvert_avx2_fma',
     ['resample-native-avx2.c'],
-    c_args : [avx2_args, fma_args, '-O3', '-DHAVE_AVX2', '-DHAVE_FMA'],
+    c_args : [avx2_args, fma_args, '-O3', '-DHAVE_AVX2', '-DHAVE_FMA', simd_cargs],
     dependencies : [ spa_dep ],
     install : false
     )
@@ -85,7 +85,7 @@ endif
 if have_avx2
   audioconvert_avx2 = static_library('audioconvert_avx2',
     ['fmt-ops-avx2.c'],
-    c_args : [avx2_args, '-O3', '-DHAVE_AVX2'],
+    c_args : [avx2_args, '-O3', '-DHAVE_AVX2', simd_cargs],
     dependencies : [ spa_dep ],
     install : false
     )
diff --git a/spa/plugins/audioconvert/peaks-ops.c b/spa/plugins/audioconvert/peaks-ops.c
index 29b93a081..f7a897f90 100644
--- a/spa/plugins/audioconvert/peaks-ops.c
+++ b/spa/plugins/audioconvert/peaks-ops.c
@@ -60,7 +60,7 @@ int peaks_init(struct peaks *peaks)
 	if (info == NULL)
 		return -ENOTSUP;
 
-	peaks->cpu_flags = info->cpu_flags;
+	peaks->func_cpu_flags = info->cpu_flags;
 	peaks->func_name = info->name;
 	peaks->free = impl_peaks_free;
 	peaks->min_max = info->min_max;
diff --git a/spa/plugins/audioconvert/peaks-ops.h b/spa/plugins/audioconvert/peaks-ops.h
index 24092a4f7..40b20cfbc 100644
--- a/spa/plugins/audioconvert/peaks-ops.h
+++ b/spa/plugins/audioconvert/peaks-ops.h
@@ -14,6 +14,7 @@ extern struct spa_log_topic resample_log_topic;
 
 struct peaks {
 	uint32_t cpu_flags;
+	uint32_t func_cpu_flags;
 	const char *func_name;
 
 	struct spa_log *log;
diff --git a/spa/plugins/audioconvert/resample-native.c b/spa/plugins/audioconvert/resample-native.c
index 3604c5b45..5bb33ffc1 100644
--- a/spa/plugins/audioconvert/resample-native.c
+++ b/spa/plugins/audioconvert/resample-native.c
@@ -576,7 +576,7 @@ int resample_native_init(struct resample *r)
 			r, c->cutoff, r->quality, c->window, r->i_rate, r->o_rate, gcd, n_taps, n_phases,
 			r->cpu_flags, d->info->cpu_flags);
 
-	r->cpu_flags = d->info->cpu_flags;
+	r->func_cpu_flags = d->info->cpu_flags;
 
 	impl_native_reset(r);
 	impl_native_update_rate(r, 1.0);
diff --git a/spa/plugins/audioconvert/resample.h b/spa/plugins/audioconvert/resample.h
index fec3bf963..7b6e58415 100644
--- a/spa/plugins/audioconvert/resample.h
+++ b/spa/plugins/audioconvert/resample.h
@@ -38,6 +38,7 @@ struct resample {
 #define RESAMPLE_OPTION_PREFILL		(1<<0)
 	uint32_t options;
 	uint32_t cpu_flags;
+	uint32_t func_cpu_flags;
 	const char *func_name;
 
 	uint32_t channels;
diff --git a/spa/plugins/audioconvert/volume-ops.c b/spa/plugins/audioconvert/volume-ops.c
index bf6aa6909..b76ab4bec 100644
--- a/spa/plugins/audioconvert/volume-ops.c
+++ b/spa/plugins/audioconvert/volume-ops.c
@@ -56,7 +56,7 @@ int volume_init(struct volume *vol)
 	if (info == NULL)
 		return -ENOTSUP;
 
-	vol->cpu_flags = info->cpu_flags;
+	vol->func_cpu_flags = info->cpu_flags;
 	vol->func_name = info->name;
 	vol->free = impl_volume_free;
 	vol->process = info->process;
diff --git a/spa/plugins/audioconvert/volume-ops.h b/spa/plugins/audioconvert/volume-ops.h
index a50ee9a6f..51642110f 100644
--- a/spa/plugins/audioconvert/volume-ops.h
+++ b/spa/plugins/audioconvert/volume-ops.h
@@ -13,6 +13,7 @@
 
 struct volume {
 	uint32_t cpu_flags;
+	uint32_t func_cpu_flags;
 	const char *func_name;
 
 	struct spa_log *log;

From 9ba0c3cfd3b520d2aac1462e61120fad820b6415 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 20 Mar 2026 18:23:43 +0100
Subject: [PATCH 227/263] audioconver: add avx channelmix copy function

---
 spa/plugins/audioconvert/channelmix-ops-avx.c | 63 +++++++++++++++++++
 spa/plugins/audioconvert/channelmix-ops.c     |  5 ++
 spa/plugins/audioconvert/channelmix-ops.h     |  4 ++
 spa/plugins/audioconvert/meson.build          | 10 +++
 4 files changed, 82 insertions(+)
 create mode 100644 spa/plugins/audioconvert/channelmix-ops-avx.c

diff --git a/spa/plugins/audioconvert/channelmix-ops-avx.c b/spa/plugins/audioconvert/channelmix-ops-avx.c
new file mode 100644
index 000000000..08d8e2b00
--- /dev/null
+++ b/spa/plugins/audioconvert/channelmix-ops-avx.c
@@ -0,0 +1,63 @@
+/* Spa */
+/* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
+/* SPDX-License-Identifier: MIT */
+
+#include "channelmix-ops.h"
+
+#include <immintrin.h>
+#include <float.h>
+#include <math.h>
+
+static inline void clear_avx(float *d, uint32_t n_samples)
+{
+	memset(d, 0, n_samples * sizeof(float));
+}
+
+static inline void copy_avx(float *d, const float *s, uint32_t n_samples)
+{
+	spa_memcpy(d, s, n_samples * sizeof(float));
+}
+
+static inline void vol_avx(float *d, const float *s, float vol, uint32_t n_samples)
+{
+	uint32_t n, unrolled;
+	if (vol == 0.0f) {
+		clear_avx(d, n_samples);
+	} else if (vol == 1.0f) {
+		copy_avx(d, s, n_samples);
+	} else {
+		__m256 t[4];
+		const __m256 v = _mm256_set1_ps(vol);
+
+		if (SPA_IS_ALIGNED(d, 32) &&
+		    SPA_IS_ALIGNED(s, 32))
+			unrolled = n_samples & ~31;
+		else
+			unrolled = 0;
+
+		for(n = 0; n < unrolled; n += 32) {
+			t[0] = _mm256_load_ps(&s[n]);
+			t[1] = _mm256_load_ps(&s[n+8]);
+			t[2] = _mm256_load_ps(&s[n+16]);
+			t[3] = _mm256_load_ps(&s[n+24]);
+			_mm256_store_ps(&d[n], _mm256_mul_ps(t[0], v));
+			_mm256_store_ps(&d[n+8], _mm256_mul_ps(t[1], v));
+			_mm256_store_ps(&d[n+16], _mm256_mul_ps(t[2], v));
+			_mm256_store_ps(&d[n+24], _mm256_mul_ps(t[3], v));
+		}
+		for(; n < n_samples; n++) {
+			__m128 v = _mm_set1_ps(vol);
+			_mm_store_ss(&d[n], _mm_mul_ss(_mm_load_ss(&s[n]), v));
+		}
+	}
+}
+
+void channelmix_copy_avx(struct channelmix *mix, void * SPA_RESTRICT dst[],
+		const void * SPA_RESTRICT src[], uint32_t n_samples)
+{
+	uint32_t i, n_dst = mix->dst_chan;
+	float **d = (float **)dst;
+	const float **s = (const float **)src;
+	for (i = 0; i < n_dst; i++)
+		vol_avx(d[i], s[i], mix->matrix[i][i], n_samples);
+}
diff --git a/spa/plugins/audioconvert/channelmix-ops.c b/spa/plugins/audioconvert/channelmix-ops.c
index c8c01eb81..921270450 100644
--- a/spa/plugins/audioconvert/channelmix-ops.c
+++ b/spa/plugins/audioconvert/channelmix-ops.c
@@ -36,6 +36,11 @@ static const struct channelmix_info {
 	uint32_t cpu_flags;
 } channelmix_table[] =
 {
+#if defined (HAVE_AVX)
+	MAKE(2, MASK_MONO, 2, MASK_MONO, channelmix_copy_avx, SPA_CPU_FLAG_AVX),
+	MAKE(2, MASK_STEREO, 2, MASK_STEREO, channelmix_copy_avx, SPA_CPU_FLAG_AVX),
+	MAKE(EQ, 0, EQ, 0, channelmix_copy_avx, SPA_CPU_FLAG_AVX),
+#endif
 #if defined (HAVE_SSE)
 	MAKE(2, MASK_MONO, 2, MASK_MONO, channelmix_copy_sse, SPA_CPU_FLAG_SSE),
 	MAKE(2, MASK_STEREO, 2, MASK_STEREO, channelmix_copy_sse, SPA_CPU_FLAG_SSE),
diff --git a/spa/plugins/audioconvert/channelmix-ops.h b/spa/plugins/audioconvert/channelmix-ops.h
index 155079cd2..947cc6f34 100644
--- a/spa/plugins/audioconvert/channelmix-ops.h
+++ b/spa/plugins/audioconvert/channelmix-ops.h
@@ -140,4 +140,8 @@ DEFINE_FUNCTION(f32_5p1_4, sse);
 DEFINE_FUNCTION(f32_7p1_4, sse);
 #endif
 
+#if defined (HAVE_AVX)
+DEFINE_FUNCTION(copy, avx);
+#endif
+
 #undef DEFINE_FUNCTION
diff --git a/spa/plugins/audioconvert/meson.build b/spa/plugins/audioconvert/meson.build
index 559db4308..71d5d56cd 100644
--- a/spa/plugins/audioconvert/meson.build
+++ b/spa/plugins/audioconvert/meson.build
@@ -72,6 +72,16 @@ if have_sse41
   simd_cargs += ['-DHAVE_SSE41']
   simd_dependencies += audioconvert_sse41
 endif
+if have_avx
+  audioconvert_avx = static_library('audioconvert_avx',
+    ['channelmix-ops-avx.c'],
+    c_args : [avx_args, '-O3', '-DHAVE_AVX', simd_cargs],
+    dependencies : [ spa_dep ],
+    install : false
+    )
+  simd_cargs += ['-DHAVE_AVX']
+  simd_dependencies += audioconvert_avx
+endif
 if have_avx2 and have_fma
   audioconvert_avx2_fma = static_library('audioconvert_avx2_fma',
     ['resample-native-avx2.c'],

From 52b23384e06b3c95613431b02c208e73664a1efe Mon Sep 17 00:00:00 2001
From: Martin Geier <martin.geier@streamunlimited.com>
Date: Mon, 23 Mar 2026 10:40:18 +0100
Subject: [PATCH 228/263] impl-node: correctly synchronize suspend state with
 remote node

Previously, if a remote node was set to running and immediately reverted
to suspended state, the remote node stayed in running state. This occurred
because suspend_node sent suspend command only when the locally cached
state was "idle" or "running."

Modified to send suspend to a node whenever its pending state is not
"suspended," ensuring the command is sent during state transitions.

Fixes #5026

Signed-off-by: Martin Geier <martin.geier@streamunlimited.com>
---
 src/pipewire/impl-node.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c
index 6f5066e82..63e433893 100644
--- a/src/pipewire/impl-node.c
+++ b/src/pipewire/impl-node.c
@@ -528,13 +528,15 @@ static void node_update_state(struct pw_impl_node *node, enum pw_node_state stat
 
 static int suspend_node(struct pw_impl_node *this)
 {
+	struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
 	int res = 0;
 	struct pw_impl_port *p;
 
 	pw_log_debug("%p: suspend node state:%s", this,
 			pw_node_state_as_string(this->info.state));
 
-	if (this->info.state > 0 && this->info.state <= PW_NODE_STATE_SUSPENDED)
+	if (this->info.state > 0 && this->info.state < PW_NODE_STATE_SUSPENDED ||
+		this->info.state == PW_NODE_STATE_SUSPENDED && impl->pending_state == PW_NODE_STATE_SUSPENDED)
 		return 0;
 
 	spa_list_for_each(p, &this->input_ports, link) {

From d47b4974ce6844784510b882d0563c8051604cc1 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 23 Mar 2026 11:55:05 +0100
Subject: [PATCH 229/263] impl-node: add () around &&

To fix a compiler warning.
---
 src/pipewire/impl-node.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c
index 63e433893..77aef4bfc 100644
--- a/src/pipewire/impl-node.c
+++ b/src/pipewire/impl-node.c
@@ -535,8 +535,8 @@ static int suspend_node(struct pw_impl_node *this)
 	pw_log_debug("%p: suspend node state:%s", this,
 			pw_node_state_as_string(this->info.state));
 
-	if (this->info.state > 0 && this->info.state < PW_NODE_STATE_SUSPENDED ||
-		this->info.state == PW_NODE_STATE_SUSPENDED && impl->pending_state == PW_NODE_STATE_SUSPENDED)
+	if ((this->info.state > 0 && this->info.state < PW_NODE_STATE_SUSPENDED) ||
+	    (this->info.state == PW_NODE_STATE_SUSPENDED && impl->pending_state == PW_NODE_STATE_SUSPENDED))
 		return 0;
 
 	spa_list_for_each(p, &this->input_ports, link) {

From 01b9abc5ef2f381fc3f95d898fab3e80775ff475 Mon Sep 17 00:00:00 2001
From: Vitaliy Fadeev <vital.fadeev@gmail.com>
Date: Fri, 20 Mar 2026 09:20:15 +0000
Subject: [PATCH 230/263] Edit overview.dox five flags Node

---
 doc/dox/overview.dox | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/dox/overview.dox b/doc/dox/overview.dox
index 1490cd444..9e2530163 100644
--- a/doc/dox/overview.dox
+++ b/doc/dox/overview.dox
@@ -77,7 +77,7 @@ Certain properties are, by convention, expected for specific object types.
 
 Each object type has a list of methods that it needs to implement.
 
-The session manager is responsible for defining the list of permissions each client has. Each permission entry is an object ID and four flags. The four flags are:
+The session manager is responsible for defining the list of permissions each client has. Each permission entry is an object ID and five flags. The five flags are:
 
 - Read: the object can be seen and events can be received;
 - Write: the object can be modified, usually through methods (which requires the execute flag)
@@ -109,7 +109,7 @@ Modules in PipeWire can only be loaded in their own process. A client, for examp
 
 Nodes are the core data processing entities in PipeWire.
 They may produce data (capture devices, signal generators, ...), consume data (playback devices, network endpoints, ...) or both (filters).
-Notes have a method `process`, which eats up data from input ports and provides data for each output port.
+Nodes have a method `process`, which eats up data from input ports and provides data for each output port.
 
 #### Ports
 

From 2e7aee3573aea16e277489cf4eb112c89c34fa28 Mon Sep 17 00:00:00 2001
From: Julian Bouzas <julian.bouzas@collabora.com>
Date: Mon, 23 Mar 2026 10:55:17 -0400
Subject: [PATCH 231/263] bluez: Increase priority of A2DP quality and latency
 profiles

This improves the UX as the highest A2DP profile will be selected by default.
---
 spa/plugins/bluez5/bluez5-device.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spa/plugins/bluez5/bluez5-device.c b/spa/plugins/bluez5/bluez5-device.c
index 15b34a78c..4b3dcbfa2 100644
--- a/spa/plugins/bluez5/bluez5-device.c
+++ b/spa/plugins/bluez5/bluez5-device.c
@@ -2281,17 +2281,17 @@ static struct spa_pod *build_profile(struct impl *this, struct spa_pod_builder *
 		case DEVICE_PROFILE_A2DP_AUTO_PREFER_QUALITY:
 			name = "a2dp-auto-prefer-quality";
 			desc = _("Auto: Prefer Quality (A2DP)");
+			priority = 255;
 			break;
 		case DEVICE_PROFILE_A2DP_AUTO_PREFER_LATENCY:
 			name = "a2dp-auto-prefer-latency";
 			desc = _("Auto: Prefer Latency (A2DP)");
+			priority = 254;
 			break;
 		default:
 			return NULL;
 		}
 
-		priority = 0;
-
 		n_sink++;
 		if (this->autoswitch_routes && (device->connected_profiles & SPA_BT_PROFILE_HEADSET_HEAD_UNIT))
 			n_source++;

From e1f53b7f391e51b13eb8772db70d03f33c78f193 Mon Sep 17 00:00:00 2001
From: Julian Bouzas <julian.bouzas@collabora.com>
Date: Mon, 23 Mar 2026 11:38:57 -0400
Subject: [PATCH 232/263] bluez: Set initial profile to quality A2DP

---
 spa/plugins/bluez5/bluez5-device.c | 34 ++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/spa/plugins/bluez5/bluez5-device.c b/spa/plugins/bluez5/bluez5-device.c
index 4b3dcbfa2..231e30841 100644
--- a/spa/plugins/bluez5/bluez5-device.c
+++ b/spa/plugins/bluez5/bluez5-device.c
@@ -2121,15 +2121,37 @@ static void set_initial_profile(struct impl *this)
 
 		t = find_transport(this, i);
 		if (t) {
-			if (i == SPA_BT_PROFILE_A2DP_SOURCE || i == SPA_BT_PROFILE_BAP_SOURCE)
+			if (i == SPA_BT_PROFILE_A2DP_SOURCE || i == SPA_BT_PROFILE_BAP_SOURCE) {
 				this->profile =  DEVICE_PROFILE_AG;
-			else if (i == SPA_BT_PROFILE_BAP_SINK)
+				this->props.codec = t->media_codec->id;
+			} else if (i == SPA_BT_PROFILE_BAP_SINK) {
 				this->profile =  DEVICE_PROFILE_BAP;
-			else if (i == SPA_BT_PROFILE_ASHA_SINK)
+				this->props.codec = t->media_codec->id;
+			} else if (i == SPA_BT_PROFILE_ASHA_SINK) {
 				this->profile =  DEVICE_PROFILE_ASHA;
-			else
-				this->profile =  DEVICE_PROFILE_A2DP;
-			this->props.codec = t->media_codec->id;
+				this->props.codec = t->media_codec->id;
+			} else {
+				const struct media_codec *codecs[64];
+				const struct media_codec *quality_codec = NULL;
+				int j;
+
+				get_media_codecs(this, CODEC_ORDER_QUALITY, 0, codecs, SPA_N_ELEMENTS(codecs));
+				for (j = 0; codecs[j] != NULL; ++j) {
+					if (codecs[j]->kind == MEDIA_CODEC_A2DP) {
+						quality_codec = codecs[j];
+						break;
+					}
+				}
+
+				if (quality_codec) {
+					this->profile = DEVICE_PROFILE_A2DP_AUTO_PREFER_QUALITY;
+					this->props.codec = quality_codec->id;
+				} else {
+					this->profile = DEVICE_PROFILE_A2DP;
+					this->props.codec = t->media_codec->id;
+				}
+			}
+
 			spa_log_debug(this->log, "initial profile media profile:%d codec:%d",
 					this->profile, this->props.codec);
 			return;

From 4f564422494a4f61edf3b17cb1434296822c3105 Mon Sep 17 00:00:00 2001
From: Julian Bouzas <julian.bouzas@collabora.com>
Date: Mon, 23 Mar 2026 11:13:26 -0400
Subject: [PATCH 233/263] bluez: Discard latency and quality codecs worse than
 SBC for A2DP auto profiles.

Since SBC is mandatory in all devices that support A2DP, we dont need to inclide
them in the priority tables.

This change also increases the priority of OPUS_G codec as it has better latency
and quality than SBC.
---
 spa/plugins/bluez5/bluez5-device.c | 34 +++++-------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/spa/plugins/bluez5/bluez5-device.c b/spa/plugins/bluez5/bluez5-device.c
index 231e30841..897241954 100644
--- a/spa/plugins/bluez5/bluez5-device.c
+++ b/spa/plugins/bluez5/bluez5-device.c
@@ -230,29 +230,17 @@ static size_t get_media_codec_quality_priority (const struct media_codec *mc)
 	/* From lowest quality to highest quality */
 	static const enum spa_bluetooth_audio_codec quality_priorities[] = {
 		SPA_BLUETOOTH_AUDIO_CODEC_START,
-		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_DUPLEX,
-		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05,
-		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_51,
-		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_71,
-		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_G,
-		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_PRO,
-		SPA_BLUETOOTH_AUDIO_CODEC_FASTSTREAM_DUPLEX,
-		SPA_BLUETOOTH_AUDIO_CODEC_FASTSTREAM,
-		SPA_BLUETOOTH_AUDIO_CODEC_MPEG,
-		SPA_BLUETOOTH_AUDIO_CODEC_APTX_LL_DUPLEX,
-		SPA_BLUETOOTH_AUDIO_CODEC_APTX_LL,
 		SPA_BLUETOOTH_AUDIO_CODEC_SBC,
 		SPA_BLUETOOTH_AUDIO_CODEC_APTX,
-		SPA_BLUETOOTH_AUDIO_CODEC_SBC_XQ,
-		SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD,
 		SPA_BLUETOOTH_AUDIO_CODEC_AAC,
+		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_G,
 		SPA_BLUETOOTH_AUDIO_CODEC_LC3PLUS_HR,
 		SPA_BLUETOOTH_AUDIO_CODEC_APTX_HD,
-		SPA_BLUETOOTH_AUDIO_CODEC_LDAC
+		SPA_BLUETOOTH_AUDIO_CODEC_LDAC,
 	};
 	size_t i;
 
-	for (i = 0; SPA_N_ELEMENTS(quality_priorities); ++i) {
+	for (i = 0; i < SPA_N_ELEMENTS(quality_priorities); ++i) {
 		if (quality_priorities[i] == mc->id)
 			return i;
 	}
@@ -265,21 +253,9 @@ static size_t get_media_codec_latency_priority (const struct media_codec *mc)
 	/* From highest latency to lowest latency */
 	static const enum spa_bluetooth_audio_codec latency_priorities[] = {
 		SPA_BLUETOOTH_AUDIO_CODEC_START,
-		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_71,
-		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_51,
-		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_PRO,
-		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_G,
-		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05,
-		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_DUPLEX,
-		SPA_BLUETOOTH_AUDIO_CODEC_MPEG,
-		SPA_BLUETOOTH_AUDIO_CODEC_AAC,
-		SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD,
-		SPA_BLUETOOTH_AUDIO_CODEC_APTX_HD,
-		SPA_BLUETOOTH_AUDIO_CODEC_LDAC,
-		SPA_BLUETOOTH_AUDIO_CODEC_LC3PLUS_HR,
 		SPA_BLUETOOTH_AUDIO_CODEC_SBC,
 		SPA_BLUETOOTH_AUDIO_CODEC_APTX,
-		SPA_BLUETOOTH_AUDIO_CODEC_SBC_XQ,
+		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_G,
 		SPA_BLUETOOTH_AUDIO_CODEC_FASTSTREAM_DUPLEX,
 		SPA_BLUETOOTH_AUDIO_CODEC_FASTSTREAM,
 		SPA_BLUETOOTH_AUDIO_CODEC_APTX_LL_DUPLEX,
@@ -287,7 +263,7 @@ static size_t get_media_codec_latency_priority (const struct media_codec *mc)
 	};
 	size_t i;
 
-	for (i = 0; SPA_N_ELEMENTS(latency_priorities); ++i) {
+	for (i = 0; i < SPA_N_ELEMENTS(latency_priorities); ++i) {
 		if (latency_priorities[i] == mc->id)
 			return i;
 	}

From bc87bc8588a6a824c99ea96175f64a91748d5526 Mon Sep 17 00:00:00 2001
From: lumingzh <lumingzh@qq.com>
Date: Mon, 23 Mar 2026 08:54:30 +0800
Subject: [PATCH 234/263] update Chinese translation

---
 po/zh_CN.po | 114 ++++++++++++++++++++++++++++------------------------
 1 file changed, 61 insertions(+), 53 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8be588b03..3c82c60e7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: pipewire.master-tx\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pipewire/pipewire/-/"
 "issues\n"
-"POT-Creation-Date: 2026-02-11 16:53+0000\n"
-"PO-Revision-Date: 2026-02-13 09:36+0800\n"
+"POT-Creation-Date: 2026-03-19 15:38+0000\n"
+"PO-Revision-Date: 2026-03-23 08:48+0800\n"
 "Last-Translator: lumingzh <lumingzh@qq.com>\n"
 "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2016-03-22 13:23+0000\n"
-"X-Generator: Gtranslator 49.0\n"
+"X-Generator: Gtranslator 50.0\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/daemon/pipewire.c:29
@@ -65,46 +65,46 @@ msgstr "虚拟输出"
 msgid "Tunnel for %s@%s"
 msgstr "用于 %s@%s 的隧道"
 
-#: src/modules/module-zeroconf-discover.c:326
+#: src/modules/module-zeroconf-discover.c:290
 msgid "Unknown device"
 msgstr "未知设备"
 
-#: src/modules/module-zeroconf-discover.c:338
+#: src/modules/module-zeroconf-discover.c:302
 #, c-format
 msgid "%s on %s@%s"
 msgstr "%2$s@%3$s 上的 %1$s"
 
-#: src/modules/module-zeroconf-discover.c:342
+#: src/modules/module-zeroconf-discover.c:306
 #, c-format
 msgid "%s on %s"
 msgstr "%2$s 上的 %1$s"
 
-#: src/tools/pw-cat.c:264
+#: src/tools/pw-cat.c:269
 #, c-format
 msgid "Supported formats:\n"
 msgstr "支持的格式：\n"
 
-#: src/tools/pw-cat.c:749
+#: src/tools/pw-cat.c:754
 #, c-format
 msgid "Supported channel layouts:\n"
 msgstr "支持的声道布局：\n"
 
-#: src/tools/pw-cat.c:759
+#: src/tools/pw-cat.c:764
 #, c-format
 msgid "Supported channel layout aliases:\n"
 msgstr "支持的声道布局别名：\n"
 
-#: src/tools/pw-cat.c:761
+#: src/tools/pw-cat.c:766
 #, c-format
 msgid "    %s -> %s\n"
 msgstr "    %s -> %s\n"
 
-#: src/tools/pw-cat.c:766
+#: src/tools/pw-cat.c:771
 #, c-format
 msgid "Supported channel names:\n"
 msgstr "支持的声道名称：\n"
 
-#: src/tools/pw-cat.c:1177
+#: src/tools/pw-cat.c:1182
 #, c-format
 msgid ""
 "%s [options] [<file>|-]\n"
@@ -119,7 +119,7 @@ msgstr ""
 "  -v, --verbose                         输出详细操作\n"
 "\n"
 
-#: src/tools/pw-cat.c:1184
+#: src/tools/pw-cat.c:1189
 #, c-format
 msgid ""
 "  -R, --remote                          Remote daemon name\n"
@@ -151,7 +151,7 @@ msgstr ""
 "  -P  --properties                      设置节点属性\n"
 "\n"
 
-#: src/tools/pw-cat.c:1202
+#: src/tools/pw-cat.c:1207
 #, c-format
 msgid ""
 "      --rate                            Sample rate (default %u)\n"
@@ -198,7 +198,7 @@ msgstr ""
 "  -n, --sample-count COUNT              计数采样后停止\n"
 "\n"
 
-#: src/tools/pw-cat.c:1227
+#: src/tools/pw-cat.c:1232
 msgid ""
 "  -p, --playback                        Playback mode\n"
 "  -r, --record                          Recording mode\n"
@@ -218,7 +218,7 @@ msgstr ""
 "  -c, --midi-clip                       MIDI 剪辑模式\n"
 "\n"
 
-#: src/tools/pw-cat.c:1827
+#: src/tools/pw-cat.c:1837
 #, c-format
 msgid "Supported containers and extensions:\n"
 msgstr "支持的容器和扩展：\n"
@@ -245,12 +245,12 @@ msgstr ""
 msgid "Pro Audio"
 msgstr "专业音频"
 
-#: spa/plugins/alsa/acp/acp.c:537 spa/plugins/alsa/acp/alsa-mixer.c:4699
-#: spa/plugins/bluez5/bluez5-device.c:2021
+#: spa/plugins/alsa/acp/acp.c:535 spa/plugins/alsa/acp/alsa-mixer.c:4699
+#: spa/plugins/bluez5/bluez5-device.c:2165
 msgid "Off"
 msgstr "关"
 
-#: spa/plugins/alsa/acp/acp.c:620
+#: spa/plugins/alsa/acp/acp.c:618
 #, c-format
 msgid "%s [ALSA UCM error]"
 msgstr "%s [ALSA UCM 错误]"
@@ -278,7 +278,7 @@ msgstr "输入插孔"
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:2726
 #: spa/plugins/alsa/acp/alsa-mixer.c:2810
-#: spa/plugins/bluez5/bluez5-device.c:2422
+#: spa/plugins/bluez5/bluez5-device.c:2598
 msgid "Microphone"
 msgstr "话筒"
 
@@ -344,15 +344,15 @@ msgid "No Bass Boost"
 msgstr "无重低音增强"
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:2741
-#: spa/plugins/bluez5/bluez5-device.c:2428
+#: spa/plugins/bluez5/bluez5-device.c:2604
 msgid "Speaker"
 msgstr "扬声器"
 
 #. Don't call it "headset", the HF one has the mic
 #: spa/plugins/alsa/acp/alsa-mixer.c:2742
 #: spa/plugins/alsa/acp/alsa-mixer.c:2820
-#: spa/plugins/bluez5/bluez5-device.c:2434
-#: spa/plugins/bluez5/bluez5-device.c:2501
+#: spa/plugins/bluez5/bluez5-device.c:2610
+#: spa/plugins/bluez5/bluez5-device.c:2677
 msgid "Headphones"
 msgstr "模拟耳机"
 
@@ -462,7 +462,7 @@ msgstr "立体声"
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:4535
 #: spa/plugins/alsa/acp/alsa-mixer.c:4693
-#: spa/plugins/bluez5/bluez5-device.c:2410
+#: spa/plugins/bluez5/bluez5-device.c:2586
 msgid "Headset"
 msgstr "耳机"
 
@@ -657,101 +657,109 @@ msgstr "内置音频"
 msgid "Modem"
 msgstr "调制解调器"
 
-#: spa/plugins/bluez5/bluez5-device.c:2032
+#: spa/plugins/bluez5/bluez5-device.c:2176
 msgid "Audio Gateway (A2DP Source & HSP/HFP AG)"
 msgstr "音频网关 (A2DP 信源 或 HSP/HFP 网关)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2061
+#: spa/plugins/bluez5/bluez5-device.c:2205
 msgid "Audio Streaming for Hearing Aids (ASHA Sink)"
 msgstr "助听器音频流 (ASHA 信宿)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2104
+#: spa/plugins/bluez5/bluez5-device.c:2248
 #, c-format
 msgid "High Fidelity Playback (A2DP Sink, codec %s)"
 msgstr "高保真回放 (A2DP 信宿, 编码 %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2107
+#: spa/plugins/bluez5/bluez5-device.c:2251
 #, c-format
 msgid "High Fidelity Duplex (A2DP Source/Sink, codec %s)"
 msgstr "高保真双工 (A2DP 信源/信宿, 编码 %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2115
+#: spa/plugins/bluez5/bluez5-device.c:2259
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "高保真回放 (A2DP 信宿)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2117
+#: spa/plugins/bluez5/bluez5-device.c:2261
 msgid "High Fidelity Duplex (A2DP Source/Sink)"
 msgstr "高保真双工 (A2DP 信源/信宿)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2194
+#: spa/plugins/bluez5/bluez5-device.c:2283
+msgid "Auto: Prefer Quality (A2DP)"
+msgstr "自动：质量优先 (A2DP)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2287
+msgid "Auto: Prefer Latency (A2DP)"
+msgstr "自动：延迟优先 (A2DP)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2368
 #, c-format
 msgid "High Fidelity Playback (BAP Sink, codec %s)"
 msgstr "高保真回放 (BAP 信宿, 编码 %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2199
+#: spa/plugins/bluez5/bluez5-device.c:2373
 #, c-format
 msgid "High Fidelity Input (BAP Source, codec %s)"
 msgstr "高保真输入 (BAP 信源, 编码 %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2203
+#: spa/plugins/bluez5/bluez5-device.c:2377
 #, c-format
 msgid "High Fidelity Duplex (BAP Source/Sink, codec %s)"
 msgstr "高保真双工 (BAP 信源/信宿, 编码 %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2212
+#: spa/plugins/bluez5/bluez5-device.c:2386
 msgid "High Fidelity Playback (BAP Sink)"
 msgstr "高保真回放 (BAP 信宿)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2216
+#: spa/plugins/bluez5/bluez5-device.c:2390
 msgid "High Fidelity Input (BAP Source)"
 msgstr "高保真输入 (BAP 信源)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2219
+#: spa/plugins/bluez5/bluez5-device.c:2393
 msgid "High Fidelity Duplex (BAP Source/Sink)"
 msgstr "高保真双工 (BAP 信源/信宿)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2259
+#: spa/plugins/bluez5/bluez5-device.c:2433
 #, c-format
 msgid "Headset Head Unit (HSP/HFP, codec %s)"
 msgstr "头戴式耳机单元 (HSP/HFP, 编码 %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:2411
-#: spa/plugins/bluez5/bluez5-device.c:2416
-#: spa/plugins/bluez5/bluez5-device.c:2423
-#: spa/plugins/bluez5/bluez5-device.c:2429
-#: spa/plugins/bluez5/bluez5-device.c:2435
-#: spa/plugins/bluez5/bluez5-device.c:2441
-#: spa/plugins/bluez5/bluez5-device.c:2447
-#: spa/plugins/bluez5/bluez5-device.c:2453
-#: spa/plugins/bluez5/bluez5-device.c:2459
+#: spa/plugins/bluez5/bluez5-device.c:2587
+#: spa/plugins/bluez5/bluez5-device.c:2592
+#: spa/plugins/bluez5/bluez5-device.c:2599
+#: spa/plugins/bluez5/bluez5-device.c:2605
+#: spa/plugins/bluez5/bluez5-device.c:2611
+#: spa/plugins/bluez5/bluez5-device.c:2617
+#: spa/plugins/bluez5/bluez5-device.c:2623
+#: spa/plugins/bluez5/bluez5-device.c:2629
+#: spa/plugins/bluez5/bluez5-device.c:2635
 msgid "Handsfree"
 msgstr "免提"
 
-#: spa/plugins/bluez5/bluez5-device.c:2417
+#: spa/plugins/bluez5/bluez5-device.c:2593
 msgid "Handsfree (HFP)"
 msgstr "免提（HFP）"
 
-#: spa/plugins/bluez5/bluez5-device.c:2440
+#: spa/plugins/bluez5/bluez5-device.c:2616
 msgid "Portable"
 msgstr "便携式"
 
-#: spa/plugins/bluez5/bluez5-device.c:2446
+#: spa/plugins/bluez5/bluez5-device.c:2622
 msgid "Car"
 msgstr "车内"
 
-#: spa/plugins/bluez5/bluez5-device.c:2452
+#: spa/plugins/bluez5/bluez5-device.c:2628
 msgid "HiFi"
 msgstr "高保真"
 
-#: spa/plugins/bluez5/bluez5-device.c:2458
+#: spa/plugins/bluez5/bluez5-device.c:2634
 msgid "Phone"
 msgstr "电话"
 
-#: spa/plugins/bluez5/bluez5-device.c:2465
+#: spa/plugins/bluez5/bluez5-device.c:2641
 msgid "Bluetooth"
 msgstr "蓝牙"
 
-#: spa/plugins/bluez5/bluez5-device.c:2466
+#: spa/plugins/bluez5/bluez5-device.c:2642
 msgid "Bluetooth Handsfree"
 msgstr "蓝牙免提"
 

From 39f4cbfc98528ce1d28311f074c9a2fab0dea104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Tue, 24 Mar 2026 17:31:40 +0100
Subject: [PATCH 235/263] spa: audioconvert: test-fmt-ops: initialize `convert`

Since c02cdcb5ce98 ("audioconvert: add avx2 optimized s32_to f32d")
`conv_s32_to_f32d_avx2()` reads `convert::cpu_flags`, which was
previously unitiailized, fix that by setting it to 0.
---
 spa/plugins/audioconvert/test-fmt-ops.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spa/plugins/audioconvert/test-fmt-ops.c b/spa/plugins/audioconvert/test-fmt-ops.c
index 17a26a351..d5ca414ef 100644
--- a/spa/plugins/audioconvert/test-fmt-ops.c
+++ b/spa/plugins/audioconvert/test-fmt-ops.c
@@ -45,9 +45,9 @@ static void run_test(const char *name,
 	void *tp[N_CHANNELS];
 	int i, j;
 	const uint8_t *in8 = in, *out8 = out;
-	struct convert conv;
-
-	conv.n_channels = N_CHANNELS;
+	struct convert conv = {
+		.n_channels = N_CHANNELS,
+	};
 
 	for (j = 0; j < N_SAMPLES; j++) {
 		memcpy(&samp_in[j * in_size], &in8[(j % n_samples) * in_size], in_size);

From 22c1a16dcec42eebb12aad15c6d68a6b1a89db89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Tue, 24 Mar 2026 17:49:39 +0100
Subject: [PATCH 236/263] spa: audioconvert: benchmark-fmt-ops: initialize
 `convert`

Since c02cdcb5ce98 ("audioconvert: add avx2 optimized s32_to f32d")
`conv_s32_to_f32d_avx2()` reads `convert::cpu_flags`, which was
previously unitiailized, fix that by setting it to 0.
---
 spa/plugins/audioconvert/benchmark-fmt-ops.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spa/plugins/audioconvert/benchmark-fmt-ops.c b/spa/plugins/audioconvert/benchmark-fmt-ops.c
index 9ea43ec65..e59f1f56b 100644
--- a/spa/plugins/audioconvert/benchmark-fmt-ops.c
+++ b/spa/plugins/audioconvert/benchmark-fmt-ops.c
@@ -51,9 +51,9 @@ static void run_test1(const char *name, const char *impl, bool in_packed, bool o
 	void *op[n_channels];
 	struct timespec ts;
 	uint64_t count, t1, t2;
-	struct convert conv;
-
-	conv.n_channels = n_channels;
+	struct convert conv = {
+		.n_channels = n_channels,
+	};
 
 	for (j = 0; j < n_channels; j++) {
 		ip[j] = &samp_in[j * n_samples * 4];

From 0d1280a5b229d53714bb908056aaa42e11721e1c Mon Sep 17 00:00:00 2001
From: George Kiagiadakis <george.kiagiadakis@collabora.com>
Date: Fri, 6 Mar 2026 07:37:10 +0200
Subject: [PATCH 237/263] bluez5: parse the broadcast adapter value from the
 correct iterator

---
 spa/plugins/bluez5/bluez5-dbus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spa/plugins/bluez5/bluez5-dbus.c b/spa/plugins/bluez5/bluez5-dbus.c
index db1d8272c..f4b384547 100644
--- a/spa/plugins/bluez5/bluez5-dbus.c
+++ b/spa/plugins/bluez5/bluez5-dbus.c
@@ -7097,7 +7097,7 @@ static void parse_broadcast_source_config(struct spa_bt_monitor *monitor, const
 				memcpy(big_entry->broadcast_code, bcode, strlen(bcode));
 				spa_log_debug(monitor->log, "big_entry->broadcast_code %s", big_entry->broadcast_code);
 			} else if (spa_streq(key, "adapter")) {
-				if (spa_json_get_string(&it[1], big_entry->adapter, sizeof(big_entry->adapter)) <= 0)
+				if (spa_json_get_string(&it[0], big_entry->adapter, sizeof(big_entry->adapter)) <= 0)
 					goto parse_failed;
 				spa_log_debug(monitor->log, "big_entry->adapter %s", big_entry->adapter);
 			} else if (spa_streq(key, "encryption")) {

From 67070762d0c5ab40275b546d00ec9b7ff254ba73 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 23 Mar 2026 12:14:27 +0100
Subject: [PATCH 238/263] mixer: only add input ports to mixer

---
 spa/plugins/control/mixer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spa/plugins/control/mixer.c b/spa/plugins/control/mixer.c
index caf3a6b06..b9d57c1e6 100644
--- a/spa/plugins/control/mixer.c
+++ b/spa/plugins/control/mixer.c
@@ -589,7 +589,7 @@ static int do_port_set_io(struct spa_loop *loop, bool async, uint32_t seq,
 			port->io[0] = info->data;
 			port->io[1] = info->data;
 		}
-		if (!port->active) {
+		if (port->direction == SPA_DIRECTION_INPUT && !port->active) {
 			spa_list_append(&info->impl->mix_list, &port->mix_link);
 			port->active = true;
 		}

From ea28343166db890d161baa5fd80d7920c5ba2019 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 24 Mar 2026 14:02:46 +0100
Subject: [PATCH 239/263] midi: don't convert Midi in nodes

Avoid doing conversions in the nodes between Midi formats, just assume
the imput is what we expect and output what we naturally produce.

For ALSA this means we produce and consume Midi1 or Midi2 depending on the
configurtation.

All of the other modules (ffado, RTP, netjack and VBAN) really only
produce and consume MIDI1.

Set the default MIDI format to MIDI1 in ALSA.

Whith this change, almost everything now produces and consumes MIDI1
again (previously the buffer format was forced to MIDI2).

The problem is that MIDI2 to and from MIDI1 conversion has problems in
some cases in PipeWire and ALSA and breaks compatibility with some
hardware.

The idea is to let elements produce their prefered format and that the
control mixer also negotiates and converts to the node prefered format.
There is then a mix of MIDI2 and MIDI1 on ports but with the control
port adapting, this should not be a problem.

There is one remaining problem to make this work, the port format is
taken from the node port and not the mixer port, which would then expose
the prefered format on the port and force negotiation to it with the
peer instead of in the mixer.

See #5183
---
 pipewire-jack/src/pipewire-jack.c  |  29 +++-----
 spa/plugins/alsa/alsa-seq-bridge.c |  31 ++++++--
 spa/plugins/alsa/alsa-seq.c        |  74 ++++++++------------
 spa/plugins/alsa/alsa-seq.h        |   2 +
 src/modules/module-ffado-driver.c  |  44 ++++--------
 src/modules/module-jack-tunnel.c   |  60 +++++-----------
 src/modules/module-netjack2/peer.c |  68 ++++++------------
 src/modules/module-rtp/midi.c      | 109 ++++++++++++-----------------
 src/modules/module-vban/midi.c     |  53 +++++---------
 9 files changed, 177 insertions(+), 293 deletions(-)

diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
index 55f2d0d56..c82abc13f 100644
--- a/pipewire-jack/src/pipewire-jack.c
+++ b/pipewire-jack/src/pipewire-jack.c
@@ -1448,8 +1448,9 @@ static size_t convert_from_event(void *midi, void *buffer, size_t size, uint32_t
 
 	switch (type) {
 	case TYPE_ID_MIDI:
+		event_type = SPA_CONTROL_Midi;
+		break;
 	case TYPE_ID_OSC:
-		/* we handle MIDI as OSC, check below */
 		event_type = SPA_CONTROL_OSC;
 		break;
 	case TYPE_ID_UMP:
@@ -1466,27 +1467,15 @@ static size_t convert_from_event(void *midi, void *buffer, size_t size, uint32_t
 	for (i = 0; i < count; i++) {
 		jack_midi_event_t ev;
 		jack_midi_event_get(&ev, midi, i);
+		uint32_t ev_type;
 
-		if (type != TYPE_ID_MIDI || is_osc(&ev)) {
-			/* no midi port or it's OSC */
-			spa_pod_builder_control(&b, ev.time, event_type);
-			spa_pod_builder_bytes(&b, ev.buffer, ev.size);
-		} else {
-			/* midi port and it's not OSC, convert to UMP */
-			uint8_t *data = ev.buffer;
-			size_t size = ev.size;
-			uint64_t state = 0;
+		if (type == TYPE_ID_MIDI && is_osc(&ev))
+			ev_type = SPA_CONTROL_OSC;
+		else
+			ev_type = event_type;
 
-			while (size > 0) {
-				uint32_t ump[4];
-				int ump_size = spa_ump_from_midi(&data, &size,
-						ump, sizeof(ump), 0, &state);
-				if (ump_size <= 0)
-					break;
-				spa_pod_builder_control(&b, ev.time, SPA_CONTROL_UMP);
-				spa_pod_builder_bytes(&b, ump, ump_size);
-			}
-		}
+		spa_pod_builder_control(&b, ev.time, ev_type);
+		spa_pod_builder_bytes(&b, ev.buffer, ev.size);
 	}
 	spa_pod_builder_pop(&b, &f);
 	return b.state.offset;
diff --git a/spa/plugins/alsa/alsa-seq-bridge.c b/spa/plugins/alsa/alsa-seq-bridge.c
index 06c5bc28f..ffd9e98d8 100644
--- a/spa/plugins/alsa/alsa-seq-bridge.c
+++ b/spa/plugins/alsa/alsa-seq-bridge.c
@@ -501,6 +501,7 @@ impl_node_port_enum_params(void *object, int seq,
 	struct seq_state *this = object;
 	struct seq_port *port;
 	struct spa_pod *param;
+	struct spa_pod_frame f[1];
 	struct spa_pod_builder b = { 0 };
 	uint8_t buffer[1024];
 	struct spa_result_node_params result;
@@ -524,10 +525,18 @@ impl_node_port_enum_params(void *object, int seq,
 	case SPA_PARAM_EnumFormat:
 		if (result.index > 0)
 			return 0;
-		param = spa_pod_builder_add_object(&b,
-			SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
+		spa_pod_builder_push_object(&b, &f[0],
+			SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat);
+		spa_pod_builder_add(&b,
 			SPA_FORMAT_mediaType,      SPA_POD_Id(SPA_MEDIA_TYPE_application),
-			SPA_FORMAT_mediaSubtype,   SPA_POD_Id(SPA_MEDIA_SUBTYPE_control));
+			SPA_FORMAT_mediaSubtype,   SPA_POD_Id(SPA_MEDIA_SUBTYPE_control),
+			0);
+		if (port->control_types != 0) {
+			spa_pod_builder_add(&b,
+				SPA_FORMAT_CONTROL_types,  SPA_POD_Int(port->control_types),
+				0);
+		}
+		param = spa_pod_builder_pop(&b, &f[0]);
 		break;
 
 	case SPA_PARAM_Format:
@@ -535,10 +544,18 @@ impl_node_port_enum_params(void *object, int seq,
 			return -EIO;
 		if (result.index > 0)
 			return 0;
-		param = spa_pod_builder_add_object(&b,
-			SPA_TYPE_OBJECT_Format, SPA_PARAM_Format,
+		spa_pod_builder_push_object(&b, &f[0],
+			SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat);
+		spa_pod_builder_add(&b,
 			SPA_FORMAT_mediaType,      SPA_POD_Id(SPA_MEDIA_TYPE_application),
-			SPA_FORMAT_mediaSubtype,   SPA_POD_Id(SPA_MEDIA_SUBTYPE_control));
+			SPA_FORMAT_mediaSubtype,   SPA_POD_Id(SPA_MEDIA_SUBTYPE_control),
+			0);
+		if (port->control_types != 0) {
+			spa_pod_builder_add(&b,
+				SPA_FORMAT_CONTROL_types,  SPA_POD_Int(port->control_types),
+				0);
+		}
+		param = spa_pod_builder_pop(&b, &f[0]);
 		break;
 
 	case SPA_PARAM_Buffers:
@@ -955,7 +972,7 @@ impl_init(const struct spa_handle_factory *factory,
 	this->quantum_limit = 8192;
 	this->min_pool_size = 500;
 	this->max_pool_size = 2000;
-	this->ump = true;
+	this->ump = false;
 
 	for (i = 0; info && i < info->n_items; i++) {
 		const char *k = info->items[i].key;
diff --git a/spa/plugins/alsa/alsa-seq.c b/spa/plugins/alsa/alsa-seq.c
index 8a4ba369c..c25b49420 100644
--- a/spa/plugins/alsa/alsa-seq.c
+++ b/spa/plugins/alsa/alsa-seq.c
@@ -620,9 +620,8 @@ static int process_read(struct seq_state *state)
 {
 	struct seq_stream *stream = &state->streams[SPA_DIRECTION_OUTPUT];
 	const bool ump = state->ump;
-	uint32_t *data;
+	void *data;
 	uint8_t midi1_data[MAX_EVENT_SIZE];
-	uint32_t ump_data[MAX_EVENT_SIZE];
 	long size;
 	int res = -1;
 	struct seq_port *port;
@@ -633,9 +632,6 @@ static int process_read(struct seq_state *state)
 		uint64_t ev_time, diff;
 		uint32_t offset;
 		void *event;
-		uint8_t *midi1_ptr;
-		size_t midi1_size = 0;
-		uint64_t ump_state = 0;
 		snd_seq_event_type_t SPA_UNUSED type;
 
 		if (ump) {
@@ -702,7 +698,7 @@ static int process_read(struct seq_state *state)
 #ifdef HAVE_ALSA_UMP
 			snd_seq_ump_event_t *ev = event;
 
-			data = (uint32_t*)&ev->ump[0];
+			data = &ev->ump[0];
 			size = spa_ump_message_size(snd_ump_msg_hdr_type(ev->ump[0])) * 4;
 #else
 			spa_assert_not_reached();
@@ -715,34 +711,21 @@ static int process_read(struct seq_state *state)
 				spa_log_warn(state->log, "decode failed: %s", snd_strerror(size));
 				continue;
 			}
-
-			midi1_ptr = midi1_data;
-			midi1_size = size;
+			data = midi1_data;
 		}
 
-		do {
-			if (!ump) {
-				data = ump_data;
-				size = spa_ump_from_midi(&midi1_ptr, &midi1_size,
-						ump_data, sizeof(ump_data), 0, &ump_state);
-				if (size <= 0)
-					break;
-			}
+		spa_log_trace_fp(state->log, "event %d time:%"PRIu64" offset:%d size:%ld port:%d.%d",
+				type, ev_time, offset, size, addr->client, addr->port);
 
-			spa_log_trace_fp(state->log, "event %d time:%"PRIu64" offset:%d size:%ld port:%d.%d",
-					type, ev_time, offset, size, addr->client, addr->port);
+		spa_pod_builder_control(&port->builder, offset, ump ? SPA_CONTROL_UMP : SPA_CONTROL_Midi );
+		spa_pod_builder_bytes(&port->builder, data, size);
 
-			spa_pod_builder_control(&port->builder, offset, SPA_CONTROL_UMP);
-			spa_pod_builder_bytes(&port->builder, data, size);
-
-			/* make sure we can fit at least one control event of max size otherwise
-			 * we keep the event in the queue and try to copy it in the next cycle */
-			if (port->builder.state.offset +
-					sizeof(struct spa_pod_control) +
-					MAX_EVENT_SIZE > port->buffer->buf->datas[0].maxsize)
-				goto done;
-
-		} while (!ump);
+		/* make sure we can fit at least one control event of max size otherwise
+		 * we keep the event in the queue and try to copy it in the next cycle */
+		if (port->builder.state.offset +
+				sizeof(struct spa_pod_control) +
+				MAX_EVENT_SIZE > port->buffer->buf->datas[0].maxsize)
+			goto done;
         }
 
 done:
@@ -819,7 +802,6 @@ static int process_write(struct seq_state *state)
 		const void *c_body;
 		uint64_t out_time;
 		snd_seq_real_time_t out_rt;
-		bool first = true;
 
 		if (io->status != SPA_STATUS_HAVE_DATA ||
 		    io->buffer_id >= port->n_buffers)
@@ -844,9 +826,6 @@ static int process_write(struct seq_state *state)
 			size_t body_size;
 			uint8_t *body;
 
-			if (c.type != SPA_CONTROL_UMP)
-				continue;
-
 			body = (uint8_t*)c_body;
 			body_size = c.value.size;
 
@@ -861,6 +840,9 @@ static int process_write(struct seq_state *state)
 #ifdef HAVE_ALSA_UMP
 				snd_seq_ump_event_t ev;
 
+				if (c.type != SPA_CONTROL_UMP)
+					continue;
+
 				snd_seq_ump_ev_clear(&ev);
 				snd_seq_ev_set_ump_data(&ev, body, SPA_MIN(sizeof(ev.ump), (size_t)body_size));
 				snd_seq_ev_set_source(&ev, state->event.addr.port);
@@ -878,26 +860,26 @@ static int process_write(struct seq_state *state)
 #endif
 			} else {
 				snd_seq_event_t ev;
-				uint8_t data[MAX_EVENT_SIZE];
-				int size;
-				uint64_t st = 0;
+				int size = 0;
+				long s;
+
+				if (c.type != SPA_CONTROL_Midi)
+					continue;
 
 				while (body_size > 0) {
-					if ((size = spa_ump_to_midi((const uint32_t **)&body, &body_size,
-									data, sizeof(data), &st)) <= 0)
-						break;
-
-					if (first)
+					if (size == 0)
 						snd_seq_ev_clear(&ev);
 
-					if ((size = snd_midi_event_encode(stream->codec, data, size, &ev)) < 0) {
+					if ((s = snd_midi_event_encode(stream->codec, body, body_size, &ev)) < 0) {
 						spa_log_warn(state->log, "failed to encode event: %s",
 								snd_strerror(size));
 						snd_midi_event_reset_encode(stream->codec);
-						first = true;
+						size = 0;
 						continue;
 					}
-					first = false;
+					body += s;
+					body_size -= s;
+					size += s;
 					if (ev.type == SND_SEQ_EVENT_NONE)
 						/* this can happen when the event is not complete yet, like
 						 * a sysex message and we need to encode some more data. */
@@ -913,7 +895,7 @@ static int process_write(struct seq_state *state)
 						spa_log_warn(state->log, "failed to output event: %s",
 								snd_strerror(err));
 					}
-					first = true;
+					size = 0;
 				}
 			}
 		}
diff --git a/spa/plugins/alsa/alsa-seq.h b/spa/plugins/alsa/alsa-seq.h
index 354fa1d5d..3100b9587 100644
--- a/spa/plugins/alsa/alsa-seq.h
+++ b/spa/plugins/alsa/alsa-seq.h
@@ -82,6 +82,8 @@ struct seq_port {
 	struct spa_pod_builder builder;
 	struct spa_pod_frame frame;
 
+	uint32_t control_types;
+
 	struct spa_audio_info current_format;
 	unsigned int have_format:1;
 	unsigned int active:1;
diff --git a/src/modules/module-ffado-driver.c b/src/modules/module-ffado-driver.c
index 05b9218ce..c98b0efcd 100644
--- a/src/modules/module-ffado-driver.c
+++ b/src/modules/module-ffado-driver.c
@@ -345,34 +345,26 @@ static void midi_to_ffado(struct port *p, float *src, uint32_t n_samples)
 	p->event_pos = 0;
 
 	while (spa_pod_parser_get_control_body(&parser, &c, &c_body) >= 0) {
-		uint8_t data[16];
-		int j, size;
-		size_t c_size = c.value.size;
-		uint64_t state = 0;
+		uint32_t j, size = c.value.size;
+		const uint8_t *data = c_body;
 
-		if (c.type != SPA_CONTROL_UMP)
+		if (c.type != SPA_CONTROL_Midi)
 			continue;
 
 		if (index < c.offset)
 			index = SPA_ROUND_UP_N(c.offset, 8);
 
-		while (c_size > 0) {
-			size = spa_ump_to_midi((const uint32_t**)&c_body, &c_size, data, sizeof(data), &state);
-			if (size <= 0)
-				break;
-
-			for (j = 0; j < size; j++) {
-				if (index >= n_samples) {
-					/* keep events that don't fit for the next cycle */
-					if (p->event_pos < sizeof(p->event_buffer))
-						p->event_buffer[p->event_pos++] = data[j];
-					else
-						unhandled++;
-				}
+		for (j = 0; j < size; j++) {
+			if (index >= n_samples) {
+				/* keep events that don't fit for the next cycle */
+				if (p->event_pos < sizeof(p->event_buffer))
+					p->event_buffer[p->event_pos++] = data[j];
 				else
-					dst[index] = 0x01000000 | (uint32_t) data[j];
-				index += 8;
+					unhandled++;
 			}
+			else
+				dst[index] = 0x01000000 | (uint32_t) data[j];
+			index += 8;
 		}
 	}
 	if (unhandled > 0)
@@ -497,16 +489,8 @@ static void ffado_to_midi(struct port *p, float *dst, uint32_t *src, uint32_t si
 			continue;
 
 		if (process_byte(p, i, data & 0xff, &frame, &bytes, &size)) {
-			uint64_t state = 0;
-			while (size > 0) {
-				uint32_t ev[4];
-				int ev_size = spa_ump_from_midi(&bytes, &size, ev, sizeof(ev), 0, &state);
-				if (ev_size <= 0)
-					break;
-
-				spa_pod_builder_control(&b, frame, SPA_CONTROL_UMP);
-		                spa_pod_builder_bytes(&b, ev, ev_size);
-			}
+			spa_pod_builder_control(&b, frame, SPA_CONTROL_Midi);
+	                spa_pod_builder_bytes(&b, bytes, size);
 		}
         }
 	spa_pod_builder_pop(&b, &f);
diff --git a/src/modules/module-jack-tunnel.c b/src/modules/module-jack-tunnel.c
index 0c0cee034..4b22f7883 100644
--- a/src/modules/module-jack-tunnel.c
+++ b/src/modules/module-jack-tunnel.c
@@ -243,13 +243,16 @@ static inline void do_volume(float *dst, const float *src, struct volume *vol, u
 	}
 }
 
-static inline void fix_midi_event(uint8_t *data, size_t size)
+static inline bool fix_midi_event(const uint8_t *data, size_t size, uint8_t dst[3])
 {
 	/* fixup NoteOn with vel 0 */
 	if (size > 2 && (data[0] & 0xF0) == 0x90 && data[2] == 0x00) {
-		data[0] = 0x80 + (data[0] & 0x0F);
-		data[2] = 0x40;
+		dst[0] = 0x80 + (data[0] & 0x0F);
+		dst[1] = data[1];
+		dst[2] = 0x40;
+		return true;
 	}
+	return false;
 }
 
 static void midi_to_jack(struct impl *impl, float *dst, float *src, uint32_t n_samples)
@@ -260,9 +263,6 @@ static void midi_to_jack(struct impl *impl, float *dst, float *src, uint32_t n_s
 	struct spa_pod_control c;
 	const void *seq_body, *c_body;
 	int res;
-	bool in_sysex = false;
-	uint8_t tmp[n_samples * 4];
-	size_t tmp_size = 0;
 
 	jack.midi_clear_buffer(dst);
 	if (src == NULL)
@@ -274,36 +274,20 @@ static void midi_to_jack(struct impl *impl, float *dst, float *src, uint32_t n_s
 		return;
 
 	while (spa_pod_parser_get_control_body(&parser, &c, &c_body) >= 0) {
-		int size;
-		size_t c_size = c.value.size;
-		uint64_t state = 0;
+		uint32_t size = c.value.size;
+		const uint8_t *data = c_body;
+		uint8_t tmp[3];
 
-		if (c.type != SPA_CONTROL_UMP)
+		if (c.type != SPA_CONTROL_Midi)
 			continue;
 
-		while (c_size > 0) {
-			size = spa_ump_to_midi((const uint32_t**)&c_body, &c_size,
-					&tmp[tmp_size], sizeof(tmp) - tmp_size, &state);
-			if (size <= 0)
-				break;
-
-			if (impl->fix_midi)
-				fix_midi_event(&tmp[tmp_size], size);
-
-			if (!in_sysex && tmp[tmp_size] == 0xf0)
-				in_sysex = true;
-
-			tmp_size += size;
-			if (in_sysex && tmp[tmp_size-1] == 0xf7)
-				in_sysex = false;
-
-			if (!in_sysex) {
-				if ((res = jack.midi_event_write(dst, c.offset, tmp, tmp_size)) < 0)
-					pw_log_warn("midi %p: can't write event: %s", dst,
-							spa_strerror(res));
-				tmp_size = 0;
-			}
+		if (impl->fix_midi && fix_midi_event(data, size, tmp)) {
+			data = tmp;
+			size = 3;
 		}
+		if ((res = jack.midi_event_write(dst, c.offset, data, size)) < 0)
+			pw_log_warn("midi %p: can't write event: %s", dst,
+					spa_strerror(res));
 	}
 }
 
@@ -319,19 +303,11 @@ static void jack_to_midi(float *dst, float *src, uint32_t size)
 	spa_pod_builder_push_sequence(&b, &f, 0);
 	for (i = 0; i < count; i++) {
 		jack_midi_event_t ev;
-		uint64_t state = 0;
 
 		jack.midi_event_get(&ev, src, i);
 
-		while (ev.size > 0) {
-			uint32_t ump[4];
-			int ump_size = spa_ump_from_midi(&ev.buffer, &ev.size, ump, sizeof(ump), 0, &state);
-			if (ump_size <= 0)
-				break;
-
-			spa_pod_builder_control(&b, ev.time, SPA_CONTROL_UMP);
-	                spa_pod_builder_bytes(&b, ump, ump_size);
-		}
+		spa_pod_builder_control(&b, ev.time, SPA_CONTROL_Midi);
+		spa_pod_builder_bytes(&b, ev.buffer, ev.size);
 	}
 	spa_pod_builder_pop(&b, &f);
 }
diff --git a/src/modules/module-netjack2/peer.c b/src/modules/module-netjack2/peer.c
index eacc1c95b..0486bcfe1 100644
--- a/src/modules/module-netjack2/peer.c
+++ b/src/modules/module-netjack2/peer.c
@@ -235,13 +235,16 @@ struct data_info {
 	bool filled;
 };
 
-static inline void fix_midi_event(uint8_t *data, size_t size)
+static inline bool fix_midi_event(const uint8_t *data, size_t size, uint8_t tmp[3])
 {
 	/* fixup NoteOn with vel 0 */
 	if (size > 2 && (data[0] & 0xF0) == 0x90 && data[2] == 0x00) {
-		data[0] = 0x80 + (data[0] & 0x0F);
-		data[2] = 0x40;
+		tmp[0] = 0x80 + (data[0] & 0x0F);
+		tmp[1] = data[1];
+		tmp[2] = 0x40;
+		return true;
 	}
+	return false;
 }
 
 static inline void *n2j_midi_buffer_reserve(struct nj2_midi_buffer *buf,
@@ -273,7 +276,7 @@ static inline void *n2j_midi_buffer_reserve(struct nj2_midi_buffer *buf,
 }
 
 static inline void n2j_midi_buffer_write(struct nj2_midi_buffer *buf,
-		uint32_t offset, void *data, uint32_t size)
+		uint32_t offset, const void *data, uint32_t size)
 {
 	void *ptr = n2j_midi_buffer_reserve(buf, offset, size);
 	if (ptr != NULL)
@@ -314,7 +317,6 @@ static void midi_to_netjack2(struct netjack2_peer *peer,
 	struct spa_pod_sequence seq;
 	struct spa_pod_control c;
 	const void *seq_body, *c_body;
-	bool in_sysex = false;
 
 	buf->magic = MIDI_BUFFER_MAGIC;
 	buf->buffer_size = peer->params.period_size * sizeof(float);
@@ -332,39 +334,22 @@ static void midi_to_netjack2(struct netjack2_peer *peer,
 		return;
 
 	while (spa_pod_parser_get_control_body(&parser, &c, &c_body) >= 0) {
-		int size;
-		uint8_t data[16];
-		bool was_sysex = in_sysex;
-		size_t c_size = c.value.size;
-		uint64_t state = 0;
+		uint32_t size = c.value.size;
+		const uint8_t *data = c_body;
+		uint8_t tmp[3];
 
-		if (c.type != SPA_CONTROL_UMP)
+		if (c.type != SPA_CONTROL_Midi)
 			continue;
 
-		while (c_size > 0) {
-			size = spa_ump_to_midi((const uint32_t**)&c_body, &c_size, data, sizeof(data), &state);
-			if (size <= 0)
-				break;
-
-			if (c.offset >= n_samples) {
-				buf->lost_events++;
-				continue;
-			}
-
-			if (!in_sysex && data[0] == 0xf0)
-				in_sysex = true;
-
-			if (!in_sysex && peer->fix_midi)
-				fix_midi_event(data, size);
-
-			if (in_sysex && data[size-1] == 0xf7)
-				in_sysex = false;
-
-			if (was_sysex)
-				n2j_midi_buffer_append(buf, data, size);
-			else
-				n2j_midi_buffer_write(buf, c.offset, data, size);
+		if (c.offset >= n_samples) {
+			buf->lost_events++;
+			continue;
 		}
+		if (peer->fix_midi && fix_midi_event(data, size, tmp)) {
+			data = tmp;
+			size = 3;
+		}
+		n2j_midi_buffer_write(buf, c.offset, data, size);
 	}
 	if (buf->write_pos > 0)
 		memmove(SPA_PTROFF(buf, sizeof(*buf) + buf->event_count * sizeof(struct nj2_midi_event), void),
@@ -395,8 +380,6 @@ static inline void netjack2_to_midi(float *dst, uint32_t size, struct nj2_midi_b
 	for (i = 0; i < buf->event_count; i++) {
 		struct nj2_midi_event *ev = &buf->event[i];
 		uint8_t *data;
-		size_t s;
-		uint64_t state = 0;
 
 		if (ev->size <= MIDI_INLINE_MAX)
 			data = ev->buffer;
@@ -405,17 +388,8 @@ static inline void netjack2_to_midi(float *dst, uint32_t size, struct nj2_midi_b
 		else
 			continue;
 
-		s = ev->size;
-		while (s > 0) {
-			uint32_t ump[4];
-			int ump_size = spa_ump_from_midi(&data, &s, ump, sizeof(ump), 0, &state);
-			if (ump_size <= 0) {
-				pw_log_warn("invalid MIDI received: %s", spa_strerror(ump_size));
-				break;
-			}
-			spa_pod_builder_control(&b, ev->time, SPA_CONTROL_UMP);
-	                spa_pod_builder_bytes(&b, ump, ump_size);
-		}
+		spa_pod_builder_control(&b, ev->time, SPA_CONTROL_Midi);
+                spa_pod_builder_bytes(&b, data, ev->size);
 	}
 	spa_pod_builder_pop(&b, &f);
 }
diff --git a/src/modules/module-rtp/midi.c b/src/modules/module-rtp/midi.c
index 5fbdf3b63..d5c55740d 100644
--- a/src/modules/module-rtp/midi.c
+++ b/src/modules/module-rtp/midi.c
@@ -271,9 +271,6 @@ static int rtp_midi_receive_midi(struct impl *impl, uint8_t *packet, uint32_t ti
 	while (offs < end) {
 		uint32_t delta;
 		int size;
-		uint64_t state = 0;
-		uint8_t *d;
-		size_t s;
 
 		if (first && !hdr.z)
 			delta = 0;
@@ -294,17 +291,9 @@ static int rtp_midi_receive_midi(struct impl *impl, uint8_t *packet, uint32_t ti
 			return -EINVAL;
 		}
 
-		d = &packet[offs];
-		s = size;
-		while (s > 0) {
-			uint32_t ump[4];
-			int ump_size = spa_ump_from_midi(&d, &s, ump, sizeof(ump), 0, &state);
-			if (ump_size <= 0)
-				break;
+		spa_pod_builder_control(&b, timestamp, SPA_CONTROL_Midi);
+		spa_pod_builder_bytes(&b, &packet[offs], size);
 
-			spa_pod_builder_control(&b, timestamp, SPA_CONTROL_UMP);
-	                spa_pod_builder_bytes(&b, ump, ump_size);
-		}
 		offs += size;
 		first = false;
 	}
@@ -378,7 +367,7 @@ unexpected_ssrc:
 	return -EINVAL;
 }
 
-static int write_event(uint8_t *p, uint32_t buffer_size, uint32_t value, void *ev, uint32_t size)
+static int write_event(uint8_t *p, uint32_t buffer_size, uint32_t value, const void *ev, uint32_t size)
 {
         uint64_t buffer;
         uint8_t b;
@@ -437,62 +426,54 @@ static void rtp_midi_flush_packets(struct impl *impl,
 
 	while (spa_pod_parser_get_control_body(parser, &c, &c_body) >= 0) {
 		uint32_t delta, offset;
-		uint8_t event[16];
-		int size;
-		size_t c_size = c.value.size;
-		uint64_t state = 0;
+		uint32_t size = c.value.size;
+		const uint8_t *data = c_body;
 
-		if (c.type != SPA_CONTROL_UMP)
+		if (c.type != SPA_CONTROL_Midi)
 			continue;
 
-		while (c_size > 0) {
-			size = spa_ump_to_midi((const uint32_t **)&c_body, &c_size, event, sizeof(event), &state);
-			if (size <= 0)
-				break;
+		offset = c.offset * impl->rate / rate;
 
-			offset = c.offset * impl->rate / rate;
-
-			if (len > 0 && (len + size > max_size ||
-			    offset - base > impl->psamples)) {
-				/* flush packet when we have one and when it's either
-				 * too large or has too much data. */
-				if (len < 16) {
-					midi_header.b = 0;
-					midi_header.len = len;
-					iov[1].iov_len = sizeof(midi_header) - 1;
-				} else {
-					midi_header.b = 1;
-					midi_header.len = (len >> 8) & 0xf;
-					midi_header.len_b = len & 0xff;
-					iov[1].iov_len = sizeof(midi_header);
-				}
-				iov[2].iov_len = len;
-
-				pw_log_trace("sending %d timestamp:%d %u %u",
-						len, timestamp + base,
-						offset, impl->psamples);
-				rtp_stream_emit_send_packet(impl, iov, 3);
-
-				impl->seq++;
-				len = 0;
-			}
-			if ((unsigned int)size > BUFFER_SIZE || len > BUFFER_SIZE - size) {
-				pw_log_error("Buffer overflow prevented!");
-				return; // FIXME: what to do instead?
-			}
-			if (len == 0) {
-				/* start new packet */
-				base = prev_offset = offset;
-				header.sequence_number = htons(impl->seq);
-				header.timestamp = htonl(impl->ts_offset + timestamp + base);
-
-				memcpy(&impl->buffer[len], event, size);
-				len += size;
+		if (len > 0 && (len + size > max_size ||
+		    offset - base > impl->psamples)) {
+			/* flush packet when we have one and when it's either
+			 * too large or has too much data. */
+			if (len < 16) {
+				midi_header.b = 0;
+				midi_header.len = len;
+				iov[1].iov_len = sizeof(midi_header) - 1;
 			} else {
-				delta = offset - prev_offset;
-				prev_offset = offset;
-				len += write_event(&impl->buffer[len], BUFFER_SIZE - len, delta, event, size);
+				midi_header.b = 1;
+				midi_header.len = (len >> 8) & 0xf;
+				midi_header.len_b = len & 0xff;
+				iov[1].iov_len = sizeof(midi_header);
 			}
+			iov[2].iov_len = len;
+
+			pw_log_trace("sending %d timestamp:%d %u %u",
+					len, timestamp + base,
+					offset, impl->psamples);
+			rtp_stream_emit_send_packet(impl, iov, 3);
+
+			impl->seq++;
+			len = 0;
+		}
+		if ((unsigned int)size > BUFFER_SIZE || len > BUFFER_SIZE - size) {
+			pw_log_error("Buffer overflow prevented!");
+			return; // FIXME: what to do instead?
+		}
+		if (len == 0) {
+			/* start new packet */
+			base = prev_offset = offset;
+			header.sequence_number = htons(impl->seq);
+			header.timestamp = htonl(impl->ts_offset + timestamp + base);
+
+			memcpy(&impl->buffer[len], data, size);
+			len += size;
+		} else {
+			delta = offset - prev_offset;
+			prev_offset = offset;
+			len += write_event(&impl->buffer[len], BUFFER_SIZE - len, delta, data, size);
 		}
 	}
 	if (len > 0) {
diff --git a/src/modules/module-vban/midi.c b/src/modules/module-vban/midi.c
index f460bd274..484902448 100644
--- a/src/modules/module-vban/midi.c
+++ b/src/modules/module-vban/midi.c
@@ -163,9 +163,6 @@ static int vban_midi_receive_midi(struct impl *impl, uint8_t *packet,
 
 	while (offs < plen) {
 		int size;
-		uint8_t *midi_data;
-		size_t midi_size;
-		uint64_t midi_state = 0;
 
 		size = get_midi_size(&packet[offs], plen - offs);
 		if (size <= 0 || offs + size > plen) {
@@ -174,18 +171,9 @@ static int vban_midi_receive_midi(struct impl *impl, uint8_t *packet,
 			break;
 		}
 
-		midi_data = &packet[offs];
-		midi_size = size;
-		while (midi_size > 0) {
-			uint32_t ump[4];
-			int ump_size = spa_ump_from_midi(&midi_data, &midi_size,
-					ump, sizeof(ump), 0, &midi_state);
-			if (ump_size <= 0)
-				break;
+		spa_pod_builder_control(&b, timestamp, SPA_CONTROL_Midi);
+	        spa_pod_builder_bytes(&b, &packet[offs], size);
 
-			spa_pod_builder_control(&b, timestamp, SPA_CONTROL_UMP);
-	                spa_pod_builder_bytes(&b, ump, ump_size);
-		}
 		offs += size;
 	}
 	spa_pod_builder_pop(&b, &f[0]);
@@ -237,34 +225,25 @@ static void vban_midi_flush_packets(struct impl *impl,
 	len = 0;
 
 	while (spa_pod_parser_get_control_body(parser, &c, &c_body) >= 0) {
-		int size;
-		uint8_t event[16];
-		uint64_t state = 0;
-		size_t c_size = c.value.size;
+		uint32_t size = c.value.size;
+		const void *data = c_body;
 
-		if (c.type != SPA_CONTROL_UMP)
+		if (c.type != SPA_CONTROL_Midi)
 			continue;
 
-		while (c_size > 0) {
-			size = spa_ump_to_midi((const uint32_t**)&c_body,
-					&c_size, event, sizeof(event), &state);
-			if (size <= 0)
-				break;
+		if (len == 0) {
+			/* start new packet */
+			header.n_frames++;
+		} else if (len + size > impl->mtu) {
+			/* flush packet when we have one and when it's too large */
+			iov[1].iov_len = len;
 
-			if (len == 0) {
-				/* start new packet */
-				header.n_frames++;
-			} else if (len + size > impl->mtu) {
-				/* flush packet when we have one and when it's too large */
-				iov[1].iov_len = len;
-
-				pw_log_debug("sending %d", len);
-				vban_stream_emit_send_packet(impl, iov, 2);
-				len = 0;
-			}
-			memcpy(&impl->buffer[len], event, size);
-			len += size;
+			pw_log_debug("sending %d", len);
+			vban_stream_emit_send_packet(impl, iov, 2);
+			len = 0;
 		}
+		memcpy(&impl->buffer[len], data, size);
+		len += size;
 	}
 	if (len > 0) {
 		/* flush last packet */

From 7fe191bc1095141631a5ef7bba390011fba43ce3 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 25 Mar 2026 11:10:50 +0100
Subject: [PATCH 240/263] buffers: handle 0 result from Buffers param
 enumeration

Since abf37dbddef96518f7e93f39d910fd4e38cc887b the param enumeration in
the client-node can return 0 when the parameter is supported but there
are no params uploaded.

When negotiating buffers we need to assume a 0 result as a NULL filter
as well or else we will error.
---
 src/pipewire/buffers.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pipewire/buffers.c b/src/pipewire/buffers.c
index db1a01551..ac3911f33 100644
--- a/src/pipewire/buffers.c
+++ b/src/pipewire/buffers.c
@@ -146,8 +146,11 @@ param_filter(struct pw_buffers *this,
 		if (in_res < 1) {
 			/* in_res == -ENOENT  : unknown parameter, assume NULL and we will
 			 *                      exit the loop below.
-			 * in_res < 1         : some error or no data, exit now
+			 * in_res == 0        : no data, assume NULL
+			 * in_res < 0         : some error, exit now
 			 */
+			if (in_res == 0)
+				in_res = -ENOENT;
 			if (in_res == -ENOENT)
 				iparam = NULL;
 			else
@@ -163,6 +166,8 @@ param_filter(struct pw_buffers *this,
 						id, &oidx, iparam, &oparam, result);
 
 			/* out_res < 1 : no value or error, exit now */
+			if (out_res == 0)
+				out_res = -ENOENT;
 			if (out_res < 1)
 				break;
 

From 9eeb2f193029e014f6b0eb97813003a184d9a0c0 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 25 Mar 2026 11:47:01 +0100
Subject: [PATCH 241/263] mixer: handle control.ump property

Add a control.ump port property. When true, the port wants UMP and the
mixer will convert to it. When false, the port supports both UMP and
Midi1 and no conversions will happen. When unset, the mixer will always
convert UMP to midi1.

Remove the CONTROL_types property from the filter. This causes problems
because this is the format negotiated with peers, which might not
support the types but can still be linked because the mixer will
convert.

The control.ump port property is supposed to be a temporary fix until we
can negotiate the mixer ports properly with the CONTROL_types.

Remove UMP handling from bluetooth midi, just use the raw Midi1 events
now that the mixer will give those and we are supposed to output our
unconverted format.

Fix midi events in-place in netjack because we can.

Update docs and pw-mididump to note that we are back to midi1 as the
default format.

With this, most of the midi<->UMP conversion should be gone again and we
should be able to avoid conversion problems in ALSA and PipeWire.

Fixes #5183
---
 doc/dox/internals/midi.dox                   | 22 ++++---
 spa/plugins/alsa/alsa-seq-bridge.c           |  5 +-
 spa/plugins/bluez5/midi-node.c               | 64 +++++++-------------
 spa/plugins/control/mixer.c                  | 17 +++++-
 src/modules/module-client-node/client-node.c |  1 -
 src/modules/module-netjack2/peer.c           | 49 +++------------
 src/pipewire/filter.c                        |  7 ++-
 src/pipewire/impl-port.c                     | 17 +++---
 src/tools/pw-mididump.c                      | 11 ++--
 9 files changed, 88 insertions(+), 105 deletions(-)

diff --git a/doc/dox/internals/midi.dox b/doc/dox/internals/midi.dox
index 4c86c516b..e89b24578 100644
--- a/doc/dox/internals/midi.dox
+++ b/doc/dox/internals/midi.dox
@@ -62,6 +62,13 @@ As of 1.4, SPA_CONTROL_UMP (Universal Midi Packet) is the prefered format
 for the MIDI 1.0 and 2.0 messages in the \ref spa_pod_sequence. Conversion
 to SPA_CONTROL_Midi is performed for legacy applications.
 
+As of 1.7 the prefered format is Midi1 again because most devices and
+applications are still Midi1 and conversions between Midi1 and UMP are not
+completely transparent in ALSA and PipeWire. UMP in the ALSA sequencer
+and consumers must be enabled explicitly. UMP in producers is supported
+still and will be converted to Midi1 by all consumers that did not explicitly
+enable UMP support.
+
 ## The PipeWire Daemon
 
 Nothing special is implemented for MIDI. Negotiation of formats
@@ -104,13 +111,14 @@ filtering out the \ref SPA_CONTROL_Midi, \ref SPA_CONTROL_OSC and
 \ref SPA_CONTROL_UMP types. On output ports, the JACK event stream is
 converted to control messages in a similar way.
 
-Normally, all MIDI and UMP messages are converted to MIDI1 jack events unless
-the JACK port was created with an explcit "32 bit raw UMP" format or with
-the JackPortIsMIDI2 flag, in which case the raw UMP is passed to the JACK
-application directly. For output ports,
-the JACK events are assumed to be MIDI1 and converted to UMP unless the port
-has the "32 bit raw UMP" format or the JackPortIsMIDI2 flag, in which case
-the UMP messages are simply passed on.
+Normally, all MIDI and UMP input messages are converted to MIDI1 jack
+events unless the JACK port was created with an explcit "32 bit raw UMP"
+format or with the JackPortIsMIDI2 flag, in which case the messages are
+converted to UMP or passed on directly.
+
+For output ports, the JACK events are assumed to be
+MIDI1 unless the port has the "32 bit raw UMP" format or the JackPortIsMIDI2
+flag, in which case the control messages are assumed to be UMP.
 
 There is a 1 to 1 mapping between the JACK events and control
 messages so there is no information loss or need for complicated
diff --git a/spa/plugins/alsa/alsa-seq-bridge.c b/spa/plugins/alsa/alsa-seq-bridge.c
index ffd9e98d8..d5b0019a8 100644
--- a/spa/plugins/alsa/alsa-seq-bridge.c
+++ b/spa/plugins/alsa/alsa-seq-bridge.c
@@ -227,7 +227,7 @@ static void emit_port_info(struct seq_state *this, struct seq_port *port, bool f
 	if (full)
 		port->info.change_mask = port->info_all;
 	if (port->info.change_mask) {
-		struct spa_dict_item items[6];
+		struct spa_dict_item items[7];
 		uint32_t n_items = 0;
 		int card_id;
 		snd_seq_port_info_t *info;
@@ -284,6 +284,9 @@ static void emit_port_info(struct seq_state *this, struct seq_port *port, bool f
 			snprintf(card, sizeof(card), "%d", card_id);
 			items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_API_ALSA_CARD, card);
 		}
+		if (this->ump)
+			items[n_items++] = SPA_DICT_ITEM_INIT("control.ump", "true");
+
 		port->info.props = &SPA_DICT_INIT(items, n_items);
 
 		spa_node_emit_port_info(&this->hooks,
diff --git a/spa/plugins/bluez5/midi-node.c b/spa/plugins/bluez5/midi-node.c
index 7146d6f8a..671035b34 100644
--- a/spa/plugins/bluez5/midi-node.c
+++ b/spa/plugins/bluez5/midi-node.c
@@ -23,7 +23,6 @@
 #include <spa/utils/ringbuffer.h>
 #include <spa/monitor/device.h>
 #include <spa/control/control.h>
-#include <spa/control/ump-utils.h>
 
 #include <spa/node/node.h>
 #include <spa/node/utils.h>
@@ -450,7 +449,7 @@ static void midi_event_recv(void *user_data, uint16_t timestamp, uint8_t *data,
 	struct impl *this = user_data;
 	struct port *port = &this->ports[PORT_OUT];
 	struct time_sync *sync = &port->sync;
-	uint64_t time, state = 0;
+	uint64_t time;
 	int res;
 
 	spa_assert(size > 0);
@@ -460,19 +459,11 @@ static void midi_event_recv(void *user_data, uint16_t timestamp, uint8_t *data,
 	spa_log_trace(this->log, "%p: event:0x%x size:%d timestamp:%d time:%"PRIu64"",
 			this, (int)data[0], (int)size, (int)timestamp, (uint64_t)time);
 
-	while (size > 0) {
-		uint32_t ump[4];
-		int ump_size = spa_ump_from_midi(&data, &size,
-					ump, sizeof(ump), 0, &state);
-		if (ump_size <= 0)
-			break;
-
-		res = midi_event_ringbuffer_push(&this->event_rbuf, time, (uint8_t*)ump, ump_size);
-		if (res < 0) {
-			midi_event_ringbuffer_init(&this->event_rbuf);
-			spa_log_warn(this->log, "%p: MIDI receive buffer overflow: %s",
-					this, spa_strerror(res));
-		}
+	res = midi_event_ringbuffer_push(&this->event_rbuf, time, data, size);
+	if (res < 0) {
+		midi_event_ringbuffer_init(&this->event_rbuf);
+		spa_log_warn(this->log, "%p: MIDI receive buffer overflow: %s",
+				this, spa_strerror(res));
 	}
 }
 
@@ -713,7 +704,7 @@ static int process_output(struct impl *this)
 			offset = time * this->rate / SPA_NSEC_PER_SEC;
 			offset = SPA_CLAMP(offset, 0u, this->duration - 1);
 
-			spa_pod_builder_control(&port->builder, offset, SPA_CONTROL_UMP);
+			spa_pod_builder_control(&port->builder, offset, SPA_CONTROL_Midi);
 			buf = spa_pod_builder_reserve_bytes(&port->builder, size);
 			if (buf) {
 				midi_event_ringbuffer_pop(&this->event_rbuf, buf, size);
@@ -786,37 +777,28 @@ static int write_data(struct impl *this, struct spa_data *d)
 	time = 0;
 
 	while (spa_pod_parser_get_control_body(&parser, &c, &c_body) >= 0) {
-		int size;
-		uint8_t event[32];
-		const uint32_t *ump = c_body;
-		size_t ump_size = c.value.size;
-		uint64_t state = 0;
+		const uint8_t *event = c_body;
+		uint32_t size = c.value.size;
 
-		if (c.type != SPA_CONTROL_UMP)
+		if (c.type != SPA_CONTROL_Midi)
 			continue;
 
 		time = SPA_MAX(time, this->current_time + c.offset * SPA_NSEC_PER_SEC / this->rate);
 
-		while (ump_size > 0) {
-			size = spa_ump_to_midi(&ump, &ump_size, event, sizeof(event), &state);
-			if (size <= 0)
-				break;
+		spa_log_trace(this->log, "%p: output event:0x%x time:%"PRIu64, this,
+				(size > 0) ? event[0] : 0, time);
 
-			spa_log_trace(this->log, "%p: output event:0x%x time:%"PRIu64, this,
-					(size > 0) ? event[0] : 0, time);
-
-			do {
-				res = spa_bt_midi_writer_write(&this->writer,
-						time, event, size);
-				if (res < 0) {
-					return res;
-				} else if (res) {
-					int res2;
-					if ((res2 = flush_packet(this)) < 0)
-						return res2;
-				}
-			} while (res);
-		}
+		do {
+			res = spa_bt_midi_writer_write(&this->writer,
+					time, event, size);
+			if (res < 0) {
+				return res;
+			} else if (res) {
+				int res2;
+				if ((res2 = flush_packet(this)) < 0)
+					return res2;
+			}
+		} while (res);
 	}
 
 	if ((res = flush_packet(this)) < 0)
diff --git a/spa/plugins/control/mixer.c b/spa/plugins/control/mixer.c
index b9d57c1e6..1b106d3f7 100644
--- a/spa/plugins/control/mixer.c
+++ b/spa/plugins/control/mixer.c
@@ -72,6 +72,7 @@ struct impl {
 	struct spa_node node;
 
 	uint32_t quantum_limit;
+	uint32_t control_types;
 
 	struct spa_log *log;
 
@@ -473,9 +474,9 @@ static int port_set_format(void *object,
 		if (!port->have_format) {
 			this->n_formats++;
 			port->have_format = true;
-			port->types = types;
-			spa_log_debug(this->log, "%p: set format on port %d:%d",
-					this, direction, port_id);
+			port->types = types == 0 ? this->control_types : types;
+			spa_log_debug(this->log, "%p: set format on port %d:%d types:%08x %08x",
+					this, direction, port_id, port->types, this->control_types);
 		}
 	}
 	port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
@@ -955,6 +956,8 @@ impl_init(const struct spa_handle_factory *factory,
 	}
 
 	this->quantum_limit = 8192;
+	/* by default we convert to midi1 */
+	this->control_types = 1u<<SPA_CONTROL_Midi;
 
 	for (i = 0; info && i < info->n_items; i++) {
 		const char *k = info->items[i].key;
@@ -962,6 +965,14 @@ impl_init(const struct spa_handle_factory *factory,
 		if (spa_streq(k, "clock.quantum-limit")) {
 			spa_atou32(s, &this->quantum_limit, 0);
 		}
+		else if (spa_streq(k, "control.ump")) {
+			if (spa_atob(s))
+				/* we convert to UMP when forced */
+				this->control_types = 1u<<SPA_CONTROL_UMP;
+			else
+				/* when unforced we let both midi1 and UMP through */
+				this->control_types = 0;
+		}
 	}
 
 	spa_hook_list_init(&this->hooks);
diff --git a/src/modules/module-client-node/client-node.c b/src/modules/module-client-node/client-node.c
index bd9a1dde2..14fda3a77 100644
--- a/src/modules/module-client-node/client-node.c
+++ b/src/modules/module-client-node/client-node.c
@@ -641,7 +641,6 @@ node_port_enum_params(struct impl *impl, int seq,
 		if (count == num)
 			break;
 	}
-
 	return 0;
 }
 
diff --git a/src/modules/module-netjack2/peer.c b/src/modules/module-netjack2/peer.c
index 0486bcfe1..7547cc5b2 100644
--- a/src/modules/module-netjack2/peer.c
+++ b/src/modules/module-netjack2/peer.c
@@ -235,16 +235,13 @@ struct data_info {
 	bool filled;
 };
 
-static inline bool fix_midi_event(const uint8_t *data, size_t size, uint8_t tmp[3])
+static inline void fix_midi_event(uint8_t *data, size_t size)
 {
 	/* fixup NoteOn with vel 0 */
 	if (size > 2 && (data[0] & 0xF0) == 0x90 && data[2] == 0x00) {
-		tmp[0] = 0x80 + (data[0] & 0x0F);
-		tmp[1] = data[1];
-		tmp[2] = 0x40;
-		return true;
+		data[0] = 0x80 + (data[0] & 0x0F);
+		data[2] = 0x40;
 	}
-	return false;
 }
 
 static inline void *n2j_midi_buffer_reserve(struct nj2_midi_buffer *buf,
@@ -276,39 +273,18 @@ static inline void *n2j_midi_buffer_reserve(struct nj2_midi_buffer *buf,
 }
 
 static inline void n2j_midi_buffer_write(struct nj2_midi_buffer *buf,
-		uint32_t offset, const void *data, uint32_t size)
+		uint32_t offset, const void *data, uint32_t size, bool fix)
 {
-	void *ptr = n2j_midi_buffer_reserve(buf, offset, size);
-	if (ptr != NULL)
+	uint8_t *ptr = n2j_midi_buffer_reserve(buf, offset, size);
+	if (ptr != NULL) {
 		memcpy(ptr, data, size);
+		if (fix)
+			fix_midi_event(ptr, size);
+	}
 	else
 		buf->lost_events++;
 }
 
-static inline void n2j_midi_buffer_append(struct nj2_midi_buffer *buf,
-		void *data, uint32_t size)
-{
-	struct nj2_midi_event *ev;
-	uint32_t old_size;
-	uint8_t *old_ptr, *new_ptr;
-
-	ev = &buf->event[--buf->event_count];
-	old_size = ev->size;
-	if (old_size <= MIDI_INLINE_MAX) {
-		old_ptr = ev->buffer;
-	} else {
-		buf->write_pos -= old_size;
-		old_ptr = SPA_PTROFF(buf, ev->offset, void);
-	}
-	new_ptr = n2j_midi_buffer_reserve(buf, ev->time, old_size + size);
-	if (new_ptr == NULL) {
-		buf->lost_events++;
-	} else {
-		memmove(new_ptr, old_ptr, old_size);
-		memcpy(new_ptr+old_size, data, size);
-	}
-}
-
 static void midi_to_netjack2(struct netjack2_peer *peer,
 		struct nj2_midi_buffer *buf, float *src, uint32_t n_samples)
 {
@@ -336,7 +312,6 @@ static void midi_to_netjack2(struct netjack2_peer *peer,
 	while (spa_pod_parser_get_control_body(&parser, &c, &c_body) >= 0) {
 		uint32_t size = c.value.size;
 		const uint8_t *data = c_body;
-		uint8_t tmp[3];
 
 		if (c.type != SPA_CONTROL_Midi)
 			continue;
@@ -345,11 +320,7 @@ static void midi_to_netjack2(struct netjack2_peer *peer,
 			buf->lost_events++;
 			continue;
 		}
-		if (peer->fix_midi && fix_midi_event(data, size, tmp)) {
-			data = tmp;
-			size = 3;
-		}
-		n2j_midi_buffer_write(buf, c.offset, data, size);
+		n2j_midi_buffer_write(buf, c.offset, data, size, peer->fix_midi);
 	}
 	if (buf->write_pos > 0)
 		memmove(SPA_PTROFF(buf, sizeof(*buf) + buf->event_count * sizeof(struct nj2_midi_event), void),
diff --git a/src/pipewire/filter.c b/src/pipewire/filter.c
index 85d16a6b1..1b8297935 100644
--- a/src/pipewire/filter.c
+++ b/src/pipewire/filter.c
@@ -1793,11 +1793,13 @@ static void add_control_dsp_port_params(struct filter *impl, struct port *port,
 		SPA_FORMAT_mediaType,      SPA_POD_Id(SPA_MEDIA_TYPE_application),
 		SPA_FORMAT_mediaSubtype,   SPA_POD_Id(SPA_MEDIA_SUBTYPE_control),
 		0);
+#if 0
 	if (types != 0) {
 		spa_pod_builder_add(&b,
 			SPA_FORMAT_CONTROL_types, SPA_POD_CHOICE_FLAGS_Int(types),
 			0);
 	}
+#endif
 	add_param(impl, port, SPA_PARAM_EnumFormat, PARAM_FLAG_LOCKED,
 			spa_pod_builder_pop(&b, &f[0]));
 }
@@ -1857,10 +1859,13 @@ void *pw_filter_add_port(struct pw_filter *filter,
 			add_video_dsp_port_params(impl, p);
 		else if (spa_streq(str, "8 bit raw midi"))
 			add_control_dsp_port_params(impl, p, 1u << SPA_CONTROL_Midi);
-		else if (spa_streq(str, "8 bit raw control"))
+		else if (spa_streq(str, "8 bit raw control")) {
 			add_control_dsp_port_params(impl, p, 0);
+			pw_properties_set(props, "control.ump", "false");
+		}
 		else if (spa_streq(str, "32 bit raw UMP")) {
 			add_control_dsp_port_params(impl, p, 1u << SPA_CONTROL_UMP);
+			pw_properties_set(props, "control.ump", "true");
 			pw_properties_set(props, PW_KEY_FORMAT_DSP, "8 bit raw midi");
 		}
 	}
diff --git a/src/pipewire/impl-port.c b/src/pipewire/impl-port.c
index 1e1d023b9..25dbdf718 100644
--- a/src/pipewire/impl-port.c
+++ b/src/pipewire/impl-port.c
@@ -1094,11 +1094,11 @@ int pw_impl_port_set_mix(struct pw_impl_port *port, struct spa_node *node, uint3
 
 static int setup_mixer(struct pw_impl_port *port, const struct spa_pod *param)
 {
-	uint32_t media_type, media_subtype;
+	uint32_t media_type, media_subtype, n_items;
 	int res;
-	const char *fallback_lib, *factory_name;
+	const char *fallback_lib, *factory_name, *str;
 	struct spa_handle *handle;
-	struct spa_dict_item items[3];
+	struct spa_dict_item items[4];
 	char quantum_limit[16];
 	void *iface;
 	struct pw_context *context = port->node->context;
@@ -1150,14 +1150,17 @@ static int setup_mixer(struct pw_impl_port *port, const struct spa_pod *param)
 		return -ENOTSUP;
 	}
 
-	items[0] = SPA_DICT_ITEM_INIT(SPA_KEY_LIBRARY_NAME, fallback_lib);
+	n_items = 0;
+	items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_LIBRARY_NAME, fallback_lib);
 	spa_scnprintf(quantum_limit, sizeof(quantum_limit), "%u",
 			context->settings.clock_quantum_limit);
-	items[1] = SPA_DICT_ITEM_INIT("clock.quantum-limit", quantum_limit);
-	items[2] = SPA_DICT_ITEM_INIT(PW_KEY_NODE_LOOP_NAME, port->node->data_loop->name);
+	items[n_items++] = SPA_DICT_ITEM_INIT("clock.quantum-limit", quantum_limit);
+	items[n_items++] = SPA_DICT_ITEM_INIT(PW_KEY_NODE_LOOP_NAME, port->node->data_loop->name);
+	if ((str = pw_properties_get(port->properties, "control.ump")) != NULL)
+		items[n_items++] = SPA_DICT_ITEM_INIT("control.ump", str);
 
 	handle = pw_context_load_spa_handle(context, factory_name,
-			&SPA_DICT_INIT_ARRAY(items));
+			&SPA_DICT_INIT(items, n_items));
 	if (handle == NULL)
 		return -errno;
 
diff --git a/src/tools/pw-mididump.c b/src/tools/pw-mididump.c
index 277784bb1..882bd4702 100644
--- a/src/tools/pw-mididump.c
+++ b/src/tools/pw-mididump.c
@@ -33,7 +33,7 @@ struct data {
 	struct pw_filter *filter;
 	struct port *in_port;
 	int64_t clock_time;
-	bool opt_midi1;
+	bool force_ump;
 };
 
 
@@ -174,7 +174,8 @@ static int dump_filter(struct data *data)
 			PW_FILTER_PORT_FLAG_MAP_BUFFERS,
 			sizeof(struct port),
 			pw_properties_new(
-				PW_KEY_FORMAT_DSP, data->opt_midi1 ? "8 bit raw midi" : "32 bit raw UMP",
+				PW_KEY_FORMAT_DSP,
+					data->force_ump ? "32 bit raw UMP" : "8 bit raw midi",
 				PW_KEY_PORT_NAME, "input",
 				NULL),
 			NULL, 0);
@@ -198,7 +199,7 @@ static void show_help(const char *name, bool error)
 		"  -h, --help                            Show this help\n"
 		"      --version                         Show version\n"
 		"  -r, --remote                          Remote daemon name\n"
-	        "  -M, --force-midi                      Force midi format, one of \"midi\" or \"ump\",(default ump)\n",
+	        "  -M, --force-midi                      Force midi format, one of \"midi\" or \"ump\",(default midi)\n",
 		name);
 }
 
@@ -238,9 +239,9 @@ int main(int argc, char *argv[])
 
 		case 'M':
 			if (spa_streq(optarg, "midi"))
-				data.opt_midi1 = true;
+				data.force_ump = false;
 			else if (spa_streq(optarg, "ump"))
-				data.opt_midi1 = false;
+				data.force_ump = true;
 			else {
 				fprintf(stderr, "error: bad force-midi %s\n", optarg);
 				show_help(argv[0], true);

From 50fcf64058f657e457b6b7d72fd6afdaf825e40e Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 25 Mar 2026 18:06:17 +0100
Subject: [PATCH 242/263] tools: add -C | --monitor to pw-cat

It sets the stream.capture.sink property which makes a record stream
capture from a sink monitor instead.
---
 doc/dox/programs/pw-cat.1.md | 3 +++
 src/tools/pw-cat.c           | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/doc/dox/programs/pw-cat.1.md b/doc/dox/programs/pw-cat.1.md
index b681e54a1..8ec02c711 100644
--- a/doc/dox/programs/pw-cat.1.md
+++ b/doc/dox/programs/pw-cat.1.md
@@ -124,6 +124,9 @@ Set a node target (default auto). The value can be:
 - <b>\<id\></b>: The object.serial or the node.name of a target node
 \endparblock
 
+\par -C | \--monitor
+In recording mode, record from monitor ports.
+
 \par \--latency=VALUE\[*units*\]
 \parblock
 Set the node latency (default 100ms)
diff --git a/src/tools/pw-cat.c b/src/tools/pw-cat.c
index 6b1916d55..c8ee6a195 100644
--- a/src/tools/pw-cat.c
+++ b/src/tools/pw-cat.c
@@ -1125,9 +1125,9 @@ enum {
 };
 
 #ifdef HAVE_PW_CAT_FFMPEG_INTEGRATION
-#define OPTIONS "hvprmdosR:P:q:aM:n:c"
+#define OPTIONS "hvprmdosR:P:q:aM:n:cC"
 #else
-#define OPTIONS "hvprmdsR:P:q:aM:n:c"
+#define OPTIONS "hvprmdsR:P:q:aM:n:cC"
 #endif
 
 static const struct option long_options[] = {
@@ -1168,6 +1168,7 @@ static const struct option long_options[] = {
 	{ "force-midi",		required_argument, NULL, 'M' },
 	{ "sample-count",	required_argument, NULL, 'n' },
 	{ "midi-clip",		no_argument,       NULL, 'c' },
+	{ "monitor",		no_argument,       NULL, 'C' },
 
 	{ NULL, 0, NULL, 0 }
 };
@@ -1192,6 +1193,7 @@ static void show_usage(const char *name, bool is_error)
 	     "      --media-role                      Set media role (default %s)\n"
 	     "      --target                          Set node target serial or name (default %s)\n"
 	     "                                          0 means don't link\n"
+	     "  -C  --monitor                         Capture monitor ports (in recording mode)\n"
 	     "      --latency                         Set node latency (default %s)\n"
 	     "                                          Xunit (unit = s, ms, us, ns)\n"
 	     "                                          or direct samples (256)\n"
@@ -2342,6 +2344,9 @@ int main(int argc, char *argv[])
 		case 'c':
 			data.data_type = TYPE_MIDI2;
 			break;
+		case 'C':
+			pw_properties_set(data.props, PW_KEY_STREAM_CAPTURE_SINK, "true");
+			break;
 		case OPT_LISTFORMATS:
 			list_formats(&data);
 			return EXIT_SUCCESS;

From 60062432b8188862492732bf6bdbd552ea1f6070 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 26 Mar 2026 09:34:45 +0100
Subject: [PATCH 243/263] module-rtp: handle the send_packet/feedback as
 callbacks

They are emited from the streaming thread and therefore can be emitted
concurrently with the events on the main thread. This can cause crashes
when the hook list is iterated.

Instead, make those events into callbacks that are more efficient,
and threadsafe.
---
 src/modules/module-rtp/audio.c  |  2 +-
 src/modules/module-rtp/midi.c   |  6 +++---
 src/modules/module-rtp/opus.c   |  2 +-
 src/modules/module-rtp/stream.c | 10 ++++++++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/modules/module-rtp/audio.c b/src/modules/module-rtp/audio.c
index eec37317f..e03ae7ce9 100644
--- a/src/modules/module-rtp/audio.c
+++ b/src/modules/module-rtp/audio.c
@@ -561,7 +561,7 @@ static void rtp_audio_flush_packets(struct impl *impl, uint32_t num_packets, uin
 				(double)timestamp * impl->io_position->clock.rate.num /
 				impl->io_position->clock.rate.denom);
 
-		rtp_stream_emit_send_packet(impl, iov, 3);
+		rtp_stream_call_send_packet(impl, iov, 3);
 
 		impl->seq++;
 		impl->first = false;
diff --git a/src/modules/module-rtp/midi.c b/src/modules/module-rtp/midi.c
index d5c55740d..1237f66c6 100644
--- a/src/modules/module-rtp/midi.c
+++ b/src/modules/module-rtp/midi.c
@@ -151,7 +151,7 @@ static int parse_journal(struct impl *impl, uint8_t *packet, uint16_t seq, uint3
 		return -EINVAL;
 	j = (struct rtp_midi_journal*)packet;
 	uint16_t seqnum = ntohs(j->checkpoint_seqnum);
-	rtp_stream_emit_send_feedback(impl, seqnum);
+	rtp_stream_call_send_feedback(impl, seqnum);
 	return 0;
 }
 
@@ -453,7 +453,7 @@ static void rtp_midi_flush_packets(struct impl *impl,
 			pw_log_trace("sending %d timestamp:%d %u %u",
 					len, timestamp + base,
 					offset, impl->psamples);
-			rtp_stream_emit_send_packet(impl, iov, 3);
+			rtp_stream_call_send_packet(impl, iov, 3);
 
 			impl->seq++;
 			len = 0;
@@ -491,7 +491,7 @@ static void rtp_midi_flush_packets(struct impl *impl,
 		iov[2].iov_len = len;
 
 		pw_log_trace("sending %d timestamp:%d", len, base);
-		rtp_stream_emit_send_packet(impl, iov, 3);
+		rtp_stream_call_send_packet(impl, iov, 3);
 		impl->seq++;
 	}
 }
diff --git a/src/modules/module-rtp/opus.c b/src/modules/module-rtp/opus.c
index d13a4efaf..9175d4a31 100644
--- a/src/modules/module-rtp/opus.c
+++ b/src/modules/module-rtp/opus.c
@@ -252,7 +252,7 @@ static void rtp_opus_flush_packets(struct impl *impl)
 		pw_log_trace("sending %d len:%d timestamp:%d", tosend, res, timestamp);
 		iov[1].iov_len = res;
 
-		rtp_stream_emit_send_packet(impl, iov, 2);
+		rtp_stream_call_send_packet(impl, iov, 2);
 
 		impl->seq++;
 		timestamp += tosend;
diff --git a/src/modules/module-rtp/stream.c b/src/modules/module-rtp/stream.c
index 992563aea..11bba4f98 100644
--- a/src/modules/module-rtp/stream.c
+++ b/src/modules/module-rtp/stream.c
@@ -48,8 +48,11 @@ PW_LOG_TOPIC_EXTERN(mod_topic);
 #define rtp_stream_emit_open_connection(s,r)	rtp_stream_emit(s, open_connection, 0,r)
 #define rtp_stream_emit_close_connection(s,r)	rtp_stream_emit(s, close_connection, 0,r)
 #define rtp_stream_emit_param_changed(s,i,p)	rtp_stream_emit(s, param_changed,0,i,p)
-#define rtp_stream_emit_send_packet(s,i,l)	rtp_stream_emit(s, send_packet,0,i,l)
-#define rtp_stream_emit_send_feedback(s,seq)	rtp_stream_emit(s, send_feedback,0,seq)
+
+#define rtp_stream_call(s,m,v,...)		spa_callbacks_call_fast(&s->rtp_callbacks, \
+							struct rtp_stream_events, m, v, ##__VA_ARGS__)
+#define rtp_stream_call_send_packet(s,i,l)	rtp_stream_call(s, send_packet,0,i,l)
+#define rtp_stream_call_send_feedback(s,seq)	rtp_stream_call(s, send_feedback,0,seq)
 
 enum rtp_stream_internal_state {
 	/* The state when the stream is idle / stopped. The background
@@ -85,6 +88,8 @@ struct impl {
 	struct spa_hook stream_listener;
 	struct pw_stream_events stream_events;
 
+	struct spa_callbacks rtp_callbacks;
+
 	struct spa_hook_list listener_list;
 	struct spa_hook listener;
 
@@ -1003,6 +1008,7 @@ struct rtp_stream *rtp_stream_new(struct pw_core *core,
 		(res = stream_start(impl)) < 0)
 		goto out;
 
+	impl->rtp_callbacks = SPA_CALLBACKS_INIT(events, data);
 	spa_hook_list_append(&impl->listener_list, &impl->listener, events, data);
 
 	return (struct rtp_stream*)impl;

From 7599079d610ecf5421592230fa8ce31ae90edb45 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 26 Mar 2026 11:59:28 +0100
Subject: [PATCH 244/263] jack: increase notify buffer and items

Make the notify buffer larger, it was 8K but we can make it 64K. Also
reorder the notify struct fields to make it smaller.

This should avoid "notify queue full" warnings. Ideally we should
dynamically size this queue and not lose any messages.
---
 pipewire-jack/src/pipewire-jack.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
index c82abc13f..5ae097ba8 100644
--- a/pipewire-jack/src/pipewire-jack.c
+++ b/pipewire-jack/src/pipewire-jack.c
@@ -86,7 +86,7 @@ PW_LOG_TOPIC_STATIC(jack_log_topic, "jack");
 #define OTHER_CONNECT_FAIL	-1
 #define OTHER_CONNECT_IGNORE	0
 
-#define NOTIFY_BUFFER_SIZE	(1u<<13)
+#define NOTIFY_BUFFER_SIZE	(1u<<16)
 #define NOTIFY_BUFFER_MASK	(NOTIFY_BUFFER_SIZE-1)
 
 struct notify {
@@ -104,8 +104,8 @@ struct notify {
 #define NOTIFY_TYPE_TOTAL_LATENCY	((9<<4)|NOTIFY_ACTIVE_FLAG)
 #define NOTIFY_TYPE_PORT_RENAME		((10<<4)|NOTIFY_ACTIVE_FLAG)
 	int type;
-	struct object *object;
 	int arg1;
+	struct object *object;
 	const char *msg;
 };
 

From 29b221671fd161546d82f66622740825ded406a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Thu, 26 Mar 2026 14:36:05 +0100
Subject: [PATCH 245/263] spa: remove `timerspec` members

These are only used when the timer is set, so convert them to local variables.
No functional changes intended.
---
 spa/plugins/audiotestsrc/audiotestsrc.c    | 21 ++++++++-------------
 spa/plugins/support/node-driver.c          | 14 ++++++--------
 spa/plugins/support/null-audio-sink.c      | 15 +++++++--------
 spa/plugins/test/fakesink.c                | 21 ++++++++-------------
 spa/plugins/test/fakesrc.c                 | 21 ++++++++-------------
 spa/plugins/videotestsrc/videotestsrc.c    | 21 ++++++++-------------
 spa/plugins/vulkan/vulkan-compute-source.c | 21 ++++++++-------------
 7 files changed, 53 insertions(+), 81 deletions(-)

diff --git a/spa/plugins/audiotestsrc/audiotestsrc.c b/spa/plugins/audiotestsrc/audiotestsrc.c
index 5e7c521b8..e2f08ac26 100644
--- a/spa/plugins/audiotestsrc/audiotestsrc.c
+++ b/spa/plugins/audiotestsrc/audiotestsrc.c
@@ -120,7 +120,6 @@ struct impl {
 
 	bool async;
 	struct spa_source timer_source;
-	struct itimerspec timerspec;
 
 	bool started;
 	uint64_t start_time;
@@ -317,21 +316,21 @@ static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
 static void set_timer(struct impl *this, bool enabled)
 {
 	if (this->async || this->props.live) {
+		struct itimerspec ts = {0};
+
 		if (enabled) {
 			if (this->props.live) {
 				uint64_t next_time = this->start_time + this->elapsed_time;
-				this->timerspec.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
-				this->timerspec.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
+				ts.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
+				ts.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
 			} else {
-				this->timerspec.it_value.tv_sec = 0;
-				this->timerspec.it_value.tv_nsec = 1;
+				ts.it_value.tv_sec = 0;
+				ts.it_value.tv_nsec = 1;
 			}
-		} else {
-			this->timerspec.it_value.tv_sec = 0;
-			this->timerspec.it_value.tv_nsec = 0;
 		}
+
 		spa_system_timerfd_settime(this->data_system,
-				this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &this->timerspec, NULL);
+				this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &ts, NULL);
 	}
 }
 
@@ -1105,10 +1104,6 @@ impl_init(const struct spa_handle_factory *factory,
 			CLOCK_MONOTONIC, SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
 	this->timer_source.mask = SPA_IO_IN;
 	this->timer_source.rmask = 0;
-	this->timerspec.it_value.tv_sec = 0;
-	this->timerspec.it_value.tv_nsec = 0;
-	this->timerspec.it_interval.tv_sec = 0;
-	this->timerspec.it_interval.tv_nsec = 0;
 
 	if (this->data_loop)
 		spa_loop_add_source(this->data_loop, &this->timer_source);
diff --git a/spa/plugins/support/node-driver.c b/spa/plugins/support/node-driver.c
index fa9cf3426..f0585a711 100644
--- a/spa/plugins/support/node-driver.c
+++ b/spa/plugins/support/node-driver.c
@@ -91,7 +91,6 @@ struct impl {
 	struct spa_io_clock *clock;
 
 	struct spa_source timer_source;
-	struct itimerspec timerspec;
 	int clock_fd;
 
 	bool started;
@@ -182,13 +181,16 @@ static void set_timeout(struct impl *this, uint64_t next_time)
 	 * returning -ECANCELED.)
 	 * If timerfd is used with a non-realtime clock, the flag is ignored.
 	 * (Note that the flag only works in combination with SPA_FD_TIMER_ABSTIME.) */
+	struct itimerspec ts;
 
 	spa_log_trace(this->log, "set timeout %"PRIu64, next_time);
-	this->timerspec.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
-	this->timerspec.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
+	ts.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
+	ts.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
+	ts.it_interval.tv_sec = 0;
+	ts.it_interval.tv_nsec = 0;
 	spa_system_timerfd_settime(this->data_system,
 			this->timer_source.fd, SPA_FD_TIMER_ABSTIME |
-			SPA_FD_TIMER_CANCEL_ON_SET, &this->timerspec, NULL);
+			SPA_FD_TIMER_CANCEL_ON_SET, &ts, NULL);
 }
 
 static inline uint64_t gettime_nsec(struct impl *this, clockid_t clock_id)
@@ -1043,10 +1045,6 @@ impl_init(const struct spa_handle_factory *factory,
 
 	this->timer_source.mask = SPA_IO_IN;
 	this->timer_source.rmask = 0;
-	this->timerspec.it_value.tv_sec = 0;
-	this->timerspec.it_value.tv_nsec = 0;
-	this->timerspec.it_interval.tv_sec = 0;
-	this->timerspec.it_interval.tv_nsec = 0;
 
 	spa_loop_add_source(this->data_loop, &this->timer_source);
 
diff --git a/spa/plugins/support/null-audio-sink.c b/spa/plugins/support/null-audio-sink.c
index b804023b3..610adf9ce 100644
--- a/spa/plugins/support/null-audio-sink.c
+++ b/spa/plugins/support/null-audio-sink.c
@@ -114,7 +114,6 @@ struct impl {
 	unsigned int started:1;
 	unsigned int following:1;
 	struct spa_source timer_source;
-	struct itimerspec timerspec;
 	uint64_t next_time;
 };
 
@@ -179,11 +178,15 @@ static int impl_node_enum_params(void *object, int seq,
 
 static void set_timeout(struct impl *this, uint64_t next_time)
 {
+	struct itimerspec ts;
+
 	spa_log_trace(this->log, "set timeout %"PRIu64, next_time);
-	this->timerspec.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
-	this->timerspec.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
+	ts.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
+	ts.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
+	ts.it_interval.tv_sec = 0;
+	ts.it_interval.tv_nsec = 0;
 	spa_system_timerfd_settime(this->data_system,
-			this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &this->timerspec, NULL);
+			this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &ts, NULL);
 }
 
 static int set_timers(struct impl *this)
@@ -929,10 +932,6 @@ impl_init(const struct spa_handle_factory *factory,
 							  SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
 	this->timer_source.mask = SPA_IO_IN;
 	this->timer_source.rmask = 0;
-	this->timerspec.it_value.tv_sec = 0;
-	this->timerspec.it_value.tv_nsec = 0;
-	this->timerspec.it_interval.tv_sec = 0;
-	this->timerspec.it_interval.tv_nsec = 0;
 
 	spa_loop_add_source(this->data_loop, &this->timer_source);
 
diff --git a/spa/plugins/test/fakesink.c b/spa/plugins/test/fakesink.c
index 71550300c..168de5473 100644
--- a/spa/plugins/test/fakesink.c
+++ b/spa/plugins/test/fakesink.c
@@ -74,7 +74,6 @@ struct impl {
 	struct spa_callbacks callbacks;
 
 	struct spa_source timer_source;
-	struct itimerspec timerspec;
 
 	bool started;
 	uint64_t start_time;
@@ -180,21 +179,21 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
 static void set_timer(struct impl *this, bool enabled)
 {
 	if (this->callbacks.funcs || this->props.live) {
+		struct itimerspec ts = {0};
+
 		if (enabled) {
 			if (this->props.live) {
 				uint64_t next_time = this->start_time + this->elapsed_time;
-				this->timerspec.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
-				this->timerspec.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
+				ts.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
+				ts.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
 			} else {
-				this->timerspec.it_value.tv_sec = 0;
-				this->timerspec.it_value.tv_nsec = 1;
+				ts.it_value.tv_sec = 0;
+				ts.it_value.tv_nsec = 1;
 			}
-		} else {
-			this->timerspec.it_value.tv_sec = 0;
-			this->timerspec.it_value.tv_nsec = 0;
 		}
+
 		spa_system_timerfd_settime(this->data_system,
-				this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &this->timerspec, NULL);
+				this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &ts, NULL);
 	}
 }
 
@@ -767,10 +766,6 @@ impl_init(const struct spa_handle_factory *factory,
 							  SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
 	this->timer_source.mask = SPA_IO_IN;
 	this->timer_source.rmask = 0;
-	this->timerspec.it_value.tv_sec = 0;
-	this->timerspec.it_value.tv_nsec = 0;
-	this->timerspec.it_interval.tv_sec = 0;
-	this->timerspec.it_interval.tv_nsec = 0;
 
 	if (this->data_loop)
 		spa_loop_add_source(this->data_loop, &this->timer_source);
diff --git a/spa/plugins/test/fakesrc.c b/spa/plugins/test/fakesrc.c
index 28b37dab4..86dc44ac8 100644
--- a/spa/plugins/test/fakesrc.c
+++ b/spa/plugins/test/fakesrc.c
@@ -75,7 +75,6 @@ struct impl {
 	struct spa_callbacks callbacks;
 
 	struct spa_source timer_source;
-	struct itimerspec timerspec;
 
 	bool started;
 	uint64_t start_time;
@@ -195,21 +194,21 @@ static int fill_buffer(struct impl *this, struct buffer *b)
 static void set_timer(struct impl *this, bool enabled)
 {
 	if (this->callbacks.funcs || this->props.live) {
+		struct itimerspec ts = {0};
+
 		if (enabled) {
 			if (this->props.live) {
 				uint64_t next_time = this->start_time + this->elapsed_time;
-				this->timerspec.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
-				this->timerspec.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
+				ts.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
+				ts.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
 			} else {
-				this->timerspec.it_value.tv_sec = 0;
-				this->timerspec.it_value.tv_nsec = 1;
+				ts.it_value.tv_sec = 0;
+				ts.it_value.tv_nsec = 1;
 			}
-		} else {
-			this->timerspec.it_value.tv_sec = 0;
-			this->timerspec.it_value.tv_nsec = 0;
 		}
+
 		spa_system_timerfd_settime(this->data_system,
-				this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &this->timerspec, NULL);
+				this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &ts, NULL);
 	}
 }
 
@@ -797,10 +796,6 @@ impl_init(const struct spa_handle_factory *factory,
 							  SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
 	this->timer_source.mask = SPA_IO_IN;
 	this->timer_source.rmask = 0;
-	this->timerspec.it_value.tv_sec = 0;
-	this->timerspec.it_value.tv_nsec = 0;
-	this->timerspec.it_interval.tv_sec = 0;
-	this->timerspec.it_interval.tv_nsec = 0;
 
 	if (this->data_loop)
 		spa_loop_add_source(this->data_loop, &this->timer_source);
diff --git a/spa/plugins/videotestsrc/videotestsrc.c b/spa/plugins/videotestsrc/videotestsrc.c
index db5c90113..7331edbbd 100644
--- a/spa/plugins/videotestsrc/videotestsrc.c
+++ b/spa/plugins/videotestsrc/videotestsrc.c
@@ -99,7 +99,6 @@ struct impl {
 
 	bool async;
 	struct spa_source *timer_source;
-	struct itimerspec timerspec;
 
 	bool started;
 	uint64_t start_time;
@@ -264,20 +263,20 @@ static int fill_buffer(struct impl *this, struct buffer *b)
 static void set_timer(struct impl *this, bool enabled)
 {
 	if (this->async || this->props.live) {
+		struct timespec ts = {0};
+
 		if (enabled) {
 			if (this->props.live) {
 				uint64_t next_time = this->start_time + this->elapsed_time;
-				this->timerspec.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
-				this->timerspec.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
+				ts.tv_sec = next_time / SPA_NSEC_PER_SEC;
+				ts.tv_nsec = next_time % SPA_NSEC_PER_SEC;
 			} else {
-				this->timerspec.it_value.tv_sec = 0;
-				this->timerspec.it_value.tv_nsec = 1;
+				ts.tv_sec = 0;
+				ts.tv_nsec = 1;
 			}
-		} else {
-			this->timerspec.it_value.tv_sec = 0;
-			this->timerspec.it_value.tv_nsec = 0;
 		}
-		spa_loop_utils_update_timer(this->loop_utils, this->timer_source, &this->timerspec.it_value, &this->timerspec.it_interval, true);
+
+		spa_loop_utils_update_timer(this->loop_utils, this->timer_source, &ts, NULL, true);
 	}
 }
 
@@ -907,10 +906,6 @@ impl_init(const struct spa_handle_factory *factory,
 	reset_props(&this->props);
 
 	this->timer_source = spa_loop_utils_add_timer(this->loop_utils, on_output, this);
-	this->timerspec.it_value.tv_sec = 0;
-	this->timerspec.it_value.tv_nsec = 0;
-	this->timerspec.it_interval.tv_sec = 0;
-	this->timerspec.it_interval.tv_nsec = 0;
 
 	port = &this->port;
 	port->info_all = SPA_PORT_CHANGE_MASK_FLAGS |
diff --git a/spa/plugins/vulkan/vulkan-compute-source.c b/spa/plugins/vulkan/vulkan-compute-source.c
index 1daf3b47c..17692636f 100644
--- a/spa/plugins/vulkan/vulkan-compute-source.c
+++ b/spa/plugins/vulkan/vulkan-compute-source.c
@@ -102,7 +102,6 @@ struct impl {
 
 	bool async;
 	struct spa_source timer_source;
-	struct itimerspec timerspec;
 
 	bool started;
 	uint64_t start_time;
@@ -243,21 +242,21 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
 static void set_timer(struct impl *this, bool enabled)
 {
 	if (this->async || this->props.live) {
+		struct itimerspec ts = {0};
+
 		if (enabled) {
 			if (this->props.live) {
 				uint64_t next_time = this->start_time + this->elapsed_time;
-				this->timerspec.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
-				this->timerspec.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
+				ts.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
+				ts.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
 			} else {
-				this->timerspec.it_value.tv_sec = 0;
-				this->timerspec.it_value.tv_nsec = 1;
+				ts.it_value.tv_sec = 0;
+				ts.it_value.tv_nsec = 1;
 			}
-		} else {
-			this->timerspec.it_value.tv_sec = 0;
-			this->timerspec.it_value.tv_nsec = 0;
 		}
+
 		spa_system_timerfd_settime(this->data_system,
-				this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &this->timerspec, NULL);
+				this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &ts, NULL);
 	}
 }
 
@@ -993,10 +992,6 @@ impl_init(const struct spa_handle_factory *factory,
 							  SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
 	this->timer_source.mask = SPA_IO_IN;
 	this->timer_source.rmask = 0;
-	this->timerspec.it_value.tv_sec = 0;
-	this->timerspec.it_value.tv_nsec = 0;
-	this->timerspec.it_interval.tv_sec = 0;
-	this->timerspec.it_interval.tv_nsec = 0;
 
 	if (this->data_loop)
 		spa_loop_add_source(this->data_loop, &this->timer_source);

From 84e7b744a6c6ecfb2a43ba2663543ab6b6654506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Fri, 27 Mar 2026 09:35:34 +0100
Subject: [PATCH 246/263] spa: libcamera: use `std::span`

libcamera is planning to move to C++20 and drop the custom `libcamera::Span`
type at some point in the future. Since pipewire already uses C++20, remove
all uses of it and instead use `std::span` so that things will compile
after the removal.
---
 spa/plugins/libcamera/libcamera-device.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spa/plugins/libcamera/libcamera-device.cpp b/spa/plugins/libcamera/libcamera-device.cpp
index 2d6532f82..6517860fc 100644
--- a/spa/plugins/libcamera/libcamera-device.cpp
+++ b/spa/plugins/libcamera/libcamera-device.cpp
@@ -5,6 +5,7 @@
 /* SPDX-License-Identifier: MIT */
 
 #include <cstddef>
+#include <span>
 #include <sstream>
 
 #include <spa/support/plugin.h>
@@ -25,7 +26,6 @@
 
 #include <libcamera/camera.h>
 #include <libcamera/property_ids.h>
-#include <libcamera/base/span.h>
 
 using namespace libcamera;
 
@@ -50,7 +50,7 @@ struct impl {
 	     std::string device_id);
 };
 
-const libcamera::Span<const int64_t> cameraDevice(const Camera& camera)
+std::span<const int64_t> cameraDevice(const Camera& camera)
 {
 	if (auto devices = camera.properties().get(properties::SystemDevices))
 		return devices.value();

From 00b4717c6e55747e5a6c0ee4ab4cba61e8c6b898 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Fri, 27 Mar 2026 11:06:56 +0100
Subject: [PATCH 247/263] spa: remove `async` members

Some node implementations have an `async` member, but these members
are not written anywhere. So remove them.
---
 spa/plugins/audiotestsrc/audiotestsrc.c    | 5 ++---
 spa/plugins/videotestsrc/videotestsrc.c    | 3 +--
 spa/plugins/vulkan/vulkan-compute-source.c | 5 ++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/spa/plugins/audiotestsrc/audiotestsrc.c b/spa/plugins/audiotestsrc/audiotestsrc.c
index e2f08ac26..3c358026e 100644
--- a/spa/plugins/audiotestsrc/audiotestsrc.c
+++ b/spa/plugins/audiotestsrc/audiotestsrc.c
@@ -118,7 +118,6 @@ struct impl {
 	struct spa_hook_list hooks;
 	struct spa_callbacks callbacks;
 
-	bool async;
 	struct spa_source timer_source;
 
 	bool started;
@@ -315,7 +314,7 @@ static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
 
 static void set_timer(struct impl *this, bool enabled)
 {
-	if (this->async || this->props.live) {
+	if (this->props.live) {
 		struct itimerspec ts = {0};
 
 		if (enabled) {
@@ -339,7 +338,7 @@ static int read_timer(struct impl *this)
 	uint64_t expirations;
 	int res = 0;
 
-	if (this->async || this->props.live) {
+	if (this->props.live) {
 		if ((res = spa_system_timerfd_read(this->data_system,
 				this->timer_source.fd, &expirations)) < 0) {
 			if (res != -EAGAIN)
diff --git a/spa/plugins/videotestsrc/videotestsrc.c b/spa/plugins/videotestsrc/videotestsrc.c
index 7331edbbd..e416be44e 100644
--- a/spa/plugins/videotestsrc/videotestsrc.c
+++ b/spa/plugins/videotestsrc/videotestsrc.c
@@ -97,7 +97,6 @@ struct impl {
 	struct spa_hook_list hooks;
 	struct spa_callbacks callbacks;
 
-	bool async;
 	struct spa_source *timer_source;
 
 	bool started;
@@ -262,7 +261,7 @@ static int fill_buffer(struct impl *this, struct buffer *b)
 
 static void set_timer(struct impl *this, bool enabled)
 {
-	if (this->async || this->props.live) {
+	if (this->props.live) {
 		struct timespec ts = {0};
 
 		if (enabled) {
diff --git a/spa/plugins/vulkan/vulkan-compute-source.c b/spa/plugins/vulkan/vulkan-compute-source.c
index 17692636f..57b4b18d0 100644
--- a/spa/plugins/vulkan/vulkan-compute-source.c
+++ b/spa/plugins/vulkan/vulkan-compute-source.c
@@ -100,7 +100,6 @@ struct impl {
 	struct spa_hook_list hooks;
 	struct spa_callbacks callbacks;
 
-	bool async;
 	struct spa_source timer_source;
 
 	bool started;
@@ -241,7 +240,7 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
 
 static void set_timer(struct impl *this, bool enabled)
 {
-	if (this->async || this->props.live) {
+	if (this->props.live) {
 		struct itimerspec ts = {0};
 
 		if (enabled) {
@@ -265,7 +264,7 @@ static int read_timer(struct impl *this)
 	uint64_t expirations;
 	int res = 0;
 
-	if (this->async || this->props.live) {
+	if (this->props.live) {
 		if ((res = spa_system_timerfd_read(this->data_system,
 						this->timer_source.fd, &expirations)) < 0) {
 			if (res != -EAGAIN)

From 7f4baba41c789364705ba0951bfc594fdeddcab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Fri, 27 Mar 2026 11:22:24 +0100
Subject: [PATCH 248/263] spa: do not use `SPA_PROP_live`

Remove support for changing `SPA_PROP_live` in node implementations
that supported it, and hard-code `SPA_PROP_live = true`. If a mode
of operation is desired where the data is processed as fast as possible,
it can be achieved by implementing non-driver operation and using the
freewheel driver in pipewire.
---
 spa/plugins/audiotestsrc/audiotestsrc.c    |  70 +++----------
 spa/plugins/test/fakesink.c                |  90 +++-------------
 spa/plugins/test/fakesrc.c                 |  59 +++--------
 spa/plugins/videotestsrc/videotestsrc.c    |  55 ++--------
 spa/plugins/vulkan/vulkan-compute-source.c | 115 +++------------------
 5 files changed, 73 insertions(+), 316 deletions(-)

diff --git a/spa/plugins/audiotestsrc/audiotestsrc.c b/spa/plugins/audiotestsrc/audiotestsrc.c
index 3c358026e..3414e8b18 100644
--- a/spa/plugins/audiotestsrc/audiotestsrc.c
+++ b/spa/plugins/audiotestsrc/audiotestsrc.c
@@ -41,13 +41,11 @@ enum wave_type {
 #define DEFAULT_RATE		48000
 #define DEFAULT_CHANNELS	2
 
-#define DEFAULT_LIVE true
 #define DEFAULT_WAVE WAVE_SINE
 #define DEFAULT_FREQ 440.0
 #define DEFAULT_VOLUME 1.0
 
 struct props {
-	bool live;
 	uint32_t wave;
 	float freq;
 	float volume;
@@ -55,7 +53,6 @@ struct props {
 
 static void reset_props(struct props *props)
 {
-	props->live = DEFAULT_LIVE;
 	props->wave = DEFAULT_WAVE;
 	props->freq = DEFAULT_FREQ;
 	props->volume = DEFAULT_VOLUME;
@@ -160,13 +157,6 @@ static int impl_node_enum_params(void *object, int seq,
 
 		switch (result.index) {
 		case 0:
-			param = spa_pod_builder_add_object(&b,
-				SPA_TYPE_OBJECT_PropInfo, id,
-				SPA_PROP_INFO_id,   SPA_POD_Id(SPA_PROP_live),
-				SPA_PROP_INFO_description, SPA_POD_String("Configure live mode of the source"),
-				SPA_PROP_INFO_type, SPA_POD_Bool(p->live));
-			break;
-		case 1:
 			spa_pod_builder_push_object(&b, &f[0], SPA_TYPE_OBJECT_PropInfo, id);
 			spa_pod_builder_add(&b,
 				SPA_PROP_INFO_id,     SPA_POD_Id(SPA_PROP_waveType),
@@ -182,14 +172,14 @@ static int impl_node_enum_params(void *object, int seq,
 			spa_pod_builder_pop(&b, &f[1]);
 			param = spa_pod_builder_pop(&b, &f[0]);
 			break;
-		case 2:
+		case 1:
 			param = spa_pod_builder_add_object(&b,
 				SPA_TYPE_OBJECT_PropInfo, id,
 				SPA_PROP_INFO_id,   SPA_POD_Id(SPA_PROP_frequency),
 				SPA_PROP_INFO_description, SPA_POD_String("Select the frequency"),
 				SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Float(p->freq, 0.0, 50000000.0));
 			break;
-		case 3:
+		case 2:
 			param = spa_pod_builder_add_object(&b,
 				SPA_TYPE_OBJECT_PropInfo, id,
 				SPA_PROP_INFO_id,   SPA_POD_Id(SPA_PROP_volume),
@@ -209,7 +199,6 @@ static int impl_node_enum_params(void *object, int seq,
 		case 0:
 			param = spa_pod_builder_add_object(&b,
 				SPA_TYPE_OBJECT_Props, id,
-				SPA_PROP_live,      SPA_POD_Bool(p->live),
 				SPA_PROP_waveType,  SPA_POD_Int(p->wave),
 				SPA_PROP_frequency, SPA_POD_Float(p->freq),
 				SPA_PROP_volume,    SPA_POD_Float(p->volume));
@@ -263,7 +252,6 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
 
 	if (id == SPA_PARAM_Props) {
 		struct props *p = &this->props;
-		struct port *port = &this->port;
 
 		if (param == NULL) {
 			reset_props(p);
@@ -271,15 +259,9 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
 		}
 		spa_pod_parse_object(param,
 			SPA_TYPE_OBJECT_Props, NULL,
-			SPA_PROP_live,      SPA_POD_OPT_Bool(&p->live),
 			SPA_PROP_waveType,  SPA_POD_OPT_Int(&p->wave),
 			SPA_PROP_frequency, SPA_POD_OPT_Float(&p->freq),
 			SPA_PROP_volume,    SPA_POD_OPT_Float(&p->volume));
-
-		if (p->live)
-			port->info.flags |= SPA_PORT_FLAG_LIVE;
-		else
-			port->info.flags &= ~SPA_PORT_FLAG_LIVE;
 	}
 	else
 		return -ENOENT;
@@ -314,23 +296,15 @@ static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
 
 static void set_timer(struct impl *this, bool enabled)
 {
-	if (this->props.live) {
-		struct itimerspec ts = {0};
+	struct itimerspec ts = {0};
 
-		if (enabled) {
-			if (this->props.live) {
-				uint64_t next_time = this->start_time + this->elapsed_time;
-				ts.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
-				ts.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
-			} else {
-				ts.it_value.tv_sec = 0;
-				ts.it_value.tv_nsec = 1;
-			}
-		}
-
-		spa_system_timerfd_settime(this->data_system,
-				this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &ts, NULL);
+	if (enabled) {
+		uint64_t next_time = this->start_time + this->elapsed_time;
+		ts.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
+		ts.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
 	}
+
+	spa_system_timerfd_settime(this->data_system, this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &ts, NULL);
 }
 
 static int read_timer(struct impl *this)
@@ -338,14 +312,12 @@ static int read_timer(struct impl *this)
 	uint64_t expirations;
 	int res = 0;
 
-	if (this->props.live) {
-		if ((res = spa_system_timerfd_read(this->data_system,
-				this->timer_source.fd, &expirations)) < 0) {
-			if (res != -EAGAIN)
-				spa_log_error(this->log, "%p: timerfd error: %s",
-						this, spa_strerror(res));
-		}
+	if ((res = spa_system_timerfd_read(this->data_system, this->timer_source.fd, &expirations)) < 0) {
+		if (res != -EAGAIN)
+			spa_log_error(this->log, "%p: timerfd error: %s",
+					this, spa_strerror(res));
 	}
+
 	return 0;
 }
 
@@ -469,10 +441,7 @@ static int impl_node_send_command(void *object, const struct spa_command *comman
 			return 0;
 
 		clock_gettime(CLOCK_MONOTONIC, &now);
-		if (this->props.live)
-			this->start_time = SPA_TIMESPEC_TO_NSEC(&now);
-		else
-			this->start_time = 0;
+		this->start_time = SPA_TIMESPEC_TO_NSEC(&now);
 		this->sample_count = 0;
 		this->elapsed_time = 0;
 
@@ -893,9 +862,6 @@ static inline void reuse_buffer(struct impl *this, struct port *port, uint32_t i
 
 	b->outstanding = false;
 	spa_list_append(&port->empty, &b->link);
-
-	if (!this->props.live && !this->following)
-		set_timer(this, true);
 }
 
 static int impl_node_port_reuse_buffer(void *object, uint32_t port_id, uint32_t buffer_id)
@@ -969,7 +935,7 @@ static int impl_node_process(void *object)
 		io->buffer_id = SPA_ID_INVALID;
 	}
 
-	if (!this->props.live || this->following)
+	if (this->following)
 		return make_buffer(this);
 	else
 		return SPA_STATUS_OK;
@@ -1111,9 +1077,7 @@ impl_init(const struct spa_handle_factory *factory,
 	port->info_all = SPA_PORT_CHANGE_MASK_FLAGS |
 			SPA_PORT_CHANGE_MASK_PARAMS;
 	port->info = SPA_PORT_INFO_INIT();
-	port->info.flags = SPA_PORT_FLAG_NO_REF;
-	if (this->props.live)
-		port->info.flags |= SPA_PORT_FLAG_LIVE;
+	port->info.flags = SPA_PORT_FLAG_NO_REF | SPA_PORT_FLAG_LIVE;
 	port->params[0] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
 	port->params[1] = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
 	port->params[2] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
diff --git a/spa/plugins/test/fakesink.c b/spa/plugins/test/fakesink.c
index 168de5473..31667a1de 100644
--- a/spa/plugins/test/fakesink.c
+++ b/spa/plugins/test/fakesink.c
@@ -26,10 +26,6 @@
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
 SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.fakesink");
 
-struct props {
-	bool live;
-};
-
 #define MAX_BUFFERS 16
 #define MAX_PORTS 1
 
@@ -68,7 +64,6 @@ struct impl {
 	uint64_t info_all;
 	struct spa_node_info info;
 	struct spa_param_info params[1];
-	struct props props;
 
 	struct spa_hook_list hooks;
 	struct spa_callbacks callbacks;
@@ -86,13 +81,6 @@ struct impl {
 
 #define CHECK_PORT(this,d,p)  ((d) == SPA_DIRECTION_INPUT && (p) < MAX_PORTS)
 
-#define DEFAULT_LIVE false
-
-static void reset_props(struct impl *this, struct props *props)
-{
-	props->live = DEFAULT_LIVE;
-}
-
 static int impl_node_enum_params(void *object, int seq,
 			uint32_t id, uint32_t start, uint32_t num,
 			const struct spa_pod *filter)
@@ -115,14 +103,6 @@ static int impl_node_enum_params(void *object, int seq,
 	spa_pod_builder_init(&b, buffer, sizeof(buffer));
 
 	switch (id) {
-	case SPA_PARAM_Props:
-		if (result.index > 0)
-			return 0;
-
-		param = spa_pod_builder_add_object(&b,
-			SPA_TYPE_OBJECT_Props, id,
-			SPA_PROP_live, SPA_POD_Bool(this->props.live));
-		break;
 	default:
 		return -ENOENT;
 	}
@@ -150,26 +130,7 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
 
 	spa_return_val_if_fail(this != NULL, -EINVAL);
 
-
 	switch (id) {
-	case SPA_PARAM_Props:
-	{
-		struct port *port = &this->port;
-
-		if (param == NULL) {
-			reset_props(this, &this->props);
-			return 0;
-		}
-		spa_pod_parse_object(param,
-			SPA_TYPE_OBJECT_Props, NULL,
-			SPA_PROP_live, SPA_POD_OPT_Bool(&this->props.live));
-
-		if (this->props.live)
-			port->info.flags |= SPA_PORT_FLAG_LIVE;
-		else
-			port->info.flags &= ~SPA_PORT_FLAG_LIVE;
-		break;
-	}
 	default:
 		return -ENOENT;
 	}
@@ -178,23 +139,15 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
 
 static void set_timer(struct impl *this, bool enabled)
 {
-	if (this->callbacks.funcs || this->props.live) {
-		struct itimerspec ts = {0};
+	struct itimerspec ts = {0};
 
-		if (enabled) {
-			if (this->props.live) {
-				uint64_t next_time = this->start_time + this->elapsed_time;
-				ts.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
-				ts.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
-			} else {
-				ts.it_value.tv_sec = 0;
-				ts.it_value.tv_nsec = 1;
-			}
-		}
-
-		spa_system_timerfd_settime(this->data_system,
-				this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &ts, NULL);
+	if (enabled) {
+		uint64_t next_time = this->start_time + this->elapsed_time;
+		ts.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
+		ts.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
 	}
+
+	spa_system_timerfd_settime(this->data_system, this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &ts, NULL);
 }
 
 static inline int read_timer(struct impl *this)
@@ -202,14 +155,12 @@ static inline int read_timer(struct impl *this)
 	uint64_t expirations;
 	int res = 0;
 
-	if (this->callbacks.funcs || this->props.live) {
-		if ((res = spa_system_timerfd_read(this->data_system,
-					this->timer_source.fd, &expirations)) < 0) {
-			if (res != -EAGAIN)
-				spa_log_error(this->log, "%p: timerfd error: %s",
-						this, spa_strerror(res));
-		}
+	if ((res = spa_system_timerfd_read(this->data_system, this->timer_source.fd, &expirations)) < 0) {
+		if (res != -EAGAIN)
+			spa_log_error(this->log, "%p: timerfd error: %s",
+					this, spa_strerror(res));
 	}
+
 	return res;
 }
 
@@ -297,10 +248,7 @@ static int impl_node_send_command(void *object, const struct spa_command *comman
 			return 0;
 
 		clock_gettime(CLOCK_MONOTONIC, &now);
-		if (this->props.live)
-			this->start_time = SPA_TIMESPEC_TO_NSEC(&now);
-		else
-			this->start_time = 0;
+		this->start_time = SPA_TIMESPEC_TO_NSEC(&now);
 		this->buffer_count = 0;
 		this->elapsed_time = 0;
 
@@ -650,10 +598,8 @@ static int impl_node_process(void *object)
 		io->buffer_id = SPA_ID_INVALID;
 		io->status = SPA_STATUS_OK;
 	}
-	if (this->callbacks.funcs == NULL)
-		return consume_buffer(this);
-	else
-		return SPA_STATUS_OK;
+
+	return SPA_STATUS_OK;
 }
 
 static const struct spa_node_methods impl_node = {
@@ -757,8 +703,6 @@ impl_init(const struct spa_handle_factory *factory,
 	this->params[0] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE);
 	this->info.params = this->params;
 	this->info.n_params = 1;
-	reset_props(this, &this->props);
-
 
 	this->timer_source.func = on_input;
 	this->timer_source.data = this;
@@ -774,9 +718,7 @@ impl_init(const struct spa_handle_factory *factory,
 	port->info_all = SPA_PORT_CHANGE_MASK_FLAGS |
 			SPA_PORT_CHANGE_MASK_PARAMS;
 	port->info = SPA_PORT_INFO_INIT();
-	port->info.flags = SPA_PORT_FLAG_NO_REF;
-	if (this->props.live)
-		port->info.flags |= SPA_PORT_FLAG_LIVE;
+	port->info.flags = SPA_PORT_FLAG_NO_REF | SPA_PORT_FLAG_LIVE;
 	port->params[0] = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
 	port->params[1] = SPA_PARAM_INFO(SPA_PARAM_IO, 0);
 	port->params[2] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
diff --git a/spa/plugins/test/fakesrc.c b/spa/plugins/test/fakesrc.c
index 86dc44ac8..db28d9c3c 100644
--- a/spa/plugins/test/fakesrc.c
+++ b/spa/plugins/test/fakesrc.c
@@ -27,7 +27,6 @@
 SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.fakesrc");
 
 struct props {
-	bool live;
 	uint32_t pattern;
 };
 
@@ -88,12 +87,10 @@ struct impl {
 
 #define CHECK_PORT(this,d,p)  ((d) == SPA_DIRECTION_OUTPUT && (p) < MAX_PORTS)
 
-#define DEFAULT_LIVE false
 #define DEFAULT_PATTERN 0
 
 static void reset_props(struct impl *this, struct props *props)
 {
-	props->live = DEFAULT_LIVE;
 	props->pattern = DEFAULT_PATTERN;
 }
 
@@ -128,7 +125,6 @@ static int impl_node_enum_params(void *object, int seq,
 
 		param = spa_pod_builder_add_object(&b,
 			SPA_TYPE_OBJECT_Props, id,
-			SPA_PROP_live,        SPA_POD_Bool(p->live),
 			SPA_PROP_patternType, SPA_POD_CHOICE_ENUM_Int(2, p->pattern, p->pattern));
 		break;
 	}
@@ -163,7 +159,6 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
 	case SPA_PARAM_Props:
 	{
 		struct props *p = &this->props;
-		struct port *port = &this->port;
 
 		if (param == NULL) {
 			reset_props(this, p);
@@ -171,13 +166,7 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
 		}
 		spa_pod_parse_object(param,
 			SPA_TYPE_OBJECT_Props, NULL,
-			SPA_PROP_live,        SPA_POD_OPT_Bool(&p->live),
 			SPA_PROP_patternType, SPA_POD_OPT_Int(&p->pattern));
-
-		if (p->live)
-			port->info.flags |= SPA_PORT_FLAG_LIVE;
-		else
-			port->info.flags &= ~SPA_PORT_FLAG_LIVE;
 		break;
 	}
 	default:
@@ -193,23 +182,15 @@ static int fill_buffer(struct impl *this, struct buffer *b)
 
 static void set_timer(struct impl *this, bool enabled)
 {
-	if (this->callbacks.funcs || this->props.live) {
-		struct itimerspec ts = {0};
+	struct itimerspec ts = {0};
 
-		if (enabled) {
-			if (this->props.live) {
-				uint64_t next_time = this->start_time + this->elapsed_time;
-				ts.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
-				ts.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
-			} else {
-				ts.it_value.tv_sec = 0;
-				ts.it_value.tv_nsec = 1;
-			}
-		}
-
-		spa_system_timerfd_settime(this->data_system,
-				this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &ts, NULL);
+	if (enabled) {
+		uint64_t next_time = this->start_time + this->elapsed_time;
+		ts.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
+		ts.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
 	}
+
+	spa_system_timerfd_settime(this->data_system, this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &ts, NULL);
 }
 
 static inline int read_timer(struct impl *this)
@@ -217,14 +198,12 @@ static inline int read_timer(struct impl *this)
 	uint64_t expirations;
 	int res = 0;
 
-	if (this->callbacks.funcs || this->props.live) {
-		if ((res = spa_system_timerfd_read(this->data_system,
-					this->timer_source.fd, &expirations)) < 0) {
-			if (res != -EAGAIN)
-				spa_log_error(this->log, "%p: timerfd error: %s",
-						this, spa_strerror(res));
-		}
+	if ((res = spa_system_timerfd_read(this->data_system, this->timer_source.fd, &expirations)) < 0) {
+		if (res != -EAGAIN)
+			spa_log_error(this->log, "%p: timerfd error: %s",
+					this, spa_strerror(res));
 	}
+
 	return res;
 }
 
@@ -310,10 +289,7 @@ static int impl_node_send_command(void *object, const struct spa_command *comman
 			return 0;
 
 		clock_gettime(CLOCK_MONOTONIC, &now);
-		if (this->props.live)
-			this->start_time = SPA_TIMESPEC_TO_NSEC(&now);
-		else
-			this->start_time = 0;
+		this->start_time = SPA_TIMESPEC_TO_NSEC(&now);
 		this->buffer_count = 0;
 		this->elapsed_time = 0;
 
@@ -681,10 +657,7 @@ static int impl_node_process(void *object)
 		io->buffer_id = SPA_ID_INVALID;
 	}
 
-	if (this->callbacks.funcs == NULL)
-		return make_buffer(this);
-	else
-		return SPA_STATUS_OK;
+	return SPA_STATUS_OK;
 }
 
 static const struct spa_node_methods impl_node = {
@@ -804,9 +777,7 @@ impl_init(const struct spa_handle_factory *factory,
 	port->info_all = SPA_PORT_CHANGE_MASK_FLAGS |
 			SPA_PORT_CHANGE_MASK_PARAMS;
 	port->info = SPA_PORT_INFO_INIT();
-	port->info.flags = SPA_PORT_FLAG_NO_REF;
-	if (this->props.live)
-		port->info.flags |= SPA_PORT_FLAG_LIVE;
+	port->info.flags = SPA_PORT_FLAG_NO_REF | SPA_PORT_FLAG_LIVE;
 	port->params[0] = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
 	port->params[1] = SPA_PARAM_INFO(SPA_PARAM_IO, 0);
 	port->params[2] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
diff --git a/spa/plugins/videotestsrc/videotestsrc.c b/spa/plugins/videotestsrc/videotestsrc.c
index e416be44e..a8d7059c8 100644
--- a/spa/plugins/videotestsrc/videotestsrc.c
+++ b/spa/plugins/videotestsrc/videotestsrc.c
@@ -35,17 +35,14 @@ enum pattern {
 	PATTERN_SNOW,
 };
 
-#define DEFAULT_LIVE true
 #define DEFAULT_PATTERN PATTERN_SMPTE_SNOW
 
 struct props {
-	bool live;
 	uint32_t pattern;
 };
 
 static void reset_props(struct props *props)
 {
-	props->live = DEFAULT_LIVE;
 	props->pattern = DEFAULT_PATTERN;
 }
 
@@ -139,13 +136,6 @@ static int impl_node_enum_params(void *object, int seq,
 
 		switch (result.index) {
 		case 0:
-			param = spa_pod_builder_add_object(&b,
-				SPA_TYPE_OBJECT_PropInfo, id,
-				SPA_PROP_INFO_id,   SPA_POD_Id(SPA_PROP_live),
-				SPA_PROP_INFO_description, SPA_POD_String("Configure live mode of the source"),
-				SPA_PROP_INFO_type, SPA_POD_Bool(p->live));
-			break;
-		case 1:
 			spa_pod_builder_push_object(&b, &f[0], SPA_TYPE_OBJECT_PropInfo, id);
 			spa_pod_builder_add(&b,
 				SPA_PROP_INFO_id,   SPA_POD_Id(SPA_PROP_patternType),
@@ -174,7 +164,6 @@ static int impl_node_enum_params(void *object, int seq,
 		case 0:
 			param = spa_pod_builder_add_object(&b,
 				SPA_TYPE_OBJECT_Props, id,
-				SPA_PROP_live,        SPA_POD_Bool(p->live),
 				SPA_PROP_patternType, SPA_POD_Int(p->pattern));
 			break;
 		default:
@@ -229,7 +218,6 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
 	case SPA_PARAM_Props:
 	{
 		struct props *p = &this->props;
-		struct port *port = &this->port;
 
 		if (param == NULL) {
 			reset_props(p);
@@ -237,13 +225,8 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
 		}
 		spa_pod_parse_object(param,
 			SPA_TYPE_OBJECT_Props, NULL,
-			SPA_PROP_live,        SPA_POD_OPT_Bool(&p->live),
 			SPA_PROP_patternType, SPA_POD_OPT_Int(&p->pattern));
 
-		if (p->live)
-			port->info.flags |= SPA_PORT_FLAG_LIVE;
-		else
-			port->info.flags &= ~SPA_PORT_FLAG_LIVE;
 		break;
 	}
 	default:
@@ -261,22 +244,15 @@ static int fill_buffer(struct impl *this, struct buffer *b)
 
 static void set_timer(struct impl *this, bool enabled)
 {
-	if (this->props.live) {
-		struct timespec ts = {0};
+	struct timespec ts = {0};
 
-		if (enabled) {
-			if (this->props.live) {
-				uint64_t next_time = this->start_time + this->elapsed_time;
-				ts.tv_sec = next_time / SPA_NSEC_PER_SEC;
-				ts.tv_nsec = next_time % SPA_NSEC_PER_SEC;
-			} else {
-				ts.tv_sec = 0;
-				ts.tv_nsec = 1;
-			}
-		}
-
-		spa_loop_utils_update_timer(this->loop_utils, this->timer_source, &ts, NULL, true);
+	if (enabled) {
+		uint64_t next_time = this->start_time + this->elapsed_time;
+		ts.tv_sec = next_time / SPA_NSEC_PER_SEC;
+		ts.tv_nsec = next_time % SPA_NSEC_PER_SEC;
 	}
+
+	spa_loop_utils_update_timer(this->loop_utils, this->timer_source, &ts, NULL, true);
 }
 
 static int make_buffer(struct impl *this)
@@ -356,10 +332,7 @@ static int impl_node_send_command(void *object, const struct spa_command *comman
 			return 0;
 
 		clock_gettime(CLOCK_MONOTONIC, &now);
-		if (this->props.live)
-			this->start_time = SPA_TIMESPEC_TO_NSEC(&now);
-		else
-			this->start_time = 0;
+		this->start_time = SPA_TIMESPEC_TO_NSEC(&now);
 		this->frame_count = 0;
 		this->elapsed_time = 0;
 
@@ -753,9 +726,6 @@ static inline void reuse_buffer(struct impl *this, struct port *port, uint32_t i
 
 	b->outstanding = false;
 	spa_list_append(&port->empty, &b->link);
-
-	if (!this->props.live)
-		set_timer(this, true);
 }
 
 static int impl_node_port_reuse_buffer(void *object, uint32_t port_id, uint32_t buffer_id)
@@ -793,10 +763,7 @@ static int impl_node_process(void *object)
 		io->buffer_id = SPA_ID_INVALID;
 	}
 
-	if (!this->props.live)
-		return make_buffer(this);
-	else
-		return SPA_STATUS_OK;
+	return SPA_STATUS_OK;
 }
 
 static const struct spa_node_methods impl_node = {
@@ -910,9 +877,7 @@ impl_init(const struct spa_handle_factory *factory,
 	port->info_all = SPA_PORT_CHANGE_MASK_FLAGS |
 			SPA_PORT_CHANGE_MASK_PARAMS;
 	port->info = SPA_PORT_INFO_INIT();
-	port->info.flags = SPA_PORT_FLAG_NO_REF;
-	if (this->props.live)
-		port->info.flags |= SPA_PORT_FLAG_LIVE;
+	port->info.flags = SPA_PORT_FLAG_NO_REF | SPA_PORT_FLAG_LIVE;
 	port->params[0] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
 	port->params[1] = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
 	port->params[2] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
diff --git a/spa/plugins/vulkan/vulkan-compute-source.c b/spa/plugins/vulkan/vulkan-compute-source.c
index 57b4b18d0..aa6f4a60f 100644
--- a/spa/plugins/vulkan/vulkan-compute-source.c
+++ b/spa/plugins/vulkan/vulkan-compute-source.c
@@ -33,17 +33,6 @@ SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.vulkan.compute-source");
 #define FRAMES_TO_TIME(this,f) ((this->position->video.framerate.denom * (f) * SPA_NSEC_PER_SEC) / \
                                 (this->position->video.framerate.num))
 
-#define DEFAULT_LIVE true
-
-struct props {
-	bool live;
-};
-
-static void reset_props(struct props *props)
-{
-	props->live = DEFAULT_LIVE;
-}
-
 struct buffer {
 	uint32_t id;
 #define BUFFER_FLAG_OUT (1<<0)
@@ -95,7 +84,6 @@ struct impl {
 #define IDX_Props	1
 #define N_NODE_PARAMS	2
 	struct spa_param_info params[N_NODE_PARAMS];
-	struct props props;
 
 	struct spa_hook_list hooks;
 	struct spa_callbacks callbacks;
@@ -136,38 +124,6 @@ static int impl_node_enum_params(void *object, int seq,
 	spa_pod_builder_init(&b, buffer, sizeof(buffer));
 
 	switch (id) {
-	case SPA_PARAM_PropInfo:
-	{
-		struct props *p = &this->props;
-
-		switch (result.index) {
-		case 0:
-			param = spa_pod_builder_add_object(&b,
-				SPA_TYPE_OBJECT_PropInfo, id,
-				SPA_PROP_INFO_id,   SPA_POD_Id(SPA_PROP_live),
-				SPA_PROP_INFO_description, SPA_POD_String("Configure live mode of the source"),
-				SPA_PROP_INFO_type, SPA_POD_Bool(p->live));
-			break;
-		default:
-			return 0;
-		}
-		break;
-	}
-	case SPA_PARAM_Props:
-	{
-		struct props *p = &this->props;
-
-		switch (result.index) {
-		case 0:
-			param = spa_pod_builder_add_object(&b,
-				SPA_TYPE_OBJECT_Props, id,
-				SPA_PROP_live,        SPA_POD_Bool(p->live));
-			break;
-		default:
-			return 0;
-		}
-		break;
-	}
 	default:
 		return -ENOENT;
 	}
@@ -212,25 +168,6 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
 	spa_return_val_if_fail(this != NULL, -EINVAL);
 
 	switch (id) {
-	case SPA_PARAM_Props:
-	{
-		struct props *p = &this->props;
-		struct port *port = &this->port;
-
-		if (param == NULL) {
-			reset_props(p);
-			return 0;
-		}
-		spa_pod_parse_object(param,
-			SPA_TYPE_OBJECT_Props, NULL,
-			SPA_PROP_live,        SPA_POD_OPT_Bool(&p->live));
-
-		if (p->live)
-			port->info.flags |= SPA_PORT_FLAG_LIVE;
-		else
-			port->info.flags &= ~SPA_PORT_FLAG_LIVE;
-		break;
-	}
 	default:
 		return -ENOENT;
 	}
@@ -240,23 +177,15 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
 
 static void set_timer(struct impl *this, bool enabled)
 {
-	if (this->props.live) {
-		struct itimerspec ts = {0};
+	struct itimerspec ts = {0};
 
-		if (enabled) {
-			if (this->props.live) {
-				uint64_t next_time = this->start_time + this->elapsed_time;
-				ts.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
-				ts.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
-			} else {
-				ts.it_value.tv_sec = 0;
-				ts.it_value.tv_nsec = 1;
-			}
-		}
-
-		spa_system_timerfd_settime(this->data_system,
-				this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &ts, NULL);
+	if (enabled) {
+		uint64_t next_time = this->start_time + this->elapsed_time;
+		ts.it_value.tv_sec = next_time / SPA_NSEC_PER_SEC;
+		ts.it_value.tv_nsec = next_time % SPA_NSEC_PER_SEC;
 	}
+
+	spa_system_timerfd_settime(this->data_system, this->timer_source.fd, SPA_FD_TIMER_ABSTIME, &ts, NULL);
 }
 
 static int read_timer(struct impl *this)
@@ -264,14 +193,12 @@ static int read_timer(struct impl *this)
 	uint64_t expirations;
 	int res = 0;
 
-	if (this->props.live) {
-		if ((res = spa_system_timerfd_read(this->data_system,
-						this->timer_source.fd, &expirations)) < 0) {
-			if (res != -EAGAIN)
-				spa_log_error(this->log, "%p: timerfd error: %s",
-						this, spa_strerror(res));
-		}
+	if ((res = spa_system_timerfd_read(this->data_system, this->timer_source.fd, &expirations)) < 0) {
+		if (res != -EAGAIN)
+			spa_log_error(this->log, "%p: timerfd error: %s",
+					this, spa_strerror(res));
 	}
+
 	return res;
 }
 
@@ -346,9 +273,6 @@ static inline void reuse_buffer(struct impl *this, struct port *port, uint32_t i
 
 		SPA_FLAG_CLEAR(b->flags, BUFFER_FLAG_OUT);
 		spa_list_append(&port->empty, &b->link);
-
-		if (!this->props.live)
-			set_timer(this, true);
 	}
 }
 
@@ -407,10 +331,7 @@ static int impl_node_send_command(void *object, const struct spa_command *comman
 			return 0;
 
 		clock_gettime(CLOCK_MONOTONIC, &now);
-		if (this->props.live)
-			this->start_time = SPA_TIMESPEC_TO_NSEC(&now);
-		else
-			this->start_time = 0;
+		this->start_time = SPA_TIMESPEC_TO_NSEC(&now);
 		this->frame_count = 0;
 		this->elapsed_time = 0;
 
@@ -872,10 +793,7 @@ static int impl_node_process(void *object)
 		io->buffer_id = SPA_ID_INVALID;
 	}
 
-	if (!this->props.live)
-		return make_buffer(this);
-	else
-		return SPA_STATUS_OK;
+	return SPA_STATUS_OK;
 }
 
 static const struct spa_node_methods impl_node = {
@@ -983,7 +901,6 @@ impl_init(const struct spa_handle_factory *factory,
 	this->params[IDX_Props] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE);
 	this->info.params = this->params;
 	this->info.n_params = N_NODE_PARAMS;
-	reset_props(&this->props);
 
 	this->timer_source.func = on_output;
 	this->timer_source.data = this;
@@ -1000,9 +917,7 @@ impl_init(const struct spa_handle_factory *factory,
 			SPA_PORT_CHANGE_MASK_PARAMS |
 			SPA_PORT_CHANGE_MASK_PROPS;
 	port->info = SPA_PORT_INFO_INIT();
-	port->info.flags = SPA_PORT_FLAG_NO_REF;
-	if (this->props.live)
-		port->info.flags |= SPA_PORT_FLAG_LIVE;
+	port->info.flags = SPA_PORT_FLAG_NO_REF | SPA_PORT_FLAG_LIVE;
 	port->params[IDX_EnumFormat] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
 	port->params[IDX_Meta] = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
 	port->params[IDX_IO] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);

From 03f894bab09e95c5c3e3259becc0a740e74305d4 Mon Sep 17 00:00:00 2001
From: Sriman Achanta <srimanachanta@gmail.com>
Date: Mon, 30 Mar 2026 07:43:27 +0000
Subject: [PATCH 249/263] alsa-udev: Add wireless device status monitoring

---
 spa/plugins/alsa/alsa-udev.c | 156 ++++++++++++++++++++++++++++++++++-
 1 file changed, 153 insertions(+), 3 deletions(-)

diff --git a/spa/plugins/alsa/alsa-udev.c b/spa/plugins/alsa/alsa-udev.c
index fdc255864..9c3e12f20 100644
--- a/spa/plugins/alsa/alsa-udev.c
+++ b/spa/plugins/alsa/alsa-udev.c
@@ -48,6 +48,7 @@ struct card {
 	unsigned int accessible:1;
 	unsigned int ignored:1;
 	unsigned int emitted:1;
+	unsigned int wireless_disconnected:1;
 
 	/* Local SPA object IDs. (Global IDs are produced by PipeWire
 	 * out of this using its registry.) Compress-Offload or PCM
@@ -59,6 +60,10 @@ struct card {
 	 * is used because 0 is a valid ALSA card number. */
 	uint32_t pcm_device_id;
 	uint32_t compress_offload_device_id;
+
+	/* Syspath of the USB interface that has wireless_status (e.g.
+	 * /sys/devices/.../1-5:1.3). Empty string when not applicable. */
+	char wireless_status_syspath[256];
 };
 
 static uint32_t calc_pcm_device_id(struct card *card)
@@ -92,6 +97,8 @@ struct impl {
 
 	struct spa_source source;
 	struct spa_source notify;
+	struct udev_monitor *usb_umonitor;
+	struct spa_source usb_source;
 	unsigned int use_acp:1;
 	unsigned int expose_busy:1;
 	int use_ucm;
@@ -353,6 +360,87 @@ static int check_udev_environment(struct udev *udev, const char *devname)
 	return ret;
 }
 
+static void check_wireless_status(struct impl *this, struct card *card)
+{
+	char path[PATH_MAX];
+	char buf[32];
+	size_t sz;
+	bool was_disconnected;
+
+	if (card->wireless_status_syspath[0] == '\0')
+		return;
+
+	was_disconnected = card->wireless_disconnected;
+
+	spa_scnprintf(path, sizeof(path), "%s/wireless_status", card->wireless_status_syspath);
+
+	spa_autoptr(FILE) f = fopen(path, "re");
+	if (f == NULL)
+		return;
+
+	sz = fread(buf, 1, sizeof(buf) - 1, f);
+	buf[sz] = '\0';
+
+	card->wireless_disconnected = spa_strstartswith(buf, "disconnected");
+
+	if (card->wireless_disconnected != was_disconnected)
+		spa_log_info(this->log, "card %u: wireless headset %s",
+		             card->card_nr,
+		             card->wireless_disconnected ? "disconnected" : "connected");
+}
+
+static void find_wireless_status(struct impl *this, struct card *card)
+{
+	const char *bus, *parent_syspath, *parent_sysname;
+	struct udev_device *parent;
+	struct dirent *entry;
+	char path[PATH_MAX];
+	size_t sysname_len;
+
+	bus = udev_device_get_property_value(card->udev_device, "ID_BUS");
+	if (!spa_streq(bus, "usb"))
+		return;
+
+	/* udev_device_get_parent_* returns a borrowed reference owned by the child; do not unref it. */
+	parent = udev_device_get_parent_with_subsystem_devtype(card->udev_device, "usb", "usb_device");
+	if (parent == NULL)
+		return;
+
+	parent_syspath = udev_device_get_syspath(parent);
+	parent_sysname = udev_device_get_sysname(parent);
+	if (parent_syspath == NULL || parent_sysname == NULL)
+		return;
+
+	sysname_len = strlen(parent_sysname);
+
+	spa_autoptr(DIR) dir = opendir(parent_syspath);
+	if (dir == NULL)
+		return;
+
+	while ((entry = readdir(dir)) != NULL) {
+		/* USB interface directories are named "<sysname>:<config>.<intf>" */
+		if (strncmp(entry->d_name, parent_sysname, sysname_len) != 0 ||
+		    entry->d_name[sysname_len] != ':')
+			continue;
+
+		spa_scnprintf(path, sizeof(path), "%s/%s/wireless_status",
+		              parent_syspath, entry->d_name);
+		if (access(path, R_OK) < 0)
+			continue;
+
+		spa_scnprintf(card->wireless_status_syspath,
+		              sizeof(card->wireless_status_syspath),
+		              "%s/%s", parent_syspath, entry->d_name);
+
+		check_wireless_status(this, card);
+
+		spa_log_debug(this->log, "card %u: found wireless_status at %s (%s)",
+		              card->card_nr, card->wireless_status_syspath,
+		              card->wireless_disconnected ? "disconnected" : "connected");
+		return;
+	}
+}
+
 static int check_pcm_device_availability(struct impl *this, struct card *card,
                                          int *num_pcm_devices)
 {
@@ -734,7 +822,11 @@ static void process_card(struct impl *this, enum action action, struct card *car
 			return;
 
 		check_access(this, card);
-		if (card->accessible && !card->emitted) {
+		check_wireless_status(this, card);
+
+		bool effective_accessible = card->accessible && !card->wireless_disconnected;
+
+		if (effective_accessible && !card->emitted) {
 			int res = emit_added_object_info(this, card);
 			if (res < 0) {
 				if (card->ignored)
@@ -753,7 +845,7 @@ static void process_card(struct impl *this, enum action action, struct card *car
 							card->card_nr);
 				card->unavailable = false;
 			}
-		} else if (!card->accessible && card->emitted) {
+		} else if (!effective_accessible && card->emitted) {
 			card->emitted = false;
 
 			if (card->pcm_device_id != ID_DEVICE_NOT_SUPPORTED)
@@ -790,8 +882,11 @@ static void process_udev_device(struct impl *this, enum action action, struct ud
 		return;
 
 	card = find_card(this, card_nr);
-	if (action == ACTION_CHANGE && !card)
+	if (action == ACTION_CHANGE && !card) {
 		card = add_card(this, card_nr, udev_device);
+		if (card)
+			find_wireless_status(this, card);
+	}
 
 	if (!card)
 		return;
@@ -918,6 +1013,41 @@ static void impl_on_fd_events(struct spa_source *source)
 	udev_device_unref(udev_device);
 }
 
+static void impl_on_usb_events(struct spa_source *source)
+{
+	struct impl *this = source->data;
+	struct udev_device *udev_device;
+	const char *action, *syspath;
+	unsigned int i;
+
+	udev_device = udev_monitor_receive_device(this->usb_umonitor);
+	if (udev_device == NULL)
+		return;
+
+	if ((action = udev_device_get_action(udev_device)) == NULL)
+		action = "change";
+
+	if (!spa_streq(action, "change"))
+		goto done;
+
+	syspath = udev_device_get_syspath(udev_device);
+	if (syspath == NULL)
+		goto done;
+
+	for (i = 0; i < this->n_cards; i++) {
+		struct card *card = &this->cards[i];
+		if (card->wireless_status_syspath[0] == '\0')
+			continue;
+		if (!spa_streq(card->wireless_status_syspath, syspath))
+			continue;
+		spa_log_debug(this->log, "wireless_status change for card %u", card->card_nr);
+		process_card(this, ACTION_CHANGE, card);
+	}
+
+done:
+	udev_device_unref(udev_device);
+}
+
 static int start_monitor(struct impl *this)
 {
 	int res;
@@ -941,6 +1071,20 @@ static int start_monitor(struct impl *this)
 	spa_log_debug(this->log, "monitor %p", this->umonitor);
 	spa_loop_add_source(this->main_loop, &this->source);
 
+	this->usb_umonitor = udev_monitor_new_from_netlink(this->udev, "udev");
+	if (this->usb_umonitor != NULL) {
+		udev_monitor_filter_add_match_subsystem_devtype(this->usb_umonitor,
+		                                                "usb", "usb_interface");
+		udev_monitor_enable_receiving(this->usb_umonitor);
+
+		this->usb_source.func = impl_on_usb_events;
+		this->usb_source.data = this;
+		this->usb_source.fd = udev_monitor_get_fd(this->usb_umonitor);
+		this->usb_source.mask = SPA_IO_IN | SPA_IO_ERR;
+
+		spa_loop_add_source(this->main_loop, &this->usb_source);
+	}
+
 	if ((res = start_inotify(this)) < 0)
 		return res;
 
@@ -958,6 +1102,12 @@ static int stop_monitor(struct impl *this)
 	udev_monitor_unref(this->umonitor);
 	this->umonitor = NULL;
 
+	if (this->usb_umonitor != NULL) {
+		spa_loop_remove_source(this->main_loop, &this->usb_source);
+		udev_monitor_unref(this->usb_umonitor);
+		this->usb_umonitor = NULL;
+	}
+
 	stop_inotify(this);
 
 	return 0;

From 18c97222c4becbced0731bac42b9025356c68d29 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 30 Mar 2026 17:50:48 +0200
Subject: [PATCH 250/263] channelmix: make up/downmix levels configurable

Add channelmix.center-level, channelmix.surround-level and
channelmix.lfe-level to control how center, surround and LFE is
up/downmixed.

Fixes #5198
---
 doc/dox/config/pipewire-client.conf.5.md     |  3 +
 doc/dox/config/pipewire-props.7.md           |  9 +++
 doc/dox/config/pipewire-pulse.conf.5.md      |  3 +
 spa/plugins/audioconvert/audioconvert.c      | 70 +++++++++++++++-----
 spa/plugins/audioconvert/channelmix-ops.c    | 21 +++++-
 spa/plugins/audioconvert/channelmix-ops.h    | 15 +++++
 spa/plugins/audioconvert/test-audioconvert.c |  7 +-
 spa/plugins/audioconvert/test-channelmix.c   |  4 +-
 src/daemon/client.conf.in                    |  3 +
 src/daemon/minimal.conf.in                   |  3 +
 src/daemon/pipewire-avb.conf.in              |  3 +
 src/daemon/pipewire-pulse.conf.in            |  3 +
 12 files changed, 119 insertions(+), 25 deletions(-)

diff --git a/doc/dox/config/pipewire-client.conf.5.md b/doc/dox/config/pipewire-client.conf.5.md
index db43839a0..321538a79 100644
--- a/doc/dox/config/pipewire-client.conf.5.md
+++ b/doc/dox/config/pipewire-client.conf.5.md
@@ -80,6 +80,9 @@ stream.properties = {
     #channelmix.fc-cutoff  = 12000.0
     #channelmix.rear-delay = 12.0
     #channelmix.stereo-widen = 0.0
+    #channelmix.center-level = 0.707106781
+    #channelmix.surround-level = 0.707106781
+    #channelmix.lfe-level = 0.5
     #channelmix.hilbert-taps = 0
     #dither.noise = 0
     #dither.method = none # rectangular, triangular, triangular-hf, wannamaker3, shaped5
diff --git a/doc/dox/config/pipewire-props.7.md b/doc/dox/config/pipewire-props.7.md
index a215c6f21..44b16f505 100644
--- a/doc/dox/config/pipewire-props.7.md
+++ b/doc/dox/config/pipewire-props.7.md
@@ -783,6 +783,15 @@ more to the center speaker and leaves the ambient sound in the stereo channels.
 This is only active when up-mix is enabled and a Front Center channel is mixed.
 \endparblock
 
+@PAR@ node-prop  channelmix.center-level = 0.707106781
+The level of the center channel when up/downmixing.
+
+@PAR@ node-prop  channelmix.surround-level = 0.707106781
+The level of the surround channels when up/downmixing.
+
+@PAR@ node-prop  channelmix.lfe-level = 0.5
+The level of the LFE channel when up/downmixing.
+
 @PAR@ node-prop  channelmix.hilbert-taps = 0
 \parblock
 This option will apply a 90 degree phase shift to the rear channels to improve specialization.
diff --git a/doc/dox/config/pipewire-pulse.conf.5.md b/doc/dox/config/pipewire-pulse.conf.5.md
index ad1b213c7..9cc8d4c48 100644
--- a/doc/dox/config/pipewire-pulse.conf.5.md
+++ b/doc/dox/config/pipewire-pulse.conf.5.md
@@ -93,6 +93,9 @@ stream.properties = {
     #channelmix.fc-cutoff = 12000.0
     #channelmix.rear-delay = 12.0
     #channelmix.stereo-widen = 0.0
+    #channelmix.center-level = 0.707106781
+    #channelmix.surround-level = 0.707106781
+    #channelmix.lfe-level = 0.5
     #channelmix.hilbert-taps = 0
     #dither.noise = 0
     #dither.method = none # rectangular, triangular, triangular-hf, wannamaker3, shaped5
diff --git a/spa/plugins/audioconvert/audioconvert.c b/spa/plugins/audioconvert/audioconvert.c
index dce1367f1..482200854 100644
--- a/spa/plugins/audioconvert/audioconvert.c
+++ b/spa/plugins/audioconvert/audioconvert.c
@@ -724,6 +724,34 @@ static int node_param_prop_info(struct impl *this, uint32_t id, uint32_t index,
 			SPA_PROP_INFO_params, SPA_POD_Bool(true));
 		break;
 	case 19:
+		*param = spa_pod_builder_add_object(b,
+			SPA_TYPE_OBJECT_PropInfo, id,
+			SPA_PROP_INFO_name, SPA_POD_String("channelmix.center-level"),
+			SPA_PROP_INFO_description, SPA_POD_String("Center up/downmix level"),
+			SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Float(
+				this->mix.center_level, 0.0, 10.0),
+			SPA_PROP_INFO_params, SPA_POD_Bool(true));
+		break;
+	case 20:
+		*param = spa_pod_builder_add_object(b,
+			SPA_TYPE_OBJECT_PropInfo, id,
+			SPA_PROP_INFO_name, SPA_POD_String("channelmix.surround-level"),
+			SPA_PROP_INFO_description, SPA_POD_String("Surround up/downmix level"),
+			SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Float(
+				this->mix.surround_level, 0.0, 10.0),
+			SPA_PROP_INFO_params, SPA_POD_Bool(true));
+		break;
+	case 21:
+		*param = spa_pod_builder_add_object(b,
+			SPA_TYPE_OBJECT_PropInfo, id,
+			SPA_PROP_INFO_name, SPA_POD_String("channelmix.lfe-level"),
+			SPA_PROP_INFO_description, SPA_POD_String("LFE up/downmix level"),
+			SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Float(
+				this->mix.lfe_level, 0.0, 10.0),
+			SPA_PROP_INFO_params, SPA_POD_Bool(true));
+		break;
+
+	case 22:
 		*param = spa_pod_builder_add_object(b,
 			SPA_TYPE_OBJECT_PropInfo, id,
 			SPA_PROP_INFO_name, SPA_POD_String("channelmix.hilbert-taps"),
@@ -732,7 +760,7 @@ static int node_param_prop_info(struct impl *this, uint32_t id, uint32_t index,
 				this->mix.hilbert_taps, 0, MAX_TAPS),
 			SPA_PROP_INFO_params, SPA_POD_Bool(true));
 		break;
-	case 20:
+	case 23:
 		spa_pod_builder_push_object(b, &f[0], SPA_TYPE_OBJECT_PropInfo, id);
 		spa_pod_builder_add(b,
 			SPA_PROP_INFO_name, SPA_POD_String("channelmix.upmix-method"),
@@ -751,14 +779,14 @@ static int node_param_prop_info(struct impl *this, uint32_t id, uint32_t index,
 		spa_pod_builder_pop(b, &f[1]);
 		*param = spa_pod_builder_pop(b, &f[0]);
 		break;
-	case 21:
+	case 24:
 		*param = spa_pod_builder_add_object(b,
 			SPA_TYPE_OBJECT_PropInfo, id,
 			SPA_PROP_INFO_id, SPA_POD_Id(SPA_PROP_rate),
 			SPA_PROP_INFO_description, SPA_POD_String("Rate scaler"),
 			SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Double(p->rate, 0.0, 10.0));
 		break;
-	case 22:
+	case 25:
 		*param = spa_pod_builder_add_object(b,
 			SPA_TYPE_OBJECT_PropInfo, id,
 			SPA_PROP_INFO_id, SPA_POD_Id(SPA_PROP_quality),
@@ -767,7 +795,7 @@ static int node_param_prop_info(struct impl *this, uint32_t id, uint32_t index,
 			SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Int(p->resample_quality, 0, 14),
 			SPA_PROP_INFO_params, SPA_POD_Bool(true));
 		break;
-	case 23:
+	case 26:
 		*param = spa_pod_builder_add_object(b,
 			SPA_TYPE_OBJECT_PropInfo, id,
 			SPA_PROP_INFO_name, SPA_POD_String("resample.disable"),
@@ -775,7 +803,7 @@ static int node_param_prop_info(struct impl *this, uint32_t id, uint32_t index,
 			SPA_PROP_INFO_type, SPA_POD_CHOICE_Bool(p->resample_disabled),
 			SPA_PROP_INFO_params, SPA_POD_Bool(true));
 		break;
-	case 24:
+	case 27:
 		*param = spa_pod_builder_add_object(b,
 			SPA_TYPE_OBJECT_PropInfo, id,
 			SPA_PROP_INFO_name, SPA_POD_String("dither.noise"),
@@ -783,7 +811,7 @@ static int node_param_prop_info(struct impl *this, uint32_t id, uint32_t index,
 			SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Int(this->dir[1].conv.noise_bits, 0, 16),
 			SPA_PROP_INFO_params, SPA_POD_Bool(true));
 		break;
-	case 25:
+	case 28:
 		spa_pod_builder_push_object(b, &f[0], SPA_TYPE_OBJECT_PropInfo, id);
 		spa_pod_builder_add(b,
 			SPA_PROP_INFO_name, SPA_POD_String("dither.method"),
@@ -801,7 +829,7 @@ static int node_param_prop_info(struct impl *this, uint32_t id, uint32_t index,
 		spa_pod_builder_pop(b, &f[1]);
 		*param = spa_pod_builder_pop(b, &f[0]);
 		break;
-	case 26:
+	case 29:
 		*param = spa_pod_builder_add_object(b,
 			SPA_TYPE_OBJECT_PropInfo, id,
 			SPA_PROP_INFO_name, SPA_POD_String("debug.wav-path"),
@@ -809,7 +837,7 @@ static int node_param_prop_info(struct impl *this, uint32_t id, uint32_t index,
 			SPA_PROP_INFO_type, SPA_POD_String(p->wav_path),
 			SPA_PROP_INFO_params, SPA_POD_Bool(true));
 		break;
-	case 27:
+	case 30:
 		*param = spa_pod_builder_add_object(b,
 			SPA_TYPE_OBJECT_PropInfo, id,
 			SPA_PROP_INFO_name, SPA_POD_String("channelmix.lock-volumes"),
@@ -817,7 +845,7 @@ static int node_param_prop_info(struct impl *this, uint32_t id, uint32_t index,
 			SPA_PROP_INFO_type, SPA_POD_CHOICE_Bool(p->lock_volumes),
 			SPA_PROP_INFO_params, SPA_POD_Bool(true));
 		break;
-	case 28:
+	case 31:
 		*param = spa_pod_builder_add_object(b,
 			SPA_TYPE_OBJECT_PropInfo, id,
 			SPA_PROP_INFO_name, SPA_POD_String("audioconvert.filter-graph.disable"),
@@ -825,7 +853,7 @@ static int node_param_prop_info(struct impl *this, uint32_t id, uint32_t index,
 			SPA_PROP_INFO_type, SPA_POD_CHOICE_Bool(p->filter_graph_disabled),
 			SPA_PROP_INFO_params, SPA_POD_Bool(true));
 		break;
-	case 29:
+	case 32:
 		*param = spa_pod_builder_add_object(b,
 			SPA_TYPE_OBJECT_PropInfo, id,
 			SPA_PROP_INFO_name, SPA_POD_String("audioconvert.filter-graph.N"),
@@ -836,7 +864,7 @@ static int node_param_prop_info(struct impl *this, uint32_t id, uint32_t index,
 	default:
 		if (this->filter_graph[0] && this->filter_graph[0]->graph) {
 			return spa_filter_graph_enum_prop_info(this->filter_graph[0]->graph,
-					index - 30, b, param);
+					index - 33, b, param);
 		}
 		return 0;
 	}
@@ -903,6 +931,12 @@ static int node_param_props(struct impl *this, uint32_t id, uint32_t index,
 		spa_pod_builder_float(b, this->mix.rear_delay);
 		spa_pod_builder_string(b, "channelmix.stereo-widen");
 		spa_pod_builder_float(b, this->mix.widen);
+		spa_pod_builder_string(b, "channelmix.center-level");
+		spa_pod_builder_float(b, this->mix.center_level);
+		spa_pod_builder_string(b, "channelmix.surround-level");
+		spa_pod_builder_float(b, this->mix.surround_level);
+		spa_pod_builder_string(b, "channelmix.lfe-level");
+		spa_pod_builder_float(b, this->mix.lfe_level);
 		spa_pod_builder_string(b, "channelmix.hilbert-taps");
 		spa_pod_builder_int(b, this->mix.hilbert_taps);
 		spa_pod_builder_string(b, "channelmix.upmix-method");
@@ -1490,6 +1524,12 @@ static int audioconvert_set_param(struct impl *this, const char *k, const char *
 		spa_atof(s, &this->mix.rear_delay);
 	else if (spa_streq(k, "channelmix.stereo-widen"))
 		spa_atof(s, &this->mix.widen);
+	else if (spa_streq(k, "channelmix.center-level"))
+		spa_atof(s, &this->mix.center_level);
+	else if (spa_streq(k, "channelmix.surround-level"))
+		spa_atof(s, &this->mix.surround_level);
+	else if (spa_streq(k, "channelmix.lfe-level"))
+		spa_atof(s, &this->mix.lfe_level);
 	else if (spa_streq(k, "channelmix.hilbert-taps"))
 		spa_atou32(s, &this->mix.hilbert_taps, 0);
 	else if (spa_streq(k, "channelmix.upmix-method"))
@@ -4320,13 +4360,7 @@ impl_init(const struct spa_handle_factory *factory,
 	this->rate_limit.interval = 2 * SPA_NSEC_PER_SEC;
 	this->rate_limit.burst = 1;
 
-	this->mix.options = CHANNELMIX_OPTION_UPMIX | CHANNELMIX_OPTION_MIX_LFE;
-	this->mix.upmix = CHANNELMIX_UPMIX_NONE;
-	this->mix.log = this->log;
-	this->mix.lfe_cutoff = 0.0f;
-	this->mix.fc_cutoff = 0.0f;
-	this->mix.rear_delay = 0.0f;
-	this->mix.widen = 0.0f;
+	channelmix_reset(&this->mix);
 
 	for (i = 0; info && i < info->n_items; i++) {
 		const char *k = info->items[i].key;
diff --git a/spa/plugins/audioconvert/channelmix-ops.c b/spa/plugins/audioconvert/channelmix-ops.c
index 921270450..574d0dd1b 100644
--- a/spa/plugins/audioconvert/channelmix-ops.c
+++ b/spa/plugins/audioconvert/channelmix-ops.c
@@ -198,9 +198,9 @@ static int make_matrix(struct channelmix *mix)
 	uint32_t dst_chan = mix->dst_chan;
 	uint64_t unassigned, keep;
 	uint32_t i, j, ic, jc, matrix_encoding = MATRIX_NORMAL;
-	float clev = SQRT1_2;
-	float slev = SQRT1_2;
-	float llev = 0.5f;
+	float clev = mix->center_level;
+	float slev = mix->surround_level;
+	float llev = mix->lfe_level;
 	float maxsum = 0.0f;
 	bool filter_fc = false, filter_lfe = false, matched = false, normalize;
 #define _MATRIX(s,d)	matrix[_CH(s)][_CH(d)]
@@ -874,6 +874,21 @@ static void impl_channelmix_free(struct channelmix *mix)
 	mix->process = NULL;
 }
 
+void channelmix_reset(struct channelmix *mix)
+{
+	spa_zero(*mix);
+	mix->options = CHANNELMIX_DEFAULT_OPTIONS;
+	mix->upmix = CHANNELMIX_DEFAULT_UPMIX;
+	mix->lfe_cutoff = CHANNELMIX_DEFAULT_LFE_CUTOFF;
+	mix->fc_cutoff = CHANNELMIX_DEFAULT_FC_CUTOFF;
+	mix->rear_delay = CHANNELMIX_DEFAULT_REAR_DELAY;
+	mix->center_level = CHANNELMIX_DEFAULT_CENTER_LEVEL;
+	mix->surround_level = CHANNELMIX_DEFAULT_SURROUND_LEVEL;
+	mix->lfe_level = CHANNELMIX_DEFAULT_LFE_LEVEL;
+	mix->widen = CHANNELMIX_DEFAULT_WIDEN;
+	mix->hilbert_taps = CHANNELMIX_DEFAULT_HILBERT_TAPS;
+}
+
 int channelmix_init(struct channelmix *mix)
 {
 	const struct channelmix_info *info;
diff --git a/spa/plugins/audioconvert/channelmix-ops.h b/spa/plugins/audioconvert/channelmix-ops.h
index 947cc6f34..c66eaddd3 100644
--- a/spa/plugins/audioconvert/channelmix-ops.h
+++ b/spa/plugins/audioconvert/channelmix-ops.h
@@ -28,6 +28,17 @@
 
 #define CHANNELMIX_OPS_MAX_ALIGN 16
 
+#define CHANNELMIX_DEFAULT_OPTIONS (CHANNELMIX_OPTION_UPMIX | CHANNELMIX_OPTION_MIX_LFE)
+#define CHANNELMIX_DEFAULT_UPMIX CHANNELMIX_UPMIX_NONE
+#define CHANNELMIX_DEFAULT_LFE_CUTOFF 0.0f
+#define CHANNELMIX_DEFAULT_FC_CUTOFF 0.0f
+#define CHANNELMIX_DEFAULT_REAR_DELAY 0.0f
+#define CHANNELMIX_DEFAULT_CENTER_LEVEL 0.707106781f
+#define CHANNELMIX_DEFAULT_SURROUND_LEVEL 0.707106781f
+#define CHANNELMIX_DEFAULT_LFE_LEVEL 0.5f
+#define CHANNELMIX_DEFAULT_WIDEN 0.0f
+#define CHANNELMIX_DEFAULT_HILBERT_TAPS 0
+
 struct channelmix {
 	uint32_t src_chan;
 	uint32_t dst_chan;
@@ -60,6 +71,9 @@ struct channelmix {
 	float fc_cutoff;				/* in Hz, 0 is disabled */
 	float rear_delay;				/* in ms, 0 is disabled */
 	float widen;					/* stereo widen. 0 is disabled */
+	float center_level;				/* center down/upmix level, sqrt(1/2) */
+	float lfe_level;				/* lfe down/upmix level, 1/2 */
+	float surround_level;				/* surround down/upmix level, sqrt(1/2) */
 	uint32_t hilbert_taps;				/* to phase shift, 0 disabled */
 	struct lr4 lr4[MAX_CHANNELS];
 
@@ -80,6 +94,7 @@ struct channelmix {
 	void *data;
 };
 
+void channelmix_reset(struct channelmix *mix);
 int channelmix_init(struct channelmix *mix);
 
 static const struct channelmix_upmix_info {
diff --git a/spa/plugins/audioconvert/test-audioconvert.c b/spa/plugins/audioconvert/test-audioconvert.c
index de3ebb8b5..de18d524b 100644
--- a/spa/plugins/audioconvert/test-audioconvert.c
+++ b/spa/plugins/audioconvert/test-audioconvert.c
@@ -54,7 +54,7 @@ static int setup_context(struct context *ctx)
 	size_t size;
 	int res;
 	struct spa_support support[1];
-	struct spa_dict_item items[6];
+	struct spa_dict_item items[9];
 	const struct spa_handle_factory *factory;
 	void *iface;
 
@@ -76,10 +76,13 @@ static int setup_context(struct context *ctx)
 	items[3] = SPA_DICT_ITEM_INIT("channelmix.lfe-cutoff", "150");
 	items[4] = SPA_DICT_ITEM_INIT("channelmix.fc-cutoff", "12000");
 	items[5] = SPA_DICT_ITEM_INIT("channelmix.rear-delay", "12.0");
+	items[6] = SPA_DICT_ITEM_INIT("channelmix.center-level", "0.707106781");
+	items[7] = SPA_DICT_ITEM_INIT("channelmix.surround-level", "0.707106781");
+	items[8] = SPA_DICT_ITEM_INIT("channelmix.lfe-level", "0.5");
 
 	res = spa_handle_factory_init(factory,
 			ctx->convert_handle,
-			&SPA_DICT_INIT(items, 6),
+			&SPA_DICT_INIT(items, 9),
 			support, 1);
 	spa_assert_se(res >= 0);
 
diff --git a/spa/plugins/audioconvert/test-channelmix.c b/spa/plugins/audioconvert/test-channelmix.c
index b68c956bf..529db880f 100644
--- a/spa/plugins/audioconvert/test-channelmix.c
+++ b/spa/plugins/audioconvert/test-channelmix.c
@@ -45,7 +45,7 @@ static void test_mix(uint32_t src_chan, uint32_t src_mask, uint32_t dst_chan, ui
 
 	spa_log_debug(&logger.log, "start %d->%d (%08x -> %08x)", src_chan, dst_chan, src_mask, dst_mask);
 
-	spa_zero(mix);
+	channelmix_reset(&mix);
 	mix.options = options;
 	mix.src_chan = src_chan;
 	mix.dst_chan = dst_chan;
@@ -340,7 +340,7 @@ static void test_n_m_impl(void)
 		src[i] = src_data[i];
 	}
 
-	spa_zero(mix);
+	channelmix_reset(&mix);
 	mix.src_chan = 16;
 	mix.dst_chan = 12;
 	mix.log = &logger.log;
diff --git a/src/daemon/client.conf.in b/src/daemon/client.conf.in
index 46874af93..e0baeda92 100644
--- a/src/daemon/client.conf.in
+++ b/src/daemon/client.conf.in
@@ -101,6 +101,9 @@ stream.properties = {
     #channelmix.lfe-cutoff = 150
     #channelmix.fc-cutoff  = 12000
     #channelmix.rear-delay = 12.0
+    #channelmix.center-level   = 0.707106781
+    #channelmix.surround-level = 0.707106781
+    #channelmix.lfe-level      = 0.5
     #channelmix.stereo-widen = 0.0
     #channelmix.hilbert-taps = 0
     #dither.noise = 0
diff --git a/src/daemon/minimal.conf.in b/src/daemon/minimal.conf.in
index 6def01bcf..7ab93e92b 100644
--- a/src/daemon/minimal.conf.in
+++ b/src/daemon/minimal.conf.in
@@ -332,6 +332,9 @@ context.objects = [
             #channelmix.fc-cutoff   = 12000
             #channelmix.rear-delay  = 12.0
             #channelmix.stereo-widen = 0.0
+            #channelmix.center-level   = 0.707106781
+            #channelmix.surround-level = 0.707106781
+            #channelmix.lfe-level      = 0.5
             #channelmix.hilbert-taps = 0
             #channelmix.disable     = false
             #dither.noise = 0
diff --git a/src/daemon/pipewire-avb.conf.in b/src/daemon/pipewire-avb.conf.in
index da158f212..e43015780 100644
--- a/src/daemon/pipewire-avb.conf.in
+++ b/src/daemon/pipewire-avb.conf.in
@@ -60,6 +60,9 @@ stream.properties = {
     #channelmix.fc-cutoff  = 6000
     #channelmix.rear-delay = 12.0
     #channelmix.stereo-widen = 0.1
+    #channelmix.center-level   = 0.707106781
+    #channelmix.surround-level = 0.707106781
+    #channelmix.lfe-level      = 0.5
     #channelmix.hilbert-taps = 0
 }
 
diff --git a/src/daemon/pipewire-pulse.conf.in b/src/daemon/pipewire-pulse.conf.in
index 8c21e37df..db646db0b 100644
--- a/src/daemon/pipewire-pulse.conf.in
+++ b/src/daemon/pipewire-pulse.conf.in
@@ -88,6 +88,9 @@ stream.properties = {
     #channelmix.fc-cutoff  = 12000
     #channelmix.rear-delay = 12.0
     #channelmix.stereo-widen = 0.0
+    #channelmix.center-level   = 0.707106781
+    #channelmix.surround-level = 0.707106781
+    #channelmix.lfe-level      = 0.5
     #channelmix.hilbert-taps = 0
     #dither.noise = 0
 }

From 9ba92bd728cadcc1811246e6d4242f03c49e82d9 Mon Sep 17 00:00:00 2001
From: Carlos Rafael Giani <crg7475@mailbox.org>
Date: Tue, 24 Mar 2026 17:05:09 +0100
Subject: [PATCH 251/263] spa: Do not perform upper range check on 32-bit
 platforms

---
 spa/include/spa/pod/body.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/spa/include/spa/pod/body.h b/spa/include/spa/pod/body.h
index 4ab5d8e5f..90eadb82e 100644
--- a/spa/include/spa/pod/body.h
+++ b/spa/include/spa/pod/body.h
@@ -111,8 +111,15 @@ SPA_API_POD_BODY int spa_pod_choice_n_values(uint32_t choice_type, uint32_t *min
 SPA_API_POD_BODY int spa_pod_body_from_data(void *data, size_t maxsize, off_t offset, size_t size,
 		struct spa_pod *pod, const void **body)
 {
-	if (offset < 0 || offset > (int64_t)UINT32_MAX)
+	if (offset < 0)
 		return -EINVAL;
+	/* On 32-bit platforms, off_t is a signed 32-bit type (since it tracks pointer
+	 * width), and consequently can never exceed UINT32_MAX. Skip the upper-bound
+	 * check on 32-bit platforms to avoid a compiler warning. */
+#if __SIZEOF_POINTER__ > 4
+	if (offset > (int64_t)UINT32_MAX)
+		return -EINVAL;
+#endif
 	if (size < sizeof(struct spa_pod) ||
 	    size > maxsize ||
 	    maxsize - size < (uint32_t)offset)

From 41b5bc662e637cbbf75eca98f816f2d172fa5b12 Mon Sep 17 00:00:00 2001
From: Carlos Rafael Giani <crg7475@mailbox.org>
Date: Mon, 30 Mar 2026 23:45:08 +0200
Subject: [PATCH 252/263] network-utils: pw_net_are_addresses_equal() function

---
 src/modules/network-utils.h | 58 +++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/src/modules/network-utils.h b/src/modules/network-utils.h
index 3c93e201e..568e9cb19 100644
--- a/src/modules/network-utils.h
+++ b/src/modules/network-utils.h
@@ -87,6 +87,64 @@ static inline int pw_net_parse_address_port(const char *address,
 	return pw_net_parse_address(n, port, addr, len);
 }
 
+static inline bool pw_net_are_addresses_equal(const struct sockaddr_storage *addr1,
+					      const struct sockaddr_storage *addr2,
+					      bool compare_ports)
+{
+	/* IPv6 addresses might actually be mapped IPv4 ones. In cases where
+	 * such mapped IPv4 addresses are compared against plain IPv4 ones
+	 * (that is, ss_family == AF_INET), special handling is required. */
+	bool addr1_is_mapped_ipv4 = (addr1->ss_family == AF_INET6) &&
+	                            IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6*)addr1)->sin6_addr);
+	bool addr2_is_mapped_ipv4 = (addr2->ss_family == AF_INET6) &&
+	                            IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6*)addr2)->sin6_addr);
+
+	if ((addr1->ss_family == AF_INET) && (addr2->ss_family == AF_INET)) {
+		/* Both addresses are plain IPv4 addresses. */
+
+		const struct sockaddr_in *addr1_in = (const struct sockaddr_in *)addr1;
+		const struct sockaddr_in *addr2_in = (const struct sockaddr_in *)addr2;
+		return (!compare_ports || (addr1_in->sin_port == addr2_in->sin_port)) &&
+		       (addr1_in->sin_addr.s_addr == addr2_in->sin_addr.s_addr);
+	} else if ((addr1->ss_family == AF_INET6) && (addr2->ss_family == AF_INET6)) {
+		/* Both addresses are IPv6 addresses. (Note that this logic here
+		 * works correctly even if both are actually mapped IPv4 addresses.) */
+
+		const struct sockaddr_in6 *addr1_in6 = (const struct sockaddr_in6 *)addr1;
+		const struct sockaddr_in6 *addr2_in6 = (const struct sockaddr_in6 *)addr2;
+		return (!compare_ports || (addr1_in6->sin6_port == addr2_in6->sin6_port)) &&
+		       (addr1_in6->sin6_scope_id == addr2_in6->sin6_scope_id) &&
+		       (memcmp(&addr1_in6->sin6_addr, &addr2_in6->sin6_addr, sizeof(struct in6_addr)) == 0);
+	} else if ((addr1->ss_family == AF_INET) && addr2_is_mapped_ipv4) {
+		/* addr1 is a plain IPv4 address, addr2 is a mapped IPv4 address.
+		 * Extract the IPv4 portion of addr2 to form a plain IPv4 address
+		 * out of it, then compare the two plain IPv4 addresses. */
+
+		struct in_addr addr2_as_ipv4;
+		const struct sockaddr_in *addr1_in = (const struct sockaddr_in *)addr1;
+		const struct sockaddr_in6 *addr2_in6 = (const struct sockaddr_in6 *)addr2;
+
+		memcpy(&addr2_as_ipv4, &(addr2_in6->sin6_addr.s6_addr[12]), 4);
+
+		return (!compare_ports || (addr1_in->sin_port == addr2_in6->sin6_port)) &&
+		       (addr1_in->sin_addr.s_addr == addr2_as_ipv4.s_addr);
+	} else if (addr1_is_mapped_ipv4 && (addr2->ss_family == AF_INET)) {
+		/* addr2 is a plain IPv4 address, addr1 is a mapped IPv4 address.
+		 * Extract the IPv4 portion of addr1 to form a plain IPv4 address
+		 * out of it, then compare the two plain IPv4 addresses. */
+
+		struct in_addr addr1_as_ipv4;
+		const struct sockaddr_in6 *addr1_in6 = (const struct sockaddr_in6 *)addr1;
+		const struct sockaddr_in *addr2_in = (const struct sockaddr_in *)addr2;
+
+		memcpy(&addr1_as_ipv4, &(addr1_in6->sin6_addr.s6_addr[12]), 4);
+
+		return (!compare_ports || (addr1_in6->sin6_port == addr2_in->sin_port)) &&
+		       (addr1_as_ipv4.s_addr == addr2_in->sin_addr.s_addr);
+	} else
+		return false;
+}
+
 static inline int pw_net_get_ip(const struct sockaddr_storage *sa, char *ip, size_t len, bool *ip4, uint16_t *port)
 {
 	if (ip4)

From 3080bca85a16ee36210516d6d782c730faa9ecaa Mon Sep 17 00:00:00 2001
From: Carlos Rafael Giani <crg7475@mailbox.org>
Date: Thu, 26 Mar 2026 00:38:33 +0100
Subject: [PATCH 253/263] module-rtp-source: Fix unicast by-address packet
 filtering

Using connect() on a UDP receiver creates a strict filter based on
the sender's _source_ port, not the sender's destination port. The
source port specifies at what sender port the packet exits the sender.
The destination port specifies at what receiver port the packet enters
the receiver. But, the RTP sink uses an ephemeral (= random) port as the
source port. Consequently, connect() at the receiver will cause a
comparison of that ephemeral port with the fixated one (which is actually
the number of the _destination_ port). This incorrect filtering causes
all packets to be dropped.

Use bind() to filter for the local destination port, and use recvmsg()
with manual IP comparison to filter for the sender's identity.
---
 src/modules/module-rtp-source.c | 68 +++++++++++++++++++++++++--------
 1 file changed, 52 insertions(+), 16 deletions(-)

diff --git a/src/modules/module-rtp-source.c b/src/modules/module-rtp-source.c
index 2110385b8..acbf0b9db 100644
--- a/src/modules/module-rtp-source.c
+++ b/src/modules/module-rtp-source.c
@@ -246,6 +246,9 @@ struct impl {
 	socklen_t src_len;
 	struct spa_source *source;
 
+	bool is_multicast;
+	bool filter_by_address;
+
 	uint8_t *buffer;
 	size_t buffer_size;
 
@@ -300,14 +303,41 @@ on_rtp_io(void *data, int fd, uint32_t mask)
 	ssize_t len;
 	int suppressed;
 	uint64_t current_time;
+	struct sockaddr_storage recvaddr;
+	socklen_t recvaddr_len = sizeof(recvaddr);
 
 	current_time = get_time_ns(impl);
 
 	if (mask & SPA_IO_IN) {
-
-		if ((len = recv(fd, impl->buffer, impl->buffer_size, 0)) < 0)
+		if ((len = recvfrom(fd, impl->buffer, impl->buffer_size, 0, (struct sockaddr *)(&recvaddr), &recvaddr_len)) < 0)
 			goto receive_error;
 
+		/* Filter the packets to exclude those with source addresses
+		 * that do not match the expected one. Only used with unicast.
+		 * (The bind() call in make_socket takes care of only
+		 * receiving packets that target the specified port.) */
+		if (impl->filter_by_address && !pw_net_are_addresses_equal(&recvaddr, &(impl->src_addr), false)) {
+			/* In the IPv6 case, pw_net_get_ip() produces output formatted
+			 * as "<IPv6 address>%<network interface name>". Both constants
+			 * INET6_ADDRSTRLEN and IFNAMSIZ include the null terminator
+			 * in their respective length values. This works out well for
+			 * the formatted output, since this ensures there is one extra
+			 * character for the % delimiter and another extra character
+			 * for the null terminator of the entire string.
+			 *
+			 * (In the IPv4 case, pw_net_get_ip() just outputs the address.) */
+			char address_str[INET6_ADDRSTRLEN + IFNAMSIZ];
+			int res;
+
+			res = pw_net_get_ip(&recvaddr, address_str, sizeof(address_str), NULL, NULL);
+			if (SPA_LIKELY(res == 0))
+				pw_log_trace("Filtering out packet with mismatching address %s", address_str);
+			else
+				pw_log_warn("Filtering out packet with unrecognized address");
+
+			return;
+		}
+
 		if (len < 12)
 			goto short_packet;
 
@@ -474,12 +504,12 @@ finish:
 }
 
 static int make_socket(const struct sockaddr* sa, socklen_t salen, char *ifname,
-			struct igmp_recovery *igmp_recovery)
+			struct igmp_recovery *igmp_recovery, bool *is_multicast,
+			bool *filter_by_address)
 {
 	int af, fd, val, res;
 	struct ifreq req;
 	struct sockaddr_storage ba = *(struct sockaddr_storage *)sa;
-	bool do_connect = false;
 	char addr[128];
 
 	af = sa->sa_family;
@@ -522,12 +552,16 @@ static int make_socket(const struct sockaddr* sa, socklen_t salen, char *ifname,
 			pw_net_get_ip((struct sockaddr_storage*)sa, addr, sizeof(addr), NULL, NULL);
 			pw_log_info("join IPv4 group: %s", addr);
 			res = setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mr4, sizeof(mr4));
+			*filter_by_address = false;
+			*is_multicast = true;
 		} else {
 			struct sockaddr_in *ba4 = (struct sockaddr_in*)&ba;
-			if (ba4->sin_addr.s_addr != INADDR_ANY) {
-				ba4->sin_addr.s_addr = INADDR_ANY;
-				do_connect = true;
-			}
+			*filter_by_address = (ba4->sin_addr.s_addr != INADDR_ANY);
+			*is_multicast = false;
+			/* Make sure the ANY address is always used. This is important
+			 * for the bind() call below - with unicast, it shall only filter
+			 * by port number (address filtering is done by recvfrom()). */
+			ba4->sin_addr.s_addr = INADDR_ANY;
 		}
 	} else if (af == AF_INET6) {
 		struct sockaddr_in6 *sa6 = (struct sockaddr_in6*)sa;
@@ -539,8 +573,15 @@ static int make_socket(const struct sockaddr* sa, socklen_t salen, char *ifname,
 			pw_net_get_ip((struct sockaddr_storage*)sa, addr, sizeof(addr), NULL, NULL);
 			pw_log_info("join IPv6 group: %s", addr);
 			res = setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mr6, sizeof(mr6));
+			*filter_by_address = false;
+			*is_multicast = true;
 		} else {
 			struct sockaddr_in6 *ba6 = (struct sockaddr_in6*)&ba;
+			*filter_by_address = !IN6_IS_ADDR_UNSPECIFIED(&(ba6->sin6_addr.s6_addr));
+			*is_multicast = false;
+			/* Make sure the ANY address is always used. This is important
+			 * for the bind() call below - with unicast, it shall only filter
+			 * by port number (address filtering is done by recvfrom()). */
 			ba6->sin6_addr = in6addr_any;
 		}
 	} else {
@@ -569,13 +610,6 @@ static int make_socket(const struct sockaddr* sa, socklen_t salen, char *ifname,
 		pw_log_error("bind() failed: %m");
 		goto error;
 	}
-	if (do_connect) {
-		if (connect(fd, sa, salen) < 0) {
-			res = -errno;
-			pw_log_error("connect() failed: %m");
-			goto error;
-		}
-	}
 	return fd;
 error:
 	close(fd);
@@ -613,7 +647,9 @@ static void stream_open_connection(void *data, int *result)
 
 	if ((fd = make_socket((const struct sockaddr *)&impl->src_addr,
 					impl->src_len, impl->ifname,
-					&(impl->igmp_recovery))) < 0) {
+					&(impl->igmp_recovery),
+					&(impl->is_multicast),
+					&(impl->filter_by_address))) < 0) {
 		/* If make_socket() tries to create a socket and join to a multicast
 		 * group while the network interfaces are not ready yet to do so
 		 * (usually because a network manager component is still setting up

From 5b86e3d418b21bd26d9c44ca8b755129a28b53f9 Mon Sep 17 00:00:00 2001
From: Carlos Rafael Giani <crg7475@mailbox.org>
Date: Thu, 26 Mar 2026 00:39:10 +0100
Subject: [PATCH 254/263] module-rtp-source: Only enable IGMP recovery when
 using multicast

IGMP recovery makes no sense with unicast IP addresses.
---
 src/modules/module-rtp-source.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/modules/module-rtp-source.c b/src/modules/module-rtp-source.c
index acbf0b9db..b0b52ed50 100644
--- a/src/modules/module-rtp-source.c
+++ b/src/modules/module-rtp-source.c
@@ -699,11 +699,13 @@ static void stream_open_connection(void *data, int *result)
 		goto finish;
 	}
 
-	if ((res = pw_timer_queue_add(impl->timer_queue, &impl->igmp_recovery.timer,
-			NULL, impl->igmp_recovery.check_interval * SPA_NSEC_PER_SEC,
-			on_igmp_recovery_timer_event, impl)) < 0) {
-		pw_log_error("can't add timer: %s", spa_strerror(res));
-		goto finish;
+	if (impl->is_multicast) {
+		if ((res = pw_timer_queue_add(impl->timer_queue, &impl->igmp_recovery.timer,
+				NULL, impl->igmp_recovery.check_interval * SPA_NSEC_PER_SEC,
+				on_igmp_recovery_timer_event, impl)) < 0) {
+			pw_log_error("can't add timer: %s", spa_strerror(res));
+			goto finish;
+		}
 	}
 
 finish:

From 0121bdc4759f7ab06611a8d91716ecf79263314b Mon Sep 17 00:00:00 2001
From: Carlos Rafael Giani <crg7475@mailbox.org>
Date: Mon, 1 Dec 2025 12:14:18 +0100
Subject: [PATCH 255/263] module-rtp: Lower missing timeout log line from warn
 to trace

A warning is not warranted in this case, and this log line can spam
the logs, so set it to trace.
---
 src/modules/module-rtp/audio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/module-rtp/audio.c b/src/modules/module-rtp/audio.c
index e03ae7ce9..085f3bae8 100644
--- a/src/modules/module-rtp/audio.c
+++ b/src/modules/module-rtp/audio.c
@@ -606,7 +606,7 @@ static void rtp_audio_stop_timer(struct impl *impl)
 static void rtp_audio_flush_timeout(struct impl *impl, uint64_t expirations)
 {
 	if (expirations > 1)
-		pw_log_warn("missing timeout %"PRIu64, expirations);
+		pw_log_trace("missing timeout %"PRIu64, expirations);
 	rtp_audio_flush_packets(impl, expirations, 0);
 }
 

From 54c517b2d95a055004b9b8321361374e456cdbb4 Mon Sep 17 00:00:00 2001
From: Martin Geier <martin.geier@streamunlimited.com>
Date: Fri, 12 Dec 2025 08:58:33 +0100
Subject: [PATCH 256/263] module-rtp: Add more logging for debugging timer
 related issues

---
 src/modules/module-rtp-sap.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/modules/module-rtp-sap.c b/src/modules/module-rtp-sap.c
index c734758c3..cfbcbf419 100644
--- a/src/modules/module-rtp-sap.c
+++ b/src/modules/module-rtp-sap.c
@@ -1235,8 +1235,11 @@ static struct session *session_new_announce(struct impl *impl, struct node *node
 			sess->has_sdp = true;
 	}
 
+	pw_log_debug("sending out initial SAP");
 	send_sap(impl, sess, 0);
 
+	pw_log_debug("new announcement session up and running");
+
 	return sess;
 
 error_free:
@@ -1835,6 +1838,7 @@ static int start_sap(struct impl *impl)
 			pw_timer_queue_add(impl->timer_queue, &impl->start_sap_retry_timer,
 					NULL, 1 * SPA_NSEC_PER_SEC,
 					on_start_sap_retry_timer_event, impl);
+			pw_log_info("starting SAP retry timer");
 
 			/* It is important to return 0 in this case. Otherwise, the nonzero return
 			 * value will later be propagated through the core as an error. */
@@ -2005,8 +2009,10 @@ static void impl_destroy(struct impl *impl)
 	pw_timer_queue_cancel(&impl->sap_send_timer);
 	pw_timer_queue_cancel(&impl->start_sap_retry_timer);
 	pw_timer_queue_cancel(&impl->igmp_recovery.timer);
-	if (impl->sap_source)
+	if (impl->sap_source) {
+		pw_log_info("destroying SAP source");
 		pw_loop_destroy_source(impl->loop, impl->sap_source);
+	}
 
 	if (impl->sap_fd != -1)
 		close(impl->sap_fd);

From 67dd3549a78599fccf5894ed4062a5e3cb502bb2 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 20 Mar 2026 19:36:51 +0100
Subject: [PATCH 257/263] system: use attribute packed for the spa_poll_event

This makes it the same size as epoll_event and we don't need to copy the
results over.

It however technically causes an ABI break, in case someone was using
the system interface directly.
---
 spa/include/spa/support/system.h |  8 ++++----
 spa/plugins/support/system.c     | 13 ++++---------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/spa/include/spa/support/system.h b/spa/include/spa/support/system.h
index 07a31a55f..3d287da04 100644
--- a/spa/include/spa/support/system.h
+++ b/spa/include/spa/support/system.h
@@ -41,7 +41,7 @@ struct itimerspec;
 #define SPA_TYPE_INTERFACE_System	SPA_TYPE_INFO_INTERFACE_BASE "System"
 #define SPA_TYPE_INTERFACE_DataSystem	SPA_TYPE_INFO_INTERFACE_BASE "DataSystem"
 
-#define SPA_VERSION_SYSTEM		0
+#define SPA_VERSION_SYSTEM		1
 struct spa_system { struct spa_interface iface; };
 
 /* IO events */
@@ -60,10 +60,10 @@ struct spa_system { struct spa_interface iface; };
 struct spa_poll_event {
 	uint32_t events;
 	void *data;
-};
+} __attribute__ ((packed));
 
 struct spa_system_methods {
-#define SPA_VERSION_SYSTEM_METHODS	0
+#define SPA_VERSION_SYSTEM_METHODS	1
 	uint32_t version;
 
 	/* read/write/ioctl */
@@ -151,7 +151,7 @@ SPA_API_SYSTEM int spa_system_pollfd_del(struct spa_system *object, int pfd, int
 SPA_API_SYSTEM int spa_system_pollfd_wait(struct spa_system *object, int pfd,
 			struct spa_poll_event *ev, int n_ev, int timeout)
 {
-	return spa_api_method_fast_r(int, -ENOTSUP, spa_system, &object->iface, pollfd_wait, 0, pfd, ev, n_ev, timeout);
+	return spa_api_method_fast_r(int, -ENOTSUP, spa_system, &object->iface, pollfd_wait, 1, pfd, ev, n_ev, timeout);
 }
 
 SPA_API_SYSTEM int spa_system_timerfd_create(struct spa_system *object, int clockid, int flags)
diff --git a/spa/plugins/support/system.c b/spa/plugins/support/system.c
index 767e0b43d..d48636e2e 100644
--- a/spa/plugins/support/system.c
+++ b/spa/plugins/support/system.c
@@ -30,6 +30,8 @@ SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.system");
 #  define TFD_TIMER_CANCEL_ON_SET (1 << 1)
 #endif
 
+SPA_STATIC_ASSERT(sizeof(struct spa_poll_event) == sizeof(struct epoll_event));
+
 struct impl {
 	struct spa_handle handle;
 	struct spa_system system;
@@ -132,16 +134,9 @@ static int impl_pollfd_del(void *object, int pfd, int fd)
 static int impl_pollfd_wait(void *object, int pfd,
 		struct spa_poll_event *ev, int n_ev, int timeout)
 {
-	struct epoll_event ep[n_ev];
-	int i, nfds;
-
-	if (SPA_UNLIKELY((nfds = epoll_wait(pfd, ep, n_ev, timeout)) < 0))
+	int nfds;
+	if (SPA_UNLIKELY((nfds = epoll_wait(pfd, (struct epoll_event*)ev, n_ev, timeout)) < 0))
 		return -errno;
-
-        for (i = 0; i < nfds; i++) {
-                ev[i].events = ep[i].events;
-                ev[i].data = ep[i].data.ptr;
-        }
 	return nfds;
 }
 

From 49d5f4f2363564cd05236a22d1a3e1d13bf57b39 Mon Sep 17 00:00:00 2001
From: ValdikSS <iam@valdikss.org.ru>
Date: Sun, 5 Apr 2026 19:52:53 +0300
Subject: [PATCH 258/263] bluez5: aac: use maximum possible peak bitrate
 according to MTU

Android 11 and newer, in both CBR and VBR modes,
* Sets bitrate (AACENC_BITRATE) to the max_bitrate value of A2DP
* Sets peak bitrate (AACENC_PEAK_BITRATE) according to the maximum data
   which could fit into single audio packet based on MTU

AACENC_BITRATE is used only in CBR mode. For VBR mode, the only limiting
factor is AACENC_PEAK_BITRATE.

Do the same in Pipewire.

Link: https://gitlab.freedesktop.org/pipewire/pipewire/-/work_items/1482#note_2949680
Link: https://cs.android.com/android/platform/superproject/+/android16-qpr2-release:packages/modules/Bluetooth/system/stack/a2dp/a2dp_aac_encoder.cc;drc=37d7b4549f7b8740df1a290f04c20c591a2d3391;l=269
---
 spa/plugins/bluez5/a2dp-codec-aac.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spa/plugins/bluez5/a2dp-codec-aac.c b/spa/plugins/bluez5/a2dp-codec-aac.c
index a82efe983..689e26ba6 100644
--- a/spa/plugins/bluez5/a2dp-codec-aac.c
+++ b/spa/plugins/bluez5/a2dp-codec-aac.c
@@ -380,8 +380,12 @@ static void *codec_init(const struct media_codec *codec, uint32_t flags,
 	// Fragmentation is not implemented yet,
 	// so make sure every encoded AAC frame fits in (mtu - header)
 	this->max_bitrate = ((this->mtu - sizeof(struct rtp_header)) * 8 * this->rate) / 1024;
-	this->max_bitrate = SPA_MIN(this->max_bitrate, get_valid_aac_bitrate(conf));
-	this->cur_bitrate = this->max_bitrate;
+	this->cur_bitrate = SPA_MIN(this->max_bitrate, get_valid_aac_bitrate(conf));
+	spa_log_debug(log, "AAC: max (peak) bitrate: %d, cur bitrate: %d, mode: %d (vbr: %d)",
+			this->max_bitrate,
+			this->cur_bitrate,
+			bitratemode,
+			conf->vbr);
 
 	res = aacEncoder_SetParam(this->aacenc, AACENC_BITRATE, this->cur_bitrate);
 	if (res != AACENC_OK)

From a35b6b0c4bcf93c7f261c6317a1a8e8eb141f33c Mon Sep 17 00:00:00 2001
From: ValdikSS <iam@valdikss.org.ru>
Date: Sun, 5 Apr 2026 19:58:00 +0300
Subject: [PATCH 259/263] bluez5: aac: use higher band limit for CBR mode

FDK-AAC encoder uses band pass filter, which is automatically
applied at all bitrates.
For CBR encoding mode, its values are as follows (for stereo):

* 0-12 kb/s:   5   kHz
* 12-20 kb/s:  6.4 kHz
* 20-28 kb/s:  9.6 kHz
* 40-56 kb/s:  13  kHz
* 56-72 kb/s:  16  kHz
* 72-576 kb/s: 17  kHz

VBR uses the following table (stereo):

* Mode 1: 13   kHz
* Mode 2: 13   kHz
* Mode 3: 15.7 kHz
* Mode 4: 16.5 kHz
* Mode 5: 19.3 kHz

17 kHz for CBR is a limiting value for high bitrate.

Assume >110 kbit/s as a "high bitrate" CBR and increase the
band pass cutout up to 19.3 kHz (as in mode 5 VBR).

Link: https://github.com/mstorsjo/fdk-aac/blob/d8e6b1a3aa606c450241632b64b703f21ea31ce3/libAACenc/src/bandwidth.cpp#L114-L160
---
 spa/plugins/bluez5/a2dp-codec-aac.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/spa/plugins/bluez5/a2dp-codec-aac.c b/spa/plugins/bluez5/a2dp-codec-aac.c
index 689e26ba6..c426dc1db 100644
--- a/spa/plugins/bluez5/a2dp-codec-aac.c
+++ b/spa/plugins/bluez5/a2dp-codec-aac.c
@@ -395,6 +395,15 @@ static void *codec_init(const struct media_codec *codec, uint32_t flags,
 	if (res != AACENC_OK)
 		goto error;
 
+	// Assume >110 kbit/s as a "high bitrate" CBR and increase the
+	// band pass cutout up to 19.3 kHz (as in mode 5 VBR).
+	if (!conf->vbr && this->cur_bitrate > 110000)  {
+		res = aacEncoder_SetParam(this->aacenc, AACENC_BANDWIDTH,
+				19293);
+		if (res != AACENC_OK)
+			goto error;
+	}
+
 	res = aacEncoder_SetParam(this->aacenc, AACENC_TRANSMUX, TT_MP4_LATM_MCP1);
 	if (res != AACENC_OK)
 		goto error;

From ee1b42944121c20d6ae64e64a70e8fc2db8cd4f1 Mon Sep 17 00:00:00 2001
From: ValdikSS <iam@valdikss.org.ru>
Date: Sun, 5 Apr 2026 20:14:23 +0300
Subject: [PATCH 260/263] bluez5: aac: Use VBR encoding with Mode 5 by default

---
 spa/plugins/bluez5/a2dp-codec-aac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spa/plugins/bluez5/a2dp-codec-aac.c b/spa/plugins/bluez5/a2dp-codec-aac.c
index c426dc1db..f4cbecd9b 100644
--- a/spa/plugins/bluez5/a2dp-codec-aac.c
+++ b/spa/plugins/bluez5/a2dp-codec-aac.c
@@ -286,7 +286,7 @@ static void *codec_init_props(const struct media_codec *codec, uint32_t flags, c
 		return NULL;
 
 	if (settings == NULL || (str = spa_dict_lookup(settings, "bluez5.a2dp.aac.bitratemode")) == NULL)
-		str = "0";
+		str = "5";
 
 	p->bitratemode = SPA_CLAMP(atoi(str), 0, 5);
 	return p;

From 54a4515b09bbed17ed493179a839099389fc72cf Mon Sep 17 00:00:00 2001
From: Alexander Sarmanow <a.sarmanow@televic.com>
Date: Tue, 31 Mar 2026 14:30:46 +0200
Subject: [PATCH 261/263] bluez5: bap: add support for manual BIS config

---
 spa/plugins/bluez5/bap-codec-lc3.c | 18 +++++++++--
 spa/plugins/bluez5/bluez5-dbus.c   | 49 +++++++++++++++++++++++++++---
 2 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/spa/plugins/bluez5/bap-codec-lc3.c b/spa/plugins/bluez5/bap-codec-lc3.c
index b1b12cb78..881af4e14 100644
--- a/spa/plugins/bluez5/bap-codec-lc3.c
+++ b/spa/plugins/bluez5/bap-codec-lc3.c
@@ -1503,6 +1503,10 @@ static int codec_get_bis_config(const struct media_codec *codec, uint8_t *caps,
 	struct ltv_writer writer = LTV_WRITER(caps, *caps_size);
 	const struct bap_qos *preset = NULL;
 
+	uint32_t retransmissions = 0;
+	uint8_t rtn_manual_set = 0;
+	uint32_t max_transport_latency = 0;
+	uint32_t presentation_delay = 0;
 	*caps_size = 0;
 
 	if (settings) {
@@ -1511,6 +1515,14 @@ static int codec_get_bis_config(const struct media_codec *codec, uint8_t *caps,
 				sscanf(settings->items[i].value, "%"PRIu32, &channel_allocation);
 			if (spa_streq(settings->items[i].key, "preset"))
 				preset_name = settings->items[i].value;
+			if (spa_streq(settings->items[i].key, "max_transport_latency"))
+				spa_atou32(settings->items[i].value, &max_transport_latency, 0);
+			if (spa_streq(settings->items[i].key, "presentation_delay"))
+				spa_atou32(settings->items[i].value, &presentation_delay, 0);
+			if (spa_streq(settings->items[i].key, "retransmissions")) {
+				spa_atou32(settings->items[i].value, &retransmissions, 0);
+				rtn_manual_set = 1;
+			}
 		}
 	}
 
@@ -1537,9 +1549,9 @@ static int codec_get_bis_config(const struct media_codec *codec, uint8_t *caps,
 	else
 		qos->framing = 0;
 	qos->sdu = preset->framelen * get_channel_count(channel_allocation);
-	qos->retransmission = preset->retransmission;
-	qos->latency = preset->latency;
-	qos->delay = preset->delay;
+	qos->retransmission = rtn_manual_set ? retransmissions : preset->retransmission;
+	qos->latency = max_transport_latency ? max_transport_latency : preset->latency;
+	qos->delay = presentation_delay ? presentation_delay : preset->delay;
 	qos->phy = 2;
 	qos->interval = (preset->frame_duration == LC3_CONFIG_DURATION_7_5 ? 7500 : 10000);
 
diff --git a/spa/plugins/bluez5/bluez5-dbus.c b/spa/plugins/bluez5/bluez5-dbus.c
index f4b384547..22d971c37 100644
--- a/spa/plugins/bluez5/bluez5-dbus.c
+++ b/spa/plugins/bluez5/bluez5-dbus.c
@@ -188,9 +188,16 @@ struct spa_bt_metadata {
 	uint8_t value[METADATA_MAX_LEN - 1];
 };
 
+#define RTN_MAX				0x1E
+#define MAX_TRANSPORT_LATENCY_MIN	0x5
+#define MAX_TRANSPORT_LATENCY_MAX	0x0FA0
+
 struct spa_bt_bis {
 	struct spa_list link;
 	char qos_preset[255];
+	int retransmissions;
+	int rtn_manual_set;
+	int max_transport_latency;
 	int channel_allocation;
 	struct spa_list metadata_list;
 };
@@ -6192,8 +6199,11 @@ static void configure_bis(struct spa_bt_monitor *monitor,
 	struct bap_codec_qos qos;
 	struct spa_bt_metadata *metadata_entry;
 	struct spa_dict settings;
-	struct spa_dict_item setting_items[2];
+	struct spa_dict_item setting_items[4];
+	uint32_t n_items = 0;
 	char channel_allocation[64] = {0};
+	char retransmissions[3] = {0};
+	char max_transport_latency[5] = {0};
 
 	int mse = 0;
 	int options = 0;
@@ -6218,12 +6228,27 @@ static void configure_bis(struct spa_bt_monitor *monitor,
 		metadata_size += metadata_entry->length - 1;
 	}
 
+
 	spa_log_debug(monitor->log, "bis->channel_allocation %d", bis->channel_allocation);
-	if (bis->channel_allocation)
+	if (bis->channel_allocation) {
 		spa_scnprintf(channel_allocation, sizeof(channel_allocation), "%"PRIu32, bis->channel_allocation);
-	setting_items[0] = SPA_DICT_ITEM_INIT("channel_allocation", channel_allocation);
-	setting_items[1] = SPA_DICT_ITEM_INIT("preset", bis->qos_preset);
-	settings = SPA_DICT_INIT(setting_items, 2);
+	}
+	spa_log_debug(monitor->log, "bis->rtn_manual_set %d", bis->rtn_manual_set);
+	spa_log_debug(monitor->log, "bis->retransmissions %d", bis->retransmissions);
+	if (bis->rtn_manual_set) {
+		spa_scnprintf(retransmissions, sizeof(retransmissions), "%"PRIu8, bis->retransmissions);
+		setting_items[n_items++] = SPA_DICT_ITEM_INIT("retransmissions", retransmissions);
+	}
+	spa_log_debug(monitor->log, "bis->max_transport_latency %d", bis->max_transport_latency);
+	if (bis->max_transport_latency) {
+		spa_scnprintf(max_transport_latency, sizeof(max_transport_latency), "%"PRIu32, bis->max_transport_latency);
+		setting_items[n_items++] = SPA_DICT_ITEM_INIT("max_transport_latency", max_transport_latency);
+	}
+
+	setting_items[n_items++] = SPA_DICT_ITEM_INIT("preset", bis->qos_preset);
+	setting_items[n_items++] = SPA_DICT_ITEM_INIT("channel_allocation", channel_allocation);
+
+	settings = SPA_DICT_INIT(setting_items, n_items);
 
 	caps_size = sizeof(caps);
 	ret = codec->get_bis_config(codec, caps, &caps_size, &settings, &qos);
@@ -7126,6 +7151,20 @@ static void parse_broadcast_source_config(struct spa_bt_monitor *monitor, const
 							if (spa_json_get_string(&it[1], bis_entry->qos_preset, sizeof(bis_entry->qos_preset)) <= 0)
 								goto parse_failed;
 							spa_log_debug(monitor->log, "bis_entry->qos_preset %s", bis_entry->qos_preset);
+						} else if (spa_streq(bis_key, "retransmissions")) {
+							if (spa_json_get_int(&it[2], &bis_entry->retransmissions) <= 0)
+								goto parse_failed;
+							if (bis_entry->retransmissions > RTN_MAX)
+								goto parse_failed;
+							bis_entry->rtn_manual_set = 1;
+							spa_log_debug(monitor->log, "bis_entry->retransmissions %d", bis_entry->retransmissions);
+						} else if (spa_streq(bis_key, "max_transport_latency")) {
+							if (spa_json_get_int(&it[2], &bis_entry->max_transport_latency) <= 0)
+								goto parse_failed;
+							if (bis_entry->max_transport_latency < MAX_TRANSPORT_LATENCY_MIN &&
+								bis_entry->max_transport_latency > MAX_TRANSPORT_LATENCY_MAX)
+								goto parse_failed;
+							spa_log_debug(monitor->log, "bis_entry->max_transport_latency %d", bis_entry->max_transport_latency);
 						} else if (spa_streq(bis_key, "audio_channel_allocation")) {
 							if (spa_json_get_int(&it[1], &bis_entry->channel_allocation) <= 0)
 								goto parse_failed;

From 6b0248d68cadc7b7d61b5d656cda5600e42e287c Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 6 Apr 2026 10:39:08 +0200
Subject: [PATCH 262/263] Revert "impl-node: Don't suspend when links are busy"

This reverts commit bb0efd777f187f10896c899ccebe93be0bf242f2.

It is unclear what the problem was before this commit. If there are any
pending operations, the suspend should simply cancel them.

See #5207
---
 src/pipewire/impl-node.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c
index 77aef4bfc..c72dc7dcd 100644
--- a/src/pipewire/impl-node.c
+++ b/src/pipewire/impl-node.c
@@ -539,21 +539,6 @@ static int suspend_node(struct pw_impl_node *this)
 	    (this->info.state == PW_NODE_STATE_SUSPENDED && impl->pending_state == PW_NODE_STATE_SUSPENDED))
 		return 0;
 
-	spa_list_for_each(p, &this->input_ports, link) {
-		if (p->busy_count > 0) {
-			pw_log_debug("%p: can't suspend, input port %d busy:%d",
-					this, p->port_id, p->busy_count);
-			return -EBUSY;
-		}
-	}
-	spa_list_for_each(p, &this->output_ports, link) {
-		if (p->busy_count > 0) {
-			pw_log_debug("%p: can't suspend, output port %d busy:%d",
-					this, p->port_id, p->busy_count);
-			return -EBUSY;
-		}
-	}
-
 	node_deactivate(this);
 
 	pw_log_debug("%p: suspend node driving:%d driver:%d prepared:%d", this,

From ad0bab69a1d15bb7f2d3ded2ed70ff2e85df6605 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Mon, 6 Apr 2026 10:24:34 +0300
Subject: [PATCH 263/263] spa: system: make spa_poll_event compatible with
 epoll_events

spa_poll_event should have exactly same layout as epoll_events to be
compatible across platforms. The structure is packed only on x86-64.

Fix packing and replace the data member with similar union as
epoll_data, to fix compatibility on 32-bit etc.
---
 spa/include/spa/support/system.h | 11 +++++++++--
 spa/plugins/support/system.c     |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/spa/include/spa/support/system.h b/spa/include/spa/support/system.h
index 3d287da04..56ceea648 100644
--- a/spa/include/spa/support/system.h
+++ b/spa/include/spa/support/system.h
@@ -59,8 +59,15 @@ struct spa_system { struct spa_interface iface; };
 
 struct spa_poll_event {
 	uint32_t events;
-	void *data;
-} __attribute__ ((packed));
+	union {
+		void *data;
+		uint64_t data_u64;
+	};
+#ifdef __x86_64__
+} __attribute__((packed));
+#else
+};
+#endif
 
 struct spa_system_methods {
 #define SPA_VERSION_SYSTEM_METHODS	1
diff --git a/spa/plugins/support/system.c b/spa/plugins/support/system.c
index d48636e2e..cd9e1c6eb 100644
--- a/spa/plugins/support/system.c
+++ b/spa/plugins/support/system.c
@@ -31,6 +31,8 @@ SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.system");
 #endif
 
 SPA_STATIC_ASSERT(sizeof(struct spa_poll_event) == sizeof(struct epoll_event));
+SPA_STATIC_ASSERT(offsetof(struct spa_poll_event, events) == offsetof(struct epoll_event, events));
+SPA_STATIC_ASSERT(offsetof(struct spa_poll_event, data) == offsetof(struct epoll_event, data.ptr));
 
 struct impl {
 	struct spa_handle handle;