Request 6066 (accepted)

Overview

Request 6066 (accepted)

New stable branch release

Created by zaitor 4 months ago
In state accepted
Package maintainer: zaitor

Submit pipewire-aptx

Submit package home:zaitor:...s:Essentials / pipewire-aptx to package Essentials / pipewire-aptx

pipewire-aptx.changes Changed

pipewire-aptx.spec Changed

pipewire-1.0.1.tar.bz2/doc/dox/programs/pipewire-pulse-modules.7.md Deleted

pipewire-1.0.1.tar.bz2/doc/dox/programs/pipewire-pulse.conf.5.md Deleted

@@ -1,56 +0,0 @@
-\page page_man_pipewire-pulse_conf_5 pipewire-pulse.conf
-
-The PipeWire Pulseaudio server configuration file
-
-# SYNOPSIS
-
-*$XDG_CONFIG_HOME/pipewire/pipewire-pulse.conf*
-
-*$(PIPEWIRE_CONFIG_DIR)/pipewire-pulse.conf*
-
-*$(PIPEWIRE_CONFDATADIR)/pipewire-pulse.conf*
-
-*$(PIPEWIRE_CONFDATADIR)/pipewire-pulse.conf.d/*
-
-*$(PIPEWIRE_CONFIG_DIR)/pipewire-pulse.conf.d/*
-
-*$XDG_CONFIG_HOME/pipewire/pipewire-pulse.conf.d/*
-
-# DESCRIPTION
-
-Configuration for PipeWire's PulseAudio-compatible daemon.
-
-The configuration file format is the same as for `pipewire.conf(5)`.
-There are additional sections for configuring `pipewire-pulse(1)`
-settings.
-
-# CONFIGURATION FILE SECTIONS
-
-\par pulse.properties
-Dictionary. These properties configure the PipeWire Pulseaudio server
-properties.
-
-\par pulse.cmd
-Array of dictionaries. A set of commands to be executed on startup.
-
-\par pulse.rules
-Array of dictionaries. A set of match rules and actions to apply to
-clients.
-
-See \ref page_module_protocol_pulse "libpipewire-module-protocol-pulse(7)"
-for the detailed description.
-
-In addition, the general PipeWire daemon configuration sections apply,
-see \ref page_man_pipewire_conf_5 "pipewire.conf(5)".
-
-# AUTHORS
-
-The PipeWire Developers <$(PACKAGE_BUGREPORT)>;
-PipeWire is available from <$(PACKAGE_URL)>
-
-# SEE ALSO
-
-\ref page_module_protocol_pulse "libpipewire-module-protocol-pulse(7)",
-\ref page_man_pipewire_conf_5 "pipewire.conf(5)",
-\ref page_man_pipewire-pulse_1 "pipewire-pulse(1)",
-\ref page_man_pipewire-pulse-modules_7 "pipewire-pulse-modules(7)"

pipewire-1.0.1.tar.bz2/doc/dox/programs/pipewire.conf.5.md Deleted

@@ -1,102 +0,0 @@
-\page page_man_pipewire_conf_5 pipewire.conf
-
-The PipeWire server configuration file
-
-# SYNOPSIS
-
-*$XDG_CONFIG_HOME/pipewire/pipewire.conf*
-
-*$(PIPEWIRE_CONFIG_DIR)/pipewire.conf*
-
-*$(PIPEWIRE_CONFDATADIR)/pipewire.conf*
-
-*$(PIPEWIRE_CONFDATADIR)/pipewire.conf.d/*
-
-*$(PIPEWIRE_CONFIG_DIR)/pipewire.conf.d/*
-
-*$XDG_CONFIG_HOME/pipewire/pipewire.conf.d/*
-
-# DESCRIPTION
-
-PipeWire is a service that facilitates sharing of multimedia content
-between devices and applications.
-
-On startup, the daemon reads a main configuration file to configure
-itself. It executes a series of commands listed in the config file.
-
-The config files are loaded in the order listed in the
-SYNOPSIS(#synopsis). The environment variables `PIPEWIRE_CONFIG_DIR`,
-`PIPEWIRE_CONFIG_PREFIX` and `PIPEWIRE_CONFIG_NAME` can be used to
-specify an alternative config directory, subdirectory and file
-respectively.
-
-Next to the configuration file can be a directory with the same name as
-the file with a `.d/` suffix. All directories in the
-SYNOPSIS(#synopsis) directory search paths are traversed in the listed
-order and the contents of the `*.conf` files inside them are appended to
-the main configuration file as overrides. Object sections are merged and
-array sections are appended.
-
-# CONFIGURATION FILE FORMAT
-
-The configuration file format is grouped into sections. A section is
-either a dictionary, {}, or an array, \\. Dictionary and array entries
-are separated by whitespace and may be simple value assignment, an array
-or a dictionary. For example:
-```
-    name = value # simple assignment
-
-    name = { key1 = value1 key2 = value2 } # a dictionary with two entries
-
-    name =  value1 value2  # an array with two entries
-
-    name =  { k = v1 } { k = v2 }  # an array of dictionaries
-```
-
-The configuration files can be expressed in full JSON syntax but for
-ease of use, a relaxed format may be used where:
-
-- `:` to delimit keys and values can be substuted by `=` or a space.
-- <tt>\"</tt> around keys and string can be omitted as long as no special
-  characters are used in the strings.
-- `,` to separate objects can be replaced with a whitespace character.
-- `#` can be used to start a comment until the line end
-
-# CONFIGURATION FILE SECTIONS
-
-\par context.properties
-Dictionary. These properties configure the PipeWire instance.
-
-\par context.spa-libs
-Dictionary. Maps plugin features with globs to a spa library.
-
-\par context.modules
-Array of dictionaries. Each entry in the array is a dictionary with the
-*name* of the module to load, including optional *args* and *flags*.
-Most modules support being loaded multiple times.
-
-\par context.objects
-Array of dictionaries. Each entry in the array is a dictionary
-containing the *factory* to create an object from and optional extra
-arguments specific to that factory.
-
-\par context.exec
-\parblock
-Array of dictionaries. Each entry in the array is dictionary containing
-the *path* of a program to execute on startup and optional *args*.
-
-This array used to contain an entry to start the session manager but
-this mode of operation has since been demoted to development aid. Avoid
-starting a session manager in this way in production environment.
-\endparblock
-
-# AUTHORS
-
-The PipeWire Developers <$(PACKAGE_BUGREPORT)>;
-PipeWire is available from <$(PACKAGE_URL)>
-
-# SEE ALSO
-
-\ref page_man_pipewire_1 "pipewire(1)",
-\ref page_man_pw-mon_1 "pw-mon(1)",
-\ref page_man_libpipewire-modules_7 "libpipewire-modules(7)"

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/dbus-helpers.h Deleted

@@ -1,72 +0,0 @@
-/* Spa Bluez5 DBus helpers */
-/* SPDX-FileCopyrightText: Copyright © 2023 PipeWire authors */
-/* SPDX-License-Identifier: MIT */
-
-#ifndef SPA_BLUEZ5_DBUS_HELPERS_H
-#define SPA_BLUEZ5_DBUS_HELPERS_H
-
-#include <stdbool.h>
-
-#include <dbus/dbus.h>
-
-#include <spa/utils/cleanup.h>
-
-static inline void cancel_and_unref(DBusPendingCall **pp)
-{
-	DBusPendingCall *pending_call = spa_steal_ptr(*pp);
-
-	if (pending_call) {
-		dbus_pending_call_cancel(pending_call);
-		dbus_pending_call_unref(pending_call);
-	}
-}
-
-static inline DBusMessage *steal_reply_and_unref(DBusPendingCall **pp)
-{
-	DBusPendingCall *pending_call = spa_steal_ptr(*pp);
-
-	DBusMessage *reply = dbus_pending_call_steal_reply(pending_call);
-	dbus_pending_call_unref(pending_call);
-
-	return reply;
-}
-
-SPA_DEFINE_AUTOPTR_CLEANUP(DBusMessage, DBusMessage, {
-	spa_clear_ptr(*thing, dbus_message_unref);
-})
-
-static inline bool reply_with_error(DBusConnection *conn,
-				    DBusMessage *reply_to,
-				    const char *error_name, const char *error_message)
-{
-	spa_autoptr(DBusMessage) reply = dbus_message_new_error(reply_to, error_name, error_message);
-
-	return reply && dbus_connection_send(conn, reply, NULL);
-}
-
-static inline DBusPendingCall *send_with_reply(DBusConnection *conn,
-					       DBusMessage *m,
-					       DBusPendingCallNotifyFunction callback, void *user_data)
-{
-	DBusPendingCall *pending_call;
-
-	if (!dbus_connection_send_with_reply(conn, m, &pending_call, DBUS_TIMEOUT_USE_DEFAULT))
-		return NULL;
-
-	if (!pending_call)
-		return NULL;
-
-	if (!dbus_pending_call_set_notify(pending_call, callback, user_data, NULL)) {
-		dbus_pending_call_cancel(pending_call);
-		dbus_pending_call_unref(pending_call);
-		return NULL;
-	}
-
-	return pending_call;
-}
-
-SPA_DEFINE_AUTO_CLEANUP(DBusError, DBusError, {
-	dbus_error_free(thing);
-})
-
-#endif /* SPA_BLUEZ5_DBUS_HELPERS_H */

pipewire-1.0.1.tar.bz2/spa/plugins/support/log-patterns.c Deleted

@@ -1,90 +0,0 @@
-/* Spa */
-/* SPDX-FileCopyrightText: Copyright © 2021 Red Hat, Inc. */
-/* SPDX-License-Identifier: MIT */
-
-#include <errno.h>
-#include <fnmatch.h>
-
-#include <spa/support/log.h>
-#include <spa/utils/list.h>
-#include <spa/utils/json.h>
-
-#include "log-patterns.h"
-
-struct support_log_pattern {
-	struct spa_list link;
-	enum spa_log_level level;
-	char pattern;
-};
-
-void
-support_log_topic_init(struct spa_list *patterns, enum spa_log_level default_level,
-		       struct spa_log_topic *t)
-{
-	enum spa_log_level level = default_level;
-	bool has_custom_level = false;
-	const char *topic = t->topic;
-	struct support_log_pattern *pattern;
-
-	spa_list_for_each(pattern, patterns, link) {
-		if (fnmatch(pattern->pattern, topic, 0) != 0)
-			continue;
-		level = pattern->level;
-		has_custom_level = true;
-	}
-
-	t->level = level;
-	t->has_custom_level = has_custom_level;
-}
-
-int
-support_log_parse_patterns(struct spa_list *patterns, const char *jsonstr)
-{
-	struct spa_json iter, array, elem;
-	int res = 0;
-
-	spa_json_init(&iter, jsonstr, strlen(jsonstr));
-
-	if (spa_json_enter_array(&iter, &array) < 0)
-		return -EINVAL;
-
-	while (spa_json_enter_object(&array, &elem) > 0) {
-		char pattern512 = {0};
-
-		while (spa_json_get_string(&elem, pattern, sizeof(pattern)) > 0) {
-			struct support_log_pattern *p;
-			const char *val;
-			int len;
-			int lvl;
-
-			if ((len = spa_json_next(&elem, &val)) <= 0)
-				break;
-
-			if (!spa_json_is_int(val, len))
-				break;
-
-			if ((res = spa_json_parse_int(val, len, &lvl)) < 0)
-				break;
-
-			SPA_CLAMP(lvl, SPA_LOG_LEVEL_NONE, SPA_LOG_LEVEL_TRACE);
-
-			p = calloc(1, sizeof(*p) + strlen(pattern) + 1);
-			p->level = lvl;
-			strcpy(p->pattern, pattern);
-			spa_list_append(patterns, &p->link);
-		}
-	}
-
-	return res;
-}
-
-void
-support_log_free_patterns(struct spa_list *patterns)
-{
-	struct support_log_pattern *p;
-
-	spa_list_consume(p, patterns, link) {
-		spa_list_remove(&p->link);
-		free(p);
-	}
-}

pipewire-1.0.1.tar.bz2/spa/plugins/support/log-patterns.h Deleted

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/extensions Deleted

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/extensions/ext-device-manager.c Deleted

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/extensions/ext-device-restore.c Deleted

@@ -1,316 +0,0 @@
-/* PipeWire */
-/* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans */
-/* SPDX-License-Identifier: MIT */
-
-#define EXT_DEVICE_RESTORE_VERSION	1
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <spa/pod/builder.h>
-#include <spa/utils/defs.h>
-#include <spa/utils/dict.h>
-#include <spa/utils/string.h>
-#include <spa/utils/json.h>
-#include <spa/param/audio/format.h>
-#include <spa/param/props.h>
-
-#include <pipewire/log.h>
-#include <pipewire/properties.h>
-
-#include "../client.h"
-#include "../collect.h"
-#include "../defs.h"
-#include "../extension.h"
-#include "../format.h"
-#include "../manager.h"
-#include "../message.h"
-#include "../reply.h"
-#include "../volume.h"
-#include "registry.h"
-
-PW_LOG_TOPIC_EXTERN(pulse_ext_dev_restore);
-#undef PW_LOG_TOPIC_DEFAULT
-#define PW_LOG_TOPIC_DEFAULT pulse_ext_dev_restore
-
-#define DEVICE_TYPE_SINK	0
-#define DEVICE_TYPE_SOURCE	1
-
-static int do_extension_device_restore_test(struct client *client, uint32_t command, uint32_t tag, struct message *m)
-{
-	struct message *reply;
-
-	reply = reply_new(client, tag);
-	message_put(reply,
-			TAG_U32, EXT_DEVICE_RESTORE_VERSION,
-			TAG_INVALID);
-
-	return client_queue_message(client, reply);
-}
-
-static int do_extension_device_restore_subscribe(struct client *client, uint32_t command, uint32_t tag, struct message *m)
-{
-	return reply_simple_ack(client, tag);
-}
-
-
-struct format_data {
-        struct client *client;
-        struct message *reply;
-};
-
-static int do_sink_read_format(void *data, struct pw_manager_object *o)
-{
-	struct format_data *d = data;
-	struct pw_manager_param *p;
-	struct format_info info32;
-	uint32_t i, n_info = 0;
-
-	if (!pw_manager_object_is_sink(o))
-		return 0;
-
-	spa_list_for_each(p, &o->param_list, link) {
-		uint32_t index = 0;
-
-		if (p->id != SPA_PARAM_EnumFormat)
-			continue;
-
-		while (n_info < SPA_N_ELEMENTS(info)) {
-			spa_zero(infon_info);
-			if (format_info_from_param(&infon_info, p->param, index++) < 0)
-				break;
-			if (infon_info.encoding == ENCODING_ANY) {
-				format_info_clear(&infon_info);
-				continue;
-			}
-			n_info++;
-		}
-	}
-	message_put(d->reply,
-		TAG_U32, DEVICE_TYPE_SINK,
-		TAG_U32, o->index,			/* sink index */
-		TAG_U8, n_info,				/* n_formats */
-		TAG_INVALID);
-	for (i = 0; i < n_info; i++) {
-		message_put(d->reply,
-			TAG_FORMAT_INFO, &infoi,
-			TAG_INVALID);
-		format_info_clear(&infoi);
-	}
-	return 0;
-}
-
-static int do_extension_device_restore_read_formats_all(struct client *client,
-		uint32_t command, uint32_t tag, struct message *m)
-{
-	struct pw_manager *manager = client->manager;
-	struct format_data data;
-
-	spa_zero(data);
-	data.client = client;
-	data.reply = reply_new(client, tag);
-
-	pw_manager_for_each_object(manager, do_sink_read_format, &data);
-
-	return client_queue_message(client, data.reply);
-}
-
-static int do_extension_device_restore_read_formats(struct client *client,
-		uint32_t command, uint32_t tag, struct message *m)
-{
-	struct pw_manager *manager = client->manager;
-	struct format_data data;
-	uint32_t type, sink_index;
-	struct selector sel;
-	struct pw_manager_object *o;
-	int res;
-
-	if ((res = message_get(m,
-			TAG_U32, &type,
-			TAG_U32, &sink_index,
-			TAG_INVALID)) < 0)
-		return -EPROTO;
-
-	if (type != DEVICE_TYPE_SINK) {
-		pw_log_info("Device format reading is only supported on sinks");
-		return -ENOTSUP;
-	}
-
-	spa_zero(sel);
-	sel.index = sink_index;
-	sel.type = pw_manager_object_is_sink;
-
-	o = select_object(manager, &sel);
-        if (o == NULL)
-		return -ENOENT;
-
-	spa_zero(data);
-	data.client = client;
-	data.reply = reply_new(client, tag);
-
-	do_sink_read_format(&data, o);
-
-	return client_queue_message(client, data.reply);
-}
-
-static int set_card_codecs(struct pw_manager_object *o, uint32_t port_index,
-		uint32_t device_id, uint32_t n_codecs, uint32_t *codecs)
-{
-	char buf1024;
-	struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buf, sizeof(buf));
-	struct spa_pod_frame f2;
-	struct spa_pod *param;
-
-	if (!SPA_FLAG_IS_SET(o->permissions, PW_PERM_W | PW_PERM_X))
-		return -EACCES;
-
-	if (o->proxy == NULL)
-		return -ENOENT;
-
-	spa_pod_builder_push_object(&b, &f0,
-			SPA_TYPE_OBJECT_ParamRoute, SPA_PARAM_Route);
-	spa_pod_builder_add(&b,
-			SPA_PARAM_ROUTE_index, SPA_POD_Int(port_index),
-			SPA_PARAM_ROUTE_device, SPA_POD_Int(device_id),
-			0);
-	spa_pod_builder_prop(&b, SPA_PARAM_ROUTE_props, 0);
-	spa_pod_builder_push_object(&b, &f1,
-			SPA_TYPE_OBJECT_Props,  SPA_PARAM_Props);
-	spa_pod_builder_add(&b,
-			SPA_PROP_iec958Codecs, SPA_POD_Array(sizeof(uint32_t),
-				SPA_TYPE_Id, n_codecs, codecs), 0);
-	spa_pod_builder_pop(&b, &f1);
-	spa_pod_builder_prop(&b, SPA_PARAM_ROUTE_save, 0);
-	spa_pod_builder_bool(&b, true);
-	param = spa_pod_builder_pop(&b, &f0);
-
-	pw_device_set_param((struct pw_device*)o->proxy,
-			SPA_PARAM_Route, 0, param);
-	return 0;
-}
-
-static int set_node_codecs(struct pw_manager_object *o, uint32_t n_codecs, uint32_t *codecs)
-{
-	char buf1024;
-	struct spa_pod_builder b;
-	struct spa_pod *param;
-
-	if (!SPA_FLAG_IS_SET(o->permissions, PW_PERM_W | PW_PERM_X))
-		return -EACCES;
-
-	if (o->proxy == NULL)
-		return -ENOENT;
-
-	spa_pod_builder_init(&b, buf, sizeof(buf));
-	param = spa_pod_builder_add_object(&b,
-			SPA_TYPE_OBJECT_Props, SPA_PARAM_Props,
-			SPA_PROP_iec958Codecs, SPA_POD_Array(sizeof(uint32_t),
-				SPA_TYPE_Id, n_codecs, codecs));
-
-	pw_node_set_param((struct pw_node*)o->proxy,
-			SPA_PARAM_Props, 0, param);
-
-	return 0;
-}
-
-
-static int do_extension_device_restore_save_formats(struct client *client,
-		uint32_t command, uint32_t tag, struct message *m)
-{
-	struct pw_manager *manager = client->manager;
-	struct selector sel;
-	struct pw_manager_object *o, *card = NULL;
-	struct pw_node_info *info;
-	int res;
-	uint32_t type, sink_index;
-	uint8_t i, n_formats;
-	uint32_t n_codecs = 0, codec, iec958codecs32;
-	struct device_info dev_info;
-
-	if ((res = message_get(m,
-			TAG_U32, &type,
-			TAG_U32, &sink_index,
-			TAG_U8, &n_formats,
-			TAG_INVALID)) < 0)
-		return -EPROTO;
-	if (n_formats < 1)
-		return -EPROTO;
-
-	if (type != DEVICE_TYPE_SINK)
-		return -ENOTSUP;
-
-	for (i = 0; i < n_formats; ++i) {
-		struct format_info format;
-		spa_zero(format);
-		if (message_get(m,
-				TAG_FORMAT_INFO, &format,
-				TAG_INVALID) < 0)
-			return -EPROTO;
-
-		codec = format_encoding2id(format.encoding);
-		if (codec != SPA_ID_INVALID && n_codecs < SPA_N_ELEMENTS(iec958codecs))
-			iec958codecsn_codecs++ = codec;
-
-		format_info_clear(&format);
-	}
-	if (n_codecs == 0)
-		return -ENOTSUP;
-
-	spa_zero(sel);
-	sel.index = sink_index;
-	sel.type = pw_manager_object_is_sink;
-
-	o = select_object(manager, &sel);
-	if (o == NULL || (info = o->info) == NULL || info->props == NULL)
-		return -ENOENT;
-
-	get_device_info(o, &dev_info, SPA_DIRECTION_INPUT, false);
-
-	if (dev_info.card_id != SPA_ID_INVALID) {
-		struct selector sel = { .id = dev_info.card_id, .type = pw_manager_object_is_card, };
-		card = select_object(manager, &sel);
-	}
-	if (card != NULL && dev_info.active_port != SPA_ID_INVALID) {
-		res = set_card_codecs(card, dev_info.active_port,
-				dev_info.device, n_codecs, iec958codecs);
-	} else {
-		res = set_node_codecs(o, n_codecs, iec958codecs);
-	}
-	if (res < 0)
-		return res;
-
-	return reply_simple_ack(client, tag);
-}
-
-static const struct extension_sub ext_device_restore = {
-	{ "TEST", 0, do_extension_device_restore_test, },
-	{ "SUBSCRIBE", 1, do_extension_device_restore_subscribe, },
-	{ "EVENT", 2, },
-	{ "READ_FORMATS_ALL", 3, do_extension_device_restore_read_formats_all, },
-	{ "READ_FORMATS", 4, do_extension_device_restore_read_formats, },
-	{ "SAVE_FORMATS", 5, do_extension_device_restore_save_formats, },
-};
-
-int do_extension_device_restore(struct client *client, uint32_t tag, struct message *m)
-{
-	uint32_t command;
-	int res;
-
-	if ((res = message_get(m,
-			TAG_U32, &command,
-			TAG_INVALID)) < 0)
-		return -EPROTO;
-
-	if (command >= SPA_N_ELEMENTS(ext_device_restore))
-		return -ENOTSUP;
-	if (ext_device_restorecommand.process == NULL)
-		return -EPROTO;
-
-	pw_log_info("client %p %s: EXT_DEVICE_RESTORE_%s tag:%u",
-		    client, client->name, ext_device_restorecommand.name, tag);
-
-	return ext_device_restorecommand.process(client, command, tag, m);
-}

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/extensions/ext-stream-restore.c Deleted

@@ -1,310 +0,0 @@
-/* PipeWire */
-/* SPDX-FileCopyrightText: Copyright © 2020 Wim Taymans */
-/* SPDX-License-Identifier: MIT */
-
-#define EXT_STREAM_RESTORE_VERSION	1
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <spa/utils/defs.h>
-#include <spa/utils/dict.h>
-#include <spa/utils/string.h>
-#include <spa/utils/json.h>
-#include <pipewire/log.h>
-#include <pipewire/properties.h>
-
-#include "../client.h"
-#include "../defs.h"
-#include "../extension.h"
-#include "../format.h"
-#include "../manager.h"
-#include "../message.h"
-#include "../remap.h"
-#include "../reply.h"
-#include "../volume.h"
-#include "registry.h"
-
-PW_LOG_TOPIC_EXTERN(pulse_ext_stream_restore);
-#undef PW_LOG_TOPIC_DEFAULT
-#define PW_LOG_TOPIC_DEFAULT pulse_ext_stream_restore
-
-static int do_extension_stream_restore_test(struct client *client, uint32_t command, uint32_t tag, struct message *m)
-{
-	struct message *reply;
-
-	reply = reply_new(client, tag);
-	message_put(reply,
-			TAG_U32, EXT_STREAM_RESTORE_VERSION,
-			TAG_INVALID);
-
-	return client_queue_message(client, reply);
-}
-
-static int key_from_name(const char *name, char *key, size_t maxlen)
-{
-	const char *media_class, *select, *str;
-
-	if (spa_strstartswith(name, "sink-input-"))
-		media_class = "Output/Audio";
-	else if (spa_strstartswith(name, "source-output-"))
-		media_class = "Input/Audio";
-	else
-		return -1;
-
-	if ((str = strstr(name, "-by-media-role:")) != NULL) {
-		const struct str_map *map;
-		str += strlen("-by-media-role:");
-		map = str_map_find(media_role_map, NULL, str);
-		str = map ? map->pw_str : str;
-		select = "media.role";
-	}
-	else if ((str = strstr(name, "-by-application-id:")) != NULL) {
-		str += strlen("-by-application-id:");
-		select = "application.id";
-	}
-	else if ((str = strstr(name, "-by-application-name:")) != NULL) {
-		str += strlen("-by-application-name:");
-		select = "application.name";
-	}
-	else if ((str = strstr(name, "-by-media-name:")) != NULL) {
-		str += strlen("-by-media-name:");
-		select = "media.name";
-	} else
-		return -1;
-
-	snprintf(key, maxlen, "restore.stream.%s.%s:%s",
-				media_class, select, str);
-	return 0;
-}
-
-static int key_to_name(const char *key, char *name, size_t maxlen)
-{
-	const char *type, *select, *str;
-
-	if (spa_strstartswith(key, "restore.stream.Output/Audio."))
-		type = "sink-input";
-	else if (spa_strstartswith(key, "restore.stream.Input/Audio."))
-		type = "source-output";
-	else
-		type = "stream";
-
-	if ((str = strstr(key, ".media.role:")) != NULL) {
-		const struct str_map *map;
-		str += strlen(".media.role:");
-		map = str_map_find(media_role_map, str, NULL);
-		select = "media-role";
-		str = map ? map->pa_str : str;
-	}
-	else if ((str = strstr(key, ".application.id:")) != NULL) {
-		str += strlen(".application.id:");
-		select = "application-id";
-	}
-	else if ((str = strstr(key, ".application.name:")) != NULL) {
-		str += strlen(".application.name:");
-		select = "application-name";
-	}
-	else if ((str = strstr(key, ".media.name:")) != NULL) {
-		str += strlen(".media.name:");
-		select = "media-name";
-	}
-	else
-		return -1;
-
-	snprintf(name, maxlen, "%s-by-%s:%s", type, select, str);
-	return 0;
-
-}
-
-static int do_extension_stream_restore_read(struct client *client, uint32_t command, uint32_t tag, struct message *m)
-{
-	struct message *reply;
-	const struct spa_dict_item *item;
-
-	reply = reply_new(client, tag);
-
-	spa_dict_for_each(item, &client->routes->dict) {
-		struct spa_json it3;
-		const char *value;
-		char name1024, key128;
-		char device_name1024 = "\0";
-		bool mute = false;
-		struct volume vol = VOLUME_INIT;
-		struct channel_map map = CHANNEL_MAP_INIT;
-		float volume = 0.0f;
-
-		if (key_to_name(item->key, name, sizeof(name)) < 0)
-			continue;
-
-		pw_log_debug("%s -> %s: %s", item->key, name, item->value);
-
-		spa_json_init(&it0, item->value, strlen(item->value));
-		if (spa_json_enter_object(&it0, &it1) <= 0)
-			continue;
-
-		while (spa_json_get_string(&it1, key, sizeof(key)) > 0) {
-			if (spa_streq(key, "volume")) {
-				if (spa_json_get_float(&it1, &volume) <= 0)
-					continue;
-			}
-			else if (spa_streq(key, "mute")) {
-				if (spa_json_get_bool(&it1, &mute) <= 0)
-					continue;
-			}
-			else if (spa_streq(key, "volumes")) {
-				vol = VOLUME_INIT;
-				if (spa_json_enter_array(&it1, &it2) <= 0)
-					continue;
-
-				for (vol.channels = 0; vol.channels < CHANNELS_MAX; vol.channels++) {
-					if (spa_json_get_float(&it2, &vol.valuesvol.channels) <= 0)
-						break;
-				}
-			}
-			else if (spa_streq(key, "channels")) {
-				if (spa_json_enter_array(&it1, &it2) <= 0)
-					continue;
-
-				for (map.channels = 0; map.channels < CHANNELS_MAX; map.channels++) {
-					char chname16;
-					if (spa_json_get_string(&it2, chname, sizeof(chname)) <= 0)
-						break;
-					map.mapmap.channels = channel_name2id(chname);
-				}
-			}
-			else if (spa_streq(key, "target-node")) {
-				if (spa_json_get_string(&it1, device_name, sizeof(device_name)) <= 0)
-					continue;
-			}
-			else if (spa_json_next(&it1, &value) <= 0)
-				break;
-		}
-		message_put(reply,
-			TAG_STRING, name,
-			TAG_CHANNEL_MAP, &map,
-			TAG_CVOLUME, &vol,
-			TAG_STRING, device_name0 ? device_name : NULL,
-			TAG_BOOLEAN, mute,
-			TAG_INVALID);
-	}
-
-	return client_queue_message(client, reply);
-}
-
-static int do_extension_stream_restore_write(struct client *client, uint32_t command, uint32_t tag, struct message *m)
-{
-	int res;
-	uint32_t mode;
-	bool apply;
-
-	if ((res = message_get(m,
-			TAG_U32, &mode,
-			TAG_BOOLEAN, &apply,
-			TAG_INVALID)) < 0)
-		return -EPROTO;
-
-	while (m->offset < m->length) {
-		const char *name, *device_name = NULL;
-		struct channel_map map;
-		struct volume vol;
-		bool mute = false;
-		uint32_t i;
-		FILE *f;
-		char *ptr;
-		size_t size;
-		char key1024, buf128;
-
-		spa_zero(map);
-		spa_zero(vol);
-
-		if (message_get(m,
-				TAG_STRING, &name,
-				TAG_CHANNEL_MAP, &map,
-				TAG_CVOLUME, &vol,
-				TAG_STRING, &device_name,
-				TAG_BOOLEAN, &mute,
-				TAG_INVALID) < 0)
-			return -EPROTO;
-
-		if (name == NULL || name0 == '\0')
-			return -EPROTO;
-
-		if ((f = open_memstream(&ptr, &size)) == NULL)
-			return -errno;
-
-		fprintf(f, "{");
-		fprintf(f, " \"mute\": %s", mute ? "true" : "false");
-		if (vol.channels > 0) {
-			fprintf(f, ", \"volumes\": ");
-			for (i = 0; i < vol.channels; i++)
-				fprintf(f, "%s%s", (i == 0 ? " ":", "),
-						spa_json_format_float(buf, sizeof(buf), vol.valuesi));
-			fprintf(f, " ");
-		}
-		if (map.channels > 0) {
-			fprintf(f, ", \"channels\": ");
-			for (i = 0; i < map.channels; i++)
-				fprintf(f, "%s\"%s\"", (i == 0 ? " ":", "), channel_id2name(map.mapi));
-			fprintf(f, " ");
-		}
-		if (device_name != NULL && device_name0 &&
-		    (client->default_source == NULL || !spa_streq(device_name, client->default_source)) &&
-		    (client->default_sink == NULL || !spa_streq(device_name, client->default_sink)))
-			fprintf(f, ", \"target-node\": \"%s\"", device_name);
-		fprintf(f, " }");
-		fclose(f);
-		if (key_from_name(name, key, sizeof(key)) >= 0) {
-			pw_log_debug("%s -> %s: %s", name, key, ptr);
-			if ((res = pw_manager_set_metadata(client->manager,
-							client->metadata_routes,
-							PW_ID_CORE, key, "Spa:String:JSON", "%s", ptr)) < 0)
-				pw_log_warn("failed to set metadata %s = %s, %s", key, ptr, strerror(-res));
-		}
-		free(ptr);
-	}
-
-	return reply_simple_ack(client, tag);
-}
-
-static int do_extension_stream_restore_delete(struct client *client, uint32_t command, uint32_t tag, struct message *m)
-{
-	return reply_simple_ack(client, tag);
-}
-
-static int do_extension_stream_restore_subscribe(struct client *client, uint32_t command, uint32_t tag, struct message *m)
-{
-	return reply_simple_ack(client, tag);
-}
-
-static const struct extension_sub ext_stream_restore = {
-	{ "TEST", 0, do_extension_stream_restore_test, },
-	{ "READ", 1, do_extension_stream_restore_read, },
-	{ "WRITE", 2, do_extension_stream_restore_write, },
-	{ "DELETE", 3, do_extension_stream_restore_delete, },
-	{ "SUBSCRIBE", 4, do_extension_stream_restore_subscribe, },
-	{ "EVENT", 5, },
-};
-
-int do_extension_stream_restore(struct client *client, uint32_t tag, struct message *m)
-{
-	uint32_t command;
-	int res;
-
-	if ((res = message_get(m,
-			TAG_U32, &command,
-			TAG_INVALID)) < 0)
-		return -EPROTO;
-
-	if (command >= SPA_N_ELEMENTS(ext_stream_restore))
-		return -ENOTSUP;
-	if (ext_stream_restorecommand.process == NULL)
-		return -EPROTO;
-
-	pw_log_info("client %p %s: EXT_STREAM_RESTORE_%s tag:%u",
-		    client, client->name, ext_stream_restorecommand.name, tag);
-
-	return ext_stream_restorecommand.process(client, command, tag, m);
-}

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/extensions/registry.h Deleted

pipewire-1.0.1.tar.bz2/src/pipewire/cleanup.h Deleted

pipewire-1.2.0.tar.gz/.gitattributes Added

pipewire-1.0.1.tar.bz2/.gitlab-ci.yml -> pipewire-1.2.0.tar.gz/.gitlab-ci.yml Changed

@@ -25,8 +25,8 @@
 .fedora:
   variables:
     # Update this tag when you want to trigger a rebuild
-    FDO_DISTRIBUTION_TAG: '2023-11-22.0'
-    FDO_DISTRIBUTION_VERSION: '39'
+    FDO_DISTRIBUTION_TAG: '2024-05-30.0'
+    FDO_DISTRIBUTION_VERSION: '40'
     FDO_DISTRIBUTION_PACKAGES: >-
       alsa-lib-devel
       avahi-devel
@@ -90,12 +90,13 @@
 .ubuntu:
   variables:
     # Update this tag when you want to trigger a rebuild
-    FDO_DISTRIBUTION_TAG: '2023-04-18.0'
+    FDO_DISTRIBUTION_TAG: '2024-01-12.0'
     FDO_DISTRIBUTION_VERSION: '22.04'
     FDO_DISTRIBUTION_PACKAGES: >-
       debhelper-compat
       findutils
       git
+      libapparmor-dev
       libasound2-dev
       libavcodec-dev
       libavfilter-dev
@@ -107,6 +108,7 @@
       libgstreamer-plugins-base1.0-dev
       libsbc-dev
       libsdl2-dev
+      libsnapd-glib-dev
       libudev-dev
       libva-dev
       libv4l-dev
@@ -128,8 +130,8 @@
 .alpine:
   variables:
     # Update this tag when you want to trigger a rebuild
-    FDO_DISTRIBUTION_TAG: '2023-04-17.0'
-    FDO_DISTRIBUTION_VERSION: '3.17'
+    FDO_DISTRIBUTION_TAG: '2024-05-30.0'
+    FDO_DISTRIBUTION_VERSION: '3.20'
     FDO_DISTRIBUTION_PACKAGES: >-
       alsa-lib-dev
       avahi-dev
@@ -173,14 +175,12 @@
       tar xf /tmp/cov-analysis-linux64.tgz ;
       mv cov-analysis-linux64-* coverity ;
       rm /tmp/cov-analysis-linux64.tgz
-  only:
-    variables:
-      - $COVERITY
+  rules:
+    - if: $COVERITY != null
 
 .not_coverity:
-  except:
-    variables:
-      - $COVERITY
+  rules:
+    - if: $COVERITY == null
 
 .build:
   before_script:
@@ -247,7 +247,7 @@
     - .build
   stage: build
   variables:
-    MESON_OPTIONS: "-Dsession-managers="
+    MESON_OPTIONS: "-Dsession-managers= -Dsnap=enabled"
 
 .build_on_fedora:
   extends:
@@ -263,6 +263,9 @@
   variables:
     MESON_OPTIONS: >-
         -Ddocs=enabled
+        -Dman=enabled
+        -Ddoc-prefix-value=/usr
+        -Ddoc-sysconfdir-value=/etc
         -Dinstalled_tests=enabled
         -Dsystemd-system-service=enabled
         -Dbluez5-backend-hsphfpd=enabled
@@ -274,6 +277,7 @@
         -Dsdl2=enabled
         -Dsndfile=enabled
         -Dsession-managers=
+        -Dsnap=disabled
   artifacts:
     name: pipewire-$CI_COMMIT_SHA
     when: always
@@ -281,6 +285,49 @@
       - build-*/meson-logs
       - prefix-*
 
+build_on_fedora_html_docs:
+  extends:
+    - .build_on_fedora
+  variables:
+    MESON_OPTIONS: >-
+        -Ddocs=enabled
+        -Dman=enabled
+        -Ddoc-prefix-value=/usr
+        -Ddoc-sysconfdir-value=/etc
+        -Dinstalled_tests=enabled
+        -Dsystemd-system-service=enabled
+        -Dbluez5-backend-hsphfpd=enabled
+        -Daudiotestsrc=enabled
+        -Dtest=enabled
+        -Dvideotestsrc=enabled
+        -Dvolume=enabled
+        -Dvulkan=enabled
+        -Dsdl2=enabled
+        -Dsndfile=enabled
+        -Dsession-managers=
+  before_script:
+    - git fetch origin 1.0 master
+    - git branch -f 1.0 origin/1.0
+    - git branch -f master origin/master
+    - git clone -b 1.0 . branch-1.0
+    - git clone -b master . branch-master
+    - !reference .build, before_script
+  script:
+    - cd branch-1.0
+    - meson setup builddir $MESON_OPTIONS
+    - meson compile -C builddir doc/pipewire-docs
+    - cd ../branch-master
+    - meson setup builddir $MESON_OPTIONS
+    - meson compile -C builddir doc/pipewire-docs
+  artifacts:
+    name: pipewire-$CI_COMMIT_SHA
+    when: always
+    paths:
+      - branch-*/builddir/meson-logs
+      - branch-*/builddir/doc/html
+  rules:
+    - !reference pages, rules
+
 build_on_alpine:
   extends:
     - .alpine
@@ -289,7 +336,7 @@
     - .build
   stage: build
   variables:
-    MESON_OPTIONS: "-Dsession-managers="
+    MESON_OPTIONS: "-Dsession-managers= -Dsnap=disabled"
 
 # build with all auto() options enabled
 build_all:
@@ -308,6 +355,7 @@
         -Dsession-managers=
         -Dc_args='-UFASTPATH'
         -Dcpp_args='-UFASTPATH'
+        -Dsnap=disabled
   parallel:
     matrix:
       - CC: gcc, clang
@@ -317,7 +365,7 @@
   extends:
     - .build_on_fedora
   variables:
-    MESON_OPTIONS: "-Dsession-managers="
+    MESON_OPTIONS: "-Dsession-managers= -Dsnap=disabled"
   parallel:
     matrix:
       - CC: gcc, clang
@@ -353,7 +401,7 @@
   extends:
     - .build_on_fedora
   variables:
-    MESON_OPTIONS: "-Dtest=enabled -Dbuildtype=release -Db_ndebug=true -Dsession-managers="
+    MESON_OPTIONS: "-Dtest=enabled -Dbuildtype=release -Db_ndebug=true -Dsession-managers= -Dsnap=disabled"
   parallel:
     matrix:
       - CC: gcc, clang
@@ -367,7 +415,7 @@
     - meson compile -C "$BUILD_DIR" $COMPILE_ARGS
     - meson install -C "$BUILD_DIR" --no-rebuild
   variables:
-    MESON_OPTIONS: "-Dsession-managers=$SESSION_MANAGERS"
+    MESON_OPTIONS: "-Dsession-managers=$SESSION_MANAGERS -Dsnap=disabled"
   parallel:
     matrix:
       - SESSION_MANAGERS: "", "wireplumber", "media-session", "media-session,wireplumber", "wireplumber,media-session" 
@@ -384,7 +432,7 @@
     - meson compile -C "$BUILD_DIR" $COMPILE_ARGS
     - meson install -C "$BUILD_DIR" --no-rebuild
   variables:
-    MESON_OPTIONS: "-Dsession-managers=wireplumber,media-session"
+    MESON_OPTIONS: "-Dsession-managers=wireplumber,media-session -Dsnap=disabled"
   allow_failure: true
 
 build_meson_exact_release:
@@ -402,7 +450,7 @@
     - meson compile -C "$BUILD_DIR" $COMPILE_ARGS
     - meson install -C "$BUILD_DIR" --no-rebuild
   variables:
-    MESON_OPTIONS: "-Dsession-managers="
+    MESON_OPTIONS: "-Dsession-managers= -Dsnap=disabled"
 
 valgrind:
   extends:
@@ -483,7 +531,7 @@
   stage: analysis
   script:
     # Check that each pipewire module has a \subpage entry
-    - git grep -h -o -e "\\\page page_module_\w\+" | cut -f2 -d' ' > pipewire_module_pages
+    - git grep -h -o -e "\\\page page_module_\w\+" | cut -f2 -d ' ' > pipewire_module_pages
     - cat pipewire_module_pages
     - |
       for page in $(cat pipewire_module_pages); do
@@ -507,12 +555,14 @@
     - .not_coverity
   stage: pages
   dependencies:
-    - build_on_fedora
+    - build_on_fedora_html_docs
   script:
-    - mkdir public
-    - cp -R prefix-*/share/doc/pipewire/html/* public/
+    - mkdir public public/devel
+    - cp -R branch-1.0/builddir/doc/html/* public/
+    - cp -R branch-master/builddir/doc/html/* public/devel/
   artifacts:
     paths:
       - public
-  only:
-    - master
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'master'
+    - if: $CI_COMMIT_BRANCH == '1.0'

pipewire-1.0.1.tar.bz2/.gitlab/ci/check_missing_headers.sh -> pipewire-1.2.0.tar.gz/.gitlab/ci/check_missing_headers.sh Changed

pipewire-1.0.1.tar.bz2/INSTALL.md -> pipewire-1.2.0.tar.gz/INSTALL.md Changed

pipewire-1.0.1.tar.bz2/NEWS -> pipewire-1.2.0.tar.gz/NEWS Changed

@@ -1,3 +1,576 @@
+# PipeWire 1.2.0 (2024-06-27)
+
+This is the 1.2 release that is API and ABI compatible with previous
+1.1.x and 1.0.x releases.
+
+This release contains some of the bigger changes that happened since
+the 1.0 release last year, including:
+
+  * Support for asynchronous processing has been implemented. Nodes can choose
+    (or be forced) to be scheduled asynchronously. The graph will not wait for
+    the output of the node to continue processing but it will use the output
+    of the previous cycle (or silence) instead. This adds one cycle of latency
+    but it can avoid having some nodes blocking the processing graph. Non realtime
+    streams and filters now also use this asynchronous processing instead of
+    their own slightly broken version.
+  * The concept of node.sync-group was added. This groups nodes with overlapping
+    sync-group together when one of them sets the node.sync = true. This is now
+    used to make sure all nodes are scheduled together when JACK transport is
+    started so that they all see the same transport time.
+  * Config parsing errors are reported earlier and much better with line and
+    column numbers where the parsing started to fail.
+  * Add support for mandatory metadata when negotiating buffer parameters. This
+    can be used to only negotiate extra buffer planes when certain metadata is
+    negotiated. One use case is the explicit sync support that requires 2
+    extra fds for the timelines.
+  * Explicit sync metadata and support was added.
+  * Support was added for making and using multiple data-loops in the server
+    and clients. Support for CPU affinity and priorities was added to the
+    data-loops as well.
+  * The log topic debug levels can now be changed at runtime with metadata.
+    The log levels in the pulse server can be dynamically changed with a
+    /core message.
+  * The UCM conflicting devices patches were merged.
+  * Add snapcast-discover module to stream to snapcast servers.
+  * Rework how peers are linked and the counters are updated. Resume the
+    peers when a node is unlinked and not yet processed. This should cause
+    less occasional dropouts in the graph when reconnecting things.
+  * Many GStreamer element updates.
+  * Many more fixes and improvements.
+
+Enjoy the summer vacation!
+
+
+## Highlights (since the previous 1.1.83 release)
+  - Small fixes here and there.
+
+## PipeWire
+  - Compilation fixes after enabling -Werror=float-conversion
+
+## Modules
+  - The module-rtp-sap now propagates the cleanup.sec property to the
+    rtp-source and the rtp-source now sets a property with the receiving
+    status.
+  - Fix for ROC 0.3, explicitly specify sender encoding. (#4070)
+  - Some fixes to the RAOP sink module, including a format fix for 32 bit
+    machines.
+
+## Tools
+  - Fix pw-cli monitoring code.
+
+## SPA
+  - Revert peer_enum_params again because it was not used and flawed.
+  - Fix multichannel processing in webrtc AEC.
+
+## GStreamer
+  - Logging improvements.
+  - Fix a race in the bufferpool activation.
+
+## Bluetooth
+  - Improvements to BAP broadcast code parsing.
+
+Older versions:
+
+
+# PipeWire 1.1.83 (2024-06-17)
+
+This is the third and hopefully the last 1.2 release candidate that is
+API and ABI compatible with previous 1.0.x releases.
+
+Some last minute changes went in to clean up the node activation and
+scheduling that justify another pre-release.
+
+## Highlights
+  - Rework how peers are linked and the counters are updated. Resume the
+    peers when a node is unlinked and not yet processed. This should cause
+    less occasional dropouts in the graph when reconnecting things.
+  - Improve xruns in module-ffado.
+  - Many GStreamer element updates.
+  - More fixes and improvements.
+
+
+## PipeWire
+  - Rework how peers are linked and the counters are updated. Resume the
+    peers when a node is unlinked and not yet processed. This should cause
+    less dropouts in the graph when reconnecting. (#4026)
+  - Improve debug of xruns.
+  - Evaluate node.rules and device.rules before loading the plugin so that
+    extra properties can be passed to the plugin init function.
+
+## Modules
+  - Improve timing reporting in module-ffado some more.
+  - Prealloc less memory in the profiler by default.
+  - Improve xrun handling in module-ffado.
+
+## Tools
+  - Fix a crash in pw-link when a link fails.
+  - Fix pw-dump update for metadata. (#4053)
+
+## SPA
+  - Improve handling of controls. (#4028)
+  - Fix the string size in v4l2 to hold the device and vendor id.
+  - Support meta_videotransform on buffers in v4l2. This can be used to
+    signal that the buffer was rotated for example.
+  - Add HDMI/AC3 profile to ALSA when supported.
+  - Make it possible to disable the webrtc dependency
+
+## GStreamer
+  - Improve caps handling in the elements.
+  - Set buffer duration when we can.
+  - Post an element error when all the elements buffers are removed.
+    (#1980)
+  - Improve DMA_DRM caps selection.
+  - Some refactoring work.
+  - Improve state handling in the elements.
+
+## JACK
+  - Improve how links are activated.
+  - Fix some races when freeing memory.
+
+## Bluetooth
+  - Support multiple BIS in the broadcast source.
+
+# PipeWire 1.1.82 (2024-05-24)
+
+This is the second 1.2 release candidate that is API and ABI
+compatible with previous 1.0.x releases.
+
+Not so many things needed to be fixed so this might already be the
+last prerelease if everything goes well...
+
+## Highlights
+  - Fix problem when moving nodes that could cause nodes to be scheduled
+    wrongly and cause errors. (#4017)
+  - Add snapcast-discover module to stream to snapcast servers.
+  - Work around wrong kernel provided MTU for USB controllers.
+  - Fix some spelling mistakes all over the codebase.
+  - More small fixes and improvements.
+
+
+## PipeWire
+  - Remove the private cleanup.h header and use the public SPA version.
+  - Fix problem when moving nodes that could cause nodes to be scheduled
+    wrongly and cause errors. (#4017)
+
+## Modules
+  - Handle IPv6 in module-protocol-simple and support port allocation.
+  - Add snapcast-discover module to stream to snapcast servers.
+
+## Bluetooth
+  - Work around wrong kernel provided MTU for USB controllers.
+
+# PipeWire 1.0.7 (2024-05-24)
+
+This is a small bugfix release that is API and ABI compatible with previous
+1.0.x releases.
+
+## Highlights
+  - Fix a potential race/crash.
+  - Fix some problems with negotiation of large integers and floats.
+  - Fix JACK sysex MIDI event handling.
+  - Some more smaller fixes and improvements.
+
+## PipeWire
+  - Fix a potential race when adding/removing a port to be scheduled.
+
+## Modules
+  - Fix FFADO default device handling. (#4023)
+
+## SPA
+  - Fix in integer overflow and float/double compare in POD.
+
+## JACK
+  - Copy larger MIDI events correctly.
+
+# PipeWire 1.1.81 (2024-05-16)
+
+This is the first 1.2 release candidate that is API and ABI
+compatible with previous 1.0.x releases.
+
+In addition to all the changes backported to 1.0.x, this release
+also contains some new features:
+
+## Highlights
+  - Support for asynchronous processing has been implemented. Nodes can choose
+    (or be forced) to be scheduled asynchronously. The graph will not wait for
+    the output of the node to continue processing but it will use the output
+    of the previous cycle (or silence) instead. This adds one cycle of latency
+    but it can avoid having some nodes blocking the processing graph. Non realtime
+    streams and filters now also use this asynchronous processing instead of
+    their own slightly broken version.
+  - The concept of node.sync-group was added. This groups nodes with overlapping
+    sync-group together when one of them sets the node.sync = true. This is now
+    used to make sure all nodes are scheduled together when JACK transport is
+    started so that they all see the same time.
+  - Config parsing errors are reported earlier and much better with line and
+    column numbers where the parsing started to fail.
+  - Add support for mandatory metadata when negotiation buffer parameters. This
+    can be used to only negotiate extra buffer planes when certain metadata is
+    negotiated. One use case is the explicit sync support that requires 2
+    extra fds for the timelines.
+  - Support was added for making and using multiple data-loops in the server
+    and clients. Support for CPU affinity and priorities was added to the
+    data-loops as well.
+  - The log topic debug levels can now be changed at runtime with metadata.
+    The log levels in the pulse server can be dynamically changed with a
+    /core message.
+  - The UCM conflicting devices patches were merged.
+
+
+## PipeWire
+  - snap support has been added.
+  - Implement async processing. (#3509)
+  - Support for explicit sync was added.
+  - Config parsing errors are reported earlier and much better.
+  - A -P option was added to provide extra properties to the context. This can be
+    used to enable some features that use rules.
+  - properties.rules was added to enhance properties based on some rules.
+    This deprecates the vm.overrides.
+  - Support was added for security-context. This makes it possible for a flatpak
+    to request a socket with specific properties from pipewire to mount in the
+    flatpak. The session manager can then assign permissions based on the connection
+    properties.
+  - Support for fixed arrays in pw_array was improved.
+  - PipeWire server and clients can now use multiple threads to process the nodes
+    in parallel.
+  - device.rules and node.rules were added to update device and node properties
+    based on rules.
+  - device.param and node.param can now be used to configure params when devices
+    and nodes are created.
+  - Memory will now try to use MFD_NOEXEC_SEAL.
+  - The driver id of a node is now placed in the properties.
+  - A potential race was fixed when adding and removing ports to the scheduling
+    lists.
+
+## Modules
+  - Priorities for the FFADO threads can be configured now.
+  - The loopback module now has support for up and downmixing.
+  - Extra properties can now be configured per native-connection socket.
+  - The pulse-tunnel can now automatically reconnect when the connection is
+    broken.
+  - The RTP module now supports the PTP management protocol.
+  - The RTP sender can now use a timer to send out multiple packets per
+    quantum.
+  - A new module was added for loading Parametric EQ.
+  - The simple-protocol module now has per stream configurable properties
+    and can also be used to interface with a snapcast server.
+  - Support for local services was added to raop, rtp and pulse avahi
+    discoverers. Support for IPv6 on local services was added to RAOP.
+
+## SPA
+  - Support for reporting JSON parsing errors has been added.
+  - Some extra checks are added when iterating POD structures.
+  - Port and profiles can now be hidden from ALSA nodes with
+    api.acp.hidden-ports and api.acp.hidden-profiles properties.
+  - The UCM conflicting devices patches were merged.
+  - Profiles and Routes can now also be set by name.
+  - Hires timestamps are now used when possible in IRQ based scheduling to
+    get more accurate wakeup times.
+  - udev can now be an optional dependency.
+  - audioadapter now has an option to automatically configure its ports.
+  - Camera rotation was added to the libcamera node.
+  - invoke on loops can now be done from multiple threads at the same time.
+  - Make sure we use CLOCK_MONOTONIC everywhere in the io_clock.
+  - Vulkan bit and convert filters were added.
+  - ALSA will now always read the HW ringbuffer pointer when followers are
+    not on the same card.
+  - Support for larger MIDI sysex messages was improved. Configuration of
+    the client input and output pool was added. (#4005)
+
+## Bluetooth
+  - Support Google OPUS codec.
+  - Support the LC3-SWB codec.
+  - Support the AAC-ELD codec.
+  - Broadcast source configuration support was added.
+
+## pulseaudio-server
+  - The GSettings schemas are now optionally installed.
+  - Extensions were moved to the modules.
+  - The log level of the pulse server can dynamically be changed with
+    a core object message.
+  - snap access control was added to pulse-server.
+  - The old pacmd describe-module functionality is now implemented with
+    a core message pipewire-pulse:describe-module.
+  - An option was added to disable module loading and unloading.
+
+## JACK
+  - OSC messages can now also be placed in JACK MIDI and the translation
+    layer will detect and tag the right PipeWire control message types.
+  - A jack.other-connect-mode was added to limit the connections that an
+    app can do to ports it doesn't own.
+  - The way the transport is started and how the nodes are grouped together
+    in the transport was improved using the new sync groups. (#3850)
+  - Fix large MIDI messages handling. (#4005)
+
+## ALSA
+  - Fix format renegotiation. (#3858)
+  - Handle period events better. (#3676)
+  - Improve handling of the eventfd wakeups.
+
+## GStreamer
+  - The GStreamer elements can now negotiate and use DMABUF.
+
+## Tools
+  - The T flag is used in pw-top when the transport is running.
+  - A new pw-container tool was added to start a new security context and
+    run an application in it.
+  - pw-dot handles properties with quotes better. Nodes are grouped with the
+    node.link-group.
+  - pw-link has a --wait option to wait for all links to be created.
+
+# PipeWire 1.0.6 (2024-05-09)
+
+This is a bugfix release that is API and ABI compatible with previous
+1.0.x releases.
+
+## Highlights
+  - A bitfield race was fixed that could cause some crashes or undefined
+    behaviour when moving nodes between drivers.
+  - Fix to some invalid memory access in the pw-mon and pw-dump.
+  - A regression in kodi with IEC958 formats playback was fixed.
+  - A race in the ALSA plugin was fixed when updating the eventfd.
+  - Improvements and fixes to module-combine-stream.
+  - Negotiation was improved in pipewiresrc.
+  - Some more small fixes and improvements.
+
+## PipeWire
+  - Context properties are now set early so that client properties can be
+    matched with rules.
+  - A bitfield race was fixed that could cause some crashes or undefined
+    behaviour when moving nodes between drivers.
+
+## Tools
+  - Fix failure to hide properties in pw-mon. (#3997)
+  - Fix some memleaks and a crash in pw-dump. (#4001)
+
+## Modules
+  - The combine-stream module now prevents resampling to avoid broken
+    audio because of different samplerates.
+  - Fix a potential double free in module-loopback when calculating the
+    delay. (#3748)
+  - The FFADO module now only starts when ports are negotiated to avoid
+    startup races. (#3968)
+  - The combine-stream module will now forward tags.
+
+## SPA
+  - Monitor volumes are now also clamped to the min/max volumes. (#3962)
+  - V4l2 and libcamera now encodes the device ids into a JSON array. This
+    is part of the deduplication code of devices.
+  - A regression in kodi with IEC958 formats playback was fixed.
+
+## Bluetooth
+  - Improved buffer handling and queued data when stopping.
+
+## ALSA
+  - A race was fixed when updating the eventfd. (#3711)
+
+## GStreamer
+  - Handle some errors better instead of crashing. (#3994)
+  - Fix a memleak in the stream params handling.
+  - Negotiation was improved in pipewiresrc.
+
+# PipeWire 1.0.5 (2024-04-15)
+
+This is a bugfix release that is API and ABI compatible with previous
+1.0.x releases.
+
+## Highlights
+  - pw_stream can now report timestamps on buffers and the expected
+    amount of samples for the resampler.
+  - The GStreamer element now has more correct timestamps using the new
+    pw_stream timestamps as a fallback.
+  - The FFADO module now handles suspend and resume better.
+  - A regression in v4l2 was fixed when parsing malformed filters.
+  - A potential memory/fd leak was fixed in client-node.
+  - Many more small bugfixes and improvements.
+
+
+## PipeWire
+  - pw_stream now reports the expected resampler input or output size in
+    the pw_time structure. (#3750)
+  - pw_stream now also adds a time field to the buffer, which contains the
+    time of the graph when the buffer was received in the stream.
+  - Fix a compiler error when compiling with -Werror=shadow. (#3915)
+  - The config parser will warn when invalid config is detected.
+
+## Modules
+  - The FFADO module now opens and closes when suspending. This fixes some
+    problems when FFADO properties are changed while suspended. (#3558)
+  - Filter-chain will now warn when invalid config is detected.
+  - Echo-cancel will now handle manage the state of the echo-cancel plugin
+    better, making sure run() is not called after deactivate().
+  - Fix some potential memory/fd leaks in client-node.
+
+## SPA
+  - Improve reading the bound ALSA controls.
+  - The resampler can now also report the number of expected output samples.
+  - The ALSA ACP device objects have some more properties like the card.id
+    and alsa.components. (#3912)
+  - Fix a potential string corruption when parsing JSON strings.
+  - V4l2 now sets the latency on the port. (#3910)
+  - alsa-udev now has an option to expose the device even if busy. (#3914)
+  - Improve null-audio-sink channel handling. (#3931)
+  - v4l2 will now drop the first frame because it often contains wrong
+    timestamps or garbage. (#3910)
+  - A regression in v4l2 was fixed where invalid/empty properties in the
+    filter would make it error early. (#3959)
+
+## GStreamer
+  - The source now falls back to the new pw_buffer time for the timestamps.
+
+## Docs
+  - Sync with the master branch.
+
+# PipeWire 1.0.4 (2024-03-13)
+
+This is a bugfix release that is API and ABI compatible with previous
+1.0.x releases.
+
+## Highlights
+
+  - Track memfd better to avoid inconsistent memory. Also make sure the
+    mixer info is removed correctly in all cases on destroyed ports.
+  - Correctly handle removed objects in the metadata.
+  - Add an option to set the server and client priorities instead of using
+    a hardcoded value of 88.
+  - The FFADO module has been fixed. Audio and MIDI now works with
+    the same latency as the JACK driver. This has now also been
+    tested with a Focusrite Saffire Pro 14.
+  - The JACK library has seen some important fixes. Some ardour crackling
+    has been fixed when looping and multiple MIDI ports on a client should
+    now work.
+  - Small bugfixes and improvements.
+
+
+## PipeWire
+  - Track memfd better to avoid inconsistent memory. Also make sure the
+    mixer info is removed correctly in all cases on destroyed ports.
+  - Fix Props param emission again in pw_stream. (#3833)
+  - Add MAPPABLE flag to buffer data to indicate that the fd can be
+    mmapped directly. Use this on DMABUF from v4l2. (#3840)
+  - Correctly handle removed object in the metadata.
+  - FreeBSD build and compatibility fixes.
+  - Add an option to set the server and client priorities instead of using
+    a hardcoded value of 88.
+  - Read config overrides in the right order.
+  - Fix PIPEWIRE_QUANTUM rate handling in pw_stream and pw_filter.
+  - Fix pw_context_parse_conf_section(), actually use the conf argument.
+  - A new pw_stream_get_nsec() and pw_filter_get_nsec() function was added
+    to get the current time of the stream/filter without having to assume a
+    particular clock.
+  - A new default.clock.quantum-floor property was added to configure the
+    absolute lowest buffer-size. (#3908)
+
+## docs
+  - Many doc updates.
+
+## tools
+  - Make sure we always quit pw-cli when the server stops. (#3837)
+  - pw-top now prints all drivers in batch mode. (#3899)
+
+## modules
+  - Don't destroy the client in protocol-simple on EAGAIN.
+  - Handle IPv6 better in the RTP modules. Fix IPv6 SAP header
+    parsing. (#3851)
+  - The FFADO module has been fixed. Audio and MIDI now works with
+    the same latency as the JACK driver. This has now also been
+    tested with a Focusrite Saffire Pro 14. (#3558)
+
+## pulse-server
+  - Make sure the peer_name is filled to avoid protocol errors.
+
+## SPA
+  - Small resampler tweaks to improve stability of adaptive resampler.
+  - Add ALSA option to control htimestamp autodisable.
+  - Avoid some potential crashes in audioconvert when ports are removed.
+  - Improve HDMI jack detection on some SOCs.
+  - The audioconvert now has a monitor.passthrough option to pass the
+    latency information on the monitor ports. (#3888)
+
+## GStreamer
+  - Don't use timeouts when autoconnect=false in pipewiresrc. (#3884)
+  - pipewiresrc and pipewiresink can now be automatically selected as
+    audio source and sink.
+  - An invalid memory access was fixed when destroying the device
+    provider.
+
+## JACK
+  - Remove properties correctly with the object id, not serial.
+  - Improve sync with the data thread by pausing the core. Also improve
+    handling of port io to avoid invalid buffer access.
+  - Fix PIPEWIRE_QUANTUM rate handling.
+  - Support multiple MIDI input ports per client. (#3901)
+  - The output buffer size is now always correctly set. (#3892)
+
+## ALSA
+  - Handle errors from eventfd_create correctly.
+
+# PipeWire 1.0.3 (2024-02-02)
+
+This is a quick bugfix release that is API and ABI compatible with previous
+1.0.x releases.
+
+## Highlights
+  - Fix ALSA version check. This should allow the alsa plugin to work again.
+  - Some small fixes and improvements.
+
+## PipeWire
+  - Escape @DEFAULT_SINK@ in the conf files.
+
+## Modules
+  - Improve logging in module-pipe-tunnel.
+
+## SPA
+  - Always recheck rate matching in ALSA when moving drivers. This fixes a
+    potential issue where the adaptive resampler would not be activated in
+    some cases.
+
+## ALSA
+  - Fix version check. This should allow the alsa plugin to work again
+    with version 1.0.2.
+
+# PipeWire 1.0.2 (2024-01-31)
+
+This is a bugfix release that is API and ABI compatible with previous
+1.0.x releases.
+
+## Highlights
+  - Fix v4l2 enumeration with filter. This should fix negotiation in some
+    GStreamer pipelines with capsfilter. Also probe for EXPBUF support
+    before using it.
+  - Fix max-latency property and Buffer param when dealing with small
+    ALSA device buffers. This should fix stuttering with some AMD
+    based soundcards.
+  - More small cleanups an improvements.
+
+## Modules
+  - Improve netjack2 channel positions.
+  - Improve RAOP module state after suspend/resume. (#3778)
+  - Avoid crash in some LV2 plugins by configuring the Atom ports. (#3815)
+
+## SPA
+  - Bump libcamera requirements to 0.2.0.
+  - Try to avoid unaligned load exceptions. (#3790)
+  - Fix v4l2 enumeration with filter. (#1793)
+  - Fix max-latency property and Buffer param when dealing with small
+    ALSA device buffers. This should fix stuttering with some AMD
+    based soundcards. (#3744,#3622)
+  - Add a resync.ms option to node.driver to make it possible to resync
+    fast to clock jumps.
+  - Probe for EXPBUF support in v4l2 before using it. (#3821)
+
+## pulse-server
+  - Also emit change events when the port list change.
+
+## Bluetooth
+  - Log a more verbose explanation when other soundservers seem to be
+    interfering with bluetooth.
+  - Add quirks for Rockbox Brick. (#3786)
+  - Add quirks for SoundCore mini2. (#2927)
+
+## JACK
+  - Improve check for the running state of clients. (#3794)
+
 # PipeWire 1.0.1 (2024-01-11)
 
 This is a bugfix release that is API and ABI compatible with previous
@@ -49,9 +622,6 @@
   - Improve error handling while connecting.
   - Fix dts_offset.
 
-Older versions:
-
-
 # PipeWire 1.0.0 (2023-11-26)
 
 The PipeWire project is immensely proud to announce the 1.0 release
@@ -78,7 +648,7 @@
 
  "From the beginning of the libcamera project, we have always seen
  PipeWire as the solution to handle desktop and mobile integration and
- give a seemless multimedia integration to users while providing security
+ give a seamless multimedia integration to users while providing security
  features and resource sharing between applications."
     - Kieran Bingham, libcamera author
 
@@ -390,7 +960,7 @@
     nodes adapt to the new quantum. This is important for Pro-Audio nodes
     that need to reconfigure the hardware to a new period.
   - The stream now has an EARLY_PROCESS option that can be used to implement
-    custum buffer fill levels. (#3480)
+    custom buffer fill levels. (#3480)
   - Fix a regression in regex parsing. (#3528)
   - Fix a bug in position reporting in the driver node. (#3189) (#3544)
   - Destroying a link will now recalculate the graph correctly.
@@ -500,7 +1070,7 @@
   - Some fixes for LE audio support (#3479)
 
 ## JACK
-  - Also emit unregister notify even when supressed when creating the
+  - Also emit unregister notify even when suppressed when creating the
     client.
   - The notify callbacks now match JACK2 behaviour more.
   - The mixer io areas are updated and handled safely now to avoid
@@ -620,7 +1190,7 @@
   - Fix a bug in ALSA source where the available number of samples was miscaluclated
     and resulted in xruns in some cases.
   - A new L permission was added to make it possible to force a link between
-    nodes even when the nodes can't see eachother.
+    nodes even when the nodes can't see each other.
   - The VBAN module now supports midi send and receive as well.
   - Many cleanups and small fixes.
 
@@ -629,7 +1199,7 @@
   - Global objects now only show permissions that apply to them. The permissions
     required to perform various API calls are documented.
   - A new L permission was added to make it possible to force a link between
-    nodes even when the nodes can't see eachother.
+    nodes even when the nodes can't see each other.
   - Config files need to end with .conf.
   - The client.api is added the to global properties of a node.
 
@@ -718,7 +1288,7 @@
 
 ## PipeWire
   - Permissions for links between nodes are now enforced. The link will now check
-    that the owner clients of the nodes can see eachother before allowing the link.
+    that the owner clients of the nodes can see each other before allowing the link.
     This avoids screensharing clients to accidentally being linked to the camera
     nodes by the session manager. A side effect is that patchbay tools will no longer
     be able to link portal managed screencast nodes to the camera, for this we need
@@ -971,7 +1541,7 @@
     graph as a synchronous JACK client with no added latency.
   - Many performance improvements. Activation of remote nodes is more
     efficient, fewer eventfds are required on the clients, less callback
-    overhead in performence critical paths and an optimized poll function
+    overhead in performance critical paths and an optimized poll function
     was added. This was mainly driven by the jackdbus module to get the lowest
     possible overhead when running the graph.
   - The JACK notify callback implementation was reworked to emulate better what
@@ -996,7 +1566,7 @@
   - A potential out-of-buffers case was fixed in capture pw-streams where buffers
     were not moved to the recycle queue when the node suspended.
   - Nodes are now always woken up with the eventfd. Previously there were
-    some optimiztions in the server to directly call into the node process
+    some optimizations in the server to directly call into the node process
     function but that optimization is not necessary. Without this optimization
     it is now possible to run nodes in different threads.
   - pw-stream trigger is now implemented correctly in all cases.
@@ -1083,7 +1653,7 @@
   - Improve some error reporting.
   - The JACK headers were updated to a newer version.
   - JACK callbacks are now managed with an event queue to simulate
-    more what JACK does. This avoids emiting callbacks when a method is blocking
+    more what JACK does. This avoids emitting callbacks when a method is blocking
     for a reply and causing deadlocks. (#3183)
   - Assign unique names to JACK clients. (#2833)
   - Fix a potential crash when the thread_utils was used after free.
@@ -1149,7 +1719,7 @@
 ## SPA
   - One ALSA commit was not correctly reverted and might cause crashes.
   - The ALSA sink and source now calculate the ALSA ringbuffer memory
-    location more correctly wich might improve compatibility with some
+    location more correctly which might improve compatibility with some
     hardware.
   - v4l2 now sets the values of the controls in the Props param.
 
@@ -1179,7 +1749,7 @@
     again. (#3153)
   - ALSA rate matching for sources was fixed. It would previously wait too
     long for rate matching and then cause drift. This should reduce
-    crackling and stuttering whan capturing in low latency.
+    crackling and stuttering when capturing in low latency.
   - Fix the GStreamer clock to make cheese video recording work again. (#3149)
   - More fixes and improvements.
 
@@ -1205,7 +1775,7 @@
   - More ALSA IRQ based scheduling improvements.
   - ALSA rate matching for sources was fixed. It would previously wait too
     long for rate matching and then cause drift. This should reduce
-    crackling and stuttering whan capturing in low latency.
+    crackling and stuttering when capturing in low latency.
   - The echo-cancel plugin API has a new method to make it possible to have
     different channels for capture, source and playback.
   - Reverted the UCM changes, they seem to cause regressions causing audio
@@ -1463,7 +2033,7 @@
     example is the X11-bell module that can now be disabled with a custom
     property override.
   - Filter-chain has a new mysofa based spacializer plugin.
-  - Suport was added for different clocks that allow the RTP modules to work
+  - Support was added for different clocks that allow the RTP modules to work
     with a PTP clock, for example.
   - Many bugfixes and improvements.
 
@@ -1472,7 +2042,7 @@
   - Avoid rate switches when the graph is idle.
   - The rate selection algorithm was improved. This ensures minimal performance
     and quality loss when resampling.
-  - The default min.quantum was set to 32 again after it got erronously changed
+  - The default min.quantum was set to 32 again after it got erroneously changed
     to (the too low) 16 in version 0.3.45.
   - Fix compilation issues with rust bindings because of macros in defines.
     Work around it for now. (#2952)
@@ -1637,7 +2207,7 @@
     This can be set per application using the rules.
 
 ## GStreamer
-  - pipewiresrc will now advertize DMABUF support if the pipeline suports
+  - pipewiresrc will now advertise DMABUF support if the pipeline supports
     this.
   - pipewiresrc will now always be a live source unless told otherwise.
 
@@ -1983,7 +2553,7 @@
   - Codecs can now share endpoints. This reduces the amount of endpoints and
     avoids problems with devices that can't handle a large amount of
     codec endpoints.
-  - Report batery status to UPower for HFP AG.
+  - Report battery status to UPower for HFP AG.
   - Fix bitpool increase.
 
 ## SPA
@@ -2204,10 +2774,10 @@
   - Support masking of conf.d/ files. (#2629)
   - Use org.freedesktop.portal.Realtime when available. This does the
     correct PID/TID mappings to make realtime also work from flatpaks.
-  - Fix rate adjustement logic in pulse-tunnel. This would cause
+  - Fix rate adjustment logic in pulse-tunnel. This would cause
     increasing delays and hickups when using tunnels. (#2548)
   - Add OPUS as a new vendor codec. Add OPUS-A2DP spec. PipeWire can now
-    send and reveive OPUS data over bluetooth.
+    send and receive OPUS data over bluetooth.
   - An AAC decoder was added so that PipeWire can now also function as
     an A2DP AAC receiver.
   - Fix some issues where the wrong samplerate was used. (#2614)
@@ -2244,13 +2814,13 @@
   - Implement PIPEWIRE_NOTIFICATION_FD for notification when the socket
     is ready.
   - Try to use rtkit if set_nice() fails.
-  - Fix rate adjustement logic in pulse-tunnel. This would cause
+  - Fix rate adjustment logic in pulse-tunnel. This would cause
     increasing delays and hickups when using tunnels. (#2548)
   - Handle disconnect in pulse-tunnel.
 
 ## Bluetooth
   - Add OPUS as a new vendor codec. Add OPUS-A2DP spec. PipeWire can now
-    send and reveive OPUS data over bluetooth.
+    send and receive OPUS data over bluetooth.
   - An AAC decoder was added so that PipeWire can now also function as
     an A2DP AAC receiver.
 
@@ -2606,7 +3176,7 @@
 
 ## pulse-server
   - Add initial stream latency property so that devices can be started
-    with a resonably accurate latency.
+    with a reasonably accurate latency.
   - Fix ringbuffer underrun case. (#2366)
   - module-native-protocol-tcp now has a auth-anonymous option to give
     full access to the clients.
@@ -2725,7 +3295,7 @@
   - There is a new module-roc-sink-input module, the the PulseAudio equivalent.
   - The ROC source and sink-input module now have a much lower latency.
   - The ROC module now has an option to select FEC mode.
-  - Playback and record rate adjustements should work now. (#1159)
+  - Playback and record rate adjustments should work now. (#1159)
 
 ## JACK
   - Remove some useless pthread attributes. This makes JACK work in QEMU with
@@ -2799,13 +3369,13 @@
 ## SPA
   - The channelmixer now has PSD upmixing enabled again. We used the
     simple upmixing in the previous release but that just sounds too
-    aweful to be a good default. (#861) and (#2219)
+    awful to be a good default. (#861) and (#2219)
   - The channelmixer will not upmix FC and LFE anymore when upmixing is
     explicitly disabled. (#2266)
   - The channelmixer will only lowpass filter FC and LFE channels when
     they were upmixed. (#2280)
   - The defaults of the channelmixer were tweaked a little. There is now
-    a little bit more bass in the LFE channel and more high fequencies
+    a little bit more bass in the LFE channel and more high frequencies
     in the FC channel when upmixing. Also the channel widening has been
     disabled by default.
   - Locale independent float parsing now uses a more portable solution
@@ -2944,7 +3514,7 @@
   - The channelmix parameters can be changed at runtime now.
   - Many improvements to the upmixing algorithms. Rear channels are now
     constructed from the ambient sound and can have delay and phase shift
-    applied to them to improve spacialization. The stereo channels can
+    applied to them to improve specialization. The stereo channels can
     be filtered so that the dialog is more concentrated in the center
     channel. (#861)
 
@@ -3063,7 +3633,7 @@
     more quickly and accurately.
 
 ## JACK
-  - Add an option to name the defauld device as `system` to improve
+  - Add an option to name the default device as `system` to improve
     compatibility with some applications,
   - Use lock-quantum by default. This makes sure that all dynamic quantum
     changes are disabled while a JACK app is running. The only way to force
@@ -3111,7 +3681,7 @@
   - TI2902 chips as found in various Behringer cards should have inputs
     again.
   - Better handling of busy devices in udev, retry when the inotify close
-    event is emited.
+    event is emitted.
 
 ## SPA
   - plugins now handle alignment properly and only expect the max alignment
@@ -3174,7 +3744,7 @@
   - Fix a potential file descriptor leak in the connection.
   - A new minimal.conf file was added to demonstrate a static setup
     of a daemon that doesn't require a session manager and is able to
-    run JACK applicaions.
+    run JACK applications.
   - Nice levels are now only changed on the servers, not the clients.
   - Add an option to suspend nodes when idle.
   - Make it possible to avoid quantum and rate changes with
@@ -3409,7 +3979,7 @@
     that newer clients can now bind to older servers, which is
     a typical case for a flatpak.
   - A bug in the latency calculations was fixed where it would in
-    some cases report the wrong minumum latency.
+    some cases report the wrong minimum latency.
 
 ## modules
   - module-echo-cancel has voice-detection enabled now.

pipewire-1.0.1.tar.bz2/doc/Doxyfile.in -> pipewire-1.2.0.tar.gz/doc/Doxyfile.in Changed

pipewire-1.0.1.tar.bz2/doc/DoxygenLayout.xml -> pipewire-1.2.0.tar.gz/doc/DoxygenLayout.xml Changed

@@ -1,8 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <doxygenlayout version="1.0">
+  
+  
   <navindex>
     <tab type="mainpage" visible="yes" title=""/>
     <tab type="pages" visible="yes" title="Pages" intro=""/>
-    <tab type="modules" visible="yes" title="API Reference" intro="" />
+    <tab type="topics" visible="yes" title="API Reference" intro=""/>
+    <tab type="modules" visible="yes" title="API Reference" intro="">
+      <tab type="modulelist" visible="yes" title="" intro=""/>
+      <tab type="modulemembers" visible="yes" title="" intro=""/>
+    </tab>
     <tab type="namespaces" visible="no" title="">
       <tab type="namespacelist" visible="yes" title="" intro=""/>
       <tab type="namespacemembers" visible="yes" title="" intro=""/>
@@ -16,7 +23,7 @@
     </tab>
     <tab type="classes" visible="yes" title="">
       <tab type="classlist" visible="yes" title="" intro=""/>
-      <tab type="classindex" visible="yes" title=""/>
+      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
       <tab type="hierarchy" visible="yes" title="" intro=""/>
       <tab type="classmembers" visible="no" title="" intro=""/>
     </tab>
@@ -40,8 +47,8 @@
   <class>
     <briefdescription visible="yes"/>
     <includes visible="$SHOW_HEADERFILE"/>
-    <inheritancegraph visible="$CLASS_GRAPH"/>
-    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
+    <inheritancegraph visible="no"/>
+    <collaborationgraph visible="no"/>
     <memberdecl>
       <nestedclasses visible="yes" title=""/>
       <publictypes title=""/>
@@ -112,6 +119,7 @@
       <enums title=""/>
       <functions title=""/>
       <variables title=""/>
+      <properties title=""/>
       <membergroups visible="yes"/>
     </memberdecl>
     <detaileddescription title=""/>
@@ -123,6 +131,7 @@
       <enums title=""/>
       <functions title=""/>
       <variables title=""/>
+      <properties title=""/>
     </memberdef>
     <authorsection visible="yes"/>
   </namespace>
@@ -140,8 +149,8 @@
   <file>
     <briefdescription visible="yes"/>
     <includes visible="$SHOW_INCLUDE_FILES"/>
-    <includegraph visible="$INCLUDE_GRAPH"/>
-    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
+    <includegraph visible="no"/>
+    <includedbygraph visible="no"/>
     <sourcelink visible="yes"/>
     <memberdecl>
       <interfaces visible="yes" title=""/>
@@ -158,6 +167,7 @@
       <enums title=""/>
       <functions title=""/>
       <variables title=""/>
+      <properties title=""/>
       <membergroups visible="yes"/>
     </memberdecl>
     <detaileddescription title=""/>
@@ -170,6 +180,7 @@
       <enums title=""/>
       <functions title=""/>
       <variables title=""/>
+      <properties title=""/>
     </memberdef>
     <authorsection/>
   </file>
@@ -177,9 +188,10 @@
   
   <group>
     <briefdescription visible="yes"/>
-    <groupgraph visible="$GROUP_GRAPHS"/>
+    <groupgraph visible="no"/>
     <memberdecl>
       <nestedgroups visible="yes" title=""/>
+      <modules visible="yes" title=""/>
       <dirs visible="yes" title=""/>
       <files visible="yes" title=""/>
       <namespaces visible="yes" title=""/>
@@ -225,10 +237,29 @@
     <authorsection visible="yes"/>
   </group>
 
+  
+  <module>
+    <briefdescription visible="yes"/>
+    <exportedmodules visible="yes"/>
+    <memberdecl>
+      <concepts visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <enums title=""/>
+      <typedefs title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups title=""/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdecl>
+      <files visible="yes"/>
+    </memberdecl>
+  </module>
+
   
   <directory>
     <briefdescription visible="yes"/>
-    <directorygraph visible="yes"/>
+    <directorygraph visible="no"/>
     <memberdecl>
       <dirs visible="yes"/>
       <files visible="yes"/>

pipewire-1.0.1.tar.bz2/doc/custom.css -> pipewire-1.2.0.tar.gz/doc/custom.css Changed

pipewire-1.0.1.tar.bz2/doc/dox/api/spa-design.dox -> pipewire-1.2.0.tar.gz/doc/dox/api/spa-design.dox Changed

pipewire-1.0.1.tar.bz2/doc/dox/api/spa-pod.dox -> pipewire-1.2.0.tar.gz/doc/dox/api/spa-pod.dox Changed

pipewire-1.2.0.tar.gz/doc/dox/config Added

pipewire-1.2.0.tar.gz/doc/dox/config/index.md Added

@@ -0,0 +1,89 @@
+\page page_config Configuration
+
+One of the design goals of PipeWire is to be able to closely control
+and configure all aspects of the processing graph.
+
+A fully configured PipeWire setup runs various pieces, each with their
+configuration options and files:
+
+- **pipewire**: The PipeWire main daemon that runs and coordinates the processing.
+
+- **pipewire-pulse**: The PipeWire PulseAudio replacement server. It also configures
+  the properties of the PulseAudio clients connecting to it.
+
+- **wireplumber**: Most configuration of devices is performed by the session manager.
+  It typically loads ALSA and other devices and configures the profiles, port volumes and more.
+  The session manager also configures new clients and links them to the targets, as configured
+  in the session manager policy.
+
+- **PipeWire clients**: Each native PipeWire client also loads a configuration file.
+  Emulated JACK client also have separate configuration.
+
+# Configuration Settings
+
+Configuration of daemons:
+
+- \ref page_man_pipewire_conf_5 "PipeWire daemon configuration reference"
+- \ref page_man_pipewire-pulse_conf_5 "PipeWire Pulseaudio daemon configuration reference"
+- WirePlumber daemon configuration(https://pipewire.pages.freedesktop.org/wireplumber/)
+- Wiki page on PipeWire daemon configuration(https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-PipeWire)
+- Wiki page on PipeWire PulseAudio daemon configuration(https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-PulseAudio)
+
+Configuration of devices:
+
+- WirePlumber configuration(https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration.html)
+- \ref page_man_pipewire-devices_7 "Device and node property reference"
+- Wiki page on device runtime settings(https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-Devices)
+
+Configuration for client applications, either connecting via the
+native PipeWire interface, or the emulated ALSA, JACK, or PulseAudio
+interfaces:
+
+- \ref page_man_pipewire-client_conf_5 "PipeWire native and ALSA client configuration reference"
+- \ref page_man_pipewire-jack_conf_5 "PipeWire JACK client configuration reference"
+- \ref page_man_pipewire-pulse_conf_5 "PipeWire Pulseaudio client configuration reference"
+- Wiki page on native clients(https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-client)
+- Wiki page on ALSA clients(https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-ALSA)
+- Wiki page on JACK clients(https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-JACK)
+- Wiki page on PulseAudio clients(https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-PulseAudio)
+
+# Manual Pages
+
+- \subpage page_man_pipewire_conf_5
+- \subpage page_man_pipewire-client_conf_5
+- \subpage page_man_pipewire-pulse_conf_5
+- \subpage page_man_pipewire-jack_conf_5
+- \subpage page_man_pipewire-filter-chain_conf_5
+- \subpage page_man_pipewire-devices_7
+- \subpage page_man_pipewire-pulse-modules_7
+- \subpage page_man_libpipewire-modules_7
+
+# Configuration Index
+
+\ref page_man_pipewire_conf_5 "pipewire.conf"
+
+@SECREF@ pipewire.conf
+
+\ref page_man_pipewire-pulse_conf_5 "pipewire-pulse.conf"
+
+@SECREF@ pipewire-pulse.conf
+
+\ref page_man_pipewire-client_conf_5 "client.conf, client-rt.conf"
+
+@SECREF@ client.conf
+
+\ref page_man_pipewire-jack_conf_5 "jack.conf"
+
+@SECREF@ jack.conf
+
+**Runtime settings**
+
+@SECREF@ pipewire-settings
+
+**Environment variables**
+
+@SECREF@ pipewire-env client-env jack-env pulse-env
+
+**Device properties**
+
+@SECREF@ device-param

pipewire-1.2.0.tar.gz/doc/dox/config/libpipewire-modules.7.md Changed

pipewire-1.2.0.tar.gz/doc/dox/config/pipewire-client.conf.5.md Added

@@ -0,0 +1,659 @@
+\page page_man_pipewire-client_conf_5 client.conf
+
+The PipeWire client configuration file.
+
+\tableofcontents
+
+# SYNOPSIS
+
+*$XDG_CONFIG_HOME/pipewire/client.conf*
+
+*$(PIPEWIRE_CONFIG_DIR)/client.conf*
+
+*$(PIPEWIRE_CONFDATADIR)/client.conf*
+
+*$(PIPEWIRE_CONFDATADIR)/client.conf.d/*
+
+*$(PIPEWIRE_CONFIG_DIR)/client.conf.d/*
+
+*$XDG_CONFIG_HOME/pipewire/client.conf.d/*
+
+*$XDG_CONFIG_HOME/pipewire/client-rt.conf*
+
+*$(PIPEWIRE_CONFIG_DIR)/client-rt.conf*
+
+*$(PIPEWIRE_CONFDATADIR)/client-rt.conf*
+
+*$(PIPEWIRE_CONFDATADIR)/client-rt.conf.d/*
+
+*$(PIPEWIRE_CONFIG_DIR)/client-rt.conf.d/*
+
+*$XDG_CONFIG_HOME/pipewire/client-rt.conf.d/*
+
+# DESCRIPTION
+
+Configuration for PipeWire native clients, and for PipeWire's ALSA
+plugin.
+
+A PipeWire native client program selects the default config to load,
+and if nothing is specified, it usually loads `client.conf`.
+
+The ALSA plugin uses the `client-rt.conf` file, as do some PipeWire
+native clients such as \ref page_man_pw-cat_1 "pw-cat(1)".
+
+The configuration file format and lookup logic is the same as for \ref page_man_pipewire_conf_5 "pipewire.conf(5)".
+
+Drop-in configuration files `client.conf.d/*.conf` can be used, and are recommended.
+See \ref pipewire_conf__drop-in_configuration_files "pipewire.conf(5)".
+
+# CONFIGURATION FILE SECTIONS  @IDX@ client.conf
+
+\par stream.properties
+Configures options for native client streams.
+
+\par stream.rules
+Configures rules for native client streams.
+
+\par alsa.properties
+ALSA client configuration.
+
+\par alsa.rules
+ALSA client match rules.
+
+In addition, the PipeWire context configuration sections 
+may also be specified, see \ref page_man_pipewire_conf_5 "pipewire.conf(5)".
+
+# STREAM PROPERTIES  @IDX@ client.conf
+
+The client configuration files contain a stream.properties section that configures the options for client streams:
+```
+stream.properties = {
+    #node.latency = 1024/48000
+    #node.autoconnect = true
+    #resample.disable = false
+    #resample.quality = 4
+    #monitor.channel-volumes = false
+    #channelmix.disable = false
+    #channelmix.min-volume = 0.0
+    #channelmix.max-volume = 10.0
+    #channelmix.normalize = false
+    #channelmix.lock-volume = false
+    #channelmix.mix-lfe = true
+    #channelmix.upmix = true
+    #channelmix.upmix-method = psd  # none, simple
+    #channelmix.lfe-cutoff = 150.0
+    #channelmix.fc-cutoff  = 12000.0
+    #channelmix.rear-delay = 12.0
+    #channelmix.stereo-widen = 0.0
+    #channelmix.hilbert-taps = 0
+    #dither.noise = 0
+    #dither.method = none # rectangular, triangular, triangular-hf, wannamaker3, shaped5
+    #debug.wav-path = ""
+}
+```
+
+Some of the properties refer to different aspects of the stream:
+
+* General stream properties to identify the stream.
+* General stream properties to classify the stream.
+* How it is going to be scheduled by the graph.
+* How it is going to be linked by the session manager.
+* How the internal processing will be done.
+* Properties to configure the media format.
+
+## Identifying Properties  @IDX@ client.conf
+
+These contain properties to identify the node or to display the node in a GUI application.
+
+@PAR@ client.conf  node.name
+A (unique) name for the node. This is usually set on sink and sources to identify them
+as targets for linking by the session manager.
+
+@PAR@ client.conf  node.description
+A human readable description of the node or stream.
+
+@PAR@ client.conf  media.name
+A user readable media name, usually the artist and title.
+These are usually shown in user facing applications
+to inform the user about the current playing media.
+
+@PAR@ client.conf  media.title
+A user readable stream title.
+
+@PAR@ client.conf  media.artist
+A user readable stream artist
+
+@PAR@ client.conf  media.copyright
+User readable stream copyright information
+
+@PAR@ client.conf  media.software
+User readable stream generator software information
+
+@PAR@ client.conf  media.language
+Stream language in POSIX format. Ex: `en_GB`
+
+@PAR@ client.conf  media.filename
+File name for the stream
+
+@PAR@ client.conf  media.icon
+Icon for the media, a base64 blob with PNG image data
+
+@PAR@ client.conf  media.icon-name
+An XDG icon name for the media. Ex: `audio-x-mp3`
+
+@PAR@ client.conf  media.comment
+Extra stream comment
+
+@PAR@ client.conf  media.date
+Date of the media
+
+@PAR@ client.conf  media.format
+User readable stream format information
+
+@PAR@ client.conf  object.linger = false
+If the object should outlive its creator.
+
+## Classifying Properties  @IDX@ client.conf
+
+The classifying properties of a node are use for routing the signal to its destination and
+for configuring the settings.
+
+@PAR@ client.conf  media.type
+The media type contains a broad category of the media that is being processed by the node.
+Possible values include "Audio", "Video", "Midi"
+
+@PAR@ client.conf  media.category
+\parblock
+What kind of processing is done with the media. Possible values include:
+
+* Playback: media playback.
+* Capture: media capture.
+* Duplex: media capture and playback or media processing in general.
+* Monitor: a media monitor application. Does not actively change media data but monitors
+           activity.
+* Manager: Will manage the media graph.
+\endparblock
+
+@PAR@ client.conf  media.role
+\parblock
+The Use case of the media. Possible values include:
+
+* Movie: Movie playback with audio and video.
+* Music: Music listening.
+* Camera: Recording video from a camera.
+* Screen: Recording or sharing the desktop screen.
+* Communication: VOIP or other video chat application.
+* Game: Game.
+* Notification: System notification sounds.
+* DSP: Audio or Video filters and effect processing.
+* Production: Professional audio processing and production.
+* Accessibility: Audio and Visual aid for accessibility.
+* Test: Test program.
+\endparblock
+
+@PAR@ client.conf  media.class
+\parblock
+The media class is to classify the stream function. Possible values include:
+
+* Video/Source: a producer of video, like a webcam.
+* Video/Sink: a consumer of video, like a display window.
+* Audio/Source: a source of audio samples like a microphone.
+* Audio/Sink: a sink for audio samples, like an audio card.
+* Audio/Duplex: a node that is both a sink and a source.
+* Stream/Output/Audio: a playback stream.
+* Stream/Input/Audio: a capture stream.
+
+The session manager assigns special meaning to the nodes based on the media.class. Sink or Source
+classes are used as targets for Stream classes, etc..
+\endparblock
+
+## Scheduling Properties  @IDX@ client.conf
+
+@PAR@ client.conf  node.latency = 1024/48000
+Sets a suggested latency on the node as a fraction. This is just a suggestion, the graph will try to configure this latency or less for the graph. It is however possible that the graph is forced to a higher latency.
+
+@PAR@ client.conf  node.lock-quantum = false
+\parblock
+When this node is active, the quantum of the graph is locked and not allowed to change automatically.
+It can still be changed forcibly with metadata or when a node forces a quantum.
+
+JACK clients use this property to avoid unexpected quantum changes.
+\endparblock
+
+@PAR@ client.conf  node.force-quantum = INTEGER
+\parblock
+While the node is active, force a quantum in the graph. The last node to be activated with this property wins.
+
+A value of 0 unforces the quantum.
+\endparblock
+
+@PAR@ client.conf  node.rate = RATE
+Suggest a rate (samplerate) for the graph. The suggested rate will only be applied when doing so would not cause
+interruptions (devices are idle) and when the rate is in the list of allowed rates in the server.
+
+@PAR@ client.conf  node.lock-rate = false
+When the node is active, the rate of the graph will not change automatically. It is still possible to force a rate change with metadata or with a node property.
+
+@PAR@ client.conf  node.force-rate = RATE
+\parblock
+When the node is active, force a specific sample rate on the graph. The last node to activate with this property wins.
+
+A RATE of 0 means to force the rate in `node.rate` denominator.
+\endparblock
+
+@PAR@ client.conf  node.always-process = false
+\parblock
+When the node is active, it will always be joined with a driver node, even when nothing is linked to the node.
+Setting this property to true also implies node.want-driver = true.
+
+This is the default for JACK nodes, that always need their process callback called.
+\endparblock
+
+@PAR@ client.conf  node.want-driver = true
+The node wants to be linked to a driver so that it can start processing. This is the default for streams
+and filters since 0.3.51. Nodes that are not linked to anything will still be set to the idle state,
+unless node.always-process is set to true.
+
+@PAR@ client.conf  node.pause-on-idle = false
+@PAR@ client.conf  node.suspend-on-idle = false
+\parblock
+When the node is not linked anymore, it becomes idle. Normally idle nodes keep processing and are suspended by the session manager after some timeout.  It is possible to immediately pause a node when idle with this property.
+
+When the session manager does not suspend nodes (or when there is no session manager), the node.suspend-on-idle property can be used instead.
+\endparblock
+
+@PAR@ client.conf  node.loop.name = null
+@PAR@ client.conf  node.loop.class = data.rt
+\parblock
+Add the node to a specific loop name or loop class. By default the node is added to the
+data.rt loop class. You can make more specific data loops and then assign the nodes to those.
+
+Other well known names are main-loop.0 and the main node.loop.class which runs the node data processing
+in the main loop.
+\endparblock
+
+## Session Manager Properties  @IDX@ client.conf
+
+@PAR@ client.conf  node.autoconnect = true
+Instructs the session manager to automatically connect this node to some other node, usually
+a sink or source.
+
+@PAR@ client.conf  node.exclusive = false
+If this node wants to be linked exclusively to the sink/source.
+
+@PAR@ client.conf  node.target = <node.name|object.id>
+Where this node should be linked to. This can be a node.name or an object.id of a node. This property is 
+deprecated, the target.object property should be used instead, which uses the more unique object.serial as
+a possible target.
+
+@PAR@ client.conf  target.object = <node.name|object.serial>
+Where the node should link to, this can be a node.name or an object.serial.
+
+@PAR@ client.conf  node.dont-reconnect = false
+\parblock
+When the node has a target configured and the target is destroyed, destroy the node as well.
+This property also inhibits that the node is moved to another sink/source.
+
+Note that if a stream should appear/disappear in sync with the target, a session manager (WirePlumber) script
+should be written instead.
+\endparblock
+
+@PAR@ client.conf  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 is used for filter nodes that sit in front of sinks/sources and need to suspend together with the sink/source.
+\endparblock
+
+@PAR@ client.conf  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.
+
+@PAR@ client.conf  stream.dont-remix = false
+Instruct the session manager to not remix the channels of a stream. Normally the stream channel configuration is changed to match the sink/source it is connected to. With this property set to true, the stream will keep its original channel layout and the session manager will link matching channels with the sink.
+
+## Audio Adapter Parameters  @IDX@ client.conf
+
+An audio stream (and also audio device nodes) contain an audio adapter that can perform,
+sample format, sample rate and channel mixing operations.
+
+### Merger Parameters
+
+The merger is used as the input for a sink device node or a capture stream. It takes the various channels and merges them into a single stream for further processing. 
+
+The merger will also provide the monitor ports of the input channels and can
+apply a software volume on the monitor signal.
+
+@PAR@ client.conf  monitor.channel-volumes = false
+The volume of the input channels is applied to the volume of the monitor ports. Normally
+the monitor ports expose the raw unmodified signal on the input ports.
+
+### Resampler Parameters
+
+Source, sinks, capture and playback streams contain a high quality adaptive resampler.
+It uses sinc(https://ccrma.stanford.edu/~jos/resample/resample.pdf) based resampling
+with linear interpolation of filter banks to perform arbitrary
+resample factors. The resampler is activated in the following cases:
+
+* The hardware of a device node does not support the graph samplerate. Resampling will occur
+  from the graph samplerate to the hardware samplerate.
+* The hardware clock of a device does not run at the same speed as the graph clock and adaptive
+  resampling is required to match the clocks.
+* A stream does not have the same samplerate as the graph and needs to be resampled.
+* An application wants to activate adaptive resampling in a stream to make it match some other
+  clock.
+
+PipeWire performs most of the sample conversions and resampling in the client (Or in the case of the PulseAudio server, in the pipewire-pulse server that creates the streams). This ensures all the conversions are offloaded to the clients and the server can deal with one single format for performance reasons.
+
+Below is an explanation of the options that can be tuned in the sample converter.
+
+@PAR@ client.conf  resample.quality = 4
+\parblock
+The quality of the resampler. from 0 to 14, the default is 4.
+
+Increasing the quality will result in better cutoff and less aliasing at the expense of
+(much) more CPU consumption. The default quality of 4 has been selected as a good compromise
+between quality and performance with no artifacts that are well below the audible range.
+
+See Infinite Wave(https://src.infinitewave.ca/) for a comparison of the performance.
+\endparblock
+
+@PAR@ client.conf  resample.disable = false
+Disable the resampler entirely. The node will only be able to negotiate with the graph
+when the samplerates are compatible.
+
+### Channel Mixer Parameters
+
+Source, sinks, capture and playback streams can apply channel mixing on the incoming signal.
+
+Normally the channel mixer is not used for devices, the device channels are usually exposed as they are. This policy is usually enforced by the session manager, so we refer to its documentation there.
+
+Playback and capture streams are usually configured to the channel layout of the sink/source
+they connect to and will thus perform channel mixing.
+
+The channel mixer also implements a software volume. This volume adjustment is performed on the original
+channel layout. ex: A stereo playback stream that is up-mixed to 5.1 has 2 a left an right volume control.
+
+@PAR@ client.conf  channelmix.disable = false
+Disables the channel mixer completely. The stream will only be able to link to compatible
+sources/sinks with the exact same channel layout.
+
+@PAR@ client.conf  channelmix.min-volume = 0.0
+@PAR@ client.conf  channelmix.max-volume = 10.0
+Gives the min and max volume values allowed. Any volume that is set will be clamped to these
+values.
+
+@PAR@ client.conf  channelmix.normalize = false
+\parblock
+Makes sure that during such mixing & resampling original 0 dB level is preserved, so nothing sounds wildly quieter/louder.
+
+While this options prevents clipping, it can in some cases produce too low volume. Increase the
+volume in that case or disable normalization.
+\endparblock
+
+@PAR@ client.conf  channelmix.lock-volumes = false
+Completely disable volume or mute changes. Defaults to false.
+
+@PAR@ client.conf  channelmix.mix-lfe = true
+Mixes the low frequency effect channel into the front center or stereo pair. This might enhance the dynamic range of the signal if there is no subwoofer and the speakers can reproduce the low frequency signal.
+
+@PAR@ client.conf  channelmix.upmix = true
+\parblock
+Enables up-mixing of the front center (FC) when the target has a FC channel.
+The sum of the stereo channels is used and an optional lowpass filter can be used
+(see `channelmix.fc-cutoff`).
+
+Also enabled up-mixing of LFE when `channelmix.lfe-cutoff` is set to something else than 0 and
+the target has an LFE channel. The LFE channel is produced by adding the stereo channels.
+
+If `channelmix.upmix` is true, the up-mixing of the rear channels is also enabled and controlled
+with the `channelmix-upmix-method` property.
+\endparblock
+
+@PAR@ client.conf  channelmix.upmix-method = psd
+\parblock
+3 methods are provided to produce the rear channels in a surround sound:
+
+1. none. No rear channels are produced.
+
+2. simple. Front channels are copied to the rear. This is fast but can produce phasing effects.
+
+3. psd. The rear channels as produced from the front left and right ambient sound (the
+difference between the channels). A delay and optional phase shift are added to the rear signal
+to make the sound bigger. 
+\endparblock
+
+@PAR@ client.conf  channelmix.lfe-cutoff = 150
+Apply a lowpass filter to the low frequency effects. The value is expressed in Hz. Typical subwoofers have a cutoff at around 150 and 200. The default value of 0 disables the feature.
+
+@PAR@ client.conf  channelmix.fc-cutoff = 12000
+\parblock
+Apply a lowpass filter to the front center frequency. The value is expressed in Hz.
+
+Since the front center contains the dialogs, a typical cutoff frequency is 12000 Hz.
+
+This option is only active when the up-mix is enabled.
+\endparblock
+
+@PAR@ client.conf  channelmix.rear-delay = 12.0
+\parblock
+Apply a delay in milliseconds when up-mixing the rear channels. This improves
+specialization of the sound. A typical delay of 12 milliseconds is the default.
+
+This is only active when the `psd` up-mix method is used.
+\endparblock
+
+@PAR@ client.conf  channelmix.stereo-widen = 0.0
+\parblock
+Subtracts some of the front center signal from the stereo channels. This moves the dialogs
+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@ client.conf  channelmix.hilbert-taps = 0
+\parblock
+This option will apply a 90 degree phase shift to the rear channels to improve specialization.
+Taps needs to be between 15 and 255 with more accurate results (and more CPU consumption)
+for higher values.
+
+This is only active when the `psd` up-mix method is used.
+\endparblock
+
+@PAR@ client.conf  dither.noise = 0
+\parblock
+This option will add N bits of random data to the signal. When no dither.method is
+specified, the random data will flip between -(1<<(N-1)), 0 every 1024 samples. With
+a dither.method, the dither noise is amplified with 1<<(N-1) bits.
+
+This can be used to keep some amplifiers alive during silent periods. One or two bits of noise is
+usually enough, otherwise the noise will become audible. This is usually used together with
+`session.suspend-timeout-seconds` to disable suspend in the session manager.
+
+Note that PipeWire uses floating point operations with 24 bits precission for all of the audio
+processing. Conversion to 24 bits integer sample formats is lossless and conversion to 32 bits
+integer sample formats are simply padded with 0 bits at the end. This means that the dither noise
+is always only in the 24 most significant bits.
+\endparblock
+
+@PAR@ client.conf  dither.method = none
+\parblock
+Optional dithering(https://en.wikipedia.org/wiki/Dither) can be done on the quantized
+output signal.
+
+There are 6 modes available:
+
+1. none           No dithering is done.
+2. rectangular    Dithering with a rectangular noise distribution. This adds random
+                  bits in the -0.5, 0.5 range to the signal with even distribution.
+3. triangular     Dithering with a triangular noise distribution. This add random
+                  bits in the -1.0, 1.0 range to the signal with triangular distribution
+                  around 0.0.
+4. triangular-hf  Dithering with a sloped triangular noise distribution.
+5. wannamaker3    Additional noise shaping is performed on the sloped triangular
+                  dithering to move the noise to the more inaudible range. This is using
+                  the "F-Weighted" noise filter described by Wannamaker.
+6. shaped5        Additional noise shaping is performed on the triangular dithering
+                  to move the noise to the more inaudible range. This is using the
+                  Lipshitz filter.
+
+Dithering is only useful for conversion to a format with less than 24 bits and will be
+disabled otherwise.
+\endparblock
+
+## Debug Parameters
+
+@PAR@ client.conf  debug.wav-path = ""
+Make the stream to also write the raw samples to a WAV file for debugging purposes.
+
+## Format Properties
+
+Streams and also most device nodes can be configured in a certain format with properties.
+
+@PAR@ client.conf  audio.rate = RATE
+Forces a samplerate on the node.
+
+@PAR@ client.conf  audio.channels = INTEGER
+The number of audio channels to use. Must be a value between 1 and 64.
+
+@PAR@ client.conf  audio.format = FORMAT
+\parblock
+Forces an audio format on the node. This is the format used internally in the node because the graph processing format is always float 32.
+
+Valid formats include: S16, S32, F32, F64, S16LE, S16BE, ...
+\endparblock
+
+@PAR@ client.conf  audio.allowed-rates
+An array of allowed samplerates for the node. ex. " 44100 48000 "
+
+# STREAM RULES  @IDX@ client.conf
+
+You can add \ref pipewire_conf__match_rules "match rules, see pipewire(1)"
+to set properties for certain streams and filters.
+
+`stream.rules` and `filter.rules` provides an `update-props` action
+that takes an object with properties that are updated on the node
+object of the stream and filter.
+
+Add a `stream.rules` or `filter.rules` section in the config file like
+this:
+
+```
+stream.rules = 
+    {
+        matches = 
+            {
+                # all keys must match the value. ! negates. ~ starts regex.
+                application.process.binary = "firefox"
+            }
+        
+        actions = {
+            update-props = {
+                node.name = "My Name"
+            }
+        }
+    }
+
+```
+
+Will set the node.name of Firefox to "My Name".
+
+# ALSA PROPERTIES  @IDX@ client.conf
+
+An `alsa.properties` section can be added to configure ALSA specific client config.
+
+```css
+alsa.properties = {
+    #alsa.deny = false
+    #alsa.format = 0
+    #alsa.rate = 0
+    #alsa.channels = 0
+    #alsa.period-bytes = 0
+    #alsa.buffer-bytes = 0
+    #alsa.volume-method = cubic         # linear, cubic
+}
+```
+
+@PAR@ client.conf  alsa.deny
+Denies ALSA access for the client. Useful in rules or PIPEWIRE_ALSA environment variable.
+
+@PAR@ client.conf  alsa.format
+The ALSA format to use for the client. This is an ALSA format name. default 0, which is to
+allow all formats.
+
+@PAR@ client.conf  alsa.rate
+The samplerate to use for the client. The default is 0, which is to allow all rates.
+
+@PAR@ client.conf  alsa.channels
+The number of channels for the client. The default is 0, which is to allow any number of channels.
+
+@PAR@ client.conf  alsa.period-bytes
+The number of bytes per period. The default is 0 which is to allow any number of period bytes.
+
+@PAR@ client.conf  alsa.buffer-bytes
+The number of bytes in the alsa buffer. The default is 0, which is to allow any number of bytes.
+
+@PAR@ client.conf  alsa.volume-method = cubic | linear
+This controls the volume curve used on the ALSA mixer. Possible values are `cubic` and
+`linear`. The default is to use `cubic`.
+
+# ALSA RULES  @IDX@ client.conf
+
+It is possible to set ALSA client specific properties by using
+\ref pipewire_conf__match_rules "Match rules, see pipewire(1)". You can
+set any of the above ALSA properties or any of the `stream.properties`.
+
+### Example
+```
+alsa.rules = 
+    {   matches =  { application.process.binary = "resolve" } 
+        actions = {
+            update-props = {
+                alsa.buffer-bytes = 131072
+            }
+        }
+    }
+
+```
+
+# ENVIRONMENT VARIABLES  @IDX@ client-env
+
+See \ref page_man_pipewire_1 "pipewire(1)" for common environment
+variables. Many of these also apply to client applications.
+
+The environment variables also influence ALSA applications that are
+using PipeWire's ALSA plugin.
+
+@PAR@ client-env  PIPEWIRE_ALSA
+\parblock
+This can be an object with properties from `alsa.properties` or `stream.properties` that will
+be used to construct the client and streams.
+
+For example:
+```
+PIPEWIRE_ALSA='{ alsa.buffer-bytes=16384 node.name=foo }' aplay ...
+```
+Starts aplay with custom properties.
+\endparblock
+
+@PAR@ client-env  PIPEWIRE_NODE
+\parblock
+Instructs the ALSA client to link to a particular sink or source `object.serial` or `node.name`.
+
+For example:
+```
+PIPEWIRE_NODE=alsa_output.pci-0000_00_1b.0.analog-stereo aplay ...
+```
+Makes aplay play on the give audio sink.
+\endparblock
+
+# AUTHORS
+
+The PipeWire Developers <$(PACKAGE_BUGREPORT)>;
+PipeWire is available from <$(PACKAGE_URL)>
+
+# SEE ALSO
+
+\ref page_module_protocol_pulse "libpipewire-module-protocol-pulse(7)",
+\ref page_man_pipewire_conf_5 "pipewire.conf(5)",
+\ref page_man_pipewire-pulse_1 "pipewire-pulse(1)",
+\ref page_man_pipewire-pulse-modules_7 "pipewire-pulse-modules(7)"

pipewire-1.2.0.tar.gz/doc/dox/config/pipewire-devices.7.md Added

@@ -0,0 +1,518 @@
+\page page_man_pipewire-devices_7 pipewire-devices
+
+PipeWire device and node property reference.
+
+\tableofcontents
+
+# DESCRIPTION
+
+Audio sinks and sources, cameras, Bluetooth endpoints, and other
+objects have properties that can be set in configuration files or at
+runtime.
+
+Some of the properties are "common object properties" (e.g. such as
+`node.description`) and can be set on all types of devices and
+nodes. Other properties control settings of a specific type of a
+device (ALSA, Bluetooth, ...).
+
+All the properties are usually configured in the session manager configuration.
+For how to configure them, see the session manager documentation.
+
+In minimal PipeWire setups without a session manager, they can be configured via
+\ref pipewire_conf__context_objects "context.objects in pipewire.conf(5)".
+
+# RUNTIME SETTINGS  @IDX@ device-param
+
+The settings of most ALSA and virtual device parameters can be
+configured also at runtime.
+
+The settings are available in device `Props` in the `params`
+field. They can be seen e.g. using `pw-dump <id>` for an ALSA device:
+
+```json
+{
+...
+      "Props": 
+        {
+          ...
+          "params": 
+              "audio.channels",
+              2,
+              "audio.rate",
+              0,
+              "audio.format",
+              "UNKNOWN",
+              "audio.position",
+              " FL, FR ",
+              "audio.allowed-rates",
+              "  ",
+              "api.alsa.period-size",
+              0,
+              "api.alsa.period-num",
+              0,
+              "api.alsa.headroom",
+              0,
+              "api.alsa.start-delay",
+              0,
+              "api.alsa.disable-mmap",
+              false,
+              "api.alsa.disable-batch",
+              false,
+              "api.alsa.use-chmap",
+              false,
+              "api.alsa.multi-rate",
+              true,
+              "latency.internal.rate",
+              0,
+              "latency.internal.ns",
+              0,
+              "clock.name",
+              "api.alsa.c-1"
+            
+          }
+...
+```
+
+One or more `params` can be changed using \ref page_man_pw-cli_1 "pw-cli(1)":
+```
+pw-cli s <id> Props '{ params =  "api.alsa.headroom" 1024  }'
+```
+These settings are not saved and need to be reapplied for each session manager restart.
+
+# COMMON NODE PROPERTIES  @IDX@ device-param
+
+The properties listed in \ref client_conf__stream_properties "Stream properties"
+apply also to sink or source nodes corresponding to real or virtual devices.
+
+In addition:
+
+@PAR@ device-param  priority.driver    # integer
+\parblock
+The priority of choosing this device as the driver in the graph. The driver is selected from all linked devices by selecting the device with the highest priority.
+
+Normally, the session manager assigns higher priority to sources so that they become the driver in the graph. The reason for this is that adaptive resampling should be done on the sinks rather than the source to avoid signal distortion when capturing audio.
+\endparblock
+
+@PAR@ device-param  priority.session    # integer
+The priority for selecting this device as the default device.
+
+@PAR@ device-param  clock.name    # string
+\parblock
+The name of the clock. This name is auto generated from the card index and stream direction. Devices with the same clock name will not use a resampler to align the clocks. This can be used to link devices together with a shared word clock.
+
+In Pro Audio mode, nodes from the same device are assumed to have the same clock and no resampling will happen when linked together. So, linking a capture port to a playback port will not use any adaptive resampling in Pro Audio mode.
+
+In Non Pro Audio profile, no such assumption is made and adaptive resampling is done in all cases by default. This can also be disabled by setting the same clock.name on the nodes.
+\endparblock
+
+@PAR@ device-param  node.param.PARAM = JSON    # JSON
+\parblock
+Set value of a node \ref spa_param_type "Param" to a JSON value when the device is loaded.
+This works similarly as \ref page_man_pw-cli_1 "pw-cli(1)" `set-param` command.
+The `PARAM` should be replaced with the name of the Param to set,
+ie. for example `node.param.Props = { ... }` to set `Props`.
+\endparblock
+
+@PAR@ device-param  device.id
+ID of the device the node belongs to.
+
+# COMMON DEVICE PROPERTIES  @IDX@ device-param
+
+These are common properties for devices.
+
+@PAR@ device-param  device.name    # string
+A (unique) name for the device. It can be used by command-line and other tools to identify the device.
+
+@PAR@ device-param  device.param.PARAM = JSON    # JSON
+\parblock
+Set value of a device \ref spa_param_type "Param" to a JSON value when the device is loaded.
+This works similarly as \ref page_man_pw-cli_1 "pw-cli(1)" `set-param` command.
+The `PARAM` should be replaced with the name of the Param to set,
+ie. for example `device.Param.Props = { ... }` to set `Props`.
+\endparblock
+
+Other `device.*` properties: UNDOCUMENTED
+
+# AUDIO CONVERTER PROPERTIES  @IDX@ device-param
+
+Most audio nodes (ALSA, Bluetooth, ...) have common properties for the audio
+converter. See \ref client_conf__stream_properties "pipewire-client.conf(5) stream.properties"
+for explanations.
+
+## Node properties
+
+@PAR@ device-param  clock.quantum-limit
+\ref pipewire_conf__default_clock_quantum-limit "See pipewire.conf(5)"
+
+@PAR@ device-param  channelmix.disable
+\ref client_conf__channelmix_disable "See pipewire-client.conf(5)"
+
+@PAR@ device-param  channelmix.min-volume
+\ref client_conf__channelmix_min-volume "See pipewire-client.conf(5)"
+
+@PAR@ device-param  channelmix.max-volume
+\ref client_conf__channelmix_max-volume "See pipewire-client.conf(5)"
+
+@PAR@ device-param  channelmix.normalize
+\ref client_conf__channelmix_normalize "See pipewire-client.conf(5)"
+
+@PAR@ device-param  channelmix.mix-lfe
+\ref client_conf__channelmix_mix-lfe "See pipewire-client.conf(5)"
+
+@PAR@ device-param  channelmix.upmix
+\ref client_conf__channelmix_upmix "See pipewire-client.conf(5)"
+
+@PAR@ device-param  channelmix.lfe-cutoff
+\ref client_conf__channelmix_lfe-cutoff "See pipewire-client.conf(5)"
+
+@PAR@ device-param  channelmix.fc-cutoff
+\ref client_conf__channelmix_fc-cutoff "See pipewire-client.conf(5)"
+
+@PAR@ device-param  channelmix.rear-delay
+\ref client_conf__channelmix_rear-delay "See pipewire-client.conf(5)"
+
+@PAR@ device-param  channelmix.stereo-widen
+\ref client_conf__channelmix_stereo-widen "See pipewire-client.conf(5)"
+
+@PAR@ device-param  channelmix.hilbert-taps
+\ref client_conf__channelmix_hilbert-taps "See pipewire-client.conf(5)"
+
+@PAR@ device-param  channelmix.upmix-method
+\ref client_conf__channelmix_upmix-method "See pipewire-client.conf(5)"
+
+@PAR@ device-param  channelmix.lock-volumes
+\ref client_conf__channelmix_lock-volumes "See pipewire-client.conf(5)"
+
+@PAR@ device-param  resample.quality
+\ref client_conf__resample_quality "See pipewire-client.conf(5)"
+
+@PAR@ device-param  resample.disable
+\ref client_conf__resample_disable "See pipewire-client.conf(5)"
+
+@PAR@ device-param  resample.peaks = false # boolean
+Instead of actually resampling, produce peak amplitude values as output.
+This is used for volume monitoring, where it is set as a property
+of the "recording" stream.
+
+@PAR@ device-param  resample.prefill = false # boolean
+Prefill resampler buffers with silence. This affects the initial
+samples produced by the resampler.
+
+@PAR@ device-param  monitor.channel-volumes
+\ref client_conf__monitor_channel-volumes "See pipewire-client.conf(5)"
+
+@PAR@ device-param  dither.noise
+\ref client_conf__dither_noise "See pipewire-client.conf(5)"
+
+@PAR@ device-param  dither.method
+\ref client_conf__dither_method "See pipewire-client.conf(5)"
+
+@PAR@ device-param  debug.wav-path
+\ref client_conf__debug_wav-path "See pipewire-client.conf(5)"
+
+@PAR@ device-param  adapter.auto-port-config = null # JSON
+\parblock
+If specified, configure the ports of the node when it is created, instead of
+leaving that to the session manager to do. This is useful (only) for minimal
+configurations without a session manager.
+
+Value is SPA JSON of the form:
+```json
+{
+    mode = "none",          # "none", "passthrough", "convert", "dsp"
+    monitor = false,        # boolean
+    control = false,        # boolean
+    position = "preserve"   # "unknown", "aux", "preserve"
+}
+```
+See \ref spa_param_port_config for the meaning.
+\endparblock
+
+# ALSA PROPERTIES  @IDX@ device-param
+
+## Monitor properties
+
+@PAR@ device-param  alsa.use-acp    # boolean
+Use \ref device-param__alsa_card_profiles "ALSA Card Profiles" (ACP) for device configuration.
+
+@PAR@ device-param  alsa.udev.expose-busy    # boolean
+Expose the ALSA card even if it is busy/in use. Default false. This can be useful when some
+of the PCMs are in use by other applications but the other free PCMs should still be exposed.
+
+## Device properties
+
+@PAR@ device-param  api.alsa.path    # string
+ALSA device path as can be used in snd_pcm_open() and snd_ctl_open().
+
+@PAR@ device-param  api.acp.auto-port    # boolean
+Select reasonable port on device startup. Available for ACP devices.
+
+@PAR@ device-param  api.acp.auto-profile    # boolean
+Select reasonable profile on device startup. Available for ACP devices.
+
+## Node properties
+
+@PAR@ device-param  audio.channels    # integer
+The number of audio channels to open the device with. Defaults depends on the profile of the device.
+
+@PAR@ device-param  audio.rate    # integer
+The audio rate to open the device with. Default is 0, which means to open the device with a rate as close to the graph rate as possible.
+
+@PAR@ device-param  audio.format    # string
+The audio format to open the device in. By default this is "UNKNOWN", which will open the device in the best possible bits (32/24/16/8..). You can force a format like S16_LE or S32_LE.
+
+@PAR@ device-param  audio.position    # JSON array of strings
+The audio position of the channels in the device. This is auto detected based on the profile. You can configure an array of channel positions, like " FL, FR ".
+
+@PAR@ device-param  audio.allowed-rates    # JSON array of integers
+\parblock
+The allowed audio rates to open the device with. Default is " ", which means the device can be opened in any supported rate.
+
+Only rates from the array will be used to open the device. When the graph is running with a rate not listed in the allowed-rates, the resampler will be used to resample to the nearest allowed rate.
+\endparblock
+
+@PAR@ device-param  api.alsa.period-size    # integer
+The period size to open the device in. By default this is 0, which will open the device in the default period size to minimize latency.
+
+@PAR@ device-param  api.alsa.period-num    # integer
+The amount of periods to use in the device. By default this is 0, which means to use as many as possible.
+
+@PAR@ device-param  api.alsa.headroom    # integer
+The amount of extra space to keep in the ringbuffer. The default is 0. Higher values can be configured when the device read and write pointers are not accurately reported.
+
+@PAR@ device-param  api.alsa.start-delay    # integer
+Some devices require a startup period. The default is 0. Higher values can be set to send silence samples to the device first.
+
+@PAR@ device-param  api.alsa.disable-mmap    # boolean
+Disable mmap operation of the device and use the ALSA read/write API instead. Default is false, mmap is preferred.
+
+@PAR@ device-param  api.alsa.disable-batch    # boolean
+Ignore the ALSA batch flag. If the batch flag is set, ALSA will need an extra period to update the read/write pointers. Ignore this flag from ALSA can reduce the latency. Default is false.
+
+@PAR@ device-param  api.alsa.use-chmap    # boolean
+Use the driver provided channel map. Default is true when using UCM, false otherwise because many driver don't report this correctly.
+
+@PAR@ device-param  api.alsa.multi-rate    # boolean
+Allow devices from the same card to be opened in multiple sample rates. Default is true. Some older drivers did not properly advertise the capabilities of the device and only really supported opening the device in one rate.
+
+@PAR@ device-param  api.alsa.htimestamp = false    # boolean
+Use ALSA htimestamps in scheduling, instead of the system clock.
+Some ALSA drivers produce bad timestamps, so this is not enabled by default
+and will be disabled at runtime if it looks like the ALSA timestamps are bad.
+
+@PAR@ device-param  api.alsa.htimestamp.max-errors    # integer
+Specify the number of consecutive errors before htimestamp is disabled.
+Setting this to 0 makes htimestamp never get disabled.
+
+@PAR@ device-param  api.alsa.disable-tsched = false    # boolean
+Disable timer-based scheduling, and use IRQ for scheduling instead.
+The "Pro Audio" profile will usually enable this setting, if it is expected it works on the hardware.
+
+@PAR@ device-param  api.alsa.auto-link = false    # boolean
+Link follower PCM devices to the driver PCM device when using IRQ-based scheduling.
+The "Pro Audio" profile will usually enable this setting, if it is expected it works on the hardware.
+
+@PAR@ device-param  latency.internal.rate    # integer
+Static set the device systemic latency, in samples at playback rate.
+
+@PAR@ device-param  latency.internal.ns    # integer
+Static set the device systemic latency, in nanoseconds.
+
+@PAR@ device-param  api.alsa.path    # string
+UNDOCUMENTED
+
+@PAR@ device-param  api.alsa.open.ucm    # boolean
+Open device using UCM.
+
+@PAR@ device-param  api.alsa.bind-ctls    # boolean
+UNDOCUMENTED
+
+@PAR@ device-param  iec958.codecs    # JSON array of string
+Enable only specific IEC958 codecs. This can be used to disable some codecs the hardware supports.
+Available values: PCM, AC3, DTS, MPEG, MPEG2-AAC, EAC3, TRUEHD, DTSHD
+
+# BLUETOOTH PROPERTIES  @IDX@ device-param
+
+## Monitor properties
+
+The following are settings for the Bluetooth device monitor, not device or
+node properties:
+
+@PAR@ device-param  bluez5.roles   # JSON array of string
+\parblock
+Enabled roles (default:  a2dp_sink a2dp_source bap_sink bap_source hfp_hf hfp_ag )
+
+Currently some headsets (Sony WH-1000XM3) are not working with
+both hsp_ag and hfp_ag enabled, so by default we enable only HFP.
+
+Supported roles:
+- hsp_hs (HSP Headset),
+- hsp_ag (HSP Audio Gateway),
+- hfp_hf (HFP Hands-Free),
+- hfp_ag (HFP Audio Gateway)
+- a2dp_sink (A2DP Audio Sink)
+- a2dp_source (A2DP Audio Source)
+- bap_sink (LE Audio Basic Audio Profile Sink)
+- bap_source (LE Audio Basic Audio Profile Source)
+\endparblock
+
+@PAR@ device-param  bluez5.codecs   # JSON array of string
+Enabled A2DP codecs (default: all).
+Possible values: sbc sbc_xq aac aac_eld aptx aptx_hd aptx_ll aptx_ll_duplex faststream faststream_duplex lc3plus_h3 ldac opus_05 opus_05_51 opus_05_71 opus_05_duplex opus_05_pro opus_g lc3
+
+@PAR@ device-param  bluez5.default.rate   # integer
+Default audio rate.
+
+@PAR@ device-param  bluez5.default.channels   # integer
+Default audio channels.
+
+@PAR@ device-param  bluez5.hfphsp-backend   # integer
+HFP/HSP backend (default: native). Available values: any, none, hsphfpd, ofono, native
+
+@PAR@ device-param  bluez5.hfphsp-backend-native-modem   # string
+
+@PAR@ device-param  bluez5.dummy-avrcp player   # boolean
+Register dummy AVRCP player. Some devices have wrongly functioning
+volume or playback controls if this is not enabled. Default: false
+
+@PAR@ device-param  bluez5.enable-sbc-xq   # boolean
+Override device quirk list and enable SBC-XQ for devices for which it is disabled.
+
+@PAR@ device-param  bluez5.enable-msbc   # boolean
+Override device quirk list and enable MSBC for devices for which it is disabled.
+
+@PAR@ device-param  bluez5.enable-hw-volume   # boolean
+Override device quirk list and enable hardware volume fo devices for which it is disabled.
+
+@PAR@ device-param  bluez5.hw-offload-sco   # boolean
+\parblock
+HFP/HSP hardware offload SCO support (default: false).
+
+This feature requires a custom configuration that routes SCO audio to ALSA nodes,
+in a platform-specific way. See `tests/examples/bt-pinephone.lua` in WirePlumber for an example.
+Do not enable this setting if you don't know what all this means, as it won't work.
+\endparblock
+
+@PAR@ device-param  bluez5.a2dp.opus.pro.channels = 3   # integer
+PipeWire Opus Pro audio profile channel count.
+
+@PAR@ device-param  bluez5.a2dp.opus.pro.coupled-streams = 1   # integer
+PipeWire Opus Pro audio profile coupled stream count.
+
+@PAR@ device-param  bluez5.a2dp.opus.pro.locations = "FL,FR,LFE"   # string
+PipeWire Opus Pro audio profile audio channel locations.
+
+@PAR@ device-param  bluez5.a2dp.opus.pro.max-bitrate = 600000   # integer
+PipeWire Opus Pro audio profile max bitrate.
+
+@PAR@ device-param  bluez5.a2dp.opus.pro.frame-dms = 50   # integer
+PipeWire Opus Pro audio profile frame duration (1/10 ms).
+
+@PAR@ device-param  bluez5.a2dp.opus.pro.bidi.channels = 1   # integer
+PipeWire Opus Pro audio profile duplex channels.
+
+@PAR@ device-param  bluez5.a2dp.opus.pro.bidi.coupled-streams = 0   # integer
+PipeWire Opus Pro audio profile duplex coupled stream count.
+
+@PAR@ device-param  bluez5.a2dp.opus.pro.bidi.locations = "FC"   # string
+PipeWire Opus Pro audio profile duplex coupled channel locations.
+
+@PAR@ device-param  bluez5.a2dp.opus.pro.bidi.max-bitrate = 160000   # integer
+PipeWire Opus Pro audio profile duplex max bitrate.
+
+@PAR@ device-param  bluez5.a2dp.opus.pro.bidi.frame-dms = 400   # integer
+PipeWire Opus Pro audio profile duplex frame duration (1/10 ms).
+
+@PAR@ device-param  bluez5.bcast_source.config   # JSON
+\parblock
+Example:
+```
+bluez5.bcast_source.config = 
+  {
+    "broadcast_code": "Børne House",
+    "encryption: false,
+    "bis": 
+      { # BIS configuration
+        "qos_preset": "16_2_1", # QOS preset name from table Table 6.4 from BAP_v1.0.1.
+        "audio_channel_allocation": 1, # audio channel allocation configuration for the BIS
+        "metadata":  # metadata configurations for the BIS
+           { "type": 1, "value":  1, 1  }
+        
+      }
+    
+  }
+
+```
+\endparblock
+
+## Device properties
+
+@PAR@ device-param  bluez5.auto-connect   # boolean
+Auto-connect devices on start up. Disabled by default if
+the property is not specified.
+
+@PAR@ device-param  bluez5.hw-volume =  PROFILE1 PROFILE2...    # JSON array of string
+Profiles for which to enable hardware volume control (default:  hfp_ag hsp_ag a2dp_source ).
+
+@PAR@ device-param  bluez5.profile   # string
+Initial device profile. This usually has no effect as the session manager
+overrides it.
+
+@PAR@ device-param  bluez5.a2dp.ldac.quality   # string
+LDAC encoding quality
+Available values:
+- auto (Adaptive Bitrate, default)
+- hq   (High Quality, 990/909kbps)
+- sq   (Standard Quality, 660/606kbps)
+- mq   (Mobile use Quality, 330/303kbps)
+
+@PAR@ device-param  bluez5.a2dp.aac.bitratemode   # integer
+AAC variable bitrate mode.
+Available values: 0 (cbr, default), 1-5 (quality level)
+
+@PAR@ device-param  bluez5.a2dp.opus.pro.application = "audio"   # string
+PipeWire Opus Pro Audio encoding mode: audio, voip, lowdelay
+
+@PAR@ device-param  bluez5.a2dp.opus.pro.bidi.application = "audio"   # string
+PipeWire Opus Pro Audio duplex encoding mode: audio, voip, lowdelay
+
+@PAR@ device-param  bluez5.bap.cig = auto   # integer, or 'auto'
+Set CIG ID for BAP unicast streams of the device.
+Default: "auto" (automatic).
+
+## Node properties
+
+@PAR@ device-param  bluez5.media-source-role   # string
+\parblock
+Media source role for Bluetooth clients connecting to
+this instance. Available values:
+  - playback: playing stream to speakers
+  - input: appear as source node.
+\endparblock
+
+# ALSA CARD PROFILES  @IDX@ device-param
+
+The sound card profiles ("Analog stereo", "Analog stereo duplex", ...) except "Pro Audio" come from two sources:
+
+- UCM: ALSA Use Case Manager: the profile configuration system from ALSA. See https://github.com/alsa-project/alsa-ucm-conf/
+- ACP ("Alsa Card Profiles"): Pulseaudio's profile system ported to PipeWire. See https://www.freedesktop.org/wiki/Software/PulseAudio/Backends/ALSA/Profiles/
+
+See the above links on how to configure these systems.
+
+For ACP, PipeWire looks for the profile configuration files under
+
+- ~/.config/alsa-card-profile
+- /etc/alsa-card-profile
+- /usr/share/alsa-card-profile/mixer`. 
+
+The `path` and `profile-set` files are in subdirectories `paths` and `profile-sets` of these directories.
+It is possible to override individual files locally by putting a modified copy into the ACP directories under `~/.config` or `/etc`.
+
+# AUTHORS
+
+The PipeWire Developers <$(PACKAGE_BUGREPORT)>;
+PipeWire is available from <$(PACKAGE_URL)>
+
+# SEE ALSO
+
+\ref page_man_pipewire_conf_5 "pipewire.conf(5)"

pipewire-1.2.0.tar.gz/doc/dox/config/pipewire-filter-chain.conf.5.md Added

@@ -0,0 +1,42 @@
+\page page_man_pipewire-filter-chain_conf_5 filter-chain.conf
+
+PipeWire example configuration for running audio filters.
+
+\tableofcontents
+
+# SYNOPSIS
+
+*$XDG_CONFIG_HOME/pipewire/filter-chain.conf*
+
+*$(PIPEWIRE_CONFIG_DIR)/filter-chain.conf*
+
+*$(PIPEWIRE_CONFDATADIR)/filter-chain.conf*
+
+*$(PIPEWIRE_CONFDATADIR)/filter-chain.conf.d/*
+
+*$(PIPEWIRE_CONFIG_DIR)/filter-chain.conf.d/*
+
+*$XDG_CONFIG_HOME/pipewire/filter-chain.conf.d/*
+
+# DESCRIPTION
+
+When \ref page_man_pipewire_1 "pipewire(1)" is run using
+this configuration file, `pipewire -c filter-chain.conf`,
+it starts a PipeWire client application that publishes
+nodes that apply various audio filters to their input.
+
+It is a normal PipeWire client application in all respects.
+
+Drop-in configuration files `filter-chain.conf.d/*.conf` can be used
+to modify the filter configuration, see \ref pipewire_conf__drop-in_configuration_files "pipewire.conf(5)".
+Some examples are in *$(PIPEWIRE_CONFDATADIR)/filter-chain/*
+
+# AUTHORS
+
+The PipeWire Developers <$(PACKAGE_BUGREPORT)>;
+PipeWire is available from <$(PACKAGE_URL)>
+
+# SEE ALSO
+
+\ref page_man_pipewire_1 "pipewire(1)",
+\ref page_man_pipewire_conf_5 "pipewire.conf(5)"

pipewire-1.2.0.tar.gz/doc/dox/config/pipewire-jack.conf.5.md Added

@@ -0,0 +1,331 @@
+\page page_man_pipewire-jack_conf_5 jack.conf
+
+The PipeWire JACK client configuration file.
+
+\tableofcontents
+
+# SYNOPSIS
+
+*$XDG_CONFIG_HOME/pipewire/jack.conf*
+
+*$(PIPEWIRE_CONFIG_DIR)/jack.conf*
+
+*$(PIPEWIRE_CONFDATADIR)/jack.conf*
+
+*$(PIPEWIRE_CONFDATADIR)/jack.conf.d/*
+
+*$(PIPEWIRE_CONFIG_DIR)/jack.conf.d/*
+
+*$XDG_CONFIG_HOME/pipewire/jack.conf.d/*
+
+# DESCRIPTION
+
+Configuration for PipeWire JACK clients.
+
+The configuration file format and lookup logic is the same as for \ref page_man_pipewire_conf_5 "pipewire.conf(5)".
+
+Drop-in configuration files `jack.conf.d/*.conf` can be used, and are recommended.
+See \ref pipewire_conf__drop-in_configuration_files "pipewire.conf(5)".
+
+# CONFIGURATION FILE SECTIONS  @IDX@ jack.conf
+
+\par jack.properties
+JACK client configuration.
+
+\par jack.rules
+JACK client match rules.
+
+In addition, the PipeWire context configuration sections 
+may also be specified, see \ref page_man_pipewire_conf_5 "pipewire.conf(5)".
+
+# JACK PROPERTIES  @IDX@ jack.conf
+
+The configuration file can contain an extra JACK specific section called `jack.properties` like this:
+```
+...
+jack.properties = {
+    #rt.prio             = 88
+    #node.latency        = 1024/48000
+    #node.lock-quantum   = true
+    #node.force-quantum  = 0
+    #jack.show-monitor   = true
+    #jack.merge-monitor  = true
+    #jack.show-midi      = true
+    #jack.short-name     = false
+    #jack.filter-name    = false
+    #jack.filter-char    = " "
+    #
+    # allow:           Don't restrict self connect requests
+    # fail-external:   Fail self connect requests to external ports only
+    # ignore-external: Ignore self connect requests to external ports only
+    # fail-all:        Fail all self connect requests
+    # ignore-all:      Ignore all self connect requests
+    #jack.self-connect-mode  = allow
+    #jack.locked-process     = true
+    #jack.default-as-system  = false
+    #jack.fix-midi-events    = true
+    #jack.global-buffer-size = false
+    #jack.passive-links      = false
+    #jack.max-client-ports   = 768
+    #jack.fill-aliases       = false
+    #jack.writable-input     = false
+
+}
+```
+
+See `stream.properties` in 
+\ref client_conf__stream_properties "pipewire-client.conf(5)" for
+an explanation of the generic node properties.
+
+It is also possible to have per-client settings, see Match Rules below.
+
+@PAR@ jack.conf  rt.prio
+To limit the realtime priority that jack clients can acquire.
+
+@PAR@ jack.conf  node.latency
+To force a specific minimum buffer size for the JACK applications, configure:
+```
+node.latency = 1024/48000
+```
+This configures a buffer-size of 1024 samples at 48KHz. If the graph is running at a different sample rate, the buffer-size will be adjusted accordingly.
+
+@PAR@ jack.conf  node.lock-quantum
+To make sure that no automatic quantum is changes while JACK applications are running, configure:
+```
+node.lock-quantum = true
+```
+The quantum can then only be changed by metadata or when an application is started with node.force-quantum. JACK Applications will also be able to use jack_set_buffersize() to override the quantum.
+
+@PAR@ jack.conf  node.force-quantum
+To force the quantum to a certain value and avoid changes to it:
+```
+    node.force-quantum = 1024
+```
+The quantum can then only be changed by metadata or when an application is started with node.force-quantum (or JACK applications that use jack_set_buffersize() to override the quantum).
+
+@PAR@ jack.conf  jack.show-monitor
+Show the Monitor client and its ports. 
+
+@PAR@ jack.conf  jack.merge-monitor
+\parblock
+Exposes the capture ports and monitor ports on the same JACK device client. This is how JACK presents monitor ports to the clients. The default is however *not* to merge them together because this results in more user friendly user interfaces, usually. An extra client with a `Monitor` suffix is created that contains the monitor ports.
+
+For example, this is (part of) the output of `jack_lsp` with the default setting (`jack.merge-monitor = false`):
+
+Compare:
+
+| `jack.merge-monitor = true` | `jack.merge-monitor = false` |
+|:--|:--|
+| Built-in Audio Analog Stereo:playback_FL | Built-in Audio Analog Stereo:playback_FL
+| Built-in Audio Analog Stereo:monitor_FL | Built-in Audio Analog Stereo Monitor:monitor_FL
+| Built-in Audio Analog Stereo:playback_FR | Built-in Audio Analog Stereo:playback_FR
+| Built-in Audio Analog Stereo:monitor_FR |Built-in Audio Analog Stereo Monitor:monitor_FR
+\endparblock
+
+@PAR@ jack.conf  jack.show-midi
+Show the MIDI clients and their ports.
+
+@PAR@ jack.conf  jack.short-name
+\parblock
+To use shorter names for the device client names use `jack.short-name = true`. Compare:
+
+| `jack.short-name = true` | `jack.short-name = false` |
+|:--|:--|
+| HDA Intel PCH:playback_FL | Built-in Audio Analog Stereo:playback_FL
+| HDA Intel PCH Monitor:monitor_FL | Built-in Audio Analog Stereo Monitor:monitor_FL
+| HDA Intel PCH:playback_FR | Built-in Audio Analog Stereo:playback_FR
+| HDA Intel PCH Monitor:monitor_FR |Built-in Audio Analog Stereo Monitor:monitor_FR
+\endparblock
+
+@PAR@ jack.conf  jack.filter-name
+@PAR@ jack.conf  jack.filter-char
+Will replace all special characters with `jack.filter-char`. For clients the special characters are ` ().:*$` and for ports they are ` ().*$`. Use this option when a client is not able to deal with the special characters. (and older version of PortAudio was known to use the client and port names as a regex, and thus failing when there are regex special characters in the name).
+
+@PAR@ jack.conf  jack.self-connect-mode
+\parblock
+Restrict a client from making connections to and from itself. Possible values and their meaning are summarized as:
+
+| Value | Behavior
+|:--|:--|
+| `allow` | Don't restrict self connect requests.
+| `fail-external` | Fail self connect requests to external ports only.
+| `ignore-external` | Ignore self connect requests to external ports only.
+| `fail-all` | Fail all self connect requests.
+| `ignore-all` | Ignore all self connect requests.
+\endparblock
+
+@PAR@ jack.conf  jack.locked-process
+Make sure the process and callbacks can not be called at the same time. This is the
+normal operation but it can be disabled in case a specific client can handle this.
+
+@PAR@ jack.conf  jack.default-as-system
+\parblock
+Name the default source and sink as `system` and number the ports to maximize
+compatibility with JACK programs.
+
+| `jack.default-as-system = false` | `jack.default-as-system = true` |
+|:--|:--|
+| HDA Intel PCH:playback_FL | system:playback_1
+| HDA Intel PCH Monitor:monitor_FL | system:monitor_1
+| HDA Intel PCH:playback_FR | system:playback_2
+| HDA Intel PCH Monitor:monitor_FR | system:monitor_2
+\endparblock
+
+@PAR@ jack.conf  jack.fix-midi-events
+Fix NoteOn events with a 0 velocity to NoteOff. This is standard behaviour in JACK and is thus
+enabled by default to maximize compatibility. Especially LV2 plugins do not allow NoteOn
+with 0 velocity.
+
+@PAR@ jack.conf  jack.global-buffer-size
+When a client has this option, buffersize changes will be applied globally and permanently for all PipeWire clients using the metadata.
+
+@PAR@ jack.conf  jack.passive-links
+Makes JACK clients make passive links. This option only works when the server link-factory was configured with the `allow.link.passive` option.
+
+@PAR@ jack.conf  jack.max-client-ports
+Limit the number of allowed ports per client to this value.
+
+@PAR@ jack.conf  jack.fill-aliases
+Automatically set the port alias1 and alias2 on the ports.
+
+@PAR@ jack.conf  jack.writable-input
+\parblock
+Makes the input buffers writable. This is the default because some JACK clients write to the
+input buffer. This however can cause corruption in other clients when they are also reading
+from the buffer.
+
+Set this to true to avoid buffer corruption if you are only dealing with non-buggy clients.
+\endparblock
+
+# MATCH RULES  @IDX@ jack.conf
+
+`jack.rules` provides an `update-props` action that takes an object with properties that are updated
+on the client and node object of the jack client.
+
+Add a `jack.rules` section in the config file like this:
+
+```
+jack.rules = 
+    {
+        matches = 
+            {
+                # all keys must match the value. ! negates. ~ starts regex.
+                application.process.binary = "jack_simple_client"
+            }
+        
+        actions = {
+            update-props = {
+                node.latency = 512/48000
+            }
+        }
+    }
+    {
+        matches = 
+            {
+                client.name = "catia"
+            }
+        
+        actions = {
+            update-props = {
+                jack.merge-monitor = true
+            }
+        }
+    }
+
+```
+Will set the latency of jack_simple_client to 512/48000 and makes Catia see the monitor client merged with the playback client.
+
+# ENVIRONMENT VARIABLES  @IDX@ jack-env
+
+See \ref page_man_pipewire_1 "pipewire(1)" for common environment
+variables. Many of these also apply to JACK client applications.
+
+Environment variables can be used to control the behavior of the PipeWire JACK client library.
+
+@PAR@ jack-env  PIPEWIRE_NOJACK
+@PAR@ jack-env  PIPEWIRE_INTERNAL
+When any of these variables is set, the JACK client library will refuse to open a client. The `PIPEWIRE_INTERNAL` variable is set by the PipeWire main daemon to avoid self connections.
+
+@PAR@ jack-env  PIPEWIRE_PROPS
+Adds/overrides the properties specified in the `jack.conf` file. Check out the output of this:
+```
+> PIPEWIRE_PROPS='{ jack.short-name=true jack.merge-monitor=true }' jack_lsp
+...
+HDA Intel PCH:playback_FL
+HDA Intel PCH:monitor_FL
+HDA Intel PCH:playback_FR
+HDA Intel PCH:monitor_FR
+...
+```
+
+@PAR@ jack-env  PIPEWIRE_LATENCY
+\parblock
+```
+PIPEWIRE_LATENCY=<samples>/<rate> <application>
+```
+A quick way to configure the maximum buffer-size for a client. It will run this client with the specified buffer-size (or smaller).
+
+`PIPEWIRE_LATENCY=256/48000 jack_lsp` is equivalent to `PIPEWIRE_PROPS='{ node.latency=256/48000 }' jack_lsp`
+
+A better way to start a jack session in a specific buffer-size is to force it with:
+```
+pw-metadata -n settings 0 clock.force-quantum <quantum>
+```
+This always works immediately and the buffer size will not change until the quantum is changed back to 0.
+\endparblock
+
+@PAR@ jack-env  PIPEWIRE_RATE
+\parblock
+```
+PIPEWIRE_RATE=1/<rate> <application>
+```
+
+A quick way to configure the rate of the graph. It will try to switch the samplerate of the graph. This can usually only be done with the graph is idle and the rate is part of the allowed sample rates.
+
+`PIPEWIRE_RATE=1/48000 jack_lsp` is equivalent to `PIPEWIRE_PROPS='{ node.rate=1/48000 }' jack_lsp`
+
+A better way to start a jack session in a specific rate is to force the rate with:
+```
+pw-metadata -n settings 0 clock.force-rate <rate>
+```
+This always works and the samplerate does not need to be in the allowed rates. The rate will also not change until it is set back to 0.
+\endparblock
+
+@PAR@ jack-env  PIPEWIRE_QUANTUM
+\parblock
+```
+PIPEWIRE_QUANTUM=<buffersize>/<rate> <application>
+```
+
+Is similar to using `PIPEWIRE_LATENCY=<buffersize>/<rate>` and `PIPEWIRE_RATE=1/<rate>` (see above), except that it is not just a suggestion but it actively *forces* the graph to change the rate and quantum. It can be used to set both a buffersize and samplerate at the same time.
+
+When 2 applications force a quantum, the last one wins. When the winning app is stopped, the quantum of the previous app is restored.
+\endparblock
+
+@PAR@ jack-env  PIPEWIRE_LINK_PASSIVE
+\parblock
+```
+PIPEWIRE_LINK_PASSIVE=true qjackctl
+```
+Make this client create passive links only. All links created by the client will be marked passive and will not keep the sink/source busy.
+
+You can use this to link filters to devices. When there is no client connected to the filter, only passive links remain between the filter and the device and the device will become idle and suspended.
+\endparblock
+
+@PAR@ jack-env  PIPEWIRE_NODE
+\parblock
+```
+PIPEWIRE_NODE=<id> <application>
+```
+Will sort the ports so that only the ports of the node with <id> are listed. You can use this to force an application to only deal with the ports of a certain node, for example when auto connecting.
+\endparblock
+
+# AUTHORS
+
+The PipeWire Developers <$(PACKAGE_BUGREPORT)>;
+PipeWire is available from <$(PACKAGE_URL)>
+
+# SEE ALSO
+
+\ref page_man_pw-jack_1 "pw-jack(1)",
+\ref page_man_pipewire_conf_5 "pipewire.conf(5)"

pipewire-1.2.0.tar.gz/doc/dox/config/pipewire-pulse-modules.7.md Added

pipewire-1.2.0.tar.gz/doc/dox/config/pipewire-pulse.conf.5.md Added

@@ -0,0 +1,190 @@
+\page page_man_pipewire-pulse_conf_5 pipewire-pulse.conf
+
+The PipeWire Pulseaudio server configuration file
+
+\tableofcontents
+
+# SYNOPSIS
+
+*$XDG_CONFIG_HOME/pipewire/pipewire-pulse.conf*
+
+*$(PIPEWIRE_CONFIG_DIR)/pipewire-pulse.conf*
+
+*$(PIPEWIRE_CONFDATADIR)/pipewire-pulse.conf*
+
+*$(PIPEWIRE_CONFDATADIR)/pipewire-pulse.conf.d/*
+
+*$(PIPEWIRE_CONFIG_DIR)/pipewire-pulse.conf.d/*
+
+*$XDG_CONFIG_HOME/pipewire/pipewire-pulse.conf.d/*
+
+# DESCRIPTION
+
+Configuration for PipeWire's PulseAudio-compatible daemon.
+
+The configuration file format and lookup logic is the same as for \ref page_man_pipewire_conf_5 "pipewire.conf(5)".
+
+Drop-in configuration files `pipewire-pulse.conf.d/*.conf` can be used, and are recommended.
+See \ref pipewire_conf__drop-in_configuration_files "pipewire.conf(5)".
+
+# CONFIGURATION FILE SECTIONS  @IDX@ pipewire-pulse.conf
+
+\par stream.properties
+Dictionary. These properties configure the PipeWire Pulseaudio server
+properties.
+
+\par stream.rules
+Dictionary. These properties configure the PipeWire Pulseaudio server
+properties.
+
+\par pulse.properties
+Dictionary. These properties configure the PipeWire Pulseaudio server
+properties.
+
+\par pulse.cmd
+Array of dictionaries. A set of commands to be executed on startup.
+
+\par pulse.rules
+Array of dictionaries. A set of match rules and actions to apply to
+clients.
+
+See \ref page_module_protocol_pulse "libpipewire-module-protocol-pulse(7)"
+for the detailed description.
+
+In addition, the PipeWire context configuration sections 
+may also be specified, see \ref page_man_pipewire_conf_5 "pipewire.conf(5)".
+
+# STREAM PROPERTIES  @IDX@ pipewire-pulse.conf
+
+The `stream.properties` section contains properties for streams created
+by the pipewire-pulse server.
+
+Available options are described in
+\ref client_conf__stream_properties "pipewire-client.conf(5) stream.properties".
+
+Some of these properties map to the PulseAudio `/etc/pulse/default.pa` config entries as follows:
+
+| PulseAudio                     | PipeWire              | Notes                |
+| ------------------------------ | --------------------- | -------------------- |
+| remixing-use-all-sink-channels | channelmix.upmix      |                      |
+| remixing-produce-lfe           | channelmix.lfe-cutoff | Set to > 0 to enable |
+| remixing-consume-lfe           | channelmix.mix-lfe    |                      |
+| lfe-crossover-freq             | channelmix.lfe-cutoff |                      |
+
+## Example
+
+```css
+stream.properties = {
+    #node.latency = 1024/48000
+    #node.autoconnect = true
+    #resample.disable = false
+    #resample.quality = 4
+    #monitor.channel-volumes = false
+    #channelmix.disable = false
+    #channelmix.min-volume = 0.0
+    #channelmix.max-volume = 10.0
+    #channelmix.normalize = false
+    #channelmix.mix-lfe = true
+    #channelmix.upmix = true
+    #channelmix.upmix-method = psd  # none, simple
+    #channelmix.lfe-cutoff = 150.0
+    #channelmix.fc-cutoff = 12000.0
+    #channelmix.rear-delay = 12.0
+    #channelmix.stereo-widen = 0.0
+    #channelmix.hilbert-taps = 0
+    #dither.noise = 0
+    #dither.method = none # rectangular, triangular, triangular-hf, wannamaker3, shaped5
+    #debug.wav-path = ""
+}
+```
+
+# STREAM RULES  @IDX@ pipewire-pulse.conf
+
+The `stream.rules` section works the same as
+\ref client_conf__stream_rules "pipewire-client.conf(5) stream.rules".
+
+# PULSEAUDIO PROPERTIES  @IDX@ pipewire-pulse.conf
+
+For `pulse.properties` section,
+see \ref page_module_protocol_pulse "libpipewire-module-protocol-pulse(7)" 
+for available options.
+
+# PULSEAUDIO RULES  @IDX@ pipewire-pulse.conf
+
+For each client, a set of rules can be written in `pulse.rules`
+section to configure quirks of the client or to force some pulse
+specific stream configuration.
+
+The general look of this section is as follows and follows the layout of
+\ref pipewire_conf__match_rules "match rules, see pipewire(1)".
+
+See \ref page_module_protocol_pulse "libpipewire-module-protocol-pulse(7)" 
+for available options.
+
+## Example
+
+```css
+pulse.rules = 
+    {
+        # skype does not want to use devices that don't have an S16 sample format.
+        matches = 
+             { application.process.binary = "teams" }
+             { application.process.binary = "teams-insiders" }
+             { application.process.binary = "skypeforlinux" }
+        
+        actions = { quirks =  force-s16-info  }
+    }
+    {
+        # speech dispatcher asks for too small latency and then underruns.
+        matches =  { application.name = "~speech-dispatcher*" } 
+        actions = {
+            update-props = {
+                pulse.min.req          = 1024/48000     # 21ms
+                pulse.min.quantum      = 1024/48000     # 21ms
+            }
+        }
+    }
+
+```
+
+# PULSEAUDIO COMMANDS  @IDX@ pipewire-pulse.conf
+
+As part of the server startup procedure you can execute some
+additional commands with the `pulse.cmd` section in
+`pipewire-pulse.conf`.
+
+```css
+...
+pulse.cmd = 
+    { cmd = "load-module" args = "module-always-sink" flags =   }
+    { cmd = "load-module" args = "module-switch-on-connect" }
+    { cmd = "load-module" args = "module-gsettings" flags =  "nofail"  }
+
+...
+```
+
+Additional commands can also be run via the
+\ref pipewire_conf__context_exec "context.exec section, see pipewire.conf(5)".
+
+Supported commands:
+
+@PAR@ pipewire-pulse.conf load-module
+Load the specified Pulseaudio module on startup, as if using **pactl(1)**
+to load the module.
+
+# PULSEAUDIO MODULES  @IDX@ pipewire-pulse.conf
+
+For contents of section `pulse.modules`,
+see \ref page_man_pipewire-pulse-modules_7 "pipewire-pulse-modules(7)".
+
+# AUTHORS
+
+The PipeWire Developers <$(PACKAGE_BUGREPORT)>;
+PipeWire is available from <$(PACKAGE_URL)>
+
+# SEE ALSO
+
+\ref page_module_protocol_pulse "libpipewire-module-protocol-pulse(7)",
+\ref page_man_pipewire_conf_5 "pipewire.conf(5)",
+\ref page_man_pipewire-pulse_1 "pipewire-pulse(1)",
+\ref page_man_pipewire-pulse-modules_7 "pipewire-pulse-modules(7)"

pipewire-1.2.0.tar.gz/doc/dox/config/pipewire.conf.5.md Added

@@ -0,0 +1,674 @@
+\page page_man_pipewire_conf_5 pipewire.conf
+
+The PipeWire server configuration file
+
+\tableofcontents
+
+# SYNOPSIS
+
+*$XDG_CONFIG_HOME/pipewire/pipewire.conf*
+
+*$(PIPEWIRE_CONFIG_DIR)/pipewire.conf*
+
+*$(PIPEWIRE_CONFDATADIR)/pipewire.conf*
+
+*$(PIPEWIRE_CONFDATADIR)/pipewire.conf.d/*
+
+*$(PIPEWIRE_CONFIG_DIR)/pipewire.conf.d/*
+
+*$XDG_CONFIG_HOME/pipewire/pipewire.conf.d/*
+
+# DESCRIPTION
+
+PipeWire is a service that facilitates sharing of multimedia content
+between devices and applications.
+
+On startup, the daemon reads a main configuration file to configure
+itself. It executes a series of commands listed in the config file.
+
+The config file is looked up in the order listed in the
+SYNOPSIS(#synopsis). The environment variables `PIPEWIRE_CONFIG_DIR`,
+`PIPEWIRE_CONFIG_PREFIX` and `PIPEWIRE_CONFIG_NAME` can be used to
+specify an alternative config directory, subdirectory and file
+respectively.
+
+Other PipeWire configuration files generally follow the same lookup
+logic, replacing `pipewire.conf` with the name of the particular
+config file.
+
+# DROP-IN CONFIGURATION FILES  @IDX@ pipewire.conf
+
+All `*.conf` files in the `pipewire.conf.d/` directories are loaded
+and merged into the configuration.  Dictionary sections are merged,
+overriding properties if they already existed, and array sections are
+appended to. The drop-in files have same format as the main
+configuration file, but only contain the settings to be modified.
+
+As the `pipewire.conf` configuration file contains various parts
+that must be present for correct functioning, using drop-in files
+for configuration is recommended.
+
+## Example
+
+A configuration file `~/.config/pipewire/pipewire.conf.d/custom.conf`
+to change the value of the `default.clock.min-quantum` setting in `pipewire.conf`:
+
+```css
+context.properties = {
+    default.clock.min-quantum = 128
+}
+```
+
+# CONFIGURATION FILE FORMAT  @IDX@ pipewire.conf
+
+The configuration file is in "SPA" JSON format.
+
+The configuration file contains top-level keys, which are the sections.
+The value of a section is either a dictionary, `{ }`, or an
+array, ` `. Section and dictionary item declarations 
+have `KEY = VALUE` form, and are separated by whitespace.
+For example:
+
+```
+context.properties = {  # top-level dictionary section
+
+    key1 = value  # a simple value
+
+    key2 = { key1 = value1 key2 = value2 }  # a dictionary with two entries
+
+    key3 =  value1 value2   # an array with two entries
+
+    key4 =  { k = v1 } { k = v2 }   # an array of dictionaries
+
+}
+
+context.modules =   # top-level array section
+
+    value1
+
+    value2
+
+
+```
+
+The configuration files can also be written in standard JSON syntax,
+but for easier manual editing, the relaxed "SPA" variant is allowed.
+In "SPA" JSON:
+
+- `:` to delimit keys and values can be substituted by `=` or a space.
+- <tt>\"</tt> around keys and string can be omitted as long as no special
+  characters are used in the strings.
+- `,` to separate objects can be replaced with a whitespace character.
+- `#` can be used to start a comment until the line end
+
+# CONFIGURATION FILE SECTIONS  @IDX@ pipewire.conf
+
+\par context.properties
+Dictionary. These properties configure the PipeWire instance.
+
+\par context.spa-libs
+Dictionary. Maps plugin features with globs to a spa library.
+
+\par context.modules
+Array of dictionaries. Each entry in the array is a dictionary with the
+*name* of the module to load, including optional *args* and *flags*.
+Most modules support being loaded multiple times.
+
+\par context.objects
+Array of dictionaries. Each entry in the array is a dictionary
+containing the *factory* to create an object from and optional extra
+arguments specific to that factory.
+
+\par context.exec
+\parblock
+Array of dictionaries. Each entry in the array is dictionary containing
+the *path* of a program to execute on startup and optional *args*.
+
+This array used to contain an entry to start the session manager but
+this mode of operation has since been demoted to development aid. Avoid
+starting a session manager in this way in production environment.
+\endparblock
+
+\par node.rules
+Array of dictionaries. Match rules for modifying node properties
+on the server.
+
+\par device.rules
+Array of dictionaries. Match rules for modifying device properties
+on the server.
+
+
+# CONTEXT PROPERTIES  @IDX@ pipewire.conf
+
+Available PipeWire properties in `context.properties` and possible
+default values.
+
+@PAR@ pipewire.conf  clock.power-of-two-quantum = true
+The quantum requests from the clients and the final graph quantum are
+rounded down to a power of two. A power of two quantum can be more
+efficient for many processing tasks.
+
+@PAR@ pipewire.conf  context.data-loop.library.name.system
+The name of the shared library to use for the system functions for the data processing
+thread. This can typically be changed if the data thread is running on a realtime
+kernel such as EVL.
+
+@PAR@ pipewire.conf  loop.rt-prio = -1
+The priority of the data loops. The data loops are used to schedule the nodes in the graph.
+A value of -1 uses the default realtime priority from the module-rt. A value of 0 disables
+realtime scheduling for the data loops.
+
+@PAR@ pipewire.conf  loop.class =  data.rt .. 
+An array of classes of the data loops. Normally nodes are assigned to a loop by name or by class.
+Nodes are by default assigned to the data.rt class so it is good to have a data loop
+of this class as well.
+
+@PAR@ pipewire.conf  context.num-data-loops = 1
+The number of data loops to create. By default 1 data-loop is created and all nodes are
+scheduled in this thread. A value of 0 disables the real-time data loops and schedules
+all nodes in the main thread. A value of -1 spawns as many data threads as there are
+cpu cores.
+
+@PAR@ pipewire.conf  context.data-loops =  ... 
+This controls the data loops that will be created for the context. Is is an array of
+data loop specifications, one entry for each data loop to start:
+```json
+context.data-loops = 
+    {
+         #library.name.system = support/libspa-support
+         loop.rt-prio = -1
+         loop.class =  data.rt .. 
+         thread.name = data-loop.0
+         thread.affinity =  0 1 
+    }
+    ...
+
+```
+A specific priority, classes and name can be given with loop.rt-prio, loop.class and
+thread.name respectively. It is also possible to pin the data loop to specific CPU
+cores with the thread.affinity property.
+
+@PAR@ pipewire.conf  core.daemon = false
+Makes the PipeWire process, started with this config, a daemon
+process. This means that it will manage and schedule a graph for
+clients. You would also want to configure a core.name to give it a
+well known name.
+
+@PAR@ pipewire.conf  core.name = pipewire-0
+The name of the PipeWire context. This will also be the name of the
+PipeWire socket clients can connect to.
+
+@PAR@ pipewire.conf  cpu.zero.denormals = false
+Configures the CPU to zero denormals automatically. This will be
+enabled for the data processing thread only, when enabled.
+
+@PAR@ pipewire.conf  cpu.vm.name = null
+This will be set automatically when the context is created and will
+contain the name of the VM. It is typically used to write match rules
+to set extra properties.
+
+@PAR@ pipewire.conf  default.clock.rate  = 48000
+The default clock rate determines the real time duration of the
+min/max/default quantums. You might want to change the quantums when
+you change the default clock rate to maintain the same duration for
+the quantums.
+
+@PAR@ pipewire.conf  default.clock.allowed-rates =  
+It is possible to specify up to 32 alternative sample rates. The graph
+sample rate will be switched when devices are idle. Note that this is
+not enabled by default for now because of various kernel and Bluetooth
+issues. Note that the min/max/default quantum values are scaled when
+the samplerate changes.
+
+@PAR@ pipewire.conf  default.clock.min-quantum = 32
+Default minimum quantum.
+
+@PAR@ pipewire.conf  default.clock.max-quantum = 8192
+Default maximum quantum.
+
+@PAR@ pipewire.conf  default.clock.quantum  = 1024
+Default quantum used when no client specifies one.
+
+@PAR@ pipewire.conf  default.clock.quantum-limit = 8192
+Maximum quantum to reserve space for. This is the maximum buffer size used
+in the graph, regardless of the samplerate.
+
+@PAR@ pipewire.conf  default.clock.quantum-floor = 4
+Minimum quantum to reserve space for. This is the minimum buffer size used
+in the graph, regardless of the samplerate.
+
+@PAR@ pipewire.conf  default.video.width
+Default video width
+
+@PAR@ pipewire.conf  default.video.height
+Default video height
+
+@PAR@ pipewire.conf  default.video.rate.num
+Default video rate numerator
+
+@PAR@ pipewire.conf  default.video.rate.denom
+Default video rate denominator
+
+@PAR@ pipewire.conf  library.name.system = support/libspa-support
+The name of the shared library to use for the system functions for the main thread.
+
+@PAR@ pipewire.conf  link.max-buffers = 64
+The maximum number of buffers to negotiate between nodes. Note that version < 3 clients
+can only support 16 buffers. More buffers is almost always worse than less, latency
+and memory wise.
+
+@PAR@ pipewire.conf  log.level = 2
+The default log level used by the process.
+
+@PAR@ pipewire.conf  mem.allow-mlock = true
+Try to mlock the memory for the realtime processes. Locked memory will
+not be swapped out by the kernel and avoid hickups in the processing
+threads.
+
+@PAR@ pipewire.conf  mem.warn-mlock = false
+Warn about failures to lock memory. 
+
+@PAR@ pipewire.conf  mem.mlock-all = false
+Try to mlock all current and future memory by the process.
+
+@PAR@ pipewire.conf  settings.check-quantum = false
+Check if the quantum in the settings metadata update is compatible
+with the configured limits.
+
+@PAR@ pipewire.conf  settings.check-rate = false
+Check if the rate in the settings metadata update is compatible
+with the configured limits.
+
+@PAR@ pipewire.conf  support.dbus = true
+Enable DBus support. This will enable DBus support in the various modules that require
+it. Disable this if you want to globally disable DBus support in the process.
+
+@PAR@ pipewire.conf  vm.overrides = { default.clock.min-quantum = 1024 }
+Any property in the vm.overrides property object will override the property
+in the context.properties when PipeWire detects it is running in a VM. This
+is deprecated, use the context.properties.rules instead.
+
+@PAR@ pipewire.conf  context.modules.allow-empty = false
+By default, a warning is logged when there are no context.modules loaded because this
+likely indicates there is a problem. Some applications might load the modules themselves
+and when they set this property to true, no warning will be logged.
+
+The context properties may also contain custom values. For example,
+the `context.modules` and `context.objects` sections can declare
+additional conditions that control whether a module or object is loaded
+depending on what properties are present.
+
+# SPA LIBRARIES  @IDX@ pipewire.conf
+
+SPA plugins are loaded based on their factory-name. This is a well
+known name that uniquely describes the features that the plugin should
+have. The `context.spa-libs` section provides a mapping between the
+factory-name and the plugin where the factory can be found.
+
+Factory names can contain a wildcard to group several related factories into one
+plugin. The plugin is loaded from the first matching factory-name.
+
+## Example
+
+```json
+context.spa-libs = {
+    audio.convert.* = audioconvert/libspa-audioconvert
+    avb.*           = avb/libspa-avb
+    api.alsa.*      = alsa/libspa-alsa
+    api.v4l2.*      = v4l2/libspa-v4l2
+    api.libcamera.* = libcamera/libspa-libcamera
+    api.bluez5.*    = bluez5/libspa-bluez5
+    api.vulkan.*    = vulkan/libspa-vulkan
+    api.jack.*      = jack/libspa-jack
+    support.*       = support/libspa-support
+    video.convert.* = videoconvert/libspa-videoconvert
+}
+```
+
+# MODULES  @IDX@ pipewire.conf
+
+PipeWire modules to be loaded. See
+\ref page_man_libpipewire-modules_7 "libpipewire-modules(7)".
+
+```json
+context.modules = 
+    #{ name = MODULENAME
+    #    ( args  = { KEY = VALUE ... } )
+    #    ( flags =  ( ifexists ) ( nofail )  )
+    #    ( condition =  { KEY = VALUE ... } ...  )
+    #}
+    #
+
+```
+
+\par name
+Name of module to be loaded
+
+\par args = { }
+Arguments passed to the module
+
+\par flags =  
+Loading flags. `ifexists` to only load module if it exists,
+and `nofail` to not fail PipeWire startup if the module fails to load.
+
+\par condition =  
+A \ref pipewire_conf__match_rules "match rule" `matches` condition.
+The module is loaded only if one of the expressions in the array matches
+to a context property.
+
+# CONTEXT OBJECTS  @IDX@ pipewire.conf
+
+The `context.objects` section allows you to make some objects from factories (usually created
+by loading modules in `context.modules`).
+
+```json
+context.objects = 
+    #{ factory = <factory-name>
+    #    ( args  = { <key> = <value> ... } )
+    #    ( flags =  ( nofail )  )
+    #    ( condition =  { <key> = <value> ... } ...  )
+    #}
+
+```
+This section can be used to make nodes or links between nodes.
+
+\par factory
+Name of the factory to create the object.
+
+\par args = { }
+Arguments passed to the factory.
+
+\par flags =  
+Flag `nofail` to not fail PipeWire startup if the object fails to load.
+
+\par condition =  
+A \ref pipewire_conf__match_rules "match rule" `matches` condition.
+The object is created only if one of the expressions in the array matches
+to a context property.
+
+## Example
+
+This fragment creates a new dummy driver node, but only if
+`core.daemon` property is true:
+
+```json
+context.objects = 
+    { factory = spa-node-factory
+      args = {
+          factory.name    = support.node.driver
+          node.name       = Dummy-Driver
+          node.group      = pipewire.dummy
+          priority.driver = 20000
+      },
+      condition =  { core.daemon = true } 
+    }
+
+```
+
+# COMMAND EXECUTION  @IDX@ pipewire.conf
+
+The `context.exec` section can be used to start arbitrary commands as
+part of the initialization of the PipeWire program.
+
+```json
+context.exec = 
+    #{   path = <program-name>
+    #    ( args = "<arguments>" |  <arg1> <arg2> ...  )
+    #    ( condition =  { <key> = <value> ... } ...  )
+    #}
+
+```
+
+\par path
+Program to execute.
+
+\par args
+Arguments to the program.
+
+\par condition
+A \ref pipewire_conf__match_rules "match rule" `matches` condition.
+The object is created only if one of the expressions in the array matches
+to a context property.
+
+## Example
+
+The following fragment executes a pactl command with the given arguments:
+
+```json
+context.exec = 
+    { path = "pactl" args = "load-module module-always-sink" }
+
+```
+
+# MATCH RULES  @IDX@ pipewire.conf
+
+Some configuration file sections contain match rules. This makes it
+possible to perform some action when an object (usually a node or
+stream) is created/updated that matches certain properties.
+
+The general rules object follows the following pattern:
+```json
+<rules> = 
+    {
+        matches = 
+            # any of the following sets of properties are matched, if
+            # any matches, the actions are executed
+            {
+                # <key> = <value>
+                # all keys must match the value. ! negates. ~ starts regex.
+                #application.process.binary = "teams"
+                #application.name = "~speech-dispatcher.*"
+
+                # Absence of property can be tested by comparing to null
+                #pipewire.sec.flatpak = null
+            }
+            {
+                # more matches here...
+	    }
+	    ...
+        
+        actions = {
+            <action-name> = <action value>
+	    ...
+        }
+    }
+
+```
+Match rules are an array of rules.
+
+A rule is always a JSON object with two keys: matches and actions. The matches key is used to
+define the conditions that need to be met for the rule to be evaluated as true, and the actions
+key is used to define the actions that are performed when the rule is evaluated as true.
+
+The matches key is always a JSON array of objects, where each object defines a condition that needs
+to be met. Each condition is a list of key-value pairs, where the key is the name of the property
+that is being matched, and the value is the value that the property needs to have. Within a condition,
+all the key-value pairs are combined with a logical AND, and all the conditions in the matches
+array are combined with a logical OR.
+
+The actions key is always a JSON object, where each key-value pair defines an action that is
+performed when the rule is evaluated as true. The action name is specific to the rule and is
+defined by the rule’s documentation, but most frequently you will see the update-props action,
+which is used to update the properties of the matched object.
+
+In the matches array, it is also possible to use regular expressions to match property values.
+For example, to match all nodes with a name that starts with my_, you can use the following condition:
+
+```
+matches = 
+  {
+    node.name = "~my_.*"
+  }
+
+```
+
+The ~ character signifies that the value is a regular expression. The exact syntax of the regular
+expressions is the POSIX extended regex syntax, as described in the regex (7) man page. 
+
+In addition to regular expressions, you may also use the ! character to negate a condition. For
+example, to match all nodes with a name that does not start with my_, you can use the following condition:
+
+```
+matches = 
+  {
+    node.name = "!~my_.*"
+  }
+
+```
+
+The ! character can be used with or without a regular expression. For example, to match all
+nodes with a name that is not equal to my_node, you can use the following condition:
+
+```
+matches = 
+  {
+    node.name = "!my_node"
+  }
+
+```
+
+The null value has a special meaning; it checks if the property is not available
+(or unset). To check if a property is not set:
+
+```
+matches = 
+  {
+    node.name = null
+  }
+
+```
+
+To check the existence of a property, one can use the !null condition, for example:
+
+```
+matches = 
+  {
+    node.name = "!null"
+  }
+  {
+    node.name = !null            # simplified syntax
+  }
+
+```
+To handle the "null" string, one needs to escape the string. For example, to check
+if a property has the string value "null", use:
+
+```
+matches = 
+  {
+    node.name = "null"
+  }
+
+```
+To handle anything but the "null" string, use:
+
+```
+matches = 
+  {
+    node.name = "!\"null\""
+  }
+  {
+    node.name = !"null"      # simplified syntax
+  }
+
+```
+
+
+# CONTEXT PROPERTIES RULES  @IDX@ pipewire.conf
+
+`context.properties.rules` can be used to dynamically update the properties
+based on other properties.
+
+A typical case is to update custom settings when running inside a VM.
+The `cpu.vm.name` is automatically set when running in a VM with the name of
+the VM. A match rule can be written to set custom properties like this:
+
+```
+context.properties.rules = 
+    {   matches =  { cpu.vm.name = !null } 
+        actions = {
+            update-props = {
+                # These overrides are only applied when running in a vm.
+                default.clock.min-quantum = 1024
+	    }
+        }
+    }
+}
+```
+
+# NODE RULES  @IDX@ pipewire.conf
+
+The node.rules are evaluated every time the properties on a node are set
+or updated. This can be used on the server side to override client set
+properties on arbitrary nodes.
+
+`node.rules` provides an `update-props` action that takes an object with
+properties that are updated on the node object.
+
+Add a `node.rules` section in the config file like this:
+
+```
+node.rules = 
+    {
+        matches = 
+            {
+                # all keys must match the value. ! negates. ~ starts regex.
+                client.name = "jack_simple_client"
+            }
+        
+        actions = {
+            update-props = {
+                node.force-quantum = 512
+            }
+        }
+    }
+
+```
+
+Will set the `node.force-quantum` property of `jack_simple_client` to 512.
+
+# DEVICE RULES  @IDX@ pipewire.conf
+
+The device.rules are evaluated every time the properties on a device are set
+or updated. This can be used on the server side to override client set
+properties on arbitrary devices.
+
+`device.rules` provides an `update-props` action that takes an object with
+properties that are updated on the device object.
+
+Add a `device.rules` section in the config file like this:
+
+```
+device.rules = 
+    {
+        matches = 
+            {
+                # all keys must match the value. ! negates. ~ starts regex.
+                device.name = ""v4l2_device.pci-0000_00_14.0-usb-0_1.2_1.0
+            }
+        
+        actions = {
+            update-props = {
+                device.description = "My Webcam"
+            }
+        }
+    }
+
+```
+
+Will set the `device.description` property of the device with the given `device.name`
+to "My Webcam".
+
+
+# AUTHORS
+
+The PipeWire Developers <$(PACKAGE_BUGREPORT)>;
+PipeWire is available from <$(PACKAGE_URL)>
+
+# SEE ALSO
+
+\ref page_man_pipewire_1 "pipewire(1)",
+\ref page_man_pw-mon_1 "pw-mon(1)",
+\ref page_man_libpipewire-modules_7 "libpipewire-modules(7)"
+\ref page_man_pipewire-pulse_conf_5 "pipewire-pulse.conf(5)"
+\ref page_man_pipewire-client_conf_5 "pipewire-client.conf(5)"

pipewire-1.0.1.tar.bz2/doc/dox/index.dox -> pipewire-1.2.0.tar.gz/doc/dox/index.dox Changed

pipewire-1.0.1.tar.bz2/doc/dox/internals/access.dox -> pipewire-1.2.0.tar.gz/doc/dox/internals/access.dox Changed

@@ -82,15 +82,14 @@
 
 If the property is not set it will go through a set of checks to determine
 the permissions for a client. See the \ref page_module_access documentation
-for details, particularly on the values documented below. Depending on the
-value of the \ref PW_KEY_ACCESS property one the following happens:
+for details.
 
-- `"allowed"`, `"unrestricted"`:  ALL permissions are set on the core
+Depending on the resolution, it grants permissions to the client as follows:
+
+- `"unrestricted"`:  ALL permissions are set on the core
     object and the client will be able to resume.
-- `"restricted"`, `"flatpak"`, `"$access.force"`:  No permissions are set on
-    the core object and the client will be suspended.
-- `"rejected"`: An error is sent to the client and the client is
-    suspended.
+- any other value: No permissions are set on the core object
+  and the client will be suspended.
 
 As detailed above, the client may be suspended. In that case the session
 manager or another client is required to configure permissions on the object
@@ -101,8 +100,7 @@
 The session manager listens for new clients to appear. It will use the
 \ref PW_KEY_ACCESS property to determine what to do.
 
-For clients that are suspended with `"restricted"`, `"flatpak"` or
-`"$access.force"` access, the session manager needs to set permissions on the
+For clients that are not unrestricted, the session manager needs to set permissions on the
 client for the various PipeWire objects in the graph that it is allowed to
 interact with.  To resume a client, the session manager needs to set
 permission `R` on the core object for the client.

pipewire-1.0.1.tar.bz2/doc/dox/internals/daemon.dox -> pipewire-1.2.0.tar.gz/doc/dox/internals/daemon.dox Changed

pipewire-1.0.1.tar.bz2/doc/dox/internals/design.dox -> pipewire-1.2.0.tar.gz/doc/dox/internals/design.dox Changed

pipewire-1.0.1.tar.bz2/doc/dox/internals/library.dox -> pipewire-1.2.0.tar.gz/doc/dox/internals/library.dox Changed

pipewire-1.0.1.tar.bz2/doc/dox/internals/protocol.dox -> pipewire-1.2.0.tar.gz/doc/dox/internals/protocol.dox Changed

@@ -157,7 +157,7 @@
 
 ### Core::Error (Opcode 4)
 
-An error occured in an object on the client.
+An error occurred in an object on the client.
 
 ```
    Struct(
@@ -274,11 +274,11 @@
 
 ## Core Events
 
-Core events are emited by the server.
+Core events are emitted by the server.
 
 ### Core::Info (Opcode 0)
 
-Emited by the server upon connection with the more information about the
+Emitted by the server upon connection with the more information about the
 server.
 
 ```
@@ -309,7 +309,7 @@
 
 ### Core::Done (Opcode 1)
 
-Emited as a result of a client Sync method.
+Emitted as a result of a client Sync method.
 
 ```
    Struct(
@@ -322,7 +322,7 @@
 
 ### Core::Ping (Opcode 2)
 
-Emited by the server when it wants to check if a client is alive or ensure
+Emitted by the server when it wants to check if a client is alive or ensure
 that it has processed the previous events.
 
 ```
@@ -1236,7 +1236,7 @@
 - type: the plane memory type
 - memfd: the plane memfd
 - mapoffset: the start offset of where the buffer memory starts
-- maxsize: the maxiumum size of the memory.
+- maxsize: the maximum size of the memory.
 
 ## ClientNode events

pipewire-1.0.1.tar.bz2/doc/dox/internals/scheduling.dox -> pipewire-1.2.0.tar.gz/doc/dox/internals/scheduling.dox Changed

pipewire-1.0.1.tar.bz2/doc/dox/modules.dox -> pipewire-1.2.0.tar.gz/doc/dox/modules.dox Changed

pipewire-1.0.1.tar.bz2/doc/dox/overview.dox -> pipewire-1.2.0.tar.gz/doc/dox/overview.dox Changed

@@ -1,42 +1,149 @@
 /** \page page_overview Overview
 
-PipeWire is a new low-level multimedia framework designed from scratch that
-aims to provide:
-
-- Graph based processing.
-- Support for out-of-process processing graphs with minimal overhead.
-- Flexible and extensible media format negotiation and buffer allocation.
-- Hard real-time capable plugins.
-- Achieve very low-latency for both audio and video processing.
-
-The framework is used to build a modular daemon that can be configured to:
-
-- Be a low-latency audio server with features like PulseAudio and/or JACK.
-- A video capture server that can manage hardware video capture devices and
-  provide access to them.
-- A central hub where video can be made available for other applications
-  such as the gnome-shell screencast API.
-
-
-# Motivation
-
-Linux has no unified framework for exchanging multimedia content between
-applications or even devices. In most cases, developers realized that
-a user-space daemon is needed to make this possible:
-
-- For video content, we typically rely on the compositor to render our
-  data.
-- For video capture, we usually go directly to the hardware devices, with
-  all security implications and inflexible routing that this brings.
-- For consumer audio, we use PulseAudio to manage and mix multiple streams
-  from clients.
-- For Pro audio, we use JACK to manage the graph of nodes.
-
-None of these solutions (except perhaps to some extent Wayland) however 
-were designed to support the security features that are required when
-dealing with flatpaks or other containerized applications. PipeWire
-aims to solve this problem and provides a unified framework to run both
-consumer and pro audio as well as video capture and processing in a
-secure way.
+# Concepts
+
+## The PipeWire Server
+
+PipeWire is a graph-based processing framework, that focuses on handling multimedia data (audio, video and MIDI mainly).
+
+A PipeWire graph is composed of nodes.
+Each node takes an arbitrary number of inputs called ports, does some processing over this multimedia data, and sends data out of its output ports.
+The edges in the graph are here called links.
+They are capable of connecting an output port to an input port.
+
+Nodes can have an arbitrary number of ports.
+A node with only output ports is often called a source, and a sink is a node that only possesses input ports.
+
+The PipeWire server provides the implementation of some of these nodes itself.
+Most importantly, it uses alsa-lib like any other ALSA client to expose statically configured ALSA devices as nodes.
+For example
+
+- a stereo ALSA PCM playback device can appear as a sink with two input ports: front-left and front-right or
+- a virtual ALSA device, to which clients which attempt to use ALSA directly connect, can appear as a source with two output ports: front-left and front right.
+
+Similar mechanisms exist to interface with and accommodate applications which use JACK or Pulseaudio.
+
+NOTE: `pw-jack` modifies the `LD_LIBRARY_PATH` environment variable so that applications will load PipeWire’s reimplementation of the JACK client libraries instead of JACK’s own libraries. This results in JACK clients being redirected to PipeWire.
+
+Other nodes are implemented by PipeWire clients.
+
+## The PipeWire clients
+
+PipeWire clients can be any process.
+They can speak to the PipeWire server through a UNIX domain socket using the PipeWire native protocol.
+Besides implementing nodes, they may control the graph.
+
+### Graph control
+
+The PipeWire server itself does not perform any management of the graph;
+context-dependent behaviour such as monitoring for new ALSA devices, and configuring them so that they appear as nodes, or linking nodes is not done automatically.
+It rather provides an API that allows spawning, linking and controlling these nodes.
+This API is then relied upon by clients to control the graph structure, without having to worry about the graph execution process.
+
+A recommended pattern that is often used is a single client be a daemon that deals with the session and policy management. Two implementations are known as of today:
+
+- pipewire-media-session, which was the first implementation of a session manager.c
+  Today, it is used mainly in debugging scenarios.
+- WirePlumber, which takes a modular approach:
+  It provides another, higher-level API compared to the PipeWire one, and runs Lua scripts that implement the management logic using the said API.
+  It ships with default scripts and configuration that handle linking policies as well as monitoring and automatic spawning of ALSA, bluez, libcamera and v4l2 devices.
+  The API is available for any process, not only from WirePlumber’s Lua scripts.
+ 
+### Node implementation 
+ 
+With the nodes which they implement, clients can send multimedia data into the graph or obtain multimedia data from the graph.
+A client can create multiple PipeWire nodes.
+That allows one to create more complex applications;
+a browser would for example be able to create a node per tab that requests the ability to play audio, letting the session manager handle the routing:
+This allows the user to route different tab sources to different sinks.
+Another example would be an application that requires many inputs.
+
+## API Semantics
+
+The current state of the PipeWire server and its capabilities, and the PipeWire graph are exposed towards clients -- including introspection tools like `pw-dump` -- as a collection of objects, each of which has a specific type.
+These objects have associated parameters, and properties, methods, events, and permissions.
+
+Parameters of an object are data with a specific, well defined meaning, which can be modified and read-out in a controlled fashion through the PipeWire API.
+They are used to configure the object at run-time.
+Parameters are the key that allow WirePlumber to negotiate data formats and port configuration with nodes by providing information such as:
+
+- Multiple, supported sample rates
+- Channel count
+- Positions sample format
+- Available monitor ports
+
+Properties of an object are additional data which have been attached on the behalf of modules and of which the PipeWire server has no native understanding.
+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:
+
+- 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)
+- eXecute: methods can be called;
+- Metadata: metadata can be set on the object.
+- Link: any link can be made even to a port that is not visible by the owner of the port.
+
+### Object types
+
+The following are the known types and their most important, specialized parameters and methods:
+
+#### Core
+
+The core is the heart of the PipeWire server.
+There can only be one core per server and it has the identifier zero.
+It represents global properties of the server.
+
+#### Clients
+
+A client object is the representation of an open connection with a client process with the server.
+
+#### Modules
+
+Modules are dynamic libraries that are loaded at run time in the clients and in the server and do arbitrary things, such as creating devices or provide methods to create links, nodes, etc.
+
+Modules in PipeWire can only be loaded in their own process. A client, for example, can not load a module in the server.
+
+#### Nodes
+
+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.
+
+#### Ports
+
+Ports are the entry and exit point of data for a Node.
+A port can either be used for input or output (but not both).
+For nodes that work with audio, one type of configuration is whether they have `dsp` ports or a `passthrough` port.
+In `dsp` mode, there is one port for channel of multichannel audio (so two ports for stereo audio, for example), and data is always in 32-bit floating point format.
+In `passthrough` mode, there is one port for multichannel data in a format that is negotiated between ports.
+
+#### Links
+
+Data flows between nodes when there is a Link between their ports.
+Links may be `"passive"` in which case the existence of the link does not automatically cause data to flow between those nodes (some link in the graph must be `"active"` for the graph to have data flow).
+
+#### Devices
+
+A device is a handle representing an underlying API, which is then used to create nodes or other devices.
+Examples of devices are ALSA PCM cards or V4L2 devices.
+A device has a profile, which allows one to configure them.
+
+#### Factories
+
+A factory is an object whose sole capability is to create other objects.
+Once a factory is created, it can only emit the type of object it declared.
+Those are most often delivered as a module: the module creates the factory and stays alive to keep it accessible for clients.
+
+### Common parameters and methods
+
+Every object implement at least the add_listener method, that allows any client to register event listeners.
+Events are used through the PipeWire API to expose information about an object that might change over time (the state of a node for example).
+
+## Context
+
+The PipeWire server and PipeWire clients use the PipeWire API through their respective `pw_context`, the so called PipeWire context.
+When a PipeWire context is created, it finds and parses a configuration file from the filesystem according to the rules of loading configuration files.
 
 */

pipewire-1.0.1.tar.bz2/doc/dox/programs/index.md -> pipewire-1.2.0.tar.gz/doc/dox/programs/index.md Changed

pipewire-1.0.1.tar.bz2/doc/dox/programs/pipewire-pulse.1.md -> pipewire-1.2.0.tar.gz/doc/dox/programs/pipewire-pulse.1.md Changed

pipewire-1.0.1.tar.bz2/doc/dox/programs/pipewire.1.md -> pipewire-1.2.0.tar.gz/doc/dox/programs/pipewire.1.md Changed

@@ -2,6 +2,8 @@
 
 The PipeWire media server
 
+\tableofcontents
+
 # SYNOPSIS
 
 **pipewire** \*options*\
@@ -29,6 +31,207 @@
 \par -c | \--config=FILE
 Load the given config file (Default: pipewire.conf).
 
+\par -P | \--properties=PROPS
+Add the given properties as a SPA JSON object to the context.
+
+# RUNTIME SETTINGS  @IDX@ pipewire
+
+A PipeWire daemon will also expose a settings metadata object that can
+be used to change some settings at runtime.
+
+Normally these settings can bypass any of the restrictions listed in
+the config options above, such as quantum and samplerate values.
+
+The settings can be modified using \ref page_man_pw-metadata_1 "pw-metadata(1)":
+```
+pw-metadata -n settings                  # list settings
+pw-metadata -n settings 0                # list server settings
+pw-metadata -n settings 0 log.level 2    # modify a server setting
+```
+
+@PAR@ pipewire-settings  log.level = INTEGER
+Change the log level of the PipeWire daemon.
+
+@PAR@ pipewire-settings  clock.rate = INTEGER
+The default samplerate.
+
+@PAR@ pipewire-settings  clock.allowed-rates =  RATE1 RATE2... 
+The allowed samplerates.
+
+@PAR@ pipewire-settings  clock.force-rate = INTEGER
+\parblock
+Temporarily forces the graph to operate in a fixed sample rate.
+Both DSP processing and devices will switch to the new rate immediately.
+Running streams (PulseAudio, native and ALSA applications) will automatically
+resample to match the new rate.
+
+Set the value to 0 to allow the sample rate to vary again.
+\endparblock
+
+@PAR@ pipewire-settings  clock.quantum = INTEGER
+The default quantum (buffer size).
+
+@PAR@ pipewire-settings  clock.min-quantum = INTEGER
+Smallest quantum to be used.
+
+@PAR@ pipewire-settings  clock.max-quantum = INTEGER
+Largest quantum to be used.
+
+@PAR@ pipewire-settings  clock.force-quantum = INTEGER
+\parblock
+Temporarily force the graph to operate in a fixed quantum.
+
+Set the value to 0 to allow the quantum to vary again.
+\endparblock
+
+# ENVIRONMENT VARIABLES  @IDX@ pipewire-env
+
+## Socket directories
+
+@PAR@ pipewire-env PIPEWIRE_RUNTIME_DIR
+
+@PAR@ pipewire-env XDG_RUNTIME_DIR
+
+@PAR@ pipewire-env USERPROFILE
+Used to find the PipeWire socket on the server (and native clients).
+
+@PAR@ pipewire-env PIPEWIRE_CORE
+Name of the socket to make.
+
+@PAR@ pipewire-env PIPEWIRE_REMOTE
+Name of the socket to connect to.
+
+@PAR@ pipewire-env PIPEWIRE_DAEMON
+If set to true then the process becomes a new PipeWire server.
+
+## Config directories, config file name and prefix
+
+@PAR@ pipewire-env PIPEWIRE_CONFIG_DIR
+
+@PAR@ pipewire-env XDG_CONFIG_HOME
+
+@PAR@ pipewire-env HOME
+Used to find the config file directories.
+
+@PAR@ pipewire-env PIPEWIRE_CONFIG_PREFIX
+
+@PAR@ pipewire-env PIPEWIRE_CONFIG_NAME
+Used to override the application provided
+config prefix and config name.
+
+@PAR@ pipewire-env PIPEWIRE_NO_CONFIG
+Enables (false) or disables (true) overriding on the default configuration.
+
+## Context information
+
+As part of a client context, the following information is collected
+from environment variables and placed in the context properties:
+
+@PAR@ pipewire-env LANG
+The current language in `application.language`.
+
+@PAR@ pipewire-env XDG_SESSION_ID
+Set as the `application.process.session-id` property.
+
+@PAR@ pipewire-env DISPLAY
+Is set as the `window.x11.display` property.
+
+## Modules
+
+@PAR@ pipewire-env PIPEWIRE_MODULE_DIR
+Sets the directory where to find PipeWire modules.
+
+@PAR@ pipewire-env SPA_SUPPORT_LIB
+The name of the SPA support lib to load. This can be used to switch to
+an alternative support library, for example, to run on the EVL realtime kernel.
+
+## Logging options
+
+@PAR@ pipewire-env JOURNAL_STREAM
+Is used to parse the stream used for the journal. This is usually configured by
+systemd.
+
+@PAR@ pipewire-env PIPEWIRE_LOG_LINE
+Enables the logging of line numbers. Default true.
+
+@PAR@ pipewire-env PIPEWIRE_LOG
+Specifies a log file to use instead of the default logger.
+
+@PAR@ pipewire-env PIPEWIRE_LOG_SYSTEMD
+Enables the use of systemd for the logger, default true.
+
+## Other settings
+
+@PAR@ pipewire-env PIPEWIRE_CPU
+Selects the CPU and flags. This is a bitmask of any of the \ref CPU flags
+
+@PAR@ pipewire-env PIPEWIRE_VM
+Selects the Virtual Machine PipeWire is running on.  This can be any of the \ref CPU "VM"
+types.
+
+@PAR@ pipewire-env DISABLE_RTKIT
+Disables the use of RTKit or the Realtime Portal for realtime scheduling.
+
+@PAR@ pipewire-env NO_COLOR
+Disables the use of colors in the console output.
+
+## Debugging options
+
+@PAR@ pipewire-env PIPEWIRE_DLCLOSE
+Enables (true) or disables (false) the use of dlclose when a shared library
+is no longer in use. When debugging, it might make sense to disable dlclose to be able to get
+debugging symbols from the object.
+
+## Stream options
+
+@PAR@ pipewire-env PIPEWIRE_NODE
+Makes a stream connect to a specific `object.serial` or `node.name`.
+
+@PAR@ pipewire-env PIPEWIRE_PROPS
+Adds extra properties to a stream or filter.
+
+@PAR@ pipewire-env PIPEWIRE_QUANTUM
+Forces a specific rate and buffer-size for the stream or filter.
+
+@PAR@ pipewire-env PIPEWIRE_LATENCY
+Sets a specific latency for a stream or filter. This is only a suggestion but
+the configured latency will not be larger.
+
+@PAR@ pipewire-env PIPEWIRE_RATE
+Sets a rate for a stream or filter. This is only a suggestion. The rate will be
+switched when the graph is idle.
+
+@PAR@ pipewire-env PIPEWIRE_AUTOCONNECT
+Overrides the default stream autoconnect settings.
+
+## Plugin options
+
+@PAR@ pipewire-env SPA_PLUGIN_DIR
+Is used to locate SPA plugins.
+
+@PAR@ pipewire-env SPA_DATA_DIR
+Is used to locate plugin specific config files. This is used by the
+bluetooth plugin currently to locate the quirks database.
+
+@PAR@ pipewire-env SPA_DEBUG
+Set the log level for SPA plugins. This is usually controlled by the `PIPEWIRE_DEBUG` variable
+when the plugins are managed by PipeWire but some standalone tools (like spa-inspect) uses this
+variable.
+
+@PAR@ pipewire-env ACP_BUILDDIR
+If set, the ACP profiles are loaded from the builddir.
+
+@PAR@ pipewire-env ACP_PATHS_DIR
+
+@PAR@ pipewire-env ACP_PROFILES_DIR
+Used to locate the ACP paths and profile directories respectively.
+
+@PAR@ pipewire-env LADSPA_PATH
+Comma separated list of directories where the ladspa plugins can be found.
+
+@PAR@ pipewire-env LIBJACK_PATH
+Directory where the jack1 or jack2 libjack.so can be found.
+
 # AUTHORS
 
 The PipeWire Developers <$(PACKAGE_BUGREPORT)>;

pipewire-1.2.0.tar.gz/doc/dox/programs/pw-container.1.md Added

@@ -0,0 +1,71 @@
+\page page_man_pw-container_1 pw-container
+
+The PipeWire container utility
+
+# SYNOPSIS
+
+**pw-container** \*options*\ \*PROGRAM*\
+
+# DESCRIPTION
+
+Run a program in a new security context 1.
+
+**pw-container** will create a new temporary unix socket and uses the
+SecurityContext extension API to create a server on this socket with
+the given properties. Clients created from this server socket will have
+the security properties attached to them.
+
+This can be used to simulate the behaviour of Flatpak or other containers.
+
+Without any arguments, **pw-container** simply creates the new socket
+and prints the address on stdout. Other PipeWire programs can then be run
+with `PIPEWIRE_REMOTE=<socket-address>` to connect through this security
+context.
+
+When *PROGRAM* is given, the `PIPEWIRE_REMOTE` env variable will be set
+and *PROGRAM* will be passed to system(). Argument to *PROGRAM* need to be
+properly quoted.
+
+# OPTIONS
+
+\par -P | \--properties=VALUE
+Set extra context properties as a JSON object.
+
+\par -r | \--remote=NAME
+The name the *remote* instance to connect to. If left unspecified, a
+connection is made to the default PipeWire instance.
+
+\par -h | \--help
+Show help.
+
+\par \--version
+Show version information.
+
+# EXIT STATUS
+
+If the security context was successfully created, **pw-container** does
+not exit until terminated with a signal. It exits with status 0 if terminated by
+SIGINT or SIGTERM in this case.
+
+Otherwise, it exits with nonzero exit status.
+
+# EXAMPLES
+
+**pw-container** 'pw-dump i 0'
+
+Run pw-dump of the Core object. Note the difference in the object permissions
+when running pw-dump with and without **pw-container**.
+
+**pw-container** 'pw-dump pw-dump'
+
+Run pw-dump of itself. Note the difference in the Client security tokens when
+running pw-dump with and without **pw-container**.
+
+# AUTHORS
+
+The PipeWire Developers <$(PACKAGE_BUGREPORT)>;
+PipeWire is available from <$(PACKAGE_URL)>
+
+# SEE ALSO
+
+1 https://gitlab.freedesktop.org/wayland/wayland-protocols/-/blob/main/staging/security-context/security-context-v1.xml - Creating a security context

pipewire-1.0.1.tar.bz2/doc/dox/programs/pw-jack.1.md -> pipewire-1.2.0.tar.gz/doc/dox/programs/pw-jack.1.md Changed

pipewire-1.2.0.tar.gz/doc/dox/programs/pw-reserve.1.md Added

@@ -0,0 +1,79 @@
+\page page_man_pw-reserve_1 pw-reserve
+
+The PipeWire device reservation utility
+
+# SYNOPSIS
+
+**pw-reserve** \*options*\
+
+# DESCRIPTION
+
+Reserves a device using the DBus `org.freedesktop.ReserveDevice1`
+device reservation scheme 1, waiting until terminated by `SIGINT` or
+another signal.
+
+It can also request other applications to release a device. This can
+be used to make audio servers such as PipeWire, Pulseaudio, JACK, or
+other applications that respect the device reservation protocol, to
+ignore a device, or to release a sound device they are already using
+so that it can be used by other applications.
+
+# OPTIONS
+
+\par -r | \--release
+Request any client currently holding the device to release it, and try
+to reserve it after that. If this option is not given and the device
+is already in use, **pw-reserve** will exit with error status.
+
+\par -n NAME | \--name=NAME
+\parblock
+Name of the device to reserve. By convention, this is
+
+- Audio<em>N</em>: for ALSA card number <em>N</em>
+
+**pw-reserve** can reserve any device name, however PipeWire does
+not currently support other values than listed above.
+\endparblock
+
+\par -a NAME | \--appname=NAME
+Application name to use when reserving the device.
+
+\par -p PRIO | \--priority=PRIO
+Priority to use when reserving the device.
+
+\par -m | \--monitor
+Monitor reservations of a given device, instead of reserving it.
+
+\par -h | \--help
+Show help.
+
+\par \--version
+Show version information.
+
+# EXIT STATUS
+
+If the device reservation succeeds, **pw-reserve** does not exit until
+terminated with a signal. It exits with status 0 if terminated by
+SIGINT or SIGTERM in this case.
+
+Otherwise, it exits with nonzero exit status.
+
+# EXAMPLES
+
+**pw-reserve** -n Audio0
+
+Reserve ALSA card 0, and exit with error if it is already reserved.
+
+**pw-reserve** -n Audio0 -r
+
+Reserve ALSA card 0, requesting any applications that have reserved
+the device to release it for us.
+
+# AUTHORS
+
+The PipeWire Developers <$(PACKAGE_BUGREPORT)>;
+PipeWire is available from <$(PACKAGE_URL)>
+
+# SEE ALSO
+
+1 https://git.0pointer.net/reserve.git/tree/reserve.txt - A simple device reservation scheme with DBus

pipewire-1.0.1.tar.bz2/doc/dox/programs/pw-top.1.md -> pipewire-1.2.0.tar.gz/doc/dox/programs/pw-top.1.md Changed

pipewire-1.2.0.tar.gz/doc/dox/programs/pw-v4l2.1.md Added

pipewire-1.2.0.tar.gz/doc/dox/programs/spa-acp-tool.1.md Added

@@ -0,0 +1,80 @@
+\page page_man_spa-acp-tool_1 spa-acp-tool
+
+The PipeWire ALSA profile debugging utility
+
+# SYNOPSIS
+
+**spa-acp-tool** \*COMMAND*\
+
+# DESCRIPTION
+
+Debug tool for exercising the ALSA card profile probing code, without
+running PipeWire.
+
+May be used to debug problems where PipeWire has incorrectly
+functioning ALSA card profiles.
+
+# COMMANDS
+
+\par help | h
+Show available commands
+
+\par quit | q
+Quit
+
+\par card ID | c ID
+Probe card
+
+\par info | i
+List card info
+
+\par list | l
+List all objects
+
+\par list-verbose | lv
+List all data
+
+\par list-profiles ID | lpr ID
+List profiles
+
+\par set-profile ID | spr ID
+Activate a profile
+
+\par list-ports ID | lp ID
+List ports
+
+\par set-port ID | sp ID
+Activate a port
+
+\par list-devices ID | ld ID
+List available devices
+
+\par get-volume ID | gv ID
+Get volume from device
+
+\par set-volume ID VOL | v ID VOL
+Set volume on device
+
+\par inc-volume ID | v+ ID
+Increase volume on device
+
+\par dec-volume ID | v- ID
+Decrease volume on device
+
+\par get-mute ID | gm ID
+Get mute state from device
+
+\par set-mute ID VAL | sm ID VAL
+Set mute on device
+
+\par toggle-mute ID  | m ID
+Toggle mute on device
+
+# AUTHORS
+
+The PipeWire Developers <$(PACKAGE_BUGREPORT)>;
+PipeWire is available from <$(PACKAGE_URL)>
+
+# SEE ALSO
+
+\ref page_man_pipewire_1 "pipewire(1)"

pipewire-1.2.0.tar.gz/doc/dox/programs/spa-inspect.1.md Added

pipewire-1.2.0.tar.gz/doc/dox/programs/spa-json-dump.1.md Added

pipewire-1.2.0.tar.gz/doc/dox/programs/spa-monitor.1.md Added

pipewire-1.2.0.tar.gz/doc/dox/programs/spa-resample.1.md Added

pipewire-1.0.1.tar.bz2/doc/dox/pulse-modules.dox -> pipewire-1.2.0.tar.gz/doc/dox/pulse-modules.dox Changed

@@ -1,123 +1,15 @@
 /** \page page_pulse_modules Pulseaudio Modules
 
-PipeWire's Pulseaudio emulation implements several Pulseaudio modules.
-It only supports its own built-in modules, and cannot load external
-modules written for Pulseaudio.
+\include{doc} pulse-modules.inc
 
-# Loading modules
-
-The built-in modules can be loaded using Pulseaudio client programs,
-for example `pactl load-module <module-name> <module-options>`. They
-can also added to `pipewire-pulse.conf`, typically by a drop-in file
-in `~/.config/pipewire/pipewire-pulse.conf.d/` containing the module
-name and its arguments
-```
-pulse.cmd = 
-    { cmd = "load-module" args = "module-null-sink sink_name=foo" flags =   }
-
-```
-
-To list all modules currently loaded, with their arguments:
-```
-pactl list modules
-```
-
-For a short list of loaded modules:
-```
-pactl list modules short
-```
-
-Modules may be unloaded using either the module-name or index number:
-
-```
-pactl load-module <module-name> <parameters>
-pactl unload-module <module-name|index#>
-```
-
-# Common module options
-
-Most modules that create streams/devices support the following properties:
-
-## sink_name, source_name
-
-Name for the sink (resp. source). Allowed characters in the name are a-z, A-Z, numbers, period (.) and underscore (_). The length must be 1-128 characters.
-
-## format
-
-The sample format. The supported audio formats are:
-
-### PCM
- - u8: unsigned 8-bit integer
- - aLaw: A-law encoded 8-bit integer
- - uLaw: μ-law encoded 8-bit integer
- - s16le: signed 16-bit little-endian integer
- - s16be: signed 16-bit big-endian integer
- - s16, s16ne: native-endian aliases for s16le or s16be
- - s16re: reverse-endian alias for s16le or s16be
- - float32le: 32-bit little-endian float
- - float32be: 32-bit big-endian float
- - float32, float32ne: native-endian aliases for float32le or float32be
- - float32re: reverse-endian alias for float32le or float32be
- - s32le: signed 32-bit little-endian integer
- - s32be: signed 32-bit big-endian integer
- - s32, s32ne: native-endian aliases for s32le or s32be
- - s32re: reverse-endian alias for s32le or s32be
- - s24le: signed 24-bit little-endian integer (note: ALSA calls this "S24_3LE")
- - s24be: signed 24-bit big-endian integer (note: ALSA calls this "S24_3BE")
- - s24, s24ne: native-endian aliases for s24le or s24be
- - s24re: reverse-endian alias for s24le or s24be
- - s24-32le: signed 24-bit little-endian integer, packed into a 32-bit integer so that the 8 most significant bits are ignored (note: ALSA calls this "S24_LE")
- - s24-32be: signed 24-bit big-endian integer, packed into a 32-bit integer so that the 8 most significant bits are ignored (note: ALSA calls this "S24_BE")
- - s24-32, s24-32ne: native-endian aliases for s24-32le or s24-32be
- - s24-32re: reverse-endian alias for s24-32le or s24-32be
-
-### Compressed audio formats
-
-Below is a list of all supported compressed formats. The code at the beginning of each line is used whenever a textual identifier for a format is needed (for example in configuration files or on the command line). The formats whose identifier ends with -iec61937 have to be wrapped in IEC 61937 frames, which makes the compressed audio behave more like normal PCM audio.
-
- - ac3-iec61937: Dolby Digital (DD / AC-3 / A/52)
- - eac3-iec61937: Dolby Digital Plus (DD+ / E-AC-3)
- - mpeg-iec61937: MPEG-1 or MPEG-2 Part 3 (not MPEG-2 AAC)
- - dts-iec61937: DTS
- - mpeg2-aac-iec61937: MPEG-2 AAC (supported since PulseAudio 4.0)
- - truehd-iec61937: Dolby TrueHD (added in PulseAudio 13.0, but doesn't work yet in practice)
- - dtshd-iec61937: DTS-HD Master Audio (added in PulseAudio 13.0, but doesn't work yet in practice)
- - pcm: PCM (not a compressed format, but listed here, because pcm is one of the recognized encoding identifiers)
- - any: (special identifier for indicating that any encoding can be used)
-
-
-## rate
-
-The sample rate.
-
-##channels
-
-Number of audio channels.
-
-## channel_map
-
-A channel map. A list of comma-separated channel names. The currently defined channel names are:
-`left`, `right`, `mono`, `center`, `front-left`, `front-right`, `front-center`,
-`rear-center`, `rear-left`, `rear-right`, `lfe`, `subwoofer`, `front-left-of-center`,
-`front-right-of-center`, `side-left`, `side-right`, `aux0`, `aux1` to `aux15`, `top-center`,
-`top-front-left`, `top-front-right`, `top-front-center`, `top-rear-left`, `top-rear-right`,
-`top-rear-center`
-
-## sink_properties, source_properties
-
-Set additional properties of the sink/source. For example, you can set the description directly
-when the module is loaded by setting this parameter.
-
-```
-load-module module-alsa-sink sink_name=headphones sink_properties=device.description=Headphones
-```
-
-# List of known built-in modules:
+# List of built-in modules:
 
 - \subpage page_pulse_module_alsa_sink
 - \subpage page_pulse_module_alsa_source
 - \subpage page_pulse_module_always_sink
 - \subpage page_pulse_module_combine_sink
+- \subpage page_pulse_module_device_manager
+- \subpage page_pulse_module_device_restore
 - \subpage page_pulse_module_echo_cancel
 - \subpage page_pulse_module_gsettings
 - \subpage page_pulse_module_jackdbus_detect
@@ -137,6 +29,7 @@
 - \subpage page_pulse_module_rtp_recv
 - \subpage page_pulse_module_rtp_send
 - \subpage page_pulse_module_simple_protocol_tcp
+- \subpage page_pulse_module_stream_restore
 - \subpage page_pulse_module_switch_on_connect
 - \subpage page_pulse_module_tunnel_sink
 - \subpage page_pulse_module_tunnel_source

pipewire-1.2.0.tar.gz/doc/dox/pulse-modules.inc Added

@@ -0,0 +1,111 @@
+PipeWire's Pulseaudio emulation implements several Pulseaudio modules.
+It only supports its own built-in modules, and cannot load external
+modules written for Pulseaudio.
+
+# Loading modules
+
+The built-in modules can be loaded using Pulseaudio client programs,
+for example `pactl load-module <module-name> <module-options>`. They
+can also added to `pipewire-pulse.conf`, typically by a drop-in file
+in `~/.config/pipewire/pipewire-pulse.conf.d/` containing the module
+name and its arguments
+```
+pulse.cmd = 
+    { cmd = "load-module" args = "module-null-sink sink_name=foo" flags =   }
+
+```
+
+To list all modules currently loaded, with their arguments:
+```
+pactl list modules
+```
+
+For a short list of loaded modules:
+```
+pactl list modules short
+```
+
+Modules may be unloaded using either the module-name or index number:
+
+```
+pactl load-module <module-name> <parameters>
+pactl unload-module <module-name|index#>
+```
+
+# Common module options
+
+Most modules that create streams/devices support the following properties:
+
+## sink_name, source_name
+
+Name for the sink (resp. source). Allowed characters in the name are a-z, A-Z, numbers, period (.) and underscore (_). The length must be 1-128 characters.
+
+## format
+
+The sample format. The supported audio formats are:
+
+### PCM
+ - u8: unsigned 8-bit integer
+ - aLaw: A-law encoded 8-bit integer
+ - uLaw: μ-law encoded 8-bit integer
+ - s16le: signed 16-bit little-endian integer
+ - s16be: signed 16-bit big-endian integer
+ - s16, s16ne: native-endian aliases for s16le or s16be
+ - s16re: reverse-endian alias for s16le or s16be
+ - float32le: 32-bit little-endian float
+ - float32be: 32-bit big-endian float
+ - float32, float32ne: native-endian aliases for float32le or float32be
+ - float32re: reverse-endian alias for float32le or float32be
+ - s32le: signed 32-bit little-endian integer
+ - s32be: signed 32-bit big-endian integer
+ - s32, s32ne: native-endian aliases for s32le or s32be
+ - s32re: reverse-endian alias for s32le or s32be
+ - s24le: signed 24-bit little-endian integer (note: ALSA calls this "S24_3LE")
+ - s24be: signed 24-bit big-endian integer (note: ALSA calls this "S24_3BE")
+ - s24, s24ne: native-endian aliases for s24le or s24be
+ - s24re: reverse-endian alias for s24le or s24be
+ - s24-32le: signed 24-bit little-endian integer, packed into a 32-bit integer so that the 8 most significant bits are ignored (note: ALSA calls this "S24_LE")
+ - s24-32be: signed 24-bit big-endian integer, packed into a 32-bit integer so that the 8 most significant bits are ignored (note: ALSA calls this "S24_BE")
+ - s24-32, s24-32ne: native-endian aliases for s24-32le or s24-32be
+ - s24-32re: reverse-endian alias for s24-32le or s24-32be
+
+### Compressed audio formats
+
+Below is a list of all supported compressed formats. The code at the beginning of each line is used whenever a textual identifier for a format is needed (for example in configuration files or on the command line). The formats whose identifier ends with -iec61937 have to be wrapped in IEC 61937 frames, which makes the compressed audio behave more like normal PCM audio.
+
+ - ac3-iec61937: Dolby Digital (DD / AC-3 / A/52)
+ - eac3-iec61937: Dolby Digital Plus (DD+ / E-AC-3)
+ - mpeg-iec61937: MPEG-1 or MPEG-2 Part 3 (not MPEG-2 AAC)
+ - dts-iec61937: DTS
+ - mpeg2-aac-iec61937: MPEG-2 AAC (supported since PulseAudio 4.0)
+ - truehd-iec61937: Dolby TrueHD (added in PulseAudio 13.0, but doesn't work yet in practice)
+ - dtshd-iec61937: DTS-HD Master Audio (added in PulseAudio 13.0, but doesn't work yet in practice)
+ - pcm: PCM (not a compressed format, but listed here, because pcm is one of the recognized encoding identifiers)
+ - any: (special identifier for indicating that any encoding can be used)
+
+
+## rate
+
+The sample rate.
+
+##channels
+
+Number of audio channels.
+
+## channel_map
+
+A channel map. A list of comma-separated channel names. The currently defined channel names are:
+`left`, `right`, `mono`, `center`, `front-left`, `front-right`, `front-center`,
+`rear-center`, `rear-left`, `rear-right`, `lfe`, `subwoofer`, `front-left-of-center`,
+`front-right-of-center`, `side-left`, `side-right`, `aux0`, `aux1` to `aux15`, `top-center`,
+`top-front-left`, `top-front-right`, `top-front-center`, `top-rear-left`, `top-rear-right`,
+`top-rear-center`
+
+## sink_properties, source_properties
+
+Set additional properties of the sink/source. For example, you can set the description directly
+when the module is loaded by setting this parameter.
+
+```
+load-module module-alsa-sink sink_name=headphones sink_properties=device.description=Headphones
+```

pipewire-1.0.1.tar.bz2/doc/dox/tutorial/index.dox -> pipewire-1.2.0.tar.gz/doc/dox/tutorial/index.dox Changed

pipewire-1.0.1.tar.bz2/doc/examples/tutorial3.c -> pipewire-1.2.0.tar.gz/doc/examples/tutorial3.c Changed

pipewire-1.0.1.tar.bz2/doc/examples/tutorial4.c -> pipewire-1.2.0.tar.gz/doc/examples/tutorial4.c Changed

pipewire-1.0.1.tar.bz2/doc/input-filter-h.sh -> pipewire-1.2.0.tar.gz/doc/input-filter-h.sh Changed

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Doxygen input filter, which tries to fix documentation of callback
 # method macros.
@@ -11,9 +11,7 @@
 # Add \ingroup commands for the file, for each \addgroup in it
 BASEFILE=$(echo "$FILENAME" | sed -e 's@.*src/pipewire/@pipewire/@; s@.*spa/include/spa/@spa/@; s@.*src/test/@test/@;')
 
-# shellcheck disable=SC2028 # \file is not an escape sequence
-echo "/** \file"
-echo "\`$BASEFILE\`"
+printf "/** \\\\file\n\`%s\`\n" "$BASEFILE"
 sed -n -e '/.*\\addtogroup a-zA-Z0-9_.*/ { s/.*addtogroup /\\ingroup /; p; }' < "$FILENAME" | sort | uniq
 echo " */"
 
@@ -25,9 +23,15 @@
 # Ensure all macros are included (also those defined inside a struct),
 # by adding /** \ingroup XXX */ before each definition.
 # Also ensure all opaque structs get included.
+# Strip SPA_FORMAT_ARG_FUNC(1) etc. things that confuse doxygen
 sed -e 's@^$#define .*:space:$$.*_method$$(.,:space:*$$a-z_\+$$.*):space:*$$@\1\2\3\4\5 /**< \\copydoc \2s.\4\n\n\\sa \2s.\4 */@;' \
     -e 's@^$#define .*:space:$$.*_method$$_rvs(.,:space:*$$a-z_\+$$.*):space:*$$@\1\2\3\4\5 /**< \\copydoc \2s.\4\n\n\\sa \2s.\4 */@;' \
     -e '/\\addtogroup/ { h; s@.*\\addtogroup $.*$.*@/** \\ingroup \1 */@; x; }' \
     -e '/#define $PW\|SPA$_A-Z.*^\\ *$/ { x; p; x; }' \
     -e 's@^$ *struct $$a-zA-Z0-9_*$$;.*$$@/** \\struct \2 */\n\1\2\3@;' \
+    -e 's@^ *SPA_FORMAT_ARG_FUNC(0-9, *)@@;' \
+    -e 's@ *SPA_PRINTF_FUNC(0-9, *);@;@;' \
+    -e 's@^ *SPA_WARN_UNUSED_RESULT@ @;' \
+    -e 's@ SPA_SENTINEL;@;@;' \
+    -e 's@ SPA_UNUSED,@,@;' \
 < "$FILENAME"

pipewire-1.2.0.tar.gz/doc/input-filter-md.py Added

@@ -0,0 +1,167 @@
+#!/usr/bin/env python3
+# -*- mode: python; coding: utf-8; eval: (blacken-mode); -*-
+r"""input-filter-md.py FILENAME
+input-filter-md.py --index FILENAMES...
+
+Doxygen .md input filter that adds extended syntax.
+With --index, generates an index file.
+Assumes BUILD_DIR environment variable is set.
+
+@PAR@ <section> <name> (...)
+
+    Adds an index item and expands to
+
+    \anchor <key>
+    \par <name> (...)
+
+@SECREF@ <section>
+
+    Expands to
+
+    \secreflist
+    \refitem ...
+    ...
+    \endsecreflist
+
+    containing all index items from the specified section.
+
+# Section title    @IDX@ <section>
+
+   Adds the section title to the index, and expands to an anchor
+
+   # Section title {#key}
+
+The index keys can be used in \ref and have format
+
+    {section}__{name}
+
+where the parts are converted to lowercase and _ replaces
+non-alphanumerics.
+
+"""
+import sys
+import re
+import os
+
+
+def index_key(section, name):
+    key = f"{section}__{name}".lower()
+    return re.sub(r"^A-Za-z0-9_-", "_", key)
+
+
+BUILD_DIR = os.environ"BUILD_DIR"
+PAR_RE = r"^@PAR@\s+(^\s*) \t+(\S+)(.*)$"
+IDX_RE = r"^(#+)(.*)@IDX@ \t+(\S+) \t*$"
+SECREF_RE = r"^@SECREF@ \t+(^\n*) \t*$"
+
+
+def main(args):
+    fn = args0
+    with open(fn, "r") as f:
+        text = f.read()
+
+    def par(m):
+        section = m.group(1)
+        name = m.group(2)
+        rest = m.group(3).strip()
+        key = index_key(section, name)
+        return f"\\anchor {key}\n\\par {name} {rest}"
+
+    def idx(m):
+        level = m.group(1)
+        title = name = m.group(2).strip()
+        section = m.group(3)
+        if title == title.upper():
+            name = name.capitalize()
+        key = index_key(section, name)
+        return f"{level} {title} {{#{key}}}"
+
+    def secref(m):
+        import os
+        import json
+
+        secs = m.group(1).split()
+
+        with open(os.path.join(BUILD_DIR, "index.json"), "r") as f:
+            index = json.load(f)
+
+        items = {}
+
+        for sec in secs:
+            if sec not in index:
+                print(f"{fn}: no index '{sec}'", file=sys.stderr)
+            else:
+                for name, key in indexsec.items():
+                    if name in items:
+                        pkey, psec = items.pop(name)
+                        nname = f"{name} ({sec})"
+                        itemsnname = (key, sec)
+                        if pkey is not None:
+                            pname = f"{name} ({psec})"
+                            itemspname = (pkey, psec)
+                            itemsname = (None, None)
+                    else:
+                        itemsname = (key, sec)
+
+        text = r"\secreflist"
+        for name, (key, sec) in sorted(items.items()):
+            if key is not None:
+                text.append(rf'\refitem {key} "{name}"')
+        text.append(r"\endsecreflist")
+        text = "\n".join(text)
+        return f"{text}\n"
+
+    text = re.sub(PAR_RE, par, text, flags=re.M)
+    text = re.sub(IDX_RE, idx, text, flags=re.M)
+    text = re.sub(SECREF_RE, secref, text, flags=re.M)
+
+    print(text)
+
+
+def main_index(args):
+    import json
+
+    sections = {}
+
+    for fn in set(args):
+        with open(fn, "r") as f:
+            load_index(sections, f.read())
+
+    result = {}
+
+    for section, items in sections.items():
+        for name in items:
+            key = index_key(section, name)
+            result.setdefault(section, {})name = key
+
+    with open(os.path.join(BUILD_DIR, "index.json"), "w") as f:
+        json.dump(result, f)
+
+
+def load_index(sections, text):
+    def par(m):
+        section = m.group(1)
+        name = m.group(2)
+        sections.setdefault(section, ).append(name)
+        return ""
+
+    def idx(m):
+        name = m.group(2).strip()
+        section = m.group(3)
+        if name == name.upper():
+            name = name.capitalize()
+        sections.setdefault(section, ).append(name)
+        return ""
+
+    text = re.sub(PAR_RE, par, text, flags=re.M)
+    text = re.sub(IDX_RE, idx, text, flags=re.M)
+
+
+if __name__ == "__main__":
+    if len(sys.argv) >= 2 and sys.argv1 == "--index":
+        main_index(sys.argv2:)
+    elif len(sys.argv) == 2:
+        main(sys.argv1:)
+    else:
+        print(__doc__.strip())
+        sys.exit(1)

pipewire-1.0.1.tar.bz2/doc/man-fixup.py -> pipewire-1.2.0.tar.gz/doc/man-fixup.py Changed

pipewire-1.0.1.tar.bz2/doc/meson.build -> pipewire-1.2.0.tar.gz/doc/meson.build Changed

@@ -7,13 +7,34 @@
 doxyfile_conf.set('top_builddir', meson.project_build_root())
 doxyfile_conf.set('output_directory', meson.current_build_dir())
 
+doc_prefix_value = get_option('doc-prefix-value')
+doc_sysconfdir_value = get_option('doc-sysconfdir-value')
+
+if doc_prefix_value == '' and doc_sysconfdir_value == ''
+   doc_spa_plugindir = spa_plugindir
+   doc_pipewire_configdir = pipewire_configdir
+   doc_pipewire_confdatadir = pipewire_confdatadir
+else
+   if doc_prefix_value == ''
+     doc_prefix_value = get_option('prefix')
+   endif
+   if doc_sysconfdir_value == ''
+     doc_sysconfdir_value = get_option('sysconfdir')
+   endif
+   doc_spa_plugindir = doc_prefix_value / get_option('libdir') / spa_name
+   doc_pipewire_configdir = doc_prefix_value / doc_sysconfdir_value / 'pipewire'
+   doc_pipewire_confdatadir = doc_prefix_value / get_option('datadir') / 'pipewire'
+endif
+
 doxygen_env = environment()
 doxygen_env.set('PACKAGE_NAME', meson.project_name())
 doxygen_env.set('PACKAGE_VERSION', meson.project_version())
 doxygen_env.set('PACKAGE_URL', 'https://pipewire.org')
 doxygen_env.set('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/pipewire/pipewire/issues')
-doxygen_env.set('PIPEWIRE_CONFIG_DIR', pipewire_configdir)
-doxygen_env.set('PIPEWIRE_CONFDATADIR', pipewire_confdatadir)
+doxygen_env.set('PIPEWIRE_CONFIG_DIR', doc_pipewire_configdir)
+doxygen_env.set('PIPEWIRE_CONFDATADIR', doc_pipewire_confdatadir)
+doxygen_env.set('SPA_PLUGINDIR', doc_spa_plugindir)
+doxygen_env.set('BUILD_DIR', meson.current_build_dir())
 
 dot_found = find_program('dot', required: false).found()
 summary({'dot (used with doxygen)': dot_found}, bool_yn: true, section: 'Optional programs')
@@ -32,6 +53,7 @@
   'dox/modules.dox',
   'dox/pulse-modules.dox',
   'dox/programs/index.md',
+  'dox/config/index.md',
   'dox/internals/index.dox',
   'dox/internals/design.dox',
   'dox/internals/access.dox',
@@ -62,15 +84,20 @@
 
 
 manpage_docs = 
-  'dox/programs/libpipewire-modules.7.md',
-  'dox/programs/pipewire-pulse-modules.7.md',
+  'dox/config/pipewire-pulse.conf.5.md',
+  'dox/config/pipewire.conf.5.md',
+  'dox/config/pipewire-client.conf.5.md',
+  'dox/config/pipewire-jack.conf.5.md',
+  'dox/config/pipewire-devices.7.md',
+  'dox/config/pipewire-filter-chain.conf.5.md',
+  'dox/config/pipewire-pulse-modules.7.md',
+  'dox/config/libpipewire-modules.7.md',
   'dox/programs/pipewire-pulse.1.md',
-  'dox/programs/pipewire-pulse.conf.5.md',
   'dox/programs/pipewire.1.md',
-  'dox/programs/pipewire.conf.5.md',
   'dox/programs/pw-cat.1.md',
   'dox/programs/pw-cli.1.md',
   'dox/programs/pw-config.1.md',
+  'dox/programs/pw-container.1.md',
   'dox/programs/pw-dot.1.md',
   'dox/programs/pw-dump.1.md',
   'dox/programs/pw-jack.1.md',
@@ -80,7 +107,14 @@
   'dox/programs/pw-mididump.1.md',
   'dox/programs/pw-mon.1.md',
   'dox/programs/pw-profiler.1.md',
+  'dox/programs/pw-reserve.1.md',
   'dox/programs/pw-top.1.md',
+  'dox/programs/pw-v4l2.1.md',
+  'dox/programs/spa-acp-tool.1.md',
+  'dox/programs/spa-inspect.1.md',
+  'dox/programs/spa-json-dump.1.md',
+  'dox/programs/spa-monitor.1.md',
+  'dox/programs/spa-resample.1.md',
 
 
 manpages = 
@@ -136,11 +170,17 @@
   'tutorial5.c',
   'tutorial6.c',
 
+example_dep_files = 
+foreach h : example_files
+  example_dep_files += 'examples/' + h
+endforeach
 foreach h : examples
   example_files += h + '.c'
+  example_dep_files += '../src/examples/' + h + '.c'
 endforeach
 foreach h : spa_examples
   example_files += 'spa/examples/' + h + '.c'
+  example_dep_files += '../spa/examples/' + h + '.c'
 endforeach
 
 example_doxygen = 
@@ -187,6 +227,7 @@
 doxygen_layout = meson.project_source_root() / 'doc' / 'DoxygenLayout.xml'
 doxygen_filter_c = meson.project_source_root() / 'doc' / 'input-filter.py'
 doxygen_filter_h = meson.project_source_root() / 'doc' / 'input-filter-h.sh'
+doxygen_filter_md = meson.project_source_root() / 'doc' / 'input-filter-md.py'
 
 doxyfile_conf.set('inputs', ' '.join(inputs + input_dirs))
 doxyfile_conf.set('cssfiles', ' '.join(cssfiles))
@@ -194,6 +235,7 @@
 doxyfile_conf.set('path_prefixes', ' '.join(path_prefixes))
 doxyfile_conf.set('c_input_filter', doxygen_filter_c)
 doxyfile_conf.set('h_input_filter', doxygen_filter_h)
+doxyfile_conf.set('md_input_filter', doxygen_filter_md)
 
 doxyfile = configure_file(input: 'Doxyfile.in',
                           output: 'Doxyfile',
@@ -204,8 +246,16 @@
   docdir = pipewire_datadir / 'doc' / meson.project_name()
 endif
 
+index_json = custom_target('index.json',
+  command:  doxygen_filter_md, '--index', '@INPUT@' ,
+  input: extra_docs + manpage_docs,
+  output: 'index.json',
+  env: doxygen_env
+)
+
 html_target = custom_target('pipewire-docs',
-                            input:  doxyfile, doxygen_layout, examples_dox, doxygen_filter_c, doxygen_filter_h  + inputs + cssfiles,
+                            input:  doxyfile, doxygen_layout, example_dep_files, examples_dox,
+                                     doxygen_filter_c, doxygen_filter_h, index_json  + inputs + cssfiles,
                             output:  'html' ,
                             command:  doxygen, doxyfile ,
                             env: doxygen_env,

pipewire-1.0.1.tar.bz2/doc/tree.dox -> pipewire-1.2.0.tar.gz/doc/tree.dox Changed

pipewire-1.0.1.tar.bz2/include/valgrind/memcheck.h -> pipewire-1.2.0.tar.gz/include/valgrind/memcheck.h Changed

@@ -157,7 +157,7 @@
 /* Client-code macros to check the state of memory. */
 
 /* Check that memory at _qzz_addr is addressable for _qzz_len bytes.
-   If suitable addressibility is not established, Valgrind prints an
+   If suitable addressability is not established, Valgrind prints an
    error message and returns the address of the first offending byte.
    Otherwise it returns zero. */
 #define VALGRIND_CHECK_MEM_IS_ADDRESSABLE(_qzz_addr,_qzz_len)      \
@@ -166,7 +166,7 @@
                             (_qzz_addr), (_qzz_len), 0, 0, 0)
 
 /* Check that memory at _qzz_addr is addressable and defined for
-   _qzz_len bytes.  If suitable addressibility and definedness are not
+   _qzz_len bytes.  If suitable addressability and definedness are not
    established, Valgrind prints an error message and returns the
    address of the first offending byte.  Otherwise it returns zero. */
 #define VALGRIND_CHECK_MEM_IS_DEFINED(_qzz_addr,_qzz_len)        \
@@ -174,8 +174,8 @@
                             VG_USERREQ__CHECK_MEM_IS_DEFINED,    \
                             (_qzz_addr), (_qzz_len), 0, 0, 0)
 
-/* Use this macro to force the definedness and addressibility of an
-   lvalue to be checked.  If suitable addressibility and definedness
+/* Use this macro to force the definedness and addressability of an
+   lvalue to be checked.  If suitable addressability and definedness
    are not established, Valgrind prints an error message and returns
    the address of the first offending byte.  Otherwise it returns
    zero. */

pipewire-1.0.1.tar.bz2/meson.build -> pipewire-1.2.0.tar.gz/meson.build Changed

@@ -1,5 +1,5 @@
 project('pipewire', 'c' ,
-  version : '1.0.1',
+  version : '1.2.0',
   license :  'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ,
   meson_version : '>= 0.61.1',
   default_options :  'warning_level=3',
@@ -94,6 +94,7 @@
   '-Wdeprecated-declarations',
   '-Wunused-result',
   '-Werror=return-type',
+  '-Werror=float-conversion',
 
 
 cc_flags = common_flags + 
@@ -101,6 +102,7 @@
   '-DFASTPATH',
 # '-DSPA_DEBUG_MEMCPY',
   '-Werror=implicit-function-declaration',
+  '-Werror=incompatible-pointer-types',
   '-Werror=int-conversion',
   '-Werror=old-style-declaration',
   '-Werror=old-style-definition',
@@ -220,6 +222,8 @@
 cdata.set_quoted('PLUGINDIR', spa_plugindir)
 cdata.set_quoted('SPADATADIR', spa_datadir)
 cdata.set_quoted('PA_ALSA_DATA_DIR', alsadatadir)
+cdata.set('RTPRIO_SERVER', get_option('rtprio-server'))
+cdata.set('RTPRIO_CLIENT', get_option('rtprio-client'))
 
 if host_machine.endian() == 'big'
   cdata.set('WORDS_BIGENDIAN', 1)
@@ -343,6 +347,9 @@
 
 gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings'))
 summary({'GIO (GSettings)': gio_dep.found()}, bool_yn: true, section: 'Misc dependencies')
+if not gio_dep.found() and get_option('gsettings-pulse-schema').enabled()
+  error('`gsettings-pulse-schema` is enabled but `gio` was not found.')
+endif
 
 gst_option = get_option('gstreamer')
 gst_deps_def = {
@@ -359,6 +366,7 @@
 }
 
 gst_dep = 
+gst_dma_drm_found = false
 foreach depname, kwargs: gst_deps_def
   dep = dependency(depname, required: gst_option, kwargs: kwargs)
   summary({depname: dep.found()}, bool_yn: true, section: 'GStreamer modules')
@@ -371,6 +379,10 @@
     break
   endif
   gst_dep += dep
+
+  if depname == 'gstreamer-allocators-1.0' and dep.version().version_compare('>= 1.23.1')
+    gst_dma_drm_found = true
+  endif
 endforeach
 
 # This code relies on the array being empty if any dependency was not found
@@ -379,18 +391,26 @@
 
 cdata.set('HAVE_GSTREAMER_DEVICE_PROVIDER', get_option('gstreamer-device-provider').allowed())
 
-webrtc_dep = dependency('webrtc-audio-processing-1',
-  version : '>= 1.2' ,
-  required : false)
-cdata.set('HAVE_WEBRTC1', webrtc_dep.found())
-if webrtc_dep.found()
+summary({'gstreamer DMA_DRM support': gst_dma_drm_found}, bool_yn: true, section: 'Backend')
+cdata.set('HAVE_GSTREAMER_DMA_DRM', gst_dma_drm_found)
+
+if get_option('echo-cancel-webrtc').disabled()
+  webrtc_dep = dependency('', required: false)
   summary({'WebRTC Echo Canceling >= 1.2': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies')
 else
-  webrtc_dep = dependency('webrtc-audio-processing',
-    version : '>= 0.2', '< 1.0',
-    required : get_option('echo-cancel-webrtc'))
-  cdata.set('HAVE_WEBRTC', webrtc_dep.found())
-  summary({'WebRTC Echo Canceling < 1.0': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies')
+  webrtc_dep = dependency('webrtc-audio-processing-1',
+    version : '>= 1.2' ,
+    required : false)
+  cdata.set('HAVE_WEBRTC1', webrtc_dep.found())
+  if webrtc_dep.found()
+    summary({'WebRTC Echo Canceling >= 1.2': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies')
+  else
+    webrtc_dep = dependency('webrtc-audio-processing',
+      version : '>= 0.2', '< 1.0',
+      required : get_option('echo-cancel-webrtc'))
+    cdata.set('HAVE_WEBRTC', webrtc_dep.found())
+    summary({'WebRTC Echo Canceling < 1.0': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies')
+  endif
 endif
 
 # On FreeBSD and MidnightBSD, epoll-shim library is required for eventfd() and timerfd()
@@ -430,6 +450,22 @@
 
 libffado_dep = dependency('libffado', required: get_option('libffado'))
 summary({'ffado': libffado_dep.found()}, bool_yn: true)
+glib2_snap_dep = dependency('glib-2.0', required : get_option('snap'))
+gio2_snap_dep = dependency('gio-2.0', required : get_option('snap'))
+apparmor_snap_dep = dependency('libapparmor', required : get_option('snap'))
+if dependency('snapd-glib-2', required: false).found()
+  snap_dep = dependency('snapd-glib-2', required : get_option('snap'))
+else
+  snap_dep = dependency('snapd-glib', required : get_option('snap'))
+endif
+if snap_dep.found() and glib2_snap_dep.found() and gio2_snap_dep.found() and apparmor_snap_dep.found()
+  cdata.set('HAVE_SNAP', true)
+  snap_deps = glib2_snap_dep, gio2_snap_dep, snap_dep, apparmor_snap_dep
+endif
+summary({'GLib-2.0 (Snap support)': glib2_snap_dep.found()}, bool_yn: true, section: 'Misc dependencies')
+summary({'Gio-2.0 (Snap support)': gio2_snap_dep.found()}, bool_yn: true, section: 'Misc dependencies')
+summary({'Apparmor (Snap support)': apparmor_snap_dep.found()}, bool_yn: true, section: 'Misc dependencies')
+summary({'Snapd-glib (Snap support)': snap_dep.found()}, bool_yn: true, section: 'Misc dependencies')
 
 check_functions = 
   'gettid', '#include <unistd.h>', '-D_GNU_SOURCE', ,
@@ -487,7 +523,7 @@
 
 generate_docs = get_option('man').enabled() or get_option('docs').enabled()
 if get_option('man').allowed() or get_option('docs').allowed()
-  doxygen = find_program('doxygen', required : generate_docs)
+  doxygen = find_program('doxygen', required : generate_docs, version : '>=1.9')
   pymod = import('python')
   python = pymod.find_installation('python3', required: generate_docs)
   generate_docs = doxygen.found() and python.found()

pipewire-1.0.1.tar.bz2/meson_options.txt -> pipewire-1.2.0.tar.gz/meson_options.txt Changed

@@ -306,6 +306,18 @@
        description : 'PAM match rule for the generated limits.d file. @<name> denotes matching a group.',
        type : 'string',
        value: '@pipewire')
+option('rtprio-server',
+       description : 'PipeWire server realtime priority',
+       type : 'integer',
+       min: 11,
+       max: 99,
+       value: 88)
+option('rtprio-client',
+       description : 'PipeWire clients realtime priority',
+       type : 'integer',
+       min: 11,
+       max: 99,
+       value: 83)
 option('rlimits-rtprio',
        description : 'RR and FIFO scheduler priority permitted for realtime threads of the matching user(s)',
        type : 'integer',
@@ -330,3 +342,19 @@
        description: 'Enable code that depends on libffado',
        type: 'feature',
        value: 'auto')
+option('gsettings-pulse-schema',
+       description: 'Install gsettings schema for pulseaudio',
+       type: 'feature',
+       value: 'auto')
+option('snap',
+       description : 'Enable Snap permissions support.',
+       type : 'feature',
+       value : 'auto')
+option('doc-prefix-value',
+       description : 'Installation prefix to show in documentation instead of the actual value.',
+       type : 'string',
+       value : '')
+option('doc-sysconfdir-value',
+       description : 'Sysconf data directory to show in documentation instead of the actual value.',
+       type : 'string',
+       value : '')

pipewire-1.0.1.tar.bz2/pipewire-alsa/alsa-plugins/ctl_pipewire.c -> pipewire-1.2.0.tar.gz/pipewire-alsa/alsa-plugins/ctl_pipewire.c Changed

pipewire-1.0.1.tar.bz2/pipewire-alsa/alsa-plugins/pcm_pipewire.c -> pipewire-1.2.0.tar.gz/pipewire-alsa/alsa-plugins/pcm_pipewire.c Changed

@@ -56,7 +56,6 @@
 	unsigned int draining:1;
 	unsigned int xrun_detected:1;
 	unsigned int hw_params_changed:1;
-	unsigned int active:1;
 	unsigned int negotiated:1;
 
 	snd_pcm_uframes_t hw_ptr;
@@ -79,7 +78,7 @@
 	struct spa_hook stream_listener;
 
 	int64_t delay;
-	uint64_t transfered;
+	uint64_t transferred;
 	uint64_t buffered;
 	int64_t now;
 	uintptr_t seq;
@@ -94,6 +93,7 @@
 	snd_pcm_pipewire_t *pw = io->private_data;
 	snd_pcm_sframes_t avail;
 	bool active;
+	uint64_t val;
 
 	avail = snd_pcm_ioplug_avail(io, pw->hw_ptr, io->appl_ptr);
 
@@ -112,20 +112,17 @@
 	else {
 		active = false;
 	}
-	if (pw->active != active) {
-		uint64_t val;
 
-		pw_log_trace("%p: avail:%lu min-avail:%lu state:%s hw:%lu appl:%lu active:%d->%d state:%s",
-			pw, avail, pw->min_avail, snd_pcm_state_name(io->state),
-			pw->hw_ptr, io->appl_ptr, pw->active, active,
-			snd_pcm_state_name(io->state));
+	pw_log_trace("%p: avail:%lu min-avail:%lu state:%s hw:%lu appl:%lu active:%d state:%s",
+		pw, avail, pw->min_avail, snd_pcm_state_name(io->state),
+		pw->hw_ptr, io->appl_ptr, active,
+		snd_pcm_state_name(io->state));
+
+	if (active)
+		spa_system_eventfd_write(pw->system, io->poll_fd, 1);
+	else
+		spa_system_eventfd_read(pw->system, io->poll_fd, &val);
 
-		pw->active = active;
-		if (active)
-			spa_system_eventfd_write(pw->system, io->poll_fd, 1);
-		else
-			spa_system_eventfd_read(pw->system, io->poll_fd, &val);
-	}
 	return active;
 }
 
@@ -200,13 +197,12 @@
 	snd_pcm_pipewire_t *pw = io->private_data;
 	uintptr_t seq1, seq2;
 	int64_t elapsed = 0, delay, now, avail;
-	struct timespec ts;
 	int64_t diff;
 
 	do {
 		seq1 = SPA_SEQ_READ(pw->seq);
 
-		delay = pw->delay + pw->transfered;
+		delay = pw->delay + pw->transferred;
 		now = pw->now;
 		if (io->stream == SND_PCM_STREAM_PLAYBACK)
 			avail = snd_pcm_ioplug_hw_avail(io, pw->hw_ptr, io->appl_ptr);
@@ -218,8 +214,7 @@
 
 	if (now != 0 && (io->state == SND_PCM_STATE_RUNNING ||
 	    io->state == SND_PCM_STATE_DRAINING)) {
-		clock_gettime(CLOCK_MONOTONIC, &ts);
-		diff = SPA_TIMESPEC_TO_NSEC(&ts) - now;
+		diff = pw_stream_get_nsec(pw->stream) - now;
 		elapsed = (io->rate * diff) / SPA_NSEC_PER_SEC;
 
 		if (io->stream == SND_PCM_STREAM_PLAYBACK)
@@ -421,7 +416,7 @@
 	SPA_SEQ_WRITE(pw->seq);
 
 	if (pw->now != pwt.now) {
-		pw->transfered = pw->buffered;
+		pw->transferred = pw->buffered;
 		pw->buffered = 0;
 	}
 
@@ -430,10 +425,10 @@
 	pw->delay = delay;
 	/* the buffer is now queued in the stream and consumed */
 	if (io->stream == SND_PCM_STREAM_PLAYBACK)
-		pw->transfered += xfer;
+		pw->transferred += xfer;
 
-	/* more then requested data transfered, use them in next iteration */
-	pw->buffered = (want == 0 || pw->transfered < want) ?  0 : (pw->transfered % want);
+	/* more then requested data transferred, use them in next iteration */
+	pw->buffered = (want == 0 || pw->transferred < want) ?  0 : (pw->transferred % want);
 
 	pw->now = pwt.now;
 	SPA_SEQ_WRITE(pw->seq);
@@ -504,7 +499,12 @@
 
 	snd_pcm_sw_params_alloca(&swparams);
 	if (snd_pcm_sw_params_current(io->pcm, swparams) == 0) {
-		snd_pcm_sw_params_get_avail_min(swparams, &pw->min_avail);
+		int event;
+		snd_pcm_sw_params_get_period_event(swparams, &event);
+		if (event)
+			pw->min_avail = io->period_size;
+		else
+			snd_pcm_sw_params_get_avail_min(swparams, &pw->min_avail);
 		snd_pcm_sw_params_get_boundary(swparams, &pw->boundary);
 		snd_pcm_sw_params_dump(swparams, pw->output);
 		fflush(pw->log_file);
@@ -530,8 +530,10 @@
 	params0 = spa_format_audio_raw_build(&b, SPA_PARAM_EnumFormat, &pw->format);
 
 	if (pw->stream != NULL) {
+		pw_stream_set_active(pw->stream, false);
 		pw_stream_update_properties(pw->stream, &pw->props->dict);
 		pw_stream_update_params(pw->stream, params, 1);
+		pw_stream_set_active(pw->stream, true);
 		goto done;
 	}
 
@@ -1252,7 +1254,12 @@
 	pw_core_add_listener(pw->core, &pw->core_listener, &core_events, pw);
 	pw_thread_loop_unlock(pw->main_loop);
 
-	pw->fd = spa_system_eventfd_create(pw->system, SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
+	pw->fd = spa_system_eventfd_create(pw->system,
+			SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
+	if (pw->fd < 0) {
+		err = pw->fd;
+		goto error;
+	}
 
 	pw->io.version = SND_PCM_IOPLUG_VERSION;
 	pw->io.name = "ALSA <-> PipeWire PCM I/O Plugin";
@@ -1298,7 +1305,7 @@
 	int err;
 
 	pw_init(NULL, NULL);
-	if (strstr(pw_get_library_version(), "0.2") != NULL)
+	if (spa_strstartswith(pw_get_library_version(), "0.2"))
 		return -ENOTSUP;
 
 	props = pw_properties_new(NULL, NULL);

pipewire-1.0.1.tar.bz2/pipewire-jack/src/metadata.c -> pipewire-1.2.0.tar.gz/pipewire-jack/src/metadata.c Changed

@@ -324,7 +324,8 @@
 int jack_remove_property (jack_client_t* client, jack_uuid_t subject, const char* key)
 {
 	struct client *c = (struct client *) client;
-	uint32_t id;
+	struct object *o;
+	uint32_t serial;
 	int res = -1;
 
 	spa_return_val_if_fail(c != NULL, -EINVAL);
@@ -335,11 +336,16 @@
 	if (c->metadata == NULL)
 		goto done;
 
-	id = jack_uuid_to_index(subject);
+	if (subject & (1<<30))
+		goto done;
+
+	serial = jack_uuid_to_index(subject);
+	if ((o = find_by_serial(c, serial)) == NULL)
+		goto done;
 
-	pw_log_info("remove id:%u (%"PRIu64") '%s'", id, subject, key);
+	pw_log_info("remove id:%u (%"PRIu64") '%s'", o->id, subject, key);
 	pw_metadata_set_property(c->metadata->proxy,
-			id, key, NULL, NULL);
+			o->id, key, NULL, NULL);
 	res = do_sync(c);
 done:
 	pw_thread_loop_unlock(c->context.loop);
@@ -351,7 +357,8 @@
 int jack_remove_properties (jack_client_t* client, jack_uuid_t subject)
 {
 	struct client *c = (struct client *) client;
-	uint32_t id;
+	struct object *o;
+	uint32_t serial;
 	int res = -1;
 
 	spa_return_val_if_fail(c != NULL, -EINVAL);
@@ -360,11 +367,16 @@
 	if (c->metadata == NULL)
 		goto done;
 
-	id = jack_uuid_to_index(subject);
+	if (subject & (1<<30))
+		goto done;
 
-	pw_log_info("remove id:%u (%"PRIu64")", id, subject);
+	serial = jack_uuid_to_index(subject);
+	if ((o = find_by_serial(c, serial)) == NULL)
+		goto done;
+
+	pw_log_info("remove id:%u (%"PRIu64")", o->id, subject);
 	pw_metadata_set_property(c->metadata->proxy,
-			id, NULL, NULL, NULL);
+			o->id, NULL, NULL, NULL);
 	res = do_sync(c);
 done:
 	pw_thread_loop_unlock(c->context.loop);
@@ -396,8 +408,9 @@
 	struct client *c = (struct client *) client;
 
 	spa_return_val_if_fail(c != NULL, -EINVAL);
-
+	pw_thread_loop_lock(c->context.loop);
 	c->property_callback = callback;
 	c->property_arg = arg;
+	pw_thread_loop_unlock(c->context.loop);
 	return 0;
 }

pipewire-1.0.1.tar.bz2/pipewire-jack/src/pipewire-jack.c -> pipewire-1.2.0.tar.gz/pipewire-jack/src/pipewire-jack.c Changed

@@ -45,7 +45,7 @@
  * with mlockall() on many systems */
 #define THREAD_STACK 524288
 
-#define DEFAULT_RT_MAX	88
+#define DEFAULT_RT_MAX	RTPRIO_CLIENT
 
 #define JACK_CLIENT_NAME_SIZE		256
 #define JACK_PORT_NAME_SIZE		256
@@ -75,6 +75,10 @@
 #define SELF_CONNECT_FAIL_ALL	-2
 #define SELF_CONNECT_IGNORE_ALL	2
 
+#define OTHER_CONNECT_ALLOW	1
+#define OTHER_CONNECT_FAIL	-1
+#define OTHER_CONNECT_IGNORE	0
+
 #define NOTIFY_BUFFER_SIZE	(1u<<13)
 #define NOTIFY_BUFFER_MASK	(NOTIFY_BUFFER_SIZE-1)
 
@@ -106,6 +110,7 @@
 	struct pw_array descriptions;
 	struct spa_list free_objects;
 	struct spa_thread_utils *thread_utils;
+	uint32_t max_frames;
 };
 
 static struct globals globals;
@@ -223,7 +228,7 @@
 	struct port *port;
 	struct port *peer_port;
 
-	struct spa_io_buffers *io;
+	struct spa_io_buffers *io2;
 
 	struct buffer buffersMAX_BUFFERS;
 	uint32_t n_buffers;
@@ -249,7 +254,7 @@
 #define N_PORT_PARAMS	5
 	struct spa_param_info paramsN_PORT_PARAMS;
 
-	struct spa_io_buffers io;
+	struct spa_io_buffers io2;
 	struct spa_list mix;
 	uint32_t n_mix;
 	struct mix *global_mix;
@@ -273,6 +278,7 @@
 	struct pw_memmap *mem;
 	struct pw_node_activation *activation;
 	int signalfd;
+	void (*trigger) (struct link *l, uint64_t nsec);
 };
 
 struct context {
@@ -414,6 +420,9 @@
 		struct spa_io_position *position;
 		struct pw_node_activation *driver_activation;
 		struct spa_list target_links;
+		unsigned int prepared:1;
+		unsigned int first:1;
+		unsigned int thread_entered:1;
 	} rt;
 
 	pthread_mutex_t rt_lock;
@@ -423,8 +432,6 @@
 	unsigned int started:1;
 	unsigned int active:1;
 	unsigned int destroyed:1;
-	unsigned int first:1;
-	unsigned int thread_entered:1;
 	unsigned int has_transport:1;
 	unsigned int allow_mlock:1;
 	unsigned int warn_mlock:1;
@@ -438,18 +445,19 @@
 	unsigned int locked_process:1;
 	unsigned int default_as_system:1;
 	int self_connect_mode;
+	int other_connect_mode;
 	int rt_max;
 	unsigned int fix_midi_events:1;
 	unsigned int global_buffer_size:1;
 	unsigned int global_sample_rate:1;
 	unsigned int passive_links:1;
-	unsigned int graph_callback_pending:1;
 	unsigned int pending_callbacks:1;
 	int frozen_callbacks;
 	char filter_char;
 	uint32_t max_ports;
 	unsigned int fill_aliases:1;
 	unsigned int writable_input:1;
+	unsigned int async:1;
 
 	uint32_t max_frames;
 
@@ -559,6 +567,7 @@
 struct io_info {
 	struct mix *mix;
 	void *data;
+	size_t size;
 };
 
 static int
@@ -566,13 +575,35 @@
 		const void *data, size_t size, void *user_data)
 {
 	const struct io_info *info = data;
-	info->mix->io = info->data;
+	struct port *port = info->mix->port;
+	if (info->data) {
+		if (info->size >= sizeof(struct spa_io_async_buffers)) {
+			struct spa_io_async_buffers *ab = info->data;
+			info->mix->io0 = &ab->buffersport->direction;
+			info->mix->io1 = &ab->buffersport->direction^1;
+		} else if (info->size >= sizeof(struct spa_io_buffers)) {
+			info->mix->io0 = info->data;
+			info->mix->io1 = info->data;
+		} else {
+			info->mix->io0 = NULL;
+			info->mix->io1 = NULL;
+		}
+		if (port->n_mix++ == 0 && port->global_mix != NULL) {
+			port->global_mix->io0 = &port->io0;
+			port->global_mix->io1 = &port->io1;
+		}
+	} else {
+		if (--port->n_mix == 0 && port->global_mix != NULL) {
+			port->global_mix->io0 = NULL;
+			port->global_mix->io1 = NULL;
+		}
+	}
 	return 0;
 }
 
-static inline void mix_set_io(struct mix *mix, void *data)
+static inline void mix_set_io(struct mix *mix, void *data, size_t size)
 {
-	struct io_info info = { .mix = mix, .data = data };
+	struct io_info info = { .mix = mix, .data = data, .size = size };
 	pw_data_loop_invoke(mix->port->client->loop,
 		do_mix_set_io, SPA_ID_INVALID, &info, sizeof(info), false, NULL);
 }
@@ -584,13 +615,14 @@
 	mix->peer_id = peer_id;
 	mix->port = port;
 	mix->peer_port = NULL;
-	mix->io = NULL;
+	mix->io0 = mix->io1 = NULL;
 	mix->n_buffers = 0;
 	spa_list_init(&mix->queue);
-	if (mix_id == SPA_ID_INVALID)
+	if (mix_id == SPA_ID_INVALID) {
 		port->global_mix = mix;
-	else if (port->n_mix++ == 0 && port->global_mix != NULL)
-		mix_set_io(port->global_mix, &port->io);
+		if (port->n_mix > 0)
+			mix_set_io(port->global_mix, &port->io, sizeof(port->io));
+	}
 }
 static struct mix *find_mix_peer(struct client *c, uint32_t peer_id)
 {
@@ -677,8 +709,6 @@
 	spa_list_remove(&mix->port_link);
 	if (mix->id == SPA_ID_INVALID)
 		port->global_mix = NULL;
-	else if (--port->n_mix == 0 && port->global_mix != NULL)
-		mix_set_io(port->global_mix, NULL);
 	spa_list_remove(&mix->link);
 	spa_list_append(&c->free_mix, &mix->link);
 }
@@ -1346,6 +1376,10 @@
 	return b;
 }
 
+static inline bool is_osc(jack_midi_event_t *ev)
+{
+	return ev->size >= 1 && (ev->buffer0 == '#' || ev->buffer0 == '/');
+}
 
 static size_t convert_from_midi(void *midi, void *buffer, size_t size)
 {
@@ -1361,7 +1395,8 @@
 	for (i = 0; i < count; i++) {
 		jack_midi_event_t ev;
 		jack_midi_event_get(&ev, midi, i);
-		spa_pod_builder_control(&b, ev.time, SPA_CONTROL_Midi);
+		spa_pod_builder_control(&b, ev.time,
+				is_osc(&ev) ? SPA_CONTROL_OSC : SPA_CONTROL_Midi);
 		spa_pod_builder_bytes(&b, ev.buffer, ev.size);
 	}
 	spa_pod_builder_pop(&b, &f);
@@ -1450,6 +1485,7 @@
 			break;
 
 		switch(next->type) {
+		case SPA_CONTROL_OSC:
 		case SPA_CONTROL_Midi:
 		{
 			uint8_t *data = SPA_POD_BODY(&next->value);
@@ -1474,6 +1510,7 @@
 	struct buffer *b;
 	struct spa_data *d;
 	struct spa_io_buffers *io;
+	uint32_t cycle = p->client->rt.position->clock.cycle & 1;
 
 	if (frames == 0 || !p->valid)
 		return NULL;
@@ -1485,7 +1522,7 @@
 			c, p->object->port.name, p->port_id, frames,
 			mix->n_buffers, mix->io);
 
-	if (SPA_UNLIKELY((io = mix->io) == NULL || mix->n_buffers == 0))
+	if (SPA_UNLIKELY((io = mix->iocycle) == NULL || mix->n_buffers == 0))
 		return NULL;
 
 	if (io->status == SPA_STATUS_HAVE_DATA &&
@@ -1508,7 +1545,7 @@
 		}
 		d = &b->datas0;
 		d->chunk->offset = 0;
-		d->chunk->size = frames * sizeof(float);
+		d->chunk->size = c->buffer_frames * sizeof(float);
 		d->chunk->stride = stride;
 
 		io->buffer_id = b->id;
@@ -1557,7 +1594,7 @@
 	}
 }
 
-static void prepare_output(struct port *p, uint32_t frames)
+static void prepare_output(struct port *p, uint32_t frames, uint32_t cycle)
 {
 	struct mix *mix;
 	struct spa_io_buffers *io;
@@ -1565,12 +1602,12 @@
 	if (SPA_UNLIKELY(p->empty_out || p->tied))
 		process_empty(p, frames);
 
-	if (p->global_mix == NULL || (io = p->global_mix->io) == NULL)
+	if (p->global_mix == NULL || (io = p->global_mix->iocycle) == NULL)
 		return;
 
 	spa_list_for_each(mix, &p->mix, port_link) {
-		if (SPA_LIKELY(mix->io != NULL))
-			*mix->io = *io;
+		if (SPA_LIKELY(mix->iocycle != NULL))
+			*mix->iocycle = *io;
 	}
 }
 
@@ -1579,6 +1616,7 @@
 	struct port *p;
 	struct mix *mix;
 	union pw_map_item *item;
+	uint32_t cycle = c->rt.position->clock.cycle & 1;
 
 	pw_array_for_each(item, &c->portsSPA_DIRECTION_OUTPUT.items) {
                 if (pw_map_item_is_free(item))
@@ -1586,8 +1624,8 @@
 		p = item->data;
 		if (!p->valid)
 			continue;
-		prepare_output(p, frames);
-		p->io.status = SPA_STATUS_NEED_DATA;
+		prepare_output(p, frames, cycle);
+		p->iocycle.status = SPA_STATUS_NEED_DATA;
 	}
 	pw_array_for_each(item, &c->portsSPA_DIRECTION_INPUT.items) {
                 if (pw_map_item_is_free(item))
@@ -1596,8 +1634,8 @@
 		if (!p->valid)
 			continue;
 		spa_list_for_each(mix, &p->mix, port_link) {
-			if (SPA_LIKELY(mix->io != NULL))
-				mix->io->status = SPA_STATUS_NEED_DATA;
+			if (SPA_LIKELY(mix->iocycle != NULL))
+				mix->iocycle->status = SPA_STATUS_NEED_DATA;
 		}
         }
 }
@@ -1698,7 +1736,7 @@
 		running = s->clock.position - s->offset;
 		if (running >= seg->start &&
 		    (seg->duration == 0 || running < seg->start + seg->duration))
-			d->frame = (running - seg->start) * seg->rate + seg->position;
+			d->frame = (unsigned int)((running - seg->start) * seg->rate + seg->position);
 		else
 			d->frame = seg->position;
 	}
@@ -1720,12 +1758,12 @@
 
 		abs_beat = seg->bar.beat;
 
-		d->bar = abs_beat / d->beats_per_bar;
-		beats = d->bar * d->beats_per_bar;
+		d->bar = (int32_t) (abs_beat / d->beats_per_bar);
+		beats = (long int) (d->bar * d->beats_per_bar);
 		d->bar_start_tick = beats * d->ticks_per_beat;
-		d->beat = abs_beat - beats;
+		d->beat = (int32_t) (abs_beat - beats);
 		beats += d->beat;
-		d->tick = (abs_beat - beats) * d->ticks_per_beat;
+		d->tick = (int32_t) ((abs_beat - beats) * d->ticks_per_beat);
 		d->bar++;
 		d->beat++;
 	}
@@ -1761,13 +1799,6 @@
 	return c->sample_rate == sample_rate;
 }
 
-static inline uint64_t get_time_ns(void)
-{
-	struct timespec ts;
-	clock_gettime(CLOCK_MONOTONIC, &ts);
-	return SPA_TIMESPEC_TO_NSEC(&ts);
-}
-
 static inline uint32_t cycle_run(struct client *c)
 {
 	uint64_t cmd;
@@ -1786,16 +1817,25 @@
 		}
 		break;
 	}
-	if (SPA_UNLIKELY(cmd > 1))
+	if (SPA_UNLIKELY(cmd > 1)) {
 		pw_log_info("%p: missed %"PRIu64" wakeups", c, cmd - 1);
+		activation->xrun_count += cmd - 1;
+		activation->xrun_time = activation->awake_time;
+		activation->xrun_delay = 0;
+		activation->max_delay = SPA_MAX(activation->max_delay, 0u);
+	}
+
+	if (!SPA_ATOMIC_CAS(activation->status,
+				PW_NODE_ACTIVATION_TRIGGERED,
+				PW_NODE_ACTIVATION_AWAKE))
+		return 0;
 
-	activation->status = PW_NODE_ACTIVATION_AWAKE;
-	activation->awake_time = get_time_ns();
+	activation->awake_time = get_time_ns(c->l->system);
 
-	if (SPA_UNLIKELY(c->first)) {
+	if (SPA_UNLIKELY(c->rt.first)) {
 		if (c->thread_init_callback)
 			c->thread_init_callback(c->thread_init_arg);
-		c->first = false;
+		c->rt.first = false;
 	}
 
 	if (SPA_UNLIKELY(pos == NULL)) {
@@ -1845,40 +1885,75 @@
 	return nframes;
 }
 
-static inline void signal_sync(struct client *c)
+static void trigger_link_v1(struct link *l, uint64_t nsec)
 {
-	uint64_t cmd, nsec;
-	struct link *l;
-	struct pw_node_activation *activation = c->activation;
+	struct client *c = l->client;
+	struct pw_node_activation *a = l->activation;
+	struct pw_node_activation_state *state = &a->state0;
+	uint64_t cmd = 1;
+
+	pw_log_trace_fp("%p: link %p-%d %p %d/%d", c, l, l->node_id, state,
+			state->pending, state->required);
+
+	if (pw_node_activation_state_dec(state)) {
+		if (SPA_ATOMIC_CAS(a->status,
+					PW_NODE_ACTIVATION_NOT_TRIGGERED,
+					PW_NODE_ACTIVATION_TRIGGERED)) {
+			a->signal_time = nsec;
 
-	complete_process(c, c->buffer_frames);
+			pw_log_trace_fp("%p: signal %p %p", c, l, state);
 
-	nsec = get_time_ns();
-	activation->status = PW_NODE_ACTIVATION_FINISHED;
-	activation->finish_time = nsec;
+			if (SPA_UNLIKELY(write(l->signalfd, &cmd, sizeof(cmd)) != sizeof(cmd)))
+				pw_log_warn("%p: write failed %m", c);
+		}
+	}
+}
 
-	cmd = 1;
-	spa_list_for_each(l, &c->rt.target_links, target_link) {
-		struct pw_node_activation_state *state;
+static void trigger_link_v0(struct link *l, uint64_t nsec)
+{
+	struct client *c = l->client;
+	struct pw_node_activation *a = l->activation;
+	struct pw_node_activation_state *state = &a->state0;
+	uint64_t cmd = 1;
 
-		if (SPA_UNLIKELY(l->activation == NULL))
-			continue;
+	pw_log_trace_fp("%p: link %p-%d %p %d/%d", c, l, l->node_id, state,
+			state->pending, state->required);
 
-		state = &l->activation->state0;
+	if (pw_node_activation_state_dec(state)) {
+		SPA_ATOMIC_STORE(a->status, PW_NODE_ACTIVATION_TRIGGERED);
+		a->signal_time = nsec;
 
-		pw_log_trace_fp("%p: link %p %p %d/%d", c, l, state,
-				state->pending, state->required);
+		pw_log_trace_fp("%p: signal %p %p", c, l, state);
 
-		if (pw_node_activation_state_dec(state)) {
-			l->activation->status = PW_NODE_ACTIVATION_TRIGGERED;
-			l->activation->signal_time = nsec;
+		if (SPA_UNLIKELY(write(l->signalfd, &cmd, sizeof(cmd)) != sizeof(cmd)))
+			pw_log_warn("%p: write failed %m", c);
+	}
+}
 
-			pw_log_trace_fp("%p: signal %p %p", c, l, state);
+static inline void deactivate_link(struct client *c, struct link *l, uint64_t trigger)
+{
+	if (!c->async && trigger != 0)
+		l->trigger(l, trigger);
+}
 
-			if (SPA_UNLIKELY(write(l->signalfd, &cmd, sizeof(cmd)) != sizeof(cmd)))
-				pw_log_warn("%p: write failed %m", c);
-		}
-	}
+static inline void signal_sync(struct client *c)
+{
+	uint64_t nsec;
+	struct link *l;
+	struct pw_node_activation *activation = c->activation;
+	int old_status;
+
+	complete_process(c, c->buffer_frames);
+
+	nsec = get_time_ns(c->l->system);
+	old_status = SPA_ATOMIC_XCHG(activation->status, PW_NODE_ACTIVATION_FINISHED);
+	activation->finish_time = nsec;
+
+	if (c->async || old_status != PW_NODE_ACTIVATION_AWAKE)
+		return;
+
+	spa_list_for_each(l, &c->rt.target_links, target_link)
+		l->trigger(l, nsec);
 }
 
 static inline void cycle_signal(struct client *c, int status)
@@ -1918,8 +1993,8 @@
 		return;
 	}
 	if (SPA_UNLIKELY(c->thread_callback)) {
-		if (!c->thread_entered) {
-			c->thread_entered = true;
+		if (!c->rt.thread_entered) {
+			c->rt.thread_entered = true;
 			c->thread_callback(c->thread_arg);
 		}
 	} else if (SPA_LIKELY(mask & SPA_IO_IN)) {
@@ -1994,6 +2069,8 @@
 	pw_log_debug("%p: create client transport with fds %d %d for node %u",
 			c, readfd, writefd, c->node_id);
 
+	c->activation->client_version = PW_VERSION_NODE_ACTIVATION;
+
 	close(writefd);
 	c->socket_source = pw_loop_add_io(c->l,
 					  readfd,
@@ -2057,7 +2134,7 @@
 	c->rt.position = c->position;
 	c->rt.driver_activation = c->driver_activation;
 	if (c->position) {
-		pw_log_info("%p: driver:%d clock:%s", c,
+		pw_log_debug("%p: driver:%d clock:%s", c,
 				c->driver_id, c->position->clock.name);
 		check_sample_rate(c, c->position);
 		check_buffer_frames(c, c->position);
@@ -2099,6 +2176,37 @@
 	return 0;
 }
 
+static int
+do_memmap_free(struct spa_loop *loop,
+                bool async, uint32_t seq, const void *data, size_t size, void *user_data)
+{
+	struct client *c = user_data;
+	struct pw_memmap *mm = *((struct pw_memmap **)data);
+	pw_log_trace("memmap %p free", mm);
+	pw_memmap_free(mm);
+	pw_core_set_paused(c->core, false);
+	return 0;
+}
+
+static int
+do_queue_memmap_free(struct spa_loop *loop,
+                bool async, uint32_t seq, const void *data, size_t size, void *user_data)
+{
+	struct client *c = user_data;
+	pw_loop_invoke(c->context.l, do_memmap_free, 0, data, size, false, c);
+	return 0;
+}
+
+static void queue_memmap_free(struct client *c, struct pw_memmap *mem)
+{
+	if (mem != NULL) {
+		mem->tag0 = SPA_ID_INVALID;
+		pw_core_set_paused(c->core, true);
+		pw_data_loop_invoke(c->loop,
+			do_queue_memmap_free, SPA_ID_INVALID, &mem, sizeof(&mem), false, c);
+	}
+}
+
 static int client_node_set_io(void *data,
 			uint32_t id,
 			uint32_t mem_id,
@@ -2131,6 +2239,9 @@
 		c->position = ptr;
 		c->driver_id = ptr ? c->position->clock.id : SPA_ID_INVALID;
 		update_driver_activation(c);
+		c->activation->active_driver_id = c->driver_id;
+		queue_memmap_free(c, old);
+		old = NULL;
 		break;
 	default:
 		break;
@@ -2145,6 +2256,54 @@
 	return -ENOTSUP;
 }
 
+static int do_prepare_client(struct spa_loop *loop, bool async, uint32_t seq,
+		const void *data, size_t size, void *user_data)
+{
+	struct client *c = user_data;
+
+	pw_log_debug("%p prepared:%d ", c, c->rt.prepared);
+	if (c->rt.prepared)
+		return 0;
+
+	SPA_ATOMIC_STORE(c->activation->status, PW_NODE_ACTIVATION_FINISHED);
+	pw_loop_update_io(c->l,
+			  c->socket_source,
+			  SPA_IO_IN | SPA_IO_ERR | SPA_IO_HUP);
+
+	c->rt.first = true;
+	c->rt.thread_entered = false;
+	c->rt.prepared = true;
+	return 0;
+}
+
+static int do_unprepare_client(struct spa_loop *loop, bool async, uint32_t seq,
+		const void *data, size_t size, void *user_data)
+{
+	struct client *c = user_data;
+	int old_state;
+	uint64_t trigger = 0;
+	struct link *l;
+
+	pw_log_debug("%p prepared:%d ", c, c->rt.prepared);
+	if (!c->rt.prepared)
+		return 0;
+
+	old_state = SPA_ATOMIC_XCHG(c->activation->status, PW_NODE_ACTIVATION_INACTIVE);
+	if (old_state != PW_NODE_ACTIVATION_FINISHED)
+		trigger = get_time_ns(c->l->system);
+
+	spa_list_for_each(l, &c->rt.target_links, target_link) {
+		if (!c->async && trigger != 0)
+			l->trigger(l, trigger);
+	}
+
+	pw_loop_update_io(c->l,
+			  c->socket_source, SPA_IO_ERR | SPA_IO_HUP);
+
+	c->rt.prepared = false;
+	return 0;
+}
+
 static int client_node_command(void *data, const struct spa_command *command)
 {
 	struct client *c = (struct client *) data;
@@ -2155,21 +2314,17 @@
 	case SPA_NODE_COMMAND_Suspend:
 	case SPA_NODE_COMMAND_Pause:
 		if (c->started) {
-			pw_loop_update_io(c->l,
-					  c->socket_source, SPA_IO_ERR | SPA_IO_HUP);
-
+			pw_data_loop_invoke(c->loop,
+				do_unprepare_client, SPA_ID_INVALID, NULL, 0, false, c);
 			c->started = false;
 		}
 		break;
 
 	case SPA_NODE_COMMAND_Start:
 		if (!c->started) {
-			pw_loop_update_io(c->l,
-					  c->socket_source,
-					  SPA_IO_IN | SPA_IO_ERR | SPA_IO_HUP);
+			pw_data_loop_invoke(c->loop,
+				do_prepare_client, SPA_ID_INVALID, NULL, 0, false, c);
 			c->started = true;
-			c->first = true;
-			c->thread_entered = false;
 		}
 		break;
 	default:
@@ -2303,6 +2458,15 @@
 	return 1;
 }
 
+static int param_io_async(struct client *c, struct port *p,
+		struct spa_pod **param, struct spa_pod_builder *b)
+{
+	*param = spa_pod_builder_add_object(b,
+		SPA_TYPE_OBJECT_ParamIO, SPA_PARAM_IO,
+		SPA_PARAM_IO_id,	SPA_POD_Id(SPA_IO_AsyncBuffers),
+		SPA_PARAM_IO_size,	SPA_POD_Int(sizeof(struct spa_io_async_buffers)));
+	return 1;
+}
 static int param_latency(struct client *c, struct port *p,
 		struct spa_pod **param, struct spa_pod_builder *b)
 {
@@ -2323,7 +2487,7 @@
 static int port_set_format(struct client *c, struct port *p,
 		uint32_t flags, const struct spa_pod *param)
 {
-	struct spa_pod *params6;
+	struct spa_pod *params7;
 	uint8_t buffer4096;
 	struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
 
@@ -2384,8 +2548,9 @@
 	param_format(c, p, &params1, &b);
 	param_buffers(c, p, &params2, &b);
 	param_io(c, p, &params3, &b);
-	param_latency(c, p, &params4, &b);
-	param_latency_other(c, p, &params5, &b);
+	param_io_async(c, p, &params4, &b);
+	param_latency(c, p, &params5, &b);
+	param_latency_other(c, p, &params6, &b);
 
 	pw_client_node_port_update(c->node,
 					 p->direction,
@@ -2403,7 +2568,7 @@
 static void port_update_latency(struct port *p)
 {
 	struct client *c = p->client;
-	struct spa_pod *params6;
+	struct spa_pod *params7;
 	uint8_t buffer4096;
 	struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
 
@@ -2411,8 +2576,9 @@
 	param_format(c, p, &params1, &b);
 	param_buffers(c, p, &params2, &b);
 	param_io(c, p, &params3, &b);
-	param_latency(c, p, &params4, &b);
-	param_latency_other(c, p, &params5, &b);
+	param_io_async(c, p, &params4, &b);
+	param_latency(c, p, &params5, &b);
+	param_latency_other(c, p, &params6, &b);
 
 	pw_log_info("port %s: update", p->object->port.name);
 
@@ -2568,18 +2734,18 @@
 	return 0;
 }
 
-static void midi_init_buffer(void *data, uint32_t max_frames)
+static void midi_init_buffer(void *data, uint32_t max_frames, uint32_t nframes)
 {
 	struct midi_buffer *mb = data;
 	mb->magic = MIDI_BUFFER_MAGIC;
 	mb->buffer_size = max_frames * sizeof(float);
-	mb->nframes = max_frames;
+	mb->nframes = nframes;
 	mb->write_pos = 0;
 	mb->event_count = 0;
 	mb->lost_events = 0;
 }
 
-static inline void *init_buffer(struct port *p)
+static inline void *init_buffer(struct port *p, uint32_t nframes)
 {
 	struct client *c = p->client;
 	void *data = p->emptyptr;
@@ -2588,8 +2754,9 @@
 
 	if (p->object->port.type_id == TYPE_ID_MIDI) {
 		struct midi_buffer *mb = data;
-		midi_init_buffer(data, c->max_frames);
-		pw_log_debug("port %p: init midi buffer size:%d", p, mb->buffer_size);
+		midi_init_buffer(data, c->max_frames, nframes);
+		pw_log_debug("port %p: init midi buffer size:%d frames:%d", p,
+				mb->buffer_size, nframes);
 	} else
 		memset(data, 0, c->max_frames * sizeof(float));
 
@@ -2746,26 +2913,6 @@
 	return res;
 }
 
-static int
-do_memmap_free(struct spa_loop *loop,
-                bool async, uint32_t seq, const void *data, size_t size, void *user_data)
-{
-	struct pw_memmap *mm = user_data;
-	pw_log_trace("memmap %p free", mm);
-	pw_memmap_free(mm);
-	return 0;
-}
-
-static int
-do_queue_memmap_free(struct spa_loop *loop,
-                bool async, uint32_t seq, const void *data, size_t size, void *user_data)
-{
-	struct client *c = user_data;
-	struct pw_memmap *mm = *((struct pw_memmap **)data);
-	pw_loop_invoke(c->context.l, do_memmap_free, 0, NULL, 0, false, mm);
-	return 0;
-}
-
 static int client_node_port_set_io(void *data,
                              enum spa_direction direction,
                              uint32_t port_id,
@@ -2797,8 +2944,8 @@
 
         if (mem_id == SPA_ID_INVALID) {
                 mm = ptr = NULL;
-        }
-        else {
+		size = 0;
+        } else {
 		mm = pw_mempool_map_id(c->pool, mem_id,
 				PW_MEMMAP_FLAG_READWRITE, offset, size, tag);
                 if (mm == NULL) {
@@ -2814,17 +2961,15 @@
 
 	switch (id) {
 	case SPA_IO_Buffers:
-		mix_set_io(mix, ptr);
-		if (old != NULL) {
-			old->tag0 = SPA_ID_INVALID;
-			pw_data_loop_invoke(c->loop,
-				do_queue_memmap_free, SPA_ID_INVALID, &old, sizeof(&old), false, c);
-			old = NULL;
-		}
+	case SPA_IO_AsyncBuffers:
+		mix_set_io(mix, ptr, size);
+		queue_memmap_free(c, old);
+		old = NULL;
 		break;
 	default:
 		break;
 	}
+
 exit_free:
 	pw_memmap_free(old);
 exit:
@@ -2834,27 +2979,63 @@
 }
 
 static int
-do_activate_link(struct spa_loop *loop,
+do_add_link(struct spa_loop *loop,
                 bool async, uint32_t seq, const void *data, size_t size, void *user_data)
 {
 	struct link *link = user_data;
 	struct client *c = link->client;
-	pw_log_trace("link %p activate", link);
+	pw_log_trace("link %p", link);
 	spa_list_append(&c->rt.target_links, &link->target_link);
 	return 0;
 }
 
 static int
-do_deactivate_link(struct spa_loop *loop,
+do_remove_link(struct spa_loop *loop,
                 bool async, uint32_t seq, const void *data, size_t size, void *user_data)
 {
 	struct link *link = user_data;
-	pw_log_trace("link %p activate", link);
+	struct client *c = link->client;
+
+	pw_log_trace("link %p", link);
 	spa_list_remove(&link->target_link);
-	free_link(link);
+
+	if (c->rt.prepared) {
+		int old_state = SPA_ATOMIC_LOAD(c->activation->status);
+		uint64_t trigger = 0;
+		if (old_state != PW_NODE_ACTIVATION_FINISHED)
+			trigger = get_time_ns(c->l->system);
+		deactivate_link(c, link, trigger);
+	}
+	return 0;
+}
+
+static int
+do_free_link(struct spa_loop *loop,
+                bool async, uint32_t seq, const void *data, size_t size, void *user_data)
+{
+	struct client *c = user_data;
+	struct link *l = *((struct link **)data);
+	free_link(l);
+	pw_core_set_paused(c->core, false);
+	return 0;
+}
+
+static int
+do_queue_free_link(struct spa_loop *loop,
+                bool async, uint32_t seq, const void *data, size_t size, void *user_data)
+{
+	struct client *c = user_data;
+	pw_loop_invoke(c->context.l, do_free_link, 0, data, size, false, c);
 	return 0;
 }
 
+static void queue_free_link(struct client *c, struct link *l)
+{
+	pw_core_set_paused(c->core, true);
+	pw_data_loop_invoke(c->loop,
+		do_queue_free_link, SPA_ID_INVALID, &l, sizeof(&l), false, c);
+}
+
 static int client_node_set_activation(void *data,
                              uint32_t node_id,
                              int signalfd,
@@ -2902,10 +3083,11 @@
 		link->mem = mm;
 		link->activation = ptr;
 		link->signalfd = signalfd;
+		link->trigger = link->activation->server_version < 1 ? trigger_link_v0 : trigger_link_v1;
 		spa_list_append(&c->links, &link->link);
 
 		pw_data_loop_invoke(c->loop,
-                       do_activate_link, SPA_ID_INVALID, NULL, 0, false, link);
+                       do_add_link, SPA_ID_INVALID, NULL, 0, false, link);
 	}
 	else {
 		link = find_activation(&c->links, node_id);
@@ -2916,7 +3098,8 @@
 		spa_list_remove(&link->link);
 
 		pw_data_loop_invoke(c->loop,
-                       do_deactivate_link, SPA_ID_INVALID, NULL, 0, false, link);
+                       do_remove_link, SPA_ID_INVALID, NULL, 0, false, link);
+		queue_free_link(c, link);
 	}
 
 	if (c->driver_id == node_id)
@@ -3241,18 +3424,28 @@
 	.destroy = proxy_destroy,
 };
 
+static bool node_is_active(struct client *c, struct object *n)
+{
+	return !n->node.is_jack ||
+		(c->node_id == n->id ? c->active : n->node.is_running);
+}
+
 static void node_info(void *data, const struct pw_node_info *info)
 {
 	struct object *n = data;
 	struct client *c = n->client;
-	const char *str;
+	bool active;
 
 	if (info->change_mask & PW_NODE_CHANGE_MASK_PROPS) {
-		str = spa_dict_lookup(info->props, PW_KEY_NODE_ALWAYS_PROCESS);
+		/* JACK clients always need ALWAYS_PROCESS=true or else they don't
+		 * conform to the JACK API. We would try to hide the ports of
+		 * PAUSED JACK clients, for example, even if they are active. */
+		const char *str = spa_dict_lookup(info->props, PW_KEY_NODE_ALWAYS_PROCESS);
 		n->node.is_jack = str ? spa_atob(str) : false;
 	}
 
-	n->node.is_running = !n->node.is_jack || (info->state == PW_NODE_STATE_RUNNING);
+	n->node.is_running = info->state == PW_NODE_STATE_RUNNING;
+	active = node_is_active(c, n);
 
 	pw_log_debug("DSP node %d %08"PRIx64" jack:%u state change %s running:%d", info->id,
 			info->change_mask, n->node.is_jack,
@@ -3264,7 +3457,7 @@
 			if (p->type != INTERFACE_Port || p->removed ||
 			    p->port.node_id != info->id)
 				continue;
-			if (n->node.is_running)
+			if (active)
 				queue_notify(c, NOTIFY_TYPE_PORTREGISTRATION, p, 1, NULL);
 			else {
 				spa_list_for_each(l, &c->context.objects, link) {
@@ -3492,7 +3685,7 @@
 			o->port.latencySPA_DIRECTION_INPUT = SPA_LATENCY_INFO(SPA_DIRECTION_INPUT);
 			o->port.latencySPA_DIRECTION_OUTPUT = SPA_LATENCY_INFO(SPA_DIRECTION_OUTPUT);
 
-			do_emit = !ot->node.is_jack || ot->node.is_running;
+			do_emit = node_is_active(c, ot);
 
 			o->proxy = pw_registry_bind(c->registry,
 				id, type, PW_VERSION_PORT, 0);
@@ -3785,7 +3978,7 @@
 
         if (getenv("PIPEWIRE_NOJACK") != NULL ||
             getenv("PIPEWIRE_INTERNAL") != NULL ||
-	    strstr(pw_get_library_version(), "0.2") != NULL)
+	    spa_strstartswith(pw_get_library_version(), "0.2"))
 		goto disabled;
 
 	return_val_if_fail(client_name != NULL, NULL);
@@ -3829,7 +4022,7 @@
 		client->server_name = NULL;
 
 	client->props = pw_properties_new(
-			"loop.cancel", "true",
+			PW_KEY_LOOP_CANCEL, "true",
 			PW_KEY_REMOTE_NAME, client->server_name,
 			PW_KEY_CLIENT_NAME, client_name,
 			PW_KEY_CLIENT_API, "jack",
@@ -3854,7 +4047,7 @@
 		goto no_props;
 	client->context.nl = pw_thread_loop_get_loop(client->context.notify);
 
-	client->max_frames = client->context.context->settings.clock_quantum_limit;
+	globals.max_frames = client->max_frames = client->context.context->settings.clock_quantum_limit;
 
 	client->notify_source = pw_loop_add_event(client->context.nl,
 			on_notify_event, client);
@@ -3930,7 +4123,7 @@
 		struct spa_fraction q;
 		if (sscanf(str, "%u/%u", &q.num, &q.denom) == 2 && q.denom != 0) {
 			pw_properties_setf(client->props, PW_KEY_NODE_FORCE_RATE,
-					"1/%u", q.denom);
+					"%u", q.denom);
 			pw_properties_setf(client->props, PW_KEY_NODE_FORCE_QUANTUM,
 					"%u", q.num);
 		} else {
@@ -4012,6 +4205,7 @@
 	client->max_ports = pw_properties_get_uint32(client->props, "jack.max-client-ports", MAX_CLIENT_PORTS);
 	client->fill_aliases = pw_properties_get_bool(client->props, "jack.fill-aliases", false);
 	client->writable_input = pw_properties_get_bool(client->props, "jack.writable-input", true);
+	client->async = pw_properties_get_bool(client->props, PW_KEY_NODE_ASYNC, false);
 
 	client->self_connect_mode = SELF_CONNECT_ALLOW;
 	if ((str = pw_properties_get(client->props, "jack.self-connect-mode")) != NULL) {
@@ -4024,6 +4218,14 @@
 		else if (spa_streq(str, "ignore-all"))
 			client->self_connect_mode = SELF_CONNECT_IGNORE_ALL;
 	}
+	client->other_connect_mode = OTHER_CONNECT_ALLOW;
+	if ((str = pw_properties_get(client->props, "jack.other-connect-mode")) != NULL) {
+		if (spa_streq(str, "fail"))
+			client->other_connect_mode = OTHER_CONNECT_FAIL;
+		else if (spa_streq(str, "ignore"))
+			client->other_connect_mode = OTHER_CONNECT_IGNORE;
+	}
+
 	client->rt_max = pw_properties_get_int32(client->props, "rt.prio", DEFAULT_RT_MAX);
 
 	if (status)
@@ -4749,12 +4951,29 @@
 int jack_set_freewheel(jack_client_t* client, int onoff)
 {
 	struct client *c = (struct client *) client;
+	const char *str;
 
 	pw_log_info("%p: freewheel %d", client, onoff);
 
 	pw_thread_loop_lock(c->context.loop);
-	pw_properties_set(c->props, "node.group",
-			onoff ? "pipewire.freewheel" : "");
+	str = pw_properties_get(c->props, PW_KEY_NODE_GROUP);
+	if (str != NULL) {
+		char *p = strstr(str, ",pipewire.freewheel");
+		if (p == NULL)
+			p = strstr(str, "pipewire.freewheel");
+		if (p == NULL && onoff)
+			pw_properties_setf(c->props, PW_KEY_NODE_GROUP,
+					"%s,pipewire.freewheel", str);
+		else if (p != NULL && !onoff) {
+			pw_log_info("%s %d %s %.*s", p, (int)(p - str),
+					str, (int)(p - str), str);
+			pw_properties_setf(c->props, PW_KEY_NODE_GROUP,
+					"%.*s", (int)(p - str), str);
+		}
+	} else {
+		pw_properties_set(c->props, PW_KEY_NODE_GROUP,
+				onoff ? "pipewire.freewheel" : "");
+	}
 
 	c->info.change_mask |= SPA_NODE_CHANGE_MASK_PROPS;
 	c->info.props = &c->props->dict;
@@ -4922,7 +5141,7 @@
 	jack_port_type_id_t type_id;
 	uint8_t buffer1024;
 	struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
-	struct spa_pod *params6;
+	struct spa_pod *params7;
 	uint32_t n_params = 0;
 	struct port *p;
 	int res, len;
@@ -4972,7 +5191,7 @@
 	strcpy(o->port.name, name);
 	o->port.type_id = type_id;
 
-	init_buffer(p);
+	init_buffer(p, c->max_frames);
 
 	if (direction == SPA_DIRECTION_INPUT) {
 		switch (type_id) {
@@ -5034,6 +5253,7 @@
 	param_enum_format(c, p, &paramsn_params++, &b);
 	param_buffers(c, p, &paramsn_params++, &b);
 	param_io(c, p, &paramsn_params++, &b);
+	param_io_async(c, p, &paramsn_params++, &b);
 	param_latency(c, p, &paramsn_params++, &b);
 	param_latency_other(c, p, &paramsn_params++, &b);
 
@@ -5140,14 +5360,15 @@
 	return res;
 }
 
-static struct buffer *get_mix_buffer(struct mix *mix, jack_nframes_t frames)
+static struct buffer *get_mix_buffer(struct client *c, struct mix *mix, jack_nframes_t frames)
 {
 	struct spa_io_buffers *io;
+	uint32_t cycle = c->rt.position->clock.cycle & 1;
 
 	if (mix->peer_port != NULL)
-		prepare_output(mix->peer_port, frames);
+		prepare_output(mix->peer_port, frames, cycle);
 
-	io = mix->io;
+	io = mix->iocycle;
 	if (io == NULL ||
 	    io->status != SPA_STATUS_HAVE_DATA ||
 	    io->buffer_id >= mix->n_buffers)
@@ -5185,7 +5406,7 @@
 		pw_log_trace_fp("%p: port %s mix %d.%d get buffer %d",
 				p->client, p->object->port.name, p->port_id, mix->id, frames);
 
-		if ((b = get_mix_buffer(mix, frames)) == NULL)
+		if ((b = get_mix_buffer(p->client, mix, frames)) == NULL)
 			continue;
 
 		if ((np = get_buffer_data(b, frames)) == NULL)
@@ -5206,14 +5427,15 @@
 		p->zeroed = false;
 	}
 	if (ptr == NULL)
-		ptr = init_buffer(p);
+		ptr = init_buffer(p, frames);
 	return ptr;
 }
 
 static void *get_buffer_input_midi(struct port *p, jack_nframes_t frames)
 {
 	struct mix *mix;
-	void *ptr = midi_scratch;
+	void *ptr = p->emptyptr;
+	struct midi_buffer *mb = (struct midi_buffer*)midi_scratch;
 	struct spa_pod_sequence *seqMAX_MIX;
 	uint32_t n_seq = 0;
 
@@ -5228,7 +5450,7 @@
 		pw_log_trace_fp("%p: port %p mix %d.%d get buffer %d",
 				p->client, p, p->port_id, mix->id, frames);
 
-		if ((b = get_mix_buffer(mix, frames)) == NULL)
+		if ((b = get_mix_buffer(p->client, mix, frames)) == NULL)
 			continue;
 
 		d = &b->datas0;
@@ -5242,8 +5464,17 @@
 		if (n_seq == MAX_MIX)
 			break;
 	}
-	midi_init_buffer(ptr, MIDI_SCRATCH_FRAMES);
-	convert_to_midi(seq, n_seq, ptr, p->client->fix_midi_events);
+	midi_init_buffer(mb, MIDI_SCRATCH_FRAMES, frames);
+	/* first convert to a thread local scratch buffer, then memcpy into
+	 * the per port buffer. This makes it possible to call this function concurrently
+	 * but also have different pointers per port */
+	convert_to_midi(seq, n_seq, mb, p->client->fix_midi_events);
+	memcpy(ptr, mb, sizeof(struct midi_buffer) + (mb->event_count
+                              * sizeof(struct midi_event)));
+	if (mb->write_pos) {
+		size_t offs = mb->buffer_size - 1 - mb->write_pos;
+		memcpy(SPA_PTROFF(ptr, offs, void), SPA_PTROFF(mb, offs, void), mb->write_pos);
+	}
 	return ptr;
 }
 
@@ -5271,7 +5502,7 @@
 
 static void *get_buffer_input_empty(struct port *p, jack_nframes_t frames)
 {
-	return init_buffer(p);
+	return init_buffer(p, frames);
 }
 
 SPA_EXPORT
@@ -5280,22 +5511,27 @@
 	struct object *o = port_to_object(port);
 	struct port *p = NULL;
 	void *ptr = NULL;
+	struct client *c;
 
 	return_val_if_fail(o != NULL, NULL);
 
-	if (o->type != INTERFACE_Port || o->client == NULL)
+	c = o->client;
+	if (o->type != INTERFACE_Port || c == NULL)
+		goto done;
+
+	if (frames > c->max_frames)
 		goto done;
 
 	if ((p = o->port.port) == NULL) {
 		struct mix *mix;
 		struct buffer *b;
 
-		if ((mix = find_mix_peer(o->client, o->id)) == NULL)
+		if ((mix = find_mix_peer(c, o->id)) == NULL)
 			goto done;
 
 		pw_log_trace("peer mix: %p %d", mix, mix->peer_id);
 
-		if ((b = get_mix_buffer(mix, frames)) == NULL)
+		if ((b = get_mix_buffer(c, mix, frames)) == NULL)
 			goto done;
 
 		if (o->port.type_id == TYPE_ID_MIDI) {
@@ -5304,7 +5540,7 @@
 			void *pod;
 
 			ptr = midi_scratch;
-			midi_init_buffer(ptr, MIDI_SCRATCH_FRAMES);
+			midi_init_buffer(ptr, MIDI_SCRATCH_FRAMES, frames);
 
 			d = &b->datas0;
 			if ((pod = spa_pod_from_data(d->data, d->maxsize,
@@ -5313,7 +5549,7 @@
 			if (!spa_pod_is_sequence(pod))
 				goto done;
 			seq0 = pod;
-			convert_to_midi(seq, 1, ptr, o->client->fix_midi_events);
+			convert_to_midi(seq, 1, ptr, c->fix_midi_events);
 		} else {
 			ptr = get_buffer_data(b, frames);
 		}
@@ -5321,7 +5557,7 @@
 		ptr = p->get_buffer(p, frames);
 	}
 done:
-	pw_log_trace_fp("%p: port %p buffer %p", o->client, p, ptr);
+	pw_log_trace_fp("%p: port:%p buffer:%p frames:%d", c, p, ptr, frames);
 	return ptr;
 }
 
@@ -5821,14 +6057,17 @@
 {
 	int src_self, dst_self, sum;
 
-	if (c->self_connect_mode == SELF_CONNECT_ALLOW)
-		return 1;
-
 	src_self = src->port.node_id == c->node_id ? 1 : 0;
 	dst_self = dst->port.node_id == c->node_id ? 1 : 0;
 	sum = src_self + dst_self;
-	/* check for no self connection first */
+
+	pw_log_debug("sum %d %d", sum, c->self_connect_mode);
+
+	/* check for other connection first */
 	if (sum == 0)
+		return c->other_connect_mode;
+
+	if (c->self_connect_mode == SELF_CONNECT_ALLOW)
 		return 1;
 
 	/* internal connection */
@@ -6083,10 +6322,10 @@
 	rate = jack_get_sample_rate((jack_client_t*)c);
 	info = &o->port.latencydirection;
 
-	range->min = (info->min_quantum * nframes) +
-		info->min_rate + (info->min_ns * rate) / SPA_NSEC_PER_SEC;
-	range->max = (info->max_quantum * nframes) +
-		info->max_rate + (info->max_ns * rate) / SPA_NSEC_PER_SEC;
+	range->min = (jack_nframes_t)((info->min_quantum * nframes) +
+		info->min_rate + (info->min_ns * rate) / SPA_NSEC_PER_SEC);
+	range->max = (jack_nframes_t)((info->max_quantum * nframes) +
+		info->max_rate + (info->max_ns * rate) / SPA_NSEC_PER_SEC);
 
 	pw_log_debug("%p: %s get %d latency range %d %d", c, o->port.name,
 			mode, range->min, range->max);
@@ -6270,13 +6509,13 @@
 
 	if (port_name_pattern && port_name_pattern0) {
 		if ((r = regcomp(&port_regex, port_name_pattern, REG_EXTENDED | REG_NOSUB)) != 0) {
-			pw_log_error("cant compile regex %s: %d", port_name_pattern, r);
+			pw_log_error("can't compile regex %s: %d", port_name_pattern, r);
 			return NULL;
 		}
 	}
 	if (type_name_pattern && type_name_pattern0) {
 		if ((r = regcomp(&type_regex, type_name_pattern, REG_EXTENDED | REG_NOSUB)) != 0) {
-			pw_log_error("cant compile regex %s: %d", type_name_pattern, r);
+			pw_log_error("can't compile regex %s: %d", type_name_pattern, r);
 			return NULL;
 		}
 	}
@@ -6391,7 +6630,7 @@
 		u1 = c->jack_position.unique_1;
 		*times = c->jack_times;
 		if (++count == 10) {
-			pw_log_warn("could not get snapshot %lu %lu", u1, c->jack_position.unique_2);
+			pw_log_warn("could not get snapshot %" PRIu64 " %" PRIu64, u1, c->jack_position.unique_2);
 			break;
 		}
 	} while (u1 != c->jack_position.unique_2);
@@ -6407,7 +6646,7 @@
 	return_val_if_fail(c != NULL, 0);
 
 	get_frame_times(c, &times);
-	diff = get_time_ns() - times.nsec;
+	diff = get_time_ns(c->l->system) - times.nsec;
 	return (jack_nframes_t) floor(((double)times.sample_rate * diff) / SPA_NSEC_PER_SEC);
 }
 
@@ -6449,8 +6688,8 @@
 
 	*current_frames = times.frames;
 	*next_usecs = times.next_nsec / SPA_NSEC_PER_USEC;
-	*period_usecs = times.buffer_frames *
-			(float)SPA_USEC_PER_SEC / (times.sample_rate * times.rate_diff);
+	*period_usecs = (float)(times.buffer_frames *
+			SPA_USEC_PER_SEC / (times.sample_rate * times.rate_diff));
 	*current_usecs = *next_usecs - (jack_time_t)*period_usecs;
 
 	pw_log_trace("%p: %d %"PRIu64" %"PRIu64" %f", c, *current_frames,
@@ -6505,7 +6744,9 @@
 SPA_EXPORT
 jack_time_t jack_get_time(void)
 {
-	return get_time_ns()/SPA_NSEC_PER_USEC;
+	struct timespec ts;
+	clock_gettime(CLOCK_MONOTONIC, &ts);
+	return SPA_TIMESPEC_TO_NSEC(&ts);
 }
 
 SPA_EXPORT
@@ -6684,7 +6925,7 @@
 		if (pos != NULL)
 			*pos = c->jack_position;
 		if (++count == 10) {
-			pw_log_warn("could not get snapshot %lu %lu", u1, c->jack_position.unique_2);
+			pw_log_warn("could not get snapshot %" PRIu64 " %" PRIu64, u1, c->jack_position.unique_2);
 			break;
 		}
 	} while (u1 != c->jack_position.unique_2);
@@ -6706,7 +6947,7 @@
 	res = pos.frame;
 
 	if (state == JackTransportRolling) {
-		float usecs = get_time_ns()/1000 - pos.usecs;
+		float usecs = get_time_ns(c->l->system)/1000 - pos.usecs;
 		res += (jack_nframes_t)floor((((float) pos.frame_rate) / 1000000.0f) * usecs);
 	}
 	return res;
@@ -6749,12 +6990,36 @@
 	SPA_ATOMIC_STORE(a->command, command);
 }
 
+static int transport_update(struct client* c, int active)
+{
+	pw_log_info("%p: transport %d", c, active);
+
+	pw_thread_loop_lock(c->context.loop);
+	pw_properties_set(c->props, PW_KEY_NODE_SYNC, "true");
+	pw_properties_set(c->props, PW_KEY_NODE_TRANSPORT,
+			active ? "true" : "false");
+
+	c->info.change_mask |= SPA_NODE_CHANGE_MASK_PROPS;
+	c->info.props = &c->props->dict;
+
+	pw_client_node_update(c->node,
+                                    PW_CLIENT_NODE_UPDATE_INFO,
+				    0, NULL, &c->info);
+	c->info.change_mask = 0;
+	pw_thread_loop_unlock(c->context.loop);
+
+	return 0;
+}
+
 SPA_EXPORT
 void jack_transport_start (jack_client_t *client)
 {
 	struct client *c = (struct client *) client;
 	return_if_fail(c != NULL);
-	update_command(c, PW_NODE_ACTIVATION_COMMAND_START);
+	if (c->activation->server_version < 1)
+		update_command(c, PW_NODE_ACTIVATION_COMMAND_START);
+	else
+		transport_update(c, true);
 }
 
 SPA_EXPORT
@@ -6762,7 +7027,10 @@
 {
 	struct client *c = (struct client *) client;
 	return_if_fail(c != NULL);
-	update_command(c, PW_NODE_ACTIVATION_COMMAND_STOP);
+	if (c->activation->server_version < 1)
+		update_command(c, PW_NODE_ACTIVATION_COMMAND_STOP);
+	else
+		transport_update(c, false);
 }
 
 SPA_EXPORT
@@ -7035,8 +7303,8 @@
 {
 	struct midi_buffer *mb = port_buffer;
 	struct midi_event *ev = SPA_PTROFF(mb, sizeof(*mb), struct midi_event);
-	return_val_if_fail(mb != NULL, -EINVAL);
-	return_val_if_fail(ev != NULL, -EINVAL);
+	if (mb == NULL || mb->magic != MIDI_BUFFER_MAGIC)
+		return -EINVAL;
 	if (event_index >= mb->event_count)
 		return -ENOBUFS;
 	ev += event_index;
@@ -7050,7 +7318,8 @@
 void jack_midi_clear_buffer(void *port_buffer)
 {
 	struct midi_buffer *mb = port_buffer;
-	return_if_fail(mb != NULL);
+	if (mb == NULL || mb->magic != MIDI_BUFFER_MAGIC)
+		return;
 	mb->event_count = 0;
 	mb->write_pos = 0;
 	mb->lost_events = 0;
@@ -7059,7 +7328,7 @@
 SPA_EXPORT
 void jack_midi_reset_buffer(void *port_buffer)
 {
-	jack_midi_clear_buffer(port_buffer);
+	midi_init_buffer(port_buffer, globals.max_frames, globals.max_frames);
 }
 
 SPA_EXPORT
@@ -7068,7 +7337,8 @@
 	struct midi_buffer *mb = port_buffer;
 	size_t buffer_size;
 
-	return_val_if_fail(mb != NULL, 0);
+	if (mb == NULL || mb->magic != MIDI_BUFFER_MAGIC)
+		return 0;
 
 	buffer_size = mb->buffer_size;
 
@@ -7094,18 +7364,21 @@
                         size_t data_size)
 {
 	struct midi_buffer *mb = port_buffer;
-	struct midi_event *events = SPA_PTROFF(mb, sizeof(*mb), struct midi_event);
-	size_t buffer_size;
-
-	return_val_if_fail(mb != NULL, NULL);
-
-	buffer_size = mb->buffer_size;
+	struct midi_event *events;
 
+	if (SPA_UNLIKELY(mb == NULL)) {
+		pw_log_warn("port buffer is NULL");
+		return NULL;
+	}
+	if (SPA_UNLIKELY(mb->magic != MIDI_BUFFER_MAGIC)) {
+		pw_log_warn("port buffer is invalid");
+		return NULL;
+	}
 	if (SPA_UNLIKELY(time >= mb->nframes)) {
 		pw_log_warn("midi %p: time:%d frames:%d", port_buffer, time, mb->nframes);
 		goto failed;
 	}
-
+	events = SPA_PTROFF(mb, sizeof(*mb), struct midi_event);
 	if (SPA_UNLIKELY(mb->event_count > 0 && time < eventsmb->event_count - 1.time)) {
 		pw_log_warn("midi %p: time:%d ev:%d", port_buffer, time, mb->event_count);
 		goto failed;
@@ -7128,7 +7401,7 @@
 			res = ev->inline_data;
 		} else {
 			mb->write_pos += data_size;
-			ev->byte_offset = buffer_size - 1 - mb->write_pos;
+			ev->byte_offset = mb->buffer_size - 1 - mb->write_pos;
 			res = SPA_PTROFF(mb, ev->byte_offset, uint8_t);
 		}
 		mb->event_count += 1;
@@ -7152,7 +7425,8 @@
 uint32_t jack_midi_get_lost_event_count(void *port_buffer)
 {
 	struct midi_buffer *mb = port_buffer;
-	return_val_if_fail(mb != NULL, 0);
+	if (mb == NULL || mb->magic != MIDI_BUFFER_MAGIC)
+		return 0;
 	return mb->lost_events;
 }

pipewire-1.0.1.tar.bz2/pipewire-v4l2/src/meson.build -> pipewire-1.2.0.tar.gz/pipewire-v4l2/src/meson.build Changed

pipewire-1.0.1.tar.bz2/pipewire-v4l2/src/pipewire-v4l2.c -> pipewire-1.2.0.tar.gz/pipewire-v4l2/src/pipewire-v4l2.c Changed

@@ -21,6 +21,7 @@
 
 #include <spa/utils/atomic.h>
 #include <spa/utils/result.h>
+#include <spa/utils/keys.h>
 #include <spa/pod/iter.h>
 #include <spa/pod/parser.h>
 #include <spa/pod/filter.h>
@@ -912,7 +913,7 @@
 static int vidioc_querycap(struct file *file, struct v4l2_capability *arg)
 {
 	int res = 0;
-	const char *str = NULL;
+	const char *card = NULL, *bus_info = NULL;
 	struct pw_node_info *info;
 
 	if (file->node == NULL)
@@ -921,15 +922,19 @@
 	info = file->node->info;
 
 	if (info != NULL && info->props != NULL) {
-		str = spa_dict_lookup(info->props, PW_KEY_NODE_DESCRIPTION);
+		card = spa_dict_lookup(info->props, PW_KEY_NODE_DESCRIPTION);
+		bus_info = spa_dict_lookup(info->props, SPA_KEY_API_V4L2_CAP_BUS_INFO);
 	}
-	if (str == NULL)
-		str = DEFAULT_CARD;
+	if (card == NULL)
+		card = DEFAULT_CARD;
 
 	spa_scnprintf((char*)arg->driver, sizeof(arg->driver), "%s", DEFAULT_DRIVER);
-	spa_scnprintf((char*)arg->card, sizeof(arg->card), "%s", str);
-	spa_scnprintf((char*)arg->bus_info, sizeof(arg->bus_info), "platform:%s-%d",
-			DEFAULT_BUS_INFO, file->node->id);
+	spa_scnprintf((char*)arg->card, sizeof(arg->card), "%s", card);
+	if (bus_info == NULL)
+		spa_scnprintf((char*)arg->bus_info, sizeof(arg->bus_info), "platform:%s-%d",
+				DEFAULT_BUS_INFO, file->node->id);
+	else
+		spa_scnprintf((char*)arg->bus_info, sizeof(arg->bus_info), "%s", bus_info);
 
 	arg->version = KERNEL_VERSION(5, 2, 0);
 	arg->device_caps = V4L2_CAP_VIDEO_CAPTURE

pipewire-1.0.1.tar.bz2/pipewire-v4l2/src/v4l2-func.c -> pipewire-1.2.0.tar.gz/pipewire-v4l2/src/v4l2-func.c Changed

@@ -11,8 +11,9 @@
 #undef _FORTIFY_SOURCE
 #endif
 
+#include <assert.h>
+#include <stdbool.h>
 #include <stdio.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <sys/mman.h>
@@ -31,10 +32,15 @@
 	va_end(ap);			\
 }
 
+static inline bool needs_mode(int flags)
+{
+	return (flags & O_CREAT) || ((flags & O_TMPFILE) == O_TMPFILE);
+}
+
 SPA_EXPORT int open(const char *path, int oflag, ...)
 {
 	mode_t mode = 0;
-	if (oflag & O_CREAT || oflag & O_TMPFILE)
+	if (needs_mode(oflag))
 		extract_va_arg(mode_t, mode, oflag);
 
 	return get_fops()->openat(AT_FDCWD, path, oflag, mode);
@@ -43,6 +49,7 @@
 /* _FORTIFY_SOURCE redirects open to __open_2 */
 SPA_EXPORT int __open_2(const char *path, int oflag)
 {
+	assert(!needs_mode(oflag));
 	return open(path, oflag);
 }
 
@@ -50,7 +57,7 @@
 SPA_EXPORT int open64(const char *path, int oflag, ...)
 {
 	mode_t mode = 0;
-	if (oflag & O_CREAT || oflag & O_TMPFILE)
+	if (needs_mode(oflag))
 		extract_va_arg(mode_t, mode, oflag);
 
 	return get_fops()->openat(AT_FDCWD, path, oflag | O_LARGEFILE, mode);
@@ -58,14 +65,15 @@
 
 SPA_EXPORT int __open64_2(const char *path, int oflag)
 {
-        return open(path, oflag);
+	assert(!needs_mode(oflag));
+	return open64(path, oflag);
 }
 #endif
 
 SPA_EXPORT int openat(int dirfd, const char *path, int oflag, ...)
 {
 	mode_t mode = 0;
-	if (oflag & O_CREAT || oflag & O_TMPFILE)
+	if (needs_mode(oflag))
 		extract_va_arg(mode_t, mode, oflag);
 
 	return get_fops()->openat(dirfd, path, oflag, mode);
@@ -73,6 +81,7 @@
 
 SPA_EXPORT int __openat_2(int dirfd, const char *path, int oflag)
 {
+	assert(!needs_mode(oflag));
 	return openat(dirfd, path, oflag);
 }
 
@@ -80,7 +89,7 @@
 SPA_EXPORT int openat64(int dirfd, const char *path, int oflag, ...)
 {
 	mode_t mode = 0;
-	if (oflag & O_CREAT || oflag & O_TMPFILE)
+	if (needs_mode(oflag))
 		extract_va_arg(mode_t, mode, oflag);
 
 	return get_fops()->openat(dirfd, path, oflag | O_LARGEFILE, mode);
@@ -88,7 +97,8 @@
 
 SPA_EXPORT int __openat64_2(int dirfd, const char *path, int oflag)
 {
-	return openat(dirfd, path, oflag);
+	assert(!needs_mode(oflag));
+	return openat64(dirfd, path, oflag);
 }
 #endif

pipewire-1.0.1.tar.bz2/po/bg.po -> pipewire-1.2.0.tar.gz/po/bg.po Changed

@@ -1,22 +1,24 @@
-# Valentin Laskov <laskov@festa.bg>, 2016. #zanata
+# Bulgarian translation of pipewire po-file.
+# Copyright (C) 2023 Alexander Shopov <ash@kambanaria.org>
+# Alexander Shopov <ash@kambanaria.org>, 2023.
+# This file is licensed under the same terms as pipewire.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: pipewire 1.0.0.\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-10-15 21:30+0000\n"
-"Last-Translator: Emanuil Novachev <em.novachev@gmail.com>\n"
-"Language-Team: Bulgarian <https://translate.fedoraproject.org/projects/"
-"pipewire/pipewire/bg/>\n"
+"POT-Creation-Date: 2022-06-30 12:50+0200\n"
+"PO-Revision-Date: 2023-12-09 15:17+0100\n"
+"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.2.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/daemon/pipewire.c:43
+#: src/daemon/pipewire.c:46
 #, c-format
 msgid ""
 "%s options\n"
@@ -24,40 +26,57 @@
 "      --version                         Show version\n"
 "  -c, --config                          Load config (Default %s)\n"
 msgstr ""
+"%s ОПЦИЯ…\n"
+"\n"
+"    -h --help            Извеждане на тази помощ\n"
+"    -V --version         Извеждане на версията\n"
+"    -c, --config         Зареждане на настройки (стандартно „%s“)\n"
 
-#: src/daemon/pipewire.desktop.in:4
-msgid "PipeWire Media System"
-msgstr ""
-
-#: src/daemon/pipewire.desktop.in:5
-msgid "Start the PipeWire Media System"
-msgstr ""
+#: src/modules/module-protocol-pulse/modules/module-tunnel-sink.c:180
+#: src/modules/module-protocol-pulse/modules/module-tunnel-source.c:180
+#, c-format
+msgid "Tunnel to %s/%s"
+msgstr "Тунелиране към „%s/%s“"
 
-#: src/examples/media-session/alsa-monitor.c:526
-#: spa/plugins/alsa/acp/compat.c:187
-msgid "Built-in Audio"
-msgstr ""
+#: src/modules/module-fallback-sink.c:51
+msgid "Dummy Output"
+msgstr "Фиктивен изход"
 
-#: src/examples/media-session/alsa-monitor.c:530
-#: spa/plugins/alsa/acp/compat.c:192
-msgid "Modem"
-msgstr ""
+#: src/modules/module-pulse-tunnel.c:662
+#, c-format
+msgid "Tunnel for %s@%s"
+msgstr "Тунелиране за %s@%s"
 
-#: src/examples/media-session/alsa-monitor.c:539
+#: src/modules/module-zeroconf-discover.c:332
 msgid "Unknown device"
-msgstr ""
+msgstr "Непознато устройство"
+
+#: src/modules/module-zeroconf-discover.c:344
+#, c-format
+msgid "%s on %s@%s"
+msgstr "„%s“ на „%s@%s“"
+
+#: src/modules/module-zeroconf-discover.c:348
+#, c-format
+msgid "%s on %s"
+msgstr "„%s“ на „%s“"
 
-#: src/tools/pw-cat.c:991
+#: src/tools/pw-cat.c:784
 #, 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"
+"\n"
+"  -h, --help             Извеждане на тази помощ\n"
+"      --version          Извеждане на версията\n"
+"  -v, --verbose          Включване на подробен режим\n"
 
-#: src/tools/pw-cat.c:998
+#: src/tools/pw-cat.c:791
 #, c-format
 msgid ""
 "  -R, --remote                          Remote daemon name\n"
@@ -71,11 +90,21 @@
 "                                          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 ""
-
-#: src/tools/pw-cat.c:1016
+"  -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"
+
+#: src/tools/pw-cat.c:809
 #, c-format
 msgid ""
 "      --rate                            Sample rate (req. for rec) (default "
@@ -94,16 +123,33 @@
 "%d)\n"
 "\n"
 msgstr ""
-
-#: src/tools/pw-cat.c:1033
+"      --rate             Честота на отчитане (задължително при запис)\n"
+"                           (стандартно: „%u“)\n"
+"      --channels         Брой канали (задължително при запис)\n"
+"                           (стандартно: „%u“)\n"
+"      --channel-map      Карта на каналите:\n"
+"                           едно от: „stereo“, „surround-51“, … или\n"
+"                           списък с разделител „,“, напр. „FL,FR“\n"
+"      --format           Формат на отчѐта %s (задължително при запис)\n"
+"                           (стандартно: „%s“)\n"
+"      --volume           Сила на звука на потока 0-1.0 (стандартно: %.3f)\n"
+"  -q  --quality          Качество при ново отчитане (0 - 15) (стандартно: %d)\n"
+
+#: src/tools/pw-cat.c:826
 msgid ""
 "  -p, --playback                        Playback mode\n"
 "  -r, --record                          Recording mode\n"
 "  -m, --midi                            Midi mode\n"
+"  -d, --dsd                             DSD mode\n"
 "\n"
 msgstr ""
+"  -p, --playback         Режим за изпълнение\n"
+"  -r, --record           Режим за запис\n"
+"  -m, --midi             Режим за Midi\n"
+"  -d, --dsd              Режим за DSD\n"
+"\n"
 
-#: src/tools/pw-cli.c:2932
+#: src/tools/pw-cli.c:2250
 #, c-format
 msgid ""
 "%s options command\n"
@@ -113,349 +159,350 @@
 "  -r, --remote                          Remote daemon name\n"
 "\n"
 msgstr ""
+"%s ОПЦИЯ… КОМАНДА\n"
+"  -h, --help             Извеждане на тази помощ\n"
+"      --version          Извеждане на версията\n"
+"  -d, --daemon           Стартиране като демон (стандартно: не)\n"
+"  -r, --remote           Име на отдалечения демон\n"
 
-#: spa/plugins/alsa/acp/acp.c:290
+#: spa/plugins/alsa/acp/acp.c:321
 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:444 spa/plugins/alsa/acp/alsa-mixer.c:4648
+#: spa/plugins/bluez5/bluez5-device.c:1236
 msgid "Off"
-msgstr ""
-
-#: spa/plugins/alsa/acp/channelmap.h:466
-msgid "(invalid)"
-msgstr ""
+msgstr "Изключено"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2709
+#: spa/plugins/alsa/acp/alsa-mixer.c:2652
 msgid "Input"
-msgstr ""
+msgstr "Вход"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2710
+#: spa/plugins/alsa/acp/alsa-mixer.c:2653
 msgid "Docking Station Input"
-msgstr ""
+msgstr "Вход на станцията за скачане"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2711
+#: spa/plugins/alsa/acp/alsa-mixer.c:2654
 msgid "Docking Station Microphone"
-msgstr ""
+msgstr "Микрофон на станцията за скачане"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2712
+#: spa/plugins/alsa/acp/alsa-mixer.c:2655
 msgid "Docking Station Line In"
-msgstr ""
+msgstr "Вход на станцията за скачане"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2713
-#: spa/plugins/alsa/acp/alsa-mixer.c:2804
+#: spa/plugins/alsa/acp/alsa-mixer.c:2656
+#: spa/plugins/alsa/acp/alsa-mixer.c:2747
 msgid "Line In"
-msgstr ""
+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:2657
+#: spa/plugins/alsa/acp/alsa-mixer.c:2741
+#: spa/plugins/bluez5/bluez5-device.c:1454
 msgid "Microphone"
-msgstr ""
+msgstr "Микрофон"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2715
-#: spa/plugins/alsa/acp/alsa-mixer.c:2799
+#: spa/plugins/alsa/acp/alsa-mixer.c:2658
+#: spa/plugins/alsa/acp/alsa-mixer.c:2742
 msgid "Front Microphone"
-msgstr ""
+msgstr "Преден микрофон"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2716
-#: spa/plugins/alsa/acp/alsa-mixer.c:2800
+#: spa/plugins/alsa/acp/alsa-mixer.c:2659
+#: spa/plugins/alsa/acp/alsa-mixer.c:2743
 msgid "Rear Microphone"
-msgstr ""
+msgstr "Заден микрофон"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2717
+#: spa/plugins/alsa/acp/alsa-mixer.c:2660
 msgid "External Microphone"
-msgstr ""
+msgstr "Външен микрофон"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2718
-#: spa/plugins/alsa/acp/alsa-mixer.c:2802
+#: spa/plugins/alsa/acp/alsa-mixer.c:2661
+#: spa/plugins/alsa/acp/alsa-mixer.c:2745
 msgid "Internal Microphone"
-msgstr ""
+msgstr "Вътрешен микрофон"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2719
-#: spa/plugins/alsa/acp/alsa-mixer.c:2805
+#: spa/plugins/alsa/acp/alsa-mixer.c:2662
+#: spa/plugins/alsa/acp/alsa-mixer.c:2748
 msgid "Radio"
-msgstr ""
+msgstr "Радио"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2720
-#: spa/plugins/alsa/acp/alsa-mixer.c:2806
+#: spa/plugins/alsa/acp/alsa-mixer.c:2663
+#: spa/plugins/alsa/acp/alsa-mixer.c:2749
 msgid "Video"
-msgstr ""
+msgstr "Видео"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2721
+#: spa/plugins/alsa/acp/alsa-mixer.c:2664
 msgid "Automatic Gain Control"
-msgstr ""
+msgstr "Автоматично усилване"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2722
+#: spa/plugins/alsa/acp/alsa-mixer.c:2665
 msgid "No Automatic Gain Control"
-msgstr ""
+msgstr "Без автоматично усилване"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2723
+#: spa/plugins/alsa/acp/alsa-mixer.c:2666
 msgid "Boost"
-msgstr ""
+msgstr "Подсилване"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2724
+#: spa/plugins/alsa/acp/alsa-mixer.c:2667
 msgid "No Boost"
-msgstr ""
+msgstr "Без подсилване"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2725
+#: spa/plugins/alsa/acp/alsa-mixer.c:2668
 msgid "Amplifier"
-msgstr ""
+msgstr "Усилвател"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2726
+#: spa/plugins/alsa/acp/alsa-mixer.c:2669
 msgid "No Amplifier"
-msgstr ""
+msgstr "Без усилвател"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2727
+#: spa/plugins/alsa/acp/alsa-mixer.c:2670
 msgid "Bass Boost"
-msgstr ""
+msgstr "Усилване на басите"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2728
+#: spa/plugins/alsa/acp/alsa-mixer.c:2671
 msgid "No Bass Boost"
-msgstr ""
+msgstr "Без усилване на басите"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2729
-#: spa/plugins/bluez5/bluez5-device.c:1150
+#: spa/plugins/alsa/acp/alsa-mixer.c:2672
+#: spa/plugins/bluez5/bluez5-device.c:1460
 msgid "Speaker"
-msgstr ""
+msgstr "Високоговорител"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2730
-#: spa/plugins/alsa/acp/alsa-mixer.c:2808
+#: spa/plugins/alsa/acp/alsa-mixer.c:2673
+#: spa/plugins/alsa/acp/alsa-mixer.c:2751
 msgid "Headphones"
-msgstr ""
+msgstr "Слушалки"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2797
+#: spa/plugins/alsa/acp/alsa-mixer.c:2740
 msgid "Analog Input"
-msgstr ""
+msgstr "Аналогов вход"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2801
+#: spa/plugins/alsa/acp/alsa-mixer.c:2744
 msgid "Dock Microphone"
-msgstr ""
+msgstr "Микрофон за скачане"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2803
+#: spa/plugins/alsa/acp/alsa-mixer.c:2746
 msgid "Headset Microphone"
-msgstr ""
+msgstr "Микрофон на слушалките"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2807
+#: spa/plugins/alsa/acp/alsa-mixer.c:2750
 msgid "Analog Output"
-msgstr ""
+msgstr "Аналогов изход"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2809
+#: spa/plugins/alsa/acp/alsa-mixer.c:2752
 msgid "Headphones 2"
-msgstr ""
+msgstr "Слушалки 2"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2810
+#: spa/plugins/alsa/acp/alsa-mixer.c:2753
 msgid "Headphones Mono Output"
-msgstr ""
+msgstr "Моно изход на слушалките"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2811
+#: spa/plugins/alsa/acp/alsa-mixer.c:2754
 msgid "Line Out"
-msgstr ""
+msgstr "Изход"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2812
+#: spa/plugins/alsa/acp/alsa-mixer.c:2755
 msgid "Analog Mono Output"
-msgstr ""
+msgstr "Аналогов моно изход"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2813
+#: spa/plugins/alsa/acp/alsa-mixer.c:2756
 msgid "Speakers"
-msgstr ""
+msgstr "Тонколони"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2814
+#: spa/plugins/alsa/acp/alsa-mixer.c:2757
 msgid "HDMI / DisplayPort"
-msgstr ""
+msgstr "HDMI/DisplayPort"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2815
+#: spa/plugins/alsa/acp/alsa-mixer.c:2758
 msgid "Digital Output (S/PDIF)"
-msgstr ""
+msgstr "Цифров изход (S/PDIF)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2816
+#: spa/plugins/alsa/acp/alsa-mixer.c:2759
 msgid "Digital Input (S/PDIF)"
-msgstr ""
+msgstr "Цифров вход (S/PDIF)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2817
+#: spa/plugins/alsa/acp/alsa-mixer.c:2760
 msgid "Multichannel Input"
-msgstr ""
+msgstr "Многоканален вход"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2818
+#: spa/plugins/alsa/acp/alsa-mixer.c:2761
 msgid "Multichannel Output"
-msgstr ""
+msgstr "Многоканален изход"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2819
+#: spa/plugins/alsa/acp/alsa-mixer.c:2762
 msgid "Game Output"
-msgstr ""
+msgstr "Изход за игри"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2820
-#: spa/plugins/alsa/acp/alsa-mixer.c:2821
+#: spa/plugins/alsa/acp/alsa-mixer.c:2763
+#: spa/plugins/alsa/acp/alsa-mixer.c:2764
 msgid "Chat Output"
-msgstr ""
+msgstr "Изход за разговори"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2822
+#: spa/plugins/alsa/acp/alsa-mixer.c:2765
 msgid "Chat Input"
-msgstr ""
+msgstr "Вход за разговори"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2823
+#: spa/plugins/alsa/acp/alsa-mixer.c:2766
 msgid "Virtual Surround 7.1"
-msgstr ""
+msgstr "Виртуален съраунд 7.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4527
+#: spa/plugins/alsa/acp/alsa-mixer.c:4471
 msgid "Analog Mono"
-msgstr ""
+msgstr "Аналогово моно"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4528
+#: spa/plugins/alsa/acp/alsa-mixer.c:4472
 msgid "Analog Mono (Left)"
-msgstr ""
+msgstr "Аналогово моно (отляво)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4529
+#: spa/plugins/alsa/acp/alsa-mixer.c:4473
 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:4474
+#: spa/plugins/alsa/acp/alsa-mixer.c:4482
+#: spa/plugins/alsa/acp/alsa-mixer.c:4483
 msgid "Analog Stereo"
-msgstr ""
+msgstr "Аналогово стерео"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4531
+#: spa/plugins/alsa/acp/alsa-mixer.c:4475
 msgid "Mono"
-msgstr ""
+msgstr "Моно"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4532
+#: spa/plugins/alsa/acp/alsa-mixer.c:4476
 msgid "Stereo"
-msgstr ""
+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:4484
+#: spa/plugins/alsa/acp/alsa-mixer.c:4642
+#: spa/plugins/bluez5/bluez5-device.c:1442
 msgid "Headset"
-msgstr ""
+msgstr "Слушалки с микрофон"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4541
-#: spa/plugins/alsa/acp/alsa-mixer.c:4699
+#: spa/plugins/alsa/acp/alsa-mixer.c:4485
+#: spa/plugins/alsa/acp/alsa-mixer.c:4643
 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:4486
+#: spa/plugins/alsa/acp/alsa-mixer.c:4487
 msgid "Multichannel"
-msgstr ""
+msgstr "Многоканален"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4544
+#: spa/plugins/alsa/acp/alsa-mixer.c:4488
 msgid "Analog Surround 2.1"
-msgstr ""
+msgstr "Аналогов съраунд 2.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4545
+#: spa/plugins/alsa/acp/alsa-mixer.c:4489
 msgid "Analog Surround 3.0"
-msgstr ""
+msgstr "Аналогов съраунд 3.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4546
+#: spa/plugins/alsa/acp/alsa-mixer.c:4490
 msgid "Analog Surround 3.1"
-msgstr ""
+msgstr "Аналогов съраунд 3.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4547
+#: spa/plugins/alsa/acp/alsa-mixer.c:4491
 msgid "Analog Surround 4.0"
-msgstr ""
+msgstr "Аналогов съраунд 4.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4548
+#: spa/plugins/alsa/acp/alsa-mixer.c:4492
 msgid "Analog Surround 4.1"
-msgstr ""
+msgstr "Аналогов съраунд 4.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4549
+#: spa/plugins/alsa/acp/alsa-mixer.c:4493
 msgid "Analog Surround 5.0"
-msgstr ""
+msgstr "Аналогов съраунд 5.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4550
+#: spa/plugins/alsa/acp/alsa-mixer.c:4494
 msgid "Analog Surround 5.1"
-msgstr ""
+msgstr "Аналогов съраунд 5.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4551
+#: spa/plugins/alsa/acp/alsa-mixer.c:4495
 msgid "Analog Surround 6.0"
-msgstr ""
+msgstr "Аналогов съраунд 6.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4552
+#: spa/plugins/alsa/acp/alsa-mixer.c:4496
 msgid "Analog Surround 6.1"
-msgstr ""
+msgstr "Аналогов съраунд 6.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4553
+#: spa/plugins/alsa/acp/alsa-mixer.c:4497
 msgid "Analog Surround 7.0"
-msgstr ""
+msgstr "Аналогов съраунд 7.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4554
+#: spa/plugins/alsa/acp/alsa-mixer.c:4498
 msgid "Analog Surround 7.1"
-msgstr ""
+msgstr "Аналогов съраунд 7.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4555
+#: spa/plugins/alsa/acp/alsa-mixer.c:4499
 msgid "Digital Stereo (IEC958)"
-msgstr ""
+msgstr "Цифрово стерео (IEC958)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4556
+#: spa/plugins/alsa/acp/alsa-mixer.c:4500
 msgid "Digital Surround 4.0 (IEC958/AC3)"
-msgstr ""
+msgstr "Цифров съраунд 4.0 (IEC958/AC3)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4557
+#: spa/plugins/alsa/acp/alsa-mixer.c:4501
 msgid "Digital Surround 5.1 (IEC958/AC3)"
-msgstr ""
+msgstr "Цифров съраунд 5.1 (IEC958/AC3)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4558
+#: spa/plugins/alsa/acp/alsa-mixer.c:4502
 msgid "Digital Surround 5.1 (IEC958/DTS)"
-msgstr ""
+msgstr "Цифров съраунд 5.1 (IEC958/DTS)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4559
+#: spa/plugins/alsa/acp/alsa-mixer.c:4503
 msgid "Digital Stereo (HDMI)"
-msgstr ""
+msgstr "Цифрово стерео (HDMI)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4560
+#: spa/plugins/alsa/acp/alsa-mixer.c:4504
 msgid "Digital Surround 5.1 (HDMI)"
-msgstr ""
+msgstr "Цифров съраунд 5.1 (HDMI)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4561
+#: spa/plugins/alsa/acp/alsa-mixer.c:4505
 msgid "Chat"
-msgstr ""
+msgstr "Разговор"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4562
+#: spa/plugins/alsa/acp/alsa-mixer.c:4506
 msgid "Game"
-msgstr ""
+msgstr "Игра"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4696
+#: spa/plugins/alsa/acp/alsa-mixer.c:4640
 msgid "Analog Mono Duplex"
-msgstr ""
+msgstr "Двупосочно аналогово моно"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4697
+#: spa/plugins/alsa/acp/alsa-mixer.c:4641
 msgid "Analog Stereo Duplex"
-msgstr ""
+msgstr "Двупосочно аналогово стерео"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4700
+#: spa/plugins/alsa/acp/alsa-mixer.c:4644
 msgid "Digital Stereo Duplex (IEC958)"
-msgstr ""
+msgstr "Двупосочно цифрово стерео (IEC958)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4701
+#: spa/plugins/alsa/acp/alsa-mixer.c:4645
 msgid "Multichannel Duplex"
-msgstr ""
+msgstr "Двупосочна многоканална връзка"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4702
+#: spa/plugins/alsa/acp/alsa-mixer.c:4646
 msgid "Stereo Duplex"
-msgstr ""
+msgstr "Двупосочно стерео"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4703
+#: spa/plugins/alsa/acp/alsa-mixer.c:4647
 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:4754
 #, c-format
 msgid "%s Output"
-msgstr ""
+msgstr "Изход %s"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4813
+#: spa/plugins/alsa/acp/alsa-mixer.c:4761
 #, c-format
 msgid "%s Input"
-msgstr ""
+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:1187 spa/plugins/alsa/acp/alsa-util.c:1281
 #, c-format
 msgid ""
 "snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
@@ -468,24 +515,36 @@
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 msgstr0 ""
+"„snd_pcm_avail()“ върна неочаквано голяма стойност: %lu байт (%lu ms).\n"
+"Най-вероятно се дължи на грешка в драйвера на ALSA „%s“. Молим да докладвате "
+"това на разработчиците на ALSA."
 msgstr1 ""
+"„snd_pcm_avail()“ върна неочаквано голяма стойност: %lu байта (%lu ms).\n"
+"Най-вероятно се дължи на грешка в драйвера на ALSA „%s“. Молим да докладвате "
+"това на разработчиците на ALSA."
 
-#: spa/plugins/alsa/acp/alsa-util.c:1241
+#: spa/plugins/alsa/acp/alsa-util.c:1253
 #, 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."
 msgstr0 ""
+"„snd_pcm_delay()“ върна неочаквано голяма стойност: %li байт (%s%lu ms).\n"
+"Най-вероятно се дължи на грешка в драйвера на ALSA „%s“. Молим да докладвате "
+"това на разработчиците на ALSA."
 msgstr1 ""
+"„snd_pcm_delay()“ върна неочаквано голяма стойност: %li байта (%s%lu ms).\n"
+"Най-вероятно се дължи на грешка в драйвера на ALSA „%s“. Молим да докладвате "
+"това на разработчиците на ALSA.<"
 
-#: spa/plugins/alsa/acp/alsa-util.c:1288
+#: spa/plugins/alsa/acp/alsa-util.c:1300
 #, c-format
 msgid ""
 "snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
@@ -493,8 +552,12 @@
 "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:1343
 #, c-format
 msgid ""
 "snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
@@ -507,63 +570,117 @@
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 msgstr0 ""
+"„snd_pcm_mmap_begin()“ върна неочаквано голяма стойност: %lu байт (%lu ms).\n"
+"Най-вероятно се дължи на грешка в драйвера на ALSA „%s“. Молим да докладвате "
+"това на разработчиците на ALSA."
 msgstr1 ""
+"„snd_pcm_mmap_begin()“ върна неочаквано голяма стойност: %lu байта (%lu "
+"ms).\n"
+"Най-вероятно се дължи на грешка в драйвера на ALSA „%s“. Молим да докладвате "
+"това на разработчиците на ALSA."
+
+#: spa/plugins/alsa/acp/channelmap.h:457
+msgid "(invalid)"
+msgstr "(неправилно)"
+
+#: spa/plugins/alsa/acp/compat.c:189
+msgid "Built-in Audio"
+msgstr "Вградено аудио"
+
+#: spa/plugins/alsa/acp/compat.c:194
+msgid "Modem"
+msgstr "Модем"
 
-#: spa/plugins/bluez5/bluez5-device.c:1010
+#: spa/plugins/bluez5/bluez5-device.c:1247
 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:1272
 #, 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:1275
 #, c-format
 msgid "High Fidelity Duplex (A2DP Source/Sink, codec %s)"
 msgstr ""
+"Двупосочна връзка с висока точност (елемент-източник/приемник A2DP, кодер "
+"„%s“)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1041
+#: spa/plugins/bluez5/bluez5-device.c:1283
 msgid "High Fidelity Playback (A2DP Sink)"
-msgstr ""
+msgstr "Изпълнение с висока точност (елемент-приемник A2DP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1043
+#: spa/plugins/bluez5/bluez5-device.c:1285
 msgid "High Fidelity Duplex (A2DP Source/Sink)"
+msgstr "Двупосочна връзка с висока точност (елемент-източник/приемник A2DP)"
+
+#: spa/plugins/bluez5/bluez5-device.c:1322
+#, c-format
+msgid "High Fidelity Playback (BAP Sink, codec %s)"
+msgstr "Изпълнение с висока точност (елемент-приемник BAP, кодер „%s“)"
+
+#: spa/plugins/bluez5/bluez5-device.c:1326
+#, c-format
+msgid "High Fidelity Input (BAP Source, codec %s)"
+msgstr "Вход с висока точност (елемент-източник BAP, кодер „%s“)"
+
+#: spa/plugins/bluez5/bluez5-device.c:1330
+#, c-format
+msgid "High Fidelity Duplex (BAP Source/Sink, codec %s)"
 msgstr ""
+"Двупосочна връзка с висока точност (елемент-източник/приемник BAP, кодер "
+"„%s“)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1070
+#: spa/plugins/bluez5/bluez5-device.c:1359
 #, c-format
 msgid "Headset Head Unit (HSP/HFP, codec %s)"
-msgstr ""
+msgstr "Слушалки с микрофон (HSP/HFP, кодер „%s“)<"
 
-#: spa/plugins/bluez5/bluez5-device.c:1074
+#: spa/plugins/bluez5/bluez5-device.c:1364
 msgid "Headset Head Unit (HSP/HFP)"
-msgstr ""
-
-#: spa/plugins/bluez5/bluez5-device.c:1140
+msgstr "Слушалки с микрофон (HSP/HFP)"
+
+#: spa/plugins/bluez5/bluez5-device.c:1443
+#: spa/plugins/bluez5/bluez5-device.c:1448
+#: spa/plugins/bluez5/bluez5-device.c:1455
+#: spa/plugins/bluez5/bluez5-device.c:1461
+#: spa/plugins/bluez5/bluez5-device.c:1467
+#: spa/plugins/bluez5/bluez5-device.c:1473
+#: spa/plugins/bluez5/bluez5-device.c:1479
+#: spa/plugins/bluez5/bluez5-device.c:1485
+#: spa/plugins/bluez5/bluez5-device.c:1491
 msgid "Handsfree"
-msgstr ""
+msgstr "Слушалка за свободни ръце"
 
-#: spa/plugins/bluez5/bluez5-device.c:1155
+#: spa/plugins/bluez5/bluez5-device.c:1449
+msgid "Handsfree (HFP)"
+msgstr "Слушалка за свободни ръце (HFP)"
+
+#: spa/plugins/bluez5/bluez5-device.c:1466
 msgid "Headphone"
-msgstr ""
+msgstr "Слушалки"
 
-#: spa/plugins/bluez5/bluez5-device.c:1160
+#: spa/plugins/bluez5/bluez5-device.c:1472
 msgid "Portable"
-msgstr ""
+msgstr "Преносимо"
 
-#: spa/plugins/bluez5/bluez5-device.c:1165
+#: spa/plugins/bluez5/bluez5-device.c:1478
 msgid "Car"
-msgstr ""
+msgstr "Кола̀"
 
-#: spa/plugins/bluez5/bluez5-device.c:1170
+#: spa/plugins/bluez5/bluez5-device.c:1484
 msgid "HiFi"
-msgstr ""
+msgstr "HiFi"
 
-#: spa/plugins/bluez5/bluez5-device.c:1175
+#: spa/plugins/bluez5/bluez5-device.c:1490
 msgid "Phone"
-msgstr ""
+msgstr "Телефон"
 
-#: spa/plugins/bluez5/bluez5-device.c:1181
+#: spa/plugins/bluez5/bluez5-device.c:1497
 msgid "Bluetooth"
-msgstr ""
+msgstr "Bluetooth"
+
+#: spa/plugins/bluez5/bluez5-device.c:1498
+msgid "Bluetooth (HFP)"
+msgstr "Bluetooth (HFP)"

pipewire-1.0.1.tar.bz2/po/de.po -> pipewire-1.2.0.tar.gz/po/de.po Changed

@@ -8,15 +8,16 @@
 # Micha Pietsch <barney@fedoraproject.org>, 2008, 2009.
 # Hedda Peters <hpeters@redhat.com>, 2009, 2012.
 # Mario Blättermann <mario.blaettermann@gmail.com>, 2016.
+# Jürgen Benvenuti <gastornis@posteo.org>, 2024.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pipewire.master-tx.de\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: 2021-01-09 11:36+0000\n"
-"Last-Translator: Tobias Weise <tobias.weise@web.de>\n"
+"Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pipewire/pipewire/-/"
+"issues\n"
+"POT-Creation-Date: 2024-01-28 15:27+0000\n"
+"PO-Revision-Date: 2024-01-28 19:19+0100\n"
+"Last-Translator: Jürgen Benvenuti <gastornis@posteo.org>\n"
 "Language-Team: German <https://translate.fedoraproject.org/projects/pipewire/"
 "pipewire/de/>\n"
 "Language: de\n"
@@ -24,9 +25,9 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.4\n"
+"X-Generator: Poedit 3.4.2\n"
 
-#: src/daemon/pipewire.c:43
+#: src/daemon/pipewire.c:26
 #, c-format
 msgid ""
 "%s options\n"
@@ -34,38 +35,64 @@
 "      --version                         Show version\n"
 "  -c, --config                          Load config (Default %s)\n"
 msgstr ""
+"%s Optionen\n"
+"  -h, --help                            Diese Hilfe ausgeben\n"
+"      --version                         Version anzeigen\n"
+"  -c, --config                          Konfiguration laden (Voreinstellung "
+"%s)\n"
 
 #: src/daemon/pipewire.desktop.in:4
 msgid "PipeWire Media System"
-msgstr ""
+msgstr "PipeWire-Mediensystem"
 
 #: src/daemon/pipewire.desktop.in:5
 msgid "Start the PipeWire Media System"
-msgstr ""
+msgstr "Das PipeWire-Mediensystem starten"
 
-#: src/examples/media-session/alsa-monitor.c:526
-#: spa/plugins/alsa/acp/compat.c:187
-msgid "Built-in Audio"
-msgstr "Internes Audio"
+#: 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 "Tunnel zu %s%s%s"
 
-#: src/examples/media-session/alsa-monitor.c:530
-#: spa/plugins/alsa/acp/compat.c:192
-msgid "Modem"
-msgstr "Modem"
+#: src/modules/module-fallback-sink.c:40
+msgid "Dummy Output"
+msgstr "Schein-Ausgabe"
+
+#: src/modules/module-pulse-tunnel.c:774
+#, c-format
+msgid "Tunnel for %s@%s"
+msgstr "Tunnel für %s@%s"
 
-#: src/examples/media-session/alsa-monitor.c:539
+#: src/modules/module-zeroconf-discover.c:315
 msgid "Unknown device"
-msgstr ""
+msgstr "Unbekanntes Gerät"
+
+#: src/modules/module-zeroconf-discover.c:327
+#, c-format
+msgid "%s on %s@%s"
+msgstr "%s auf %s@%s"
+
+#: src/modules/module-zeroconf-discover.c:331
+#, c-format
+msgid "%s on %s"
+msgstr "%s auf %s"
 
 #: src/tools/pw-cat.c:991
 #, 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 Optionen <Datei>|-\n"
+"  -h, --help                            Diese Hilfe ausgeben\n"
+"      --version                         Version anzeigen\n"
+"  -v, --verbose                         Ausführliche Vorgänge einschalten\n"
+"\n"
+"\n"
 
 #: src/tools/pw-cat.c:998
 #, c-format
@@ -74,16 +101,32 @@
 "      --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                          Name des entfernten Daemon\n"
+"      --media-type                      Medientyp festlegen (Vorgabe %s)\n"
+"      --media-category                  Medienkategorie festlegen (Vorgabe "
+"%s)\n"
+"      --media-role                      Medienrolle festlegen (Vorgabe %s)\n"
+"      --target                          Seriennummer oder Name des "
+"Knotenziels festlegen (Vorgabe %s)\n"
+"                                          0 bedeutet keine Verbindung\n"
+"      --latency                         Knotenlatenz festlegen (Vorgabe %s)\n"
+"                                          Xunit (unit = s, ms, us, ns)\n"
+"                                          oder direkte Abtastung (256)\n"
+"                                          die Rate entspricht der "
+"Quelldatei\n"
+"  -P  --properties                      Knoteneigenschaften festlegen\n"
+"\n"
 
 #: src/tools/pw-cat.c:1016
 #, c-format
@@ -104,16 +147,40 @@
 "%d)\n"
 "\n"
 msgstr ""
+"      --rate                            Abtastrate (notw. für Aufzeichn.) "
+"(Vorgabe %u)\n"
+"      --channels                        Anzahl der Kanäle (notw. für "
+"Aufzeichn.) (Vorgabe %u)\n"
+"      --channel-map                     Kanalabbildung\n"
+"                                            eines von: »stereo«, "
+"»surround-51«, … oder\n"
+"                                            eine mit Kommata getrennte Liste "
+"mit Kanalnamen: z.B. »FL,FR«\n"
+"      --format                          Abtastformat %s (notw. für "
+"Aufzeichn.) (Vorgabe %s)\n"
+"      --volume                          Strom-Lautstärke 0-1.0 (Vorgabe "
+"%.3f)\n"
+"  -q  --quality                         Qualität der Neu-Abtastung (0 - 15) "
+"(Vorgabe %d)\n"
+"\n"
 
 #: src/tools/pw-cat.c:1033
 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"
 "\n"
 msgstr ""
+"  -p, --playback                        Wiedergabe-Modus\n"
+"  -r, --record                          Aufnahme-Modus\n"
+"  -m, --midi                            Midi-Modus\n"
+"  -d, --dsd                             DSD-Modus\n"
+"  -o, --encoded                         Codieren-Modus\n"
+"\n"
 
-#: src/tools/pw-cli.c:2932
+#: src/tools/pw-cli.c:2248
 #, c-format
 msgid ""
 "%s options command\n"
@@ -121,362 +188,356 @@
 "      --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 Optionen Befehl\n"
+"  -h, --help                            Diese Hilfe ausgeben\n"
+"      --version                         Version anzeigen\n"
+"  -d, --daemon                          Als Daemon starten (Vorgabe: nein)\n"
+"  -r, --remote                          Name des entfernten Daemon\n"
+"  -m, --monitor                         Aktivitäten überwachen\n"
+"\n"
 
-#: spa/plugins/alsa/acp/acp.c:290
+#: spa/plugins/alsa/acp/acp.c:327
 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:488 spa/plugins/alsa/acp/alsa-mixer.c:4633
+#: spa/plugins/bluez5/bluez5-device.c:1725
 msgid "Off"
 msgstr "Aus"
 
-#: spa/plugins/alsa/acp/channelmap.h:466
-msgid "(invalid)"
-msgstr "(ungültig)"
-
-#: spa/plugins/alsa/acp/alsa-mixer.c:2709
+#: spa/plugins/alsa/acp/alsa-mixer.c:2652
 msgid "Input"
 msgstr "Eingabe"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2710
+#: spa/plugins/alsa/acp/alsa-mixer.c:2653
 msgid "Docking Station Input"
 msgstr "Eingabe über Docking-Station"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2711
+#: spa/plugins/alsa/acp/alsa-mixer.c:2654
 msgid "Docking Station Microphone"
 msgstr "Mikrofon der Docking-Station"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2712
+#: spa/plugins/alsa/acp/alsa-mixer.c:2655
 msgid "Docking Station Line In"
 msgstr "Line-Eingang der 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:2656
+#: spa/plugins/alsa/acp/alsa-mixer.c:2747
 msgid "Line In"
 msgstr "Line-Eingang"
 
-#: 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:2657
+#: spa/plugins/alsa/acp/alsa-mixer.c:2741
+#: spa/plugins/bluez5/bluez5-device.c:2004
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2715
-#: spa/plugins/alsa/acp/alsa-mixer.c:2799
+#: spa/plugins/alsa/acp/alsa-mixer.c:2658
+#: spa/plugins/alsa/acp/alsa-mixer.c:2742
 msgid "Front Microphone"
 msgstr "Vorderes Mikrofon"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2716
-#: spa/plugins/alsa/acp/alsa-mixer.c:2800
+#: spa/plugins/alsa/acp/alsa-mixer.c:2659
+#: spa/plugins/alsa/acp/alsa-mixer.c:2743
 msgid "Rear Microphone"
 msgstr "Rückwärtiges Mikrofon"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2717
+#: spa/plugins/alsa/acp/alsa-mixer.c:2660
 msgid "External Microphone"
 msgstr "Externes Mikrofon"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2718
-#: spa/plugins/alsa/acp/alsa-mixer.c:2802
+#: spa/plugins/alsa/acp/alsa-mixer.c:2661
+#: spa/plugins/alsa/acp/alsa-mixer.c:2745
 msgid "Internal Microphone"
 msgstr "Internes Mikrofon"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2719
-#: spa/plugins/alsa/acp/alsa-mixer.c:2805
+#: spa/plugins/alsa/acp/alsa-mixer.c:2662
+#: spa/plugins/alsa/acp/alsa-mixer.c:2748
 msgid "Radio"
 msgstr "Radio"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2720
-#: spa/plugins/alsa/acp/alsa-mixer.c:2806
+#: spa/plugins/alsa/acp/alsa-mixer.c:2663
+#: spa/plugins/alsa/acp/alsa-mixer.c:2749
 msgid "Video"
 msgstr "Video"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2721
+#: spa/plugins/alsa/acp/alsa-mixer.c:2664
 msgid "Automatic Gain Control"
 msgstr "Automatische Verstärkungsregelung"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2722
+#: spa/plugins/alsa/acp/alsa-mixer.c:2665
 msgid "No Automatic Gain Control"
 msgstr "Keine automatische Verstärkungsregelung"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2723
+#: spa/plugins/alsa/acp/alsa-mixer.c:2666
 msgid "Boost"
 msgstr "Boost"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2724
+#: spa/plugins/alsa/acp/alsa-mixer.c:2667
 msgid "No Boost"
 msgstr "Kein Boost"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2725
+#: spa/plugins/alsa/acp/alsa-mixer.c:2668
 msgid "Amplifier"
 msgstr "Verstärker"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2726
+#: spa/plugins/alsa/acp/alsa-mixer.c:2669
 msgid "No Amplifier"
 msgstr "Kein Verstärker"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2727
+#: spa/plugins/alsa/acp/alsa-mixer.c:2670
 msgid "Bass Boost"
 msgstr "Bassverstärkung"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2728
+#: spa/plugins/alsa/acp/alsa-mixer.c:2671
 msgid "No Bass Boost"
 msgstr "Keine Bassverstärkung"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2729
-#: spa/plugins/bluez5/bluez5-device.c:1150
+#: spa/plugins/alsa/acp/alsa-mixer.c:2672
+#: spa/plugins/bluez5/bluez5-device.c:2010
 msgid "Speaker"
 msgstr "Lautsprecher"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2730
-#: spa/plugins/alsa/acp/alsa-mixer.c:2808
+#: spa/plugins/alsa/acp/alsa-mixer.c:2673
+#: spa/plugins/alsa/acp/alsa-mixer.c:2751
 msgid "Headphones"
 msgstr "Kopfhörer"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2797
+#: spa/plugins/alsa/acp/alsa-mixer.c:2740
 msgid "Analog Input"
 msgstr "Analoger Eingang"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2801
+#: spa/plugins/alsa/acp/alsa-mixer.c:2744
 msgid "Dock Microphone"
 msgstr "Mikrofon der Docking-Station"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2803
+#: spa/plugins/alsa/acp/alsa-mixer.c:2746
 msgid "Headset Microphone"
 msgstr "Mikrofon am Kopfhörer"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2807
+#: spa/plugins/alsa/acp/alsa-mixer.c:2750
 msgid "Analog Output"
 msgstr "Analoge Ausgabe"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2809
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:2752
 msgid "Headphones 2"
-msgstr "Kopfhörer"
+msgstr "Kopfhörer 2"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2810
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:2753
 msgid "Headphones Mono Output"
-msgstr "Analoge Mono-Ausgabe"
+msgstr "Kopfhörer Mono-Ausgabe"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2811
+#: spa/plugins/alsa/acp/alsa-mixer.c:2754
 msgid "Line Out"
 msgstr "Line-Ausgang"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2812
+#: spa/plugins/alsa/acp/alsa-mixer.c:2755
 msgid "Analog Mono Output"
 msgstr "Analoge Mono-Ausgabe"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2813
+#: spa/plugins/alsa/acp/alsa-mixer.c:2756
 msgid "Speakers"
 msgstr "Lautsprecher"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2814
+#: spa/plugins/alsa/acp/alsa-mixer.c:2757
 msgid "HDMI / DisplayPort"
 msgstr "HDMI / DisplayPort"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2815
+#: spa/plugins/alsa/acp/alsa-mixer.c:2758
 msgid "Digital Output (S/PDIF)"
 msgstr "Digitalausgang (S/PDIF)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2816
+#: spa/plugins/alsa/acp/alsa-mixer.c:2759
 msgid "Digital Input (S/PDIF)"
 msgstr "Digitaleingang (S/PDIF)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2817
+#: spa/plugins/alsa/acp/alsa-mixer.c:2760
 msgid "Multichannel Input"
-msgstr "Mehrkanaleingang"
+msgstr "Mehrkanal-Eingang"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2818
+#: spa/plugins/alsa/acp/alsa-mixer.c:2761
 msgid "Multichannel Output"
-msgstr "Mehrkanalausgang"
+msgstr "Mehrkanal-Ausgang"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2819
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:2762
 msgid "Game Output"
-msgstr "%s-Ausgabe"
+msgstr "Spiel-Ausgabe"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2820
-#: spa/plugins/alsa/acp/alsa-mixer.c:2821
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:2763
+#: spa/plugins/alsa/acp/alsa-mixer.c:2764
 msgid "Chat Output"
-msgstr "%s-Ausgabe"
+msgstr "Unterhaltungs-Ausgabe"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2822
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:2765
 msgid "Chat Input"
-msgstr "%s-Eingabe"
+msgstr "Unterhaltungs-Eingang"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:2823
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:2766
 msgid "Virtual Surround 7.1"
-msgstr "Virtuelles Surround-Ziel"
+msgstr "Virtuelles 7.1 Surround"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4527
+#: spa/plugins/alsa/acp/alsa-mixer.c:4456
 msgid "Analog Mono"
 msgstr "Analog Mono"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4528
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:4457
 msgid "Analog Mono (Left)"
-msgstr "Analog Mono"
+msgstr "Analoges Mono (links)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4529
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:4458
 msgid "Analog Mono (Right)"
-msgstr "Analog Mono"
+msgstr "Analoges Mono (rechts)"
 
 #. 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:4459
+#: spa/plugins/alsa/acp/alsa-mixer.c:4467
+#: spa/plugins/alsa/acp/alsa-mixer.c:4468
 msgid "Analog Stereo"
 msgstr "Analog Stereo"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4531
+#: spa/plugins/alsa/acp/alsa-mixer.c:4460
 msgid "Mono"
 msgstr "Mono"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4532
+#: spa/plugins/alsa/acp/alsa-mixer.c:4461
 msgid "Stereo"
 msgstr "Stereo"
 
-#: 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:4469
+#: spa/plugins/alsa/acp/alsa-mixer.c:4627
+#: spa/plugins/bluez5/bluez5-device.c:1992
 msgid "Headset"
 msgstr "Headset"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4541
-#: spa/plugins/alsa/acp/alsa-mixer.c:4699
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:4470
+#: spa/plugins/alsa/acp/alsa-mixer.c:4628
 msgid "Speakerphone"
-msgstr "Lautsprecher"
+msgstr "Lautsprechertelefon"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4542
-#: spa/plugins/alsa/acp/alsa-mixer.c:4543
+#: spa/plugins/alsa/acp/alsa-mixer.c:4471
+#: spa/plugins/alsa/acp/alsa-mixer.c:4472
 msgid "Multichannel"
 msgstr "Mehrkanal"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4544
+#: spa/plugins/alsa/acp/alsa-mixer.c:4473
 msgid "Analog Surround 2.1"
 msgstr "Analog Surround 2.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4545
+#: spa/plugins/alsa/acp/alsa-mixer.c:4474
 msgid "Analog Surround 3.0"
 msgstr "Analog Surround 3.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4546
+#: spa/plugins/alsa/acp/alsa-mixer.c:4475
 msgid "Analog Surround 3.1"
 msgstr "Analog Surround 3.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4547
+#: spa/plugins/alsa/acp/alsa-mixer.c:4476
 msgid "Analog Surround 4.0"
 msgstr "Analog Surround 4.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4548
+#: spa/plugins/alsa/acp/alsa-mixer.c:4477
 msgid "Analog Surround 4.1"
 msgstr "Analog Surround 4.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4549
+#: spa/plugins/alsa/acp/alsa-mixer.c:4478
 msgid "Analog Surround 5.0"
 msgstr "Analog Surround 5.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4550
+#: spa/plugins/alsa/acp/alsa-mixer.c:4479
 msgid "Analog Surround 5.1"
 msgstr "Analog Surround 5.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4551
+#: spa/plugins/alsa/acp/alsa-mixer.c:4480
 msgid "Analog Surround 6.0"
 msgstr "Analog Surround 6.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4552
+#: spa/plugins/alsa/acp/alsa-mixer.c:4481
 msgid "Analog Surround 6.1"
 msgstr "Analog Surround 6.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4553
+#: spa/plugins/alsa/acp/alsa-mixer.c:4482
 msgid "Analog Surround 7.0"
 msgstr "Analog Surround 7.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4554
+#: spa/plugins/alsa/acp/alsa-mixer.c:4483
 msgid "Analog Surround 7.1"
 msgstr "Analog Surround 7.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4555
+#: spa/plugins/alsa/acp/alsa-mixer.c:4484
 msgid "Digital Stereo (IEC958)"
 msgstr "Digital Stereo (IEC958)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4556
+#: spa/plugins/alsa/acp/alsa-mixer.c:4485
 msgid "Digital Surround 4.0 (IEC958/AC3)"
 msgstr "Digital Surround 4.0 (IEC958/AC3)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4557
+#: spa/plugins/alsa/acp/alsa-mixer.c:4486
 msgid "Digital Surround 5.1 (IEC958/AC3)"
 msgstr "Digital Surround 5.1 (IEC958/AC3)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4558
+#: spa/plugins/alsa/acp/alsa-mixer.c:4487
 msgid "Digital Surround 5.1 (IEC958/DTS)"
 msgstr "Digital Surround 5.1 (IEC958/DTS)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4559
+#: spa/plugins/alsa/acp/alsa-mixer.c:4488
 msgid "Digital Stereo (HDMI)"
 msgstr "Digital Stereo (HDMI)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4560
+#: spa/plugins/alsa/acp/alsa-mixer.c:4489
 msgid "Digital Surround 5.1 (HDMI)"
 msgstr "Digital Surround 5.1 (HDMI)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4561
+#: spa/plugins/alsa/acp/alsa-mixer.c:4490
 msgid "Chat"
-msgstr ""
+msgstr "Unterhaltung"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4562
+#: spa/plugins/alsa/acp/alsa-mixer.c:4491
 msgid "Game"
-msgstr ""
+msgstr "Spiel"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4696
+#: spa/plugins/alsa/acp/alsa-mixer.c:4625
 msgid "Analog Mono Duplex"
 msgstr "Analog Mono Duplex"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4697
+#: spa/plugins/alsa/acp/alsa-mixer.c:4626
 msgid "Analog Stereo Duplex"
 msgstr "Analog Stereo Duplex"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4700
+#: spa/plugins/alsa/acp/alsa-mixer.c:4629
 msgid "Digital Stereo Duplex (IEC958)"
 msgstr "Digital Stereo Duplex (IEC958)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4701
+#: spa/plugins/alsa/acp/alsa-mixer.c:4630
 msgid "Multichannel Duplex"
 msgstr "Mehrkanal-Duplex"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4702
-#, fuzzy
+#: spa/plugins/alsa/acp/alsa-mixer.c:4631
 msgid "Stereo Duplex"
-msgstr "Analog Stereo Duplex"
+msgstr "Stereo Duplex"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4703
+#: spa/plugins/alsa/acp/alsa-mixer.c:4632
 msgid "Mono Chat + 7.1 Surround"
-msgstr ""
+msgstr "Mono-Unterhaltung + 7.1 Surround"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4806
+#: spa/plugins/alsa/acp/alsa-mixer.c:4733
 #, c-format
 msgid "%s Output"
 msgstr "%s-Ausgabe"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4813
+#: spa/plugins/alsa/acp/alsa-mixer.c:4741
 #, c-format
 msgid "%s Input"
-msgstr "%s-Eingabe"
+msgstr "%s-Eingang"
 
-#: spa/plugins/alsa/acp/alsa-util.c:1175 spa/plugins/alsa/acp/alsa-util.c:1269
-#, fuzzy, c-format
+#: spa/plugins/alsa/acp/alsa-util.c:1211 spa/plugins/alsa/acp/alsa-util.c:1305
+#, c-format
 msgid ""
 "snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
 "ms).\n"
@@ -488,40 +549,40 @@
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 msgstr0 ""
-"snd_pcm_avail() gibt einen Wert zurück, der außerordentlich groß ist: %lu "
-"bytes (%lu ms).\n"
+"snd_pcm_avail() gab einen Wert zurück, der außerordentlich groß ist: %lu "
+"Byte (%lu ms).\n"
 "Dies ist wahrscheinlich ein Fehler im ALSA-Treiber »%s«. Bitte melden Sie "
 "dieses Problem den ALSA-Entwicklern."
 msgstr1 ""
-"snd_pcm_avail() gibt einen Wert zurück, der außerordentlich groß ist: %lu "
-"bytes (%lu ms).\n"
+"snd_pcm_avail() gab einen Wert zurück, der außerordentlich groß ist: %lu "
+"Bytes (%lu ms).\n"
 "Dies ist wahrscheinlich ein Fehler im ALSA-Treiber »%s«. Bitte melden Sie "
 "dieses Problem den ALSA-Entwicklern."
 
-#: spa/plugins/alsa/acp/alsa-util.c:1241
-#, fuzzy, c-format
+#: spa/plugins/alsa/acp/alsa-util.c:1277
+#, 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."
 msgstr0 ""
-"snd_pcm_delay() gibt einen Wert zurück, der außerordentlich groß ist: %li "
-"Bytes (%s%lu ms).\n"
+"snd_pcm_delay() gab einen Wert zurück, der außerordentlich groß ist: %li "
+"Byte (%s%lu ms).\n"
 "Dies ist wahrscheinlich ein Fehler im ALSA-Treiber »%s«. Bitte melden Sie "
 "dieses Problem den ALSA-Entwicklern."
 msgstr1 ""
-"snd_pcm_delay() gibt einen Wert zurück, der außerordentlich groß ist: %li "
+"snd_pcm_delay() gab einen Wert zurück, der außerordentlich groß ist: %li "
 "Bytes (%s%lu ms).\n"
 "Dies ist wahrscheinlich ein Fehler im ALSA-Treiber »%s«. Bitte melden Sie "
 "dieses Problem den ALSA-Entwicklern."
 
-#: spa/plugins/alsa/acp/alsa-util.c:1288
+#: spa/plugins/alsa/acp/alsa-util.c:1324
 #, c-format
 msgid ""
 "snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
@@ -534,8 +595,8 @@
 "Dies ist wahrscheinlich ein Fehler im ALSA-Treiber »%s«. Bitte melden Sie "
 "dieses Problem den ALSA-Entwicklern."
 
-#: spa/plugins/alsa/acp/alsa-util.c:1331
-#, fuzzy, c-format
+#: spa/plugins/alsa/acp/alsa-util.c:1367
+#, c-format
 msgid ""
 "snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
 "(%lu ms).\n"
@@ -547,72 +608,126 @@
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 msgstr0 ""
-"snd_pcm_mmap_begin() gibt einen Wert zurück, der außerordentlich groß ist: "
-"%lu Bytes (%lu ms).\n"
+"snd_pcm_mmap_begin() gab einen Wert zurück, der außerordentlich groß ist: "
+"%lu Byte (%lu ms).\n"
 "Dies ist wahrscheinlich ein Fehler im ALSA-Treiber »%s«. Bitte melden Sie "
 "dieses Problem den ALSA-Entwicklern."
 msgstr1 ""
-"snd_pcm_mmap_begin() gibt einen Wert zurück, der außerordentlich groß ist: "
-"%lu Bytes (%lu ms).\n"
+"snd_pcm_mmap_begin() gab einen Wert zurück, der außerordentlich groß ist: "
+"%lu Byte (%lu ms).\n"
 "Dies ist wahrscheinlich ein Fehler im ALSA-Treiber »%s«. Bitte melden Sie "
 "dieses Problem den ALSA-Entwicklern."
 
-#: spa/plugins/bluez5/bluez5-device.c:1010
+#: spa/plugins/alsa/acp/channelmap.h:457
+msgid "(invalid)"
+msgstr "(ungültig)"
+
+#: spa/plugins/alsa/acp/compat.c:193
+msgid "Built-in Audio"
+msgstr "Internes Audio"
+
+#: spa/plugins/alsa/acp/compat.c:198
+msgid "Modem"
+msgstr "Modem"
+
+#: spa/plugins/bluez5/bluez5-device.c:1736
 msgid "Audio Gateway (A2DP Source & HSP/HFP AG)"
-msgstr ""
+msgstr "Audio-Gateway (A2DP-Quelle und HSP/HFP AG)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1033
+#: spa/plugins/bluez5/bluez5-device.c:1784
 #, c-format
 msgid "High Fidelity Playback (A2DP Sink, codec %s)"
-msgstr ""
+msgstr "High Fidelity-Wiedergabe (A2DP-Senke, Codec %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1035
+#: spa/plugins/bluez5/bluez5-device.c:1787
 #, c-format
 msgid "High Fidelity Duplex (A2DP Source/Sink, codec %s)"
-msgstr ""
+msgstr "High Fidelity Duplex (A2DP-Quelle/-Senke, Codec %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1041
+#: spa/plugins/bluez5/bluez5-device.c:1795
 msgid "High Fidelity Playback (A2DP Sink)"
-msgstr ""
+msgstr "High Fidelity-Wiedergabe (A2DP-Senke)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1043
+#: spa/plugins/bluez5/bluez5-device.c:1797
 msgid "High Fidelity Duplex (A2DP Source/Sink)"
-msgstr ""
+msgstr "High Fidelity Duplex (A2DP-Quelle/-Senke)"
+
+#: spa/plugins/bluez5/bluez5-device.c:1847
+#, c-format
+msgid "High Fidelity Playback (BAP Sink, codec %s)"
+msgstr "High Fidelity-Wiedergabe (BAP-Senke, Codec %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1070
+#: spa/plugins/bluez5/bluez5-device.c:1852
+#, c-format
+msgid "High Fidelity Input (BAP Source, codec %s)"
+msgstr "High Fidelity-Eingang (BAP-Quelle, Codec %s)"
+
+#: spa/plugins/bluez5/bluez5-device.c:1856
+#, c-format
+msgid "High Fidelity Duplex (BAP Source/Sink, codec %s)"
+msgstr "High Fidelity Duplex (BAP-Quelle/-Senke, Codec %s)"
+
+#: spa/plugins/bluez5/bluez5-device.c:1865
+msgid "High Fidelity Playback (BAP Sink)"
+msgstr "High Fidelity-Wiedergabe (BAP-Senke)"
+
+#: spa/plugins/bluez5/bluez5-device.c:1869
+msgid "High Fidelity Input (BAP Source)"
+msgstr "High Fidelity-Eingang (BAP-Quelle)"
+
+#: spa/plugins/bluez5/bluez5-device.c:1872
+msgid "High Fidelity Duplex (BAP Source/Sink)"
+msgstr "High Fidelity Duplex (BAP-Quelle/-Senke)"
+
+#: spa/plugins/bluez5/bluez5-device.c:1908
 #, c-format
 msgid "Headset Head Unit (HSP/HFP, codec %s)"
-msgstr ""
+msgstr "Kopfhörer-Garnitur (HSP/HFP, Codec %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1074
+#: spa/plugins/bluez5/bluez5-device.c:1913
 msgid "Headset Head Unit (HSP/HFP)"
-msgstr ""
-
-#: spa/plugins/bluez5/bluez5-device.c:1140
+msgstr "Kopfhörer-Garnitur (HSP/HFP)"
+
+#: spa/plugins/bluez5/bluez5-device.c:1993
+#: spa/plugins/bluez5/bluez5-device.c:1998
+#: spa/plugins/bluez5/bluez5-device.c:2005
+#: spa/plugins/bluez5/bluez5-device.c:2011
+#: spa/plugins/bluez5/bluez5-device.c:2017
+#: spa/plugins/bluez5/bluez5-device.c:2023
+#: spa/plugins/bluez5/bluez5-device.c:2029
+#: spa/plugins/bluez5/bluez5-device.c:2035
+#: spa/plugins/bluez5/bluez5-device.c:2041
 msgid "Handsfree"
-msgstr "Freisprecheinrichtung"
+msgstr "Freisprech"
 
-#: spa/plugins/bluez5/bluez5-device.c:1155
+#: spa/plugins/bluez5/bluez5-device.c:1999
+msgid "Handsfree (HFP)"
+msgstr "Freisprech (HFP)"
+
+#: spa/plugins/bluez5/bluez5-device.c:2016
 msgid "Headphone"
 msgstr "Kopfhörer"
 
-#: spa/plugins/bluez5/bluez5-device.c:1160
+#: spa/plugins/bluez5/bluez5-device.c:2022
 msgid "Portable"
-msgstr "tragbar"
+msgstr "Tragbar"
 
-#: spa/plugins/bluez5/bluez5-device.c:1165
+#: spa/plugins/bluez5/bluez5-device.c:2028
 msgid "Car"
 msgstr "Auto"
 
-#: spa/plugins/bluez5/bluez5-device.c:1170
+#: spa/plugins/bluez5/bluez5-device.c:2034
 msgid "HiFi"
 msgstr "HiFi"
 
-#: spa/plugins/bluez5/bluez5-device.c:1175
+#: spa/plugins/bluez5/bluez5-device.c:2040
 msgid "Phone"
 msgstr "Telefon"
 
-#: spa/plugins/bluez5/bluez5-device.c:1181
-#, fuzzy
+#: spa/plugins/bluez5/bluez5-device.c:2047
 msgid "Bluetooth"
-msgstr "Bluetooth-Eingabe"
+msgstr "Bluetooth"
+
+#: spa/plugins/bluez5/bluez5-device.c:2048
+msgid "Bluetooth (HFP)"
+msgstr "Bluetooth (HFP)"

pipewire-1.0.1.tar.bz2/po/oc.po -> pipewire-1.2.0.tar.gz/po/oc.po Changed

@@ -8,14 +8,14 @@
 # Thomas Canniot <mrtom@fedoraproject.org>, 2009, 2012.
 # Cédric Valmary (Tot en Òc) <cvalmary@yahoo.fr>, 2015.
 # Cédric Valmary (totenoc.eu) <cvalmary@yahoo.fr>, 2016.
-# Quentin PAGÈS, 2023.
+# Quentin PAGÈS, 2023.-2024
 msgid ""
 msgstr ""
 "Project-Id-Version: pipewire trunk\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pipewire/pipewire/"
 "issues/new\n"
-"POT-Creation-Date: 2022-06-30 12:50+0200\n"
-"PO-Revision-Date: 2023-02-11 00:11+0100\n"
+"POT-Creation-Date: 2024-02-25 03:43+0300\n"
+"PO-Revision-Date: 2024-06-24 11:53+0200\n"
 "Last-Translator: Quentin PAGÈS\n"
 "Language-Team: Tot En Òc\n"
 "Language: oc\n"
@@ -23,10 +23,10 @@
 "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.2.2\n"
+"X-Generator: Poedit 3.4.3\n"
 "X-Launchpad-Export-Date: 2016-10-12 20:12+0000\n"
 
-#: src/daemon/pipewire.c:46
+#: src/daemon/pipewire.c:26
 #, c-format
 msgid ""
 "%s options\n"
@@ -39,36 +39,44 @@
 "      --version                         Afichar la version\n"
 "  -c, --config                          Cargar la conf. (Defaut %s)\n"
 
-#: src/modules/module-protocol-pulse/modules/module-tunnel-sink.c:180
-#: src/modules/module-protocol-pulse/modules/module-tunnel-source.c:180
+#: src/daemon/pipewire.desktop.in:4
+msgid "PipeWire Media System"
+msgstr "Sistèma mèdia PipeWire"
+
+#: src/daemon/pipewire.desktop.in:5
+msgid "Start the PipeWire Media System"
+msgstr "Aviar lo sistèma mèdia PipeWire"
+
+#: 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"
-msgstr "Tunèl cap a %s/%s"
+msgid "Tunnel to %s%s%s"
+msgstr "Tunèl cap a %s%s%s"
 
-#: src/modules/module-fallback-sink.c:51
+#: src/modules/module-fallback-sink.c:40
 msgid "Dummy Output"
 msgstr "Sortida factícia"
 
-#: src/modules/module-pulse-tunnel.c:662
+#: src/modules/module-pulse-tunnel.c:774
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Tunèl per %s@%s"
 
-#: src/modules/module-zeroconf-discover.c:332
+#: src/modules/module-zeroconf-discover.c:315
 msgid "Unknown device"
 msgstr "Periferic desconegut"
 
-#: src/modules/module-zeroconf-discover.c:344
+#: src/modules/module-zeroconf-discover.c:327
 #, c-format
 msgid "%s on %s@%s"
 msgstr "%s sus %s@%s"
 
-#: src/modules/module-zeroconf-discover.c:348
+#: src/modules/module-zeroconf-discover.c:331
 #, c-format
 msgid "%s on %s"
 msgstr "%s sus %s"
 
-#: src/tools/pw-cat.c:784
+#: src/tools/pw-cat.c:991
 #, c-format
 msgid ""
 "%s options <file>|-\n"
@@ -83,14 +91,15 @@
 "  -v, --verbose                         Activar las operacions verbosas\n"
 "\n"
 
-#: src/tools/pw-cat.c:791
+#: src/tools/pw-cat.c:998
 #, 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"
@@ -100,8 +109,25 @@
 "  -P  --properties                      Set node properties\n"
 "\n"
 msgstr ""
+"  -R, --remote                          Nom del demòni distant\n"
+"      --media-type                      Definir lo tipe de mèdia (per defaut "
+"%s)\n"
+"      --media-category                  Definir la categoria de mèdia (per "
+"defaut %s)\n"
+"      --media-role                      Definir lo ròtle del mèdia (per "
+"defaut %s)\n"
+"      --target                          Definir lo numèro de seria o lo nom "
+"de la cibla del nos (per defaut %s)\n"
+"                                          0 significa ligar pas\n"
+"      --latency                         Definir la laténcia del nos (per "
+"defaut %s)\n"
+"                                          Xunit (unit = s, ms, us, ns)\n"
+"                                          o escandalhatge dirècte (256)\n"
+"                                          lo taus es çò del fichièr font\n"
+"  -P  --properties                      Definir las proprietats del nos\n"
+"\n"
 
-#: src/tools/pw-cat.c:809
+#: src/tools/pw-cat.c:1016
 #, c-format
 msgid ""
 "      --rate                            Sample rate (req. for rec) (default "
@@ -120,22 +146,41 @@
 "%d)\n"
 "\n"
 msgstr ""
+"      --rate                            Taus d'escandalhatge (req. per rec) "
+"(per defaut %u)\n"
+"      --channels                        Nombre de canals (req. per rec) (per "
+"defaut %u)\n"
+"      --channel-map                     Mapa de canal\n"
+"                                            un de : \"stereo\", "
+"\"surround-51\",... o\n"
+"                                            lista de nom de canal separats "
+"per de virgula : ex. \"FL,FR\"\n"
+"      --format                          Format d'escandalhatge %s (req. per "
+"rec) (per defaut %s)\n"
+"      --volume                          Volum del flux 0-1.0 (per defaut "
+"%.3f)\n"
+"  -q  --quality                         Qualitat del aus reescandalhatge (0 "
+"- 15) (per defaut %d)\n"
+"\n"
 
-#: src/tools/pw-cat.c:826
+#: src/tools/pw-cat.c:1033
 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"
 "\n"
 msgstr ""
 "  -p, --playback                        Mòde lectura\n"
 "  -r, --record                          Mòde enregistrament\n"
 "  -m, --midi                            Mòde Midi\n"
 "  -d, --dsd                             Mòde DSD\n"
+"  -o, --encoded                         %òde encodat\n"
+"\n"
 "\n"
 
-#: src/tools/pw-cli.c:2250
+#: src/tools/pw-cli.c:2252
 #, c-format
 msgid ""
 "%s options command\n"
@@ -143,6 +188,7 @@
 "      --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 opcions comanda\n"
@@ -150,15 +196,17 @@
 "      --version                         Afichar la version\n"
 "  -d, --daemon                          Aviar coma demòni (Per defaut "
 "false)\n"
-"  -r, --remote                          Remote daemon name\n"
+"  -r, --remote                          Nom del demòni distant\n"
+"  -m, --monitor                         Susvelhar l’activitat\n"
+"\n"
 "\n"
 
-#: spa/plugins/alsa/acp/acp.c:321
+#: spa/plugins/alsa/acp/acp.c:327
 msgid "Pro Audio"
-msgstr ""
+msgstr "Àudio pro"
 
-#: spa/plugins/alsa/acp/acp.c:444 spa/plugins/alsa/acp/alsa-mixer.c:4648
-#: spa/plugins/bluez5/bluez5-device.c:1236
+#: spa/plugins/alsa/acp/acp.c:488 spa/plugins/alsa/acp/alsa-mixer.c:4633
+#: spa/plugins/bluez5/bluez5-device.c:1701
 msgid "Off"
 msgstr "Atudat"
 
@@ -185,7 +233,7 @@
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:2657
 #: spa/plugins/alsa/acp/alsa-mixer.c:2741
-#: spa/plugins/bluez5/bluez5-device.c:1454
+#: spa/plugins/bluez5/bluez5-device.c:1989
 msgid "Microphone"
 msgstr "Microfòn"
 
@@ -251,7 +299,7 @@
 msgstr "Pas d'amplificacion de las bassas"
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:2672
-#: spa/plugins/bluez5/bluez5-device.c:1460
+#: spa/plugins/bluez5/bluez5-device.c:1995
 msgid "Speaker"
 msgstr "Nautparlaire"
 
@@ -333,15 +381,15 @@
 msgid "Virtual Surround 7.1"
 msgstr "Surround 7.1 virtual"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4471
+#: spa/plugins/alsa/acp/alsa-mixer.c:4456
 msgid "Analog Mono"
 msgstr "Mono analogic"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4472
+#: spa/plugins/alsa/acp/alsa-mixer.c:4457
 msgid "Analog Mono (Left)"
 msgstr "Mono analogic (esquèrra)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4473
+#: spa/plugins/alsa/acp/alsa-mixer.c:4458
 msgid "Analog Mono (Right)"
 msgstr "Mono analogic (drecha)"
 
@@ -350,147 +398,147 @@
 #. * 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:4474
-#: spa/plugins/alsa/acp/alsa-mixer.c:4482
-#: spa/plugins/alsa/acp/alsa-mixer.c:4483
+#: spa/plugins/alsa/acp/alsa-mixer.c:4459
+#: spa/plugins/alsa/acp/alsa-mixer.c:4467
+#: spa/plugins/alsa/acp/alsa-mixer.c:4468
 msgid "Analog Stereo"
 msgstr "Estereo analogic"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4475
+#: spa/plugins/alsa/acp/alsa-mixer.c:4460
 msgid "Mono"
 msgstr "Mono"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4476
+#: spa/plugins/alsa/acp/alsa-mixer.c:4461
 msgid "Stereo"
 msgstr "Estereo"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4484
-#: spa/plugins/alsa/acp/alsa-mixer.c:4642
-#: spa/plugins/bluez5/bluez5-device.c:1442
+#: spa/plugins/alsa/acp/alsa-mixer.c:4469
+#: spa/plugins/alsa/acp/alsa-mixer.c:4627
+#: spa/plugins/bluez5/bluez5-device.c:1977
 msgid "Headset"
 msgstr "Casc àudio"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4485
-#: spa/plugins/alsa/acp/alsa-mixer.c:4643
+#: spa/plugins/alsa/acp/alsa-mixer.c:4470
+#: spa/plugins/alsa/acp/alsa-mixer.c:4628
 msgid "Speakerphone"
 msgstr "Nautparlaire"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4486
-#: spa/plugins/alsa/acp/alsa-mixer.c:4487
+#: spa/plugins/alsa/acp/alsa-mixer.c:4471
+#: spa/plugins/alsa/acp/alsa-mixer.c:4472
 msgid "Multichannel"
 msgstr "Multicanal"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4488
+#: spa/plugins/alsa/acp/alsa-mixer.c:4473
 msgid "Analog Surround 2.1"
 msgstr "Surround analogic 2.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4489
+#: spa/plugins/alsa/acp/alsa-mixer.c:4474
 msgid "Analog Surround 3.0"
 msgstr "Surround analogic 3.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4490
+#: spa/plugins/alsa/acp/alsa-mixer.c:4475
 msgid "Analog Surround 3.1"
 msgstr "Surround analogic 3.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4491
+#: spa/plugins/alsa/acp/alsa-mixer.c:4476
 msgid "Analog Surround 4.0"
 msgstr "Surround analogic 4.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4492
+#: spa/plugins/alsa/acp/alsa-mixer.c:4477
 msgid "Analog Surround 4.1"
 msgstr "Surround analogic 4.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4493
+#: spa/plugins/alsa/acp/alsa-mixer.c:4478
 msgid "Analog Surround 5.0"
 msgstr "Surround analogic 5.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4494
+#: spa/plugins/alsa/acp/alsa-mixer.c:4479
 msgid "Analog Surround 5.1"
 msgstr "Surround analogic 5.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4495
+#: spa/plugins/alsa/acp/alsa-mixer.c:4480
 msgid "Analog Surround 6.0"
 msgstr "Surround analogic 6.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4496
+#: spa/plugins/alsa/acp/alsa-mixer.c:4481
 msgid "Analog Surround 6.1"
 msgstr "Surround analogic 6.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4497
+#: spa/plugins/alsa/acp/alsa-mixer.c:4482
 msgid "Analog Surround 7.0"
 msgstr "Surround analogic 7.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4498
+#: spa/plugins/alsa/acp/alsa-mixer.c:4483
 msgid "Analog Surround 7.1"
 msgstr "Surround analogic 7.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4499
+#: spa/plugins/alsa/acp/alsa-mixer.c:4484
 msgid "Digital Stereo (IEC958)"
 msgstr "Estereo numeric (IEC958)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4500
+#: spa/plugins/alsa/acp/alsa-mixer.c:4485
 msgid "Digital Surround 4.0 (IEC958/AC3)"
 msgstr "Surround numeric 4.0 (IEC958/AC3)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4501
+#: spa/plugins/alsa/acp/alsa-mixer.c:4486
 msgid "Digital Surround 5.1 (IEC958/AC3)"
 msgstr "Surround numeric 5.1 (IEC958/AC3)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4502
+#: spa/plugins/alsa/acp/alsa-mixer.c:4487
 msgid "Digital Surround 5.1 (IEC958/DTS)"
 msgstr "Digital Surround 5.1 (IEC958/DTS)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4503
+#: spa/plugins/alsa/acp/alsa-mixer.c:4488
 msgid "Digital Stereo (HDMI)"
 msgstr "Estereo numeric (HDMI)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4504
+#: spa/plugins/alsa/acp/alsa-mixer.c:4489
 msgid "Digital Surround 5.1 (HDMI)"
 msgstr "Digital Surround 5.1 (HDMI)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4505
+#: spa/plugins/alsa/acp/alsa-mixer.c:4490
 msgid "Chat"
 msgstr "Messatjariá instantanèa"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4506
+#: spa/plugins/alsa/acp/alsa-mixer.c:4491
 msgid "Game"
 msgstr "Jòc"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4640
+#: spa/plugins/alsa/acp/alsa-mixer.c:4625
 msgid "Analog Mono Duplex"
 msgstr "Duplèx Mono analogic"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4641
+#: spa/plugins/alsa/acp/alsa-mixer.c:4626
 msgid "Analog Stereo Duplex"
 msgstr "Duplèx esterèo analogic"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4644
+#: spa/plugins/alsa/acp/alsa-mixer.c:4629
 msgid "Digital Stereo Duplex (IEC958)"
 msgstr "Duplèx estèreo numeric (IEC958)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4645
+#: spa/plugins/alsa/acp/alsa-mixer.c:4630
 msgid "Multichannel Duplex"
 msgstr "Duplèx multicanal"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4646
+#: spa/plugins/alsa/acp/alsa-mixer.c:4631
 msgid "Stereo Duplex"
 msgstr "Duplèx estereo"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4647
+#: spa/plugins/alsa/acp/alsa-mixer.c:4632
 msgid "Mono Chat + 7.1 Surround"
 msgstr "Messatjariá mono + Surround 7.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4754
+#: spa/plugins/alsa/acp/alsa-mixer.c:4733
 #, c-format
 msgid "%s Output"
 msgstr "%s Sortida"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4761
+#: spa/plugins/alsa/acp/alsa-mixer.c:4741
 #, c-format
 msgid "%s Input"
 msgstr "%s Entrada"
 
-#: spa/plugins/alsa/acp/alsa-util.c:1187 spa/plugins/alsa/acp/alsa-util.c:1281
+#: spa/plugins/alsa/acp/alsa-util.c:1220 spa/plugins/alsa/acp/alsa-util.c:1314
 #, c-format
 msgid ""
 "snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
@@ -513,7 +561,7 @@
 "Es fòrt probablament un bug dins lo pilòt ALSA « %s ». Senhalatz-lo als "
 "desvolopaires d’ALSA."
 
-#: spa/plugins/alsa/acp/alsa-util.c:1253
+#: spa/plugins/alsa/acp/alsa-util.c:1286
 #, c-format
 msgid ""
 "snd_pcm_delay() returned a value that is exceptionally large: %li byte (%s"
@@ -536,7 +584,7 @@
 "Es fòrt probablament un bug dins lo pilòt ALSA « %s ». Senhalatz-lo als "
 "desvolopaires d’ALSA."
 
-#: spa/plugins/alsa/acp/alsa-util.c:1300
+#: spa/plugins/alsa/acp/alsa-util.c:1333
 #, c-format
 msgid ""
 "snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
@@ -549,7 +597,7 @@
 "Es fòrt probablament un bug dins lo pilòt ALSA « %s ». Senhalatz-lo als "
 "desvolopaires d’ALSA."
 
-#: spa/plugins/alsa/acp/alsa-util.c:1343
+#: spa/plugins/alsa/acp/alsa-util.c:1376
 #, c-format
 msgid ""
 "snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
@@ -576,100 +624,108 @@
 msgid "(invalid)"
 msgstr "(invalid)"
 
-#: spa/plugins/alsa/acp/compat.c:189
+#: spa/plugins/alsa/acp/compat.c:193
 msgid "Built-in Audio"
 msgstr "Àudio integrat"
 
-#: spa/plugins/alsa/acp/compat.c:194
+#: spa/plugins/alsa/acp/compat.c:198
 msgid "Modem"
 msgstr "Modèm"
 
-#: spa/plugins/bluez5/bluez5-device.c:1247
+#: spa/plugins/bluez5/bluez5-device.c:1712
 msgid "Audio Gateway (A2DP Source & HSP/HFP AG)"
 msgstr "Palanca àudio (Font A2DP & HSP/HFP AG)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1272
+#: spa/plugins/bluez5/bluez5-device.c:1760
 #, c-format
 msgid "High Fidelity Playback (A2DP Sink, codec %s)"
 msgstr "Lectura nauta fidelitat (A2DP Sink, codec %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1275
+#: spa/plugins/bluez5/bluez5-device.c:1763
 #, c-format
 msgid "High Fidelity Duplex (A2DP Source/Sink, codec %s)"
 msgstr "Duplèx nauta fidelitat (A2DP Source/Sink, codec %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1283
+#: spa/plugins/bluez5/bluez5-device.c:1771
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Lectura nauta fidelitat (A2DP Sink)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1285
+#: spa/plugins/bluez5/bluez5-device.c:1773
 msgid "High Fidelity Duplex (A2DP Source/Sink)"
 msgstr "Duplèx nauta fidelitat (A2DP Source/Sink)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1322
+#: spa/plugins/bluez5/bluez5-device.c:1823
 #, c-format
 msgid "High Fidelity Playback (BAP Sink, codec %s)"
 msgstr "Lectura nauta fidelitat (A2DP Sink, codec %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1326
+#: spa/plugins/bluez5/bluez5-device.c:1828
 #, c-format
 msgid "High Fidelity Input (BAP Source, codec %s)"
 msgstr "Duplèx nauta fidelitat (Font BAP, codec %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1330
+#: spa/plugins/bluez5/bluez5-device.c:1832
 #, c-format
 msgid "High Fidelity Duplex (BAP Source/Sink, codec %s)"
 msgstr "Duplèx nauta fidelitat (Font BAP/Sink, codec %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1359
-#, c-format
-msgid "Headset Head Unit (HSP/HFP, codec %s)"
-msgstr ""
+#: spa/plugins/bluez5/bluez5-device.c:1841
+msgid "High Fidelity Playback (BAP Sink)"
+msgstr "Lectura nauta fidelitat (receptor BAP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1364
-msgid "Headset Head Unit (HSP/HFP)"
-msgstr ""
+#: spa/plugins/bluez5/bluez5-device.c:1845
+msgid "High Fidelity Input (BAP Source)"
+msgstr "Duplèx nauta fidelitat (Font BAP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1443
-#: spa/plugins/bluez5/bluez5-device.c:1448
-#: spa/plugins/bluez5/bluez5-device.c:1455
-#: spa/plugins/bluez5/bluez5-device.c:1461
-#: spa/plugins/bluez5/bluez5-device.c:1467
-#: spa/plugins/bluez5/bluez5-device.c:1473
-#: spa/plugins/bluez5/bluez5-device.c:1479
-#: spa/plugins/bluez5/bluez5-device.c:1485
-#: spa/plugins/bluez5/bluez5-device.c:1491
+#: spa/plugins/bluez5/bluez5-device.c:1848
+msgid "High Fidelity Duplex (BAP Source/Sink)"
+msgstr "Duplèx nauta fidelitat (Font/Receptor BAP)"
+
+#: spa/plugins/bluez5/bluez5-device.c:1897
+#, c-format
+msgid "Headset Head Unit (HSP/HFP, codec %s)"
+msgstr "Controlador de casc (HSP/HFP, codec %s)"
+
+#: spa/plugins/bluez5/bluez5-device.c:1978
+#: spa/plugins/bluez5/bluez5-device.c:1983
+#: spa/plugins/bluez5/bluez5-device.c:1990
+#: spa/plugins/bluez5/bluez5-device.c:1996
+#: spa/plugins/bluez5/bluez5-device.c:2002
+#: spa/plugins/bluez5/bluez5-device.c:2008
+#: spa/plugins/bluez5/bluez5-device.c:2014
+#: spa/plugins/bluez5/bluez5-device.c:2020
+#: spa/plugins/bluez5/bluez5-device.c:2026
 msgid "Handsfree"
 msgstr "Mans liuras"
 
-#: spa/plugins/bluez5/bluez5-device.c:1449
+#: spa/plugins/bluez5/bluez5-device.c:1984
 msgid "Handsfree (HFP)"
 msgstr "Mans liuras (HFP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1466
+#: spa/plugins/bluez5/bluez5-device.c:2001
 msgid "Headphone"
 msgstr "Escotador"
 
-#: spa/plugins/bluez5/bluez5-device.c:1472
+#: spa/plugins/bluez5/bluez5-device.c:2007
 msgid "Portable"
 msgstr "Portable"
 
-#: spa/plugins/bluez5/bluez5-device.c:1478
+#: spa/plugins/bluez5/bluez5-device.c:2013
 msgid "Car"
 msgstr "Telefòn de veitura"
 
-#: spa/plugins/bluez5/bluez5-device.c:1484
+#: spa/plugins/bluez5/bluez5-device.c:2019
 msgid "HiFi"
 msgstr "HiFi"
 
-#: spa/plugins/bluez5/bluez5-device.c:1490
+#: spa/plugins/bluez5/bluez5-device.c:2025
 msgid "Phone"
 msgstr "Telefòn"
 
-#: spa/plugins/bluez5/bluez5-device.c:1497
+#: spa/plugins/bluez5/bluez5-device.c:2032
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: spa/plugins/bluez5/bluez5-device.c:1498
+#: spa/plugins/bluez5/bluez5-device.c:2033
 msgid "Bluetooth (HFP)"
-msgstr "Bluetooth (HFP)"
+msgstr "Bluetooth (HFP)"
\ No newline at end of file

pipewire-1.0.1.tar.bz2/po/pipewire.pot -> pipewire-1.2.0.tar.gz/po/pipewire.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: pipewire\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pipewire/pipewire/issues/new\n"
-"POT-Creation-Date: 2022-06-30 12:50+0200\n"
+"POT-Creation-Date: 2024-02-25 03:43+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/daemon/pipewire.c:46
+#: src/daemon/pipewire.c:26
 #, c-format
 msgid ""
 "%s options\n"
@@ -27,36 +27,44 @@
 "  -c, --config                          Load config (Default %s)\n"
 msgstr ""
 
-#: src/modules/module-protocol-pulse/modules/module-tunnel-sink.c:180
-#: src/modules/module-protocol-pulse/modules/module-tunnel-source.c:180
+#: src/daemon/pipewire.desktop.in:4
+msgid "PipeWire Media System"
+msgstr ""
+
+#: src/daemon/pipewire.desktop.in:5
+msgid "Start the PipeWire Media System"
+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"
+msgid "Tunnel to %s%s%s"
 msgstr ""
 
-#: src/modules/module-fallback-sink.c:51
+#: src/modules/module-fallback-sink.c:40
 msgid "Dummy Output"
 msgstr ""
 
-#: src/modules/module-pulse-tunnel.c:662
+#: src/modules/module-pulse-tunnel.c:774
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
-#: src/modules/module-zeroconf-discover.c:332
+#: src/modules/module-zeroconf-discover.c:315
 msgid "Unknown device"
 msgstr ""
 
-#: src/modules/module-zeroconf-discover.c:344
+#: src/modules/module-zeroconf-discover.c:327
 #, c-format
 msgid "%s on %s@%s"
 msgstr ""
 
-#: src/modules/module-zeroconf-discover.c:348
+#: src/modules/module-zeroconf-discover.c:331
 #, c-format
 msgid "%s on %s"
 msgstr ""
 
-#: src/tools/pw-cat.c:784
+#: src/tools/pw-cat.c:991
 #, c-format
 msgid ""
 "%s options <file>|-\n"
@@ -66,14 +74,15 @@
 "\n"
 msgstr ""
 
-#: src/tools/pw-cat.c:791
+#: src/tools/pw-cat.c:998
 #, 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"
@@ -84,7 +93,7 @@
 "\n"
 msgstr ""
 
-#: src/tools/pw-cat.c:809
+#: src/tools/pw-cat.c:1016
 #, c-format
 msgid ""
 "      --rate                            Sample rate (req. for rec) (default "
@@ -104,16 +113,17 @@
 "\n"
 msgstr ""
 
-#: src/tools/pw-cat.c:826
+#: src/tools/pw-cat.c:1033
 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"
 "\n"
 msgstr ""
 
-#: src/tools/pw-cli.c:2250
+#: src/tools/pw-cli.c:2252
 #, c-format
 msgid ""
 "%s options command\n"
@@ -121,15 +131,16 @@
 "      --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 ""
 
-#: spa/plugins/alsa/acp/acp.c:321
+#: spa/plugins/alsa/acp/acp.c:327
 msgid "Pro Audio"
 msgstr ""
 
-#: spa/plugins/alsa/acp/acp.c:444 spa/plugins/alsa/acp/alsa-mixer.c:4648
-#: spa/plugins/bluez5/bluez5-device.c:1236
+#: spa/plugins/alsa/acp/acp.c:488 spa/plugins/alsa/acp/alsa-mixer.c:4633
+#: spa/plugins/bluez5/bluez5-device.c:1701
 msgid "Off"
 msgstr ""
 
@@ -156,7 +167,7 @@
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:2657
 #: spa/plugins/alsa/acp/alsa-mixer.c:2741
-#: spa/plugins/bluez5/bluez5-device.c:1454
+#: spa/plugins/bluez5/bluez5-device.c:1989
 msgid "Microphone"
 msgstr ""
 
@@ -222,7 +233,7 @@
 msgstr ""
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:2672
-#: spa/plugins/bluez5/bluez5-device.c:1460
+#: spa/plugins/bluez5/bluez5-device.c:1995
 msgid "Speaker"
 msgstr ""
 
@@ -304,15 +315,15 @@
 msgid "Virtual Surround 7.1"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4471
+#: spa/plugins/alsa/acp/alsa-mixer.c:4456
 msgid "Analog Mono"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4472
+#: spa/plugins/alsa/acp/alsa-mixer.c:4457
 msgid "Analog Mono (Left)"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4473
+#: spa/plugins/alsa/acp/alsa-mixer.c:4458
 msgid "Analog Mono (Right)"
 msgstr ""
 
@@ -321,148 +332,147 @@
 #. * 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:4474
-#: spa/plugins/alsa/acp/alsa-mixer.c:4482
-#: spa/plugins/alsa/acp/alsa-mixer.c:4483
+#: spa/plugins/alsa/acp/alsa-mixer.c:4459
+#: spa/plugins/alsa/acp/alsa-mixer.c:4467
+#: spa/plugins/alsa/acp/alsa-mixer.c:4468
 msgid "Analog Stereo"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4475
+#: spa/plugins/alsa/acp/alsa-mixer.c:4460
 msgid "Mono"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4476
+#: spa/plugins/alsa/acp/alsa-mixer.c:4461
 msgid "Stereo"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4484
-#: spa/plugins/alsa/acp/alsa-mixer.c:4642
-#: spa/plugins/bluez5/bluez5-device.c:1442
+#: spa/plugins/alsa/acp/alsa-mixer.c:4469
+#: spa/plugins/alsa/acp/alsa-mixer.c:4627
+#: spa/plugins/bluez5/bluez5-device.c:1977
 msgid "Headset"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4485
-#: spa/plugins/alsa/acp/alsa-mixer.c:4643
+#: spa/plugins/alsa/acp/alsa-mixer.c:4470
+#: spa/plugins/alsa/acp/alsa-mixer.c:4628
 msgid "Speakerphone"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4486
-#: spa/plugins/alsa/acp/alsa-mixer.c:4487
+#: spa/plugins/alsa/acp/alsa-mixer.c:4471
+#: spa/plugins/alsa/acp/alsa-mixer.c:4472
 msgid "Multichannel"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4488
+#: spa/plugins/alsa/acp/alsa-mixer.c:4473
 msgid "Analog Surround 2.1"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4489
+#: spa/plugins/alsa/acp/alsa-mixer.c:4474
 msgid "Analog Surround 3.0"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4490
+#: spa/plugins/alsa/acp/alsa-mixer.c:4475
 msgid "Analog Surround 3.1"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4491
+#: spa/plugins/alsa/acp/alsa-mixer.c:4476
 msgid "Analog Surround 4.0"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4492
+#: spa/plugins/alsa/acp/alsa-mixer.c:4477
 msgid "Analog Surround 4.1"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4493
+#: spa/plugins/alsa/acp/alsa-mixer.c:4478
 msgid "Analog Surround 5.0"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4494
+#: spa/plugins/alsa/acp/alsa-mixer.c:4479
 msgid "Analog Surround 5.1"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4495
+#: spa/plugins/alsa/acp/alsa-mixer.c:4480
 msgid "Analog Surround 6.0"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4496
+#: spa/plugins/alsa/acp/alsa-mixer.c:4481
 msgid "Analog Surround 6.1"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4497
+#: spa/plugins/alsa/acp/alsa-mixer.c:4482
 msgid "Analog Surround 7.0"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4498
+#: spa/plugins/alsa/acp/alsa-mixer.c:4483
 msgid "Analog Surround 7.1"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4499
+#: spa/plugins/alsa/acp/alsa-mixer.c:4484
 msgid "Digital Stereo (IEC958)"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4500
+#: spa/plugins/alsa/acp/alsa-mixer.c:4485
 msgid "Digital Surround 4.0 (IEC958/AC3)"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4501
+#: spa/plugins/alsa/acp/alsa-mixer.c:4486
 msgid "Digital Surround 5.1 (IEC958/AC3)"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4502
+#: spa/plugins/alsa/acp/alsa-mixer.c:4487
 msgid "Digital Surround 5.1 (IEC958/DTS)"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4503
+#: spa/plugins/alsa/acp/alsa-mixer.c:4488
 msgid "Digital Stereo (HDMI)"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4504
+#: spa/plugins/alsa/acp/alsa-mixer.c:4489
 msgid "Digital Surround 5.1 (HDMI)"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4505
+#: spa/plugins/alsa/acp/alsa-mixer.c:4490
 msgid "Chat"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4506
+#: spa/plugins/alsa/acp/alsa-mixer.c:4491
 msgid "Game"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4640
+#: spa/plugins/alsa/acp/alsa-mixer.c:4625
 msgid "Analog Mono Duplex"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4641
+#: spa/plugins/alsa/acp/alsa-mixer.c:4626
 msgid "Analog Stereo Duplex"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4644
+#: spa/plugins/alsa/acp/alsa-mixer.c:4629
 msgid "Digital Stereo Duplex (IEC958)"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4645
+#: spa/plugins/alsa/acp/alsa-mixer.c:4630
 msgid "Multichannel Duplex"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4646
+#: spa/plugins/alsa/acp/alsa-mixer.c:4631
 msgid "Stereo Duplex"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4647
+#: spa/plugins/alsa/acp/alsa-mixer.c:4632
 msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4754
+#: spa/plugins/alsa/acp/alsa-mixer.c:4733
 #, c-format
 msgid "%s Output"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4761
+#: spa/plugins/alsa/acp/alsa-mixer.c:4741
 #, c-format
 msgid "%s Input"
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-util.c:1187
-#: spa/plugins/alsa/acp/alsa-util.c:1281
+#: spa/plugins/alsa/acp/alsa-util.c:1220 spa/plugins/alsa/acp/alsa-util.c:1314
 #, c-format
 msgid ""
 "snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
@@ -477,7 +487,7 @@
 msgstr0 ""
 msgstr1 ""
 
-#: spa/plugins/alsa/acp/alsa-util.c:1253
+#: spa/plugins/alsa/acp/alsa-util.c:1286
 #, c-format
 msgid ""
 "snd_pcm_delay() returned a value that is exceptionally large: %li byte "
@@ -492,7 +502,7 @@
 msgstr0 ""
 msgstr1 ""
 
-#: spa/plugins/alsa/acp/alsa-util.c:1300
+#: spa/plugins/alsa/acp/alsa-util.c:1333
 #, c-format
 msgid ""
 "snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
@@ -501,7 +511,7 @@
 "to the ALSA developers."
 msgstr ""
 
-#: spa/plugins/alsa/acp/alsa-util.c:1343
+#: spa/plugins/alsa/acp/alsa-util.c:1376
 #, c-format
 msgid ""
 "snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
@@ -520,100 +530,108 @@
 msgid "(invalid)"
 msgstr ""
 
-#: spa/plugins/alsa/acp/compat.c:189
+#: spa/plugins/alsa/acp/compat.c:193
 msgid "Built-in Audio"
 msgstr ""
 
-#: spa/plugins/alsa/acp/compat.c:194
+#: spa/plugins/alsa/acp/compat.c:198
 msgid "Modem"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1247
+#: spa/plugins/bluez5/bluez5-device.c:1712
 msgid "Audio Gateway (A2DP Source & HSP/HFP AG)"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1272
+#: spa/plugins/bluez5/bluez5-device.c:1760
 #, c-format
 msgid "High Fidelity Playback (A2DP Sink, codec %s)"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1275
+#: spa/plugins/bluez5/bluez5-device.c:1763
 #, c-format
 msgid "High Fidelity Duplex (A2DP Source/Sink, codec %s)"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1283
+#: spa/plugins/bluez5/bluez5-device.c:1771
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1285
+#: spa/plugins/bluez5/bluez5-device.c:1773
 msgid "High Fidelity Duplex (A2DP Source/Sink)"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1322
+#: spa/plugins/bluez5/bluez5-device.c:1823
 #, c-format
 msgid "High Fidelity Playback (BAP Sink, codec %s)"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1326
+#: spa/plugins/bluez5/bluez5-device.c:1828
 #, c-format
 msgid "High Fidelity Input (BAP Source, codec %s)"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1330
+#: spa/plugins/bluez5/bluez5-device.c:1832
 #, c-format
 msgid "High Fidelity Duplex (BAP Source/Sink, codec %s)"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1359
-#, c-format
-msgid "Headset Head Unit (HSP/HFP, codec %s)"
+#: spa/plugins/bluez5/bluez5-device.c:1841
+msgid "High Fidelity Playback (BAP Sink)"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1364
-msgid "Headset Head Unit (HSP/HFP)"
+#: spa/plugins/bluez5/bluez5-device.c:1845
+msgid "High Fidelity Input (BAP Source)"
+msgstr ""
+
+#: spa/plugins/bluez5/bluez5-device.c:1848
+msgid "High Fidelity Duplex (BAP Source/Sink)"
+msgstr ""
+
+#: spa/plugins/bluez5/bluez5-device.c:1897
+#, c-format
+msgid "Headset Head Unit (HSP/HFP, codec %s)"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1443
-#: spa/plugins/bluez5/bluez5-device.c:1448
-#: spa/plugins/bluez5/bluez5-device.c:1455
-#: spa/plugins/bluez5/bluez5-device.c:1461
-#: spa/plugins/bluez5/bluez5-device.c:1467
-#: spa/plugins/bluez5/bluez5-device.c:1473
-#: spa/plugins/bluez5/bluez5-device.c:1479
-#: spa/plugins/bluez5/bluez5-device.c:1485
-#: spa/plugins/bluez5/bluez5-device.c:1491
+#: spa/plugins/bluez5/bluez5-device.c:1978
+#: spa/plugins/bluez5/bluez5-device.c:1983
+#: spa/plugins/bluez5/bluez5-device.c:1990
+#: spa/plugins/bluez5/bluez5-device.c:1996
+#: spa/plugins/bluez5/bluez5-device.c:2002
+#: spa/plugins/bluez5/bluez5-device.c:2008
+#: spa/plugins/bluez5/bluez5-device.c:2014
+#: spa/plugins/bluez5/bluez5-device.c:2020
+#: spa/plugins/bluez5/bluez5-device.c:2026
 msgid "Handsfree"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1449
+#: spa/plugins/bluez5/bluez5-device.c:1984
 msgid "Handsfree (HFP)"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1466
+#: spa/plugins/bluez5/bluez5-device.c:2001
 msgid "Headphone"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1472
+#: spa/plugins/bluez5/bluez5-device.c:2007
 msgid "Portable"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1478
+#: spa/plugins/bluez5/bluez5-device.c:2013
 msgid "Car"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1484
+#: spa/plugins/bluez5/bluez5-device.c:2019
 msgid "HiFi"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1490
+#: spa/plugins/bluez5/bluez5-device.c:2025
 msgid "Phone"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1497
+#: spa/plugins/bluez5/bluez5-device.c:2032
 msgid "Bluetooth"
 msgstr ""
 
-#: spa/plugins/bluez5/bluez5-device.c:1498
+#: spa/plugins/bluez5/bluez5-device.c:2033
 msgid "Bluetooth (HFP)"
 msgstr ""

pipewire-1.0.1.tar.bz2/po/ru.po -> pipewire-1.2.0.tar.gz/po/ru.po Changed

@@ -10,8 +10,8 @@
 "Project-Id-Version: pipewire\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pipewire/pipewire/-/"
 "issues\n"
-"POT-Creation-Date: 2023-04-06 03:27+0000\n"
-"PO-Revision-Date: 2023-04-06 10:51+0300\n"
+"POT-Creation-Date: 2023-05-28 10:45+0000\n"
+"PO-Revision-Date: 2023-11-28 14:30+0300\n"
 "Last-Translator: Aleksandr Melman <Alexmelman88@gmail.com>\n"
 "Language-Team: ru\n"
 "Language: ru\n"
@@ -20,7 +20,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 3.2.2\n"
+"X-Generator: Poedit 3.4.1\n"
 
 #: src/daemon/pipewire.c:26
 #, c-format
@@ -30,9 +30,9 @@
 "      --version                         Show version\n"
 "  -c, --config                          Load config (Default %s)\n"
 msgstr ""
-"%s опции\n"
+"%s параметры\n"
 "  -h, --help                            Показать справку\n"
-"      --version                         Информация о версии\n"
+"      --version                         Показать версию\n"
 "  -c, --config                          Загрузить конфигурацию (По умолчанию "
 "%s)\n"
 
@@ -44,17 +44,17 @@
 msgid "Start the PipeWire Media System"
 msgstr "Запустить PipeWire"
 
-#: src/modules/module-protocol-pulse/modules/module-tunnel-sink.c:159
-#: src/modules/module-protocol-pulse/modules/module-tunnel-source.c:159
+#: src/modules/module-protocol-pulse/modules/module-tunnel-sink.c:141
+#: src/modules/module-protocol-pulse/modules/module-tunnel-source.c:141
 #, c-format
-msgid "Tunnel to %s/%s"
-msgstr "Туннель на %s/%s"
+msgid "Tunnel to %s%s%s"
+msgstr "Туннель на %s%s%s"
 
 #: src/modules/module-fallback-sink.c:31
 msgid "Dummy Output"
 msgstr "Холостой выход"
 
-#: src/modules/module-pulse-tunnel.c:688
+#: src/modules/module-pulse-tunnel.c:844
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Туннель для %s@%s"
@@ -82,9 +82,9 @@
 "  -v, --verbose                         Enable verbose operations\n"
 "\n"
 msgstr ""
-"%s опции <file>|-\n"
+"%s параметры <file>|-\n"
 "  -h, --help                            Показать справку\n"
-"      --version                         Информация о версии\n"
+"      --version                         Показать версию\n"
 "  -v, --verbose                         Включить показ подробной информации\n"
 "\n"
 
@@ -188,9 +188,9 @@
 "  -m, --monitor                         Monitor activity\n"
 "\n"
 msgstr ""
-"%s опции команда\n"
+"%s параметры команда\n"
 "  -h, --help                            Показать справку\n"
-"      --version                         Информация о версии\n"
+"      --version                         Показать версию\n"
 "  -d, --daemon                          Запустить в режиме фоновой службы "
 "(По умолчанию false)\n"
 "  -r, --remote                          Имя удаленного фоновой службы\n"
@@ -202,7 +202,7 @@
 msgstr "Pro Audio"
 
 #: spa/plugins/alsa/acp/acp.c:427 spa/plugins/alsa/acp/alsa-mixer.c:4648
-#: spa/plugins/bluez5/bluez5-device.c:1286
+#: spa/plugins/bluez5/bluez5-device.c:1586
 msgid "Off"
 msgstr "Выключено"
 
@@ -229,7 +229,7 @@
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:2657
 #: spa/plugins/alsa/acp/alsa-mixer.c:2741
-#: spa/plugins/bluez5/bluez5-device.c:1522
+#: spa/plugins/bluez5/bluez5-device.c:1831
 msgid "Microphone"
 msgstr "Микрофон"
 
@@ -295,7 +295,7 @@
 msgstr "Нет усиления басов"
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:2672
-#: spa/plugins/bluez5/bluez5-device.c:1528
+#: spa/plugins/bluez5/bluez5-device.c:1837
 msgid "Speaker"
 msgstr "Динамик"
 
@@ -410,7 +410,7 @@
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:4484
 #: spa/plugins/alsa/acp/alsa-mixer.c:4642
-#: spa/plugins/bluez5/bluez5-device.c:1510
+#: spa/plugins/bluez5/bluez5-device.c:1819
 msgid "Headset"
 msgstr "Гарнитура"
 
@@ -534,7 +534,7 @@
 msgid "%s Input"
 msgstr "%s вход"
 
-#: spa/plugins/alsa/acp/alsa-util.c:1211 spa/plugins/alsa/acp/alsa-util.c:1305
+#: spa/plugins/alsa/acp/alsa-util.c:1187 spa/plugins/alsa/acp/alsa-util.c:1281
 #, c-format
 msgid ""
 "snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
@@ -562,7 +562,7 @@
 "Вероятно, это ошибка в драйвере ALSA «%s». Пожалуйста, сообщите об этой "
 "проблеме разработчикам ALSA."
 
-#: spa/plugins/alsa/acp/alsa-util.c:1277
+#: spa/plugins/alsa/acp/alsa-util.c:1253
 #, c-format
 msgid ""
 "snd_pcm_delay() returned a value that is exceptionally large: %li byte "
@@ -590,7 +590,7 @@
 "Вероятно, это ошибка в драйвере ALSA «%s». Пожалуйста, сообщите об этой "
 "проблеме разработчикам ALSA."
 
-#: spa/plugins/alsa/acp/alsa-util.c:1324
+#: spa/plugins/alsa/acp/alsa-util.c:1300
 #, c-format
 msgid ""
 "snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
@@ -603,7 +603,7 @@
 "Вероятно, это ошибка в драйвере ALSA «%s». Пожалуйста, сообщите об этой "
 "проблеме разработчикам ALSA."
 
-#: spa/plugins/alsa/acp/alsa-util.c:1367
+#: spa/plugins/alsa/acp/alsa-util.c:1343
 #, c-format
 msgid ""
 "snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
@@ -643,104 +643,104 @@
 msgid "Modem"
 msgstr "Модем"
 
-#: spa/plugins/bluez5/bluez5-device.c:1297
+#: spa/plugins/bluez5/bluez5-device.c:1597
 msgid "Audio Gateway (A2DP Source & HSP/HFP AG)"
 msgstr "Адаптер аудиогарнитуры (приёмник A2DP и HSP/HFP AG)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1322
+#: spa/plugins/bluez5/bluez5-device.c:1622
 #, c-format
 msgid "High Fidelity Playback (A2DP Sink, codec %s)"
 msgstr "Воспроизведение высокого качества (приёмник A2DP, кодек %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1325
+#: spa/plugins/bluez5/bluez5-device.c:1625
 #, c-format
 msgid "High Fidelity Duplex (A2DP Source/Sink, codec %s)"
 msgstr "Дуплекс высокого качества (источник / приёмник A2DP,  кодек %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1333
+#: spa/plugins/bluez5/bluez5-device.c:1633
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Воспроизведение высокого качества (приёмник A2DP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1335
+#: spa/plugins/bluez5/bluez5-device.c:1635
 msgid "High Fidelity Duplex (A2DP Source/Sink)"
 msgstr "Дуплекс высокого качества (источник / приёмник A2DP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1377
+#: spa/plugins/bluez5/bluez5-device.c:1677
 #, c-format
 msgid "High Fidelity Playback (BAP Sink, codec %s)"
 msgstr "Воспроизведение высокого качества (приёмник BAP, кодек %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1381
+#: spa/plugins/bluez5/bluez5-device.c:1681
 #, c-format
 msgid "High Fidelity Input (BAP Source, codec %s)"
 msgstr "Вход высокого качества (источник BAP, кодек %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1385
+#: spa/plugins/bluez5/bluez5-device.c:1685
 #, c-format
 msgid "High Fidelity Duplex (BAP Source/Sink, codec %s)"
 msgstr "Дуплекс высокого качества (источник / приёмник BAP, кодек %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1393
+#: spa/plugins/bluez5/bluez5-device.c:1693
 msgid "High Fidelity Playback (BAP Sink)"
 msgstr "Воспроизведение высокого качества (приёмник BAP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1396
+#: spa/plugins/bluez5/bluez5-device.c:1696
 msgid "High Fidelity Input (BAP Source)"
 msgstr "Вход высокого качества (источник BAP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1399
+#: spa/plugins/bluez5/bluez5-device.c:1699
 msgid "High Fidelity Duplex (BAP Source/Sink)"
 msgstr "Дуплекс высокого качества (источник / приёмник BAP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1427
+#: spa/plugins/bluez5/bluez5-device.c:1735
 #, c-format
 msgid "Headset Head Unit (HSP/HFP, codec %s)"
 msgstr "Гарнитура (HSP/HFP, кодек %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1432
+#: spa/plugins/bluez5/bluez5-device.c:1740
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr "Гарнитура (HSP/HFP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1511
-#: spa/plugins/bluez5/bluez5-device.c:1516
-#: spa/plugins/bluez5/bluez5-device.c:1523
-#: spa/plugins/bluez5/bluez5-device.c:1529
-#: spa/plugins/bluez5/bluez5-device.c:1535
-#: spa/plugins/bluez5/bluez5-device.c:1541
-#: spa/plugins/bluez5/bluez5-device.c:1547
-#: spa/plugins/bluez5/bluez5-device.c:1553
-#: spa/plugins/bluez5/bluez5-device.c:1559
+#: spa/plugins/bluez5/bluez5-device.c:1820
+#: spa/plugins/bluez5/bluez5-device.c:1825
+#: spa/plugins/bluez5/bluez5-device.c:1832
+#: spa/plugins/bluez5/bluez5-device.c:1838
+#: spa/plugins/bluez5/bluez5-device.c:1844
+#: spa/plugins/bluez5/bluez5-device.c:1850
+#: spa/plugins/bluez5/bluez5-device.c:1856
+#: spa/plugins/bluez5/bluez5-device.c:1862
+#: spa/plugins/bluez5/bluez5-device.c:1868
 msgid "Handsfree"
 msgstr "Handsfree"
 
-#: spa/plugins/bluez5/bluez5-device.c:1517
+#: spa/plugins/bluez5/bluez5-device.c:1826
 msgid "Handsfree (HFP)"
 msgstr "Handsfree (HFP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1534
+#: spa/plugins/bluez5/bluez5-device.c:1843
 msgid "Headphone"
 msgstr "Наушники"
 
-#: spa/plugins/bluez5/bluez5-device.c:1540
+#: spa/plugins/bluez5/bluez5-device.c:1849
 msgid "Portable"
 msgstr "Портативное устройство"
 
-#: spa/plugins/bluez5/bluez5-device.c:1546
+#: spa/plugins/bluez5/bluez5-device.c:1855
 msgid "Car"
 msgstr "Автомобильное устройство"
 
-#: spa/plugins/bluez5/bluez5-device.c:1552
+#: spa/plugins/bluez5/bluez5-device.c:1861
 msgid "HiFi"
 msgstr "Hi-Fi"
 
-#: spa/plugins/bluez5/bluez5-device.c:1558
+#: spa/plugins/bluez5/bluez5-device.c:1867
 msgid "Phone"
 msgstr "Телефон"
 
-#: spa/plugins/bluez5/bluez5-device.c:1565
+#: spa/plugins/bluez5/bluez5-device.c:1874
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: spa/plugins/bluez5/bluez5-device.c:1566
+#: spa/plugins/bluez5/bluez5-device.c:1875
 msgid "Bluetooth (HFP)"
 msgstr "Bluetooth (HFP)"

pipewire-1.0.1.tar.bz2/po/tr.po -> pipewire-1.2.0.tar.gz/po/tr.po Changed

@@ -1,19 +1,19 @@
 # Turkish translation for PipeWire.
-# Copyright (C) 2014-2023 PipeWire's COPYRIGHT HOLDER
+# Copyright (C) 2014-2024 PipeWire's COPYRIGHT HOLDER
 # This file is distributed under the same license as the PipeWire package.
 #
 # Necdet Yücel <necdetyucel@gmail.com>, 2014.
 # Kaan Özdinçer <kaanozdincer@gmail.com>, 2014.
 # Muhammet Kara <muhammetk@gmail.com>, 2015, 2016, 2017.
 # Oğuz Ersen <oguz@ersen.moe>, 2021-2022.
+# Sabri Ünal <libreajans@gmail.com>, 2024.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PipeWire master\n"
-"Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pipewire/pipewire/"
-"issues/new\n"
-"POT-Creation-Date: 2022-06-30 12:50+0200\n"
-"PO-Revision-Date: 2023-05-26 23:39+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-02-25 03:43+0300\n"
+"PO-Revision-Date: 2024-02-25 03:49+0300\n"
 "Last-Translator: Sabri Ünal <libreajans@gmail.com>\n"
 "Language-Team: Türkçe <takim@gnome.org.tr>\n"
 "Language: tr\n"
@@ -21,9 +21,9 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.2.2\n"
+"X-Generator: Poedit 3.4.2\n"
 
-#: src/daemon/pipewire.c:46
+#: src/daemon/pipewire.c:26
 #, c-format
 msgid ""
 "%s options\n"
@@ -36,36 +36,44 @@
 "      --version                         Sürümü göster\n"
 "  -c, --config                          Yapılandırmayı yükle (Öntanımlı %s)\n"
 
-#: src/modules/module-protocol-pulse/modules/module-tunnel-sink.c:180
-#: src/modules/module-protocol-pulse/modules/module-tunnel-source.c:180
+#: src/daemon/pipewire.desktop.in:4
+msgid "PipeWire Media System"
+msgstr "PipeWire Ortam Sistemi"
+
+#: src/daemon/pipewire.desktop.in:5
+msgid "Start the PipeWire Media System"
+msgstr "PipeWire Ortam Sistemini Başlat"
+
+#: 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"
-msgstr "%s/%s tüneli"
+msgid "Tunnel to %s%s%s"
+msgstr "%s%s%s tüneli"
 
-#: src/modules/module-fallback-sink.c:51
+#: src/modules/module-fallback-sink.c:40
 msgid "Dummy Output"
 msgstr "Temsili Çıkış"
 
-#: src/modules/module-pulse-tunnel.c:662
+#: src/modules/module-pulse-tunnel.c:774
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "%s@%s için tünel"
 
-#: src/modules/module-zeroconf-discover.c:332
+#: src/modules/module-zeroconf-discover.c:315
 msgid "Unknown device"
 msgstr "Bilinmeyen aygıt"
 
-#: src/modules/module-zeroconf-discover.c:344
+#: src/modules/module-zeroconf-discover.c:327
 #, c-format
 msgid "%s on %s@%s"
 msgstr "%s, %s@%s"
 
-#: src/modules/module-zeroconf-discover.c:348
+#: src/modules/module-zeroconf-discover.c:331
 #, c-format
 msgid "%s on %s"
 msgstr "%s, %s"
 
-#: src/tools/pw-cat.c:784
+#: src/tools/pw-cat.c:991
 #, c-format
 msgid ""
 "%s options <file>|-\n"
@@ -80,14 +88,15 @@
 "  -v, --verbose                         Ayrıntılı işlemleri etkinleştir\n"
 "\n"
 
-#: src/tools/pw-cat.c:791
+#: src/tools/pw-cat.c:998
 #, 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"
@@ -102,8 +111,8 @@
 "      --media-category                  Ortam kategorisini ayarla (öntanımlı "
 "%s)\n"
 "      --media-role                      Ortam rolünü ayarla (öntanımlı %s)\n"
-"      --target                          Düğüm hedefini ayarla (öntanımlı "
-"%s)\n"
+"      --target                          Düğüm hedefi seri ya da adını ayarla "
+"(öntanımlı %s)\n"
 "                                          0, bağlanmayacağı anlamına gelir\n"
 "      --latency                         Düğüm gecikmesini ayarla (öntanımlı "
 "%s)\n"
@@ -113,7 +122,7 @@
 "  -P  --properties                      Düğüm özelliklerini ayarla\n"
 "\n"
 
-#: src/tools/pw-cat.c:809
+#: src/tools/pw-cat.c:1016
 #, c-format
 msgid ""
 "      --rate                            Sample rate (req. for rec) (default "
@@ -149,21 +158,23 @@
 "15) (öntanımlı %d)\n"
 "\n"
 
-#: src/tools/pw-cat.c:826
+#: src/tools/pw-cat.c:1033
 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"
 "\n"
 msgstr ""
-"  -p, --playback                        Çalma modu\n"
-"  -r, --record                          Kayıt modu\n"
-"  -m, --midi                            Midi modu\n"
-"  -d, --dsd                             DSD modu\n"
+"  -p, --playback                        Çalma kipi\n"
+"  -r, --record                          Kayıt kipi\n"
+"  -m, --midi                            Midi kipi\n"
+"  -d, --dsd                             DSD kipi\n"
+"  -o, --encoded                         Kodlanmış kip\n"
 "\n"
 
-#: src/tools/pw-cli.c:2250
+#: src/tools/pw-cli.c:2252
 #, c-format
 msgid ""
 "%s options command\n"
@@ -171,6 +182,7 @@
 "      --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 seçenekler komut\n"
@@ -179,14 +191,14 @@
 "  -d, --daemon                          Art alan hizmeti olarak başlat "
 "(Öntanımlı olarak yanlış)\n"
 "  -r, --remote                          Uzak arka plan programı adı\n"
-"\n"
+"  -m, --monitor                         Etkinliği izle\n"
 
-#: spa/plugins/alsa/acp/acp.c:321
+#: spa/plugins/alsa/acp/acp.c:327
 msgid "Pro Audio"
 msgstr "Profesyonel Ses"
 
-#: spa/plugins/alsa/acp/acp.c:444 spa/plugins/alsa/acp/alsa-mixer.c:4648
-#: spa/plugins/bluez5/bluez5-device.c:1236
+#: spa/plugins/alsa/acp/acp.c:488 spa/plugins/alsa/acp/alsa-mixer.c:4633
+#: spa/plugins/bluez5/bluez5-device.c:1701
 msgid "Off"
 msgstr "Kapalı"
 
@@ -213,7 +225,7 @@
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:2657
 #: spa/plugins/alsa/acp/alsa-mixer.c:2741
-#: spa/plugins/bluez5/bluez5-device.c:1454
+#: spa/plugins/bluez5/bluez5-device.c:1989
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -279,7 +291,7 @@
 msgstr "Bas Artırma Yok"
 
 #: spa/plugins/alsa/acp/alsa-mixer.c:2672
-#: spa/plugins/bluez5/bluez5-device.c:1460
+#: spa/plugins/bluez5/bluez5-device.c:1995
 msgid "Speaker"
 msgstr "Hoparlör"
 
@@ -361,15 +373,15 @@
 msgid "Virtual Surround 7.1"
 msgstr "Sanal Çevresel Ses 7.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4471
+#: spa/plugins/alsa/acp/alsa-mixer.c:4456
 msgid "Analog Mono"
 msgstr "Analog Tek Kanallı"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4472
+#: spa/plugins/alsa/acp/alsa-mixer.c:4457
 msgid "Analog Mono (Left)"
 msgstr "Analog Tek Kanallı (Sol)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4473
+#: spa/plugins/alsa/acp/alsa-mixer.c:4458
 msgid "Analog Mono (Right)"
 msgstr "Analog Tek Kanallı (Sağ)"
 
@@ -378,147 +390,147 @@
 #. * 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:4474
-#: spa/plugins/alsa/acp/alsa-mixer.c:4482
-#: spa/plugins/alsa/acp/alsa-mixer.c:4483
+#: spa/plugins/alsa/acp/alsa-mixer.c:4459
+#: spa/plugins/alsa/acp/alsa-mixer.c:4467
+#: spa/plugins/alsa/acp/alsa-mixer.c:4468
 msgid "Analog Stereo"
 msgstr "Analog Stereo"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4475
+#: spa/plugins/alsa/acp/alsa-mixer.c:4460
 msgid "Mono"
 msgstr "Tek Kanallı"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4476
+#: spa/plugins/alsa/acp/alsa-mixer.c:4461
 msgid "Stereo"
 msgstr "Stereo"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4484
-#: spa/plugins/alsa/acp/alsa-mixer.c:4642
-#: spa/plugins/bluez5/bluez5-device.c:1442
+#: spa/plugins/alsa/acp/alsa-mixer.c:4469
+#: spa/plugins/alsa/acp/alsa-mixer.c:4627
+#: spa/plugins/bluez5/bluez5-device.c:1977
 msgid "Headset"
 msgstr "Kulaklık"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4485
-#: spa/plugins/alsa/acp/alsa-mixer.c:4643
+#: spa/plugins/alsa/acp/alsa-mixer.c:4470
+#: spa/plugins/alsa/acp/alsa-mixer.c:4628
 msgid "Speakerphone"
 msgstr "Hoparlör"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4486
-#: spa/plugins/alsa/acp/alsa-mixer.c:4487
+#: spa/plugins/alsa/acp/alsa-mixer.c:4471
+#: spa/plugins/alsa/acp/alsa-mixer.c:4472
 msgid "Multichannel"
 msgstr "Çok kanallı"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4488
+#: spa/plugins/alsa/acp/alsa-mixer.c:4473
 msgid "Analog Surround 2.1"
 msgstr "Analog Çevresel Ses 2.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4489
+#: spa/plugins/alsa/acp/alsa-mixer.c:4474
 msgid "Analog Surround 3.0"
 msgstr "Analog Çevresel Ses 3.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4490
+#: spa/plugins/alsa/acp/alsa-mixer.c:4475
 msgid "Analog Surround 3.1"
 msgstr "Analog Çevresel Ses 3.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4491
+#: spa/plugins/alsa/acp/alsa-mixer.c:4476
 msgid "Analog Surround 4.0"
 msgstr "Analog Çevresel Ses 4.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4492
+#: spa/plugins/alsa/acp/alsa-mixer.c:4477
 msgid "Analog Surround 4.1"
 msgstr "Analog Çevresel Ses 4.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4493
+#: spa/plugins/alsa/acp/alsa-mixer.c:4478
 msgid "Analog Surround 5.0"
 msgstr "Analog Çevresel Ses 5.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4494
+#: spa/plugins/alsa/acp/alsa-mixer.c:4479
 msgid "Analog Surround 5.1"
 msgstr "Analog Çevresel Ses 5.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4495
+#: spa/plugins/alsa/acp/alsa-mixer.c:4480
 msgid "Analog Surround 6.0"
 msgstr "Analog Çevresel Ses 6.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4496
+#: spa/plugins/alsa/acp/alsa-mixer.c:4481
 msgid "Analog Surround 6.1"
 msgstr "Analog Çevresel Ses 6.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4497
+#: spa/plugins/alsa/acp/alsa-mixer.c:4482
 msgid "Analog Surround 7.0"
 msgstr "Analog Çevresel Ses 7.0"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4498
+#: spa/plugins/alsa/acp/alsa-mixer.c:4483
 msgid "Analog Surround 7.1"
 msgstr "Analog Çevresel Ses 7.1"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4499
+#: spa/plugins/alsa/acp/alsa-mixer.c:4484
 msgid "Digital Stereo (IEC958)"
 msgstr "Sayısal Stereo (IEC958)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4500
+#: spa/plugins/alsa/acp/alsa-mixer.c:4485
 msgid "Digital Surround 4.0 (IEC958/AC3)"
 msgstr "Sayısal Çevresel Ses 4.0 (IEC958/AC3)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4501
+#: spa/plugins/alsa/acp/alsa-mixer.c:4486
 msgid "Digital Surround 5.1 (IEC958/AC3)"
 msgstr "Sayısal Çevresel Ses 5.1 (IEC958/AC3)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4502
+#: spa/plugins/alsa/acp/alsa-mixer.c:4487
 msgid "Digital Surround 5.1 (IEC958/DTS)"
 msgstr "Sayısal Çevresel Ses 5.1 (IEC958/DTS)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4503
+#: spa/plugins/alsa/acp/alsa-mixer.c:4488
 msgid "Digital Stereo (HDMI)"
 msgstr "Sayısal Stereo (HDMI)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4504
+#: spa/plugins/alsa/acp/alsa-mixer.c:4489
 msgid "Digital Surround 5.1 (HDMI)"
 msgstr "Sayısal Çevresel Ses 5.1 (HDMI)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4505
+#: spa/plugins/alsa/acp/alsa-mixer.c:4490
 msgid "Chat"
 msgstr "Sohbet"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4506
+#: spa/plugins/alsa/acp/alsa-mixer.c:4491
 msgid "Game"
 msgstr "Oyun"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4640
+#: spa/plugins/alsa/acp/alsa-mixer.c:4625
 msgid "Analog Mono Duplex"
 msgstr "Analog Tek Kanallı İkili"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4641
+#: spa/plugins/alsa/acp/alsa-mixer.c:4626
 msgid "Analog Stereo Duplex"
 msgstr "Analog İkili Stereo"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4644
+#: spa/plugins/alsa/acp/alsa-mixer.c:4629
 msgid "Digital Stereo Duplex (IEC958)"
 msgstr "Sayısal İkili Stereo (IEC958)"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4645
+#: spa/plugins/alsa/acp/alsa-mixer.c:4630
 msgid "Multichannel Duplex"
 msgstr "Çok Kanallı İkili"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4646
+#: spa/plugins/alsa/acp/alsa-mixer.c:4631
 msgid "Stereo Duplex"
 msgstr "İkili Stereo"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4647
+#: spa/plugins/alsa/acp/alsa-mixer.c:4632
 msgid "Mono Chat + 7.1 Surround"
 msgstr "Tek Kanallı Sohbet + 7.1 Çevresel Ses"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4754
+#: spa/plugins/alsa/acp/alsa-mixer.c:4733
 #, c-format
 msgid "%s Output"
 msgstr "%s Çıkışı"
 
-#: spa/plugins/alsa/acp/alsa-mixer.c:4761
+#: spa/plugins/alsa/acp/alsa-mixer.c:4741
 #, c-format
 msgid "%s Input"
 msgstr "%s Girişi"
 
-#: spa/plugins/alsa/acp/alsa-util.c:1187 spa/plugins/alsa/acp/alsa-util.c:1281
+#: spa/plugins/alsa/acp/alsa-util.c:1220 spa/plugins/alsa/acp/alsa-util.c:1314
 #, c-format
 msgid ""
 "snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
@@ -535,16 +547,16 @@
 "Büyük ihtimalle bu bir ALSA sürücüsü '%s' hatasıdır. Lütfen bu sorunu ALSA "
 "geliştiricilerine bildirin."
 
-#: spa/plugins/alsa/acp/alsa-util.c:1253
+#: spa/plugins/alsa/acp/alsa-util.c:1286
 #, 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."
 msgstr0 ""
@@ -552,7 +564,7 @@
 "Büyük ihtimalle bu bir ALSA sürücüsü '%s' hatasıdır. Lütfen bu sorunu ALSA "
 "geliştiricilerine bildirin."
 
-#: spa/plugins/alsa/acp/alsa-util.c:1300
+#: spa/plugins/alsa/acp/alsa-util.c:1333
 #, c-format
 msgid ""
 "snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
@@ -565,7 +577,7 @@
 "Büyük ihtimalle bu bir ALSA sürücüsü '%s' hatasıdır. Lütfen bu sorunu ALSA "
 "geliştiricilerine bildirin."
 
-#: spa/plugins/alsa/acp/alsa-util.c:1343
+#: spa/plugins/alsa/acp/alsa-util.c:1376
 #, c-format
 msgid ""
 "snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
@@ -587,100 +599,108 @@
 msgid "(invalid)"
 msgstr "(geçersiz)"
 
-#: spa/plugins/alsa/acp/compat.c:189
+#: spa/plugins/alsa/acp/compat.c:193
 msgid "Built-in Audio"
 msgstr "Dahili Ses"
 
-#: spa/plugins/alsa/acp/compat.c:194
+#: spa/plugins/alsa/acp/compat.c:198
 msgid "Modem"
 msgstr "Modem"
 
-#: spa/plugins/bluez5/bluez5-device.c:1247
+#: spa/plugins/bluez5/bluez5-device.c:1712
 msgid "Audio Gateway (A2DP Source & HSP/HFP AG)"
 msgstr "Ses Geçidi (A2DP Kaynak & HSP/HFP AG)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1272
+#: spa/plugins/bluez5/bluez5-device.c:1760
 #, c-format
 msgid "High Fidelity Playback (A2DP Sink, codec %s)"
 msgstr "Yüksek Kaliteli Çalma (A2DP Alıcı, çözücü %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1275
+#: spa/plugins/bluez5/bluez5-device.c:1763
 #, c-format
 msgid "High Fidelity Duplex (A2DP Source/Sink, codec %s)"
 msgstr "Yüksek Kaliteli İkili (A2DP Kaynak/Alıcı, çözücü %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1283
+#: spa/plugins/bluez5/bluez5-device.c:1771
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Yüksek Kaliteli Çalma (A2DP Alıcı)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1285
+#: spa/plugins/bluez5/bluez5-device.c:1773
 msgid "High Fidelity Duplex (A2DP Source/Sink)"
 msgstr "Yüksek Kaliteli İkili (A2DP Kaynak/Alıcı)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1322
+#: spa/plugins/bluez5/bluez5-device.c:1823
 #, c-format
 msgid "High Fidelity Playback (BAP Sink, codec %s)"
 msgstr "Yüksek Kaliteli Çalma (BAP Alıcı, çözücü %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1326
+#: spa/plugins/bluez5/bluez5-device.c:1828
 #, c-format
 msgid "High Fidelity Input (BAP Source, codec %s)"
 msgstr "Yüksek Kaliteli Giriş (BAP Kaynak, çözücü %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1330
+#: spa/plugins/bluez5/bluez5-device.c:1832
 #, c-format
 msgid "High Fidelity Duplex (BAP Source/Sink, codec %s)"
 msgstr "Yüksek Kaliteli İkili (BAP Kaynak/Alıcı, çözücü %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1359
+#: spa/plugins/bluez5/bluez5-device.c:1841
+msgid "High Fidelity Playback (BAP Sink)"
+msgstr "Yüksek Kaliteli Çalma (BAP Alıcı)"
+
+#: spa/plugins/bluez5/bluez5-device.c:1845
+msgid "High Fidelity Input (BAP Source)"
+msgstr "Yüksek Kaliteli Giriş (BAP Kaynak)"
+
+#: spa/plugins/bluez5/bluez5-device.c:1848
+msgid "High Fidelity Duplex (BAP Source/Sink)"
+msgstr "Yüksek Kaliteli İkili (BAP Kaynak/Alıcı)"
+
+#: spa/plugins/bluez5/bluez5-device.c:1897
 #, c-format
 msgid "Headset Head Unit (HSP/HFP, codec %s)"
 msgstr "Kulaklık Ana Birimi (HSP/HFP, çözücü %s)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1364
-msgid "Headset Head Unit (HSP/HFP)"
-msgstr "Kulaklık Ana Birimi (HSP/HFP)"
-
-#: spa/plugins/bluez5/bluez5-device.c:1443
-#: spa/plugins/bluez5/bluez5-device.c:1448
-#: spa/plugins/bluez5/bluez5-device.c:1455
-#: spa/plugins/bluez5/bluez5-device.c:1461
-#: spa/plugins/bluez5/bluez5-device.c:1467
-#: spa/plugins/bluez5/bluez5-device.c:1473
-#: spa/plugins/bluez5/bluez5-device.c:1479
-#: spa/plugins/bluez5/bluez5-device.c:1485
-#: spa/plugins/bluez5/bluez5-device.c:1491
+#: spa/plugins/bluez5/bluez5-device.c:1978
+#: spa/plugins/bluez5/bluez5-device.c:1983
+#: spa/plugins/bluez5/bluez5-device.c:1990
+#: spa/plugins/bluez5/bluez5-device.c:1996
+#: spa/plugins/bluez5/bluez5-device.c:2002
+#: spa/plugins/bluez5/bluez5-device.c:2008
+#: spa/plugins/bluez5/bluez5-device.c:2014
+#: spa/plugins/bluez5/bluez5-device.c:2020
+#: spa/plugins/bluez5/bluez5-device.c:2026
 msgid "Handsfree"
 msgstr "Ahizesiz"
 
-#: spa/plugins/bluez5/bluez5-device.c:1449
+#: spa/plugins/bluez5/bluez5-device.c:1984
 msgid "Handsfree (HFP)"
 msgstr "Ahizesiz (HFP)"
 
-#: spa/plugins/bluez5/bluez5-device.c:1466
+#: spa/plugins/bluez5/bluez5-device.c:2001
 msgid "Headphone"
 msgstr "Kulaklık"
 
-#: spa/plugins/bluez5/bluez5-device.c:1472
+#: spa/plugins/bluez5/bluez5-device.c:2007
 msgid "Portable"
 msgstr "Taşınabilir"
 
-#: spa/plugins/bluez5/bluez5-device.c:1478
+#: spa/plugins/bluez5/bluez5-device.c:2013
 msgid "Car"
 msgstr "Araba"
 
-#: spa/plugins/bluez5/bluez5-device.c:1484
+#: spa/plugins/bluez5/bluez5-device.c:2019
 msgid "HiFi"
 msgstr "Yüksek Kalite"
 
-#: spa/plugins/bluez5/bluez5-device.c:1490
+#: spa/plugins/bluez5/bluez5-device.c:2025
 msgid "Phone"
 msgstr "Telefon"
 
-#: spa/plugins/bluez5/bluez5-device.c:1497
+#: spa/plugins/bluez5/bluez5-device.c:2032
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: spa/plugins/bluez5/bluez5-device.c:1498
+#: spa/plugins/bluez5/bluez5-device.c:2033
 msgid "Bluetooth (HFP)"
 msgstr "Bluetooth (HFP)"

pipewire-1.0.1.tar.bz2/spa/examples/adapter-control.c -> pipewire-1.2.0.tar.gz/spa/examples/adapter-control.c Changed

pipewire-1.0.1.tar.bz2/spa/examples/local-libcamera.c -> pipewire-1.2.0.tar.gz/spa/examples/local-libcamera.c Changed

pipewire-1.0.1.tar.bz2/spa/examples/local-v4l2.c -> pipewire-1.2.0.tar.gz/spa/examples/local-v4l2.c Changed

pipewire-1.0.1.tar.bz2/spa/examples/meson.build -> pipewire-1.2.0.tar.gz/spa/examples/meson.build Changed

pipewire-1.2.0.tar.gz/spa/include-private Added

pipewire-1.2.0.tar.gz/spa/include-private/spa-private Added

pipewire-1.2.0.tar.gz/spa/include-private/spa-private/dbus-helpers.h Added

@@ -0,0 +1,72 @@
+/* Spa DBus helpers */
+/* SPDX-FileCopyrightText: Copyright © 2023 PipeWire authors */
+/* SPDX-License-Identifier: MIT */
+
+#ifndef SPA_PRIVATE_DBUS_HELPERS_H
+#define SPA_PRIVATE_DBUS_HELPERS_H
+
+#include <stdbool.h>
+
+#include <dbus/dbus.h>
+
+#include <spa/utils/cleanup.h>
+
+static inline void cancel_and_unref(DBusPendingCall **pp)
+{
+	DBusPendingCall *pending_call = spa_steal_ptr(*pp);
+
+	if (pending_call) {
+		dbus_pending_call_cancel(pending_call);
+		dbus_pending_call_unref(pending_call);
+	}
+}
+
+static inline DBusMessage *steal_reply_and_unref(DBusPendingCall **pp)
+{
+	DBusPendingCall *pending_call = spa_steal_ptr(*pp);
+
+	DBusMessage *reply = dbus_pending_call_steal_reply(pending_call);
+	dbus_pending_call_unref(pending_call);
+
+	return reply;
+}
+
+SPA_DEFINE_AUTOPTR_CLEANUP(DBusMessage, DBusMessage, {
+	spa_clear_ptr(*thing, dbus_message_unref);
+})
+
+static inline bool reply_with_error(DBusConnection *conn,
+				    DBusMessage *reply_to,
+				    const char *error_name, const char *error_message)
+{
+	spa_autoptr(DBusMessage) reply = dbus_message_new_error(reply_to, error_name, error_message);
+
+	return reply && dbus_connection_send(conn, reply, NULL);
+}
+
+static inline DBusPendingCall *send_with_reply(DBusConnection *conn,
+					       DBusMessage *m,
+					       DBusPendingCallNotifyFunction callback, void *user_data)
+{
+	DBusPendingCall *pending_call;
+
+	if (!dbus_connection_send_with_reply(conn, m, &pending_call, DBUS_TIMEOUT_USE_DEFAULT))
+		return NULL;
+
+	if (!pending_call)
+		return NULL;
+
+	if (!dbus_pending_call_set_notify(pending_call, callback, user_data, NULL)) {
+		dbus_pending_call_cancel(pending_call);
+		dbus_pending_call_unref(pending_call);
+		return NULL;
+	}
+
+	return pending_call;
+}
+
+SPA_DEFINE_AUTO_CLEANUP(DBusError, DBusError, {
+	dbus_error_free(thing);
+})
+
+#endif /* SPA_PRIVATE_DBUS_HELPERS_H */

pipewire-1.0.1.tar.bz2/spa/include/spa/buffer/buffer.h -> pipewire-1.2.0.tar.gz/spa/include/spa/buffer/buffer.h Changed

@@ -27,9 +27,15 @@
 	SPA_DATA_Invalid,
 	SPA_DATA_MemPtr,		/**< pointer to memory, the data field in
 					  *  struct spa_data is set. */
-	SPA_DATA_MemFd,			/**< generic fd, mmap to get to memory */
-	SPA_DATA_DmaBuf,		/**< fd to dmabuf memory */
-	SPA_DATA_MemId,			/**< memory is identified with an id */
+	SPA_DATA_MemFd,			/**< memfd, mmap to get to memory. */
+	SPA_DATA_DmaBuf,		/**< fd to dmabuf memory. This might not be readily
+					  *  mappable (unless the MAPPABLE flag is set) and should
+					  *  normally be handled with DMABUF apis. */
+	SPA_DATA_MemId,			/**< memory is identified with an id. The actual memory
+					  *  can be obtained in some other way and can be identified
+					  *  with this id. */
+	SPA_DATA_SyncObj,		/**< a syncobj, usually requires a spa_meta_sync_timeline metadata
+					  *  with timeline points. */
 
 	_SPA_DATA_LAST,			/**< not part of ABI */
 };
@@ -65,9 +71,12 @@
 #define SPA_DATA_FLAG_WRITABLE	(1u<<1)	/**< data is writable */
 #define SPA_DATA_FLAG_DYNAMIC	(1u<<2)	/**< data pointer can be changed */
 #define SPA_DATA_FLAG_READWRITE	(SPA_DATA_FLAG_READABLE|SPA_DATA_FLAG_WRITABLE)
+#define SPA_DATA_FLAG_MAPPABLE	(1u<<3)	/**< data is mappable with simple mmap/munmap. Some memory
+					  *  types are not simply mappable (DmaBuf) unless explicitly
+					  *  specified with this flag. */
 	uint32_t flags;			/**< data flags */
 	int64_t fd;			/**< optional fd for data */
-	uint32_t mapoffset;		/**< offset to map fd at */
+	uint32_t mapoffset;		/**< offset to map fd at, this is page aligned */
 	uint32_t maxsize;		/**< max size of data */
 	void *data;			/**< optional data pointer */
 	struct spa_chunk *chunk;	/**< valid chunk of memory */

pipewire-1.0.1.tar.bz2/spa/include/spa/buffer/meta.h -> pipewire-1.2.0.tar.gz/spa/include/spa/buffer/meta.h Changed

@@ -28,6 +28,7 @@
 					  *  associated with the data */
 	SPA_META_Busy,			/**< don't write to buffer when count > 0 */
 	SPA_META_VideoTransform,	/**< struct spa_meta_transform */
+	SPA_META_SyncTimeline,		/**< struct spa_meta_sync_timeline */
 
 	_SPA_META_LAST,			/**< not part of ABI/API */
 };
@@ -149,7 +150,7 @@
 	SPA_META_TRANSFORMATION_270,		/**< 270 degree counter-clockwise */
 	SPA_META_TRANSFORMATION_Flipped,	/**< 180 degree flipped around the vertical axis. Equivalent
 						  * to a reflexion through the vertical line splitting the
-						  * bufffer in two equal sized parts */
+						  * buffer in two equal sized parts */
 	SPA_META_TRANSFORMATION_Flipped90,	/**< flip then rotate around 90 degree counter-clockwise */
 	SPA_META_TRANSFORMATION_Flipped180,	/**< flip then rotate around 180 degree counter-clockwise */
 	SPA_META_TRANSFORMATION_Flipped270,	/**< flip then rotate around 270 degree counter-clockwise */
@@ -162,6 +163,21 @@
 };
 
 /**
+ * A timeline point for explicit sync
+ *
+ * Metadata to describe the time on the timeline when the buffer
+ * can be acquired and when it can be reused.
+ */
+struct spa_meta_sync_timeline {
+	uint32_t flags;
+	uint32_t padding;
+	uint64_t acquire_point;			/**< the timeline acquire point, this is when the data
+						  *  can be accessed. */
+	uint64_t release_point;			/**< the timeline release point, this timeline point should
+						  *  be signaled when the data is no longer accessed. */
+};
+
+/**
  * \}
  */

pipewire-1.0.1.tar.bz2/spa/include/spa/buffer/type-info.h -> pipewire-1.2.0.tar.gz/spa/include/spa/buffer/type-info.h Changed

@@ -35,6 +35,7 @@
 	{ SPA_DATA_MemFd, SPA_TYPE_Int, SPA_TYPE_INFO_DATA_FD_BASE "MemFd", NULL },
 	{ SPA_DATA_DmaBuf, SPA_TYPE_Int, SPA_TYPE_INFO_DATA_FD_BASE "DmaBuf", NULL },
 	{ SPA_DATA_MemId, SPA_TYPE_Int, SPA_TYPE_INFO_DATA_BASE "MemId", NULL },
+	{ SPA_DATA_SyncObj, SPA_TYPE_Int, SPA_TYPE_INFO_DATA_BASE "SyncObj", NULL },
 	{ 0, 0, NULL, NULL },
 };
 
@@ -50,6 +51,22 @@
 #define SPA_TYPE_INFO_META_ARRAY_Region		SPA_TYPE_INFO_META_ARRAY_BASE "Region"
 #define SPA_TYPE_INFO_META_ARRAY_REGION_BASE	SPA_TYPE_INFO_META_ARRAY_Region ":"
 
+/* VideoTransform meta */
+#define SPA_TYPE_INFO_META_Transformation	SPA_TYPE_INFO_ENUM_BASE "Meta:Transformation"
+#define SPA_TYPE_INFO_META_TRANSFORMATION_BASE	SPA_TYPE_INFO_META_Transformation ":"
+
+static const struct spa_type_info spa_type_meta_videotransform_type = {
+	{ SPA_META_TRANSFORMATION_None, SPA_TYPE_Int, SPA_TYPE_INFO_META_TRANSFORMATION_BASE "None", NULL },
+	{ SPA_META_TRANSFORMATION_90, SPA_TYPE_Int, SPA_TYPE_INFO_META_TRANSFORMATION_BASE "90", NULL },
+	{ SPA_META_TRANSFORMATION_180, SPA_TYPE_Int, SPA_TYPE_INFO_META_TRANSFORMATION_BASE "180", NULL },
+	{ SPA_META_TRANSFORMATION_270, SPA_TYPE_Int, SPA_TYPE_INFO_META_TRANSFORMATION_BASE "270", NULL },
+	{ SPA_META_TRANSFORMATION_Flipped, SPA_TYPE_Int, SPA_TYPE_INFO_META_TRANSFORMATION_BASE "Flipped", NULL },
+	{ SPA_META_TRANSFORMATION_Flipped90, SPA_TYPE_Int, SPA_TYPE_INFO_META_TRANSFORMATION_BASE "Flipped90", NULL },
+	{ SPA_META_TRANSFORMATION_Flipped180, SPA_TYPE_Int, SPA_TYPE_INFO_META_TRANSFORMATION_BASE "Flipped180", NULL },
+	{ SPA_META_TRANSFORMATION_Flipped270, SPA_TYPE_Int, SPA_TYPE_INFO_META_TRANSFORMATION_BASE "Flipped270", NULL },
+	{ 0, 0, NULL, NULL },
+};
+
 static const struct spa_type_info spa_type_meta_type = {
 	{ SPA_META_Invalid, SPA_TYPE_Pointer, SPA_TYPE_INFO_META_BASE "Invalid", NULL },
 	{ SPA_META_Header, SPA_TYPE_Pointer, SPA_TYPE_INFO_META_BASE "Header", NULL },
@@ -60,6 +77,7 @@
 	{ SPA_META_Control, SPA_TYPE_Pointer, SPA_TYPE_INFO_META_BASE "Control", NULL },
 	{ SPA_META_Busy, SPA_TYPE_Pointer, SPA_TYPE_INFO_META_BASE "Busy", NULL },
 	{ SPA_META_VideoTransform, SPA_TYPE_Pointer, SPA_TYPE_INFO_META_BASE "VideoTransform", NULL },
+	{ SPA_META_SyncTimeline, SPA_TYPE_Pointer, SPA_TYPE_INFO_META_BASE "SyncTimeline", NULL },
 	{ 0, 0, NULL, NULL },
 };

pipewire-1.0.1.tar.bz2/spa/include/spa/debug/context.h -> pipewire-1.2.0.tar.gz/spa/include/spa/debug/context.h Changed

pipewire-1.2.0.tar.gz/spa/include/spa/debug/file.h Added

@@ -0,0 +1,62 @@
+/* Simple Plugin API */
+/* SPDX-FileCopyrightText: Copyright © 2022 Wim Taymans */
+/* SPDX-License-Identifier: MIT */
+
+#ifndef SPA_DEBUG_FILE_H
+#define SPA_DEBUG_FILE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <ctype.h>
+
+#include <spa/utils/defs.h>
+#include <spa/support/log.h>
+#include <spa/debug/context.h>
+#include <spa/debug/dict.h>
+#include <spa/debug/format.h>
+#include <spa/debug/mem.h>
+#include <spa/debug/pod.h>
+
+/**
+ * \addtogroup spa_debug
+ * \{
+ */
+
+struct spa_debug_file_ctx {
+	struct spa_debug_context ctx;
+	FILE *f;
+};
+
+SPA_PRINTF_FUNC(2,3)
+static inline void spa_debug_file_log(struct spa_debug_context *ctx, const char *fmt, ...)
+{
+	struct spa_debug_file_ctx *c = SPA_CONTAINER_OF(ctx, struct spa_debug_file_ctx, ctx);
+	va_list args;
+	va_start(args, fmt);
+	vfprintf(c->f, fmt, args); fputc('\n', c->f);
+	va_end(args);
+}
+
+#define SPA_DEBUG_FILE_INIT(_f)							\
+	(struct spa_debug_file_ctx){ { spa_debug_file_log }, _f, }
+
+#define spa_debug_file_error_location(f,loc,fmt,...)				\
+({										\
+	struct spa_debug_file_ctx c = SPA_DEBUG_FILE_INIT(f);			\
+	if (fmt) spa_debugc(&c.ctx, fmt, __VA_ARGS__);				\
+	spa_debugc_error_location(&c.ctx, loc);					\
+})
+
+/**
+ * \}
+ */
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#endif /* SPA_DEBUG_FILE_H */

pipewire-1.0.1.tar.bz2/spa/include/spa/debug/log.h -> pipewire-1.2.0.tar.gz/spa/include/spa/debug/log.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/graph/graph.h -> pipewire-1.2.0.tar.gz/spa/include/spa/graph/graph.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/node/io.h -> pipewire-1.2.0.tar.gz/spa/include/spa/node/io.h Changed

@@ -31,14 +31,16 @@
 enum spa_io_type {
 	SPA_IO_Invalid,
 	SPA_IO_Buffers,		/**< area to exchange buffers, struct spa_io_buffers */
-	SPA_IO_Range,		/**< expected byte range, struct spa_io_range */
+	SPA_IO_Range,		/**< expected byte range, struct spa_io_range (currently not used in PipeWire) */
 	SPA_IO_Clock,		/**< area to update clock information, struct spa_io_clock */
-	SPA_IO_Latency,		/**< latency reporting, struct spa_io_latency */
+	SPA_IO_Latency,		/**< latency reporting, struct spa_io_latency (currently not used in
+				  * PipeWire). \see spa_param_latency */
 	SPA_IO_Control,		/**< area for control messages, struct spa_io_sequence */
 	SPA_IO_Notify,		/**< area for notify messages, struct spa_io_sequence */
 	SPA_IO_Position,	/**< position information in the graph, struct spa_io_position */
 	SPA_IO_RateMatch,	/**< rate matching between nodes, struct spa_io_rate_match */
-	SPA_IO_Memory,		/**< memory pointer, struct spa_io_memory */
+	SPA_IO_Memory,		/**< memory pointer, struct spa_io_memory (currently not used in PipeWire) */
+	SPA_IO_AsyncBuffers,	/**< async area to exchange buffers, struct spa_io_async_buffers */
 };
 
 /**
@@ -108,29 +110,47 @@
  *
  * The clock counts the elapsed time according to the clock provider
  * since the provider was last started.
+ *
+ * Driver nodes are supposed to update the contents of \ref SPA_IO_Clock before
+ * signaling the start of a graph cycle.  These updated clock values become
+ * visible to other nodes in \ref SPA_IO_Position. Non-driver nodes do
+ * not need to update the contents of their \ref SPA_IO_Clock.
+ *
+ * The host generally gives each node a separate \ref spa_io_clock in \ref
+ * SPA_IO_Clock, so that updates made by the driver are not visible in the
+ * contents of \ref SPA_IO_Clock of other nodes. Instead, \ref SPA_IO_Position
+ * is used to look up the current graph time.
+ *
+ * A node is a driver when \ref spa_io_clock.id in \ref SPA_IO_Clock and
+ * \ref spa_io_position.clock.id in \ref SPA_IO_Position are the same.
  */
 struct spa_io_clock {
 #define SPA_IO_CLOCK_FLAG_FREEWHEEL (1u<<0)
-	uint32_t flags;			/**< clock flags */
-	uint32_t id;			/**< unique clock id, set by application */
-	char name64;			/**< clock name prefixed with API, set by node. The clock name
-					  *  is unique per clock and can be used to check if nodes
-					  *  share the same clock. */
-	uint64_t nsec;			/**< time in nanoseconds against monotonic clock */
-	struct spa_fraction rate;	/**< rate for position/duration/delay/xrun */
-	uint64_t position;		/**< current position */
-	uint64_t duration;		/**< duration of current cycle */
-	int64_t delay;			/**< delay between position and hardware,
-					  *  positive for capture, negative for playback */
-	double rate_diff;		/**< rate difference between clock and monotonic time */
-	uint64_t next_nsec;		/**< estimated next wakeup time in nanoseconds */
+	uint32_t flags;			/**< Clock flags */
+	uint32_t id;			/**< Unique clock id, set by host application */
+	char name64;			/**< Clock name prefixed with API, set by node when it receives
+					  *  \ref SPA_IO_Clock. The clock name is unique per clock and
+					  *  can be used to check if nodes share the same clock. */
+	uint64_t nsec;			/**< Time in nanoseconds against monotonic clock
+					  * (CLOCK_MONOTONIC). This fields reflects a real time instant
+					  * in the past. The value may have jitter. */
+	struct spa_fraction rate;	/**< Rate for position/duration/delay/xrun */
+	uint64_t position;		/**< Current position, in samples @ \ref rate */
+	uint64_t duration;		/**< Duration of current cycle, in samples @ \ref rate */
+	int64_t delay;			/**< Delay between position and hardware, in samples @ \ref rate */
+	double rate_diff;		/**< Rate difference between clock and monotonic time, as a ratio of
+					  *  clock speeds. */
+	uint64_t next_nsec;		/**< Estimated next wakeup time in nanoseconds.
+					  *  This time is a logical start time of the next cycle, and
+					  *  is not necessarily in the future.
+					  */
 
-	struct spa_fraction target_rate;	/**< target rate of next cycle */
-	uint64_t target_duration;		/**< target duration of next cycle */
-	uint32_t target_seq;			/**< seq counter. must be equal at start and
+	struct spa_fraction target_rate;	/**< Target rate of next cycle */
+	uint64_t target_duration;		/**< Target duration of next cycle */
+	uint32_t target_seq;			/**< Seq counter. must be equal at start and
 						  *  end of read and lower bit must be 0 */
-	uint32_t padding;
-	uint64_t xrun;			/**< estimated accumulated xrun duration */
+	uint32_t cycle;			/**< incremented each time the graph is started */
+	uint64_t xrun;			/**< Estimated accumulated xrun duration */
 };
 
 /* the size of the video in this cycle */
@@ -145,7 +165,11 @@
 	uint32_t padding4;
 };
 
-/** latency reporting */
+/**
+ * Latency reporting
+ *
+ * Currently not used in PipeWire. Instead, \see spa_param_latency
+ */
 struct spa_io_latency {
 	struct spa_fraction rate;	/**< rate for min/max */
 	uint64_t min;			/**< min latency */
@@ -245,8 +269,13 @@
 /**
  * The position information adds extra meaning to the raw clock times.
  *
- * It is set on all nodes and the clock id will contain the clock of the
- * driving node in the graph.
+ * It is set on all nodes in \ref SPA_IO_Position, and the contents of \ref
+ * spa_io_position.clock contain the clock updates made by the driving node in
+ * the graph in its \ref SPA_IO_Clock.  Also, \ref spa_io_position.clock.id
+ * will contain the clock id of the driving node in the graph.
+ *
+ * The position clock indicates the logical start time of the current graph
+ * cycle.
  *
  * The position information contains 1 or more segments that convert the
  * raw clock times to a stream time. They are sorted based on their
@@ -279,6 +308,12 @@
 	uint32_t padding7;
 };
 
+/** async buffers */
+struct spa_io_async_buffers {
+	struct spa_io_buffers buffers2;	/**< async buffers, writers write to current (cycle+1)&1,
+						  *  readers read from (cycle)&1 */
+};
+
 /**
  * \}
  */

pipewire-1.0.1.tar.bz2/spa/include/spa/node/keys.h -> pipewire-1.2.0.tar.gz/spa/include/spa/node/keys.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/node/node.h -> pipewire-1.2.0.tar.gz/spa/include/spa/node/node.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/node/type-info.h -> pipewire-1.2.0.tar.gz/spa/include/spa/node/type-info.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/aac-types.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/aac-types.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/aac-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/aac-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/aac.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/aac.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/alac-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/alac-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/alac.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/alac.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/amr-types.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/amr-types.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/amr-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/amr-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/amr.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/amr.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/ape-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/ape-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/ape.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/ape.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/dsd-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/dsd-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/dsp-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/dsp-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/dsp.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/dsp.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/flac-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/flac-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/flac.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/flac.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/format-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/format-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/iec958-types.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/iec958-types.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/iec958-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/iec958-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/mp3-types.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/mp3-types.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/mp3-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/mp3-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/mp3.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/mp3.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/opus.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/opus.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/ra-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/ra-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/ra.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/ra.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/raw-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/raw-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/vorbis-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/vorbis-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/vorbis.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/vorbis.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/wma-types.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/wma-types.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/wma-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/wma-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/audio/wma.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/audio/wma.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/bluetooth/audio.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/bluetooth/audio.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/bluetooth/type-info.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/bluetooth/type-info.h Changed

@@ -25,6 +25,7 @@
 	{ SPA_BLUETOOTH_AUDIO_CODEC_SBC_XQ, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "sbc_xq", NULL },
 	{ SPA_BLUETOOTH_AUDIO_CODEC_MPEG, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "mpeg", NULL },
 	{ SPA_BLUETOOTH_AUDIO_CODEC_AAC, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "aac", NULL },
+	{ SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "aac_eld", NULL },
 	{ SPA_BLUETOOTH_AUDIO_CODEC_APTX, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "aptx", NULL },
 	{ SPA_BLUETOOTH_AUDIO_CODEC_APTX_HD, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "aptx_hd", NULL },
 	{ SPA_BLUETOOTH_AUDIO_CODEC_LDAC, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "ldac", NULL },
@@ -38,9 +39,11 @@
 	{ SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_71, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "opus_05_71", NULL },
 	{ SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_DUPLEX, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "opus_05_duplex", NULL },
 	{ SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_PRO, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "opus_05_pro", NULL },
+	{ SPA_BLUETOOTH_AUDIO_CODEC_OPUS_G, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "opus_g", NULL },
 
 	{ SPA_BLUETOOTH_AUDIO_CODEC_CVSD, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "cvsd", NULL },
 	{ SPA_BLUETOOTH_AUDIO_CODEC_MSBC, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "msbc", NULL },
+	{ SPA_BLUETOOTH_AUDIO_CODEC_LC3_SWB, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "lc3_swb", NULL },
 
 	{ SPA_BLUETOOTH_AUDIO_CODEC_LC3, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "lc3", NULL },

pipewire-1.0.1.tar.bz2/spa/include/spa/param/buffers-types.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/buffers-types.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/buffers.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/buffers.h Changed

@@ -24,14 +24,15 @@
 	SPA_PARAM_BUFFERS_size,		/**< size of a data block memory (Int)*/
 	SPA_PARAM_BUFFERS_stride,	/**< stride of data block memory (Int) */
 	SPA_PARAM_BUFFERS_align,	/**< alignment of data block memory (Int) */
-	SPA_PARAM_BUFFERS_dataType,	/**< possible memory types (Int, mask of enum spa_data_type) */
+	SPA_PARAM_BUFFERS_dataType,	/**< possible memory types (flags choice Int, mask of enum spa_data_type) */
+	SPA_PARAM_BUFFERS_metaType,	/**< required meta data types (Int, mask of enum spa_meta_type) */
 };
 
 /** properties for SPA_TYPE_OBJECT_ParamMeta */
 enum spa_param_meta {
 	SPA_PARAM_META_START,
-	SPA_PARAM_META_type,	/**< the metadata, one of enum spa_meta_type (Id enum spa_meta_type) */
-	SPA_PARAM_META_size,	/**< the expected maximum size the meta (Int) */
+	SPA_PARAM_META_type,		/**< the metadata, one of enum spa_meta_type (Id enum spa_meta_type) */
+	SPA_PARAM_META_size,		/**< the expected maximum size the meta (Int) */
 };
 
 /** properties for SPA_TYPE_OBJECT_ParamIO */

pipewire-1.0.1.tar.bz2/spa/include/spa/param/latency.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/latency.h Changed

@@ -16,14 +16,31 @@
 
 #include <spa/param/param.h>
 
-/** properties for SPA_TYPE_OBJECT_ParamLatency */
+/**
+ * Properties for SPA_TYPE_OBJECT_ParamLatency
+ *
+ * The latency indicates:
+ *
+ * - for playback: time delay between start of a graph cycle, and the rendering of
+ *   the first sample of that cycle in audio output.
+ *
+ * - for capture: time delay between start of a graph cycle, and the first sample
+ *   of that cycle having occurred in audio input.
+ *
+ * For physical output/input, the latency is intended to correspond to the
+ * rendering/capture of physical audio, including hardware internal rendering delay.
+ *
+ * The latency values are adjusted by \ref SPA_PROP_latencyOffsetNsec or
+ * SPA_PARAM_ProcessLatency, if present. (e.g. for ALSA this is used to adjust for
+ * the internal hardware latency).
+ */
 enum spa_param_latency {
 	SPA_PARAM_LATENCY_START,
 	SPA_PARAM_LATENCY_direction,		/**< direction, input/output (Id enum spa_direction) */
 	SPA_PARAM_LATENCY_minQuantum,		/**< min latency relative to quantum (Float) */
 	SPA_PARAM_LATENCY_maxQuantum,		/**< max latency relative to quantum (Float) */
-	SPA_PARAM_LATENCY_minRate,		/**< min latency (Int) relative to rate */
-	SPA_PARAM_LATENCY_maxRate,		/**< max latency (Int) relative to rate */
+	SPA_PARAM_LATENCY_minRate,		/**< min latency (Int) relative to graph rate */
+	SPA_PARAM_LATENCY_maxRate,		/**< max latency (Int) relative to graph rate */
 	SPA_PARAM_LATENCY_minNs,		/**< min latency (Long) in nanoseconds */
 	SPA_PARAM_LATENCY_maxNs,		/**< max latency (Long) in nanoseconds */
 };
@@ -41,11 +58,16 @@
 
 #define SPA_LATENCY_INFO(dir,...) ((struct spa_latency_info) { .direction = (dir), ## __VA_ARGS__ })
 
-/** properties for SPA_TYPE_OBJECT_ParamProcessLatency */
+/**
+ * Properties for SPA_TYPE_OBJECT_ParamProcessLatency
+ *
+ * The processing latency indicates logical time delay between a sample in an input port,
+ * and a corresponding sample in an output port, relative to the graph time.
+ */
 enum spa_param_process_latency {
 	SPA_PARAM_PROCESS_LATENCY_START,
 	SPA_PARAM_PROCESS_LATENCY_quantum,	/**< latency relative to quantum (Float) */
-	SPA_PARAM_PROCESS_LATENCY_rate,		/**< latency (Int) relative to rate */
+	SPA_PARAM_PROCESS_LATENCY_rate,		/**< latency (Int) relative to graph rate */
 	SPA_PARAM_PROCESS_LATENCY_ns,		/**< latency (Long) in nanoseconds */
 };

pipewire-1.0.1.tar.bz2/spa/include/spa/param/profiler.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/profiler.h Changed

@@ -39,7 +39,8 @@
 							  *      Long : clock duration,
 							  *      Long : clock delay,
 							  *      Double : clock rate_diff,
-							  *      Long : clock next_nsec)) */
+							  *      Long : clock next_nsec,
+							  *      Int : transport_state)) */
 	SPA_PROFILER_driverBlock,			/**< generic driver info block
 							  *  (Struct(
 							  *      Int : driver_id,
@@ -48,8 +49,9 @@
 							  *      Long : driver signal,
 							  *      Long : driver awake,
 							  *      Long : driver finish,
-							  *      Int : driver status),
-							  *      Fraction : latency))  */
+							  *      Int : driver status,
+							  *      Fraction : latency,
+							  *      Int : xrun_count))  */
 
 	SPA_PROFILER_START_Follower	= 0x20000,	/**< follower related profiler properties */
 	SPA_PROFILER_followerBlock,			/**< generic follower info block
@@ -61,7 +63,8 @@
 							  *      Long : awake,
 							  *      Long : finish,
 							  *      Int : status,
-							  *      Fraction : latency))  */
+							  *      Fraction : latency,
+							  *      Int : xrun_count))  */
 
 	SPA_PROFILER_START_CUSTOM	= 0x1000000,
 };

pipewire-1.0.1.tar.bz2/spa/include/spa/param/video/dsp-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/video/dsp-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/video/format-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/video/format-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/video/h264-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/video/h264-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/video/mjpg-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/video/mjpg-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/param/video/raw-utils.h -> pipewire-1.2.0.tar.gz/spa/include/spa/param/video/raw-utils.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/pod/builder.h -> pipewire-1.2.0.tar.gz/spa/include/spa/pod/builder.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/pod/compare.h -> pipewire-1.2.0.tar.gz/spa/include/spa/pod/compare.h Changed

@@ -31,16 +31,17 @@
 	case SPA_TYPE_None:
 		return 0;
 	case SPA_TYPE_Bool:
+		return SPA_CMP(!!*(int32_t *)r1, !!*(int32_t *)r2);
 	case SPA_TYPE_Id:
-		return *(uint32_t *) r1 == *(uint32_t *) r2 ? 0 : 1;
+		return SPA_CMP(*(uint32_t *)r1, *(uint32_t *)r2);
 	case SPA_TYPE_Int:
-		return *(int32_t *) r1 - *(int32_t *) r2;
+		return SPA_CMP(*(int32_t *)r1, *(int32_t *)r2);
 	case SPA_TYPE_Long:
-		return *(int64_t *) r1 - *(int64_t *) r2;
+		return SPA_CMP(*(int64_t *)r1, *(int64_t *)r2);
 	case SPA_TYPE_Float:
-		return *(float *) r1 - *(float *) r2;
+		return SPA_CMP(*(float *)r1, *(float *)r2);
 	case SPA_TYPE_Double:
-		return *(double *) r1 - *(double *) r2;
+		return SPA_CMP(*(double *)r1, *(double *)r2);
 	case SPA_TYPE_String:
 		return strcmp((char *)r1, (char *)r2);
 	case SPA_TYPE_Bytes:
@@ -60,15 +61,10 @@
 	{
 		const struct spa_fraction *f1 = (struct spa_fraction *) r1,
 		    *f2 = (struct spa_fraction *) r2;
-		int64_t n1, n2;
-		n1 = ((int64_t) f1->num) * f2->denom;
-		n2 = ((int64_t) f2->num) * f1->denom;
-		if (n1 < n2)
-			return -1;
-		else if (n1 > n2)
-			return 1;
-		else
-			return 0;
+		uint64_t n1, n2;
+		n1 = ((uint64_t) f1->num) * f2->denom;
+		n2 = ((uint64_t) f2->num) * f1->denom;
+		return SPA_CMP(n1, n2);
 	}
 	default:
 		break;

pipewire-1.0.1.tar.bz2/spa/include/spa/pod/dynamic.h -> pipewire-1.2.0.tar.gz/spa/include/spa/pod/dynamic.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/pod/iter.h -> pipewire-1.2.0.tar.gz/spa/include/spa/pod/iter.h Changed

@@ -28,8 +28,10 @@
 
 static inline bool spa_pod_is_inside(const void *pod, uint32_t size, const void *iter)
 {
-	return SPA_POD_BODY(iter) <= SPA_PTROFF(pod, size, void) &&
-		SPA_PTROFF(iter, SPA_POD_SIZE(iter), void) <= SPA_PTROFF(pod, size, void);
+	size_t remaining;
+
+	return spa_ptr_type_inside(pod, size, iter, struct spa_pod, &remaining) &&
+	       remaining >= SPA_POD_BODY_SIZE(iter);
 }
 
 static inline void *spa_pod_next(const void *iter)
@@ -45,8 +47,10 @@
 static inline bool spa_pod_prop_is_inside(const struct spa_pod_object_body *body,
 		uint32_t size, const struct spa_pod_prop *iter)
 {
-	return SPA_POD_CONTENTS(struct spa_pod_prop, iter) <= SPA_PTROFF(body, size, void) &&
-		SPA_PTROFF(iter, SPA_POD_PROP_SIZE(iter), void) <= SPA_PTROFF(body, size, void);
+	size_t remaining;
+
+	return spa_ptr_type_inside(body, size, iter, struct spa_pod_prop, &remaining) &&
+	       remaining >= iter->value.size;
 }
 
 static inline struct spa_pod_prop *spa_pod_prop_next(const struct spa_pod_prop *iter)
@@ -62,8 +66,10 @@
 static inline bool spa_pod_control_is_inside(const struct spa_pod_sequence_body *body,
 		uint32_t size, const struct spa_pod_control *iter)
 {
-	return SPA_POD_CONTENTS(struct spa_pod_control, iter) <= SPA_PTROFF(body, size, void) &&
-		SPA_PTROFF(iter, SPA_POD_CONTROL_SIZE(iter), void) <= SPA_PTROFF(body, size, void);
+	size_t remaining;
+
+	return spa_ptr_type_inside(body, size, iter, struct spa_pod_control, &remaining) &&
+	       remaining >= iter->value.size;
 }
 
 static inline struct spa_pod_control *spa_pod_control_next(const struct spa_pod_control *iter)
@@ -73,7 +79,7 @@
 
 #define SPA_POD_ARRAY_BODY_FOREACH(body, _size, iter)							\
 	for ((iter) = (__typeof__(iter))SPA_PTROFF((body), sizeof(struct spa_pod_array_body), void);	\
-	     (iter) < (__typeof__(iter))SPA_PTROFF((body), (_size), void);				\
+	     (body)->child.size > 0 && spa_ptrinside(body, _size, iter, (body)->child.size, NULL);	\
 	     (iter) = (__typeof__(iter))SPA_PTROFF((iter), (body)->child.size, void))
 
 #define SPA_POD_ARRAY_FOREACH(obj, iter)							\
@@ -81,7 +87,7 @@
 
 #define SPA_POD_CHOICE_BODY_FOREACH(body, _size, iter)							\
 	for ((iter) = (__typeof__(iter))SPA_PTROFF((body), sizeof(struct spa_pod_choice_body), void);	\
-	     (iter) < (__typeof__(iter))SPA_PTROFF((body), (_size), void);				\
+	     (body)->child.size > 0 && spa_ptrinside(body, _size, iter, (body)->child.size, NULL);	\
 	     (iter) = (__typeof__(iter))SPA_PTROFF((iter), (body)->child.size, void))
 
 #define SPA_POD_CHOICE_FOREACH(obj, iter)							\
@@ -437,6 +443,14 @@
 	return 1;
 }
 
+static inline int spa_pod_object_has_props(const struct spa_pod_object *pod)
+{
+	struct spa_pod_prop *res;
+	SPA_POD_OBJECT_FOREACH(pod, res)
+		return 1;
+	return 0;
+}
+
 static inline int spa_pod_is_fixated(const struct spa_pod *pod)
 {
 	if (!spa_pod_is_object(pod))

pipewire-1.0.1.tar.bz2/spa/include/spa/support/cpu.h -> pipewire-1.2.0.tar.gz/spa/include/spa/support/cpu.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/support/log-impl.h -> pipewire-1.2.0.tar.gz/spa/include/spa/support/log-impl.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/support/log.h -> pipewire-1.2.0.tar.gz/spa/include/spa/support/log.h Changed

@@ -84,6 +84,21 @@
 	bool has_custom_level;
 };
 
+/**
+ * Enumeration of log topics in a plugin
+ *
+ * \since 1.1.0
+ */
+struct spa_log_topic_enum {
+#define SPA_VERSION_LOG_TOPIC_ENUM	0
+	uint32_t version;
+	/** Array of pointers to log topics */
+	struct spa_log_topic * const * const topics;
+	/** End of topics array */
+	struct spa_log_topic * const * const topics_end;
+};
+
+
 struct spa_log_methods {
 #define SPA_VERSION_LOG_METHODS		1
 	uint32_t version;
@@ -185,6 +200,10 @@
 	/**
 	 * Initializes a \ref spa_log_topic to the correct logging level.
 	 *
+	 * \deprecated
+	 * Plugin host should obtain log topics from \ref SPA_LOG_TOPIC_ENUM_NAME
+	 * and update them itself.
+	 *
 	 * \since 1
 	 */
 	void (*topic_init) (void *object, struct spa_log_topic *topic);
@@ -282,6 +301,66 @@
 #endif
 
 
+/**
+ * Name of the symbol indicating a \ref spa_log_topic_enum enumerating
+ * the static log topics in a plugin,
+ *
+ * \since 1.1.0
+ */
+#define SPA_LOG_TOPIC_ENUM_NAME "spa_log_topic_enum"
+
+/**
+ * Define the symbol for \ref SPA_LOG_TOPIC_ENUM_NAME
+ *
+ * \since 1.1.0
+ */
+#define SPA_LOG_TOPIC_ENUM_DEFINE(s, e) \
+	SPA_EXPORT struct spa_log_topic_enum spa_log_topic_enum = (struct spa_log_topic_enum) { \
+		.version = SPA_VERSION_LOG_TOPIC_ENUM, \
+		.topics = (s), \
+		.topics_end = (e), \
+	}
+
+/**
+ * Magically register a statically defined \ref spa_log_topic into
+ * the log topic enumeration for a plugin.
+ *
+ * \since 1.1.0
+ */
+#define SPA_LOG_TOPIC_REGISTER(v)		      \
+	__attribute__((used)) __attribute__((retain)) \
+	__attribute__((section("spa_log_topic"))) __attribute__((aligned(__alignof__(struct spa_log_topic *)))) \
+	static struct spa_log_topic * const spa_log_topic_export_##v = &v
+
+/**
+ * Define and magically register a \ref spa_log_topic
+ *
+ * \since 1.1.0
+ */
+#define SPA_LOG_TOPIC_DEFINE(var,name) \
+	struct spa_log_topic var = SPA_LOG_TOPIC(SPA_VERSION_LOG_TOPIC, name); \
+	SPA_LOG_TOPIC_REGISTER(var)
+
+/**
+ * Define and magically register a \ref spa_log_topic with static scope
+ *
+ * \since 1.1.0
+ */
+#define SPA_LOG_TOPIC_DEFINE_STATIC(var,name) \
+	static struct spa_log_topic var = SPA_LOG_TOPIC(SPA_VERSION_LOG_TOPIC, name); \
+	SPA_LOG_TOPIC_REGISTER(var)
+
+/**
+ * Do \ref SPA_LOG_TOPIC_ENUM_DEFINE for the auto-registered
+ * \ref spa_log_topic in the plugin.
+ *
+ * \since 1.1.0
+ */
+#define SPA_LOG_TOPIC_ENUM_DEFINE_REGISTERED \
+	extern struct spa_log_topic * const __start_spa_log_topic; \
+	extern struct spa_log_topic * const __stop_spa_log_topic; \
+	SPA_LOG_TOPIC_ENUM_DEFINE(__start_spa_log_topic, __stop_spa_log_topic)
+
 /** \fn spa_log_error */
 
 /** keys can be given when initializing the logger handle */

pipewire-1.0.1.tar.bz2/spa/include/spa/support/loop.h -> pipewire-1.2.0.tar.gz/spa/include/spa/support/loop.h Changed

@@ -66,19 +66,56 @@
 #define SPA_VERSION_LOOP_METHODS	0
 	uint32_t version;
 
-	/** add a source to the loop */
+	/** Add a source to the loop. Must be called from the loop's own thread.
+	 *
+	 * \paramin object The callbacks data.
+	 * \paramin source The source.
+	 * \return 0 on success, negative errno-style value on failure.
+	 */
 	int (*add_source) (void *object,
 			   struct spa_source *source);
 
-	/** update the source io mask */
+	/** Update the source io mask. Must be called from the loop's own thread.
+	 *
+	 * \paramin object The callbacks data.
+	 * \paramin source The source.
+	 * \return 0 on success, negative errno-style value on failure.
+	 */
 	int (*update_source) (void *object,
 			struct spa_source *source);
 
-	/** remove a source from the loop */
+	/** Remove a source from the loop. Must be called from the loop's own thread.
+	 *
+	 * \paramin object The callbacks data.
+	 * \paramin source The source.
+	 * \return 0 on success, negative errno-style value on failure.
+	 */
 	int (*remove_source) (void *object,
 			struct spa_source *source);
 
-	/** invoke a function in the context of this loop */
+	/** Invoke a function in the context of this loop.
+	 * May be called from any thread and multiple threads at the same time.
+	 * If called from the loop's thread, all callbacks previously queued with
+	 * invoke() will be run synchronously, which might cause unexpected
+	 * reentrancy problems.
+	 *
+	 * \paramin object The callbacks data.
+	 * \param func The function to be invoked.
+	 * \param seq An opaque sequence number. This will be made
+	 *            available to func.
+	 * \paramin data Data that will be copied into the internal ring buffer and made
+	 *             available to func. Because this data is copied, it is okay to
+	 *             pass a pointer to a local variable, but do not pass a pointer to
+	 *             an object that has identity.
+	 * \param size The size of data to copy.
+	 * \param block If \true, do not return until func has been called. Otherwise,
+	 *              returns immediately. Passing \true does not risk a deadlock because
+	 *              the data thread is never allowed to wait on any other thread.
+	 * \param user_data An opaque pointer passed to func.
+	 * \return `-EPIPE` if the internal ring buffer filled up,
+	 *         if block is \false, 0 if seq was SPA_ID_INVALID or
+	 *         seq with the ASYNC flag set
+	 *         or the return value of func otherwise. */
 	int (*invoke) (void *object,
 		       spa_invoke_func_t func,
 		       uint32_t seq,

pipewire-1.0.1.tar.bz2/spa/include/spa/support/thread.h -> pipewire-1.2.0.tar.gz/spa/include/spa/support/thread.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/utils/cleanup.h -> pipewire-1.2.0.tar.gz/spa/include/spa/utils/cleanup.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/utils/defs.h -> pipewire-1.2.0.tar.gz/spa/include/spa/utils/defs.h Changed

@@ -9,20 +9,31 @@
 extern "C" {
 # if __cplusplus >= 201103L
 #  define SPA_STATIC_ASSERT_IMPL(expr, msg, ...) static_assert(expr, msg)
+#  define SPA_ALIGNOF alignof
 # endif
+#elif __STDC_VERSION__ >= 202311L
+#  define SPA_STATIC_ASSERT_IMPL(expr, msg, ...) static_assert(expr, msg)
+#  define SPA_ALIGNOF alignof
 #else
 # include <stdbool.h>
 # if __STDC_VERSION__ >= 201112L
 #  define SPA_STATIC_ASSERT_IMPL(expr, msg, ...) _Static_assert(expr, msg)
+#  define SPA_ALIGNOF _Alignof
 # endif
 #endif
 #ifndef SPA_STATIC_ASSERT_IMPL
 #define SPA_STATIC_ASSERT_IMPL(expr, ...) \
 	((void)sizeof(struct { int spa_static_assertion_failed : 2 * !!(expr) - 1; }))
 #endif
+#ifndef SPA_ALIGNOF
+#define SPA_ALIGNOF __alignof__
+#endif
 
 #define SPA_STATIC_ASSERT(expr, ...) SPA_STATIC_ASSERT_IMPL(expr, ## __VA_ARGS__, "`" #expr "` evaluated to false")
 
+#define SPA_CONCAT_NOEXPAND(a, b) a ## b
+#define SPA_CONCAT(a, b) SPA_CONCAT_NOEXPAND(a, b)
+
 #include <inttypes.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -156,6 +167,10 @@
 ({							\
 	fminf(fmaxf(v, low), high);			\
 })
+#define SPA_CLAMPD(v,low,high)				\
+({							\
+	fmin(fmax(v, low), high);			\
+})
 
 
 #define SPA_SWAP(a,b)					\
@@ -171,6 +186,16 @@
 	x;				\
 })
 
+/** 3-way comparison. NaN > NaN and NaN > finite numbers */
+#define SPA_CMP(a, b)					\
+({							\
+	__typeof__(a) _a = (a);				\
+	__typeof__(b) _b = (b);				\
+	(_a > _b) ? 1 : (_a == _b) ? 0 : (_a < _b) ? -1 \
+		: (_a == _a) ? -1 : (_b == _b) ? 1 	\
+		: 1;					\
+})
+
 /**
  * Return the address (buffer + offset) as pointer of \a type
  */
@@ -178,7 +203,6 @@
 #define SPA_PTROFF_ALIGN(ptr_,offset_,alignment_,type_) \
    SPA_PTR_ALIGN(SPA_PTROFF(ptr_,offset_,type_),alignment_,type_)
 
-
 /**
  * Deprecated, use SPA_PTROFF and SPA_PTROFF_ALIGN instead
  */
@@ -189,9 +213,6 @@
 
 #define SPA_PTRDIFF(p1,p2) ((intptr_t)(p1) - (intptr_t)(p2))
 
-#define SPA_PTR_TO_INT(p) ((int) ((intptr_t) (p)))
-#define SPA_INT_TO_PTR(u) ((void*) ((intptr_t) (u)))
-
 #define SPA_PTR_TO_UINT32(p) ((uint32_t) ((uintptr_t) (p)))
 #define SPA_UINT32_TO_PTR(u) ((void*) ((uintptr_t) (u)))
 
@@ -265,7 +286,7 @@
 })
 
 
-#define SPA_PTR_ALIGNMENT(p,align)	((intptr_t)(p) & ((align)-1))
+#define SPA_PTR_ALIGNMENT(p,align)	((uintptr_t)(p) & ((align)-1))
 #define SPA_IS_ALIGNED(p,align)		(SPA_PTR_ALIGNMENT(p,align) == 0)
 #define SPA_PTR_ALIGN(p,align,type)	((type*)SPA_ROUND_UP_N((intptr_t)(p), (intptr_t)(align)))
 
@@ -279,9 +300,51 @@
 #endif
 #endif
 
+static inline bool spa_ptrinside(const void *p1, size_t s1, const void *p2, size_t s2,
+                                 size_t *remaining)
+{
+	if (SPA_LIKELY((uintptr_t)p1 <= (uintptr_t)p2 && s2 <= s1 &&
+	               (uintptr_t)p2 - (uintptr_t)p1 <= s1 - s2)) {
+		if (remaining != NULL)
+			*remaining = ((uintptr_t)p1 + s1) - ((uintptr_t)p2 + s2);
+		return true;
+	} else {
+		if (remaining != NULL)
+			*remaining = 0;
+		return false;
+	}
+}
+
+static inline bool spa_ptr_inside_and_aligned(const void *p1, size_t s1,
+                                              const void *p2, size_t s2, size_t align,
+                                              size_t *remaining)
+{
+	if (SPA_IS_ALIGNED(p2, align)) {
+		return spa_ptrinside(p1, s1, p2, s2, remaining);
+	} else {
+		if (remaining != NULL)
+			*remaining = 0;
+		return false;
+	}
+}
+
+#define spa_ptr_type_inside(p1, s1, p2, type, remaining) \
+	spa_ptr_inside_and_aligned(p1, s1, p2, sizeof(type), SPA_ALIGNOF(type), remaining)
+
+#define SPA_PTR_TO_INT(p) ((int) ((intptr_t) (p)))
+#define SPA_INT_TO_PTR(u) ((void*) ((intptr_t) (u)))
+
 #define SPA_STRINGIFY_1(...)	#__VA_ARGS__
 #define SPA_STRINGIFY(...)	SPA_STRINGIFY_1(__VA_ARGS__)
 
+struct spa_error_location {
+	int line;
+	int col;
+	size_t len;
+	const char *location;
+	const char *reason;
+};
+
 #define spa_return_if_fail(expr)					\
 	do {								\
 		if (SPA_UNLIKELY(!(expr))) {				\

pipewire-1.0.1.tar.bz2/spa/include/spa/utils/enum-types.h -> pipewire-1.2.0.tar.gz/spa/include/spa/utils/enum-types.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/utils/json-pod.h -> pipewire-1.2.0.tar.gz/spa/include/spa/utils/json-pod.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/utils/json.h -> pipewire-1.2.0.tar.gz/spa/include/spa/utils/json.h Changed

@@ -34,6 +34,7 @@
 	const char *cur;
 	const char *end;
 	struct spa_json *parent;
+#define SPA_JSON_ERROR_FLAG	0x100
 	uint32_t state;
 	uint32_t depth;
 };
@@ -44,78 +45,185 @@
 {
 	*iter =  SPA_JSON_INIT(data, size);
 }
-#define SPA_JSON_ENTER(iter) ((struct spa_json) { (iter)->cur, (iter)->end, (iter), 0, 0 })
+#define SPA_JSON_ENTER(iter) ((struct spa_json) { (iter)->cur, (iter)->end, (iter), (iter)->state & 0xff0, 0 })
 
 static inline void spa_json_enter(struct spa_json * iter, struct spa_json * sub)
 {
 	*sub = SPA_JSON_ENTER(iter);
 }
 
-#define SPA_JSON_SAVE(iter) ((struct spa_json) { (iter)->cur, (iter)->end, })
+#define SPA_JSON_SAVE(iter) ((struct spa_json) { (iter)->cur, (iter)->end, NULL, (iter)->state, 0 })
 
 /** Get the next token. \a value points to the token and the return value
- * is the length. */
+ * is the length. Returns -1 on parse error, 0 on end of input. */
 static inline int spa_json_next(struct spa_json * iter, const char **value)
 {
-	int utf8_remain = 0;
-	enum { __NONE, __STRUCT, __BARE, __STRING, __UTF8, __ESC, __COMMENT };
+	int utf8_remain = 0, err = 0;
+	enum {
+		__NONE, __STRUCT, __BARE, __STRING, __UTF8, __ESC, __COMMENT,
+		__ARRAY_FLAG = 0x10,		/* in array context */
+		__PREV_ARRAY_FLAG = 0x20,	/* depth=0 array context flag */
+		__KEY_FLAG = 0x40,		/* inside object key */
+		__SUB_FLAG = 0x80,		/* not at top-level */
+		__FLAGS = 0xff0,
+		__ERROR_SYSTEM = SPA_JSON_ERROR_FLAG,
+		__ERROR_INVALID_ARRAY_SEPARATOR,
+		__ERROR_EXPECTED_OBJECT_KEY,
+		__ERROR_EXPECTED_OBJECT_VALUE,
+		__ERROR_TOO_DEEP_NESTING,
+		__ERROR_EXPECTED_ARRAY_CLOSE,
+		__ERROR_EXPECTED_OBJECT_CLOSE,
+		__ERROR_MISMATCHED_BRACKET,
+		__ERROR_ESCAPE_NOT_ALLOWED,
+		__ERROR_CHARACTERS_NOT_ALLOWED,
+		__ERROR_INVALID_ESCAPE,
+		__ERROR_INVALID_STATE,
+		__ERROR_UNFINISHED_STRING,
+	};
+	uint64_t array_stack8 = {0};		/* array context flags of depths 1...512 */
 
 	*value = iter->cur;
+
+	if (iter->state & SPA_JSON_ERROR_FLAG)
+		return -1;
+
 	for (; iter->cur < iter->end; iter->cur++) {
 		unsigned char cur = (unsigned char)*iter->cur;
+		uint32_t flag;
+
+#define _SPA_ERROR(reason)	{ err = __ERROR_ ## reason; goto error; }
  again:
-		switch (iter->state) {
+		flag = iter->state & __FLAGS;
+		switch (iter->state & ~__FLAGS) {
 		case __NONE:
-			iter->state = __STRUCT;
+			flag &= ~(__KEY_FLAG | __PREV_ARRAY_FLAG);
+			iter->state = __STRUCT | flag;
 			iter->depth = 0;
 			goto again;
 		case __STRUCT:
 			switch (cur) {
-			case '\0': case '\t': case ' ': case '\r': case '\n': case ':': case '=': case ',':
+			case '\0': case '\t': case ' ': case '\r': case '\n': case ',':
+				continue;
+			case ':': case '=':
+				if (flag & __ARRAY_FLAG)
+					_SPA_ERROR(INVALID_ARRAY_SEPARATOR);
+				if (!(flag & __KEY_FLAG))
+					_SPA_ERROR(EXPECTED_OBJECT_KEY);
+				iter->state |= __SUB_FLAG;
 				continue;
 			case '#':
-				iter->state = __COMMENT;
+				iter->state = __COMMENT | flag;
 				continue;
 			case '"':
+				if (flag & __KEY_FLAG)
+					flag |= __SUB_FLAG;
+				if (!(flag & __ARRAY_FLAG))
+					SPA_FLAG_UPDATE(flag, __KEY_FLAG, !(flag & __KEY_FLAG));
 				*value = iter->cur;
-				iter->state = __STRING;
+				iter->state = __STRING | flag;
 				continue;
 			case '': case '{':
+				if (!(flag & __ARRAY_FLAG)) {
+					/* At top-level we may be either in object context
+					 * or in single-item context, and then we need to
+					 * accept array/object here.
+					 */
+					if ((iter->state & __SUB_FLAG) && !(flag & __KEY_FLAG))
+						_SPA_ERROR(EXPECTED_OBJECT_KEY);
+					SPA_FLAG_CLEAR(flag, __KEY_FLAG);
+				}
+				iter->state = __STRUCT | __SUB_FLAG | flag;
+				SPA_FLAG_UPDATE(iter->state, __ARRAY_FLAG, cur == '');
+
+				/* We need to remember previous array state across calls
+				 * for depth=0, so store that in state. Others bits go to
+				 * temporary stack.
+				 */
+				if (iter->depth == 0) {
+					SPA_FLAG_UPDATE(iter->state, __PREV_ARRAY_FLAG, flag & __ARRAY_FLAG);
+				} else if (((iter->depth-1) >> 6) < SPA_N_ELEMENTS(array_stack)) {
+					uint64_t mask = 1ULL << ((iter->depth-1) & 0x3f);
+					SPA_FLAG_UPDATE(array_stack(iter->depth-1) >> 6, mask, flag & __ARRAY_FLAG);
+				} else {
+					/* too deep */
+					_SPA_ERROR(TOO_DEEP_NESTING);
+				}
+
 				*value = iter->cur;
 				if (++iter->depth > 1)
 					continue;
 				iter->cur++;
 				return 1;
 			case '}': case '':
+				if ((flag & __ARRAY_FLAG) && cur != '')
+					_SPA_ERROR(EXPECTED_ARRAY_CLOSE);
+				if (!(flag & __ARRAY_FLAG) && cur != '}')
+					_SPA_ERROR(EXPECTED_OBJECT_CLOSE);
+				if (flag & __KEY_FLAG) {
+					/* incomplete key-value pair */
+					_SPA_ERROR(EXPECTED_OBJECT_VALUE);
+				}
+				iter->state = __STRUCT | __SUB_FLAG | flag;
 				if (iter->depth == 0) {
 					if (iter->parent)
 						iter->parent->cur = iter->cur;
+					else
+						_SPA_ERROR(MISMATCHED_BRACKET);
 					return 0;
 				}
 				--iter->depth;
+				if (iter->depth == 0) {
+					SPA_FLAG_UPDATE(iter->state, __ARRAY_FLAG, flag & __PREV_ARRAY_FLAG);
+				} else if (((iter->depth-1) >> 6) < SPA_N_ELEMENTS(array_stack)) {
+					uint64_t mask = 1ULL << ((iter->depth-1) & 0x3f);
+					SPA_FLAG_UPDATE(iter->state, __ARRAY_FLAG,
+							SPA_FLAG_IS_SET(array_stack(iter->depth-1) >> 6, mask));
+				} else {
+					/* too deep */
+					_SPA_ERROR(TOO_DEEP_NESTING);
+				}
 				continue;
+			case '\\':
+				/* disallow bare escape */
+				_SPA_ERROR(ESCAPE_NOT_ALLOWED);
 			default:
+				/* allow bare ascii */
+				if (!(cur >= 32 && cur <= 126))
+					_SPA_ERROR(CHARACTERS_NOT_ALLOWED);
+				if (flag & __KEY_FLAG)
+					flag |= __SUB_FLAG;
+				if (!(flag & __ARRAY_FLAG))
+					SPA_FLAG_UPDATE(flag, __KEY_FLAG, !(flag & __KEY_FLAG));
 				*value = iter->cur;
-				iter->state = __BARE;
+				iter->state = __BARE | flag;
 			}
 			continue;
 		case __BARE:
 			switch (cur) {
+			case '\0':
 			case '\t': case ' ': case '\r': case '\n':
+			case '"': case '#':
 			case ':': case ',': case '=': case '': case '}':
-				iter->state = __STRUCT;
+				iter->state = __STRUCT | flag;
 				if (iter->depth > 0)
 					goto again;
 				return iter->cur - *value;
+			case '\\':
+				/* disallow bare escape */
+				_SPA_ERROR(ESCAPE_NOT_ALLOWED);
+			default:
+				/* allow bare ascii */
+				if (cur >= 32 && cur <= 126)
+					continue;
 			}
-			continue;
+			_SPA_ERROR(CHARACTERS_NOT_ALLOWED);
 		case __STRING:
 			switch (cur) {
 			case '\\':
-				iter->state = __ESC;
+				iter->state = __ESC | flag;
 				continue;
 			case '"':
-				iter->state = __STRUCT;
+				iter->state = __STRUCT | flag;
 				if (iter->depth > 0)
 					continue;
 				return ++iter->cur - *value;
@@ -127,50 +235,134 @@
 				SPA_FALLTHROUGH;
 			case 192 ... 223:
 				utf8_remain++;
-				iter->state = __UTF8;
+				iter->state = __UTF8 | flag;
 				continue;
 			default:
-				if (cur >= 32 && cur <= 126)
+				if (cur >= 32 && cur <= 127)
 					continue;
 			}
-			return -1;
+			_SPA_ERROR(CHARACTERS_NOT_ALLOWED);
 		case __UTF8:
 			switch (cur) {
 			case 128 ... 191:
 				if (--utf8_remain == 0)
-					iter->state = __STRING;
+					iter->state = __STRING | flag;
 				continue;
 			}
-			return -1;
+			_SPA_ERROR(CHARACTERS_NOT_ALLOWED);
 		case __ESC:
 			switch (cur) {
 			case '"': case '\\': case '/': case 'b': case 'f':
 			case 'n': case 'r': case 't': case 'u':
-				iter->state = __STRING;
+				iter->state = __STRING | flag;
 				continue;
 			}
-			return -1;
+			_SPA_ERROR(INVALID_ESCAPE);
 		case __COMMENT:
 			switch (cur) {
 			case '\n': case '\r':
-				iter->state = __STRUCT;
+				iter->state = __STRUCT | flag;
 			}
+			break;
+		default:
+			_SPA_ERROR(INVALID_STATE);
 		}
 
 	}
-	if (iter->depth != 0)
-		return -1;
-	if (iter->state != __STRUCT) {
-		iter->state = __STRUCT;
+	if (iter->depth != 0 || iter->parent)
+		_SPA_ERROR(MISMATCHED_BRACKET);
+
+	switch (iter->state & ~__FLAGS) {
+	case __STRING: case __UTF8: case __ESC:
+		/* string/escape not closed */
+		_SPA_ERROR(UNFINISHED_STRING);
+	case __COMMENT:
+		/* trailing comment */
+		return 0;
+	}
+
+	if ((iter->state & __SUB_FLAG) && (iter->state & __KEY_FLAG)) {
+		/* incomplete key-value pair */
+		_SPA_ERROR(EXPECTED_OBJECT_VALUE);
+	}
+
+	if ((iter->state & ~__FLAGS) != __STRUCT) {
+		iter->state = __STRUCT | (iter->state & __FLAGS);
 		return iter->cur - *value;
 	}
 	return 0;
+#undef _SPA_ERROR
+
+error:
+	iter->state = err;
+	while (iter->parent) {
+		if (iter->parent->state & SPA_JSON_ERROR_FLAG)
+			break;
+		iter->parent->state = err;
+		iter->parent->cur = iter->cur;
+		iter = iter->parent;
+	}
+	return -1;
+}
+
+/**
+ * Return it there was a parse error, and its possible location.
+ *
+ * \since 1.1.0
+ */
+static inline bool spa_json_get_error(struct spa_json *iter, const char *start,
+		struct spa_error_location *loc)
+{
+	static const char *reasons = {
+		"System error",
+		"Invalid array separator",
+		"Expected object key",
+		"Expected object value",
+		"Too deep nesting",
+		"Expected array close bracket",
+		"Expected object close brace",
+		"Mismatched bracket",
+		"Escape not allowed",
+		"Character not allowed",
+		"Invalid escape",
+		"Invalid state",
+		"Unfinished string",
+		"Expected key separator",
+	};
+
+	if (!(iter->state & SPA_JSON_ERROR_FLAG))
+		return false;
+
+	if (loc) {
+		int linepos = 1, colpos = 1, code;
+		const char *p, *l;
+
+		for (l = p = start; p && p != iter->cur; ++p) {
+			if (*p == '\n') {
+				linepos++;
+				colpos = 1;
+				l = p+1;
+			} else {
+				colpos++;
+			}
+		}
+		code = SPA_CLAMP(iter->state & 0xff, 0u, SPA_N_ELEMENTS(reasons)-1);
+		loc->line = linepos;
+		loc->col = colpos;
+		loc->location = l;
+		loc->len = SPA_PTRDIFF(iter->end, loc->location) / sizeof(char);
+		loc->reason = code == 0 ? strerror(errno) : reasonscode;
+	}
+	return true;
 }
 
 static inline int spa_json_enter_container(struct spa_json *iter, struct spa_json *sub, char type)
 {
 	const char *value;
-	if (spa_json_next(iter, &value) <= 0 || *value != type)
+	int len;
+	if ((len = spa_json_next(iter, &value)) <= 0)
+		return len;
+	if (*value != type)
 		return -1;
 	spa_json_enter(iter, sub);
 	return 1;
@@ -181,12 +373,20 @@
 	return len > 0 && (*val == '{'  || *val == '');
 }
 
+/**
+ * Return length of container at current position, starting at \a value.
+ *
+ * \return Length of container including {} or , or 0 on error.
+ */
 static inline int spa_json_container_len(struct spa_json *iter, const char *value, int len SPA_UNUSED)
 {
 	const char *val;
 	struct spa_json sub;
+	int res;
 	spa_json_enter(iter, &sub);
-	while (spa_json_next(&sub, &val) > 0);
+	while ((res = spa_json_next(&sub, &val)) > 0);
+	if (res < 0)
+		return 0;
 	return sub.cur + 1 - value;
 }
 
@@ -219,11 +419,25 @@
 /* float */
 static inline int spa_json_parse_float(const char *val, int len, float *result)
 {
+	char buf96;
 	char *end;
-	if (strspn(val, "+-0123456789.Ee") < (size_t)len)
+	int pos;
+
+	if (len <= 0 || len >= (int)sizeof(buf))
 		return 0;
-	*result = spa_strtof(val, &end);
-	return len > 0 && end == val + len;
+
+	for (pos = 0; pos < len; ++pos) {
+		switch (valpos) {
+		case '+': case '-': case '0' ... '9': case '.': case 'e': case 'E': break;
+		default: return 0;
+		}
+	}
+
+	memcpy(buf, val, len);
+	buflen = '\0';
+
+	*result = spa_strtof(buf, &end);
+	return len > 0 && end == buf + len;
 }
 
 static inline bool spa_json_is_float(const char *val, int len)
@@ -236,7 +450,7 @@
 	const char *value;
 	int len;
 	if ((len = spa_json_next(iter, &value)) <= 0)
-		return -1;
+		return len;
 	return spa_json_parse_float(value, len, res);
 }
 
@@ -256,9 +470,17 @@
 /* int */
 static inline int spa_json_parse_int(const char *val, int len, int *result)
 {
+	char buf64;
 	char *end;
-	*result = strtol(val, &end, 0);
-	return len > 0 && end == val + len;
+
+	if (len <= 0 || len >= (int)sizeof(buf))
+		return 0;
+
+	memcpy(buf, val, len);
+	buflen = '\0';
+
+	*result = strtol(buf, &end, 0);
+	return len > 0 && end == buf + len;
 }
 static inline bool spa_json_is_int(const char *val, int len)
 {
@@ -270,7 +492,7 @@
 	const char *value;
 	int len;
 	if ((len = spa_json_next(iter, &value)) <= 0)
-		return -1;
+		return len;
 	return spa_json_parse_int(value, len, res);
 }
 
@@ -303,7 +525,7 @@
 	const char *value;
 	int len;
 	if ((len = spa_json_next(iter, &value)) <= 0)
-		return -1;
+		return len;
 	return spa_json_parse_bool(value, len, res);
 }
 
@@ -339,7 +561,7 @@
 		return -1;
 	if (!spa_json_is_string(val, len)) {
 		if (result != val)
-			strncpy(result, val, len);
+			memmove(result, val, len);
 		result += len;
 	} else {
 		for (p = val+1; p < val + len; p++) {
@@ -372,7 +594,7 @@
 						    v < 0xdc00 || v > 0xdfff)
 							continue;
 						p += 6;
-						cp = 0x010000 | ((cp & 0x3ff) << 10) | (v & 0x3ff);
+						cp = 0x010000 + (((cp & 0x3ff) << 10) | (v & 0x3ff));
 					} else if (cp >= 0xdc00 && cp <= 0xdfff)
 						continue;
 
@@ -405,7 +627,7 @@
 	const char *value;
 	int len;
 	if ((len = spa_json_next(iter, &value)) <= 0)
-		return -1;
+		return len;
 	return spa_json_parse_stringn(value, len, res, maxlen);
 }

pipewire-1.0.1.tar.bz2/spa/include/spa/utils/keys.h -> pipewire-1.2.0.tar.gz/spa/include/spa/utils/keys.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/utils/names.h -> pipewire-1.2.0.tar.gz/spa/include/spa/utils/names.h Changed

pipewire-1.0.1.tar.bz2/spa/include/spa/utils/string.h -> pipewire-1.2.0.tar.gz/spa/include/spa/utils/string.h Changed

pipewire-1.0.1.tar.bz2/spa/meson.build -> pipewire-1.2.0.tar.gz/spa/meson.build Changed

@@ -8,6 +8,7 @@
 spa_dep = declare_dependency(
   include_directories : 
     include_directories('include'),
+    include_directories('include-private'),
   ,
   dependencies : atomic_dep,
   version : spaversion,
@@ -31,11 +32,14 @@
 
 subdir('include')
 
+jack_dep = dependency('jack', version : '>= 1.9.10', required: get_option('jack'))
+summary({'JACK2': jack_dep.found()}, bool_yn: true, section: 'Backend')
+
 if get_option('spa-plugins').allowed()
   udevrulesdir = get_option('udevrulesdir')
   if udevrulesdir == ''
     # absolute path, otherwise meson prepends the prefix
-    udevrulesdir = '/lib/udev/rules.d'
+    udevrulesdir = '/usr/lib/udev/rules.d'
   endif
 
   # plugin-specific dependencies
@@ -84,9 +88,8 @@
       mm_dep = dependency('ModemManager', version : '>= 1.10.0', required : get_option('bluez5-backend-native-mm'))
       summary({'ModemManager': mm_dep.found()}, bool_yn: true, section: 'Bluetooth backends')
     endif
+    cdata.set('HAVE_LC3', get_option('bluez5-codec-lc3').allowed() and lc3_dep.found())
   endif
-  jack_dep = dependency('jack', version : '>= 1.9.10', required: get_option('jack'))
-  summary({'JACK2': jack_dep.found()}, bool_yn: true, section: 'Backend')
 
   have_vulkan = false
   vulkan_dep = dependency('vulkan', version : '>= 1.2.170', required: get_option('vulkan'))
@@ -96,18 +99,19 @@
   endif
   summary({'Vulkan': have_vulkan}, bool_yn: true, section: 'Misc dependencies')
 
-  libcamera_dep = dependency('libcamera', required: get_option('libcamera'))
+  libcamera_dep = dependency('libcamera', version: '>= 0.2.0', required: get_option('libcamera'))
   summary({'libcamera': libcamera_dep.found()}, bool_yn: true, section: 'Backend')
-  cdata.set('HAVE_LIBCAMERA_SYSTEM_DEVICES', libcamera_dep.version().version_compare('>= 0.1.0'))
 
   compress_offload_option = get_option('compress-offload')
   summary({'Compress-Offload': compress_offload_option.allowed()}, bool_yn: true, section: 'Backend')
   cdata.set('HAVE_ALSA_COMPRESS_OFFLOAD', compress_offload_option.allowed())
 
   # common dependencies
-  libudev_dep = dependency('libudev', required: alsa_dep.found() or get_option('udev').enabled() or get_option('v4l2').enabled())
+  libudev_dep = dependency('libudev', required: get_option('udev').enabled())
+  cdata.set('HAVE_LIBUDEV', libudev_dep.found())
   summary({'Udev': libudev_dep.found()}, bool_yn: true, section: 'Backend')
 
+  cdata.set('HAVE_SPA_PLUGINS', '1')
   subdir('plugins')
 endif

pipewire-1.0.1.tar.bz2/spa/plugins/aec/aec-null.c -> pipewire-1.2.0.tar.gz/spa/plugins/aec/aec-null.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/aec/aec-webrtc.cpp -> pipewire-1.2.0.tar.gz/spa/plugins/aec/aec-webrtc.cpp Changed

@@ -35,7 +35,7 @@
 	std::unique_ptr<float *> play_buffer, rec_buffer, out_buffer;
 };
 
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.eac.webrtc");
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.eac.webrtc");
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
 
@@ -171,6 +171,8 @@
 #else
 	webrtc::AudioProcessing::Config config;
 	config.echo_canceller.enabled = true;
+	config.pipeline.multi_channel_capture = rec_info->channels > 1;
+	config.pipeline.multi_channel_render = play_info->channels > 1;
 	// FIXME: Example code enables both gain controllers, but that seems sus
 	config.gain_controller1.enabled = gain_control;
 	config.gain_controller1.mode = webrtc::AudioProcessing::Config::GainController1::Mode::kAdaptiveDigital;
@@ -211,7 +213,7 @@
 	// drift compensation on all sinks and sources linked to this echo-canceler
 	apm->echo_cancellation()->enable_drift_compensation(false);
 	apm->echo_cancellation()->Enable(true);
-	// TODO: wire up supression levels to args
+	// TODO: wire up suppression levels to args
 	apm->echo_cancellation()->set_suppression_level(webrtc::EchoCancellation::kHighSuppression);
 	apm->noise_suppression()->set_level(webrtc::NoiseSuppression::kHigh);
 	apm->noise_suppression()->Enable(noise_suppression);
@@ -292,7 +294,7 @@
 }
 
 static const struct spa_audio_aec_methods impl_aec = {
-	SPA_VERSION_AUDIO_AEC_METHODS,
+	.version = SPA_VERSION_AUDIO_AEC_METHODS,
 	.add_listener = NULL,
 	.init = webrtc_init,
 	.run = webrtc_run,
@@ -391,6 +393,10 @@
 	impl_enum_interface_info,
 };
 
+extern "C" {
+SPA_LOG_TOPIC_ENUM_DEFINE_REGISTERED;
+}
+
 SPA_EXPORT
 int spa_handle_factory_enum(const struct spa_handle_factory **factory, uint32_t *index)
 {

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/90-pipewire-alsa.rules -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/90-pipewire-alsa.rules Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/acp-tool.c -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/acp-tool.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/acp/acp.c -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/acp/acp.c Changed

@@ -7,6 +7,7 @@
 #include "alsa-ucm.h"
 
 #include <spa/utils/string.h>
+#include <spa/utils/json.h>
 
 int _acp_log_level = 1;
 acp_log_func _acp_log_func;
@@ -385,7 +386,7 @@
 							devstr, NULL, &m->sample_spec,
 							&m->channel_map, SND_PCM_STREAM_PLAYBACK,
 							&try_period_size, &try_buffer_size,
-							0, NULL, NULL, false))) {
+							0, NULL, NULL, NULL, NULL, false))) {
 				pa_alsa_init_proplist_pcm(NULL, m->output_proplist, m->output_pcm);
 				pa_proplist_setf(m->output_proplist, "clock.name", "api.alsa.%u", index);
 				pa_proplist_setf(m->output_proplist, "device.profile.pro", "true");
@@ -417,7 +418,7 @@
 							devstr, NULL, &m->sample_spec,
 							&m->channel_map, SND_PCM_STREAM_CAPTURE,
 							&try_period_size, &try_buffer_size,
-							0, NULL, NULL, false))) {
+							0, NULL, NULL, NULL, NULL, false))) {
 				pa_alsa_init_proplist_pcm(NULL, m->input_proplist, m->input_pcm);
 				pa_proplist_setf(m->input_proplist, "clock.name", "api.alsa.%u", index);
 				pa_proplist_setf(m->input_proplist, "device.profile.pro", "true");
@@ -449,6 +450,24 @@
 	return 0;
 }
 
+static bool contains_string(const char *arr, const char *str)
+{
+	struct spa_json it2;
+	char v256;
+
+	if (arr == NULL || str == NULL)
+		return false;
+
+	spa_json_init(&it0, arr, strlen(arr));
+        if (spa_json_enter_array(&it0, &it1) <= 0)
+                spa_json_init(&it1, arr, strlen(arr));
+
+	while (spa_json_get_string(&it1, v, sizeof(v)) > 0) {
+		if (spa_streq(v, str))
+			return true;
+	}
+	return false;
+}
 
 static void add_profiles(pa_card *impl)
 {
@@ -459,6 +478,7 @@
 	pa_alsa_device *dev;
 	int n_profiles, n_ports, n_devices;
 	uint32_t idx;
+	const char *arr;
 
 	n_devices = 0;
 	pa_dynarray_init(&impl->out.devices, device_free);
@@ -490,8 +510,8 @@
 					pa_dynarray_append(&impl->out.devices, dev);
 				}
 				if (impl->use_ucm) {
-					if (m->ucm_context.ucm_devices) {
-						pa_alsa_ucm_add_ports_combination(NULL, &m->ucm_context,
+					if (m->ucm_context.ucm_device) {
+						pa_alsa_ucm_add_port(NULL, &m->ucm_context,
 							true, impl->ports, ap, NULL);
 						pa_alsa_ucm_add_ports(&dev->ports, m->proplist, &m->ucm_context,
 							true, impl, dev->pcm_handle, impl->profile_set->ignore_dB);
@@ -514,8 +534,8 @@
 				}
 
 				if (impl->use_ucm) {
-					if (m->ucm_context.ucm_devices) {
-						pa_alsa_ucm_add_ports_combination(NULL, &m->ucm_context,
+					if (m->ucm_context.ucm_device) {
+						pa_alsa_ucm_add_port(NULL, &m->ucm_context,
 							false, impl->ports, ap, NULL);
 						pa_alsa_ucm_add_ports(&dev->ports, m->proplist, &m->ucm_context,
 							false, impl, dev->pcm_handle, impl->profile_set->ignore_dB);
@@ -561,7 +581,10 @@
 		dev->device.ports = dev->port_array.array.data;
 		dev->device.n_ports = pa_dynarray_size(&dev->port_array);
 	}
+	arr = pa_proplist_gets(impl->proplist, "api.acp.hidden-ports");
 	PA_HASHMAP_FOREACH(dp, impl->ports, state) {
+		if (contains_string(arr, dp->name))
+			dp->port.flags |= ACP_PORT_HIDDEN;
 		dp->port.devices = dp->devices.array.data;
 		dp->port.n_devices = pa_dynarray_size(&dp->devices);
 	}
@@ -570,7 +593,10 @@
 
 	n_profiles = 0;
 	pa_dynarray_init(&impl->out.profiles, NULL);
+	arr = pa_proplist_gets(impl->proplist, "api.acp.hidden-profiles");
 	PA_HASHMAP_FOREACH(cp, impl->profiles, state) {
+		if (contains_string(arr, cp->name))
+			cp->flags |= ACP_PROFILE_HIDDEN;
 		cp->index = n_profiles++;
 		pa_dynarray_append(&impl->out.profiles, cp);
 	}
@@ -649,7 +675,7 @@
 static int report_jack_state(snd_mixer_elem_t *melem, unsigned int mask)
 {
 	pa_card *impl = snd_mixer_elem_get_callback_private(melem);
-	snd_hctl_elem_t *elem = snd_mixer_elem_get_private(melem);
+	snd_hctl_elem_t **_elem = snd_mixer_elem_get_private(melem), *elem;
 	snd_ctl_elem_value_t *elem_value;
 	bool plugged_in, any_input_port_available;
 	void *state;
@@ -659,6 +685,8 @@
 	enum acp_available active_available = ACP_AVAILABLE_UNKNOWN;
 	size_t size;
 
+	pa_assert(_elem);
+	elem = *_elem;
 #if 0
 	/* Changing the jack state may cause a port change, and a port change will
 	 * make the sink or source change the mixer settings. If there are multiple
@@ -927,13 +955,17 @@
 static int hdmi_eld_changed(snd_mixer_elem_t *melem, unsigned int mask)
 {
 	pa_card *impl = snd_mixer_elem_get_callback_private(melem);
-	snd_hctl_elem_t *elem = snd_mixer_elem_get_private(melem);
-	int device = snd_hctl_elem_get_device(elem);
+	snd_hctl_elem_t **_elem = snd_mixer_elem_get_private(melem), *elem;
+	int device;
 	const char *old_monitor_name;
 	pa_device_port *p;
 	pa_hdmi_eld eld;
 	bool changed = false;
 
+	pa_assert(_elem);
+	elem = *_elem;
+	device = snd_hctl_elem_get_device(elem);
+
 	if (mask == SND_CTL_EVENT_MASK_REMOVE)
 		return 0;
 
@@ -1021,6 +1053,9 @@
 	for (i = 0; i < card->n_profiles; i++) {
 		struct acp_card_profile *p = profilesi;
 
+		if (SPA_FLAG_IS_SET(p->flags, ACP_PROFILE_HIDDEN))
+			continue;
+
 		if (name) {
 			if (spa_streq(name, p->name))
 				best = i;
@@ -1108,6 +1143,14 @@
 	uint32_t i;
 	int res;
 
+	if (dev->ucm_context) {
+		if (!dev->active_port)
+			return 0;
+		pa_alsa_ucm_port_data *data = PA_DEVICE_PORT_DATA(dev->active_port);
+		if (pa_alsa_ucm_port_device_status(data) <= 0)
+			return 0;
+	}
+
 	if (!dev->mixer_handle)
 		return 0;
 
@@ -1143,6 +1186,14 @@
 	if (v != &dev->real_volume)
 		dev->real_volume = *v;
 
+	if (dev->ucm_context) {
+		if (!dev->active_port)
+			return;
+		pa_alsa_ucm_port_data *data = PA_DEVICE_PORT_DATA(dev->active_port);
+		if (pa_alsa_ucm_port_device_status(data) <= 0)
+			return;
+	}
+
 	if (!dev->mixer_handle)
 		return;
 
@@ -1196,6 +1247,14 @@
 	bool mute;
 	int res;
 
+	if (dev->ucm_context) {
+		if (!dev->active_port)
+			return 0;
+		pa_alsa_ucm_port_data *data = PA_DEVICE_PORT_DATA(dev->active_port);
+		if (pa_alsa_ucm_port_device_status(data) <= 0)
+			return 0;
+	}
+
 	if (!dev->mixer_handle)
 		return 0;
 
@@ -1218,6 +1277,14 @@
 {
 	dev->muted = mute;
 
+	if (dev->ucm_context) {
+		if (!dev->active_port)
+			return;
+		pa_alsa_ucm_port_data *data = PA_DEVICE_PORT_DATA(dev->active_port);
+		if (pa_alsa_ucm_port_device_status(data) <= 0)
+			return;
+	}
+
 	if (!dev->mixer_handle)
 		return;
 
@@ -1268,7 +1335,7 @@
 		pa_log_info("Using hardware volume control. Hardware dB scale %s.",
 				dev->mixer_path->has_dB ? "supported" : "not supported");
 	}
-	dev->device.base_volume = pa_sw_volume_to_linear(dev->base_volume);
+	dev->device.base_volume = (float)pa_sw_volume_to_linear(dev->base_volume);
 	dev->device.volume_step = 1.0f / dev->n_volume_steps;
 
 	if (impl->soft_mixer || !dev->mixer_path || !dev->mixer_path->has_mute) {
@@ -1295,8 +1362,7 @@
 	* will be NULL, but the UCM device enable sequence will still need to be
 	* executed. */
 	if (dev->active_port && dev->ucm_context) {
-		if ((res = pa_alsa_ucm_set_port(dev->ucm_context, dev->active_port,
-					dev->direction == PA_ALSA_DIRECTION_OUTPUT)) < 0)
+		if ((res = pa_alsa_ucm_set_port(dev->ucm_context, dev->active_port)) < 0)
 			return res;
 	}
 
@@ -1441,9 +1507,11 @@
 	if (new_index >= card->n_profiles)
 		return -EINVAL;
 
-	op = old_index != ACP_INVALID_INDEX ? (pa_alsa_profile*)profilesold_index : NULL;
 	np = (pa_alsa_profile*)profilesnew_index;
+	if (SPA_FLAG_IS_SET(np->profile.flags, ACP_PROFILE_HIDDEN))
+		return -EINVAL;
 
+	op = old_index != ACP_INVALID_INDEX ? (pa_alsa_profile*)profilesold_index : NULL;
 	if (op == np)
 		return 0;
 
@@ -1469,10 +1537,19 @@
 	}
 
 	/* if UCM is available for this card then update the verb */
-	if (impl->use_ucm && !(np->profile.flags & ACP_PROFILE_PRO)) {
-		if ((res = pa_alsa_ucm_set_profile(&impl->ucm, impl,
-		    np->profile.flags & ACP_PROFILE_OFF ? NULL : np->profile.name,
-		    op ? op->profile.name : NULL)) < 0) {
+	if (impl->use_ucm) {
+		if (np->profile.flags & ACP_PROFILE_OFF) {
+			if ((res = pa_alsa_ucm_set_profile(&impl->ucm, impl, NULL, op)) < 0)
+				return res;
+		} else if (np->profile.flags & ACP_PROFILE_PRO) {
+			const char *verb = find_best_verb(impl);
+			if ((res = pa_alsa_ucm_set_profile(&impl->ucm, impl, NULL, op)) < 0)
+				return res;
+			if ((res = snd_use_case_set(impl->ucm.ucm_mgr, "_verb", verb)) < 0) {
+				pa_log_error("error setting verb: %s", snd_strerror(res));
+				return res;
+			}
+		} else if ((res = pa_alsa_ucm_set_profile(&impl->ucm, impl, np, op)) < 0) {
 			return res;
 		}
 	}
@@ -1481,8 +1558,8 @@
 		PA_IDXSET_FOREACH(am, np->output_mappings, idx) {
 			if (impl->use_ucm) {
 				/* Update ports priorities */
-				if (am->ucm_context.ucm_devices) {
-					pa_alsa_ucm_add_ports_combination(am->output.ports, &am->ucm_context,
+				if (am->ucm_context.ucm_device) {
+					pa_alsa_ucm_add_port(am->output.ports, &am->ucm_context,
 						true, impl->ports, np, NULL);
 				}
 			}
@@ -1494,8 +1571,8 @@
 		PA_IDXSET_FOREACH(am, np->input_mappings, idx) {
 			if (impl->use_ucm) {
 				/* Update ports priorities */
-				if (am->ucm_context.ucm_devices) {
-					pa_alsa_ucm_add_ports_combination(am->input.ports, &am->ucm_context,
+				if (am->ucm_context.ucm_device) {
+					pa_alsa_ucm_add_port(am->input.ports, &am->ucm_context,
 						false, impl->ports, np, NULL);
 				}
 			}
@@ -1548,16 +1625,6 @@
     pa_hashmap_free(group_counts);
 }
 
-static const char *acp_dict_lookup(const struct acp_dict *dict, const char *key)
-{
-	const struct acp_dict_item *it;
-	acp_dict_for_each(it, dict) {
-		if (spa_streq(key, it->key))
-			return it->value;
-	}
-	return NULL;
-}
-
 struct acp_card *acp_card_new(uint32_t index, const struct acp_dict *props)
 {
 	pa_card *impl;
@@ -1831,6 +1898,9 @@
 	for (i = 0; i < dev->n_ports; i++) {
 		struct acp_port *p = portsi;
 
+		if (SPA_FLAG_IS_SET(p->flags, ACP_PORT_HIDDEN))
+			continue;
+
 		if (name) {
 			if (spa_streq(name, p->name))
 				best = i;
@@ -1870,6 +1940,8 @@
 	p = (pa_device_port*)impl->card.portsport_index;
 	if (!pa_hashmap_get(d->ports, p->name))
 		return -EINVAL;
+	if (SPA_FLAG_IS_SET(p->port.flags, ACP_PORT_HIDDEN))
+		return -EINVAL;
 
 	p->port.flags = ACP_PORT_ACTIVE | flags;
 	if (p == old)
@@ -1886,8 +1958,7 @@
 		mixer_volume_init(impl, d);
 
 		sync_mixer(d, p);
-		res = pa_alsa_ucm_set_port(d->ucm_context, p,
-					dev->direction == ACP_DIRECTION_PLAYBACK);
+		res = pa_alsa_ucm_set_port(d->ucm_context, p);
 	} else {
 		pa_alsa_port_data *data;
 
@@ -1951,7 +2022,7 @@
 	if (v->channels == 0)
 		return -EIO;
 	for (i = 0; i < n_volume; i++)
-		volumei = pa_sw_volume_to_linear(v->valuesi % v->channels);
+		volumei = (float)pa_sw_volume_to_linear(v->valuesi % v->channels);
 	return 0;
 }

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/acp/acp.h -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/acp/acp.h Changed

@@ -15,6 +15,7 @@
 #include <stdarg.h>
 #include <stdint.h>
 #include <poll.h>
+#include <string.h>
 
 #ifdef __GNUC__
 #define ACP_PRINTF_FUNC(fmt, arg1) __attribute__((format(printf, fmt, arg1)))
@@ -103,6 +104,15 @@
 	     (item) < &(dict)->items(dict)->n_items;		\
 	     (item)++)
 
+static inline const char *acp_dict_lookup(const struct acp_dict *dict, const char *key)
+{
+	const struct acp_dict_item *it;
+	acp_dict_for_each(it, dict)
+		if (strcmp(key, it->key) == 0)
+			return it->value;
+	return NULL;
+}
+
 enum acp_direction {
 	ACP_DIRECTION_PLAYBACK = 1,
 	ACP_DIRECTION_CAPTURE = 2
@@ -167,6 +177,7 @@
 	uint32_t index;			/**< unique index for this port */
 #define ACP_PORT_ACTIVE		(1<<0)
 #define ACP_PORT_SAVE		(1<<1)	/* if the port needs saving */
+#define ACP_PORT_HIDDEN		(1<<2)
 	uint32_t flags;			/**< extra port flags */
 
 	const char *name;		/**< Name of this port */
@@ -190,6 +201,7 @@
 #define ACP_DEVICE_HW_MUTE	(1<<2)
 #define ACP_DEVICE_UCM_DEVICE	(1<<3)
 #define ACP_DEVICE_IEC958	(1<<4)
+#define ACP_DEVICE_HIDDEN	(1<<5)
 	uint32_t flags;
 
 	const char *name;
@@ -218,6 +230,7 @@
 #define ACP_PROFILE_OFF		(1<<1)		/* the Off profile */
 #define ACP_PROFILE_SAVE	(1<<2)		/* if the profile needs saving */
 #define ACP_PROFILE_PRO		(1<<3)		/* the Pro profile */
+#define ACP_PROFILE_HIDDEN	(1<<4)		/* don't show the profile */
 	uint32_t flags;
 
 	const char *name;

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/acp/alsa-mixer.c -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/acp/alsa-mixer.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/acp/alsa-mixer.h -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/acp/alsa-mixer.h Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/acp/alsa-ucm.c -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/acp/alsa-ucm.c Changed

@@ -72,9 +72,8 @@
 
 
 static void ucm_port_data_init(pa_alsa_ucm_port_data *port, pa_alsa_ucm_config *ucm, pa_device_port *core_port,
-                               pa_alsa_ucm_device **devices, unsigned n_devices);
+                               pa_alsa_ucm_device *device);
 static void ucm_port_data_free(pa_device_port *port);
-static void ucm_port_update_available(pa_alsa_ucm_port_data *port);
 
 static struct ucm_type types = {
     {"None", PA_DEVICE_PORT_TYPE_UNKNOWN},
@@ -170,17 +169,6 @@
     return (char *)value;
 }
 
-static int ucm_device_exists(pa_idxset *idxset, pa_alsa_ucm_device *dev) {
-    pa_alsa_ucm_device *d;
-    uint32_t idx;
-
-    PA_IDXSET_FOREACH(d, idxset, idx)
-        if (d == dev)
-            return 1;
-
-    return 0;
-}
-
 static void ucm_add_devices_to_idxset(
         pa_idxset *idxset,
         pa_alsa_ucm_device *me,
@@ -506,10 +494,10 @@
     n_confdev = snd_use_case_get_list(uc_mgr, id, &devices);
     pa_xfree(id);
 
+    device->conflicting_devices = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
     if (n_confdev <= 0)
         pa_log_debug("No %s for device %s", "_conflictingdevs", device_name);
     else {
-        device->conflicting_devices = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
         ucm_add_devices_to_idxset(device->conflicting_devices, device, verb->devices, devices, n_confdev);
         snd_use_case_free_list(devices, n_confdev);
     }
@@ -518,10 +506,10 @@
     n_suppdev = snd_use_case_get_list(uc_mgr, id, &devices);
     pa_xfree(id);
 
+    device->supported_devices = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
     if (n_suppdev <= 0)
         pa_log_debug("No %s for device %s", "_supporteddevs", device_name);
     else {
-        device->supported_devices = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
         ucm_add_devices_to_idxset(device->supported_devices, device, verb->devices, devices, n_suppdev);
         snd_use_case_free_list(devices, n_suppdev);
     }
@@ -530,10 +518,16 @@
 };
 
 /* Create a property list for this ucm modifier */
-static int ucm_get_modifier_property(pa_alsa_ucm_modifier *modifier, snd_use_case_mgr_t *uc_mgr, const char *modifier_name) {
+static int ucm_get_modifier_property(
+        pa_alsa_ucm_modifier *modifier,
+        snd_use_case_mgr_t *uc_mgr,
+        pa_alsa_ucm_verb *verb,
+        const char *modifier_name) {
     const char *value;
     char *id;
     int i;
+    const char **devices;
+    int n_confdev, n_suppdev;
 
     for (i = 0; itemi.id; i++) {
         int err;
@@ -550,16 +544,28 @@
     }
 
     id = pa_sprintf_malloc("%s/%s", "_conflictingdevs", modifier_name);
-    modifier->n_confdev = snd_use_case_get_list(uc_mgr, id, &modifier->conflicting_devices);
+    n_confdev = snd_use_case_get_list(uc_mgr, id, &devices);
     pa_xfree(id);
-    if (modifier->n_confdev < 0)
+
+    modifier->conflicting_devices = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
+    if (n_confdev <= 0)
         pa_log_debug("No %s for modifier %s", "_conflictingdevs", modifier_name);
+    else {
+        ucm_add_devices_to_idxset(modifier->conflicting_devices, NULL, verb->devices, devices, n_confdev);
+        snd_use_case_free_list(devices, n_confdev);
+    }
 
     id = pa_sprintf_malloc("%s/%s", "_supporteddevs", modifier_name);
-    modifier->n_suppdev = snd_use_case_get_list(uc_mgr, id, &modifier->supported_devices);
+    n_suppdev = snd_use_case_get_list(uc_mgr, id, &devices);
     pa_xfree(id);
-    if (modifier->n_suppdev < 0)
+
+    modifier->supported_devices = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
+    if (n_suppdev <= 0)
         pa_log_debug("No %s for modifier %s", "_supporteddevs", modifier_name);
+    else {
+        ucm_add_devices_to_idxset(modifier->supported_devices, NULL, verb->devices, devices, n_suppdev);
+        snd_use_case_free_list(devices, n_suppdev);
+    }
 
     return 0;
 };
@@ -596,6 +602,74 @@
     return 0;
 };
 
+static long ucm_device_status(pa_alsa_ucm_config *ucm, pa_alsa_ucm_device *dev) {
+    const char *dev_name = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_NAME);
+    char *devstatus;
+    long status = 0;
+
+    if (!ucm->active_verb) {
+        pa_log_error("Failed to get status for UCM device %s: no UCM verb set", dev_name);
+        return -1;
+    }
+
+    devstatus = pa_sprintf_malloc("_devstatus/%s", dev_name);
+    if (snd_use_case_geti(ucm->ucm_mgr, devstatus, &status) < 0) {
+        pa_log_debug("Failed to get status for UCM device %s", dev_name);
+        status = -1;
+    }
+    pa_xfree(devstatus);
+
+    return status;
+}
+
+static int ucm_device_disable(pa_alsa_ucm_config *ucm, pa_alsa_ucm_device *dev) {
+    const char *dev_name = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_NAME);
+
+    if (!ucm->active_verb) {
+        pa_log_error("Failed to disable UCM device %s: no UCM verb set", dev_name);
+        return -1;
+    }
+
+    /* If any of dev's conflicting devices is enabled, trying to disable
+     * dev gives an error despite the fact that it's already disabled.
+     * Check that dev is enabled to avoid this error. */
+    if (ucm_device_status(ucm, dev) == 0) {
+        pa_log_debug("UCM device %s is already disabled", dev_name);
+        return 0;
+    }
+
+    pa_log_debug("Disabling UCM device %s", dev_name);
+    if (snd_use_case_set(ucm->ucm_mgr, "_disdev", dev_name) < 0) {
+        pa_log("Failed to disable UCM device %s", dev_name);
+        return -1;
+    }
+
+    return 0;
+}
+
+static int ucm_device_enable(pa_alsa_ucm_config *ucm, pa_alsa_ucm_device *dev) {
+    const char *dev_name = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_NAME);
+
+    if (!ucm->active_verb) {
+        pa_log_error("Failed to enable UCM device %s: no UCM verb set", dev_name);
+        return -1;
+    }
+
+    /* We don't need to enable devices that are already enabled */
+    if (ucm_device_status(ucm, dev) > 0) {
+        pa_log_debug("UCM device %s is already enabled", dev_name);
+        return 0;
+    }
+
+    pa_log_debug("Enabling UCM device %s", dev_name);
+    if (snd_use_case_set(ucm->ucm_mgr, "_enadev", dev_name) < 0) {
+        pa_log("Failed to enable UCM device %s", dev_name);
+        return -1;
+    }
+
+    return 0;
+}
+
 static int ucm_get_modifiers(pa_alsa_ucm_verb *verb, snd_use_case_mgr_t *uc_mgr) {
     const char **mod_list;
     int num_mod, i;
@@ -626,6 +700,72 @@
     return 0;
 };
 
+static long ucm_modifier_status(pa_alsa_ucm_config *ucm, pa_alsa_ucm_modifier *mod) {
+    const char *mod_name = pa_proplist_gets(mod->proplist, PA_ALSA_PROP_UCM_NAME);
+    char *modstatus;
+    long status = 0;
+
+    if (!ucm->active_verb) {
+        pa_log_error("Failed to get status for UCM modifier %s: no UCM verb set", mod_name);
+        return -1;
+    }
+
+    modstatus = pa_sprintf_malloc("_modstatus/%s", mod_name);
+    if (snd_use_case_geti(ucm->ucm_mgr, modstatus, &status) < 0) {
+        pa_log_debug("Failed to get status for UCM modifier %s", mod_name);
+        status = -1;
+    }
+    pa_xfree(modstatus);
+
+    return status;
+}
+
+static int ucm_modifier_disable(pa_alsa_ucm_config *ucm, pa_alsa_ucm_modifier *mod) {
+    const char *mod_name = pa_proplist_gets(mod->proplist, PA_ALSA_PROP_UCM_NAME);
+
+    if (!ucm->active_verb) {
+        pa_log_error("Failed to disable UCM modifier %s: no UCM verb set", mod_name);
+        return -1;
+    }
+
+    /* We don't need to disable modifiers that are already disabled */
+    if (ucm_modifier_status(ucm, mod) == 0) {
+        pa_log_debug("UCM modifier %s is already disabled", mod_name);
+        return 0;
+    }
+
+    pa_log_debug("Disabling UCM modifier %s", mod_name);
+    if (snd_use_case_set(ucm->ucm_mgr, "_dismod", mod_name) < 0) {
+        pa_log("Failed to disable UCM modifier %s", mod_name);
+        return -1;
+    }
+
+    return 0;
+}
+
+static int ucm_modifier_enable(pa_alsa_ucm_config *ucm, pa_alsa_ucm_modifier *mod) {
+    const char *mod_name = pa_proplist_gets(mod->proplist, PA_ALSA_PROP_UCM_NAME);
+
+    if (!ucm->active_verb) {
+        pa_log_error("Failed to enable UCM modifier %s: no UCM verb set", mod_name);
+        return -1;
+    }
+
+    /* We don't need to enable modifiers that are already enabled */
+    if (ucm_modifier_status(ucm, mod) > 0) {
+        pa_log_debug("UCM modifier %s is already enabled", mod_name);
+        return 0;
+    }
+
+    pa_log_debug("Enabling UCM modifier %s", mod_name);
+    if (snd_use_case_set(ucm->ucm_mgr, "_enamod", mod_name) < 0) {
+        pa_log("Failed to enable UCM modifier %s", mod_name);
+        return -1;
+    }
+
+    return 0;
+}
+
 static void add_role_to_device(pa_alsa_ucm_device *dev, const char *dev_name, const char *role_name, const char *role) {
     const char *cur = pa_proplist_gets(dev->proplist, role_name);
 
@@ -642,27 +782,19 @@
                 role_name));
 }
 
-static void add_media_role(const char *name, pa_alsa_ucm_device *list, const char *role_name, const char *role, bool is_sink) {
-    pa_alsa_ucm_device *d;
-
-    PA_LLIST_FOREACH(d, list) {
-        const char *dev_name = pa_proplist_gets(d->proplist, PA_ALSA_PROP_UCM_NAME);
-
-        if (pa_streq(dev_name, name)) {
-            const char *sink = pa_proplist_gets(d->proplist, PA_ALSA_PROP_UCM_SINK);
-            const char *source = pa_proplist_gets(d->proplist, PA_ALSA_PROP_UCM_SOURCE);
+static void add_media_role(pa_alsa_ucm_device *dev, const char *role_name, const char *role, bool is_sink) {
+    const char *dev_name = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_NAME);
+    const char *sink = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_SINK);
+    const char *source = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_SOURCE);
 
-            if (is_sink && sink)
-                add_role_to_device(d, dev_name, role_name, role);
-            else if (!is_sink && source)
-                add_role_to_device(d, dev_name, role_name, role);
-            break;
-        }
-    }
+    if (is_sink && sink)
+        add_role_to_device(dev, dev_name, role_name, role);
+    else if (!is_sink && source)
+        add_role_to_device(dev, dev_name, role_name, role);
 }
 
 static char *modifier_name_to_role(const char *mod_name, bool *is_sink) {
-    char *sub = NULL, *tmp;
+    char *sub = NULL, *tmp, *pos;
 
     *is_sink = false;
 
@@ -672,26 +804,32 @@
     } else if (pa_startswith(mod_name, "Capture"))
         sub = pa_xstrdup(mod_name + 7);
 
-    if (!sub || !*sub) {
+    pos = sub;
+    while (pos && *pos == ' ') pos++;
+
+    if (!pos || !*pos) {
         pa_xfree(sub);
         pa_log_warn("Can't match media roles for modifier %s", mod_name);
         return NULL;
     }
 
-    tmp = sub;
+    tmp = pos;
 
     do {
         *tmp = tolower(*tmp);
     } while (*(++tmp));
 
-    return sub;
+    tmp = pa_xstrdup(pos);
+    pa_xfree(sub);
+    return tmp;
 }
 
-static void ucm_set_media_roles(pa_alsa_ucm_modifier *modifier, pa_alsa_ucm_device *list, const char *mod_name) {
-    int i;
+static void ucm_set_media_roles(pa_alsa_ucm_modifier *modifier, const char *mod_name) {
+    pa_alsa_ucm_device *dev;
     bool is_sink = false;
     char *sub = NULL;
     const char *role_name;
+    uint32_t idx;
 
     sub = modifier_name_to_role(mod_name, &is_sink);
     if (!sub)
@@ -701,11 +839,11 @@
     modifier->media_role = sub;
 
     role_name = is_sink ? PA_ALSA_PROP_UCM_PLAYBACK_ROLES : PA_ALSA_PROP_UCM_CAPTURE_ROLES;
-    for (i = 0; i < modifier->n_suppdev; i++) {
+    PA_IDXSET_FOREACH(dev, modifier->supported_devices, idx) {
         /* if modifier has no specific pcm, we add role intent to its supported devices */
         if (!pa_proplist_gets(modifier->proplist, PA_ALSA_PROP_UCM_SINK) &&
                 !pa_proplist_gets(modifier->proplist, PA_ALSA_PROP_UCM_SOURCE))
-            add_media_role(modifier->supported_devicesi, list, role_name, sub, is_sink);
+            add_media_role(dev, role_name, sub, is_sink);
     }
 }
 
@@ -713,29 +851,17 @@
     uint32_t idx;
     pa_alsa_ucm_device *d;
 
-    if (dev->conflicting_devices) {
-        PA_IDXSET_FOREACH(d, dev->conflicting_devices, idx) {
-            if (!d->conflicting_devices)
-                d->conflicting_devices = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
-
-            if (pa_idxset_put(d->conflicting_devices, dev, NULL) == 0)
-                pa_log_warn("Add lost conflicting device %s to %s",
-                        pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_NAME),
-                        pa_proplist_gets(d->proplist, PA_ALSA_PROP_UCM_NAME));
-        }
-    }
-
-    if (dev->supported_devices) {
-        PA_IDXSET_FOREACH(d, dev->supported_devices, idx) {
-            if (!d->supported_devices)
-                d->supported_devices = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
+    PA_IDXSET_FOREACH(d, dev->conflicting_devices, idx)
+        if (pa_idxset_put(d->conflicting_devices, dev, NULL) == 0)
+            pa_log_warn("Add lost conflicting device %s to %s",
+                    pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_NAME),
+                    pa_proplist_gets(d->proplist, PA_ALSA_PROP_UCM_NAME));
 
-            if (pa_idxset_put(d->supported_devices, dev, NULL) == 0)
-                pa_log_warn("Add lost supported device %s to %s",
-                        pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_NAME),
-                        pa_proplist_gets(d->proplist, PA_ALSA_PROP_UCM_NAME));
-        }
-    }
+    PA_IDXSET_FOREACH(d, dev->supported_devices, idx)
+        if (pa_idxset_put(d->supported_devices, dev, NULL) == 0)
+            pa_log_warn("Add lost supported device %s to %s",
+                    pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_NAME),
+                    pa_proplist_gets(d->proplist, PA_ALSA_PROP_UCM_NAME));
 }
 
 int pa_alsa_ucm_query_profiles(pa_alsa_ucm_config *ucm, int card_index) {
@@ -787,7 +913,7 @@
         free((void *)value);
     }
 
-    /* get a list of all UCM verbs (profiles) for this card */
+    /* get a list of all UCM verbs for this card */
     num_verbs = snd_use_case_verb_list(ucm->ucm_mgr, &verb_list);
     if (num_verbs < 0) {
         pa_log("UCM verb list not found for %s", card_name);
@@ -876,11 +1002,11 @@
         const char *mod_name = pa_proplist_gets(mod->proplist, PA_ALSA_PROP_UCM_NAME);
 
         /* Modifier properties */
-        ucm_get_modifier_property(mod, uc_mgr, mod_name);
+        ucm_get_modifier_property(mod, uc_mgr, verb, mod_name);
 
         /* Set PA_PROP_DEVICE_INTENDED_ROLES property to devices */
         pa_log_debug("Set media roles for verb %s, modifier %s", verb_name, mod_name);
-        ucm_set_media_roles(mod, verb->devices, mod_name);
+        ucm_set_media_roles(mod, mod_name);
     }
 
     *p_verb = verb;
@@ -899,43 +1025,28 @@
     pa_device_port *port;
     pa_alsa_ucm_port_data *data;
     pa_alsa_ucm_device *dev;
-    const char *eld_mixer_device_name;
     void *state;
-    int idx, eld_device;
 
     PA_HASHMAP_FOREACH(port, hash, state) {
         data = PA_DEVICE_PORT_DATA(port);
-        eld_mixer_device_name = NULL;
-        eld_device = -1;
-        PA_DYNARRAY_FOREACH(dev, data->devices, idx) {
-            if (dev->eld_device >= 0 && dev->eld_mixer_device_name) {
-                if (eld_device >= 0 && eld_device != dev->eld_device) {
-                    pa_log_error("The ELD device is already set!");
-                } else if (eld_mixer_device_name && pa_streq(dev->eld_mixer_device_name, eld_mixer_device_name)) {
-                    pa_log_error("The ELD mixer device is already set (%s, %s)!", dev->eld_mixer_device_name, dev->eld_mixer_device_name);
-                } else {
-                    eld_mixer_device_name = dev->eld_mixer_device_name;
-                    eld_device = dev->eld_device;
-                }
-            }
-        }
-        data->eld_device = eld_device;
+        dev = data->device;
+        data->eld_device = dev->eld_device;
         if (data->eld_mixer_device_name)
             pa_xfree(data->eld_mixer_device_name);
-        data->eld_mixer_device_name = pa_xstrdup(eld_mixer_device_name);
+        data->eld_mixer_device_name = pa_xstrdup(dev->eld_mixer_device_name);
     }
 }
 
-static void update_mixer_paths(pa_hashmap *ports, const char *profile) {
+static void update_mixer_paths(pa_hashmap *ports, const char *verb_name) {
     pa_device_port *port;
     pa_alsa_ucm_port_data *data;
     void *state;
 
     /* select volume controls on ports */
     PA_HASHMAP_FOREACH(port, ports, state) {
-        pa_log_info("Updating mixer path for %s: %s", profile, port->name);
+        pa_log_info("Updating mixer path for %s: %s", verb_name, port->name);
         data = PA_DEVICE_PORT_DATA(port);
-        data->path = pa_hashmap_get(data->paths, profile);
+        data->path = pa_hashmap_get(data->paths, verb_name);
     }
 }
 
@@ -945,39 +1056,29 @@
     pa_alsa_ucm_port_data *data;
     pa_alsa_ucm_device *dev;
     snd_mixer_t *mixer_handle;
-    const char *profile, *mdev, *mdev2;
+    const char *verb_name, *mdev;
     void *state, *state2;
-    int idx;
 
     PA_HASHMAP_FOREACH(port, hash, state) {
         data = PA_DEVICE_PORT_DATA(port);
 
-        mdev = NULL;
-        PA_DYNARRAY_FOREACH(dev, data->devices, idx) {
-            mdev2 = get_mixer_device(dev, is_sink);
-            if (mdev && mdev2 && !pa_streq(mdev, mdev2)) {
-                pa_log_error("Two mixer device names found ('%s', '%s'), using s/w volume", mdev, mdev2);
-                goto fail;
-            }
-            if (mdev2)
-                mdev = mdev2;
-        }
-
+        dev = data->device;
+        mdev = get_mixer_device(dev, is_sink);
         if (mdev == NULL || !(mixer_handle = pa_alsa_open_mixer_by_name(mixers, mdev, true))) {
             pa_log_error("Failed to find a working mixer device (%s).", mdev);
             goto fail;
         }
 
-        PA_HASHMAP_FOREACH_KV(profile, path, data->paths, state2) {
+        PA_HASHMAP_FOREACH_KV(verb_name, path, data->paths, state2) {
             if (pa_alsa_path_probe(path, NULL, mixer_handle, ignore_dB) < 0) {
                 pa_log_warn("Could not probe path: %s, using s/w volume", path->name);
-                pa_hashmap_remove(data->paths, profile);
+                pa_hashmap_remove(data->paths, verb_name);
             } else if (!path->has_volume && !path->has_mute) {
                 pa_log_warn("Path %s is not a volume or mute control", path->name);
-                pa_hashmap_remove(data->paths, profile);
+                pa_hashmap_remove(data->paths, verb_name);
             } else
                 pa_log_debug("Set up h/w %s using '%s' for %s:%s", path->has_volume ? "volume" : "mute",
-                                path->name, profile, port->name);
+                                path->name, verb_name, port->name);
         }
     }
 
@@ -1025,91 +1126,141 @@
     pa_proplist_sets(port->proplist, "device.icon_name", icon);
 }
 
-static void ucm_add_port_combination(
+static char *devset_name(pa_idxset *devices, const char *sep) {
+    int i = 0;
+    int num = pa_idxset_size(devices);
+    pa_alsa_ucm_device *sortednum, *dev;
+    char *dev_names = NULL;
+    char *tmp = NULL;
+    uint32_t idx;
+
+    PA_IDXSET_FOREACH(dev, devices, idx) {
+        sortedi = dev;
+        i++;
+    }
+
+    /* Sort by alphabetical order so as to have a deterministic naming scheme */
+    qsort(&sorted0, num, sizeof(pa_alsa_ucm_device *), pa_alsa_ucm_device_cmp);
+
+    for (i = 0; i < num; i++) {
+        dev = sortedi;
+        const char *dev_name = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_NAME);
+
+        if (!dev_names) {
+            dev_names = pa_xstrdup(dev_name);
+        } else {
+            tmp = pa_sprintf_malloc("%s%s%s", dev_names, sep, dev_name);
+            pa_xfree(dev_names);
+            dev_names = tmp;
+        }
+    }
+
+    return dev_names;
+}
+
+PA_UNUSED static char *devset_description(pa_idxset *devices, const char *sep) {
+    int i = 0;
+    int num = pa_idxset_size(devices);
+    pa_alsa_ucm_device *sortednum, *dev;
+    char *dev_descs = NULL;
+    char *tmp = NULL;
+    uint32_t idx;
+
+    PA_IDXSET_FOREACH(dev, devices, idx) {
+        sortedi = dev;
+        i++;
+    }
+
+    /* Sort by alphabetical order to match devset_name() */
+    qsort(&sorted0, num, sizeof(pa_alsa_ucm_device *), pa_alsa_ucm_device_cmp);
+
+    for (i = 0; i < num; i++) {
+        dev = sortedi;
+        const char *dev_desc = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_DESCRIPTION);
+
+        if (!dev_descs) {
+            dev_descs = pa_xstrdup(dev_desc);
+        } else {
+            tmp = pa_sprintf_malloc("%s%s%s", dev_descs, sep, dev_desc);
+            pa_xfree(dev_descs);
+            dev_descs = tmp;
+        }
+    }
+
+    return dev_descs;
+}
+
+/* If invert is true, uses the formula 1/p = 1/p1 + 1/p2 + ... 1/pn.
+ * This way, the result will always be less than the individual components,
+ * yet higher components will lead to higher result. */
+static unsigned devset_playback_priority(pa_idxset *devices, bool invert) {
+    pa_alsa_ucm_device *dev;
+    uint32_t idx;
+    double priority = 0;
+
+    PA_IDXSET_FOREACH(dev, devices, idx) {
+        if (dev->playback_priority > 0 && invert)
+            priority += 1.0 / dev->playback_priority;
+        else
+            priority += dev->playback_priority;
+    }
+
+    if (priority > 0 && invert)
+        return (unsigned)(1.0 / priority);
+
+    return (unsigned) priority;
+}
+
+static unsigned devset_capture_priority(pa_idxset *devices, bool invert) {
+    pa_alsa_ucm_device *dev;
+    uint32_t idx;
+    double priority = 0;
+
+    PA_IDXSET_FOREACH(dev, devices, idx) {
+        if (dev->capture_priority > 0 && invert)
+            priority += 1.0 / dev->capture_priority;
+        else
+            priority += dev->capture_priority;
+    }
+
+    if (priority > 0 && invert)
+        return (unsigned)(1.0 / priority);
+
+    return (unsigned) priority;
+}
+
+void pa_alsa_ucm_add_port(
         pa_hashmap *hash,
         pa_alsa_ucm_mapping_context *context,
         bool is_sink,
-        pa_alsa_ucm_device **pdevices,
-        int num,
         pa_hashmap *ports,
         pa_card_profile *cp,
         pa_core *core) {
 
     pa_device_port *port;
-    int i;
     unsigned priority;
-    double prio2;
     char *name, *desc;
     const char *dev_name;
     const char *direction;
-    const char *profile;
-    pa_alsa_ucm_device *sortednum, *dev;
+    const char *verb_name;
+    pa_alsa_ucm_device *dev;
     pa_alsa_ucm_port_data *data;
     pa_alsa_ucm_volume *vol;
-    pa_alsa_jack *jack, *jack2;
-    pa_device_port_type_t type, type2;
+    pa_alsa_jack *jack;
+    pa_device_port_type_t type;
     void *state;
 
-    for (i = 0; i < num; i++)
-        sortedi = pdevicesi;
-
-    /* Sort by alphabetical order so as to have a deterministic naming scheme
-     * for combination ports */
-    qsort(&sorted0, num, sizeof(pa_alsa_ucm_device *), pa_alsa_ucm_device_cmp);
+    dev = context->ucm_device;
+    if (!dev)
+        return;
 
-    dev = sorted0;
     dev_name = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_NAME);
-
     name = pa_sprintf_malloc("%s%s", is_sink ? PA_UCM_PRE_TAG_OUTPUT : PA_UCM_PRE_TAG_INPUT, dev_name);
-    desc = num == 1 ? pa_xstrdup(pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_DESCRIPTION))
-            : pa_sprintf_malloc("Combination port for %s", dev_name);
-
+    desc = pa_xstrdup(pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_DESCRIPTION));
     priority = is_sink ? dev->playback_priority : dev->capture_priority;
-    prio2 = (priority == 0 ? 0 : 1.0/priority);
     jack = ucm_get_jack(context->ucm, dev);
     type = dev->type;
 
-    for (i = 1; i < num; i++) {
-        char *tmp;
-
-        dev = sortedi;
-        dev_name = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_NAME);
-
-        tmp = pa_sprintf_malloc("%s+%s", name, dev_name);
-        pa_xfree(name);
-        name = tmp;
-
-        tmp = pa_sprintf_malloc("%s,%s", desc, dev_name);
-        pa_xfree(desc);
-        desc = tmp;
-
-        priority = is_sink ? dev->playback_priority : dev->capture_priority;
-        if (priority != 0 && prio2 > 0)
-            prio2 += 1.0/priority;
-
-        jack2 = ucm_get_jack(context->ucm, dev);
-        if (jack2) {
-            if (jack && jack != jack2)
-                pa_log_warn("Multiple jacks per combined device '%s': '%s' '%s'", name, jack->name, jack2->name);
-            jack = jack2;
-        }
-
-        type2 = dev->type;
-        if (type2 != PA_DEVICE_PORT_TYPE_UNKNOWN) {
-            if (type != PA_DEVICE_PORT_TYPE_UNKNOWN && type != type2)
-                pa_log_warn("Multiple device types per combined device '%s': %d %d", name, type, type2);
-            type = type2;
-        }
-    }
-
-    /* Make combination ports always have lower priority, and use the formula
-       1/p = 1/p1 + 1/p2 + ... 1/pn.
-       This way, the result will always be less than the individual components,
-       yet higher components will lead to higher result. */
-
-    if (num > 1)
-        priority = prio2 > 0 ? 1.0/prio2 : 0;
-
     port = pa_hashmap_get(ports, name);
     if (!port) {
         pa_device_port_new_data port_data;
@@ -1126,38 +1277,33 @@
         pa_device_port_new_data_done(&port_data);
 
         data = PA_DEVICE_PORT_DATA(port);
-        ucm_port_data_init(data, context->ucm, port, pdevices, num);
+        ucm_port_data_init(data, context->ucm, port, dev);
         port->impl_free = ucm_port_data_free;
 
         pa_hashmap_put(ports, port->name, port);
         pa_log_debug("Add port %s: %s", port->name, port->description);
         ucm_add_port_props(port, is_sink);
 
-        if (num == 1) {
-            /* To keep things simple and not worry about stacking controls, we only support hardware volumes on non-combination
-             * ports. */
-            PA_HASHMAP_FOREACH_KV(profile, vol, is_sink ? dev->playback_volumes : dev->capture_volumes, state) {
-                pa_alsa_path *path = pa_alsa_path_synthesize(vol->mixer_elem,
-                                                             is_sink ? PA_ALSA_DIRECTION_OUTPUT : PA_ALSA_DIRECTION_INPUT);
-
-                if (!path)
-                    pa_log_warn("Failed to set up volume control: %s", vol->mixer_elem);
-                else {
-                    if (vol->master_elem) {
-                        pa_alsa_element *e = pa_alsa_element_get(path, vol->master_elem, false);
-                        e->switch_use = PA_ALSA_SWITCH_MUTE;
-                        e->volume_use = PA_ALSA_VOLUME_MERGE;
-                    }
+        PA_HASHMAP_FOREACH_KV(verb_name, vol, is_sink ? dev->playback_volumes : dev->capture_volumes, state) {
+            pa_alsa_path *path = pa_alsa_path_synthesize(vol->mixer_elem,
+                                                         is_sink ? PA_ALSA_DIRECTION_OUTPUT : PA_ALSA_DIRECTION_INPUT);
+
+            if (!path)
+                pa_log_warn("Failed to set up volume control: %s", vol->mixer_elem);
+            else {
+                if (vol->master_elem) {
+                    pa_alsa_element *e = pa_alsa_element_get(path, vol->master_elem, false);
+                    e->switch_use = PA_ALSA_SWITCH_MUTE;
+                    e->volume_use = PA_ALSA_VOLUME_MERGE;
+                }
 
-                    pa_hashmap_put(data->paths, pa_xstrdup(profile), path);
+                pa_hashmap_put(data->paths, pa_xstrdup(verb_name), path);
 
-                    /* Add path also to already created empty path set */
-                    dev = sorted0;
-                    if (is_sink)
-                        pa_hashmap_put(dev->playback_mapping->output_path_set->paths, pa_xstrdup(vol->mixer_elem), path);
-                    else
-                        pa_hashmap_put(dev->capture_mapping->input_path_set->paths, pa_xstrdup(vol->mixer_elem), path);
-                }
+                /* Add path also to already created empty path set */
+                if (is_sink)
+                    pa_hashmap_put(dev->playback_mapping->output_path_set->paths, pa_xstrdup(vol->mixer_elem), path);
+                else
+                    pa_hashmap_put(dev->capture_mapping->input_path_set->paths, pa_xstrdup(vol->mixer_elem), path);
             }
         }
     }
@@ -1178,113 +1324,127 @@
     if (hash) {
         pa_hashmap_put(hash, port->name, port);
     }
+
+    /* ELD devices */
+    set_eld_devices(ports);
 }
 
-static int ucm_port_contains(const char *port_name, const char *dev_name, bool is_sink) {
-    int ret = 0;
-    const char *r;
-    const char *state = NULL;
-    size_t len;
+static bool devset_supports_device(pa_idxset *devices, pa_alsa_ucm_device *dev) {
+    const char *sink, *sink2, *source, *source2;
+    pa_alsa_ucm_device *d;
+    uint32_t idx;
 
-    if (!port_name || !dev_name)
-        return false;
+    pa_assert(devices);
+    pa_assert(dev);
 
-    port_name += is_sink ? strlen(PA_UCM_PRE_TAG_OUTPUT) : strlen(PA_UCM_PRE_TAG_INPUT);
+    /* Can add anything to empty group */
+    if (pa_idxset_isempty(devices))
+        return true;
 
-    while ((r = pa_split_in_place(port_name, "+", &len, &state))) {
-        if (strlen(dev_name) == len && !strncmp(r, dev_name, len)) {
-            ret = 1;
-            break;
-        }
-    }
+    /* Device already selected */
+    if (pa_idxset_contains(devices, dev))
+        return true;
 
-    return ret;
-}
+    /* No conflicting device must already be selected */
+    if (!pa_idxset_isdisjoint(devices, dev->conflicting_devices))
+        return false;
 
-static int ucm_check_conformance(
-        pa_alsa_ucm_mapping_context *context,
-        pa_alsa_ucm_device **pdevices,
-        int dev_num,
-        pa_alsa_ucm_device *dev) {
+    /* No already selected device must be unsupported */
+    if (!pa_idxset_isempty(dev->supported_devices))
+        if (!pa_idxset_issubset(devices, dev->supported_devices))
+           return false;
 
-    uint32_t idx;
-    pa_alsa_ucm_device *d;
-    int i;
+    sink = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_SINK);
+    source = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_SOURCE);
 
-    pa_assert(dev);
+    PA_IDXSET_FOREACH(d, devices, idx) {
+        /* Must not be unsupported by any selected device */
+        if (!pa_idxset_isempty(d->supported_devices))
+            if (!pa_idxset_contains(d->supported_devices, dev))
+                return false;
 
-    pa_log_debug("Check device %s conformance with %d other devices",
-            pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_NAME), dev_num);
-    if (dev_num == 0) {
-        pa_log_debug("First device in combination, number 1");
-        return 1;
-    }
+        /* PlaybackPCM must not be the same as any selected device */
+        sink2 = pa_proplist_gets(d->proplist, PA_ALSA_PROP_UCM_SINK);
+        if (sink && sink2 && pa_streq(sink, sink2))
+            return false;
 
-    if (dev->conflicting_devices) { /* the device defines conflicting devices */
-        PA_IDXSET_FOREACH(d, dev->conflicting_devices, idx) {
-            for (i = 0; i < dev_num; i++) {
-                if (pdevicesi == d) {
-                    pa_log_debug("Conflicting device found");
-                    return 0;
-                }
-            }
-        }
-    } else if (dev->supported_devices) { /* the device defines supported devices */
-        for (i = 0; i < dev_num; i++) {
-            if (!ucm_device_exists(dev->supported_devices, pdevicesi)) {
-                pa_log_debug("Supported device not found");
-                return 0;
-            }
-        }
-    } else { /* not support any other devices */
-        pa_log_debug("Not support any other devices");
-        return 0;
+        /* CapturePCM must not be the same as any selected device */
+        source2 = pa_proplist_gets(d->proplist, PA_ALSA_PROP_UCM_SOURCE);
+        if (source && source2 && pa_streq(source, source2))
+            return false;
     }
 
-    pa_log_debug("Device added to combination, number %d", dev_num + 1);
-    return 1;
+    return true;
 }
 
-static inline pa_alsa_ucm_device *get_next_device(pa_idxset *idxset, uint32_t *idx) {
+/* Iterates nonempty subsets of UCM devices that can be simultaneously
+ * used, including subsets of previously returned subsets. At start,
+ * *state should be NULL. It's not safe to modify the devices argument
+ * until iteration ends. The returned idxsets must be freed by the
+ * caller. */
+static pa_idxset *iterate_device_subsets(pa_idxset *devices, void **state) {
+    uint32_t idx;
     pa_alsa_ucm_device *dev;
 
-    if (*idx == PA_IDXSET_INVALID)
-        dev = pa_idxset_first(idxset, idx);
-    else
-        dev = pa_idxset_next(idxset, idx);
+    pa_assert(devices);
+    pa_assert(state);
 
-    return dev;
-}
+    if (*state == NULL) {
+        /* First iteration, start adding from first device */
+        *state = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
+        dev = pa_idxset_first(devices, &idx);
 
-static void ucm_add_ports_combination(
-        pa_hashmap *hash,
-        pa_alsa_ucm_mapping_context *context,
-        bool is_sink,
-        pa_alsa_ucm_device **pdevices,
-        int dev_num,
-        uint32_t map_index,
-        pa_hashmap *ports,
-        pa_card_profile *cp,
-        pa_core *core) {
+    } else {
+        /* Backtrack the most recent device we added and skip it */
+        dev = pa_idxset_steal_last(*state, NULL);
+        pa_idxset_get_by_data(devices, dev, &idx);
+        if (dev)
+            dev = pa_idxset_next(devices, &idx);
+    }
 
-    pa_alsa_ucm_device *dev;
-    uint32_t idx = map_index;
+    /* Try adding devices we haven't decided on yet */
+    for (; dev; dev = pa_idxset_next(devices, &idx)) {
+        if (devset_supports_device(*state, dev))
+            pa_idxset_put(*state, dev, NULL);
+    }
 
-    if ((dev = get_next_device(context->ucm_devices, &idx)) == NULL)
-        return;
+    if (pa_idxset_isempty(*state)) {
+        /* No more choices to backtrack on, therefore no more subsets to
+         * return after this. Don't return the empty set, instead clean
+         * up and end iteration. */
+        pa_idxset_free(*state, NULL);
+        *state = NULL;
+        return NULL;
+    }
+
+    return pa_idxset_copy(*state, NULL);
+}
 
-    /* check if device at map_index can combine with existing devices combination */
-    if (ucm_check_conformance(context, pdevices, dev_num, dev)) {
-        /* add device at map_index to devices combination */
-        pdevicesdev_num = dev;
-        /* add current devices combination as a new port */
-        ucm_add_port_combination(hash, context, is_sink, pdevices, dev_num + 1, ports, cp, core);
-        /* try more elements combination */
-        ucm_add_ports_combination(hash, context, is_sink, pdevices, dev_num + 1, idx, ports, cp, core);
+/* This a wrapper around iterate_device_subsets() that only returns the
+ * biggest possible groups and not any of their subsets. */
+static pa_idxset *iterate_maximal_device_subsets(pa_idxset *devices, void **state) {
+    uint32_t idx;
+    pa_alsa_ucm_device *dev;
+    pa_idxset *subset;
+
+    pa_assert(devices);
+    pa_assert(state);
+
+    subset = iterate_device_subsets(devices, state);
+    if (!subset)
+        return subset;
+
+    /* Skip this group if it's incomplete, by checking if we can add any
+     * other device. If we can, this iteration is a subset of another
+     * group that we already returned or eventually return. */
+    PA_IDXSET_FOREACH(dev, devices, idx) {
+        if (!pa_idxset_contains(subset, dev) && devset_supports_device(subset, dev)) {
+            pa_idxset_free(subset, NULL);
+            return iterate_maximal_device_subsets(devices, state);
+        }
     }
 
-    /* try other device with current elements number */
-    ucm_add_ports_combination(hash, context, is_sink, pdevices, dev_num, idx, ports, cp, core);
+    return subset;
 }
 
 static char* merge_roles(const char *cur, const char *add) {
@@ -1316,28 +1476,6 @@
     return ret;
 }
 
-void pa_alsa_ucm_add_ports_combination(
-        pa_hashmap *p,
-        pa_alsa_ucm_mapping_context *context,
-        bool is_sink,
-        pa_hashmap *ports,
-        pa_card_profile *cp,
-        pa_core *core) {
-
-    pa_alsa_ucm_device **pdevices;
-
-    pa_assert(context->ucm_devices);
-
-    if (pa_idxset_size(context->ucm_devices) > 0) {
-        pdevices = pa_xnew(pa_alsa_ucm_device *, pa_idxset_size(context->ucm_devices));
-        ucm_add_ports_combination(p, context, is_sink, pdevices, 0, PA_IDXSET_INVALID, ports, cp, core);
-        pa_xfree(pdevices);
-    }
-
-    /* ELD devices */
-    set_eld_devices(ports);
-}
-
 void pa_alsa_ucm_add_ports(
         pa_hashmap **p,
         pa_proplist *proplist,
@@ -1347,7 +1485,6 @@
         snd_pcm_t *pcm_handle,
         bool ignore_dB) {
 
-    uint32_t idx;
     char *merged_roles;
     const char *role_name = is_sink ? PA_ALSA_PROP_UCM_PLAYBACK_ROLES : PA_ALSA_PROP_UCM_CAPTURE_ROLES;
     pa_alsa_ucm_device *dev;
@@ -1358,34 +1495,39 @@
     pa_assert(*p);
 
     /* add ports first */
-    pa_alsa_ucm_add_ports_combination(*p, context, is_sink, card->ports, NULL, card->core);
+    pa_alsa_ucm_add_port(*p, context, is_sink, card->ports, NULL, card->core);
 
     /* now set up volume paths if any */
     probe_volumes(*p, is_sink, pcm_handle, context->ucm->mixers, ignore_dB);
 
-    /* probe_volumes() removes per-profile paths from ports if probing them
-     * fails. The path for the current profile is cached in
+    /* probe_volumes() removes per-verb paths from ports if probing them
+     * fails. The path for the current verb is cached in
      * pa_alsa_ucm_port_data.path, which is not cleared by probe_volumes() if
      * the path gets removed, so we have to call update_mixer_paths() here to
      * unset the cached path if needed. */
-    if (card->card.active_profile_index < card->card.n_profiles)
-        update_mixer_paths(*p, card->card.profilescard->card.active_profile_index->name);
+    if (context->ucm->active_verb) {
+        const char *verb_name;
+        verb_name = pa_proplist_gets(context->ucm->active_verb->proplist, PA_ALSA_PROP_UCM_NAME);
+        update_mixer_paths(*p, verb_name);
+    }
 
     /* then set property PA_PROP_DEVICE_INTENDED_ROLES */
     merged_roles = pa_xstrdup(pa_proplist_gets(proplist, PA_PROP_DEVICE_INTENDED_ROLES));
-    PA_IDXSET_FOREACH(dev, context->ucm_devices, idx) {
+
+    dev = context->ucm_device;
+    if (dev) {
         const char *roles = pa_proplist_gets(dev->proplist, role_name);
         tmp = merge_roles(merged_roles, roles);
         pa_xfree(merged_roles);
         merged_roles = tmp;
     }
 
-    if (context->ucm_modifiers)
-        PA_IDXSET_FOREACH(mod, context->ucm_modifiers, idx) {
-            tmp = merge_roles(merged_roles, mod->media_role);
-            pa_xfree(merged_roles);
-            merged_roles = tmp;
-        }
+    mod = context->ucm_modifier;
+    if (mod) {
+        tmp = merge_roles(merged_roles, mod->media_role);
+        pa_xfree(merged_roles);
+        merged_roles = tmp;
+    }
 
     if (merged_roles)
         pa_proplist_sets(proplist, PA_PROP_DEVICE_INTENDED_ROLES, merged_roles);
@@ -1395,85 +1537,92 @@
 }
 
 /* Change UCM verb and device to match selected card profile */
-int pa_alsa_ucm_set_profile(pa_alsa_ucm_config *ucm, pa_card *card, const char *new_profile, const char *old_profile) {
+int pa_alsa_ucm_set_profile(pa_alsa_ucm_config *ucm, pa_card *card, pa_alsa_profile *new_profile, pa_alsa_profile *old_profile) {
     int ret = 0;
-    const char *profile;
+    const char *verb_name, *profile_name;
     pa_alsa_ucm_verb *verb;
+    pa_alsa_mapping *map;
+    uint32_t idx;
 
     if (new_profile == old_profile)
-        return ret;
-    else if (new_profile == NULL || old_profile == NULL)
-        profile = new_profile ? new_profile : SND_USE_CASE_VERB_INACTIVE;
-    else if (!pa_streq(new_profile, old_profile))
-        profile = new_profile;
-    else
-        return ret;
+        return 0;
 
-    /* change verb */
-    pa_log_info("Set UCM verb to %s", profile);
-    if ((ret = snd_use_case_set(ucm->ucm_mgr, "_verb", profile)) < 0) {
-        pa_log("Failed to set verb %s: %s", profile, snd_strerror(ret));
+    if (new_profile == NULL) {
+        verb = NULL;
+        profile_name = SND_USE_CASE_VERB_INACTIVE;
+        verb_name = SND_USE_CASE_VERB_INACTIVE;
+    } else {
+        verb = new_profile->ucm_context.verb;
+        profile_name = new_profile->name;
+        verb_name = pa_proplist_gets(verb->proplist, PA_ALSA_PROP_UCM_NAME);
     }
 
-    /* find active verb */
-    ucm->active_verb = NULL;
-    PA_LLIST_FOREACH(verb, ucm->verbs) {
-        const char *verb_name;
-        verb_name = pa_proplist_gets(verb->proplist, PA_ALSA_PROP_UCM_NAME);
-        if (pa_streq(verb_name, profile)) {
-            ucm->active_verb = verb;
-            break;
+    pa_log_info("Set profile to %s", profile_name);
+    if (ucm->active_verb != verb) {
+        /* change verb */
+        pa_log_info("Set UCM verb to %s", verb_name);
+        if ((snd_use_case_set(ucm->ucm_mgr, "_verb", verb_name)) < 0) {
+            pa_log("Failed to set verb %s", verb_name);
+            ret = -1;
         }
+
+    } else if (ucm->active_verb) {
+        /* Disable modifiers not in new profile. Has to be done before
+         * devices, because _dismod fails if a modifier's supported
+         * devices are disabled. */
+        PA_IDXSET_FOREACH(map, old_profile->input_mappings, idx)
+            if (new_profile && !pa_idxset_contains(new_profile->input_mappings, map))
+                if (map->ucm_context.ucm_modifier && ucm_modifier_disable(ucm, map->ucm_context.ucm_modifier) < 0)
+                    ret = -1;
+
+        PA_IDXSET_FOREACH(map, old_profile->output_mappings, idx)
+            if (new_profile && !pa_idxset_contains(new_profile->output_mappings, map))
+                if (map->ucm_context.ucm_modifier && ucm_modifier_disable(ucm, map->ucm_context.ucm_modifier) < 0)
+                    ret = -1;
+
+        /* Disable devices not in new profile */
+        PA_IDXSET_FOREACH(map, old_profile->input_mappings, idx)
+            if (new_profile && !pa_idxset_contains(new_profile->input_mappings, map))
+                if (map->ucm_context.ucm_device && ucm_device_disable(ucm, map->ucm_context.ucm_device) < 0)
+                    ret = -1;
+
+        PA_IDXSET_FOREACH(map, old_profile->output_mappings, idx)
+            if (new_profile && !pa_idxset_contains(new_profile->output_mappings, map))
+                if (map->ucm_context.ucm_device && ucm_device_disable(ucm, map->ucm_context.ucm_device) < 0)
+                    ret = -1;
     }
+    ucm->active_verb = verb;
+
+    update_mixer_paths(card->ports, verb_name);
 
-    update_mixer_paths(card->ports, profile);
     return ret;
 }
 
-int pa_alsa_ucm_set_port(pa_alsa_ucm_mapping_context *context, pa_device_port *port, bool is_sink) {
-    int i;
-    int ret = 0;
+int pa_alsa_ucm_set_port(pa_alsa_ucm_mapping_context *context, pa_device_port *port) {
     pa_alsa_ucm_config *ucm;
-    const char **enable_devs;
-    int enable_num = 0;
-    uint32_t idx;
     pa_alsa_ucm_device *dev;
+    pa_alsa_ucm_port_data *data;
+    const char *dev_name, *ucm_dev_name;
 
     pa_assert(context && context->ucm);
 
     ucm = context->ucm;
     pa_assert(ucm->ucm_mgr);
 
-    enable_devs = pa_xnew(const char *, pa_idxset_size(context->ucm_devices));
-
-    /* first disable then enable */
-    PA_IDXSET_FOREACH(dev, context->ucm_devices, idx) {
-        const char *dev_name = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_NAME);
-
-        if (ucm_port_contains(port->name, dev_name, is_sink))
-            enable_devsenable_num++ = dev_name;
-        else {
-            pa_log_debug("Disable ucm device %s", dev_name);
-            if (snd_use_case_set(ucm->ucm_mgr, "_disdev", dev_name) > 0) {
-                pa_log("Failed to disable ucm device %s", dev_name);
-                ret = -1;
-                break;
-            }
-        }
-    }
+    data = PA_DEVICE_PORT_DATA(port);
+    dev = data->device;
+    pa_assert(dev);
 
-    for (i = 0; i < enable_num; i++) {
-        pa_log_debug("Enable ucm device %s", enable_devsi);
-        if (snd_use_case_set(ucm->ucm_mgr, "_enadev", enable_devsi) < 0) {
-            pa_log("Failed to enable ucm device %s", enable_devsi);
-            ret = -1;
-            break;
+    if (context->ucm_device) {
+        dev_name = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_NAME);
+        ucm_dev_name = pa_proplist_gets(context->ucm_device->proplist, PA_ALSA_PROP_UCM_NAME);
+        if (!pa_streq(dev_name, ucm_dev_name)) {
+            pa_log_error("Failed to set port %s with wrong UCM context: %s", dev_name, ucm_dev_name);
+            return -1;
         }
     }
 
-    pa_xfree(enable_devs);
-
-    return ret;
+    return ucm_device_enable(ucm, dev);
 }
 
 static void ucm_add_mapping(pa_alsa_profile *p, pa_alsa_mapping *m) {
@@ -1509,7 +1658,7 @@
     const char *new_desc, *mdev;
     bool is_sink = m->direction == PA_ALSA_DIRECTION_OUTPUT;
 
-    pa_idxset_put(m->ucm_context.ucm_devices, device, NULL);
+    m->ucm_context.ucm_device = device;
 
     new_desc = pa_proplist_gets(device->proplist, PA_ALSA_PROP_UCM_DESCRIPTION);
     cur_desc = m->description;
@@ -1538,7 +1687,7 @@
     const char *new_desc, *mod_name, *channel_str;
     uint32_t channels = 0;
 
-    pa_idxset_put(m->ucm_context.ucm_modifiers, modifier, NULL);
+    m->ucm_context.ucm_modifier = modifier;
 
     new_desc = pa_proplist_gets(modifier->proplist, PA_ALSA_PROP_UCM_DESCRIPTION);
     cur_desc = m->description;
@@ -1579,17 +1728,11 @@
         pa_channel_map_init(&m->channel_map);
 }
 
-static pa_alsa_mapping* ucm_alsa_mapping_get(pa_alsa_ucm_config *ucm, pa_alsa_profile_set *ps, const char *verb_name, const char *device_str, bool is_sink) {
+static pa_alsa_mapping* ucm_alsa_mapping_get(pa_alsa_ucm_config *ucm, pa_alsa_profile_set *ps, const char *verb_name, const char *ucm_name, bool is_sink) {
     pa_alsa_mapping *m;
     char *mapping_name;
-    size_t ucm_alibpref_len = 0;
-
-    /* find private alsa-lib's configuration device prefix */
 
-    if (ucm->alib_prefix && pa_startswith(device_str, ucm->alib_prefix))
-        ucm_alibpref_len = strlen(ucm->alib_prefix);
-
-    mapping_name = pa_sprintf_malloc("Mapping %s: %s: %s", verb_name, device_str + ucm_alibpref_len, is_sink ? "sink" : "source");
+    mapping_name = pa_sprintf_malloc("Mapping %s: %s: %s", verb_name, ucm_name, is_sink ? "sink" : "source");
 
     m = pa_alsa_mapping_get(ps, mapping_name);
 
@@ -1604,7 +1747,6 @@
 static int ucm_create_mapping_direction(
         pa_alsa_ucm_config *ucm,
         pa_alsa_profile_set *ps,
-        pa_alsa_profile *p,
         pa_alsa_ucm_device *device,
         const char *verb_name,
         const char *device_name,
@@ -1614,7 +1756,7 @@
     pa_alsa_mapping *m;
     unsigned priority, rate, channels;
 
-    m = ucm_alsa_mapping_get(ucm, ps, verb_name, device_str, is_sink);
+    m = ucm_alsa_mapping_get(ucm, ps, verb_name, device_name, is_sink);
 
     if (!m)
         return -1;
@@ -1625,8 +1767,7 @@
     rate = is_sink ? device->playback_rate : device->capture_rate;
     channels = is_sink ? device->playback_channels : device->capture_channels;
 
-    if (!m->ucm_context.ucm_devices) {   /* new mapping */
-        m->ucm_context.ucm_devices = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
+    if (!m->ucm_context.ucm_device) {   /* new mapping */
         m->ucm_context.ucm = ucm;
         m->ucm_context.direction = is_sink ? PA_DIRECTION_OUTPUT : PA_DIRECTION_INPUT;
 
@@ -1634,7 +1775,6 @@
         m->device_strings0 = pa_xstrdup(device_str);
         m->direction = is_sink ? PA_ALSA_DIRECTION_OUTPUT : PA_ALSA_DIRECTION_INPUT;
 
-        ucm_add_mapping(p, m);
         if (rate)
             m->sample_spec.rate = rate;
         pa_channel_map_init_extend(&m->channel_map, channels, PA_CHANNEL_MAP_ALSA);
@@ -1656,7 +1796,6 @@
 static int ucm_create_mapping_for_modifier(
         pa_alsa_ucm_config *ucm,
         pa_alsa_profile_set *ps,
-        pa_alsa_profile *p,
         pa_alsa_ucm_modifier *modifier,
         const char *verb_name,
         const char *mod_name,
@@ -1665,16 +1804,14 @@
 
     pa_alsa_mapping *m;
 
-    m = ucm_alsa_mapping_get(ucm, ps, verb_name, device_str, is_sink);
+    m = ucm_alsa_mapping_get(ucm, ps, verb_name, mod_name, is_sink);
 
     if (!m)
         return -1;
 
     pa_log_info("UCM mapping: %s modifier %s", m->name, mod_name);
 
-    if (!m->ucm_context.ucm_devices && !m->ucm_context.ucm_modifiers) {   /* new mapping */
-        m->ucm_context.ucm_devices = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
-        m->ucm_context.ucm_modifiers = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
+    if (!m->ucm_context.ucm_device && !m->ucm_context.ucm_modifier) {   /* new mapping */
         m->ucm_context.ucm = ucm;
         m->ucm_context.direction = is_sink ? PA_DIRECTION_OUTPUT : PA_DIRECTION_INPUT;
 
@@ -1683,10 +1820,7 @@
         m->direction = is_sink ? PA_ALSA_DIRECTION_OUTPUT : PA_ALSA_DIRECTION_INPUT;
         /* Modifier sinks should not be routed to by default */
         m->priority = 0;
-
-        ucm_add_mapping(p, m);
-    } else if (!m->ucm_context.ucm_modifiers) /* share pcm with device */
-        m->ucm_context.ucm_modifiers = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
+    }
 
     alsa_mapping_add_ucm_modifier(m, modifier);
 
@@ -1696,7 +1830,6 @@
 static int ucm_create_mapping(
         pa_alsa_ucm_config *ucm,
         pa_alsa_profile_set *ps,
-        pa_alsa_profile *p,
         pa_alsa_ucm_device *device,
         const char *verb_name,
         const char *device_name,
@@ -1711,9 +1844,9 @@
     }
 
     if (sink)
-        ret = ucm_create_mapping_direction(ucm, ps, p, device, verb_name, device_name, sink, true);
+        ret = ucm_create_mapping_direction(ucm, ps, device, verb_name, device_name, sink, true);
     if (ret == 0 && source)
-        ret = ucm_create_mapping_direction(ucm, ps, p, device, verb_name, device_name, source, false);
+        ret = ucm_create_mapping_direction(ucm, ps, device, verb_name, device_name, source, false);
 
     return ret;
 }
@@ -1786,27 +1919,28 @@
         pa_alsa_ucm_config *ucm,
         pa_alsa_profile_set *ps,
         pa_alsa_ucm_verb *verb,
-        const char *verb_name,
-        const char *verb_desc) {
+        pa_idxset *mappings,
+        const char *profile_name,
+        const char *profile_desc,
+        unsigned int profile_priority) {
 
     pa_alsa_profile *p;
-    pa_alsa_ucm_device *dev;
-    pa_alsa_ucm_modifier *mod;
-    int i = 0;
-    const char *name, *sink, *source;
-    unsigned int priority;
+    pa_alsa_mapping *map;
+    uint32_t idx;
 
     pa_assert(ps);
 
-    if (pa_hashmap_get(ps->profiles, verb_name)) {
-        pa_log("Verb %s already exists", verb_name);
+    if (pa_hashmap_get(ps->profiles, profile_name)) {
+        pa_log("Profile %s already exists", profile_name);
         return -1;
     }
 
     p = pa_xnew0(pa_alsa_profile, 1);
     p->profile_set = ps;
-    p->name = pa_xstrdup(verb_name);
-    p->description = pa_xstrdup(verb_desc);
+    p->name = pa_xstrdup(profile_name);
+    p->description = pa_xstrdup(profile_desc);
+    p->priority = profile_priority;
+    p->ucm_context.verb = verb;
 
     p->output_mappings = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
     p->input_mappings = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
@@ -1814,10 +1948,36 @@
     p->supported = true;
     pa_hashmap_put(ps->profiles, p->name, p);
 
+    PA_IDXSET_FOREACH(map, mappings, idx)
+        ucm_add_mapping(p, map);
+
+    pa_alsa_profile_dump(p);
+
+    return 0;
+}
+
+static int ucm_create_verb_profiles(
+        pa_alsa_ucm_config *ucm,
+        pa_alsa_profile_set *ps,
+        pa_alsa_ucm_verb *verb,
+        const char *verb_name,
+        const char *verb_desc) {
+
+    pa_idxset *verb_devices, *p_devices, *p_mappings;
+    pa_alsa_ucm_device *dev;
+    pa_alsa_ucm_modifier *mod;
+    int i = 0;
+    int n_profiles = 0;
+    const char *name, *sink, *source;
+    char *p_name, *p_desc, *tmp;
+    unsigned int verb_priority, p_priority;
+    uint32_t idx;
+    void *state = NULL;
+
     /* TODO: get profile priority from policy management */
-    priority = verb->priority;
+    verb_priority = verb->priority;
 
-    if (priority == 0) {
+    if (verb_priority == 0) {
         char *verb_cmp, *c;
         c = verb_cmp = pa_xstrdup(verb_name);
         while (*c) {
@@ -1826,15 +1986,13 @@
         }
         for (i = 0; verb_infoi.id; i++) {
             if (strcasecmp(verb_infoi.id, verb_cmp) == 0) {
-                priority = verb_infoi.priority;
+                verb_priority = verb_infoi.priority;
                 break;
             }
         }
         pa_xfree(verb_cmp);
     }
 
-    p->priority = priority;
-
     PA_LLIST_FOREACH(dev, verb->devices) {
         pa_alsa_jack *jack;
         const char *jack_hw_mute;
@@ -1844,7 +2002,7 @@
         sink = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_SINK);
         source = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_SOURCE);
 
-        ucm_create_mapping(ucm, ps, p, dev, verb_name, name, sink, source);
+        ucm_create_mapping(ucm, ps, dev, verb_name, name, sink, source);
 
         jack = ucm_get_jack(ucm, dev);
         if (jack)
@@ -1895,12 +2053,74 @@
         source = pa_proplist_gets(mod->proplist, PA_ALSA_PROP_UCM_SOURCE);
 
         if (sink)
-            ucm_create_mapping_for_modifier(ucm, ps, p, mod, verb_name, name, sink, true);
+            ucm_create_mapping_for_modifier(ucm, ps, mod, verb_name, name, sink, true);
         else if (source)
-            ucm_create_mapping_for_modifier(ucm, ps, p, mod, verb_name, name, source, false);
+            ucm_create_mapping_for_modifier(ucm, ps, mod, verb_name, name, source, false);
     }
 
-    pa_alsa_profile_dump(p);
+    verb_devices = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
+    PA_LLIST_FOREACH(dev, verb->devices)
+        pa_idxset_put(verb_devices, dev, NULL);
+
+    while ((p_devices = iterate_maximal_device_subsets(verb_devices, &state))) {
+        p_mappings = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
+
+        /* Add the mappings that include our selected devices */
+        PA_IDXSET_FOREACH(dev, p_devices, idx) {
+            if (dev->playback_mapping)
+                pa_idxset_put(p_mappings, dev->playback_mapping, NULL);
+            if (dev->capture_mapping)
+                pa_idxset_put(p_mappings, dev->capture_mapping, NULL);
+        }
+
+        /* Add mappings only for the modifiers that can work with our
+         * device selection */
+        PA_LLIST_FOREACH(mod, verb->modifiers)
+            if (pa_idxset_isempty(mod->supported_devices) || pa_idxset_issubset(mod->supported_devices, p_devices))
+                if (pa_idxset_isdisjoint(mod->conflicting_devices, p_devices)) {
+                    if (mod->playback_mapping)
+                        pa_idxset_put(p_mappings, mod->playback_mapping, NULL);
+                    if (mod->capture_mapping)
+                        pa_idxset_put(p_mappings, mod->capture_mapping, NULL);
+                }
+
+        /* If we'll have multiple profiles for this verb, their names
+         * must be unique. Use a list of chosen devices to disambiguate
+         * them. If the profile contains all devices of a verb, we'll
+         * generate only onle profile whose name should be the verb
+         * name. GUIs usually show the profile description instead of
+         * the name, add the device names to those as well. */
+        tmp = devset_name(p_devices, ", ");
+        if (pa_idxset_equals(p_devices, verb_devices)) {
+            p_name = pa_xstrdup(verb_name);
+            p_desc = pa_xstrdup(verb_desc);
+        } else {
+            p_name = pa_sprintf_malloc("%s (%s)", verb_name, tmp);
+            p_desc = pa_sprintf_malloc("%s (%s)", verb_desc, tmp);
+        }
+
+        /* Make sure profiles with higher-priority devices are
+         * prioritized. */
+        p_priority = verb_priority + devset_playback_priority(p_devices, false) + devset_capture_priority(p_devices, false);
+
+        if (ucm_create_profile(ucm, ps, verb, p_mappings, p_name, p_desc, p_priority) == 0) {
+            pa_log_debug("Created profile %s for UCM verb %s", p_name, verb_name);
+            n_profiles++;
+        }
+
+        pa_xfree(tmp);
+        pa_xfree(p_name);
+        pa_xfree(p_desc);
+        pa_idxset_free(p_mappings, NULL);
+        pa_idxset_free(p_devices, NULL);
+    }
+
+    pa_idxset_free(verb_devices, NULL);
+
+    if (n_profiles == 0) {
+        pa_log("UCM verb %s created no profiles", verb_name);
+        return -1;
+    }
 
     return 0;
 }
@@ -1909,7 +2129,6 @@
 {
     pa_alsa_ucm_mapping_context *context = &m->ucm_context;
     pa_alsa_ucm_device *dev;
-    uint32_t idx;
     char *mdev, *alib_prefix;
     snd_pcm_info_t *info;
     int pcm_card, pcm_device;
@@ -1925,13 +2144,12 @@
 
     alib_prefix = context->ucm->alib_prefix;
 
-    PA_IDXSET_FOREACH(dev, context->ucm_devices, idx) {
-       mdev = pa_sprintf_malloc("%shw:%i", alib_prefix ? alib_prefix : "", pcm_card);
-       if (mdev == NULL)
-           continue;
-       dev->eld_mixer_device_name = mdev;
-       dev->eld_device = pcm_device;
-    }
+    dev = context->ucm_device;
+    mdev = pa_sprintf_malloc("%shw:%i", alib_prefix ? alib_prefix : "", pcm_card);
+    if (mdev == NULL)
+        return;
+    dev->eld_mixer_device_name = mdev;
+    dev->eld_device = pcm_device;
 }
 
 static snd_pcm_t* mapping_open_pcm(pa_alsa_ucm_config *ucm, pa_alsa_mapping *m, int mode) {
@@ -1953,7 +2171,7 @@
     try_buffer_size = ucm->default_n_fragments * try_period_size;
 
     pcm = pa_alsa_open_by_device_string(m->device_strings0, NULL, &try_ss,
-            &try_map, mode, &try_period_size, &try_buffer_size, 0, NULL, NULL, exact_channels);
+            &try_map, mode, &try_period_size, &try_buffer_size, 0, NULL, NULL, NULL, NULL, exact_channels);
 
     if (pcm) {
         if (!exact_channels)
@@ -1995,38 +2213,39 @@
     snd_mixer_t *mixer_handle;
     pa_alsa_ucm_mapping_context *context = &m->ucm_context;
     pa_alsa_ucm_device *dev;
-    uint32_t idx;
+    bool has_control;
 
-    PA_IDXSET_FOREACH(dev, context->ucm_devices, idx) {
-        bool has_control;
-
-        if (!dev->jack || !dev->jack->mixer_device_name)
-            continue;
-
-        mixer_handle = pa_alsa_open_mixer_by_name(mixers, dev->jack->mixer_device_name, true);
-        if (!mixer_handle) {
-            pa_log_error("Unable to determine open mixer device '%s' for jack %s", dev->jack->mixer_device_name, dev->jack->name);
-            continue;
-        }
+    dev = context->ucm_device;
+    if (!dev->jack || !dev->jack->mixer_device_name)
+        return;
 
-        has_control = pa_alsa_mixer_find_card(mixer_handle, &dev->jack->alsa_id, 0) != NULL;
-        pa_alsa_jack_set_has_control(dev->jack, has_control);
-        pa_log_info("UCM jack %s has_control=%d", dev->jack->name, dev->jack->has_control);
+    mixer_handle = pa_alsa_open_mixer_by_name(mixers, dev->jack->mixer_device_name, true);
+    if (!mixer_handle) {
+        pa_log_error("Unable to determine open mixer device '%s' for jack %s", dev->jack->mixer_device_name, dev->jack->name);
+        return;
     }
+
+    has_control = pa_alsa_mixer_find_card(mixer_handle, &dev->jack->alsa_id, 0) != NULL;
+    pa_alsa_jack_set_has_control(dev->jack, has_control);
+    pa_log_info("UCM jack %s has_control=%d", dev->jack->name, dev->jack->has_control);
 }
 
 static void ucm_probe_profile_set(pa_alsa_ucm_config *ucm, pa_alsa_profile_set *ps) {
     void *state;
     pa_alsa_profile *p;
     pa_alsa_mapping *m;
+    const char *verb_name;
     uint32_t idx;
 
     PA_HASHMAP_FOREACH(p, ps->profiles, state) {
+        pa_log_info("Probing profile %s", p->name);
+
         /* change verb */
-        pa_log_info("Set ucm verb to %s", p->name);
+        verb_name = pa_proplist_gets(p->ucm_context.verb->proplist, PA_ALSA_PROP_UCM_NAME);
+        pa_log_info("Set ucm verb to %s", verb_name);
 
-        if ((snd_use_case_set(ucm->ucm_mgr, "_verb", p->name)) < 0) {
-            pa_log("Failed to set verb %s", p->name);
+        if ((snd_use_case_set(ucm->ucm_mgr, "_verb", verb_name)) < 0) {
+            pa_log("Failed to set verb %s", verb_name);
             p->supported = false;
             continue;
         }
@@ -2096,7 +2315,7 @@
                                        (pa_free_cb_t) pa_alsa_profile_free);
     ps->decibel_fixes = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
 
-    /* create a profile for each verb */
+    /* create profiles for each verb */
     PA_LLIST_FOREACH(verb, ucm->verbs) {
         const char *verb_name;
         const char *verb_desc;
@@ -2108,7 +2327,7 @@
             continue;
         }
 
-        ucm_create_profile(ucm, ps, verb, verb_name, verb_desc);
+        ucm_create_verb_profiles(ucm, ps, verb, verb_name, verb_desc);
     }
 
     ucm_probe_profile_set(ucm, ps);
@@ -2137,10 +2356,8 @@
 
         pa_proplist_free(di->proplist);
 
-        if (di->conflicting_devices)
-            pa_idxset_free(di->conflicting_devices, NULL);
-        if (di->supported_devices)
-            pa_idxset_free(di->supported_devices, NULL);
+        pa_idxset_free(di->conflicting_devices, NULL);
+        pa_idxset_free(di->supported_devices, NULL);
 
         pa_xfree(di->eld_mixer_device_name);
 
@@ -2150,10 +2367,8 @@
     PA_LLIST_FOREACH_SAFE(mi, mn, verb->modifiers) {
         PA_LLIST_REMOVE(pa_alsa_ucm_modifier, verb->modifiers, mi);
         pa_proplist_free(mi->proplist);
-        if (mi->n_suppdev > 0)
-            snd_use_case_free_list(mi->supported_devices, mi->n_suppdev);
-        if (mi->n_confdev > 0)
-            snd_use_case_free_list(mi->conflicting_devices, mi->n_confdev);
+        pa_idxset_free(mi->conflicting_devices, NULL);
+        pa_idxset_free(mi->supported_devices, NULL);
         pa_xfree(mi->media_role);
         pa_xfree(mi);
     }
@@ -2201,29 +2416,22 @@
 void pa_alsa_ucm_mapping_context_free(pa_alsa_ucm_mapping_context *context) {
     pa_alsa_ucm_device *dev;
     pa_alsa_ucm_modifier *mod;
-    uint32_t idx;
 
-    if (context->ucm_devices) {
+    dev = context->ucm_device;
+    if (dev) {
         /* clear ucm device pointer to mapping */
-        PA_IDXSET_FOREACH(dev, context->ucm_devices, idx) {
-            if (context->direction == PA_DIRECTION_OUTPUT)
-                dev->playback_mapping = NULL;
-            else
-                dev->capture_mapping = NULL;
-        }
-
-        pa_idxset_free(context->ucm_devices, NULL);
+        if (context->direction == PA_DIRECTION_OUTPUT)
+            dev->playback_mapping = NULL;
+        else
+            dev->capture_mapping = NULL;
     }
 
-    if (context->ucm_modifiers) {
-        PA_IDXSET_FOREACH(mod, context->ucm_modifiers, idx) {
-            if (context->direction == PA_DIRECTION_OUTPUT)
-                mod->playback_mapping = NULL;
-            else
-                mod->capture_mapping = NULL;
-        }
-
-        pa_idxset_free(context->ucm_modifiers, NULL);
+    mod = context->ucm_modifier;
+    if (mod) {
+        if (context->direction == PA_DIRECTION_OUTPUT)
+            mod->playback_mapping = NULL;
+        else
+            mod->capture_mapping = NULL;
     }
 }
 
@@ -2237,12 +2445,7 @@
     PA_LLIST_FOREACH(mod, ucm->active_verb->modifiers) {
         if ((mod->action_direction == dir) && (pa_streq(mod->media_role, role))) {
             if (mod->enabled_counter == 0) {
-                const char *mod_name = pa_proplist_gets(mod->proplist, PA_ALSA_PROP_UCM_NAME);
-
-                pa_log_info("Enable ucm modifier %s", mod_name);
-                if (snd_use_case_set(ucm->ucm_mgr, "_enamod", mod_name) < 0) {
-                    pa_log("Failed to enable ucm modifier %s", mod_name);
-                }
+                ucm_modifier_enable(ucm, mod);
             }
 
             mod->enabled_counter++;
@@ -2262,27 +2465,14 @@
         if ((mod->action_direction == dir) && (pa_streq(mod->media_role, role))) {
 
             mod->enabled_counter--;
-            if (mod->enabled_counter == 0) {
-                const char *mod_name = pa_proplist_gets(mod->proplist, PA_ALSA_PROP_UCM_NAME);
-
-                pa_log_info("Disable ucm modifier %s", mod_name);
-                if (snd_use_case_set(ucm->ucm_mgr, "_dismod", mod_name) < 0) {
-                    pa_log("Failed to disable ucm modifier %s", mod_name);
-                }
-            }
+            if (mod->enabled_counter == 0)
+                ucm_modifier_disable(ucm, mod);
 
             break;
         }
     }
 }
 
-static void device_add_ucm_port(pa_alsa_ucm_device *device, pa_alsa_ucm_port_data *port) {
-    pa_assert(device);
-    pa_assert(port);
-
-    pa_dynarray_append(device->ucm_ports, port);
-}
-
 static void device_set_jack(pa_alsa_ucm_device *device, pa_alsa_jack *jack) {
     pa_assert(device);
     pa_assert(jack);
@@ -2315,7 +2505,7 @@
     device->available = available;
 
     PA_DYNARRAY_FOREACH(port, device->ucm_ports, idx)
-        ucm_port_update_available(port);
+        pa_device_port_set_available(port->core_port, port->device->available);
 }
 
 void pa_alsa_ucm_device_update_available(pa_alsa_ucm_device *device) {
@@ -2339,26 +2529,21 @@
 }
 
 static void ucm_port_data_init(pa_alsa_ucm_port_data *port, pa_alsa_ucm_config *ucm, pa_device_port *core_port,
-                               pa_alsa_ucm_device **devices, unsigned n_devices) {
-    unsigned i;
-
+                               pa_alsa_ucm_device *device) {
     pa_assert(ucm);
     pa_assert(core_port);
-    pa_assert(devices);
+    pa_assert(device);
 
     port->ucm = ucm;
     port->core_port = core_port;
-    port->devices = pa_dynarray_new(NULL);
     port->eld_device = -1;
 
-    for (i = 0; i < n_devices; i++) {
-        pa_dynarray_append(port->devices, devicesi);
-        device_add_ucm_port(devicesi, port);
-    }
+    port->device = device;
+    pa_dynarray_append(device->ucm_ports, port);
 
     port->paths = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, pa_xfree, NULL);
 
-    ucm_port_update_available(port);
+    pa_device_port_set_available(port->core_port, port->device->available);
 }
 
 static void ucm_port_data_free(pa_device_port *port) {
@@ -2368,32 +2553,14 @@
 
     ucm_port = PA_DEVICE_PORT_DATA(port);
 
-    if (ucm_port->devices)
-        pa_dynarray_free(ucm_port->devices);
-
     if (ucm_port->paths)
         pa_hashmap_free(ucm_port->paths);
 
     pa_xfree(ucm_port->eld_mixer_device_name);
 }
 
-static void ucm_port_update_available(pa_alsa_ucm_port_data *port) {
-    pa_alsa_ucm_device *device;
-    unsigned idx;
-    pa_available_t available = PA_AVAILABLE_YES;
-
-    pa_assert(port);
-
-    PA_DYNARRAY_FOREACH(device, port->devices, idx) {
-        if (device->available == PA_AVAILABLE_UNKNOWN)
-            available = PA_AVAILABLE_UNKNOWN;
-        else if (device->available == PA_AVAILABLE_NO) {
-            available = PA_AVAILABLE_NO;
-            break;
-        }
-    }
-
-    pa_device_port_set_available(port->core_port, available);
+long pa_alsa_ucm_port_device_status(pa_alsa_ucm_port_data *data) {
+    return ucm_device_status(data->ucm, data->device);
 }
 
 #else /* HAVE_ALSA_UCM */
@@ -2409,7 +2576,7 @@
     return NULL;
 }
 
-int pa_alsa_ucm_set_profile(pa_alsa_ucm_config *ucm, pa_card *card, const char *new_profile, const char *old_profile) {
+int pa_alsa_ucm_set_profile(pa_alsa_ucm_config *ucm, pa_card *card, pa_alsa_profile *new_profile, pa_alsa_profile *old_profile) {
     return -1;
 }
 
@@ -2427,7 +2594,7 @@
         bool ignore_dB) {
 }
 
-void pa_alsa_ucm_add_ports_combination(
+void pa_alsa_ucm_add_port(
         pa_hashmap *hash,
         pa_alsa_ucm_mapping_context *context,
         bool is_sink,
@@ -2436,7 +2603,7 @@
         pa_core *core) {
 }
 
-int pa_alsa_ucm_set_port(pa_alsa_ucm_mapping_context *context, pa_device_port *port, bool is_sink) {
+int pa_alsa_ucm_set_port(pa_alsa_ucm_mapping_context *context, pa_device_port *port) {
     return -1;
 }
 
@@ -2452,4 +2619,8 @@
 void pa_alsa_ucm_roled_stream_end(pa_alsa_ucm_config *ucm, const char *role, pa_direction_t dir) {
 }
 
+long pa_alsa_ucm_port_device_status(pa_alsa_ucm_port_data *data) {
+    return -1;
+}
+
 #endif

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/acp/alsa-ucm.h -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/acp/alsa-ucm.h Changed

@@ -142,12 +142,13 @@
 typedef struct pa_alsa_ucm_device pa_alsa_ucm_device;
 typedef struct pa_alsa_ucm_config pa_alsa_ucm_config;
 typedef struct pa_alsa_ucm_mapping_context pa_alsa_ucm_mapping_context;
+typedef struct pa_alsa_ucm_profile_context pa_alsa_ucm_profile_context;
 typedef struct pa_alsa_ucm_port_data pa_alsa_ucm_port_data;
 typedef struct pa_alsa_ucm_volume pa_alsa_ucm_volume;
 
 int pa_alsa_ucm_query_profiles(pa_alsa_ucm_config *ucm, int card_index);
 pa_alsa_profile_set* pa_alsa_ucm_add_profile_set(pa_alsa_ucm_config *ucm, pa_channel_map *default_channel_map);
-int pa_alsa_ucm_set_profile(pa_alsa_ucm_config *ucm, pa_card *card, const char *new_profile, const char *old_profile);
+int pa_alsa_ucm_set_profile(pa_alsa_ucm_config *ucm, pa_card *card, pa_alsa_profile *new_profile, pa_alsa_profile *old_profile);
 
 int pa_alsa_ucm_get_verb(snd_use_case_mgr_t *uc_mgr, const char *verb_name, const char *verb_desc, pa_alsa_ucm_verb **p_verb);
 
@@ -159,14 +160,14 @@
         pa_card *card,
         snd_pcm_t *pcm_handle,
         bool ignore_dB);
-void pa_alsa_ucm_add_ports_combination(
+void pa_alsa_ucm_add_port(
         pa_hashmap *hash,
         pa_alsa_ucm_mapping_context *context,
         bool is_sink,
         pa_hashmap *ports,
         pa_card_profile *cp,
         pa_core *core);
-int pa_alsa_ucm_set_port(pa_alsa_ucm_mapping_context *context, pa_device_port *port, bool is_sink);
+int pa_alsa_ucm_set_port(pa_alsa_ucm_mapping_context *context, pa_device_port *port);
 
 void pa_alsa_ucm_free(pa_alsa_ucm_config *ucm);
 void pa_alsa_ucm_mapping_context_free(pa_alsa_ucm_mapping_context *context);
@@ -223,11 +224,8 @@
 
     pa_proplist *proplist;
 
-    int n_confdev;
-    int n_suppdev;
-
-    const char **conflicting_devices;
-    const char **supported_devices;
+    pa_idxset *conflicting_devices;
+    pa_idxset *supported_devices;
 
     pa_direction_t action_direction;
 
@@ -270,21 +268,23 @@
     pa_alsa_ucm_config *ucm;
     pa_direction_t direction;
 
-    pa_idxset *ucm_devices;
-    pa_idxset *ucm_modifiers;
+    pa_alsa_ucm_device *ucm_device;
+    pa_alsa_ucm_modifier *ucm_modifier;
+};
+
+struct pa_alsa_ucm_profile_context {
+    pa_alsa_ucm_verb *verb;
 };
 
 struct pa_alsa_ucm_port_data {
     pa_alsa_ucm_config *ucm;
     pa_device_port *core_port;
 
-    /* A single port will be associated with multiple devices if it represents
-     * a combination of devices. */
-    pa_dynarray *devices; /* pa_alsa_ucm_device */
+    pa_alsa_ucm_device *device;
 
-    /* profile name -> pa_alsa_path for volume control */
+    /* verb name -> pa_alsa_path for volume control */
     pa_hashmap *paths;
-    /* Current path, set when activating profile */
+    /* Current path, set when activating verb */
     pa_alsa_path *path;
 
     /* ELD info */
@@ -292,6 +292,8 @@
     int eld_device; /* PCM device number */
 };
 
+long pa_alsa_ucm_port_device_status(pa_alsa_ucm_port_data *data);
+
 struct pa_alsa_ucm_volume {
     char *mixer_elem;	/* mixer element identifier */
     char *master_elem;	/* master mixer element identifier */

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/acp/alsa-util.c -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/acp/alsa-util.c Changed

@@ -505,6 +505,8 @@
         snd_pcm_uframes_t tsched_size,
         bool *use_mmap,
         bool *use_tsched,
+        pa_sample_format_t **query_supported_formats,
+        unsigned int **query_supported_rates,
         pa_alsa_profile_set *ps,
         pa_alsa_mapping **mapping) {
 
@@ -543,6 +545,8 @@
                 tsched_size,
                 use_mmap,
                 use_tsched,
+                query_supported_formats,
+                query_supported_rates,
                 m);
 
         if (pcm_handle) {
@@ -570,6 +574,8 @@
                 tsched_size,
                 use_mmap,
                 use_tsched,
+                query_supported_formats,
+                query_supported_rates,
                 m);
 
         if (pcm_handle) {
@@ -594,6 +600,8 @@
             tsched_size,
             use_mmap,
             use_tsched,
+            query_supported_formats,
+            query_supported_rates,
             false);
     pa_xfree(d);
 
@@ -615,6 +623,8 @@
         snd_pcm_uframes_t tsched_size,
         bool *use_mmap,
         bool *use_tsched,
+        pa_sample_format_t **query_supported_formats,
+        unsigned int **query_supported_rates,
         pa_alsa_mapping *m) {
 
     snd_pcm_t *pcm_handle;
@@ -644,6 +654,8 @@
             tsched_size,
             use_mmap,
             use_tsched,
+            query_supported_formats,
+            query_supported_rates,
             pa_channel_map_valid(&m->channel_map) /* Query the channel count if we don't know what we want */);
 
     if (!pcm_handle)
@@ -681,6 +693,8 @@
         snd_pcm_uframes_t tsched_size,
         bool *use_mmap,
         bool *use_tsched,
+        pa_sample_format_t **query_supported_formats,
+        unsigned int **query_supported_rates,
         bool require_exact_channel_number) {
 
     int err;
@@ -708,6 +722,12 @@
         pa_log_info("ALSA device open '%s' %s: %p", d,
 			mode == SND_PCM_STREAM_CAPTURE ? "capture" : "playback", pcm_handle);
 
+        if (query_supported_formats)
+            *query_supported_formats = pa_alsa_get_supported_formats(pcm_handle, ss->format);
+
+        if (query_supported_rates)
+            *query_supported_rates = pa_alsa_get_supported_rates(pcm_handle, ss->rate);
+
         if ((err = pa_alsa_set_hw_params(
                      pcm_handle,
                      ss,
@@ -781,6 +801,8 @@
         snd_pcm_uframes_t tsched_size,
         bool *use_mmap,
         bool *use_tsched,
+        pa_sample_format_t **query_supported_formats,
+        unsigned int **query_supported_rates,
         bool require_exact_channel_number) {
 
     snd_pcm_t *pcm_handle;
@@ -802,6 +824,8 @@
                 tsched_size,
                 use_mmap,
                 use_tsched,
+                query_supported_formats,
+                query_supported_rates,
                 require_exact_channel_number);
 
         pa_xfree(d);
@@ -867,6 +891,10 @@
 }
 #endif
 
+static PA_PRINTF_FUNC(5,0) void alsa_local_handler(const char *file, int line, const char *function, int err, const char *fmt, va_list arg) {
+    pa_log_levelv_meta(PA_LOG_INFO, file, line, function, fmt, arg);
+}
+
 static PA_PRINTF_FUNC(5,6) void alsa_error_handler(const char *file, int line, const char *function, int err, const char *fmt,...) {
     va_list ap;
 //    char *alsa_file;
@@ -885,13 +913,17 @@
 static int n_error_handler_installed = 0;
 
 typedef void (*snd_lib2_error_handler_t)(const char *file, int line, const char *function, int err, const char *fmt, ...) PA_PRINTF_FUNC(5,6) /* __attribute__ ((format (printf, 5, 6))) */;
+typedef void (*snd_lib2_local_handler_t)(const char *file, int line, const char *function, int err, const char *fmt, va_list args) PA_PRINTF_FUNC(5,0) /* __attribute__ ((format (printf, 5, 0))) */;
 
 extern int snd_lib_error_set_handler(snd_lib2_error_handler_t handler);
+extern snd_local_error_handler_t snd_lib_error_set_local(snd_lib2_local_handler_t handler);
 
 void pa_alsa_refcnt_inc(void) {
     /* This is not really thread safe, but we do our best */
-   if (n_error_handler_installed++ == 0)
+   if (n_error_handler_installed++ == 0) {
         snd_lib_error_set_handler(alsa_error_handler);
+        snd_lib_error_set_local(alsa_local_handler);
+   }
 }
 
 void pa_alsa_refcnt_dec(void) {
@@ -901,6 +933,7 @@
 
     if (r == 1) {
         snd_lib_error_set_handler(NULL);
+        snd_lib_error_set_local(NULL);
         snd_config_update_free_global();
     }
 }
@@ -929,7 +962,7 @@
 }
 
 void pa_alsa_init_proplist_card(pa_core *c, pa_proplist *p, int card) {
-    char *cn, *lcn, *dn;
+    char *cn, *lcn, *dn, name64;
 
     pa_assert(p);
     pa_assert(card >= 0);
@@ -951,6 +984,9 @@
         pa_xfree(dn);
     }
 
+    snprintf(name, sizeof(name), "hw:%d", card);
+    pa_alsa_init_proplist_ctl(p, name);
+
 #ifdef HAVE_UDEV
     pa_udev_get_info(card, p);
 #endif
@@ -979,6 +1015,7 @@
     snd_pcm_subclass_t subclass;
     const char *n, *id, *sdn;
     int card;
+    snd_pcm_sync_id_t sync_id;
 
     pa_assert(p);
     pa_assert(pcm_info);
@@ -1013,6 +1050,10 @@
 
     if ((card = snd_pcm_info_get_card(pcm_info)) >= 0)
         pa_alsa_init_proplist_card(c, p, card);
+
+    sync_id = snd_pcm_info_get_sync(pcm_info);
+    pa_proplist_setf(p, "alsa.sync.id", "%08x:%08x:%08x:%08x",
+			sync_id.id320, sync_id.id321, sync_id.id322, sync_id.id323);
 }
 
 void pa_alsa_init_proplist_pcm(pa_core *c, pa_proplist *p, snd_pcm_t *pcm) {
@@ -1037,7 +1078,6 @@
         pa_alsa_init_proplist_pcm_info(c, p, info);
 }
 
-#if 0
 void pa_alsa_init_proplist_ctl(pa_proplist *p, const char *name) {
     int err;
     snd_ctl_t *ctl;
@@ -1065,9 +1105,13 @@
     if ((t = snd_ctl_card_info_get_components(info)) && *t)
         pa_proplist_sets(p, "alsa.components", t);
 
+    if ((t = snd_ctl_card_info_get_id(info)) && *t)
+        pa_proplist_sets(p, "alsa.id", t);
+
     snd_ctl_close(ctl);
 }
 
+#if 0
 int pa_alsa_recover_from_poll(snd_pcm_t *pcm, int revents) {
     snd_pcm_state_t state;
     snd_pcm_hw_params_t *hwparams;
@@ -1411,6 +1455,24 @@
 
     return pa_sprintf_malloc("Audio%i", i);
 }
+#endif
+
+static void dump_supported_rates(unsigned int* values)
+{
+    pa_strbuf *buf;
+    char *str;
+    int i;
+
+    buf = pa_strbuf_new();
+
+    for (i = 0; valuesi; i++) {
+        pa_strbuf_printf(buf, " %u", valuesi);
+    }
+
+    str = pa_strbuf_to_string_free(buf);
+    pa_log_debug("Supported rates:%s", str);
+    pa_xfree(str);
+}
 
 unsigned int *pa_alsa_get_supported_rates(snd_pcm_t *pcm, unsigned int fallback_rate) {
     static unsigned int all_rates = { 8000, 11025, 12000,
@@ -1418,7 +1480,8 @@
                                         32000, 44100, 48000,
                                         64000, 88200, 96000,
                                         128000, 176400, 192000,
-                                        384000 };
+                                        352800, 384000,
+                                        705600, 768000 };
     bool supportedPA_ELEMENTSOF(all_rates) = { false, };
     snd_pcm_hw_params_t *hwparams;
     unsigned int i, j, n, *rates = NULL;
@@ -1460,39 +1523,40 @@
         rates1 = 0;
     }
 
+    dump_supported_rates(rates);
     return rates;
 }
 
 pa_sample_format_t *pa_alsa_get_supported_formats(snd_pcm_t *pcm, pa_sample_format_t fallback_format) {
-    static const snd_pcm_format_t format_trans_to_pa = {
-        SND_PCM_FORMAT_U8 = PA_SAMPLE_U8,
-        SND_PCM_FORMAT_A_LAW = PA_SAMPLE_ALAW,
-        SND_PCM_FORMAT_MU_LAW = PA_SAMPLE_ULAW,
-        SND_PCM_FORMAT_S16_LE = PA_SAMPLE_S16LE,
-        SND_PCM_FORMAT_S16_BE = PA_SAMPLE_S16BE,
-        SND_PCM_FORMAT_FLOAT_LE = PA_SAMPLE_FLOAT32LE,
-        SND_PCM_FORMAT_FLOAT_BE = PA_SAMPLE_FLOAT32BE,
-        SND_PCM_FORMAT_S32_LE = PA_SAMPLE_S32LE,
-        SND_PCM_FORMAT_S32_BE = PA_SAMPLE_S32BE,
-        SND_PCM_FORMAT_S24_3LE = PA_SAMPLE_S24LE,
-        SND_PCM_FORMAT_S24_3BE = PA_SAMPLE_S24BE,
-        SND_PCM_FORMAT_S24_LE = PA_SAMPLE_S24_32LE,
-        SND_PCM_FORMAT_S24_BE = PA_SAMPLE_S24_32BE,
+    static const snd_pcm_format_t format_trans_to_pcm = {
+        PA_SAMPLE_U8 = SND_PCM_FORMAT_U8,
+        PA_SAMPLE_ALAW = SND_PCM_FORMAT_A_LAW,
+        PA_SAMPLE_ULAW = SND_PCM_FORMAT_MU_LAW,
+        PA_SAMPLE_S16LE = SND_PCM_FORMAT_S16_LE,
+        PA_SAMPLE_S16BE = SND_PCM_FORMAT_S16_BE,
+        PA_SAMPLE_FLOAT32LE = SND_PCM_FORMAT_FLOAT_LE,
+        PA_SAMPLE_FLOAT32BE = SND_PCM_FORMAT_FLOAT_BE,
+        PA_SAMPLE_S32LE = SND_PCM_FORMAT_S32_LE,
+        PA_SAMPLE_S32BE = SND_PCM_FORMAT_S32_BE,
+        PA_SAMPLE_S24LE = SND_PCM_FORMAT_S24_3LE,
+        PA_SAMPLE_S24BE = SND_PCM_FORMAT_S24_3BE,
+        PA_SAMPLE_S24_32LE = SND_PCM_FORMAT_S24_LE,
+        PA_SAMPLE_S24_32BE = SND_PCM_FORMAT_S24_BE,
     };
-    static const snd_pcm_format_t all_formats = {
-        SND_PCM_FORMAT_U8,
-        SND_PCM_FORMAT_A_LAW,
-        SND_PCM_FORMAT_MU_LAW,
-        SND_PCM_FORMAT_S16_LE,
-        SND_PCM_FORMAT_S16_BE,
-        SND_PCM_FORMAT_FLOAT_LE,
-        SND_PCM_FORMAT_FLOAT_BE,
-        SND_PCM_FORMAT_S32_LE,
-        SND_PCM_FORMAT_S32_BE,
-        SND_PCM_FORMAT_S24_3LE,
-        SND_PCM_FORMAT_S24_3BE,
-        SND_PCM_FORMAT_S24_LE,
-        SND_PCM_FORMAT_S24_BE,
+    static const pa_sample_format_t all_formats = {
+        PA_SAMPLE_U8,
+        PA_SAMPLE_ALAW,
+        PA_SAMPLE_ULAW,
+        PA_SAMPLE_S16LE,
+        PA_SAMPLE_S16BE,
+        PA_SAMPLE_FLOAT32LE,
+        PA_SAMPLE_FLOAT32BE,
+        PA_SAMPLE_S32LE,
+        PA_SAMPLE_S32BE,
+        PA_SAMPLE_S24LE,
+        PA_SAMPLE_S24BE,
+        PA_SAMPLE_S24_32LE,
+        PA_SAMPLE_S24_32BE,
     };
     bool supportedPA_ELEMENTSOF(all_formats) = {
         false,
@@ -1510,7 +1574,7 @@
     }
 
     for (i = 0, n = 0; i < PA_ELEMENTSOF(all_formats); i++) {
-        if (snd_pcm_hw_params_test_format(pcm, hwparams, all_formatsi) == 0) {
+        if (snd_pcm_hw_params_test_format(pcm, hwparams, format_trans_to_pcmall_formatsi) == 0) {
             supportedi = true;
             n++;
         }
@@ -1521,7 +1585,7 @@
 
         for (i = 0, j = 0; i < PA_ELEMENTSOF(all_formats); i++) {
             if (supportedi)
-                formatsj++ = format_trans_to_paall_formatsi;
+                formatsj++ = all_formatsi;
         }
 
         formatsj = PA_SAMPLE_MAX;
@@ -1529,7 +1593,7 @@
         formats = pa_xnew(pa_sample_format_t, 2);
 
         formats0 = fallback_format;
-        if ((ret = snd_pcm_hw_params_set_format(pcm, hwparams, format_trans_to_paformats0)) < 0) {
+        if ((ret = snd_pcm_hw_params_set_format(pcm, hwparams, format_trans_to_pcmformats0)) < 0) {
             pa_log_debug("snd_pcm_hw_params_set_format() failed: %s", pa_alsa_strerror(ret));
             pa_xfree(formats);
             return NULL;
@@ -1540,7 +1604,6 @@
 
     return formats;
 }
-#endif
 
 bool pa_alsa_pcm_is_hw(snd_pcm_t *pcm) {
     snd_pcm_info_t* info;
@@ -1600,14 +1663,16 @@
                                             snd_ctl_elem_iface_t iface,
                                             const char *name,
                                             unsigned int index,
-                                            unsigned int device) {
+                                            unsigned int device,
+                                            unsigned int subdevice) {
     snd_mixer_elem_t *elem;
 
     for (elem = snd_mixer_first_elem(mixer); elem; elem = snd_mixer_elem_next(elem)) {
-        snd_hctl_elem_t *helem;
+        snd_hctl_elem_t **_helem, *helem;
         if (snd_mixer_elem_get_type(elem) != SND_MIXER_ELEM_PULSEAUDIO)
             continue;
-        helem = snd_mixer_elem_get_private(elem);
+        _helem = snd_mixer_elem_get_private(elem);
+        helem = *_helem;
         if (snd_hctl_elem_get_interface(helem) != iface)
             continue;
         if (!pa_streq(snd_hctl_elem_get_name(helem), name))
@@ -1616,17 +1681,19 @@
             continue;
         if (snd_hctl_elem_get_device(helem) != device)
             continue;
+        if (snd_hctl_elem_get_subdevice(helem) != subdevice)
+            continue;
         return elem;
     }
     return NULL;
 }
 
 snd_mixer_elem_t *pa_alsa_mixer_find_card(snd_mixer_t *mixer, struct pa_alsa_mixer_id *alsa_id, unsigned int device) {
-    return pa_alsa_mixer_find(mixer, SND_CTL_ELEM_IFACE_CARD, alsa_id->name, alsa_id->index, device);
+    return pa_alsa_mixer_find(mixer, SND_CTL_ELEM_IFACE_CARD, alsa_id->name, alsa_id->index, device, 0);
 }
 
 snd_mixer_elem_t *pa_alsa_mixer_find_pcm(snd_mixer_t *mixer, const char *name, unsigned int device) {
-    return pa_alsa_mixer_find(mixer, SND_CTL_ELEM_IFACE_PCM, name, 0, device);
+    return pa_alsa_mixer_find(mixer, SND_CTL_ELEM_IFACE_PCM, name, 0, device, 0);
 }
 
 static int mixer_class_compare(const snd_mixer_elem_t *c1, const snd_mixer_elem_t *c2)
@@ -1635,36 +1702,79 @@
     return c1 == c2 ? 0 : (c1 > c2 ? 1 : -1);
 }
 
+static void mixer_melem_free(snd_mixer_elem_t *elem)
+{
+    snd_hctl_elem_t **_helem;
+    _helem = snd_mixer_elem_get_private(elem);
+    pa_xfree(_helem);
+}
+
 static int mixer_class_event(snd_mixer_class_t *class, unsigned int mask,
 			snd_hctl_elem_t *helem, snd_mixer_elem_t *melem)
 {
     int err;
     const char *name = snd_hctl_elem_get_name(helem);
+    snd_hctl_elem_t **_helem;
     // NOTE: The remove event defined as '~0U`.
     if (mask == SND_CTL_EVENT_MASK_REMOVE) {
         // NOTE: unless remove pointer to melem from link-list at private_data of helem, hits
-	// assersion in alsa-lib since the list is not empty.
+	// assertion in alsa-lib since the list is not empty.
+        _helem = snd_mixer_elem_get_private(melem);
+        *_helem = NULL;
         snd_mixer_elem_detach(melem, helem);
     } else if (mask & SND_CTL_EVENT_MASK_ADD) {
         snd_ctl_elem_iface_t iface = snd_hctl_elem_get_interface(helem);
         if (iface == SND_CTL_ELEM_IFACE_CARD || iface == SND_CTL_ELEM_IFACE_PCM) {
+            snd_mixer_t *mixer = snd_mixer_class_get_mixer(class);
+            snd_ctl_elem_iface_t iface = snd_hctl_elem_get_interface(helem);
+            const char *name = snd_hctl_elem_get_name(helem);
+            const int index = snd_hctl_elem_get_index(helem);
+            const int device = snd_hctl_elem_get_device(helem);
+            const int subdevice = snd_hctl_elem_get_subdevice(helem);
             snd_mixer_elem_t *new_melem;
 
-            /* Put the hctl pointer as our private data - it will be useful for callbacks */
-            if ((err = snd_mixer_elem_new(&new_melem, SND_MIXER_ELEM_PULSEAUDIO, 0, helem, NULL)) < 0) {
-                pa_log_warn("snd_mixer_elem_new failed: %s", pa_alsa_strerror(err));
-                return 0;
+            bool found = true;
+
+            new_melem = pa_alsa_mixer_find(mixer, iface, name, index, device, subdevice);
+            if (!new_melem) {
+                _helem = pa_xmalloc(sizeof(snd_hctl_elem_t *));
+                *_helem = helem;
+                /* Put the hctl pointer as our private data - it will be useful for callbacks */
+                if ((err = snd_mixer_elem_new(&new_melem, SND_MIXER_ELEM_PULSEAUDIO, 0, _helem, mixer_melem_free)) < 0) {
+                    pa_log_warn("snd_mixer_elem_new failed: %s", pa_alsa_strerror(err));
+                    return 0;
+                }
+                found = false;
+            } else {
+                _helem = snd_mixer_elem_get_private(new_melem);
+                if (_helem) {
+                    char *s1, *s2;
+                    snd_ctl_elem_id_t *id1, *id2;
+                    snd_ctl_elem_id_alloca(&id1);
+                    snd_ctl_elem_id_alloca(&id2);
+                    snd_hctl_elem_get_id(helem, id1);
+                    snd_hctl_elem_get_id(*_helem, id2);
+                    s1 = snd_ctl_ascii_elem_id_get(id1);
+                    s2 = snd_ctl_ascii_elem_id_get(id2);
+                    pa_log_warn("mixer_class_event - duplicate mixer controls: %s | %s", s1, s2);
+                    free(s2);
+                    free(s1);
+                    return 0;
+                }
+                *_helem = helem;
             }
 
             if ((err = snd_mixer_elem_attach(new_melem, helem)) < 0) {
                 pa_log_warn("snd_mixer_elem_attach failed: %s", pa_alsa_strerror(err));
-		snd_mixer_elem_free(melem);
+                snd_mixer_elem_free(melem);
                 return 0;
             }
 
-            if ((err = snd_mixer_elem_add(new_melem, class)) < 0) {
-                pa_log_warn("snd_mixer_elem_add failed: %s", pa_alsa_strerror(err));
-                return 0;
+            if (!found) {
+                if ((err = snd_mixer_elem_add(new_melem, class)) < 0) {
+                    pa_log_warn("snd_mixer_elem_add failed: %s", pa_alsa_strerror(err));
+                    return 0;
+                }
             }
         }
     }

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/acp/alsa-util.h -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/acp/alsa-util.h Changed

@@ -64,6 +64,8 @@
         snd_pcm_uframes_t tsched_size,
         bool *use_mmap,                   /* modified at return */
         bool *use_tsched,                 /* modified at return */
+        pa_sample_format_t **query_supported_formats, /* modified at return */
+        unsigned int **query_supported_rates,         /* modified at return */
         pa_alsa_profile_set *ps,
         pa_alsa_mapping **mapping);       /* modified at return */
 #endif
@@ -80,6 +82,8 @@
         snd_pcm_uframes_t tsched_size,
         bool *use_mmap,                   /* modified at return */
         bool *use_tsched,                 /* modified at return */
+        pa_sample_format_t **query_supported_formats, /* modified at return */
+        unsigned int **query_supported_rates,         /* modified at return */
         pa_alsa_mapping *mapping);
 
 /* Opens the explicit ALSA device */
@@ -94,6 +98,8 @@
         snd_pcm_uframes_t tsched_size,
         bool *use_mmap,                   /* modified at return */
         bool *use_tsched,                 /* modified at return */
+        pa_sample_format_t **query_supported_formats, /* modified at return */
+        unsigned int **query_supported_rates,         /* modified at return */
         bool require_exact_channel_number);
 
 /* Opens the explicit ALSA device with a fallback list */
@@ -109,6 +115,8 @@
         snd_pcm_uframes_t tsched_size,
         bool *use_mmap,                   /* modified at return */
         bool *use_tsched,                 /* modified at return */
+        pa_sample_format_t **query_supported_formats, /* modified at return */
+        unsigned int **query_supported_rates,        /* modified at return */
         bool require_exact_channel_number);
 
 #if 0
@@ -123,9 +131,7 @@
 void pa_alsa_init_proplist_pcm_info(pa_core *c, pa_proplist *p, snd_pcm_info_t *pcm_info);
 void pa_alsa_init_proplist_card(pa_core *c, pa_proplist *p, int card);
 void pa_alsa_init_proplist_pcm(pa_core *c, pa_proplist *p, snd_pcm_t *pcm);
-#if 0
 void pa_alsa_init_proplist_ctl(pa_proplist *p, const char *name);
-#endif
 bool pa_alsa_init_description(pa_proplist *p, pa_card *card);
 
 #if 0

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/acp/compat.h -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/acp/compat.h Changed

@@ -35,6 +35,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <math.h>
+#include <limits.h>
 
 #include <spa/utils/string.h>
 
@@ -47,10 +48,12 @@
 #define PA_LIKELY(x) (__builtin_expect(!!(x),1))
 #define PA_UNLIKELY(x) (__builtin_expect(!!(x),0))
 #define PA_PRINTF_FUNC(fmt, arg1) __attribute__((format(printf, fmt, arg1)))
+#define PA_UNUSED __attribute__ ((unused))
 #else
 #define PA_LIKELY(x) (x)
 #define PA_UNLIKELY(x) (x)
 #define PA_PRINTF_FUNC(fmt, arg1)
+#define PA_UNUSED
 #endif
 
 #define PA_MIN(a,b)                    \
@@ -96,7 +99,7 @@
 	PA_AVAILABLE_YES = 2,
 } pa_available_t;
 
-#define PA_RATE_MAX (48000U*8U)
+#define PA_RATE_MAX (48000U*16U)
 
 typedef enum pa_sample_format {
 	PA_SAMPLE_U8,		/**< Unsigned 8 Bit PCM */
@@ -660,6 +663,8 @@
         ssize_t n;
 
         c = pa_xmalloc(l);
+        if (c == NULL)
+            return NULL;
 
         if ((n = readlink(p, c, l-1)) < 0) {
             pa_xfree(c);
@@ -672,6 +677,9 @@
         }
 
         pa_xfree(c);
+
+        if (l >= (size_t)(INT_MAX / 2))
+            return NULL;
         l *= 2;
     }
 #else

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/acp/idxset.h -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/acp/idxset.h Changed

@@ -130,13 +130,25 @@
 	return count;
 }
 
-static inline void *pa_idxset_search(pa_idxset *s, uint32_t *idx)
+static inline pa_idxset_item *pa_idxset_search(pa_idxset *s, uint32_t *idx)
 {
         pa_idxset_item *item;
 	for (item = pa_array_get_unchecked(&s->array, *idx, pa_idxset_item);
 	     pa_array_check(&s->array, item); item++, (*idx)++) {
 		if (item->ptr != NULL)
-			return item->ptr;
+			return item;
+	}
+	*idx = PA_IDXSET_INVALID;
+	return NULL;
+}
+
+static inline pa_idxset_item *pa_idxset_reverse_search(pa_idxset *s, uint32_t *idx)
+{
+        pa_idxset_item *item;
+	for (item = pa_array_get_unchecked(&s->array, *idx, pa_idxset_item);
+	     pa_array_check(&s->array, item); item--, (*idx)--) {
+		if (item->ptr != NULL)
+			return item;
 	}
 	*idx = PA_IDXSET_INVALID;
 	return NULL;
@@ -144,29 +156,93 @@
 
 static inline void *pa_idxset_next(pa_idxset *s, uint32_t *idx)
 {
+	pa_idxset_item *item;
 	(*idx)++;;
-	return pa_idxset_search(s, idx);
+	item = pa_idxset_search(s, idx);
+	return item ? item->ptr : NULL;
 }
 
 static inline void* pa_idxset_first(pa_idxset *s, uint32_t *idx)
 {
 	uint32_t i = 0;
-	void *ptr = pa_idxset_search(s, &i);
+	pa_idxset_item *item = pa_idxset_search(s, &i);
 	if (idx)
 		*idx = i;
+	return item ? item->ptr : NULL;
+}
+
+static inline void* pa_idxset_last(pa_idxset *s, uint32_t *idx)
+{
+	uint32_t i = pa_array_get_len(&s->array, pa_idxset_item) - 1;
+	pa_idxset_item *item = pa_idxset_reverse_search(s, &i);
+	if (idx)
+		*idx = i;
+	return item ? item->ptr : NULL;
+}
+
+static inline void* pa_idxset_steal_last(pa_idxset *s, uint32_t *idx)
+{
+	uint32_t i = pa_array_get_len(&s->array, pa_idxset_item) - 1;
+	void *ptr = NULL;
+	pa_idxset_item *item = pa_idxset_reverse_search(s, &i);
+	if (idx)
+		*idx = i;
+	if (item) {
+		ptr = item->ptr;
+		item->ptr = NULL;
+		pa_array_remove(&s->array, item);
+	}
 	return ptr;
 }
 
 static inline void* pa_idxset_get_by_data(pa_idxset*s, const void *p, uint32_t *idx)
 {
 	pa_idxset_item *item = pa_idxset_find(s, p);
-	if (item == NULL)
+	if (item == NULL) {
+		if (idx)
+			*idx = PA_IDXSET_INVALID;
 		return NULL;
+	}
 	if (idx)
 		*idx = item - (pa_idxset_item*)s->array.data;
 	return item->ptr;
 }
 
+static inline bool pa_idxset_contains(pa_idxset *s, const void *p)
+{
+	return pa_idxset_get_by_data(s, p, NULL) == p;
+}
+
+static inline bool pa_idxset_isdisjoint(pa_idxset *s, pa_idxset *t)
+{
+	pa_idxset_item *item;
+	pa_array_for_each(item, &s->array) {
+		if (item->ptr && pa_idxset_contains(t, item->ptr))
+			return false;
+	}
+	return true;
+}
+
+static inline bool pa_idxset_issubset(pa_idxset *s, pa_idxset *t)
+{
+	pa_idxset_item *item;
+	pa_array_for_each(item, &s->array) {
+		if (item->ptr && !pa_idxset_contains(t, item->ptr))
+			return false;
+	}
+	return true;
+}
+
+static inline bool pa_idxset_issuperset(pa_idxset *s, pa_idxset *t)
+{
+    return pa_idxset_issubset(t, s);
+}
+
+static inline bool pa_idxset_equals(pa_idxset *s, pa_idxset *t)
+{
+    return pa_idxset_issubset(s, t) && pa_idxset_issuperset(s, t);
+}
+
 static inline void* pa_idxset_get_by_index(pa_idxset*s, uint32_t idx)
 {
         pa_idxset_item *item;

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/alsa-acp-device.c -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/alsa-acp-device.c Changed

@@ -12,6 +12,7 @@
 #include <alsa/asoundlib.h>
 
 #include <spa/node/node.h>
+#include <spa/node/keys.h>
 #include <spa/utils/type.h>
 #include <spa/utils/keys.h>
 #include <spa/utils/names.h>
@@ -130,12 +131,12 @@
 	struct spa_dict_item *items;
 	const struct acp_dict_item *it;
 	uint32_t n_items, i;
-	char device_name128, path180, channels16, ch12, routes16;
-	char card_index16, *p;
+	char device_name128, path210, channels16, ch12, routes16;
+	char card_index16, card_name64, *p;
 	char positionsSPA_AUDIO_MAX_CHANNELS * 12;
 	struct spa_device_object_info info;
 	struct acp_card *card = this->card;
-	const char *stream, *devstr;
+	const char *stream, *devstr, *card_id;
 
 	info = SPA_DEVICE_OBJECT_INFO_INIT();
 	info.type = SPA_TYPE_INTERFACE_Node;
@@ -150,10 +151,12 @@
 
 	info.change_mask = SPA_DEVICE_OBJECT_CHANGE_MASK_PROPS;
 
-	items = alloca((dev->props.n_items + 8) * sizeof(*items));
+	items = alloca((dev->props.n_items + 9) * sizeof(*items));
 	n_items = 0;
 
 	snprintf(card_index, sizeof(card_index), "%d", card->index);
+	card_id = acp_dict_lookup(&card->props, "alsa.id");
+	snprintf(card_name, sizeof(card_name), "%s", card_id ? card_id : card_index);
 
 	devstr = dev->device_strings0;
 	p = strstr(devstr, "%f");
@@ -164,13 +167,15 @@
 	} else {
 		snprintf(device_name, sizeof(device_name), "%s", devstr);
 	}
-	snprintf(path, sizeof(path), "alsa:pcm:%s:%s:%s", card_index, device_name, stream);
+
+	snprintf(path, sizeof(path), "alsa:acp:%s:%d:%s", card_name, dev->index, stream);
 	itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_OBJECT_PATH, path);
 	itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_API_ALSA_PATH, device_name);
 	if (dev->flags & ACP_DEVICE_UCM_DEVICE)
 		itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_API_ALSA_OPEN_UCM, "true");
 	itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_API_ALSA_PCM_CARD, card_index);
 	itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_API_ALSA_PCM_STREAM, stream);
+	itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_PORT_GROUP, stream);
 
 	snprintf(channels, sizeof(channels), "%d", dev->format.channels);
 	itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_AUDIO_CHANNELS, channels);
@@ -204,6 +209,7 @@
 	struct acp_card *card = this->card;
 	char path128;
 	uint64_t old = full ? this->info.change_mask : 0;
+	const char *card_id;
 
 	if (full)
 		this->info.change_mask = this->info_all;
@@ -211,11 +217,16 @@
 		n_items = card->props.n_items + 4;
 		items = alloca(n_items * sizeof(*items));
 
+		card_id = acp_dict_lookup(&card->props, "alsa.id");
+
 		n_items = 0;
 #define ADD_ITEM(key, value) itemsn_items++ = SPA_DICT_ITEM_INIT(key, value)
-		snprintf(path, sizeof(path), "alsa:pcm:%d", card->index);
+		if (card_id)
+			snprintf(path, sizeof(path), "alsa:acp:%s", card_id);
+		else
+			snprintf(path, sizeof(path), "alsa:acp:%d", card->index);
 		ADD_ITEM(SPA_KEY_OBJECT_PATH, path);
-		ADD_ITEM(SPA_KEY_DEVICE_API, "alsa:pcm");
+		ADD_ITEM(SPA_KEY_DEVICE_API, "alsa:acp");
 		ADD_ITEM(SPA_KEY_MEDIA_CLASS, "Audio/Device");
 		ADD_ITEM(SPA_KEY_API_ALSA_PATH,	(char *)this->props.device);
 		acp_dict_for_each(it, &card->props)
@@ -516,14 +527,17 @@
 			return 0;
 
 		pr = card->profilesresult.index;
+		if (SPA_FLAG_IS_SET(pr->flags, ACP_PROFILE_HIDDEN))
+			goto next;
 		param = build_profile(&b.b, id, pr, false);
 		break;
 
 	case SPA_PARAM_Profile:
 		if (result.index > 0 || card->active_profile_index >= card->n_profiles)
 			return 0;
-
 		pr = card->profilescard->active_profile_index;
+		if (SPA_FLAG_IS_SET(pr->flags, ACP_PROFILE_HIDDEN))
+			goto next;
 		param = build_profile(&b.b, id, pr, true);
 		break;
 
@@ -532,6 +546,8 @@
 			return 0;
 
 		p = card->portsresult.index;
+		if (SPA_FLAG_IS_SET(p->flags, ACP_PORT_HIDDEN))
+			goto next;
 		param = build_route(&b.b, id, p, NULL, SPA_ID_INVALID);
 		break;
 
@@ -541,6 +557,8 @@
 				return 0;
 
 			dev = card->devicesresult.index;
+			if (SPA_FLAG_IS_SET(dev->flags, ACP_DEVICE_HIDDEN))
+				goto next;
 			if (SPA_FLAG_IS_SET(dev->flags, ACP_DEVICE_ACTIVE) &&
 			    (p = find_port_for_device(card, dev)) != NULL)
 				break;
@@ -548,6 +566,8 @@
 			result.index++;
 		}
 		result.next = result.index + 1;
+		if (SPA_FLAG_IS_SET(p->flags, ACP_PORT_HIDDEN))
+			goto next;
 		param = build_route(&b.b, id, p, dev, card->active_profile_index);
 		if (param == NULL)
 			return -errno;
@@ -699,6 +719,26 @@
 	return changed;
 }
 
+static uint32_t find_profile_by_name(struct acp_card *card, const char *name)
+{
+	uint32_t i;
+	for (i = 0; i < card->n_profiles; i++) {
+		if (spa_streq(card->profilesi->name, name))
+			return i;
+	}
+	return SPA_ID_INVALID;
+}
+
+static uint32_t find_route_by_name(struct acp_card *card, const char *name)
+{
+	uint32_t i;
+	for (i = 0; i < card->n_ports; i++) {
+		if (spa_streq(card->portsi->name, name))
+			return i;
+	}
+	return SPA_ID_INVALID;
+}
+
 static int impl_set_param(void *object,
 			  uint32_t id, uint32_t flags,
 			  const struct spa_pod *param)
@@ -711,7 +751,8 @@
 	switch (id) {
 	case SPA_PARAM_Profile:
 	{
-		uint32_t idx;
+		uint32_t idx = SPA_ID_INVALID;
+		const char *name = NULL;
 		bool save = false;
 
 		if (param == NULL) {
@@ -719,20 +760,31 @@
 			save = true;
 		} else if ((res = spa_pod_parse_object(param,
 				SPA_TYPE_OBJECT_ParamProfile, NULL,
-				SPA_PARAM_PROFILE_index, SPA_POD_Int(&idx),
+				SPA_PARAM_PROFILE_index, SPA_POD_OPT_Int(&idx),
+				SPA_PARAM_PROFILE_name, SPA_POD_OPT_String(&name),
 				SPA_PARAM_PROFILE_save, SPA_POD_OPT_Bool(&save))) < 0) {
 			spa_log_warn(this->log, "can't parse profile");
 			spa_debug_log_pod(this->log, SPA_LOG_LEVEL_DEBUG, 0, NULL, param);
 			return res;
 		}
-
+		if (idx == SPA_ID_INVALID && name == NULL) {
+			spa_log_warn(this->log, "profile needs name or index");
+			return -EINVAL;
+		}
+		if (idx == SPA_ID_INVALID)
+			idx = find_profile_by_name(this->card, name);
+		if (idx == SPA_ID_INVALID) {
+			spa_log_warn(this->log, "unknown profile %s", name);
+			return -EINVAL;
+		}
 		acp_card_set_profile(this->card, idx, save ? ACP_PROFILE_SAVE : 0);
 		emit_info(this, false);
 		break;
 	}
 	case SPA_PARAM_Route:
 	{
-		uint32_t idx, device;
+		uint32_t idx = SPA_ID_INVALID, device;
+		const char *name = NULL;
 		struct spa_pod *props = NULL;
 		struct acp_device *dev;
 		bool save = false;
@@ -742,7 +794,8 @@
 
 		if ((res = spa_pod_parse_object(param,
 				SPA_TYPE_OBJECT_ParamRoute, NULL,
-				SPA_PARAM_ROUTE_index, SPA_POD_Int(&idx),
+				SPA_PARAM_ROUTE_index, SPA_POD_OPT_Int(&idx),
+				SPA_PARAM_ROUTE_name, SPA_POD_OPT_String(&name),
 				SPA_PARAM_ROUTE_device, SPA_POD_Int(&device),
 				SPA_PARAM_ROUTE_props, SPA_POD_OPT_Pod(&props),
 				SPA_PARAM_ROUTE_save, SPA_POD_OPT_Bool(&save))) < 0) {
@@ -752,8 +805,18 @@
 		}
 		if (device >= this->card->n_devices)
 			return -EINVAL;
+		if (idx == SPA_ID_INVALID && name == NULL)
+			return -EINVAL;
 
 		dev = this->card->devicesdevice;
+		if (SPA_FLAG_IS_SET(dev->flags, ACP_DEVICE_HIDDEN))
+			return -EINVAL;
+
+		if (idx == SPA_ID_INVALID)
+			idx = find_route_by_name(this->card, name);
+		if (idx == SPA_ID_INVALID)
+			return -EINVAL;
+
 		acp_device_set_port(dev, idx, save ? ACP_PORT_SAVE : 0);
 		if (props)
 			apply_device_props(this, dev, props);

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/alsa-compress-offload-device.c -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/alsa-compress-offload-device.c Changed

@@ -47,6 +47,13 @@
 
 	struct spa_log *log;
 
+	uint32_t info_all;
+	struct spa_device_info device_info;
+
+#define IDX_EnumProfile		0
+#define IDX_Profile		1
+	struct spa_param_info params2;
+
 	struct spa_hook_list hooks;
 
 	struct props props;
@@ -215,6 +222,9 @@
 	this->n_playback = n_play;
 	this->n_nodes = i;
 
+	this->device_info.change_mask |= SPA_DEVICE_CHANGE_MASK_PARAMS;
+	this->paramsIDX_Profile.user++;
+
 finish:
 	if (snd_dir != NULL)
 		closedir(snd_dir);
@@ -234,56 +244,58 @@
 	uint32_t n_items = 0;
 	snd_ctl_t *ctl_hndl;
 	snd_ctl_card_info_t *info;
-	struct spa_device_info dinfo;
-	struct spa_param_info params2;
 	char path128;
 	char device_name200;
 	char device_desc200;
 
-	spa_log_debug(this->log, "open card %s", this->props.device);
-	if ((err = snd_ctl_open(&ctl_hndl, this->props.device, 0)) < 0) {
-		spa_log_error(this->log, "can't open control for card %s: %s",
-		              this->props.device, snd_strerror(err));
-		return err;
-	}
-
-	snd_ctl_card_info_alloca(&info);
-	if ((err = snd_ctl_card_info(ctl_hndl, info)) < 0) {
-		spa_log_error(this->log, "error hardware info: %s", snd_strerror(err));
-		goto finish;
-	}
-
-	dinfo = SPA_DEVICE_INFO_INIT();
-
-	dinfo.change_mask = SPA_DEVICE_CHANGE_MASK_PROPS;
-
-	snprintf(path, sizeof(path), "alsa:compressed:%s", snd_ctl_card_info_get_id(info));
-	snprintf(device_name, sizeof(device_name), "comprC%u", this->props.card_nr);
-	snprintf(device_desc, sizeof(device_desc), "Compress-Offload device (ALSA card %u)", this->props.card_nr);
+	if (full)
+		this->device_info.change_mask = this->info_all;
 
-	ADD_DICT_ITEM(SPA_KEY_OBJECT_PATH,              path);
-	ADD_DICT_ITEM(SPA_KEY_DEVICE_API,               "alsa:compressed");
-	ADD_DICT_ITEM(SPA_KEY_DEVICE_NICK,              "alsa:compressed");
-	ADD_DICT_ITEM(SPA_KEY_DEVICE_NAME,              device_name);
-	ADD_DICT_ITEM(SPA_KEY_DEVICE_DESCRIPTION,       device_desc);
-	ADD_DICT_ITEM(SPA_KEY_MEDIA_CLASS,              "Audio/Device");
-	ADD_DICT_ITEM(SPA_KEY_API_ALSA_PATH,	        (char *)this->props.device);
-	ADD_DICT_ITEM(SPA_KEY_API_ALSA_CARD_ID,         snd_ctl_card_info_get_id(info));
-	ADD_DICT_ITEM(SPA_KEY_API_ALSA_CARD_COMPONENTS, snd_ctl_card_info_get_components(info));
-	ADD_DICT_ITEM(SPA_KEY_API_ALSA_CARD_DRIVER,     snd_ctl_card_info_get_driver(info));
-	ADD_DICT_ITEM(SPA_KEY_API_ALSA_CARD_NAME,       snd_ctl_card_info_get_name(info));
-	ADD_DICT_ITEM(SPA_KEY_API_ALSA_CARD_LONGNAME,   snd_ctl_card_info_get_longname(info));
-	ADD_DICT_ITEM(SPA_KEY_API_ALSA_CARD_MIXERNAME,  snd_ctl_card_info_get_mixername(info));
-
-	dinfo.props = &SPA_DICT_INIT(items, n_items);
+	if (this->device_info.change_mask) {
+		spa_log_debug(this->log, "open card %s", this->props.device);
+		if ((err = snd_ctl_open(&ctl_hndl, this->props.device, 0)) < 0) {
+			spa_log_error(this->log, "can't open control for card %s: %s",
+			              this->props.device, snd_strerror(err));
+			return err;
+		}
 
-	dinfo.change_mask |= SPA_DEVICE_CHANGE_MASK_PARAMS;
-	params0 = SPA_PARAM_INFO(SPA_PARAM_EnumProfile, SPA_PARAM_INFO_READ);
-	params1 = SPA_PARAM_INFO(SPA_PARAM_Profile, SPA_PARAM_INFO_READWRITE);
-	dinfo.n_params = SPA_N_ELEMENTS(params);
-	dinfo.params = params;
+		snd_ctl_card_info_alloca(&info);
+		if ((err = snd_ctl_card_info(ctl_hndl, info)) < 0) {
+			spa_log_error(this->log, "error hardware info: %s", snd_strerror(err));
+			goto finish;
+		}
 
-	spa_device_emit_info(&this->hooks, &dinfo);
+		snprintf(path, sizeof(path), "alsa:compressed:%s", snd_ctl_card_info_get_id(info));
+		snprintf(device_name, sizeof(device_name), "comprC%u", this->props.card_nr);
+		snprintf(device_desc, sizeof(device_desc), "Compress-Offload device (ALSA card %u)", this->props.card_nr);
+
+		ADD_DICT_ITEM(SPA_KEY_OBJECT_PATH,              path);
+		ADD_DICT_ITEM(SPA_KEY_DEVICE_API,               "alsa:compressed");
+		ADD_DICT_ITEM(SPA_KEY_DEVICE_NICK,              "alsa:compressed");
+		ADD_DICT_ITEM(SPA_KEY_DEVICE_NAME,              device_name);
+		ADD_DICT_ITEM(SPA_KEY_DEVICE_DESCRIPTION,       device_desc);
+		ADD_DICT_ITEM(SPA_KEY_MEDIA_CLASS,              "Audio/Device");
+		ADD_DICT_ITEM(SPA_KEY_API_ALSA_PATH,	        (char *)this->props.device);
+		ADD_DICT_ITEM(SPA_KEY_API_ALSA_CARD_ID,         snd_ctl_card_info_get_id(info));
+		ADD_DICT_ITEM(SPA_KEY_API_ALSA_CARD_COMPONENTS, snd_ctl_card_info_get_components(info));
+		ADD_DICT_ITEM(SPA_KEY_API_ALSA_CARD_DRIVER,     snd_ctl_card_info_get_driver(info));
+		ADD_DICT_ITEM(SPA_KEY_API_ALSA_CARD_NAME,       snd_ctl_card_info_get_name(info));
+		ADD_DICT_ITEM(SPA_KEY_API_ALSA_CARD_LONGNAME,   snd_ctl_card_info_get_longname(info));
+		ADD_DICT_ITEM(SPA_KEY_API_ALSA_CARD_MIXERNAME,  snd_ctl_card_info_get_mixername(info));
+
+		this->device_info.props = &SPA_DICT_INIT(items, n_items);
+
+		if (this->device_info.change_mask & SPA_DEVICE_CHANGE_MASK_PARAMS) {
+			SPA_FOR_EACH_ELEMENT_VAR(this->params, p) {
+				if (p->user > 0) {
+					p->flags ^= SPA_PARAM_INFO_SERIAL;
+					p->user = 0;
+				}
+			}
+		}
+		spa_device_emit_info(&this->hooks, &this->device_info);
+		this->device_info.change_mask = 0;
+	}
 
 finish:
 	spa_log_debug(this->log, "close card %s", this->props.device);
@@ -429,6 +441,15 @@
 	return 0;
 }
 
+static uint32_t find_profile_by_name(const char *name)
+{
+	if (spa_streq(name, "off"))
+		return 0;
+	else if (spa_streq(name, "on"))
+		return 1;
+	return SPA_ID_INVALID;
+}
+
 static int impl_set_param(void *object,
                           uint32_t id, uint32_t flags,
                           const struct spa_pod *param)
@@ -441,17 +462,26 @@
 	switch (id) {
 	case SPA_PARAM_Profile:
 	{
-		uint32_t idx;
+		uint32_t idx = SPA_ID_INVALID;
+		const char *name = NULL;
 
 		if ((res = spa_pod_parse_object(param,
-		                                SPA_TYPE_OBJECT_ParamProfile, NULL,
-		                                SPA_PARAM_PROFILE_index, SPA_POD_Int(&idx))) < 0) {
+						SPA_TYPE_OBJECT_ParamProfile, NULL,
+						SPA_PARAM_PROFILE_index, SPA_POD_OPT_Int(&idx),
+		                                SPA_PARAM_PROFILE_name, SPA_POD_OPT_String(&name))) < 0) {
 			spa_log_warn(this->log, "can't parse profile");
 			spa_debug_log_pod(this->log, SPA_LOG_LEVEL_DEBUG, 0, NULL, param);
 			return res;
 		}
+		if (idx == SPA_ID_INVALID && name == NULL)
+			return -EINVAL;
+		if (idx == SPA_ID_INVALID)
+			idx = find_profile_by_name(name);
+		if (idx == SPA_ID_INVALID)
+			return -EINVAL;
 
 		set_profile(this, idx);
+		emit_info(this, false);
 		break;
 	}
 	default:
@@ -545,6 +575,15 @@
 		}
 	}
 
+	this->device_info = SPA_DEVICE_INFO_INIT();
+	this->info_all = SPA_DEVICE_CHANGE_MASK_PROPS |
+		SPA_DEVICE_CHANGE_MASK_PARAMS;
+
+	this->paramsIDX_EnumProfile = SPA_PARAM_INFO(SPA_PARAM_EnumProfile, SPA_PARAM_INFO_READ);
+	this->paramsIDX_Profile = SPA_PARAM_INFO(SPA_PARAM_Profile, SPA_PARAM_INFO_READWRITE);
+	this->device_info.params = this->params;
+	this->device_info.n_params = SPA_N_ELEMENTS(this->params);
+
 	return 0;
 }

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/alsa-compress-offload-sink.c -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/alsa-compress-offload-sink.c Changed

@@ -227,7 +227,6 @@
 static int do_start(struct impl *this);
 static void do_stop(struct impl *this);
 static int write_queued_output_buffers(struct impl *this);
-static const char * spa_command_to_string(const struct spa_command *command);
 
 /* Node and port functions */
 
@@ -962,7 +961,7 @@
 
 	/* In here, we write as much data as possible. The device may
 	 * initially not have sufficient space, but it is possible
-	 * that due to ongoing data consumption, it can accomodate
+	 * that due to ongoing data consumption, it can accommodate
 	 * for more data in a next attempt, hence the "again" label.
 	 *
 	 * If during the write attempts, only a portion of a chunk
@@ -1051,26 +1050,6 @@
 }
 
 
-static const char * spa_command_to_string(const struct spa_command *command)
-{
-	switch (SPA_NODE_COMMAND_ID(command)) {
-	case SPA_NODE_COMMAND_Suspend: return "Suspend";
-	case SPA_NODE_COMMAND_Pause: return "Pause";
-	case SPA_NODE_COMMAND_Start: return "Start";
-	case SPA_NODE_COMMAND_Enable: return "Enable";
-	case SPA_NODE_COMMAND_Disable: return "Disable";
-	case SPA_NODE_COMMAND_Flush: return "Flush";
-	case SPA_NODE_COMMAND_Drain: return "Drain";
-	case SPA_NODE_COMMAND_Marker: return "Marker";
-	case SPA_NODE_COMMAND_ParamBegin: return "ParamBegin";
-	case SPA_NODE_COMMAND_ParamEnd: return "ParamEnd";
-	case SPA_NODE_COMMAND_RequestProcess: return "RequestProcess";
-	default: return "<unknown>";
-	}
-}
-
-
-
 /* Node and port functions */
 
 static const struct spa_dict_item node_info_items = {
@@ -1341,7 +1320,8 @@
 	spa_return_val_if_fail(this != NULL, -EINVAL);
 	spa_return_val_if_fail(command != NULL, -EINVAL);
 
-	spa_log_debug(this->log, "%p: got new command: %s", this, spa_command_to_string(command));
+	spa_log_debug(this->log, "%p: got new command: %s", this,
+		spa_debug_type_find_name(spa_type_node_command_id, SPA_NODE_COMMAND_ID(command)));
 
 	switch (SPA_NODE_COMMAND_ID(command)) {
 	case SPA_NODE_COMMAND_ParamBegin:

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/alsa-pcm-device.c -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/alsa-pcm-device.c Changed

@@ -48,6 +48,13 @@
 
 	struct spa_log *log;
 
+	uint32_t info_all;
+	struct spa_device_info device_info;
+
+#define IDX_EnumProfile		0
+#define IDX_Profile		1
+	struct spa_param_info params2;
+
 	struct spa_hook_list hooks;
 
 	struct props props;
@@ -229,6 +236,9 @@
 	spa_log_debug(this->log, "done enumerating PCM nodes for card %s", this->props.device);
 	snd_ctl_close(ctl_hndl);
 
+	this->device_info.change_mask |= SPA_DEVICE_CHANGE_MASK_PARAMS;
+	this->paramsIDX_Profile.user++;
+
 	return err;
 }
 
@@ -239,51 +249,54 @@
 	uint32_t n_items = 0;
 	snd_ctl_t *ctl_hndl;
 	snd_ctl_card_info_t *info;
-	struct spa_device_info dinfo;
-	struct spa_param_info params2;
 	char path128;
 
-	spa_log_debug(this->log, "open card %s", this->props.device);
-	if ((err = snd_ctl_open(&ctl_hndl, this->props.device, 0)) < 0) {
-		spa_log_error(this->log, "can't open control for card %s: %s",
-				this->props.device, snd_strerror(err));
-		return err;
-	}
-
-	snd_ctl_card_info_alloca(&info);
-	if ((err = snd_ctl_card_info(ctl_hndl, info)) < 0) {
-		spa_log_error(this->log, "error hardware info: %s", snd_strerror(err));
-		goto exit;
-	}
+	if (full)
+		this->device_info.change_mask = this->info_all;
 
-	dinfo = SPA_DEVICE_INFO_INIT();
+	if (this->device_info.change_mask) {
+		spa_log_debug(this->log, "open card %s", this->props.device);
+		if ((err = snd_ctl_open(&ctl_hndl, this->props.device, 0)) < 0) {
+			spa_log_error(this->log, "can't open control for card %s: %s",
+					this->props.device, snd_strerror(err));
+			return err;
+		}
 
-	dinfo.change_mask = SPA_DEVICE_CHANGE_MASK_PROPS;
+		snd_ctl_card_info_alloca(&info);
+		if ((err = snd_ctl_card_info(ctl_hndl, info)) < 0) {
+			spa_log_error(this->log, "error hardware info: %s", snd_strerror(err));
+			goto exit;
+		}
 
 #define ADD_ITEM(key, value) itemsn_items++ = SPA_DICT_ITEM_INIT(key, value)
-	snprintf(path, sizeof(path), "alsa:pcm:%s", snd_ctl_card_info_get_id(info));
-	ADD_ITEM(SPA_KEY_OBJECT_PATH, path);
-	ADD_ITEM(SPA_KEY_DEVICE_API, "alsa:pcm");
-	ADD_ITEM(SPA_KEY_MEDIA_CLASS, "Audio/Device");
-	ADD_ITEM(SPA_KEY_API_ALSA_PATH,	(char *)this->props.device);
-	ADD_ITEM(SPA_KEY_API_ALSA_CARD_ID, snd_ctl_card_info_get_id(info));
-	ADD_ITEM(SPA_KEY_API_ALSA_CARD_COMPONENTS, snd_ctl_card_info_get_components(info));
-	ADD_ITEM(SPA_KEY_API_ALSA_CARD_DRIVER, snd_ctl_card_info_get_driver(info));
-	ADD_ITEM(SPA_KEY_API_ALSA_CARD_NAME, snd_ctl_card_info_get_name(info));
-	ADD_ITEM(SPA_KEY_API_ALSA_CARD_LONGNAME, snd_ctl_card_info_get_longname(info));
-	ADD_ITEM(SPA_KEY_API_ALSA_CARD_MIXERNAME, snd_ctl_card_info_get_mixername(info));
-	dinfo.props = &SPA_DICT_INIT(items, n_items);
+		snprintf(path, sizeof(path), "alsa:pcm:%s", snd_ctl_card_info_get_id(info));
+		ADD_ITEM(SPA_KEY_OBJECT_PATH, path);
+		ADD_ITEM(SPA_KEY_DEVICE_API, "alsa:pcm");
+		ADD_ITEM(SPA_KEY_MEDIA_CLASS, "Audio/Device");
+		ADD_ITEM(SPA_KEY_API_ALSA_PATH,	(char *)this->props.device);
+		ADD_ITEM(SPA_KEY_API_ALSA_CARD_ID, snd_ctl_card_info_get_id(info));
+		ADD_ITEM(SPA_KEY_API_ALSA_CARD_COMPONENTS, snd_ctl_card_info_get_components(info));
+		ADD_ITEM(SPA_KEY_API_ALSA_CARD_DRIVER, snd_ctl_card_info_get_driver(info));
+		ADD_ITEM(SPA_KEY_API_ALSA_CARD_NAME, snd_ctl_card_info_get_name(info));
+		ADD_ITEM(SPA_KEY_API_ALSA_CARD_LONGNAME, snd_ctl_card_info_get_longname(info));
+		ADD_ITEM(SPA_KEY_API_ALSA_CARD_MIXERNAME, snd_ctl_card_info_get_mixername(info));
+		this->device_info.props = &SPA_DICT_INIT(items, n_items);
 #undef ADD_ITEM
 
-	dinfo.change_mask |= SPA_DEVICE_CHANGE_MASK_PARAMS;
-	params0 = SPA_PARAM_INFO(SPA_PARAM_EnumProfile, SPA_PARAM_INFO_READ);
-	params1 = SPA_PARAM_INFO(SPA_PARAM_Profile, SPA_PARAM_INFO_READWRITE);
-	dinfo.n_params = SPA_N_ELEMENTS(params);
-	dinfo.params = params;
+		if (this->device_info.change_mask & SPA_DEVICE_CHANGE_MASK_PARAMS) {
+			SPA_FOR_EACH_ELEMENT_VAR(this->params, p) {
+				if (p->user > 0) {
+					p->flags ^= SPA_PARAM_INFO_SERIAL;
+					p->user = 0;
+				}
+			}
+		}
 
-	spa_device_emit_info(&this->hooks, &dinfo);
+		spa_device_emit_info(&this->hooks, &this->device_info);
+		this->device_info.change_mask = 0;
+	}
 
-      exit:
+exit:
 	spa_log_debug(this->log, "close card %s", this->props.device);
 	snd_ctl_close(ctl_hndl);
 	return err;
@@ -427,6 +440,15 @@
 	return 0;
 }
 
+static uint32_t find_profile_by_name(const char *name)
+{
+	if (spa_streq(name, "off"))
+		return 0;
+	else if (spa_streq(name, "on"))
+		return 1;
+	return SPA_ID_INVALID;
+}
+
 static int impl_set_param(void *object,
 			  uint32_t id, uint32_t flags,
 			  const struct spa_pod *param)
@@ -439,17 +461,32 @@
 	switch (id) {
 	case SPA_PARAM_Profile:
 	{
-		uint32_t idx;
+		uint32_t idx = SPA_ID_INVALID;
+		const char *name = NULL;
 
-		if ((res = spa_pod_parse_object(param,
+		if (param == NULL) {
+			idx = 1;
+		} else if ((res = spa_pod_parse_object(param,
 				SPA_TYPE_OBJECT_ParamProfile, NULL,
-				SPA_PARAM_PROFILE_index, SPA_POD_Int(&idx))) < 0) {
+				SPA_PARAM_PROFILE_index, SPA_POD_OPT_Int(&idx),
+				SPA_PARAM_PROFILE_name, SPA_POD_OPT_String(&name))) < 0) {
 			spa_log_warn(this->log, "can't parse profile");
 			spa_debug_log_pod(this->log, SPA_LOG_LEVEL_DEBUG, 0, NULL, param);
 			return res;
 		}
+		if (idx == SPA_ID_INVALID && name == NULL) {
+			spa_log_warn(this->log, "profile needs name or index");
+			return -EINVAL;
+		}
+		if (idx == SPA_ID_INVALID)
+			idx = find_profile_by_name(name);
+		if (idx == SPA_ID_INVALID) {
+			spa_log_warn(this->log, "unknown profile %s", name);
+			return -EINVAL;
+		}
 
 		set_profile(this, idx);
+		emit_info(this, false);
 		break;
 	}
 	default:
@@ -529,6 +566,15 @@
 	if (info && (str = spa_dict_lookup(info, SPA_KEY_API_ALSA_PATH)))
 		snprintf(this->props.device, 64, "%s", str);
 
+	this->device_info = SPA_DEVICE_INFO_INIT();
+	this->info_all = SPA_DEVICE_CHANGE_MASK_PROPS |
+		SPA_DEVICE_CHANGE_MASK_PARAMS;
+
+	this->paramsIDX_EnumProfile = SPA_PARAM_INFO(SPA_PARAM_EnumProfile, SPA_PARAM_INFO_READ);
+	this->paramsIDX_Profile = SPA_PARAM_INFO(SPA_PARAM_Profile, SPA_PARAM_INFO_READWRITE);
+	this->device_info.params = this->params;
+	this->device_info.n_params = SPA_N_ELEMENTS(this->params);
+
 	return 0;
 }

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/alsa-pcm-sink.c -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/alsa-pcm-sink.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/alsa-pcm.c -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/alsa-pcm.c Changed

@@ -133,6 +133,8 @@
 		state->multi_rate = spa_atob(s);
 	} else if (spa_streq(k, "api.alsa.htimestamp")) {
 		state->htimestamp = spa_atob(s);
+	} else if (spa_streq(k, "api.alsa.htimestamp.max-errors")) {
+		state->htimestamp_max_errors = atoi(s);
 	} else if (spa_streq(k, "api.alsa.auto-link")) {
 		state->auto_link = spa_atob(s);
 	} else if (spa_streq(k, "latency.internal.rate")) {
@@ -411,9 +413,17 @@
 			SPA_PROP_INFO_type, SPA_POD_String(state->clock_name),
 			SPA_PROP_INFO_params, SPA_POD_Bool(true));
 		break;
+	case 18:
+		param = spa_pod_builder_add_object(b,
+			SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo,
+			SPA_PROP_INFO_name, SPA_POD_String("api.alsa.htimestamp.max-errors"),
+			SPA_PROP_INFO_description, SPA_POD_String("Max errors before disabling htimestamp"),
+			SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Int(state->htimestamp_max_errors, 0, INT32_MAX),
+			SPA_PROP_INFO_params, SPA_POD_Bool(true));
+		break;
 	// While adding params here, update the math in default too
 	default:
-		idx -= 17;
+		idx -= 18;
 		if (idx <= state->num_bind_ctls)
 			param = enum_bind_ctl_propinfo(state, idx - 1, b);
 		else
@@ -425,36 +435,53 @@
 static void add_bind_ctl_param(struct state *state, const snd_ctl_elem_value_t *elem, const snd_ctl_elem_info_t *info,
 		struct spa_pod_builder *b)
 {
+	struct spa_pod_frame f1;
 	char param_name1024;
+	unsigned int count = snd_ctl_elem_info_get_count(info);
+	int type = snd_ctl_elem_info_get_type(info);
+	bool is_array = count > 1 && type != SND_CTL_ELEM_TYPE_BYTES;
 
 	snprintf(param_name, sizeof(param_name), "api.alsa.bind-ctl.%s",
 			snd_ctl_elem_info_get_name(info));
 	spa_pod_builder_string(b, param_name);
 
-	switch (snd_ctl_elem_info_get_type(info)) {
+	if (is_array)
+		spa_pod_builder_push_array(b, &f0);
+
+	switch (type) {
 		case SND_CTL_ELEM_TYPE_BOOLEAN:
-			spa_pod_builder_bool(b, snd_ctl_elem_value_get_boolean(elem, 0));
+			for (unsigned int i = 0; i < count; i++)
+				spa_pod_builder_bool(b, snd_ctl_elem_value_get_boolean(elem, i));
 			break;
 
 		case SND_CTL_ELEM_TYPE_INTEGER:
-			spa_pod_builder_int(b, snd_ctl_elem_value_get_integer(elem, 0));
+			for (unsigned int i = 0; i < count; i++)
+				spa_pod_builder_int(b, snd_ctl_elem_value_get_integer(elem, i));
 			break;
 
 		case SND_CTL_ELEM_TYPE_INTEGER64:
-			spa_pod_builder_long(b, snd_ctl_elem_value_get_integer64(elem, 0));
+			for (unsigned int i = 0; i < count; i++)
+				spa_pod_builder_long(b, snd_ctl_elem_value_get_integer64(elem, i));
 			break;
 
 		case SND_CTL_ELEM_TYPE_ENUMERATED:
-			spa_pod_builder_int(b, snd_ctl_elem_value_get_enumerated(elem, 0));
+			for (unsigned int i = 0; i < count; i++)
+				spa_pod_builder_int(b, snd_ctl_elem_value_get_enumerated(elem, i));
+			break;
+
+		case SND_CTL_ELEM_TYPE_BYTES:
+			spa_pod_builder_bytes(b, snd_ctl_elem_value_get_bytes(elem), count);
 			break;
 
 		default:
-			// FIXME: we can probably support bytes but the length seems unknown in the API
 			spa_log_warn(state->log, "%s ctl '%s' not supported",
 					snd_ctl_elem_type_name(snd_ctl_elem_info_get_type(info)),
 					snd_ctl_elem_info_get_name(info));
 			break;
 	}
+
+	if (is_array)
+		spa_pod_builder_pop(b, &f0);
 }
 
 static void add_bind_ctl_params(struct state *state, struct spa_pod_builder *b)
@@ -462,6 +489,10 @@
 	int err;
 
 	for (unsigned int i = 0; i < state->num_bind_ctls; i++) {
+
+		if(!state->bound_ctlsi.value || !state->bound_ctlsi.info)
+			continue;
+
 		err = snd_ctl_elem_read(state->ctl, state->bound_ctlsi.value);
 		if (err < 0) {
 			spa_log_warn(state->log, "Could not read elem value for '%s': %s",
@@ -530,6 +561,9 @@
 	spa_pod_builder_string(b, "api.alsa.htimestamp");
 	spa_pod_builder_bool(b, state->htimestamp);
 
+	spa_pod_builder_string(b, "api.alsa.htimestamp.max-errors");
+	spa_pod_builder_int(b, state->htimestamp_max_errors);
+
 	spa_pod_builder_string(b, "latency.internal.rate");
 	spa_pod_builder_int(b, state->process_latency.rate);
 
@@ -629,62 +663,193 @@
 
 static void bind_ctl_event(struct spa_source *source)
 {
-	// We don't know if a bound element changed or not, so let's find out
 	struct state *state = source->data;
+	snd_ctl_event_t *ev;
+	snd_ctl_elem_id_t *id, *bound_id;
 	snd_ctl_elem_value_t *old_value;
-	bool changed = false;
+	unsigned short revents;
+	int err;
 
+	// Do the same demangling of revents we do for PCM pollfds
+	for (int i = 0; i < state->ctl_n_fds; i++) {
+		state->ctl_pfdsi.revents = state->ctl_sourcesi.rmask;
+		state->ctl_sourcesi.rmask = 0;
+	}
+
+	err = snd_ctl_poll_descriptors_revents(state->ctl, state->ctl_pfds, state->ctl_n_fds, &revents);
+	if (SPA_UNLIKELY(err < 0)) {
+		spa_log_warn(state->log, "Could not read ctl revents: %s", snd_strerror(err));
+		return;
+	}
+
+	if (!revents) {
+		spa_log_trace(state->log, "Got a bind ctl wakeup but no actual event");
+		return;
+	}
+
+	snd_ctl_event_alloca(&ev);
+	snd_ctl_elem_id_alloca(&id);
+	snd_ctl_elem_id_alloca(&bound_id);
 	snd_ctl_elem_value_alloca(&old_value);
 
+	while ((err = snd_ctl_read(state->ctl, ev) > 0)) {
+		bool changed = false;
+
+		if (snd_ctl_event_get_type(ev) != SND_CTL_EVENT_ELEM)
+			continue;
+
+		snd_ctl_event_elem_get_id(ev, id);
+
+		for (unsigned int i = 0; i < state->num_bind_ctls; i++) {
+			int err;
+
+			if(!state->bound_ctlsi.value || !state->bound_ctlsi.info)
+				continue;
+
+			// Check if we have the right element
+			snd_ctl_elem_value_get_id(state->bound_ctlsi.value, bound_id);
+			if (snd_ctl_elem_id_compare_set(id, bound_id) ||
+					snd_ctl_elem_id_compare_numid(id, bound_id)) {
+				continue;
+			}
+
+			snd_ctl_elem_value_copy(old_value, state->bound_ctlsi.value);
+
+			err = snd_ctl_elem_read(state->ctl, state->bound_ctlsi.value);
+			if (err < 0) {
+				spa_log_warn(state->log, "Could not read ctl '%s': %s",
+						state->bound_ctlsi.name, snd_strerror(err));
+				continue;
+			}
+
+			if (snd_ctl_elem_value_compare(old_value, state->bound_ctlsi.value) != 0) {
+				// We don't need to check all the ctls, if one changed,
+				// we'll emit a notification and they'll be read when
+				// the props are read
+				spa_log_debug(state->log, "bound ctl '%s' has changed", state->bound_ctlsi.name);
+				changed = true;
+				break;
+			}
+		}
+
+		if (changed) {
+			state->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
+			state->paramsNODE_Props.user++;
+			spa_alsa_emit_node_info(state, false);
+		}
+	}
+
+	if (err < 0 && err != -EAGAIN)
+		spa_log_warn(state->log, "Could not read ctl: %s", snd_strerror(err));
+}
+
+static void fetch_bind_ctls(struct state *state)
+{
+	snd_ctl_elem_list_t* element_list;
+	unsigned int elem_count = 0;
+	int err;
+
+	if (!state->num_bind_ctls)
+		return;
+
+	snd_ctl_elem_list_alloca(&element_list);
+
+	/* Get number of elements */
+	err = snd_ctl_elem_list(state->ctl, element_list);
+	if (SPA_UNLIKELY(err < 0)) {
+		spa_log_warn(state->log, "Couldn't get elem list count. Error: %s",
+			     snd_strerror(err));
+		return;
+	}
+
+	elem_count = snd_ctl_elem_list_get_count(element_list);
+	err = snd_ctl_elem_list_alloc_space(element_list, elem_count);
+	if (SPA_UNLIKELY(err < 0)) {
+		spa_log_error(state->log, "Couldn't allocate elem_list space. Error: %s",
+			      snd_strerror(err));
+		return;
+	}
+
+	/* Get identifiers */
+	err = snd_ctl_elem_list(state->ctl, element_list);
+	if (SPA_UNLIKELY(err < 0)) {
+		spa_log_warn(state->log, "Couldn't get elem list. Error: %s",
+			     snd_strerror(err));
+		goto cleanup;
+	}
+
+
 	for (unsigned int i = 0; i < state->num_bind_ctls; i++) {
-		int err;
+		unsigned int numid = 0;
 
-		snd_ctl_elem_value_copy(old_value, state->bound_ctlsi.value);
+		for (unsigned int j = 0; j < elem_count; j++) {
+			const char* element_name = snd_ctl_elem_list_get_name(element_list, j);
 
-		err = snd_ctl_elem_read(state->ctl, state->bound_ctlsi.value);
-		if (err < 0) {
-			spa_log_warn(state->log, "Could not read ctl '%s': %s",
-					state->bound_ctlsi.name, snd_strerror(err));
+			if (!strcmp(element_name, state->bound_ctlsi.name)) {
+				numid = snd_ctl_elem_list_get_numid(element_list, j);
+				break;
+			}
+		}
+
+		/* zero = invalid numid */
+		if (SPA_UNLIKELY(!numid)) {
+			spa_log_warn(state->log, "Didn't find ctl: '%s', count: %u",
+				     state->bound_ctlsi.name, elem_count);
 			continue;
 		}
 
-		if (snd_ctl_elem_value_compare(old_value, state->bound_ctlsi.value) != 0) {
-			// We don't need to check all the ctls, if one changed,
-			// we'll emit a notification and they'll be read when
-			// the props are read
-			spa_log_debug(state->log, "bound ctl '%s' has changed", state->bound_ctlsi.name);
-			changed = true;
-			break;
+		snd_ctl_elem_info_malloc(&state->bound_ctlsi.info);
+		snd_ctl_elem_info_set_numid(state->bound_ctlsi.info, numid);
+
+		err = snd_ctl_elem_info(state->ctl, state->bound_ctlsi.info);
+		if (SPA_UNLIKELY(err < 0)) {
+			spa_log_warn(state->log, "Could not read elem info for '%s': %s",
+				     state->bound_ctlsi.name, snd_strerror(err));
+
+			snd_ctl_elem_info_free(state->bound_ctlsi.info);
+			state->bound_ctlsi.info = NULL;
+			continue;
 		}
+
+		snd_ctl_elem_value_malloc(&state->bound_ctlsi.value);
+		snd_ctl_elem_value_set_numid(state->bound_ctlsi.value, numid);
+
+		spa_log_debug(state->log, "Binding ctl for '%s'",
+			      snd_ctl_elem_info_get_name(state->bound_ctlsi.info));
 	}
 
-	if (changed) {
-		state->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
-		state->paramsNODE_Props.user++;
-		spa_alsa_emit_node_info(state, false);
+cleanup:
+	snd_ctl_elem_list_free_space(element_list);
+}
+
+int open_card_ctl(struct state *state)
+{
+	int err;
+	char card_name256;
+
+	snprintf(card_name, sizeof(card_name), "hw:%d", state->card_index);
+
+	err = snd_ctl_open(&state->ctl, card_name, SND_CTL_NONBLOCK);
+	if (err < 0) {
+		spa_log_info(state->log, "%s could not find ctl card: %s",
+				card_name, snd_strerror(err));
+		return err;
 	}
+
+	return 0;
 }
 
 static void bind_ctls_for_params(struct state *state)
 {
-	struct pollfd pfds16;
 	int err;
 
 	if (state->num_bind_ctls == 0)
 		return;
 
 	if (!state->ctl) {
-		char device_name256;
-
-		fill_device_name(state, NULL, device_name, sizeof(device_name));
-
-		err = snd_ctl_open(&state->ctl, device_name, SND_CTL_NONBLOCK);
-		if (err < 0) {
-			spa_log_info(state->log, "%s could not find ctl device: %s",
-					state->props.device, snd_strerror(err));
-			state->ctl = NULL;
+		err = open_card_ctl(state);
+		if (err < 0)
 			return;
-		}
 	}
 
 	state->ctl_n_fds = snd_ctl_poll_descriptors_count(state->ctl);
@@ -693,7 +858,7 @@
 		state->ctl_n_fds = SPA_N_ELEMENTS(state->ctl_sources);
 	}
 
-	if ((err = snd_ctl_poll_descriptors(state->ctl, pfds, state->ctl_n_fds)) < 0) {
+	if ((err = snd_ctl_poll_descriptors(state->ctl, state->ctl_pfds, state->ctl_n_fds)) < 0) {
 		spa_log_warn(state->log, "Could not get poll descriptors: %s", snd_strerror(err));
 		return;
 	}
@@ -703,38 +868,13 @@
 	for (int i = 0; i < state->ctl_n_fds; i++) {
 		state->ctl_sourcesi.func = bind_ctl_event;
 		state->ctl_sourcesi.data = state;
-		state->ctl_sourcesi.fd = pfdsi.fd;
+		state->ctl_sourcesi.fd = state->ctl_pfdsi.fd;
 		state->ctl_sourcesi.mask = SPA_IO_IN;
 		state->ctl_sourcesi.rmask = 0;
 		spa_loop_add_source(state->main_loop, &state->ctl_sourcesi);
 	}
 
-	for (unsigned int i = 0; i < state->num_bind_ctls; i++) {
-		snd_ctl_elem_id_t *id;
-
-		snd_ctl_elem_id_alloca(&id);
-		snd_ctl_elem_id_set_name(id, state->bound_ctlsi.name);
-		snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_PCM);
-
-		snd_ctl_elem_info_malloc(&state->bound_ctlsi.info);
-		snd_ctl_elem_info_set_id(state->bound_ctlsi.info, id);
-
-		err = snd_ctl_elem_info(state->ctl, state->bound_ctlsi.info);
-		if (err < 0) {
-			spa_log_warn(state->log, "Could not read elem info for '%s': %s",
-					state->bound_ctlsi.name, snd_strerror(err));
-
-			snd_ctl_elem_info_free(state->bound_ctlsi.info);
-			state->bound_ctlsi.info = NULL;
-			continue;
-		}
-
-		snd_ctl_elem_value_malloc(&state->bound_ctlsi.value);
-		snd_ctl_elem_value_set_id(state->bound_ctlsi.value, id);
-
-		spa_log_debug(state->log, "Binding ctl for '%s'",
-				snd_ctl_elem_info_get_name(state->bound_ctlsi.info));
-	}
+	fetch_bind_ctls(state);
 }
 
 int spa_alsa_init(struct state *state, const struct spa_dict *info)
@@ -753,6 +893,7 @@
 
 	state->multi_rate = true;
 	state->htimestamp = false;
+	state->htimestamp_max_errors = MAX_HTIMESTAMP_ERROR;
 	for (i = 0; info && i < info->n_items; i++) {
 		const char *k = info->itemsi.key;
 		const char *s = info->itemsi.value;
@@ -762,6 +903,8 @@
 			state->card_index = atoi(s);
 		} else if (spa_streq(k, SPA_KEY_API_ALSA_OPEN_UCM)) {
 			state->open_ucm = spa_atob(s);
+			if (state->open_ucm)
+				state->props.use_chmap = true;
 		} else if (spa_streq(k, "clock.quantum-limit")) {
 			spa_atou32(s, &state->quantum_limit, 0);
 		} else if (spa_streq(k, SPA_KEY_API_ALSA_BIND_CTLS)) {
@@ -861,7 +1004,7 @@
 	return err;
 }
 
-static int probe_pitch_ctl(struct state *state, const char* device_name)
+static int probe_pitch_ctl(struct state *state)
 {
 	snd_ctl_elem_id_t *id;
 	/* TODO: Add configuration params for the control name and units */
@@ -875,13 +1018,10 @@
 	snd_lib_error_set_handler(silence_error_handler);
 
 	if (!state->ctl) {
-		err = snd_ctl_open(&state->ctl, device_name, SND_CTL_NONBLOCK);
-		if (err < 0) {
-			spa_log_info(state->log, "%s could not find ctl device: %s",
-					device_name, snd_strerror(err));
-			state->ctl = NULL;
+		err = open_card_ctl(state);
+		if (err < 0)
 			goto error;
-		}
+
 		opened = true;
 	}
 
@@ -894,8 +1034,8 @@
 
 	err = snd_ctl_elem_read(state->ctl, state->pitch_elem);
 	if (err < 0) {
-		spa_log_debug(state->log, "%s: did not find ctl %s: %s",
-				device_name, elem_name, snd_strerror(err));
+		spa_log_debug(state->log, "%s: did not find ctl: %s",
+				 elem_name, snd_strerror(err));
 
 		snd_ctl_elem_value_free(state->pitch_elem);
 		state->pitch_elem = NULL;
@@ -912,7 +1052,7 @@
 	CHECK(snd_ctl_elem_write(state->ctl, state->pitch_elem), "snd_ctl_elem_write");
 	state->last_rate = 1.0;
 
-	spa_log_info(state->log, "%s: found ctl %s", device_name, elem_name);
+	spa_log_info(state->log, "found ctl %s", elem_name);
 	err = 0;
 error:
 	snd_lib_error_set_handler(NULL);
@@ -979,7 +1119,7 @@
 	state->sample_count = 0;
 	state->sample_time = 0;
 
-	probe_pitch_ctl(state, device_name);
+	probe_pitch_ctl(state);
 
 	return 0;
 
@@ -1353,6 +1493,8 @@
 			goto skip_channels;
 		}
 
+		spa_log_debug(state->log, "%p: using chmap", state);
+
 		sanitize_map(map);
 		spa_pod_builder_int(b, map->channels);
 
@@ -1385,10 +1527,13 @@
 		spa_pod_builder_pop(b, &f0);
 
 		if (min == max) {
-			if (state->default_pos.channels == min)
+			if (state->default_pos.channels == min) {
 				map = &state->default_pos;
-			else if (min == max && min <= 8)
+				spa_log_debug(state->log, "%p: using provided default", state);
+			} else if (min <= 8) {
 				map = &default_mapmin;
+				spa_log_debug(state->log, "%p: using default %d channel map", state, min);
+			}
 		}
 		if (map) {
 			spa_pod_builder_prop(b, SPA_FORMAT_AUDIO_position, 0);
@@ -1789,7 +1934,10 @@
 		if (state->stream == SND_PCM_STREAM_CAPTURE)
 			state->headroom = SPA_MAX(state->headroom, 32u);
 	}
-	state->headroom = SPA_MIN(state->headroom, state->buffer_frames);
+	if (SPA_LIKELY(state->buffer_frames >= state->threshold))
+		state->headroom = SPA_MIN(state->headroom, state->buffer_frames - state->threshold);
+	else
+		state->headroom = 0;
 
 	latency = SPA_MAX(state->min_delay, SPA_MIN(state->max_delay, state->headroom));
 	if (rate != 0 && state->rate != 0)
@@ -1817,7 +1965,7 @@
 			state->have_format, state->started);
 
 	state->use_mmap = !state->disable_mmap;
-	state->force_position = false;
+	state->force_rate = false;
 
 	switch (fmt->media_subtype) {
 	case SPA_MEDIA_SUBTYPE_raw:
@@ -1880,7 +2028,7 @@
 				IEC958_AES0_CON_EMPHASIS_NONE | IEC958_AES0_NONAUDIO,
 				IEC958_AES1_CON_ORIGINAL | IEC958_AES1_CON_PCM_CODER,
 				0, aes3);
-		state->force_position = true;
+		state->force_rate = true;
 		break;
 	}
 	case SPA_MEDIA_SUBTYPE_dsd:
@@ -2135,11 +2283,11 @@
 	 * means that to adjust the playback rate, we need to apply the inverse
 	 * of the given rate. */
 	if (state->stream == SND_PCM_STREAM_CAPTURE) {
-		pitch = 1000000 * state->rate_match->rate;
-		last_pitch = 1000000 * state->last_rate;
+		pitch = (uint64_t)(1000000 * state->rate_match->rate);
+		last_pitch = (uint64_t)(1000000 * state->last_rate);
 	} else {
-		pitch = 1000000 / state->rate_match->rate;
-		last_pitch = 1000000 / state->last_rate;
+		pitch = (uint64_t)(1000000 / state->rate_match->rate);
+		last_pitch = (uint64_t)(1000000 / state->last_rate);
 	}
 
 	/* The pitch adjustment is limited to 1 ppm */
@@ -2183,14 +2331,15 @@
 	CHECK(snd_pcm_sw_params_set_start_threshold(hndl, params, LONG_MAX), "set_start_threshold");
 
 	if (state->disable_tsched) {
-		snd_pcm_uframes_t avail_min;
+		snd_pcm_uframes_t avail_min = 0;
 
 		if (state->stream == SND_PCM_STREAM_PLAYBACK) {
 			/* wake up when buffer has target frames or less data (will underrun soon) */
-			avail_min = state->buffer_frames - state->threshold;
+			if (state->buffer_frames >= (state->threshold + state->headroom))
+				avail_min = state->buffer_frames - (state->threshold + state->headroom);
 		} else {
 			/* wake up when there's target frames or more (enough for us to read and push a buffer) */
-			avail_min = state->threshold;
+			avail_min = SPA_MIN(state->threshold + state->headroom, state->buffer_frames);
 		}
 
 		CHECK(snd_pcm_sw_params_set_avail_min(hndl, params, avail_min), "set_avail_min");
@@ -2343,7 +2492,7 @@
 	return 0;
 }
 
-static inline int check_position_config(struct state *state);
+static inline int check_position_config(struct state *state, bool starting);
 
 static int alsa_recover(struct state *state)
 {
@@ -2410,7 +2559,7 @@
 	spa_list_for_each(follower, &driver->rt.followers, rt.driver_link) {
 		if (follower != driver && follower->linked) {
 			do_drop(follower);
-			check_position_config(follower);
+			check_position_config(follower, false);
 		}
 	}
 	do_prepare(driver);
@@ -2429,7 +2578,7 @@
 static inline snd_pcm_sframes_t alsa_avail(struct state *state)
 {
 	snd_pcm_sframes_t avail;
-	if (state->disable_tsched && !state->resample)
+	if (!state->matching && state->disable_tsched && !state->resample)
 		avail = snd_pcm_avail_update(state->hndl);
 	else
 		avail = snd_pcm_avail(state->hndl);
@@ -2483,8 +2632,8 @@
 			if (SPA_ABS(diff) < state->threshold * 3) {
 				*delay += SPA_CLAMP(diff, -((int64_t)state->threshold), (int64_t)state->threshold);
 				state->htimestamp_error = 0;
-			} else {
-				if (++state->htimestamp_error > MAX_HTIMESTAMP_ERROR) {
+			} else if (state->htimestamp_max_errors) {
+				if (++state->htimestamp_error > state->htimestamp_max_errors) {
 					spa_log_error(state->log, "%s: wrong htimestamps from driver, disabling",
 						state->name);
 					state->htimestamp_error = 0;
@@ -2578,7 +2727,7 @@
 		corr = 1.0;
 
 	if (diff < 0)
-		state->next_time += diff / corr * 1e9 / state->rate;
+		state->next_time += (uint64_t)(diff / corr * 1e9 / state->rate);
 
 	if (SPA_UNLIKELY((state->next_time - state->base_time) > BW_PERIOD)) {
 		state->base_time = state->next_time;
@@ -2602,7 +2751,7 @@
 			SPA_FLAG_UPDATE(state->rate_match->flags, SPA_IO_RATE_MATCH_FLAG_ACTIVE, state->matching);
 	}
 
-	state->next_time += state->threshold / corr * 1e9 / state->rate;
+	state->next_time += (uint64_t)(state->threshold / corr * 1e9 / state->rate);
 
 	if (SPA_LIKELY(!follower && state->clock)) {
 		state->clock->nsec = current_time;
@@ -2655,7 +2804,7 @@
 	}
 }
 
-static inline int check_position_config(struct state *state)
+static inline int check_position_config(struct state *state, bool starting)
 {
 	uint64_t target_duration;
 	struct spa_fraction target_rate;
@@ -2664,15 +2813,19 @@
 	if (SPA_UNLIKELY((pos = state->position) == NULL))
 		return 0;
 
-	if (state->force_position ||
-	    (state->disable_tsched && state->started && !state->following)) {
+	if (state->disable_tsched && (starting || state->started) && !state->following) {
 		target_duration = state->period_frames;
 		target_rate = SPA_FRACTION(1, state->rate);
 		pos->clock.target_duration = target_duration;
 		pos->clock.target_rate = target_rate;
 	} else {
 		target_duration = pos->clock.target_duration;
-		target_rate = pos->clock.target_rate;
+		if (state->force_rate && !state->following) {
+			target_rate = SPA_FRACTION(1, state->rate);
+			pos->clock.target_rate = target_rate;
+		} else {
+			target_rate = pos->clock.target_rate;
+		}
 	}
 	if (target_duration == 0 || target_rate.denom == 0)
 		return -EIO;
@@ -2701,12 +2854,12 @@
 	snd_pcm_uframes_t avail, delay, target;
 	bool following = state->following;
 
-	if (SPA_UNLIKELY((res = check_position_config(state)) < 0))
+	if (SPA_UNLIKELY((res = check_position_config(state, false)) < 0))
 		return res;
 
 	if (SPA_UNLIKELY((res = get_status(state, current_time, &avail, &delay, &target)) < 0)) {
 		spa_log_error(state->log, "get_status error: %s", spa_strerror(res));
-		state->next_time += state->threshold * 1e9 / state->rate;
+		state->next_time += (uint64_t)(state->threshold * 1e9 / state->rate);
 		return res;
 	}
 
@@ -2962,12 +3115,12 @@
 	if (SPA_UNLIKELY(!state->alsa_started))
 		return 0;
 
-	if (SPA_UNLIKELY((res = check_position_config(state)) < 0))
+	if (SPA_UNLIKELY((res = check_position_config(state, false)) < 0))
 		return res;
 
 	if (SPA_UNLIKELY((res = get_status(state, current_time, &avail, &delay, &target)) < 0)) {
 		spa_log_error(state->log, "get_status error: %s", spa_strerror(res));
-		state->next_time += state->threshold * 1e9 / state->rate;
+		state->next_time += (uint64_t)(state->threshold * 1e9 / state->rate);
 		return res;
 	}
 
@@ -3174,56 +3327,10 @@
 	return SPA_TIMESPEC_TO_NSEC(&now);
 }
 
-static void alsa_wakeup_event(struct spa_source *source)
+static inline int alsa_do_wakeup_work(struct state *state, uint64_t current_time)
 {
-	struct state *state = source->data, *follower;
-	uint64_t expire, current_time;
-	int res, suppressed;
-
-	if (SPA_UNLIKELY(state->disable_tsched)) {
-		/* ALSA poll fds need to be "demangled" to know whether it's a real wakeup */
-		int err;
-		unsigned short revents;
-
-		current_time = get_time_ns(state);
-
-		for (int i = 0; i < state->n_fds; i++) {
-			state->pfdsi.revents = state->sourcei.rmask;
-			/* Reset so that we only handle all our sources' events once */
-			state->sourcei.rmask = 0;
-		}
-
-		if (SPA_UNLIKELY(err = snd_pcm_poll_descriptors_revents(state->hndl,
-						state->pfds, state->n_fds, &revents))) {
-			spa_log_error(state->log, "Could not look up revents: %s",
-					snd_strerror(err));
-			return;
-		}
-
-		if (!revents) {
-			spa_log_trace_fp(state->log, "Woken up with no work to do");
-			return;
-		}
-		if (revents & POLLERR) {
-			spa_log_trace_fp(state->log, "poll error");
-			if ((res = alsa_recover(state)) < 0)
-				return;
-		}
-	} else {
-		if (SPA_LIKELY(state->started)) {
-			if (SPA_UNLIKELY((res = spa_system_timerfd_read(state->data_system,
-						state->timerfd, &expire)) < 0)) {
-			/* we can get here when the timer is changed since the last
-				 * timerfd wakeup, for example by do_reassign_follower() executed
-				 * in the same epoll wakeup cycle */
-				if (res != -EAGAIN)
-					spa_log_warn(state->log, "%p: error reading timerfd: %s",
-							state, spa_strerror(res));
-				return;
-			}
-		}
-		current_time = state->next_time;
-	}
+	struct state *follower;
+	int res;
 
 	/* first do all the sync */
 	if (state->stream == SND_PCM_STREAM_CAPTURE)
@@ -3232,7 +3339,7 @@
 		res = alsa_write_sync(state, current_time);
 	/* we can get -EAGAIN when we need to wait some more */
 	if (SPA_UNLIKELY(res == -EAGAIN))
-		goto done;
+		return res;
 
 	spa_list_for_each(follower, &state->rt.followers, rt.driver_link) {
 		if (follower == state)
@@ -3255,21 +3362,89 @@
 	else
 		capture_ready(state);
 
-done:
-	if (!state->disable_tsched) {
-		if (state->next_time > current_time + SPA_NSEC_PER_SEC ||
-		    current_time > state->next_time + SPA_NSEC_PER_SEC) {
-			if ((suppressed = spa_ratelimit_test(&state->rate_limit, current_time)) >= 0) {
-				spa_log_error(state->log, "%s: impossible timeout %"
-					PRIu64" %"PRIu64" %"PRIi64" %d %"PRIi64" (%d suppressed)",
-					state->name, current_time, state->next_time,
-					state->next_time - current_time, state->threshold,
-					state->sample_count, suppressed);
-			}
-			state->next_time = current_time + state->threshold * 1e9 / state->rate;
+	return 0;
+}
+
+static void alsa_irq_wakeup_event(struct spa_source *source)
+{
+	struct state *state = source->data;
+	uint64_t current_time;
+	int res, err;
+	unsigned short revents;
+	snd_pcm_uframes_t havail;
+	snd_htimestamp_t tstamp;
+
+	// First, take a snapshot of the wakeup time
+	current_time = get_time_ns(state);
+	// If the hi-res timestamps are working, we will get a timestamp that
+	// is earlier then current_time
+	if ((res = snd_pcm_htimestamp(state->hndl, &havail, &tstamp)) == 0) {
+		uint64_t htime = SPA_TIMESPEC_TO_NSEC(&tstamp);
+		if (htime < current_time) {
+			current_time = htime;
 		}
-		set_timeout(state, state->next_time);
 	}
+
+	for (int i = 0; i < state->n_fds; i++) {
+		state->pfdsi.revents = state->sourcei.rmask;
+		/* Reset so that we only handle all our sources' events once */
+		state->sourcei.rmask = 0;
+	}
+
+	/* ALSA poll fds need to be "demangled" to know whether it's a real wakeup */
+	if (SPA_UNLIKELY(err = snd_pcm_poll_descriptors_revents(state->hndl,
+					state->pfds, state->n_fds, &revents))) {
+		spa_log_error(state->log, "Could not look up revents: %s",
+				snd_strerror(err));
+		return;
+	}
+
+	if (!revents) {
+		spa_log_trace_fp(state->log, "Woken up with no work to do");
+		return;
+	}
+	if (revents & POLLERR) {
+		spa_log_trace_fp(state->log, "poll error");
+		if ((res = alsa_recover(state)) < 0)
+			return;
+	}
+	alsa_do_wakeup_work(state, current_time);
+}
+
+static void alsa_timer_wakeup_event(struct spa_source *source)
+{
+	struct state *state = source->data;
+	uint64_t expire, current_time;
+	int res, suppressed;
+
+	if (SPA_LIKELY(state->started)) {
+		if (SPA_UNLIKELY((res = spa_system_timerfd_read(state->data_system,
+					state->timerfd, &expire)) < 0)) {
+		/* we can get here when the timer is changed since the last
+			 * timerfd wakeup, for example by do_reassign_follower() executed
+			 * in the same epoll wakeup cycle */
+			if (res != -EAGAIN)
+				spa_log_warn(state->log, "%p: error reading timerfd: %s",
+						state, spa_strerror(res));
+			return;
+		}
+	}
+	current_time = state->next_time;
+
+	alsa_do_wakeup_work(state, current_time);
+
+	if (state->next_time > current_time + SPA_NSEC_PER_SEC ||
+	    current_time > state->next_time + SPA_NSEC_PER_SEC) {
+		if ((suppressed = spa_ratelimit_test(&state->rate_limit, current_time)) >= 0) {
+			spa_log_error(state->log, "%s: impossible timeout %"
+				PRIu64" %"PRIu64" %"PRIi64" %d %"PRIi64" (%d suppressed)",
+				state->name, current_time, state->next_time,
+				state->next_time - current_time, state->threshold,
+				state->sample_count, suppressed);
+		}
+		state->next_time = (uint64_t)(current_time + state->threshold * 1e9 / state->rate);
+	}
+	set_timeout(state, state->next_time);
 }
 
 static void remove_sources(struct state *state)
@@ -3344,7 +3519,7 @@
 	if (state->prepared)
 		return 0;
 
-	if (check_position_config(state) < 0) {
+	if (check_position_config(state, true) < 0) {
 		spa_log_error(state->log, "%s: invalid position config", state->name);
 		return -EIO;
 	}
@@ -3379,7 +3554,7 @@
 
 	if (!state->disable_tsched) {
 		/* Timer-based scheduling */
-		state->source0.func = alsa_wakeup_event;
+		state->source0.func = alsa_timer_wakeup_event;
 		state->source0.data = state;
 		state->source0.fd = state->timerfd;
 		state->source0.mask = SPA_IO_IN;
@@ -3408,7 +3583,7 @@
 		/* We only add the source to the data loop if we're driving.
 		 * This is done in setup_sources() */
 		for (int i = 0; i < state->n_fds; i++) {
-			state->sourcei.func = alsa_wakeup_event;
+			state->sourcei.func = alsa_irq_wakeup_event;
 			state->sourcei.data = state;
 			state->sourcei.fd = state->pfdsi.fd;
 			state->sourcei.mask = state->pfdsi.events;
@@ -3427,16 +3602,17 @@
 			return err;
 	}
 
-	state->started = true;
-	spa_loop_invoke(state->data_loop, do_state_sync, 0, NULL, 0, true, state);
-
 	/* playback will start after first write. Without tsched, we start
 	 * right away so that the fds become active in poll right away. */
 	if (state->stream == SND_PCM_STREAM_PLAYBACK) {
-		if (state->disable_tsched)
+		if (state->disable_tsched || state->start_delay > 0)
 			if ((err = do_start(state)) < 0)
 				return err;
 	}
+
+	state->started = true;
+	spa_loop_invoke(state->data_loop, do_state_sync, 0, NULL, 0, true, state);
+
 	return 0;
 }
 
@@ -3476,8 +3652,8 @@
 	if (following != state->following) {
 		spa_log_debug(state->log, "%p: reassign follower %d->%d", state, state->following, following);
 		state->following = following;
-		setup_matching(state);
 	}
+	setup_matching(state);
 	if (state->started)
 		spa_loop_invoke(state->data_loop, do_state_sync, 0, NULL, 0, true, state);
 
@@ -3527,28 +3703,37 @@
 	if (state->info.change_mask) {
 		struct spa_dict_item items7;
 		uint32_t i, n_items = 0;
-		char latency64, period64, nperiods64, headroom64;
+		char latency64 = "", period64 = "", nperiods64 = "", headroom64 = "";
 
 		itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_API, "alsa");
 		itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_MEDIA_CLASS,
 				state->stream == SND_PCM_STREAM_PLAYBACK ? "Audio/Sink" : "Audio/Source");
 		itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_DRIVER, "true");
-		if (state->have_format) {
-			snprintf(latency, sizeof(latency), "%lu/%d", state->buffer_frames / 2, state->rate);
-			itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_MAX_LATENCY, latency);
+
+		if (state->have_format)
+			snprintf(latency, sizeof(latency), "%lu/%d",
+					state->buffer_frames / (2 * state->frame_scale), state->rate);
+		itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_MAX_LATENCY, latency0 ? latency : NULL);
+
+		if (state->have_format)
 			snprintf(period, sizeof(period), "%lu", state->period_frames);
-			itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.period-size", period);
+		else if (state->default_period_size)
+			snprintf(period, sizeof(period), "%u", state->default_period_size);
+		itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.period-size", period0 ? period : NULL);
+
+		if (state->have_format)
 			snprintf(nperiods, sizeof(nperiods), "%lu",
 					state->period_frames != 0 ? state->buffer_frames / state->period_frames : 0);
-			itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.period-num", nperiods);
+		else if (state->default_period_num)
+			snprintf(nperiods, sizeof(nperiods), "%u", state->default_period_size);
+		itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.period-num", nperiods0 ? nperiods : NULL);
+
+		if (state->have_format)
 			snprintf(headroom, sizeof(headroom), "%u", state->headroom);
-			itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.headroom", headroom);
-		} else {
-			itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_MAX_LATENCY, NULL);
-			itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.period-size", NULL);
-			itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.period-num", NULL);
-			itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.headroom", NULL);
-		}
+		else if (state->default_headroom)
+			snprintf(headroom, sizeof(headroom), "%u", state->default_headroom);
+		itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.headroom", headroom0 ? headroom : NULL);
+
 		state->info.props = &SPA_DICT_INIT(items, n_items);
 
 		if (state->info.change_mask & SPA_NODE_CHANGE_MASK_PARAMS) {
@@ -3573,7 +3758,10 @@
 		state->port_info.change_mask = state->port_info_all;
 	if (state->port_info.change_mask) {
 		uint32_t i;
-
+		static const struct spa_dict_item info_items = {
+			{ SPA_KEY_PORT_GROUP, "stream.0" },
+		};
+		state->port_info.props = &SPA_DICT_INIT_ARRAY(info_items);
 		if (state->port_info.change_mask & SPA_PORT_CHANGE_MASK_PARAMS) {
 			for (i = 0; i < state->port_info.n_params; i++) {
 				if (state->port_paramsi.user > 0) {

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/alsa-pcm.h -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/alsa-pcm.h Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/alsa-seq-bridge.c -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/alsa-seq-bridge.c Changed

@@ -225,7 +225,7 @@
 	if (full)
 		port->info.change_mask = port->info_all;
 	if (port->info.change_mask) {
-		struct spa_dict_item items5;
+		struct spa_dict_item items6;
 		uint32_t n_items = 0;
 		int id;
 		snd_seq_port_info_t *info;
@@ -234,6 +234,7 @@
 		char name256;
 		char path128;
 		char alias128;
+		char stream32;
 
 		snd_seq_port_info_alloca(&info);
 		snd_seq_get_any_port_info(this->sys.hndl,
@@ -273,9 +274,12 @@
 		}
 		clean_name(name);
 
-		snprintf(path, sizeof(path), "alsa:seq:%s:client_%d:%s_%d",
+		snprintf(stream, sizeof(stream), "client_%d", port->addr.client);
+		clean_name(stream);
+
+		snprintf(path, sizeof(path), "alsa:seq:%s:%s:%s_%d",
 				this->props.device,
-				port->addr.client,
+				stream,
 				port->direction == SPA_DIRECTION_OUTPUT ? "capture" : "playback",
 				port->addr.port);
 		clean_name(path);
@@ -285,10 +289,12 @@
 				snd_seq_port_info_get_name(info));
 		clean_name(alias);
 
+
 		itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_FORMAT_DSP, "8 bit raw midi");
 		itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_OBJECT_PATH, path);
 		itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_PORT_NAME, name);
 		itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_PORT_ALIAS, alias);
+		itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_PORT_GROUP, stream);
 		if ((id = snd_seq_client_info_get_card(client_info)) != -1) {
 			snprintf(card, sizeof(card), "%d", id);
 			itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_API_ALSA_CARD, card);
@@ -563,7 +569,7 @@
 			SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(2, 1, MAX_BUFFERS),
 			SPA_PARAM_BUFFERS_blocks,  SPA_POD_Int(1),
 			SPA_PARAM_BUFFERS_size,    SPA_POD_CHOICE_RANGE_Int(
-							4096, 4096, INT32_MAX),
+							this->quantum_limit, this->quantum_limit, INT32_MAX),
 			SPA_PARAM_BUFFERS_stride,  SPA_POD_Int(1));
 		break;
 
@@ -927,6 +933,10 @@
 	this->info.n_params = N_NODE_PARAMS;
 	reset_props(&this->props);
 
+	this->quantum_limit = 8192;
+	this->min_pool_size = 500;
+	this->max_pool_size = 2000;
+
 	for (i = 0; info && i < info->n_items; i++) {
 		const char *k = info->itemsi.key;
 		const char *s = info->itemsi.value;
@@ -936,8 +946,14 @@
 		} else if (spa_streq(k, "clock.name")) {
 			spa_scnprintf(this->props.clock_name,
 					sizeof(this->props.clock_name), "%s", s);
+		} else if (spa_streq(k, "clock.quantum-limit")) {
+			spa_atou32(s, &this->quantum_limit, 0);
 		} else if (spa_streq(k, SPA_KEY_API_ALSA_DISABLE_LONGNAME)) {
 			this->props.disable_longname = spa_atob(s);
+		} else if (spa_streq(k, "api.alsa.seq.min-pool")) {
+			spa_atou32(s, &this->min_pool_size, 0);
+		} else if (spa_streq(k, "api.alsa.seq.max-pool")) {
+			spa_atou32(s, &this->max_pool_size, 0);
 		}
 	}
 
@@ -974,7 +990,14 @@
 static const struct spa_dict_item info_items = {
 	{ SPA_KEY_FACTORY_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
 	{ SPA_KEY_FACTORY_DESCRIPTION, "Bridge midi ports with the alsa sequencer API" },
-	{ SPA_KEY_FACTORY_USAGE, ""SPA_KEY_API_ALSA_PATH"=<device>" },
+	{ SPA_KEY_FACTORY_USAGE,
+		""SPA_KEY_API_ALSA_PATH"=<device, default \"default\"> "
+		" clock.name=<clock name, default \"clock.system.monotonic\"> "
+		" clock.quantum-limit=<limit, default 8192> "
+		""SPA_KEY_API_ALSA_DISABLE_LONGNAME"=<bool, default false> "
+		" api.alsa.seq.min-pool=<min-pool, default 500> "
+		" api.alsa.seq.max-pool=<max-pool, default 2000>"
+	},
 };
 
 static const struct spa_dict info = SPA_DICT_INIT_ARRAY(info_items);

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/alsa-seq.c -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/alsa-seq.c Changed

@@ -250,7 +250,9 @@
 	snd_seq_port_subscribe_t *sub;
 	snd_seq_addr_t addr;
 	snd_seq_queue_timer_t *timer;
+	snd_seq_client_pool_t *pool;
 	struct seq_conn reserve16;
+	size_t pool_size;
 
 	if (state->opened)
 		return 0;
@@ -319,6 +321,31 @@
 		spa_log_warn(state->log, "failed to set queue timer: %s", snd_strerror(res));
 	}
 
+	/* Increase client pool sizes. This determines the max sysex message that
+	 * can be received. */
+	snd_seq_client_pool_alloca(&pool);
+	if ((res = snd_seq_get_client_pool(state->event.hndl, pool)) < 0) {
+		spa_log_warn(state->log, "failed to get pool: %s", snd_strerror(res));
+	} else {
+		/* make sure we at least use the default size */
+		pool_size = snd_seq_client_pool_get_output_pool(pool);
+		pool_size = SPA_MAX(pool_size, snd_seq_client_pool_get_input_pool(pool));
+
+		/* The pool size is in cells, which are about 24 bytes long. Try to
+		 * make sure we can fit sysex of at least twice the quantum limit. */
+		pool_size = SPA_MAX(pool_size, state->quantum_limit * 2 / 24);
+		/* The kernel ignores values larger than 2000 (by default) so clamp
+		 * this here. It's configurable in case the kernel was modified. */
+		pool_size = SPA_CLAMP(pool_size, state->min_pool_size, state->max_pool_size);
+
+		snd_seq_client_pool_set_input_pool(pool, pool_size);
+		snd_seq_client_pool_set_output_pool(pool, pool_size);
+
+		if ((res = snd_seq_set_client_pool(state->event.hndl, pool)) < 0) {
+			spa_log_warn(state->log, "failed to set pool: %s", snd_strerror(res));
+		}
+	}
+
 	init_ports(state);
 
 	if ((res = spa_system_timerfd_create(state->data_system,
@@ -503,7 +530,7 @@
 	int res;
 
 	/* copy all new midi events into their port buffers */
-	while (snd_seq_event_input(state->event.hndl, &ev) > 0) {
+	while ((res = snd_seq_event_input(state->event.hndl, &ev)) > 0) {
 		const snd_seq_addr_t *addr = &ev->source;
 		struct seq_port *port;
 		uint64_t ev_time, diff;
@@ -546,14 +573,23 @@
 		else
 			offset = 0;
 
-		spa_log_trace_fp(state->log, "event time:%"PRIu64" offset:%d size:%ld port:%d.%d",
-				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",
+				ev->type, ev_time, offset, size, addr->client, addr->port);
 
 		spa_pod_builder_control(&port->builder, offset, SPA_CONTROL_Midi);
 		spa_pod_builder_bytes(&port->builder, data, size);
 
 		snd_seq_free_event(ev);
+
+		/* 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->datas0.maxsize)
+			break;
         }
+	if (res < 0 && res != -EAGAIN)
+		spa_log_warn(state->log, "event read failed: %s", snd_strerror(res));
 
 	/* prepare a buffer on each port, some ports might have their
 	 * buffer filled above */
@@ -571,6 +607,12 @@
 			port->buffer->buf->datas0.chunk->offset = 0;
 			port->buffer->buf->datas0.chunk->size = port->builder.state.offset;
 
+			if (port->builder.state.offset > port->buffer->buf->datas0.maxsize) {
+				spa_log_warn(state->log, "control overflow: %d > %d",
+						port->builder.state.offset,
+						port->buffer->buf->datas0.maxsize);
+			}
+
 			/* move buffer to ready queue */
 			spa_list_remove(&port->buffer->link);
 			SPA_FLAG_SET(port->buffer->flags, BUFFER_FLAG_OUT);
@@ -620,6 +662,7 @@
 		snd_seq_event_t ev;
 		uint64_t out_time;
 		snd_seq_real_time_t out_rt;
+		long size = 0;
 
 		if (!port->valid || io == NULL)
 			continue;
@@ -643,37 +686,53 @@
 		}
 
 		SPA_POD_SEQUENCE_FOREACH(pod, c) {
-			long size;
+			long s, body_size;
+			uint8_t *body;
 
 			if (c->type != SPA_CONTROL_Midi)
 				continue;
 
-			snd_seq_ev_clear(&ev);
-
-			snd_midi_event_reset_encode(stream->codec);
-			if ((size = snd_midi_event_encode(stream->codec,
-						SPA_POD_BODY(&c->value),
-						SPA_POD_BODY_SIZE(&c->value), &ev)) <= 0) {
-				spa_log_warn(state->log, "failed to encode event: %s",
-						snd_strerror(size));
-	                        continue;
-			}
-
-			snd_seq_ev_set_source(&ev, state->event.addr.port);
-			snd_seq_ev_set_dest(&ev, port->addr.client, port->addr.port);
-
-			out_time = state->queue_time + NSEC_FROM_CLOCK(&state->rate, c->offset);
-
-			out_rt.tv_nsec = out_time % SPA_NSEC_PER_SEC;
-			out_rt.tv_sec = out_time / SPA_NSEC_PER_SEC;
-			snd_seq_ev_schedule_real(&ev, state->event.queue_id, 0, &out_rt);
-
-			spa_log_trace_fp(state->log, "event time:%"PRIu64" offset:%d size:%ld port:%d.%d",
-				out_time, c->offset, size, port->addr.client, port->addr.port);
-
-			if ((err = snd_seq_event_output(state->event.hndl, &ev)) < 0) {
-				spa_log_warn(state->log, "failed to output event: %s",
-						snd_strerror(err));
+			body = SPA_POD_BODY(&c->value);
+			body_size = SPA_POD_BODY_SIZE(&c->value);
+
+			while (body_size > 0) {
+				if (size == 0)
+					/* only reset when we start decoding a new message */
+					snd_seq_ev_clear(&ev);
+
+				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(s));
+					snd_midi_event_reset_encode(stream->codec);
+					size = 0;
+					break;
+				}
+				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. */
+					break;
+
+				snd_seq_ev_set_source(&ev, state->event.addr.port);
+				snd_seq_ev_set_dest(&ev, port->addr.client, port->addr.port);
+
+				out_time = state->queue_time + NSEC_FROM_CLOCK(&state->rate, c->offset);
+
+				out_rt.tv_nsec = out_time % SPA_NSEC_PER_SEC;
+				out_rt.tv_sec = out_time / SPA_NSEC_PER_SEC;
+				snd_seq_ev_schedule_real(&ev, state->event.queue_id, 0, &out_rt);
+
+				spa_log_trace_fp(state->log, "event %d time:%"PRIu64" offset:%d size:%ld port:%d.%d",
+					ev.type, out_time, c->offset, size, port->addr.client, port->addr.port);
+
+				if ((err = snd_seq_event_output(state->event.hndl, &ev)) < 0) {
+					spa_log_warn(state->log, "failed to output event: %s",
+							snd_strerror(err));
+				}
+				size = 0;
 			}
 		}
 	}
@@ -738,9 +797,9 @@
 	 * use the rate correction, else we will use the rate correction only for the new
 	 * timeout. */
 	if (state->following)
-		state->queue_next += state->threshold * corr * 1e9 / state->rate.denom;
+		state->queue_next += (uint64_t)(state->threshold * corr * 1e9 / state->rate.denom);
 	else
-		state->queue_next += state->threshold * 1e9 / state->rate.denom;
+		state->queue_next += (uint64_t)(state->threshold * 1e9 / state->rate.denom);
 
 	if ((state->next_time - state->base_time) > BW_PERIOD) {
 		state->base_time = state->next_time;
@@ -748,14 +807,14 @@
 				state, follower, corr, state->dll.bw, err,
 				state->dll.z1, state->dll.z2, state->dll.z3);
 	}
-	state->next_time += state->threshold / corr * 1e9 / state->rate.denom;
+	state->next_time += (uint64_t)(state->threshold / corr * 1e9 / state->rate.denom);
 
 	if (!follower && state->clock) {
 		state->clock->nsec = nsec;
 		state->clock->rate = state->rate;
 		state->clock->position += state->clock->duration;
 		state->clock->duration = state->duration;
-		state->clock->delay = state->duration * corr;
+		state->clock->delay = (int64_t)(state->duration * corr);
 		state->clock->rate_diff = corr;
 		state->clock->next_nsec = state->next_time;
 	}

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/alsa-seq.h -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/alsa-seq.h Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/alsa-udev.c -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/alsa-udev.c Changed

@@ -31,9 +31,10 @@
 
 #define MAX_CARDS	64
 
-#define ACTION_ADD	0
-#define ACTION_REMOVE	1
-#define ACTION_DISABLE	2
+enum action {
+	ACTION_CHANGE,
+	ACTION_REMOVE,
+};
 
 /* Used for unavailable devices in the card structure. */
 #define ID_DEVICE_NOT_SUPPORTED 0
@@ -92,6 +93,7 @@
 	struct spa_source source;
 	struct spa_source notify;
 	unsigned int use_acp:1;
+	unsigned int expose_busy:1;
 };
 
 static int impl_udev_open(struct impl *this)
@@ -381,6 +383,8 @@
 	 */
 
 	res = 0;
+	if (this->expose_busy)
+		return res;
 
 	spa_scnprintf(path, sizeof(path), "/proc/asound/card%u", card->card_nr);
 
@@ -715,57 +719,48 @@
 	return card->accessible;
 }
 
-static void process_card(struct impl *this, uint32_t action, struct udev_device *udev_device)
+static void process_card(struct impl *this, enum action action, struct card *card)
 {
-	unsigned int card_nr;
-	struct card *card;
-	bool emitted;
-	int res;
-
-	if ((card_nr = get_card_nr(this, udev_device)) == SPA_ID_INVALID)
-		return;
-
-	card = find_card(this, card_nr);
-	if (card && card->ignored)
+	if (card->ignored)
 		return;
 
 	switch (action) {
-	case ACTION_ADD:
-		if (card == NULL)
-			card = add_card(this, card_nr, udev_device);
-		if (card == NULL)
-			return;
-		if (!check_access(this, card))
-			return;
-		res = emit_added_object_info(this, card);
-		if (res < 0) {
-			if (card->ignored)
-				spa_log_info(this->log, "ALSA card %u unavailable (%s): it is ignored",
-						card->card_nr, spa_strerror(res));
-			else if (!card->unavailable)
-				spa_log_info(this->log, "ALSA card %u unavailable (%s): wait for it",
-						card->card_nr, spa_strerror(res));
-			else
-				spa_log_debug(this->log, "ALSA card %u still unavailable (%s)",
-						card->card_nr, spa_strerror(res));
-			card->unavailable = true;
-		} else {
-			if (card->unavailable)
-				spa_log_info(this->log, "ALSA card %u now available",
-						card->card_nr);
-			card->unavailable = false;
+	case ACTION_CHANGE: {
+		check_access(this, card);
+		if (card->accessible && !card->emitted) {
+			int res = emit_added_object_info(this, card);
+			if (res < 0) {
+				if (card->ignored)
+					spa_log_info(this->log, "ALSA card %u unavailable (%s): it is ignored",
+							card->card_nr, spa_strerror(res));
+				else if (!card->unavailable)
+					spa_log_info(this->log, "ALSA card %u unavailable (%s): wait for it",
+							card->card_nr, spa_strerror(res));
+				else
+					spa_log_debug(this->log, "ALSA card %u still unavailable (%s)",
+							card->card_nr, spa_strerror(res));
+				card->unavailable = true;
+			} else {
+				if (card->unavailable)
+					spa_log_info(this->log, "ALSA card %u now available",
+							card->card_nr);
+				card->unavailable = false;
+			}
+		} else if (!card->accessible && card->emitted) {
+			card->emitted = false;
+
+			if (card->pcm_device_id != ID_DEVICE_NOT_SUPPORTED)
+				spa_device_emit_object_info(&this->hooks, card->pcm_device_id, NULL);
+			if (card->compress_offload_device_id != ID_DEVICE_NOT_SUPPORTED)
+				spa_device_emit_object_info(&this->hooks, card->compress_offload_device_id, NULL);
 		}
 		break;
-
+	}
 	case ACTION_REMOVE: {
-		uint32_t pcm_device_id, compress_offload_device_id;
+		uint32_t pcm_device_id = card->pcm_device_id;
+		uint32_t compress_offload_device_id = card->compress_offload_device_id;
+		bool emitted = card->emitted;
 
-		if (card == NULL)
-			return;
-
-		emitted = card->emitted;
-		pcm_device_id = card->pcm_device_id;
-		compress_offload_device_id = card->compress_offload_device_id;
 		remove_card(this, card);
 
 		if (emitted) {
@@ -776,25 +771,25 @@
 		}
 		break;
 	}
+	}
+}
 
-	case ACTION_DISABLE:
-		if (card == NULL)
-			return;
-		if (card->emitted) {
-			uint32_t pcm_device_id, compress_offload_device_id;
+static void process_udev_device(struct impl *this, enum action action, struct udev_device *udev_device)
+{
+	unsigned int card_nr;
+	struct card *card;
 
-			pcm_device_id = card->pcm_device_id;
-			compress_offload_device_id = card->compress_offload_device_id;
+	if ((card_nr = get_card_nr(this, udev_device)) == SPA_ID_INVALID)
+		return;
 
-			card->emitted = false;
+	card = find_card(this, card_nr);
+	if (action == ACTION_CHANGE && !card)
+		card = add_card(this, card_nr, udev_device);
 
-			if (pcm_device_id != ID_DEVICE_NOT_SUPPORTED)
-				spa_device_emit_object_info(&this->hooks, pcm_device_id, NULL);
-			if (compress_offload_device_id != ID_DEVICE_NOT_SUPPORTED)
-				spa_device_emit_object_info(&this->hooks, compress_offload_device_id, NULL);
-		}
-		break;
-	}
+	if (!card)
+		return;
+
+	process_card(this, action, card);
 }
 
 static int stop_inotify(struct impl *this)
@@ -823,8 +818,6 @@
 		void *p, *e;
 
 		len = read(source->fd, &buf, sizeof(buf));
-		if (len < 0 && errno != EAGAIN)
-			break;
 		if (len <= 0)
 			break;
 
@@ -842,21 +835,16 @@
 
 			/* card becomes accessible or not busy */
 			if ((event->mask & (IN_ATTRIB | IN_CLOSE_WRITE))) {
-				bool access;
 				if (sscanf(event->name, "controlC%u", &card_nr) != 1 &&
 				    sscanf(event->name, "pcmC%uD", &card_nr) != 1)
 					continue;
 				if ((card = find_card(this, card_nr)) == NULL)
 					continue;
 
-				access = check_access(this, card);
-				if (access && !card->emitted)
-					process_card(this, ACTION_ADD, card->udev_device);
-				else if (!access && card->emitted)
-					process_card(this, ACTION_DISABLE, card->udev_device);
+				process_card(this, ACTION_CHANGE, card);
 			}
 			/* /dev/snd/ might have been removed */
-			if ((event->mask & (IN_DELETE_SELF | IN_MOVE_SELF)))
+			if ((event->mask & (IN_IGNORED | IN_MOVE_SELF)))
 				deleted = true;
 		}
 	}
@@ -875,7 +863,7 @@
 		return -errno;
 
 	res = inotify_add_watch(notify_fd, "/dev/snd",
-			IN_ATTRIB | IN_CLOSE_WRITE | IN_DELETE_SELF | IN_MOVE_SELF);
+			IN_ATTRIB | IN_CLOSE_WRITE | IN_MOVE_SELF);
 	if (res < 0) {
 		res = -errno;
 		close(notify_fd);
@@ -915,10 +903,10 @@
 
 	start_inotify(this);
 
-	if (spa_streq(action, "change")) {
-		process_card(this, ACTION_ADD, udev_device);
+	if (spa_streq(action, "add") || spa_streq(action, "change")) {
+		process_udev_device(this, ACTION_CHANGE, udev_device);
 	} else if (spa_streq(action, "remove")) {
-		process_card(this, ACTION_REMOVE, udev_device);
+		process_udev_device(this, ACTION_REMOVE, udev_device);
 	}
 	udev_device_unref(udev_device);
 }
@@ -989,7 +977,7 @@
 		if (udev_device == NULL)
 			continue;
 
-		process_card(this, ACTION_ADD, udev_device);
+		process_udev_device(this, ACTION_CHANGE, udev_device);
 
 		udev_device_unref(udev_device);
 	}
@@ -1141,6 +1129,8 @@
 	if (info) {
 		if ((str = spa_dict_lookup(info, "alsa.use-acp")) != NULL)
 			this->use_acp = spa_atob(str);
+		else if ((str = spa_dict_lookup(info, "alsa.udev.expose-busy")) != NULL)
+			this->expose_busy = spa_atob(str);
 	}
 
 	return 0;

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/alsa.c -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/alsa.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/meson.build -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/meson.build Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/mixer/paths/hdmi-output-0.conf -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/mixer/paths/hdmi-output-0.conf Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/mixer/paths/hdmi-output-1.conf -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/mixer/paths/hdmi-output-1.conf Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/mixer/paths/hdmi-output-10.conf -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/mixer/paths/hdmi-output-10.conf Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/mixer/paths/hdmi-output-2.conf -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/mixer/paths/hdmi-output-2.conf Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/mixer/paths/hdmi-output-3.conf -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/mixer/paths/hdmi-output-3.conf Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/mixer/paths/hdmi-output-4.conf -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/mixer/paths/hdmi-output-4.conf Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/mixer/paths/hdmi-output-5.conf -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/mixer/paths/hdmi-output-5.conf Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/mixer/paths/hdmi-output-6.conf -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/mixer/paths/hdmi-output-6.conf Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/mixer/paths/hdmi-output-7.conf -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/mixer/paths/hdmi-output-7.conf Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/mixer/paths/hdmi-output-8.conf -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/mixer/paths/hdmi-output-8.conf Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/mixer/paths/hdmi-output-9.conf -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/mixer/paths/hdmi-output-9.conf Changed

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/mixer/profile-sets/default.conf -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/mixer/profile-sets/default.conf Changed

@@ -237,6 +237,14 @@
 priority = 6
 direction = output
 
+Mapping hdmi-ac3-surround
+description = Digital Surround 5.1 (HDMI/AC3)
+device-strings = plug:{SLAVE="a52:%f,'hw:%f,3'"}
+paths-output = hdmi-output-0
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 6
+direction = output
+
 Mapping hdmi-stereo-extra1
 description = Digital Stereo (HDMI 2)
 device-strings = hdmi:%f,1
@@ -269,6 +277,14 @@
 priority = 6
 direction = output
 
+Mapping hdmi-ac3-surround-extra1
+description = Digital Surround 5.1 (HDMI 2/AC3)
+device-strings = plug:{SLAVE="a52:%f,'hw:%f,7'"}
+paths-output = hdmi-output-1
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 6
+direction = output
+
 Mapping hdmi-stereo-extra2
 description = Digital Stereo (HDMI 3)
 device-strings = hdmi:%f,2
@@ -301,6 +317,14 @@
 priority = 6
 direction = output
 
+Mapping hdmi-ac3-surround-extra2
+description = Digital Surround 5.1 (HDMI 3/AC3)
+device-strings = plug:{SLAVE="a52:%f,'hw:%f,8'"}
+paths-output = hdmi-output-2
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 6
+direction = output
+
 Mapping hdmi-stereo-extra3
 description = Digital Stereo (HDMI 4)
 device-strings = hdmi:%f,3
@@ -333,6 +357,14 @@
 priority = 6
 direction = output
 
+Mapping hdmi-ac3-surround-extra3
+description = Digital Surround 5.1 (HDMI 4/AC3)
+device-strings = plug:{SLAVE="a52:%f,'hw:%f,9'"}
+paths-output = hdmi-output-3
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 6
+direction = output
+
 Mapping hdmi-stereo-extra4
 description = Digital Stereo (HDMI 5)
 device-strings = hdmi:%f,4
@@ -365,6 +397,14 @@
 priority = 6
 direction = output
 
+Mapping hdmi-ac3-surround-extra4
+description = Digital Surround 5.1 (HDMI 5/AC3)
+device-strings = plug:{SLAVE="a52:%f,'hw:%f,10'"}
+paths-output = hdmi-output-4
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 6
+direction = output
+
 Mapping hdmi-stereo-extra5
 description = Digital Stereo (HDMI 6)
 device-strings = hdmi:%f,5
@@ -397,6 +437,14 @@
 priority = 6
 direction = output
 
+Mapping hdmi-ac3-surround-extra5
+description = Digital Surround 5.1 (HDMI 6/AC3)
+device-strings = plug:{SLAVE="a52:%f,'hw:%f,11'"}
+paths-output = hdmi-output-5
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 6
+direction = output
+
 Mapping hdmi-stereo-extra6
 description = Digital Stereo (HDMI 7)
 device-strings = hdmi:%f,6
@@ -429,6 +477,14 @@
 priority = 6
 direction = output
 
+Mapping hdmi-ac3-surround-extra6
+description = Digital Surround 5.1 (HDMI 7/AC3)
+device-strings = plug:{SLAVE="a52:%f,'hw:%f,12'"}
+paths-output = hdmi-output-6
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 6
+direction = output
+
 Mapping hdmi-stereo-extra7
 description = Digital Stereo (HDMI 8)
 device-strings = hdmi:%f,7
@@ -461,6 +517,14 @@
 priority = 6
 direction = output
 
+Mapping hdmi-ac3-surround-extra7
+description = Digital Surround 5.1 (HDMI 8/AC3)
+device-strings = plug:{SLAVE="a52:%f,'hw:%f,13'"}
+paths-output = hdmi-output-7
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 6
+direction = output
+
 Mapping hdmi-stereo-extra8
 description = Digital Stereo (HDMI 9)
 device-strings = hdmi:%f,8
@@ -493,6 +557,14 @@
 priority = 6
 direction = output
 
+Mapping hdmi-ac3-surround-extra8
+description = Digital Surround 5.1 (HDMI 9/AC3)
+device-strings = plug:{SLAVE="a52:%f,'hw:%f,14'"}
+paths-output = hdmi-output-8
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 6
+direction = output
+
 Mapping hdmi-stereo-extra9
 description = Digital Stereo (HDMI 10)
 device-strings = hdmi:%f,9
@@ -525,6 +597,14 @@
 priority = 6
 direction = output
 
+Mapping hdmi-ac3-surround-extra9
+description = Digital Surround 5.1 (HDMI 10/AC3)
+device-strings = plug:{SLAVE="a52:%f,'hw:%f,15'"}
+paths-output = hdmi-output-9
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 6
+direction = output
+
 Mapping hdmi-stereo-extra10
 description = Digital Stereo (HDMI 11)
 device-strings = hdmi:%f,10
@@ -557,6 +637,14 @@
 priority = 6
 direction = output
 
+Mapping hdmi-ac3-surround-extra10
+description = Digital Surround 5.1 (HDMI 11/AC3)
+device-strings = plug:{SLAVE="a52:%f,'hw:%f,16'"}
+paths-output = hdmi-output-10
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 6
+direction = output
+
 Mapping multichannel-output
 device-strings = hw:%f
 channel-map = left,right,rear-left,rear-right

pipewire-1.0.1.tar.bz2/spa/plugins/alsa/test-timer.c -> pipewire-1.2.0.tar.gz/spa/plugins/alsa/test-timer.c Changed

@@ -16,7 +16,7 @@
 
 #define DEFAULT_DEVICE	"hw:0"
 
-#define M_PI_M2 (M_PI + M_PI)
+#define M_PI_M2f (float)(M_PI+M_PI)
 
 #define BW_PERIOD	(SPA_NSEC_PER_SEC * 3)
 
@@ -63,10 +63,10 @@
 	type *samples, v;										\
 	samples = (type*)((uint8_t*)areas0.addr + (areas0.first + offset*areas0.step) / 8);	\
 	for (i = 0; i < frames; i++) {									\
-		state->accumulator += M_PI_M2 * 440 / state->rate;					\
-		if (state->accumulator >= M_PI_M2)							\
-			state->accumulator -= M_PI_M2;							\
-		v = sin(state->accumulator) * scale;							\
+		state->accumulator += M_PI_M2f * 440.0f / state->rate;					\
+		if (state->accumulator >= M_PI_M2f)							\
+			state->accumulator -= M_PI_M2f;							\
+		v = (type)(sin(state->accumulator) * scale);						\
 		for (j = 0; j < state->channels; j++)							\
 			*samples++ = v;									\
 	}												\
@@ -135,7 +135,7 @@
 	/* set our new adjusted timeout. alternatively, this value can
 	 * instead be used to drive a resampler if this device is
 	 * slaved. */
-	state->next_time += state->period / corr * 1e9 / state->rate;
+	state->next_time += (uint64_t)(state->period / corr * 1e9 / state->rate);
 	set_timeout(state, state->next_time);
 
 	if (state->next_time - state->prev_time > BW_PERIOD) {

pipewire-1.0.1.tar.bz2/spa/plugins/audioconvert/audioadapter.c -> pipewire-1.2.0.tar.gz/spa/plugins/audioconvert/audioadapter.c Changed

@@ -13,6 +13,7 @@
 #include <spa/utils/names.h>
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
+#include <spa/utils/json.h>
 #include <spa/buffer/alloc.h>
 #include <spa/pod/parser.h>
 #include <spa/pod/filter.h>
@@ -27,7 +28,7 @@
 
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.audioadapter");
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.audioadapter");
 
 #define DEFAULT_ALIGN	16
 
@@ -88,6 +89,7 @@
 
 	unsigned int add_listener:1;
 	unsigned int have_format:1;
+	unsigned int recheck_format:1;
 	unsigned int started:1;
 	unsigned int ready:1;
 	unsigned int async:1;
@@ -301,6 +303,18 @@
 	if (full)
 		this->info.change_mask = this->info_all;
 	if (this->info.change_mask) {
+		struct spa_dict_item *items;
+		uint32_t n_items = 0;
+
+		if (this->info.props)
+			n_items = this->info.props->n_items;
+		items = alloca((n_items + 2) * sizeof(struct spa_dict_item));
+		for (i = 0; i < n_items; i++)
+			itemsi = this->info.props->itemsi;
+		itemsn_items++ = SPA_DICT_ITEM_INIT("adapter.auto-port-config", NULL);
+		itemsn_items++ = SPA_DICT_ITEM_INIT("audio.adapt.follower", NULL);
+		this->info.props = &SPA_DICT_INIT(items, n_items);
+
 		if (this->info.change_mask & SPA_NODE_CHANGE_MASK_PARAMS) {
 			for (i = 0; i < this->info.n_params; i++) {
 				if (this->paramsi.user > 0) {
@@ -313,6 +327,7 @@
 		}
 		spa_node_emit_info(&this->hooks, &this->info);
 		this->info.change_mask = old;
+		spa_zero(this->info.props);
 	}
 }
 
@@ -472,6 +487,13 @@
 	return 0;
 }
 
+static void clear_buffers(struct impl *this)
+{
+	free(this->buffers);
+	this->buffers = NULL;
+	this->n_buffers = 0;
+}
+
 static int configure_format(struct impl *this, uint32_t flags, const struct spa_pod *format)
 {
 	uint8_t buffer4096;
@@ -515,11 +537,11 @@
 	}
 
 	this->have_format = format != NULL;
-	if (format == NULL) {
-		this->n_buffers = 0;
-	} else if (this->target != this->follower) {
+	clear_buffers(this);
+
+	if (format != NULL && this->target != this->follower)
 		res = negotiate_buffers(this);
-	}
+
 	return res;
 }
 
@@ -846,11 +868,14 @@
 	struct spa_pod_builder b = { 0 };
 	int res;
 
-	spa_log_debug(this->log, "%p: have_format:%d", this, this->have_format);
+	spa_log_debug(this->log, "%p: have_format:%d recheck:%d", this, this->have_format,
+			this->recheck_format);
 
-	if (this->have_format)
+	if (this->have_format && !this->recheck_format)
 		return 0;
 
+	this->recheck_format = false;
+
 	spa_pod_builder_init(&b, buffer, sizeof(buffer));
 
 	spa_node_send_command(this->follower,
@@ -1040,6 +1065,9 @@
 	uint32_t i;
 	int res;
 
+	if (info == NULL)
+		return;
+
 	spa_log_debug(this->log, "%p: convert port info %s %p %08"PRIx64, this,
 			this->direction == SPA_DIRECTION_INPUT ?
 				"Input" : "Output", info, info->change_mask);
@@ -1217,6 +1245,9 @@
 	uint32_t i;
 	int res;
 
+	if (info == NULL)
+		return;
+
 	if (this->follower_removing) {
 	      spa_node_emit_port_info(&this->hooks, direction, port_id, NULL);
 	      return;
@@ -1279,6 +1310,7 @@
 			if (idx == IDX_EnumFormat) {
 				spa_log_debug(this->log, "new formats");
 				/* we will renegotiate when restarting */
+				this->recheck_format = true;
 			}
 
 			this->paramsidx.user++;
@@ -1632,11 +1664,7 @@
 				break;
 
 			done = (status & (SPA_STATUS_HAVE_DATA | SPA_STATUS_DRAINED));
-
-			/* when not async, we can return the data when we are done.
-			 * In async mode we might first need to wake up the follower
-			 * to asynchronously provide more data for the next round. */
-			if (!this->async && done)
+			if (done)
 				break;
 
 			if (status & SPA_STATUS_NEED_DATA) {
@@ -1652,10 +1680,6 @@
 				if ((fstatus & (SPA_STATUS_HAVE_DATA | SPA_STATUS_DRAINED)) == 0)
 					break;
 			}
-			/* converter produced something or is drained and we
-			 * scheduled the follower above, we can stop now*/
-			if (done)
-				break;
 		}
 		if (!done)
 			spa_node_call_xrun(&this->callbacks, 0, 0, NULL);
@@ -1689,6 +1713,115 @@
 	.process = impl_node_process,
 };
 
+static int do_auto_port_config(struct impl *this, const char *str)
+{
+	uint32_t state = 0, i;
+	uint8_t buffer4096;
+	struct spa_pod_builder b;
+#define POSITION_PRESERVE 0
+#define POSITION_AUX 1
+#define POSITION_UNKNOWN 2
+	int res, position = POSITION_PRESERVE;
+	struct spa_pod *param;
+	uint32_t media_type, media_subtype;
+	bool have_format = false, monitor = false, control = false;
+	struct spa_audio_info format = { 0, };
+	enum spa_param_port_config_mode mode = SPA_PARAM_PORT_CONFIG_MODE_none;
+	struct spa_json it2;
+	char key1024, val256;
+
+	spa_json_init(&it0, str, strlen(str));
+	if (spa_json_enter_object(&it0, &it1) <= 0)
+		return -EINVAL;
+
+	while (spa_json_get_string(&it1, key, sizeof(key)) > 0) {
+		if (spa_json_get_string(&it1, val, sizeof(val)) <= 0)
+			break;
+
+		if (spa_streq(key, "mode")) {
+			mode = spa_debug_type_find_type_short(spa_type_param_port_config_mode, val);
+			if (mode == SPA_ID_INVALID)
+				mode = SPA_PARAM_PORT_CONFIG_MODE_none;
+		} else if (spa_streq(key, "monitor")) {
+			monitor = spa_atob(val);
+		} else if (spa_streq(key, "control")) {
+			control = spa_atob(val);
+		} else if (spa_streq(key, "position")) {
+			if (spa_streq(val, "unknown"))
+				position = POSITION_UNKNOWN;
+			else if (spa_streq(val, "aux"))
+				position = POSITION_AUX;
+			else
+				position = POSITION_PRESERVE;
+		}
+        }
+
+	while (true) {
+		struct spa_audio_info info = { 0, };
+		struct spa_pod *position = NULL;
+		uint32_t n_position = 0;
+
+		spa_pod_builder_init(&b, buffer, sizeof(buffer));
+		if ((res = spa_node_port_enum_params_sync(this->follower,
+					this->direction, 0,
+					SPA_PARAM_EnumFormat, &state,
+					NULL, &param, &b)) != 1)
+			break;
+
+		if ((res = spa_format_parse(param, &media_type, &media_subtype)) < 0)
+			continue;
+
+		if (media_type != SPA_MEDIA_TYPE_audio ||
+		    media_subtype != SPA_MEDIA_SUBTYPE_raw)
+			continue;
+
+		spa_pod_object_fixate((struct spa_pod_object*)param);
+
+		if (spa_pod_parse_object(param,
+				SPA_TYPE_OBJECT_Format, NULL,
+				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_OPT_Pod(&position)) < 0)
+			continue;
+
+		if (position != NULL)
+			n_position = spa_pod_copy_array(position, SPA_TYPE_Id,
+					info.info.raw.position, SPA_AUDIO_MAX_CHANNELS);
+		if (n_position == 0 || n_position != info.info.raw.channels)
+			SPA_FLAG_SET(info.info.raw.flags, SPA_AUDIO_FLAG_UNPOSITIONED);
+
+		if (format.info.raw.channels >= info.info.raw.channels)
+			continue;
+
+		format = info;
+		have_format = true;
+	}
+	if (!have_format)
+		return -ENOENT;
+
+	if (position == POSITION_AUX) {
+		for (i = 0; i < format.info.raw.channels; i++)
+			format.info.raw.positioni = SPA_AUDIO_CHANNEL_START_Aux + i;
+	} else if (position == POSITION_UNKNOWN) {
+		for (i = 0; i < format.info.raw.channels; i++)
+			format.info.raw.positioni = SPA_AUDIO_CHANNEL_UNKNOWN;
+	}
+
+	spa_pod_builder_init(&b, buffer, sizeof(buffer));
+	param = spa_format_audio_raw_build(&b, SPA_PARAM_Format, &format.info.raw);
+	param = spa_pod_builder_add_object(&b,
+		SPA_TYPE_OBJECT_ParamPortConfig, SPA_PARAM_PortConfig,
+		SPA_PARAM_PORT_CONFIG_direction, SPA_POD_Id(this->direction),
+		SPA_PARAM_PORT_CONFIG_mode,      SPA_POD_Id(mode),
+		SPA_PARAM_PORT_CONFIG_monitor,   SPA_POD_Bool(monitor),
+		SPA_PARAM_PORT_CONFIG_control,   SPA_POD_Bool(control),
+		SPA_PARAM_PORT_CONFIG_format,    SPA_POD_Pod(param));
+	impl_node_set_param(this, SPA_PARAM_PortConfig, 0, param);
+
+	return 0;
+}
+
 static int impl_get_interface(struct spa_handle *handle, const char *type, void **interface)
 {
 	struct impl *this;
@@ -1719,10 +1852,7 @@
 
 	spa_handle_clear(this->hnd_convert);
 
-	if (this->buffers)
-		free(this->buffers);
-	this->buffers = NULL;
-
+	clear_buffers(this);
 	return 0;
 }
 
@@ -1794,6 +1924,7 @@
 	this->target = this->convert;
 
 	this->info_all = SPA_NODE_CHANGE_MASK_FLAGS |
+		SPA_NODE_CHANGE_MASK_PROPS |
 		SPA_NODE_CHANGE_MASK_PARAMS;
 	this->info = SPA_NODE_INFO_INIT();
 	this->info.flags = SPA_NODE_FLAG_RT |
@@ -1817,7 +1948,10 @@
 	spa_node_add_listener(this->convert,
 			&this->convert_listener, &convert_node_events, this);
 
-	configure_convert(this, SPA_PARAM_PORT_CONFIG_MODE_dsp);
+	if (info && (str = spa_dict_lookup(info, "adapter.auto-port-config")) != NULL)
+		do_auto_port_config(this, str);
+	else
+		configure_convert(this, SPA_PARAM_PORT_CONFIG_MODE_dsp);
 
 	link_io(this);

pipewire-1.0.1.tar.bz2/spa/plugins/audioconvert/audioconvert.c -> pipewire-1.2.0.tar.gz/spa/plugins/audioconvert/audioconvert.c Changed

@@ -37,7 +37,7 @@
 
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.audioconvert");
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.audioconvert");
 
 #define DEFAULT_RATE		48000
 #define DEFAULT_CHANNELS	2
@@ -151,6 +151,7 @@
 	unsigned int have_latency:1;
 
 	struct spa_audio_info format;
+	unsigned int valid:1;
 	unsigned int have_format:1;
 	unsigned int is_dsp:1;
 	unsigned int is_monitor:1;
@@ -237,6 +238,9 @@
 	unsigned int drained:1;
 	unsigned int rate_adjust:1;
 	unsigned int port_ignore_latency:1;
+	unsigned int monitor_passthrough:1;
+
+	char group_name128;
 
 	uint32_t scratch_size;
 	uint32_t scratch_ports;
@@ -285,7 +289,7 @@
 	if (full)
 		port->info.change_mask = port->info_all;
 	if (port->info.change_mask) {
-		struct spa_dict_item items4;
+		struct spa_dict_item items5;
 		uint32_t n_items = 0;
 
 		if (PORT_IS_DSP(this, port->direction, port->id)) {
@@ -299,6 +303,8 @@
 			itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_PORT_NAME, "control");
 			itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_FORMAT_DSP, "8 bit raw midi");
 		}
+		if (this->group_name0 != '\0')
+			itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_PORT_GROUP, this->group_name);
 		port->info.props = &SPA_DICT_INIT(items, n_items);
 
 		if (port->info.change_mask & SPA_PORT_CHANGE_MASK_PARAMS) {
@@ -370,6 +376,7 @@
 		port->blocks = 1;
 		port->stride = 1;
 	}
+	port->valid = true;
 	spa_list_init(&port->queue);
 
 	spa_log_debug(this->log, "%p: add port %d:%d position:%s %d %d %d",
@@ -380,6 +387,16 @@
 	return 0;
 }
 
+static int deinit_port(struct impl *this, enum spa_direction direction, uint32_t port_id)
+{
+	struct port *port = GET_PORT(this, direction, port_id);
+	if (port == NULL || !port->valid)
+		return -ENOENT;
+	port->valid = false;
+	spa_node_emit_port_info(&this->hooks, direction, port_id, NULL);
+	return 0;
+}
+
 static int impl_node_enum_params(void *object, int seq,
 				 uint32_t id, uint32_t start, uint32_t num,
 				 const struct spa_pod *filter)
@@ -1274,9 +1291,9 @@
 			control, mode, dir->n_ports);
 
 	for (i = 0; i < dir->n_ports; i++) {
-		spa_node_emit_port_info(&this->hooks, direction, i, NULL);
+		deinit_port(this, direction, i);
 		if (this->monitor && direction == SPA_DIRECTION_INPUT)
-			spa_node_emit_port_info(&this->hooks, SPA_DIRECTION_OUTPUT, i+1, NULL);
+			deinit_port(this, SPA_DIRECTION_OUTPUT, i+1);
 	}
 
 	this->monitor = monitor;
@@ -1325,6 +1342,11 @@
 		i = dir->n_ports++;
 		init_port(this, direction, i, 0, false, false, true);
 	}
+	/* when output is convert mode, we are in OUTPUT (merge) mode, we always output all
+	 * the incoming data to output. When output is DSP, we need to output quantum size
+	 * chunks. */
+	this->direction = this->dirSPA_DIRECTION_OUTPUT.mode == SPA_PARAM_PORT_CONFIG_MODE_convert ?
+		SPA_DIRECTION_OUTPUT : SPA_DIRECTION_INPUT;
 
 	this->info.change_mask |= SPA_NODE_CHANGE_MASK_FLAGS | SPA_NODE_CHANGE_MASK_PARAMS;
 	this->info.flags &= ~SPA_NODE_FLAG_NEED_CONFIGURE;
@@ -1813,10 +1835,56 @@
 	return 0;
 }
 
+static uint32_t resample_update_rate_match(struct impl *this, bool passthrough, uint32_t size, uint32_t queued)
+{
+	uint32_t delay, match_size;
+
+	if (passthrough) {
+		delay = 0;
+		match_size = size;
+	} else {
+		double rate = this->rate_scale / this->props.rate;
+		if (this->io_rate_match &&
+		    SPA_FLAG_IS_SET(this->io_rate_match->flags, SPA_IO_RATE_MATCH_FLAG_ACTIVE))
+			rate *= this->io_rate_match->rate;
+		resample_update_rate(&this->resample, rate);
+		delay = resample_delay(&this->resample);
+		if (this->direction == SPA_DIRECTION_INPUT)
+			match_size = resample_in_len(&this->resample, size);
+		else
+			match_size = resample_out_len(&this->resample, size);
+	}
+	match_size -= SPA_MIN(match_size, queued);
+
+	spa_log_trace_fp(this->log, "%p: next match %u %u %u", this, match_size, size, queued);
+
+	if (this->io_rate_match) {
+		this->io_rate_match->delay = delay + queued;
+		this->io_rate_match->size = match_size;
+	}
+	return match_size;
+}
+
+static inline bool resample_is_passthrough(struct impl *this)
+{
+	if (this->props.resample_disabled)
+		return true;
+	if (this->resample.i_rate != this->resample.o_rate)
+		return false;
+	if (this->rate_scale != 1.0)
+		return false;
+	if (this->rate_adjust)
+		return false;
+	if (this->io_rate_match != NULL &&
+	    SPA_FLAG_IS_SET(this->io_rate_match->flags, SPA_IO_RATE_MATCH_FLAG_ACTIVE))
+		return false;
+	return true;
+}
+
 static int setup_convert(struct impl *this)
 {
 	struct dir *in, *out;
-	uint32_t i, rate, maxsize, maxports;
+	uint32_t i, rate, maxsize, maxports, duration;
 	struct port *p;
 	int res;
 
@@ -1832,7 +1900,13 @@
 	if (!in->have_format || !out->have_format)
 		return -EINVAL;
 
-	rate = this->io_position ? this->io_position->clock.target_rate.denom : DEFAULT_RATE;
+	if (this->io_position != NULL) {
+		rate = this->io_position->clock.target_rate.denom;
+		duration = this->io_position->clock.target_duration;
+	} else {
+		rate = DEFAULT_RATE;
+		duration = this->quantum_limit;
+	}
 
 	/* in DSP mode we always convert to the DSP rate */
 	if (in->mode == SPA_PARAM_PORT_CONFIG_MODE_dsp)
@@ -1879,6 +1953,8 @@
 	if ((res = ensure_tmp(this, maxsize, maxports)) < 0)
 		return res;
 
+	resample_update_rate_match(this, resample_is_passthrough(this), duration, 0);
+
 	this->setup = true;
 
 	emit_node_info(this, false);
@@ -1934,6 +2010,7 @@
 	struct impl *this = object;
 	uint32_t i;
 	struct spa_hook_list save;
+	struct port *p;
 
 	spa_return_val_if_fail(this != NULL, -EINVAL);
 
@@ -1942,10 +2019,12 @@
 
 	emit_node_info(this, true);
 	for (i = 0; i < this->dirSPA_DIRECTION_INPUT.n_ports; i++) {
-		emit_port_info(this, GET_IN_PORT(this, i), true);
+		if ((p = GET_IN_PORT(this, i)) && p->valid)
+			emit_port_info(this, p, true);
 	}
 	for (i = 0; i < this->dirSPA_DIRECTION_OUTPUT.n_ports; i++) {
-		emit_port_info(this, GET_OUT_PORT(this, i), true);
+		if ((p = GET_OUT_PORT(this, i)) && p->valid)
+			emit_port_info(this, p, true);
 	}
 	spa_hook_list_join(&this->hooks, &save);
 
@@ -2176,8 +2255,6 @@
 		case 0: case 1:
 		{
 			uint32_t idx = result.index;
-			if (port->is_monitor)
-				idx = idx ^ 1;
 			param = spa_latency_build(&b, id, &port->latencyidx);
 			break;
 		}
@@ -2243,9 +2320,6 @@
 			this, direction, port_id, latency);
 
 	port = GET_PORT(this, direction, port_id);
-	if (port->is_monitor)
-		return 0;
-
 	if (latency == NULL) {
 		info = SPA_LATENCY_INFO(other);
 		have_latency = false;
@@ -2267,32 +2341,50 @@
 			info.min_rate, info.max_rate,
 			info.min_ns, info.max_ns);
 
-	spa_latency_info_combine_start(&info, other);
-	for (i = 0; i < this->dirdirection.n_ports; i++) {
-		oport = GET_PORT(this, direction, i);
-		if (oport->is_monitor || !oport->have_latency)
-			continue;
-		spa_log_debug(this->log, "%p: combine %d", this, i);
-		spa_latency_info_combine(&info, &oport->latencyother);
-	}
-	spa_latency_info_combine_finish(&info);
-
-	spa_log_debug(this->log, "%p: combined %s latency %f-%f %d-%d %"PRIu64"-%"PRIu64, this,
-			info.direction == SPA_DIRECTION_INPUT ? "input" : "output",
-			info.min_quantum, info.max_quantum,
-			info.min_rate, info.max_rate,
-			info.min_ns, info.max_ns);
-
-	for (i = 0; i < this->dirother.n_ports; i++) {
-		oport = GET_PORT(this, other, i);
+	if (this->monitor_passthrough) {
+		if (port->is_monitor)
+			oport = GET_PORT(this, other, port_id-1);
+		else if (this->monitor && direction == SPA_DIRECTION_INPUT)
+			oport = GET_PORT(this, other, port_id+1);
+		else
+			return 0;
 
-		spa_log_debug(this->log, "%p: change %d", this, i);
-		if (spa_latency_info_compare(&info, &oport->latencyother) != 0) {
+		if (oport != NULL &&
+		    spa_latency_info_compare(&info, &oport->latencyother) != 0) {
 			oport->latencyother = info;
 			oport->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
 			oport->paramsIDX_Latency.user++;
 			emit_port_info(this, oport, false);
 		}
+	} else {
+		spa_latency_info_combine_start(&info, other);
+		for (i = 0; i < this->dirdirection.n_ports; i++) {
+			oport = GET_PORT(this, direction, i);
+			if ((oport->is_monitor) || !oport->have_latency)
+				continue;
+			spa_log_debug(this->log, "%p: combine %d", this, i);
+			spa_latency_info_combine(&info, &oport->latencyother);
+		}
+		spa_latency_info_combine_finish(&info);
+
+		spa_log_debug(this->log, "%p: combined %s latency %f-%f %d-%d %"PRIu64"-%"PRIu64, this,
+				info.direction == SPA_DIRECTION_INPUT ? "input" : "output",
+				info.min_quantum, info.max_quantum,
+				info.min_rate, info.max_rate,
+				info.min_ns, info.max_ns);
+
+		for (i = 0; i < this->dirother.n_ports; i++) {
+			oport = GET_PORT(this, other, i);
+			if (oport->is_monitor)
+				continue;
+			spa_log_debug(this->log, "%p: change %d", this, i);
+			if (spa_latency_info_compare(&info, &oport->latencyother) != 0) {
+				oport->latencyother = info;
+				oport->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
+				oport->paramsIDX_Latency.user++;
+				emit_port_info(this, oport, false);
+			}
+		}
 	}
 	if (emit) {
 		port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
@@ -2317,7 +2409,7 @@
 			this, direction, port_id, tag);
 
 	port = GET_PORT(this, direction, port_id);
-	if (port->is_monitor)
+	if (port->is_monitor && !this->monitor_passthrough)
 		return 0;
 
 	if (tag != NULL) {
@@ -2736,49 +2828,6 @@
 	return match_size;
 }
 
-static uint32_t resample_update_rate_match(struct impl *this, bool passthrough, uint32_t out_size, uint32_t in_queued)
-{
-	uint32_t delay, match_size;
-
-	if (passthrough) {
-		delay = 0;
-		match_size = out_size;
-	} else {
-		double rate = this->rate_scale / this->props.rate;
-		if (this->io_rate_match &&
-		    SPA_FLAG_IS_SET(this->io_rate_match->flags, SPA_IO_RATE_MATCH_FLAG_ACTIVE))
-			rate *= this->io_rate_match->rate;
-		resample_update_rate(&this->resample, rate);
-		delay = resample_delay(&this->resample);
-		match_size = resample_in_len(&this->resample, out_size);
-	}
-	match_size -= SPA_MIN(match_size, in_queued);
-
-	spa_log_trace_fp(this->log, "%p: next match %u", this, match_size);
-
-	if (this->io_rate_match) {
-		this->io_rate_match->delay = delay + in_queued;
-		this->io_rate_match->size = match_size;
-	}
-	return match_size;
-}
-
-static inline bool resample_is_passthrough(struct impl *this)
-{
-	if (this->props.resample_disabled)
-		return true;
-	if (this->resample.i_rate != this->resample.o_rate)
-		return false;
-	if (this->rate_scale != 1.0)
-		return false;
-	if (this->rate_adjust)
-		return false;
-	if (this->io_rate_match != NULL &&
-	    SPA_FLAG_IS_SET(this->io_rate_match->flags, SPA_IO_RATE_MATCH_FLAG_ACTIVE))
-		return false;
-	return true;
-}
-
 static uint64_t get_time_ns(struct impl *impl)
 {
 	struct timespec now;
@@ -3007,6 +3056,9 @@
 						volume *= this->props.channel.mute ? 0.0f :
 							this->props.channel.volumesremap;
 
+					volume = SPA_CLAMPF(volume, this->props.min_volume,
+							this->props.max_volume);
+
 					mon_max = SPA_MIN(bd->maxsize / port->stride, max_in);
 
 					volume_process(&this->volume, bd->data, src_datasremap,
@@ -3243,10 +3295,20 @@
 			spa_log_trace_fp(this->log, "%p: no output buffer", this);
 		}
 	}
-	if (resample_update_rate_match(this, resample_passthrough,
-			max_out - this->out_offset,
-			max_in - this->in_offset) > 0)
-		res |= SPA_STATUS_NEED_DATA;
+	{
+		uint32_t size, queued;
+
+		if (this->direction == SPA_DIRECTION_INPUT) {
+			size = max_out - this->out_offset;
+			queued = max_in - this->in_offset;
+		} else {
+			size = quant_samples;
+			queued = 0;
+		}
+		if (resample_update_rate_match(this, resample_passthrough,
+					size, queued) > 0)
+			res |= SPA_STATUS_NEED_DATA;
+	}
 
 	return res;
 }
@@ -3401,18 +3463,16 @@
 		else if (spa_streq(k, "resample.prefill"))
 			SPA_FLAG_UPDATE(this->resample.options,
 				RESAMPLE_OPTION_PREFILL, spa_atob(s));
-		else if (spa_streq(k, "factory.mode")) {
-			if (spa_streq(s, "merge"))
-				this->direction = SPA_DIRECTION_OUTPUT;
-			else
-				this->direction = SPA_DIRECTION_INPUT;
-		}
 		else if (spa_streq(k, SPA_KEY_AUDIO_POSITION)) {
 			if (s != NULL)
 	                        this->props.n_channels = parse_position(this->props.channel_map, s, strlen(s));
 		}
 		else if (spa_streq(k, SPA_KEY_PORT_IGNORE_LATENCY))
 			this->port_ignore_latency = spa_atob(s);
+		else if (spa_streq(k, SPA_KEY_PORT_GROUP))
+			spa_scnprintf(this->group_name, sizeof(this->group_name), "%s", s);
+		else if (spa_streq(k, "monitor.passthrough"))
+			this->monitor_passthrough = spa_atob(s);
 		else
 			audioconvert_set_param(this, k, s);
 	}

pipewire-1.0.1.tar.bz2/spa/plugins/audioconvert/biquad.c -> pipewire-1.2.0.tar.gz/spa/plugins/audioconvert/biquad.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/audioconvert/channelmix-ops.c -> pipewire-1.2.0.tar.gz/spa/plugins/audioconvert/channelmix-ops.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/audioconvert/fmt-ops-sse2.c -> pipewire-1.2.0.tar.gz/spa/plugins/audioconvert/fmt-ops-sse2.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/audioconvert/fmt-ops.c -> pipewire-1.2.0.tar.gz/spa/plugins/audioconvert/fmt-ops.c Changed

@@ -468,6 +468,8 @@
 	const struct noise_info *ninfo;
 	uint32_t i, conv_flags, data_size3;
 
+	/* we generate int32 bits of random values. With this scale
+	 * factor, we bring this in the -1.0, 1.0 range */
 	conv->scale = 1.0f / (float)(INT32_MAX);
 
 	/* disable dither if not needed */
@@ -483,6 +485,9 @@
 		switch (conv->noise_method) {
 		case NOISE_METHOD_NONE:
 			conv->noise_method = NOISE_METHOD_PATTERN;
+			/* the pattern method does not use a random number
+			 * but flips the noise between -(1<<(N-1)), 0 every
+			 * 1024 samples. */
 			conv->scale = -1.0f * (1 << (conv->noise_bits-1));
 			break;
 		case NOISE_METHOD_RECTANGULAR:
@@ -490,10 +495,13 @@
 			SPA_FALLTHROUGH;
 		case NOISE_METHOD_TRIANGULAR:
 		case NOISE_METHOD_TRIANGULAR_HF:
+			/* Amplify the random noise, with additional
+			 * N-1 bits of noise. */
 			conv->scale *= (1 << (conv->noise_bits-1));
 			break;
 		}
 	}
+	/* RECTANGULAR dither goes from -0.5, 0.5 */
 	if (conv->noise_method < NOISE_METHOD_TRIANGULAR)
 		conv->scale *= 0.5f;

pipewire-1.0.1.tar.bz2/spa/plugins/audioconvert/hilbert.h -> pipewire-1.2.0.tar.gz/spa/plugins/audioconvert/hilbert.h Changed

pipewire-1.0.1.tar.bz2/spa/plugins/audioconvert/plugin.c -> pipewire-1.2.0.tar.gz/spa/plugins/audioconvert/plugin.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/audioconvert/resample-native-avx.c -> pipewire-1.2.0.tar.gz/spa/plugins/audioconvert/resample-native-avx.c Changed

@@ -16,18 +16,18 @@
 	uint32_t n_taps4 = n_taps & ~0xf;
 
 	for (; i < n_taps4; i += 16) {
-		ty = (__m256)_mm256_lddqu_si256((__m256i*)(s + i + 0));
+		ty = _mm256_loadu_ps(s + i + 0);
 		sy0 = _mm256_fmadd_ps(ty, _mm256_load_ps(taps + i + 0), sy0);
-		ty = (__m256)_mm256_lddqu_si256((__m256i*)(s + i + 8));
+		ty = _mm256_loadu_ps(s + i + 8);
 		sy1 = _mm256_fmadd_ps(ty, _mm256_load_ps(taps + i + 8), sy1);
 	}
 	sy0 = _mm256_add_ps(sy1, sy0);
 	sx1 = _mm256_extractf128_ps(sy0, 1);
 	sx0 = _mm256_extractf128_ps(sy0, 0);
 	for (; i < n_taps; i += 8) {
-		tx = (__m128)_mm_lddqu_si128((__m128i*)(s + i + 0));
+		tx = _mm_loadu_ps(s + i + 0);
 		sx0 = _mm_fmadd_ps(tx, _mm_load_ps(taps + i + 0), sx0);
-		tx = (__m128)_mm_lddqu_si128((__m128i*)(s + i + 4));
+		tx = _mm_loadu_ps(s + i + 4);
 		sx1 = _mm_fmadd_ps(tx, _mm_load_ps(taps + i + 4), sx1);
 	}
 	sx0 = _mm_add_ps(sx0, sx1);
@@ -45,10 +45,10 @@
 	uint32_t i, n_taps4 = n_taps & ~0xf;
 
 	for (i = 0; i < n_taps4; i += 16) {
-		ty = (__m256)_mm256_lddqu_si256((__m256i*)(s + i + 0));
+		ty = _mm256_loadu_ps(s + i + 0);
 		sy0 = _mm256_fmadd_ps(ty, _mm256_load_ps(t0 + i + 0), sy0);
 		sy1 = _mm256_fmadd_ps(ty, _mm256_load_ps(t1 + i + 0), sy1);
-		ty = (__m256)_mm256_lddqu_si256((__m256i*)(s + i + 8));
+		ty = _mm256_loadu_ps(s + i + 8);
 		sy0 = _mm256_fmadd_ps(ty, _mm256_load_ps(t0 + i + 8), sy0);
 		sy1 = _mm256_fmadd_ps(ty, _mm256_load_ps(t1 + i + 8), sy1);
 	}
@@ -56,10 +56,10 @@
 	sx1 = _mm_add_ps(_mm256_extractf128_ps(sy1, 0), _mm256_extractf128_ps(sy1, 1));
 
 	for (; i < n_taps; i += 8) {
-		tx = (__m128)_mm_lddqu_si128((__m128i*)(s + i + 0));
+		tx = _mm_loadu_ps(s + i + 0);
 		sx0 = _mm_fmadd_ps(tx, _mm_load_ps(t0 + i + 0), sx0);
 		sx1 = _mm_fmadd_ps(tx, _mm_load_ps(t1 + i + 0), sx1);
-		tx = (__m128)_mm_lddqu_si128((__m128i*)(s + i + 4));
+		tx = _mm_loadu_ps(s + i + 4);
 		sx0 = _mm_fmadd_ps(tx, _mm_load_ps(t0 + i + 4), sx0);
 		sx1 = _mm_fmadd_ps(tx, _mm_load_ps(t1 + i + 4), sx1);
 	}

pipewire-1.0.1.tar.bz2/spa/plugins/audioconvert/resample-native-impl.h -> pipewire-1.2.0.tar.gz/spa/plugins/audioconvert/resample-native-impl.h Changed

@@ -29,7 +29,7 @@
 	uint32_t n_phases;
 	uint32_t in_rate;
 	uint32_t out_rate;
-	uint32_t phase;
+	float phase;
 	uint32_t inc;
 	uint32_t frac;
 	uint32_t filter_stride;
@@ -99,7 +99,7 @@
 		float *d = dstc;						\
 										\
 		index = ioffs;							\
-		phase = data->phase;						\
+		phase = (uint32_t)data->phase;					\
 										\
 		for (o = ooffs; o < olen && index + n_taps <= ilen; o++) {	\
 			inner_product_##arch(&do, &sindex,			\
@@ -117,11 +117,12 @@
 DEFINE_RESAMPLER(inter,arch)							\
 {										\
 	struct native_data *data = r->data;					\
-	uint32_t index, phase, stride = data->filter_stride;			\
+	uint32_t index, stride = data->filter_stride;				\
 	uint32_t n_phases = data->n_phases, out_rate = data->out_rate;		\
 	uint32_t n_taps = data->n_taps;						\
 	uint32_t c, o, olen = *out_len, ilen = *in_len;				\
 	uint32_t inc = data->inc, frac = data->frac;				\
+	float phase;								\
 										\
 	if (r->channels == 0)							\
 		return;								\
@@ -134,8 +135,8 @@
 		phase = data->phase;						\
 										\
 		for (o = ooffs; o < olen && index + n_taps <= ilen; o++) {	\
-			float ph = (float)phase * n_phases / out_rate;		\
-			uint32_t offset = floorf(ph);				\
+			float ph = phase * n_phases / out_rate;			\
+			uint32_t offset = (uint32_t)floorf(ph);			\
 			inner_product_ip_##arch(&do, &sindex,		\
 					&data->filter(offset + 0) * stride,	\
 					&data->filter(offset + 1) * stride,	\

pipewire-1.0.1.tar.bz2/spa/plugins/audioconvert/resample-native.c -> pipewire-1.2.0.tar.gz/spa/plugins/audioconvert/resample-native.c Changed

@@ -72,8 +72,8 @@
 		for (j = 0; j < n_taps12; j++, t += 1.0) {
 			/* exploit symmetry in filter taps */
 			taps(n_phases - i) * stride + n_taps12 + j =
-				tapsi * stride + (n_taps12 - j - 1) =
-					cutoff * sinc(t * cutoff) * window(t, n_taps);
+				tapsi * stride + (n_taps12 - j - 1) = (float)
+					(cutoff * sinc(t * cutoff) * window(t, n_taps));
 		}
 	}
 	return 0;
@@ -134,13 +134,14 @@
 static void impl_native_update_rate(struct resample *r, double rate)
 {
 	struct native_data *data = r->data;
-	uint32_t in_rate, out_rate, phase, gcd, old_out_rate;
+	uint32_t in_rate, out_rate, gcd, old_out_rate;
+	float phase;
 
 	if (SPA_LIKELY(data->rate == rate))
 		return;
 
 	old_out_rate = data->out_rate;
-	in_rate = r->i_rate / rate;
+	in_rate = (uint32_t)(r->i_rate / rate);
 	out_rate = r->o_rate;
 	phase = data->phase;
 
@@ -149,14 +150,14 @@
 	out_rate /= gcd;
 
 	data->rate = rate;
-	data->phase = phase * out_rate / old_out_rate;
+	data->phase = phase * out_rate / (float)old_out_rate;
 	data->in_rate = in_rate;
 	data->out_rate = out_rate;
 
 	data->inc = data->in_rate / data->out_rate;
 	data->frac = data->in_rate % data->out_rate;
 
-	if (data->in_rate == data->out_rate) {
+	if (data->in_rate == data->out_rate && rate == 1.0) {
 		data->func = data->info->process_copy;
 		r->func_name = data->info->copy_name;
 	}
@@ -169,7 +170,7 @@
 		r->func_name = data->info->inter_name;
 	}
 
-	spa_log_trace_fp(r->log, "native %p: rate:%f in:%d out:%d gcd:%d phase:%d inc:%d frac:%d", r,
+	spa_log_trace_fp(r->log, "native %p: rate:%f in:%d out:%d gcd:%d phase:%f inc:%d frac:%d", r,
 			rate, r->i_rate, r->o_rate, gcd, data->phase, data->inc, data->frac);
 
 }
@@ -179,7 +180,7 @@
 	struct native_data *data = r->data;
 	uint32_t in_len;
 
-	in_len = (data->phase + out_len * data->frac) / data->out_rate;
+	in_len = (uint32_t)((data->phase + out_len * data->frac) / data->out_rate);
 	in_len += out_len * data->inc +	(data->n_taps - data->hist);
 
 	spa_log_trace_fp(r->log, "native %p: hist:%d %d->%d", r, data->hist, out_len, in_len);
@@ -187,6 +188,20 @@
 	return in_len;
 }
 
+static uint32_t impl_native_out_len(struct resample *r, uint32_t in_len)
+{
+	struct native_data *data = r->data;
+	uint32_t out_len;
+
+	in_len = in_len - SPA_MIN(in_len, (data->n_taps - data->hist) + 1);
+	out_len = (uint32_t)(in_len * data->out_rate - data->phase);
+	out_len = (out_len + data->in_rate - 1) / data->in_rate;
+
+	spa_log_trace_fp(r->log, "native %p: hist:%d %d->%d", r, data->hist, in_len, out_len);
+
+	return out_len;
+}
+
 static void impl_native_process(struct resample *r,
 		const void * SPA_RESTRICT src, uint32_t *in_len,
 		void * SPA_RESTRICT dst, uint32_t *out_len)
@@ -309,6 +324,7 @@
 	r->free = impl_native_free;
 	r->update_rate = impl_native_update_rate;
 	r->in_len = impl_native_in_len;
+	r->out_len = impl_native_out_len;
 	r->process = impl_native_process;
 	r->reset = impl_native_reset;
 	r->delay = impl_native_delay;

pipewire-1.0.1.tar.bz2/spa/plugins/audioconvert/resample-peaks.c -> pipewire-1.2.0.tar.gz/spa/plugins/audioconvert/resample-peaks.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/audioconvert/test-channelmix.c -> pipewire-1.2.0.tar.gz/spa/plugins/audioconvert/test-channelmix.c Changed

@@ -18,14 +18,14 @@
 
 SPA_LOG_IMPL(logger);
 
-#define MATRIX(...) (float) { __VA_ARGS__ }
+#define MATRIX(...) (double) { __VA_ARGS__ }
 
 #include "test-helper.h"
 #include "channelmix-ops.c"
 
 #define CLOSE_ENOUGH(a,b)	(fabs((a)-(b)) < 0.000001f)
 
-static void dump_matrix(struct channelmix *mix, float *coeff)
+static void dump_matrix(struct channelmix *mix, double *coeff)
 {
 	uint32_t i, j;
 
@@ -33,13 +33,13 @@
 		for (j = 0; j < mix->src_chan; j++) {
 			float v = mix->matrixij;
 			spa_log_debug(mix->log, "%d %d: %f <-> %f", i, j, v, *coeff);
-			spa_assert_se(CLOSE_ENOUGH(v, *coeff));
+			spa_assert_se(CLOSE_ENOUGH(v, (float)*coeff));
 			coeff++;
 		}
 	}
 }
 
-static void test_mix(uint32_t src_chan, uint32_t src_mask, uint32_t dst_chan, uint32_t dst_mask, uint32_t options, float *coeff)
+static void test_mix(uint32_t src_chan, uint32_t src_mask, uint32_t dst_chan, uint32_t dst_mask, uint32_t options, double *coeff)
 {
 	struct channelmix mix;
 
@@ -336,7 +336,7 @@
 
 	for (i = 0; i < 16; i++) {
 		for (j = 0; j < N_SAMPLES; j++)
-			src_dataij = (drand48() - 0.5f) * 2.5f;
+			src_dataij = (float)((drand48() - 0.5f) * 2.5f);
 		srci = src_datai;
 	}
 
@@ -360,7 +360,7 @@
 	/* random matrix */
 	for (i = 0; i < mix.dst_chan; i++) {
 		for (j = 0; j < mix.src_chan; j++) {
-			mix.matrix_origij = drand48() - 0.5f;
+			mix.matrix_origij = (float)(drand48() - 0.5f);
 		}
 	}
 	channelmix_set_volume(&mix, 1.0f, false, 0, NULL);

pipewire-1.0.1.tar.bz2/spa/plugins/audioconvert/test-fmt-ops.c -> pipewire-1.2.0.tar.gz/spa/plugins/audioconvert/test-fmt-ops.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/audioconvert/test-peaks.c -> pipewire-1.2.0.tar.gz/spa/plugins/audioconvert/test-peaks.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/audioconvert/test-source.c -> pipewire-1.2.0.tar.gz/spa/plugins/audioconvert/test-source.c Changed

@@ -20,7 +20,9 @@
 #include <spa/pod/filter.h>
 #include <spa/debug/types.h>
 
-#define NAME "test-source"
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.test-source");
 
 #define DEFAULT_RATE		44100
 #define DEFAULT_CHANNELS	2
@@ -135,7 +137,7 @@
 
 	spa_return_val_if_fail(this != NULL, -EINVAL);
 
-	spa_log_trace(this->log, NAME" %p: add listener %p", this, listener);
+	spa_log_trace(this->log, "%p: add listener %p", this, listener);
 	spa_hook_list_isolate(&this->hooks, &save, listener, events, data);
 
 	emit_info(this, true);
@@ -494,7 +496,7 @@
 static int clear_buffers(struct impl *this, struct port *port)
 {
 	if (port->n_buffers > 0) {
-		spa_log_debug(this->log, NAME " %p: clear buffers %p", this, port);
+		spa_log_debug(this->log, "%p: clear buffers %p", this, port);
 		port->n_buffers = 0;
 		spa_list_init(&port->queue);
 	}
@@ -571,7 +573,7 @@
 		port->have_format = true;
 		port->format = info;
 
-		spa_log_debug(this->log, NAME " %p: set format on port %d %d", this, port_id, res);
+		spa_log_debug(this->log, "%p: set format on port %d %d", this, port_id, res);
 	}
 
 	port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
@@ -599,7 +601,7 @@
 	spa_return_val_if_fail(object != NULL, -EINVAL);
 	spa_return_val_if_fail(CHECK_PORT(object, direction, port_id), -EINVAL);
 
-	spa_log_debug(this->log, NAME" %p: set param %d", this, id);
+	spa_log_debug(this->log, "%p: set param %d", this, id);
 
 	switch (id) {
 	case SPA_PARAM_Format:
@@ -616,7 +618,7 @@
 	if (SPA_FLAG_IS_SET(b->flags, BUFFER_FLAG_OUT)) {
 		spa_list_append(&port->queue, &b->link);
 		SPA_FLAG_CLEAR(b->flags, BUFFER_FLAG_OUT);
-		spa_log_trace_fp(this->log, NAME " %p: recycle buffer %d", this, b->id);
+		spa_log_trace_fp(this->log, "%p: recycle buffer %d", this, b->id);
 	}
 }
 
@@ -637,7 +639,7 @@
 
 	spa_return_val_if_fail(port->have_format, -EIO);
 
-	spa_log_debug(this->log, NAME " %p: use buffers %d on port %d", this, n_buffers, port_id);
+	spa_log_debug(this->log, "%p: use buffers %d on port %d", this, n_buffers, port_id);
 
 	clear_buffers(this, port);
 
@@ -659,12 +661,12 @@
 				return -EINVAL;
 
 			if (dj.data == NULL) {
-				spa_log_error(this->log, NAME " %p: invalid memory on buffer %p", this,
+				spa_log_error(this->log, "%p: invalid memory on buffer %p", this,
 					      buffersi);
 				return -EINVAL;
 			}
 			if (!SPA_IS_ALIGNED(dj.data, 16)) {
-				spa_log_warn(this->log, NAME " %p: memory %d on buffer %d not aligned",
+				spa_log_warn(this->log, "%p: memory %d on buffer %d not aligned",
 						this, j, i);
 			}
 		}
@@ -742,7 +744,7 @@
 	if ((io = port->io) == NULL)
 		return -EIO;
 
-	spa_log_trace_fp(this->log, NAME " %p: status %d", this, io->status);
+	spa_log_trace_fp(this->log, "%p: status %d", this, io->status);
 
 	if (io->status == SPA_STATUS_HAVE_DATA)
 		goto done;
@@ -839,7 +841,7 @@
 			spa_atou32(s, &this->quantum_limit, 0);
 	}
 
-	spa_log_debug(this->log, NAME " %p: init", this);
+	spa_log_debug(this->log, "%p: init", this);
 	spa_hook_list_init(&this->hooks);
 
 	this->node.iface = SPA_INTERFACE_INIT(

pipewire-1.0.1.tar.bz2/spa/plugins/audiomixer/audiomixer.c -> pipewire-1.2.0.tar.gz/spa/plugins/audiomixer/audiomixer.c Changed

@@ -24,7 +24,7 @@
 
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.audiomixer");
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.audiomixer");
 
 #define DEFAULT_RATE		48000
 #define DEFAULT_CHANNELS	2
@@ -65,7 +65,7 @@
 
 	struct port_props props;
 
-	struct spa_io_buffers *io;
+	struct spa_io_buffers *io2;
 
 	uint64_t info_all;
 	struct spa_port_info info;
@@ -100,6 +100,8 @@
 	struct spa_node_info info;
 	struct spa_param_info params8;
 
+	struct spa_io_position *position;
+
 	struct spa_hook_list hooks;
 
 	uint32_t port_count;
@@ -120,13 +122,16 @@
 };
 
 #define PORT_VALID(p)                ((p) != NULL && (p)->valid)
+#define CHECK_ANY_IN(this,d,p)       ((d) == SPA_DIRECTION_INPUT && (p) == SPA_ID_INVALID)
 #define CHECK_FREE_IN_PORT(this,d,p) ((d) == SPA_DIRECTION_INPUT && (p) < MAX_PORTS && !PORT_VALID(this->in_ports(p)))
 #define CHECK_IN_PORT(this,d,p)      ((d) == SPA_DIRECTION_INPUT && (p) < MAX_PORTS && PORT_VALID(this->in_ports(p)))
 #define CHECK_OUT_PORT(this,d,p)     ((d) == SPA_DIRECTION_OUTPUT && (p) == 0)
 #define CHECK_PORT(this,d,p)         (CHECK_OUT_PORT(this,d,p) || CHECK_IN_PORT (this,d,p))
+#define CHECK_PORT_ANY(this,d,p)     (CHECK_ANY_IN(this,d,p) || CHECK_PORT(this,d,p))
 #define GET_IN_PORT(this,p)          (this->in_portsp)
 #define GET_OUT_PORT(this,p)         (&this->out_portsp)
 #define GET_PORT(this,d,p)           (d == SPA_DIRECTION_INPUT ? GET_IN_PORT(this,p) : GET_OUT_PORT(this,p))
+#define GET_PORT_ANY(this,d,p)       (CHECK_ANY_IN(this,d,p) ? NULL : GET_PORT(this,d,p))
 
 static int impl_node_enum_params(void *object, int seq,
 			uint32_t id, uint32_t start, uint32_t num,
@@ -143,7 +148,16 @@
 
 static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
 {
-	return -ENOTSUP;
+	struct impl *this = object;
+
+	switch (id) {
+	case SPA_IO_Position:
+		this->position = data;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+	return 0;
 }
 
 static int impl_node_send_command(void *object, const struct spa_command *command)
@@ -307,8 +321,7 @@
 	return 0;
 }
 
-static int port_enum_formats(void *object,
-			     enum spa_direction direction, uint32_t port_id,
+static int port_enum_formats(void *object, struct port *port,
 			     uint32_t index,
 			     struct spa_pod **param,
 			     struct spa_pod_builder *builder)
@@ -372,9 +385,9 @@
 
 	spa_return_val_if_fail(this != NULL, -EINVAL);
 	spa_return_val_if_fail(num != 0, -EINVAL);
-	spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
+	spa_return_val_if_fail(CHECK_PORT_ANY(this, direction, port_id), -EINVAL);
 
-	port = GET_PORT(this, direction, port_id);
+	port = GET_PORT_ANY(this, direction, port_id);
 
 	result.id = id;
 	result.next = start;
@@ -385,12 +398,12 @@
 
 	switch (id) {
 	case SPA_PARAM_EnumFormat:
-		if ((res = port_enum_formats(this, direction, port_id, result.index, &param, &b)) <= 0)
+		if ((res = port_enum_formats(this, port, result.index, &param, &b)) <= 0)
 			return res;
 		break;
 
 	case SPA_PARAM_Format:
-		if (!port->have_format)
+		if (port == NULL || !port->have_format)
 			return -EIO;
 		if (result.index > 0)
 			return 0;
@@ -399,7 +412,7 @@
 		break;
 
 	case SPA_PARAM_Buffers:
-		if (!port->have_format)
+		if (port == NULL || !port->have_format)
 			return -EIO;
 		if (result.index > 0)
 			return 0;
@@ -434,6 +447,12 @@
 				SPA_PARAM_IO_id,   SPA_POD_Id(SPA_IO_Buffers),
 				SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_buffers)));
 			break;
+		case 1:
+			param = spa_pod_builder_add_object(&b,
+				SPA_TYPE_OBJECT_ParamIO, id,
+				SPA_PARAM_IO_id,   SPA_POD_Id(SPA_IO_AsyncBuffers),
+				SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_async_buffers)));
+			break;
 		default:
 			return 0;
 		}
@@ -681,13 +700,24 @@
 struct io_info {
 	struct port *port;
 	void *data;
+	size_t size;
 };
 
 static int do_port_set_io(struct spa_loop *loop, bool async, uint32_t seq,
 		const void *data, size_t size, void *user_data)
 {
 	struct io_info *info = user_data;
-	info->port->io = info->data;
+	if (info->size >= sizeof(struct spa_io_async_buffers)) {
+		struct spa_io_async_buffers *ab = info->data;
+		info->port->io0 = &ab->buffersinfo->port->direction;
+		info->port->io1 = &ab->buffersinfo->port->direction^1;
+	} else if (info->size >= sizeof(struct spa_io_buffers)) {
+		info->port->io0 = info->data;
+		info->port->io1 = info->data;
+	} else {
+		info->port->io0 = NULL;
+		info->port->io1 = NULL;
+	}
 	return 0;
 }
 
@@ -710,9 +740,11 @@
 	port = GET_PORT(this, direction, port_id);
 	info.port = port;
 	info.data = data;
+	info.size = size;
 
 	switch (id) {
 	case SPA_IO_Buffers:
+	case SPA_IO_AsyncBuffers:
 		spa_loop_invoke(this->data_loop,
                                do_port_set_io, SPA_ID_INVALID, NULL, 0, true, &info);
 		break;
@@ -746,11 +778,12 @@
 	struct buffer **buffers;
 	struct buffer *outb;
 	const void **datas;
+	uint32_t cycle = this->position->clock.cycle & 1;
 
 	spa_return_val_if_fail(this != NULL, -EINVAL);
 
 	outport = GET_OUT_PORT(this, 0);
-	if ((outio = outport->io) == NULL)
+	if ((outio = outport->iocycle) == NULL)
 		return -EIO;
 
 	spa_log_trace_fp(this->log, "%p: status %p %d %d",
@@ -778,16 +811,17 @@
 		struct spa_data *bd;
 		uint32_t size, offs;
 
-		if (SPA_UNLIKELY(!PORT_VALID(inport) ||
-		    (inio = inport->io) == NULL ||
-		    inio->buffer_id >= inport->n_buffers ||
-		    inio->status != SPA_STATUS_HAVE_DATA)) {
-			spa_log_trace_fp(this->log, "%p: skip input idx:%d valid:%d "
+		if (SPA_UNLIKELY(!PORT_VALID(inport) || (inio = inport->iocycle) == NULL)) {
+			spa_log_trace_fp(this->log, "%p: skip input idx:%d valid:%d io:%p/%p/%d",
+					this, i, PORT_VALID(inport),
+					inport->io0, inport->io1, cycle);
+			continue;
+		}
+		if (inio->buffer_id >= inport->n_buffers ||
+		    inio->status != SPA_STATUS_HAVE_DATA) {
+			spa_log_trace_fp(this->log, "%p: skip input idx:%d "
 					"io:%p status:%d buf_id:%d n_buffers:%d", this,
-				i, PORT_VALID(inport), inio,
-				inio ? inio->status : -1,
-				inio ? inio->buffer_id : SPA_ID_INVALID,
-				inport->n_buffers);
+				i, inio, inio->status, inio->buffer_id, inport->n_buffers);
 			continue;
 		}

pipewire-1.0.1.tar.bz2/spa/plugins/audiomixer/mixer-dsp.c -> pipewire-1.2.0.tar.gz/spa/plugins/audiomixer/mixer-dsp.c Changed

@@ -24,7 +24,7 @@
 
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.mixer-dsp");
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.mixer-dsp");
 
 #define MAX_BUFFERS	64
 #define MAX_PORTS	512
@@ -61,7 +61,7 @@
 
 	struct port_props props;
 
-	struct spa_io_buffers *io;
+	struct spa_io_buffers *io2;
 
 	uint64_t info_all;
 	struct spa_port_info info;
@@ -96,6 +96,8 @@
 	struct spa_node_info info;
 	struct spa_param_info params8;
 
+	struct spa_io_position *position;
+
 	struct spa_hook_list hooks;
 
 	uint32_t port_count;
@@ -115,13 +117,16 @@
 };
 
 #define PORT_VALID(p)                ((p) != NULL && (p)->valid)
+#define CHECK_ANY_IN(this,d,p)       ((d) == SPA_DIRECTION_INPUT && (p) == SPA_ID_INVALID)
 #define CHECK_FREE_IN_PORT(this,d,p) ((d) == SPA_DIRECTION_INPUT && (p) < MAX_PORTS && !PORT_VALID(this->in_ports(p)))
 #define CHECK_IN_PORT(this,d,p)      ((d) == SPA_DIRECTION_INPUT && (p) < MAX_PORTS && PORT_VALID(this->in_ports(p)))
 #define CHECK_OUT_PORT(this,d,p)     ((d) == SPA_DIRECTION_OUTPUT && (p) == 0)
 #define CHECK_PORT(this,d,p)         (CHECK_OUT_PORT(this,d,p) || CHECK_IN_PORT (this,d,p))
+#define CHECK_PORT_ANY(this,d,p)     (CHECK_ANY_IN(this,d,p) || CHECK_PORT(this,d,p))
 #define GET_IN_PORT(this,p)          (this->in_portsp)
 #define GET_OUT_PORT(this,p)         (&this->out_portsp)
 #define GET_PORT(this,d,p)           (d == SPA_DIRECTION_INPUT ? GET_IN_PORT(this,p) : GET_OUT_PORT(this,p))
+#define GET_PORT_ANY(this,d,p)       (CHECK_ANY_IN(this,d,p) ? NULL : GET_PORT(this,d,p))
 
 static int impl_node_enum_params(void *object, int seq,
 				 uint32_t id, uint32_t start, uint32_t num,
@@ -138,7 +143,16 @@
 
 static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
 {
-	return -ENOTSUP;
+	struct impl *this = object;
+
+	switch (id) {
+	case SPA_IO_Position:
+		this->position = data;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+	return 0;
 }
 
 static int impl_node_send_command(void *object, const struct spa_command *command)
@@ -303,8 +317,7 @@
 	return 0;
 }
 
-static int port_enum_formats(void *object,
-			     enum spa_direction direction, uint32_t port_id,
+static int port_enum_formats(void *object, struct port *port,
 			     uint32_t index,
 			     struct spa_pod **param,
 			     struct spa_pod_builder *builder)
@@ -347,9 +360,9 @@
 
 	spa_return_val_if_fail(this != NULL, -EINVAL);
 	spa_return_val_if_fail(num != 0, -EINVAL);
-	spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
+	spa_return_val_if_fail(CHECK_PORT_ANY(this, direction, port_id), -EINVAL);
 
-	port = GET_PORT(this, direction, port_id);
+	port = GET_PORT_ANY(this, direction, port_id);
 
 	result.id = id;
 	result.next = start;
@@ -360,12 +373,12 @@
 
 	switch (id) {
 	case SPA_PARAM_EnumFormat:
-		if ((res = port_enum_formats(this, direction, port_id, result.index, &param, &b)) <= 0)
+		if ((res = port_enum_formats(this, port, result.index, &param, &b)) <= 0)
 			return res;
 		break;
 
 	case SPA_PARAM_Format:
-		if (!port->have_format)
+		if (port == NULL || !port->have_format)
 			return -EIO;
 		if (result.index > 0)
 			return 0;
@@ -374,7 +387,7 @@
 		break;
 
 	case SPA_PARAM_Buffers:
-		if (!port->have_format)
+		if (port == NULL || !port->have_format)
 			return -EIO;
 		if (result.index > 0)
 			return 0;
@@ -411,6 +424,12 @@
 				SPA_PARAM_IO_id,   SPA_POD_Id(SPA_IO_Buffers),
 				SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_buffers)));
 			break;
+		case 1:
+			param = spa_pod_builder_add_object(&b,
+				SPA_TYPE_OBJECT_ParamIO, id,
+				SPA_PARAM_IO_id,   SPA_POD_Id(SPA_IO_AsyncBuffers),
+				SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_async_buffers)));
+			break;
 		default:
 			return 0;
 		}
@@ -616,13 +635,24 @@
 struct io_info {
 	struct port *port;
 	void *data;
+	size_t size;
 };
 
 static int do_port_set_io(struct spa_loop *loop, bool async, uint32_t seq,
 		const void *data, size_t size, void *user_data)
 {
 	struct io_info *info = user_data;
-	info->port->io = info->data;
+	if (info->size >= sizeof(struct spa_io_async_buffers)) {
+		struct spa_io_async_buffers *ab = info->data;
+		info->port->io0 = &ab->buffersinfo->port->direction;
+		info->port->io1 = &ab->buffersinfo->port->direction^1;
+	} else if (info->size >= sizeof(struct spa_io_buffers)) {
+		info->port->io0 = info->data;
+		info->port->io1 = info->data;
+	} else {
+		info->port->io0 = NULL;
+		info->port->io1 = NULL;
+	}
 	return 0;
 }
 
@@ -645,9 +675,11 @@
 	port = GET_PORT(this, direction, port_id);
 	info.port = port;
 	info.data = data;
+	info.size = size;
 
 	switch (id) {
 	case SPA_IO_Buffers:
+	case SPA_IO_AsyncBuffers:
 		spa_loop_invoke(this->data_loop,
                                do_port_set_io, SPA_ID_INVALID, NULL, 0, true, &info);
 		break;
@@ -681,11 +713,12 @@
 	struct buffer **buffers;
 	struct buffer *outb;
 	const void **datas;
+	uint32_t cycle = this->position->clock.cycle & 1;
 
 	spa_return_val_if_fail(this != NULL, -EINVAL);
 
 	outport = GET_OUT_PORT(this, 0);
-	if ((outio = outport->io) == NULL)
+	if ((outio = outport->iocycle) == NULL)
 		return -EIO;
 
 	spa_log_trace_fp(this->log, "%p: status %p %d %d",
@@ -713,16 +746,17 @@
 		struct spa_data *bd;
 		uint32_t size, offs;
 
-		if (SPA_UNLIKELY(!PORT_VALID(inport) ||
-		    (inio = inport->io) == NULL ||
-		    inio->buffer_id >= inport->n_buffers ||
-		    inio->status != SPA_STATUS_HAVE_DATA)) {
-			spa_log_trace_fp(this->log, "%p: skip input idx:%d valid:%d "
+		if (SPA_UNLIKELY(!PORT_VALID(inport) || (inio = inport->iocycle) == NULL)) {
+			spa_log_trace_fp(this->log, "%p: skip input idx:%d valid:%d io:%p/%p/%d",
+					this, i, PORT_VALID(inport),
+					inport->io0, inport->io1, cycle);
+			continue;
+		}
+		if (inio->buffer_id >= inport->n_buffers ||
+		    inio->status != SPA_STATUS_HAVE_DATA) {
+			spa_log_trace_fp(this->log, "%p: skip input idx:%d "
 					"io:%p status:%d buf_id:%d n_buffers:%d", this,
-				i, PORT_VALID(inport), inio,
-				inio ? inio->status : -1,
-				inio ? inio->buffer_id : SPA_ID_INVALID,
-				inport->n_buffers);
+				i, inio, inio->status, inio->buffer_id, inport->n_buffers);
 			continue;
 		}
 
@@ -733,8 +767,8 @@
 		size = SPA_MIN(bd->maxsize - offs, bd->chunk->size);
 		maxsize = SPA_MIN(maxsize, size);
 
-		spa_log_trace_fp(this->log, "%p: mix input %d %p->%p %d %d %d:%d/%d %u", this,
-				i, inio, outio, inio->status, inio->buffer_id,
+		spa_log_trace_fp(this->log, "%p: mix input %d %p->%p %d %d/%d %d:%d/%d %u", this,
+				i, inio, outio, inio->status, inio->buffer_id, inport->n_buffers,
 				offs, size, (int)sizeof(float),
 				bd->chunk->flags);

pipewire-1.0.1.tar.bz2/spa/plugins/audiomixer/plugin.c -> pipewire-1.2.0.tar.gz/spa/plugins/audiomixer/plugin.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/audiotestsrc/audiotestsrc.c -> pipewire-1.2.0.tar.gz/spa/plugins/audiotestsrc/audiotestsrc.c Changed

@@ -25,7 +25,9 @@
 #include <spa/pod/filter.h>
 #include <spa/control/control.h>
 
-#define NAME "audiotestsrc"
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.audiotestsrc");
 
 #define SAMPLES_TO_TIME(this,s)   ((s) * SPA_NSEC_PER_SEC / (port)->current_format.info.raw.rate)
 #define BYTES_TO_SAMPLES(this,b)  ((b)/(port)->bpf)
@@ -338,7 +340,7 @@
 		if ((res = spa_system_timerfd_read(this->data_system,
 				this->timer_source.fd, &expirations)) < 0) {
 			if (res != -EAGAIN)
-				spa_log_error(this->log, NAME " %p: timerfd error: %s",
+				spa_log_error(this->log, "%p: timerfd error: %s",
 						this, spa_strerror(res));
 		}
 	}
@@ -369,7 +371,7 @@
 
 	if (spa_list_is_empty(&port->empty)) {
 		set_timer(this, false);
-		spa_log_error(this->log, NAME " %p: out of buffers", this);
+		spa_log_error(this->log, "%p: out of buffers", this);
 		return -EPIPE;
 	}
 	b = spa_list_first(&port->empty, struct buffer, link);
@@ -382,7 +384,7 @@
 
 	n_bytes = maxsize;
 
-	spa_log_trace(this->log, NAME " %p: dequeue buffer %d %d %d", this, b->id,
+	spa_log_trace(this->log, "%p: dequeue buffer %d %d %d", this, b->id,
 		      maxsize, n_bytes);
 
 	filled = 0;
@@ -704,7 +706,7 @@
 static int clear_buffers(struct impl *this, struct port *port)
 {
 	if (port->n_buffers > 0) {
-		spa_log_info(this->log, NAME " %p: clear buffers", this);
+		spa_log_info(this->log, "%p: clear buffers", this);
 		port->n_buffers = 0;
 		spa_list_init(&port->empty);
 		this->started = false;
@@ -837,7 +839,7 @@
 		b->h = spa_buffer_find_meta_data(buffersi, SPA_META_Header, sizeof(*b->h));
 
 		if (d0.data == NULL) {
-			spa_log_error(this->log, NAME " %p: invalid memory on buffer %p", this,
+			spa_log_error(this->log, "%p: invalid memory on buffer %p", this,
 				      buffersi);
 			return -EINVAL;
 		}
@@ -882,7 +884,7 @@
 	struct buffer *b = &port->buffersid;
 	spa_return_if_fail(b->outstanding);
 
-	spa_log_trace(this->log, NAME " %p: reuse buffer %d", this, id);
+	spa_log_trace(this->log, "%p: reuse buffer %d", this, id);
 
 	b->outstanding = false;
 	spa_list_append(&port->empty, &b->link);
@@ -1102,7 +1104,7 @@
 	port->info.n_params = 5;
 	spa_list_init(&port->empty);
 
-	spa_log_info(this->log, NAME " %p: initialized", this);
+	spa_log_info(this->log, "%p: initialized", this);
 
 	return 0;
 }
@@ -1141,7 +1143,7 @@
 
 const struct spa_handle_factory spa_audiotestsrc_factory = {
 	SPA_VERSION_HANDLE_FACTORY,
-	NAME,
+	"audiotestsrc",
 	&info,
 	impl_get_size,
 	impl_init,

pipewire-1.0.1.tar.bz2/spa/plugins/audiotestsrc/plugin.c -> pipewire-1.2.0.tar.gz/spa/plugins/audiotestsrc/plugin.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/audiotestsrc/render.c -> pipewire-1.2.0.tar.gz/spa/plugins/audiotestsrc/render.c Changed

@@ -4,7 +4,7 @@
 
 #include <math.h>
 
-#define M_PI_M2 ( M_PI + M_PI )
+#define M_PI_M2f (float)(M_PI+M_PI)
 
 #define DEFINE_SINE(type,scale)								\
 static void										\
@@ -17,24 +17,24 @@
 	float volume = this->props.volume;						\
 											\
 	channels = this->port.current_format.info.raw.channels;				\
-	step = M_PI_M2 * freq / this->port.current_format.info.raw.rate;		\
+	step = M_PI_M2f * freq / this->port.current_format.info.raw.rate;		\
 	amp = volume * scale;								\
 											\
 	for (i = 0; i < n_samples; i++) {						\
 		type val;								\
 		this->port.accumulator += step;						\
-		if (this->port.accumulator >= M_PI_M2)					\
-			this->port.accumulator -= M_PI_M2;				\
+		if (this->port.accumulator >= M_PI_M2f)					\
+			this->port.accumulator -= M_PI_M2f;				\
 		val = (type) (sin (this->port.accumulator) * amp);			\
 		for (c = 0; c < channels; ++c)						\
 			*samples++ = val;						\
 	}										\
 }
 
-DEFINE_SINE(int16_t, 32767.0);
-DEFINE_SINE(int32_t, 2147483647.0);
-DEFINE_SINE(float, 1.0);
-DEFINE_SINE(double, 1.0);
+DEFINE_SINE(int16_t, 32767.0f);
+DEFINE_SINE(int32_t, 2147483647.0f);
+DEFINE_SINE(float, 1.0f);
+DEFINE_SINE(double, 1.0f);
 
 static const render_func_t sine_funcs = {
 	(render_func_t) audio_test_src_create_sine_int16_t,

pipewire-1.0.1.tar.bz2/spa/plugins/avb/avb-pcm-sink.c -> pipewire-1.2.0.tar.gz/spa/plugins/avb/avb-pcm-sink.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/avb/avb-pcm-source.c -> pipewire-1.2.0.tar.gz/spa/plugins/avb/avb-pcm-source.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/avb/avb.c -> pipewire-1.2.0.tar.gz/spa/plugins/avb/avb.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/a2dp-codec-aac.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/a2dp-codec-aac.c Changed

@@ -17,9 +17,6 @@
 #include "media-codecs.h"
 
 static struct spa_log *log;
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.codecs.aac");
-#undef SPA_LOG_TOPIC_DEFAULT
-#define SPA_LOG_TOPIC_DEFAULT &log_topic
 
 #define DEFAULT_AAC_BITRATE	320000
 #define MIN_AAC_BITRATE		64000
@@ -45,15 +42,41 @@
 	int samplesize;
 };
 
+static bool eld_supported(void)
+{
+	static bool supported = false, checked = false;
+	HANDLE_AACENCODER aacenc = NULL;
+
+	if (checked)
+		return supported;
+
+	if (aacEncOpen(&aacenc, 0, 2) != AACENC_OK)
+		goto done;
+	if (aacEncoder_SetParam(aacenc, AACENC_AOT, AOT_ER_AAC_ELD) != AACENC_OK)
+		goto done;
+	if (aacEncoder_SetParam(aacenc,  AACENC_SBR_MODE, 1) != AACENC_OK)
+		goto done;
+
+	supported = true;
+
+done:
+	if (aacenc)
+		aacEncClose(&aacenc);
+	checked = true;
+	spa_log_debug(log, "FDK-AAC AAC-ELD support:%d", (int)supported);
+	return supported;
+}
+
 static int codec_fill_caps(const struct media_codec *codec, uint32_t flags,
 		uint8_t capsA2DP_MAX_CAPS_SIZE)
 {
-	static const a2dp_aac_t a2dp_aac = {
+	const a2dp_aac_t a2dp_aac = {
 		.object_type =
 			/* NOTE: AAC Long Term Prediction and AAC Scalable are
 			 *       not supported by the FDK-AAC library. */
 			AAC_OBJECT_TYPE_MPEG2_AAC_LC |
-			AAC_OBJECT_TYPE_MPEG4_AAC_LC,
+			AAC_OBJECT_TYPE_MPEG4_AAC_LC |
+			(eld_supported() ? AAC_OBJECT_TYPE_MPEG4_AAC_ELD : 0),
 		AAC_INIT_FREQUENCY(
 			AAC_SAMPLING_FREQ_8000 |
 			AAC_SAMPLING_FREQ_11025 |
@@ -123,16 +146,26 @@
 
 	conf = *(a2dp_aac_t*)caps;
 
-	if (conf.object_type & AAC_OBJECT_TYPE_MPEG2_AAC_LC)
-		conf.object_type = AAC_OBJECT_TYPE_MPEG2_AAC_LC;
-	else if (conf.object_type & AAC_OBJECT_TYPE_MPEG4_AAC_LC)
-		conf.object_type = AAC_OBJECT_TYPE_MPEG4_AAC_LC;
-	else if (conf.object_type & AAC_OBJECT_TYPE_MPEG4_AAC_LTP)
-		return -ENOTSUP;  /* Not supported by FDK-AAC */
-	else if (conf.object_type & AAC_OBJECT_TYPE_MPEG4_AAC_SCA)
-		return -ENOTSUP;  /* Not supported by FDK-AAC */
-	else
-		return -ENOTSUP;
+	if (codec->id == SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD) {
+		if (!eld_supported())
+			return -ENOTSUP;
+			
+		if (conf.object_type & AAC_OBJECT_TYPE_MPEG4_AAC_ELD)
+			conf.object_type = AAC_OBJECT_TYPE_MPEG4_AAC_ELD;
+		else
+			return -ENOTSUP;
+	} else {
+		if (conf.object_type & AAC_OBJECT_TYPE_MPEG2_AAC_LC)
+			conf.object_type = AAC_OBJECT_TYPE_MPEG2_AAC_LC;
+		else if (conf.object_type & AAC_OBJECT_TYPE_MPEG4_AAC_LC)
+			conf.object_type = AAC_OBJECT_TYPE_MPEG4_AAC_LC;
+		else if (conf.object_type & AAC_OBJECT_TYPE_MPEG4_AAC_LTP)
+			return -ENOTSUP;  /* Not supported by FDK-AAC */
+		else if (conf.object_type & AAC_OBJECT_TYPE_MPEG4_AAC_SCA)
+			return -ENOTSUP;  /* Not supported by FDK-AAC */
+		else
+			return -ENOTSUP;
+	}
 
 	if ((i = media_codec_select_config(aac_frequencies,
 					  SPA_N_ELEMENTS(aac_frequencies),
@@ -250,7 +283,8 @@
 	 * a BlueZ bug, but we can be lax here and below in codec_init.
 	 */
 	if (!(conf.object_type & (AAC_OBJECT_TYPE_MPEG2_AAC_LC |
-					AAC_OBJECT_TYPE_MPEG4_AAC_LC)))
+					AAC_OBJECT_TYPE_MPEG4_AAC_LC |
+					AAC_OBJECT_TYPE_MPEG4_AAC_ELD)))
 		return -EINVAL;
 	j = 0;
 	SPA_FOR_EACH_ELEMENT_VAR(aac_frequencies, f) {
@@ -330,16 +364,24 @@
 	if (res != AACENC_OK)
 		goto error;
 
-	if (!(conf->object_type & (AAC_OBJECT_TYPE_MPEG2_AAC_LC |
-					AAC_OBJECT_TYPE_MPEG4_AAC_LC))) {
+	if (conf->object_type & AAC_OBJECT_TYPE_MPEG4_AAC_ELD) {
+		res = aacEncoder_SetParam(this->aacenc, AACENC_AOT, AOT_ER_AAC_ELD);
+		if (res != AACENC_OK)
+			goto error;
+
+		res = aacEncoder_SetParam(this->aacenc,  AACENC_SBR_MODE, 1);
+		if (res != AACENC_OK)
+			goto error;
+	} else if (conf->object_type & (AAC_OBJECT_TYPE_MPEG2_AAC_LC |
+						AAC_OBJECT_TYPE_MPEG4_AAC_LC)) {
+		res = aacEncoder_SetParam(this->aacenc, AACENC_AOT, AOT_AAC_LC);
+		if (res != AACENC_OK)
+			goto error;
+	} else {		
 		res = -EINVAL;
 		goto error;
 	}
 
-	res = aacEncoder_SetParam(this->aacenc, AACENC_AOT, AOT_AAC_LC);
-	if (res != AACENC_OK)
-		goto error;
-
 	res = aacEncoder_SetParam(this->aacenc, AACENC_SAMPLERATE, this->rate);
 	if (res != AACENC_OK)
 		goto error;
@@ -608,7 +650,7 @@
 static void codec_set_log(struct spa_log *global_log)
 {
 	log = global_log;
-	spa_log_topic_init(log, &log_topic);
+	spa_log_topic_init(log, &codec_plugin_log_topic);
 }
 
 const struct media_codec a2dp_codec_aac = {
@@ -635,7 +677,33 @@
 	.set_log = codec_set_log,
 };
 
+const struct media_codec a2dp_codec_aac_eld = {
+	.id = SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD,
+	.codec_id = A2DP_CODEC_MPEG24,
+	.name = "aac_eld",
+	.description = "AAC-ELD",
+	.endpoint_name = "aac",
+	.fill_caps = NULL,
+	.select_config = codec_select_config,
+	.enum_config = codec_enum_config,
+	.validate_config = codec_validate_config,
+	.init_props = codec_init_props,
+	.clear_props = codec_clear_props,
+	.init = codec_init,
+	.deinit = codec_deinit,
+	.get_block_size = codec_get_block_size,
+	.start_encode = codec_start_encode,
+	.encode = codec_encode,
+	.start_decode = codec_start_decode,
+	.decode = codec_decode,
+	.abr_process = codec_abr_process,
+	.reduce_bitpool = codec_reduce_bitpool,
+	.increase_bitpool = codec_increase_bitpool,
+	.set_log = codec_set_log,
+};
+
 MEDIA_CODEC_EXPORT_DEF(
 	"aac",
-	&a2dp_codec_aac
+	&a2dp_codec_aac,
+	&a2dp_codec_aac_eld
 );

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/a2dp-codec-aptx.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/a2dp-codec-aptx.c Changed

@@ -300,8 +300,17 @@
 		void *config, size_t config_len, const struct spa_audio_info *info,
 		void *props, size_t mtu)
 {
-	struct impl *this;
+	struct impl *this = NULL;
+	a2dp_aptx_t conf;
 	int res;
+	int frequency;
+
+	if (config_len < sizeof(conf)) {
+		res = -EINVAL;
+		goto error;
+	}
+
+	memcpy(&conf, config, sizeof(conf));
 
 	if ((this = calloc(1, sizeof(struct impl))) == NULL)
 		goto error_errno;
@@ -322,10 +331,17 @@
 	this->frame_length = this->hd ? 6 : 4;
 	this->codesize = 4 * 3 * 2;
 
+	frequency = media_codec_get_config(aptx_frequencies, SPA_N_ELEMENTS(aptx_frequencies), conf.frequency);
+	if (frequency < 0) {
+		res = -EINVAL;
+		goto error;
+	}
+
 	if (this->hd)
 		this->max_frames = (this->mtu - sizeof(struct rtp_header)) / this->frame_length;
 	else if (codec_is_ll(codec))
-		this->max_frames = SPA_MIN(256u, this->mtu) / this->frame_length;
+		/* try to make 7.5ms packets */
+		this->max_frames = SPA_MIN((unsigned)frequency * 75u/10000u / 4u, this->mtu / this->frame_length);
 	else
 		this->max_frames = this->mtu / this->frame_length;

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/a2dp-codec-caps.h -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/a2dp-codec-caps.h Changed

@@ -101,6 +101,7 @@
 #define AAC_OBJECT_TYPE_MPEG4_AAC_LC	0x40
 #define AAC_OBJECT_TYPE_MPEG4_AAC_LTP	0x20
 #define AAC_OBJECT_TYPE_MPEG4_AAC_SCA	0x10
+#define AAC_OBJECT_TYPE_MPEG4_AAC_ELD	0x02
 
 #define AAC_SAMPLING_FREQ_8000		0x0800
 #define AAC_SAMPLING_FREQ_11025		0x0400
@@ -281,6 +282,29 @@
 #define OPUS_05_SET_BITRATE(a, v) OPUS_05_SET_UINT16(a, bitrate, v)
 
 
+#define OPUS_G_VENDOR_ID	0x000000e0
+#define OPUS_G_CODEC_ID		0x0001
+
+#define OPUS_G_FREQUENCY_MASK		0x80
+#define OPUS_G_FREQUENCY_48000		0x80
+
+#define OPUS_G_DURATION_MASK		0x18
+#define OPUS_G_DURATION_100		0x08
+#define OPUS_G_DURATION_200		0x10
+
+#define OPUS_G_CHANNELS_MASK		0x07
+#define OPUS_G_CHANNELS_MONO		0x01
+#define OPUS_G_CHANNELS_STEREO		0x02
+#define OPUS_G_CHANNELS_MONO_2		0x04
+
+#define OPUS_G_GET_FREQUENCY(a) ((a).data & OPUS_G_FREQUENCY_MASK)
+#define OPUS_G_GET_DURATION(a) ((a).data & OPUS_G_DURATION_MASK)
+#define OPUS_G_GET_CHANNELS(a) ((a).data & OPUS_G_CHANNELS_MASK)
+
+#define OPUS_G_SET(a, freq, dur, ch) \
+	(a).data = ((freq) & OPUS_G_FREQUENCY_MASK) | ((dur) & OPUS_G_DURATION_MASK) | ((ch) & OPUS_G_CHANNELS_MASK)
+
+
 typedef struct {
 	uint32_t vendor_id;
 	uint16_t codec_id;
@@ -457,4 +481,9 @@
 	a2dp_opus_05_direction_t bidi;
 } __attribute__ ((packed)) a2dp_opus_05_t;
 
+typedef struct {
+	a2dp_vendor_codec_t info;
+	uint8_t data;
+} __attribute__ ((packed)) a2dp_opus_g_t;
+
 #endif

pipewire-1.2.0.tar.gz/spa/plugins/bluez5/a2dp-codec-opus-g.c Added

@@ -0,0 +1,526 @@
+/* Spa A2DP Opus Codec */
+/* SPDX-FileCopyrightText: Copyright © 2020 Wim Taymans */
+/* SPDX-FileCopyrightText: Copyright © 2022 Pauli Virtanen */
+/* SPDX-License-Identifier: MIT */
+
+#include <unistd.h>
+#include <string.h>
+#include <stddef.h>
+#include <errno.h>
+#include <arpa/inet.h>
+#if __BYTE_ORDER != __LITTLE_ENDIAN
+#include <byteswap.h>
+#endif
+
+#include <spa/debug/types.h>
+#include <spa/param/audio/type-info.h>
+#include <spa/param/audio/raw.h>
+#include <spa/utils/string.h>
+#include <spa/utils/dict.h>
+#include <spa/param/audio/format.h>
+#include <spa/param/audio/format-utils.h>
+
+#include <opus.h>
+
+#include "rtp.h"
+#include "media-codecs.h"
+
+static struct spa_log *log;
+
+struct dec_data {
+};
+
+struct enc_data {
+	struct rtp_header *header;
+	struct rtp_payload *payload;
+
+	int samples;
+	int codesize;
+	int frame_dms;
+	int bitrate;
+	int packet_size;
+};
+
+struct impl {
+	OpusEncoder *enc;
+	OpusDecoder *dec;
+
+	int mtu;
+	int samplerate;
+	int channels;
+	int application;
+
+	struct dec_data d;
+	struct enc_data e;
+};
+
+static int codec_fill_caps(const struct media_codec *codec, uint32_t flags,
+		uint8_t capsA2DP_MAX_CAPS_SIZE)
+{
+	a2dp_opus_g_t conf = {
+		.info = codec->vendor,
+	};
+
+	OPUS_G_SET(conf,
+			OPUS_G_FREQUENCY_48000,
+			OPUS_G_DURATION_100 | OPUS_G_DURATION_200,
+			OPUS_G_CHANNELS_MONO | OPUS_G_CHANNELS_STEREO | OPUS_G_CHANNELS_MONO_2);
+
+	memcpy(caps, &conf, sizeof(conf));
+	return sizeof(conf);
+}
+
+static int codec_select_config(const struct media_codec *codec, uint32_t flags,
+		const void *caps, size_t caps_size,
+		const struct media_codec_audio_info *info,
+		const struct spa_dict *global_settings, uint8_t configA2DP_MAX_CAPS_SIZE)
+{
+	a2dp_opus_g_t conf;
+	int frequency, duration, channels;
+
+	if (caps_size < sizeof(conf))
+		return -EINVAL;
+
+	memcpy(&conf, caps, sizeof(conf));
+
+	if (codec->vendor.vendor_id != conf.info.vendor_id ||
+	    codec->vendor.codec_id != conf.info.codec_id)
+		return -ENOTSUP;
+
+	if (OPUS_G_GET_FREQUENCY(conf) & OPUS_G_FREQUENCY_48000)
+		frequency = OPUS_G_FREQUENCY_48000;
+	else
+		return -EINVAL;
+
+	if (OPUS_G_GET_DURATION(conf) & OPUS_G_DURATION_200)
+		duration = OPUS_G_DURATION_200;
+	else if (OPUS_G_GET_DURATION(conf) & OPUS_G_DURATION_100)
+		duration = OPUS_G_DURATION_100;
+	else
+		return -EINVAL;
+
+	if (OPUS_G_GET_CHANNELS(conf) & OPUS_G_CHANNELS_STEREO)
+		channels = OPUS_G_CHANNELS_STEREO;
+	else if (OPUS_G_GET_CHANNELS(conf) & OPUS_G_CHANNELS_MONO)
+		channels = OPUS_G_CHANNELS_MONO;
+	else if (OPUS_G_GET_CHANNELS(conf) & OPUS_G_CHANNELS_MONO_2)
+		channels = OPUS_G_CHANNELS_MONO_2;
+	else
+		return -EINVAL;
+
+	OPUS_G_SET(conf, frequency, duration, channels);
+
+	memcpy(config, &conf, sizeof(conf));
+
+	return sizeof(conf);
+}
+
+static int codec_caps_preference_cmp(const struct media_codec *codec, uint32_t flags, const void *caps1, size_t caps1_size,
+		const void *caps2, size_t caps2_size, const struct media_codec_audio_info *info,
+		const struct spa_dict *global_settings)
+{
+	a2dp_opus_g_t conf1, conf2, cap1, cap2;
+	a2dp_opus_g_t *conf;
+	int res1, res2;
+	int a, b;
+
+	/* Order selected configurations by preference */
+	res1 = codec->select_config(codec, flags, caps1, caps1_size, info, global_settings, (uint8_t *)&conf1);
+	res2 = codec->select_config(codec, flags, caps2, caps2_size, info, global_settings, (uint8_t *)&conf2);
+
+#define PREFER_EXPR(expr)			\
+		do {				\
+			conf = &conf1; 		\
+			a = (expr);		\
+			conf = &conf2;		\
+			b = (expr);		\
+			if (a != b)		\
+				return b - a;	\
+		} while (0)
+
+#define PREFER_BOOL(expr)	PREFER_EXPR((expr) ? 1 : 0)
+
+	/* Prefer valid */
+	a = (res1 > 0 && (size_t)res1 == sizeof(a2dp_opus_g_t)) ? 1 : 0;
+	b = (res2 > 0 && (size_t)res2 == sizeof(a2dp_opus_g_t)) ? 1 : 0;
+	if (!a || !b)
+		return b - a;
+
+	memcpy(&cap1, caps1, sizeof(cap1));
+	memcpy(&cap2, caps2, sizeof(cap2));
+
+	PREFER_EXPR(OPUS_G_GET_CHANNELS(*conf) & OPUS_G_CHANNELS_STEREO);
+
+	return 0;
+
+#undef PREFER_EXPR
+#undef PREFER_BOOL
+}
+
+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_opus_g_t conf;
+	struct spa_pod_frame f1;
+	uint32_t positionSPA_AUDIO_MAX_CHANNELS;
+	int channels;
+
+	if (caps_size < sizeof(conf))
+		return -EINVAL;
+
+	memcpy(&conf, caps, sizeof(conf));
+
+	if (idx > 0)
+		return 0;
+
+	switch (OPUS_G_GET_CHANNELS(conf)) {
+	case OPUS_G_CHANNELS_STEREO:
+		channels = 2;
+		position0 = SPA_AUDIO_CHANNEL_FL;
+		position1 = SPA_AUDIO_CHANNEL_FR;
+		break;
+	case OPUS_G_CHANNELS_MONO:
+		channels = 1;
+		position0 = SPA_AUDIO_CHANNEL_MONO;
+		break;
+	case OPUS_G_CHANNELS_MONO_2:
+		channels = 2;
+		position0 = SPA_AUDIO_CHANNEL_AUX0;
+		position1 = SPA_AUDIO_CHANNEL_AUX1;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	spa_pod_builder_push_object(b, &f0, 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_F32),
+			SPA_FORMAT_AUDIO_rate,     SPA_POD_CHOICE_ENUM_Int(6,
+					48000, 48000, 24000, 16000, 12000, 8000),
+			SPA_FORMAT_AUDIO_channels, SPA_POD_Int(channels),
+			SPA_FORMAT_AUDIO_position, SPA_POD_Array(sizeof(uint32_t),
+					SPA_TYPE_Id, channels, position),
+			0);
+
+	*param = spa_pod_builder_pop(b, &f0);
+	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)
+{
+	a2dp_opus_g_t conf;
+
+	if (caps == NULL || caps_size < sizeof(conf))
+		return -EINVAL;
+
+	memcpy(&conf, caps, sizeof(conf));
+
+	spa_zero(*info);
+	info->media_type = SPA_MEDIA_TYPE_audio;
+	info->media_subtype = SPA_MEDIA_SUBTYPE_raw;
+
+	info->info.raw.format = SPA_AUDIO_FORMAT_F32;
+	info->info.raw.rate = 0;  /* not specified by config */
+
+	switch (OPUS_G_GET_FREQUENCY(conf)) {
+	case OPUS_G_FREQUENCY_48000:
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	switch (OPUS_G_GET_DURATION(conf)) {
+	case OPUS_G_DURATION_100:
+	case OPUS_G_DURATION_200:
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	switch (OPUS_G_GET_CHANNELS(conf)) {
+	case OPUS_G_CHANNELS_STEREO:
+		info->info.raw.channels = 2;
+		info->info.raw.position0 = SPA_AUDIO_CHANNEL_FL;
+		info->info.raw.position1 = SPA_AUDIO_CHANNEL_FR;
+		break;
+	case OPUS_G_CHANNELS_MONO:
+		info->info.raw.channels = 1;
+		info->info.raw.position0 = SPA_AUDIO_CHANNEL_MONO;
+		break;
+	case OPUS_G_CHANNELS_MONO_2:
+		info->info.raw.channels = 2;
+		info->info.raw.position0 = SPA_AUDIO_CHANNEL_AUX0;
+		info->info.raw.position1 = SPA_AUDIO_CHANNEL_AUX1;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int parse_frame_dms(int value)
+{
+	switch (value) {
+	case OPUS_G_DURATION_100:
+		return 100;
+	case OPUS_G_DURATION_200:
+		return 200;
+	default:
+		return -EINVAL;
+	}
+}
+
+static void *codec_init(const struct media_codec *codec, uint32_t flags,
+		void *config, size_t config_len, const struct spa_audio_info *info,
+		void *props, size_t mtu)
+{
+	a2dp_opus_g_t conf;
+	struct impl *this = NULL;
+	struct spa_audio_info config_info;
+	int res;
+
+	if (config_len < sizeof(conf)) {
+		res = -EINVAL;
+		goto error;
+	}
+	memcpy(&conf, config, sizeof(conf));
+
+	if (info->media_type != SPA_MEDIA_TYPE_audio ||
+	    info->media_subtype != SPA_MEDIA_SUBTYPE_raw ||
+	    info->info.raw.format != SPA_AUDIO_FORMAT_F32) {
+		res = -EINVAL;
+		goto error;
+	}
+
+	if ((this = calloc(1, sizeof(struct impl))) == NULL)
+		goto error_errno;
+
+	if ((res = codec_validate_config(codec, flags, config, config_len, &config_info)) < 0)
+		goto error;
+	if (config_info.info.raw.channels != info->info.raw.channels) {
+		res = -EINVAL;
+		goto error;
+	}
+
+	this->mtu = mtu;
+	this->samplerate = info->info.raw.rate;
+	this->channels = config_info.info.raw.channels;
+	this->application = OPUS_APPLICATION_AUDIO;
+
+	/*
+	 * Setup encoder
+	 */
+	this->enc = opus_encoder_create(this->samplerate, this->channels, this->application, &res);
+	if (this->enc == NULL) {
+		res = -EINVAL;
+		goto error;
+	}
+
+	if ((this->e.frame_dms = parse_frame_dms(OPUS_G_GET_DURATION(conf))) < 0) {
+		res = -EINVAL;
+		goto error;
+	}
+
+	this->e.samples = this->e.frame_dms * this->samplerate / 10000;
+	this->e.codesize = this->e.samples * (int)this->channels * sizeof(float);
+
+	int header_size = sizeof(struct rtp_header) + sizeof(struct rtp_payload);
+	this->e.bitrate = SPA_MIN(128000 * this->channels,
+			(int64_t)8 * (this->mtu - header_size) * 10000 / this->e.frame_dms);
+
+	opus_encoder_ctl(this->enc, OPUS_SET_BITRATE(this->e.bitrate));
+
+	/*
+	 * Setup decoder
+	 */
+	this->dec = opus_decoder_create(this->samplerate, this->channels, &res);
+	if (this->dec == NULL) {
+		res = -EINVAL;
+		goto error;
+	}
+
+	return this;
+
+error_errno:
+	res = -errno;
+	goto error;
+
+error:
+	if (this && this->enc)
+		opus_encoder_destroy(this->enc);
+	if (this && this->dec)
+		opus_decoder_destroy(this->dec);
+	free(this);
+	errno = -res;
+	return NULL;
+}
+
+static void codec_deinit(void *data)
+{
+	struct impl *this = data;
+
+	opus_encoder_destroy(this->enc);
+	opus_decoder_destroy(this->dec);
+	free(this);
+}
+
+static int codec_get_block_size(void *data)
+{
+	struct impl *this = data;
+	return this->e.codesize;
+}
+
+static int codec_start_encode (void *data,
+		void *dst, size_t dst_size, uint16_t seqnum, uint32_t timestamp)
+{
+	struct impl *this = data;
+	size_t header_size = sizeof(struct rtp_header) + sizeof(struct rtp_payload);
+
+	if (dst_size <= header_size)
+		return -EINVAL;
+
+	this->e.header = (struct rtp_header *)dst;
+	this->e.payload = SPA_PTROFF(dst, sizeof(struct rtp_header), struct rtp_payload);
+	memset(dst, 0, header_size);
+
+	this->e.payload->frame_count = 0;
+	this->e.header->v = 2;
+	this->e.header->pt = 96;
+	this->e.header->sequence_number = htons(seqnum);
+	this->e.header->timestamp = htonl(timestamp);
+	this->e.header->ssrc = htonl(1);
+
+	this->e.packet_size = header_size;
+	return this->e.packet_size;
+}
+
+static int codec_encode(void *data,
+		const void *src, size_t src_size,
+		void *dst, size_t dst_size,
+		size_t *dst_out, int *need_flush)
+{
+	struct impl *this = data;
+	int res;
+
+	if (src_size < (size_t)this->e.codesize) {
+		*dst_out = 0;
+		return 0;
+	}
+	if (this->e.packet_size >= this->mtu)
+		return -EINVAL;
+
+	dst_size = SPA_MIN(dst_size, (size_t)(this->mtu - this->e.packet_size));
+
+	res = opus_encode_float(this->enc, src, this->e.samples, dst, dst_size);
+	if (res < 0)
+		return -EINVAL;
+
+	*dst_out = res;
+
+	this->e.packet_size += res;
+	this->e.payload->frame_count++;
+
+	*need_flush = NEED_FLUSH_ALL;
+
+	return this->e.codesize;
+}
+
+static int codec_start_decode (void *data,
+		const void *src, size_t src_size, uint16_t *seqnum, uint32_t *timestamp)
+{
+	struct impl SPA_UNUSED *this = data;
+	const struct rtp_header *header = src;
+	const struct rtp_payload *payload = SPA_PTROFF(src, sizeof(struct rtp_header), void);
+	size_t header_size = sizeof(struct rtp_header) + sizeof(struct rtp_payload);
+
+	spa_return_val_if_fail (src_size > header_size, -EINVAL);
+
+	if (seqnum)
+		*seqnum = ntohs(header->sequence_number);
+	if (timestamp)
+		*timestamp = ntohl(header->timestamp);
+
+	if (payload->is_fragmented)
+		return -EINVAL;  /* fragmentation not supported */
+	if (payload->frame_count != 1)
+		return -EINVAL;  /* wrong number of frames in packet */
+
+	return header_size;
+}
+
+static int codec_decode(void *data,
+		const void *src, size_t src_size,
+		void *dst, size_t dst_size,
+		size_t *dst_out)
+{
+	struct impl SPA_UNUSED *this = data;
+	int consumed = src_size;
+	int res;
+	int dst_samples;
+
+	dst_samples = dst_size / (sizeof(float) * this->channels);
+	res = opus_decode_float(this->dec, src, src_size, dst, dst_samples, 0);
+	if (res < 0)
+		return -EINVAL;
+
+	*dst_out = (size_t)res * this->channels * sizeof(float);
+
+	return consumed;
+}
+
+static int codec_abr_process (void *data, size_t unsent)
+{
+	return -ENOTSUP;
+}
+
+static int codec_reduce_bitpool(void *data)
+{
+	return 0;
+}
+
+static int codec_increase_bitpool(void *data)
+{
+	return 0;
+}
+
+static void codec_set_log(struct spa_log *global_log)
+{
+	log = global_log;
+	spa_log_topic_init(log, &codec_plugin_log_topic);
+}
+
+const struct media_codec a2dp_codec_opus_g = {
+	.id = SPA_BLUETOOTH_AUDIO_CODEC_OPUS_G,
+	.codec_id = A2DP_CODEC_VENDOR,
+	.vendor = { .vendor_id = OPUS_G_VENDOR_ID,
+			.codec_id = OPUS_G_CODEC_ID },
+	.select_config = codec_select_config,
+	.enum_config = codec_enum_config,
+	.validate_config = codec_validate_config,
+	.caps_preference_cmp = codec_caps_preference_cmp,
+	.init = codec_init,
+	.deinit = codec_deinit,
+	.get_block_size = codec_get_block_size,
+	.start_encode = codec_start_encode,
+	.encode = codec_encode,
+	.abr_process = codec_abr_process,
+	.reduce_bitpool = codec_reduce_bitpool,
+	.increase_bitpool = codec_increase_bitpool,
+	.set_log = codec_set_log,
+	.start_decode = codec_start_decode,
+	.decode = codec_decode,
+	.name = "opus_g",
+	.description = "Opus",
+	.fill_caps = codec_fill_caps,
+};
+
+MEDIA_CODEC_EXPORT_DEF(
+	"opus-g",
+	&a2dp_codec_opus_g
+);

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/a2dp-codec-opus.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/a2dp-codec-opus.c Changed

@@ -27,9 +27,6 @@
 #include "media-codecs.h"
 
 static struct spa_log *log;
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.codecs.opus");
-#undef SPA_LOG_TOPIC_DEFAULT
-#define SPA_LOG_TOPIC_DEFAULT &log_topic
 
 #define BUFSIZE_FROM_BITRATE(frame_dms,bitrate)	((bitrate)/8 * (frame_dms) / 10000 * 5/4)  /* estimate */
 
@@ -182,7 +179,7 @@
 #define BT_AUDIO_LOCATION_BC	0x00200000  /* Bottom Front Center */
 #define BT_AUDIO_LOCATION_BLC	0x00400000  /* Bottom Front Left */
 #define BT_AUDIO_LOCATION_BRC	0x00800000  /* Bottom Front Right */
-#define BT_AUDIO_LOCATION_FLW	0x01000000  /* Fron Left Wide */
+#define BT_AUDIO_LOCATION_FLW	0x01000000  /* Front Left Wide */
 #define BT_AUDIO_LOCATION_FRW	0x02000000  /* Front Right Wide */
 #define BT_AUDIO_LOCATION_SSL	0x04000000  /* Left Surround */
 #define BT_AUDIO_LOCATION_SSR	0x08000000  /* Right Surround */
@@ -1333,7 +1330,7 @@
 static void codec_set_log(struct spa_log *global_log)
 {
 	log = global_log;
-	spa_log_topic_init(log, &log_topic);
+	spa_log_topic_init(log, &codec_plugin_log_topic);
 }
 
 #define OPUS_05_COMMON_DEFS					\
@@ -1363,7 +1360,7 @@
 	OPUS_05_COMMON_FULL_DEFS,
 	.id = SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05,
 	.name = "opus_05",
-	.description = "Opus",
+	.description = "Opus 05",
 	.fill_caps = codec_fill_caps,
 };
 
@@ -1371,7 +1368,7 @@
 	OPUS_05_COMMON_DEFS,
 	.id = SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_51,
 	.name = "opus_05_51",
-	.description = "Opus 5.1 Surround",
+	.description = "Opus 05 5.1 Surround",
 	.endpoint_name = "opus_05",
 	.fill_caps = NULL,
 };
@@ -1380,7 +1377,7 @@
 	OPUS_05_COMMON_DEFS,
 	.id = SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_71,
 	.name = "opus_05_71",
-	.description = "Opus 7.1 Surround",
+	.description = "Opus 05 7.1 Surround",
 	.endpoint_name = "opus_05",
 	.fill_caps = NULL,
 };
@@ -1390,14 +1387,14 @@
 	OPUS_05_COMMON_FULL_DEFS,
 	.id = 0,
 	.name = "opus_05_duplex_bidi",
-	.description = "Opus Duplex Bidi channel",
+	.description = "Opus 05 Duplex Bidi channel",
 };
 
 const struct media_codec a2dp_codec_opus_05_duplex = {
 	OPUS_05_COMMON_FULL_DEFS,
 	.id = SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_DUPLEX,
 	.name = "opus_05_duplex",
-	.description = "Opus Duplex",
+	.description = "Opus 05 Duplex",
 	.duplex_codec = &a2dp_codec_opus_05_return,
 	.fill_caps = codec_fill_caps,
 };
@@ -1406,7 +1403,7 @@
 	OPUS_05_COMMON_DEFS,
 	.id = SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_PRO,
 	.name = "opus_05_pro",
-	.description = "Opus Pro Audio",
+	.description = "Opus 05 Pro Audio",
 	.init_props = codec_init_props,
 	.clear_props = codec_clear_props,
 	.duplex_codec = &a2dp_codec_opus_05_return,

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/a2dp-codec-sbc.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/a2dp-codec-sbc.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/backend-hsphfpd.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/backend-hsphfpd.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/backend-native.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/backend-native.c Changed

@@ -26,6 +26,7 @@
 #include <spa/utils/type.h>
 #include <spa/utils/json.h>
 #include <spa/param/audio/raw.h>
+#include <spa-private/dbus-helpers.h>
 
 #include "defs.h"
 
@@ -33,11 +34,10 @@
 #include <libusb.h>
 #endif
 
-#include "dbus-helpers.h"
 #include "modemmanager.h"
 #include "upower.h"
 
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.native");
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.native");
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
 
@@ -161,6 +161,7 @@
 	unsigned int slc_configured:1;
 	unsigned int codec_negotiation_supported:1;
 	unsigned int msbc_supported_by_hfp:1;
+	unsigned int lc3_supported_by_hfp:1;
 	unsigned int hfp_ag_switching_codec:1;
 	unsigned int hfp_ag_initial_codec_setup:2;
 	unsigned int cind_call_active:1;
@@ -199,20 +200,26 @@
 
 static const struct spa_bt_transport_implementation sco_transport_impl;
 
-static struct spa_bt_transport *_transport_create(struct rfcomm *rfcomm)
+static int rfcomm_new_transport(struct rfcomm *rfcomm)
 {
 	struct impl *backend = rfcomm->backend;
 	struct spa_bt_transport *t = NULL;
 	struct transport_data *td;
 	char* pathfd;
 
+	if (rfcomm->transport) {
+		spa_hook_remove(&rfcomm->transport_listener);
+		spa_bt_transport_free(rfcomm->transport);
+		rfcomm->transport = NULL;
+	}
+
 	if ((pathfd = spa_aprintf("%s/fd%d", rfcomm->path, rfcomm->source.fd)) == NULL)
-		return NULL;
+		goto fail;
 
 	t = spa_bt_transport_create(backend->monitor, pathfd, sizeof(struct transport_data));
 	if (t == NULL) {
 		free(pathfd);
-		return NULL;
+		goto fail;
 	}
 	spa_bt_transport_set_implementation(t, &sco_transport_impl, t);
 
@@ -222,6 +229,7 @@
 	t->backend = &backend->this;
 	t->n_channels = 1;
 	t->channels0 = SPA_AUDIO_CHANNEL_MONO;
+	t->codec = HFP_AUDIO_CODEC_CVSD;
 
 	td = t->user_data;
 	td->rfcomm = rfcomm;
@@ -238,13 +246,18 @@
 		t->volumesi.active = rfcomm->volumesi.active;
 		t->volumesi.hw_volume_max = SPA_BT_VOLUME_HS_MAX;
 		if (rfcomm->volumesi.active && rfcomm->volumesi.hw_volume != SPA_BT_VOLUME_INVALID)
-			t->volumesi.volume =
+			t->volumesi.volume = (float)
 				spa_bt_volume_hw_to_linear(rfcomm->volumesi.hw_volume, t->volumesi.hw_volume_max);
 	}
 
 	spa_bt_transport_add_listener(t, &rfcomm->transport_listener, &transport_events, rfcomm);
 
-	return t;
+	rfcomm->transport = t;
+	return 0;
+
+fail:
+	spa_log_warn(backend->log, "failed to create transport");
+	return -ENOMEM;
 }
 
 static int codec_switch_stop_timer(struct rfcomm *rfcomm);
@@ -411,7 +424,7 @@
 	for (int i = 0; i < SPA_BT_VOLUME_ID_TERM ; ++i) {
 		t_volume = &rfcomm->transport->volumesi;
 		t_volume->active = rfcomm->volumesi.active;
-		t_volume->volume =
+		t_volume->volume = (float)
 			spa_bt_volume_hw_to_linear(rfcomm->volumesi.hw_volume, t_volume->hw_volume_max);
 	}
 
@@ -422,7 +435,7 @@
 static bool rfcomm_hsp_ag(struct rfcomm *rfcomm, char* buf)
 {
 	struct impl *backend = rfcomm->backend;
-	unsigned int gain, dummy;
+	unsigned int gain;
 
 	/* There are only three HSP AT commands:
 	 * AT+VGS=value: value between 0 and 15, sent by the HS to AG to set the speaker gain.
@@ -445,8 +458,9 @@
 			rfcomm_send_reply(rfcomm, "ERROR");
 			spa_log_debug(backend->log, "RFCOMM receive unsupported VGM gain: %s", buf);
 		}
-	} else if (sscanf(buf, "AT+CKPD=%d", &dummy) == 1) {
+	} else if (spa_strstartswith(buf, "AT+CKPD=200") == 1) {
 		rfcomm_send_reply(rfcomm, "OK");
+		spa_bt_device_emit_switch_profile(rfcomm->device);
 	} else {
 		return false;
 	}
@@ -495,19 +509,19 @@
 	 *   or when the gain is changed on the AG side.
 	 * RING: Sent by AG to HS to notify of an incoming call. It can safely be ignored because
 	 *   it does not expect a reply. */
-	if (sscanf(buf, "\r\n+VGS=%d\r\n", &gain) == 1) {
+	if (sscanf(buf, "+VGS=%d", &gain) == 1) {
 		if (gain <= SPA_BT_VOLUME_HS_MAX) {
 			rfcomm_emit_volume_changed(rfcomm, SPA_BT_VOLUME_ID_RX, gain);
 		} else {
 			spa_log_debug(backend->log, "RFCOMM receive unsupported VGS gain: %s", buf);
 		}
-	} else if (sscanf(buf, "\r\n+VGM=%d\r\n", &gain) == 1) {
+	} else if (sscanf(buf, "+VGM=%d", &gain) == 1) {
 		if (gain <= SPA_BT_VOLUME_HS_MAX) {
 			rfcomm_emit_volume_changed(rfcomm, SPA_BT_VOLUME_ID_TX, gain);
 		} else {
 			spa_log_debug(backend->log, "RFCOMM receive unsupported VGM gain: %s", buf);
 		}
-	} else if (spa_strstartswith(buf, "\r\nOK\r\n")) {
+	} else if (spa_streq(buf, "OK")) {
 		if (rfcomm->hs_state == hsp_hs_init2) {
 			if (rfcomm_send_volume_cmd(rfcomm, SPA_BT_VOLUME_ID_RX))
 				rfcomm->hs_state = hsp_hs_vgs;
@@ -614,28 +628,48 @@
 
 #ifdef HAVE_BLUEZ_5_BACKEND_HFP_NATIVE
 
-static bool device_supports_required_mSBC_transport_modes(
-		struct impl *backend, struct spa_bt_device *device)
+static bool device_supports_codec(struct impl *backend, struct spa_bt_device *device, int codec)
 {
 	int res;
-	bool msbc_ok, msbc_alt1_ok;
+	bool alt6_ok = true, alt1_ok = true;
+	bool msbc_alt6_ok = true, msbc_alt1_ok = true;
 	uint32_t bt_features;
 
 	if (device->adapter == NULL)
 		return false;
 
 	if (backend->quirks && spa_bt_quirks_get_features(backend->quirks, device->adapter, device, &bt_features) == 0) {
-		msbc_ok = bt_features & SPA_BT_FEATURE_MSBC;
-		msbc_alt1_ok = bt_features & (SPA_BT_FEATURE_MSBC_ALT1 | SPA_BT_FEATURE_MSBC_ALT1_RTL);
-	} else {
-		msbc_ok = true;
-		msbc_alt1_ok = true;
+		msbc_alt1_ok = (bt_features & (SPA_BT_FEATURE_MSBC_ALT1 | SPA_BT_FEATURE_MSBC_ALT1_RTL));
+		msbc_alt6_ok = (bt_features & SPA_BT_FEATURE_MSBC);
+	}
+
+	switch (codec) {
+	case HFP_AUDIO_CODEC_CVSD:
+		return true;
+	case HFP_AUDIO_CODEC_MSBC:
+		alt1_ok = msbc_alt1_ok;
+		alt6_ok = msbc_alt6_ok;
+		break;
+	case HFP_AUDIO_CODEC_LC3_SWB:
+#ifdef HAVE_LC3
+		/* LC3-SWB has same transport requirements as msbc.
+		 * However, ALT1/ALT5 modes don't appear to work, seem
+		 * to lose frame sync so output is garbled.
+		 */
+		alt1_ok = false;
+		alt6_ok = msbc_alt6_ok;
+		break;
+#else
+		return false;
+#endif
+	default:
+		return false;
 	}
 
 	spa_log_info(backend->log,
-			"bluez-monitor/hardware.conf: msbc:%d msbc-alt1:%d", (int)msbc_ok, (int)msbc_alt1_ok);
+			"bluez-monitor/hardware.conf: alt6:%d alt1/5:%d", (int)alt6_ok, (int)alt1_ok);
 
-	if (!msbc_ok && !msbc_alt1_ok)
+	if (!alt6_ok && !alt1_ok)
 		return false;
 
 	res = spa_bt_adapter_has_msbc(device->adapter);
@@ -655,26 +689,26 @@
 	}
 
 	/* Check if USB ALT6 is really available on the device */
-	if (device->adapter->bus_type == BUS_TYPE_USB && !msbc_alt1_ok && msbc_ok) {
+	if (device->adapter->bus_type == BUS_TYPE_USB && !alt1_ok && alt6_ok) {
 #ifdef HAVE_LIBUSB
 		if (device->adapter->source_id == SOURCE_ID_USB) {
-			msbc_ok = check_usb_altsetting_6(backend, device->adapter->vendor_id,
+			alt6_ok = check_usb_altsetting_6(backend, device->adapter->vendor_id,
 					device->adapter->product_id);
 		} else {
-			msbc_ok = false;
+			alt6_ok = false;
 		}
-		if (!msbc_ok)
+		if (!alt6_ok)
 			spa_log_info(backend->log, "bluetooth host adapter does not support USB ALT6");
 #else
 		spa_log_info(backend->log,
-			"compiled without libusb; can't check if bluetooth adapter has USB ALT6");
-		msbc_ok = false;
+			"compiled without libusb; can't check if bluetooth adapter has USB ALT6, assuming no");
+		alt6_ok = false;
 #endif
 	}
 	if (device->adapter->bus_type != BUS_TYPE_USB)
-		msbc_alt1_ok = false;
+		alt1_ok = false;
 
-	return msbc_ok || msbc_alt1_ok;
+	return alt6_ok || alt1_ok;
 }
 
 static int codec_switch_start_timer(struct rfcomm *rfcomm, int timeout_msec);
@@ -776,14 +810,10 @@
 	int xapl_product;
 	int xapl_features;
 
-	spa_debug_log_mem(backend->log, SPA_LOG_LEVEL_DEBUG, 2, buf, strlen(buf));
-
-	/* Some devices send initial \n: be permissive */
-	while (*buf == '\n')
-		++buf;
-
 	if (sscanf(buf, "AT+BRSF=%u", &features) == 1) {
 		unsigned int ag_features = SPA_BT_HFP_AG_FEATURE_NONE;
+		bool codecs = device_supports_codec(backend, rfcomm->device, HFP_AUDIO_CODEC_MSBC) ||
+			device_supports_codec(backend, rfcomm->device, HFP_AUDIO_CODEC_LC3_SWB);
 
 		/*
 		 * Determine device volume control. Some headsets only support control of
@@ -792,10 +822,9 @@
 		 */
 		rfcomm->has_volume = (features & SPA_BT_HFP_HF_FEATURE_REMOTE_VOLUME_CONTROL);
 
-		/* Decide if we want to signal that the computer supports mSBC negotiation
+		/* Decide if we want to signal that the computer supports codec negotiation
 		   This should be done when the computers bluetooth adapter supports the necessary transport mode */
-		if (device_supports_required_mSBC_transport_modes(backend, rfcomm->device)) {
-
+		if (codecs) {
 			/* set the feature bit that indicates AG (=computer) supports codec negotiation */
 			ag_features |= SPA_BT_HFP_AG_FEATURE_CODEC_NEGOTIATION;
 
@@ -807,6 +836,7 @@
 				/* Prepare reply: Audio Gateway (=computer) supports codec negotiation */
 				rfcomm->codec_negotiation_supported = true;
 				rfcomm->msbc_supported_by_hfp = false;
+				rfcomm->lc3_supported_by_hfp = false;
 			} else {
 				/* Codec negotiation not supported */
 				spa_log_debug(backend->log,
@@ -815,6 +845,7 @@
 
 				rfcomm->codec_negotiation_supported = false;
 				rfcomm->msbc_supported_by_hfp = false;
+				rfcomm->lc3_supported_by_hfp = false;
 			}
 		}
 
@@ -837,14 +868,22 @@
 			/* skip token 0 i.e. the "AT+BAC=" part */
 			if (cntr > 0 && sscanf(token, "%u", &codec_id) == 1) {
 				spa_log_debug(backend->log, "RFCOMM AT+BAC found codec %u", codec_id);
-				if (codec_id == HFP_AUDIO_CODEC_MSBC) {
-					rfcomm->msbc_supported_by_hfp = true;
-					spa_log_debug(backend->log, "RFCOMM headset supports mSBC codec");
-				}
+
+				if (codec_id == HFP_AUDIO_CODEC_MSBC)
+					rfcomm->msbc_supported_by_hfp =
+						device_supports_codec(backend, rfcomm->device, HFP_AUDIO_CODEC_MSBC);
+				else if (codec_id == HFP_AUDIO_CODEC_LC3_SWB)
+					rfcomm->lc3_supported_by_hfp =
+						device_supports_codec(backend, rfcomm->device, HFP_AUDIO_CODEC_LC3_SWB);
 			}
 			cntr++;
 		}
 
+		if (rfcomm->msbc_supported_by_hfp)
+			spa_log_debug(backend->log, "mSBC codec is supported");
+		if (rfcomm->lc3_supported_by_hfp)
+			spa_log_debug(backend->log, "LC3 codec is supported");
+
 		rfcomm_send_reply(rfcomm, "OK");
 	} else if (spa_strstartswith(buf, "AT+CIND=?")) {
 		rfcomm_send_reply(rfcomm, "+CIND:%s", CIND_INDICATORS);
@@ -856,6 +895,7 @@
 		rfcomm_send_reply(rfcomm, "OK");
 	} else if (spa_strstartswith(buf, "AT+CMER")) {
 		int mode, keyp, disp, ind;
+		bool have_codecs = rfcomm->msbc_supported_by_hfp || rfcomm->lc3_supported_by_hfp;
 
 		rfcomm->slc_configured = true;
 		rfcomm_send_reply(rfcomm, "OK");
@@ -867,15 +907,16 @@
 			rfcomm->cind_call_notify = false;
 
 		/* switch codec to mSBC by sending unsolicited +BCS message */
-		if (rfcomm->codec_negotiation_supported && rfcomm->msbc_supported_by_hfp) {
+		if (rfcomm->codec_negotiation_supported && have_codecs) {
 			spa_log_debug(backend->log, "RFCOMM initial codec setup");
 			rfcomm->hfp_ag_initial_codec_setup = HFP_AG_INITIAL_CODEC_SETUP_SEND;
-			rfcomm_send_reply(rfcomm, "+BCS: 2");
+			if (rfcomm->lc3_supported_by_hfp)
+				rfcomm_send_reply(rfcomm, "+BCS: 3");
+			else
+				rfcomm_send_reply(rfcomm, "+BCS: 2");
 			codec_switch_start_timer(rfcomm, HFP_CODEC_SWITCH_INITIAL_TIMEOUT_MSEC);
 		} else {
-			rfcomm->transport = _transport_create(rfcomm);
-			if (rfcomm->transport == NULL) {
-				spa_log_warn(backend->log, "can't create transport: %m");
+			if (rfcomm_new_transport(rfcomm) < 0) {
 				// TODO: We should manage the missing transport
 			} else {
 				rfcomm->transport->codec = HFP_AUDIO_CODEC_CVSD;
@@ -883,7 +924,7 @@
 				rfcomm_emit_volume_changed(rfcomm, -1, SPA_BT_VOLUME_INVALID);
 			}
 		}
-	} else if (spa_streq(buf, "\r")) {
+	} else if (spa_streq(buf, "")) {
 		/* No commands, reply OK (ITU-T Rec. V.250 Sec. 5.2.1 & 5.6) */
 		rfcomm_send_reply(rfcomm, "OK");
 	} else if (!rfcomm->slc_configured) {
@@ -903,7 +944,8 @@
 		codec_switch_stop_timer(rfcomm);
 		volume_sync_stop_timer(rfcomm);
 
-		if (selected_codec != HFP_AUDIO_CODEC_CVSD && selected_codec != HFP_AUDIO_CODEC_MSBC) {
+		if (selected_codec != HFP_AUDIO_CODEC_CVSD && selected_codec != HFP_AUDIO_CODEC_MSBC &&
+				selected_codec != HFP_AUDIO_CODEC_LC3_SWB) {
 			spa_log_warn(backend->log, "unsupported codec negotiation: %d", selected_codec);
 			rfcomm_send_error(rfcomm, CMEE_AG_FAILURE);
 			if (was_switching_codec)
@@ -916,12 +958,7 @@
 		spa_log_debug(backend->log, "RFCOMM selected_codec = %i", selected_codec);
 
 		/* Recreate transport, since previous connection may now be invalid */
-		if (rfcomm->transport)
-			spa_bt_transport_free(rfcomm->transport);
-
-		rfcomm->transport = _transport_create(rfcomm);
-		if (rfcomm->transport == NULL) {
-			spa_log_warn(backend->log, "can't create transport: %m");
+		if (rfcomm_new_transport(rfcomm) < 0) {
 			// TODO: We should manage the missing transport
 			rfcomm_send_error(rfcomm, CMEE_AG_FAILURE);
 			if (was_switching_codec)
@@ -1115,7 +1152,7 @@
 
 	/* *****
 	 * Following commands requires a Service Level Connection
-	 * and acces to a modem
+	 * and access to a modem
 	 * ***** */
 
 	} else if (!backend->modem.network_has_service) {
@@ -1125,7 +1162,7 @@
 
 	/* *****
 	 * Following commands requires a Service Level Connection,
-	 * acces to a modem and to the network
+	 * access to a modem and to the network
 	 * ***** */
 
 	} else if (spa_strstartswith(buf, "ATA")) {
@@ -1177,147 +1214,148 @@
 	return true;
 }
 
-static bool rfcomm_hfp_hf(struct rfcomm *rfcomm, char* buf)
+static bool rfcomm_hfp_hf(struct rfcomm *rfcomm, char* token)
 {
 	struct impl *backend = rfcomm->backend;
 	unsigned int features, gain, selected_codec, indicator, value;
-	char* token;
-
-	while ((token = strsep(&buf, "\r\n"))) {
-		if (sscanf(token, "+BRSF:%u", &features) == 1) {
-			if (((features & (SPA_BT_HFP_AG_FEATURE_CODEC_NEGOTIATION)) != 0) &&
-			    rfcomm->msbc_supported_by_hfp)
-				rfcomm->codec_negotiation_supported = true;
-		} else if (sscanf(token, "+BCS:%u", &selected_codec) == 1 && rfcomm->codec_negotiation_supported) {
-			if (selected_codec != HFP_AUDIO_CODEC_CVSD && selected_codec != HFP_AUDIO_CODEC_MSBC) {
-				spa_log_warn(backend->log, "unsupported codec negotiation: %d", selected_codec);
-			} else {
-				spa_log_debug(backend->log, "RFCOMM selected_codec = %i", selected_codec);
 
-				/* send codec selection to AG */
-				rfcomm_send_cmd(rfcomm, "AT+BCS=%u", selected_codec);
+	if (sscanf(token, "+BRSF:%u", &features) == 1) {
+		if (((features & (SPA_BT_HFP_AG_FEATURE_CODEC_NEGOTIATION)) != 0) &&
+				(rfcomm->msbc_supported_by_hfp || rfcomm->lc3_supported_by_hfp))
+			rfcomm->codec_negotiation_supported = true;
+	} else if (sscanf(token, "+BCS:%u", &selected_codec) == 1 && rfcomm->codec_negotiation_supported) {
+		if (selected_codec != HFP_AUDIO_CODEC_CVSD && selected_codec != HFP_AUDIO_CODEC_MSBC &&
+				selected_codec != HFP_AUDIO_CODEC_LC3_SWB) {
+			spa_log_warn(backend->log, "unsupported codec negotiation: %d", selected_codec);
+		} else {
+			spa_log_debug(backend->log, "RFCOMM selected_codec = %i", selected_codec);
 
-				rfcomm->hf_state = hfp_hf_bcs;
+			/* send codec selection to AG */
+			rfcomm_send_cmd(rfcomm, "AT+BCS=%u", selected_codec);
 
-				if (!rfcomm->transport || (rfcomm->transport->codec != selected_codec) ) {
-					if (rfcomm->transport)
-						spa_bt_transport_free(rfcomm->transport);
+			rfcomm->hf_state = hfp_hf_bcs;
 
-					rfcomm->transport = _transport_create(rfcomm);
-					if (rfcomm->transport == NULL) {
-						spa_log_warn(backend->log, "can't create transport: %m");
-						// TODO: We should manage the missing transport
-					} else {
-						rfcomm->transport->codec = selected_codec;
-						spa_bt_device_connect_profile(rfcomm->device, rfcomm->profile);
-					}
+			if (!rfcomm->transport || (rfcomm->transport->codec != selected_codec) ) {
+				if (rfcomm_new_transport(rfcomm) < 0) {
+					// TODO: We should manage the missing transport
+				} else {
+					rfcomm->transport->codec = selected_codec;
+					spa_bt_device_connect_profile(rfcomm->device, rfcomm->profile);
 				}
 			}
-		} else if (sscanf(token, "+VGM%*1:=%u", &gain) == 1) {
-			if (gain <= SPA_BT_VOLUME_HS_MAX) {
-				rfcomm_emit_volume_changed(rfcomm, SPA_BT_VOLUME_ID_TX, gain);
-			} else {
-				spa_log_debug(backend->log, "RFCOMM receive unsupported VGM gain: %s", token);
+		}
+	} else if (sscanf(token, "+VGM%*1:=%u", &gain) == 1) {
+		if (gain <= SPA_BT_VOLUME_HS_MAX) {
+			rfcomm_emit_volume_changed(rfcomm, SPA_BT_VOLUME_ID_TX, gain);
+		} else {
+			spa_log_debug(backend->log, "RFCOMM receive unsupported VGM gain: %s", token);
+		}
+	} else if (sscanf(token, "+VGS%*1:=%u", &gain) == 1) {
+		if (gain <= SPA_BT_VOLUME_HS_MAX) {
+			rfcomm_emit_volume_changed(rfcomm, SPA_BT_VOLUME_ID_RX, gain);
+		} else {
+			spa_log_debug(backend->log, "RFCOMM receive unsupported VGS gain: %s", token);
+		}
+	} else if (spa_strstartswith(token, "+CIND: (")) {
+		uint8_t i = 1;
+		while (strstr(token, "\"")) {
+			token += strcspn(token, "\"") + 1;
+			tokenstrcspn(token, "\"") = 0;
+			rfcomm->hf_indicatorsi = strdup(token);
+			token += strcspn(token, "\"") + 1;
+			i++;
+			if (i == MAX_HF_INDICATORS) {
+				break;
 			}
-		} else if (sscanf(token, "+VGS%*1:=%u", &gain) == 1) {
-			if (gain <= SPA_BT_VOLUME_HS_MAX) {
-				rfcomm_emit_volume_changed(rfcomm, SPA_BT_VOLUME_ID_RX, gain);
-			} else {
-				spa_log_debug(backend->log, "RFCOMM receive unsupported VGS gain: %s", token);
+		}
+	} else if (spa_strstartswith(token, "+CIND: ")) {
+		tokenstrcspn(token, "\r") = 0;
+		tokenstrcspn(token, "\n") = 0;
+		token += strlen("+CIND: ");
+		uint8_t i = 1;
+		while (strlen(token)) {
+			if (i >= MAX_HF_INDICATORS || !rfcomm->hf_indicatorsi) {
+				break;
 			}
-		} else if (spa_strstartswith(token, "+CIND: (")) {
-			uint8_t i = 1;
-			while (strstr(token, "\"")) {
-				token += strcspn(token, "\"") + 1;
-				tokenstrcspn(token, "\"") = 0;
-				rfcomm->hf_indicatorsi = strdup(token);
-				token += strcspn(token, "\"") + 1;
-				i++;
-				if (i == MAX_HF_INDICATORS) {
-					break;
-				}
+			tokenstrcspn(token, ",") = 0;
+			spa_log_info(backend->log, "AG indicator state: %s = %i", rfcomm->hf_indicatorsi, atoi(token));
+
+			if (spa_streq(rfcomm->hf_indicatorsi, "battchg")) {
+				spa_bt_device_report_battery_level(rfcomm->device, atoi(token) * 100 / 5);
 			}
-		} else if (spa_strstartswith(token, "+CIND: ")) {
-			tokenstrcspn(token, "\r") = 0;
-			tokenstrcspn(token, "\n") = 0;
-			token += strlen("+CIND: ");
-			uint8_t i = 1;
-			while (strlen(token)) {
-				if (i >= MAX_HF_INDICATORS || !rfcomm->hf_indicatorsi) {
-					break;
-				}
-				tokenstrcspn(token, ",") = 0;
-				spa_log_info(backend->log, "AG indicator state: %s = %i", rfcomm->hf_indicatorsi, atoi(token));
 
-				if (spa_streq(rfcomm->hf_indicatorsi, "battchg")) {
-					spa_bt_device_report_battery_level(rfcomm->device, atoi(token) * 100 / 5);
-				}
+			token += strcspn(token, "\0") + 1;
+			i++;
+		}
+	} else if (sscanf(token, "+CIEV: %u,%u", &indicator, &value) == 2) {
+		if (indicator >= MAX_HF_INDICATORS || !rfcomm->hf_indicatorsindicator) {
+			spa_log_warn(backend->log, "indicator %u has not been registered, ignoring", indicator);
+		} else {
+			spa_log_info(backend->log, "AG indicator update: %s = %u", rfcomm->hf_indicatorsindicator, value);
 
-				token += strcspn(token, "\0") + 1;
-				i++;
+			if (spa_streq(rfcomm->hf_indicatorsindicator, "battchg")) {
+				spa_bt_device_report_battery_level(rfcomm->device, value * 100 / 5);
 			}
-		} else if (sscanf(token, "+CIEV: %u,%u", &indicator, &value) == 2) {
-			if (indicator >= MAX_HF_INDICATORS || !rfcomm->hf_indicatorsindicator) {
-				spa_log_warn(backend->log, "indicator %u has not been registered, ignoring", indicator);
+		}
+	} else if (spa_strstartswith(token, "OK")) {
+		switch(rfcomm->hf_state) {
+		case hfp_hf_brsf:
+			if (rfcomm->codec_negotiation_supported) {
+				char buf64;
+				struct spa_strbuf str;
+
+				spa_strbuf_init(&str, buf, sizeof(buf));
+				spa_strbuf_append(&str, "1");
+				if (rfcomm->msbc_supported_by_hfp)
+					spa_strbuf_append(&str, ",2");
+				if (rfcomm->lc3_supported_by_hfp)
+					spa_strbuf_append(&str, ",3");
+
+				rfcomm_send_cmd(rfcomm, "AT+BAC=%s", buf);
+				rfcomm->hf_state = hfp_hf_bac;
 			} else {
-				spa_log_info(backend->log, "AG indicator update: %s = %u", rfcomm->hf_indicatorsindicator, value);
-
-				if (spa_streq(rfcomm->hf_indicatorsindicator, "battchg")) {
-					spa_bt_device_report_battery_level(rfcomm->device, value * 100 / 5);
-				}
+				rfcomm_send_cmd(rfcomm, "AT+CIND=?");
+				rfcomm->hf_state = hfp_hf_cind1;
 			}
-		} else if (spa_strstartswith(token, "OK")) {
-			switch(rfcomm->hf_state) {
-				case hfp_hf_brsf:
-					if (rfcomm->codec_negotiation_supported) {
-						rfcomm_send_cmd(rfcomm, "AT+BAC=1,2");
-						rfcomm->hf_state = hfp_hf_bac;
-					} else {
-						rfcomm_send_cmd(rfcomm, "AT+CIND=?");
-						rfcomm->hf_state = hfp_hf_cind1;
-					}
-					break;
-				case hfp_hf_bac:
-					rfcomm_send_cmd(rfcomm, "AT+CIND=?");
-					rfcomm->hf_state = hfp_hf_cind1;
-					break;
-				case hfp_hf_cind1:
-					rfcomm_send_cmd(rfcomm, "AT+CIND?");
-					rfcomm->hf_state = hfp_hf_cind2;
-					break;
-				case hfp_hf_cind2:
-					rfcomm_send_cmd(rfcomm, "AT+CMER=3,0,0,1");
-					rfcomm->hf_state = hfp_hf_cmer;
-					break;
-				case hfp_hf_cmer:
-					rfcomm->hf_state = hfp_hf_slc1;
-					rfcomm->slc_configured = true;
-					if (!rfcomm->codec_negotiation_supported) {
-						rfcomm->transport = _transport_create(rfcomm);
-						if (rfcomm->transport == NULL) {
-							spa_log_warn(backend->log, "can't create transport: %m");
-							// TODO: We should manage the missing transport
-						} else {
-							rfcomm->transport->codec = HFP_AUDIO_CODEC_CVSD;
-							spa_bt_device_connect_profile(rfcomm->device, rfcomm->profile);
-						}
-					}
-					/* Report volume on SLC establishment */
-					if (rfcomm_send_volume_cmd(rfcomm, SPA_BT_VOLUME_ID_RX))
-						rfcomm->hf_state = hfp_hf_vgs;
-					break;
-				case hfp_hf_slc2:
-					if (rfcomm_send_volume_cmd(rfcomm, SPA_BT_VOLUME_ID_RX))
-						rfcomm->hf_state = hfp_hf_vgs;
-					break;
-				case hfp_hf_vgs:
-					rfcomm->hf_state = hfp_hf_slc1;
-					if (rfcomm_send_volume_cmd(rfcomm, SPA_BT_VOLUME_ID_TX))
-						rfcomm->hf_state = hfp_hf_vgm;
-					break;
-				default:
-					break;
+			break;
+		case hfp_hf_bac:
+			rfcomm_send_cmd(rfcomm, "AT+CIND=?");
+			rfcomm->hf_state = hfp_hf_cind1;
+			break;
+		case hfp_hf_cind1:
+			rfcomm_send_cmd(rfcomm, "AT+CIND?");
+			rfcomm->hf_state = hfp_hf_cind2;
+			break;
+		case hfp_hf_cind2:
+			rfcomm_send_cmd(rfcomm, "AT+CMER=3,0,0,1");
+			rfcomm->hf_state = hfp_hf_cmer;
+			break;
+		case hfp_hf_cmer:
+			rfcomm->hf_state = hfp_hf_slc1;
+			rfcomm->slc_configured = true;
+			if (!rfcomm->codec_negotiation_supported) {
+				if (rfcomm_new_transport(rfcomm) < 0) {
+					// TODO: We should manage the missing transport
+				} else {
+					rfcomm->transport->codec = HFP_AUDIO_CODEC_CVSD;
+					spa_bt_device_connect_profile(rfcomm->device, rfcomm->profile);
+				}
 			}
+			/* Report volume on SLC establishment */
+			if (rfcomm_send_volume_cmd(rfcomm, SPA_BT_VOLUME_ID_RX))
+				rfcomm->hf_state = hfp_hf_vgs;
+			break;
+		case hfp_hf_slc2:
+			if (rfcomm_send_volume_cmd(rfcomm, SPA_BT_VOLUME_ID_RX))
+				rfcomm->hf_state = hfp_hf_vgs;
+			break;
+		case hfp_hf_vgs:
+			rfcomm->hf_state = hfp_hf_slc1;
+			if (rfcomm_send_volume_cmd(rfcomm, SPA_BT_VOLUME_ID_TX))
+				rfcomm->hf_state = hfp_hf_vgm;
+			break;
+		default:
+			break;
 		}
 	}
 
@@ -1326,6 +1364,35 @@
 
 #endif
 
+static void rfcomm_process_events(struct rfcomm *rfcomm, char *buf, bool ag, bool (*handler)(struct rfcomm *, char *))
+{
+	struct impl *backend = rfcomm->backend;
+	char *token;
+
+	/* Relaxed parsing of both <COMMAND>\r (AG) and \r\n<REPLY>\r\n (HF) */
+
+	while ((token = strsep(&buf, "\r"))) {
+		size_t len;
+
+		/* Skip leading and trailing \n */
+		while (*token == '\n')
+			++token;
+		for (len = strlen(token); len > 0 && tokenlen - 1 == '\n'; --len)
+			tokenlen - 1 = '\0';
+
+		/* Skip empty (only last one if AG) */
+		if (*token == '\0' && (buf == NULL || !ag))
+			continue;
+
+		spa_log_debug(backend->log, "RFCOMM event: %s", token);
+
+		if (!handler(rfcomm, token)) {
+			spa_log_debug(backend->log, "RFCOMM received unsupported event: %s", token);
+			rfcomm_send_error(rfcomm, CMEE_OPERATION_NOT_SUPPORTED);
+		}
+	}
+}
+
 static void rfcomm_event(struct spa_source *source)
 {
 	struct rfcomm *rfcomm = source->data;
@@ -1340,45 +1407,41 @@
 	if (source->rmask & SPA_IO_IN) {
 		char buf512;
 		ssize_t len;
-		bool res = false;
 
-		len = read(source->fd, buf, 511);
+		len = read(source->fd, buf, sizeof(buf) - 1);
 		if (len < 0) {
 			spa_log_error(backend->log, "RFCOMM read error: %s", strerror(errno));
 			return;
 		}
 		buflen = 0;
+
 		spa_log_debug(backend->log, "RFCOMM << %s", buf);
+		spa_debug_log_mem(backend->log, SPA_LOG_LEVEL_DEBUG, 2, buf, strlen(buf));
 
 		switch (rfcomm->profile) {
 #ifdef HAVE_BLUEZ_5_BACKEND_HSP_NATIVE
 		case SPA_BT_PROFILE_HSP_HS:
-			res = rfcomm_hsp_ag(rfcomm, buf);
+			rfcomm_process_events(rfcomm, buf, true, rfcomm_hsp_ag);
 			break;
 		case SPA_BT_PROFILE_HSP_AG:
-			res = rfcomm_hsp_hs(rfcomm, buf);
+			rfcomm_process_events(rfcomm, buf, false, rfcomm_hsp_hs);
 			break;
 #endif
 #ifdef HAVE_BLUEZ_5_BACKEND_HFP_NATIVE
 		case SPA_BT_PROFILE_HFP_HF:
-			res = rfcomm_hfp_ag(rfcomm, buf);
+			rfcomm_process_events(rfcomm, buf, true, rfcomm_hfp_ag);
 			break;
 		case SPA_BT_PROFILE_HFP_AG:
-			res = rfcomm_hfp_hf(rfcomm, buf);
+			rfcomm_process_events(rfcomm, buf, false, rfcomm_hfp_hf);
 			break;
 #endif
 		default:
 			break;
 		}
-
-		if (!res) {
-			spa_log_debug(backend->log, "RFCOMM received unsupported command: %s", buf);
-			rfcomm_send_error(rfcomm, CMEE_OPERATION_NOT_SUPPORTED);
-		}
 	}
 }
 
-static int sco_create_socket(struct impl *backend, struct spa_bt_adapter *adapter, bool msbc)
+static int sco_create_socket(struct impl *backend, struct spa_bt_adapter *adapter, bool transparent)
 {
 	struct sockaddr_sco addr;
 	socklen_t len;
@@ -1402,9 +1465,9 @@
 		return -1;
 	}
 
-	spa_log_debug(backend->log, "msbc=%d", (int)msbc);
-	if (msbc) {
-		/* set correct socket options for mSBC */
+	spa_log_debug(backend->log, "transparent=%d", (int)transparent);
+	if (transparent) {
+		/* set correct socket options for mSBC/LC3 */
 		struct bt_voice voice_config;
 		memset(&voice_config, 0, sizeof(voice_config));
 		voice_config.setting = BT_VOICE_TRANSPARENT;
@@ -1438,7 +1501,8 @@
 	str2ba(d->address, &addr.sco_bdaddr);
 
 	for (int retry = 2;;) {
-		spa_autoclose int sock = sco_create_socket(backend, d->adapter, (t->codec == HFP_AUDIO_CODEC_MSBC));
+		bool transparent = (t->codec == HFP_AUDIO_CODEC_MSBC || t->codec == HFP_AUDIO_CODEC_LC3_SWB);
+		spa_autoclose int sock = sco_create_socket(backend, d->adapter, transparent);
 		if (sock < 0)
 			return -1;
 
@@ -1451,12 +1515,13 @@
 		} else if (err < 0 && !(errno == EAGAIN || errno == EINPROGRESS)) {
 			spa_log_error(backend->log, "connect(): %s", strerror(errno));
 #ifdef HAVE_BLUEZ_5_BACKEND_HFP_NATIVE
-			if (errno == EOPNOTSUPP && t->codec == HFP_AUDIO_CODEC_MSBC &&
-					td->rfcomm->msbc_supported_by_hfp) {
-				/* Adapter doesn't support msbc. Renegotiate. */
+			if (errno == EOPNOTSUPP && t->codec != HFP_AUDIO_CODEC_CVSD &&
+					td->rfcomm->codec_negotiation_supported) {
+				/* Adapter doesn't support msbc/lc3. Renegotiate. */
 				d->adapter->msbc_probed = true;
 				d->adapter->has_msbc = false;
 				td->rfcomm->msbc_supported_by_hfp = false;
+				td->rfcomm->lc3_supported_by_hfp = false;
 				if (t->profile == SPA_BT_PROFILE_HFP_HF) {
 					td->rfcomm->hfp_ag_switching_codec = true;
 					rfcomm_send_reply(td->rfcomm, "+BCS: 1");
@@ -1668,8 +1733,8 @@
 		}
 	}
 
-	if (source->rmask & SPA_IO_IN) {
-		SPA_FLAG_UPDATE(source->mask, SPA_IO_IN, false);
+	if (source->rmask & (SPA_IO_OUT | SPA_IO_IN)) {
+		SPA_FLAG_CLEAR(source->mask, SPA_IO_OUT | SPA_IO_IN);
 		spa_loop_update_source(backend->main_loop, source);
 		sco_ready(t);
 	}
@@ -1685,15 +1750,25 @@
 
 	td->err = -EINPROGRESS;
 
-	/*
-	 * We on purpose wait for POLLIN when connecting (not POLLOUT as usual), to
-	 * indicate ready only after we are sure the device is sending data.
-	 */
 	td->sco.func = sco_event;
 	td->sco.data = t;
 	td->sco.fd = t->fd;
-	td->sco.mask = SPA_IO_HUP | SPA_IO_ERR | SPA_IO_IN;
+	td->sco.mask = SPA_IO_HUP | SPA_IO_ERR;
 	td->sco.rmask = 0;
+
+	switch (t->device->adapter->bus_type) {
+	case BUS_TYPE_USB:
+		/* With USB controllers, we have to determine packet size from incoming
+		 * packets before we can send. Wait for POLLIN when connecting (not
+		 * POLLOUT as usual).
+		 */
+		td->sco.mask |= SPA_IO_IN;
+		break;
+	default:
+		td->sco.mask |= SPA_IO_OUT;
+		break;
+	}
+
 	spa_loop_add_source(backend->main_loop, &td->sco);
 }
 
@@ -1736,10 +1811,12 @@
 
 	/* Find transport for local and remote address */
 	spa_list_for_each(rfcomm, &backend->rfcomm_list, link) {
-		if (rfcomm->transport && spa_streq(rfcomm->transport->device->address, remote_address) &&
-		    spa_streq(rfcomm->transport->device->adapter->address, local_address)) {
-					t = rfcomm->transport;
-					break;
+		if ((rfcomm->profile & SPA_BT_PROFILE_HEADSET_AUDIO_GATEWAY) &&
+				rfcomm->transport &&
+				spa_streq(rfcomm->device->address, remote_address) &&
+				spa_streq(rfcomm->device->adapter->address, local_address)) {
+			t = rfcomm->transport;
+			break;
 		}
 	}
 	if (!t) {
@@ -1748,12 +1825,7 @@
 		return;
 	}
 
-	/* The Synchronous Connection shall always be established by the AG, i.e. the remote profile
-	   should be a HSP AG or HFP AG profile */
-	if ((t->profile & SPA_BT_PROFILE_HEADSET_AUDIO_GATEWAY) == 0) {
-		spa_log_debug(backend->log, "transport %p: Rejecting incoming audio connection to an AG profile", t);
-		return;
-	}
+	spa_assert(t->profile & SPA_BT_PROFILE_HEADSET_AUDIO_GATEWAY);
 
 	if (t->fd >= 0) {
 		spa_log_debug(backend->log, "transport %p: Rejecting, audio already connected", t);
@@ -1767,8 +1839,8 @@
 		 * accepted socket. */
 		char buff;
 
-		if (t->codec == HFP_AUDIO_CODEC_MSBC) {
-			/* set correct socket options for mSBC */
+		if (t->codec == HFP_AUDIO_CODEC_MSBC || t->codec == HFP_AUDIO_CODEC_LC3_SWB) {
+			/* set correct socket options for mSBC/LC3 */
 			struct bt_voice voice_config;
 			memset(&voice_config, 0, sizeof(voice_config));
 			voice_config.setting = BT_VOICE_TRANSPARENT;
@@ -1939,11 +2011,15 @@
 	if (codec == HFP_AUDIO_CODEC_CVSD)
 		return 1;
 
-	return (codec == HFP_AUDIO_CODEC_MSBC &&
-	        (rfcomm->profile == SPA_BT_PROFILE_HFP_AG ||
-	         rfcomm->profile == SPA_BT_PROFILE_HFP_HF) &&
-	        rfcomm->msbc_supported_by_hfp &&
-	        rfcomm->codec_negotiation_supported) ? 1 : 0;
+	if (!rfcomm->codec_negotiation_supported)
+		return 0;
+
+	if (codec == HFP_AUDIO_CODEC_MSBC)
+		return rfcomm->msbc_supported_by_hfp;
+	else if (codec == HFP_AUDIO_CODEC_LC3_SWB)
+		return rfcomm->lc3_supported_by_hfp;
+
+	return 0;
 #else
 	return -ENOTSUP;
 #endif
@@ -2046,10 +2122,7 @@
 		/* Failure, try falling back to CVSD. */
 		rfcomm->hfp_ag_initial_codec_setup = HFP_AG_INITIAL_CODEC_SETUP_NONE;
 		if (rfcomm->transport == NULL) {
-			rfcomm->transport = _transport_create(rfcomm);
-			if (rfcomm->transport == NULL) {
-				spa_log_warn(backend->log, "can't create transport: %m");
-			} else {
+			if (rfcomm_new_transport(rfcomm) == 0) {
 				rfcomm->transport->codec = HFP_AUDIO_CODEC_CVSD;
 				spa_bt_device_connect_profile(rfcomm->device, rfcomm->profile);
 			}
@@ -2168,7 +2241,6 @@
 	enum spa_bt_profile profile;
 	struct rfcomm *rfcomm;
 	struct spa_bt_device *d;
-	struct spa_bt_transport *t = NULL;
 	spa_autoclose int fd = -1;
 
 	if (!dbus_message_has_signature(m, "oha{sv}")) {
@@ -2226,34 +2298,37 @@
 	spa_list_append(&backend->rfcomm_list, &rfcomm->link);
 
 	if (profile == SPA_BT_PROFILE_HSP_HS || profile == SPA_BT_PROFILE_HSP_AG) {
-		t = _transport_create(rfcomm);
-		if (t == NULL) {
-			spa_log_warn(backend->log, "can't create transport: %m");
+		if (rfcomm_new_transport(rfcomm) < 0)
 			goto fail_need_memory;
-		}
-		rfcomm->transport = t;
+
+		rfcomm->transport->codec = HFP_AUDIO_CODEC_CVSD;
 		rfcomm->has_volume = rfcomm_volume_enabled(rfcomm);
 
 		if (profile == SPA_BT_PROFILE_HSP_AG) {
 			rfcomm->hs_state = hsp_hs_init1;
 		}
 
-		spa_bt_device_connect_profile(t->device, profile);
+		spa_bt_device_connect_profile(rfcomm->device, profile);
 
-		spa_log_debug(backend->log, "Transport %s available for profile %s", t->path, handler);
+		spa_log_debug(backend->log, "Transport %s available for profile %s",
+				rfcomm->transport->path, handler);
 	} else if (profile == SPA_BT_PROFILE_HFP_AG) {
 		/* Start SLC connection */
 		unsigned int hf_features = SPA_BT_HFP_HF_FEATURE_NONE;
+		bool has_msbc = device_supports_codec(backend, rfcomm->device, HFP_AUDIO_CODEC_MSBC);
+		bool has_lc3 = device_supports_codec(backend, rfcomm->device, HFP_AUDIO_CODEC_LC3_SWB);
 
-		/* Decide if we want to signal that the HF supports mSBC negotiation
+		/* Decide if we want to signal that the HF supports mSBC/LC3 negotiation
 		   This should be done when the bluetooth adapter supports the necessary transport mode */
-		if (device_supports_required_mSBC_transport_modes(backend, rfcomm->device)) {
+		if (has_msbc || has_lc3) {
 			/* set the feature bit that indicates HF supports codec negotiation */
 			hf_features |= SPA_BT_HFP_HF_FEATURE_CODEC_NEGOTIATION;
-			rfcomm->msbc_supported_by_hfp = true;
+			rfcomm->msbc_supported_by_hfp = has_msbc;
+			rfcomm->lc3_supported_by_hfp = has_lc3;
 			rfcomm->codec_negotiation_supported = false;
 		} else {
 			rfcomm->msbc_supported_by_hfp = false;
+			rfcomm->lc3_supported_by_hfp = false;
 			rfcomm->codec_negotiation_supported = false;
 		}
 
@@ -2586,7 +2661,7 @@
 	struct rfcomm *rfcomm;
 
 	spa_list_for_each(rfcomm, &backend->rfcomm_list, link) {
-		if (rfcomm->slc_configured &&
+		if (rfcomm->profile == SPA_BT_PROFILE_HFP_HF && rfcomm->slc_configured &&
 		    ((indicator == CIND_CALL || indicator == CIND_CALLSETUP || indicator == CIND_CALLHELD) ||
 			(rfcomm->cind_call_notify && (rfcomm->cind_enabled_indicators & (1 << indicator)))))
 			rfcomm_send_reply(rfcomm, "+CIEV: %d,%d", indicator, value);
@@ -2615,7 +2690,7 @@
 	spa_loop_utils_update_timer(backend->loop_utils, backend->ring_timer, &ts, NULL, false);
 
 	spa_list_for_each(rfcomm, &backend->rfcomm_list, link) {
-		if (rfcomm->slc_configured) {
+		if (rfcomm->profile == SPA_BT_PROFILE_HFP_HF  && rfcomm->slc_configured) {
 			rfcomm_send_reply(rfcomm, "RING");
 			if (rfcomm->clip_notify && number)
 				rfcomm_send_reply(rfcomm, "+CLIP: \"%s\",%u", number, type);

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/backend-ofono.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/backend-ofono.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/bap-codec-caps.h -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/bap-codec-caps.h Changed

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/bap-codec-lc3.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/bap-codec-lc3.c Changed

@@ -24,15 +24,11 @@
 #define MAX_PACS	64
 
 static struct spa_log *log;
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.codecs.lc3");
-#undef SPA_LOG_TOPIC_DEFAULT
-#define SPA_LOG_TOPIC_DEFAULT &log_topic
 
 struct impl {
 	lc3_encoder_t encLC3_MAX_CHANNELS;
 	lc3_decoder_t decLC3_MAX_CHANNELS;
 
-	int mtu;
 	int samplerate;
 	int channels;
 	int frame_dus;
@@ -46,6 +42,21 @@
 	size_t size;
 	int index;
 	uint32_t locations;
+	uint32_t channel_allocation;
+	bool sink;
+	bool duplex;
+};
+
+struct bap_qos {
+	char *name;
+	uint8_t rate;
+	uint8_t frame_duration;
+	bool framing;
+	uint16_t framelen;
+	uint8_t retransmission;
+	uint16_t latency;
+	uint32_t delay;
+	unsigned int priority;
 };
 
 typedef struct {
@@ -54,12 +65,16 @@
 	uint32_t channels;
 	uint16_t framelen;
 	uint8_t n_blks;
+	bool sink;
+	bool duplex;
+	unsigned int priority;
 } bap_lc3_t;
 
 static const struct {
 	uint32_t bit;
 	enum spa_audio_channel channel;
 } channel_bits = {
+	{ BAP_CHANNEL_MONO, SPA_AUDIO_CHANNEL_MONO },
 	{ BAP_CHANNEL_FL,   SPA_AUDIO_CHANNEL_FL },
 	{ BAP_CHANNEL_FR,   SPA_AUDIO_CHANNEL_FR },
 	{ BAP_CHANNEL_FC,   SPA_AUDIO_CHANNEL_FC },
@@ -90,6 +105,113 @@
 	{ BAP_CHANNEL_RS,   SPA_AUDIO_CHANNEL_SR }, /* is it the right mapping? */
 };
 
+#define BAP_QOS(name_, rate_, duration_, framing_, framelen_, rtn_, latency_, delay_, priority_) \
+	((struct bap_qos){ .name = (name_), .rate = (rate_), .frame_duration = (duration_), .framing = (framing_), \
+			 .framelen = (framelen_), .retransmission = (rtn_), .latency = (latency_),	\
+			 .delay = (delay_), .priority = (priority_) })
+
+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 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, 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 */
+};
+
+static const struct bap_qos bap_bcast_qos_configs = {
+	/* Priority: low-latency > high-reliability, 7.5ms > 10ms,
+	 * 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 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 */
+};
+
+static unsigned int get_rate_mask(uint8_t rate) {
+	switch (rate) {
+	case LC3_CONFIG_FREQ_8KHZ: return LC3_FREQ_8KHZ;
+	case LC3_CONFIG_FREQ_16KHZ: return LC3_FREQ_16KHZ;
+	case LC3_CONFIG_FREQ_24KHZ: return LC3_FREQ_24KHZ;
+	case LC3_CONFIG_FREQ_32KHZ: return LC3_FREQ_32KHZ;
+	case LC3_CONFIG_FREQ_44KHZ: return LC3_FREQ_44KHZ;
+	case LC3_CONFIG_FREQ_48KHZ: return LC3_FREQ_48KHZ;
+	}
+	return 0;
+}
+
+static unsigned int get_duration_mask(uint8_t rate) {
+	switch (rate) {
+	case LC3_CONFIG_DURATION_7_5: return LC3_DUR_7_5;
+	case LC3_CONFIG_DURATION_10: return LC3_DUR_10;
+	}
+	return 0;
+}
+
 static int write_ltv(uint8_t *dest, uint8_t type, void* value, size_t len)
 {
 	struct ltv *ltv = (struct ltv *)dest;
@@ -123,7 +245,8 @@
 	uint16_t framelen2 = {htobs(LC3_MIN_FRAME_BYTES), htobs(LC3_MAX_FRAME_BYTES)};
 
 	data += write_ltv_uint16(data, LC3_TYPE_FREQ,
-	                         htobs(LC3_FREQ_48KHZ | LC3_FREQ_24KHZ | LC3_FREQ_16KHZ | LC3_FREQ_8KHZ));
+	                         htobs(LC3_FREQ_48KHZ | LC3_FREQ_32KHZ | \
+					 LC3_FREQ_24KHZ | LC3_FREQ_16KHZ | LC3_FREQ_8KHZ));
 	data += write_ltv_uint8(data, LC3_TYPE_DUR, LC3_DUR_ANY);
 	data += write_ltv_uint8(data, LC3_TYPE_CHAN, LC3_CHAN_1 | LC3_CHAN_2);
 	data += write_ltv(data, LC3_TYPE_FRAMELEN, framelen, sizeof(framelen));
@@ -160,7 +283,7 @@
 		struct spa_debug_context *debug_ctx)
 {
 	/*
-	 * BlueZ capabilites for the same codec may contain multiple
+	 * BlueZ capabilities for the same codec may contain multiple
 	 * PACs separated by zero-length LTV (see BlueZ b907befc2d80)
 	 */
 	int pac = 0;
@@ -190,10 +313,12 @@
 	return pac + 1;
 }
 
-static uint8_t get_num_channels(uint32_t channels)
+static uint8_t get_channel_count(uint32_t channels)
 {
 	uint8_t num;
 
+	channels &= BAP_CHANNEL_ALL;
+
 	if (channels == 0)
 		return 1;  /* MONO */
 
@@ -204,27 +329,84 @@
 	return num;
 }
 
-static int select_channels(uint8_t channels, uint32_t locations, uint32_t *mapping, unsigned int max_channels)
+static bool supports_channel_count(uint8_t mask, uint8_t count)
 {
-	unsigned int i, num = 0;
+	if (count == 0 || count > 8)
+		return false;
+	return mask & (1u << (count - 1));
+}
 
-	if ((channels & LC3_CHAN_2) && max_channels >= 2)
-		num = 2;
-	else if ((channels & LC3_CHAN_1) && max_channels >= 1)
-		num = 1;
-	else
+static const struct bap_qos *select_bap_qos(unsigned int rate_mask, unsigned int duration_mask, uint16_t framelen_min, uint16_t framelen_max)
+{
+	const struct bap_qos *best = NULL;
+	unsigned int best_priority = 0;
+
+	SPA_FOR_EACH_ELEMENT_VAR(bap_qos_configs, c) {
+		if (c->priority < best_priority)
+			continue;
+		if (!(get_rate_mask(c->rate) & rate_mask))
+			continue;
+		if (!(get_duration_mask(c->frame_duration) & duration_mask))
+			continue;
+		if (c->framing)
+			continue;  /* XXX: framing not supported */
+		if (c->framelen < framelen_min || c->framelen > framelen_max)
+			continue;
+
+		best = c;
+		best_priority = c->priority;
+	}
+
+	return best;
+}
+
+static int select_channels(uint8_t channel_counts, uint32_t locations, uint32_t channel_allocation,
+		uint32_t *allocation)
+{
+	unsigned int i, num;
+
+	locations &= BAP_CHANNEL_ALL;
+
+	if (!channel_counts)
 		return -1;
 
 	if (!locations) {
-		*mapping = 0;  /* mono (omit Audio_Channel_Allocation) */
+		*allocation = 0;  /* mono (omit Audio_Channel_Allocation) */
+		return 0;
+	}
+
+	if (channel_allocation) {
+		channel_allocation &= locations;
+
+		/* sanity check channel allocation */
+		while (!supports_channel_count(channel_counts, get_channel_count(channel_allocation))) {
+			for (i = 32; i > 0; --i) {
+				uint32_t mask = (1u << (i-1));
+				if (channel_allocation & mask) {
+					channel_allocation &= ~mask;
+					break;
+				}
+			}
+			if (i == 0)
+				break;
+		}
+
+		*allocation = channel_allocation;
 		return 0;
 	}
 
 	/* XXX: select some channels, but upper level should tell us what */
-	*mapping = 0;
+	if ((channel_counts & LC3_CHAN_2) && get_channel_count(locations) >= 2)
+		num = 2;
+	else if ((channel_counts & LC3_CHAN_1) && get_channel_count(locations) >= 1)
+		num = 1;
+	else
+		return -1;
+
+	*allocation = 0;
 	for (i = 0; i < SPA_N_ELEMENTS(channel_bits); ++i) {
 		if (locations & channel_bitsi.bit) {
-			*mapping |= channel_bitsi.bit;
+			*allocation |= channel_bitsi.bit;
 			--num;
 			if (num == 0)
 				break;
@@ -240,13 +422,19 @@
 	size_t data_size = pac->size;
 	uint16_t framelen_min = 0, framelen_max = 0;
 	int max_frames = -1;
-	uint8_t channels = 0;
+	uint8_t channel_counts = LC3_CHAN_1; /* Default: 1 channel (BAP v1.0.1 Sec 4.3.1) */
+	uint8_t max_channels = 0;
+	uint8_t duration_mask = 0;
+	uint16_t rate_mask = 0;
+	const struct bap_qos *bap_qos = NULL;
+	unsigned int i;
 
 	if (!data_size)
 		return false;
 	memset(conf, 0, sizeof(*conf));
 
-	conf->frame_duration = 0xFF;
+	conf->sink = pac->sink;
+	conf->duplex = pac->duplex;
 
 	/* XXX: we always use one frame block */
 	conf->n_blks = 1;
@@ -262,41 +450,15 @@
 		switch (ltv->type) {
 		case LC3_TYPE_FREQ:
 			spa_return_val_if_fail(ltv->len == 3, false);
-			{
-				uint16_t rate = ltv->value0 + (ltv->value1 << 8);
-				if (rate & LC3_FREQ_48KHZ)
-					conf->rate = LC3_CONFIG_FREQ_48KHZ;
-				else if (rate & LC3_FREQ_24KHZ)
-					conf->rate = LC3_CONFIG_FREQ_24KHZ;
-				else if (rate & LC3_FREQ_16KHZ)
-					conf->rate = LC3_CONFIG_FREQ_16KHZ;
-				else if (rate & LC3_FREQ_8KHZ)
-					conf->rate = LC3_CONFIG_FREQ_8KHZ;
-				else {
-					spa_debugc(debug_ctx, "unsupported rate: 0x%04x", rate);
-					return false;
-				}
-			}
+			rate_mask = ltv->value0 + (ltv->value1 << 8);
 			break;
 		case LC3_TYPE_DUR:
 			spa_return_val_if_fail(ltv->len == 2, false);
-			{
-				uint8_t duration = ltv->value0;
-				if (duration & LC3_DUR_10)
-					conf->frame_duration = LC3_CONFIG_DURATION_10;
-				else if (duration & LC3_DUR_7_5)
-					conf->frame_duration = LC3_CONFIG_DURATION_7_5;
-				else {
-					spa_debugc(debug_ctx, "unsupported duration: 0x%02x", duration);
-					return false;
-				}
-			}
+			duration_mask = ltv->value0;
 			break;
 		case LC3_TYPE_CHAN:
 			spa_return_val_if_fail(ltv->len == 2, false);
-			{
-				channels = ltv->value0;
-			}
+			channel_counts = ltv->value0;
 			break;
 		case LC3_TYPE_FRAMELEN:
 			spa_return_val_if_fail(ltv->len == 5, false);
@@ -315,60 +477,64 @@
 		data += ltv->len + 1;
 	}
 
-	if (select_channels(channels, pac->locations, &conf->channels, max_frames) < 0) {
+	for (i = 0; i < 8; ++i)
+		if (channel_counts & (1u << i))
+			max_channels = i + 1;
+
+	/* Default: 1 frame per channel (BAP v1.0.1 Sec 4.3.1) */
+	if (max_frames < 0)
+		max_frames = max_channels;
+
+	/*
+	 * Workaround:
+	 * Creative Zen Hybrid Pro sets Supported_Max_Codec_Frames_Per_SDU == 1
+	 * but channels == 0x3, and the 2-channel audio stream works.
+	 */
+	if (max_frames < max_channels) {
+		spa_debugc(debug_ctx, "workaround: fixing bad Supported_Max_Codec_Frames_Per_SDU: %u->%u",
+				max_frames, max_channels);
+		max_frames = max_channels;
+	}
+
+	if (select_channels(channel_counts, pac->locations, pac->channel_allocation, &conf->channels) < 0) {
 		spa_debugc(debug_ctx, "invalid channel configuration: 0x%02x %u",
-				channels, max_frames);
+				channel_counts, max_frames);
 		return false;
 	}
 
-	/* Default: 1 per channel (BAP v1.0.1 Sec 4.3.1) */
-	if (max_frames < 0)
-		max_frames = get_num_channels(conf->channels);
-	if (max_frames < get_num_channels(conf->channels)) {
+	if (max_frames < get_channel_count(conf->channels)) {
 		spa_debugc(debug_ctx, "invalid max frames per SDU: %u", max_frames);
 		return false;
 	}
 
-	if (framelen_min < LC3_MIN_FRAME_BYTES || framelen_max > LC3_MAX_FRAME_BYTES) {
-		spa_debugc(debug_ctx, "invalid framelen: %u %u", framelen_min, framelen_max);
-		return false;
-	}
-	if (conf->frame_duration == 0xFF || !conf->rate) {
-		spa_debugc(debug_ctx, "no frame duration or rate");
-		return false;
+	/*
+	 * Select supported rate + frame length combination.
+	 *
+	 * Frame length is not limited by ISO MTU, as kernel will fragment
+	 * and reassemble SDUs as needed.
+	 */
+	if (pac->sink && pac->duplex) {
+		/* 16KHz input is mandatory in BAP v1.0.1 Table 3.5, so prefer
+		 * it for now for input rate in duplex configuration.
+		 *
+		 * Devices may list other values but not certain they will work properly.
+		 */
+		bap_qos = select_bap_qos(rate_mask & LC3_FREQ_16KHZ, duration_mask, framelen_min, framelen_max);
 	}
+	if (!bap_qos)
+		bap_qos = select_bap_qos(rate_mask, duration_mask, framelen_min, framelen_max);
 
-	/* BAP v1.0.1 Table 5.2; high-reliability */
-	switch (conf->rate) {
-	case LC3_CONFIG_FREQ_48KHZ:
-		if (conf->frame_duration == LC3_CONFIG_DURATION_7_5)
-			conf->framelen = 117;	/* 48_5_2 */
-		else
-			conf->framelen = 120;	/* 48_4_2 */
-		break;
-	case LC3_CONFIG_FREQ_24KHZ:
-		if (conf->frame_duration == LC3_CONFIG_DURATION_7_5)
-			conf->framelen = 45;	/* 24_1_2 */
-		else
-			conf->framelen = 60;	/* 24_2_2 */
-		break;
-	case LC3_CONFIG_FREQ_16KHZ:
-		if (conf->frame_duration == LC3_CONFIG_DURATION_7_5)
-			conf->framelen = 30;	/* 16_1_2 */
-		else
-			conf->framelen = 40;	/* 16_2_2 */
-		break;
-	case LC3_CONFIG_FREQ_8KHZ:
-		if (conf->frame_duration == LC3_CONFIG_DURATION_7_5)
-			conf->framelen = 26;	/* 8_1_2 */
-		else
-			conf->framelen = 30;	/* 8_2_2 */
-		break;
-	default:
-		spa_debugc(debug_ctx, "invalid rate");
+	if (!bap_qos) {
+		spa_debugc(debug_ctx, "no compatible configuration found, rate:0x%08x, duration:0x%08x frame:%u-%u",
+				rate_mask, duration_mask, framelen_min, framelen_max);
 		return false;
 	}
 
+	conf->rate = bap_qos->rate;
+	conf->frame_duration = bap_qos->frame_duration;
+	conf->framelen = bap_qos->framelen;
+	conf->priority = bap_qos->priority;
+
 	return true;
 }
 
@@ -451,11 +617,11 @@
 
 	PREFER_BOOL(conf->channels & LC3_CHAN_2);
 	PREFER_BOOL(conf->channels & LC3_CHAN_1);
-	PREFER_BOOL(conf->rate & (LC3_CONFIG_FREQ_48KHZ | LC3_CONFIG_FREQ_24KHZ | LC3_CONFIG_FREQ_16KHZ | LC3_CONFIG_FREQ_8KHZ));
-	PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_48KHZ);
-	PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_24KHZ);
-	PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_16KHZ);
-	PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_8KHZ);
+
+	if (conf->sink && conf->duplex)
+		PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_16KHZ);
+
+	PREFER_EXPR(conf->priority);
 
 	return 0;
 
@@ -487,6 +653,8 @@
 	bap_lc3_t conf;
 	uint8_t *data = config;
 	uint32_t locations = 0;
+	uint32_t channel_allocation = 0;
+	bool sink = false, duplex = false;
 	struct spa_debug_log_ctx debug_ctx = SPA_LOG_DEBUG_INIT(log, SPA_LOG_LEVEL_TRACE);
 	int i;
 
@@ -494,12 +662,21 @@
 		return -EINVAL;
 
 	if (settings) {
-		for (i = 0; i < (int)settings->n_items; ++i)
+		for (i = 0; i < (int)settings->n_items; ++i) {
 			if (spa_streq(settings->itemsi.key, "bluez5.bap.locations"))
 				sscanf(settings->itemsi.value, "%"PRIu32, &locations);
+			if (spa_streq(settings->itemsi.key, "bluez5.bap.channel-allocation"))
+				sscanf(settings->itemsi.value, "%"PRIu32, &channel_allocation);
+		}
 
 		if (spa_atob(spa_dict_lookup(settings, "bluez5.bap.debug")))
 			debug_ctx = SPA_LOG_DEBUG_INIT(log, SPA_LOG_LEVEL_DEBUG);
+
+		/* Is remote endpoint sink or source */
+		sink = spa_atob(spa_dict_lookup(settings, "bluez5.bap.sink"));
+
+		/* Is remote endpoint duplex */
+		duplex = spa_atob(spa_dict_lookup(settings, "bluez5.bap.duplex"));
 	}
 
 	/* Select best conf from those possible */
@@ -512,8 +689,12 @@
 		return -EINVAL;
 	}
 
-	for (i = 0; i < npacs; ++i)
+	for (i = 0; i < npacs; ++i) {
 		pacsi.locations = locations;
+		pacsi.channel_allocation = channel_allocation;
+		pacsi.sink = sink;
+		pacsi.duplex = duplex;
+	}
 
 	qsort(pacs, npacs, sizeof(struct pac_data), pac_cmp);
 
@@ -550,7 +731,7 @@
 
 static uint8_t channels_to_positions(uint32_t channels, uint32_t *position)
 {
-	uint8_t n_channels = get_num_channels(channels);
+	uint8_t n_channels = get_channel_count(channels);
 	uint8_t n_positions = 0;
 
 	spa_assert(n_channels <= SPA_AUDIO_MAX_CHANNELS);
@@ -600,22 +781,27 @@
 	spa_pod_builder_push_choice(b, &f1, SPA_CHOICE_None, 0);
 	choice = (struct spa_pod_choice*)spa_pod_builder_frame(b, &f1);
 	i = 0;
-	if (conf.rate & LC3_CONFIG_FREQ_48KHZ) {
+	if (conf.rate == LC3_CONFIG_FREQ_48KHZ) {
 		if (i++ == 0)
 			spa_pod_builder_int(b, 48000);
 		spa_pod_builder_int(b, 48000);
 	}
-	if (conf.rate & LC3_CONFIG_FREQ_24KHZ) {
+	if (conf.rate == LC3_CONFIG_FREQ_32KHZ) {
+		if (i++ == 0)
+			spa_pod_builder_int(b, 32000);
+		spa_pod_builder_int(b, 32000);
+	}
+	if (conf.rate == LC3_CONFIG_FREQ_24KHZ) {
 		if (i++ == 0)
 			spa_pod_builder_int(b, 24000);
 		spa_pod_builder_int(b, 24000);
 	}
-	if (conf.rate & LC3_CONFIG_FREQ_16KHZ) {
+	if (conf.rate == LC3_CONFIG_FREQ_16KHZ) {
 		if (i++ == 0)
 			spa_pod_builder_int(b, 16000);
 		spa_pod_builder_int(b, 16000);
 	}
-	if (conf.rate & LC3_CONFIG_FREQ_8KHZ) {
+	if (conf.rate == LC3_CONFIG_FREQ_8KHZ) {
 		if (i++ == 0)
 			spa_pod_builder_int(b, 8000);
 		spa_pod_builder_int(b, 8000);
@@ -662,6 +848,9 @@
 	case LC3_CONFIG_FREQ_48KHZ:
 		info->info.raw.rate = 48000U;
 		break;
+	case LC3_CONFIG_FREQ_32KHZ:
+		info->info.raw.rate = 32000U;
+		break;
 	case LC3_CONFIG_FREQ_24KHZ:
 		info->info.raw.rate = 24000U;
 		break;
@@ -696,6 +885,7 @@
 		const struct bap_endpoint_qos *endpoint_qos,
 		struct bap_codec_qos *qos)
 {
+	const struct bap_qos *bap_qos;
 	bap_lc3_t conf;
 
 	spa_zero(*qos);
@@ -703,6 +893,14 @@
 	if (!parse_conf(&conf, config, config_size))
 		return -EINVAL;
 
+	bap_qos = select_bap_qos(get_rate_mask(conf.rate), get_duration_mask(conf.frame_duration),
+			conf.framelen, conf.framelen);
+	if (!bap_qos) {
+		/* shouldn't happen: select_config should pick existing one */
+		spa_log_error(log, "no QoS settings found");
+		return -EINVAL;
+	}
+
 	qos->framing = false;
 	if (endpoint_qos->phy & 0x2)
 		qos->phy = 0x2;
@@ -710,42 +908,27 @@
 		qos->phy = 0x1;
 	else
 		qos->phy = 0x2;
-	qos->sdu = conf.framelen * conf.n_blks * get_num_channels(conf.channels);
-	qos->interval = (conf.frame_duration == LC3_CONFIG_DURATION_7_5 ? 7500 : 10000);
-	qos->target_latency = BT_ISO_QOS_TARGET_LATENCY_RELIABILITY;
 
-	/* Default values from BAP v1.0.1 Table 5.2; high-reliability */
-	qos->delay = 40000U;
-	qos->retransmission = 13;
+	qos->sdu = conf.framelen * conf.n_blks * get_channel_count(conf.channels);
+	qos->interval = (conf.frame_duration == LC3_CONFIG_DURATION_7_5 ? 7500 : 10000);
+	qos->target_latency = BT_ISO_QOS_TARGET_LATENCY_BALANCED;
 
-	switch (conf.rate) {
-	case LC3_CONFIG_FREQ_8KHZ:
-	case LC3_CONFIG_FREQ_16KHZ:
-	case LC3_CONFIG_FREQ_24KHZ:
-	case LC3_CONFIG_FREQ_32KHZ:
-		/* F_1_2, F_2_2 */
-		qos->latency = (conf.frame_duration == LC3_CONFIG_DURATION_7_5 ? 75 : 95);
-		break;
-	case LC3_CONFIG_FREQ_48KHZ:
-		/* 48_5_2, 48_4_2 */
-		qos->latency = (conf.frame_duration == LC3_CONFIG_DURATION_7_5 ? 75 : 100);
-		break;
-	default:
-		qos->latency = 100;
-		break;
-	}
+	qos->delay = bap_qos->delay;
+	qos->latency = bap_qos->latency;
+	qos->retransmission = bap_qos->retransmission;
 
 	/* Clamp to ASE values (if known) */
-	if (endpoint_qos->latency >= 0x0005 && endpoint_qos->latency <= 0x0FA0)
-		/* Values outside the range are RFU */
-		qos->latency = endpoint_qos->latency;
-	if (endpoint_qos->retransmission)
-		qos->retransmission = endpoint_qos->retransmission;
 	if (endpoint_qos->delay_min)
 		qos->delay = SPA_MAX(qos->delay, endpoint_qos->delay_min);
 	if (endpoint_qos->delay_max)
 		qos->delay = SPA_MIN(qos->delay, endpoint_qos->delay_max);
 
+	/*
+	 * We ignore endpoint suggested latency and RTN. On current devices
+	 * these do not appear to be very useful numbers, so it's better
+	 * to just pick one from the table in the spec.
+	 */
+
 	return 0;
 }
 
@@ -772,11 +955,11 @@
 		goto error;
 
 	if (!parse_conf(&conf, config, config_len)) {
+		spa_log_error(log, "invalid LC3 config");
 		res = -ENOTSUP;
 		goto error;
 	}
 
-	this->mtu = mtu;
 	this->samplerate = config_info.info.raw.rate;
 	this->channels = config_info.info.raw.channels;
 	this->framelen = conf.framelen;
@@ -793,12 +976,17 @@
 		goto error;
 	}
 
-	this->samples = lc3_frame_samples(this->frame_dus, this->samplerate);
-	if (this->samples < 0) {
+	spa_log_info(log, "LC3 rate:%d frame_duration:%d channels:%d framelen:%d nblks:%d",
+			this->samplerate, this->frame_dus, this->channels, this->framelen, conf.n_blks);
+
+	res = lc3_frame_samples(this->frame_dus, this->samplerate);
+	if (res < 0) {
+		spa_log_error(log, "invalid LC3 frame samples");
 		res = -EINVAL;
 		goto error;
 	}
-	this->codesize = this->samples * this->channels * conf.n_blks * sizeof(int32_t);
+	this->samples = res;
+	this->codesize = (size_t)this->samples * this->channels * conf.n_blks * sizeof(int32_t);
 
 	if (!(flags & MEDIA_CODEC_FLAG_SINK)) {
 		for (ich = 0; ich < this->channels; ich++) {
@@ -858,6 +1046,13 @@
 	return this->codesize;
 }
 
+static uint64_t codec_get_interval(void *data)
+{
+	struct impl *this = data;
+
+	return (uint64_t)this->frame_dus * 1000;
+}
+
 static int codec_abr_process (void *data, size_t unsent)
 {
 	return -ENOTSUP;
@@ -875,18 +1070,16 @@
 		size_t *dst_out, int *need_flush)
 {
 	struct impl *this = data;
-	int frame_bytes;
 	int ich, res;
 	int size, processed;
 
-	frame_bytes = lc3_frame_bytes(this->frame_dus, this->samplerate);
 	processed = 0;
 	size = 0;
 
 	if (src_size < (size_t)this->codesize)
-		goto done;
-	if (dst_size < (size_t)frame_bytes)
-		goto done;
+		return -EINVAL;
+	if (dst_size < (size_t)this->framelen * this->channels)
+		return -EINVAL;
 
 	for (ich = 0; ich < this->channels; ich++) {
 		uint8_t *in = (uint8_t *)src + (ich * 4);
@@ -900,8 +1093,6 @@
 
 	processed += this->codesize;
 
-done:
-	spa_assert(size <= this->mtu);
 	*need_flush = NEED_FLUSH_ALL;
 
 	return processed;
@@ -921,13 +1112,10 @@
 	struct impl *this = data;
 	int ich, res;
 	int consumed;
-	int samples;
 
-	spa_return_val_if_fail((size_t)(this->framelen * this->channels) == src_size, -EINVAL);
 	consumed = 0;
 
-	samples = lc3_frame_samples(this->frame_dus, this->samplerate);
-	if (samples == -1)
+	if (src_size < (size_t)this->framelen * this->channels)
 		return -EINVAL;
 	if (dst_size < this->codesize)
 		return -EINVAL;
@@ -959,7 +1147,84 @@
 static void codec_set_log(struct spa_log *global_log)
 {
 	log = global_log;
-	spa_log_topic_init(log, &log_topic);
+	spa_log_topic_init(log, &codec_plugin_log_topic);
+}
+
+static int codec_get_bis_config(const struct media_codec *codec, uint8_t *caps,
+				uint8_t *caps_size, struct spa_dict *settings,
+				struct bap_codec_qos *qos)
+{
+	int index = 0x0;
+	bool preset_found = false;
+	const char *preset = NULL;
+	int channel_allocation = 0;
+	uint8_t *data = caps;
+	*caps_size = 0;
+	int i;
+
+	if (settings) {
+		for (i = 0; i < (int)settings->n_items; ++i) {
+			if (spa_streq(settings->itemsi.key, "channel_allocation"))
+				sscanf(settings->itemsi.value, "%"PRIu32, &channel_allocation);
+			if (spa_streq(settings->itemsi.key, "preset"))
+				preset = spa_dict_lookup(settings, "preset");
+		}
+	}
+
+	if (preset == NULL)
+		return -EINVAL;
+
+	SPA_FOR_EACH_ELEMENT_VAR(bap_bcast_qos_configs, c) {
+		if (spa_streq(c->name, preset)) {
+			preset_found = true;
+			break;
+		}
+		index++;
+	}
+
+	if (!preset_found)
+		return -EINVAL;
+
+	switch (bap_bcast_qos_configsindex.rate) {
+	case LC3_CONFIG_FREQ_48KHZ:
+		data += write_ltv_uint8(data, LC3_TYPE_FREQ, LC3_CONFIG_FREQ_48KHZ);
+		break;
+	case LC3_CONFIG_FREQ_32KHZ:
+		data += write_ltv_uint8(data, LC3_TYPE_FREQ, LC3_CONFIG_FREQ_32KHZ);
+		break;
+	case LC3_CONFIG_FREQ_24KHZ:
+		data += write_ltv_uint8(data, LC3_TYPE_FREQ, LC3_CONFIG_FREQ_24KHZ);
+		break;
+	case LC3_CONFIG_FREQ_16KHZ:
+		data += write_ltv_uint8(data, LC3_TYPE_FREQ, LC3_CONFIG_FREQ_16KHZ);
+		break;
+	case LC3_CONFIG_FREQ_8KHZ:
+		data += write_ltv_uint8(data, LC3_TYPE_FREQ, LC3_CONFIG_FREQ_8KHZ);
+		break;
+	default:
+		return -EINVAL;
+	}
+	*caps_size += 3;
+
+	data += write_ltv_uint16(data, LC3_TYPE_FRAMELEN, htobs(bap_bcast_qos_configsindex.framelen));
+	*caps_size += 4;
+	data += write_ltv_uint8(data, LC3_TYPE_DUR, bap_bcast_qos_configsindex.frame_duration);
+	*caps_size += 3;
+	data += write_ltv_uint32(data, LC3_TYPE_CHAN, htobl(channel_allocation));
+	*caps_size += 6;
+
+	if(bap_bcast_qos_configsindex.framing)
+		qos->framing = 1;
+	else
+		qos->framing = 0;
+	qos->sdu = bap_bcast_qos_configsindex.framelen * get_channel_count(channel_allocation);
+	qos->retransmission = bap_bcast_qos_configsindex.retransmission;
+	qos->latency = bap_bcast_qos_configsindex.latency;
+	qos->delay = bap_bcast_qos_configsindex.delay;
+	qos->phy = 2;
+	qos->interval = (bap_bcast_qos_configsindex.frame_duration == LC3_CONFIG_DURATION_7_5 ? 7500 : 10000);
+
+	return true;
 }
 
 const struct media_codec bap_codec_lc3 = {
@@ -977,6 +1242,7 @@
 	.init = codec_init,
 	.deinit = codec_deinit,
 	.get_block_size = codec_get_block_size,
+	.get_interval = codec_get_interval,
 	.abr_process = codec_abr_process,
 	.start_encode = codec_start_encode,
 	.encode = codec_encode,
@@ -985,6 +1251,7 @@
 	.reduce_bitpool = codec_reduce_bitpool,
 	.increase_bitpool = codec_increase_bitpool,
 	.set_log = codec_set_log,
+	.get_bis_config = codec_get_bis_config
 };
 
 MEDIA_CODEC_EXPORT_DEF(

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/bluez-hardware.conf -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/bluez-hardware.conf Changed

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/bluez5-dbus.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/bluez5-dbus.c Changed

@@ -32,16 +32,16 @@
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
+#include <spa-private/dbus-helpers.h>
 
 #include "config.h"
 #include "codec-loader.h"
-#include "dbus-helpers.h"
 #include "player.h"
 #include "iso-io.h"
 #include "bap-codec-caps.h"
 #include "defs.h"
 
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5");
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5");
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
 
@@ -120,6 +120,8 @@
 	unsigned int connection_info_supported:1;
 	unsigned int dummy_avrcp_player:1;
 
+	struct spa_list bcast_source_config_list;
+
 	struct spa_bt_quirks *quirks;
 
 #define MAX_SETTINGS 128
@@ -146,6 +148,40 @@
 	bool acceptor;
 };
 
+#define METADATA_MAX_LEN	255
+#define CC_MAX_LEN	255
+
+/*
+ * This structure stores metadata as defined
+ * in Assigned Numbers chapter 6.12.6 Metadata
+ * LTV structures. Length contains the size of
+ * type and value.
+ */
+struct spa_bt_metadata {
+	struct spa_list link;
+	int length;
+	int type;
+	uint8_t valueMETADATA_MAX_LEN - 1;
+};
+
+struct spa_bt_bis {
+	struct spa_list link;
+	char qos_preset255;
+	int channel_allocation;
+	struct spa_list metadata_list;
+};
+
+#define BROADCAST_CODE_LEN	16
+
+struct spa_bt_big {
+	struct spa_list link;
+	char broadcast_codeBROADCAST_CODE_LEN;
+	bool encryption;
+	int presentation_delay;
+	struct spa_list bis_list;
+	int big_id;
+};
+
 /*
  * Codec switching tries various codec/remote endpoint combinations
  * in order, until an acceptable one is found. This triggers BlueZ
@@ -408,11 +444,11 @@
 
 	if (direction == SPA_BT_MEDIA_SOURCE)
 		endpoint = codec->bap ? BAP_SOURCE_ENDPOINT : A2DP_SOURCE_ENDPOINT;
-	else if (direction == SPA_BT_MEDIA_SINK) 
+	else if (direction == SPA_BT_MEDIA_SINK)
 		endpoint = codec->bap ? BAP_SINK_ENDPOINT : A2DP_SINK_ENDPOINT;
-	else if (direction == SPA_BT_MEDIA_SOURCE_BROADCAST) 
+	else if (direction == SPA_BT_MEDIA_SOURCE_BROADCAST)
 		endpoint = BAP_BROADCAST_SOURCE_ENDPOINT;
-	else if (direction == SPA_BT_MEDIA_SINK_BROADCAST) 
+	else if (direction == SPA_BT_MEDIA_SINK_BROADCAST)
 		endpoint = BAP_BROADCAST_SINK_ENDPOINT;
 
 	*object_path = spa_aprintf("%s/%s", endpoint,
@@ -457,6 +493,8 @@
 		const char *codec_ep_name =
 			codec->endpoint_name ? codec->endpoint_name : codec->name;
 
+		if (!preferred && !codec->fill_caps)
+			continue;
 		if (!spa_streq(ep_name, codec_ep_name))
 			continue;
 		if ((*sink && !codec->decode) || (!*sink && !codec->encode))
@@ -775,8 +813,6 @@
 				qos->preferred_delay_min = value;
 			else if (spa_streq(key, "PreferredMaximumDelay"))
 				qos->preferred_delay_max = value;
-			else if (spa_streq(key, "Locations") || spa_streq(key, "Location"))
-				qos->locations = value;
 		}
 
 		dbus_message_iter_next(&dict_iter);
@@ -843,7 +879,7 @@
 
 			dbus_message_iter_recurse(&it1, &it2);
 			parse_endpoint_qos(monitor, &it2, qos);
-		} else if (spa_streq(key, "Locations")) {
+		} else if (spa_streq(key, "Locations") || spa_streq(key, "Location")) {
 			dbus_uint32_t value;
 
 			if (type != DBUS_TYPE_UINT32)
@@ -852,6 +888,15 @@
 			dbus_message_iter_get_basic(&it1, &value);
 			spa_log_debug(monitor->log, "ep qos: %s=%d", key, (int)value);
 			qos->locations = value;
+		} else if (spa_streq(key, "ChannelAllocation")) {
+			dbus_uint32_t value;
+
+			if (type != DBUS_TYPE_UINT32)
+				goto bad_property;
+
+			dbus_message_iter_get_basic(&it1, &value);
+			spa_log_debug(monitor->log, "ep qos: %s=%d", key, (int)value);
+			qos->channel_allocation = value;
 		}
 
 		dbus_message_iter_next(&dict_iter);
@@ -873,16 +918,17 @@
 	int res;
 	const struct media_codec *codec;
 	struct spa_bt_remote_endpoint *ep;
-	bool sink;
+	bool sink, duplex;
 	const char *err_msg = "Unknown error";
 	struct spa_dict settings;
-	struct spa_dict_item setting_itemsSPA_N_ELEMENTS(monitor->global_setting_items) + 2;
+	struct spa_dict_item setting_itemsSPA_N_ELEMENTS(monitor->global_setting_items) + 5;
 	int i;
 
 	const char *endpoint_path = NULL;
 	uint8_t capsA2DP_MAX_CAPS_SIZE;
 	uint8_t configA2DP_MAX_CAPS_SIZE;
 	char locations64 = {0};
+	char channel_allocation64 = {0};
 	int caps_size = 0;
 	int conf_size;
 	DBusMessageIter dict;
@@ -919,23 +965,31 @@
 		goto error_invalid;
 	if (endpoint_qos.locations)
 		spa_scnprintf(locations, sizeof(locations), "%"PRIu32, endpoint_qos.locations);
+	if (endpoint_qos.channel_allocation)
+		spa_scnprintf(channel_allocation, sizeof(channel_allocation), "%"PRIu32, endpoint_qos.channel_allocation);
 
 	ep = remote_endpoint_find(monitor, endpoint_path);
-	if (!ep) {
+	if (!ep || !ep->device) {
 		spa_log_warn(monitor->log, "Unable to find remote endpoint for %s", endpoint_path);
 		goto error_invalid;
 	}
 
+	duplex = SPA_FLAG_IS_SET(ep->device->profiles, SPA_BT_PROFILE_BAP_DUPLEX);
+
 	/* Call of SelectProperties means that local device acts as an initiator
-	 * and therefor remote endpoint is an acceptor
+	 * and therefore remote endpoint is an acceptor
 	 */
 	ep->acceptor = true;
 
 	for (i = 0; i < (int)monitor->global_settings.n_items; ++i)
 		setting_itemsi = monitor->global_settings.itemsi;
 	setting_itemsi++ = SPA_DICT_ITEM_INIT("bluez5.bap.locations", locations);
+	setting_itemsi++ = SPA_DICT_ITEM_INIT("bluez5.bap.channel-allocation", channel_allocation);
+	setting_itemsi++ = SPA_DICT_ITEM_INIT("bluez5.bap.sink", sink ? "true" : "false");
+	setting_itemsi++ = SPA_DICT_ITEM_INIT("bluez5.bap.duplex", duplex ? "true" : "false");
 	setting_itemsi++ = SPA_DICT_ITEM_INIT("bluez5.bap.debug", "true");
 	settings = SPA_DICT_INIT(setting_items, i);
+	spa_assert((size_t)i <= SPA_N_ELEMENTS(setting_items));
 
 	conf_size = codec->select_config(codec, 0, caps, caps_size, &monitor->default_audio_info, &settings, config);
 	if (conf_size < 0) {
@@ -962,6 +1016,7 @@
 		struct bap_codec_qos qos;
 		DBusMessageIter entry, variant, qos_dict;
 		const char *entry_key = "QoS";
+		uint8_t cig = 0xff;
 
 		spa_zero(qos);
 
@@ -972,10 +1027,18 @@
 			goto error_invalid;
 		}
 
+		if (ep->device->settings) {
+			const char *str = spa_dict_lookup(ep->device->settings, "bluez5.bap.cig");
+			uint32_t value;
+
+			if (spa_atou32(str, &value, 0))
+				cig = value;
+		}
+
 		spa_log_debug(monitor->log, "select qos: interval:%d framing:%d phy:%d sdu:%d "
-				"rtn:%d latency:%d delay:%d target_latency:%d",
+				"rtn:%d latency:%d delay:%d target_latency:%d cig:%u",
 				qos.interval, qos.framing, qos.phy, qos.sdu, qos.retransmission,
-				qos.latency, (int)qos.delay, qos.target_latency);
+				qos.latency, (int)qos.delay, qos.target_latency, cig);
 
 		dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY, NULL, &entry);
 		dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &entry_key);
@@ -997,6 +1060,9 @@
 		append_basic_variant_dict_entry(&qos_dict, "PresentationDelay", DBUS_TYPE_UINT32, "u", &qos.delay);
 		append_basic_variant_dict_entry(&qos_dict, "TargetLatency", DBUS_TYPE_BYTE, "y", &qos.target_latency);
 
+		if (cig < 0xf0)
+			append_basic_variant_dict_entry(&qos_dict, "CIG", DBUS_TYPE_BYTE, "y", &cig);
+
 		dbus_message_iter_close_container(&variant, &qos_dict);
 		dbus_message_iter_close_container(&entry, &variant);
 		dbus_message_iter_close_container(&dict, &entry);
@@ -1350,8 +1416,35 @@
 	free(adapter);
 }
 
+static void metadata_entry_free(struct spa_bt_metadata *metadata_entry)
+{
+	spa_list_remove(&metadata_entry->link);
+	free(metadata_entry);
+}
+
+static void bis_entry_free(struct spa_bt_bis *bis_entry)
+{
+	struct spa_bt_metadata *m;
+
+	spa_list_consume(m, &bis_entry->metadata_list, link)
+		metadata_entry_free(m);
+	spa_list_remove(&bis_entry->link);
+	free(bis_entry);
+}
+
+static void big_entry_free(struct spa_bt_big *big_entry)
+{
+	struct spa_bt_bis *b;
+
+	spa_list_consume(b, &big_entry->bis_list, link)
+		bis_entry_free(b);
+	spa_list_remove(&big_entry->link);
+	free(big_entry);
+}
+
 static uint32_t adapter_connectable_profiles(struct spa_bt_adapter *adapter)
 {
+	struct spa_bt_monitor *monitor = adapter->monitor;
 	const uint32_t profiles = adapter->profiles;
 	uint32_t mask = 0;
 
@@ -1380,6 +1473,9 @@
 	if (profiles & SPA_BT_PROFILE_HFP_HF)
 		mask |= SPA_BT_PROFILE_HFP_AG;
 
+	if (monitor->backend_selection == BACKEND_NONE)
+		mask &= ~SPA_BT_PROFILE_HEADSET_AUDIO;
+
 	return mask;
 }
 
@@ -1447,6 +1543,7 @@
 {
 	battery_remove(device);
 	spa_bt_device_release_transports(device);
+	device->preferred_codec = NULL;
 }
 
 static void device_free(struct spa_bt_device *device)
@@ -1943,7 +2040,8 @@
 			direction_connected = true;
 	}
 
-	all_connected = (device->profiles & connected_profiles) == device->profiles;
+	all_connected = ((device->profiles & connected_profiles & connectable_profiles)
+				== (device->profiles & connectable_profiles));
 
 	spa_list_for_each(set, &device->set_membership_list, link)
 		spa_bt_for_each_set_member(s, set)
@@ -1957,7 +2055,7 @@
 	if (connected_profiles == 0 && spa_list_is_empty(&device->codec_switch_list)) {
 		device_stop_timer(device);
 		device_connected(monitor, device, BT_DEVICE_DISCONNECTED);
-	} else if (force || ((direction_connected || all_connected) && set_connected)) {
+	} else if (force || ((direction_connected || all_connected) && set_connected && connected_profiles)) {
 		device_stop_timer(device);
 		device_connected(monitor, device, BT_DEVICE_CONNECTED);
 	} else {
@@ -2350,17 +2448,11 @@
 
 				profile = spa_bt_profile_from_uuid(uuid);
 
-				/* Only add A2DP/BAP profiles if HSP/HFP backed is none.
-				 * This allows BT device to connect instantly instead of waiting for
-				 * profile timeout, because all available profiles are connected.
-				 */
-				if (monitor->backend_selection != BACKEND_NONE || (monitor->backend_selection == BACKEND_NONE &&
-						profile & (SPA_BT_PROFILE_MEDIA_SINK | SPA_BT_PROFILE_MEDIA_SOURCE))) {
-					if (profile && (device->profiles & profile) == 0) {
-						spa_log_debug(monitor->log, "device %p: add UUID=%s", device, uuid);
-						device->profiles |= profile;
-					}
+				if (profile && (device->profiles & profile) == 0) {
+					spa_log_debug(monitor->log, "device %p: add UUID=%s", device, uuid);
+					device->profiles |= profile;
 				}
+
 				dbus_message_iter_next(&iter);
 			}
 
@@ -2521,29 +2613,30 @@
 	return NULL;
 }
 
-static struct spa_bt_device *create_bcast_device(struct spa_bt_monitor *monitor, const char *object_path)
-{	
+static struct spa_bt_device *create_bcast_device(struct spa_bt_monitor *monitor, const char *adapter_path,
+		const char *transport_path, const char *address)
+{
 	struct spa_bt_device *d;
 	struct spa_bt_adapter *adapter;
 
-	adapter = adapter_find(monitor, object_path);
+	adapter = adapter_find(monitor, adapter_path);
 	if (adapter == NULL) {
-		spa_log_warn(monitor->log, "unknown adapter %s", object_path);
+		spa_log_warn(monitor->log, "unknown adapter %s", adapter_path);
 		return NULL;
 	}
 
-	d = device_create(monitor, object_path);
+	d = device_create(monitor, transport_path);
 	if (d == NULL) {
 		spa_log_warn(monitor->log, "can't create Bluetooth device %s: %m",
-				object_path);
+				transport_path);
 		return NULL;
 	}
 
 	d->adapter = adapter;
 	d->adapter_path = strdup(adapter->path);
-	d->alias = strdup(adapter->alias);
-	d->name = strdup(adapter->name);
-	d->address = strdup("00:00:00:00:00:00");
+	d->address = spa_aprintf("%s.%d", address, d->id);
+	d->alias = strdup(d->address);
+	d->name = strdup(d->address);
 	d->reconnect_state = BT_DEVICE_RECONNECT_STOP;
 
 	device_update_hw_volume_profiles(d);
@@ -2581,28 +2674,19 @@
 			if (spa_streq(key, "UUID")) {
 				free(remote_endpoint->uuid);
 				remote_endpoint->uuid = strdup(value);
+
+				if(spa_streq(remote_endpoint->uuid, SPA_BT_UUID_BAP_BROADCAST_SINK))
+					/* Set remote endpoint as an acceptor for a broadcast sink.
+					 * So the transport is an initiator.
+					 */
+					remote_endpoint->acceptor = true;
 			}
 			else if (spa_streq(key, "Device")) {
 				struct spa_bt_device *device;
 
 				device = spa_bt_device_find(monitor, value);
 				if (device == NULL) {
-					/*
-					* If a broadcast sink endpoint is detected (over DBus) a new device
-					* will be created.  This device will be our simulated remote device. 
-					* This is done because BlueZ sets the adapter as the device
-					* that is connected to for a broadcast sink endpoint/transport.
-					*/
-					if (spa_streq(remote_endpoint->uuid, SPA_BT_UUID_BAP_BROADCAST_SINK)) {
-						device = create_bcast_device(monitor, value);
-						if (device == NULL)
-							goto next;
-
-						remote_endpoint->acceptor = true;
-						device_set_connected(device, 1);
-					} else {
-						goto next;
-					}
+					goto next;
 				}
 
 				spa_log_debug(monitor->log, "remote_endpoint %p: device -> %p", remote_endpoint, device);
@@ -2667,6 +2751,19 @@
 next:
 		dbus_message_iter_next(props_iter);
 	}
+
+	/* BAP profile UUIDs do not appear in device UUID list.
+	 * Instead, we detect these capabilities based on available
+	 * endpoints (i.e. PACs).
+	 */
+	if (remote_endpoint->uuid && remote_endpoint->device) {
+		enum spa_bt_profile profile;
+
+		profile = spa_bt_profile_from_uuid(remote_endpoint->uuid);
+		if (profile & SPA_BT_PROFILE_BAP_AUDIO)
+			spa_bt_device_add_profile(remote_endpoint->device, profile);
+	}
+
 	return 0;
 }
 
@@ -3075,7 +3172,7 @@
 
 	if (t_volume->hw_volume != t_volume->new_hw_volume) {
 		t_volume->hw_volume = t_volume->new_hw_volume;
-		t_volume->volume = spa_bt_volume_hw_to_linear(t_volume->hw_volume,
+		t_volume->volume = (float)spa_bt_volume_hw_to_linear(t_volume->hw_volume,
 					t_volume->hw_volume_max);
 		spa_log_debug(monitor->log, "transport %p: volume changed %d(%f) ",
 			transport, t_volume->new_hw_volume, t_volume->volume);
@@ -3115,10 +3212,7 @@
 int spa_bt_transport_ensure_sco_io(struct spa_bt_transport *t, struct spa_loop *data_loop)
 {
 	if (t->sco_io == NULL) {
-		t->sco_io = spa_bt_sco_io_create(data_loop,
-						 t->fd,
-						 t->read_mtu,
-						 t->write_mtu);
+		t->sco_io = spa_bt_sco_io_create(t, data_loop, t->monitor->log);
 		if (t->sco_io == NULL)
 			return -ENOMEM;
 	}
@@ -3142,20 +3236,18 @@
 	/* Fallback values when device does not provide information */
 
 	if (t->media_codec == NULL)
-		return 30 * SPA_NSEC_PER_MSEC;
+		return 20 * SPA_NSEC_PER_MSEC;
 
 	switch (t->media_codec->id) {
 	case SPA_BLUETOOTH_AUDIO_CODEC_SBC:
 	case SPA_BLUETOOTH_AUDIO_CODEC_SBC_XQ:
-		return 200 * SPA_NSEC_PER_MSEC;
 	case SPA_BLUETOOTH_AUDIO_CODEC_MPEG:
 	case SPA_BLUETOOTH_AUDIO_CODEC_AAC:
-		return 200 * SPA_NSEC_PER_MSEC;
 	case SPA_BLUETOOTH_AUDIO_CODEC_APTX:
 	case SPA_BLUETOOTH_AUDIO_CODEC_APTX_HD:
-		return 150 * SPA_NSEC_PER_MSEC;
 	case SPA_BLUETOOTH_AUDIO_CODEC_LDAC:
-		return 175 * SPA_NSEC_PER_MSEC;
+		return 125 * SPA_NSEC_PER_MSEC;
+	case SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD:
 	case SPA_BLUETOOTH_AUDIO_CODEC_APTX_LL:
 	case SPA_BLUETOOTH_AUDIO_CODEC_APTX_LL_DUPLEX:
 	case SPA_BLUETOOTH_AUDIO_CODEC_FASTSTREAM:
@@ -3165,7 +3257,7 @@
 	default:
 		break;
 	};
-	return 150 * SPA_NSEC_PER_MSEC;
+	return 125 * SPA_NSEC_PER_MSEC;
 }
 
 static int transport_update_props(struct spa_bt_transport *transport,
@@ -3206,7 +3298,45 @@
 					spa_bt_transport_set_state(transport, state);
 			}
 			else if (spa_streq(key, "Device")) {
+				char *pos;
 				struct spa_bt_device *device = spa_bt_device_find(monitor, value);
+				if ((device == NULL) &&
+					(transport->profile == SPA_BT_PROFILE_BAP_BROADCAST_SINK)) {
+					/*
+					* If a transport with profile broadcast source is detected (over DBus)
+					* and no device is found for it, a new device will be created.
+					* This device will be our simulated remote device.
+					* This is done because BlueZ sets the adapter as the device
+					* that is connected to a broadcast sink endpoint/transport.
+					*/
+					device = spa_bt_device_find(monitor, transport->path);
+					if (device == NULL) {
+						device = create_bcast_device(monitor, value, transport->path, "00:00:00:00:00:00");
+						if (device == NULL) {
+							spa_log_warn(monitor->log, "could not find device %s", value);
+						} else
+							device_set_connected(device, 1);
+					}
+				} if ((device != NULL) &&
+					(transport->profile == SPA_BT_PROFILE_BAP_BROADCAST_SOURCE)) {
+					/*
+					 * For each transport that has a broadcast source profile,
+					 * we need to create a new node for each BIS.
+					 * example of transport path = /org/bluez/hci0/dev_2D_9D_93_F9_D7_5E/bis1/fd0
+					 * Create new devices only for a case of a big with multiple BISes,
+					 * for this case will have the scanned device to the transport
+					 * "/fd0" and create new devices for the other transports from this device
+					 * that appear only in case of multiple BISes per BIG.
+					 */
+					pos = strstr(transport->path, "/fd0");
+					if (pos == NULL) {
+						device = create_bcast_device(monitor, device->adapter_path, transport->path, device->address);
+						if (device == NULL) {
+							spa_log_warn(monitor->log, "could not find device created");
+						} else
+							device_set_connected(device, 1);
+					}
+				}
 				if (transport->device != device) {
 					if (transport->device != NULL)
 						spa_list_remove(&transport->device_link);
@@ -3316,7 +3446,6 @@
 			transport->bap_bis = qos.bis;
 			transport->delay_us = qos.qos.delay;
 			transport->latency_us = (unsigned int)qos.qos.latency * 1000;
-			transport->bap_interval = qos.qos.interval;
 
 			spa_bt_transport_emit_delay_changed(transport);
 		}
@@ -3562,7 +3691,7 @@
 			spa_log_error(monitor->log, "transport %p: transport_create_iso_io failed",
 					transport);
 		/* For broadcast the initiator moves the transport state to SPA_BT_TRANSPORT_STATE_ACTIVE */
-		/* TODO: handeling multiple BIGs support */
+		/* TODO: handling multiple BIGs support */
 		if ((transport->profile == SPA_BT_PROFILE_BAP_BROADCAST_SINK) ||
 			(transport->profile == SPA_BT_PROFILE_BAP_BROADCAST_SOURCE))	{
 			spa_bt_transport_set_state(transport, SPA_BT_TRANSPORT_STATE_ACTIVE);
@@ -3734,7 +3863,7 @@
 	}
 
 	/* For LE Audio, multiple transport stream (CIS) can be linked together (CIG).
-	 * If they are part of the same device they re-use the same fd, and call to
+	 * If they are part of the same device they reuse the same fd, and call to
 	 * release should be done for the last one only.
 	 */
 	spa_list_for_each(t_linked, &transport->bap_transport_linked, bap_transport_linked) {
@@ -4834,7 +4963,7 @@
 									codec_id, caps, caps_size);
 						}
 				}
-				
+
 				if (endpoint_should_be_registered(monitor, codec, SPA_BT_MEDIA_SINK_BROADCAST)) {
 					caps_size = codec->fill_caps(codec, MEDIA_CODEC_FLAG_SINK, caps);
 					if (caps_size < 0)
@@ -5035,7 +5164,7 @@
 			continue;
 		if (endpoint_should_be_registered(monitor, codec, SPA_BT_MEDIA_SINK) ||
 				endpoint_should_be_registered(monitor, codec, SPA_BT_MEDIA_SOURCE) ||
-				endpoint_should_be_registered(monitor, codec, SPA_BT_MEDIA_SOURCE_BROADCAST) || 
+				endpoint_should_be_registered(monitor, codec, SPA_BT_MEDIA_SOURCE_BROADCAST) ||
 				endpoint_should_be_registered(monitor, codec, SPA_BT_MEDIA_SINK_BROADCAST))
 			return true;
 	}
@@ -5154,6 +5283,132 @@
 				backend ? backend->name : "none");
 }
 
+static void configure_bis(struct spa_bt_monitor *monitor,
+				const struct media_codec *codec,
+				DBusConnection *conn,
+				const char *object_path,
+				const char *interface_name,
+				struct spa_bt_big *big,
+				struct spa_bt_bis *bis,
+				const char *local_endpoint)
+{
+	DBusMessageIter iter, entry, variant, qos_dict;
+	spa_autoptr(DBusMessage) msg = NULL;
+	DBusMessageIter dict;
+	int bis_id = 0xFF;
+	uint8_t caps CC_MAX_LEN;
+	uint8_t metadata METADATA_MAX_LEN;
+	uint8_t caps_size, metadata_size = 0;
+	struct bap_codec_qos qos;
+	int presentation_delay;
+	struct spa_bt_metadata *metadata_entry;
+	struct spa_dict settings;
+	struct spa_dict_item setting_items2;
+	char channel_allocation64 = {0};
+
+	int mse = 0;
+	int options = 0;
+	int skip = 0;
+	int sync_cte_type = 0;
+	int sync_factor = 1;
+	int sync_timeout = 2000;
+	int timeout = 2000;
+
+	/* Configure each BIS from a BIG */
+	spa_list_for_each(metadata_entry, &bis->metadata_list, link) {
+		if ((metadata_size + metadata_entry->length + 1) > METADATA_MAX_LEN) {
+			spa_log_warn(monitor->log, "Metadata configured for the BIS exceeds the maximum metadata size");
+			return;
+		}
+
+		metadatametadata_size = (uint8_t)metadata_entry->length;
+		metadata_size++;
+		metadatametadata_size = (uint8_t)metadata_entry->type;
+		metadata_size++;
+		memcpy(&metadatametadata_size, metadata_entry->value, metadata_entry->length - 1);
+		metadata_size += metadata_entry->length - 1;
+	}
+
+	spa_log_debug(monitor->log, "bis->channel_allocation %d", bis->channel_allocation);
+	if (bis->channel_allocation)
+		spa_scnprintf(channel_allocation, sizeof(channel_allocation), "%"PRIu32, bis->channel_allocation);
+	setting_items0 = SPA_DICT_ITEM_INIT("channel_allocation", channel_allocation);
+	setting_items1 = SPA_DICT_ITEM_INIT("preset", bis->qos_preset);
+	settings = SPA_DICT_INIT(setting_items, 2);
+
+	codec->get_bis_config(codec, caps, &caps_size, &settings, &qos);
+
+	msg = dbus_message_new_method_call(BLUEZ_SERVICE,
+				object_path,
+				interface_name,
+				"SetConfiguration");
+
+	dbus_message_iter_init_append(msg, &iter);
+	dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH, &local_endpoint);
+	dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &dict);
+	append_basic_array_variant_dict_entry(&dict, "Capabilities", "ay", "y", DBUS_TYPE_BYTE, caps, caps_size);
+
+	append_basic_array_variant_dict_entry(&dict, "Metadata", "ay", "y", DBUS_TYPE_BYTE, metadata, metadata_size);
+
+	dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY, NULL, &entry);
+	dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &(const char *) { "QoS" });
+	dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, "a{sv}", &variant);
+
+	dbus_message_iter_open_container(&variant, DBUS_TYPE_ARRAY,
+		DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
+		DBUS_TYPE_STRING_AS_STRING
+		DBUS_TYPE_VARIANT_AS_STRING
+		DBUS_DICT_ENTRY_END_CHAR_AS_STRING,
+		&qos_dict);
+
+	append_basic_variant_dict_entry(&qos_dict, "BIG", DBUS_TYPE_BYTE, "y", &big->big_id);
+	append_basic_variant_dict_entry(&qos_dict, "BIS", DBUS_TYPE_BYTE, "y", &bis_id);
+	append_basic_variant_dict_entry(&qos_dict, "SyncFactor", DBUS_TYPE_BYTE, "y", &sync_factor);
+	append_basic_variant_dict_entry(&qos_dict, "Options", DBUS_TYPE_BYTE, "y", &options);
+	append_basic_variant_dict_entry(&qos_dict, "Skip", DBUS_TYPE_UINT16, "q", &skip);
+	append_basic_variant_dict_entry(&qos_dict, "SyncTimeout", DBUS_TYPE_UINT16, "q", &sync_timeout);
+	append_basic_variant_dict_entry(&qos_dict, "SyncCteType", DBUS_TYPE_BYTE, "y", &sync_cte_type);
+	append_basic_variant_dict_entry(&qos_dict, "MSE", DBUS_TYPE_BYTE, "y", &mse);
+	append_basic_variant_dict_entry(&qos_dict, "Timeout", DBUS_TYPE_UINT16, "q", &timeout);
+	append_basic_array_variant_dict_entry(&qos_dict, "BCode", "ay", "y", DBUS_TYPE_BYTE, big->broadcast_code, BROADCAST_CODE_LEN);
+	append_basic_variant_dict_entry(&qos_dict, "Encryption", DBUS_TYPE_BYTE, "y", &big->encryption);
+	append_basic_variant_dict_entry(&qos_dict, "Interval", DBUS_TYPE_UINT32, "u", &qos.interval);
+	append_basic_variant_dict_entry(&qos_dict, "Framing", DBUS_TYPE_BYTE, "y", &qos.framing);
+	append_basic_variant_dict_entry(&qos_dict, "PHY", DBUS_TYPE_BYTE, "y", &qos.phy);
+	append_basic_variant_dict_entry(&qos_dict, "SDU", DBUS_TYPE_UINT16, "q", &qos.sdu);
+	append_basic_variant_dict_entry(&qos_dict, "Retransmissions", DBUS_TYPE_BYTE, "y", &qos.retransmission);
+	append_basic_variant_dict_entry(&qos_dict, "Latency", DBUS_TYPE_UINT16, "q", &qos.latency);
+	append_basic_variant_dict_entry(&qos_dict, "PresentationDelay", DBUS_TYPE_UINT32, "u", &presentation_delay);
+
+	dbus_message_iter_close_container(&variant, &qos_dict);
+	dbus_message_iter_close_container(&entry, &variant);
+	dbus_message_iter_close_container(&dict, &entry);
+
+	dbus_message_iter_close_container(&iter, &dict);
+	dbus_message_set_no_reply(msg, TRUE);
+	if (!dbus_connection_send(conn, msg, NULL)) {
+		spa_log_error(monitor->log, "sending SetConfiguration failed");
+	}
+}
+
+static void configure_bcast_source(struct spa_bt_monitor *monitor,
+				const struct media_codec *codec,
+				DBusConnection *conn,
+				const char *object_path,
+				const char *interface_name,
+				const char *local_endpoint)
+{
+	struct spa_bt_big *big;
+	struct spa_bt_bis *bis;
+	/* Configure each BIS from a BIG */
+	spa_list_for_each(big, &monitor->bcast_source_config_list, link) {
+		spa_list_for_each(bis, &big->bis_list, link) {
+			configure_bis(monitor, codec, conn, object_path, interface_name,
+				big, bis, local_endpoint);
+		}
+	}
+}
+
 static void interface_added(struct spa_bt_monitor *monitor,
 			    DBusConnection *conn,
 			    const char *object_path,
@@ -5241,6 +5496,35 @@
 		d = ep->device;
 		if (d)
 			spa_bt_device_emit_profiles_changed(d, d->profiles, d->connected_profiles);
+
+		if (spa_streq(ep->uuid, SPA_BT_UUID_BAP_BROADCAST_SINK)) {
+			int ret, i;
+			bool codec_found = false;
+			spa_autofree char *local_endpoint = NULL;
+			/* get local endpoint */
+
+			for (i = 0; monitor->media_codecs; i++) {
+				if (!monitor->media_codecsi->bap)
+					continue;
+				if (!is_media_codec_enabled(monitor, monitor->media_codecsi))
+					continue;
+				if (monitor->media_codecsi->codec_id == ep->codec){
+					ret = media_codec_to_endpoint(monitor->media_codecsi, SPA_BT_MEDIA_SOURCE_BROADCAST, &local_endpoint);
+					if (ret == 0) {
+						codec_found = true;
+						break;
+					}
+				}
+			}
+
+			if (!codec_found) {
+				spa_log_warn(monitor->log, "endpoint codec not found");
+				return;
+			}
+
+			if (local_endpoint != NULL)
+				configure_bcast_source(monitor, monitor->media_codecsi, conn, object_path, interface_name, local_endpoint);
+		}
 	}
 }
 
@@ -5307,6 +5591,37 @@
 				if (d)
 					spa_bt_device_emit_profiles_changed(d, d->profiles, d->connected_profiles);
 			}
+		} else if (spa_streq(interface_name, BLUEZ_MEDIA_TRANSPORT_INTERFACE)) {
+			struct spa_bt_transport *transport;
+			transport = spa_bt_transport_find(monitor, object_path);
+			if (transport != NULL) {
+				if (transport->profile == SPA_BT_PROFILE_BAP_BROADCAST_SINK) {
+					struct spa_bt_device *d = transport->device;
+					if (d != NULL){
+						device_free(d);
+					}		
+				} else if (transport->profile == SPA_BT_PROFILE_BAP_BROADCAST_SOURCE) {
+					/*
+					 * For each transport that has a broadcast source profile,
+					 * we need to create a new node for each BIS.
+					 * example of transport path = /org/bluez/hci0/dev_2D_9D_93_F9_D7_5E/bis1/fd0
+					 * Create new devices only for a case of a big with multiple BISes,
+					 * for this case will have the scanned device to the transport
+					 * "/fd0" and create new devices for the other transports from this device
+					 * that appear only in case of multiple BISes per BIG.
+					 * 
+					 * Here we delete the created devices.
+					 */
+					char *pos = strstr(transport->path, "/fd0");
+					if (pos == NULL) {
+						struct spa_bt_device *d = transport->device;
+						if (d != NULL){
+							device_free(d);
+						}
+					}
+				}
+				spa_bt_transport_free(transport);
+			}
 		}
 
 		dbus_message_iter_next(&it);
@@ -5328,6 +5643,11 @@
 		return;
 	}
 
+	if (dbus_message_is_error(r, DBUS_ERROR_NAME_HAS_NO_OWNER)) {
+		spa_log_warn(monitor->log, "BlueZ system service is not available");
+		return;
+	}
+
 	if (dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR) {
 		spa_log_error(monitor->log, "GetManagedObjects() failed: %s",
 				dbus_message_get_error_name(r));
@@ -5545,7 +5865,12 @@
 			transport = spa_bt_transport_find(monitor, path);
 			if (transport == NULL) {
 				spa_log_warn(monitor->log,
-						"Properties changed in unknown transport %s", path);
+						"Properties changed in unknown transport '%s'. "
+						"Multiple sound server instances (PipeWire/Pulseaudio/bluez-alsa) are "
+						"probably trying to use Bluetooth audio at the same time, which can "
+						"cause problems. The system configuration likely should be fixed "
+						"to have only one sound server that manages Bluetooth audio.",
+						path);
 				goto finish;
 			}
 
@@ -5676,6 +6001,7 @@
 	struct spa_bt_device *d;
 	struct spa_bt_remote_endpoint *ep;
 	struct spa_bt_transport *t;
+	struct spa_bt_big *b;
 	const struct spa_dict_item *it;
 	size_t i;
 
@@ -5704,6 +6030,8 @@
 		device_free(d);
 	spa_list_consume(a, &monitor->adapter_list, link)
 		adapter_free(a);
+	spa_list_consume(b, &monitor->bcast_source_config_list, link)
+		big_entry_free(b);
 
 	for (i = 0; i < SPA_N_ELEMENTS(monitor->backends); ++i) {
 		spa_bt_backend_free(monitor->backendsi);
@@ -5806,6 +6134,138 @@
 	return res;
 }
 
+static void parse_broadcast_source_config(struct spa_bt_monitor *monitor, const struct spa_dict *info)
+{
+	const char *str;
+	char key256;
+	char bis_key256;
+	char qos_key256;
+	char bcodeBROADCAST_CODE_LEN + 3;
+	int cursor;
+	int big_id = 0;
+	struct spa_json it4, it_array4;
+	struct spa_list big_list = SPA_LIST_INIT(&big_list);
+	struct spa_error_location loc;
+	struct spa_bt_big *big;
+
+	/* Search for bluez5.bcast_source.config */
+	if (!(info && (str = spa_dict_lookup(info, "bluez5.bcast_source.config"))))
+		return;
+
+	spa_json_init(&it0, str, strlen(str));
+
+	/* Verify is an array of BIGS */
+	if (spa_json_enter_array(&it0, &it_array0) <= 0)
+		goto parse_failed;
+
+	/* Iterate on all BIG objects */
+	while (spa_json_enter_object(&it_array0, &it1) > 0) {
+		struct spa_bt_big *big_entry = calloc(1, sizeof(struct spa_bt_big));
+
+		if (!big_entry)
+			goto errno_failed;
+
+		big_entry->big_id = big_id++;
+		spa_list_init(&big_entry->bis_list);
+		spa_list_append(&big_list, &big_entry->link);
+
+		/* Iterate on all BIG values */
+		while (spa_json_get_string(&it1, key, sizeof(key)) > 0) {
+			if (spa_streq(key, "broadcast_code")) {
+				if (spa_json_get_string(&it1, bcode, sizeof(bcode)) <= 0)
+						goto parse_failed;
+				if (strlen(bcode) > BROADCAST_CODE_LEN)
+					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, "encryption")) {
+				if (spa_json_get_bool(&it1, &big_entry->encryption) <= 0)
+					goto parse_failed;
+				spa_log_debug(monitor->log, "big_entry->encryption %d", big_entry->encryption);
+			} else if (spa_streq(key, "bis")) {
+				if (spa_json_enter_array(&it1, &it_array1) <= 0)
+					goto parse_failed;
+				while (spa_json_enter_object(&it_array1, &it2) > 0) {
+					/* Iterate on all BIS values */
+					struct spa_bt_bis *bis_entry = calloc(1, sizeof(struct spa_bt_bis));
+
+					if (!bis_entry)
+						goto errno_failed;
+
+					spa_list_init(&bis_entry->metadata_list);
+					spa_list_append(&big_entry->bis_list, &bis_entry->link);
+
+					while (spa_json_get_string(&it2, bis_key, sizeof(bis_key)) > 0) {
+						if (spa_streq(bis_key, "qos_preset")) {
+							if (spa_json_get_string(&it2, 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, "audio_channel_allocation")) {
+							if (spa_json_get_int(&it2, &bis_entry->channel_allocation) <= 0)
+								goto parse_failed;
+							spa_log_debug(monitor->log, "bis_entry->channel_allocation %d", bis_entry->channel_allocation);
+						} else if (spa_streq(bis_key, "metadata")) {
+							if (spa_json_enter_array(&it2, &it_array2) <= 0)
+								goto parse_failed;
+							while (spa_json_enter_object(&it_array2, &it3) > 0) {
+								struct spa_bt_metadata *metadata_entry = calloc(1, sizeof(struct spa_bt_metadata));
+
+								if (!metadata_entry)
+									goto errno_failed;
+
+								spa_list_append(&bis_entry->metadata_list, &metadata_entry->link);
+
+								while (spa_json_get_string(&it3, qos_key, sizeof(qos_key)) > 0) {
+									if (spa_streq(qos_key, "type")) {
+										if (spa_json_get_int(&it3, &metadata_entry->type) <= 0)
+											goto parse_failed;
+										spa_log_debug(monitor->log, "metadata_entry->type %d", metadata_entry->type);
+									} else if (spa_streq(qos_key, "value")) {
+										if (spa_json_enter_array(&it3, &it_array3) <= 0)
+											goto parse_failed;
+										for (cursor = 0; cursor < METADATA_MAX_LEN - 1; cursor++) {
+											int temp_val = 0;
+											if (spa_json_get_int(&it_array3, &temp_val) <= 0)
+												break;
+											metadata_entry->valuecursor = (uint8_t)temp_val;
+											spa_log_debug(monitor->log, "metadata_entry->value%d %d", cursor, metadata_entry->valuecursor);
+										}
+										/* length is size of value plus 1 octet for type */
+										metadata_entry->length = cursor + 1;
+										spa_log_debug(monitor->log, "metadata_entry->length %d", metadata_entry->length);
+										spa_log_debug(monitor->log, "metadata_entry->value_size %d", cursor);
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	spa_list_insert_list(&monitor->bcast_source_config_list, &big_list);
+	return;
+
+errno_failed:
+	spa_log_warn(monitor->log, "failed in bluez5.bcast_source.config: %m");
+	goto cleanup;
+
+parse_failed:
+	str = spa_dict_lookup(info, "bluez5.bcast_source.config");
+	if (spa_json_get_error(&it0, str, &loc)) {
+		spa_debug_log_error_location(monitor->log, SPA_LOG_LEVEL_WARN,
+			&loc, "malformed bluez5.bcast_source.config: %s", loc.reason);
+	} else {
+		spa_log_warn(monitor->log, "malformed bluez5.bcast_source.config");
+	}
+	goto cleanup;
+
+cleanup:
+	spa_list_consume(big, &big_list, link)
+		big_entry_free(big);
+}
+
 static int parse_codec_array(struct spa_bt_monitor *this, const struct spa_dict *info)
 {
 	const struct media_codec * const * const media_codecs = this->media_codecs;
@@ -5989,11 +6449,13 @@
 	spa_list_init(&this->device_list);
 	spa_list_init(&this->remote_endpoint_list);
 	spa_list_init(&this->transport_list);
+	spa_list_init(&this->bcast_source_config_list);
 
 	if ((res = parse_codec_array(this, info)) < 0)
 		goto fail;
 
 	parse_roles(this, info);
+	parse_broadcast_source_config(this, info);
 
 	this->default_audio_info.rate = A2DP_CODEC_DEFAULT_RATE;
 	this->default_audio_info.channels = A2DP_CODEC_DEFAULT_CHANNELS;

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/bluez5-device.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/bluez5-device.c Changed

@@ -34,16 +34,18 @@
 #include "defs.h"
 #include "media-codecs.h"
 
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.device");
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.device");
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
 
-#define MAX_DEVICES	64
+#define MAX_NODES		(2*SPA_AUDIO_MAX_CHANNELS)
 
 #define DEVICE_ID_SOURCE	0
 #define DEVICE_ID_SINK		1
-#define DEVICE_ID_SOURCE_SET	2
-#define DEVICE_ID_SINK_SET	3
+#define DEVICE_ID_SOURCE_SET	(MAX_NODES + 0)
+#define DEVICE_ID_SINK_SET	(MAX_NODES + 1)
+
+#define SINK_ID_FLAG		0x1
 #define DYNAMIC_NODE_ID_FLAG	0x1000
 
 static struct spa_i18n *_i18n;
@@ -57,7 +59,7 @@
 	DEVICE_PROFILE_A2DP = 2,
 	DEVICE_PROFILE_HSP_HFP = 3,
 	DEVICE_PROFILE_BAP = 4,
-	DEVICE_PROFILE_LAST = DEVICE_PROFILE_BAP,
+	DEVICE_PROFILE_LAST,
 };
 
 struct props {
@@ -104,6 +106,7 @@
 	struct impl *impl;
 	struct spa_bt_transport *transport;
 	struct spa_hook listener;
+	uint32_t id;
 };
 
 struct device_set {
@@ -149,16 +152,13 @@
 	const struct media_codec **supported_codecs;
 	size_t supported_codec_count;
 
-	struct dynamic_node dyn_media_source;
-	struct dynamic_node dyn_media_sink;
-	struct dynamic_node dyn_sco_source;
-	struct dynamic_node dyn_sco_sink;
+	struct dynamic_node dyn_nodesMAX_NODES + 2;
 
 #define MAX_SETTINGS 32
 	struct spa_dict_item setting_itemsMAX_SETTINGS;
 	struct spa_dict setting_dict;
 
-	struct node nodes4;
+	struct node nodesMAX_NODES + 2;
 };
 
 static void init_node(struct impl *this, struct node *node, uint32_t id)
@@ -247,6 +247,8 @@
 		return HFP_AUDIO_CODEC_CVSD;
 	case SPA_BLUETOOTH_AUDIO_CODEC_MSBC:
 		return HFP_AUDIO_CODEC_MSBC;
+	case SPA_BLUETOOTH_AUDIO_CODEC_LC3_SWB:
+		return HFP_AUDIO_CODEC_LC3_SWB;
 	default:
 		return 0;
 	}
@@ -257,6 +259,8 @@
 	switch (codec) {
 	case HFP_AUDIO_CODEC_MSBC:
 		return SPA_BLUETOOTH_AUDIO_CODEC_MSBC;
+	case HFP_AUDIO_CODEC_LC3_SWB:
+		return SPA_BLUETOOTH_AUDIO_CODEC_LC3_SWB;
 	case HFP_AUDIO_CODEC_CVSD:
 		return SPA_BLUETOOTH_AUDIO_CODEC_CVSD;
 	}
@@ -268,6 +272,8 @@
 	switch (codec) {
 	case HFP_AUDIO_CODEC_MSBC:
 		return "mSBC";
+	case HFP_AUDIO_CODEC_LC3_SWB:
+		return "LC3-SWB";
 	case HFP_AUDIO_CODEC_CVSD:
 		return "CVSD";
 	}
@@ -279,6 +285,8 @@
 	switch (codec) {
 	case HFP_AUDIO_CODEC_MSBC:
 		return "msbc";
+	case HFP_AUDIO_CODEC_LC3_SWB:
+		return "lc3_swb";
 	case HFP_AUDIO_CODEC_CVSD:
 		return "cvsd";
 	}
@@ -356,7 +364,7 @@
 	 */
 	if (node->a2dp_duplex && node->transport && codec && codec->info &&
 			spa_atob(spa_dict_lookup(codec->info, "duplex.boost")) &&
-			node->id == DEVICE_ID_SOURCE &&
+			!(node->id & SINK_ID_FLAG) &&
 			!node->transport->volumesSPA_BT_VOLUME_ID_RX.active)
 		return 10.0f;	/* 20 dB boost */
 
@@ -573,7 +581,7 @@
 
 	for (i = 0; i < node->n_channels; ++i) {
 		/* Session manager will override this, so put in some safe number */
-		node->volumesi = node->soft_volumesi = 0.064;
+		node->volumesi = node->soft_volumesi = 0.064f;
 	}
 
 	/* Produce member info json */
@@ -581,13 +589,13 @@
 	spa_strbuf_append(&json, "");
 	for (i = 0; i < n_members; ++i) {
 		struct spa_bt_transport *t = membersi.transport;
+		uint32_t member_id = membersi.id;
 		char object_path512;
 		unsigned int j;
-		int member_id = (id == DEVICE_ID_SINK_SET) ? DEVICE_ID_SINK : DEVICE_ID_SOURCE;
 
 		if (i > 0)
 			spa_strbuf_append(&json, ",");
-		spa_scnprintf(object_path, sizeof(object_path), "%s/%s-%d",
+		spa_scnprintf(object_path, sizeof(object_path), "%s/%s-%"PRIu32,
 				this->device_set.path, t->device->address, member_id);
 		spa_strbuf_append(&json, "{\"object.path\":\"%s\",\"channels\":", object_path);
 		for (j = 0; j < t->n_channels; ++j) {
@@ -633,9 +641,15 @@
 	uint32_t n_items = 0;
 	char transport32, str_id32, object_path512;
 	bool is_dyn_node = SPA_FLAG_IS_SET(id, DYNAMIC_NODE_ID_FLAG);
+	bool in_device_set = false;
 
 	spa_log_debug(this->log, "%p: node, transport:%p id:%08x factory:%s", this, t, id, factory_name);
 
+	if (id & SINK_ID_FLAG)
+		in_device_set = this->device_set.path && (this->device_set.sinks > 1);
+	else
+		in_device_set = this->device_set.path && (this->device_set.sources > 1);
+
 	snprintf(transport, sizeof(transport), "pointer:%p", t);
 	items0 = SPA_DICT_ITEM_INIT(SPA_KEY_API_BLUEZ5_TRANSPORT, transport);
 	items1 = SPA_DICT_ITEM_INIT(SPA_KEY_API_BLUEZ5_PROFILE, spa_bt_profile_name(t->profile));
@@ -643,7 +657,7 @@
 	items3 = SPA_DICT_ITEM_INIT(SPA_KEY_API_BLUEZ5_ADDRESS, device->address);
 	items4 = SPA_DICT_ITEM_INIT("device.routes", "1");
 	n_items = 5;
-	if (!is_dyn_node && !this->device_set.path) {
+	if (!is_dyn_node && !in_device_set) {
 		snprintf(str_id, sizeof(str_id), "%d", id);
 		itemsn_items = SPA_DICT_ITEM_INIT("card.profile.device", str_id);
 		n_items++;
@@ -656,7 +670,7 @@
 		itemsn_items = SPA_DICT_ITEM_INIT("api.bluez5.a2dp-duplex", "true");
 		n_items++;
 	}
-	if (this->device_set.path) {
+	if (in_device_set) {
 		itemsn_items = SPA_DICT_ITEM_INIT("api.bluez5.set", this->device_set.path);
 		n_items++;
 		itemsn_items = SPA_DICT_ITEM_INIT("api.bluez5.internal", "true");
@@ -676,6 +690,8 @@
 	info.props = &SPA_DICT_INIT(items, n_items);
 
 	SPA_FLAG_CLEAR(id, DYNAMIC_NODE_ID_FLAG);
+	spa_assert(id < SPA_N_ELEMENTS(this->nodes));
+
 	spa_device_emit_object_info(&this->hooks, id, &info);
 
 	if (this->device_set.path) {
@@ -704,10 +720,8 @@
 
 		if (prev_channels > 0) {
 			size_t i;
-			/*
-			 * Spread mono volume to all channels, if we had switched HFP -> A2DP.
-			 * XXX: we should also use different route for hfp and a2dp
-			 */
+
+			/* Spread mono volume to all channels, if we had switched HFP -> A2DP. */
 			for (i = prev_channels; i < this->nodesid.n_channels; ++i)
 				this->nodesid.volumesi = this->nodesid.volumesi % prev_channels;
 		}
@@ -725,28 +739,51 @@
 	}
 }
 
-static struct spa_bt_transport *find_device_transport(struct spa_bt_device *device, int profile,
-		enum spa_bluetooth_audio_codec codec)
+static void init_dummy_input_node(struct impl *this, uint32_t id)
+{
+	uint32_t prev_channels = this->nodesid.n_channels;
+
+	/* Don't emit a device node, only initialize volume etc. for the route */
+
+	spa_log_debug(this->log, "%p: node, id:%08x", this, id);
+
+	this->nodesid.impl = this;
+	this->nodesid.active = true;
+	this->nodesid.offload_acquired = false;
+	this->nodesid.a2dp_duplex = false;
+	this->nodesid.n_channels = 1;
+	this->nodesid.channels0 = SPA_AUDIO_CHANNEL_MONO;
+
+	if (prev_channels > 0) {
+		size_t i;
+
+		/* Spread mono volume to all channels */
+		for (i = prev_channels; i < this->nodesid.n_channels; ++i)
+			this->nodesid.volumesi = this->nodesid.volumesi % prev_channels;
+	}
+}
+
+static bool transport_enabled(struct spa_bt_transport *t, int profile)
+{
+	return (t->profile & t->device->connected_profiles) &&
+		(t->profile & profile) == t->profile;
+}
+
+static struct spa_bt_transport *find_device_transport(struct spa_bt_device *device, int profile)
 {
 	struct spa_bt_transport *t;
 
 	spa_list_for_each(t, &device->transport_list, device_link) {
-		bool codec_ok = codec == 0 ||
-			(t->media_codec != NULL && t->media_codec->id == codec) ||
-			get_hfp_codec_id(t->codec) == codec;
-
-		if ((t->profile & device->connected_profiles) &&
-				(t->profile & profile) == t->profile &&
-				codec_ok)
+		if (transport_enabled(t, profile))
 			return t;
 	}
 
 	return NULL;
 }
 
-static struct spa_bt_transport *find_transport(struct impl *this, int profile, enum spa_bluetooth_audio_codec codec)
+static struct spa_bt_transport *find_transport(struct impl *this, int profile)
 {
-	return find_device_transport(this->bt_dev, profile, codec);
+	return find_device_transport(this->bt_dev, profile);
 }
 
 static void dynamic_node_transport_destroy(void *data)
@@ -835,9 +872,13 @@
 	.volume_changed = dynamic_node_volume_changed,
 };
 
-static void emit_dynamic_node(struct dynamic_node *this, struct impl *impl,
+static void emit_dynamic_node(struct impl *impl,
 	struct spa_bt_transport *t, uint32_t id, const char *factory_name, bool a2dp_duplex)
 {
+	struct dynamic_node *this = &impl->dyn_nodesid;
+
+	spa_assert(id < SPA_N_ELEMENTS(impl->dyn_nodes));
+
 	spa_log_debug(impl->log, "%p: dynamic node, transport: %p->%p id: %08x->%08x",
 			this, this->transport, t, this->id, id);
 
@@ -881,16 +922,22 @@
 	struct device_set *set = &impl->device_set;
 	unsigned int i;
 
-	for (i = 0; i < SPA_N_ELEMENTS(set->sink); ++i) {
+	for (i = 0; i < SPA_N_ELEMENTS(set->sink); ++i)
 		if (set->sinki.transport)
 			spa_hook_remove(&set->sinki.listener);
+
+	for (i = 0; i < SPA_N_ELEMENTS(set->source); ++i)
 		if (set->sourcei.transport)
 			spa_hook_remove(&set->sourcei.listener);
-	}
 
 	free(set->path);
 	spa_zero(*set);
+
 	set->impl = impl;
+	for (i = 0; i < SPA_N_ELEMENTS(set->sink); ++i)
+		set->sinki.impl = impl;
+	for (i = 0; i < SPA_N_ELEMENTS(set->source); ++i)
+		set->sourcei.impl = impl;
 }
 
 static void device_set_transport_destroy(void *data)
@@ -911,36 +958,71 @@
 	struct spa_bt_device *device = this->bt_dev;
 	struct device_set *dset = &this->device_set;
 	struct spa_bt_set_membership *set;
+	struct spa_bt_set_membership tmp_set = {
+		.device = device,
+		.rank = 0,
+		.leader = true,
+		.path = device->path,
+		.others = SPA_LIST_INIT(&tmp_set.others),
+	};
+	struct spa_list tmp_set_list = SPA_LIST_INIT(&tmp_set_list);
+	struct spa_list *membership_list = &device->set_membership_list;
 
-	device_set_clear(this);
-
-	if (!is_bap_client(this))
-		return;
+	/*
+	 * If no device set, use a dummy one, so that we can handle also those devices
+	 * here (they may have multiple transports regardless).
+	 */
+	if (spa_list_is_empty(membership_list)) {
+		spa_list_append(&tmp_set_list, &tmp_set.link);
+		membership_list = &tmp_set_list;
+	}
 
-	spa_list_for_each(set, &device->set_membership_list, link) {
+	spa_list_for_each(set, membership_list, link) {
 		struct spa_bt_set_membership *s;
 		int num_devices = 0;
 
+		device_set_clear(this);
+
 		spa_bt_for_each_set_member(s, set) {
 			struct spa_bt_transport *t;
 			bool active = false;
+			uint32_t source_id = DEVICE_ID_SOURCE;
+			uint32_t sink_id = DEVICE_ID_SINK;
 
 			if (!(s->device->connected_profiles & SPA_BT_PROFILE_BAP_DUPLEX))
 				continue;
 
-			t = find_device_transport(s->device, SPA_BT_PROFILE_BAP_SOURCE, 0);
-			if (t && t->bap_initiator) {
+			spa_list_for_each(t, &s->device->transport_list, device_link) {
+				if (!(s->device->connected_profiles & SPA_BT_PROFILE_BAP_SOURCE))
+					continue;
+				if (!transport_enabled(t, SPA_BT_PROFILE_BAP_SOURCE))
+					continue;
+				if (dset->sources >= SPA_N_ELEMENTS(dset->source))
+					break;
+
 				active = true;
+				dset->sourcedset->sources.impl = this;
 				dset->sourcedset->sources.transport = t;
+				dset->sourcedset->sources.id = source_id;
+				source_id += 2;
 				spa_bt_transport_add_listener(t, &dset->sourcedset->sources.listener,
 						&device_set_transport_events, &dset->sourcedset->sources);
 				++dset->sources;
 			}
 
-			t = find_device_transport(s->device, SPA_BT_PROFILE_BAP_SINK, this->props.codec);
-			if (t && t->bap_initiator) {
+			spa_list_for_each(t, &s->device->transport_list, device_link) {
+				if (!(s->device->connected_profiles & SPA_BT_PROFILE_BAP_SINK))
+					continue;
+				if (!transport_enabled(t, SPA_BT_PROFILE_BAP_SINK))
+					continue;
+				if (dset->sinks >= SPA_N_ELEMENTS(dset->sink))
+					break;
+
 				active = true;
+				dset->sinkdset->sinks.impl = this;
 				dset->sinkdset->sinks.transport = t;
+				dset->sinkdset->sinks.id = sink_id;
+				sink_id += 2;
 				spa_bt_transport_add_listener(t, &dset->sinkdset->sinks.listener,
 						&device_set_transport_events, &dset->sinkdset->sinks);
 				++dset->sinks;
@@ -950,17 +1032,22 @@
 				++num_devices;
 		}
 
-		if (num_devices <= 1 || (dset->sinks <= 1 && dset->sources <= 1)) {
-			device_set_clear(this);
-			continue;
-		}
-
 		spa_log_debug(this->log, "%p: %s belongs to set %s leader:%d", this,
 				device->path, set->path, set->leader);
 
-		dset->path = strdup(set->path);
-		dset->leader = set->leader;
-		break;
+		if (is_bap_client(this)) {
+			dset->path = strdup(set->path);
+			dset->leader = set->leader;
+		} else {
+			/* XXX: device set nodes for BAP server not supported,
+			 * XXX: it'll appear as multiple streams
+			 */
+			dset->path = NULL;
+			dset->leader = false;
+		}
+
+		if (num_devices > 1)
+			break;
 	}
 }
 
@@ -968,6 +1055,8 @@
 {
 	struct spa_bt_transport *t;
 
+	this->props.codec = 0;
+
 	device_set_update(this);
 
 	switch (this->profile) {
@@ -975,51 +1064,40 @@
 		break;
 	case DEVICE_PROFILE_AG:
 		if (this->bt_dev->connected_profiles & SPA_BT_PROFILE_HEADSET_AUDIO_GATEWAY) {
-			t = find_transport(this, SPA_BT_PROFILE_HFP_AG, 0);
+			t = find_transport(this, SPA_BT_PROFILE_HFP_AG);
 			if (!t)
-				t = find_transport(this, SPA_BT_PROFILE_HSP_AG, 0);
+				t = find_transport(this, SPA_BT_PROFILE_HSP_AG);
 			if (t) {
-				if (t->profile == SPA_BT_PROFILE_HSP_AG)
-					this->props.codec = 0;
-				else
-					this->props.codec = get_hfp_codec_id(t->codec);
-				emit_dynamic_node(&this->dyn_sco_source, this, t,
-						0, SPA_NAME_API_BLUEZ5_SCO_SOURCE, false);
-				emit_dynamic_node(&this->dyn_sco_sink, this, t,
-						1, SPA_NAME_API_BLUEZ5_SCO_SINK, false);
+				this->props.codec = get_hfp_codec_id(t->codec);
+				emit_dynamic_node(this, t, 0, SPA_NAME_API_BLUEZ5_SCO_SOURCE, false);
+				emit_dynamic_node(this, t, 1, SPA_NAME_API_BLUEZ5_SCO_SINK, false);
 			}
 		}
 		if (this->bt_dev->connected_profiles & (SPA_BT_PROFILE_A2DP_SOURCE)) {
-			t = find_transport(this, SPA_BT_PROFILE_A2DP_SOURCE, 0);
+			t = find_transport(this, SPA_BT_PROFILE_A2DP_SOURCE);
 			if (t) {
 				this->props.codec = t->media_codec->id;
-				emit_dynamic_node(&this->dyn_media_source, this, t,
-						2, SPA_NAME_API_BLUEZ5_A2DP_SOURCE, false);
+				emit_dynamic_node(this, t, 2, SPA_NAME_API_BLUEZ5_A2DP_SOURCE, false);
 
-				if (t->media_codec->duplex_codec) {
-					emit_dynamic_node(&this->dyn_media_sink, this, t,
-						3, SPA_NAME_API_BLUEZ5_A2DP_SINK, true);
-				}
+				if (t->media_codec->duplex_codec)
+					emit_dynamic_node(this, t, 3, SPA_NAME_API_BLUEZ5_A2DP_SINK, true);
 			}
 		}
 		break;
 	case DEVICE_PROFILE_A2DP:
 		if (this->bt_dev->connected_profiles & SPA_BT_PROFILE_A2DP_SOURCE) {
-			t = find_transport(this, SPA_BT_PROFILE_A2DP_SOURCE, 0);
+			t = find_transport(this, SPA_BT_PROFILE_A2DP_SOURCE);
 			if (t) {
 				this->props.codec = t->media_codec->id;
-				emit_dynamic_node(&this->dyn_media_source, this, t,
-					DEVICE_ID_SOURCE, SPA_NAME_API_BLUEZ5_A2DP_SOURCE, false);
+				emit_dynamic_node(this, t, DEVICE_ID_SOURCE, SPA_NAME_API_BLUEZ5_A2DP_SOURCE, false);
 
-				if (t->media_codec->duplex_codec) {
-					emit_node(this, t,
-						DEVICE_ID_SINK, SPA_NAME_API_BLUEZ5_A2DP_SINK, true);
-				}
+				if (t->media_codec->duplex_codec)
+					emit_node(this, t, DEVICE_ID_SINK, SPA_NAME_API_BLUEZ5_A2DP_SINK, true);
 			}
 		}
 
 		if (this->bt_dev->connected_profiles & SPA_BT_PROFILE_A2DP_SINK) {
-			t = find_transport(this, SPA_BT_PROFILE_A2DP_SINK, this->props.codec);
+			t = find_transport(this, SPA_BT_PROFILE_A2DP_SINK);
 			if (t) {
 				this->props.codec = t->media_codec->id;
 				emit_node(this, t, DEVICE_ID_SINK, SPA_NAME_API_BLUEZ5_A2DP_SINK, false);
@@ -1030,40 +1108,61 @@
 				}
 			}
 		}
+
+		/* Setup route for HFP input, for tracking its volume even though there is
+		 * no node emitted yet. */
+		if ((this->bt_dev->connected_profiles & SPA_BT_PROFILE_HEADSET_HEAD_UNIT) &&
+				!(this->bt_dev->connected_profiles & SPA_BT_PROFILE_A2DP_SOURCE) &&
+				!this->nodesDEVICE_ID_SOURCE.active)
+			init_dummy_input_node(this, DEVICE_ID_SOURCE);
+
+		if (!this->props.codec)
+			this->props.codec = SPA_BLUETOOTH_AUDIO_CODEC_SBC;
 		break;
-	case DEVICE_PROFILE_BAP:
-		if (this->bt_dev->connected_profiles & (SPA_BT_PROFILE_BAP_SOURCE)) {
-			t = find_transport(this, SPA_BT_PROFILE_BAP_SOURCE, 0);
-			if (t) {
-				this->props.codec = t->media_codec->id;
-				if (t->bap_initiator)
-					emit_node(this, t, DEVICE_ID_SOURCE, SPA_NAME_API_BLUEZ5_MEDIA_SOURCE, false);
-				else
-					emit_dynamic_node(&this->dyn_media_source, this, t,
-						DEVICE_ID_SOURCE, SPA_NAME_API_BLUEZ5_MEDIA_SOURCE, false);
-			}
+	case DEVICE_PROFILE_BAP: {
+		struct device_set *set = &this->device_set;
+		unsigned int i;
+
+		for (i = 0; i < set->sources; ++i) {
+			struct spa_bt_transport *t = set->sourcei.transport;
+			uint32_t id = set->sourcei.id;
+
+			if (id >= MAX_NODES)
+				continue;
+			if (t->device != this->bt_dev)
+				continue;
 
-			if (this->device_set.leader && this->device_set.sources > 0)
-				emit_device_set_node(this, DEVICE_ID_SOURCE_SET);
+			this->props.codec = t->media_codec->id;
+			if (t->bap_initiator)
+				emit_node(this, t, id, SPA_NAME_API_BLUEZ5_MEDIA_SOURCE, false);
+			else
+				emit_dynamic_node(this, t, id, SPA_NAME_API_BLUEZ5_MEDIA_SOURCE, false);
 		}
 
-		if (this->bt_dev->connected_profiles & (SPA_BT_PROFILE_BAP_SINK)) {
-			t = find_transport(this, SPA_BT_PROFILE_BAP_SINK, this->props.codec);
-			if (t) {
-				this->props.codec = t->media_codec->id;
-				if (t->bap_initiator)
-					emit_node(this, t, DEVICE_ID_SINK, SPA_NAME_API_BLUEZ5_MEDIA_SINK, false);
-				else
-					emit_dynamic_node(&this->dyn_media_sink, this, t,
-						DEVICE_ID_SINK, SPA_NAME_API_BLUEZ5_MEDIA_SINK, false);
-			}
+		if (set->path && set->leader && set->sources > 1)
+			emit_device_set_node(this, DEVICE_ID_SOURCE_SET);
 
-			if (this->device_set.leader && this->device_set.sinks > 0)
-				emit_device_set_node(this, DEVICE_ID_SINK_SET);
+		for (i = 0; i < set->sinks; ++i) {
+			struct spa_bt_transport *t = set->sinki.transport;
+			uint32_t id = set->sinki.id;
+
+			if (id >= MAX_NODES)
+				continue;
+			if (t->device != this->bt_dev)
+				continue;
+
+			this->props.codec = t->media_codec->id;
+			if (t->bap_initiator)
+				emit_node(this, t, id, SPA_NAME_API_BLUEZ5_MEDIA_SINK, false);
+			else
+				emit_dynamic_node(this, t, id, SPA_NAME_API_BLUEZ5_MEDIA_SINK, false);
 		}
 
+		if (set->path && set->leader && set->sinks > 1)
+			emit_device_set_node(this, DEVICE_ID_SINK_SET);
+
 		if (this->bt_dev->connected_profiles & (SPA_BT_PROFILE_BAP_BROADCAST_SINK)) {
-			t = find_transport(this, SPA_BT_PROFILE_BAP_BROADCAST_SINK, this->props.codec);
+			t = find_transport(this, SPA_BT_PROFILE_BAP_BROADCAST_SINK);
 			if (t) {
 				this->props.codec = t->media_codec->id;
 				emit_node(this, t, DEVICE_ID_SINK, SPA_NAME_API_BLUEZ5_MEDIA_SINK, false);
@@ -1074,35 +1173,36 @@
 		}
 
 		if (this->bt_dev->connected_profiles & (SPA_BT_PROFILE_BAP_BROADCAST_SOURCE)) {
-			t = find_transport(this, SPA_BT_PROFILE_BAP_BROADCAST_SOURCE, this->props.codec);
+			t = find_transport(this, SPA_BT_PROFILE_BAP_BROADCAST_SOURCE);
 			if (t) {
 				this->props.codec = t->media_codec->id;
-				emit_dynamic_node(&this->dyn_media_source, this, t,
-					DEVICE_ID_SOURCE, SPA_NAME_API_BLUEZ5_MEDIA_SOURCE, false);
+				emit_dynamic_node(this, t, DEVICE_ID_SOURCE, SPA_NAME_API_BLUEZ5_MEDIA_SOURCE, false);
 			}
 		}
+
+		if (!this->props.codec)
+			this->props.codec = SPA_BLUETOOTH_AUDIO_CODEC_LC3;
 		break;
+	};
 	case DEVICE_PROFILE_HSP_HFP:
 		if (this->bt_dev->connected_profiles & SPA_BT_PROFILE_HEADSET_HEAD_UNIT) {
-			t = find_transport(this, SPA_BT_PROFILE_HFP_HF, this->props.codec);
+			t = find_transport(this, SPA_BT_PROFILE_HFP_HF);
 			if (!t)
-				t = find_transport(this, SPA_BT_PROFILE_HSP_HS, 0);
+				t = find_transport(this, SPA_BT_PROFILE_HSP_HS);
 			if (t) {
-				if (t->profile == SPA_BT_PROFILE_HSP_HS)
-					this->props.codec = 0;
-				else
-					this->props.codec = get_hfp_codec_id(t->codec);
+				this->props.codec = get_hfp_codec_id(t->codec);
 				emit_node(this, t, DEVICE_ID_SOURCE, SPA_NAME_API_BLUEZ5_SCO_SOURCE, false);
 				emit_node(this, t, DEVICE_ID_SINK, SPA_NAME_API_BLUEZ5_SCO_SINK, false);
 			}
 		}
 
-		if (spa_bt_device_supports_hfp_codec(this->bt_dev, get_hfp_codec(this->props.codec)) != 1)
-			this->props.codec = 0;
+		if (!this->props.codec)
+			this->props.codec = SPA_BLUETOOTH_AUDIO_CODEC_CVSD;
 		break;
 	default:
 		return -EINVAL;
 	}
+
 	return 0;
 }
 
@@ -1129,10 +1229,8 @@
 {
 	spa_log_debug(this->log, "%p: remove nodes", this);
 
-	remove_dynamic_node (&this->dyn_media_source);
-	remove_dynamic_node (&this->dyn_media_sink);
-	remove_dynamic_node (&this->dyn_sco_source);
-	remove_dynamic_node (&this->dyn_sco_sink);
+	for (uint32_t i = 0; i < SPA_N_ELEMENTS(this->dyn_nodes); i++)
+		remove_dynamic_node (&this->dyn_nodesi);
 
 	for (uint32_t i = 0; i < SPA_N_ELEMENTS(this->nodes); i++) {
 		struct node * node = &this->nodesi;
@@ -1176,7 +1274,6 @@
 
 	this->profile = profile;
 	this->prev_bt_connected_profiles = this->bt_dev->connected_profiles;
-	this->props.codec = codec;
 
 	/*
 	 * A2DP/BAP: ensure there's a transport with the selected codec (0 means any).
@@ -1205,7 +1302,7 @@
 		} else {
 			return 0;
 		}
-	} else if (profile == DEVICE_PROFILE_HSP_HFP && get_hfp_codec(codec) && !(this->bt_dev->connected_profiles & SPA_BT_PROFILE_HFP_AG)) {
+	} else if (profile == DEVICE_PROFILE_HSP_HFP && get_hfp_codec(codec)) {
 		int ret;
 
 		this->switching_codec = true;
@@ -1220,7 +1317,6 @@
 	}
 
 	this->switching_codec = false;
-	this->props.codec = 0;
 	emit_nodes(this);
 
 	this->info.change_mask |= SPA_DEVICE_CHANGE_MASK_PARAMS;
@@ -1242,19 +1338,8 @@
 
 	this->switching_codec = false;
 
-	if (status < 0) {
-		/* Failed to switch: return to a fallback profile */
-		spa_log_error(this->log, "failed to switch codec (%d), setting fallback profile", status);
-		if (this->profile == DEVICE_PROFILE_A2DP && this->props.codec != 0) {
-			this->props.codec = 0;
-		} else if (this->profile == DEVICE_PROFILE_BAP && this->props.codec != 0) {
-			this->props.codec = 0;
-		} else if (this->profile == DEVICE_PROFILE_HSP_HFP && this->props.codec != 0) {
-			this->props.codec = 0;
-		} else {
-			this->profile = DEVICE_PROFILE_OFF;
-		}
-	}
+	if (status < 0)
+		spa_log_error(this->log, "failed to switch codec (%d)", status);
 
 	emit_remove_nodes(this);
 	emit_nodes(this);
@@ -1311,8 +1396,6 @@
 			      nodes_changed);
 		break;
 	case DEVICE_PROFILE_HSP_HFP:
-		if (spa_bt_device_supports_hfp_codec(this->bt_dev, get_hfp_codec(this->props.codec)) != 1)
-			this->props.codec = 0;
 		nodes_changed = (connected_change & SPA_BT_PROFILE_HEADSET_HEAD_UNIT);
 		spa_log_debug(this->log, "profiles changed: HSP/HFP nodes changed: %d",
 			      nodes_changed);
@@ -1340,8 +1423,6 @@
 
 	if (this->profile != DEVICE_PROFILE_BAP)
 		return;
-	if (!is_bap_client(this))
-		return;
 
 	spa_log_debug(this->log, "%p: device set changed", this);
 
@@ -1370,12 +1451,34 @@
 	}
 }
 
+static void device_switch_profile(void *userdata)
+{
+	struct impl *this = userdata;
+	uint32_t profile;
+
+	switch(this->profile) {
+	case DEVICE_PROFILE_OFF:
+		profile = DEVICE_PROFILE_HSP_HFP;
+		break;
+	case DEVICE_PROFILE_HSP_HFP:
+		profile = DEVICE_PROFILE_OFF;
+		break;
+	default:
+		return;
+	}
+
+	spa_log_debug(this->log, "%p: device switch profile %d -> %d", this, this->profile, profile);
+
+	set_profile(this, profile, 0, false);
+}
+
 static const struct spa_bt_device_events bt_dev_events = {
 	SPA_VERSION_BT_DEVICE_EVENTS,
 	.connected = device_connected,
 	.codec_switched = codec_switched,
 	.profiles_changed = profiles_changed,
 	.device_set_changed = device_set_changed,
+	.switch_profile = device_switch_profile,
 };
 
 static int impl_add_listener(void *object,
@@ -1413,7 +1516,8 @@
 	return 0;
 }
 
-static uint32_t profile_direction_mask(struct impl *this, uint32_t index, enum spa_bluetooth_audio_codec codec)
+static uint32_t profile_direction_mask(struct impl *this, uint32_t index, enum spa_bluetooth_audio_codec codec,
+	bool hfp_input_for_a2dp)
 {
 	struct spa_bt_device *device = this->bt_dev;
 	uint32_t mask;
@@ -1428,6 +1532,8 @@
 		media_codec = get_supported_media_codec(this, codec, NULL, device->connected_profiles);
 		if (media_codec && media_codec->duplex_codec)
 			have_input = true;
+		if (hfp_input_for_a2dp && this->nodesDEVICE_ID_SOURCE.active)
+			have_input = true;
 		break;
 	case DEVICE_PROFILE_BAP:
 		if (device->connected_profiles & SPA_BT_PROFILE_BAP_SINK)
@@ -1453,15 +1559,9 @@
 
 static uint32_t get_profile_from_index(struct impl *this, uint32_t index, uint32_t *next, enum spa_bluetooth_audio_codec *codec)
 {
-	/*
-	 * XXX: The codecs should probably become a separate param, and not have
-	 * XXX: separate profiles for each one.
-	 */
-
-	*codec = 0;
-	*next = index + 1;
-
-	if (index <= DEVICE_PROFILE_LAST) {
+	if (index < DEVICE_PROFILE_LAST) {
+		*codec = 0;
+		*next = index + 1;
 		return index;
 	} else if (index != SPA_ID_INVALID) {
 		const struct spa_type_info *info;
@@ -1490,16 +1590,16 @@
 
 static uint32_t get_index_from_profile(struct impl *this, uint32_t profile, enum spa_bluetooth_audio_codec codec)
 {
-	if (profile == DEVICE_PROFILE_OFF || profile == DEVICE_PROFILE_AG)
+	switch (profile) {
+	case DEVICE_PROFILE_OFF:
+	case DEVICE_PROFILE_AG:
 		return profile;
 
-	if ((profile == DEVICE_PROFILE_A2DP) || (profile == DEVICE_PROFILE_BAP))
-		return codec + DEVICE_PROFILE_LAST;
-
-	if (profile == DEVICE_PROFILE_HSP_HFP) {
-		if (codec == 0 || (this->bt_dev->connected_profiles & SPA_BT_PROFILE_HFP_AG))
-			return profile;
-
+	case DEVICE_PROFILE_A2DP:
+	case DEVICE_PROFILE_BAP:
+	case DEVICE_PROFILE_HSP_HFP:
+		if (!codec)
+			return SPA_ID_INVALID;
 		return codec + DEVICE_PROFILE_LAST;
 	}
 
@@ -1515,7 +1615,7 @@
 		if (!(this->bt_dev->connected_profiles & i))
 			continue;
 
-		t = find_transport(this, i, 0);
+		t = find_transport(this, i);
 		if (t) {
 			this->profile = (i & SPA_BT_PROFILE_HEADSET_AUDIO_GATEWAY) ?
 				DEVICE_PROFILE_AG : DEVICE_PROFILE_HSP_HFP;
@@ -1557,7 +1657,7 @@
 		if (!(this->bt_dev->connected_profiles & i))
 			continue;
 
-		t = find_transport(this, i, 0);
+		t = find_transport(this, i);
 		if (t) {
 			if (i == SPA_BT_PROFILE_A2DP_SOURCE || i == SPA_BT_PROFILE_BAP_SOURCE)
 				this->profile =  DEVICE_PROFILE_AG;
@@ -1679,8 +1779,8 @@
 	case DEVICE_PROFILE_BAP:
 	{
 		uint32_t profile = device->connected_profiles &
-		      (SPA_BT_PROFILE_BAP_SINK | SPA_BT_PROFILE_BAP_SOURCE 
-			  	| SPA_BT_PROFILE_BAP_BROADCAST_SOURCE 
+		      (SPA_BT_PROFILE_BAP_SINK | SPA_BT_PROFILE_BAP_SOURCE
+				| SPA_BT_PROFILE_BAP_BROADCAST_SOURCE
 				| SPA_BT_PROFILE_BAP_BROADCAST_SINK);
 		size_t idx;
 		const struct media_codec *media_codec;
@@ -1692,10 +1792,10 @@
 		if (profile == 0)
 			return NULL;
 
-		if ((profile & (SPA_BT_PROFILE_BAP_SINK)) || 
+		if ((profile & (SPA_BT_PROFILE_BAP_SINK)) ||
 			(profile & (SPA_BT_PROFILE_BAP_BROADCAST_SINK)))
 			n_sink++;
-		if ((profile & (SPA_BT_PROFILE_BAP_SOURCE)) || 
+		if ((profile & (SPA_BT_PROFILE_BAP_SOURCE)) ||
 			(profile & (SPA_BT_PROFILE_BAP_BROADCAST_SOURCE)))
 			n_source++;
 
@@ -1764,31 +1864,40 @@
 		/* make this device profile visible only if there is a head unit */
 		uint32_t profile = device->connected_profiles &
 		      SPA_BT_PROFILE_HEADSET_HEAD_UNIT;
-		if (profile == 0) {
+		unsigned int hfp_codec = get_hfp_codec(codec);
+		unsigned int idx;
+
+		if (profile == 0)
 			return NULL;
-		}
+
+		/* HFP will only enlist codec profiles */
+		if (codec == 0)
+			return NULL;
+		if (codec != SPA_BLUETOOTH_AUDIO_CODEC_CVSD &&
+				spa_bt_device_supports_hfp_codec(this->bt_dev, hfp_codec) != 1)
+			return NULL;
+
 		name = spa_bt_profile_name(profile);
 		n_source++;
 		n_sink++;
-		if (codec) {
-			bool codec_ok = !(profile & SPA_BT_PROFILE_HEADSET_AUDIO_GATEWAY);
-			unsigned int hfp_codec = get_hfp_codec(codec);
-			if (spa_bt_device_supports_hfp_codec(this->bt_dev, hfp_codec) != 1)
-				codec_ok = false;
-			if (!codec_ok) {
-				errno = EINVAL;
-				return NULL;
-			}
-			name_and_codec = spa_aprintf("%s-%s", name, get_hfp_codec_name(hfp_codec));
+
+		name_and_codec = spa_aprintf("%s-%s", name, get_hfp_codec_name(hfp_codec));
+
+		/*
+		 * Give base name to highest priority profile, so that best codec can be
+		 * selected at command line with out knowing which codecs are actually
+		 * supported
+		 */
+		for (idx = HFP_AUDIO_CODEC_LC3_SWB; idx > 0; --idx)
+			if (spa_bt_device_supports_hfp_codec(this->bt_dev, idx) == 1)
+				break;
+		if (hfp_codec < idx)
 			name = name_and_codec;
-			desc_and_codec = spa_aprintf(_("Headset Head Unit (HSP/HFP, codec %s)"),
-						get_hfp_codec_description(hfp_codec));
-			desc = desc_and_codec;
-			priority = 1 + hfp_codec;  /* prefer msbc over cvsd */
-		} else {
-			desc = _("Headset Head Unit (HSP/HFP)");
-			priority = 1;
-		}
+
+		desc_and_codec = spa_aprintf(_("Headset Head Unit (HSP/HFP, codec %s)"),
+				get_hfp_codec_description(hfp_codec));
+		desc = desc_and_codec;
+		priority = 1 + hfp_codec;  /* prefer lc3_swb > msbc > cvsd */
 		break;
 	}
 	default:
@@ -1931,7 +2040,15 @@
 		direction = SPA_DIRECTION_INPUT;
 		snprintf(name, sizeof(name), "%s-input", name_prefix);
 		enum_dev = DEVICE_ID_SOURCE;
-		if (profile == DEVICE_PROFILE_A2DP || profile == DEVICE_PROFILE_BAP)
+
+		if ((this->bt_dev->connected_profiles & SPA_BT_PROFILE_A2DP_SINK) &&
+				!(this->bt_dev->connected_profiles & SPA_BT_PROFILE_A2DP_SOURCE) &&
+				!(this->bt_dev->connected_profiles & SPA_BT_PROFILE_BAP_AUDIO) &&
+				(this->bt_dev->connected_profiles & SPA_BT_PROFILE_HEADSET_HEAD_UNIT))
+			description = hfp_description;
+
+		if (profile == DEVICE_PROFILE_A2DP || profile == DEVICE_PROFILE_BAP ||
+				profile == DEVICE_PROFILE_HSP_HFP)
 			dev = enum_dev;
 		else if (profile != SPA_ID_INVALID)
 			enum_dev = SPA_ID_INVALID;
@@ -1946,16 +2063,6 @@
 			enum_dev = SPA_ID_INVALID;
 		break;
 	case 2:
-		direction = SPA_DIRECTION_INPUT;
-		snprintf(name, sizeof(name), "%s-hf-input", name_prefix);
-		description = hfp_description;
-		enum_dev = DEVICE_ID_SOURCE;
-		if (profile == DEVICE_PROFILE_HSP_HFP)
-			dev = enum_dev;
-		else if (profile != SPA_ID_INVALID)
-			enum_dev = SPA_ID_INVALID;
-		break;
-	case 3:
 		direction = SPA_DIRECTION_OUTPUT;
 		snprintf(name, sizeof(name), "%s-hf-output", name_prefix);
 		description = hfp_description;
@@ -1965,7 +2072,7 @@
 		else if (profile != SPA_ID_INVALID)
 			enum_dev = SPA_ID_INVALID;
 		break;
-	case 4:
+	case 3:
 		if (!this->device_set.leader) {
 			errno = EINVAL;
 			return NULL;
@@ -1978,7 +2085,7 @@
 		else if (profile != SPA_ID_INVALID)
 			enum_dev = SPA_ID_INVALID;
 		break;
-	case 5:
+	case 4:
 		if (!this->device_set.leader) {
 			errno = EINVAL;
 			return NULL;
@@ -2031,12 +2138,12 @@
 
 		if (j == DEVICE_PROFILE_A2DP && !(port == 0 || port == 1))
 			continue;
-		if (j == DEVICE_PROFILE_BAP && !(port == 0 || port == 1 || port == 4 || port == 5))
+		if (j == DEVICE_PROFILE_BAP && !(port == 0 || port == 1 || port == 3 || port == 4))
 			continue;
-		if (j == DEVICE_PROFILE_HSP_HFP && !(port == 2 || port == 3))
+		if (j == DEVICE_PROFILE_HSP_HFP && !(port == 0 || port == 2))
 			continue;
 
-		profile_mask = profile_direction_mask(this, j, codec);
+		profile_mask = profile_direction_mask(this, j, codec, false);
 		if (!(profile_mask & (1 << direction)))
 			continue;
 
@@ -2058,7 +2165,7 @@
 		struct node *node = &this->nodesdev;
 		struct spa_bt_transport_volume *t_volume;
 
-		mask = profile_direction_mask(this, this->profile, this->props.codec);
+		mask = profile_direction_mask(this, this->profile, this->props.codec, true);
 		if (!(mask & (1 << direction)))
 			return NULL;
 
@@ -2090,7 +2197,7 @@
 				node->n_channels, node->channels);
 
 		if ((this->profile == DEVICE_PROFILE_A2DP || this->profile == DEVICE_PROFILE_BAP) &&
-		    dev == DEVICE_ID_SINK) {
+				(dev & SINK_ID_FLAG)) {
 			spa_pod_builder_prop(b, SPA_PROP_latencyOffsetNsec, 0);
 			spa_pod_builder_long(b, node->latency_offset);
 		}
@@ -2142,7 +2249,7 @@
 #define FOR_EACH_MEDIA_CODEC(j, codec) \
 		for (j = -1; iterate_supported_media_codecs(this, &j, &codec);)
 #define FOR_EACH_HFP_CODEC(j) \
-		for (j = HFP_AUDIO_CODEC_MSBC; j >= HFP_AUDIO_CODEC_CVSD; --j) \
+		for (j = HFP_AUDIO_CODEC_LC3_SWB; j >= HFP_AUDIO_CODEC_CVSD; --j) \
 			if (spa_bt_device_supports_hfp_codec(this->bt_dev, j) == 1)
 
 	spa_pod_builder_push_object(b, &f0, SPA_TYPE_OBJECT_PropInfo, id);
@@ -2272,7 +2379,7 @@
 	case SPA_PARAM_EnumRoute:
 	{
 		switch (result.index) {
-		case 0: case 1: case 2: case 3: case 4: case 5:
+		case 0: case 1: case 2: case 3: case 4:
 			param = build_route(this, &b, id, result.index, SPA_ID_INVALID);
 			if (param == NULL)
 				goto next;
@@ -2625,6 +2732,9 @@
 			} else if (codec_id == SPA_BLUETOOTH_AUDIO_CODEC_MSBC &&
 					spa_bt_device_supports_hfp_codec(this->bt_dev, HFP_AUDIO_CODEC_MSBC) == 1) {
 				return set_profile(this, this->profile, codec_id, true);
+			} else if (codec_id == SPA_BLUETOOTH_AUDIO_CODEC_LC3_SWB &&
+					spa_bt_device_supports_hfp_codec(this->bt_dev, HFP_AUDIO_CODEC_LC3_SWB) == 1) {
+				return set_profile(this, this->profile, codec_id, true);
 			}
 		}
 		return -EINVAL;
@@ -2718,6 +2828,7 @@
 {
 	struct impl *this;
 	const char *str;
+	unsigned int i;
 
 	spa_return_val_if_fail(factory != NULL, -EINVAL);
 	spa_return_val_if_fail(handle != NULL, -EINVAL);
@@ -2764,10 +2875,8 @@
 
 	reset_props(&this->props);
 
-	init_node(this, &this->nodes0, 0);
-	init_node(this, &this->nodes1, 1);
-	init_node(this, &this->nodes2, 2);
-	init_node(this, &this->nodes3, 3);
+	for (i = 0; i < SPA_N_ELEMENTS(this->nodes); ++i)
+		init_node(this, &this->nodesi, i);
 
 	this->info = SPA_DEVICE_INFO_INIT();
 	this->info_all = SPA_DEVICE_CHANGE_MASK_PROPS |

pipewire-1.2.0.tar.gz/spa/plugins/bluez5/bt-latency.h Added

@@ -0,0 +1,175 @@
+/* Spa Bluez5 ISO I/O */
+/* SPDX-FileCopyrightText: Copyright © 2024 Pauli Virtanen */
+/* SPDX-License-Identifier: MIT */
+
+#ifndef SPA_BLUEZ5_BT_LATENCY_H
+#define SPA_BLUEZ5_BT_LATENCY_H
+
+#include <sys/socket.h>
+#include <linux/net_tstamp.h>
+#include <linux/errqueue.h>
+#include <linux/sockios.h>
+
+#include <spa/utils/defs.h>
+#include <spa/support/log.h>
+
+#include "rate-control.h"
+
+/* New kernel API */
+#ifndef BT_SCM_ERROR
+#define BT_SCM_ERROR 0x04
+#endif
+#ifndef BT_POLL_ERRQUEUE
+#define BT_POLL_ERRQUEUE 21
+#endif
+
+/**
+ * Bluetooth latency tracking.
+ */
+struct spa_bt_latency
+{
+	uint64_t value;
+	struct spa_bt_ptp ptp;
+	bool valid;
+	bool disabled;
+
+	struct {
+		int64_t send64;
+		uint32_t pos;
+		int64_t prev_tx;
+	} impl;
+};
+
+static inline void spa_bt_latency_init(struct spa_bt_latency *lat, int fd,
+		uint32_t period, struct spa_log *log)
+{
+	int so_timestamping = (SOF_TIMESTAMPING_TX_SOFTWARE | SOF_TIMESTAMPING_SOFTWARE |
+					SOF_TIMESTAMPING_OPT_ID | SOF_TIMESTAMPING_OPT_TSONLY);
+	uint32_t flag;
+	int res;
+
+	spa_zero(*lat);
+
+	flag = 0;
+	res = setsockopt(fd, SOL_BLUETOOTH, BT_POLL_ERRQUEUE, &flag, sizeof(flag));
+	if (res < 0) {
+		spa_log_warn(log, "setsockopt(BT_POLL_ERRQUEUE) failed (kernel feature not enabled?): %d (%m)", errno);
+		lat->disabled = true;
+		return;
+	}
+
+	res = setsockopt(fd, SOL_SOCKET, SO_TIMESTAMPING, &so_timestamping, sizeof(so_timestamping));
+	if (res < 0) {
+		spa_log_warn(log, "setsockopt(SO_TIMESTAMPING) failed (kernel feature not enabled?): %d (%m)", errno);
+		lat->disabled = true;
+		return;
+	}
+
+	/* Flush errqueue on start */
+	do {
+		res = recv(fd, NULL, 0, MSG_ERRQUEUE | MSG_DONTWAIT | MSG_TRUNC);
+	} while (res == 0);
+
+	spa_bt_ptp_init(&lat->ptp, period, period / 2);
+}
+
+static inline void spa_bt_latency_reset(struct spa_bt_latency *lat)
+{
+	lat->value = 0;
+	lat->valid = false;
+	spa_bt_ptp_init(&lat->ptp, lat->ptp.period, lat->ptp.period / 2);
+}
+
+static inline void spa_bt_latency_sent(struct spa_bt_latency *lat, uint64_t now)
+{
+	const unsigned int n = SPA_N_ELEMENTS(lat->impl.send);
+
+	if (lat->disabled)
+		return;
+
+	lat->impl.sendlat->impl.pos++ = now;
+	if (lat->impl.pos >= n)
+		lat->impl.pos = 0;
+}
+
+static inline int spa_bt_latency_recv_errqueue(struct spa_bt_latency *lat, int fd, struct spa_log *log)
+{
+	struct {
+		struct cmsghdr cm;
+		char control512;
+	} control;
+
+	if (lat->disabled)
+		return -EOPNOTSUPP;
+
+	do {
+		struct iovec data = {
+			.iov_base = NULL,
+			.iov_len = 0
+		};
+		struct msghdr msg = {
+			.msg_iov = &data,
+			.msg_iovlen = 1,
+			.msg_control = &control,
+			.msg_controllen = sizeof(control),
+		};
+		struct cmsghdr *cmsg;
+		struct scm_timestamping *tss = NULL;
+		struct sock_extended_err *serr = NULL;
+		int res;
+
+		res = recvmsg(fd, &msg, MSG_ERRQUEUE | MSG_DONTWAIT);
+		if (res < 0) {
+			if (errno == EAGAIN || errno == EWOULDBLOCK)
+				break;
+			return -errno;
+		}
+
+		for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+			if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_TIMESTAMPING)
+				tss = (void *)CMSG_DATA(cmsg);
+			else if (cmsg->cmsg_level == SOL_BLUETOOTH && cmsg->cmsg_type == BT_SCM_ERROR)
+				serr = (void *)CMSG_DATA(cmsg);
+			else
+				continue;
+		}
+
+		if (!tss || !serr || serr->ee_errno != ENOMSG || serr->ee_origin != SO_EE_ORIGIN_TIMESTAMPING)
+			return -EINVAL;
+		if (serr->ee_info != SCM_TSTAMP_SND)
+			continue;
+
+		struct timespec *ts = &tss->ts0;
+		int64_t tx_time = SPA_TIMESPEC_TO_NSEC(ts);
+		uint32_t tx_pos = serr->ee_data % SPA_N_ELEMENTS(lat->impl.send);
+
+		lat->value = tx_time - lat->impl.sendtx_pos;
+
+		if (lat->impl.prev_tx && tx_time > lat->impl.prev_tx)
+			spa_bt_ptp_update(&lat->ptp, lat->value, tx_time - lat->impl.prev_tx);
+
+		lat->impl.prev_tx = tx_time;
+
+		spa_log_trace(log, "fd:%d latency%d nsec:%"PRIu64" range:%d..%d ms",
+				fd, tx_pos, lat->value,
+				(int)(spa_bt_ptp_valid(&lat->ptp) ? lat->ptp.min / SPA_NSEC_PER_MSEC : -1),
+				(int)(spa_bt_ptp_valid(&lat->ptp) ? lat->ptp.max / SPA_NSEC_PER_MSEC : -1));
+	} while (true);
+
+	lat->valid = spa_bt_ptp_valid(&lat->ptp);
+
+	return 0;
+}
+
+static inline void spa_bt_latency_flush(struct spa_bt_latency *lat, int fd, struct spa_log *log)
+{
+	int so_timestamping = 0;
+
+	/* Disable timestamping and flush errqueue */
+	setsockopt(fd, SOL_SOCKET, SO_TIMESTAMPING, &so_timestamping, sizeof(so_timestamping));
+	spa_bt_latency_recv_errqueue(lat, fd, log);
+
+	lat->disabled = true;
+}
+
+#endif

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/codec-loader.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/codec-loader.c Changed

@@ -15,7 +15,7 @@
 #define MAX_CODECS	0x3E
 #define MAX_HANDLES	MAX_CODECS
 
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.codecs");
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.codecs");
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
 
@@ -36,6 +36,7 @@
 		SPA_BLUETOOTH_AUDIO_CODEC_APTX_HD,
 		SPA_BLUETOOTH_AUDIO_CODEC_APTX,
 		SPA_BLUETOOTH_AUDIO_CODEC_AAC,
+		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_G,
 		SPA_BLUETOOTH_AUDIO_CODEC_LC3PLUS_HR,
 		SPA_BLUETOOTH_AUDIO_CODEC_MPEG,
 		SPA_BLUETOOTH_AUDIO_CODEC_SBC,
@@ -49,6 +50,7 @@
 		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_71,
 		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_DUPLEX,
 		SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_PRO,
+		SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD,
 	};
 	size_t i;
 	for (i = 0; i < SPA_N_ELEMENTS(order); ++i)
@@ -169,6 +171,7 @@
 		MEDIA_CODEC_FACTORY_LIB("sbc"),
 		MEDIA_CODEC_FACTORY_LIB("lc3plus"),
 		MEDIA_CODEC_FACTORY_LIB("opus"),
+		MEDIA_CODEC_FACTORY_LIB("opus-g"),
 		MEDIA_CODEC_FACTORY_LIB("lc3")
 #undef MEDIA_CODEC_FACTORY_LIB
 	};

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/decode-buffer.h -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/decode-buffer.h Changed

@@ -55,21 +55,6 @@
 	SPA_CLAMP((spike)*3/2, (packet_size), (max_buf) - 2*(packet_size))
 
 
-/** Windowed min/max */
-struct spa_bt_ptp
-{
-	union {
-		int32_t min;
-		int32_t mins4;
-	};
-	union {
-		int32_t max;
-		int32_t maxs4;
-	};
-	uint32_t pos;
-	uint32_t period;
-};
-
 struct spa_bt_decode_buffer
 {
 	struct spa_log *log;
@@ -102,40 +87,6 @@
 	uint8_t buffering:1;
 };
 
-static void spa_bt_ptp_init(struct spa_bt_ptp *p, int32_t period)
-{
-	size_t i;
-
-	spa_zero(*p);
-	for (i = 0; i < SPA_N_ELEMENTS(p->mins); ++i) {
-		p->minsi = INT32_MAX;
-		p->maxsi = INT32_MIN;
-	}
-	p->period = period;
-}
-
-static void spa_bt_ptp_update(struct spa_bt_ptp *p, int32_t value, uint32_t duration)
-{
-	const size_t n = SPA_N_ELEMENTS(p->mins);
-	size_t i;
-
-	for (i = 0; i < n; ++i) {
-		p->minsi = SPA_MIN(p->minsi, value);
-		p->maxsi = SPA_MAX(p->maxsi, value);
-	}
-
-	p->pos += duration;
-	if (p->pos >= p->period / (n - 1)) {
-		p->pos = 0;
-		for (i = 1; i < SPA_N_ELEMENTS(p->mins); ++i) {
-			p->minsi-1 = p->minsi;
-			p->maxsi-1 = p->maxsi;
-		}
-		p->minsn-1 = INT32_MAX;
-		p->maxsn-1 = INT32_MIN;
-	}
-}
-
 static int spa_bt_decode_buffer_init(struct spa_bt_decode_buffer *this, struct spa_log *log,
 		uint32_t frame_size, uint32_t rate, uint32_t quantum_limit, uint32_t reserve)
 {
@@ -153,8 +104,8 @@
 
 	spa_bt_rate_control_init(&this->ctl, 0);
 
-	spa_bt_ptp_init(&this->spike, (uint64_t)this->rate * BUFFERING_LONG_MSEC / 1000);
-	spa_bt_ptp_init(&this->packet_size, (uint64_t)this->rate * BUFFERING_SHORT_MSEC / 1000);
+	spa_bt_ptp_init(&this->spike, (uint64_t)this->rate * BUFFERING_LONG_MSEC / 1000, 0);
+	spa_bt_ptp_init(&this->packet_size, (uint64_t)this->rate * BUFFERING_SHORT_MSEC / 1000, 0);
 
 	if ((this->buffer_decoded = malloc(this->buffer_size)) == NULL) {
 		this->buffer_size = 0;
@@ -302,7 +253,7 @@
 		level = SPA_MAX(level, -max_level);
 		this->prev_consumed = SPA_MIN(this->prev_consumed, avg_period);
 
-		spa_bt_ptp_update(&this->spike, this->ctl.avg - level, this->prev_consumed);
+		spa_bt_ptp_update(&this->spike, (int32_t)(this->ctl.avg - level), this->prev_consumed);
 
 		/* Update target level */
 		if (this->target)

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/defs.h -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/defs.h Changed

@@ -141,8 +141,9 @@
 #define BUS_TYPE_USB		1
 #define BUS_TYPE_OTHER		255
 
-#define HFP_AUDIO_CODEC_CVSD    0x01
-#define HFP_AUDIO_CODEC_MSBC    0x02
+#define HFP_AUDIO_CODEC_CVSD	0x01
+#define HFP_AUDIO_CODEC_MSBC	0x02
+#define HFP_AUDIO_CODEC_LC3_SWB	0x03
 
 #define A2DP_OBJECT_MANAGER_PATH "/MediaEndpoint"
 #define A2DP_SINK_ENDPOINT	A2DP_OBJECT_MANAGER_PATH "/A2DPSink"
@@ -160,9 +161,11 @@
 
 /* HFP uses SBC encoding with precisely defined parameters. Hence, the size
  * of the input (number of PCM samples) and output is known up front. */
-#define MSBC_DECODED_SIZE       240
-#define MSBC_ENCODED_SIZE       60  /* 2 bytes header + 57 mSBC payload + 1 byte padding */
-#define MSBC_PAYLOAD_SIZE       57
+#define MSBC_DECODED_SIZE       	240
+#define MSBC_PAYLOAD_SIZE       	57	/* 1 byte padding follows payload */
+#define LC3_SWB_DECODED_SIZE    	960	/* 32 kHz mono S24_32 @ 7.5 ms */
+#define LC3_SWB_PAYLOAD_SIZE    	58
+#define HFP_CODEC_PACKET_SIZE		60	/* 2 bytes header + payload */
 
 enum spa_bt_media_direction {
 	SPA_BT_MEDIA_SOURCE,
@@ -190,6 +193,8 @@
 	SPA_BT_PROFILE_HEADSET_HEAD_UNIT = (SPA_BT_PROFILE_HSP_HS | SPA_BT_PROFILE_HFP_HF),
 	SPA_BT_PROFILE_HEADSET_AUDIO_GATEWAY = (SPA_BT_PROFILE_HSP_AG | SPA_BT_PROFILE_HFP_AG),
 	SPA_BT_PROFILE_HEADSET_AUDIO =  (SPA_BT_PROFILE_HEADSET_HEAD_UNIT | SPA_BT_PROFILE_HEADSET_AUDIO_GATEWAY),
+	SPA_BT_PROFILE_BAP_AUDIO =  (SPA_BT_PROFILE_BAP_SINK | SPA_BT_PROFILE_BAP_BROADCAST_SINK |
+			SPA_BT_PROFILE_BAP_SOURCE | SPA_BT_PROFILE_BAP_BROADCAST_SOURCE),
 
 	SPA_BT_PROFILE_MEDIA_SINK =		(SPA_BT_PROFILE_A2DP_SINK | SPA_BT_PROFILE_BAP_SINK |
 										SPA_BT_PROFILE_BAP_BROADCAST_SINK),
@@ -462,6 +467,9 @@
 	/** Device set configuration changed */
 	void (*device_set_changed) (void *data);
 
+	/** Switch profile between OFF and HSP_HFP */
+	void (*switch_profile) (void *data);
+
 	/** Device freed */
 	void (*destroy) (void *data);
 };
@@ -554,6 +562,7 @@
 #define spa_bt_device_emit_codec_switched(d,...)	spa_bt_device_emit(d, codec_switched, 0, __VA_ARGS__)
 #define spa_bt_device_emit_profiles_changed(d,...)	spa_bt_device_emit(d, profiles_changed, 0, __VA_ARGS__)
 #define spa_bt_device_emit_device_set_changed(d)	spa_bt_device_emit(d, device_set_changed, 0)
+#define spa_bt_device_emit_switch_profile(d)		spa_bt_device_emit(d, switch_profile, 0)
 #define spa_bt_device_emit_destroy(d)			spa_bt_device_emit(d, destroy, 0)
 #define spa_bt_device_add_listener(d,listener,events,data)           \
 	spa_hook_list_append(&(d)->listener_list, listener, events, data)
@@ -562,7 +571,7 @@
 
 struct spa_bt_sco_io;
 
-struct spa_bt_sco_io *spa_bt_sco_io_create(struct spa_loop *data_loop, int fd, uint16_t read_mtu, uint16_t write_mtu);
+struct spa_bt_sco_io *spa_bt_sco_io_create(struct spa_bt_transport *transport, struct spa_loop *data_loop, struct spa_log *log);
 void spa_bt_sco_io_destroy(struct spa_bt_sco_io *io);
 void spa_bt_sco_io_set_source_cb(struct spa_bt_sco_io *io, int (*source_cb)(void *userdata, uint8_t *data, int size), void *userdata);
 void spa_bt_sco_io_set_sink_cb(struct spa_bt_sco_io *io, int (*sink_cb)(void *userdata), void *userdata);
@@ -650,7 +659,6 @@
 	uint8_t bap_cis;
 	uint8_t bap_big;
 	uint8_t bap_bis;
-	uint32_t bap_interval;
 
 	struct spa_bt_iso_io *iso_io;
 	struct spa_bt_sco_io *sco_io;

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/iso-io.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/iso-io.c Changed

@@ -7,7 +7,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <limits.h>
-#include <sys/socket.h>
 
 #include <spa/support/loop.h>
 #include <spa/support/log.h>
@@ -22,16 +21,20 @@
 #include "media-codecs.h"
 #include "defs.h"
 
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.iso");
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.iso");
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
 
+#include "bt-latency.h"
+
 #define IDLE_TIME	(500 * SPA_NSEC_PER_MSEC)
 #define EMPTY_BUF_SIZE	65536
 
+#define LATENCY_PERIOD		(200 * SPA_NSEC_PER_MSEC)
+#define MAX_PACKET_QUEUE	3
+
 struct group {
 	struct spa_log *log;
-	struct spa_log_topic log_topic;
 	struct spa_loop *data_loop;
 	struct spa_system *data_system;
 	struct spa_source source;
@@ -40,7 +43,6 @@
 	uint8_t id;
 	uint64_t next;
 	uint64_t duration;
-	uint32_t paused;
 	bool started;
 };
 
@@ -56,6 +58,8 @@
 
 	const struct media_codec *codec;
 	uint32_t block_size;
+
+	struct spa_bt_latency tx_latency;
 };
 
 struct modify_info
@@ -132,17 +136,34 @@
 			group->timerfd, SPA_FD_TIMER_ABSTIME, &ts, NULL);
 }
 
-static int set_timers(struct group *group)
+static uint64_t get_time_ns(struct spa_system *system, clockid_t clockid)
 {
 	struct timespec now;
 
-	spa_system_clock_gettime(group->data_system, CLOCK_MONOTONIC, &now);
-	group->next = SPA_ROUND_UP(SPA_TIMESPEC_TO_NSEC(&now) + group->duration,
+	spa_system_clock_gettime(system, clockid, &now);
+	return SPA_TIMESPEC_TO_NSEC(&now);
+}
+
+static int set_timers(struct group *group)
+{
+	if (group->duration == 0)
+		return -EINVAL;
+
+	group->next = SPA_ROUND_UP(get_time_ns(group->data_system, CLOCK_MONOTONIC) + group->duration,
 			group->duration);
 
 	return set_timeout(group, group->next);
 }
 
+static void drop_rx(int fd)
+{
+	ssize_t res;
+
+	do {
+		res = recv(fd, NULL, 0, MSG_TRUNC | MSG_DONTWAIT);
+	} while (res >= 0);
+}
+
 static void group_on_timeout(struct spa_source *source)
 {
 	struct group *group = source->data;
@@ -159,13 +180,16 @@
 		return;
 	}
 
-	/*
-	 * If a stream failed, pause output of all streams for a while to avoid
-	 * desynchronization.
-	 */
 	spa_list_for_each(stream, &group->streams, link) {
-		if (!stream->sink)
+		if (!stream->sink) {
+			if (!stream->pull) {
+				/* Source not running: drop any incoming data */
+				drop_rx(stream->fd);
+			}
 			continue;
+		}
+
+		spa_bt_latency_recv_errqueue(&stream->tx_latency, stream->fd, group->log);
 
 		if (stream->this.need_resync) {
 			resync = true;
@@ -176,18 +200,16 @@
 			group->started = true;
 	}
 
-	if (group->paused) {
-		--group->paused;
-		spa_log_debug(group->log, "%p: ISO group:%u paused:%u", group, group->id, group->paused);
-	}
-
 	/* Produce output */
 	spa_list_for_each(stream, &group->streams, link) {
-		int res;
+		int res = 0;
+		uint64_t now;
+		int32_t min_latency = INT32_MAX, max_latency = INT32_MIN;
+		struct stream *other;
 
 		if (!stream->sink)
 			continue;
-		if (group->paused || !group->started) {
+		if (!group->started) {
 			stream->this.resync = true;
 			stream->this.size = 0;
 			continue;
@@ -201,21 +223,50 @@
 			}
 		}
 
+		spa_list_for_each(other, &group->streams, link) {
+			if (!other->sink || stream == other || !other->tx_latency.valid)
+				continue;
+			min_latency = SPA_MIN(min_latency, other->tx_latency.ptp.min);
+			max_latency = SPA_MAX(max_latency, other->tx_latency.ptp.max);
+		}
+
+		if (stream->tx_latency.valid && min_latency <= max_latency &&
+				stream->tx_latency.ptp.min > min_latency + (int64_t)group->duration/2 &&
+				stream->tx_latency.ptp.max > max_latency + (int64_t)group->duration/2) {
+			spa_log_debug(group->log, "%p: ISO group:%u latency skip align fd:%d", group, group->id, stream->fd);
+			spa_bt_latency_reset(&stream->tx_latency);
+			goto stream_done;
+		}
+
+		/* TODO: this should use rate match */
+		if (stream->tx_latency.valid &&
+				stream->tx_latency.ptp.min > MAX_PACKET_QUEUE * (int64_t)group->duration) {
+			spa_log_debug(group->log, "%p: ISO group:%u latency skip fd:%d", group, group->id, stream->fd);
+			spa_bt_latency_reset(&stream->tx_latency);
+			goto stream_done;
+		}
+
+		now = get_time_ns(group->data_system, CLOCK_REALTIME);
 		res = send(stream->fd, stream->this.buf, stream->this.size, MSG_DONTWAIT | MSG_NOSIGNAL);
 		if (res < 0) {
 			res = -errno;
 			fail = true;
+		} else {
+			spa_bt_latency_sent(&stream->tx_latency, now);
 		}
 
-		spa_log_trace(group->log, "%p: ISO group:%u sent fd:%d size:%u ts:%u idle:%d res:%d",
+	stream_done:
+		spa_log_trace(group->log, "%p: ISO group:%u sent fd:%d size:%u ts:%u idle:%d res:%d latency:%d..%d us",
 				group, group->id, stream->fd, (unsigned)stream->this.size,
-				(unsigned)stream->this.timestamp, stream->idle, res);
+				(unsigned)stream->this.timestamp, stream->idle, res,
+				stream->tx_latency.valid ? stream->tx_latency.ptp.min/1000 : -1,
+				stream->tx_latency.valid ? stream->tx_latency.ptp.max/1000 : -1);
 
 		stream->this.size = 0;
 	}
 
 	if (fail)
-		group->paused = 1u + IDLE_TIME / group->duration;
+		spa_log_debug(group->log, "%p: ISO group:%d send failure", group, group->id);
 
 	/* Pull data for the next interval */
 	group->next += exp * group->duration;
@@ -245,11 +296,6 @@
 	struct group *group;
 	uint8_t id;
 
-	if (t->bap_interval <= 5000) {
-		errno = EINVAL;
-		return NULL;
-	}
-
 	if (t->profile & (SPA_BT_PROFILE_BAP_SINK | SPA_BT_PROFILE_BAP_SOURCE)) {
 		id = t->bap_cig;
 	} else if (t->profile & (SPA_BT_PROFILE_BAP_BROADCAST_SINK | SPA_BT_PROFILE_BAP_BROADCAST_SOURCE)) {
@@ -269,7 +315,7 @@
 	group->log = log;
 	group->data_loop = data_loop;
 	group->data_system = data_system;
-	group->duration = t->bap_interval * SPA_NSEC_PER_USEC;
+	group->duration = 0;
 
 	spa_list_init(&group->streams);
 
@@ -326,20 +372,22 @@
 	struct spa_audio_info format = { 0 };
 	int res;
 	bool sink;
-	if((t->profile == SPA_BT_PROFILE_BAP_SINK) || 
-		(t->profile == SPA_BT_PROFILE_BAP_BROADCAST_SINK)) {
+
+	if (t->profile == SPA_BT_PROFILE_BAP_SINK ||
+			t->profile == SPA_BT_PROFILE_BAP_BROADCAST_SINK) {
 		sink = true;
 	} else {
 		sink = false;
 	}
 
-
-	if (!t->media_codec->bap) {
+	if (!t->media_codec->bap || !t->media_codec->get_interval) {
 		res = -EINVAL;
 		goto fail;
 	}
 
 	if (sink) {
+		uint64_t interval;
+
 		res = t->media_codec->validate_config(t->media_codec, 0, t->configuration, t->configuration_len, &format);
 		if (res < 0)
 			goto fail;
@@ -356,6 +404,20 @@
 			res = -EINVAL;
 			goto fail;
 		}
+
+		interval = t->media_codec->get_interval(codec_data);
+		if (interval <= 5000) {
+			res = -EINVAL;
+			goto fail;
+		}
+
+		if (group->duration == 0) {
+			group->duration = interval;
+		} else if (interval != group->duration) {
+			/* SDU_Interval in ISO group must be same for each direction */
+			res = -EINVAL;
+			goto fail;
+		}
 	}
 
 	stream = calloc(1, sizeof(struct stream));
@@ -365,13 +427,15 @@
 	stream->fd = t->fd;
 	stream->sink = sink;
 	stream->group = group;
-	stream->this.duration = group->duration;
+	stream->this.duration = sink ? group->duration : 0;
 
 	stream->codec = t->media_codec;
 	stream->this.codec_data = codec_data;
 	stream->this.format = format;
 	stream->block_size = block_size;
 
+	spa_bt_latency_init(&stream->tx_latency, stream->fd, LATENCY_PERIOD, group->log);
+
 	if (sink)
 		stream_silence(stream);
 
@@ -426,6 +490,8 @@
 
 	stream_unlink(stream);
 
+	spa_bt_latency_flush(&stream->tx_latency, stream->fd, stream->group->log);
+
 	if (spa_list_is_empty(&stream->group->streams))
 		group_destroy(stream->group);
 
@@ -440,9 +506,12 @@
 {
 	struct stream *stream;
 
-	spa_list_for_each(stream, &group->streams, link)
+	spa_list_for_each(stream, &group->streams, link) {
+		if (!stream->sink)
+			continue;
 		if (stream->pull)
 			return true;
+	}
 
 	return false;
 }
@@ -453,6 +522,9 @@
 	struct stream *stream = SPA_CONTAINER_OF(this, struct stream, this);
 	bool was_enabled, enabled;
 
+	if (!stream->sink)
+		return;
+
 	was_enabled = group_is_enabled(stream->group);
 
 	stream->pull = pull;
@@ -475,3 +547,12 @@
 		return;
 	}
 }
+
+/** Must be called from data thread */
+int spa_bt_iso_io_recv_errqueue(struct spa_bt_iso_io *this)
+{
+	struct stream *stream = SPA_CONTAINER_OF(this, struct stream, this);
+	struct group *group = stream->group;
+
+	return spa_bt_latency_recv_errqueue(&stream->tx_latency, stream->fd, group->log);
+}

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/iso-io.h -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/iso-io.h Changed

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/media-codecs.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/media-codecs.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/media-codecs.h -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/media-codecs.h Changed

@@ -26,7 +26,7 @@
 
 #define SPA_TYPE_INTERFACE_Bluez5CodecMedia	SPA_TYPE_INFO_INTERFACE_BASE "Bluez5:Codec:Media:Private"
 
-#define SPA_VERSION_BLUEZ5_CODEC_MEDIA		7
+#define SPA_VERSION_BLUEZ5_CODEC_MEDIA		9
 
 struct spa_bluez5_codec_a2dp {
 	struct spa_interface iface;
@@ -39,10 +39,14 @@
 #define MEDIA_CODEC_EXPORT_DEF(basename,...)	\
 	const char *codec_plugin_factory_name = MEDIA_CODEC_FACTORY_NAME(basename); \
 	static const struct media_codec * const codec_plugin_media_codec_list = { __VA_ARGS__, NULL };	\
-	const struct media_codec * const * const codec_plugin_media_codecs = codec_plugin_media_codec_list;
+	const struct media_codec * const * const codec_plugin_media_codecs = codec_plugin_media_codec_list;	\
+	SPA_LOG_TOPIC_DEFINE(codec_plugin_log_topic, "spa.bluez5.codecs." basename);
 
 extern const struct media_codec * const * const codec_plugin_media_codecs;
 extern const char *codec_plugin_factory_name;
+extern struct spa_log_topic codec_plugin_log_topic;
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &codec_plugin_log_topic
 #endif
 
 #define MEDIA_CODEC_FLAG_SINK		(1 << 0)
@@ -77,7 +81,9 @@
 
 	const struct media_codec *duplex_codec;	/**< Codec for non-standard A2DP duplex channel */
 
-	struct spa_log *log;
+	int (*get_bis_config)(const struct media_codec *codec, uint8_t *caps,
+				uint8_t *caps_size,	struct spa_dict *settings,
+				struct bap_codec_qos *qos);
 
 	/** If fill_caps is NULL, no endpoint is registered (for sharing with another codec). */
 	int (*fill_caps) (const struct media_codec *codec, uint32_t flags,
@@ -119,19 +125,71 @@
 
 	int (*update_props) (void *data, void *props);
 
+	/** Number of bytes needed for encoding */
 	int (*get_block_size) (void *data);
 
+	/**
+	 * Duration of the next packet in nanoseconds.
+	 *
+	 * For BAP this shall be constant and equal to the SDU interval.
+	 *
+	 * \param data Codec data from init()
+	 * \return Duration in nanoseconds.
+	 */
+	uint64_t (*get_interval) (void *data);
+
 	int (*abr_process) (void *data, size_t unsent);
 
+	/**
+	 * Start encoding new packet.
+	 *
+	 * \param data Codec data from init()
+	 * \param timestamp Packet time stamp (in samples played)
+	 * \return Size of packet header written to dst in bytes, or < 0 for error
+	 */
 	int (*start_encode) (void *data,
 		void *dst, size_t dst_size, uint16_t seqnum, uint32_t timestamp);
+
+	/**
+	 * Consume data from input buffer, encode to output buffer.
+	 *
+	 * \param data Codec data from init()
+	 * \param src Source data. NULL if encoding packet fragment.
+	 * \param dst Output buffer position. The memory region passed to the
+	 *    previous start_encode() is still valid, and this position is inside
+	 *    that region. The caller does not modify the contents of the buffer.
+	 * \param dst_size Remaining buffer space after dst
+	 * \param dst_out Bytes written to dst
+	 * \param need_flush
+	 *    - NEED_FLUSH_NO: don't flush this packet,
+	 *    - NEED_FLUSH_ALL: flush this packet,
+	 *    - NEED_FLUSH_FRAGMENT: flush packet fragment. The next start_encode()
+	 *      and encode() are expected to produce more fragments or the final
+	 *      fragment with NEED_FLUSH_ALL, without consuming source data.
+	 *      The fragment start_encode() is called with the same output buffer
+	 *      as previous. The fragment encode() will be called with NULL src.
+	 *      No new source data will be fed in before NEED_FLUSH_ALL.
+	 * \return Number of bytes consumed from src, or < 0 for error
+	 */
 	int (*encode) (void *data,
 		const void *src, size_t src_size,
 		void *dst, size_t dst_size,
 		size_t *dst_out, int *need_flush);
 
+	/**
+	 * Start decoding received packet.
+	 *
+	 * \return Number of bytes consumed from source data, or < 0 for error
+	 */
 	int (*start_decode) (void *data,
 		const void *src, size_t src_size, uint16_t *seqnum, uint32_t *timestamp);
+
+	/**
+	 * Decode received packet data.
+	 *
+	 * \param dst_out Number of bytes output to dst
+	 * \return Number of bytes consumed from src, or < 0 for error
+	 */
 	int (*decode) (void *data,
 		const void *src, size_t src_size,
 		void *dst, size_t dst_size,
@@ -152,6 +210,9 @@
 int media_codec_select_config(const struct media_codec_config configs, size_t n,
 	uint32_t cap, int preferred_value);
 
+int media_codec_get_config(const struct media_codec_config configs, size_t n,
+	uint32_t conf);
+
 bool media_codec_check_caps(const struct media_codec *codec, unsigned int codec_id,
 	const void *caps, size_t caps_size, const struct media_codec_audio_info *info,
 	const struct spa_dict *global_settings);

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/media-sink.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/media-sink.c Changed

@@ -41,10 +41,12 @@
 #include "rate-control.h"
 #include "iso-io.h"
 
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.sink.media");
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.sink.media");
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
 
+#include "bt-latency.h"
+
 #define DEFAULT_CLOCK_NAME	"clock.system.monotonic"
 
 struct props {
@@ -53,10 +55,11 @@
 };
 
 #define FILL_FRAMES 4
-#define MIN_BUFFERS 2
+#define MIN_BUFFERS 3
 #define MAX_BUFFERS 32
 #define BUFFER_SIZE	(8192*8)
 #define RATE_CTL_DIFF_MAX 0.005
+#define LATENCY_PERIOD		(200 * SPA_NSEC_PER_MSEC)
 
 /* Wait for two cycles before trying to sync ISO. On start/driver reassign,
  * first cycle may have strange number of samples. */
@@ -108,6 +111,7 @@
 	struct spa_log *log;
 	struct spa_loop *data_loop;
 	struct spa_system *data_system;
+	struct spa_loop_utils *loop_utils;
 
 	struct spa_hook_list hooks;
 	struct spa_callbacks callbacks;
@@ -158,6 +162,9 @@
 	uint64_t prev_flush_time;
 	uint64_t next_flush_time;
 
+	uint64_t packet_delay_ns;
+	struct spa_source *update_delay_event;
+
 	const struct media_codec *codec;
 	bool codec_props_changed;
 	void *codec_props;
@@ -371,12 +378,31 @@
 	struct port *port = &this->port;
 	int64_t delay;
 
+	/* in main loop */
+
 	if (this->transport == NULL)
 		return;
 
-	delay = spa_bt_transport_get_delay_nsec(this->transport);
+	/*
+	 * We start flushing data immediately, so the delay is:
+	 *
+	 * (packet delay) + (codec internal delay) + (transport delay) + (latency offset)
+	 *
+	 * and doesn't depend on the quantum. The codec internal delay is neglected.
+	 * Kernel knows the latency due to socket/controller queue, but doesn't
+	 * tell us, so not included but hopefully in < 20 ms range.
+	 */
+
+	delay = __atomic_load_n(&this->packet_delay_ns, __ATOMIC_RELAXED);
+	delay += spa_bt_transport_get_delay_nsec(this->transport);
 	delay += SPA_CLAMP(this->props.latency_offset, -delay, INT64_MAX / 2);
+	delay = SPA_MAX(delay, 0);
+
 	port->latency.min_ns = port->latency.max_ns = delay;
+	port->latency.min_rate = port->latency.max_rate = 0;
+	port->latency.min_quantum = port->latency.max_quantum = 0.0f;
+
+	spa_log_info(this->log, "%p: total latency:%d ms", this, (int)(delay / SPA_NSEC_PER_MSEC));
 
 	if (emit_latency) {
 		port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
@@ -385,6 +411,29 @@
 	}
 }
 
+static void update_delay_event(void *data, uint64_t count)
+{
+	struct impl *this = data;
+
+	/* in main loop */
+	set_latency(this, true);
+}
+
+static void update_packet_delay(struct impl *this, uint64_t delay)
+{
+	uint64_t old_delay = this->packet_delay_ns;
+
+	/* in data thread */
+
+	delay = SPA_MAX(delay, old_delay);
+	if (delay == old_delay)
+		return;
+
+	__atomic_store_n(&this->packet_delay_ns, delay, __ATOMIC_RELAXED);
+	if (this->update_delay_event)
+		spa_loop_utils_signal_event(this->loop_utils, this->update_delay_event);
+}
+
 static int apply_props(struct impl *this, const struct spa_pod *param)
 {
 	struct props new_props = this->props;
@@ -489,9 +538,9 @@
 
 	/* Account for resampling delay */
 	resampling = (port->current_format.info.raw.rate != this->process_rate) || this->following;
-	if (port->rate_match && this->clock && resampling) {
+	if (port->rate_match && this->position && resampling) {
 		t -= (uint64_t)port->rate_match->delay * SPA_NSEC_PER_SEC
-			/ this->clock->rate.denom;
+			/ this->position->clock.rate.denom;
 		t += SPA_NSEC_PER_SEC / port->current_format.info.raw.rate;
 	}
 
@@ -814,6 +863,8 @@
 			this->iso_pending = false;
 
 			reset_buffer(this);
+
+			update_packet_delay(this, iso_io->duration * 3/2);
 		}
 		return 0;
 	}
@@ -888,7 +939,7 @@
 			 */
 #if 1
 			this->next_flush_time += SPA_MIN(packet_time,
-					duration_ns * (port->n_buffers - 1));
+					duration_ns * (SPA_MAX(port->n_buffers, 2u) - 2));
 #endif
 		} else {
 			if (this->next_flush_time == 0)
@@ -896,6 +947,8 @@
 			this->next_flush_time += packet_time;
 		}
 
+		update_packet_delay(this, packet_time);
+
 		if (this->need_flush == NEED_FLUSH_FRAGMENT) {
 			reset_buffer(this);
 			this->fragment = true;
@@ -992,7 +1045,7 @@
 	max_err = iso_io->duration;
 
 	if (iso_io->resync && err >= 0) {
-		unsigned int req = err * port->current_format.info.raw.rate / SPA_NSEC_PER_SEC;
+		unsigned int req = (unsigned int)(err * port->current_format.info.raw.rate / SPA_NSEC_PER_SEC);
 
 		if (req > 0) {
 			spa_bt_rate_control_init(&port->ratectl, 0);
@@ -1000,7 +1053,7 @@
 		}
 		spa_log_debug(this->log, "%p: ISO sync skip frames:%u", this, req);
 	} else if (iso_io->resync && -err >= 0) {
-		unsigned int req = -err * port->current_format.info.raw.rate / SPA_NSEC_PER_SEC;
+		unsigned int req = (unsigned int)(-err * port->current_format.info.raw.rate / SPA_NSEC_PER_SEC);
 		static const uint8_t empty8192 = {0};
 
 		if (req > 0) {
@@ -1035,9 +1088,18 @@
 {
 	struct impl *this = source->data;
 
+	if (source->rmask & SPA_IO_ERR) {
+		/* TX timestamp info? */
+		if (this->transport && this->transport->iso_io)
+			if (spa_bt_iso_io_recv_errqueue(this->transport->iso_io) == 0)
+				return;
+
+		/* Otherwise: actual error */
+	}
+
 	spa_log_trace(this->log, "%p: flush event", this);
 
-	if (source->rmask & (SPA_IO_ERR | SPA_IO_HUP)) {
+	if (source->rmask & (SPA_IO_HUP | SPA_IO_ERR)) {
 		spa_log_warn(this->log, "%p: error %d", this, source->rmask);
 		if (this->flush_source.loop)
 			spa_loop_remove_source(this->data_loop, &this->flush_source);
@@ -1083,7 +1145,7 @@
 	uint32_t rate;
 	struct spa_io_buffers *io = port->io;
 	uint64_t prev_time, now_time;
-	int res;
+	int status, res;
 
 	if (this->started) {
 		if ((res = spa_system_timerfd_read(this->data_system, this->timerfd, &exp)) < 0) {
@@ -1110,31 +1172,24 @@
 
 	setup_matching(this);
 
-	this->next_time = now_time + duration * SPA_NSEC_PER_SEC / rate * port->ratectl.corr;
+	this->next_time = (uint64_t)(now_time + duration * SPA_NSEC_PER_SEC / rate * port->ratectl.corr);
 
 	if (SPA_LIKELY(this->clock)) {
-		int64_t delay_nsec = 0;
-
 		this->clock->nsec = now_time;
 		this->clock->rate = this->clock->target_rate;
 		this->clock->position += this->clock->duration;
 		this->clock->duration = duration;
 		this->clock->rate_diff = 1 / port->ratectl.corr;
 		this->clock->next_nsec = this->next_time;
-
-		if (this->transport)
-			delay_nsec = spa_bt_transport_get_delay_nsec(this->transport);
-
-		/* Negative delay doesn't work properly, so disallow it */
-		delay_nsec += SPA_CLAMP(this->props.latency_offset, -delay_nsec, INT64_MAX / 2);
-
-		this->clock->delay = (delay_nsec * this->clock->rate.denom) / SPA_NSEC_PER_SEC;
+		this->clock->delay = 0;
 	}
 
+	status = this->transport_started ? SPA_STATUS_NEED_DATA : SPA_STATUS_HAVE_DATA;
 
-	spa_log_trace(this->log, "%p: %d", this, io->status);
-	io->status = SPA_STATUS_NEED_DATA;
-	spa_node_call_ready(&this->callbacks, SPA_STATUS_NEED_DATA);
+	spa_log_trace(this->log, "%p: %d -> %d", this, io->status, status);
+	io->status = status;
+	io->buffer_id = SPA_ID_INVALID;
+	spa_node_call_ready(&this->callbacks, status);
 
 	set_timeout(this, this->next_time);
 }
@@ -1184,8 +1239,11 @@
 				&port->current_format,
 				this->codec_props,
 				this->transport->write_mtu);
-		if (this->codec_data == NULL)
+		if (this->codec_data == NULL) {
+			spa_log_error(this->log, "%p: codec %s initialization failed", this,
+					this->codec->description);
 			return -EIO;
+		}
 	} else {
 		this->own_codec_data = false;
 		this->codec_data = this->transport->iso_io->codec_data;
@@ -1231,6 +1289,8 @@
 
 	spa_bt_rate_control_init(&port->ratectl, 0);
 
+	this->update_delay_event = spa_loop_utils_add_event(this->loop_utils, update_delay_event, this);
+
 	if (!this->transport->iso_io) {
 		this->flush_timer_source.data = this;
 		this->flush_timer_source.fd = this->flush_timerfd;
@@ -1279,6 +1339,8 @@
 		return res;
 	}
 
+	this->packet_delay_ns = 0;
+
 	this->source.data = this;
 	this->source.fd = this->timerfd;
 	this->source.func = media_on_timeout;
@@ -1307,6 +1369,12 @@
 	if (this->source.loop)
 		spa_loop_remove_source(this->data_loop, &this->source);
 	set_timeout(this, 0);
+
+	if (this->update_delay_event) {
+		spa_loop_utils_destroy_source(this->loop_utils, this->update_delay_event);
+		this->update_delay_event = NULL;
+	}
+
 	return 0;
 }
 
@@ -1323,7 +1391,6 @@
 
 	if (this->flush_source.loop)
 		spa_loop_remove_source(this->data_loop, &this->flush_source);
-
 	if (this->flush_timer_source.loop)
 		spa_loop_remove_source(this->data_loop, &this->flush_timer_source);
 	enable_flush_timer(this, false);
@@ -1331,6 +1398,9 @@
 	if (this->transport->iso_io)
 		spa_bt_iso_io_set_cb(this->transport->iso_io, NULL, NULL);
 
+	/* Drop queued data */
+	drop_frames(this, UINT32_MAX);
+
 	return 0;
 }
 
@@ -1409,12 +1479,12 @@
 	char *node_group = NULL;
 
 	if (this->transport && (this->transport->profile & SPA_BT_PROFILE_BAP_SINK)) {
-		spa_scnprintf(node_group_buf, sizeof(node_group_buf), "bluez-iso-%s-cig-%d",
+		spa_scnprintf(node_group_buf, sizeof(node_group_buf), "\"bluez-iso-%s-cig-%d\"",
 				this->transport->device->adapter->address,
 				this->transport->bap_cig);
 		node_group = node_group_buf;
 	} else if (this->transport && (this->transport->profile & SPA_BT_PROFILE_BAP_BROADCAST_SINK)) {
-		spa_scnprintf(node_group_buf, sizeof(node_group_buf), "bluez-iso-%s-big-%d",
+		spa_scnprintf(node_group_buf, sizeof(node_group_buf), "\"bluez-iso-%s-big-%d\"",
 				this->transport->device->adapter->address,
 				this->transport->bap_big);
 		node_group = node_group_buf;
@@ -1708,6 +1778,8 @@
 		port->have_format = true;
 	}
 
+	set_latency(this, false);
+
 	port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
 	if (port->have_format) {
 		port->info.change_mask |= SPA_PORT_CHANGE_MASK_RATE;
@@ -1847,8 +1919,13 @@
 		return SPA_STATUS_HAVE_DATA;
 	}
 
-	if (!this->started || !this->transport_started)
-		return SPA_STATUS_OK;
+	if (!this->started || !this->transport_started) {
+		if (io->status != SPA_STATUS_HAVE_DATA) {
+			io->status = SPA_STATUS_HAVE_DATA;
+			io->buffer_id = SPA_ID_INVALID;
+		}
+		return SPA_STATUS_HAVE_DATA;
+	}
 
 	if (io->status == SPA_STATUS_HAVE_DATA && io->buffer_id < port->n_buffers) {
 		struct buffer *b = &port->buffersio->buffer_id;
@@ -2058,6 +2135,7 @@
 	this->log = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_Log);
 	this->data_loop = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_DataLoop);
 	this->data_system = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_DataSystem);
+	this->loop_utils = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_LoopUtils);
 
 	spa_log_topic_init(this->log, &log_topic);
 
@@ -2069,6 +2147,10 @@
 		spa_log_error(this->log, "a data system is needed");
 		return -EINVAL;
 	}
+	if (this->loop_utils == NULL) {
+		spa_log_error(this->log, "loop utils are needed");
+		return -EINVAL;
+	}
 
 	this->node.iface = SPA_INTERFACE_INIT(
 			SPA_TYPE_INTERFACE_Node,
@@ -2105,8 +2187,6 @@
 	port->info.n_params = N_PORT_PARAMS;
 
 	port->latency = SPA_LATENCY_INFO(SPA_DIRECTION_INPUT);
-	port->latency.min_quantum = 1.0f;
-	port->latency.max_quantum = 1.0f;
 
 	spa_list_init(&port->ready);

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/media-source.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/media-source.c Changed

@@ -35,8 +35,9 @@
 #include "defs.h"
 #include "rtp.h"
 #include "media-codecs.h"
+#include "iso-io.h"
 
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.source.media");
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.source.media");
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
 
@@ -147,6 +148,8 @@
 	uint8_t buffer_read4096;
 	struct timespec now;
 	uint64_t sample_count;
+
+	uint32_t errqueue_count;
 };
 
 #define CHECK_PORT(this,d,p)    ((d) == SPA_DIRECTION_OUTPUT && (p) == 0)
@@ -454,6 +457,24 @@
 	return dst_size - avail;
 }
 
+static void handle_errqueue(struct impl *this)
+{
+	int res;
+
+	/* iso-io/media-sink use these for TX latency.
+	 * Someone else should be reading them, so drop
+	 * only after yielding.
+	 */
+	if (this->errqueue_count < 4) {
+		this->errqueue_count++;
+		return;
+	}
+
+	this->errqueue_count = 0;
+	res = recv(this->fd, NULL, 0, MSG_ERRQUEUE | MSG_TRUNC);
+	spa_log_trace(this->log, "%p: ignoring errqueue data (%d)", this, res);
+}
+
 static void media_on_ready_read(struct spa_source *source)
 {
 	struct impl *this = source->data;
@@ -466,6 +487,11 @@
 
 	/* make sure the source is an input */
 	if ((source->rmask & SPA_IO_IN) == 0) {
+		if (source->rmask & SPA_IO_ERR) {
+			handle_errqueue(this);
+			return;
+		}
+
 		spa_log_error(this->log, "source is not an input, rmask=%d", source->rmask);
 		goto stop;
 	}
@@ -474,6 +500,8 @@
 		goto stop;
 	}
 
+	this->errqueue_count = 0;
+
 	spa_log_trace(this->log, "socket poll");
 
 	/* read */
@@ -526,6 +554,8 @@
 stop:
 	if (this->source.loop)
 		spa_loop_remove_source(this->data_loop, &this->source);
+	if (this->transport && this->transport->iso_io)
+		spa_bt_iso_io_set_cb(this->transport->iso_io, NULL, NULL);
 }
 
 static int setup_matching(struct impl *this)
@@ -590,7 +620,7 @@
 
 	setup_matching(this);
 
-	this->next_time = now_time + duration * SPA_NSEC_PER_SEC / port->buffer.corr / rate;
+	this->next_time = (uint64_t)(now_time + duration * SPA_NSEC_PER_SEC / port->buffer.corr / rate);
 
 	if (SPA_LIKELY(this->clock)) {
 		this->clock->nsec = now_time;
@@ -612,6 +642,21 @@
 	set_timeout(this, this->next_time);
 }
 
+static void media_iso_pull(struct spa_bt_iso_io *iso_io)
+{
+	/* TODO: eventually use iso-io here, currently this is used just to indicate to
+	 * iso-io whether this source is running or not. */
+}
+
+static int do_start_iso_io(struct spa_loop *loop, bool async, uint32_t seq,
+		const void *data, size_t size, void *user_data)
+{
+	struct impl *this = user_data;
+
+	spa_bt_iso_io_set_cb(this->transport->iso_io, media_iso_pull, this);
+	return 0;
+}
+
 static int transport_start(struct impl *this)
 {
 	int res, val;
@@ -669,6 +714,9 @@
 				port->current_format.info.raw.rate * 80 / 1000);
 	}
 
+	this->sample_count = 0;
+	this->errqueue_count = 0;
+
 	this->source.data = this;
 
 	this->source.fd = this->fd;
@@ -679,7 +727,8 @@
 		spa_log_error(this->log, "%p: failed to add poll source: %s", this,
 				spa_strerror(res));
 
-	this->sample_count = 0;
+	if (this->transport->iso_io)
+		spa_loop_invoke(this->data_loop, do_start_iso_io, 0, NULL, 0, true, this);
 
 	this->transport_started = true;
 
@@ -737,6 +786,8 @@
 
 	if (this->timer_source.loop)
 		spa_loop_remove_source(this->data_loop, &this->timer_source);
+	if (this->transport && this->transport->iso_io)
+		spa_bt_iso_io_set_cb(this->transport->iso_io, NULL, NULL);
 	set_timeout(this, 0);
 
 	return 0;
@@ -757,6 +808,8 @@
 
 	if (this->source.loop)
 		spa_loop_remove_source(this->data_loop, &this->source);
+	if (this->transport->iso_io)
+		spa_bt_iso_io_set_cb(this->transport->iso_io, NULL, NULL);
 
 	return 0;
 }

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/meson.build -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/meson.build Changed

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/midi-enum.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/midi-enum.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/midi-node.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/midi-node.c Changed

@@ -41,7 +41,7 @@
 
 #include "bluez5-interface-gen.h"
 
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.midi.node");
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.midi.node");
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
 
@@ -598,7 +598,7 @@
 				-SPA_CLAMP(err_nsec, -20*SPA_NSEC_PER_MSEC, 20*SPA_NSEC_PER_MSEC)
 				* this->rate / SPA_NSEC_PER_SEC);
 		tcorr = SPA_MIN(device_elapsed, SPA_NSEC_PER_SEC) * (corr - 1);
-		sync->device_time += tcorr;
+		sync->device_time += (uint64_t)tcorr;
 
 		/* reset if too much off */
 		if (err_nsec < -50 * SPA_NSEC_PER_MSEC ||
@@ -2011,11 +2011,13 @@
 			SPA_DICT_ITEM_INIT(SPA_KEY_FORMAT_DSP, "8 bit raw midi"),
 			SPA_DICT_ITEM_INIT(SPA_KEY_PORT_NAME, "in"),
 			SPA_DICT_ITEM_INIT(SPA_KEY_PORT_ALIAS, "in"),
+			SPA_DICT_ITEM_INIT(SPA_KEY_PORT_GROUP, "group.0"),
 		};
 		static const struct spa_dict_item out_port_items = {
 			SPA_DICT_ITEM_INIT(SPA_KEY_FORMAT_DSP, "8 bit raw midi"),
 			SPA_DICT_ITEM_INIT(SPA_KEY_PORT_NAME, "out"),
 			SPA_DICT_ITEM_INIT(SPA_KEY_PORT_ALIAS, "out"),
+			SPA_DICT_ITEM_INIT(SPA_KEY_PORT_GROUP, "group.0"),
 		};
 		static const struct spa_dict in_port_props = SPA_DICT_INIT_ARRAY(in_port_items);
 		static const struct spa_dict out_port_props = SPA_DICT_INIT_ARRAY(out_port_items);

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/midi-server.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/midi-server.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/modemmanager.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/modemmanager.c Changed

@@ -4,10 +4,10 @@
 
 #include <errno.h>
 #include <spa/utils/string.h>
+#include <spa-private/dbus-helpers.h>
 
 #include <ModemManager.h>
 
-#include "dbus-helpers.h"
 #include "modemmanager.h"
 
 #define DBUS_INTERFACE_OBJECTMANAGER "org.freedesktop.DBus.ObjectManager"
@@ -570,7 +570,7 @@
 		const char *path;
 		struct call *call_object;
 		const char *mm_call_interface = MM_DBUS_INTERFACE_CALL;
-		spa_autoptr(DBusMessage) m = NULL;
+		spa_autoptr(DBusMessage) m2 = NULL;
 
 		if (!spa_streq(this->modem.path, dbus_message_get_path(m)))
 			goto finish;
@@ -590,12 +590,12 @@
 		call_object->path = strdup(path);
 		spa_list_append(&this->call_list, &call_object->link);
 
-		m = dbus_message_new_method_call(MM_DBUS_SERVICE, path, DBUS_INTERFACE_PROPERTIES, "GetAll");
-		if (m == NULL)
+		m2 = dbus_message_new_method_call(MM_DBUS_SERVICE, path, DBUS_INTERFACE_PROPERTIES, "GetAll");
+		if (m2 == NULL)
 			goto finish;
-		dbus_message_append_args(m, DBUS_TYPE_STRING, &mm_call_interface, DBUS_TYPE_INVALID);
+		dbus_message_append_args(m2, DBUS_TYPE_STRING, &mm_call_interface, DBUS_TYPE_INVALID);
 
-		call_object->pending = send_with_reply(this->conn, m, mm_get_call_properties_reply, call_object);
+		call_object->pending = send_with_reply(this->conn, m2, mm_get_call_properties_reply, call_object);
 		if (!call_object->pending) {
 			spa_log_error(this->log, "dbus call failure");
 			goto finish;

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/player.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/player.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/plugin.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/plugin.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/quirks.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/quirks.c Changed

@@ -36,10 +36,11 @@
 #include <spa/utils/result.h>
 #include <spa/utils/json.h>
 #include <spa/utils/string.h>
+#include <spa/debug/log.h>
 
 #include "defs.h"
 
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.quirks");
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.quirks");
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
 
@@ -159,6 +160,7 @@
 	struct spa_json data = SPA_JSON_INIT(str, len);
 	struct spa_json rules;
 	char key1024;
+	struct spa_error_location loc;
 
 	if (spa_json_enter_object(&data, &rules) <= 0)
 		spa_json_init(&rules, str, len);
@@ -182,6 +184,10 @@
 		else if (spa_streq(key, "bluez5.features.device") && !this->device_rules)
 			this->device_rules = strndup(value, sz);
 	}
+
+	if (spa_json_get_error(&rules, str, &loc))
+		spa_debug_log_error_location(this->log, SPA_LOG_LEVEL_ERROR, &loc,
+				"spa.bluez5 quirks syntax error: %s", loc.reason);
 }
 
 static int load_conf(struct spa_bt_quirks *this, const char *path)
@@ -211,7 +217,7 @@
 	const char *str;
 
 	if (!info) {
-		errno = -EINVAL;
+		errno = EINVAL;
 		return NULL;
 	}

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/rate-control.h -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/rate-control.h Changed

@@ -7,6 +7,67 @@
 
 #include <spa/utils/defs.h>
 
+/** Windowed min/max */
+struct spa_bt_ptp
+{
+	union {
+		int32_t min;
+		int32_t mins4;
+	};
+	union {
+		int32_t max;
+		int32_t maxs4;
+	};
+	uint32_t pos;
+	uint32_t left;
+	uint32_t period;
+};
+
+static inline void spa_bt_ptp_init(struct spa_bt_ptp *p, int32_t period, uint32_t min_duration)
+{
+	size_t i;
+
+	spa_zero(*p);
+	for (i = 0; i < SPA_N_ELEMENTS(p->mins); ++i) {
+		p->minsi = INT32_MAX;
+		p->maxsi = INT32_MIN;
+	}
+	p->left = min_duration;
+	p->period = period;
+}
+
+static inline void spa_bt_ptp_update(struct spa_bt_ptp *p, int32_t value, uint32_t duration)
+{
+	const size_t n = SPA_N_ELEMENTS(p->mins);
+	size_t i;
+
+	for (i = 0; i < n; ++i) {
+		p->minsi = SPA_MIN(p->minsi, value);
+		p->maxsi = SPA_MAX(p->maxsi, value);
+	}
+
+	p->pos += duration;
+	if (p->pos >= p->period / (n - 1)) {
+		p->pos = 0;
+		for (i = 1; i < SPA_N_ELEMENTS(p->mins); ++i) {
+			p->minsi-1 = p->minsi;
+			p->maxsi-1 = p->maxsi;
+		}
+		p->minsn-1 = INT32_MAX;
+		p->maxsn-1 = INT32_MIN;
+	}
+
+	if (p->left < duration)
+		p->left = 0;
+	else
+		p->left -= duration;
+}
+
+static inline bool spa_bt_ptp_valid(struct spa_bt_ptp *p)
+{
+	return p->left == 0;
+}
+
 /**
  * Rate controller.
  *
@@ -98,13 +159,13 @@
 	double corr;
 };
 
-static void spa_bt_rate_control_init(struct spa_bt_rate_control *this, double level)
+static inline void spa_bt_rate_control_init(struct spa_bt_rate_control *this, double level)
 {
 	this->avg = level;
 	this->corr = 1.0;
 }
 
-static double spa_bt_rate_control_update(struct spa_bt_rate_control *this, double level,
+static inline double spa_bt_rate_control_update(struct spa_bt_rate_control *this, double level,
 		double target, double duration, double period, double rate_diff_max)
 {
 	/*

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/sco-io.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/sco-io.c Changed

@@ -30,6 +30,10 @@
 
 #include "defs.h"
 
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.sco-io");
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+
 
 /* We'll use the read rx data size to find the correct packet size for writing,
  * since kernel might not report it as the socket MTU, see
@@ -54,6 +58,7 @@
 	uint16_t read_mtu;
 	uint16_t write_mtu;
 
+	struct spa_log *log;
 	struct spa_loop *data_loop;
 	struct spa_source source;
 
@@ -103,6 +108,9 @@
 			goto stop;
 		}
 
+		if (res != (int)io->read_size)
+			spa_log_trace(io->log, "%p: packet size:%d", io, res);
+
 		io->read_size = res;
 
 		if (io->source_cb) {
@@ -185,23 +193,42 @@
 }
 
 
-struct spa_bt_sco_io *spa_bt_sco_io_create(struct spa_loop *data_loop,
-                                           int fd,
-                                           uint16_t read_mtu,
-                                           uint16_t write_mtu)
+struct spa_bt_sco_io *spa_bt_sco_io_create(struct spa_bt_transport *transport, struct spa_loop *data_loop, struct spa_log *log)
 {
 	struct spa_bt_sco_io *io;
 
+	spa_log_topic_init(log, &log_topic);
+
 	io = calloc(1, sizeof(struct spa_bt_sco_io));
 	if (io == NULL)
 		return io;
 
-	io->fd = fd;
-	io->read_mtu = read_mtu;
-	io->write_mtu = write_mtu;
+	io->fd = transport->fd;
+	io->read_mtu = transport->read_mtu;
+	io->write_mtu = transport->write_mtu;
 	io->data_loop = data_loop;
+	io->log = log;
+
+	if (transport->device->adapter->bus_type == BUS_TYPE_USB) {
+		/* For USB we need to wait for RX to know it. Using wrong size doesn't
+		 * work anyway, and may result to errors printed to dmesg if too big.
+		 */
+		io->read_size = 0;
+	} else {
+		/* Set some sensible initial packet size */
+		switch (transport->codec) {
+		case HFP_AUDIO_CODEC_CVSD:
+			io->read_size = 48;  /* 3ms S16_LE 8000 Hz */
+			break;
+		case HFP_AUDIO_CODEC_MSBC:
+		case HFP_AUDIO_CODEC_LC3_SWB:
+		default:
+			io->read_size = HFP_CODEC_PACKET_SIZE;
+			break;
+		}
+	}
 
-	io->read_size = 0;
+	spa_log_debug(io->log, "%p: initial packet size:%d", io, io->read_size);
 
 	/* Add the ready callback */
 	io->source.data = io;

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/sco-sink.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/sco-sink.c Changed

@@ -33,18 +33,26 @@
 
 #include "defs.h"
 
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.sink.sco");
+#ifdef HAVE_LC3
+#include <lc3.h>
+#endif
+
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.sink.sco");
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
 
 #define DEFAULT_CLOCK_NAME	"clock.system.monotonic"
 
 struct props {
+	int64_t latency_offset;
 	char clock_name64;
 };
 
 #define MAX_BUFFERS 32
 
+#define ALT1_PACKET_SIZE	24
+#define ALT6_PACKET_SIZE	60
+
 struct buffer {
 	uint32_t id;
 	unsigned int outstanding:1;
@@ -121,6 +129,8 @@
 	unsigned int following:1;
 	unsigned int flush_pending:1;
 
+	unsigned int is_internal:1;
+
 	/* Sources */
 	struct spa_source source;
 	struct spa_source flush_timer_source;
@@ -134,16 +144,26 @@
 	uint64_t current_time;
 	uint64_t next_time;
 	uint64_t process_time;
+
 	uint64_t prev_flush_time;
 	uint64_t next_flush_time;
 
-	/* mSBC */
-	sbc_t msbc;
+	/* Codecs */
 	uint8_t *buffer;
 	uint8_t *buffer_head;
 	uint8_t *buffer_next;
 	int buffer_size;
-	int msbc_seq;
+	int h2_seq;
+
+	/* mSBC */
+	sbc_t msbc;
+
+	/* LC3 */
+#ifdef HAVE_LC3
+	lc3_encoder_t lc3;
+#else
+	void *lc3;
+#endif
 };
 
 #define CHECK_PORT(this,d,p)	((d) == SPA_DIRECTION_INPUT && (p) == 0)
@@ -152,6 +172,7 @@
 
 static void reset_props(struct props *props)
 {
+	props->latency_offset = 0;
 	strncpy(props->clock_name, DEFAULT_CLOCK_NAME, sizeof(props->clock_name));
 }
 
@@ -180,6 +201,13 @@
 	case SPA_PARAM_PropInfo:
 	{
 		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_latencyOffsetNsec),
+				SPA_PROP_INFO_description, SPA_POD_String("Latency offset (ns)"),
+				SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Long(0LL, INT64_MIN, INT64_MAX));
+			break;
 		default:
 			return 0;
 		}
@@ -187,10 +215,13 @@
 	}
 	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_TYPE_OBJECT_Props, id,
+				SPA_PROP_latencyOffsetNsec, SPA_POD_Long(p->latency_offset));
 			break;
 		default:
 			return 0;
@@ -284,6 +315,53 @@
 
 static void emit_node_info(struct impl *this, bool full);
 
+static void emit_port_info(struct impl *this, struct port *port, bool full);
+
+static void set_latency(struct impl *this, bool emit_latency)
+{
+	struct port *port = &this->port;
+	int64_t delay;
+
+	if (this->transport == NULL)
+		return;
+
+	/*
+	 * We start flushing data immediately, so the delay is:
+	 *
+	 * (transport delay) + (packet delay) + (codec internal delay) + (latency offset)
+	 *
+	 * and doesn't depend on the quantum. The codec internal delay is neglected.
+	 * Kernel knows the latency due to socket/controller queue, but doesn't
+	 * tell us, so not included but hopefully in < 20 ms range.
+	 */
+
+	switch (this->transport->codec) {
+	case HFP_AUDIO_CODEC_MSBC:
+	case HFP_AUDIO_CODEC_LC3_SWB:
+		delay = 7500 * SPA_NSEC_PER_USEC;
+		break;
+	default:
+		delay = this->transport->write_mtu / (2 * 8000);
+		break;
+	}
+
+	delay += spa_bt_transport_get_delay_nsec(this->transport);
+	delay += SPA_CLAMP(this->props.latency_offset, -delay, INT64_MAX / 2);
+	delay = SPA_MAX(delay, 0);
+
+	spa_log_info(this->log, "%p: total latency:%d ms", this, (int)(delay / SPA_NSEC_PER_MSEC));
+
+	port->latency.min_ns = port->latency.max_ns = delay;
+	port->latency.min_rate = port->latency.max_rate = 0;
+	port->latency.min_quantum = port->latency.max_quantum = 0.0f;
+
+	if (emit_latency) {
+		port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
+		port->paramsIDX_Latency.flags ^= SPA_PARAM_INFO_SERIAL;
+		emit_port_info(this, port, false);
+	}
+}
+
 static int apply_props(struct impl *this, const struct spa_pod *param)
 {
 	struct props new_props = this->props;
@@ -293,11 +371,16 @@
 		reset_props(&new_props);
 	} else {
 		spa_pod_parse_object(param,
-				SPA_TYPE_OBJECT_Props, NULL);
+				SPA_TYPE_OBJECT_Props, NULL,
+				SPA_PROP_latencyOffsetNsec, SPA_POD_OPT_Long(&new_props.latency_offset));
 	}
 
 	changed = (memcmp(&new_props, &this->props, sizeof(struct props)) != 0);
 	this->props = new_props;
+
+	if (changed)
+		set_latency(this, true);
+
 	return changed;
 }
 
@@ -362,6 +445,28 @@
 	return bytes / port->frame_size;
 }
 
+static int lc3_encode_frame(struct impl *this, const void *src, size_t src_size, void *dst, size_t dst_size,
+		ssize_t *dst_out)
+{
+#ifdef HAVE_LC3
+	int res;
+
+	if (src_size < LC3_SWB_DECODED_SIZE)
+		return -EINVAL;
+	if (dst_size < LC3_SWB_PAYLOAD_SIZE)
+		return -EINVAL;
+
+	res = lc3_encode(this->lc3, LC3_PCM_FORMAT_S24, src, 1, LC3_SWB_PAYLOAD_SIZE, dst);
+	if (res != 0)
+		return -EINVAL;
+
+	*dst_out = LC3_SWB_PAYLOAD_SIZE;
+	return LC3_SWB_DECODED_SIZE;
+#else
+	return -EOPNOTSUPP;
+#endif
+}
+
 static int flush_data(struct impl *this)
 {
 	struct port *port = &this->port;
@@ -373,12 +478,9 @@
 	if (this->transport == NULL || this->transport->sco_io == NULL || !this->flush_timer_source.loop)
 		return -EIO;
 
-	const uint32_t min_in_size =
-		(this->transport->codec == HFP_AUDIO_CODEC_MSBC) ?
-		MSBC_DECODED_SIZE : this->transport->write_mtu;
-	uint8_t * const packet =
-		(this->transport->codec == HFP_AUDIO_CODEC_MSBC) ?
-		this->buffer_head : port->write_buffer;
+	const uint32_t min_in_size = (this->transport->codec == HFP_AUDIO_CODEC_MSBC) ? MSBC_DECODED_SIZE :
+		(this->transport->codec == HFP_AUDIO_CODEC_LC3_SWB) ? LC3_SWB_DECODED_SIZE :
+		this->transport->write_mtu;
 	const uint32_t packet_samples = min_in_size / port->frame_size;
 	const uint64_t packet_time = (uint64_t)packet_samples * SPA_NSEC_PER_SEC
 		/ port->current_format.info.raw.rate;
@@ -433,30 +535,40 @@
 		return 0;
 	}
 
-	if (this->transport->codec == HFP_AUDIO_CODEC_MSBC) {
+	if (this->transport->codec == HFP_AUDIO_CODEC_MSBC ||
+			this->transport->codec == HFP_AUDIO_CODEC_LC3_SWB) {
 		ssize_t out_encoded;
-
 		/* Encode */
-		if (this->buffer_next + MSBC_ENCODED_SIZE > this->buffer + this->buffer_size) {
+		if (this->buffer_next + HFP_CODEC_PACKET_SIZE > this->buffer + this->buffer_size) {
 			/* Buffer overrun; shouldn't usually happen. Drop data and reset. */
 			this->buffer_head = this->buffer_next = this->buffer;
-			spa_log_warn(this->log, "sco-sink: mSBC buffer overrun, dropping data");
+			spa_log_warn(this->log, "sco-sink: mSBC/LC3 buffer overrun, dropping data");
 		}
+
+		/* H2 sync header */
 		this->buffer_next0 = 0x01;
-		this->buffer_next1 = sntablethis->msbc_seq % 4;
+		this->buffer_next1 = sntablethis->h2_seq % 4;
 		this->buffer_next59 = 0x00;
-		this->msbc_seq = (this->msbc_seq + 1) % 4;
-		processed = sbc_encode(&this->msbc, port->write_buffer, port->write_buffer_size,
-				this->buffer_next + 2, MSBC_ENCODED_SIZE - 3, &out_encoded);
+		this->h2_seq = (this->h2_seq + 1) % 4;
+
+		if (this->transport->codec == HFP_AUDIO_CODEC_MSBC) {
+			processed = sbc_encode(&this->msbc, port->write_buffer, port->write_buffer_size,
+					this->buffer_next + 2, HFP_CODEC_PACKET_SIZE - 3, &out_encoded);
+			out_encoded += 1; /* pad */
+		} else {
+			processed = lc3_encode_frame(this, port->write_buffer, port->write_buffer_size,
+					this->buffer_next + 2, HFP_CODEC_PACKET_SIZE - 2, &out_encoded);
+		}
+
 		if (processed < 0) {
-			spa_log_warn(this->log, "sbc_encode failed: %d", processed);
+			spa_log_warn(this->log, "encode failed: %d", processed);
 			return -EINVAL;
 		}
-		this->buffer_next += out_encoded + 3;
+		this->buffer_next += out_encoded + 2;
 		port->write_buffer_size = 0;
 
 		/* Write */
-		written = spa_bt_sco_io_write(this->transport->sco_io, packet,
+		written = spa_bt_sco_io_write(this->transport->sco_io, this->buffer_head,
 				this->buffer_next - this->buffer_head);
 		if (written < 0) {
 			spa_log_warn(this->log, "failed to write data: %d (%s)",
@@ -468,9 +580,9 @@
 
 		if (this->buffer_head == this->buffer_next)
 			this->buffer_head = this->buffer_next = this->buffer;
-		else if (this->buffer_next + MSBC_ENCODED_SIZE > this->buffer + this->buffer_size) {
+		else if (this->buffer_next + HFP_CODEC_PACKET_SIZE > this->buffer + this->buffer_size) {
 			/* Written bytes is not necessarily commensurate
-			 * with MSBC_ENCODED_SIZE. If this occurs, copy data.
+			 * with HFP_CODEC_PACKET_SIZE. If this occurs, copy data.
 			 */
 			int size = this->buffer_next - this->buffer_head;
 			spa_memmove(this->buffer, this->buffer_head, size);
@@ -478,7 +590,7 @@
 			this->buffer_head = this->buffer;
 		}
 	} else {
-		written = spa_bt_sco_io_write(this->transport->sco_io, packet,
+		written = spa_bt_sco_io_write(this->transport->sco_io, port->write_buffer,
 				port->write_buffer_size);
 		if (written < 0) {
 			spa_log_warn(this->log, "sco-sink: write failure: %d (%s)",
@@ -586,7 +698,7 @@
 	uint32_t rate;
 	struct spa_io_buffers *io = port->io;
 	uint64_t prev_time, now_time;
-	int res;
+	int status, res;
 
 	if (this->started) {
 		if ((res = spa_system_timerfd_read(this->data_system, this->timerfd, &exp)) < 0) {
@@ -622,9 +734,12 @@
 		this->clock->delay = 0;
 	}
 
-	spa_log_trace(this->log, "%p: %d", this, io->status);
-	io->status = SPA_STATUS_NEED_DATA;
-	spa_node_call_ready(&this->callbacks, SPA_STATUS_NEED_DATA);
+	status = this->transport_started ? SPA_STATUS_NEED_DATA : SPA_STATUS_HAVE_DATA;
+
+	spa_log_trace(this->log, "%p: %d -> %d", this, io->status, status);
+	io->status = status;
+	io->buffer_id = SPA_ID_INVALID;
+	spa_node_call_ready(&this->callbacks, status);
 
 	set_timeout(this, this->next_time);
 }
@@ -660,7 +775,7 @@
 
 	spa_log_debug(this->log, "%p: start transport", this);
 
-	/* Init mSBC if needed */
+	/* Init mSBC/LC3 if needed */
 	if (this->transport->codec == HFP_AUDIO_CODEC_MSBC) {
 		res = sbc_init_msbc(&this->msbc, 0);
 		if (res < 0)
@@ -674,7 +789,26 @@
 		 * commensurate, we may end up doing memmoves, but nothing worse
 		 * is going to happen.
 		 */
-		this->buffer_size = lcm(24, lcm(60, lcm(this->transport->write_mtu, 2 * MSBC_ENCODED_SIZE)));
+		this->buffer_size = lcm(ALT1_PACKET_SIZE, lcm(ALT6_PACKET_SIZE, lcm(this->transport->write_mtu, 2 * HFP_CODEC_PACKET_SIZE)));
+	} else if (this->transport->codec == HFP_AUDIO_CODEC_LC3_SWB) {
+#ifdef HAVE_LC3
+		this->lc3 = lc3_setup_encoder(7500, 32000, 0,
+				calloc(1, lc3_encoder_size(7500, 32000)));
+		if (!this->lc3)
+			return -EINVAL;
+
+		spa_assert(lc3_frame_samples(7500, 32000) * this->port.frame_size == LC3_SWB_DECODED_SIZE);
+
+		this->buffer_size = lcm(ALT1_PACKET_SIZE, lcm(ALT6_PACKET_SIZE, lcm(this->transport->write_mtu, 2 * HFP_CODEC_PACKET_SIZE)));
+#else
+		res = -EOPNOTSUPP;
+		goto fail;
+#endif
+	} else {
+		this->buffer_size = 0;
+	}
+
+	if (this->buffer_size) {
 		this->buffer = calloc(this->buffer_size, sizeof(uint8_t));
 		this->buffer_head = this->buffer_next = this->buffer;
 		if (this->buffer == NULL) {
@@ -685,6 +819,9 @@
 
 	spa_return_val_if_fail(this->transport->write_mtu <= sizeof(this->port.write_buffer), -EINVAL);
 
+	spa_log_info(this->log, "%p: using codec %d, delay:%"PRIi64" ms", this, this->transport->codec,
+			(int64_t)(spa_bt_transport_get_delay_nsec(this->transport) / SPA_NSEC_PER_MSEC));
+
 	/* start socket i/o */
 	if ((res = spa_bt_transport_ensure_sco_io(this->transport, this->data_loop)) < 0)
 		goto fail;
@@ -708,6 +845,8 @@
 	free(this->buffer);
 	this->buffer = NULL;
 	sbc_finish(&this->msbc);
+	free(this->lc3);
+	this->lc3 = NULL;
 	return res;
 }
 
@@ -802,7 +941,7 @@
 		spa_loop_remove_source(this->data_loop, &this->flush_timer_source);
 	enable_flush_timer(this, false);
 
-	/* Drop buffered data in the ready queue. Ideally there shouldn't be any. */
+	/* Drop queued data */
 	drop_port_output(this);
 
 	return 0;
@@ -824,6 +963,8 @@
 	}
 
 	sbc_finish(&this->msbc);
+	free(this->lc3);
+	this->lc3 = NULL;
 }
 
 static int do_stop(struct impl *this)
@@ -884,9 +1025,9 @@
 
 static void emit_node_info(struct impl *this, bool full)
 {
-	static const struct spa_dict_item hu_node_info_items = {
+	const struct spa_dict_item hu_node_info_items = {
 		{ SPA_KEY_DEVICE_API, "bluez5" },
-		{ SPA_KEY_MEDIA_CLASS, "Audio/Sink" },
+		{ SPA_KEY_MEDIA_CLASS, this->is_internal ? "Audio/Sink/Internal" : "Audio/Sink" },
 		{ SPA_KEY_NODE_DRIVER, "true" },
 	};
 
@@ -1018,13 +1159,21 @@
 
 		/* set the info structure */
 		struct spa_audio_info_raw info = { 0, };
-		info.format = SPA_AUDIO_FORMAT_S16_LE;
+
+		if (this->transport->codec == HFP_AUDIO_CODEC_LC3_SWB)
+			info.format = SPA_AUDIO_FORMAT_S24_32_LE;
+		else
+			info.format = SPA_AUDIO_FORMAT_S16_LE;
 		info.channels = 1;
 		info.position0 = SPA_AUDIO_CHANNEL_MONO;
 
 		/* CVSD format has a rate of 8kHz
-		 * MSBC format has a rate of 16kHz */
-		if (this->transport->codec == HFP_AUDIO_CODEC_MSBC)
+		 * MSBC format has a rate of 16kHz
+		 * LC3-SWB format has a rate of 32kHz
+		 */
+		if (this->transport->codec == HFP_AUDIO_CODEC_LC3_SWB)
+			info.rate = 32000;
+		else if (this->transport->codec == HFP_AUDIO_CODEC_MSBC)
 			info.rate = 16000;
 		else
 			info.rate = 8000;
@@ -1140,6 +1289,9 @@
 	} else {
 		struct spa_audio_info info = { 0 };
 
+		if (!this->transport)
+			return -EIO;
+
 		if ((err = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
 			return err;
 
@@ -1150,16 +1302,31 @@
 		if (spa_format_audio_raw_parse(format, &info.info.raw) < 0)
 			return -EINVAL;
 
-		if (info.info.raw.format != SPA_AUDIO_FORMAT_S16_LE ||
-		    info.info.raw.rate == 0 ||
+		if (info.info.raw.rate == 0 ||
 		    info.info.raw.channels != 1)
 			return -EINVAL;
 
-		port->frame_size = info.info.raw.channels * 2;
+		switch (info.info.raw.format) {
+		case SPA_AUDIO_FORMAT_S16_LE:
+			if (this->transport->codec == HFP_AUDIO_CODEC_LC3_SWB)
+				return -EINVAL;
+			port->frame_size = info.info.raw.channels * 2;
+			break;
+		case SPA_AUDIO_FORMAT_S24_32_LE:
+			if (this->transport->codec != HFP_AUDIO_CODEC_LC3_SWB)
+				return -EINVAL;
+			port->frame_size = info.info.raw.channels * 4;
+			break;
+		default:
+			return -EINVAL;
+		}
+
 		port->current_format = info;
 		port->have_format = true;
 	}
 
+	set_latency(this, false);
+
 	port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
 	if (port->have_format) {
 		port->info.change_mask |= SPA_PORT_CHANGE_MASK_RATE;
@@ -1296,8 +1463,13 @@
 		return SPA_STATUS_HAVE_DATA;
 	}
 
-	if (!this->started || !this->transport_started)
-		return SPA_STATUS_OK;
+	if (!this->started || !this->transport_started) {
+		if (io->status != SPA_STATUS_HAVE_DATA) {
+			io->status = SPA_STATUS_HAVE_DATA;
+			io->buffer_id = SPA_ID_INVALID;
+		}
+		return SPA_STATUS_HAVE_DATA;
+	}
 
 	if (io->status == SPA_STATUS_HAVE_DATA && io->buffer_id < port->n_buffers) {
 		struct buffer *b = &port->buffersio->buffer_id;
@@ -1525,6 +1697,9 @@
 	if (info && (str = spa_dict_lookup(info, "clock.quantum-limit")))
 		spa_atou32(str, &this->quantum_limit, 0);
 
+	if (info && (str = spa_dict_lookup(info, "api.bluez5.internal")) != NULL)
+		this->is_internal = spa_atob(str);
+
 	if (info && (str = spa_dict_lookup(info, SPA_KEY_API_BLUEZ5_TRANSPORT)))
 		sscanf(str, "pointer:%p", &this->transport);
 
@@ -1532,6 +1707,9 @@
 		spa_log_error(this->log, "a transport is needed");
 		return -EINVAL;
 	}
+
+	set_latency(this, false);
+
 	spa_bt_transport_add_listener(this->transport,
 			&this->transport_listener, &transport_events, this);

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/sco-source.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/sco-source.c Changed

@@ -35,7 +35,11 @@
 
 #include "defs.h"
 
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.source.sco");
+#ifdef HAVE_LC3
+#include <lc3.h>
+#endif
+
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.source.sco");
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
 
@@ -120,6 +124,8 @@
 	unsigned int resampling:1;
 	unsigned int io_error:1;
 
+	unsigned int is_internal:1;
+
 	struct spa_source timer_source;
 	int timerfd;
 
@@ -129,14 +135,23 @@
 	uint64_t current_time;
 	uint64_t next_time;
 
+	/* Codecs */
+	bool h2_seq_initialized;
+	uint8_t h2_seq;
+
+	/* mSBC/LC3 frame parsing */
+	uint8_t recv_bufferHFP_CODEC_PACKET_SIZE;
+	uint8_t recv_buffer_pos;
+
 	/* mSBC */
 	sbc_t msbc;
-	bool msbc_seq_initialized;
-	uint8_t msbc_seq;
 
-	/* mSBC frame parsing */
-	uint8_t msbc_bufferMSBC_ENCODED_SIZE;
-	uint8_t msbc_buffer_pos;
+	/* LC3 */
+#ifdef HAVE_LC3
+	lc3_decoder_t lc3;
+#else
+	void *lc3;
+#endif
 
 	struct timespec now;
 };
@@ -343,51 +358,53 @@
 	}
 }
 
-/* Append data to msbc buffer, syncing buffer start to frame headers */
-static void msbc_buffer_append_byte(struct impl *this, uint8_t byte)
+/* Append data to recv buffer, syncing buffer start to headers */
+static void recv_buffer_append_byte(struct impl *this, uint8_t byte)
 {
-        /* Parse mSBC frame header */
-        if (this->msbc_buffer_pos == 0) {
+        /* Parse H2 sync header */
+        if (this->recv_buffer_pos == 0) {
                 if (byte != 0x01) {
-                        this->msbc_buffer_pos = 0;
+                        this->recv_buffer_pos = 0;
                         return;
                 }
-        }
-        else if (this->msbc_buffer_pos == 1) {
+        } else if (this->recv_buffer_pos == 1) {
                 if (!((byte & 0x0F) == 0x08 &&
                       ((byte >> 4) & 1) == ((byte >> 5) & 1) &&
                       ((byte >> 6) & 1) == ((byte >> 7) & 1))) {
-                        this->msbc_buffer_pos = 0;
+                        this->recv_buffer_pos = 0;
                         return;
                 }
-        }
-        else if (this->msbc_buffer_pos == 2) {
-                /* .. and beginning of MSBC frame: SYNCWORD + 2 nul bytes */
-                if (byte != 0xAD) {
-                        this->msbc_buffer_pos = 0;
-                        return;
-                }
-        }
-        else if (this->msbc_buffer_pos == 3) {
-                if (byte != 0x00) {
-                        this->msbc_buffer_pos = 0;
-                        return;
-                }
-        }
-        else if (this->msbc_buffer_pos == 4) {
-                if (byte != 0x00) {
-                        this->msbc_buffer_pos = 0;
-                        return;
+        } else if (this->transport->codec == HFP_AUDIO_CODEC_MSBC) {
+		/* Beginning of MSBC frame: SYNCWORD + 2 nul bytes */
+		if (this->recv_buffer_pos == 2) {
+			if (byte != 0xAD) {
+				this->recv_buffer_pos = 0;
+				return;
+			}
+		}
+		else if (this->recv_buffer_pos == 3) {
+			if (byte != 0x00) {
+				this->recv_buffer_pos = 0;
+				return;
+			}
+		}
+		else if (this->recv_buffer_pos == 4) {
+			if (byte != 0x00) {
+				this->recv_buffer_pos = 0;
+				return;
+			}
                 }
-        }
-        else if (this->msbc_buffer_pos >= MSBC_ENCODED_SIZE) {
-                /* Packet completed. Reset. */
-                this->msbc_buffer_pos = 0;
-                msbc_buffer_append_byte(this, byte);
-                return;
-        }
-        this->msbc_bufferthis->msbc_buffer_pos = byte;
-        ++this->msbc_buffer_pos;
+	}
+
+	if (this->recv_buffer_pos >= HFP_CODEC_PACKET_SIZE) {
+		/* Packet completed. Reset. */
+		this->recv_buffer_pos = 0;
+		recv_buffer_append_byte(this, byte);
+		return;
+	}
+
+        this->recv_bufferthis->recv_buffer_pos = byte;
+        ++this->recv_buffer_pos;
 }
 
 /* Helper function for debugging */
@@ -419,14 +436,38 @@
 	return true;
 }
 
-static uint32_t preprocess_and_decode_msbc_data(void *userdata, uint8_t *read_data, int size_read)
+static int lc3_decode_frame(struct impl *this, const void *src, size_t src_size, void *dst,
+		size_t dst_size, size_t *dst_out)
+{
+#ifdef HAVE_LC3
+	int res;
+
+	if (src_size != LC3_SWB_PAYLOAD_SIZE)
+		return -EINVAL;
+	if (dst_size < LC3_SWB_DECODED_SIZE)
+		return -EINVAL;
+
+	res = lc3_decode(this->lc3, src, src_size, LC3_PCM_FORMAT_S24, dst, 1);
+	if (res != 0)
+		return -EINVAL;
+
+	*dst_out = LC3_SWB_DECODED_SIZE;
+	return LC3_SWB_DECODED_SIZE;
+#else
+	return -EOPNOTSUPP;
+#endif
+}
+
+static uint32_t preprocess_and_decode_codec_data(void *userdata, uint8_t *read_data, int size_read)
 {
 	struct impl *this = userdata;
 	struct port *port = &this->port;
 	uint32_t decoded = 0;
 	int i;
+	uint32_t decoded_size = (this->transport->codec == HFP_AUDIO_CODEC_MSBC) ? MSBC_DECODED_SIZE :
+		LC3_SWB_DECODED_SIZE;
 
-	spa_log_trace(this->log, "handling mSBC data");
+	spa_log_trace(this->log, "handling mSBC/LC3 data");
 
 	/*
 	 * Check if the packet contains only zeros - if so ignore the packet.
@@ -443,44 +484,49 @@
 		int seq, processed;
 		size_t written;
 
-		msbc_buffer_append_byte(this, read_datai);
+		recv_buffer_append_byte(this, read_datai);
 
-		if (this->msbc_buffer_pos != MSBC_ENCODED_SIZE)
+		if (this->recv_buffer_pos != HFP_CODEC_PACKET_SIZE)
 			continue;
 
 		/*
-		 * Handle found mSBC packet
+		 * Handle found mSBC/LC3 packet
 		 */
 
 		buf = spa_bt_decode_buffer_get_write(&port->buffer, &avail);
 
 		/* Check sequence number */
-		seq = ((this->msbc_buffer1 >> 4) & 1) |
-			((this->msbc_buffer1 >> 6) & 2);
-
-		spa_log_trace(this->log, "mSBC packet seq=%u", seq);
-		if (!this->msbc_seq_initialized) {
-			this->msbc_seq_initialized = true;
-			this->msbc_seq = seq;
-		} else if (seq != this->msbc_seq) {
+		seq = ((this->recv_buffer1 >> 4) & 1) |
+			((this->recv_buffer1 >> 6) & 2);
+
+		spa_log_trace(this->log, "mSBC/LC3 packet seq=%u", seq);
+		if (!this->h2_seq_initialized) {
+			this->h2_seq_initialized = true;
+			this->h2_seq = seq;
+		} else if (seq != this->h2_seq) {
 			/* TODO: PLC (too late to insert data now) */
 			spa_log_info(this->log,
-					"missing mSBC packet: %u != %u", seq, this->msbc_seq);
-			this->msbc_seq = seq;
+					"missing mSBC/LC3 packet: %u != %u", seq, this->h2_seq);
+			this->h2_seq = seq;
 		}
 
-		this->msbc_seq = (this->msbc_seq + 1) % 4;
+		this->h2_seq = (this->h2_seq + 1) % 4;
 
-		if (avail < MSBC_DECODED_SIZE)
-			spa_log_warn(this->log, "Output buffer full, dropping msbc data");
+		if (this->transport->codec == HFP_AUDIO_CODEC_MSBC) {
+			if (avail < decoded_size)
+				spa_log_warn(this->log, "Output buffer full, dropping msbc data");
 
-		/* decode frame */
-		processed = sbc_decode(
-			&this->msbc, this->msbc_buffer + 2, MSBC_ENCODED_SIZE - 3,
+			/* decode frame */
+			processed = sbc_decode(
+				&this->msbc, this->recv_buffer + 2, HFP_CODEC_PACKET_SIZE - 3,
+						buf, avail, &written);
+		} else {
+			processed = lc3_decode_frame(this, this->recv_buffer + 2, HFP_CODEC_PACKET_SIZE - 2,
 					buf, avail, &written);
+		}
 
 		if (processed < 0) {
-			spa_log_warn(this->log, "sbc_decode failed: %d", processed);
+			spa_log_warn(this->log, "decode failed: %d", processed);
 			/* TODO: manage errors */
 			continue;
 		}
@@ -518,8 +564,9 @@
 	hexdump_to_log(this, read_data, size_read);
 #endif
 
-	if (this->transport->codec == HFP_AUDIO_CODEC_MSBC) {
-		decoded = preprocess_and_decode_msbc_data(userdata, read_data, size_read);
+	if (this->transport->codec == HFP_AUDIO_CODEC_MSBC ||
+			this->transport->codec == HFP_AUDIO_CODEC_LC3_SWB) {
+		decoded = preprocess_and_decode_codec_data(userdata, read_data, size_read);
 	} else {
 		uint32_t avail;
 		uint8_t *packet;
@@ -620,7 +667,7 @@
 
 	setup_matching(this);
 
-	this->next_time = now_time + duration * SPA_NSEC_PER_SEC / port->buffer.corr / rate;
+	this->next_time = (uint64_t)(now_time + duration * SPA_NSEC_PER_SEC / port->buffer.corr / rate);
 
 	if (SPA_LIKELY(this->clock)) {
 		this->clock->nsec = now_time;
@@ -685,7 +732,7 @@
 	spa_bt_decode_buffer_set_max_latency(&port->buffer,
 			port->current_format.info.raw.rate * 40 / 1000);
 
-	/* Init mSBC if needed */
+	/* Init mSBC/LC3 if needed */
 	if (this->transport->codec == HFP_AUDIO_CODEC_MSBC) {
 		res = sbc_init_msbc(&this->msbc, 0);
 		if (res < 0)
@@ -693,9 +740,24 @@
 
 		/* Libsbc expects audio samples by default in host endianness, mSBC requires little endian */
 		this->msbc.endian = SBC_LE;
-		this->msbc_seq_initialized = false;
+		this->h2_seq_initialized = false;
+
+		this->recv_buffer_pos = 0;
+	} else if (this->transport->codec == HFP_AUDIO_CODEC_LC3_SWB) {
+#ifdef HAVE_LC3
+		this->lc3 = lc3_setup_decoder(7500, 32000, 0,
+				calloc(1, lc3_decoder_size(7500, 32000)));
+		if (!this->lc3)
+			return -EINVAL;
 
-		this->msbc_buffer_pos = 0;
+		spa_assert(lc3_frame_samples(7500, 32000) * port->frame_size == LC3_SWB_DECODED_SIZE);
+
+		this->h2_seq_initialized = false;
+		this->recv_buffer_pos = 0;
+#else
+		res = -EINVAL;
+		goto fail;
+#endif
 	}
 
 	this->io_error = false;
@@ -712,6 +774,8 @@
 
 fail:
 	sbc_finish(&this->msbc);
+	free(this->lc3);
+	this->lc3 = NULL;
 	return res;
 }
 
@@ -804,6 +868,8 @@
 	spa_bt_decode_buffer_clear(&port->buffer);
 
 	sbc_finish(&this->msbc);
+	free(this->lc3);
+	this->lc3 = NULL;
 }
 
 static int do_stop(struct impl *this)
@@ -865,9 +931,9 @@
 
 static void emit_node_info(struct impl *this, bool full)
 {
-	static const struct spa_dict_item hu_node_info_items = {
+	const struct spa_dict_item hu_node_info_items = {
 		{ SPA_KEY_DEVICE_API, "bluez5" },
-		{ SPA_KEY_MEDIA_CLASS, "Audio/Source" },
+		{ SPA_KEY_MEDIA_CLASS, this->is_internal ? "Audio/Source/Internal" : "Audio/Source" },
 		{ SPA_KEY_NODE_DRIVER, "true" },
 	};
 	const struct spa_dict_item ag_node_info_items = {
@@ -997,13 +1063,20 @@
 
 		/* set the info structure */
 		struct spa_audio_info_raw info = { 0, };
-		info.format = SPA_AUDIO_FORMAT_S16_LE;
+		if (this->transport->codec == HFP_AUDIO_CODEC_LC3_SWB)
+			info.format = SPA_AUDIO_FORMAT_S24_32_LE;
+		else
+			info.format = SPA_AUDIO_FORMAT_S16_LE;
 		info.channels = 1;
 		info.position0 = SPA_AUDIO_CHANNEL_MONO;
 
 		 /* CVSD format has a rate of 8kHz
-		  * MSBC format has a rate of 16kHz */
-		if (this->transport->codec == HFP_AUDIO_CODEC_MSBC)
+		  * MSBC format has a rate of 16kHz
+		  * LC3-SWB format has a rate of 32kHz
+		  */
+		if (this->transport->codec == HFP_AUDIO_CODEC_LC3_SWB)
+			info.rate = 32000;
+		else if (this->transport->codec == HFP_AUDIO_CODEC_MSBC)
 			info.rate = 16000;
 		else
 			info.rate = 8000;
@@ -1119,6 +1192,9 @@
 	} else {
 		struct spa_audio_info info = { 0 };
 
+		if (!this->transport)
+			return -EIO;
+
 		if ((err = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
 			return err;
 
@@ -1129,12 +1205,25 @@
 		if (spa_format_audio_raw_parse(format, &info.info.raw) < 0)
 			return -EINVAL;
 
-		if (info.info.raw.format != SPA_AUDIO_FORMAT_S16_LE ||
-		    info.info.raw.rate == 0 ||
+		if (info.info.raw.rate == 0 ||
 		    info.info.raw.channels != 1)
 			return -EINVAL;
 
-		port->frame_size = info.info.raw.channels * 2;
+		switch (info.info.raw.format) {
+		case SPA_AUDIO_FORMAT_S16_LE:
+			if (this->transport->codec == HFP_AUDIO_CODEC_LC3_SWB)
+				return -EINVAL;
+			port->frame_size = info.info.raw.channels * 2;
+			break;
+		case SPA_AUDIO_FORMAT_S24_32_LE:
+			if (this->transport->codec != HFP_AUDIO_CODEC_LC3_SWB)
+				return -EINVAL;
+			port->frame_size = info.info.raw.channels * 4;
+			break;
+		default:
+			return -EINVAL;
+		}
+
 		port->current_format = info;
 		port->have_format = true;
 	}
@@ -1628,6 +1717,9 @@
 	if (info && (str = spa_dict_lookup(info, "clock.quantum-limit")))
 		spa_atou32(str, &this->quantum_limit, 0);
 
+	if (info && (str = spa_dict_lookup(info, "api.bluez5.internal")) != NULL)
+		this->is_internal = spa_atob(str);
+
 	if (info && (str = spa_dict_lookup(info, SPA_KEY_API_BLUEZ5_TRANSPORT)))
 		sscanf(str, "pointer:%p", &this->transport);

pipewire-1.0.1.tar.bz2/spa/plugins/bluez5/upower.c -> pipewire-1.2.0.tar.gz/spa/plugins/bluez5/upower.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/control/mixer.c -> pipewire-1.2.0.tar.gz/spa/plugins/control/mixer.c Changed

@@ -21,7 +21,9 @@
 #include <spa/control/control.h>
 #include <spa/pod/filter.h>
 
-#define NAME "control-mixer"
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.control-mixer");
 
 #define MAX_BUFFERS     64
 #define MAX_PORTS       512
@@ -39,7 +41,7 @@
 	uint32_t direction;
 	uint32_t id;
 
-	struct spa_io_buffers *io;
+	struct spa_io_buffers *io2;
 
 	uint64_t info_all;
 	struct spa_port_info info;
@@ -58,6 +60,8 @@
 	struct spa_handle handle;
 	struct spa_node node;
 
+	uint32_t quantum_limit;
+
 	struct spa_log *log;
 
 	struct spa_loop *data_loop;
@@ -66,6 +70,8 @@
 	struct spa_node_info info;
 	struct spa_param_info params8;
 
+	struct spa_io_position *position;
+
 	struct spa_hook_list hooks;
 
 	uint32_t port_count;
@@ -83,13 +89,16 @@
 };
 
 #define PORT_VALID(p)                ((p) != NULL && (p)->valid)
+#define CHECK_ANY_IN(this,d,p)       ((d) == SPA_DIRECTION_INPUT && (p) == SPA_ID_INVALID)
 #define CHECK_FREE_IN_PORT(this,d,p) ((d) == SPA_DIRECTION_INPUT && (p) < MAX_PORTS && !PORT_VALID(this->in_ports(p)))
 #define CHECK_IN_PORT(this,d,p)      ((d) == SPA_DIRECTION_INPUT && (p) < MAX_PORTS && PORT_VALID(this->in_ports(p)))
 #define CHECK_OUT_PORT(this,d,p)     ((d) == SPA_DIRECTION_OUTPUT && (p) == 0)
 #define CHECK_PORT(this,d,p)         (CHECK_OUT_PORT(this,d,p) || CHECK_IN_PORT (this,d,p))
+#define CHECK_PORT_ANY(this,d,p)     (CHECK_ANY_IN(this,d,p) || CHECK_PORT(this,d,p))
 #define GET_IN_PORT(this,p)          (this->in_portsp)
 #define GET_OUT_PORT(this,p)         (&this->out_portsp)
 #define GET_PORT(this,d,p)           (d == SPA_DIRECTION_INPUT ? GET_IN_PORT(this,p) : GET_OUT_PORT(this,p))
+#define GET_PORT_ANY(this,d,p)       (CHECK_ANY_IN(this,d,p) ? NULL : GET_PORT(this,d,p))
 
 static int impl_node_enum_params(void *object, int seq,
 				 uint32_t id, uint32_t start, uint32_t num,
@@ -106,7 +115,16 @@
 
 static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
 {
-	return -ENOTSUP;
+	struct impl *this = object;
+
+	switch (id) {
+	case SPA_IO_Position:
+		this->position = data;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+	return 0;
 }
 
 static int impl_node_send_command(void *object, const struct spa_command *command)
@@ -226,7 +244,7 @@
 		this->last_port = port_id + 1;
 	port->valid = true;
 
-	spa_log_debug(this->log, NAME " %p: add port %d %d", this, port_id, this->last_port);
+	spa_log_debug(this->log, "%p: add port %d %d", this, port_id, this->last_port);
 	emit_port_info(this, port, true);
 
 	return 0;
@@ -260,15 +278,14 @@
 
 		this->last_port = i + 1;
 	}
-	spa_log_debug(this->log, NAME " %p: remove port %d %d", this, port_id, this->last_port);
+	spa_log_debug(this->log, "%p: remove port %d %d", this, port_id, this->last_port);
 
 	spa_node_emit_port_info(&this->hooks, direction, port_id, NULL);
 
 	return 0;
 }
 
-static int port_enum_formats(void *object,
-			     enum spa_direction direction, uint32_t port_id,
+static int port_enum_formats(void *object, struct port *port,
 			     uint32_t index,
 			     struct spa_pod **param,
 			     struct spa_pod_builder *builder)
@@ -303,9 +320,9 @@
 
 	spa_return_val_if_fail(this != NULL, -EINVAL);
 	spa_return_val_if_fail(num != 0, -EINVAL);
-	spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
+	spa_return_val_if_fail(CHECK_PORT_ANY(this, direction, port_id), -EINVAL);
 
-	port = GET_PORT(this, direction, port_id);
+	port = GET_PORT_ANY(this, direction, port_id);
 
 	result.id = id;
 	result.next = start;
@@ -316,19 +333,19 @@
 
 	switch (id) {
 	case SPA_PARAM_EnumFormat:
-		if ((res = port_enum_formats(this, direction, port_id, result.index, &param, &b)) <= 0)
+		if ((res = port_enum_formats(this, port, result.index, &param, &b)) <= 0)
 			return res;
 		break;
 
 	case SPA_PARAM_Format:
-		if (!port->have_format)
+		if (port == NULL || !port->have_format)
 			return -EIO;
-		if ((res = port_enum_formats(this, direction, port_id, result.index, &param, &b)) <= 0)
+		if ((res = port_enum_formats(this, port, result.index, &param, &b)) <= 0)
 			return res;
 		break;
 
 	case SPA_PARAM_Buffers:
-		if (!port->have_format)
+		if (port == NULL || !port->have_format)
 			return -EIO;
 		if (result.index > 0)
 			return 0;
@@ -337,7 +354,8 @@
 			SPA_TYPE_OBJECT_ParamBuffers, id,
 			SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(1, 1, MAX_BUFFERS),
 			SPA_PARAM_BUFFERS_blocks,  SPA_POD_Int(1),
-			SPA_PARAM_BUFFERS_size,    SPA_POD_CHOICE_RANGE_Int(4096, 512, INT32_MAX),
+			SPA_PARAM_BUFFERS_size,    SPA_POD_CHOICE_RANGE_Int(this->quantum_limit,
+				this->quantum_limit, INT32_MAX),
 			SPA_PARAM_BUFFERS_stride,  SPA_POD_Int(1));
 		break;
 
@@ -349,6 +367,12 @@
 				SPA_PARAM_IO_id,   SPA_POD_Id(SPA_IO_Buffers),
 				SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_buffers)));
 			break;
+		case 1:
+			param = spa_pod_builder_add_object(&b,
+				SPA_TYPE_OBJECT_ParamIO, id,
+				SPA_PARAM_IO_id,   SPA_POD_Id(SPA_IO_AsyncBuffers),
+				SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_async_buffers)));
+			break;
 		default:
 			return 0;
 		}
@@ -371,7 +395,7 @@
 static int clear_buffers(struct impl *this, struct port *port)
 {
 	if (port->n_buffers > 0) {
-		spa_log_debug(this->log, NAME " %p: clear buffers %p", this, port);
+		spa_log_debug(this->log, "%p: clear buffers %p", this, port);
 		port->n_buffers = 0;
 		spa_list_init(&port->queue);
 	}
@@ -385,7 +409,7 @@
 
 	spa_list_append(&port->queue, &b->link);
 	SPA_FLAG_SET(b->flags, BUFFER_FLAG_QUEUED);
-	spa_log_trace_fp(this->log, NAME " %p: queue buffer %d", this, b->id);
+	spa_log_trace_fp(this->log, "%p: queue buffer %d", this, b->id);
 	return 0;
 }
 
@@ -399,7 +423,7 @@
 	b = spa_list_first(&port->queue, struct buffer, link);
 	spa_list_remove(&b->link);
 	SPA_FLAG_CLEAR(b->flags, BUFFER_FLAG_QUEUED);
-	spa_log_trace_fp(this->log, NAME " %p: dequeue buffer %d", this, b->id);
+	spa_log_trace_fp(this->log, "%p: dequeue buffer %d", this, b->id);
 	return b;
 }
 
@@ -438,7 +462,7 @@
 		if (!port->have_format) {
 			this->n_formats++;
 			port->have_format = true;
-			spa_log_debug(this->log, NAME " %p: set format on port %d:%d",
+			spa_log_debug(this->log, "%p: set format on port %d:%d",
 					this, direction, port_id);
 		}
 	}
@@ -491,7 +515,7 @@
 
 	port = GET_PORT(this, direction, port_id);
 
-	spa_log_debug(this->log, NAME " %p: use buffers %d on port %d:%d",
+	spa_log_debug(this->log, "%p: use buffers %d on port %d:%d",
 			this, n_buffers, direction, port_id);
 
 	spa_return_val_if_fail(!this->started || port->io == NULL, -EIO);
@@ -513,7 +537,7 @@
 		b->id = i;
 
 		if (d0.data == NULL) {
-			spa_log_error(this->log, NAME " %p: invalid memory on buffer %d", this, i);
+			spa_log_error(this->log, "%p: invalid memory on buffer %d", this, i);
 			return -EINVAL;
 		}
 		if (direction == SPA_DIRECTION_OUTPUT)
@@ -527,13 +551,24 @@
 struct io_info {
 	struct port *port;
 	void *data;
+	size_t size;
 };
 
 static int do_port_set_io(struct spa_loop *loop, bool async, uint32_t seq,
 		const void *data, size_t size, void *user_data)
 {
 	struct io_info *info = user_data;
-	info->port->io = info->data;
+	if (info->size >= sizeof(struct spa_io_async_buffers)) {
+		struct spa_io_async_buffers *ab = info->data;
+		info->port->io0 = &ab->buffers0;
+		info->port->io1 = &ab->buffers1;
+	} else if (info->size >= sizeof(struct spa_io_buffers)) {
+		info->port->io0 = info->data;
+		info->port->io1 = info->data;
+	} else {
+		info->port->io0 = NULL;
+		info->port->io1 = NULL;
+	}
 	return 0;
 }
 
@@ -548,7 +583,7 @@
 
 	spa_return_val_if_fail(this != NULL, -EINVAL);
 
-	spa_log_debug(this->log, NAME " %p: port %d:%d io %d %p/%zd", this,
+	spa_log_debug(this->log, "%p: port %d:%d io %d %p/%zd", this,
 			direction, port_id, id, data, size);
 
 	spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
@@ -556,9 +591,11 @@
 	port = GET_PORT(this, direction, port_id);
 	info.port = port;
 	info.data = data;
+	info.size = size;
 
 	switch (id) {
 	case SPA_IO_Buffers:
+	case SPA_IO_AsyncBuffers:
 		spa_loop_invoke(this->data_loop,
                                do_port_set_io, SPA_ID_INVALID, NULL, 0, true, &info);
 		break;
@@ -627,14 +664,15 @@
 	struct spa_pod_frame f;
         struct buffer *outb;
 	struct spa_data *d;
+	uint32_t cycle = this->position->clock.cycle & 1;
 
 	spa_return_val_if_fail(this != NULL, -EINVAL);
 
 	outport = GET_OUT_PORT(this, 0);
-	if ((outio = outport->io) == NULL)
+	if ((outio = outport->iocycle) == NULL)
 		return -EIO;
 
-	spa_log_trace_fp(this->log, NAME " %p: status %p %d %d",
+	spa_log_trace_fp(this->log, "%p: status %p %d %d",
 			this, outio, outio->status, outio->buffer_id);
 
 	if (outio->status == SPA_STATUS_HAVE_DATA)
@@ -649,7 +687,7 @@
 	/* get output buffer */
 	if ((outb = dequeue_buffer(this, outport)) == NULL) {
 		if (outport->n_buffers > 0)
-	                spa_log_warn(this->log, NAME " %p: out of buffers (%d)",
+	                spa_log_warn(this->log, "%p: out of buffers (%d)",
 					this, outport->n_buffers);
                 return -EPIPE;
         }
@@ -664,33 +702,34 @@
 		struct spa_io_buffers *inio = NULL;
 		void *pod;
 
-		if (!inport->valid ||
-		    (inio = inport->io) == NULL ||
-		    inio->buffer_id >= inport->n_buffers ||
+		if (SPA_UNLIKELY(!PORT_VALID(inport) || (inio = inport->iocycle) == NULL)) {
+			spa_log_trace_fp(this->log, "%p: skip input idx:%d valid:%d io:%p/%p/%d",
+					this, i, PORT_VALID(inport),
+					inport->io0, inport->io1, cycle);
+			continue;
+		}
+		if (inio->buffer_id >= inport->n_buffers ||
 		    inio->status != SPA_STATUS_HAVE_DATA) {
-			spa_log_trace_fp(this->log, NAME " %p: skip input idx:%d valid:%d "
+			spa_log_trace_fp(this->log, "%p: skip input idx:%d "
 					"io:%p status:%d buf_id:%d n_buffers:%d", this,
-				i, inport->valid, inio,
-				inio ? inio->status : -1,
-				inio ? inio->buffer_id : SPA_ID_INVALID,
-				inport->n_buffers);
+				i, inio, inio->status, inio->buffer_id, inport->n_buffers);
 			continue;
 		}
 
-		spa_log_trace_fp(this->log, NAME " %p: mix input %d %p->%p %d %d", this,
+		spa_log_trace_fp(this->log, "%p: mix input %d %p->%p %d %d", this,
 				i, inio, outio, inio->status, inio->buffer_id);
 
 		d = inport->buffersinio->buffer_id.buffer->datas;
 
 		if ((pod = spa_pod_from_data(d->data, d->maxsize,
 				d->chunk->offset, d->chunk->size)) == NULL) {
-			spa_log_trace_fp(this->log, NAME " %p: skip input idx:%d max:%u "
+			spa_log_trace_fp(this->log, "%p: skip input idx:%d max:%u "
 					"offset:%u size:%u", this, i,
 					d->maxsize, d->chunk->offset, d->chunk->size);
 			continue;
 		}
 		if (!spa_pod_is_sequence(pod)) {
-			spa_log_trace_fp(this->log, NAME " %p: skip input idx:%d", this, i);
+			spa_log_trace_fp(this->log, "%p: skip input idx:%d", this, i);
 			continue;
 		}
 
@@ -731,6 +770,12 @@
 	}
 	spa_pod_builder_pop(&builder, &f);
 
+	if (builder.state.offset > d->maxsize) {
+		spa_log_warn(this->log, "%p: control overflow %d > %d",
+				this, builder.state.offset, d->maxsize);
+		builder.state.offset = 0;
+	}
+
 	d->chunk->offset = 0;
 	d->chunk->size = builder.state.offset;
 	d->chunk->stride = 1;
@@ -807,6 +852,7 @@
 {
 	struct impl *this;
 	struct port *port;
+	uint32_t i;
 
 	spa_return_val_if_fail(factory != NULL, -EINVAL);
 	spa_return_val_if_fail(handle != NULL, -EINVAL);
@@ -824,6 +870,16 @@
 		return -EINVAL;
 	}
 
+	this->quantum_limit = 8192;
+
+	for (i = 0; info && i < info->n_items; i++) {
+		const char *k = info->itemsi.key;
+		const char *s = info->itemsi.value;
+		if (spa_streq(k, "clock.quantum-limit")) {
+			spa_atou32(s, &this->quantum_limit, 0);
+		}
+	}
+
 	spa_hook_list_init(&this->hooks);
 
 	this->node.iface = SPA_INTERFACE_INIT(

pipewire-1.0.1.tar.bz2/spa/plugins/control/plugin.c -> pipewire-1.2.0.tar.gz/spa/plugins/control/plugin.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/ffmpeg/ffmpeg-dec.c -> pipewire-1.2.0.tar.gz/spa/plugins/ffmpeg/ffmpeg-dec.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/ffmpeg/ffmpeg-enc.c -> pipewire-1.2.0.tar.gz/spa/plugins/ffmpeg/ffmpeg-enc.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/ffmpeg/ffmpeg.c -> pipewire-1.2.0.tar.gz/spa/plugins/ffmpeg/ffmpeg.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/jack/jack-device.c -> pipewire-1.2.0.tar.gz/spa/plugins/jack/jack-device.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/jack/jack-sink.c -> pipewire-1.2.0.tar.gz/spa/plugins/jack/jack-sink.c Changed

@@ -27,7 +27,9 @@
 
 #include "jack-client.h"
 
-#define NAME "jack-sink"
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.jack-sink");
 
 #define MAX_PORTS 128
 #define MAX_BUFFERS 8
@@ -404,7 +406,7 @@
 			NULL, JACK_DEFAULT_AUDIO_TYPE,
                         JackPortIsPhysical|JackPortIsInput);
 	if (ports == NULL) {
-		spa_log_error(this->log, NAME" %p: can't enumerate ports", this);
+		spa_log_error(this->log, "%p: can't enumerate ports", this);
 		res = -ENODEV;
 		goto exit;
 	}
@@ -421,7 +423,7 @@
 				jack_port_type(p),
 				JackPortIsOutput, 0);
 		if (port->jack_port == NULL) {
-			spa_log_error(this->log, NAME" %p: jack_port_register() %d (%s) failed",
+			spa_log_error(this->log, "%p: jack_port_register() %d (%s) failed",
 					this, i, portsi);
 			res = -EFAULT;
 			goto exit_free;
@@ -452,7 +454,7 @@
 	for (i = 0; portsi; i++) {
 		struct port *port = GET_IN_PORT(this, i);
 		if (jack_connect(client, jack_port_name(port->jack_port), portsi)) {
-			spa_log_warn(this->log, NAME" %p: Failed to connect %s to %s",
+			spa_log_warn(this->log, "%p: Failed to connect %s to %s",
 					this, jack_port_name(port->jack_port), portsi);
             }
 	}
@@ -591,7 +593,7 @@
 static int clear_buffers(struct impl *this, struct port *port)
 {
 	if (port->n_buffers > 0) {
-		spa_log_debug(this->log, NAME " %p: clear buffers", this);
+		spa_log_debug(this->log, "%p: clear buffers", this);
 		port->n_buffers = 0;
 		this->started = false;
 	}
@@ -739,7 +741,7 @@
 	uint32_t i;
 	int res = 0;
 
-	spa_log_trace(this->log, NAME" %p: process %d", this, this->n_in_ports);
+	spa_log_trace(this->log, "%p: process %d", this, this->n_in_ports);
 
 	for (i = 0; i < this->n_in_ports; i++) {
 		struct port *port = GET_IN_PORT(this, i);
@@ -758,7 +760,7 @@
 			continue;
 		}
 
-		spa_log_trace(this->log, NAME" %p: port %d: buffer %d", this, i, io->buffer_id);
+		spa_log_trace(this->log, "%p: port %d: buffer %d", this, i, io->buffer_id);
 		b = &port->buffersio->buffer_id;
 		src = &b->outbuf->datas0;
 
@@ -840,7 +842,7 @@
 		sscanf(str, "pointer:%p", &this->client);
 
 	if (this->client == NULL) {
-		spa_log_error(this->log, NAME" %p: missing "SPA_KEY_API_JACK_CLIENT
+		spa_log_error(this->log, "%p: missing "SPA_KEY_API_JACK_CLIENT
 				" property", this);
 		return -EINVAL;
 	}

pipewire-1.0.1.tar.bz2/spa/plugins/jack/jack-source.c -> pipewire-1.2.0.tar.gz/spa/plugins/jack/jack-source.c Changed

@@ -27,7 +27,9 @@
 
 #include "jack-client.h"
 
-#define NAME "jack-source"
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.jack-source");
 
 #define MAX_PORTS 128
 #define MAX_BUFFERS 8
@@ -209,7 +211,7 @@
 	struct buffer *b = &port->buffersid;
 
 	if (SPA_FLAG_IS_SET(b->flags, BUFFER_FLAG_OUT)) {
-		spa_log_trace(this->log, NAME " %p: reuse buffer %d", this, id);
+		spa_log_trace(this->log, "%p: reuse buffer %d", this, id);
 		SPA_FLAG_CLEAR(b->flags, BUFFER_FLAG_OUT);
 		spa_list_append(&port->empty, &b->link);
 	}
@@ -404,7 +406,7 @@
 			NULL, JACK_DEFAULT_AUDIO_TYPE,
                         JackPortIsPhysical|JackPortIsOutput);
 	if (ports == NULL) {
-		spa_log_error(this->log, NAME" %p: can't enumerate ports", this);
+		spa_log_error(this->log, "%p: can't enumerate ports", this);
 		res = -ENODEV;
 		goto exit;
 	}
@@ -421,7 +423,7 @@
 				jack_port_type(p),
 				JackPortIsInput, 0);
 		if (port->jack_port == NULL) {
-			spa_log_error(this->log, NAME" %p: jack_port_register() %d (%s) failed",
+			spa_log_error(this->log, "%p: jack_port_register() %d (%s) failed",
 					this, i, portsi);
 			res = -EFAULT;
 			goto exit_free;
@@ -452,7 +454,7 @@
 	for (i = 0; portsi; i++) {
 		struct port *port = GET_OUT_PORT(this, i);
 		if (jack_connect(client, portsi, jack_port_name(port->jack_port))) {
-			spa_log_warn(this->log, NAME" %p: Failed to connect %s to %s",
+			spa_log_warn(this->log, "%p: Failed to connect %s to %s",
 					this, jack_port_name(port->jack_port), portsi);
             }
 	}
@@ -591,7 +593,7 @@
 static int clear_buffers(struct impl *this, struct port *port)
 {
 	if (port->n_buffers > 0) {
-		spa_log_debug(this->log, NAME " %p: clear buffers", this);
+		spa_log_debug(this->log, "%p: clear buffers", this);
 		port->n_buffers = 0;
 		spa_list_init(&port->empty);
 		this->started = false;
@@ -753,7 +755,7 @@
 	uint32_t i;
 	int res = 0;
 
-	spa_log_trace(this->log, NAME" %p: process %d", this, this->n_out_ports);
+	spa_log_trace(this->log, "%p: process %d", this, this->n_out_ports);
 
 	for (i = 0; i < this->n_out_ports; i++) {
 		struct port *port = GET_OUT_PORT(this, i);
@@ -772,7 +774,7 @@
 		}
 
 		if ((b = dequeue_buffer(this, port)) == NULL) {
-			spa_log_trace(this->log, NAME" %p: out of buffers", this);
+			spa_log_trace(this->log, "%p: out of buffers", this);
 			io->status = -EPIPE;
 			continue;
 		}
@@ -865,7 +867,7 @@
 		sscanf(str, "pointer:%p", &this->client);
 
 	if (this->client == NULL) {
-		spa_log_error(this->log, NAME" %p: missing "SPA_KEY_API_JACK_CLIENT
+		spa_log_error(this->log, "%p: missing "SPA_KEY_API_JACK_CLIENT
 				" property", this);
 		return -EINVAL;
 	}

pipewire-1.0.1.tar.bz2/spa/plugins/jack/plugin.c -> pipewire-1.2.0.tar.gz/spa/plugins/jack/plugin.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/libcamera/libcamera-device.cpp -> pipewire-1.2.0.tar.gz/spa/plugins/libcamera/libcamera-device.cpp Changed

@@ -7,11 +7,6 @@
 #include "config.h"
 
 #include <stddef.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include <sys/ioctl.h>
 
 #include <spa/support/plugin.h>
 #include <spa/support/log.h>
@@ -61,12 +56,10 @@
 static const libcamera::Span<const int64_t> cameraDevice(
 			const Camera *camera)
 {
-#ifdef HAVE_LIBCAMERA_SYSTEM_DEVICES
 	const ControlList &props = camera->properties();
 
 	if (auto devices = props.get(properties::SystemDevices))
 		return devices.value();
-#endif
 
 	return {};
 }
@@ -99,6 +92,26 @@
 	return nullptr;
 }
 
+static const char *cameraRot(const Camera *camera)
+{
+	const ControlList &props = camera->properties();
+
+	if (auto rotation = props.get(properties::Rotation)) {
+		switch (rotation.value()) {
+		case 90:
+			return "90";
+		case 180:
+			return "180";
+		case 270:
+			return "270";
+		default:
+			return "0";
+		}
+	}
+
+	return nullptr;
+}
+
 static int emit_info(struct impl *impl, bool full)
 {
 	struct spa_dict_item items10;
@@ -122,6 +135,8 @@
 
 	if (auto location = cameraLoc(impl->camera.get()))
 		ADD_ITEM(SPA_KEY_API_LIBCAMERA_LOCATION, location);
+	if (auto rotation = cameraRot(impl->camera.get()))
+		ADD_ITEM(SPA_KEY_API_LIBCAMERA_ROTATION, rotation);
 
 	const auto model = cameraModel(impl->camera.get());
 	ADD_ITEM(SPA_KEY_DEVICE_PRODUCT_NAME, model.c_str());
@@ -135,10 +150,12 @@
 	if (!device_numbers.empty()) {
 		spa_strbuf_init(&buf, devices_str, sizeof(devices_str));
 
-		/* created a space separated string of all the device numbers */
-		for (int64_t device_number : device_numbers)
+		/* encode device numbers into a json array */
+		spa_strbuf_append(&buf, " ");
+		for(int64_t device_number : device_numbers)
 			spa_strbuf_append(&buf, "%" PRId64 " ", device_number);
 
+		spa_strbuf_append(&buf, "");
 		ADD_ITEM(SPA_KEY_DEVICE_DEVIDS, devices_str);
 	}
 
@@ -217,7 +234,7 @@
 }
 
 static const struct spa_device_methods impl_device = {
-	SPA_VERSION_DEVICE_METHODS,
+	.version = SPA_VERSION_DEVICE_METHODS,
 	.add_listener = impl_add_listener,
 	.sync = impl_sync,
 	.enum_params = impl_enum_params,

pipewire-1.0.1.tar.bz2/spa/plugins/libcamera/libcamera-manager.cpp -> pipewire-1.2.0.tar.gz/spa/plugins/libcamera/libcamera-manager.cpp Changed

@@ -112,9 +112,9 @@
 
 	if (impl->n_devices >= MAX_DEVICES)
 		return NULL;
-	id = get_free_id(impl);;
+	id = get_free_id(impl);
 	device = &impl->devicesid;
-	device->id = get_free_id(impl);;
+	device->id = id;
 	device->camera = std::move(camera);
 	impl->n_devices++;
 	return device;
@@ -151,7 +151,6 @@
 	struct spa_dict_item items20;
 	struct spa_dict dict;
 	uint32_t n_items = 0;
-	char path256;
 
 	info = SPA_DEVICE_OBJECT_INFO_INIT();
 
@@ -165,8 +164,7 @@
 	ADD_ITEM(SPA_KEY_DEVICE_ENUM_API,"libcamera.manager");
 	ADD_ITEM(SPA_KEY_DEVICE_API, "libcamera");
 	ADD_ITEM(SPA_KEY_MEDIA_CLASS, "Video/Device");
-	snprintf(path, sizeof(path), "%s", device->camera->id().c_str());
-	ADD_ITEM(SPA_KEY_API_LIBCAMERA_PATH, path);
+	ADD_ITEM(SPA_KEY_API_LIBCAMERA_PATH, device->camera->id().c_str());
 #undef ADD_ITEM
 
 	dict = SPA_DICT_INIT(items, n_items);
@@ -352,7 +350,7 @@
 }
 
 static const struct spa_device_methods impl_device = {
-	SPA_VERSION_DEVICE_METHODS,
+	.version = SPA_VERSION_DEVICE_METHODS,
 	.add_listener = impl_device_add_listener,
 };

pipewire-1.0.1.tar.bz2/spa/plugins/libcamera/libcamera-source.cpp -> pipewire-1.2.0.tar.gz/spa/plugins/libcamera/libcamera-source.cpp Changed

@@ -60,14 +60,6 @@
 	void *ptr;
 };
 
-#define MAX_CONTROLS	64
-
-struct control {
-	uint32_t id;
-	uint32_t ctrl_id;
-	double value;
-};
-
 struct port {
 	struct impl *impl;
 
@@ -78,16 +70,14 @@
 
 	uint32_t memtype = 0;
 
-	struct control controlsMAX_CONTROLS;
-	uint32_t n_controls = 0;
-
 	struct buffer buffersMAX_BUFFERS;
 	uint32_t n_buffers = 0;
 	struct spa_list queue;
 	struct spa_ringbuffer ring = SPA_RINGBUFFER_INIT();
 	uint32_t ring_idsMAX_BUFFERS;
 
-	static constexpr uint64_t info_all = SPA_PORT_CHANGE_MASK_FLAGS | SPA_PORT_CHANGE_MASK_PARAMS;
+	static constexpr uint64_t info_all = SPA_PORT_CHANGE_MASK_FLAGS |
+		SPA_PORT_CHANGE_MASK_PROPS | SPA_PORT_CHANGE_MASK_PARAMS;
 	struct spa_port_info info = SPA_PORT_INFO_INIT();
 	struct spa_io_buffers *io = nullptr;
 	struct spa_io_sequence *control = nullptr;
@@ -413,15 +403,14 @@
 	return 0;
 }
 
-static const struct spa_dict_item info_items = {
-	{ SPA_KEY_DEVICE_API, "libcamera" },
-	{ SPA_KEY_MEDIA_CLASS, "Video/Source" },
-	{ SPA_KEY_MEDIA_ROLE, "Camera" },
-	{ SPA_KEY_NODE_DRIVER, "true" },
-};
-
 static void emit_node_info(struct impl *impl, bool full)
 {
+	static const struct spa_dict_item info_items = {
+		{ SPA_KEY_DEVICE_API, "libcamera" },
+		{ SPA_KEY_MEDIA_CLASS, "Video/Source" },
+		{ SPA_KEY_MEDIA_ROLE, "Camera" },
+		{ SPA_KEY_NODE_DRIVER, "true" },
+	};
 	uint64_t old = full ? impl->info.change_mask : 0;
 	if (full)
 		impl->info.change_mask = impl->info_all;
@@ -435,10 +424,15 @@
 
 static void emit_port_info(struct impl *impl, struct port *port, bool full)
 {
+	static const struct spa_dict_item info_items = {
+		{ SPA_KEY_PORT_GROUP, "stream.0" },
+	};
 	uint64_t old = full ? port->info.change_mask : 0;
 	if (full)
 		port->info.change_mask = port->info_all;
 	if (port->info.change_mask) {
+		struct spa_dict dict = SPA_DICT_INIT_ARRAY(info_items);
+		port->info.props = &dict;
 		spa_node_emit_port_info(&impl->hooks,
 				SPA_DIRECTION_OUTPUT, 0, &port->info);
 		port->info.change_mask = old;
@@ -905,7 +899,7 @@
 }
 
 static const struct spa_node_methods impl_node = {
-	SPA_VERSION_NODE_METHODS,
+	.version = SPA_VERSION_NODE_METHODS,
 	.add_listener = impl_node_add_listener,
 	.set_callbacks = impl_node_set_callbacks,
 	.sync = impl_node_sync,

pipewire-1.0.1.tar.bz2/spa/plugins/libcamera/libcamera-utils.cpp -> pipewire-1.2.0.tar.gz/spa/plugins/libcamera/libcamera-utils.cpp Changed

@@ -165,16 +165,16 @@
 	/* RGB formats */
 	MAKE_FMT(formats::RGB565, RGB16, video, raw),
 	MAKE_FMT(formats::RGB565_BE, RGB16, video, raw),
-	MAKE_FMT(formats::RGB888, RGB, video, raw),
-	MAKE_FMT(formats::BGR888, BGR, video, raw),
-	MAKE_FMT(formats::XRGB8888, xRGB, video, raw),
-	MAKE_FMT(formats::XBGR8888, xBGR, video, raw),
-	MAKE_FMT(formats::RGBX8888, RGBx, video, raw),
-	MAKE_FMT(formats::BGRX8888, BGRx, video, raw),
-	MAKE_FMT(formats::ARGB8888, ARGB, video, raw),
-	MAKE_FMT(formats::ABGR8888, ABGR, video, raw),
-	MAKE_FMT(formats::RGBA8888, RGBA, video, raw),
-	MAKE_FMT(formats::BGRA8888, BGRA, video, raw),
+	MAKE_FMT(formats::RGB888, BGR, video, raw),
+	MAKE_FMT(formats::BGR888, RGB, video, raw),
+	MAKE_FMT(formats::XRGB8888, BGRx, video, raw),
+	MAKE_FMT(formats::XBGR8888, RGBx, video, raw),
+	MAKE_FMT(formats::RGBX8888, xBGR, video, raw),
+	MAKE_FMT(formats::BGRX8888, xRGB, video, raw),
+	MAKE_FMT(formats::ARGB8888, BGRA, video, raw),
+	MAKE_FMT(formats::ABGR8888, RGBA, video, raw),
+	MAKE_FMT(formats::RGBA8888, ABGR, video, raw),
+	MAKE_FMT(formats::BGRA8888, ARGB, video, raw),
 
 	MAKE_FMT(formats::YUYV, YUY2, video, raw),
 	MAKE_FMT(formats::YVYU, YVYU, video, raw),
@@ -716,25 +716,23 @@
 }
 
 static const struct {
-	Transform libcamera_transform;
-	uint32_t spa_transform_value;
-} transform_map = {
-	{ Transform::Identity, SPA_META_TRANSFORMATION_None },
-	{ Transform::Rot0, SPA_META_TRANSFORMATION_None },
-	{ Transform::HFlip, SPA_META_TRANSFORMATION_Flipped },
-	{ Transform::VFlip, SPA_META_TRANSFORMATION_Flipped180 },
-	{ Transform::HVFlip, SPA_META_TRANSFORMATION_180 },
-	{ Transform::Rot180, SPA_META_TRANSFORMATION_180 },
-	{ Transform::Transpose, SPA_META_TRANSFORMATION_Flipped90 },
-	{ Transform::Rot90, SPA_META_TRANSFORMATION_90 },
-	{ Transform::Rot270, SPA_META_TRANSFORMATION_270 },
-	{ Transform::Rot180Transpose, SPA_META_TRANSFORMATION_Flipped270 },
+	Orientation libcamera_orientation; /* clockwise rotation then horizontal mirroring */
+	uint32_t spa_transform_value; /* horizontal mirroring then counter-clockwise rotation */
+} orientation_map = {
+	{ Orientation::Rotate0, SPA_META_TRANSFORMATION_None },
+	{ Orientation::Rotate0Mirror, SPA_META_TRANSFORMATION_Flipped },
+	{ Orientation::Rotate90, SPA_META_TRANSFORMATION_270 },
+	{ Orientation::Rotate90Mirror, SPA_META_TRANSFORMATION_Flipped90 },
+	{ Orientation::Rotate180, SPA_META_TRANSFORMATION_180 },
+	{ Orientation::Rotate180Mirror, SPA_META_TRANSFORMATION_Flipped180 },
+	{ Orientation::Rotate270, SPA_META_TRANSFORMATION_90 },
+	{ Orientation::Rotate270Mirror, SPA_META_TRANSFORMATION_Flipped270 },
 };
 
-static uint32_t libcamera_transform_to_spa_transform_value(Transform transform)
+static uint32_t libcamera_orientation_to_spa_transform_value(Orientation orientation)
 {
-	for (const auto& t : transform_map) {
-		if (t.libcamera_transform == transform)
+	for (const auto& t : orientation_map) {
+		if (t.libcamera_orientation == orientation)
 			return t.spa_transform_value;
 	}
 	return SPA_META_TRANSFORMATION_None;
@@ -765,7 +763,7 @@
 		} else if (d0.type & (1u << SPA_DATA_MemPtr)) {
 			port->memtype = SPA_DATA_MemPtr;
 		} else {
-			spa_log_error(impl->log, "v4l2: can't use buffers of type %d", d0.type);
+			spa_log_error(impl->log, "can't use buffers of type %d", d0.type);
 			return -EINVAL;
 		}
 	}
@@ -788,9 +786,9 @@
 			buffersi, SPA_META_VideoTransform, sizeof(*b->videotransform));
 		if (b->videotransform) {
 			b->videotransform->transform =
-				libcamera_transform_to_spa_transform_value(impl->config->transform);
-			spa_log_debug(impl->log, "Setting videotransform for buffer %d to %u (from %s)",
-				i, b->videotransform->transform, transformToString(impl->config->transform));
+				libcamera_orientation_to_spa_transform_value(impl->config->orientation);
+			spa_log_debug(impl->log, "Setting videotransform for buffer %u to %u",
+				i, b->videotransform->transform);
 
 		}
 
@@ -807,6 +805,7 @@
 
 			if (port->memtype == SPA_DATA_DmaBuf ||
 			    port->memtype == SPA_DATA_MemFd) {
+				dj.flags |= SPA_DATA_FLAG_MAPPABLE;
 				dj.fd = bufsi->planes()j.fd.get();
 				spa_log_debug(impl->log, "Got fd = %ld for buffer: #%d", dj.fd, i);
 				dj.data = NULL;
@@ -921,7 +920,7 @@
 	int res;
 
 	if (!port->current_format) {
-		spa_log_error(impl->log, "Exting %s with -EIO", __FUNCTION__);
+		spa_log_error(impl->log, "Exiting %s with -EIO", __FUNCTION__);
 		return -EIO;
 	}

pipewire-1.0.1.tar.bz2/spa/plugins/libcamera/libcamera.c -> pipewire-1.2.0.tar.gz/spa/plugins/libcamera/libcamera.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/libcamera/meson.build -> pipewire-1.2.0.tar.gz/spa/plugins/libcamera/meson.build Changed

pipewire-1.0.1.tar.bz2/spa/plugins/meson.build -> pipewire-1.2.0.tar.gz/spa/plugins/meson.build Changed

pipewire-1.0.1.tar.bz2/spa/plugins/support/cpu.c -> pipewire-1.2.0.tar.gz/spa/plugins/support/cpu.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/support/dbus.c -> pipewire-1.2.0.tar.gz/spa/plugins/support/dbus.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/support/evl-plugin.c -> pipewire-1.2.0.tar.gz/spa/plugins/support/evl-plugin.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/support/evl-system.c -> pipewire-1.2.0.tar.gz/spa/plugins/support/evl-system.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/support/journal.c -> pipewire-1.2.0.tar.gz/spa/plugins/support/journal.c Changed

@@ -21,9 +21,9 @@
 
 #include <systemd/sd-journal.h>
 
-#include "log-patterns.h"
-
-#define NAME "journal"
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.journal");
 
 #define DEFAULT_LOG_LEVEL SPA_LOG_LEVEL_INFO
 
@@ -33,8 +33,6 @@
 
 	/* if non-null, we'll additionally forward all logging to there */
 	struct spa_log *chain_log;
-
-	struct spa_list patterns;
 };
 
 static SPA_PRINTF_FUNC(7,0) void
@@ -47,6 +45,7 @@
 	      const char *fmt,
 	      va_list args)
 {
+	static const char * const levels = { "-", "E", "W", "I", "D", "T", "*T*" };
 	struct impl *impl = object;
 	char line_buffer32;
 	char file_bufferstrlen("CODE_FILE=") + strlen(file) + 1;
@@ -57,6 +56,7 @@
 	if (impl->chain_log != NULL) {
 		va_list args_copy;
 		va_copy(args_copy, args);
+		impl->chain_log->level = impl->log.level;
 		spa_log_logtv(impl->chain_log,
 			      level, topic,
 			      file, line, func, fmt, args_copy);
@@ -81,9 +81,26 @@
 		break;
 	}
 
-	if (topic)
+	if (spa_log_level_topic_enabled(&impl->log, topic, SPA_LOG_LEVEL_DEBUG)) {
+		const char *lev = levelsSPA_CLAMP(level, 0u, SPA_N_ELEMENTS(levels) - 1u);
+		const char *tp = topic ? topic->topic : "";
+
+		if (file && func) {
+			const char *f = strrchr(file, '/');
+
+			f = f ? f+1 : file;
+			sz = spa_scnprintf(message_buffer, sizeof(message_buffer),
+					"%s %s%s%s:%d:%s: ",
+					lev, tp, topic ? " " : "",
+					f, line, func);
+		} else {
+			sz = spa_scnprintf(message_buffer, sizeof(message_buffer),
+					"%s %s%s", lev, tp, topic ? ": " : "");
+		}
+	} else if (topic) {
 		sz = spa_scnprintf(message_buffer, sizeof(message_buffer),
-				   "%s: ", topic->topic);
+				"%s: ", topic->topic);
+	}
 
 	/* we'll be using the low-level journal API, which expects us to provide
 	 * the location explicitly. line and file are to be passed as preformatted
@@ -143,22 +160,12 @@
 	va_end(args);
 }
 
-static void
-impl_log_topic_init(void *object, struct spa_log_topic *t)
-{
-	struct impl *impl = object;
-	enum spa_log_level level = impl->log.level;
-
-	support_log_topic_init(&impl->patterns, level, t);
-}
-
 static const struct spa_log_methods impl_log = {
 	SPA_VERSION_LOG_METHODS,
 	.log = impl_log_log,
 	.logv = impl_log_logv,
 	.logt = impl_log_logt,
 	.logtv = impl_log_logtv,
-	.topic_init = impl_log_topic_init,
 };
 
 static int impl_get_interface(struct spa_handle *handle, const char *type, void **interface)
@@ -180,12 +187,11 @@
 
 static int impl_clear(struct spa_handle *handle)
 {
-	struct impl *this;
+	struct impl SPA_UNUSED *this;
 
 	spa_return_val_if_fail(handle != NULL, -EINVAL);
 
 	this = (struct impl *) handle;
-	support_log_free_patterns(&this->patterns);
 
 	return 0;
 }
@@ -251,13 +257,9 @@
 			&impl_log, impl);
 	impl->log.level = DEFAULT_LOG_LEVEL;
 
-	spa_list_init(&impl->patterns);
-
 	if (info) {
 		if ((str = spa_dict_lookup(info, SPA_KEY_LOG_LEVEL)) != NULL)
 			impl->log.level = atoi(str);
-		if ((str = spa_dict_lookup(info, SPA_KEY_LOG_PATTERNS)) != NULL)
-			support_log_parse_patterns(&impl->patterns, str);
 	}
 
 	/* if our stderr goes to the journal, there's no point in logging both
@@ -268,7 +270,7 @@
 	else
 		impl->chain_log = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_Log);
 
-	spa_log_debug(&impl->log, NAME " %p: initialized", impl);
+	spa_log_debug(&impl->log, "%p: initialized", impl);
 
 	return 0;
 }
@@ -307,6 +309,7 @@
 	.enum_interface_info = impl_enum_interface_info,
 };
 
+SPA_LOG_TOPIC_ENUM_DEFINE_REGISTERED;
 
 SPA_EXPORT
 int spa_handle_factory_enum(const struct spa_handle_factory **factory, uint32_t *index)

pipewire-1.0.1.tar.bz2/spa/plugins/support/logger.c -> pipewire-1.2.0.tar.gz/spa/plugins/support/logger.c Changed

@@ -20,13 +20,13 @@
 #include <spa/utils/string.h>
 #include <spa/utils/ansi.h>
 
-#include "log-patterns.h"
-
 #if defined(__FreeBSD__) || defined(__MidnightBSD__)
 #define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC
 #endif
 
-#define NAME "logger"
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.logger");
 
 #define DEFAULT_LOG_LEVEL SPA_LOG_LEVEL_INFO
 
@@ -48,8 +48,6 @@
 	unsigned int colors:1;
 	unsigned int timestamp:1;
 	unsigned int line:1;
-
-	struct spa_list patterns;
 };
 
 static SPA_PRINTF_FUNC(7,0) void
@@ -94,8 +92,8 @@
 	if (impl->timestamp) {
 		struct timespec now;
 		clock_gettime(CLOCK_MONOTONIC_RAW, &now);
-		spa_scnprintf(timestamp, sizeof(timestamp), "%05lu.%06lu",
-			(now.tv_sec & 0x1FFFFFFF) % 100000, now.tv_nsec / 1000);
+		spa_scnprintf(timestamp, sizeof(timestamp), "%05jd.%06jd",
+			(intmax_t) (now.tv_sec & 0x1FFFFFFF) % 100000, (intmax_t) now.tv_nsec / 1000);
 	}
 
 	if (topic && topic->topic)
@@ -221,22 +219,12 @@
         }
 }
 
-static void
-impl_log_topic_init(void *object, struct spa_log_topic *t)
-{
-	struct impl *impl = object;
-	enum spa_log_level level = impl->log.level;
-
-	support_log_topic_init(&impl->patterns, level, t);
-}
-
 static const struct spa_log_methods impl_log = {
 	SPA_VERSION_LOG_METHODS,
 	.log = impl_log_log,
 	.logv = impl_log_logv,
 	.logt = impl_log_logt,
 	.logtv = impl_log_logtv,
-	.topic_init = impl_log_topic_init,
 };
 
 static int impl_get_interface(struct spa_handle *handle, const char *type, void **interface)
@@ -264,8 +252,6 @@
 
 	this = (struct impl *) handle;
 
-	support_log_free_patterns(&this->patterns);
-
 	if (this->close_file && this->file != NULL)
 		fclose(this->file);
 
@@ -313,7 +299,6 @@
 
 	loop = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_Loop);
 	this->system = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_System);
-	spa_list_init(&this->patterns);
 
 	if (loop != NULL && this->system != NULL) {
 		this->source.func = on_trace_event;
@@ -358,8 +343,6 @@
 					this->close_file = true;
 			}
 		}
-		if ((str = spa_dict_lookup(info, SPA_KEY_LOG_PATTERNS)) != NULL)
-			support_log_parse_patterns(&this->patterns, str);
 	}
 	if (this->file == NULL) {
 		this->file = stderr;
@@ -370,13 +353,13 @@
 	if (linebuf)
 		setlinebuf(this->file);
 
-	if (!isatty(fileno(this->file)) && !force_colors) {
+	if (this->colors && !force_colors && !isatty(fileno(this->file)) ) {
 		this->colors = false;
 	}
 
 	spa_ringbuffer_init(&this->trace_rb);
 
-	spa_log_debug(&this->log, NAME " %p: initialized to %s linebuf:%u", this, dest, linebuf);
+	spa_log_debug(&this->log, "%p: initialized to %s linebuf:%u", this, dest, linebuf);
 
 	return 0;
 }

pipewire-1.0.1.tar.bz2/spa/plugins/support/loop.c -> pipewire-1.2.0.tar.gz/spa/plugins/support/loop.c Changed

@@ -9,12 +9,15 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <pthread.h>
+#include <threads.h>
 
 #include <spa/support/loop.h>
 #include <spa/support/system.h>
 #include <spa/support/log.h>
 #include <spa/support/plugin.h>
 #include <spa/utils/list.h>
+#include <spa/utils/cleanup.h>
+#include <spa/utils/atomic.h>
 #include <spa/utils/names.h>
 #include <spa/utils/ratelimit.h>
 #include <spa/utils/result.h>
@@ -22,14 +25,17 @@
 #include <spa/utils/ringbuffer.h>
 #include <spa/utils/string.h>
 
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.loop");
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.loop");
+
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
 
+
 #define MAX_ALIGN	8
 #define ITEM_ALIGN	8
 #define DATAS_SIZE	(4096*8)
 #define MAX_EP		32
+#define DEFAULT_RETRY	(1 * SPA_USEC_PER_SEC)
 
 /** \cond */
 
@@ -37,6 +43,7 @@
 	size_t item_size;
 	spa_invoke_func_t func;
 	uint32_t seq;
+	uint32_t count;
 	void *data;
 	size_t size;
 	bool block;
@@ -57,22 +64,34 @@
 
 	struct spa_list source_list;
 	struct spa_list destroy_list;
+	struct spa_list queue_list;
 	struct spa_hook_list hooks_list;
+	int retry_timeout;
 
 	int poll_fd;
 	pthread_t thread;
 	int enter_count;
 
 	struct spa_source *wakeup;
+
+	tss_t queue_tss_id;
+	pthread_mutex_t queue_lock;
+	uint32_t count;
+	uint32_t flush_count;
+
+	unsigned int polling:1;
+};
+
+struct queue {
+	struct impl *impl;
+	struct spa_list link;
+
 	int ack_fd;
 	struct spa_ratelimit rate_limit;
 
 	struct spa_ringbuffer buffer;
 	uint8_t *buffer_data;
 	uint8_t buffer_memDATAS_SIZE + MAX_ALIGN;
-
-	uint32_t flush_count;
-	unsigned int polling:1;
 };
 
 struct source_impl {
@@ -153,29 +172,46 @@
 	return res;
 }
 
-static void flush_items(struct impl *impl)
+static inline int32_t item_compare(struct invoke_item *a, struct invoke_item *b)
+{
+	return (int32_t)(a->count - b->count);
+}
+
+static void flush_all_queues(struct impl *impl)
 {
-	uint32_t index, flush_count;
-	int32_t avail;
+	uint32_t flush_count;
 	int res;
 
+	pthread_mutex_lock(&impl->queue_lock);
 	flush_count = ++impl->flush_count;
-	avail = spa_ringbuffer_get_read_index(&impl->buffer, &index);
-	while (avail > 0) {
-		struct invoke_item *item;
-		bool block;
+	while (true) {
+		struct queue *cqueue, *queue;
+		struct invoke_item *citem, *item = NULL;
+		uint32_t cindex, index;
 		spa_invoke_func_t func;
+		bool block;
 
-		item = SPA_PTROFF(impl->buffer_data, index & (DATAS_SIZE - 1), struct invoke_item);
-		block = item->block;
-		func = item->func;
+		spa_list_for_each(cqueue, &impl->queue_list, link) {
+			if (spa_ringbuffer_get_read_index(&cqueue->buffer, &cindex) <
+					(int32_t)sizeof(struct invoke_item))
+				continue;
+			citem = SPA_PTROFF(cqueue->buffer_data, cindex & (DATAS_SIZE - 1), struct invoke_item);
+
+			if (item == NULL || item_compare(citem, item) < 0) {
+				item = citem;
+				queue = cqueue;
+				index = cindex;
+			}
+		}
+		if (item == NULL)
+			break;
 
-		spa_log_trace_fp(impl->log, "%p: flush item %p", impl, item);
+		spa_log_trace_fp(impl->log, "%p: flush item %p", queue, item);
 		/* first we remove the function from the item so that recursive
 		 * calls don't call the callback again. We can't update the
 		 * read index before we call the function because then the item
 		 * might get overwritten. */
-		item->func = NULL;
+		func = spa_steal_ptr(item->func);
 		if (func)
 			item->res = func(&impl->loop, true, item->seq, item->data,
 				item->size, item->user_data);
@@ -186,35 +222,20 @@
 			break;
 
 		index += item->item_size;
-		avail -= item->item_size;
-		spa_ringbuffer_read_update(&impl->buffer, index);
+		block = item->block;
+		spa_ringbuffer_read_update(&queue->buffer, index);
 
 		if (block) {
-			if ((res = spa_system_eventfd_write(impl->system, impl->ack_fd, 1)) < 0)
+			if ((res = spa_system_eventfd_write(impl->system, queue->ack_fd, 1)) < 0)
 				spa_log_warn(impl->log, "%p: failed to write event fd:%d: %s",
-						impl, impl->ack_fd, spa_strerror(res));
+						queue, queue->ack_fd, spa_strerror(res));
 		}
 	}
+	pthread_mutex_unlock(&impl->queue_lock);
 }
 
 static int
-loop_invoke_inthread(struct impl *impl,
-		spa_invoke_func_t func,
-		uint32_t seq,
-		const void *data,
-		size_t size,
-		bool block,
-		void *user_data)
-{
-	/* we should probably have a second ringbuffer for the in-thread pending
-	 * callbacks. A recursive callback when flushing will insert itself
-	 * before this one. */
-	flush_items(impl);
-	return func ? func(&impl->loop, true, seq, data, size, user_data) : 0;
-}
-
-static int
-loop_invoke(void *object,
+loop_queue_invoke(void *object,
 	    spa_invoke_func_t func,
 	    uint32_t seq,
 	    const void *data,
@@ -222,27 +243,25 @@
 	    bool block,
 	    void *user_data)
 {
-	struct impl *impl = object;
+	struct queue *queue = object;
+	struct impl *impl = queue->impl;
 	struct invoke_item *item;
-	int res;
+	int res, suppressed;
 	int32_t filled;
 	uint32_t avail, idx, offset, l0;
+	size_t need;
+	uint64_t nsec;
+	bool in_thread;
 
-	/* the ringbuffer can only be written to from one thread, if we are
-	 * in the same thread as the loop, don't write into the ringbuffer
-	 * but try to emit the calback right away after flushing what we have */
-	if (impl->thread == 0 || pthread_equal(impl->thread, pthread_self()))
-		return loop_invoke_inthread(impl, func, seq, data, size, block, user_data);
+	in_thread = (impl->thread == 0 || pthread_equal(impl->thread, pthread_self()));
 
-	filled = spa_ringbuffer_get_write_index(&impl->buffer, &idx);
-	if (filled < 0 || filled > DATAS_SIZE) {
-		spa_log_warn(impl->log, "%p: queue xrun %d", impl, filled);
-		return -EPIPE;
-	}
-	avail = DATAS_SIZE - filled;
+retry:
+	filled = spa_ringbuffer_get_write_index(&queue->buffer, &idx);
+	spa_assert_se(filled >= 0 && filled <= DATAS_SIZE && "queue xrun");
+	avail = (uint32_t)(DATAS_SIZE - filled);
 	if (avail < sizeof(struct invoke_item)) {
-		spa_log_warn(impl->log, "%p: queue full %d", impl, avail);
-		return -EPIPE;
+		need = sizeof(struct invoke_item);
+		goto xrun;
 	}
 	offset = idx & (DATAS_SIZE - 1);
 
@@ -250,16 +269,17 @@
 	 * invoke_item, see below */
 	l0 = DATAS_SIZE - offset;
 
-	item = SPA_PTROFF(impl->buffer_data, offset, struct invoke_item);
+	item = SPA_PTROFF(queue->buffer_data, offset, struct invoke_item);
 	item->func = func;
 	item->seq = seq;
+	item->count = SPA_ATOMIC_INC(impl->count);
 	item->size = size;
-	item->block = block;
+	item->block = in_thread ? false : block;
 	item->user_data = user_data;
 	item->res = 0;
 	item->item_size = SPA_ROUND_UP_N(sizeof(struct invoke_item) + size, ITEM_ALIGN);
 
-	spa_log_trace_fp(impl->log, "%p: add item %p filled:%d", impl, item, filled);
+	spa_log_trace_fp(impl->log, "%p: add item %p filled:%d", queue, item, filled);
 
 	if (l0 >= item->item_size) {
 		/* item + size fit in current ringbuffer idx */
@@ -272,51 +292,130 @@
 	} else {
 		/* item does not fit, place the invoke_item at idx and start the
 		 * data at the start of the ringbuffer */
-		item->data = impl->buffer_data;
+		item->data = queue->buffer_data;
 		item->item_size = SPA_ROUND_UP_N(l0 + size, ITEM_ALIGN);
 	}
 	if (avail < item->item_size) {
-		int suppressed;
-		uint64_t nsec = get_time_ns(impl->system);
-		if ((suppressed = spa_ratelimit_test(&impl->rate_limit, nsec)) >= 0) {
-			spa_log_warn(impl->log, "%p: queue full %d, need %zd (%d suppressed)",
-					impl, avail, item->item_size, suppressed);
-		}
-		return -EPIPE;
+		need = item->item_size;
+		goto xrun;
 	}
 	if (data && size > 0)
 		memcpy(item->data, data, size);
 
-	spa_ringbuffer_write_update(&impl->buffer, idx + item->item_size);
+	spa_ringbuffer_write_update(&queue->buffer, idx + item->item_size);
 
-	loop_signal_event(impl, impl->wakeup);
+	if (in_thread) {
+		flush_all_queues(impl);
+		res = item->res;
+	} else {
+		loop_signal_event(impl, impl->wakeup);
 
-	if (block) {
-		uint64_t count = 1;
+		if (block) {
+			uint64_t count = 1;
 
-		spa_loop_control_hook_before(&impl->hooks_list);
+			spa_loop_control_hook_before(&impl->hooks_list);
 
-		if ((res = spa_system_eventfd_read(impl->system, impl->ack_fd, &count)) < 0)
-			spa_log_warn(impl->log, "%p: failed to read event fd:%d: %s",
-					impl, impl->ack_fd, spa_strerror(res));
+			if ((res = spa_system_eventfd_read(impl->system, queue->ack_fd, &count)) < 0)
+				spa_log_warn(impl->log, "%p: failed to read event fd:%d: %s",
+						queue, queue->ack_fd, spa_strerror(res));
 
-		spa_loop_control_hook_after(&impl->hooks_list);
+			spa_loop_control_hook_after(&impl->hooks_list);
 
-		res = item->res;
-	}
-	else {
-		if (seq != SPA_ID_INVALID)
-			res = SPA_RESULT_RETURN_ASYNC(seq);
-		else
-			res = 0;
+			res = item->res;
+		}
+		else {
+			if (seq != SPA_ID_INVALID)
+				res = SPA_RESULT_RETURN_ASYNC(seq);
+			else
+				res = 0;
+		}
 	}
 	return res;
+
+xrun:
+	nsec = get_time_ns(impl->system);
+	if ((suppressed = spa_ratelimit_test(&queue->rate_limit, nsec)) >= 0) {
+		spa_log_warn(impl->log, "%p: queue full %d, need %zd (%d suppressed)",
+				queue, avail, need, suppressed);
+	}
+	if (impl->retry_timeout == 0)
+		return -EPIPE;
+	usleep(impl->retry_timeout);
+	goto retry;
 }
 
 static void wakeup_func(void *data, uint64_t count)
 {
 	struct impl *impl = data;
-	flush_items(impl);
+	flush_all_queues(impl);
+}
+
+static void loop_queue_destroy(void *data)
+{
+	struct queue *queue = data;
+	struct impl *impl = queue->impl;
+
+	pthread_mutex_lock(&impl->queue_lock);
+	spa_list_remove(&queue->link);
+	pthread_mutex_unlock(&impl->queue_lock);
+
+	spa_system_close(impl->system, queue->ack_fd);
+	free(queue);
+}
+
+static struct queue *loop_create_queue(void *object, uint32_t flags)
+{
+	struct impl *impl = object;
+	struct queue *queue;
+	int res;
+
+	queue = calloc(1, sizeof(struct queue));
+	if (queue == NULL)
+		return NULL;
+
+	queue->impl = impl;
+
+	queue->rate_limit.interval = 2 * SPA_NSEC_PER_SEC;
+	queue->rate_limit.burst = 1;
+
+	queue->buffer_data = SPA_PTR_ALIGN(queue->buffer_mem, MAX_ALIGN, uint8_t);
+	spa_ringbuffer_init(&queue->buffer);
+
+	if ((res = spa_system_eventfd_create(impl->system,
+			SPA_FD_EVENT_SEMAPHORE | SPA_FD_CLOEXEC)) < 0) {
+		spa_log_error(impl->log, "%p: can't create ack event: %s",
+				impl, spa_strerror(res));
+		goto error;
+	}
+	queue->ack_fd = res;
+
+	pthread_mutex_lock(&impl->queue_lock);
+	spa_list_append(&impl->queue_list, &queue->link);
+	pthread_mutex_unlock(&impl->queue_lock);
+
+	spa_log_info(impl->log, "%p created queue %p", impl, queue);
+
+	return queue;
+
+error:
+	free(queue);
+	errno = -res;
+	return NULL;
+}
+
+static int loop_invoke(void *object, spa_invoke_func_t func, uint32_t seq,
+		const void *data, size_t size, bool block, void *user_data)
+{
+	struct impl *impl = object;
+	struct queue *local_queue = tss_get(impl->queue_tss_id);
+
+	if (local_queue == NULL) {
+		local_queue = loop_create_queue(impl, 0);
+		if (local_queue == NULL)
+			return -errno;
+		tss_set(impl->queue_tss_id, local_queue);
+	}
+	return loop_queue_invoke(local_queue, func, seq, data, size, block, user_data);
 }
 
 static int loop_get_fd(void *object)
@@ -366,7 +465,7 @@
 
 	if (--impl->enter_count == 0) {
 		impl->thread = 0;
-		flush_items(impl);
+		flush_all_queues(impl);
 		impl->polling = false;
 	}
 }
@@ -946,6 +1045,7 @@
 {
 	struct impl *impl;
 	struct source_impl *source;
+	struct queue *queue;
 
 	spa_return_val_if_fail(handle != NULL, -EINVAL);
 
@@ -957,9 +1057,12 @@
 
 	spa_list_consume(source, &impl->source_list, link)
 		loop_destroy_source(impl, &source->source);
+	spa_list_consume(queue, &impl->queue_list, link)
+		loop_queue_destroy(queue);
 
-	spa_system_close(impl->system, impl->ack_fd);
 	spa_system_close(impl->system, impl->poll_fd);
+	pthread_mutex_destroy(&impl->queue_lock);
+	tss_delete(impl->queue_tss_id);
 
 	return 0;
 }
@@ -971,6 +1074,15 @@
 	return sizeof(struct impl);
 }
 
+#define CHECK(expression,label)						\
+do {									\
+	if ((errno = (expression)) != 0) {				\
+		res = -errno;						\
+		spa_log_error(impl->log, #expression ": %s", strerror(errno));	\
+		goto label;						\
+	}								\
+} while(false);
+
 static int
 impl_init(const struct spa_handle_factory *factory,
 	  struct spa_handle *handle,
@@ -980,6 +1092,7 @@
 {
 	struct impl *impl;
 	const char *str;
+	pthread_mutexattr_t attr;
 	int res;
 
 	spa_return_val_if_fail(factory != NULL, -EINVAL);
@@ -1002,12 +1115,19 @@
 			SPA_VERSION_LOOP_UTILS,
 			&impl_loop_utils, impl);
 
+	impl->retry_timeout = DEFAULT_RETRY;
 	if (info) {
 		if ((str = spa_dict_lookup(info, "loop.cancel")) != NULL &&
 		    spa_atob(str))
 			impl->control.iface.cb.funcs = &impl_loop_control_cancel;
+		if ((str = spa_dict_lookup(info, "loop.retry-timeout")) != NULL)
+			impl->retry_timeout = atoi(str);
 	}
 
+	CHECK(pthread_mutexattr_init(&attr), error_exit);
+	CHECK(pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE), error_exit);
+	CHECK(pthread_mutex_init(&impl->queue_lock, &attr), error_exit);
+
 	impl->log = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_Log);
 	spa_log_topic_init(impl->log, &log_topic);
 	impl->system = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_System);
@@ -1015,38 +1135,32 @@
 	if (impl->system == NULL) {
 		spa_log_error(impl->log, "%p: a System is needed", impl);
 		res = -EINVAL;
-		goto error_exit;
+		goto error_exit_free_mutex;
 	}
-	impl->rate_limit.interval = 2 * SPA_NSEC_PER_SEC;
-	impl->rate_limit.burst = 1;
-
 	if ((res = spa_system_pollfd_create(impl->system, SPA_FD_CLOEXEC)) < 0) {
 		spa_log_error(impl->log, "%p: can't create pollfd: %s",
 				impl, spa_strerror(res));
-		goto error_exit;
+		goto error_exit_free_mutex;
 	}
 	impl->poll_fd = res;
 
 	spa_list_init(&impl->source_list);
+	spa_list_init(&impl->queue_list);
 	spa_list_init(&impl->destroy_list);
 	spa_hook_list_init(&impl->hooks_list);
 
-	impl->buffer_data = SPA_PTR_ALIGN(impl->buffer_mem, MAX_ALIGN, uint8_t);
-	spa_ringbuffer_init(&impl->buffer);
-
 	impl->wakeup = loop_add_event(impl, wakeup_func, impl);
 	if (impl->wakeup == NULL) {
 		res = -errno;
 		spa_log_error(impl->log, "%p: can't create wakeup event: %m", impl);
 		goto error_exit_free_poll;
 	}
-	if ((res = spa_system_eventfd_create(impl->system,
-			SPA_FD_EVENT_SEMAPHORE | SPA_FD_CLOEXEC)) < 0) {
-		spa_log_error(impl->log, "%p: can't create ack event: %s",
-				impl, spa_strerror(res));
+
+	if (tss_create(&impl->queue_tss_id, (tss_dtor_t)loop_queue_destroy) != 0) {
+		res = -errno;
+		spa_log_error(impl->log, "%p: can't create tss: %m", impl);
 		goto error_exit_free_wakeup;
 	}
-	impl->ack_fd = res;
 
 	spa_log_debug(impl->log, "%p: initialized", impl);
 
@@ -1056,6 +1170,8 @@
 	loop_destroy_source(impl, impl->wakeup);
 error_exit_free_poll:
 	spa_system_close(impl->system, impl->poll_fd);
+error_exit_free_mutex:
+	pthread_mutex_destroy(&impl->queue_lock);
 error_exit:
 	return res;
 }

pipewire-1.0.1.tar.bz2/spa/plugins/support/meson.build -> pipewire-1.2.0.tar.gz/spa/plugins/support/meson.build Changed

pipewire-1.0.1.tar.bz2/spa/plugins/support/node-driver.c -> pipewire-1.2.0.tar.gz/spa/plugins/support/node-driver.c Changed

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <fcntl.h>
-#if !defined(__FreeBSD__) && !defined(__MidnightBSD__)
+#ifdef __linux__
 #include <linux/ethtool.h>
 #include <linux/sockios.h>
 #endif
@@ -27,12 +27,19 @@
 #include <spa/node/utils.h>
 #include <spa/param/param.h>
 
-#define NAME "driver"
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.driver");
+
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
 
 #define DEFAULT_FREEWHEEL	false
 #define DEFAULT_FREEWHEEL_WAIT	10
 #define DEFAULT_CLOCK_PREFIX	"clock.system"
 #define DEFAULT_CLOCK_ID	CLOCK_MONOTONIC
+#define DEFAULT_RESYNC_MS	10
+
+#define CLOCK_OFFSET_NAVG	20
+#define CLOCK_OFFSET_MAX_ERR	(50 * SPA_NSEC_PER_USEC)
 
 #define CLOCKFD 3
 #define FD_TO_CLOCKID(fd)	((~(clockid_t) (fd) << 3) | CLOCKFD)
@@ -46,6 +53,12 @@
 	char clock_name64;
 	clockid_t clock_id;
 	uint32_t freewheel_wait;
+	float resync_ms;
+};
+
+struct clock_offset {
+	int64_t offset;
+	int64_t err;
 };
 
 struct impl {
@@ -81,6 +94,9 @@
 	uint64_t base_time;
 	struct spa_dll dll;
 	double max_error;
+	double max_resync;
+
+	struct clock_offset nsec_offset;
 };
 
 static void reset_props(struct props *props)
@@ -89,6 +105,7 @@
 	spa_zero(props->clock_name);
 	props->clock_id = CLOCK_MONOTONIC;
 	props->freewheel_wait = DEFAULT_FREEWHEEL_WAIT;
+	props->resync_ms = DEFAULT_RESYNC_MS;
 }
 
 static const struct clock_info {
@@ -186,6 +203,68 @@
 	return 0;
 }
 
+static int64_t get_nsec_offset(struct impl *this, uint64_t *now)
+{
+	struct timespec ts1, ts2, ts3;
+	int64_t t1, t2, t3;
+
+	/* Offset between timer clock and monotonic */
+	if (this->timer_clockid == CLOCK_MONOTONIC)
+		return 0;
+
+	spa_system_clock_gettime(this->data_system, CLOCK_MONOTONIC, &ts1);
+	spa_system_clock_gettime(this->data_system, this->timer_clockid, &ts2);
+	spa_system_clock_gettime(this->data_system, CLOCK_MONOTONIC, &ts3);
+
+	t1 = SPA_TIMESPEC_TO_NSEC(&ts1);
+	t2 = SPA_TIMESPEC_TO_NSEC(&ts2);
+	t3 = SPA_TIMESPEC_TO_NSEC(&ts3);
+
+	if (now)
+		*now = t3;
+
+	return t1 + (t3 - t1) / 2 - t2;
+}
+
+static int64_t clock_offset_update(struct clock_offset *off, int64_t offset, struct spa_log *log)
+{
+	const int64_t max_resync = CLOCK_OFFSET_MAX_ERR;
+	const int64_t n = CLOCK_OFFSET_NAVG;
+	int64_t err;
+
+	/* Moving average smoothing, discarding outliers */
+	err = offset - off->offset;
+
+	if (SPA_ABS(err) > max_resync) {
+		/* Clock jump */
+		spa_log_info(log, "nsec err %"PRIi64" > max_resync %"PRIi64", resetting",
+				err, max_resync);
+		off->offset = offset;
+		off->err = 0;
+		err = 0;
+	} else if (SPA_ABS(err) / 2 <= off->err) {
+		off->offset += err / n;
+	}
+
+	off->err += (SPA_ABS(err) - off->err) / n;
+
+	spa_log_trace(log, "clock offset %"PRIi64" err:%"PRIi64" abs-err:%"PRIi64,
+			off->offset, err, off->err);
+
+	return off->offset;
+}
+
+static int64_t smooth_nsec_offset(struct impl *this, uint64_t *now)
+{
+	int64_t offset;
+
+	if (this->timer_clockid == CLOCK_MONOTONIC)
+		return 0;
+
+	offset = get_nsec_offset(this, now);
+	return clock_offset_update(&this->nsec_offset, offset, this->log);
+}
+
 static int reassign_follower(struct impl *this)
 {
 	bool following;
@@ -199,7 +278,7 @@
 
 	following = is_following(this);
 	if (following != this->following) {
-		spa_log_debug(this->log, NAME" %p: reassign follower %d->%d", this, this->following, following);
+		spa_log_debug(this->log, "%p: reassign follower %d->%d", this, this->following, following);
 		this->following = following;
 		spa_loop_invoke(this->data_loop, do_set_timers, 0, NULL, 0, true, this);
 	}
@@ -239,7 +318,7 @@
 #if 0
 	return ((__uint128_t)val * num) / denom;
 #else
-	return (double)val / denom * num;
+	return (uint64_t)((double)val / denom * num);
 #endif
 }
 
@@ -254,7 +333,7 @@
 	if ((res = spa_system_timerfd_read(this->data_system,
 				this->timer_source.fd, &expirations)) < 0) {
 		if (res != -EAGAIN)
-			spa_log_error(this->log, NAME " %p: timerfd error: %s",
+			spa_log_error(this->log, "%p: timerfd error: %s",
 					this, spa_strerror(res));
 		return;
 	}
@@ -266,7 +345,7 @@
 		rate = 48000;
 	}
 	if (this->props.freewheel)
-		nsec = gettime_nsec(this, this->props.clock_id);
+		nsec = gettime_nsec(this, this->timer_clockid);
 	else
 		nsec = this->next_time;
 
@@ -281,6 +360,7 @@
 	if (this->last_time == 0) {
 		spa_dll_set_bw(&this->dll, SPA_DLL_BW_MIN, duration, rate);
 		this->max_error = rate * MAX_ERROR_MS / 1000;
+		this->max_resync = rate * this->props.resync_ms / 1000;
 		position = current_position;
 	} else if (SPA_LIKELY(this->clock)) {
 		position = this->clock->position + this->clock->duration;
@@ -288,23 +368,29 @@
 		position = current_position;
 	}
 
-	/* check the elapsed time of the other clock against
-	 * the graph clock elapsed time, feed this error into the
-	 * dll and adjust the timeout of our MONOTONIC clock. */
-	err = (double)position - (double)current_position;
-	if (err > this->max_error)
-		err = this->max_error;
-	else if (err < -this->max_error)
-		err = -this->max_error;
-
 	this->last_time = current_time;
 
 	if (this->props.freewheel) {
 		corr = 1.0;
 		this->next_time = nsec + this->props.freewheel_wait * SPA_NSEC_PER_SEC;
 	} else if (this->tracking) {
+		/* check the elapsed time of the other clock against
+		 * the graph clock elapsed time, feed this error into the
+		 * dll and adjust the timeout of our MONOTONIC clock. */
+		err = (double)position - (double)current_position;
+		if (fabs(err) > this->max_error) {
+			if (fabs(err) > this->max_resync) {
+				spa_log_warn(this->log, "err %f > max_resync %f, resetting",
+						err, this->max_resync);
+				spa_dll_set_bw(&this->dll, SPA_DLL_BW_MIN, duration, rate);
+				position = current_position;
+				err = 0.0;
+			} else {
+				err = SPA_CLAMPD(err, -this->max_error, this->max_error);
+			}
+		}
 		corr = spa_dll_update(&this->dll, err);
-		this->next_time = nsec + duration / corr * 1e9 / rate;
+		this->next_time = (uint64_t)(nsec + duration / corr * 1e9 / rate);
 	} else {
 		corr = 1.0;
 		this->next_time = scale_u64(position + duration, SPA_NSEC_PER_SEC, rate);
@@ -319,13 +405,16 @@
 	}
 
 	if (SPA_LIKELY(this->clock)) {
-		this->clock->nsec = nsec;
+		uint64_t nsec_now = nsec;
+		int64_t nsec_offset = smooth_nsec_offset(this, &nsec_now);
+
+		this->clock->nsec = SPA_MIN(nsec + nsec_offset, nsec_now);
 		this->clock->rate = this->clock->target_rate;
 		this->clock->position = position;
 		this->clock->duration = duration;
 		this->clock->delay = 0;
 		this->clock->rate_diff = corr;
-		this->clock->next_nsec = this->next_time;
+		this->clock->next_nsec = this->next_time + nsec_offset;
 	}
 
 	spa_node_call_ready(&this->callbacks,
@@ -499,7 +588,7 @@
 	return sizeof(struct impl);
 }
 
-int get_phc_index(struct spa_system *s, const char *name) {
+static int get_phc_index(struct spa_system *s, const char *name) {
 #ifdef ETHTOOL_GET_TS_INFO
 	struct ethtool_ts_info info = {0};
 	struct ifreq ifr = {0};
@@ -508,21 +597,19 @@
 	info.cmd = ETHTOOL_GET_TS_INFO;
 	strncpy(ifr.ifr_name, name, IFNAMSIZ - 1);
 	ifr.ifr_data = (char *) &info;
-	fd = socket(AF_INET, SOCK_DGRAM, 0);
 
-	if (fd < 0) {
-		return -1;
-	}
+	fd = socket(AF_INET, SOCK_DGRAM, 0);
+	if (fd < 0)
+		return -errno;
 
 	err = spa_system_ioctl(s, fd, SIOCETHTOOL, &ifr);
 	close(fd);
-	if (err < 0) {
-		return err;
-	}
+	if (err < 0)
+		return -errno;
 
 	return info.phc_index;
 #else
-	return -1;
+	return -ENOTSUP;
 #endif
 }
 
@@ -597,30 +684,33 @@
 			if (this->clock_fd >= 0) {
 				close(this->clock_fd);
 			}
-			this->clock_fd = open(s, O_RDWR);
+			this->clock_fd = open(s, O_RDONLY);
 
 			if (this->clock_fd == -1) {
-				spa_log_warn(this->log, "failed to open clock device '%s'", s);
+				spa_log_warn(this->log, "failed to open clock device '%s': %m", s);
 			} else {
 				this->props.clock_id = FD_TO_CLOCKID(this->clock_fd);
 			}
 		} else if (spa_streq(k, "clock.interface") && this->clock_fd < 0) {
 			int phc_index = get_phc_index(this->data_system, s);
 			if (phc_index < 0) {
-				spa_log_warn(this->log, "failed to get phc device index for interface '%s'", s);
+				spa_log_warn(this->log, "failed to get phc device index for interface '%s': %s",
+						s, spa_strerror(phc_index));
 			} else {
 				char dev19;
 				spa_scnprintf(dev, sizeof(dev), "/dev/ptp%d", phc_index);
-				this->clock_fd = open(dev, O_RDWR);
-			}
-
-			if (this->clock_fd == -1) {
-				spa_log_warn(this->log, "failed to open clock device '%s'", s);
-			} else {
-				this->props.clock_id = FD_TO_CLOCKID(this->clock_fd);
+				this->clock_fd = open(dev, O_RDONLY);
+				if (this->clock_fd == -1) {
+					spa_log_warn(this->log, "failed to open clock device '%s' "
+							"for interface '%s': %m", dev, s);
+				} else {
+					this->props.clock_id = FD_TO_CLOCKID(this->clock_fd);
+				}
 			}
 		} else if (spa_streq(k, "freewheel.wait")) {
 			this->props.freewheel_wait = atoi(s);
+		} else if (spa_streq(k, "resync.ms")) {
+			this->props.resync_ms = (float)atof(s);
 		}
 	}
 	if (this->props.clock_name0 == '\0') {
@@ -633,6 +723,9 @@
 	this->timer_clockid = this->tracking ? CLOCK_MONOTONIC : this->props.clock_id;
 	this->max_error = 128;
 
+	this->nsec_offset.offset = get_nsec_offset(this, NULL);
+	this->nsec_offset.err = 0;
+
 	this->timer_source.func = on_timeout;
 	this->timer_source.data = this;
 	this->timer_source.fd = spa_system_timerfd_create(this->data_system,

pipewire-1.0.1.tar.bz2/spa/plugins/support/null-audio-sink.c -> pipewire-1.2.0.tar.gz/spa/plugins/support/null-audio-sink.c Changed

@@ -29,7 +29,9 @@
 #include <spa/pod/filter.h>
 #include <spa/control/control.h>
 
-#define NAME "null-audio-sink"
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.null-audio-sink");
 
 #define DEFAULT_CLOCK_NAME	"clock.system.monotonic"
 
@@ -37,7 +39,6 @@
 	uint32_t format;
 	uint32_t channels;
 	uint32_t rate;
-	uint32_t n_pos;
 	uint32_t posSPA_AUDIO_MAX_CHANNELS;
 	char clock_name64;
 	unsigned int debug:1;
@@ -49,7 +50,6 @@
 	props->format = 0;
 	props->channels = 0;
 	props->rate = 0;
-	props->n_pos = 0;
 	strncpy(props->clock_name, DEFAULT_CLOCK_NAME, sizeof(props->clock_name));
 	props->debug = false;
 	props->driver = true;
@@ -227,7 +227,7 @@
 
 	following = is_following(this);
 	if (following != this->following) {
-		spa_log_debug(this->log, NAME" %p: reassign follower %d->%d", this, this->following, following);
+		spa_log_debug(this->log, "%p: reassign follower %d->%d", this, this->following, following);
 		this->following = following;
 		spa_loop_invoke(this->data_loop, do_set_timers, 0, NULL, 0, true, this);
 	}
@@ -274,7 +274,7 @@
 	if ((res = spa_system_timerfd_read(this->data_system,
 				this->timer_source.fd, &expirations)) < 0) {
 		if (res != -EAGAIN)
-			spa_log_error(this->log, NAME " %p: timerfd error: %s",
+			spa_log_error(this->log, "%p: timerfd error: %s",
 					this, spa_strerror(res));
 		return;
 	}
@@ -469,10 +469,10 @@
 				SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(DEFAULT_CHANNELS, 1, INT32_MAX),
 				0);
 		}
-		if (this->props.n_pos != 0) {
+		if (this->props.channels != 0) {
 			spa_pod_builder_prop(builder, SPA_FORMAT_AUDIO_position, 0);
 			spa_pod_builder_array(builder, sizeof(uint32_t), SPA_TYPE_Id,
-					this->props.n_pos, this->props.pos);
+					this->props.channels, this->props.pos);
 		}
 		*param = spa_pod_builder_pop(builder, &f0);
 		break;
@@ -573,7 +573,7 @@
 static int clear_buffers(struct impl *this, struct port *port)
 {
 	if (port->n_buffers > 0) {
-		spa_log_info(this->log, NAME " %p: clear buffers", this);
+		spa_log_info(this->log, "%p: clear buffers", this);
 		port->n_buffers = 0;
 		this->started = false;
 	}
@@ -728,7 +728,7 @@
 		b->outbuf = buffersi;
 
 		if (d0.data == NULL) {
-			spa_log_error(this->log, NAME " %p: invalid memory on buffer %p", this,
+			spa_log_error(this->log, "%p: invalid memory on buffer %p", this,
 				      buffersi);
 			return -EINVAL;
 		}
@@ -888,10 +888,10 @@
         if (spa_json_enter_array(&it0, &it1) <= 0)
                 spa_json_init(&it1, val, len);
 
-	this->props.n_pos = 0;
+	this->props.channels = 0;
 	while (spa_json_get_string(&it1, v, sizeof(v)) > 0 &&
-	    this->props.n_pos < SPA_AUDIO_MAX_CHANNELS) {
-		this->props.posthis->props.n_pos++ = channel_from_name(v);
+	    this->props.channels < SPA_AUDIO_MAX_CHANNELS) {
+		this->props.posthis->props.channels++ = channel_from_name(v);
 	}
 }
 
@@ -991,10 +991,7 @@
 					"%s", s);
 		}
 	}
-	if (this->props.n_pos > 0)
-		this->props.channels = this->props.n_pos;
-
-	spa_log_info(this->log, NAME " %p: initialized", this);
+	spa_log_info(this->log, "%p: initialized", this);
 
 	return 0;
 }

pipewire-1.0.1.tar.bz2/spa/plugins/support/plugin.c -> pipewire-1.2.0.tar.gz/spa/plugins/support/plugin.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/support/system.c -> pipewire-1.2.0.tar.gz/spa/plugins/support/system.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/test/fakesink.c -> pipewire-1.2.0.tar.gz/spa/plugins/test/fakesink.c Changed

@@ -22,7 +22,9 @@
 #include <spa/pod/parser.h>
 #include <spa/pod/filter.h>
 
-#define NAME "fakesink"
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.fakesink");
 
 struct props {
 	bool live;
@@ -205,7 +207,7 @@
 		if ((res = spa_system_timerfd_read(this->data_system,
 					this->timer_source.fd, &expirations)) < 0) {
 			if (res != -EAGAIN)
-				spa_log_error(this->log, NAME " %p: timerfd error: %s",
+				spa_log_error(this->log, "%p: timerfd error: %s",
 						this, spa_strerror(res));
 		}
 	}
@@ -231,7 +233,7 @@
 		spa_node_call_ready(&this->callbacks, SPA_STATUS_NEED_DATA);
 	}
 	if (spa_list_is_empty(&port->ready)) {
-		spa_log_error(this->log, NAME " %p: no buffers", this);
+		spa_log_error(this->log, "%p: no buffers", this);
 		return -EPIPE;
 	}
 
@@ -240,7 +242,7 @@
 
 	n_bytes = b->outbuf->datas0.maxsize;
 
-	spa_log_trace(this->log, NAME " %p: dequeue buffer %d", this, b->id);
+	spa_log_trace(this->log, "%p: dequeue buffer %d", this, b->id);
 
 	render_buffer(this, b);
 
@@ -505,7 +507,7 @@
 static int clear_buffers(struct impl *this, struct port *port)
 {
 	if (port->n_buffers > 0) {
-		spa_log_debug(this->log, NAME " %p: clear buffers", this);
+		spa_log_debug(this->log, "%p: clear buffers", this);
 		port->n_buffers = 0;
 		spa_list_init(&port->ready);
 		this->started = false;
@@ -583,7 +585,7 @@
 		b->h = spa_buffer_find_meta_data(buffersi, SPA_META_Header, sizeof(*b->h));
 
 		if (d0.data == NULL) {
-			spa_log_error(this->log, NAME " %p: invalid memory on buffer %p", this,
+			spa_log_error(this->log, "%p: invalid memory on buffer %p", this,
 				      buffersi);
 		}
 	}
@@ -635,13 +637,13 @@
 		struct buffer *b = &port->buffersio->buffer_id;
 
 		if (!b->outstanding) {
-			spa_log_warn(this->log, NAME " %p: buffer %u in use", this,
+			spa_log_warn(this->log, "%p: buffer %u in use", this,
 				     io->buffer_id);
 			io->status = -EINVAL;
 			return -EINVAL;
 		}
 
-		spa_log_trace(this->log, NAME " %p: queue buffer %u", this, io->buffer_id);
+		spa_log_trace(this->log, "%p: queue buffer %u", this, io->buffer_id);
 
 		spa_list_append(&port->ready, &b->link);
 		b->outstanding = false;
@@ -818,7 +820,7 @@
 
 const struct spa_handle_factory spa_fakesink_factory = {
 	SPA_VERSION_HANDLE_FACTORY,
-	NAME,
+	"fakesink",
 	NULL,
 	impl_get_size,
 	impl_init,

pipewire-1.0.1.tar.bz2/spa/plugins/test/fakesrc.c -> pipewire-1.2.0.tar.gz/spa/plugins/test/fakesrc.c Changed

@@ -22,7 +22,9 @@
 #include <spa/pod/parser.h>
 #include <spa/pod/filter.h>
 
-#define NAME "fakesrc"
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.fakesrc");
 
 struct props {
 	bool live;
@@ -220,7 +222,7 @@
 		if ((res = spa_system_timerfd_read(this->data_system,
 					this->timer_source.fd, &expirations)) < 0) {
 			if (res != -EAGAIN)
-				spa_log_error(this->log, NAME " %p: timerfd error: %s",
+				spa_log_error(this->log, "%p: timerfd error: %s",
 						this, spa_strerror(res));
 		}
 	}
@@ -240,7 +242,7 @@
 	if (spa_list_is_empty(&port->empty)) {
 		set_timer(this, false);
 		this->underrun = true;
-		spa_log_error(this->log, NAME " %p: out of buffers", this);
+		spa_log_error(this->log, "%p: out of buffers", this);
 		return -EPIPE;
 	}
 	b = spa_list_first(&port->empty, struct buffer, link);
@@ -249,7 +251,7 @@
 
 	n_bytes = b->outbuf->datas0.maxsize;
 
-	spa_log_trace(this->log, NAME " %p: dequeue buffer %d", this, b->id);
+	spa_log_trace(this->log, "%p: dequeue buffer %d", this, b->id);
 
 	fill_buffer(this, b);
 
@@ -518,7 +520,7 @@
 static int clear_buffers(struct impl *this, struct port *port)
 {
 	if (port->n_buffers > 0) {
-		spa_log_debug(this->log, NAME " %p: clear buffers", this);
+		spa_log_debug(this->log, "%p: clear buffers", this);
 		port->n_buffers = 0;
 		spa_list_init(&port->empty);
 		this->started = false;
@@ -595,7 +597,7 @@
 		b->h = spa_buffer_find_meta_data(buffersi, SPA_META_Header, sizeof(*b->h));
 
 		if (d0.data == NULL) {
-			spa_log_error(this->log, NAME " %p: invalid memory on buffer %p", this,
+			spa_log_error(this->log, "%p: invalid memory on buffer %p", this,
 				      buffersi);
 		}
 		spa_list_append(&port->empty, &b->link);
@@ -633,7 +635,7 @@
 	struct buffer *b = &port->buffersid;
 	spa_return_if_fail(b->outstanding);
 
-	spa_log_trace(this->log, NAME " %p: reuse buffer %d", this, id);
+	spa_log_trace(this->log, "%p: reuse buffer %d", this, id);
 
 	b->outstanding = false;
 	spa_list_append(&port->empty, &b->link);
@@ -848,7 +850,7 @@
 
 const struct spa_handle_factory spa_fakesrc_factory = {
 	SPA_VERSION_HANDLE_FACTORY,
-	NAME,
+	"fakesrc",
 	NULL,
 	impl_get_size,
 	impl_init,

pipewire-1.0.1.tar.bz2/spa/plugins/test/plugin.c -> pipewire-1.2.0.tar.gz/spa/plugins/test/plugin.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/v4l2/meson.build -> pipewire-1.2.0.tar.gz/spa/plugins/v4l2/meson.build Changed

pipewire-1.0.1.tar.bz2/spa/plugins/v4l2/v4l2-device.c -> pipewire-1.2.0.tar.gz/spa/plugins/v4l2/v4l2-device.c Changed

@@ -23,15 +23,17 @@
 
 #include "v4l2.h"
 
-#define NAME "v4l2-device"
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.v4l2-device");
 
 static const char default_device = "/dev/video0";
 
 struct props {
 	char device64;
 	char devnum32;
-	char product_id6;
-	char vendor_id6;
+	char product_id7;
+	char vendor_id7;
 	int device_fd;
 };
 
@@ -60,7 +62,8 @@
 	uint32_t n_items = 0;
 	struct spa_device_info info;
 	struct spa_param_info params2;
-	char path128, version16, capabilities16, device_caps16;
+	char path128, version16, capabilities16, device_caps16, devices_str16;
+	struct spa_strbuf buf;
 
 	if ((res = spa_v4l2_open(&this->dev, this->props.device)) < 0)
 		return res;
@@ -79,7 +82,14 @@
 	if (this->props.vendor_id0)
 		ADD_ITEM(SPA_KEY_DEVICE_VENDOR_ID, this->props.vendor_id);
 	ADD_ITEM(SPA_KEY_API_V4L2_PATH, (char *)this->props.device);
-	ADD_ITEM(SPA_KEY_DEVICE_DEVIDS, (char *)this->props.devnum);
+
+	/* encode device number into a json array */
+	spa_strbuf_init(&buf, devices_str, sizeof(devices_str));
+	spa_strbuf_append(&buf, " ");
+	spa_strbuf_append(&buf, "%s", this->props.devnum);
+	spa_strbuf_append(&buf, " ");
+	ADD_ITEM(SPA_KEY_DEVICE_DEVIDS, devices_str);
+
 	ADD_ITEM(SPA_KEY_API_V4L2_CAP_DRIVER, (char *)this->dev.cap.driver);
 	ADD_ITEM(SPA_KEY_API_V4L2_CAP_CARD, (char *)this->dev.cap.card);
 	ADD_ITEM(SPA_KEY_API_V4L2_CAP_BUS_INFO, (char *)this->dev.cap.bus_info);
@@ -234,13 +244,13 @@
 	reset_props(&this->props);
 
 	if (info && (str = spa_dict_lookup(info, SPA_KEY_API_V4L2_PATH)))
-		strncpy(this->props.device, str, 63);
+		strncpy(this->props.device, str, sizeof(this->props.device)-1);
 	if (info && (str = spa_dict_lookup(info, SPA_KEY_DEVICE_DEVIDS)))
-		strncpy(this->props.devnum, str, 31);
+		strncpy(this->props.devnum, str, sizeof(this->props.devnum)-1);
 	if (info && (str = spa_dict_lookup(info, SPA_KEY_DEVICE_PRODUCT_ID)))
-		strncpy(this->props.product_id, str, 5);
+		strncpy(this->props.product_id, str, sizeof(this->props.product_id)-1);
 	if (info && (str = spa_dict_lookup(info, SPA_KEY_DEVICE_VENDOR_ID)))
-		strncpy(this->props.vendor_id, str, 5);
+		strncpy(this->props.vendor_id, str, sizeof(this->props.vendor_id)-1);
 
 	return 0;
 }

pipewire-1.0.1.tar.bz2/spa/plugins/v4l2/v4l2-source.c -> pipewire-1.2.0.tar.gz/spa/plugins/v4l2/v4l2-source.c Changed

@@ -26,6 +26,7 @@
 #include <spa/param/latency-utils.h>
 #include <spa/pod/filter.h>
 #include <spa/control/control.h>
+#include <spa/debug/types.h>
 
 #include "v4l2.h"
 
@@ -54,6 +55,7 @@
 	struct spa_list link;
 	struct spa_buffer *outbuf;
 	struct spa_meta_header *h;
+	struct spa_meta_videotransform *vt;
 	struct v4l2_buffer v4l2_buffer;
 	void *ptr;
 };
@@ -71,6 +73,7 @@
 	struct impl *impl;
 
 	bool alloc_buffers;
+	bool probed_expbuf;
 	bool have_expbuf;
 
 	bool next_fmtdesc;
@@ -81,7 +84,6 @@
 
 	bool have_format;
 	struct spa_video_info current_format;
-	struct spa_fraction rate;
 
 	struct spa_v4l2_device dev;
 
@@ -121,6 +123,8 @@
 	struct spa_log *log;
 	struct spa_loop *data_loop;
 
+	enum spa_meta_videotransform_value transform;
+
 	uint64_t info_all;
 	struct spa_node_info info;
 #define NODE_PropInfo	0
@@ -149,15 +153,14 @@
 
 #include "v4l2-utils.c"
 
-static const struct spa_dict_item info_items = {
-	{ SPA_KEY_DEVICE_API, "v4l2" },
-	{ SPA_KEY_MEDIA_CLASS, "Video/Source" },
-	{ SPA_KEY_MEDIA_ROLE, "Camera" },
-	{ SPA_KEY_NODE_DRIVER, "true" },
-};
-
 static void emit_node_info(struct impl *this, bool full)
 {
+	static const struct spa_dict_item info_items = {
+		{ SPA_KEY_DEVICE_API, "v4l2" },
+		{ SPA_KEY_MEDIA_CLASS, "Video/Source" },
+		{ SPA_KEY_MEDIA_ROLE, "Camera" },
+		{ SPA_KEY_NODE_DRIVER, "true" },
+	};
 	uint64_t old = full ? this->info.change_mask : 0;
 	if (full)
 		this->info.change_mask = this->info_all;
@@ -170,10 +173,14 @@
 
 static void emit_port_info(struct impl *this, struct port *port, bool full)
 {
+	static const struct spa_dict_item info_items = {
+		{ SPA_KEY_PORT_GROUP, "stream.0" },
+	};
 	uint64_t old = full ? port->info.change_mask : 0;
 	if (full)
 		port->info.change_mask = port->info_all;
 	if (port->info.change_mask) {
+		port->info.props = &SPA_DICT_INIT_ARRAY(info_items);
 		spa_node_emit_port_info(&this->hooks,
 				SPA_DIRECTION_OUTPUT, 0, &port->info);
 		port->info.change_mask = old;
@@ -580,6 +587,12 @@
 				SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header),
 				SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header)));
 			break;
+		case 1:
+			param = spa_pod_builder_add_object(&b,
+				SPA_TYPE_OBJECT_ParamMeta, id,
+				SPA_PARAM_META_type, SPA_POD_Id(SPA_META_VideoTransform),
+				SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_videotransform)));
+			break;
 		default:
 			return 0;
 		}
@@ -695,11 +708,19 @@
     done:
 	this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
 	port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
+	port->paramsPORT_Latency.flags ^= SPA_PARAM_INFO_SERIAL;
 	if (port->have_format) {
+		uint64_t latency;
+		latency = port->info.rate.num * SPA_NSEC_PER_SEC / port->info.rate.denom;
+		this->latencySPA_DIRECTION_OUTPUT =
+			SPA_LATENCY_INFO(SPA_DIRECTION_OUTPUT,
+					.min_ns = latency,
+					.max_ns = latency);
 		port->paramsPORT_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READWRITE);
 		port->paramsPORT_Buffers = SPA_PARAM_INFO(SPA_PARAM_Buffers, SPA_PARAM_INFO_READ);
 		this->paramsNODE_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READ);
 	} else {
+		this->latencySPA_DIRECTION_OUTPUT = SPA_LATENCY_INFO(SPA_DIRECTION_OUTPUT);
 		port->paramsPORT_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
 		port->paramsPORT_Buffers = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
 		this->paramsNODE_Format = SPA_PARAM_INFO(SPA_PARAM_Format, 0);
@@ -715,7 +736,7 @@
 				    uint32_t id, uint32_t flags,
 				    const struct spa_pod *param)
 {
-	int res;
+	int res = 0;
 	struct impl *this = object;
 	struct port *port;
 
@@ -957,8 +978,8 @@
 	  uint32_t n_support)
 {
 	struct impl *this;
-	const char *str;
 	struct port *port;
+	uint32_t i;
 	int res;
 
 	spa_return_val_if_fail(factory != NULL, -EINVAL);
@@ -1005,6 +1026,7 @@
 	port->impl = this;
 	spa_list_init(&port->queue);
 	port->info_all = SPA_PORT_CHANGE_MASK_FLAGS |
+			SPA_PORT_CHANGE_MASK_PROPS |
 			SPA_PORT_CHANGE_MASK_PARAMS;
 	port->info = SPA_PORT_INFO_INIT();
 	port->info.flags = SPA_PORT_FLAG_LIVE |
@@ -1020,19 +1042,23 @@
 	port->info.params = port->params;
 	port->info.n_params = N_PORT_PARAMS;
 
-	port->alloc_buffers = true;
-	port->have_expbuf = true;
+	port->probed_expbuf = false;
 	port->have_query_ext_ctrl = true;
 	port->dev.log = this->log;
 	port->dev.fd = -1;
 
-	if (info && (str = spa_dict_lookup(info, SPA_KEY_API_V4L2_PATH))) {
-		strncpy(this->props.device, str, 63);
-		if ((res = spa_v4l2_open(&port->dev, this->props.device)) < 0)
-			return res;
-		spa_v4l2_close(&port->dev);
+	for (i = 0; info && i < info->n_items; i++) {
+		const char *k = info->itemsi.key;
+		const char *s = info->itemsi.value;
+		if (spa_streq(k, SPA_KEY_API_V4L2_PATH)) {
+			strncpy(this->props.device, s, 63);
+			if ((res = spa_v4l2_open(&port->dev, this->props.device)) < 0)
+				return res;
+			spa_v4l2_close(&port->dev);
+		} else if (spa_streq(k, "meta.videotransform.transform")) {
+			this->transform = spa_debug_type_find_type_short(spa_type_meta_videotransform_type, s);
+		}
 	}
-
 	return 0;
 }

pipewire-1.0.1.tar.bz2/spa/plugins/v4l2/v4l2-udev.c -> pipewire-1.2.0.tar.gz/spa/plugins/v4l2/v4l2-udev.c Changed

@@ -24,20 +24,20 @@
 #include <spa/monitor/device.h>
 #include <spa/monitor/utils.h>
 
-#define NAME "v4l2-udev"
+#include "v4l2.h"
 
 #define MAX_DEVICES	64
 
-#define ACTION_ADD	0
-#define ACTION_REMOVE	1
-#define ACTION_DISABLE	2
+enum action {
+	ACTION_CHANGE,
+	ACTION_REMOVE,
+};
 
 struct device {
 	uint32_t id;
 	struct udev_device *dev;
 	int inotify_wd;
 	unsigned int accessible:1;
-	unsigned int ignored:1;
 	unsigned int emitted:1;
 };
 
@@ -358,48 +358,47 @@
 	return device->accessible;
 }
 
-static void process_device(struct impl *this, uint32_t action, struct udev_device *dev)
+static void process_device(struct impl *this, enum action action, struct device *device)
 {
-	uint32_t id;
-	struct device *device;
-	bool emitted;
-
-	if ((id = get_device_id(this, dev)) == SPA_ID_INVALID)
-		return;
-
-	device = find_device(this, id);
-	if (device && device->ignored)
-		return;
-
 	switch (action) {
-	case ACTION_ADD:
-		if (device == NULL)
-			device = add_device(this, id, dev);
-		if (device == NULL)
-			return;
-		if (!check_access(this, device))
-			return;
-		emit_object_info(this, device);
+	case ACTION_CHANGE:
+		check_access(this, device);
+		if (device->accessible && !device->emitted) {
+			emit_object_info(this, device);
+		} else if (!device->accessible && device->emitted) {
+			device->emitted = false;
+			spa_device_emit_object_info(&this->hooks, device->id, NULL);
+		}
 		break;
+	case ACTION_REMOVE: {
+		bool emitted = device->emitted;
+		uint32_t id = device->id;
 
-	case ACTION_REMOVE:
-		if (device == NULL)
-			return;
-		emitted = device->emitted;
 		remove_device(this, device);
-		if (emitted)
-			spa_device_emit_object_info(&this->hooks, id, NULL);
-		break;
 
-	case ACTION_DISABLE:
-		if (device == NULL)
-			return;
-		if (device->emitted) {
-			device->emitted = false;
+		if (emitted)
 			spa_device_emit_object_info(&this->hooks, id, NULL);
-		}
 		break;
 	}
+	}
+}
+
+static void process_udev_device(struct impl *this, enum action action, struct udev_device *udev_device)
+{
+	struct device *device;
+	uint32_t id;
+
+	if ((id = get_device_id(this, udev_device)) == SPA_ID_INVALID)
+		return;
+
+	device = find_device(this, id);
+	if (action == ACTION_CHANGE && !device)
+		device = add_device(this, id, udev_device);
+
+	if (!device)
+		return;
+
+	process_device(this, action, device);
 }
 
 static int stop_inotify(struct impl *this)
@@ -431,8 +430,6 @@
 		void *p, *e;
 
 		len = read(source->fd, &buf, sizeof(buf));
-		if (len < 0 && errno != EAGAIN)
-			break;
 		if (len <= 0)
 			break;
 
@@ -441,25 +438,23 @@
 		for (p = &buf; p < e;
 		    p = SPA_PTROFF(p, sizeof(struct inotify_event) + event->len, void)) {
 			event = (const struct inotify_event *) p;
+			struct device *device = NULL;
 
-			if ((event->mask & IN_ATTRIB)) {
-				struct device *device = NULL;
-
-				for (size_t i = 0; i < this->n_devices; i++) {
-					if (this->devicesi.inotify_wd == event->wd) {
-						device = &this->devicesi;
-						break;
-					}
+			for (size_t i = 0; i < this->n_devices; i++) {
+				if (this->devicesi.inotify_wd == event->wd) {
+					device = &this->devicesi;
+					break;
 				}
+			}
 
-				spa_assert(device);
+			if (!device)
+				continue;
 
-				bool access = check_access(this, device);
-				if (access && !device->emitted)
-					process_device(this, ACTION_ADD, device->dev);
-				else if (!access && device->emitted)
-					process_device(this, ACTION_DISABLE, device->dev);
-			}
+			if (event->mask & IN_ATTRIB)
+				process_device(this, ACTION_CHANGE, device);
+
+			if (event->mask & IN_IGNORED)
+				device->inotify_wd = -1;
 		}
 	}
 }
@@ -507,9 +502,9 @@
 
 	if (spa_streq(action, "add") ||
 	    spa_streq(action, "change")) {
-		process_device(this, ACTION_ADD, dev);
+		process_udev_device(this, ACTION_CHANGE, dev);
 	} else if (spa_streq(action, "remove")) {
-		process_device(this, ACTION_REMOVE, dev);
+		process_udev_device(this, ACTION_REMOVE, dev);
 	}
 	udev_device_unref(dev);
 }
@@ -579,7 +574,7 @@
 		if (dev == NULL)
 			continue;
 
-		process_device(this, ACTION_ADD, dev);
+		process_udev_device(this, ACTION_CHANGE, dev);
 
 		udev_device_unref(dev);
 	}

pipewire-1.0.1.tar.bz2/spa/plugins/v4l2/v4l2-utils.c -> pipewire-1.2.0.tar.gz/spa/plugins/v4l2/v4l2-utils.c Changed

@@ -367,11 +367,11 @@
 	return NULL;
 }
 
-static uint32_t
+static int
 enum_filter_format(uint32_t media_type, int32_t media_subtype,
 		   const struct spa_pod *filter, uint32_t index)
 {
-	uint32_t video_format = 0;
+	uint32_t video_format = SPA_VIDEO_FORMAT_UNKNOWN;
 
 	switch (media_type) {
 	case SPA_MEDIA_TYPE_video:
@@ -383,11 +383,10 @@
 			const uint32_t *values;
 
 			if (!(p = spa_pod_find_prop(filter, NULL, SPA_FORMAT_VIDEO_format)))
-				return SPA_VIDEO_FORMAT_UNKNOWN;
+				return -ENOENT;
 
 			val = spa_pod_get_values(&p->value, &n_values, &choice);
-
-			if (val->type != SPA_TYPE_Id)
+			if (val->type != SPA_TYPE_Id || n_values == 0)
 				return SPA_VIDEO_FORMAT_UNKNOWN;
 
 			values = SPA_POD_BODY(val);
@@ -503,7 +502,7 @@
 	int res, n_fractions;
 	const struct format_info *info;
 	struct spa_pod_choice *choice;
-	uint32_t filter_media_type, filter_media_subtype, video_format;
+	uint32_t filter_media_type, filter_media_subtype;
 	struct spa_v4l2_device *dev = &port->dev;
 	uint8_t buffer1024;
 	struct spa_pod_builder b = { 0 };
@@ -545,16 +544,19 @@
 		if (filter) {
 			struct v4l2_format fmt;
 
-			video_format = enum_filter_format(filter_media_type,
+			res = enum_filter_format(filter_media_type,
 					    filter_media_subtype,
 					    filter, port->fmtdesc.index);
-
-			if (video_format == SPA_VIDEO_FORMAT_UNKNOWN)
+			if (res == -ENOENT)
+				goto do_enum_fmt;
+			if (res < 0)
+				goto exit;
+			if (res == SPA_VIDEO_FORMAT_UNKNOWN)
 				goto enum_end;
 
 			info = find_format_info_by_media_type(filter_media_type,
 							      filter_media_subtype,
-							      video_format, 0);
+							      res, 0);
 			if (info == NULL)
 				goto next_fmtdesc;
 
@@ -580,6 +582,7 @@
 			}
 
 		} else {
+do_enum_fmt:
 			if ((res = xioctl(dev->fd, VIDIOC_ENUM_FMT, &port->fmtdesc)) < 0) {
 				if (errno == EINVAL)
 					goto enum_end;
@@ -610,7 +613,7 @@
 				goto do_frmsize;
 
 			val = spa_pod_get_values(&p->value, &n_vals, &choice);
-			if (val->type != SPA_TYPE_Rectangle)
+			if (val->type != SPA_TYPE_Rectangle || n_vals == 0)
 				goto enum_end;
 
 			if (choice == SPA_CHOICE_None) {
@@ -648,7 +651,7 @@
 				goto have_size;
 
 			val = spa_pod_get_values(&p->value, &n_values, &choice);
-			if (val->type != SPA_TYPE_Rectangle)
+			if (val->type != SPA_TYPE_Rectangle || n_values == 0)
 				goto have_size;
 
 			values = SPA_POD_BODY_CONST(val);
@@ -768,8 +771,7 @@
 				goto have_framerate;
 
 			val = spa_pod_get_values(&p->value, &n_values, &choice);
-
-			if (val->type != SPA_TYPE_Fraction)
+			if (val->type != SPA_TYPE_Fraction || n_values == 0)
 				goto enum_end;
 
 			values = SPA_POD_BODY(val);
@@ -815,6 +817,7 @@
 						 port->frmival.discrete.denominator,
 						 port->frmival.discrete.numerator);
 			port->frmival.index++;
+			n_fractions++;
 		} else if (port->frmival.type == V4L2_FRMIVAL_TYPE_CONTINUOUS ||
 			   port->frmival.type == V4L2_FRMIVAL_TYPE_STEPWISE) {
 			if (n_fractions == 0)
@@ -828,20 +831,23 @@
 
 			if (port->frmival.type == V4L2_FRMIVAL_TYPE_CONTINUOUS) {
 				choice->body.type = SPA_CHOICE_Range;
+				n_fractions += 2;
 			} else {
 				choice->body.type = SPA_CHOICE_Step;
 				spa_pod_builder_fraction(&b,
 							 port->frmival.stepwise.step.denominator,
 							 port->frmival.stepwise.step.numerator);
+				n_fractions += 3;
 			}
 
 			port->frmsize.index++;
 			port->next_frmsize = true;
 			break;
 		}
-		n_fractions++;
 	}
-	if (n_fractions <= 1)
+	if (n_fractions == 0)
+		goto next_frmsize;
+	if (n_fractions == 1)
 		choice->body.type = SPA_CHOICE_None;
 
 	spa_pod_builder_pop(&b, &f1);
@@ -859,6 +865,48 @@
 	return res;
 }
 
+static int probe_expbuf(struct impl *this)
+{
+	struct port *port = &this->out_ports0;
+	struct spa_v4l2_device *dev = &port->dev;
+	struct v4l2_requestbuffers reqbuf;
+	struct v4l2_exportbuffer expbuf;
+
+	if (port->probed_expbuf)
+		return 0;
+	port->probed_expbuf = true;
+
+	spa_zero(reqbuf);
+	reqbuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+	reqbuf.memory = V4L2_MEMORY_MMAP;
+	reqbuf.count = 2;
+
+	if (xioctl(dev->fd, VIDIOC_REQBUFS, &reqbuf) < 0) {
+		spa_log_error(this->log, "'%s' VIDIOC_REQBUFS: %m", this->props.device);
+		return -errno;
+	}
+
+	spa_zero(expbuf);
+	expbuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+	expbuf.index = 0;
+	expbuf.flags = O_CLOEXEC | O_RDONLY;
+	if (xioctl(dev->fd, VIDIOC_EXPBUF, &expbuf) < 0) {
+		spa_log_info(this->log, "'%s' EXPBUF not supported: %m", this->props.device);
+		port->have_expbuf = false;
+		port->alloc_buffers = false;
+	} else {
+		port->have_expbuf = true;
+		port->alloc_buffers = true;
+	}
+
+	reqbuf.count = 0;
+	if (xioctl(dev->fd, VIDIOC_REQBUFS, &reqbuf) < 0) {
+		spa_log_error(this->log, "'%s' VIDIOC_REQBUFS: %m", this->props.device);
+		return -errno;
+	}
+	return 0;
+}
+
 static int spa_v4l2_set_format(struct impl *this, struct spa_video_info *format, uint32_t flags)
 {
 	struct port *port = &this->out_ports0;
@@ -903,8 +951,9 @@
 	info = find_format_info_by_media_type(format->media_type,
 					      format->media_subtype, video_format, 0);
 	if (info == NULL || size == NULL || framerate == NULL) {
-		spa_log_error(this->log, "unknown media type %d %d %d", format->media_type,
-			      format->media_subtype, video_format);
+		spa_log_error(this->log, "%s: unknown media type %d %d %d",
+				this->props.device, format->media_type,
+				format->media_subtype, video_format);
 		return -EINVAL;
 	}
 
@@ -935,14 +984,15 @@
 
 	/* some cheap USB cam's won't accept any change */
 	if (xioctl(dev->fd, VIDIOC_S_PARM, &streamparm) < 0)
-		spa_log_warn(this->log, "VIDIOC_S_PARM: %m");
+		spa_log_warn(this->log, "%s: VIDIOC_S_PARM: %m", this->props.device);
 
 	match = (reqfmt.fmt.pix.pixelformat == fmt.fmt.pix.pixelformat &&
 			reqfmt.fmt.pix.width == fmt.fmt.pix.width &&
 			reqfmt.fmt.pix.height == fmt.fmt.pix.height);
 
 	if (!match && !SPA_FLAG_IS_SET(flags, SPA_NODE_PARAM_FLAG_NEAREST)) {
-		spa_log_error(this->log, "wanted %.4s %dx%d, got %.4s %dx%d",
+		spa_log_error(this->log, "%s: wanted %.4s %dx%d, got %.4s %dx%d",
+				this->props.device,
 				(char *)&reqfmt.fmt.pix.pixelformat,
 				reqfmt.fmt.pix.width, reqfmt.fmt.pix.height,
 				(char *)&fmt.fmt.pix.pixelformat,
@@ -962,8 +1012,6 @@
 	dev->have_format = true;
 	size->width = fmt.fmt.pix.width;
 	size->height = fmt.fmt.pix.height;
-	port->rate.denom = framerate->num = streamparm.parm.capture.timeperframe.denominator;
-	port->rate.num = framerate->denom = streamparm.parm.capture.timeperframe.numerator;
 
 	port->fmt = fmt;
 	port->info.change_mask |= SPA_PORT_CHANGE_MASK_FLAGS | SPA_PORT_CHANGE_MASK_RATE;
@@ -971,7 +1019,10 @@
 		SPA_PORT_FLAG_LIVE |
 		SPA_PORT_FLAG_PHYSICAL |
 		SPA_PORT_FLAG_TERMINAL;
-	port->info.rate = SPA_FRACTION(port->rate.num, port->rate.denom);
+	port->info.rate.num = streamparm.parm.capture.timeperframe.numerator;
+	port->info.rate.denom = streamparm.parm.capture.timeperframe.denominator;
+
+	probe_expbuf(this);
 
 	return match ? 0 : 1;
 }
@@ -1318,22 +1369,27 @@
 	if (xioctl(dev->fd, VIDIOC_DQBUF, &buf) < 0)
 		return -errno;
 
+	/* Drop the first frame in order to work around common firmware
+	 * timestamp issues */
+	if (buf.sequence == 0)
+		return 0;
+
 	pts = SPA_TIMEVAL_TO_NSEC(&buf.timestamp);
 	spa_log_trace(this->log, "v4l2 %p: have output %d", this, buf.index);
 
 	if (this->clock) {
 		/* FIXME, we should follow the driver clock and target_ values.
 		 * for now we ignore and use our own. */
-		this->clock->target_rate = port->rate;
+		this->clock->target_rate = port->info.rate;
 		this->clock->target_duration = 1;
 
 		this->clock->nsec = pts;
-		this->clock->rate = port->rate;
+		this->clock->rate = port->info.rate;
 		this->clock->position = buf.sequence;
 		this->clock->duration = 1;
 		this->clock->delay = 0;
 		this->clock->rate_diff = 1.0;
-		this->clock->next_nsec = pts + 1000000000LL / port->rate.denom;
+		this->clock->next_nsec = pts + port->info.rate.num * SPA_NSEC_PER_SEC / port->info.rate.denom;
 	}
 
 	b = &port->buffersbuf.index;
@@ -1346,6 +1402,9 @@
 		b->h->pts = pts;
 		b->h->dts_offset = 0;
 	}
+	if (b->vt) {
+		b->vt->transform = this->transform;
+	}
 
 	d = b->outbuf->datas;
 	d0.chunk->offset = 0;
@@ -1424,7 +1483,8 @@
 		} else if (d0.type == SPA_DATA_DmaBuf) {
 			port->memtype = V4L2_MEMORY_DMABUF;
 		} else {
-			spa_log_error(this->log, "can't use buffers of type %d", d0.type);
+			spa_log_error(this->log, "%s: can't use buffers of type %d",
+					this->props.device, d0.type);
 			return -EINVAL;
 		}
 	}
@@ -1453,11 +1513,13 @@
 		b->outbuf = buffersi;
 		b->flags = BUFFER_FLAG_OUTSTANDING;
 		b->h = spa_buffer_find_meta_data(buffersi, SPA_META_Header, sizeof(*b->h));
+		b->vt = spa_buffer_find_meta_data(buffersi, SPA_META_VideoTransform, sizeof(*b->vt));
 
-		spa_log_debug(this->log, "import buffer %p", buffersi);
+		spa_log_debug(this->log, "%s: import buffer %p", this->props.device, buffersi);
 
 		if (buffersi->n_datas < 1) {
-			spa_log_error(this->log, "invalid memory on buffer %p", buffersi);
+			spa_log_error(this->log, "%s: invalid memory on buffer %p",
+					this->props.device, buffersi);
 			return -EINVAL;
 		}
 		d = buffersi->datas;
@@ -1492,8 +1554,8 @@
 			b->v4l2_buffer.m.fd = d0.fd;
 		}
 		else {
-			spa_log_error(this->log, "invalid port memory %d",
-					port->memtype);
+			spa_log_error(this->log, "%s: invalid port memory %d",
+					this->props.device, port->memtype);
 			return -EIO;
 		}
 
@@ -1539,7 +1601,8 @@
 		struct spa_data *d;
 
 		if (buffersi->n_datas < 1) {
-			spa_log_error(this->log, "invalid buffer data");
+			spa_log_error(this->log, "%s: invalid buffer data",
+					this->props.device);
 			return -EINVAL;
 		}
 
@@ -1548,6 +1611,7 @@
 		b->outbuf = buffersi;
 		b->flags = BUFFER_FLAG_OUTSTANDING;
 		b->h = spa_buffer_find_meta_data(buffersi, SPA_META_Header, sizeof(*b->h));
+		b->vt = spa_buffer_find_meta_data(buffersi, SPA_META_VideoTransform, sizeof(*b->vt));
 
 		spa_zero(b->v4l2_buffer);
 		b->v4l2_buffer.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -1576,6 +1640,7 @@
 
 		spa_log_debug(this->log, "data types %08x", d0.type);
 
+again:
 		if (port->have_expbuf &&
 		    d0.type != SPA_ID_INVALID &&
 		    (d0.type & ((1u << SPA_DATA_DmaBuf)|(1u<<SPA_DATA_MemFd)))) {
@@ -1590,7 +1655,7 @@
 					spa_log_debug(this->log, "'%s' VIDIOC_EXPBUF not supported: %m",
 							this->props.device);
 					port->have_expbuf = false;
-					goto fallback;
+					goto again;
 				}
 				spa_log_error(this->log, "'%s' VIDIOC_EXPBUF: %m", this->props.device);
 				return -errno;
@@ -1599,14 +1664,13 @@
 				d0.type = SPA_DATA_DmaBuf;
 			else
 				d0.type = SPA_DATA_MemFd;
-			d0.flags = SPA_DATA_FLAG_READABLE;
+			d0.flags = SPA_DATA_FLAG_READABLE | SPA_DATA_FLAG_MAPPABLE;
 			d0.fd = expbuf.fd;
 			d0.data = NULL;
 			SPA_FLAG_SET(b->flags, BUFFER_FLAG_ALLOCATED);
 			spa_log_debug(this->log, "EXPBUF fd:%d", expbuf.fd);
 			use_expbuf = true;
 		} else if (d0.type & (1u << SPA_DATA_MemPtr)) {
-fallback:
 			d0.type = SPA_DATA_MemPtr;
 			d0.flags = SPA_DATA_FLAG_READABLE;
 			d0.fd = -1;
@@ -1625,7 +1689,9 @@
 			spa_log_debug(this->log, "mmap offset:%u data:%p", d0.mapoffset, b->ptr);
 			use_expbuf = false;
 		} else {
-			spa_log_error(this->log, "unsupported data type:%08x", d0.type);
+			spa_log_error(this->log, "%s: unsupported data type:%08x",
+					this->props.device, d0.type);
+			port->alloc_buffers = false;
 			return -ENOTSUP;
 		}
 		spa_v4l2_buffer_recycle(this, i);
@@ -1668,8 +1734,8 @@
 		if ((res = read_init(this)) < 0)
 			return res;
 	} else {
-		spa_log_error(this->log, "invalid capabilities %08x",
-					dev->cap.capabilities);
+		spa_log_error(this->log, "%s: invalid capabilities %08x",
+				this->props.device, dev->cap.capabilities);
 		return -EIO;
 	}

pipewire-1.0.1.tar.bz2/spa/plugins/v4l2/v4l2.c -> pipewire-1.2.0.tar.gz/spa/plugins/v4l2/v4l2.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/videoconvert/plugin.c -> pipewire-1.2.0.tar.gz/spa/plugins/videoconvert/plugin.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/videoconvert/videoadapter.c -> pipewire-1.2.0.tar.gz/spa/plugins/videoconvert/videoadapter.c Changed

@@ -2,7 +2,9 @@
 /* SPDX-FileCopyrightText: Copyright © 2019 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "spa/utils/dict.h"
 #include <spa/support/plugin.h>
+#include <spa/support/plugin-loader.h>
 #include <spa/support/log.h>
 #include <spa/support/cpu.h>
 
@@ -20,17 +22,18 @@
 #include <spa/param/param.h>
 #include <spa/param/video/format-utils.h>
 #include <spa/param/latency-utils.h>
+#include <spa/param/tag-utils.h>
 #include <spa/debug/format.h>
 #include <spa/debug/pod.h>
 #include <spa/debug/log.h>
 
 #undef SPA_LOG_TOPIC_DEFAULT
 #define SPA_LOG_TOPIC_DEFAULT &log_topic
-static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.videoadapter");
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.videoadapter");
 
 #define DEFAULT_ALIGN	16
 
-#define MAX_PORTS	1
+#define MAX_PORTS	(1+1)
 
 /** \cond */
 
@@ -40,6 +43,7 @@
 
 	struct spa_log *log;
 	struct spa_cpu *cpu;
+	struct spa_plugin_loader *ploader;
 
 	uint32_t max_align;
 	enum spa_direction direction;
@@ -48,14 +52,16 @@
 
 	struct spa_node *follower;
 	struct spa_hook follower_listener;
-	uint32_t follower_flags;
+	uint64_t follower_flags;
 	struct spa_video_info follower_current_format;
 	struct spa_video_info default_format;
+	int in_set_param;
 
 	struct spa_handle *hnd_convert;
 	struct spa_node *convert;
 	struct spa_hook convert_listener;
-	uint32_t convert_flags;
+	uint64_t convert_flags;
+	char *convertname;
 
 	uint32_t n_buffers;
 	struct spa_buffer **buffers;
@@ -74,10 +80,12 @@
 #define IDX_PortConfig		5
 #define IDX_Latency		6
 #define IDX_ProcessLatency	7
-#define N_NODE_PARAMS		8
+#define IDX_Tag			8
+#define N_NODE_PARAMS		9
 	struct spa_param_info paramsN_NODE_PARAMS;
 	uint32_t convert_params_flagsN_NODE_PARAMS;
 	uint32_t follower_params_flagsN_NODE_PARAMS;
+	uint64_t follower_port_flags;
 
 	struct spa_hook_list hooks;
 	struct spa_callbacks callbacks;
@@ -85,10 +93,14 @@
 	unsigned int add_listener:1;
 	unsigned int have_format:1;
 	unsigned int started:1;
-	unsigned int driver:1;
+	unsigned int ready:1;
 	unsigned int async:1;
 	unsigned int passthrough:1;
 	unsigned int follower_removing:1;
+	unsigned int in_recalc;
+
+	unsigned int warned:1;
+	unsigned int driver:1;
 };
 
 /** \endcond */
@@ -120,13 +132,35 @@
 	return 0;
 }
 
+static int convert_enum_port_config(struct impl *this,
+		int seq, uint32_t id, uint32_t start, uint32_t num,
+		const struct spa_pod *filter, struct spa_pod_builder *builder)
+{
+	struct spa_pod *f1, *f2 = NULL;
+	int res;
+
+	f1 = spa_pod_builder_add_object(builder,
+		SPA_TYPE_OBJECT_ParamPortConfig, id,
+			SPA_PARAM_PORT_CONFIG_direction, SPA_POD_Id(this->direction));
+
+	if (filter) {
+		if ((res = spa_pod_filter(builder, &f2, f1, filter)) < 0)
+			return res;
+	}
+	else {
+		f2 = f1;
+	}
+	return spa_node_enum_params(this->convert, seq, id, start, num, f2);
+}
+
 static int impl_node_enum_params(void *object, int seq,
 				 uint32_t id, uint32_t start, uint32_t num,
 				 const struct spa_pod *filter)
 {
 	struct impl *this = object;
 	uint8_t buffer4096;
-	struct spa_pod_dynamic_builder b;
+	spa_auto(spa_pod_dynamic_builder) b = { 0 };
+	struct spa_pod_builder_state state;
 	struct spa_result_node_params result;
 	uint32_t count = 0;
 	int res;
@@ -134,6 +168,9 @@
 	spa_return_val_if_fail(this != NULL, -EINVAL);
 	spa_return_val_if_fail(num != 0, -EINVAL);
 
+	spa_pod_dynamic_builder_init(&b, buffer, sizeof(buffer), 4096);
+	spa_pod_builder_get_state(&b.b, &state);
+
 	result.id = id;
 	result.next = start;
 next:
@@ -141,15 +178,34 @@
 
 	spa_log_debug(this->log, "%p: %d id:%u", this, seq, id);
 
-	spa_pod_dynamic_builder_init(&b, buffer, sizeof(buffer), 4096);
+	spa_pod_builder_reset(&b.b, &state);
 
 	switch (id) {
 	case SPA_PARAM_EnumPortConfig:
-	case SPA_PARAM_PortConfig:
 		if (this->convert == NULL)
 			return 0;
-		res = spa_node_enum_params(this->convert, seq, id, start, num, filter);
-		return res;
+		return convert_enum_port_config(this, seq, id, start, num, filter, &b.b);
+	case SPA_PARAM_PortConfig:
+		if (this->passthrough) {
+			switch (result.index) {
+			case 0:
+				result.param = spa_pod_builder_add_object(&b.b,
+					SPA_TYPE_OBJECT_ParamPortConfig, id,
+					SPA_PARAM_PORT_CONFIG_direction, SPA_POD_Id(this->direction),
+					SPA_PARAM_PORT_CONFIG_mode,      SPA_POD_Id(
+						SPA_PARAM_PORT_CONFIG_MODE_passthrough));
+				result.next++;
+				res = 1;
+				break;
+			default:
+				return 0;
+			}
+		} else {
+			if (this->convert == NULL)
+				return 0;
+			return convert_enum_port_config(this, seq, id, start, num, filter, &b.b);
+		}
+		break;
 	case SPA_PARAM_PropInfo:
 		res = follower_enum_params(this,
 				id, IDX_PropInfo, &result, filter, &b.b);
@@ -165,6 +221,7 @@
 	case SPA_PARAM_EnumFormat:
 	case SPA_PARAM_Format:
 	case SPA_PARAM_Latency:
+	case SPA_PARAM_Tag:
 		res = spa_node_port_enum_params_sync(this->follower,
 				this->direction, 0,
 				id, &result.next, filter, &result.param, &b.b);
@@ -172,16 +229,12 @@
 	default:
 		return -ENOENT;
 	}
-
-	if (res == 1) {
-		spa_node_emit_result(&this->hooks, seq, 0, SPA_RESULT_TYPE_NODE_PARAMS, &result);
-		count++;
-	}
-	spa_pod_dynamic_builder_clean(&b);
-
 	if (res != 1)
 		return res;
 
+	spa_node_emit_result(&this->hooks, seq, 0, SPA_RESULT_TYPE_NODE_PARAMS, &result);
+	count++;
+
 	if (count != num)
 		goto next;
 
@@ -191,6 +244,8 @@
 static int link_io(struct impl *this)
 {
 	int res;
+	struct spa_io_rate_match *rate_match;
+	size_t rate_match_size;
 
 	if (this->convert == NULL)
 		return 0;
@@ -200,21 +255,32 @@
 	spa_zero(this->io_rate_match);
 	this->io_rate_match.rate = 1.0;
 
+	if (this->follower == this->target) {
+		rate_match = NULL;
+		rate_match_size = 0;
+	} else {
+		rate_match = &this->io_rate_match;
+		rate_match_size = sizeof(this->io_rate_match);
+	}
+
 	if ((res = spa_node_port_set_io(this->follower,
 			this->direction, 0,
 			SPA_IO_RateMatch,
-			&this->io_rate_match, sizeof(this->io_rate_match))) < 0) {
+			rate_match, rate_match_size)) < 0) {
 		spa_log_debug(this->log, "%p: set RateMatch on follower disabled %d %s", this,
 			res, spa_strerror(res));
 	}
 	else if ((res = spa_node_port_set_io(this->convert,
 			SPA_DIRECTION_REVERSE(this->direction), 0,
 			SPA_IO_RateMatch,
-			&this->io_rate_match, sizeof(this->io_rate_match))) < 0) {
+			rate_match, rate_match_size)) < 0) {
 		spa_log_warn(this->log, "%p: set RateMatch on convert failed %d %s", this,
 			res, spa_strerror(res));
 	}
 
+	if (this->follower == this->target)
+		return 0;
+
 	this->io_buffers = SPA_IO_BUFFERS_INIT;
 
 	if ((res = spa_node_port_set_io(this->follower,
@@ -280,7 +346,7 @@
 
 	if (filter) {
 		spa_log_error(this->log, "with this filter:");
-		spa_debug_log_pod(this->log, SPA_LOG_LEVEL_DEBUG, 2, NULL, filter);
+		spa_debug_log_pod(this->log, SPA_LOG_LEVEL_ERROR, 2, NULL, filter);
 	} else {
 		spa_log_error(this->log, "there was no filter");
 	}
@@ -298,7 +364,7 @@
 			break;
 		}
 		spa_log_error(this->log, "unmatched %s %d:", debug, count);
-		spa_debug_log_pod(this->log, SPA_LOG_LEVEL_DEBUG, 2, NULL, param);
+		spa_debug_log_pod(this->log, SPA_LOG_LEVEL_ERROR, 2, NULL, param);
 		count++;
 	}
 	if (count == 0)
@@ -318,12 +384,9 @@
 	uint32_t i, size, buffers, blocks, align, flags, stride = 0;
 	uint32_t *aligns;
 	struct spa_data *datas;
-	uint32_t follower_flags, conv_flags;
-
-	spa_log_debug(this->log, "%p: %d", this, this->n_buffers);
+	uint64_t follower_flags, conv_flags;
 
-	if (this->target == this->follower)
-		return 0;
+	spa_log_debug(this->log, "%p: n_buffers:%d", this, this->n_buffers);
 
 	if (this->n_buffers > 0)
 		return 0;
@@ -382,6 +445,9 @@
 			SPA_PARAM_BUFFERS_align,   SPA_POD_OPT_Int(&align))) < 0)
 		return res;
 
+	if (this->async)
+		buffers = SPA_MAX(2u, buffers);
+
 	spa_log_debug(this->log, "%p: buffers:%d, blocks:%d, size:%d, stride:%d align:%d %d:%d",
 			this, buffers, blocks, size, stride, align, follower_alloc, conv_alloc);
 
@@ -420,8 +486,12 @@
 
 static int configure_format(struct impl *this, uint32_t flags, const struct spa_pod *format)
 {
+	uint8_t buffer4096;
 	int res;
 
+	if (format == NULL && !this->have_format)
+		return 0;
+
 	spa_log_debug(this->log, "%p: configure format:", this);
 	if (format)
 		spa_debug_log_format(this->log, SPA_LOG_LEVEL_DEBUG, 0, NULL, format);
@@ -431,14 +501,13 @@
 					   SPA_PARAM_Format, flags,
 					   format)) < 0)
 			return res;
+
 	if (res > 0) {
-		uint8_t buffer4096;
-		struct spa_pod_builder b = { 0 };
+		struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
 		uint32_t state = 0;
 		struct spa_pod *fmt;
 
 		/* format was changed to nearest compatible format */
-		spa_pod_builder_init(&b, buffer, sizeof(buffer));
 
 		if ((res = spa_node_port_enum_params_sync(this->follower,
 					this->direction, 0,
@@ -449,7 +518,7 @@
 		format = fmt;
 	}
 
-	if (this->target != this->follower && this->convert) {
+	if (this->convert && this->target != this->follower) {
 		if ((res = spa_node_port_set_param(this->convert,
 					   SPA_DIRECTION_REVERSE(this->direction), 0,
 					   SPA_PARAM_Format, flags,
@@ -460,10 +529,9 @@
 	this->have_format = format != NULL;
 	if (format == NULL) {
 		this->n_buffers = 0;
-	} else {
+	} else if (this->target != this->follower) {
 		res = negotiate_buffers(this);
 	}
-
 	return res;
 }
 
@@ -478,7 +546,7 @@
 
 	spa_pod_builder_init(&b, buffer, sizeof(buffer));
 
-	spa_log_debug(this->log, "%p: configure convert %p", this, this->target);
+	spa_log_debug(this->log, "%p: configure convert %p %d", this, this->target, mode);
 
 	param = spa_pod_builder_add_object(&b,
 		SPA_TYPE_OBJECT_ParamPortConfig, SPA_PARAM_PortConfig,
@@ -488,17 +556,95 @@
 	return spa_node_set_param(this->convert, SPA_PARAM_PortConfig, 0, param);
 }
 
-extern const struct spa_handle_factory spa_videoconvert_factory;
-
 static const struct spa_node_events follower_node_events;
 
+static int recalc_latency(struct impl *this, struct spa_node *src, enum spa_direction direction,
+		uint32_t port_id, struct spa_node *dst)
+{
+	struct spa_pod_builder b = { 0 };
+	uint8_t buffer1024;
+	struct spa_pod *param;
+	uint32_t index = 0;
+	struct spa_latency_info latency;
+	int res;
+
+	spa_log_debug(this->log, "%p: %d:%d", this, direction, port_id);
+
+	if (this->target == this->follower)
+		return 0;
+
+	if (dst == NULL)
+		return 0;
+
+	while (true) {
+		spa_pod_builder_init(&b, buffer, sizeof(buffer));
+		if ((res = spa_node_port_enum_params_sync(src,
+						direction, port_id, SPA_PARAM_Latency,
+						&index, NULL, &param, &b)) != 1) {
+			param = NULL;
+			break;
+		}
+		if ((res = spa_latency_parse(param, &latency)) < 0)
+			return res;
+		if (latency.direction == direction)
+			break;
+	}
+	if ((res = spa_node_port_set_param(dst,
+					SPA_DIRECTION_REVERSE(direction), 0,
+					SPA_PARAM_Latency, 0, param)) < 0)
+		return res;
+
+	return 0;
+}
+
+static int recalc_tag(struct impl *this, struct spa_node *src, enum spa_direction direction,
+		uint32_t port_id, struct spa_node *dst)
+{
+	spa_auto(spa_pod_dynamic_builder) b = { 0 };
+	struct spa_pod_builder_state state;
+	uint8_t buffer2048;
+	struct spa_pod *param;
+	uint32_t index = 0;
+	struct spa_tag_info info;
+	int res;
+
+	spa_log_debug(this->log, "%p: %d:%d", this, direction, port_id);
+
+	if (this->target == this->follower)
+		return 0;
+
+	if (dst == NULL)
+		return 0;
+
+	spa_pod_dynamic_builder_init(&b, buffer, sizeof(buffer), 2048);
+	spa_pod_builder_get_state(&b.b, &state);
+
+	while (true) {
+		void *tag_state = NULL;
+		spa_pod_builder_reset(&b.b, &state);
+		if ((res = spa_node_port_enum_params_sync(src,
+						direction, port_id, SPA_PARAM_Tag,
+						&index, NULL, &param, &b.b)) != 1) {
+			param = NULL;
+			break;
+		}
+		if ((res = spa_tag_parse(param, &info, &tag_state)) < 0)
+			return res;
+		if (info.direction == direction)
+			break;
+	}
+	return spa_node_port_set_param(dst, SPA_DIRECTION_REVERSE(direction), 0,
+					SPA_PARAM_Tag, 0, param);
+}
+
+
 static int reconfigure_mode(struct impl *this, bool passthrough,
                 enum spa_direction direction, struct spa_pod *format)
 {
 	int res = 0;
 	struct spa_hook l;
 
-	spa_log_info(this->log, "%p: passthrough mode %d", this, passthrough);
+	spa_log_debug(this->log, "%p: passthrough mode %d", this, passthrough);
 
 	if (this->passthrough != passthrough) {
 		if (passthrough) {
@@ -530,16 +676,19 @@
 		} else {
 			/* add converter ports */
 			configure_convert(this, SPA_PARAM_PORT_CONFIG_MODE_dsp);
-			link_io(this);
 		}
+		link_io(this);
 	}
-
 	this->info.change_mask |= SPA_NODE_CHANGE_MASK_FLAGS | SPA_NODE_CHANGE_MASK_PARAMS;
-	this->info.flags &= ~SPA_NODE_FLAG_NEED_CONFIGURE;
+	SPA_FLAG_CLEAR(this->info.flags, SPA_NODE_FLAG_NEED_CONFIGURE);
+	SPA_FLAG_UPDATE(this->info.flags, SPA_NODE_FLAG_ASYNC,
+			this->async && this->follower == this->target);
 	this->paramsIDX_Props.user++;
 
 	emit_node_info(this, false);
 
+	spa_log_debug(this->log, "%p: passthrough mode %d", this, passthrough);
+
 	return 0;
 }
 
@@ -562,9 +711,8 @@
 		if ((res = spa_format_parse(param, &info.media_type, &info.media_subtype)) < 0)
 			return res;
 		if (info.media_type != SPA_MEDIA_TYPE_video ||
-		    info.media_subtype != SPA_MEDIA_SUBTYPE_raw)
-			return -EINVAL;
-
+			info.media_subtype != SPA_MEDIA_SUBTYPE_raw)
+				return -EINVAL;
 		if (spa_format_video_raw_parse(param, &info.info.raw) < 0)
 			return -EINVAL;
 
@@ -599,8 +747,9 @@
 			    info.media_subtype != SPA_MEDIA_SUBTYPE_raw)
 				return -ENOTSUP;
 
-			if (spa_format_video_raw_parse(format, &info.info.raw) >= 0)
+			if (spa_format_video_raw_parse(format, &info.info.raw) >= 0) {
 				this->default_format = info;
+			}
 		}
 
 		switch (mode) {
@@ -629,13 +778,16 @@
 	}
 
 	case SPA_PARAM_Props:
-		if (this->target != this->follower)
-			res = spa_node_set_param(this->target, id, flags, param);
-		res2 = spa_node_set_param(this->follower, id, flags, param);
+	{
+		int in_set_param = ++this->in_set_param;
+		res = spa_node_set_param(this->follower, id, flags, param);
+		if (this->target != this->follower && this->in_set_param == in_set_param)
+			res2 = spa_node_set_param(this->target, id, flags, param);
 		if (res < 0 && res2 < 0)
 			return res;
 		res = 0;
 		break;
+	}
 	case SPA_PARAM_ProcessLatency:
 		res = spa_node_set_param(this->follower, id, flags, param);
 		break;
@@ -712,10 +864,12 @@
 	struct spa_pod_builder b = { 0 };
 	int res;
 
-	if (this->have_format)
+	if (this->target == this->follower)
 		return 0;
 
-	if (this->target == this->follower)
+	spa_log_debug(this->log, "%p: have_format:%d", this, this->have_format);
+
+	if (this->have_format)
 		return 0;
 
 	spa_pod_builder_init(&b, buffer, sizeof(buffer));
@@ -739,18 +893,16 @@
 			goto done;
 		}
 	}
-	if (this->convert) {
-		state = 0;
-		if ((res = spa_node_port_enum_params_sync(this->convert,
-					SPA_DIRECTION_REVERSE(this->direction), 0,
-					SPA_PARAM_EnumFormat, &state,
-					format, &format, &b)) != 1) {
-			debug_params(this, this->convert,
-					SPA_DIRECTION_REVERSE(this->direction), 0,
-					SPA_PARAM_EnumFormat, format, "convert format", res);
-			res = -ENOTSUP;
-			goto done;
-		}
+	state = 0;
+	if (this->convert && (res = spa_node_port_enum_params_sync(this->convert,
+				SPA_DIRECTION_REVERSE(this->direction), 0,
+				SPA_PARAM_EnumFormat, &state,
+				format, &format, &b)) != 1) {
+		debug_params(this, this->convert,
+				SPA_DIRECTION_REVERSE(this->direction), 0,
+				SPA_PARAM_EnumFormat, format, "convert format", res);
+		res = -ENOTSUP;
+		goto done;
 	}
 	if (format == NULL) {
 		res = -ENOTSUP;
@@ -787,18 +939,24 @@
 
 	switch (SPA_NODE_COMMAND_ID(command)) {
 	case SPA_NODE_COMMAND_Start:
-		if ((res = negotiate_format(this)) < 0)
-			return res;
-		if ((res = negotiate_buffers(this)) < 0)
-			return res;
+		spa_log_debug(this->log, "%p: starting %d", this, this->started);
+		if (this->target != this->follower) {
+			if (this->started)
+				return 0;
+			if ((res = negotiate_format(this)) < 0)
+				return res;
+		}
+		this->ready = true;
+		this->warned = false;
 		break;
 	case SPA_NODE_COMMAND_Suspend:
-		configure_format(this, 0, NULL);
-		SPA_FALLTHROUGH
+		spa_log_debug(this->log, "%p: suspending", this);
+		break;
 	case SPA_NODE_COMMAND_Pause:
-		this->started = false;
+		spa_log_debug(this->log, "%p: pausing", this);
 		break;
 	case SPA_NODE_COMMAND_Flush:
+		spa_log_debug(this->log, "%p: flushing", this);
 		this->io_buffers.status = SPA_STATUS_OK;
 		break;
 	default:
@@ -809,20 +967,41 @@
 		spa_log_error(this->log, "%p: can't send command %d: %s",
 				this, SPA_NODE_COMMAND_ID(command),
 				spa_strerror(res));
-		return res;
 	}
 
-	if (this->target != this->follower) {
+	if (res >= 0 && this->target != this->follower) {
 		if ((res = spa_node_send_command(this->follower, command)) < 0) {
 			spa_log_error(this->log, "%p: can't send command %d: %s",
 					this, SPA_NODE_COMMAND_ID(command),
 					spa_strerror(res));
-			return res;
 		}
 	}
 	switch (SPA_NODE_COMMAND_ID(command)) {
 	case SPA_NODE_COMMAND_Start:
-		this->started = true;
+		if (res < 0) {
+			spa_log_debug(this->log, "%p: start failed", this);
+			this->ready = false;
+			configure_format(this, 0, NULL);
+		} else {
+			this->started = true;
+			spa_log_debug(this->log, "%p: started", this);
+		}
+		break;
+	case SPA_NODE_COMMAND_Suspend:
+		configure_format(this, 0, NULL);
+		this->started = false;
+		this->warned = false;
+		this->ready = false;
+		spa_log_debug(this->log, "%p: suspended", this);
+		break;
+	case SPA_NODE_COMMAND_Pause:
+		this->started = false;
+		this->warned = false;
+		this->ready = false;
+		spa_log_debug(this->log, "%p: paused", this);
+		break;
+	case SPA_NODE_COMMAND_Flush:
+		spa_log_debug(this->log, "%p: flushed", this);
 		break;
 	}
 	return res;
@@ -866,26 +1045,90 @@
 				(this->paramsidx.flags & SPA_PARAM_INFO_SERIAL) |
 				(info->paramsi.flags & SPA_PARAM_INFO_READWRITE);
 
-			if (!this->add_listener) {
-				this->paramsidx.user++;
-				spa_log_debug(this->log, "param %d changed", info->paramsi.id);
-			}
+			if (this->add_listener)
+				continue;
+
+			this->paramsidx.user++;
+			spa_log_debug(this->log, "param %d changed", info->paramsi.id);
 		}
 	}
 	emit_node_info(this, false);
 }
 
+static void follower_convert_port_info(void *data,
+		enum spa_direction direction, uint32_t port_id,
+		const struct spa_port_info *info)
+{
+	struct impl *this = data;
+	uint32_t i;
+	int res;
+
+	spa_log_debug(this->log, "%p: convert port info %s %p %08"PRIx64, this,
+			this->direction == SPA_DIRECTION_INPUT ?
+				"Input" : "Output", info, info->change_mask);
+
+	if (this->convert && info->change_mask & SPA_PORT_CHANGE_MASK_PARAMS) {
+		for (i = 0; i < info->n_params; i++) {
+			uint32_t idx;
+
+			switch (info->paramsi.id) {
+			case SPA_PARAM_Latency:
+				idx = IDX_Latency;
+				break;
+			case SPA_PARAM_Tag:
+				idx = IDX_Tag;
+				break;
+			default:
+				continue;
+			}
+
+			if (!this->add_listener &&
+			    this->convert_params_flagsidx == info->paramsi.flags)
+				continue;
+
+			this->convert_params_flagsidx = info->paramsi.flags;
+
+			if (this->add_listener)
+				continue;
+
+			if (idx == IDX_Latency) {
+				this->in_recalc++;
+				res = recalc_latency(this, this->convert, direction, port_id, this->follower);
+				this->in_recalc--;
+				spa_log_debug(this->log, "latency: %d (%s)", res,
+						spa_strerror(res));
+			}
+			if (idx == IDX_Tag) {
+				this->in_recalc++;
+				res = recalc_tag(this, this->convert, direction, port_id, this->follower);
+				this->in_recalc--;
+				spa_log_debug(this->log, "tag: %d (%s)", res,
+						spa_strerror(res));
+			}
+			spa_log_debug(this->log, "param %d changed", info->paramsi.id);
+		}
+	}
+}
+
 static void convert_port_info(void *data,
 		enum spa_direction direction, uint32_t port_id,
 		const struct spa_port_info *info)
 {
 	struct impl *this = data;
+	struct spa_port_info pi;
 
 	if (direction != this->direction) {
-		if (port_id == 0)
+		if (port_id == 0) {
+			/* handle the converter output port into the follower separately */
+			follower_convert_port_info(this, direction, port_id, info);
 			return;
-		else
+		} else
+			/* the monitor ports are exposed */
 			port_id--;
+	} else if (info) {
+		pi = *info;
+		pi.flags = this->follower_port_flags;
+		info = &pi;
 	}
 
 	spa_log_debug(this->log, "%p: port info %d:%d", this,
@@ -938,6 +1181,8 @@
 		this->info.flags |= SPA_NODE_FLAG_OUT_PORT_CONFIG;
 		this->info.max_output_ports = MAX_PORTS;
 	}
+	SPA_FLAG_UPDATE(this->info.flags, SPA_NODE_FLAG_ASYNC,
+			this->async && this->follower == this->target);
 
 	spa_log_debug(this->log, "%p: follower info %s", this,
 			this->direction == SPA_DIRECTION_INPUT ?
@@ -974,50 +1219,17 @@
 				(this->paramsidx.flags & SPA_PARAM_INFO_SERIAL) |
 				(info->paramsi.flags & SPA_PARAM_INFO_READWRITE);
 
-			if (!this->add_listener) {
-				this->paramsidx.user++;
-				spa_log_debug(this->log, "param %d changed", info->paramsi.id);
-			}
+			if (this->add_listener)
+				continue;
+
+			this->paramsidx.user++;
+			spa_log_debug(this->log, "param %d changed", info->paramsi.id);
 		}
 	}
 	emit_node_info(this, false);
 
 	spa_zero(this->info.props);
 	this->info.change_mask &= ~SPA_NODE_CHANGE_MASK_PROPS;
-
-}
-
-static int recalc_latency(struct impl *this, enum spa_direction direction, uint32_t port_id)
-{
-	struct spa_pod_builder b = { 0 };
-	uint8_t buffer1024;
-	struct spa_pod *param;
-	uint32_t index = 0;
-	struct spa_latency_info latency;
-	int res;
-
-	spa_log_debug(this->log, "%p: ", this);
-
-	if (this->target == this->follower)
-		return 0;
-
-	while (true) {
-		spa_pod_builder_init(&b, buffer, sizeof(buffer));
-		if ((res = spa_node_port_enum_params_sync(this->follower,
-						direction, port_id, SPA_PARAM_Latency,
-						&index, NULL, &param, &b)) != 1)
-			return res;
-		if ((res = spa_latency_parse(param, &latency)) < 0)
-			return res;
-		if (latency.direction == direction)
-			break;
-	}
-	if ((res = spa_node_port_set_param(this->target,
-					SPA_DIRECTION_REVERSE(direction), 0,
-					SPA_PARAM_Latency, 0, param)) < 0)
-		return res;
-
-	return 0;
 }
 
 static void follower_port_info(void *data,
@@ -1033,9 +1245,15 @@
 	      return;
 	}
 
-	spa_log_debug(this->log, "%p: follower port info %s %p %08"PRIx64, this,
+	this->follower_port_flags = info->flags &
+		(SPA_PORT_FLAG_LIVE |
+		 SPA_PORT_FLAG_PHYSICAL |
+		 SPA_PORT_FLAG_TERMINAL);
+
+	spa_log_debug(this->log, "%p: follower port info %s %p %08"PRIx64" recalc:%u", this,
 			this->direction == SPA_DIRECTION_INPUT ?
-				"Input" : "Output", info, info->change_mask);
+				"Input" : "Output", info, info->change_mask,
+				this->in_recalc);
 
 	if (info->change_mask & SPA_PORT_CHANGE_MASK_PARAMS) {
 		for (i = 0; i < info->n_params; i++) {
@@ -1051,29 +1269,43 @@
 			case SPA_PARAM_Latency:
 				idx = IDX_Latency;
 				break;
+			case SPA_PARAM_Tag:
+				idx = IDX_Tag;
+				break;
 			default:
 				continue;
 			}
+
 			if (!this->add_listener &&
 			    this->follower_params_flagsidx == info->paramsi.flags)
 				continue;
 
+			this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
 			this->follower_params_flagsidx = info->paramsi.flags;
 			this->paramsidx.flags =
 				(this->paramsidx.flags & SPA_PARAM_INFO_SERIAL) |
 				(info->paramsi.flags & SPA_PARAM_INFO_READWRITE);
 
-			if (idx == IDX_Latency) {
-				res = recalc_latency(this, direction, port_id);
+			if (this->add_listener)
+				continue;
+
+			if (idx == IDX_Latency && this->in_recalc == 0) {
+				res = recalc_latency(this, this->follower, direction, port_id, this->target);
 				spa_log_debug(this->log, "latency: %d (%s)", res,
 						spa_strerror(res));
 			}
-
-			this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
-			if (!this->add_listener) {
-				this->paramsidx.user++;
-				spa_log_debug(this->log, "param %d changed", info->paramsi.id);
+			if (idx == IDX_Tag && this->in_recalc == 0) {
+				res = recalc_tag(this, this->follower, direction, port_id, this->target);
+				spa_log_debug(this->log, "tag: %d (%s)", res,
+						spa_strerror(res));
+			}
+			if (idx == IDX_EnumFormat) {
+				spa_log_debug(this->log, "new formats");
+				/* we will renegotiate when restarting */
 			}
+
+			this->paramsidx.user++;
+			spa_log_debug(this->log, "param %d changed", info->paramsi.id);
 		}
 	}
 	emit_node_info(this, false);
@@ -1124,6 +1356,11 @@
 
 	spa_log_trace_fp(this->log, "%p: ready %d", this, status);
 
+	if (!this->ready) {
+		spa_log_info(this->log, "%p: ready stopped node", this);
+		return -EIO;
+	}
+
 	if (this->target != this->follower) {
 		this->driver = true;
 
@@ -1152,7 +1389,7 @@
 	int res;
 	struct impl *this = data;
 
-	if (this->target != this->follower && this->convert)
+	if (this->convert && this->target != this->follower)
 		res = spa_node_port_reuse_buffer(this->convert, port_id, buffer_id);
 	else
 		res = spa_node_call_reuse_buffer(&this->callbacks, port_id, buffer_id);
@@ -1187,6 +1424,7 @@
 	spa_log_trace(this->log, "%p: add listener %p", this, listener);
 	spa_hook_list_isolate(&this->hooks, &save, listener, events, data);
 
+
 	if (events->info || events->port_info) {
 		this->add_listener = true;
 
@@ -1199,6 +1437,7 @@
 			spa_node_add_listener(this->convert, &l, &convert_node_events, this);
 			spa_hook_remove(&l);
 		}
+
 		this->add_listener = false;
 
 		emit_node_info(this, true);
@@ -1286,7 +1525,6 @@
 			 const struct spa_pod *param)
 {
 	struct impl *this = object;
-	int res;
 
 	spa_return_val_if_fail(this != NULL, -EINVAL);
 
@@ -1295,18 +1533,8 @@
 	if (direction != this->direction)
 		port_id++;
 
-	if ((res = spa_node_port_set_param(this->target, direction, port_id, id,
-			flags, param)) < 0)
-		return res;
-
-	if ((id == SPA_PARAM_Latency) &&
-	    direction == this->direction) {
-		if ((res = spa_node_port_set_param(this->follower, direction, 0, id,
-				flags, param)) < 0)
-			return res;
-	}
-
-	return res;
+	return spa_node_port_set_param(this->target, direction, port_id, id,
+			flags, param);
 }
 
 static int
@@ -1369,6 +1597,13 @@
 	struct impl *this = object;
 	int status = 0, fstatus, retry = 8;
 
+	if (!this->ready) {
+		if (!this->warned)
+			spa_log_warn(this->log, "%p: scheduling stopped node", this);
+		this->warned = true;
+		return -EIO;
+	}
+
 	spa_log_trace_fp(this->log, "%p: process convert:%p driver:%d",
 			this, this->convert, this->driver);
 
@@ -1479,6 +1714,45 @@
 	.process = impl_node_process,
 };
 
+static int load_plugin_from(struct impl *this, const struct spa_dict *info,
+		const char *convertname, struct spa_handle **handle, struct spa_node **iface)
+{
+	struct spa_handle *hnd_convert = NULL;
+	void *iface_conv = NULL;
+	hnd_convert = spa_plugin_loader_load(this->ploader, convertname, NULL);
+	if (!hnd_convert)
+		return -EINVAL;
+
+	spa_handle_get_interface(hnd_convert, SPA_TYPE_INTERFACE_Node, &iface_conv);
+	if (iface_conv == NULL) {
+		spa_plugin_loader_unload(this->ploader, hnd_convert);
+		return -EINVAL;
+	}
+
+	*handle = hnd_convert;
+	*iface = iface_conv;
+
+	return 0;
+}
+
+static int load_converter(struct impl *this, const struct spa_dict *info)
+{
+	int ret;
+	if (!this->ploader || !info)
+		return -EINVAL;
+
+	const char* factory_name = spa_dict_lookup(info, "video.adapt.converter");
+
+	if (factory_name) {
+		ret = load_plugin_from(this, info, factory_name, &this->hnd_convert, &this->convert);
+		if (ret >= 0) {
+			this->convertname = strdup(factory_name);
+			return ret;
+		}
+	}
+	return 0;
+}
+
 static int impl_get_interface(struct spa_handle *handle, const char *type, void **interface)
 {
 	struct impl *this;
@@ -1507,8 +1781,10 @@
 	spa_hook_remove(&this->follower_listener);
 	spa_node_set_callbacks(this->follower, NULL, NULL);
 
-	if (this->hnd_convert)
-		spa_handle_clear(this->hnd_convert);
+	if (this->hnd_convert) {
+		spa_plugin_loader_unload(this->ploader, this->hnd_convert);
+		free(this->convertname);
+	}
 
 	if (this->buffers)
 		free(this->buffers);
@@ -1522,12 +1798,7 @@
 impl_get_size(const struct spa_handle_factory *factory,
 	      const struct spa_dict *params)
 {
-	size_t size = 0;
-
-#if 0
-	size += spa_handle_factory_get_size(&spa_videoconvert_factory, params);
-#endif
-	size += sizeof(struct impl);
+	size_t size = sizeof(struct impl);
 
 	return size;
 }
@@ -1540,10 +1811,8 @@
 	  uint32_t n_support)
 {
 	struct impl *this;
-#if 0
-	void *iface;
-#endif
 	const char *str;
+	int ret;
 
 	spa_return_val_if_fail(factory != NULL, -EINVAL);
 	spa_return_val_if_fail(handle != NULL, -EINVAL);
@@ -1558,6 +1827,8 @@
 
 	this->cpu = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_CPU);
 
+	this->ploader = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_PluginLoader);
+
 	if (info == NULL ||
 	    (str = spa_dict_lookup(info, "video.adapt.follower")) == NULL)
 		return -EINVAL;
@@ -1576,15 +1847,10 @@
 			SPA_VERSION_NODE,
 			&impl_node, this);
 
-#if 0
-	this->hnd_convert = SPA_PTROFF(this, sizeof(struct impl), struct spa_handle);
-	spa_handle_factory_init(&spa_videoconvert_factory,
-				this->hnd_convert,
-				info, support, n_support);
-
-	spa_handle_get_interface(this->hnd_convert, SPA_TYPE_INTERFACE_Node, &iface);
-	this->convert = iface;
-#endif
+	ret = load_converter(this, info);
+	spa_log_debug(this->log, "%p: loaded converter %s, hnd %p, convert %p", this, this->convertname, this->hnd_convert, this->convert);
+	if (ret < 0)
+		return ret;
 	this->target = this->convert;
 
 	this->info_all = SPA_NODE_CHANGE_MASK_FLAGS |
@@ -1600,6 +1866,7 @@
 	this->paramsIDX_PortConfig = SPA_PARAM_INFO(SPA_PARAM_PortConfig, SPA_PARAM_INFO_READWRITE);
 	this->paramsIDX_Latency = SPA_PARAM_INFO(SPA_PARAM_Latency, SPA_PARAM_INFO_READWRITE);
 	this->paramsIDX_ProcessLatency = SPA_PARAM_INFO(SPA_PARAM_ProcessLatency, SPA_PARAM_INFO_READWRITE);
+	this->paramsIDX_Tag = SPA_PARAM_INFO(SPA_PARAM_Tag, SPA_PARAM_INFO_READWRITE);
 	this->info.params = this->params;
 	this->info.n_params = N_NODE_PARAMS;
 
@@ -1607,11 +1874,15 @@
 			&this->follower_listener, &follower_node_events, this);
 	spa_node_set_callbacks(this->follower, &follower_node_callbacks, this);
 
-	if (this->convert)
+	// TODO: adapt port bootstrap for arbitrary converter (incl. dummy)
+	if (this->convert) {
 		spa_node_add_listener(this->convert,
 				&this->convert_listener, &convert_node_events, this);
 
-	reconfigure_mode(this, true, this->direction, NULL);
+		configure_convert(this, SPA_PARAM_PORT_CONFIG_MODE_convert);
+	} else {
+		reconfigure_mode(this, true, this->direction, NULL);
+	}
 
 	link_io(this);

pipewire-1.0.1.tar.bz2/spa/plugins/videotestsrc/plugin.c -> pipewire-1.2.0.tar.gz/spa/plugins/videotestsrc/plugin.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/videotestsrc/videotestsrc.c -> pipewire-1.2.0.tar.gz/spa/plugins/videotestsrc/videotestsrc.c Changed

@@ -23,7 +23,9 @@
 #include <spa/param/param.h>
 #include <spa/pod/filter.h>
 
-#define NAME "videotestsrc"
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.videotestsrc");
 
 #define FRAMES_TO_TIME(port,f) ((port->current_format.info.raw.framerate.denom * (f) * SPA_NSEC_PER_SEC) / \
                                 (port->current_format.info.raw.framerate.num))
@@ -289,7 +291,7 @@
 		if ((res = spa_system_timerfd_read(this->data_system,
 						this->timer_source.fd, &expirations)) < 0) {
 			if (res != -EAGAIN)
-				spa_log_error(this->log, NAME " %p: timerfd error: %s",
+				spa_log_error(this->log, "%p: timerfd error: %s",
 						this, spa_strerror(res));
 		}
 	}
@@ -308,7 +310,7 @@
 
 	if (spa_list_is_empty(&port->empty)) {
 		set_timer(this, false);
-		spa_log_error(this->log, NAME " %p: out of buffers", this);
+		spa_log_error(this->log, "%p: out of buffers", this);
 		return -EPIPE;
 	}
 	b = spa_list_first(&port->empty, struct buffer, link);
@@ -317,7 +319,7 @@
 
 	n_bytes = b->outbuf->datas0.maxsize;
 
-	spa_log_trace(this->log, NAME " %p: dequeue buffer %d", this, b->id);
+	spa_log_trace(this->log, "%p: dequeue buffer %d", this, b->id);
 
 	fill_buffer(this, b);
 
@@ -612,7 +614,7 @@
 static int clear_buffers(struct impl *this, struct port *port)
 {
 	if (port->n_buffers > 0) {
-		spa_log_debug(this->log, NAME " %p: clear buffers", this);
+		spa_log_debug(this->log, "%p: clear buffers", this);
 		port->n_buffers = 0;
 		spa_list_init(&port->empty);
 		this->started = false;
@@ -729,7 +731,7 @@
 		b->h = spa_buffer_find_meta_data(buffersi, SPA_META_Header, sizeof(*b->h));
 
 		if (d0.data == NULL) {
-			spa_log_error(this->log, NAME " %p: invalid memory on buffer %p", this,
+			spa_log_error(this->log, "%p: invalid memory on buffer %p", this,
 				      buffersi);
 			return -EINVAL;
 		}
@@ -769,7 +771,7 @@
 	struct buffer *b = &port->buffersid;
 	spa_return_if_fail(b->outstanding);
 
-	spa_log_trace(this->log, NAME " %p: reuse buffer %d", this, id);
+	spa_log_trace(this->log, "%p: reuse buffer %d", this, id);
 
 	b->outstanding = false;
 	spa_list_append(&port->empty, &b->link);
@@ -990,7 +992,7 @@
 
 const struct spa_handle_factory spa_videotestsrc_factory = {
 	SPA_VERSION_HANDLE_FACTORY,
-	NAME,
+	"videotestsrc",
 	&info,
 	impl_get_size,
 	impl_init,

pipewire-1.0.1.tar.bz2/spa/plugins/volume/plugin.c -> pipewire-1.2.0.tar.gz/spa/plugins/volume/plugin.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/volume/volume.c -> pipewire-1.2.0.tar.gz/spa/plugins/volume/volume.c Changed

@@ -17,7 +17,9 @@
 #include <spa/param/param.h>
 #include <spa/pod/filter.h>
 
-#define NAME "volume"
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.volume");
 
 #define DEFAULT_RATE		48000
 #define DEFAULT_CHANNELS	2
@@ -417,7 +419,7 @@
 static int clear_buffers(struct impl *this, struct port *port)
 {
 	if (port->n_buffers > 0) {
-		spa_log_debug(this->log, NAME " %p: clear buffers", this);
+		spa_log_debug(this->log, "%p: clear buffers", this);
 		port->n_buffers = 0;
 		spa_list_init(&port->empty);
 	}
@@ -529,7 +531,7 @@
 			b->ptr = d0.data;
 			b->size = d0.maxsize;
 		} else {
-			spa_log_error(this->log, NAME " %p: invalid memory on buffer %p", this,
+			spa_log_error(this->log, "%p: invalid memory on buffer %p", this,
 				      buffersi);
 			return -EINVAL;
 		}
@@ -572,13 +574,13 @@
 	struct buffer *b = &port->buffersid;
 
 	if (!SPA_FLAG_IS_SET(b->flags, BUFFER_FLAG_OUT)) {
-		spa_log_warn(this->log, NAME " %p: buffer %d not outstanding", this, id);
+		spa_log_warn(this->log, "%p: buffer %d not outstanding", this, id);
 		return;
 	}
 
 	spa_list_append(&port->empty, &b->link);
 	SPA_FLAG_CLEAR(b->flags, BUFFER_FLAG_OUT);
-	spa_log_trace(this->log, NAME " %p: recycle buffer %d", this, id);
+	spa_log_trace(this->log, "%p: recycle buffer %d", this, id);
 }
 
 static int impl_node_port_reuse_buffer(void *object, uint32_t port_id, uint32_t buffer_id)
@@ -649,7 +651,7 @@
 
 		n_samples = n_bytes / sizeof(int16_t);
 		for (i = 0; i < n_samples; i++)
-			dsti = srci * volume;
+			dsti = (int16_t)(srci * volume);
 
 		sindex += n_bytes;
 		dindex += n_bytes;
@@ -695,13 +697,13 @@
 	}
 
 	if ((dbuf = find_free_buffer(this, out_port)) == NULL) {
-                spa_log_error(this->log, NAME " %p: out of buffers", this);
+                spa_log_error(this->log, "%p: out of buffers", this);
 		return -EPIPE;
 	}
 
 	sbuf = &in_port->buffersinput->buffer_id;
 
-	spa_log_trace(this->log, NAME " %p: do volume %d -> %d", this, sbuf->id, dbuf->id);
+	spa_log_trace(this->log, "%p: do volume %d -> %d", this, sbuf->id, dbuf->id);
 	do_volume(this, dbuf->outbuf, sbuf->outbuf);
 
 	output->buffer_id = dbuf->id;
@@ -866,7 +868,7 @@
 
 const struct spa_handle_factory spa_volume_factory = {
 	SPA_VERSION_HANDLE_FACTORY,
-	NAME,
+	"volume",
 	NULL,
 	impl_get_size,
 	impl_init,

pipewire-1.0.1.tar.bz2/spa/plugins/vulkan/dmabuf_fallback.c -> pipewire-1.2.0.tar.gz/spa/plugins/vulkan/dmabuf_fallback.c Changed

pipewire-1.0.1.tar.bz2/spa/plugins/vulkan/meson.build -> pipewire-1.2.0.tar.gz/spa/plugins/vulkan/meson.build Changed

pipewire-1.2.0.tar.gz/spa/plugins/vulkan/pixel-formats.c Added

pipewire-1.2.0.tar.gz/spa/plugins/vulkan/pixel-formats.h Added

pipewire-1.0.1.tar.bz2/spa/plugins/vulkan/plugin.c -> pipewire-1.2.0.tar.gz/spa/plugins/vulkan/plugin.c Changed

pipewire-1.2.0.tar.gz/spa/plugins/vulkan/utils.c Added

@@ -0,0 +1,91 @@
+/* Spa */
+/* SPDX-FileCopyrightText: Copyright © 2023 columbarius */
+/* SPDX-License-Identifier: MIT */
+
+#include "utils.h"
+
+#include <spa/param/param.h>
+#include <spa/param/video/dsp.h>
+#include <spa/param/video/raw.h>
+
+// This function enumerates the available formats in vulkan_state::formats, announcing all formats capable to support DmaBufs
+// first and then falling back to those supported with SHM buffers.
+bool find_EnumFormatInfo(struct vulkan_format_infos *fmtInfos, uint32_t index, uint32_t caps, uint32_t *fmt_idx, bool *has_modifier)
+{
+	int64_t fmtIterator = 0;
+	int64_t maxIterator = 0;
+	if (caps & VULKAN_BUFFER_TYPE_CAP_SHM)
+		maxIterator += fmtInfos->formatCount;
+	if (caps & VULKAN_BUFFER_TYPE_CAP_DMABUF)
+		maxIterator += fmtInfos->formatCount;
+	// Count available formats until index underflows, while fmtIterator indexes the current format.
+	// Iterate twice over formats first time with modifiers, second time without if both caps are supported.
+	while (index < (uint32_t)-1 && fmtIterator < maxIterator) {
+		const struct vulkan_format_info *f_info = &fmtInfos->infosfmtIterator%fmtInfos->formatCount;
+		if (caps & VULKAN_BUFFER_TYPE_CAP_DMABUF && fmtIterator < fmtInfos->formatCount) {
+			// First round, check for modifiers
+			if (f_info->modifierCount > 0) {
+				index--;
+			}
+		} else if (caps & VULKAN_BUFFER_TYPE_CAP_SHM) {
+			// Second round, every format should be supported.
+			index--;
+		}
+		fmtIterator++;
+	}
+
+	if (index != (uint32_t)-1) {
+		// No more formats available
+		return false;
+	}
+	// Undo end of loop increment
+	fmtIterator--;
+	*fmt_idx = fmtIterator%fmtInfos->formatCount;
+	// Loop finished in first round
+	*has_modifier = caps & VULKAN_BUFFER_TYPE_CAP_DMABUF && fmtIterator < fmtInfos->formatCount;
+	return true;
+}
+
+struct spa_pod *build_dsp_EnumFormat(const struct vulkan_format_info *fmt, bool with_modifiers, struct spa_pod_builder *builder)
+{
+	struct spa_pod_frame f2;
+	uint32_t i, c;
+
+	spa_pod_builder_push_object(builder, &f0, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat);
+	spa_pod_builder_add(builder, SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video), 0);
+	spa_pod_builder_add(builder, SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_dsp), 0);
+	spa_pod_builder_add(builder, SPA_FORMAT_VIDEO_format, SPA_POD_Id(fmt->spa_format), 0);
+	if (with_modifiers && fmt->modifierCount > 0) {
+		spa_pod_builder_prop(builder, SPA_FORMAT_VIDEO_modifier, SPA_POD_PROP_FLAG_MANDATORY | SPA_POD_PROP_FLAG_DONT_FIXATE);
+		spa_pod_builder_push_choice(builder, &f1, SPA_CHOICE_Enum, 0);
+		for (i = 0, c = 0; i < fmt->modifierCount; i++) {
+			spa_pod_builder_long(builder, fmt->infosi.props.drmFormatModifier);
+			if (c++ == 0)
+				spa_pod_builder_long(builder, fmt->infosi.props.drmFormatModifier);
+		}
+		spa_pod_builder_pop(builder, &f1);
+	}
+	return spa_pod_builder_pop(builder, &f0);
+}
+
+struct spa_pod *build_raw_EnumFormat(const struct vulkan_format_info *fmt, bool with_modifiers, struct spa_pod_builder *builder)
+{
+	struct spa_pod_frame f2;
+	uint32_t i, c;
+
+	spa_pod_builder_push_object(builder, &f0, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat);
+	spa_pod_builder_add(builder, SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video), 0);
+	spa_pod_builder_add(builder, SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw), 0);
+	spa_pod_builder_add(builder, SPA_FORMAT_VIDEO_format, SPA_POD_Id(fmt->spa_format), 0);
+	if (with_modifiers && fmt->modifierCount > 0) {
+		spa_pod_builder_prop(builder, SPA_FORMAT_VIDEO_modifier, SPA_POD_PROP_FLAG_MANDATORY | SPA_POD_PROP_FLAG_DONT_FIXATE);
+		spa_pod_builder_push_choice(builder, &f1, SPA_CHOICE_Enum, 0);
+		for (i = 0, c = 0; i < fmt->modifierCount; i++) {
+			spa_pod_builder_long(builder, fmt->infosi.props.drmFormatModifier);
+			if (c++ == 0)
+				spa_pod_builder_long(builder, fmt->infosi.props.drmFormatModifier);
+		}
+		spa_pod_builder_pop(builder, &f1);
+	}
+	return spa_pod_builder_pop(builder, &f0);
+}

pipewire-1.2.0.tar.gz/spa/plugins/vulkan/utils.h Added

pipewire-1.2.0.tar.gz/spa/plugins/vulkan/vulkan-blit-dsp-filter.c Added

@@ -0,0 +1,954 @@
+/* Spa */
+/* SPDX-FileCopyrightText: Copyright © 2019 Wim Taymans */
+/* SPDX-FileCopyrightText: Copyright © 2023 columbarius */
+/* SPDX-License-Identifier: MIT */
+
+#include <errno.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdatomic.h>
+#include <pthread.h>
+
+#include <spa/support/plugin.h>
+#include <spa/support/log.h>
+#include <spa/support/loop.h>
+#include <spa/utils/list.h>
+#include <spa/utils/keys.h>
+#include <spa/utils/names.h>
+#include <spa/utils/string.h>
+#include <spa/node/node.h>
+#include <spa/node/utils.h>
+#include <spa/node/io.h>
+#include <spa/node/keys.h>
+#include <spa/param/video/format-utils.h>
+#include <spa/param/param.h>
+#include <spa/pod/filter.h>
+
+#include "pixel-formats.h"
+#include "vulkan-blit-utils.h"
+
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.vulkan.blit-dsp-filter");
+
+struct buffer {
+	uint32_t id;
+#define BUFFER_FLAG_OUT (1<<0)
+	uint32_t flags;
+	struct spa_buffer *outbuf;
+	struct spa_meta_header *h;
+	struct spa_list link;
+};
+
+struct port {
+	uint64_t info_all;
+	struct spa_port_info info;
+
+	enum spa_direction direction;
+#define IDX_EnumFormat	0
+#define IDX_Meta	1
+#define IDX_IO		2
+#define IDX_Format	3
+#define IDX_Buffer	4
+#define N_PORT_PARAMS	5
+	struct spa_param_info paramsN_PORT_PARAMS;
+
+	struct spa_io_buffers *io;
+
+	bool have_format;
+	struct spa_video_info current_format;
+
+	struct buffer buffersMAX_BUFFERS;
+	uint32_t n_buffers;
+
+	struct spa_list empty;
+	struct spa_list ready;
+	uint32_t stream_id;
+};
+
+struct impl {
+	struct spa_handle handle;
+	struct spa_node node;
+
+	struct spa_log *log;
+
+	struct spa_io_position *position;
+
+	uint64_t info_all;
+	struct spa_node_info info;
+#define IDX_PropInfo	0
+#define IDX_Props	1
+#define N_NODE_PARAMS	2
+	struct spa_param_info paramsN_NODE_PARAMS;
+
+	struct spa_hook_list hooks;
+	struct spa_callbacks callbacks;
+
+	// Synchronization between main and data thread
+	atomic_bool started;
+	pthread_rwlock_t renderlock;
+
+	struct vulkan_blit_state state;
+	struct vulkan_pass pass;
+	struct port port2;
+};
+
+#define CHECK_PORT(this,d,p)  ((p) < 1)
+
+static int lock_init(struct impl *this)
+{
+	return pthread_rwlock_init(&this->renderlock, NULL);
+}
+
+static void lock_destroy(struct impl *this)
+{
+	pthread_rwlock_destroy(&this->renderlock);
+}
+
+static int lock_renderer(struct impl *this)
+{
+	spa_log_info(this->log, "Lock renderer");
+	return pthread_rwlock_wrlock(&this->renderlock);
+}
+
+static int unlock_renderer(struct impl *this)
+{
+	spa_log_info(this->log, "Unlock renderer");
+	return pthread_rwlock_unlock(&this->renderlock);
+}
+
+static int impl_node_enum_params(void *object, int seq,
+				 uint32_t id, uint32_t start, uint32_t num,
+				 const struct spa_pod *filter)
+{
+	struct impl *this = object;
+	struct spa_pod *param;
+	struct spa_pod_builder b = { 0 };
+	uint8_t buffer1024;
+	struct spa_result_node_params result;
+	uint32_t count = 0;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+	spa_return_val_if_fail(num != 0, -EINVAL);
+
+	result.id = id;
+	result.next = start;
+      next:
+	result.index = result.next++;
+
+	spa_pod_builder_init(&b, buffer, sizeof(buffer));
+
+	switch (id) {
+	default:
+		return -ENOENT;
+	}
+
+	if (spa_pod_filter(&b, &result.param, param, filter) < 0)
+		goto next;
+
+	spa_node_emit_result(&this->hooks, seq, 0, SPA_RESULT_TYPE_NODE_PARAMS, &result);
+
+	if (++count != num)
+		goto next;
+
+	return 0;
+}
+
+static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
+{
+	struct impl *this = object;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+
+	switch (id) {
+	case SPA_IO_Position:
+		if (size > 0 && size < sizeof(struct spa_io_position))
+			return -EINVAL;
+		this->position = data;
+		break;
+	default:
+		return -ENOENT;
+	}
+	return 0;
+}
+static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
+			       const struct spa_pod *param)
+{
+	struct impl *this = object;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+
+	switch (id) {
+	default:
+		return -ENOENT;
+	}
+	return 0;
+}
+
+static inline void reuse_buffer(struct impl *this, struct port *port, uint32_t id)
+{
+	struct buffer *b = &port->buffersid;
+
+	if (SPA_FLAG_IS_SET(b->flags, BUFFER_FLAG_OUT)) {
+		spa_log_debug(this->log, "%p: reuse buffer %d", this, id);
+
+		SPA_FLAG_CLEAR(b->flags, BUFFER_FLAG_OUT);
+		spa_list_append(&port->empty, &b->link);
+	}
+}
+
+static int impl_node_send_command(void *object, const struct spa_command *command)
+{
+	struct impl *this = object;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+	spa_return_val_if_fail(command != NULL, -EINVAL);
+
+	switch (SPA_NODE_COMMAND_ID(command)) {
+	case SPA_NODE_COMMAND_Start:
+		if (this->started)
+			return 0;
+
+		this->started = true;
+		spa_vulkan_blit_start(&this->state);
+		// The main thread needs to lock the renderer before changing its state
+		break;
+
+	case SPA_NODE_COMMAND_Suspend:
+	case SPA_NODE_COMMAND_Pause:
+		if (!this->started)
+			return 0;
+
+		lock_renderer(this);
+		spa_vulkan_blit_stop(&this->state);
+		this->started = false;
+		unlock_renderer(this);
+		// Locking the renderer from the renderer is no longer required
+		break;
+	default:
+		return -ENOTSUP;
+	}
+	return 0;
+}
+
+static const struct spa_dict_item node_info_items = {
+	{ SPA_KEY_MEDIA_CLASS, "Video/Filter" },
+};
+
+static void emit_node_info(struct impl *this, bool full)
+{
+	uint64_t old = full ? this->info.change_mask : 0;
+	if (full)
+		this->info.change_mask = this->info_all;
+	if (this->info.change_mask) {
+		this->info.props = &SPA_DICT_INIT_ARRAY(node_info_items);
+		spa_node_emit_info(&this->hooks, &this->info);
+		this->info.change_mask = old;
+	}
+}
+
+static void emit_port_info(struct impl *this, struct port *port, bool full)
+{
+	uint64_t old = full ? port->info.change_mask : 0;
+	if (full)
+		port->info.change_mask = port->info_all;
+	if (port->info.change_mask) {
+		struct spa_dict_item items1;
+
+		items0 = SPA_DICT_ITEM_INIT(SPA_KEY_FORMAT_DSP, "32 bit float RGBA video");
+		port->info.props = &SPA_DICT_INIT(items, 1);
+		spa_node_emit_port_info(&this->hooks,
+				port->direction, 0, &port->info);
+		port->info.change_mask = old;
+	}
+}
+
+static int
+impl_node_add_listener(void *object,
+		struct spa_hook *listener,
+		const struct spa_node_events *events,
+		void *data)
+{
+	struct impl *this = object;
+	struct spa_hook_list save;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+
+	spa_hook_list_isolate(&this->hooks, &save, listener, events, data);
+
+	emit_node_info(this, true);
+	emit_port_info(this, &this->port0, true);
+	emit_port_info(this, &this->port1, true);
+
+	spa_hook_list_join(&this->hooks, &save);
+
+	return 0;
+}
+
+static int
+impl_node_set_callbacks(void *object,
+			const struct spa_node_callbacks *callbacks,
+			void *data)
+{
+	struct impl *this = object;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+
+	this->callbacks = SPA_CALLBACKS_INIT(callbacks, data);
+
+	return 0;
+}
+
+static int impl_node_add_port(void *object, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
+{
+	return -ENOTSUP;
+}
+
+static int
+impl_node_remove_port(void *object, enum spa_direction direction, uint32_t port_id)
+{
+	return -ENOTSUP;
+}
+
+static bool port_has_fixated_format(struct port *p)
+{
+	if (!p->have_format)
+		return false;
+	return p->current_format.info.dsp.flags & SPA_VIDEO_FLAG_MODIFIER
+		&& p->current_format.info.dsp.flags ^ SPA_VIDEO_FLAG_MODIFIER_FIXATION_REQUIRED;
+}
+
+static int port_enum_formats(void *object,
+			     enum spa_direction direction, uint32_t port_id,
+			     uint32_t index,
+			     const struct spa_pod *filter,
+			     struct spa_pod **param,
+			     struct spa_pod_builder *builder)
+{
+	struct impl *this = object;
+
+	if (port_has_fixated_format(&this->portport_id)) {
+		if (index == 0) {
+			spa_log_info(this->log, "enum_formats fixated format idx: %d, format %d, has_modifier 1",
+					index, this->portport_id.current_format.info.dsp.format);
+			*param = spa_format_video_dsp_build(builder, SPA_PARAM_EnumFormat, &this->portport_id.current_format.info.dsp);
+			return 1;
+		}
+		return spa_vulkan_blit_enumerate_formats(&this->state, index-1, spa_vulkan_blit_get_buffer_caps(&this->state, direction), param, builder);
+	} else {
+		return spa_vulkan_blit_enumerate_formats(&this->state, index, spa_vulkan_blit_get_buffer_caps(&this->state, direction), param, builder);
+	}
+}
+
+static int port_get_buffer_props(struct impl *this, struct port *port,
+		uint32_t *blocks, uint32_t *size, uint32_t *stride, bool *is_dmabuf)
+{
+	if (this->position == NULL)
+		return -EIO;
+
+	spa_log_debug(this->log, "%p: %dx%d stride %d", this,
+			this->position->video.size.width,
+			this->position->video.size.height,
+			this->position->video.stride);
+
+	if (port->current_format.info.dsp.flags & SPA_VIDEO_FLAG_MODIFIER) {
+		*is_dmabuf = true;
+
+		struct vulkan_modifier_info *mod_info = spa_vulkan_blit_get_modifier_info(&this->state,
+			&port->current_format);
+		*blocks = mod_info->props.drmFormatModifierPlaneCount;
+	} else {
+		*is_dmabuf = false;
+		*blocks = 1;
+		*size = this->position->video.stride * this->position->video.size.height;
+		*stride = this->position->video.stride;
+	}
+	return 0;
+}
+
+static int
+impl_node_port_enum_params(void *object, int seq,
+			enum spa_direction direction, uint32_t port_id,
+			uint32_t id, uint32_t start, uint32_t num,
+			const struct spa_pod *filter)
+{
+	struct impl *this = object;
+	struct port *port;
+	struct spa_pod_builder b = { 0 };
+	uint8_t buffer1024;
+	struct spa_pod *param;
+	struct spa_result_node_params result;
+	uint32_t count = 0;
+	int res;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+	spa_return_val_if_fail(num != 0, -EINVAL);
+
+	spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
+	port = &this->portdirection;
+
+	result.id = id;
+	result.next = start;
+      next:
+	result.index = result.next++;
+
+	spa_pod_builder_init(&b, buffer, sizeof(buffer));
+
+	switch (id) {
+	case SPA_PARAM_EnumFormat:
+		if ((res = port_enum_formats(this, direction, port_id,
+						result.index, filter, &param, &b)) <= 0)
+			return res;
+		break;
+
+	case SPA_PARAM_Format:
+		if (!port->have_format)
+			return -EIO;
+		if (result.index > 0)
+			return 0;
+
+		param = spa_format_video_dsp_build(&b, id, &port->current_format.info.dsp);
+		break;
+
+	case SPA_PARAM_Buffers:
+	{
+		if (!port->have_format)
+			return -EIO;
+		if (result.index > 0)
+			return 0;
+
+		int ret;
+		uint32_t blocks, size, stride;
+		bool is_dmabuf;
+
+		if ((ret = port_get_buffer_props(this, port, &blocks, &size, &stride, &is_dmabuf)) < 0)
+			return ret;
+
+		if (is_dmabuf) {
+			param = spa_pod_builder_add_object(&b,
+				SPA_TYPE_OBJECT_ParamBuffers, id,
+				SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(2, 1, MAX_BUFFERS),
+				SPA_PARAM_BUFFERS_blocks,  SPA_POD_Int(blocks),
+				SPA_PARAM_BUFFERS_dataType, SPA_POD_CHOICE_FLAGS_Int(1<<SPA_DATA_DmaBuf));
+		} else {
+			param = spa_pod_builder_add_object(&b,
+				SPA_TYPE_OBJECT_ParamBuffers, id,
+				SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(2, 1, MAX_BUFFERS),
+				SPA_PARAM_BUFFERS_blocks,  SPA_POD_Int(blocks),
+				SPA_PARAM_BUFFERS_size,  SPA_POD_Int(size),
+				SPA_PARAM_BUFFERS_stride,  SPA_POD_Int(stride),
+				SPA_PARAM_BUFFERS_dataType, SPA_POD_CHOICE_FLAGS_Int(1<<SPA_DATA_MemPtr));
+		}
+
+		break;
+	}
+	case SPA_PARAM_Meta:
+		switch (result.index) {
+		case 0:
+			param = spa_pod_builder_add_object(&b,
+				SPA_TYPE_OBJECT_ParamMeta, id,
+				SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header),
+				SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header)));
+			break;
+
+		default:
+			return 0;
+		}
+		break;
+	default:
+		return -ENOENT;
+	}
+
+	if (spa_pod_filter(&b, &result.param, param, filter) < 0)
+		goto next;
+
+	spa_node_emit_result(&this->hooks, seq, 0, SPA_RESULT_TYPE_NODE_PARAMS, &result);
+
+	if (++count != num)
+		goto next;
+
+	return 0;
+}
+
+static int clear_buffers(struct impl *this, struct port *port)
+{
+	if (port->n_buffers > 0) {
+		spa_log_debug(this->log, "%p: clear buffers", this);
+		lock_renderer(this);
+		spa_vulkan_blit_use_buffers(&this->state, &this->state.streamsport->stream_id, 0, &port->current_format, 0, NULL);
+		spa_vulkan_blit_clear_pass(&this->state, &this->pass);
+		unlock_renderer(this);
+		port->n_buffers = 0;
+		spa_list_init(&port->empty);
+		spa_list_init(&port->ready);
+	}
+	return 0;
+}
+
+static int port_set_dsp_format(struct impl *this, struct port *port,
+			   uint32_t flags, struct spa_video_info *info,
+			   bool *has_modifier, bool *modifier_fixed,
+			   const struct spa_pod *format)
+{
+		if (spa_format_video_dsp_parse(format, &info->info.dsp) < 0)
+			return -EINVAL;
+
+		if (info->info.dsp.format != SPA_VIDEO_FORMAT_DSP_F32)
+			return -EINVAL;
+
+		this->state.streamsport->stream_id.dim.width = this->position->video.size.width;
+		this->state.streamsport->stream_id.dim.height = this->position->video.size.height;
+		this->state.streamsport->stream_id.bpp = 16;
+		*has_modifier = SPA_FLAG_IS_SET(info->info.dsp.flags, SPA_VIDEO_FLAG_MODIFIER);
+
+		// fixate modifier
+		if (port->direction == SPA_DIRECTION_OUTPUT
+				&& info->info.dsp.flags & SPA_VIDEO_FLAG_MODIFIER
+				&& info->info.dsp.flags & SPA_VIDEO_FLAG_MODIFIER_FIXATION_REQUIRED) {
+			const struct spa_pod_prop *mod_prop;
+			if ((mod_prop = spa_pod_find_prop(format, NULL, SPA_FORMAT_VIDEO_modifier)) == NULL)
+				return -EINVAL;
+
+			const struct spa_pod *mod_pod = &mod_prop->value;
+			uint32_t modifierCount = SPA_POD_CHOICE_N_VALUES(mod_pod);
+			uint64_t *modifiers = SPA_POD_CHOICE_VALUES(mod_pod);
+			if (modifierCount <= 1)
+				return -EINVAL;
+			// SPA_POD_CHOICE carries the "preferred" value at position 0
+			modifierCount -= 1;
+			modifiers++;
+			uint64_t fixed_modifier;
+			if (spa_vulkan_blit_fixate_modifier(&this->state, &this->state.streamsport->stream_id, info, modifierCount, modifiers, &fixed_modifier) != 0)
+				return -EINVAL;
+
+			spa_log_info(this->log, "modifier fixated %"PRIu64, fixed_modifier);
+
+			info->info.dsp.modifier = fixed_modifier;
+			info->info.dsp.flags &= ~SPA_VIDEO_FLAG_MODIFIER_FIXATION_REQUIRED;
+			*modifier_fixed = true;
+		}
+
+	return 0;
+}
+
+static int port_set_format(struct impl *this, struct port *port,
+			   uint32_t flags,
+			   const struct spa_pod *format)
+{
+	int res;
+
+	if (format == NULL) {
+		port->have_format = false;
+		clear_buffers(this, port);
+	} else {
+		struct spa_video_info info = { 0 };
+
+		if ((res = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
+			return res;
+
+		if (info.media_type != SPA_MEDIA_TYPE_video)
+			return -EINVAL;
+
+		bool has_modifier = false;
+		bool modifier_fixed = false;
+		if ((res = port_set_dsp_format(this, port, flags, &info, &has_modifier, &modifier_fixed, format)) < 0)
+			return res;
+
+		if (has_modifier) {
+			SPA_FLAG_SET(port->info.flags, SPA_PORT_FLAG_CAN_ALLOC_BUFFERS);
+		} else {
+			SPA_FLAG_CLEAR(port->info.flags, SPA_PORT_FLAG_CAN_ALLOC_BUFFERS);
+		}
+		port->info.change_mask |= SPA_PORT_CHANGE_MASK_FLAGS;
+
+		port->current_format = info;
+		port->have_format = true;
+
+		if (modifier_fixed) {
+			port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
+			port->paramsIDX_EnumFormat.flags ^= SPA_PARAM_INFO_SERIAL;
+			emit_port_info(this, port, false);
+			return 0;
+		}
+	}
+
+	port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
+	if (port->have_format) {
+		port->paramsIDX_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READWRITE);
+		port->paramsIDX_Buffer = SPA_PARAM_INFO(SPA_PARAM_Buffers, SPA_PARAM_INFO_READ);
+	} else {
+		port->paramsIDX_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
+		port->paramsIDX_Buffer = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
+	}
+	emit_port_info(this, port, false);
+
+	return 0;
+}
+
+static int
+impl_node_port_set_param(void *object,
+			 enum spa_direction direction, uint32_t port_id,
+			 uint32_t id, uint32_t flags,
+			 const struct spa_pod *param)
+{
+	struct impl *this = object;
+	struct port *port;
+	int res;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+	spa_return_val_if_fail(CHECK_PORT(node, direction, port_id), -EINVAL);
+	port = &this->portdirection;
+
+	switch (id) {
+	case SPA_PARAM_Format:
+		res = port_set_format(this, port, flags, param);
+		break;
+	default:
+		return -ENOENT;
+	}
+	return res;
+}
+
+static int
+impl_node_port_use_buffers(void *object,
+			   enum spa_direction direction,
+			   uint32_t port_id,
+			   uint32_t flags,
+			   struct spa_buffer **buffers,
+			   uint32_t n_buffers)
+{
+	struct impl *this = object;
+	struct port *port;
+	uint32_t i;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+	spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
+	port = &this->portdirection;
+
+	clear_buffers(this, port);
+
+	if (n_buffers > 0 && !port->have_format)
+		return -EIO;
+	if (n_buffers > MAX_BUFFERS)
+		return -ENOSPC;
+
+	lock_renderer(this);
+	for (i = 0; i < n_buffers; i++) {
+		struct buffer *b;
+
+		b = &port->buffersi;
+		b->id = i;
+		b->outbuf = buffersi;
+		b->flags = 0;
+		b->h = spa_buffer_find_meta_data(buffersi, SPA_META_Header, sizeof(*b->h));
+
+		spa_log_info(this->log, "%p: %d:%d add buffer %p", port, direction, port_id, b);
+		spa_list_append(&port->empty, &b->link);
+	}
+	spa_vulkan_blit_use_buffers(&this->state, &this->state.streamsport->stream_id, flags, &port->current_format, n_buffers, buffers);
+	port->n_buffers = n_buffers;
+	if (n_buffers > 0)
+		spa_vulkan_blit_init_pass(&this->state, &this->pass);
+	unlock_renderer(this);
+
+	return 0;
+}
+
+static int
+impl_node_port_set_io(void *object,
+		      enum spa_direction direction,
+		      uint32_t port_id,
+		      uint32_t id,
+		      void *data, size_t size)
+{
+	struct impl *this = object;
+	struct port *port;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+	spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
+	port = &this->portdirection;
+
+	switch (id) {
+	case SPA_IO_Buffers:
+		port->io = data;
+		break;
+	default:
+		return -ENOENT;
+	}
+	return 0;
+}
+
+static int impl_node_port_reuse_buffer(void *object, uint32_t port_id, uint32_t buffer_id)
+{
+	struct impl *this = object;
+	struct port *port;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+	spa_return_val_if_fail(port_id == 0, -EINVAL);
+
+	port = &this->portSPA_DIRECTION_OUTPUT;
+	spa_return_val_if_fail(buffer_id < port->n_buffers, -EINVAL);
+
+	reuse_buffer(this, port, buffer_id);
+
+	return 0;
+}
+
+static int impl_node_process(void *object)
+{
+	struct impl *this = object;
+	struct port *inport, *outport;
+	struct spa_io_buffers *inio, *outio;
+	struct buffer *b;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+	spa_return_val_if_fail(this->started, -EINVAL);
+
+	inport = &this->portSPA_DIRECTION_INPUT;
+	if ((inio = inport->io) == NULL)
+		return -EIO;
+
+	if (inio->status != SPA_STATUS_HAVE_DATA)
+		return inio->status;
+
+	if (inio->buffer_id >= inport->n_buffers) {
+		inio->status = -EINVAL;
+		return -EINVAL;
+	}
+
+	outport = &this->portSPA_DIRECTION_OUTPUT;
+	if ((outio = outport->io) == NULL)
+		return -EIO;
+
+	if (outio->status == SPA_STATUS_HAVE_DATA)
+		return SPA_STATUS_HAVE_DATA;
+
+	if (outio->buffer_id < outport->n_buffers) {
+		reuse_buffer(this, outport, outio->buffer_id);
+		outio->buffer_id = SPA_ID_INVALID;
+	}
+
+	if (spa_list_is_empty(&outport->empty)) {
+		spa_log_debug(this->log, "%p: out of buffers", this);
+		return -EPIPE;
+	}
+
+	if (pthread_rwlock_tryrdlock(&this->renderlock) < 0) {
+		return -EBUSY;
+	}
+
+	b = &inport->buffersinio->buffer_id;
+	this->pass.in_stream_id = SPA_DIRECTION_INPUT;
+	this->pass.in_buffer_id = b->id;
+	inio->status = SPA_STATUS_NEED_DATA;
+
+	b = spa_list_first(&outport->empty, struct buffer, link);
+	spa_list_remove(&b->link);
+	SPA_FLAG_SET(b->flags, BUFFER_FLAG_OUT);
+	this->pass.out_stream_id = SPA_DIRECTION_OUTPUT;
+	this->pass.out_buffer_id = b->id;
+
+	spa_log_debug(this->log, "filter into %d", b->id);
+
+	spa_vulkan_blit_process(&this->state, &this->pass);
+	spa_vulkan_blit_reset_pass(&this->state, &this->pass);
+
+	b->outbuf->datas0.chunk->offset = 0;
+	b->outbuf->datas0.chunk->size = b->outbuf->datas0.maxsize;
+	b->outbuf->datas0.chunk->stride = this->position->video.stride;
+
+	outio->buffer_id = b->id;
+	outio->status = SPA_STATUS_HAVE_DATA;
+
+	pthread_rwlock_unlock(&this->renderlock);
+
+	return SPA_STATUS_NEED_DATA | SPA_STATUS_HAVE_DATA;
+}
+
+static const struct spa_node_methods impl_node = {
+	SPA_VERSION_NODE_METHODS,
+	.add_listener = impl_node_add_listener,
+	.set_callbacks = impl_node_set_callbacks,
+	.enum_params = impl_node_enum_params,
+	.set_param = impl_node_set_param,
+	.set_io = impl_node_set_io,
+	.send_command = impl_node_send_command,
+	.add_port = impl_node_add_port,
+	.remove_port = impl_node_remove_port,
+	.port_enum_params = impl_node_port_enum_params,
+	.port_set_param = impl_node_port_set_param,
+	.port_use_buffers = impl_node_port_use_buffers,
+	.port_set_io = impl_node_port_set_io,
+	.port_reuse_buffer = impl_node_port_reuse_buffer,
+	.process = impl_node_process,
+};
+
+static int impl_get_interface(struct spa_handle *handle, const char *type, void **interface)
+{
+	struct impl *this;
+
+	spa_return_val_if_fail(handle != NULL, -EINVAL);
+	spa_return_val_if_fail(interface != NULL, -EINVAL);
+
+	this = (struct impl *) handle;
+
+	if (spa_streq(type, SPA_TYPE_INTERFACE_Node))
+		*interface = &this->node;
+	else
+		return -ENOENT;
+
+	return 0;
+}
+
+static int impl_clear(struct spa_handle *handle)
+{
+	struct impl *this;
+
+	spa_return_val_if_fail(handle != NULL, -EINVAL);
+
+	this = (struct impl *) handle;
+
+	spa_vulkan_blit_unprepare(&this->state);
+	spa_vulkan_blit_deinit(&this->state);
+	lock_destroy(this);
+	return 0;
+}
+
+static size_t
+impl_get_size(const struct spa_handle_factory *factory,
+	      const struct spa_dict *params)
+{
+	return sizeof(struct impl);
+}
+
+static int
+impl_init(const struct spa_handle_factory *factory,
+	  struct spa_handle *handle,
+	  const struct spa_dict *info,
+	  const struct spa_support *support,
+	  uint32_t n_support)
+{
+	struct impl *this;
+	struct port *port;
+
+	spa_return_val_if_fail(factory != NULL, -EINVAL);
+	spa_return_val_if_fail(handle != NULL, -EINVAL);
+
+	handle->get_interface = impl_get_interface;
+	handle->clear = impl_clear;
+
+	this = (struct impl *) handle;
+
+	this->log = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_Log);
+	this->state.log = this->log;
+
+	spa_hook_list_init(&this->hooks);
+
+	this->node.iface = SPA_INTERFACE_INIT(
+			SPA_TYPE_INTERFACE_Node,
+			SPA_VERSION_NODE,
+			&impl_node, this);
+
+	this->info_all = SPA_NODE_CHANGE_MASK_FLAGS |
+			SPA_NODE_CHANGE_MASK_PROPS |
+			SPA_NODE_CHANGE_MASK_PARAMS;
+	this->info = SPA_NODE_INFO_INIT();
+	this->info.max_output_ports = 1;
+	this->info.max_input_ports = 1;
+	this->info.flags = SPA_NODE_FLAG_RT;
+	this->paramsIDX_PropInfo = SPA_PARAM_INFO(SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ);
+	this->paramsIDX_Props = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE);
+	this->info.params = this->params;
+	this->info.n_params = N_NODE_PARAMS;
+
+	lock_init(this);
+
+	port = &this->portSPA_DIRECTION_INPUT;
+	port->stream_id = SPA_DIRECTION_INPUT;
+	port->direction = SPA_DIRECTION_INPUT;
+	port->info_all = SPA_PORT_CHANGE_MASK_FLAGS |
+			SPA_PORT_CHANGE_MASK_PARAMS |
+			SPA_PORT_CHANGE_MASK_PROPS;
+	port->info = SPA_PORT_INFO_INIT();
+	port->info.flags = SPA_PORT_FLAG_NO_REF;
+	port->paramsIDX_EnumFormat = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
+	port->paramsIDX_Meta = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
+	port->paramsIDX_IO = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
+	port->paramsIDX_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
+	port->paramsIDX_Buffer = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
+	port->info.params = port->params;
+	port->info.n_params = N_PORT_PARAMS;
+	spa_vulkan_blit_init_stream(&this->state, &this->state.streamsport->stream_id,
+			SPA_DIRECTION_INPUT, NULL);
+	spa_list_init(&port->empty);
+	spa_list_init(&port->ready);
+
+	port = &this->portSPA_DIRECTION_OUTPUT;
+	port->stream_id = SPA_DIRECTION_OUTPUT;
+	port->direction = SPA_DIRECTION_OUTPUT;
+	port->info_all = SPA_PORT_CHANGE_MASK_FLAGS |
+			SPA_PORT_CHANGE_MASK_PARAMS |
+			SPA_PORT_CHANGE_MASK_PROPS;
+	port->info = SPA_PORT_INFO_INIT();
+	port->info.flags = SPA_PORT_FLAG_NO_REF | SPA_PORT_FLAG_CAN_ALLOC_BUFFERS;
+	port->paramsIDX_EnumFormat = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
+	port->paramsIDX_Meta = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
+	port->paramsIDX_IO = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
+	port->paramsIDX_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
+	port->paramsIDX_Buffer = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
+	port->info.params = port->params;
+	port->info.n_params = N_PORT_PARAMS;
+	spa_list_init(&port->empty);
+	spa_list_init(&port->ready);
+	spa_vulkan_blit_init_stream(&this->state, &this->state.streamsport->stream_id,
+			SPA_DIRECTION_OUTPUT, NULL);
+
+	this->state.n_streams = 2;
+	spa_vulkan_blit_init(&this->state);
+	spa_vulkan_blit_prepare(&this->state);
+
+	return 0;
+}
+
+static const struct spa_interface_info impl_interfaces = {
+	{SPA_TYPE_INTERFACE_Node,},
+};
+
+static int
+impl_enum_interface_info(const struct spa_handle_factory *factory,
+			 const struct spa_interface_info **info,
+			 uint32_t *index)
+{
+	spa_return_val_if_fail(factory != NULL, -EINVAL);
+	spa_return_val_if_fail(info != NULL, -EINVAL);
+	spa_return_val_if_fail(index != NULL, -EINVAL);
+
+	switch (*index) {
+	case 0:
+		*info = &impl_interfaces*index;
+		break;
+	default:
+		return 0;
+	}
+	(*index)++;
+	return 1;
+}
+
+static const struct spa_dict_item info_items = {
+	{ SPA_KEY_FACTORY_AUTHOR, "Columbarius <co1umbarius@protonmail.com>" },
+	{ SPA_KEY_FACTORY_DESCRIPTION, "Convert video frames using a vulkan blit" },
+};
+
+static const struct spa_dict info = SPA_DICT_INIT_ARRAY(info_items);
+
+const struct spa_handle_factory spa_vulkan_blit_dsp_filter_factory = {
+	SPA_VERSION_HANDLE_FACTORY,
+	SPA_NAME_API_VULKAN_BLIT_DSP_FILTER,
+	&info,
+	impl_get_size,
+	impl_init,
+	impl_enum_interface_info,
+};

pipewire-1.2.0.tar.gz/spa/plugins/vulkan/vulkan-blit-filter.c Added

@@ -0,0 +1,1056 @@
+/* Spa */
+/* SPDX-FileCopyrightText: Copyright © 2019 Wim Taymans */
+/* SPDX-FileCopyrightText: Copyright © 2023 columbarius */
+/* SPDX-License-Identifier: MIT */
+
+#include <errno.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdatomic.h>
+#include <pthread.h>
+
+#include <spa/support/plugin.h>
+#include <spa/support/log.h>
+#include <spa/support/loop.h>
+#include <spa/utils/list.h>
+#include <spa/utils/keys.h>
+#include <spa/utils/names.h>
+#include <spa/utils/string.h>
+#include <spa/node/node.h>
+#include <spa/node/utils.h>
+#include <spa/node/io.h>
+#include <spa/node/keys.h>
+#include <spa/param/video/format-utils.h>
+#include <spa/param/param.h>
+#include <spa/pod/filter.h>
+
+#include "pixel-formats.h"
+#include "vulkan-blit-utils.h"
+
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.vulkan.blit-filter");
+
+struct buffer {
+	uint32_t id;
+#define BUFFER_FLAG_OUT (1<<0)
+	uint32_t flags;
+	struct spa_buffer *outbuf;
+	struct spa_meta_header *h;
+	struct spa_list link;
+};
+
+struct port {
+	uint64_t info_all;
+	struct spa_port_info info;
+
+	enum spa_direction direction;
+#define IDX_EnumFormat	0
+#define IDX_Meta	1
+#define IDX_IO		2
+#define IDX_Format	3
+#define IDX_Buffer	4
+#define N_PORT_PARAMS	5
+	struct spa_param_info paramsN_PORT_PARAMS;
+
+	struct spa_io_buffers *io;
+
+	bool have_format;
+	struct spa_video_info current_format;
+
+	struct buffer buffersMAX_BUFFERS;
+	uint32_t n_buffers;
+
+	struct spa_list empty;
+	struct spa_list ready;
+	uint32_t stream_id;
+};
+
+struct impl {
+	struct spa_handle handle;
+	struct spa_node node;
+
+	struct spa_log *log;
+
+	struct spa_io_position *position;
+
+	uint64_t info_all;
+	struct spa_node_info info;
+#define IDX_PropInfo	0
+#define IDX_Props	1
+#define N_NODE_PARAMS	2
+	struct spa_param_info paramsN_NODE_PARAMS;
+
+	struct spa_hook_list hooks;
+	struct spa_callbacks callbacks;
+
+	// Synchronization between main and data thread
+	atomic_bool started;
+	pthread_rwlock_t renderlock;
+
+	struct vulkan_blit_state state;
+	struct vulkan_pass pass;
+	struct port port2;
+};
+
+#define CHECK_PORT(this,d,p)  ((p) < 1)
+
+static int lock_init(struct impl *this)
+{
+	return pthread_rwlock_init(&this->renderlock, NULL);
+}
+
+static void lock_destroy(struct impl *this)
+{
+	pthread_rwlock_destroy(&this->renderlock);
+}
+
+static int lock_renderer(struct impl *this)
+{
+	spa_log_info(this->log, "Lock renderer");
+	return pthread_rwlock_wrlock(&this->renderlock);
+}
+
+static int unlock_renderer(struct impl *this)
+{
+	spa_log_info(this->log, "Unlock renderer");
+	return pthread_rwlock_unlock(&this->renderlock);
+}
+
+static int impl_node_enum_params(void *object, int seq,
+				 uint32_t id, uint32_t start, uint32_t num,
+				 const struct spa_pod *filter)
+{
+	struct impl *this = object;
+	struct spa_pod *param;
+	struct spa_pod_builder b = { 0 };
+	uint8_t buffer1024;
+	struct spa_result_node_params result;
+	uint32_t count = 0;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+	spa_return_val_if_fail(num != 0, -EINVAL);
+
+	result.id = id;
+	result.next = start;
+      next:
+	result.index = result.next++;
+
+	spa_pod_builder_init(&b, buffer, sizeof(buffer));
+
+	switch (id) {
+	default:
+		return -ENOENT;
+	}
+
+	if (spa_pod_filter(&b, &result.param, param, filter) < 0)
+		goto next;
+
+	spa_node_emit_result(&this->hooks, seq, 0, SPA_RESULT_TYPE_NODE_PARAMS, &result);
+
+	if (++count != num)
+		goto next;
+
+	return 0;
+}
+
+static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
+{
+	struct impl *this = object;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+
+	switch (id) {
+	case SPA_IO_Position:
+		if (size > 0 && size < sizeof(struct spa_io_position))
+			return -EINVAL;
+		this->position = data;
+		break;
+	default:
+		return -ENOENT;
+	}
+	return 0;
+}
+static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
+			       const struct spa_pod *param)
+{
+	struct impl *this = object;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+
+	switch (id) {
+	default:
+		return -ENOENT;
+	}
+	return 0;
+}
+
+static inline void reuse_buffer(struct impl *this, struct port *port, uint32_t id)
+{
+	struct buffer *b = &port->buffersid;
+
+	if (SPA_FLAG_IS_SET(b->flags, BUFFER_FLAG_OUT)) {
+		spa_log_debug(this->log, "%p: reuse buffer %d", this, id);
+
+		SPA_FLAG_CLEAR(b->flags, BUFFER_FLAG_OUT);
+		spa_list_append(&port->empty, &b->link);
+	}
+}
+
+static int impl_node_send_command(void *object, const struct spa_command *command)
+{
+	struct impl *this = object;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+	spa_return_val_if_fail(command != NULL, -EINVAL);
+
+	switch (SPA_NODE_COMMAND_ID(command)) {
+	case SPA_NODE_COMMAND_Start:
+		if (this->started)
+			return 0;
+
+		this->started = true;
+		spa_vulkan_blit_start(&this->state);
+		// The main thread needs to lock the renderer before changing its state
+		break;
+
+	case SPA_NODE_COMMAND_Suspend:
+	case SPA_NODE_COMMAND_Pause:
+		if (!this->started)
+			return 0;
+
+		lock_renderer(this);
+		spa_vulkan_blit_stop(&this->state);
+		this->started = false;
+		unlock_renderer(this);
+		// Locking the renderer from the renderer is no longer required
+		break;
+	default:
+		return -ENOTSUP;
+	}
+	return 0;
+}
+
+static const struct spa_dict_item node_info_items = {
+	{ SPA_KEY_MEDIA_CLASS, "Video/Filter" },
+};
+
+static void emit_node_info(struct impl *this, bool full)
+{
+	uint64_t old = full ? this->info.change_mask : 0;
+	if (full)
+		this->info.change_mask = this->info_all;
+	if (this->info.change_mask) {
+		this->info.props = &SPA_DICT_INIT_ARRAY(node_info_items);
+		spa_node_emit_info(&this->hooks, &this->info);
+		this->info.change_mask = old;
+	}
+}
+
+static void emit_port_info(struct impl *this, struct port *port, bool full)
+{
+	uint64_t old = full ? port->info.change_mask : 0;
+	if (full)
+		port->info.change_mask = port->info_all;
+	if (port->info.change_mask) {
+		struct spa_dict_item items1;
+
+		items0 = SPA_DICT_ITEM_INIT(SPA_KEY_FORMAT_DSP, "32 bit float RGBA video");
+		port->info.props = &SPA_DICT_INIT(items, 1);
+		spa_node_emit_port_info(&this->hooks,
+				port->direction, 0, &port->info);
+		port->info.change_mask = old;
+	}
+}
+
+static int
+impl_node_add_listener(void *object,
+		struct spa_hook *listener,
+		const struct spa_node_events *events,
+		void *data)
+{
+	struct impl *this = object;
+	struct spa_hook_list save;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+
+	spa_hook_list_isolate(&this->hooks, &save, listener, events, data);
+
+	emit_node_info(this, true);
+	emit_port_info(this, &this->port0, true);
+	emit_port_info(this, &this->port1, true);
+
+	spa_hook_list_join(&this->hooks, &save);
+
+	return 0;
+}
+
+static int
+impl_node_set_callbacks(void *object,
+			const struct spa_node_callbacks *callbacks,
+			void *data)
+{
+	struct impl *this = object;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+
+	this->callbacks = SPA_CALLBACKS_INIT(callbacks, data);
+
+	return 0;
+}
+
+static int impl_node_add_port(void *object, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
+{
+	return -ENOTSUP;
+}
+
+static int
+impl_node_remove_port(void *object, enum spa_direction direction, uint32_t port_id)
+{
+	return -ENOTSUP;
+}
+
+static bool port_has_fixated_format(struct port *p)
+{
+	if (!p->have_format)
+		return false;
+	switch (p->current_format.media_subtype) {
+	case SPA_MEDIA_SUBTYPE_dsp:
+		return p->current_format.info.dsp.flags & SPA_VIDEO_FLAG_MODIFIER
+			&& p->current_format.info.dsp.flags ^ SPA_VIDEO_FLAG_MODIFIER_FIXATION_REQUIRED;
+	case SPA_MEDIA_SUBTYPE_raw:
+		return p->current_format.info.raw.flags & SPA_VIDEO_FLAG_MODIFIER
+			&& p->current_format.info.raw.flags ^ SPA_VIDEO_FLAG_MODIFIER_FIXATION_REQUIRED;
+	}
+	return false;
+}
+
+static int port_enum_formats(void *object,
+			     enum spa_direction direction, uint32_t port_id,
+			     uint32_t index,
+			     const struct spa_pod *filter,
+			     struct spa_pod **param,
+			     struct spa_pod_builder *builder)
+{
+	struct impl *this = object;
+
+	if (port_has_fixated_format(&this->portport_id)) {
+		if (index == 0) {
+			if (this->portport_id.current_format.media_subtype == SPA_MEDIA_SUBTYPE_dsp) {
+				spa_log_info(this->log, "enum_formats fixated format idx: %d, format %d, has_modifier 1",
+						index, this->portport_id.current_format.info.dsp.format);
+				*param = spa_format_video_dsp_build(builder, SPA_PARAM_EnumFormat, &this->portport_id.current_format.info.dsp);
+			} else {
+				spa_log_info(this->log, "enum_formats fixated format idx: %d, format %d, has_modifier 1",
+						index, this->portport_id.current_format.info.raw.format);
+				*param = spa_format_video_raw_build(builder, SPA_PARAM_EnumFormat, &this->portport_id.current_format.info.raw);
+			}
+			return 1;
+		}
+		return spa_vulkan_blit_enumerate_formats(&this->state, index-1, spa_vulkan_blit_get_buffer_caps(&this->state, direction), param, builder);
+	} else {
+		return spa_vulkan_blit_enumerate_formats(&this->state, index, spa_vulkan_blit_get_buffer_caps(&this->state, direction), param, builder);
+	}
+}
+
+static int port_get_buffer_props(struct impl *this, struct port *port,
+		uint32_t *blocks, uint32_t *size, uint32_t *stride, bool *is_dmabuf)
+{
+	if (port->current_format.media_subtype == SPA_MEDIA_SUBTYPE_dsp) {
+		if (this->position == NULL)
+			return -EIO;
+
+		spa_log_debug(this->log, "%p: %dx%d stride %d", this,
+				this->position->video.size.width,
+				this->position->video.size.height,
+				this->position->video.stride);
+
+		if (port->current_format.info.dsp.flags & SPA_VIDEO_FLAG_MODIFIER) {
+			*is_dmabuf = true;
+
+			struct vulkan_modifier_info *mod_info = spa_vulkan_blit_get_modifier_info(&this->state,
+				&port->current_format);
+			*blocks = mod_info->props.drmFormatModifierPlaneCount;
+		} else {
+			*is_dmabuf = false;
+			*blocks = 1;
+			*size = this->position->video.stride * this->position->video.size.height;
+			*stride = this->position->video.stride;
+		}
+		return 0;
+	} else if (port->current_format.media_subtype == SPA_MEDIA_SUBTYPE_raw) {
+		spa_log_debug(this->log, "%p: %dx%d", this,
+				port->current_format.info.raw.size.width,
+				port->current_format.info.raw.size.height);
+
+		if (port->current_format.info.raw.flags & SPA_VIDEO_FLAG_MODIFIER) {
+			*is_dmabuf = true;
+
+			struct vulkan_modifier_info *mod_info = spa_vulkan_blit_get_modifier_info(&this->state,
+				&port->current_format);
+			*blocks = mod_info->props.drmFormatModifierPlaneCount;
+		} else {
+			struct pixel_format_info pInfo = {0};
+			if (!get_pixel_format_info(port->current_format.info.raw.format, &pInfo))
+				return -EINVAL;
+			uint32_t buffer_stride = pInfo.bpp * port->current_format.info.raw.size.width;
+			*is_dmabuf = false;
+			*blocks = 1;
+			*size = buffer_stride * port->current_format.info.raw.size.height;
+			*stride = buffer_stride;
+		}
+		return 0;
+	} else {
+		return -EINVAL;
+	}
+}
+
+static int
+impl_node_port_enum_params(void *object, int seq,
+			enum spa_direction direction, uint32_t port_id,
+			uint32_t id, uint32_t start, uint32_t num,
+			const struct spa_pod *filter)
+{
+	struct impl *this = object;
+	struct port *port;
+	struct spa_pod_builder b = { 0 };
+	uint8_t buffer1024;
+	struct spa_pod *param;
+	struct spa_result_node_params result;
+	uint32_t count = 0;
+	int res;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+	spa_return_val_if_fail(num != 0, -EINVAL);
+
+	spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
+	port = &this->portdirection;
+
+	result.id = id;
+	result.next = start;
+      next:
+	result.index = result.next++;
+
+	spa_pod_builder_init(&b, buffer, sizeof(buffer));
+
+	switch (id) {
+	case SPA_PARAM_EnumFormat:
+		if ((res = port_enum_formats(this, direction, port_id,
+						result.index, filter, &param, &b)) <= 0)
+			return res;
+		break;
+
+	case SPA_PARAM_Format:
+		if (!port->have_format)
+			return -EIO;
+		if (result.index > 0)
+			return 0;
+
+		if (port->current_format.media_subtype == SPA_MEDIA_SUBTYPE_dsp) {
+			param = spa_format_video_dsp_build(&b, id, &port->current_format.info.dsp);
+		} else if (port->current_format.media_subtype == SPA_MEDIA_SUBTYPE_raw) {
+			param = spa_format_video_raw_build(&b, id, &port->current_format.info.raw);
+		} else {
+			return -EINVAL;
+		}
+		break;
+
+	case SPA_PARAM_Buffers:
+	{
+		if (!port->have_format)
+			return -EIO;
+		if (result.index > 0)
+			return 0;
+
+		int ret;
+		uint32_t blocks, size, stride;
+		bool is_dmabuf;
+
+		if ((ret = port_get_buffer_props(this, port, &blocks, &size, &stride, &is_dmabuf)) < 0)
+			return ret;
+
+		if (is_dmabuf) {
+			param = spa_pod_builder_add_object(&b,
+				SPA_TYPE_OBJECT_ParamBuffers, id,
+				SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(2, 1, MAX_BUFFERS),
+				SPA_PARAM_BUFFERS_blocks,  SPA_POD_Int(blocks),
+				SPA_PARAM_BUFFERS_dataType, SPA_POD_CHOICE_FLAGS_Int(1<<SPA_DATA_DmaBuf));
+		} else {
+			param = spa_pod_builder_add_object(&b,
+				SPA_TYPE_OBJECT_ParamBuffers, id,
+				SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(2, 1, MAX_BUFFERS),
+				SPA_PARAM_BUFFERS_blocks,  SPA_POD_Int(blocks),
+				SPA_PARAM_BUFFERS_size,  SPA_POD_Int(size),
+				SPA_PARAM_BUFFERS_stride,  SPA_POD_Int(stride),
+				SPA_PARAM_BUFFERS_dataType, SPA_POD_CHOICE_FLAGS_Int(1<<SPA_DATA_MemPtr));
+		}
+
+		break;
+	}
+	case SPA_PARAM_Meta:
+		switch (result.index) {
+		case 0:
+			param = spa_pod_builder_add_object(&b,
+				SPA_TYPE_OBJECT_ParamMeta, id,
+				SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header),
+				SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header)));
+			break;
+
+		default:
+			return 0;
+		}
+		break;
+	default:
+		return -ENOENT;
+	}
+
+	if (spa_pod_filter(&b, &result.param, param, filter) < 0)
+		goto next;
+
+	spa_node_emit_result(&this->hooks, seq, 0, SPA_RESULT_TYPE_NODE_PARAMS, &result);
+
+	if (++count != num)
+		goto next;
+
+	return 0;
+}
+
+static int clear_buffers(struct impl *this, struct port *port)
+{
+	if (port->n_buffers > 0) {
+		spa_log_debug(this->log, "%p: clear buffers", this);
+		lock_renderer(this);
+		spa_vulkan_blit_use_buffers(&this->state, &this->state.streamsport->stream_id, 0, &port->current_format, 0, NULL);
+		spa_vulkan_blit_clear_pass(&this->state, &this->pass);
+		unlock_renderer(this);
+		port->n_buffers = 0;
+		spa_list_init(&port->empty);
+		spa_list_init(&port->ready);
+	}
+	return 0;
+}
+
+static int port_set_dsp_format(struct impl *this, struct port *port,
+			   uint32_t flags, struct spa_video_info *info,
+			   bool *has_modifier, bool *modifier_fixed,
+			   const struct spa_pod *format)
+{
+		if (spa_format_video_dsp_parse(format, &info->info.dsp) < 0)
+			return -EINVAL;
+
+		if (info->info.dsp.format != SPA_VIDEO_FORMAT_DSP_F32)
+			return -EINVAL;
+
+		this->state.streamsport->stream_id.dim.width = this->position->video.size.width;
+		this->state.streamsport->stream_id.dim.height = this->position->video.size.height;
+		this->state.streamsport->stream_id.bpp = 16;
+		*has_modifier = SPA_FLAG_IS_SET(info->info.dsp.flags, SPA_VIDEO_FLAG_MODIFIER);
+
+		// fixate modifier
+		if (port->direction == SPA_DIRECTION_OUTPUT
+				&& info->info.dsp.flags & SPA_VIDEO_FLAG_MODIFIER
+				&& info->info.dsp.flags & SPA_VIDEO_FLAG_MODIFIER_FIXATION_REQUIRED) {
+			const struct spa_pod_prop *mod_prop;
+			if ((mod_prop = spa_pod_find_prop(format, NULL, SPA_FORMAT_VIDEO_modifier)) == NULL)
+				return -EINVAL;
+
+			const struct spa_pod *mod_pod = &mod_prop->value;
+			uint32_t modifierCount = SPA_POD_CHOICE_N_VALUES(mod_pod);
+			uint64_t *modifiers = SPA_POD_CHOICE_VALUES(mod_pod);
+			if (modifierCount <= 1)
+				return -EINVAL;
+			// SPA_POD_CHOICE carries the "preferred" value at position 0
+			modifierCount -= 1;
+			modifiers++;
+			uint64_t fixed_modifier;
+			if (spa_vulkan_blit_fixate_modifier(&this->state, &this->state.streamsport->stream_id, info, modifierCount, modifiers, &fixed_modifier) != 0)
+				return -EINVAL;
+
+			spa_log_info(this->log, "modifier fixated %"PRIu64, fixed_modifier);
+
+			info->info.dsp.modifier = fixed_modifier;
+			info->info.dsp.flags &= ~SPA_VIDEO_FLAG_MODIFIER_FIXATION_REQUIRED;
+			*modifier_fixed = true;
+		}
+
+	return 0;
+}
+
+static int port_set_raw_format(struct impl *this, struct port *port,
+			   uint32_t flags, struct spa_video_info *info,
+			   bool *has_modifier, bool *modifier_fixed,
+			   const struct spa_pod *format)
+{
+		if (spa_format_video_raw_parse(format, &info->info.raw) < 0)
+			return -EINVAL;
+
+		struct pixel_format_info pInfo;
+		if (!get_pixel_format_info(info->info.raw.format, &pInfo))
+			return -EINVAL;
+		this->state.streamsport->stream_id.dim = info->info.raw.size;
+		this->state.streamsport->stream_id.bpp = pInfo.bpp;
+		*has_modifier = SPA_FLAG_IS_SET(info->info.raw.flags, SPA_VIDEO_FLAG_MODIFIER);
+
+		// fixate modifier
+		if (port->direction == SPA_DIRECTION_OUTPUT
+				&& info->info.raw.flags & SPA_VIDEO_FLAG_MODIFIER
+				&& info->info.raw.flags & SPA_VIDEO_FLAG_MODIFIER_FIXATION_REQUIRED) {
+			const struct spa_pod_prop *mod_prop;
+			if ((mod_prop = spa_pod_find_prop(format, NULL, SPA_FORMAT_VIDEO_modifier)) == NULL)
+				return -EINVAL;
+
+			const struct spa_pod *mod_pod = &mod_prop->value;
+			uint32_t modifierCount = SPA_POD_CHOICE_N_VALUES(mod_pod);
+			uint64_t *modifiers = SPA_POD_CHOICE_VALUES(mod_pod);
+			if (modifierCount <= 1)
+				return -EINVAL;
+			// SPA_POD_CHOICE carries the "preferred" value at position 0
+			modifierCount -= 1;
+			modifiers++;
+			uint64_t fixed_modifier;
+			if (spa_vulkan_blit_fixate_modifier(&this->state, &this->state.streamsport->stream_id, info, modifierCount, modifiers, &fixed_modifier) != 0)
+				return -EINVAL;
+
+			spa_log_info(this->log, "modifier fixated %"PRIu64, fixed_modifier);
+
+			info->info.raw.modifier = fixed_modifier;
+			info->info.raw.flags &= ~SPA_VIDEO_FLAG_MODIFIER_FIXATION_REQUIRED;
+			*modifier_fixed = true;
+		}
+
+	return 0;
+}
+
+static int port_set_format(struct impl *this, struct port *port,
+			   uint32_t flags,
+			   const struct spa_pod *format)
+{
+	int res;
+
+	if (format == NULL) {
+		port->have_format = false;
+		clear_buffers(this, port);
+	} else {
+		struct spa_video_info info = { 0 };
+
+		if ((res = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
+			return res;
+
+		if (info.media_type != SPA_MEDIA_TYPE_video)
+			return -EINVAL;
+
+		bool has_modifier = false;
+		bool modifier_fixed = false;
+		if (info.media_subtype == SPA_MEDIA_SUBTYPE_dsp) {
+			if ((res = port_set_dsp_format(this, port, flags, &info, &has_modifier, &modifier_fixed, format)) < 0)
+				return res;
+		} else if (info.media_subtype == SPA_MEDIA_SUBTYPE_raw) {
+			if ((res = port_set_raw_format(this, port, flags, &info, &has_modifier, &modifier_fixed, format)) < 0)
+				return res;
+		} else {
+			return -EINVAL;
+		}
+
+		if (has_modifier) {
+			SPA_FLAG_SET(port->info.flags, SPA_PORT_FLAG_CAN_ALLOC_BUFFERS);
+		} else {
+			SPA_FLAG_CLEAR(port->info.flags, SPA_PORT_FLAG_CAN_ALLOC_BUFFERS);
+		}
+		port->info.change_mask |= SPA_PORT_CHANGE_MASK_FLAGS;
+
+		port->current_format = info;
+		port->have_format = true;
+
+		if (modifier_fixed) {
+			port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
+			port->paramsIDX_EnumFormat.flags ^= SPA_PARAM_INFO_SERIAL;
+			emit_port_info(this, port, false);
+			return 0;
+		}
+	}
+
+	port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
+	if (port->have_format) {
+		port->paramsIDX_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READWRITE);
+		port->paramsIDX_Buffer = SPA_PARAM_INFO(SPA_PARAM_Buffers, SPA_PARAM_INFO_READ);
+	} else {
+		port->paramsIDX_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
+		port->paramsIDX_Buffer = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
+	}
+	emit_port_info(this, port, false);
+
+	return 0;
+}
+
+static int
+impl_node_port_set_param(void *object,
+			 enum spa_direction direction, uint32_t port_id,
+			 uint32_t id, uint32_t flags,
+			 const struct spa_pod *param)
+{
+	struct impl *this = object;
+	struct port *port;
+	int res;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+	spa_return_val_if_fail(CHECK_PORT(node, direction, port_id), -EINVAL);
+	port = &this->portdirection;
+
+	switch (id) {
+	case SPA_PARAM_Format:
+		res = port_set_format(this, port, flags, param);
+		break;
+	default:
+		return -ENOENT;
+	}
+	return res;
+}
+
+static int
+impl_node_port_use_buffers(void *object,
+			   enum spa_direction direction,
+			   uint32_t port_id,
+			   uint32_t flags,
+			   struct spa_buffer **buffers,
+			   uint32_t n_buffers)
+{
+	struct impl *this = object;
+	struct port *port;
+	uint32_t i;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+	spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
+	port = &this->portdirection;
+
+	clear_buffers(this, port);
+
+	if (n_buffers > 0 && !port->have_format)
+		return -EIO;
+	if (n_buffers > MAX_BUFFERS)
+		return -ENOSPC;
+
+	lock_renderer(this);
+	for (i = 0; i < n_buffers; i++) {
+		struct buffer *b;
+
+		b = &port->buffersi;
+		b->id = i;
+		b->outbuf = buffersi;
+		b->flags = 0;
+		b->h = spa_buffer_find_meta_data(buffersi, SPA_META_Header, sizeof(*b->h));
+
+		spa_log_info(this->log, "%p: %d:%d add buffer %p", port, direction, port_id, b);
+		spa_list_append(&port->empty, &b->link);
+	}
+	spa_vulkan_blit_use_buffers(&this->state, &this->state.streamsport->stream_id, flags, &port->current_format, n_buffers, buffers);
+	port->n_buffers = n_buffers;
+	if (n_buffers > 0)
+		spa_vulkan_blit_init_pass(&this->state, &this->pass);
+	unlock_renderer(this);
+
+	return 0;
+}
+
+static int
+impl_node_port_set_io(void *object,
+		      enum spa_direction direction,
+		      uint32_t port_id,
+		      uint32_t id,
+		      void *data, size_t size)
+{
+	struct impl *this = object;
+	struct port *port;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+	spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
+	port = &this->portdirection;
+
+	switch (id) {
+	case SPA_IO_Buffers:
+		port->io = data;
+		break;
+	default:
+		return -ENOENT;
+	}
+	return 0;
+}
+
+static int impl_node_port_reuse_buffer(void *object, uint32_t port_id, uint32_t buffer_id)
+{
+	struct impl *this = object;
+	struct port *port;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+	spa_return_val_if_fail(port_id == 0, -EINVAL);
+
+	port = &this->portSPA_DIRECTION_OUTPUT;
+	spa_return_val_if_fail(buffer_id < port->n_buffers, -EINVAL);
+
+	reuse_buffer(this, port, buffer_id);
+
+	return 0;
+}
+
+static int impl_node_process(void *object)
+{
+	struct impl *this = object;
+	struct port *inport, *outport;
+	struct spa_io_buffers *inio, *outio;
+	struct buffer *b;
+
+	spa_return_val_if_fail(this != NULL, -EINVAL);
+	spa_return_val_if_fail(this->started, -EINVAL);
+
+	inport = &this->portSPA_DIRECTION_INPUT;
+	if ((inio = inport->io) == NULL)
+		return -EIO;
+
+	if (inio->status != SPA_STATUS_HAVE_DATA)
+		return inio->status;
+
+	if (inio->buffer_id >= inport->n_buffers) {
+		inio->status = -EINVAL;
+		return -EINVAL;
+	}
+
+	outport = &this->portSPA_DIRECTION_OUTPUT;
+	if ((outio = outport->io) == NULL)
+		return -EIO;
+
+	if (outio->status == SPA_STATUS_HAVE_DATA)
+		return SPA_STATUS_HAVE_DATA;
+
+	if (outio->buffer_id < outport->n_buffers) {
+		reuse_buffer(this, outport, outio->buffer_id);
+		outio->buffer_id = SPA_ID_INVALID;
+	}
+
+	if (spa_list_is_empty(&outport->empty)) {
+		spa_log_debug(this->log, "%p: out of buffers", this);
+		return -EPIPE;
+	}
+
+	if (pthread_rwlock_tryrdlock(&this->renderlock) < 0) {
+		return -EBUSY;
+	}
+
+	b = &inport->buffersinio->buffer_id;
+	this->pass.in_stream_id = SPA_DIRECTION_INPUT;
+	this->pass.in_buffer_id = b->id;
+	inio->status = SPA_STATUS_NEED_DATA;
+
+	b = spa_list_first(&outport->empty, struct buffer, link);
+	spa_list_remove(&b->link);
+	SPA_FLAG_SET(b->flags, BUFFER_FLAG_OUT);
+	this->pass.out_stream_id = SPA_DIRECTION_OUTPUT;
+	this->pass.out_buffer_id = b->id;
+
+	spa_log_debug(this->log, "filter into %d", b->id);
+
+	spa_vulkan_blit_process(&this->state, &this->pass);
+	spa_vulkan_blit_reset_pass(&this->state, &this->pass);
+
+	b->outbuf->datas0.chunk->offset = 0;
+	b->outbuf->datas0.chunk->size = b->outbuf->datas0.maxsize;
+	if (outport->current_format.media_subtype == SPA_MEDIA_SUBTYPE_raw) {
+		b->outbuf->datas0.chunk->stride =
+			this->state.streamsoutport->stream_id.bpp * outport->current_format.info.raw.size.width;
+	} else {
+		b->outbuf->datas0.chunk->stride = this->position->video.stride;
+	}
+
+	outio->buffer_id = b->id;
+	outio->status = SPA_STATUS_HAVE_DATA;
+
+	pthread_rwlock_unlock(&this->renderlock);
+
+	return SPA_STATUS_NEED_DATA | SPA_STATUS_HAVE_DATA;
+}
+
+static const struct spa_node_methods impl_node = {
+	SPA_VERSION_NODE_METHODS,
+	.add_listener = impl_node_add_listener,
+	.set_callbacks = impl_node_set_callbacks,
+	.enum_params = impl_node_enum_params,
+	.set_param = impl_node_set_param,
+	.set_io = impl_node_set_io,
+	.send_command = impl_node_send_command,
+	.add_port = impl_node_add_port,
+	.remove_port = impl_node_remove_port,
+	.port_enum_params = impl_node_port_enum_params,
+	.port_set_param = impl_node_port_set_param,
+	.port_use_buffers = impl_node_port_use_buffers,
+	.port_set_io = impl_node_port_set_io,
+	.port_reuse_buffer = impl_node_port_reuse_buffer,
+	.process = impl_node_process,
+};
+
+static int impl_get_interface(struct spa_handle *handle, const char *type, void **interface)
+{
+	struct impl *this;
+
+	spa_return_val_if_fail(handle != NULL, -EINVAL);
+	spa_return_val_if_fail(interface != NULL, -EINVAL);
+
+	this = (struct impl *) handle;
+
+	if (spa_streq(type, SPA_TYPE_INTERFACE_Node))
+		*interface = &this->node;
+	else
+		return -ENOENT;
+
+	return 0;
+}
+
+static int impl_clear(struct spa_handle *handle)
+{
+	struct impl *this;
+
+	spa_return_val_if_fail(handle != NULL, -EINVAL);
+
+	this = (struct impl *) handle;
+
+	spa_vulkan_blit_unprepare(&this->state);
+	spa_vulkan_blit_deinit(&this->state);
+	lock_destroy(this);
+	return 0;
+}
+
+static size_t
+impl_get_size(const struct spa_handle_factory *factory,
+	      const struct spa_dict *params)
+{
+	return sizeof(struct impl);
+}
+
+static int
+impl_init(const struct spa_handle_factory *factory,
+	  struct spa_handle *handle,
+	  const struct spa_dict *info,
+	  const struct spa_support *support,
+	  uint32_t n_support)
+{
+	struct impl *this;
+	struct port *port;
+
+	spa_return_val_if_fail(factory != NULL, -EINVAL);
+	spa_return_val_if_fail(handle != NULL, -EINVAL);
+
+	handle->get_interface = impl_get_interface;
+	handle->clear = impl_clear;
+
+	this = (struct impl *) handle;
+
+	this->log = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_Log);
+	this->state.log = this->log;
+
+	spa_hook_list_init(&this->hooks);
+
+	this->node.iface = SPA_INTERFACE_INIT(
+			SPA_TYPE_INTERFACE_Node,
+			SPA_VERSION_NODE,
+			&impl_node, this);
+
+	this->info_all = SPA_NODE_CHANGE_MASK_FLAGS |
+			SPA_NODE_CHANGE_MASK_PROPS |
+			SPA_NODE_CHANGE_MASK_PARAMS;
+	this->info = SPA_NODE_INFO_INIT();
+	this->info.max_output_ports = 1;
+	this->info.max_input_ports = 1;
+	this->info.flags = SPA_NODE_FLAG_RT;
+	this->paramsIDX_PropInfo = SPA_PARAM_INFO(SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ);
+	this->paramsIDX_Props = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE);
+	this->info.params = this->params;
+	this->info.n_params = N_NODE_PARAMS;
+
+	lock_init(this);
+
+	port = &this->portSPA_DIRECTION_INPUT;
+	port->stream_id = SPA_DIRECTION_INPUT;
+	port->direction = SPA_DIRECTION_INPUT;
+	port->info_all = SPA_PORT_CHANGE_MASK_FLAGS |
+			SPA_PORT_CHANGE_MASK_PARAMS |
+			SPA_PORT_CHANGE_MASK_PROPS;
+	port->info = SPA_PORT_INFO_INIT();
+	port->info.flags = SPA_PORT_FLAG_NO_REF;
+	port->paramsIDX_EnumFormat = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
+	port->paramsIDX_Meta = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
+	port->paramsIDX_IO = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
+	port->paramsIDX_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
+	port->paramsIDX_Buffer = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
+	port->info.params = port->params;
+	port->info.n_params = N_PORT_PARAMS;
+	spa_vulkan_blit_init_stream(&this->state, &this->state.streamsport->stream_id,
+			SPA_DIRECTION_INPUT, NULL);
+	spa_list_init(&port->empty);
+	spa_list_init(&port->ready);
+
+	port = &this->portSPA_DIRECTION_OUTPUT;
+	port->stream_id = SPA_DIRECTION_OUTPUT;
+	port->direction = SPA_DIRECTION_OUTPUT;
+	port->info_all = SPA_PORT_CHANGE_MASK_FLAGS |
+			SPA_PORT_CHANGE_MASK_PARAMS |
+			SPA_PORT_CHANGE_MASK_PROPS;
+	port->info = SPA_PORT_INFO_INIT();
+	port->info.flags = SPA_PORT_FLAG_NO_REF | SPA_PORT_FLAG_CAN_ALLOC_BUFFERS;
+	port->paramsIDX_EnumFormat = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
+	port->paramsIDX_Meta = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
+	port->paramsIDX_IO = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
+	port->paramsIDX_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
+	port->paramsIDX_Buffer = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
+	port->info.params = port->params;
+	port->info.n_params = N_PORT_PARAMS;
+	spa_list_init(&port->empty);
+	spa_list_init(&port->ready);
+	spa_vulkan_blit_init_stream(&this->state, &this->state.streamsport->stream_id,
+			SPA_DIRECTION_OUTPUT, NULL);
+
+	this->state.n_streams = 2;
+	spa_vulkan_blit_init(&this->state);
+	spa_vulkan_blit_prepare(&this->state);
+
+	return 0;
+}
+
+static const struct spa_interface_info impl_interfaces = {
+	{SPA_TYPE_INTERFACE_Node,},
+};
+
+static int
+impl_enum_interface_info(const struct spa_handle_factory *factory,
+			 const struct spa_interface_info **info,
+			 uint32_t *index)
+{
+	spa_return_val_if_fail(factory != NULL, -EINVAL);
+	spa_return_val_if_fail(info != NULL, -EINVAL);
+	spa_return_val_if_fail(index != NULL, -EINVAL);
+
+	switch (*index) {
+	case 0:
+		*info = &impl_interfaces*index;
+		break;
+	default:
+		return 0;
+	}
+	(*index)++;
+	return 1;
+}
+
+static const struct spa_dict_item info_items = {
+	{ SPA_KEY_FACTORY_AUTHOR, "Columbarius <co1umbarius@protonmail.com>" },
+	{ SPA_KEY_FACTORY_DESCRIPTION, "Convert video frames using a vulkan blit" },
+};
+
+static const struct spa_dict info = SPA_DICT_INIT_ARRAY(info_items);
+
+const struct spa_handle_factory spa_vulkan_blit_filter_factory = {
+	SPA_VERSION_HANDLE_FACTORY,
+	SPA_NAME_API_VULKAN_BLIT_FILTER,
+	&info,
+	impl_get_size,
+	impl_init,
+	impl_enum_interface_info,
+};

pipewire-1.2.0.tar.gz/spa/plugins/vulkan/vulkan-blit-utils.c Added

@@ -0,0 +1,683 @@
+/* Spa */
+/* SPDX-FileCopyrightText: Copyright © 2019 Wim Taymans */
+/* SPDX-FileCopyrightText: Copyright © 2023 columbarius */
+/* SPDX-License-Identifier: MIT */
+
+#include <vulkan/vulkan.h>
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <string.h>
+#include <vulkan/vulkan_core.h>
+#if !defined(__FreeBSD__) && !defined(__MidnightBSD__)
+#include <alloca.h>
+#endif
+#include <errno.h>
+#include <stdio.h>
+#include <assert.h>
+#include <math.h>
+#include <time.h>
+
+#include <spa/utils/result.h>
+#include <spa/utils/string.h>
+#include <spa/support/log.h>
+#include <spa/debug/mem.h>
+
+#include "vulkan-blit-utils.h"
+#include "vulkan-utils.h"
+#include "utils.h"
+
+#define VULKAN_INSTANCE_FUNCTION(name)						\
+	PFN_##name name = (PFN_##name)vkGetInstanceProcAddr(s->base.instance, #name)
+
+#define GET_BUFFER_ID_FROM_STREAM(s, pass)	\
+	(s->direction == SPA_DIRECTION_INPUT ? pass->in_buffer_id : pass->out_buffer_id)
+
+static int runImportSHMBuffers(struct vulkan_blit_state *s, struct vulkan_pass *pass) {
+	struct vulkan_stream *p = &s->streamspass->in_stream_id;
+
+	if (p->buffer_type == SPA_DATA_MemPtr) {
+		struct spa_buffer *spa_buf = p->spa_bufferspass->in_buffer_id;
+		struct vulkan_write_pixels_info writeInfo = {
+			.data = spa_buf->datas0.data,
+			.offset = 0,
+			.stride = p->bpp * p->dim.width,
+			.bytes_per_pixel = p->bpp,
+			.size.width = p->dim.width,
+			.size.height = p->dim.height,
+			.copies = &pass->in_copy,
+		};
+		CHECK(vulkan_write_pixels(&s->base, &writeInfo, &pass->in_staging_buffer));
+	}
+
+	return 0;
+}
+
+static int runExportSHMBuffers(struct vulkan_blit_state *s, struct vulkan_pass *pass) {
+	struct vulkan_stream *p = &s->streamspass->out_stream_id;
+
+	if (p->buffer_type == SPA_DATA_MemPtr) {
+		struct spa_buffer *spa_buf = p->spa_bufferspass->out_buffer_id;
+		struct vulkan_read_pixels_info readInfo = {
+			.data = spa_buf->datas0.data,
+			.offset = 0,
+			.stride = p->bpp * p->dim.width,
+			.bytes_per_pixel = p->bpp,
+			.size.width = p->dim.width,
+			.size.height = p->dim.height,
+		};
+		CHECK(vulkan_read_pixels(&s->base, &readInfo, &p->bufferspass->out_buffer_id));
+	}
+
+	return 0;
+}
+
+static int runImportSync(struct vulkan_blit_state *s, struct vulkan_pass *pass)
+{
+	int ret = 0;
+	for (uint32_t i = 0; i < s->n_streams; i++) {
+		struct vulkan_stream *p = &s->streamsi;
+		uint32_t current_buffer_id = GET_BUFFER_ID_FROM_STREAM(p, pass);
+		struct vulkan_buffer *current_buffer = &p->bufferscurrent_buffer_id;
+
+		if (p->buffer_type != SPA_DATA_DmaBuf)
+			continue;
+
+		if (vulkan_buffer_import_implicit_syncfd(&s->base, current_buffer) >= 0)
+			continue;
+		if (vulkan_buffer_wait_dmabuf_fence(&s->base, current_buffer) < 0) {
+			spa_log_warn(s->log, "Failed to wait for foreign buffer DMA-BUF fence");
+			ret = -1;
+		}
+	}
+	return ret;
+}
+
+static int runExportSync(struct vulkan_blit_state *s, struct vulkan_pass *pass)
+{
+	int ret = 0;
+	for (uint32_t i = 0; i < s->n_streams; i++) {
+		struct vulkan_stream *p = &s->streamsi;
+
+		if (p->buffer_type != SPA_DATA_DmaBuf)
+			continue;
+
+		if (!vulkan_sync_export_dmabuf(&s->base, &p->buffersGET_BUFFER_ID_FROM_STREAM(p, pass), pass->sync_fd)) {
+			ret = -1;
+		}
+	}
+
+	return ret;
+}
+
+static int runCommandBuffer(struct vulkan_blit_state *s, struct vulkan_pass *pass)
+{
+	VULKAN_INSTANCE_FUNCTION(vkQueueSubmit2KHR);
+	VULKAN_INSTANCE_FUNCTION(vkGetSemaphoreFdKHR);
+
+	static const VkCommandBufferBeginInfo beginInfo = {
+		.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
+		.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
+	};
+	VK_CHECK_RESULT(vkBeginCommandBuffer(pass->commandBuffer, &beginInfo));
+
+	uint32_t i;
+	struct vulkan_stream *stream_input = &s->streamspass->in_stream_id;
+	struct vulkan_stream *stream_output = &s->streamspass->out_stream_id;
+
+	VkImage src_image = stream_input->bufferspass->in_buffer_id.image;
+	VkImage dst_image = stream_output->bufferspass->out_buffer_id.image;
+
+	if (stream_input->buffer_type == SPA_DATA_MemPtr) {
+		vkCmdCopyBufferToImage(pass->commandBuffer, pass->in_staging_buffer.buffer, src_image,
+				VK_IMAGE_LAYOUT_GENERAL, 1, &pass->in_copy);
+
+		VkImageMemoryBarrier copy_barrier = {
+			.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+			.srcQueueFamilyIndex = s->base.queueFamilyIndex,
+			.dstQueueFamilyIndex = s->base.queueFamilyIndex,
+			.image = src_image,
+			.oldLayout = VK_IMAGE_LAYOUT_GENERAL,
+			.newLayout = VK_IMAGE_LAYOUT_GENERAL,
+			.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
+			.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT,
+			.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
+			.subresourceRange.levelCount = 1,
+			.subresourceRange.layerCount = 1,
+		};
+
+		vkCmdPipelineBarrier(pass->commandBuffer,
+					VK_PIPELINE_STAGE_TRANSFER_BIT,
+					VK_PIPELINE_STAGE_TRANSFER_BIT,
+					0, 0, NULL, 0, NULL,
+					1, &copy_barrier);
+	}
+
+	VkImageBlit imageBlitRegion = {
+		.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
+		.srcSubresource.layerCount = 1,
+		.srcOffsets0 = {
+			.x = 0,
+			.y = 0,
+			.z = 0,
+		},
+		.srcOffsets1 = {
+			.x = stream_input->dim.width,
+			.y = stream_input->dim.height,
+			.z = 1,
+		},
+		.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
+		.dstSubresource.layerCount = 1,
+		.dstOffsets1 = {
+			.x = stream_output->dim.width,
+			.y = stream_output->dim.height,
+			.z = 1,
+		}
+	};
+	spa_log_trace_fp(s->log, "Blitting from (%p, %d, %d) %d,%dx%d,%d to (%p, %d, %d) %d,%dx%d,%d",
+			stream_input, pass->in_buffer_id, stream_input->direction, 0, 0, stream_input->dim.width, stream_input->dim.height,
+			stream_output, pass->out_buffer_id, stream_output->direction, 0, 0, stream_output->dim.width, stream_output->dim.height);
+	vkCmdBlitImage(pass->commandBuffer, src_image, VK_IMAGE_LAYOUT_GENERAL,
+			dst_image, VK_IMAGE_LAYOUT_GENERAL,
+			1, &imageBlitRegion, VK_FILTER_NEAREST);
+
+	VkImageMemoryBarrier acquire_barriers->n_streams;
+	VkImageMemoryBarrier release_barriers->n_streams;
+	VkSemaphoreSubmitInfo semaphore_wait_infos->n_streams;
+	uint32_t semaphore_wait_info_len = 0;
+	VkSemaphoreSubmitInfo semaphore_signal_info1;
+	uint32_t semaphore_signal_info_len = 0;
+
+	for (i = 0; i < s->n_streams; i++) {
+		struct vulkan_stream *p = &s->streamsi;
+		struct vulkan_buffer *current_buffer = &p->buffersGET_BUFFER_ID_FROM_STREAM(p, pass);
+
+		VkAccessFlags access_flags;
+		VkAccessFlags release_flags;
+		if (p->direction == SPA_DIRECTION_INPUT) {
+			access_flags = p->buffer_type == SPA_DATA_DmaBuf
+				? VK_ACCESS_TRANSFER_READ_BIT
+				: VK_ACCESS_TRANSFER_WRITE_BIT;
+			release_flags = VK_ACCESS_TRANSFER_READ_BIT;
+		} else {
+			access_flags = VK_ACCESS_TRANSFER_WRITE_BIT;
+			release_flags = VK_ACCESS_TRANSFER_WRITE_BIT;
+		}
+
+		acquire_barrieri= (VkImageMemoryBarrier) {
+			.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+			.srcQueueFamilyIndex = VK_QUEUE_FAMILY_FOREIGN_EXT,
+			.dstQueueFamilyIndex = s->base.queueFamilyIndex,
+			.image = current_buffer->image,
+			.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED,
+			.newLayout = VK_IMAGE_LAYOUT_GENERAL,
+			.srcAccessMask = 0,
+			.dstAccessMask = access_flags,
+			.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
+			.subresourceRange.levelCount = 1,
+			.subresourceRange.layerCount = 1,
+		};
+
+		release_barrieri= (VkImageMemoryBarrier) {
+			.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+			.srcQueueFamilyIndex = s->base.queueFamilyIndex,
+			.dstQueueFamilyIndex = VK_QUEUE_FAMILY_FOREIGN_EXT,
+			.image = current_buffer->image,
+			.oldLayout = VK_IMAGE_LAYOUT_GENERAL,
+			.newLayout = VK_IMAGE_LAYOUT_GENERAL,
+			.srcAccessMask = release_flags,
+			.dstAccessMask = 0,
+			.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
+			.subresourceRange.levelCount = 1,
+			.subresourceRange.layerCount = 1,
+		};
+
+		if (current_buffer->foreign_semaphore != VK_NULL_HANDLE) {
+			semaphore_wait_infosemaphore_wait_info_len++ = (VkSemaphoreSubmitInfo) {
+				.sType = VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO,
+				.semaphore = current_buffer->foreign_semaphore,
+				.stageMask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
+			};
+		}
+	}
+
+        vkCmdPipelineBarrier(pass->commandBuffer,
+				VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
+				VK_PIPELINE_STAGE_2_TRANSFER_BIT,
+				0, 0, NULL, 0, NULL,
+				s->n_streams, acquire_barrier);
+
+        vkCmdPipelineBarrier(pass->commandBuffer,
+				VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
+				VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
+				0, 0, NULL, 0, NULL,
+				s->n_streams, release_barrier);
+
+	VK_CHECK_RESULT(vkEndCommandBuffer(pass->commandBuffer));
+
+	VK_CHECK_RESULT(vkResetFences(s->base.device, 1, &pass->fence));
+
+	semaphore_signal_infosemaphore_signal_info_len++ = (VkSemaphoreSubmitInfo) {
+		.sType = VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO,
+		.semaphore = pass->pipelineSemaphore,
+	};
+
+	VkCommandBufferSubmitInfoKHR commandBufferInfo = {
+		.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO,
+		.commandBuffer = pass->commandBuffer,
+	};
+
+	const VkSubmitInfo2KHR submitInfo = {
+		.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO_2_KHR,
+		.commandBufferInfoCount = 1,
+		.pCommandBufferInfos = &commandBufferInfo,
+		.waitSemaphoreInfoCount = semaphore_wait_info_len,
+		.pWaitSemaphoreInfos = semaphore_wait_info,
+		.signalSemaphoreInfoCount = semaphore_signal_info_len,
+		.pSignalSemaphoreInfos = semaphore_signal_info,
+	};
+        VK_CHECK_RESULT(vkQueueSubmit2KHR(s->base.queue, 1, &submitInfo, pass->fence));
+	s->started = true;
+
+	VkSemaphoreGetFdInfoKHR get_fence_fd_info = {
+		.sType = VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR,
+		.semaphore = pass->pipelineSemaphore,
+		.handleType = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT,
+	};
+	VK_CHECK_RESULT(vkGetSemaphoreFdKHR(s->base.device, &get_fence_fd_info, &pass->sync_fd));
+
+	return 0;
+}
+
+static void clear_buffers(struct vulkan_blit_state *s, struct vulkan_stream *p)
+{
+	uint32_t i;
+
+	for (i = 0; i < p->n_buffers; i++) {
+		vulkan_buffer_clear(&s->base, &p->buffersi);
+		p->spa_buffersi = NULL;
+	}
+	p->n_buffers = 0;
+	p->buffer_type = SPA_DATA_Invalid;
+	p->maxsize = 0;
+}
+
+static void clear_streams(struct vulkan_blit_state *s)
+{
+	uint32_t i;
+	for (i = 0; i < s->n_streams; i++) {
+		struct vulkan_stream *p = &s->streamsi;
+		clear_buffers(s, p);
+	}
+}
+
+int spa_vulkan_blit_fixate_modifier(struct vulkan_blit_state *s, struct vulkan_stream *p, struct spa_video_info *info,
+		uint32_t modifierCount, uint64_t *modifiers, uint64_t *modifier)
+{
+	VkFormat format;
+	struct spa_rectangle size;
+	switch (info->media_subtype) {
+	case SPA_MEDIA_SUBTYPE_dsp:
+		format = vulkan_id_to_vkformat(info->info.dsp.format);
+		size.width = p->dim.width;
+		size.height = p->dim.height;
+		break;
+	case SPA_MEDIA_SUBTYPE_raw:
+		format = vulkan_id_to_vkformat(info->info.raw.format);
+		size.width = p->dim.width;
+		size.height = p->dim.height;
+		break;
+	default:
+		spa_log_warn(s->log, "Unsupported media subtype %d", info->media_subtype);
+		return -1;
+	}
+	if (format == VK_FORMAT_UNDEFINED) {
+		return -1;
+	}
+
+	struct dmabuf_fixation_info fixation_info = {
+		.format = format,
+		.modifierCount = modifierCount,
+		.modifiers = modifiers,
+		.size = size,
+		.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT,
+	};
+	return vulkan_fixate_modifier(&s->base, &fixation_info, modifier);
+}
+
+int spa_vulkan_blit_use_buffers(struct vulkan_blit_state *s, struct vulkan_stream *p, uint32_t flags,
+		struct spa_video_info *info, uint32_t n_buffers, struct spa_buffer **buffers)
+{
+	struct external_buffer_info externalBufferInfo = {0};
+	switch (info->media_subtype) {
+	case SPA_MEDIA_SUBTYPE_dsp:
+		externalBufferInfo.format = vulkan_id_to_vkformat(info->info.dsp.format);
+		externalBufferInfo.size.width = p->dim.width;
+		externalBufferInfo.size.height = p->dim.height;
+		if (info->info.dsp.flags & SPA_VIDEO_FLAG_MODIFIER)
+			externalBufferInfo.modifier = info->info.dsp.modifier;
+		break;
+	case SPA_MEDIA_SUBTYPE_raw:
+		externalBufferInfo.format = vulkan_id_to_vkformat(info->info.raw.format);
+		externalBufferInfo.size.width = p->dim.width;
+		externalBufferInfo.size.height = p->dim.height;
+		if (info->info.raw.flags & SPA_VIDEO_FLAG_MODIFIER)
+			externalBufferInfo.modifier = info->info.raw.modifier;
+		break;
+	default:
+		spa_log_warn(s->log, "Unsupported media subtype %d", info->media_subtype);
+		return -1;
+	}
+	if (externalBufferInfo.format == VK_FORMAT_UNDEFINED)
+		return -1;
+
+	vulkan_wait_idle(&s->base);
+	clear_buffers(s, p);
+
+	if (n_buffers == 0)
+		return 0;
+
+	bool alloc = flags & SPA_NODE_BUFFERS_FLAG_ALLOC;
+	int ret;
+	for (uint32_t i = 0; i < n_buffers; i++) {
+		if (p->buffer_type == SPA_DATA_Invalid) {
+			p->buffer_type = buffersi->datas->type;
+		} else {
+			if (p->buffer_type != buffersi->datas->type) {
+				spa_log_error(s->log, "Buffers are of different type %d:%d", p->buffer_type, buffersi->datas0.type);
+				return -1;
+			}
+		}
+		p->maxsize = SPA_MAX(p->maxsize, buffersi->datas0.maxsize);
+		externalBufferInfo.usage = p->direction == SPA_DIRECTION_OUTPUT
+			? VK_IMAGE_USAGE_TRANSFER_DST_BIT
+			: VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
+		externalBufferInfo.spa_buf = buffersi;
+		if (alloc) {
+			if (SPA_FLAG_IS_SET(buffersi->datas0.type, 1<<SPA_DATA_DmaBuf)) {
+				ret = vulkan_create_dmabuf(&s->base, &externalBufferInfo, &p->buffersi);
+			} else {
+				spa_log_error(s->log, "Unsupported buffer type mask %d", buffersi->datas0.type);
+				return -1;
+			}
+		} else {
+			switch (buffersi->datas0.type) {
+			case SPA_DATA_DmaBuf:;
+				ret = vulkan_import_dmabuf(&s->base, &externalBufferInfo, &p->buffersi);
+				break;
+			case SPA_DATA_MemPtr:;
+				if (p->direction == SPA_DIRECTION_OUTPUT) {
+					externalBufferInfo.usage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
+				} else {
+					externalBufferInfo.usage |= VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+				}
+				ret = vulkan_import_memptr(&s->base, &externalBufferInfo, &p->buffersi);
+				break;
+			default:
+				spa_log_error(s->log, "Unsupported buffer type %d", buffersi->datas0.type);
+				return -1;
+			}
+		}
+		if (ret != 0) {
+			spa_log_error(s->log, "Failed to use buffer %d", i);
+			return ret;
+		}
+		p->spa_buffersi = buffersi;
+		p->n_buffers++;
+	}
+
+	return 0;
+}
+
+int spa_vulkan_blit_enumerate_raw_formats(struct vulkan_blit_state *s, uint32_t index, uint32_t caps,
+		struct spa_pod **param, struct spa_pod_builder *builder)
+{
+	uint32_t fmt_idx;
+	bool has_modifier;
+	if (!find_EnumFormatInfo(&s->formatInfosRaw, index, caps, &fmt_idx, &has_modifier))
+			return 0;
+	*param = build_raw_EnumFormat(&s->formatInfosRaw.infosfmt_idx, has_modifier, builder);
+	return 1;
+}
+
+int spa_vulkan_blit_enumerate_dsp_formats(struct vulkan_blit_state *s, uint32_t index, uint32_t caps,
+		struct spa_pod **param, struct spa_pod_builder *builder)
+{
+	uint32_t fmt_idx;
+	bool has_modifier;
+	if (!find_EnumFormatInfo(&s->formatInfosDSP, index, caps, &fmt_idx, &has_modifier))
+			return 0;
+	*param = build_dsp_EnumFormat(&s->formatInfosDSP.infosfmt_idx, has_modifier, builder);
+	return 1;
+}
+
+int spa_vulkan_blit_enumerate_formats(struct vulkan_blit_state *s, uint32_t index, uint32_t caps,
+		struct spa_pod **param, struct spa_pod_builder *builder)
+{
+	uint32_t fmt_idx;
+	bool has_modifier;
+	uint32_t raw_offset = 0;
+	if ((caps & VULKAN_BUFFER_TYPE_CAP_SHM) > 0)
+		raw_offset += s->formatInfosDSP.formatCount;
+	if ((caps & VULKAN_BUFFER_TYPE_CAP_DMABUF) > 0)
+		raw_offset += s->formatInfosDSP.formatsWithModifiersCount;
+	if (index < raw_offset) {
+		if (find_EnumFormatInfo(&s->formatInfosDSP, index, caps, &fmt_idx, &has_modifier)) {
+			*param = build_dsp_EnumFormat(&s->formatInfosDSP.infosfmt_idx, has_modifier, builder);
+			return 1;
+		}
+	} else {
+		if (find_EnumFormatInfo(&s->formatInfosRaw, index - raw_offset, caps, &fmt_idx, &has_modifier)) {
+			*param = build_raw_EnumFormat(&s->formatInfosRaw.infosfmt_idx, has_modifier, builder);
+			return 1;
+		}
+	}
+	return 0;
+}
+
+static int vulkan_stream_init(struct vulkan_stream *stream, enum spa_direction direction,
+		struct spa_dict *props)
+{
+	spa_zero(*stream);
+	stream->direction = direction;
+	stream->maxsize = 0;
+	return 0;
+}
+
+int spa_vulkan_blit_init_pass(struct vulkan_blit_state *s, struct vulkan_pass *pass)
+{
+	pass->in_buffer_id = SPA_ID_INVALID;
+	pass->in_stream_id = SPA_ID_INVALID;
+	pass->out_buffer_id = SPA_ID_INVALID;
+	pass->out_stream_id = SPA_ID_INVALID;
+
+	pass->sync_fd = -1;
+
+	CHECK(vulkan_fence_create(&s->base, &pass->fence));
+	CHECK(vulkan_commandBuffer_create(&s->base, s->commandPool, &pass->commandBuffer));
+
+	VkExportSemaphoreCreateInfo export_info = {
+		.sType = VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO,
+		.handleTypes = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT,
+	};
+	VkSemaphoreCreateInfo semaphore_info = {
+		.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO,
+		.pNext = &export_info,
+	};
+	VK_CHECK_RESULT(vkCreateSemaphore(s->base.device, &semaphore_info, NULL, &pass->pipelineSemaphore));
+
+	for (uint32_t i = 0; i < s->n_streams; i++) {
+		struct vulkan_stream *p = &s->streamsi;
+
+		if (p->direction == SPA_DIRECTION_OUTPUT || p->buffer_type != SPA_DATA_MemPtr)
+			continue;
+		vulkan_staging_buffer_create(&s->base, p->maxsize, &pass->in_staging_buffer);
+	}
+
+	return 0;
+}
+
+int spa_vulkan_blit_reset_pass(struct vulkan_blit_state *s, struct vulkan_pass *pass)
+{
+	pass->in_buffer_id = SPA_ID_INVALID;
+	pass->in_stream_id = SPA_ID_INVALID;
+	pass->out_buffer_id = SPA_ID_INVALID;
+	pass->out_stream_id = SPA_ID_INVALID;
+
+	if (pass->sync_fd != -1) {
+		close(pass->sync_fd);
+		pass->sync_fd = -1;
+	}
+
+	return 0;
+}
+
+int spa_vulkan_blit_clear_pass(struct vulkan_blit_state *s, struct vulkan_pass *pass)
+{
+	pass->in_buffer_id = SPA_ID_INVALID;
+	pass->in_stream_id = SPA_ID_INVALID;
+	pass->out_buffer_id = SPA_ID_INVALID;
+	pass->out_stream_id = SPA_ID_INVALID;
+
+	if (pass->sync_fd != -1) {
+		close(pass->sync_fd);
+		pass->sync_fd = -1;
+	}
+
+	vkDestroyFence(s->base.device, pass->fence, NULL);
+	pass->fence = VK_NULL_HANDLE;
+	vkFreeCommandBuffers(s->base.device, s->commandPool, 1, &pass->commandBuffer);
+	pass->commandBuffer = VK_NULL_HANDLE;
+	vkDestroySemaphore(s->base.device, pass->pipelineSemaphore, NULL);
+	pass->pipelineSemaphore = VK_NULL_HANDLE;
+	vulkan_staging_buffer_destroy(&s->base, &pass->in_staging_buffer);
+	pass->in_staging_buffer.buffer = VK_NULL_HANDLE;
+
+	return 0;
+}
+
+int spa_vulkan_blit_init_stream(struct vulkan_blit_state *s, struct vulkan_stream *stream,
+		enum spa_direction direction, struct spa_dict *props)
+{
+	return vulkan_stream_init(stream, direction, props);
+}
+
+int spa_vulkan_blit_prepare(struct vulkan_blit_state *s)
+{
+	if (!s->prepared) {
+		CHECK(vulkan_commandPool_create(&s->base, &s->commandPool));
+		s->prepared = true;
+	}
+	return 0;
+}
+
+int spa_vulkan_blit_unprepare(struct vulkan_blit_state *s)
+{
+	if (s->prepared) {
+		vkDestroyCommandPool(s->base.device, s->commandPool, NULL);
+		s->prepared = false;
+	}
+	return 0;
+}
+
+int spa_vulkan_blit_start(struct vulkan_blit_state *s)
+{
+	return 0;
+}
+
+int spa_vulkan_blit_stop(struct vulkan_blit_state *s)
+{
+        VK_CHECK_RESULT(vkDeviceWaitIdle(s->base.device));
+	clear_streams(s);
+	s->started = false;
+	return 0;
+}
+
+int spa_vulkan_blit_process(struct vulkan_blit_state *s, struct vulkan_pass *pass)
+{
+	if (!s->initialized) {
+		spa_log_warn(s->log, "Renderer not initialized");
+		return -1;
+	}
+	if (!s->prepared) {
+		spa_log_warn(s->log, "Renderer not prepared");
+		return -1;
+	}
+	CHECK(runImportSync(s, pass));
+	CHECK(runImportSHMBuffers(s, pass));
+	CHECK(runCommandBuffer(s, pass));
+	if (pass->sync_fd != -1) {
+		runExportSync(s, pass);
+	}
+	CHECK(vulkan_wait_idle(&s->base));
+	CHECK(runExportSHMBuffers(s, pass));
+
+	return 0;
+}
+
+int spa_vulkan_blit_get_buffer_caps(struct vulkan_blit_state *s, enum spa_direction direction)
+{
+	switch (direction) {
+	case SPA_DIRECTION_INPUT:
+		return VULKAN_BUFFER_TYPE_CAP_DMABUF | VULKAN_BUFFER_TYPE_CAP_SHM;
+	case SPA_DIRECTION_OUTPUT:
+		return VULKAN_BUFFER_TYPE_CAP_DMABUF | VULKAN_BUFFER_TYPE_CAP_SHM;
+	}
+	return 0;
+}
+
+struct vulkan_modifier_info *spa_vulkan_blit_get_modifier_info(struct vulkan_blit_state *s, struct spa_video_info *info) {
+	VkFormat format;
+	uint64_t modifier;
+	switch (info->media_subtype) {
+	case SPA_MEDIA_SUBTYPE_dsp:
+		format = vulkan_id_to_vkformat(info->info.dsp.format);
+		modifier = info->info.dsp.modifier;
+		return vulkan_modifierInfo_find(&s->formatInfosDSP, format, modifier);
+	case SPA_MEDIA_SUBTYPE_raw:
+		format = vulkan_id_to_vkformat(info->info.raw.format);
+		modifier = info->info.raw.modifier;
+		return vulkan_modifierInfo_find(&s->formatInfosRaw, format, modifier);
+	default:
+		spa_log_warn(s->log, "Unsupported media subtype %d", info->media_subtype);
+		return NULL;
+	}
+}
+
+int spa_vulkan_blit_init(struct vulkan_blit_state *s)
+{
+	int ret;
+	s->base.log = s->log;
+	struct vulkan_base_info baseInfo = {
+		.queueFlags = VK_QUEUE_TRANSFER_BIT,
+	};
+	if ((ret = vulkan_base_init(&s->base, &baseInfo)) < 0)
+		return ret;
+
+	uint32_t dsp_formats  = {
+		SPA_VIDEO_FORMAT_DSP_F32
+	};
+	vulkan_format_infos_init(&s->base, SPA_N_ELEMENTS(dsp_formats), dsp_formats, &s->formatInfosDSP);
+	uint32_t raw_formats  = {
+		SPA_VIDEO_FORMAT_BGRA,
+		SPA_VIDEO_FORMAT_RGBA,
+		SPA_VIDEO_FORMAT_BGRx,
+		SPA_VIDEO_FORMAT_RGBx,
+		SPA_VIDEO_FORMAT_BGR,
+		SPA_VIDEO_FORMAT_RGB,
+	};
+	vulkan_format_infos_init(&s->base, SPA_N_ELEMENTS(raw_formats), raw_formats, &s->formatInfosRaw);
+	s->initialized = true;
+	return 0;
+}
+
+void spa_vulkan_blit_deinit(struct vulkan_blit_state *s)
+{
+	vulkan_format_infos_deinit(&s->formatInfosRaw);
+	vulkan_format_infos_deinit(&s->formatInfosDSP);
+	vulkan_base_deinit(&s->base);
+	s->initialized = false;
+}

pipewire-1.2.0.tar.gz/spa/plugins/vulkan/vulkan-blit-utils.h Added

@@ -0,0 +1,96 @@
+/* Spa */
+/* SPDX-FileCopyrightText: Copyright © 2019 Wim Taymans */
+/* SPDX-FileCopyrightText: Copyright © 2023 columbarius */
+/* SPDX-License-Identifier: MIT */
+
+#include <vulkan/vulkan.h>
+
+#include <spa/buffer/buffer.h>
+#include <spa/param/video/format.h>
+#include <spa/node/node.h>
+#include <spa/pod/builder.h>
+
+#include "vulkan-utils.h"
+
+#define MAX_STREAMS 2
+
+struct vulkan_pass {
+	uint32_t in_buffer_id;
+	uint32_t in_stream_id;
+
+	uint32_t out_buffer_id;
+	uint32_t out_stream_id;
+
+	VkBufferImageCopy in_copy;
+	struct vulkan_staging_buffer in_staging_buffer;
+
+	VkCommandBuffer commandBuffer;
+	VkSemaphore pipelineSemaphore;
+	VkFence fence;
+
+	int sync_fd;
+};
+
+struct vulkan_stream {
+	enum spa_direction direction;
+
+	enum spa_data_type buffer_type;
+	struct spa_rectangle dim;
+	uint32_t bpp;
+	uint32_t maxsize;
+
+	struct vulkan_buffer buffersMAX_BUFFERS;
+	struct spa_buffer *spa_buffersMAX_BUFFERS;
+	uint32_t n_buffers;
+};
+
+struct vulkan_blit_state {
+	struct spa_log *log;
+
+	struct vulkan_base base;
+
+	struct vulkan_format_infos formatInfosRaw;
+	struct vulkan_format_infos formatInfosDSP;
+
+	VkCommandPool commandPool;
+
+	unsigned int initialized:1;
+	unsigned int prepared:1;
+	unsigned int started:1;
+
+	uint32_t n_streams;
+	struct vulkan_stream streamsMAX_STREAMS;
+};
+
+int spa_vulkan_blit_init_pass(struct vulkan_blit_state *s, struct vulkan_pass *pass);
+int spa_vulkan_blit_reset_pass(struct vulkan_blit_state *s, struct vulkan_pass *pass);
+int spa_vulkan_blit_clear_pass(struct vulkan_blit_state *s, struct vulkan_pass *pass);
+
+int spa_vulkan_blit_init_stream(struct vulkan_blit_state *s, struct vulkan_stream *stream, enum spa_direction,
+		struct spa_dict *props);
+
+int spa_vulkan_blit_fixate_modifier(struct vulkan_blit_state *s, struct vulkan_stream *p, struct spa_video_info *info,
+		uint32_t modifierCount, uint64_t *modifiers, uint64_t *modifier);
+int spa_vulkan_blit_use_buffers(struct vulkan_blit_state *s, struct vulkan_stream *stream, uint32_t flags,
+		struct spa_video_info *info, uint32_t n_buffers, struct spa_buffer **buffers);
+int spa_vulkan_blit_enumerate_raw_formats(struct vulkan_blit_state *s, uint32_t index, uint32_t caps,
+		struct spa_pod **param, struct spa_pod_builder *builder);
+int spa_vulkan_blit_enumerate_dsp_formats(struct vulkan_blit_state *s, uint32_t index, uint32_t caps,
+		struct spa_pod **param, struct spa_pod_builder *builder);
+int spa_vulkan_blit_enumerate_formats(struct vulkan_blit_state *s, uint32_t index, uint32_t caps,
+		struct spa_pod **param, struct spa_pod_builder *builder);
+int spa_vulkan_blit_prepare(struct vulkan_blit_state *s);
+int spa_vulkan_blit_unprepare(struct vulkan_blit_state *s);
+
+int spa_vulkan_blit_start(struct vulkan_blit_state *s);
+int spa_vulkan_blit_stop(struct vulkan_blit_state *s);
+int spa_vulkan_blit_ready(struct vulkan_blit_state *s);
+int spa_vulkan_blit_process(struct vulkan_blit_state *s, struct vulkan_pass *pass);
+int spa_vulkan_blit_cleanup(struct vulkan_blit_state *s);
+
+int spa_vulkan_blit_get_buffer_caps(struct vulkan_blit_state *s, enum spa_direction direction);
+struct vulkan_modifier_info *spa_vulkan_blit_get_modifier_info(struct vulkan_blit_state *s,
+		struct spa_video_info *info);
+
+int spa_vulkan_blit_init(struct vulkan_blit_state *s);
+void spa_vulkan_blit_deinit(struct vulkan_blit_state *s);

pipewire-1.0.1.tar.bz2/spa/plugins/vulkan/vulkan-compute-filter.c -> pipewire-1.2.0.tar.gz/spa/plugins/vulkan/vulkan-compute-filter.c Changed

@@ -25,7 +25,9 @@
 
 #include "vulkan-compute-utils.h"
 
-#define NAME "vulkan-compute-filter"
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.vulkan.compute-filter");
 
 struct buffer {
 	uint32_t id;
@@ -41,7 +43,13 @@
 	struct spa_port_info info;
 
 	enum spa_direction direction;
-	struct spa_param_info params5;
+#define IDX_EnumFormat	0
+#define IDX_Meta	1
+#define IDX_IO		2
+#define IDX_Format	3
+#define IDX_Buffer	4
+#define N_PORT_PARAMS	5
+	struct spa_param_info paramsN_PORT_PARAMS;
 
 	struct spa_io_buffers *io;
 
@@ -66,7 +74,10 @@
 
 	uint64_t info_all;
 	struct spa_node_info info;
-	struct spa_param_info params2;
+#define IDX_PropInfo	0
+#define IDX_Props	1
+#define N_NODE_PARAMS	2
+	struct spa_param_info paramsN_NODE_PARAMS;
 
 	struct spa_hook_list hooks;
 	struct spa_callbacks callbacks;
@@ -152,7 +163,7 @@
 	struct buffer *b = &port->buffersid;
 
 	if (SPA_FLAG_IS_SET(b->flags, BUFFER_FLAG_OUT)) {
-		spa_log_debug(this->log, NAME " %p: reuse buffer %d", this, id);
+		spa_log_debug(this->log, "%p: reuse buffer %d", this, id);
 
 		SPA_FLAG_CLEAR(b->flags, BUFFER_FLAG_OUT);
 		spa_list_append(&port->empty, &b->link);
@@ -172,7 +183,7 @@
 			return 0;
 
 		this->started = true;
-		spa_vulkan_start(&this->state);
+		spa_vulkan_compute_start(&this->state);
 		break;
 
 	case SPA_NODE_COMMAND_Suspend:
@@ -181,7 +192,7 @@
 			return 0;
 
 		this->started = false;
-		spa_vulkan_stop(&this->state);
+		spa_vulkan_compute_stop(&this->state);
 		break;
 	default:
 		return -ENOTSUP;
@@ -269,64 +280,6 @@
 	return -ENOTSUP;
 }
 
-static struct spa_pod *build_EnumFormat(uint32_t fmt, const struct vulkan_format_info *fmtInfo, struct spa_pod_builder *builder) {
-	struct spa_pod_frame f2;
-	uint32_t i, c;
-
-	spa_pod_builder_push_object(builder, &f0, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat);
-	spa_pod_builder_add(builder, SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video), 0);
-	spa_pod_builder_add(builder, SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_dsp), 0);
-	spa_pod_builder_add(builder, SPA_FORMAT_VIDEO_format, SPA_POD_Id(fmt), 0);
-	if (fmtInfo && fmtInfo->modifierCount > 0) {
-		spa_pod_builder_prop(builder, SPA_FORMAT_VIDEO_modifier, SPA_POD_PROP_FLAG_MANDATORY | SPA_POD_PROP_FLAG_DONT_FIXATE);
-		spa_pod_builder_push_choice(builder, &f1, SPA_CHOICE_Enum, 0);
-		for (i = 0, c = 0; i < fmtInfo->modifierCount; i++) {
-			spa_pod_builder_long(builder, fmtInfo->infosi.props.drmFormatModifier);
-			if (c++ == 0)
-				spa_pod_builder_long(builder, fmtInfo->infosi.props.drmFormatModifier);
-		}
-		spa_pod_builder_pop(builder, &f1);
-	}
-	return spa_pod_builder_pop(builder, &f0);
-}
-
-// This function enumerates the available formats in vulkan_state::formats, announcing all formats capable to support DmaBufs
-// first and then falling back to those supported with SHM buffers.
-static bool find_EnumFormatInfo(struct vulkan_base *s, uint32_t index, uint32_t caps, uint32_t *fmt_idx, bool *has_modifier) {
-	int64_t fmtIterator = 0;
-	int64_t maxIterator = 0;
-	if (caps & VULKAN_BUFFER_TYPE_CAP_SHM)
-		maxIterator += s->formatInfoCount;
-	if (caps & VULKAN_BUFFER_TYPE_CAP_DMABUF)
-		maxIterator += s->formatInfoCount;
-	// Count available formats until index underflows, while fmtIterator indexes the current format.
-	// Iterate twice over formats first time with modifiers, second time without if both caps are supported.
-	while (index < (uint32_t)-1 && fmtIterator < maxIterator) {
-		const struct vulkan_format_info *f_info = &s->formatInfosfmtIterator%s->formatInfoCount;
-		if (caps & VULKAN_BUFFER_TYPE_CAP_DMABUF && fmtIterator < s->formatInfoCount) {
-			// First round, check for modifiers
-			if (f_info->modifierCount > 0) {
-				index--;
-			}
-		} else if (caps & VULKAN_BUFFER_TYPE_CAP_SHM) {
-			// Second round, every format should be supported.
-			index--;
-		}
-		fmtIterator++;
-	}
-
-	if (index != (uint32_t)-1) {
-		// No more formats available
-		return false;
-	}
-	// Undo end of loop increment
-	fmtIterator--;
-	*fmt_idx = fmtIterator%s->formatInfoCount;
-	// Loop finished in first round
-	*has_modifier = caps & VULKAN_BUFFER_TYPE_CAP_DMABUF && fmtIterator < s->formatInfoCount;
-	return true;
-}
-
 static int port_enum_formats(void *object,
 			     enum spa_direction direction, uint32_t port_id,
 			     uint32_t index,
@@ -336,8 +289,6 @@
 {
 	struct impl *this = object;
 
-	uint32_t fmt_index;
-	bool has_modifier;
 	if (this->portport_id.have_format
 			&& this->portport_id.current_format.info.dsp.flags & SPA_VIDEO_FLAG_MODIFIER
 			&& this->portport_id.current_format.info.dsp.flags ^ SPA_VIDEO_FLAG_MODIFIER_FIXATION_REQUIRED) {
@@ -347,18 +298,10 @@
 			*param = spa_format_video_dsp_build(builder, SPA_PARAM_EnumFormat, &this->portport_id.current_format.info.dsp);
 			return 1;
 		}
-		if (!find_EnumFormatInfo(&this->state.base, index-1, spa_vulkan_get_buffer_caps(&this->state, direction), &fmt_index, &has_modifier))
-			return 0;
+		return spa_vulkan_compute_enumerate_formats(&this->state, index-1, spa_vulkan_compute_get_buffer_caps(&this->state, direction), param, builder);
 	} else {
-		if (!find_EnumFormatInfo(&this->state.base, index, spa_vulkan_get_buffer_caps(&this->state, direction), &fmt_index, &has_modifier))
-			return 0;
+		return spa_vulkan_compute_enumerate_formats(&this->state, index, spa_vulkan_compute_get_buffer_caps(&this->state, direction), param, builder);
 	}
-
-	const struct vulkan_format_info *f_info = &this->state.base.formatInfosfmt_index;
-	spa_log_info(this->log, "vulkan-compute-filter: enum_formats idx: %d, format %d, has_modifier %d", index, f_info->spa_format, has_modifier);
-	*param = build_EnumFormat(f_info->spa_format, has_modifier ? f_info : NULL, builder);
-
-	return 1;
 }
 
 static int
@@ -414,13 +357,13 @@
 		if (result.index > 0)
 			return 0;
 
-		spa_log_debug(this->log, NAME" %p: %dx%d stride %d", this,
+		spa_log_debug(this->log, "%p: %dx%d stride %d", this,
 				this->position->video.size.width,
 				this->position->video.size.height,
 				this->position->video.stride);
 
 		if (port->current_format.info.dsp.flags & SPA_VIDEO_FLAG_MODIFIER) {
-			struct vulkan_modifier_info *mod_info = spa_vulkan_get_modifier_info(&this->state,
+			struct vulkan_modifier_info *mod_info = spa_vulkan_compute_get_modifier_info(&this->state,
 				&port->current_format.info.dsp);
 			param = spa_pod_builder_add_object(&b,
 				SPA_TYPE_OBJECT_ParamBuffers, id,
@@ -471,9 +414,9 @@
 static int clear_buffers(struct impl *this, struct port *port)
 {
 	if (port->n_buffers > 0) {
-		spa_log_debug(this->log, NAME " %p: clear buffers", this);
-		spa_vulkan_stop(&this->state);
-		spa_vulkan_use_buffers(&this->state, &this->state.streamsport->stream_id, 0, &port->current_format.info.dsp, 0, NULL);
+		spa_log_debug(this->log, "%p: clear buffers", this);
+		spa_vulkan_compute_stop(&this->state);
+		spa_vulkan_compute_use_buffers(&this->state, &this->state.streamsport->stream_id, 0, &port->current_format.info.dsp, 0, NULL);
 		port->n_buffers = 0;
 		spa_list_init(&port->empty);
 		spa_list_init(&port->ready);
@@ -491,7 +434,7 @@
 	if (format == NULL) {
 		port->have_format = false;
 		clear_buffers(this, port);
-		spa_vulkan_unprepare(&this->state);
+		spa_vulkan_compute_unprepare(&this->state);
 	} else {
 		struct spa_video_info info = { 0 };
 
@@ -528,10 +471,10 @@
 			modifierCount -= 1;
 			modifiers++;
 			uint64_t fixed_modifier;
-			if (spa_vulkan_fixate_modifier(&this->state, &this->state.streamsport->stream_id, &info.info.dsp, modifierCount, modifiers, &fixed_modifier) != 0)
+			if (spa_vulkan_compute_fixate_modifier(&this->state, &this->state.streamsport->stream_id, &info.info.dsp, modifierCount, modifiers, &fixed_modifier) != 0)
 				return -EINVAL;
 
-			spa_log_info(this->log, NAME ": modifier fixated %"PRIu64, fixed_modifier);
+			spa_log_info(this->log, "modifier fixated %"PRIu64, fixed_modifier);
 
 			info.info.dsp.modifier = fixed_modifier;
 			info.info.dsp.flags &= ~SPA_VIDEO_FLAG_MODIFIER_FIXATION_REQUIRED;
@@ -550,7 +493,7 @@
 
 		if (modifier_fixed) {
 			port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
-			port->params0.flags ^= SPA_PARAM_INFO_SERIAL;
+			port->paramsIDX_EnumFormat.flags ^= SPA_PARAM_INFO_SERIAL;
 			emit_port_info(this, port, false);
 			return 0;
 		}
@@ -558,11 +501,11 @@
 
 	port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
 	if (port->have_format) {
-		port->params3 = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READWRITE);
-		port->params4 = SPA_PARAM_INFO(SPA_PARAM_Buffers, SPA_PARAM_INFO_READ);
+		port->paramsIDX_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READWRITE);
+		port->paramsIDX_Buffer = SPA_PARAM_INFO(SPA_PARAM_Buffers, SPA_PARAM_INFO_READ);
 	} else {
-		port->params3 = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
-		port->params4 = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
+		port->paramsIDX_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
+		port->paramsIDX_Buffer = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
 	}
 	emit_port_info(this, port, false);
 
@@ -628,7 +571,7 @@
 		spa_log_info(this->log, "%p: %d:%d add buffer %p", port, direction, port_id, b);
 		spa_list_append(&port->empty, &b->link);
 	}
-	spa_vulkan_use_buffers(&this->state, &this->state.streamsport->stream_id, flags, &port->current_format.info.dsp, n_buffers, buffers);
+	spa_vulkan_compute_use_buffers(&this->state, &this->state.streamsport->stream_id, flags, &port->current_format.info.dsp, n_buffers, buffers);
 	port->n_buffers = n_buffers;
 
 	return 0;
@@ -708,7 +651,7 @@
 	}
 
 	if (spa_list_is_empty(&outport->empty)) {
-		spa_log_debug(this->log, NAME " %p: out of buffers", this);
+		spa_log_debug(this->log, "%p: out of buffers", this);
 		return -EPIPE;
 	}
 	b = &inport->buffersinio->buffer_id;
@@ -720,12 +663,12 @@
 	SPA_FLAG_SET(b->flags, BUFFER_FLAG_OUT);
 	this->state.streamsoutport->stream_id.pending_buffer_id = b->id;
 
-	this->state.constants.time += 0.025;
+	this->state.constants.time += 0.025f;
 	this->state.constants.frame++;
 
 	spa_log_debug(this->log, "filter into %d", b->id);
 
-	spa_vulkan_process(&this->state);
+	spa_vulkan_compute_process(&this->state);
 
 	b->outbuf->datas0.chunk->offset = 0;
 	b->outbuf->datas0.chunk->size = b->outbuf->datas0.maxsize;
@@ -780,7 +723,7 @@
 
 	this = (struct impl *) handle;
 
-	spa_vulkan_deinit(&this->state);
+	spa_vulkan_compute_deinit(&this->state);
 	return 0;
 }
 
@@ -827,10 +770,10 @@
 	this->info.max_output_ports = 1;
 	this->info.max_input_ports = 1;
 	this->info.flags = SPA_NODE_FLAG_RT;
-	this->params0 = SPA_PARAM_INFO(SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ);
-	this->params1 = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE);
+	this->paramsIDX_PropInfo = SPA_PARAM_INFO(SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ);
+	this->paramsIDX_Props = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE);
 	this->info.params = this->params;
-	this->info.n_params = 2;
+	this->info.n_params = N_NODE_PARAMS;
 
 	port = &this->port0;
 	port->stream_id = 1;
@@ -840,14 +783,14 @@
 			SPA_PORT_CHANGE_MASK_PROPS;
 	port->info = SPA_PORT_INFO_INIT();
 	port->info.flags = SPA_PORT_FLAG_NO_REF;
-	port->params0 = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
-	port->params1 = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
-	port->params2 = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
-	port->params3 = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
-	port->params4 = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
+	port->paramsIDX_EnumFormat = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
+	port->paramsIDX_Meta = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
+	port->paramsIDX_IO = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
+	port->paramsIDX_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
+	port->paramsIDX_Buffer = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
 	port->info.params = port->params;
-	port->info.n_params = 5;
-	spa_vulkan_init_stream(&this->state, &this->state.streamsport->stream_id,
+	port->info.n_params = N_PORT_PARAMS;
+	spa_vulkan_compute_init_stream(&this->state, &this->state.streamsport->stream_id,
 			SPA_DIRECTION_INPUT, NULL);
 	spa_list_init(&port->empty);
 	spa_list_init(&port->ready);
@@ -860,21 +803,21 @@
 			SPA_PORT_CHANGE_MASK_PROPS;
 	port->info = SPA_PORT_INFO_INIT();
 	port->info.flags = SPA_PORT_FLAG_NO_REF | SPA_PORT_FLAG_CAN_ALLOC_BUFFERS;
-	port->params0 = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
-	port->params1 = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
-	port->params2 = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
-	port->params3 = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
-	port->params4 = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
+	port->paramsIDX_EnumFormat = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
+	port->paramsIDX_Meta = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
+	port->paramsIDX_IO = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
+	port->paramsIDX_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
+	port->paramsIDX_Buffer = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
 	port->info.params = port->params;
-	port->info.n_params = 5;
+	port->info.n_params = N_PORT_PARAMS;
 	spa_list_init(&port->empty);
 	spa_list_init(&port->ready);
-	spa_vulkan_init_stream(&this->state, &this->state.streamsport->stream_id,
+	spa_vulkan_compute_init_stream(&this->state, &this->state.streamsport->stream_id,
 			SPA_DIRECTION_OUTPUT, NULL);
 
 	this->state.n_streams = 2;
-	spa_vulkan_init(&this->state);
-	spa_vulkan_prepare(&this->state);
+	spa_vulkan_compute_init(&this->state);
+	spa_vulkan_compute_prepare(&this->state);
 
 	return 0;
 }

pipewire-1.0.1.tar.bz2/spa/plugins/vulkan/vulkan-compute-source.c -> pipewire-1.2.0.tar.gz/spa/plugins/vulkan/vulkan-compute-source.c Changed

@@ -26,7 +26,9 @@
 
 #include "vulkan-compute-utils.h"
 
-#define NAME "vulkan-compute-source"
+#undef SPA_LOG_TOPIC_DEFAULT
+#define SPA_LOG_TOPIC_DEFAULT &log_topic
+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))
@@ -54,7 +56,15 @@
 struct port {
 	uint64_t info_all;
 	struct spa_port_info info;
-	struct spa_param_info params5;
+
+	enum spa_direction direction;
+#define IDX_EnumFormat	0
+#define IDX_Meta	1
+#define IDX_IO		2
+#define IDX_Format	3
+#define IDX_Buffer	4
+#define N_PORT_PARAMS	5
+	struct spa_param_info paramsN_PORT_PARAMS;
 
 	struct spa_io_buffers *io;
 
@@ -81,7 +91,10 @@
 
 	uint64_t info_all;
 	struct spa_node_info info;
-	struct spa_param_info params2;
+#define IDX_PropInfo	0
+#define IDX_Props	1
+#define N_NODE_PARAMS	2
+	struct spa_param_info paramsN_NODE_PARAMS;
 	struct props props;
 
 	struct spa_hook_list hooks;
@@ -257,7 +270,7 @@
 		if ((res = spa_system_timerfd_read(this->data_system,
 						this->timer_source.fd, &expirations)) < 0) {
 			if (res != -EAGAIN)
-				spa_log_error(this->log, NAME " %p: timerfd error: %s",
+				spa_log_error(this->log, "%p: timerfd error: %s",
 						this, spa_strerror(res));
 		}
 	}
@@ -274,14 +287,14 @@
 	if (read_timer(this) < 0)
 		return 0;
 
-	if ((res = spa_vulkan_ready(&this->state)) < 0) {
+	if ((res = spa_vulkan_compute_ready(&this->state)) < 0) {
 		res = SPA_STATUS_OK;
 		goto next;
 	}
 
 	if (spa_list_is_empty(&port->empty)) {
 		set_timer(this, false);
-		spa_log_error(this->log, NAME " %p: out of buffers", this);
+		spa_log_error(this->log, "%p: out of buffers", this);
 		return -EPIPE;
 	}
 	b = spa_list_first(&port->empty, struct buffer, link);
@@ -289,20 +302,20 @@
 
 	n_bytes = b->outbuf->datas0.maxsize;
 
-	spa_log_trace(this->log, NAME " %p: dequeue buffer %d", this, b->id);
+	spa_log_trace(this->log, "%p: dequeue buffer %d", this, b->id);
 
 	this->state.constants.time = this->elapsed_time / (float) SPA_NSEC_PER_SEC;
 	this->state.constants.frame = this->frame_count;
 
 	this->state.streams0.pending_buffer_id = b->id;
-	spa_vulkan_process(&this->state);
+	spa_vulkan_compute_process(&this->state);
 
 	if (this->state.streams0.ready_buffer_id != SPA_ID_INVALID) {
 		struct buffer *b = &port->buffersthis->state.streams0.ready_buffer_id;
 
 		this->state.streams0.ready_buffer_id = SPA_ID_INVALID;
 
-		spa_log_trace(this->log, NAME " %p: ready buffer %d", this, b->id);
+		spa_log_trace(this->log, "%p: ready buffer %d", this, b->id);
 
 		b->outbuf->datas0.chunk->offset = 0;
 		b->outbuf->datas0.chunk->size = n_bytes;
@@ -331,7 +344,7 @@
 	struct buffer *b = &port->buffersid;
 
 	if (SPA_FLAG_IS_SET(b->flags, BUFFER_FLAG_OUT)) {
-		spa_log_trace(this->log, NAME " %p: reuse buffer %d", this, id);
+		spa_log_trace(this->log, "%p: reuse buffer %d", this, id);
 
 		SPA_FLAG_CLEAR(b->flags, BUFFER_FLAG_OUT);
 		spa_list_append(&port->empty, &b->link);
@@ -405,7 +418,7 @@
 
 		this->started = true;
 		set_timer(this, true);
-		spa_vulkan_start(&this->state);
+		spa_vulkan_compute_start(&this->state);
 		break;
 	}
 	case SPA_NODE_COMMAND_Suspend:
@@ -415,7 +428,7 @@
 
 		this->started = false;
 		set_timer(this, false);
-		spa_vulkan_stop(&this->state);
+		spa_vulkan_compute_stop(&this->state);
 		break;
 	default:
 		return -ENOTSUP;
@@ -503,64 +516,6 @@
 	return -ENOTSUP;
 }
 
-static struct spa_pod *build_EnumFormat(uint32_t fmt, const struct vulkan_format_info *fmtInfo, struct spa_pod_builder *builder) {
-	struct spa_pod_frame f2;
-	uint32_t i, c;
-
-	spa_pod_builder_push_object(builder, &f0, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat);
-	spa_pod_builder_add(builder, SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video), 0);
-	spa_pod_builder_add(builder, SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_dsp), 0);
-	spa_pod_builder_add(builder, SPA_FORMAT_VIDEO_format, SPA_POD_Id(fmt), 0);
-	if (fmtInfo && fmtInfo->modifierCount > 0) {
-		spa_pod_builder_prop(builder, SPA_FORMAT_VIDEO_modifier, SPA_POD_PROP_FLAG_MANDATORY | SPA_POD_PROP_FLAG_DONT_FIXATE);
-		spa_pod_builder_push_choice(builder, &f1, SPA_CHOICE_Enum, 0);
-		for (i = 0, c = 0; i < fmtInfo->modifierCount; i++) {
-			spa_pod_builder_long(builder, fmtInfo->infosi.props.drmFormatModifier);
-			if (c++ == 0)
-				spa_pod_builder_long(builder, fmtInfo->infosi.props.drmFormatModifier);
-		}
-		spa_pod_builder_pop(builder, &f1);
-	}
-	return spa_pod_builder_pop(builder, &f0);
-}
-
-// This function enumerates the available formats in vulkan_state::formats, announcing all formats capable to support DmaBufs
-// first and then falling back to those supported with SHM buffers.
-static bool find_EnumFormatInfo(struct vulkan_base *s, uint32_t index, uint32_t caps, uint32_t *fmt_idx, bool *has_modifier) {
-	int64_t fmtIterator = 0;
-	int64_t maxIterator = 0;
-	if (caps & VULKAN_BUFFER_TYPE_CAP_SHM)
-		maxIterator += s->formatInfoCount;
-	if (caps & VULKAN_BUFFER_TYPE_CAP_DMABUF)
-		maxIterator += s->formatInfoCount;
-	// Count available formats until index underflows, while fmtIterator indexes the current format.
-	// Iterate twice over formats first time with modifiers, second time without if both caps are supported.
-	while (index < (uint32_t)-1 && fmtIterator < maxIterator) {
-		const struct vulkan_format_info *f_info = &s->formatInfosfmtIterator%s->formatInfoCount;
-		if (caps & VULKAN_BUFFER_TYPE_CAP_DMABUF && fmtIterator < s->formatInfoCount) {
-			// First round, check for modifiers
-			if (f_info->modifierCount > 0) {
-				index--;
-			}
-		} else if (caps & VULKAN_BUFFER_TYPE_CAP_SHM) {
-			// Second round, every format should be supported.
-			index--;
-		}
-		fmtIterator++;
-	}
-
-	if (index != (uint32_t)-1) {
-		// No more formats available
-		return false;
-	}
-	// Undo end of loop increment
-	fmtIterator--;
-	*fmt_idx = fmtIterator%s->formatInfoCount;
-	// Loop finished in first round
-	*has_modifier = caps & VULKAN_BUFFER_TYPE_CAP_DMABUF && fmtIterator < s->formatInfoCount;
-	return true;
-}
-
 static int port_enum_formats(void *object,
 			     enum spa_direction direction, uint32_t port_id,
 			     uint32_t index,
@@ -570,8 +525,6 @@
 {
 	struct impl *this = object;
 
-	uint32_t fmt_index;
-	bool has_modifier;
 	if (this->port.have_format
 			&& this->port.current_format.info.dsp.flags & SPA_VIDEO_FLAG_MODIFIER
 			&& this->port.current_format.info.dsp.flags ^ SPA_VIDEO_FLAG_MODIFIER_FIXATION_REQUIRED) {
@@ -581,18 +534,10 @@
 			*param = spa_format_video_dsp_build(builder, SPA_PARAM_EnumFormat, &this->port.current_format.info.dsp);
 			return 1;
 		}
-		if (!find_EnumFormatInfo(&this->state.base, index-1, spa_vulkan_get_buffer_caps(&this->state, direction), &fmt_index, &has_modifier))
-			return 0;
+		return spa_vulkan_compute_enumerate_formats(&this->state, index-1, spa_vulkan_compute_get_buffer_caps(&this->state, direction), param, builder);
 	} else {
-		if (!find_EnumFormatInfo(&this->state.base, index, spa_vulkan_get_buffer_caps(&this->state, direction), &fmt_index, &has_modifier))
-			return 0;
+		return spa_vulkan_compute_enumerate_formats(&this->state, index, spa_vulkan_compute_get_buffer_caps(&this->state, direction), param, builder);
 	}
-
-	const struct vulkan_format_info *f_info = &this->state.base.formatInfosfmt_index;
-	spa_log_info(this->log, "vulkan-compute-source: enum_formats idx: %d, format %d, has_modifier %d", index, f_info->spa_format, has_modifier);
-	*param = build_EnumFormat(f_info->spa_format, has_modifier ? f_info : NULL, builder);
-
-	return 1;
 }
 
 static int
@@ -648,14 +593,14 @@
 		if (result.index > 0)
 			return 0;
 
-		spa_log_debug(this->log, NAME" %p: %dx%d stride %d", this,
+		spa_log_debug(this->log, "%p: %dx%d stride %d", this,
 				this->position->video.size.width,
 				this->position->video.size.height,
 				this->position->video.stride);
 
 
 		if (port->current_format.info.dsp.flags & SPA_VIDEO_FLAG_MODIFIER) {
-			struct vulkan_modifier_info *mod_info = spa_vulkan_get_modifier_info(&this->state,
+			struct vulkan_modifier_info *mod_info = spa_vulkan_compute_get_modifier_info(&this->state,
 				&port->current_format.info.dsp);
 			param = spa_pod_builder_add_object(&b,
 				SPA_TYPE_OBJECT_ParamBuffers, id,
@@ -706,8 +651,8 @@
 static int clear_buffers(struct impl *this, struct port *port)
 {
 	if (port->n_buffers > 0) {
-		spa_log_debug(this->log, NAME " %p: clear buffers", this);
-		spa_vulkan_use_buffers(&this->state, &this->state.streams0, 0, &port->current_format.info.dsp, 0, NULL);
+		spa_log_debug(this->log, "%p: clear buffers", this);
+		spa_vulkan_compute_use_buffers(&this->state, &this->state.streams0, 0, &port->current_format.info.dsp, 0, NULL);
 		port->n_buffers = 0;
 		spa_list_init(&port->empty);
 		spa_list_init(&port->ready);
@@ -726,7 +671,7 @@
 	if (format == NULL) {
 		port->have_format = false;
 		clear_buffers(this, port);
-		spa_vulkan_unprepare(&this->state);
+		spa_vulkan_compute_unprepare(&this->state);
 	} else {
 		struct spa_video_info info = { 0 };
 
@@ -763,10 +708,10 @@
 			modifiers++;
 
 			uint64_t fixed_modifier;
-			if (spa_vulkan_fixate_modifier(&this->state, &this->state.streams0, &info.info.dsp, modifierCount, modifiers, &fixed_modifier) != 0)
+			if (spa_vulkan_compute_fixate_modifier(&this->state, &this->state.streams0, &info.info.dsp, modifierCount, modifiers, &fixed_modifier) != 0)
 				return -EINVAL;
 
-			spa_log_info(this->log, NAME ": modifier fixated %"PRIu64, fixed_modifier);
+			spa_log_info(this->log, "modifier fixated %"PRIu64, fixed_modifier);
 
 			info.info.dsp.modifier = fixed_modifier;
 			info.info.dsp.flags &= ~SPA_VIDEO_FLAG_MODIFIER_FIXATION_REQUIRED;
@@ -782,11 +727,11 @@
 
 		port->current_format = info;
 		port->have_format = true;
-		spa_vulkan_prepare(&this->state);
+		spa_vulkan_compute_prepare(&this->state);
 
 		if (modifier_fixed) {
 			port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
-			port->params0.flags ^= SPA_PARAM_INFO_SERIAL;
+			port->paramsIDX_EnumFormat.flags ^= SPA_PARAM_INFO_SERIAL;
 			emit_port_info(this, port, false);
 			return 0;
 		}
@@ -794,11 +739,11 @@
 
 	port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
 	if (port->have_format) {
-		port->params3 = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READWRITE);
-		port->params4 = SPA_PARAM_INFO(SPA_PARAM_Buffers, SPA_PARAM_INFO_READ);
+		port->paramsIDX_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READWRITE);
+		port->paramsIDX_Buffer = SPA_PARAM_INFO(SPA_PARAM_Buffers, SPA_PARAM_INFO_READ);
 	} else {
-		port->params3 = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
-		port->params4 = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
+		port->paramsIDX_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
+		port->paramsIDX_Buffer = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
 	}
 	emit_port_info(this, port, false);
 
@@ -864,7 +809,7 @@
 		spa_log_info(this->log, "%p: %d:%d add buffer %p", port, direction, port_id, b);
 		spa_list_append(&port->empty, &b->link);
 	}
-	spa_vulkan_use_buffers(&this->state, &this->state.streams0, flags, &port->current_format.info.dsp, n_buffers, buffers);
+	spa_vulkan_compute_use_buffers(&this->state, &this->state.streams0, flags, &port->current_format.info.dsp, n_buffers, buffers);
 	port->n_buffers = n_buffers;
 
 	return 0;
@@ -985,7 +930,7 @@
 
 	this = (struct impl *) handle;
 
-	spa_vulkan_deinit(&this->state);
+	spa_vulkan_compute_deinit(&this->state);
 
 	if (this->data_loop)
 		spa_loop_invoke(this->data_loop, do_remove_timer, 0, NULL, 0, true, this);
@@ -1036,10 +981,10 @@
 	this->info = SPA_NODE_INFO_INIT();
 	this->info.max_output_ports = 1;
 	this->info.flags = SPA_NODE_FLAG_RT;
-	this->params0 = SPA_PARAM_INFO(SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ);
-	this->params1 = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE);
+	this->paramsIDX_PropInfo = SPA_PARAM_INFO(SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ);
+	this->paramsIDX_Props = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE);
 	this->info.params = this->params;
-	this->info.n_params = 2;
+	this->info.n_params = N_NODE_PARAMS;
 	reset_props(&this->props);
 
 	this->timer_source.func = on_output;
@@ -1064,22 +1009,22 @@
 	port->info.flags = SPA_PORT_FLAG_NO_REF;
 	if (this->props.live)
 		port->info.flags |= SPA_PORT_FLAG_LIVE;
-	port->params0 = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
-	port->params1 = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
-	port->params2 = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
-	port->params3 = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
-	port->params4 = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
+	port->paramsIDX_EnumFormat = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
+	port->paramsIDX_Meta = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
+	port->paramsIDX_IO = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
+	port->paramsIDX_Format = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
+	port->paramsIDX_Buffer = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
 	port->info.params = port->params;
-	port->info.n_params = 5;
+	port->info.n_params = N_PORT_PARAMS;
 	spa_list_init(&port->empty);
 	spa_list_init(&port->ready);
 
 	this->state.log = this->log;
-	spa_vulkan_init_stream(&this->state, &this->state.streams0,
+	spa_vulkan_compute_init_stream(&this->state, &this->state.streams0,
 			SPA_DIRECTION_OUTPUT, NULL);
 	this->state.shaderName = "spa/plugins/vulkan/shaders/main.spv";
 	this->state.n_streams = 1;
-	spa_vulkan_init(&this->state);
+	spa_vulkan_compute_init(&this->state);
 
 	return 0;
 }

pipewire-1.0.1.tar.bz2/spa/plugins/vulkan/vulkan-compute-utils.c -> pipewire-1.2.0.tar.gz/spa/plugins/vulkan/vulkan-compute-utils.c Changed

@@ -27,20 +27,12 @@
 
 #include "vulkan-compute-utils.h"
 #include "vulkan-utils.h"
+#include "utils.h"
+#include "pixel-formats.h"
 
 #define VULKAN_INSTANCE_FUNCTION(name)						\
 	PFN_##name name = (PFN_##name)vkGetInstanceProcAddr(s->base.instance, #name)
 
-static int createFence(struct vulkan_compute_state *s) {
-	VkFenceCreateInfo createInfo = {
-		.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO,
-		.flags = 0,
-	};
-	VK_CHECK_RESULT(vkCreateFence(s->base.device, &createInfo, NULL, &s->fence));
-
-	return 0;
-};
-
 static int createDescriptors(struct vulkan_compute_state *s)
 {
 	uint32_t i;
@@ -249,6 +241,39 @@
 	return 0;
 }
 
+static int runImportSHMBuffers(struct vulkan_compute_state *s) {
+	for (uint32_t i = 0; i < s->n_streams; i++) {
+		struct vulkan_stream *p = &s->streamsi;
+
+		if (p->direction == SPA_DIRECTION_OUTPUT)
+			continue;
+
+		struct pixel_format_info pixel_info;
+		CHECK(get_pixel_format_info(p->format, &pixel_info));
+
+		if (p->spa_buffersp->current_buffer_id->datas0.type == SPA_DATA_MemPtr) {
+			struct vulkan_buffer *vk_buf = &p->buffersp->current_buffer_id;
+			struct spa_buffer *spa_buf = p->spa_buffersp->current_buffer_id;
+			VkBufferImageCopy copy;
+			struct vulkan_write_pixels_info writeInfo = {
+				.data = spa_buf->datas0.data,
+				.offset = spa_buf->datas0.chunk->offset,
+				.stride = spa_buf->datas0.chunk->stride,
+				.bytes_per_pixel = pixel_info.bpp,
+				.size.width = s->constants.width,
+				.size.height = s->constants.height,
+				.copies = &copy,
+			};
+			CHECK(vulkan_write_pixels(&s->base, &writeInfo, &s->staging_buffer));
+
+			vkCmdCopyBufferToImage(s->commandBuffer, s->staging_buffer.buffer, vk_buf->image,
+					VK_IMAGE_LAYOUT_GENERAL, 1, &copy);
+		}
+	}
+
+	return 0;
+}
+
 static int runExportSHMBuffers(struct vulkan_compute_state *s) {
 	for (uint32_t i = 0; i < s->n_streams; i++) {
 		struct vulkan_stream *p = &s->streamsi;
@@ -256,13 +281,16 @@
 		if (p->direction == SPA_DIRECTION_INPUT)
 			continue;
 
+		struct pixel_format_info pixel_info;
+		CHECK(get_pixel_format_info(p->format, &pixel_info));
+
 		if (p->spa_buffersp->current_buffer_id->datas0.type == SPA_DATA_MemPtr) {
 			struct spa_buffer *spa_buf = p->spa_buffersp->current_buffer_id;
 			struct vulkan_read_pixels_info readInfo = {
 				.data = spa_buf->datas0.data,
 				.offset = spa_buf->datas0.chunk->offset,
 				.stride = spa_buf->datas0.chunk->stride,
-				.bytes_per_pixel = 16,
+				.bytes_per_pixel = pixel_info.bpp,
 				.size.width = s->constants.width,
 				.size.height = s->constants.height,
 			};
@@ -276,8 +304,8 @@
 /** runCommandBuffer
  *  The return value of this functions means the following:
  *  ret < 0: Error
- *  ret = 0: queueSubmit was succsessful, but manual synchronization is required
- *  ret = 1: queueSubmit was succsessful and buffers can be released without synchronization
+ *  ret = 0: queueSubmit was successful, but manual synchronization is required
+ *  ret = 1: queueSubmit was successful and buffers can be released without synchronization
  */
 static int runCommandBuffer(struct vulkan_compute_state *s)
 {
@@ -290,6 +318,8 @@
 	};
 	VK_CHECK_RESULT(vkBeginCommandBuffer(s->commandBuffer, &beginInfo));
 
+	CHECK(runImportSHMBuffers(s));
+
 	vkCmdBindPipeline(s->commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, s->pipeline);
 	vkCmdPushConstants (s->commandBuffer,
 			s->pipelineLayout, VK_SHADER_STAGE_COMPUTE_BIT,
@@ -449,6 +479,10 @@
 		p->spa_buffersi = NULL;
 	}
 	p->n_buffers = 0;
+	if (p->direction == SPA_DIRECTION_INPUT) {
+		vulkan_staging_buffer_destroy(&s->base, &s->staging_buffer);
+		s->staging_buffer.buffer = VK_NULL_HANDLE;
+	}
 }
 
 static void clear_streams(struct vulkan_compute_state *s)
@@ -460,7 +494,7 @@
 	}
 }
 
-int spa_vulkan_fixate_modifier(struct vulkan_compute_state *s, struct vulkan_stream *p, struct spa_video_info_dsp *dsp_info,
+int spa_vulkan_compute_fixate_modifier(struct vulkan_compute_state *s, struct vulkan_stream *p, struct spa_video_info_dsp *dsp_info,
 		uint32_t modifierCount, uint64_t *modifiers, uint64_t *modifier)
 {
 	VkFormat format = vulkan_id_to_vkformat(dsp_info->format);
@@ -479,7 +513,7 @@
 	return vulkan_fixate_modifier(&s->base, &fixation_info, modifier);
 }
 
-int spa_vulkan_use_buffers(struct vulkan_compute_state *s, struct vulkan_stream *p, uint32_t flags,
+int spa_vulkan_compute_use_buffers(struct vulkan_compute_state *s, struct vulkan_stream *p, uint32_t flags,
 		struct spa_video_info_dsp *dsp_info, uint32_t n_buffers, struct spa_buffer **buffers)
 {
 	VkFormat format = vulkan_id_to_vkformat(dsp_info->format);
@@ -488,10 +522,13 @@
 
 	vulkan_wait_idle(&s->base);
 	clear_buffers(s, p);
+	p->format = SPA_VIDEO_FORMAT_UNKNOWN;
+
+	if (n_buffers == 0)
+		return 0;
 
 	bool alloc = flags & SPA_NODE_BUFFERS_FLAG_ALLOC;
 	int ret;
-	p->n_buffers = 0;
 	for (uint32_t i = 0; i < n_buffers; i++) {
 		if (alloc) {
 			if (SPA_FLAG_IS_SET(buffersi->datas0.type, 1<<SPA_DATA_DmaBuf)) {
@@ -505,6 +542,8 @@
 						: VK_IMAGE_USAGE_SAMPLED_BIT,
 					.spa_buf = buffersi,
 				};
+				struct vulkan_modifier_info *modifierInfo = vulkan_modifierInfo_find(&s->formatInfos, format, dsp_info->modifier);
+				CHECK(vulkan_validate_dmabuf_properties(modifierInfo, &dmabufInfo.spa_buf->n_datas, &dmabufInfo.size));
 				ret = vulkan_create_dmabuf(&s->base, &dmabufInfo, &p->buffersi);
 			} else {
 				spa_log_error(s->log, "Unsupported buffer type mask %d", buffersi->datas0.type);
@@ -523,6 +562,8 @@
 						: VK_IMAGE_USAGE_SAMPLED_BIT,
 					.spa_buf = buffersi,
 				};
+				struct vulkan_modifier_info *modifierInfo = vulkan_modifierInfo_find(&s->formatInfos, format, dsp_info->modifier);
+				CHECK(vulkan_validate_dmabuf_properties(modifierInfo, &dmabufInfo.spa_buf->n_datas, &dmabufInfo.size));
 				ret = vulkan_import_dmabuf(&s->base, &dmabufInfo, &p->buffersi);
 				break;
 			case SPA_DATA_MemPtr:;
@@ -532,7 +573,7 @@
 					.size.height = s->constants.height,
 					.usage = p->direction == SPA_DIRECTION_OUTPUT
 						? VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT
-						: VK_IMAGE_USAGE_SAMPLED_BIT,
+						: VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT,
 					.spa_buf = buffersi,
 				};
 				ret = vulkan_import_memptr(&s->base, &memptrInfo, &p->buffersi);
@@ -549,20 +590,50 @@
 		p->spa_buffersi = buffersi;
 		p->n_buffers++;
 	}
+	if (p->direction == SPA_DIRECTION_INPUT && buffers0->datas0.type == SPA_DATA_MemPtr) {
+		ret = vulkan_staging_buffer_create(&s->base, buffers0->datas0.maxsize, &s->staging_buffer);
+		if (ret < 0) {
+			spa_log_error(s->log, "Failed to create staging buffer");
+			return ret;
+		}
+	}
+	p->format = dsp_info->format;
 
 	return 0;
 }
 
-int spa_vulkan_init_stream(struct vulkan_compute_state *s, struct vulkan_stream *stream,
+int spa_vulkan_compute_enumerate_formats(struct vulkan_compute_state *s, uint32_t index, uint32_t caps,
+		struct spa_pod **param, struct spa_pod_builder *builder)
+{
+	uint32_t fmt_idx;
+	bool has_modifier;
+	if (!find_EnumFormatInfo(&s->formatInfos, index, caps, &fmt_idx, &has_modifier))
+			return 0;
+	*param = build_dsp_EnumFormat(&s->formatInfos.infosfmt_idx, has_modifier, builder);
+	return 1;
+}
+
+static int vulkan_stream_init(struct vulkan_stream *stream, enum spa_direction direction,
+		struct spa_dict *props)
+{
+	spa_zero(*stream);
+	stream->direction = direction;
+	stream->current_buffer_id = SPA_ID_INVALID;
+	stream->busy_buffer_id = SPA_ID_INVALID;
+	stream->ready_buffer_id = SPA_ID_INVALID;
+	return 0;
+}
+
+int spa_vulkan_compute_init_stream(struct vulkan_compute_state *s, struct vulkan_stream *stream,
 		enum spa_direction direction, struct spa_dict *props)
 {
 	return vulkan_stream_init(stream, direction, props);
 }
 
-int spa_vulkan_prepare(struct vulkan_compute_state *s)
+int spa_vulkan_compute_prepare(struct vulkan_compute_state *s)
 {
 	if (!s->prepared) {
-		CHECK(createFence(s));
+		CHECK(vulkan_fence_create(&s->base, &s->fence));
 		CHECK(createDescriptors(s));
 		CHECK(createComputePipeline(s, s->shaderName));
 		CHECK(createCommandBuffer(s));
@@ -571,7 +642,7 @@
 	return 0;
 }
 
-int spa_vulkan_unprepare(struct vulkan_compute_state *s)
+int spa_vulkan_compute_unprepare(struct vulkan_compute_state *s)
 {
 	if (s->prepared) {
 		vkDestroyShaderModule(s->base.device, s->computeShaderModule, NULL);
@@ -587,7 +658,7 @@
 	return 0;
 }
 
-int spa_vulkan_start(struct vulkan_compute_state *s)
+int spa_vulkan_compute_start(struct vulkan_compute_state *s)
 {
 	uint32_t i;
 
@@ -600,7 +671,7 @@
 	return 0;
 }
 
-int spa_vulkan_stop(struct vulkan_compute_state *s)
+int spa_vulkan_compute_stop(struct vulkan_compute_state *s)
 {
         VK_CHECK_RESULT(vkDeviceWaitIdle(s->base.device));
 	clear_streams(s);
@@ -608,7 +679,7 @@
 	return 0;
 }
 
-int spa_vulkan_ready(struct vulkan_compute_state *s)
+int spa_vulkan_compute_ready(struct vulkan_compute_state *s)
 {
 	uint32_t i;
 	VkResult result;
@@ -631,7 +702,7 @@
 	return 0;
 }
 
-int spa_vulkan_process(struct vulkan_compute_state *s)
+int spa_vulkan_compute_process(struct vulkan_compute_state *s)
 {
 	CHECK(updateDescriptors(s));
 	CHECK(runCommandBuffer(s));
@@ -641,35 +712,40 @@
 	return 0;
 }
 
-int spa_vulkan_get_buffer_caps(struct vulkan_compute_state *s, enum spa_direction direction)
+int spa_vulkan_compute_get_buffer_caps(struct vulkan_compute_state *s, enum spa_direction direction)
 {
 	switch (direction) {
 	case SPA_DIRECTION_INPUT:
-		return VULKAN_BUFFER_TYPE_CAP_DMABUF;
+		return VULKAN_BUFFER_TYPE_CAP_DMABUF | VULKAN_BUFFER_TYPE_CAP_SHM;
 	case SPA_DIRECTION_OUTPUT:
 		return VULKAN_BUFFER_TYPE_CAP_DMABUF | VULKAN_BUFFER_TYPE_CAP_SHM;
 	}
 	return 0;
 }
 
-struct vulkan_modifier_info *spa_vulkan_get_modifier_info(struct vulkan_compute_state *s, struct spa_video_info_dsp *info) {
+struct vulkan_modifier_info *spa_vulkan_compute_get_modifier_info(struct vulkan_compute_state *s, struct spa_video_info_dsp *info) {
 	VkFormat vk_format = vulkan_id_to_vkformat(info->format);
-	return vulkan_modifierInfo_find(&s->base, vk_format, info->modifier);
+	return vulkan_modifierInfo_find(&s->formatInfos, vk_format, info->modifier);
 }
 
-int spa_vulkan_init(struct vulkan_compute_state *s)
+int spa_vulkan_compute_init(struct vulkan_compute_state *s)
 {
+	int ret;
 	s->base.log = s->log;
-	uint32_t dsp_format = SPA_VIDEO_FORMAT_DSP_F32;
+	uint32_t dsp_formats = {
+		SPA_VIDEO_FORMAT_DSP_F32
+	};
 	struct vulkan_base_info baseInfo = {
 		.queueFlags = VK_QUEUE_COMPUTE_BIT,
-		.formatInfo.formatCount = 1,
-		.formatInfo.formats = &dsp_format,
 	};
-	return vulkan_base_init(&s->base, &baseInfo);
+	if ((ret = vulkan_base_init(&s->base, &baseInfo)) < 0)
+			return ret;
+	return vulkan_format_infos_init(&s->base, SPA_N_ELEMENTS(dsp_formats), dsp_formats, &s->formatInfos);
+
 }
 
-void spa_vulkan_deinit(struct vulkan_compute_state *s)
+void spa_vulkan_compute_deinit(struct vulkan_compute_state *s)
 {
+	vulkan_format_infos_deinit(&s->formatInfos);
 	vulkan_base_deinit(&s->base);
 }

pipewire-1.0.1.tar.bz2/spa/plugins/vulkan/vulkan-compute-utils.h -> pipewire-1.2.0.tar.gz/spa/plugins/vulkan/vulkan-compute-utils.h Changed

@@ -7,6 +7,7 @@
 #include <spa/buffer/buffer.h>
 #include <spa/param/video/format.h>
 #include <spa/node/node.h>
+#include <spa/pod/builder.h>
 
 #include "vulkan-utils.h"
 
@@ -24,6 +25,20 @@
        int height;
 };
 
+struct vulkan_stream {
+	enum spa_direction direction;
+
+	uint32_t pending_buffer_id;
+	uint32_t current_buffer_id;
+	uint32_t busy_buffer_id;
+	uint32_t ready_buffer_id;
+
+	uint32_t format;
+
+	struct vulkan_buffer buffersMAX_BUFFERS;
+	struct spa_buffer *spa_buffersMAX_BUFFERS;
+	uint32_t n_buffers;
+};
 
 struct vulkan_compute_state {
 	struct spa_log *log;
@@ -32,6 +47,8 @@
 
 	struct vulkan_base base;
 
+	struct vulkan_format_infos formatInfos;
+
 	VkPipeline pipeline;
 	VkPipelineLayout pipelineLayout;
 	const char *shaderName;
@@ -39,6 +56,7 @@
 
 	VkCommandPool commandPool;
 	VkCommandBuffer commandBuffer;
+	struct vulkan_staging_buffer staging_buffer;
 
 	VkFence fence;
 	VkSemaphore pipelineSemaphore;
@@ -56,25 +74,27 @@
 	struct vulkan_stream streamsMAX_STREAMS;
 };
 
-int spa_vulkan_init_stream(struct vulkan_compute_state *s, struct vulkan_stream *stream, enum spa_direction,
+int spa_vulkan_compute_init_stream(struct vulkan_compute_state *s, struct vulkan_stream *stream, enum spa_direction,
 		struct spa_dict *props);
 
-int spa_vulkan_fixate_modifier(struct vulkan_compute_state *s, struct vulkan_stream *p, struct spa_video_info_dsp *dsp_info,
+int spa_vulkan_compute_fixate_modifier(struct vulkan_compute_state *s, struct vulkan_stream *p, struct spa_video_info_dsp *dsp_info,
 		uint32_t modifierCount, uint64_t *modifiers, uint64_t *modifier);
-int spa_vulkan_prepare(struct vulkan_compute_state *s);
-int spa_vulkan_use_buffers(struct vulkan_compute_state *s, struct vulkan_stream *stream, uint32_t flags,
+int spa_vulkan_compute_use_buffers(struct vulkan_compute_state *s, struct vulkan_stream *stream, uint32_t flags,
 		struct spa_video_info_dsp *dsp_info, uint32_t n_buffers, struct spa_buffer **buffers);
-int spa_vulkan_unprepare(struct vulkan_compute_state *s);
-
-int spa_vulkan_start(struct vulkan_compute_state *s);
-int spa_vulkan_stop(struct vulkan_compute_state *s);
-int spa_vulkan_ready(struct vulkan_compute_state *s);
-int spa_vulkan_process(struct vulkan_compute_state *s);
-int spa_vulkan_cleanup(struct vulkan_compute_state *s);
-
-int spa_vulkan_get_buffer_caps(struct vulkan_compute_state *s, enum spa_direction direction);
-struct vulkan_modifier_info *spa_vulkan_get_modifier_info(struct vulkan_compute_state *s,
+int spa_vulkan_compute_enumerate_formats(struct vulkan_compute_state *s, uint32_t index, uint32_t caps,
+		struct spa_pod **param, struct spa_pod_builder *builder);
+int spa_vulkan_compute_prepare(struct vulkan_compute_state *s);
+int spa_vulkan_compute_unprepare(struct vulkan_compute_state *s);
+
+int spa_vulkan_compute_start(struct vulkan_compute_state *s);
+int spa_vulkan_compute_stop(struct vulkan_compute_state *s);
+int spa_vulkan_compute_ready(struct vulkan_compute_state *s);
+int spa_vulkan_compute_process(struct vulkan_compute_state *s);
+int spa_vulkan_compute_cleanup(struct vulkan_compute_state *s);
+
+int spa_vulkan_compute_get_buffer_caps(struct vulkan_compute_state *s, enum spa_direction direction);
+struct vulkan_modifier_info *spa_vulkan_compute_get_modifier_info(struct vulkan_compute_state *s,
 		struct spa_video_info_dsp *dsp_info);
 
-int spa_vulkan_init(struct vulkan_compute_state *s);
-void spa_vulkan_deinit(struct vulkan_compute_state *s);
+int spa_vulkan_compute_init(struct vulkan_compute_state *s);
+void spa_vulkan_compute_deinit(struct vulkan_compute_state *s);

pipewire-1.0.1.tar.bz2/spa/plugins/vulkan/vulkan-types.h -> pipewire-1.2.0.tar.gz/spa/plugins/vulkan/vulkan-types.h Changed

@@ -25,6 +25,13 @@
 	struct vulkan_modifier_info *infos;
 };
 
+struct vulkan_format_infos {
+	uint32_t formatCount;
+	struct vulkan_format_info *infos;
+
+	uint32_t formatsWithModifiersCount;
+};
+
 struct vulkan_buffer {
 	int fd;
 	VkImage image;
@@ -33,26 +40,13 @@
 	VkSemaphore foreign_semaphore;
 };
 
-struct vulkan_stream {
-	enum spa_direction direction;
-
-	uint32_t pending_buffer_id;
-	uint32_t current_buffer_id;
-	uint32_t busy_buffer_id;
-	uint32_t ready_buffer_id;
-
-	struct vulkan_buffer buffersMAX_BUFFERS;
-	struct spa_buffer *spa_buffersMAX_BUFFERS;
-	uint32_t n_buffers;
+struct vulkan_staging_buffer {
+	VkBuffer buffer;
+	VkDeviceMemory memory;
 };
 
 struct vulkan_base_info {
 	uint32_t queueFlags;
-
-	struct {
-		uint32_t formatCount;
-		uint32_t *formats;
-	} formatInfo;
 };
 
 struct vulkan_base {
@@ -66,9 +60,6 @@
 	uint32_t queueFamilyIndex;
 	VkDevice device;
 
-	uint32_t formatInfoCount;
-	struct vulkan_format_info *formatInfos;
-
 	bool implicit_sync_interop;
 
 	unsigned int initialized:1;

pipewire-1.0.1.tar.bz2/spa/plugins/vulkan/vulkan-utils.c -> pipewire-1.2.0.tar.gz/spa/plugins/vulkan/vulkan-utils.c Changed

@@ -103,6 +103,12 @@
 	uint32_t id;
 } vk_video_format_convs = {
 	{ VK_FORMAT_R32G32B32A32_SFLOAT, SPA_VIDEO_FORMAT_RGBA_F32 },
+	{ VK_FORMAT_B8G8R8A8_SRGB, SPA_VIDEO_FORMAT_BGRA },
+	{ VK_FORMAT_R8G8B8A8_SRGB, SPA_VIDEO_FORMAT_RGBA },
+	{ VK_FORMAT_B8G8R8A8_SRGB, SPA_VIDEO_FORMAT_BGRx },
+	{ VK_FORMAT_R8G8B8A8_SRGB, SPA_VIDEO_FORMAT_RGBx },
+	{ VK_FORMAT_B8G8R8_SRGB, SPA_VIDEO_FORMAT_BGR },
+	{ VK_FORMAT_R8G8B8_SRGB, SPA_VIDEO_FORMAT_RGB },
 };
 
 static int createInstance(struct vulkan_base *s)
@@ -213,8 +219,10 @@
 		VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME,
 		VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME,
 		VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME,
-		VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME
+		VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME,
+		VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME,
 	};
+
 	const VkDeviceCreateInfo deviceCreateInfo = {
 		.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
 		.queueCreateInfoCount = 1,
@@ -231,113 +239,38 @@
 	return 0;
 }
 
-static int queryFormatInfo(struct vulkan_base *s, struct vulkan_base_info *info)
+int vulkan_write_pixels(struct vulkan_base *s, struct vulkan_write_pixels_info *info, struct vulkan_staging_buffer *vk_sbuf)
 {
-	if (s->formatInfos)
-		return 0;
-
-	s->formatInfos = calloc(info->formatInfo.formatCount, sizeof(struct vulkan_format_info));
-	if (!s->formatInfos)
-		return -ENOMEM;
-
-	for (uint32_t i = 0; i < info->formatInfo.formatCount; i++) {
-		VkFormat format = vulkan_id_to_vkformat(info->formatInfo.formatsi);
-		if (format == VK_FORMAT_UNDEFINED)
-			continue;
-		struct vulkan_format_info *f_info = &s->formatInfoss->formatInfoCount++;
-		f_info->spa_format = info->formatInfo.formatsi;
-		f_info->vk_format = format;
-
-		VkDrmFormatModifierPropertiesListEXT modPropsList = {
-			.sType = VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_LIST_EXT,
-		};
-		VkFormatProperties2 fmtProps = {
-			.sType = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2,
-			.pNext = &modPropsList,
-		};
-		vkGetPhysicalDeviceFormatProperties2(s->physicalDevice, format, &fmtProps);
-
-		if (!modPropsList.drmFormatModifierCount)
-			continue;
-
-		modPropsList.pDrmFormatModifierProperties = calloc(modPropsList.drmFormatModifierCount,
-				sizeof(modPropsList.pDrmFormatModifierProperties0));
-		if (!modPropsList.pDrmFormatModifierProperties)
-			continue;
-		vkGetPhysicalDeviceFormatProperties2(s->physicalDevice, format, &fmtProps);
-
-		f_info->infos = calloc(modPropsList.drmFormatModifierCount, sizeof(f_info->infos0));
-		if (!f_info->infos) {
-			free(modPropsList.pDrmFormatModifierProperties);
-			continue;
-		}
-
-		for (uint32_t j = 0; j < modPropsList.drmFormatModifierCount; j++) {
-			VkDrmFormatModifierPropertiesEXT props = modPropsList.pDrmFormatModifierPropertiesj;
-
-			if (!(props.drmFormatModifierTilingFeatures & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT))
-				continue;
-
-			if (props.drmFormatModifierPlaneCount > DMABUF_MAX_PLANES)
-				continue;
-
-			VkPhysicalDeviceImageDrmFormatModifierInfoEXT modInfo = {
-				.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT,
-				.drmFormatModifier = props.drmFormatModifier,
-				.sharingMode = VK_SHARING_MODE_EXCLUSIVE,
-			};
-			VkPhysicalDeviceExternalImageFormatInfo extImgFmtInfo = {
-				.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO,
-				.pNext = &modInfo,
-				.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
-			};
-			VkPhysicalDeviceImageFormatInfo2 imgFmtInfo = {
-				.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2,
-				.pNext = &extImgFmtInfo,
-				.type = VK_IMAGE_TYPE_2D,
-				.format = format,
-				.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
-				.tiling = VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT,
-			};
-
-			VkExternalImageFormatProperties extImgFmtProps = {
-				.sType = VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES,
-			};
-			VkImageFormatProperties2 imgFmtProps = {
-				.sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2,
-				.pNext = &extImgFmtProps,
-			};
+	void *vmap;
+	VK_CHECK_RESULT(vkMapMemory(s->device, vk_sbuf->memory, 0, VK_WHOLE_SIZE, 0, &vmap));
+
+	char *map = (char *)vmap;
+
+	// upload data
+	const char *pdata = info->data;
+	memcpy(map, pdata, info->stride * info->size.height);
+
+	info->copies0 = (VkBufferImageCopy) {
+		.imageExtent.width = info->size.width,
+		.imageExtent.height = info->size.height,
+		.imageExtent.depth = 1,
+		.imageOffset.x = 0,
+		.imageOffset.y = 0,
+		.imageOffset.z = 0,
+		.bufferOffset = 0,
+		.bufferRowLength = info->size.width,
+		.bufferImageHeight = info->size.height,
+		.imageSubresource.mipLevel = 0,
+		.imageSubresource.baseArrayLayer = 0,
+		.imageSubresource.layerCount = 1,
+		.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
+	};
 
-			VK_CHECK_RESULT_LOOP(vkGetPhysicalDeviceImageFormatProperties2(s->physicalDevice, &imgFmtInfo, &imgFmtProps))
+	vkUnmapMemory(s->device, vk_sbuf->memory);
 
-			VkExternalMemoryFeatureFlags extMemFeatures =
-				extImgFmtProps.externalMemoryProperties.externalMemoryFeatures;
-			if (!(extMemFeatures & VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT)) {
-				continue;
-			}
-
-			VkExtent3D max_extent = imgFmtProps.imageFormatProperties.maxExtent;
-			f_info->infosf_info->modifierCount++ = (struct vulkan_modifier_info){
-				.props = props,
-				.max_extent = { .width = max_extent.width, .height = max_extent.height },
-			};
-
-		}
-		free(modPropsList.pDrmFormatModifierProperties);
-	}
 	return 0;
 }
 
-static void destroyFormatInfo(struct vulkan_base *s)
-{
-	for (uint32_t i = 0; i < s->formatInfoCount; i++) {
-		free(s->formatInfosi.infos);
-	}
-	free(s->formatInfos);
-	s->formatInfos = NULL;
-	s->formatInfoCount = 0;
-}
-
 int vulkan_read_pixels(struct vulkan_base *s, struct vulkan_read_pixels_info *info, struct vulkan_buffer *vk_buf)
 {
 	VkImageSubresource img_sub_res = {
@@ -353,13 +286,13 @@
 
 	const char *d = (const char *)v + img_sub_layout.offset;
 	unsigned char *p = (unsigned char *)info->data + info->offset;
-	uint32_t bytes_per_pixel = 16;
 	uint32_t pack_stride = img_sub_layout.rowPitch;
+	spa_log_trace_fp(s->log, "Read pixels: %p to %p, stride: %d, width %d, height %d, offset %d, pack_stride %d", d, p, info->stride, info->size.width, info->size.height, info->offset, pack_stride);
 	if (pack_stride == info->stride) {
 		memcpy(p, d, info->stride * info->size.height);
 	} else {
 		for (uint32_t i = 0; i < info->size.height; i++) {
-			memcpy(p + i * info->stride, d + i * pack_stride, info->size.width * bytes_per_pixel);
+			memcpy(p + i * info->stride, d + i * pack_stride, info->size.width * info->bytes_per_pixel);
 		}
 	}
 	vkUnmapMemory(s->device, vk_buf->memory);
@@ -368,56 +301,27 @@
 
 int vulkan_sync_foreign_dmabuf(struct vulkan_base *s, struct vulkan_buffer *vk_buf)
 {
-	VULKAN_INSTANCE_FUNCTION(vkImportSemaphoreFdKHR);
-
 	if (!s->implicit_sync_interop) {
-		struct pollfd pollfd = {
-			.fd = vk_buf->fd,
-			.events = POLLIN,
-		};
-		int timeout_ms = 1000;
-		int ret = poll(&pollfd, 1, timeout_ms);
-		if (ret < 0) {
-			spa_log_error(s->log, "Failed to wait for DMA-BUF fence");
-			return -1;
-		} else if (ret == 0) {
-			spa_log_error(s->log, "Timed out waiting for DMA-BUF fence");
-			return -1;
-		}
-		return 0;
+		return vulkan_buffer_wait_dmabuf_fence(s, vk_buf);
 	}
 
-	int sync_file_fd = dmabuf_export_sync_file(s->log, vk_buf->fd, DMA_BUF_SYNC_READ);
-	if (sync_file_fd < 0) {
-		spa_log_error(s->log, "Failed to extract for DMA-BUF fence");
-		return -1;
-	}
-
-	if (vk_buf->foreign_semaphore == VK_NULL_HANDLE) {
-		VkSemaphoreCreateInfo semaphore_info = {
-			.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO,
-		};
-		VK_CHECK_RESULT_WITH_CLEANUP(vkCreateSemaphore(s->device, &semaphore_info, NULL, &vk_buf->foreign_semaphore), close(sync_file_fd));
-	}
-
-	VkImportSemaphoreFdInfoKHR import_info = {
-		.sType = VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR,
-		.handleType = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT,
-		.flags = VK_SEMAPHORE_IMPORT_TEMPORARY_BIT_KHR,
-		.semaphore = vk_buf->foreign_semaphore,
-		.fd = sync_file_fd,
-	};
-	VK_CHECK_RESULT_WITH_CLEANUP(vkImportSemaphoreFdKHR(s->device, &import_info), close(sync_file_fd));
-
-	return 0;
+	return vulkan_buffer_import_implicit_syncfd(s, vk_buf);
 }
 
 bool vulkan_sync_export_dmabuf(struct vulkan_base *s, struct vulkan_buffer *vk_buf, int sync_file_fd)
 {
-	if (!s->implicit_sync_interop)
-		return false;
+	return vulkan_buffer_set_implicit_syncfd(s, vk_buf, sync_file_fd);
+}
 
-	return dmabuf_import_sync_file(s->log, vk_buf->fd, DMA_BUF_SYNC_WRITE, sync_file_fd);
+int vulkan_fence_create(struct vulkan_base *s, VkFence *fence)
+{
+	VkFenceCreateInfo createInfo = {
+		.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO,
+		.flags = 0,
+	};
+	VK_CHECK_RESULT(vkCreateFence(s->device, &createInfo, NULL, fence));
+
+	return 0;
 }
 
 int vulkan_commandPool_create(struct vulkan_base *s, VkCommandPool *commandPool)
@@ -465,18 +369,18 @@
 	return -1;
 }
 
-struct vulkan_format_info *vulkan_formatInfo_find(struct vulkan_base *s, VkFormat format)
+struct vulkan_format_info *vulkan_formatInfo_find(struct vulkan_format_infos *fmtInfo, VkFormat format)
 {
-	for (uint32_t i = 0; i < s->formatInfoCount; i++) {
-		if (s->formatInfosi.vk_format == format)
-			return &s->formatInfosi;
+	for (uint32_t i = 0; i < fmtInfo->formatCount; i++) {
+		if (fmtInfo->infosi.vk_format == format)
+			return &fmtInfo->infosi;
 	}
 	return NULL;
 }
 
-struct vulkan_modifier_info *vulkan_modifierInfo_find(struct vulkan_base *s, VkFormat format, uint64_t mod)
+struct vulkan_modifier_info *vulkan_modifierInfo_find(struct vulkan_format_infos *fmtInfo, VkFormat format, uint64_t mod)
 {
-	struct vulkan_format_info *f_info = vulkan_formatInfo_find(s, format);
+	struct vulkan_format_info *f_info = vulkan_formatInfo_find(fmtInfo, format);
 	if (!f_info)
 		return NULL;
 	for (uint32_t i = 0; i < f_info->modifierCount; i++) {
@@ -486,6 +390,73 @@
 	return NULL;
 }
 
+int vulkan_buffer_get_implicit_syncfd(struct vulkan_base *s, struct vulkan_buffer *vk_buf)
+{
+	if (!s->implicit_sync_interop)
+		return -1;
+
+	return dmabuf_export_sync_file(s->log, vk_buf->fd, DMA_BUF_SYNC_READ);
+}
+
+bool vulkan_buffer_set_implicit_syncfd(struct vulkan_base *s, struct vulkan_buffer *vk_buf, int sync_file_fd)
+{
+	if (!s->implicit_sync_interop)
+		return false;
+
+	return dmabuf_import_sync_file(s->log, vk_buf->fd, DMA_BUF_SYNC_WRITE, sync_file_fd);
+}
+
+int vulkan_buffer_import_implicit_syncfd(struct vulkan_base *s, struct vulkan_buffer *vk_buf)
+{
+	int sync_file_fd = vulkan_buffer_get_implicit_syncfd(s, vk_buf);
+	if (sync_file_fd < 0) {
+		spa_log_error(s->log, "Failed to extract for DMA-BUF fence");
+		return -1;
+	}
+	return vulkan_buffer_import_syncfd(s, vk_buf, sync_file_fd);
+}
+
+int vulkan_buffer_wait_dmabuf_fence(struct vulkan_base *s, struct vulkan_buffer *vk_buf)
+{
+	struct pollfd pollfd = {
+		.fd = vk_buf->fd,
+		.events = POLLIN,
+	};
+	int timeout_ms = 1000;
+	int ret = poll(&pollfd, 1, timeout_ms);
+	if (ret < 0) {
+		spa_log_error(s->log, "Failed to wait for DMA-BUF fence");
+		return -1;
+	} else if (ret == 0) {
+		spa_log_error(s->log, "Timed out waiting for DMA-BUF fence");
+		return -1;
+	}
+	return 0;
+}
+
+int vulkan_buffer_import_syncfd(struct vulkan_base *s, struct vulkan_buffer *vk_buf, int sync_file_fd)
+{
+	VULKAN_INSTANCE_FUNCTION(vkImportSemaphoreFdKHR);
+
+	if (vk_buf->foreign_semaphore == VK_NULL_HANDLE) {
+		VkSemaphoreCreateInfo semaphore_info = {
+			.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO,
+		};
+		VK_CHECK_RESULT_WITH_CLEANUP(vkCreateSemaphore(s->device, &semaphore_info, NULL, &vk_buf->foreign_semaphore), close(sync_file_fd));
+	}
+
+	VkImportSemaphoreFdInfoKHR import_info = {
+		.sType = VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR,
+		.handleType = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT,
+		.flags = VK_SEMAPHORE_IMPORT_TEMPORARY_BIT_KHR,
+		.semaphore = vk_buf->foreign_semaphore,
+		.fd = sync_file_fd,
+	};
+	VK_CHECK_RESULT_WITH_CLEANUP(vkImportSemaphoreFdKHR(s->device, &import_info), close(sync_file_fd));
+
+	return 0;
+}
+
 void vulkan_buffer_clear(struct vulkan_base *s, struct vulkan_buffer *buffer)
 {
 	if (buffer->fd != -1)
@@ -506,6 +477,40 @@
 	}
 }
 
+int vulkan_staging_buffer_create(struct vulkan_base *s, uint32_t size, struct vulkan_staging_buffer *s_buf) {
+	VkBufferCreateInfo buf_info = {
+		.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
+		.size = size,
+		.usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT |
+			VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
+		.sharingMode = VK_SHARING_MODE_EXCLUSIVE,
+	};
+	VK_CHECK_RESULT(vkCreateBuffer(s->device, &buf_info, NULL, &s_buf->buffer));
+
+	VkMemoryRequirements memoryRequirements;
+	vkGetBufferMemoryRequirements(s->device, s_buf->buffer, &memoryRequirements);
+
+	VkMemoryAllocateInfo mem_info = {
+		.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
+		.allocationSize = memoryRequirements.size,
+		.memoryTypeIndex = vulkan_memoryType_find(s,
+					  memoryRequirements.memoryTypeBits,
+					  VK_MEMORY_PROPERTY_HOST_COHERENT_BIT |
+					  VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT),
+	};
+	VK_CHECK_RESULT(vkAllocateMemory(s->device, &mem_info, NULL, &s_buf->memory));
+	VK_CHECK_RESULT(vkBindBufferMemory(s->device, s_buf->buffer, s_buf->memory, 0));
+
+	return 0;
+}
+
+void vulkan_staging_buffer_destroy(struct vulkan_base *s, struct vulkan_staging_buffer *s_buf) {
+	if (s_buf->buffer == VK_NULL_HANDLE)
+		return;
+	vkFreeMemory(s->device, s_buf->memory, NULL);
+	vkDestroyBuffer(s->device, s_buf->buffer, NULL);
+}
+
 static int allocate_dmabuf(struct vulkan_base *s, VkFormat format, uint32_t modifierCount, uint64_t *modifiers, VkImageUsageFlags usage, struct spa_rectangle *size, struct vulkan_buffer *vk_buf)
 {
 	VkImageDrmFormatModifierListCreateInfoEXT imageDrmFormatModifierListCreateInfo = {
@@ -566,6 +571,19 @@
 	return 0;
 }
 
+int vulkan_validate_dmabuf_properties(const struct vulkan_modifier_info *modInfo, uint32_t *planeCount, struct spa_rectangle *dim)
+{
+	if (planeCount) {
+		if (*planeCount != modInfo->props.drmFormatModifierPlaneCount)
+			return -1;
+	}
+	if (dim) {
+		if (dim->width > modInfo->max_extent.width || dim->height > modInfo->max_extent.height)
+			return -1;
+	}
+	return 0;
+}
+
 int vulkan_fixate_modifier(struct vulkan_base *s, struct dmabuf_fixation_info *info, uint64_t *modifier)
 {
 	VULKAN_INSTANCE_FUNCTION(vkGetImageDrmFormatModifierPropertiesEXT);
@@ -604,11 +622,6 @@
 	int fd = -1;
 	VK_CHECK_RESULT(vkGetMemoryFdKHR(s->device, &getFdInfo, &fd));
 
-	const struct vulkan_modifier_info *modInfo = vulkan_modifierInfo_find(s, info->format, info->modifier);
-
-	if (info->spa_buf->n_datas != modInfo->props.drmFormatModifierPlaneCount)
-		return -1;
-
 	VkMemoryRequirements memoryRequirements = {0};
 	vkGetImageMemoryRequirements(s->device,
 			vk_buf->image, &memoryRequirements);
@@ -658,18 +671,8 @@
 	if (info->spa_buf->n_datas == 0 || info->spa_buf->n_datas > DMABUF_MAX_PLANES)
 		return -1;
 
-	struct vulkan_modifier_info *modProps = vulkan_modifierInfo_find(s, info->format, info->modifier);
-	if (!modProps)
-		return -1;
-
 	uint32_t planeCount = info->spa_buf->n_datas;
 
-	if (planeCount != modProps->props.drmFormatModifierPlaneCount)
-		return -1;
-
-	if (info->size.width > modProps->max_extent.width || info->size.height > modProps->max_extent.height)
-		return -1;
-
 	VkSubresourceLayout planeLayoutsDMABUF_MAX_PLANES = {0};
 	for (uint32_t i = 0; i < planeCount; i++) {
 		planeLayoutsi.offset = info->spa_buf->datasi.chunk->offset;
@@ -817,17 +820,6 @@
 	return 0;
 }
 
-int vulkan_stream_init(struct vulkan_stream *stream, enum spa_direction direction,
-		struct spa_dict *props)
-{
-	spa_zero(*stream);
-	stream->direction = direction;
-	stream->current_buffer_id = SPA_ID_INVALID;
-	stream->busy_buffer_id = SPA_ID_INVALID;
-	stream->ready_buffer_id = SPA_ID_INVALID;
-	return 0;
-}
-
 uint32_t vulkan_vkformat_to_id(VkFormat format)
 {
 	SPA_FOR_EACH_ELEMENT_VAR(vk_video_format_convs, f) {
@@ -865,13 +857,132 @@
 	return 0;
 }
 
+int vulkan_format_infos_init(struct vulkan_base *s, uint32_t formatCount, uint32_t *formats,
+		struct vulkan_format_infos *info)
+{
+	if (info->infos)
+		return 0;
+
+
+	info->infos = calloc(formatCount, sizeof(struct vulkan_format_info));
+	if (!info->infos)
+		return -ENOMEM;
+
+	uint32_t i;
+	for (i = 0; i < formatCount; i++) {
+		VkFormat format = vulkan_id_to_vkformat(formatsi);
+		if (format == VK_FORMAT_UNDEFINED)
+			continue;
+		struct vulkan_format_info *f_info = &info->infosinfo->formatCount++;
+		f_info->spa_format = formatsi;
+		f_info->vk_format = format;
+		spa_log_info(s->log, "Adding format %d (spa_format %d)", format, formatsi);
+
+		VkDrmFormatModifierPropertiesListEXT modPropsList = {
+			.sType = VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_LIST_EXT,
+		};
+		VkFormatProperties2 fmtProps = {
+			.sType = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2,
+			.pNext = &modPropsList,
+		};
+		vkGetPhysicalDeviceFormatProperties2(s->physicalDevice, format, &fmtProps);
+
+		if (modPropsList.drmFormatModifierCount == 0) {
+			spa_log_info(s->log, "Format has no modifiers");
+			continue;
+		}
+
+		modPropsList.pDrmFormatModifierProperties = calloc(modPropsList.drmFormatModifierCount,
+				sizeof(modPropsList.pDrmFormatModifierProperties0));
+		if (!modPropsList.pDrmFormatModifierProperties) {
+			spa_log_info(s->log, "Failed to allocate DrmFormatModifierProperties");
+			continue;
+		}
+		vkGetPhysicalDeviceFormatProperties2(s->physicalDevice, format, &fmtProps);
+
+		f_info->infos = calloc(modPropsList.drmFormatModifierCount, sizeof(f_info->infos0));
+		if (!f_info->infos) {
+			spa_log_info(s->log, "Failed to allocate modifier infos");
+			free(modPropsList.pDrmFormatModifierProperties);
+			continue;
+		}
+
+		spa_log_info(s->log, "Found %d modifiers", modPropsList.drmFormatModifierCount);
+		for (uint32_t j = 0; j < modPropsList.drmFormatModifierCount; j++) {
+			VkDrmFormatModifierPropertiesEXT props = modPropsList.pDrmFormatModifierPropertiesj;
+
+			if (!(props.drmFormatModifierTilingFeatures & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT))
+				continue;
+
+			if (props.drmFormatModifierPlaneCount > DMABUF_MAX_PLANES)
+				continue;
+
+			VkPhysicalDeviceImageDrmFormatModifierInfoEXT modInfo = {
+				.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT,
+				.drmFormatModifier = props.drmFormatModifier,
+				.sharingMode = VK_SHARING_MODE_EXCLUSIVE,
+			};
+			VkPhysicalDeviceExternalImageFormatInfo extImgFmtInfo = {
+				.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO,
+				.pNext = &modInfo,
+				.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
+			};
+			VkPhysicalDeviceImageFormatInfo2 imgFmtInfo = {
+				.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2,
+				.pNext = &extImgFmtInfo,
+				.type = VK_IMAGE_TYPE_2D,
+				.format = format,
+				.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
+				.tiling = VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT,
+			};
+
+			VkExternalImageFormatProperties extImgFmtProps = {
+				.sType = VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES,
+			};
+			VkImageFormatProperties2 imgFmtProps = {
+				.sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2,
+				.pNext = &extImgFmtProps,
+			};
+
+			VK_CHECK_RESULT_LOOP(vkGetPhysicalDeviceImageFormatProperties2(s->physicalDevice, &imgFmtInfo, &imgFmtProps))
+
+			VkExternalMemoryFeatureFlags extMemFeatures =
+				extImgFmtProps.externalMemoryProperties.externalMemoryFeatures;
+			if (!(extMemFeatures & VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT)) {
+				continue;
+			}
+
+			VkExtent3D max_extent = imgFmtProps.imageFormatProperties.maxExtent;
+			f_info->infosf_info->modifierCount++ = (struct vulkan_modifier_info){
+				.props = props,
+				.max_extent = { .width = max_extent.width, .height = max_extent.height },
+			};
+			spa_log_info(s->log, "Adding modifier %"PRIu64, props.drmFormatModifier);
+
+		}
+		free(modPropsList.pDrmFormatModifierProperties);
+	}
+	for (i = 0; i < info->formatCount; i++) {
+		if (info->infosi.modifierCount > 0)
+			info->formatsWithModifiersCount++;
+	}
+	return 0;
+}
+
+void vulkan_format_infos_deinit(struct vulkan_format_infos *info)
+{
+	for (uint32_t i = 0; i < info->formatCount; i++) {
+		free(info->infosi.infos);
+	}
+	free(info->infos);
+}
+
 int vulkan_base_init(struct vulkan_base *s, struct vulkan_base_info *info)
 {
 	if (!s->initialized) {
 		CHECK(createInstance(s));
 		CHECK(findPhysicalDevice(s));
 		CHECK(createDevice(s, info));
-		CHECK(queryFormatInfo(s, info));
 		s->implicit_sync_interop = dmabuf_check_sync_file_import_export(s->log);
 		s->initialized = true;
 	}
@@ -881,7 +992,6 @@
 void vulkan_base_deinit(struct vulkan_base *s)
 {
 	if (s->initialized) {
-		destroyFormatInfo(s);
 		vkDestroyDevice(s->device, NULL);
 		vkDestroyInstance(s->instance, NULL);
 		s->initialized = false;

pipewire-1.0.1.tar.bz2/spa/plugins/vulkan/vulkan-utils.h -> pipewire-1.2.0.tar.gz/spa/plugins/vulkan/vulkan-utils.h Changed

@@ -46,6 +46,16 @@
 		return _res;								\
 }
 
+struct vulkan_write_pixels_info {
+	struct spa_rectangle size;
+	uint32_t offset;
+	uint32_t stride;
+	uint32_t bytes_per_pixel;
+
+	VkBufferImageCopy *copies;
+	void *data;
+};
+
 struct vulkan_read_pixels_info {
 	struct spa_rectangle size;
 	void *data;
@@ -70,29 +80,37 @@
 	struct spa_buffer *spa_buf;
 };
 
+int vulkan_write_pixels(struct vulkan_base *s, struct vulkan_write_pixels_info *info, struct vulkan_staging_buffer *vk_sbuf);
 int vulkan_read_pixels(struct vulkan_base *s, struct vulkan_read_pixels_info *info, struct vulkan_buffer *vk_buf);
 
 int vulkan_sync_foreign_dmabuf(struct vulkan_base *s, struct vulkan_buffer *vk_buf);
 bool vulkan_sync_export_dmabuf(struct vulkan_base *s, struct vulkan_buffer *vk_buf, int sync_file_fd);
 
+int vulkan_staging_buffer_create(struct vulkan_base *s, uint32_t size, struct vulkan_staging_buffer *s_buf);
+void vulkan_staging_buffer_destroy(struct vulkan_base *s, struct vulkan_staging_buffer *s_buf);
+
+int vulkan_validate_dmabuf_properties(const struct vulkan_modifier_info *modInfo, uint32_t *planeCount, struct spa_rectangle *dim);
 int vulkan_fixate_modifier(struct vulkan_base *s, struct dmabuf_fixation_info *info, uint64_t *modifier);
 int vulkan_create_dmabuf(struct vulkan_base *s, struct external_buffer_info *info, struct vulkan_buffer *vk_buf);
 int vulkan_import_dmabuf(struct vulkan_base *s, struct external_buffer_info *info, struct vulkan_buffer *vk_buf);
 int vulkan_import_memptr(struct vulkan_base *s, struct external_buffer_info *info, struct vulkan_buffer *vk_buf);
 
+int vulkan_fence_create(struct vulkan_base *s, VkFence *fence);
 int vulkan_commandPool_create(struct vulkan_base *s, VkCommandPool *commandPool);
 int vulkan_commandBuffer_create(struct vulkan_base *s, VkCommandPool commandPool, VkCommandBuffer *commandBuffer);
 
 uint32_t vulkan_memoryType_find(struct vulkan_base *s,
 		uint32_t memoryTypeBits, VkMemoryPropertyFlags properties);
-struct vulkan_format_info *vulkan_formatInfo_find(struct vulkan_base *s, VkFormat format);
-struct vulkan_modifier_info *vulkan_modifierInfo_find(struct vulkan_base *s, VkFormat format, uint64_t modifier);
-
+struct vulkan_format_info *vulkan_formatInfo_find(struct vulkan_format_infos *fmtInfo, VkFormat format);
+struct vulkan_modifier_info *vulkan_modifierInfo_find(struct vulkan_format_infos *fmtInfo, VkFormat format, uint64_t modifier);
+
+int vulkan_buffer_get_implicit_syncfd(struct vulkan_base *s, struct vulkan_buffer *vk_buf);
+bool vulkan_buffer_set_implicit_syncfd(struct vulkan_base *s, struct vulkan_buffer *vk_buf, int sync_file_fd);
+int vulkan_buffer_import_implicit_syncfd(struct vulkan_base *s, struct vulkan_buffer *vk_buf);
+int vulkan_buffer_wait_dmabuf_fence(struct vulkan_base *s, struct vulkan_buffer *vk_buf);
+int vulkan_buffer_import_syncfd(struct vulkan_base *s, struct vulkan_buffer *vk_buf, int sync_file_fd);
 void vulkan_buffer_clear(struct vulkan_base *s, struct vulkan_buffer *buffer);
 
-int vulkan_stream_init(struct vulkan_stream *stream, enum spa_direction direction,
-		struct spa_dict *props);
-
 uint32_t vulkan_vkformat_to_id(VkFormat vkFormat);
 VkFormat vulkan_id_to_vkformat(uint32_t id);
 
@@ -101,5 +119,8 @@
 int vulkan_wait_fence(struct vulkan_base *s, VkFence fence);
 int vulkan_wait_idle(struct vulkan_base *s);
 
+int vulkan_format_infos_init(struct vulkan_base *s, uint32_t formatCount, uint32_t *formats,
+		struct vulkan_format_infos *info);
+void vulkan_format_infos_deinit(struct vulkan_format_infos *info);
 int vulkan_base_init(struct vulkan_base *s, struct vulkan_base_info *info);
 void vulkan_base_deinit(struct vulkan_base *s);

pipewire-1.0.1.tar.bz2/spa/tools/meson.build -> pipewire-1.2.0.tar.gz/spa/tools/meson.build Changed

pipewire-1.0.1.tar.bz2/spa/tools/spa-json-dump.c -> pipewire-1.2.0.tar.gz/spa/tools/spa-json-dump.c Changed

@@ -14,6 +14,7 @@
 
 #include <spa/utils/result.h>
 #include <spa/utils/json.h>
+#include <spa/debug/file.h>
 
 static void encode_string(FILE *f, const char *val, int len)
 {
@@ -54,22 +55,33 @@
 static int dump(FILE *file, int indent, struct spa_json *it, const char *value, int len)
 {
 	struct spa_json sub;
-	int count = 0;
+	bool toplevel = false;
+	int count = 0, res;
 	char key1024;
 
+	if (!value) {
+		toplevel = true;
+		value = "{";
+		len = 1;
+	}
+
 	if (spa_json_is_array(value, len)) {
 		fprintf(file, "");
 		spa_json_enter(it, &sub);
 		while ((len = spa_json_next(&sub, &value)) > 0) {
 			fprintf(file, "%s\n%*s", count++ > 0 ? "," : "",
 					indent+2, "");
-			dump(file, indent+2, &sub, value, len);
+			if ((res = dump(file, indent+2, &sub, value, len)) < 0)
+				return res;
 		}
 		fprintf(file, "%s%*s", count > 0 ? "\n" : "",
 				count > 0 ? indent : 0, "");
 	} else if (spa_json_is_object(value, len)) {
 		fprintf(file, "{");
-		spa_json_enter(it, &sub);
+		if (!toplevel)
+			spa_json_enter(it, &sub);
+		else
+			sub = *it;
 		while (spa_json_get_string(&sub, key, sizeof(key)) > 0) {
 			fprintf(file, "%s\n%*s",
 					count++ > 0 ? "," : "",
@@ -78,8 +90,15 @@
 			fprintf(file, ": ");
 			if ((len = spa_json_next(&sub, &value)) <= 0)
 				break;
-			dump(file, indent+2, &sub, value, len);
+			res = dump(file, indent+2, &sub, value, len);
+			if (res < 0) {
+				if (toplevel)
+					*it = sub;
+				return res;
+			}
 		}
+		if (toplevel)
+			*it = sub;
 		fprintf(file, "%s%*s}", count > 0 ? "\n" : "",
 				count > 0 ? indent : 0, "");
 	} else if (spa_json_is_string(value, len) ||
@@ -91,21 +110,98 @@
 	} else {
 		encode_string(file, value, len);
 	}
+
+	if (spa_json_get_error(it, NULL, NULL))
+		return -EINVAL;
+
+	return 0;
+}
+
+static int process_json(const char *filename, void *buf, size_t size)
+{
+	int len, res;
+	struct spa_json it;
+	const char *value;
+
+	spa_json_init(&it, buf, size);
+	if ((len = spa_json_next(&it, &value)) <= 0) {
+                fprintf(stderr, "not a valid file '%s': %s\n", filename, spa_strerror(len));
+		return -EINVAL;
+	}
+	if (!spa_json_is_container(value, len)) {
+		spa_json_init(&it, buf, size);
+		value = NULL;
+		len = 0;
+	}
+	res = dump(stdout, 0, &it, value, len);
+	if (spa_json_next(&it, &value) < 0)
+		res = -EINVAL;
+
+	fprintf(stdout, "\n");
+	fflush(stdout);
+
+	if (res < 0) {
+		struct spa_error_location loc;
+
+		if (spa_json_get_error(&it, buf, &loc))
+			spa_debug_file_error_location(stderr, &loc,
+					"syntax error in file '%s': %s",
+					filename, loc.reason);
+		else
+			fprintf(stderr, "error parsing file '%s': %s\n", filename, spa_strerror(res));
+
+		return -EINVAL;
+	}
 	return 0;
 }
 
+static int process_stdin(void)
+{
+	uint8_t *buf = NULL, *p;
+	size_t alloc = 0, size = 0, read_size, res;
+	int err;
+
+	do {
+		alloc += 1024 + alloc;
+		p = realloc(buf, alloc);
+		if (!p) {
+			fprintf(stderr, "error: %m\n");
+			goto error;
+		}
+		buf = p;
+
+		read_size = alloc - size;
+		res = fread(buf + size, 1, read_size, stdin);
+		size += res;
+	} while (res == read_size);
+
+	if (ferror(stdin)) {
+		fprintf(stderr, "error: %m\n");
+		goto error;
+	}
+
+	err = process_json("-", buf, size);
+	free(buf);
+
+	return (err == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+
+error:
+	free(buf);
+	return EXIT_FAILURE;
+}
+
 int main(int argc, char *argv)
 {
-	int fd, len, res, exit_code = EXIT_FAILURE;
+	int fd, res, exit_code = EXIT_FAILURE;
 	void *data;
 	struct stat sbuf;
-	struct spa_json it;
-	const char *value;
 
-	if (argc < 2) {
-		fprintf(stderr, "usage: %s <spa-json-file>\n", argv0);
+	if (argc < 1) {
+		fprintf(stderr, "usage: %s spa-json-file\n", argv0);
 		goto error;
 	}
+	if (argc == 1)
+		return process_stdin();
 	if ((fd = open(argv1,  O_CLOEXEC | O_RDONLY)) < 0)  {
                 fprintf(stderr, "error opening file '%s': %m\n", argv1);
 		goto error;
@@ -119,24 +215,12 @@
                 goto error_close;
 	}
 
-	spa_json_init(&it, data, sbuf.st_size);
-	if ((len = spa_json_next(&it, &value)) <= 0) {
-                fprintf(stderr, "not a valid file '%s': %s\n", argv1, spa_strerror(len));
-		goto error_unmap;
-	}
-	if (!spa_json_is_container(value, len)) {
-		spa_json_init(&it, data, sbuf.st_size);
-		value = "{";
-		len = 1;
-	}
-	if ((res = dump(stdout, 0, &it, value, len)) < 0) {
-                fprintf(stderr, "error parsing file '%s': %s\n", argv1, spa_strerror(res));
-		goto error_unmap;
-	}
-	fprintf(stdout, "\n");
-	exit_code = EXIT_SUCCESS;
+	res = process_json(argv1, data, sbuf.st_size);
+	if (res < 0)
+		exit_code = EXIT_FAILURE;
+	else
+		exit_code = EXIT_SUCCESS;
 
-error_unmap:
         munmap(data, sbuf.st_size);
 error_close:
         close(fd);

pipewire-1.0.1.tar.bz2/src/daemon/client-rt.conf.avail/meson.build -> pipewire-1.2.0.tar.gz/src/daemon/client-rt.conf.avail/meson.build Changed

pipewire-1.0.1.tar.bz2/src/daemon/client-rt.conf.in -> pipewire-1.2.0.tar.gz/src/daemon/client-rt.conf.in Changed

pipewire-1.0.1.tar.bz2/src/daemon/client.conf.avail/meson.build -> pipewire-1.2.0.tar.gz/src/daemon/client.conf.avail/meson.build Changed

pipewire-1.0.1.tar.bz2/src/daemon/filter-chain.conf.in -> pipewire-1.2.0.tar.gz/src/daemon/filter-chain.conf.in Changed

pipewire-1.0.1.tar.bz2/src/daemon/filter-chain/meson.build -> pipewire-1.2.0.tar.gz/src/daemon/filter-chain/meson.build Changed

pipewire-1.0.1.tar.bz2/src/daemon/jack.conf.in -> pipewire-1.2.0.tar.gz/src/daemon/jack.conf.in Changed

pipewire-1.0.1.tar.bz2/src/daemon/meson.build -> pipewire-1.2.0.tar.gz/src/daemon/meson.build Changed

@@ -11,6 +11,8 @@
 conf_config.set('pipewire_pulse_path', pipewire_bindir / 'pipewire-pulse')
 conf_config.set('sm_comment', '#')
 conf_config.set('pulse_comment', '#')
+conf_config.set('rtprio_server', get_option('rtprio-server'))
+conf_config.set('rtprio_client', get_option('rtprio-client'))
 
 conf_config_uninstalled = conf_config
 conf_config_uninstalled.set('pipewire_path',
@@ -78,15 +80,17 @@
 endif
 
 foreach c : conf_files
-  configure_file(input : '@0@.in'.format(c),
+  res = configure_file(input : '@0@.in'.format(c),
                  output : c,
                  configuration : conf_config,
                  install_dir : pipewire_confdatadir)
+  test(f'validate-json-@c@', spa_json_dump_exe, args : res)
 endforeach
 
-configure_file(input : 'pipewire.conf.in',
+res = configure_file(input : 'pipewire.conf.in',
                output : 'pipewire-uninstalled.conf',
                configuration : conf_config_uninstalled)
+test('validate-json-pipewire-uninstalled.conf', spa_json_dump_exe, args : res)
 
 conf_avail_folders = 
   'pipewire.conf.avail',

pipewire-1.0.1.tar.bz2/src/daemon/minimal.conf.in -> pipewire-1.2.0.tar.gz/src/daemon/minimal.conf.in Changed

@@ -32,6 +32,7 @@
     #default.clock.min-quantum   = 32
     #default.clock.max-quantum   = 2048
     #default.clock.quantum-limit = 8192
+    #default.clock.quantum-floor = 4
     #default.video.width         = 640
     #default.video.height        = 480
     #default.video.rate.num      = 25
@@ -39,13 +40,26 @@
     #
     settings.check-quantum      = true
     settings.check-rate         = true
-    #
-    # These overrides are only applied when running in a vm.
-    vm.overrides = {
-        default.clock.min-quantum = 1024
-    }
+
+    # This config can use udev or hardcoded ALSA devices. Make sure to
+    # change the alsa device below when disabling udev
+    minimal.use-udev = true
+
+    # Load the pulseaudio emulation daemon
+    minimal.use-pulse = true
 }
 
+context.properties.rules = 
+    {   matches =  { cpu.vm.name = !null } 
+        actions = {
+            update-props = {
+                # These overrides are only applied when running in a vm.
+                default.clock.min-quantum = 1024
+	    }
+        }
+    }
+
+
 context.spa-libs = {
     #<factory-name regex> = <library-name>
     #
@@ -54,6 +68,7 @@
     # that factory.
     #
     audio.convert.* = audioconvert/libspa-audioconvert
+    audio.adapt     = audioconvert/libspa-audioconvert
     api.alsa.*      = alsa/libspa-alsa
     support.*       = support/libspa-support
 }
@@ -76,7 +91,7 @@
     { name = libpipewire-module-rt
         args = {
             nice.level   = -11
-            #rt.prio      = 88
+            rt.prio      = @rtprio_server@
             #rt.time.soft = -1
             #rt.time.hard = -1
         }
@@ -99,6 +114,8 @@
     # context of the PipeWire server.
     { name = libpipewire-module-spa-node-factory }
 
+    { name = libpipewire-module-spa-device-factory }
+
     # Allows creating nodes that run in the context of the
     # client. Is used by all clients that want to provide
     # data to PipeWire.
@@ -132,8 +149,23 @@
 
     # Makes a factory for creating links between ports.
     { name = libpipewire-module-link-factory }
+
+    { name = libpipewire-module-protocol-pulse
+      condition =  { minimal.use-pulse = true } 
+    }
 
 
+pulse.properties = {
+    # the addresses this server listens on
+    server.address = 
+        "unix:native"
+    
+}
+
+stream.properties = {
+    adapter.auto-port-config = { mode = dsp }
+}
+
 context.objects = 
     #{ factory = <factory-name>
     #    ( args  = { <key> = <value> ... } )
@@ -179,9 +211,46 @@
             priority.driver = 19000
             node.group      = pipewire.freewheel
             node.freewheel  = true
+            #freewheel.wait = 10
         }
     }
 
+    # This creates a ALSA udev device that will enumerate all
+    # ALSA devices. Because it is using ACP and has the auto-profile
+    # property set, this will enable a profile and create associated
+    # nodes, which will be automatically configured to their best
+    # configuration with the auto-port-config settings.
+    # Extra node and device params can be given with node.param and
+    # device.param prefixes.
+    { factory = spa-device-factory
+        args = {
+            factory.name           = api.alsa.enum.udev
+            alsa.use-acp = true
+            device.object.properties = {
+                api.acp.auto-profile = true
+                api.acp.auto-port = true
+                device.object.properties = {
+                    node.adapter             = audio.adapt
+                    resample.disable         = false
+                    adapter.auto-port-config = {
+                        mode = dsp
+                        monitor = false
+                        control = false
+                        position = preserve   # unknown, aux
+                    }
+                    #node.param.Props    = {
+                    #    channelVolumes =  0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.6 
+                    #}
+                }
+                #device.param.Profile    = {
+                #    #idx = 0
+                #    name = pro-audio
+                #}
+            }
+        }
+        condition =  { minimal.use-udev = true } 
+    }
+
     # This creates a single PCM source device for the given
     # alsa device path hw:0. You can change source to sink
     # to make a sink in the same way.
@@ -191,7 +260,7 @@
             node.name              = "system"
             node.description       = "system"
             media.class            = "Audio/Source"
-            api.alsa.path          = "hw:0"
+            api.alsa.path          = "hw:4"
             #api.alsa.period-size   = 0
             #api.alsa.period-num    = 0
             #api.alsa.headroom      = 0
@@ -221,7 +290,7 @@
             #channelmix.rear-delay  = 12.0
             #channelmix.stereo-widen = 0.0
             #channelmix.hilbert-taps = 0
-            channelmix.disable     = true
+            #channelmix.disable     = false
             #dither.noise = 0
             #node.param.Props      = {
             #    params = 
@@ -246,7 +315,11 @@
             #        position =  FL FR RL RR 
             #    }
             #}
+            #node.param.Props    = {
+            #    channelVolumes =  0.5 0.4 0.3 0.5 
+            #}
         }
+        condition =  { minimal.use-udev = false } 
     }
     { factory = adapter
         args = {
@@ -254,7 +327,7 @@
             node.name              = "system"
             node.description       = "system"
             media.class            = "Audio/Sink"
-            api.alsa.path          = "hw:0"
+            api.alsa.path          = "hw:4"
             #api.alsa.period-size   = 0
             #api.alsa.period-num    = 0
             #api.alsa.headroom      = 0
@@ -283,7 +356,7 @@
             #channelmix.rear-delay = 12.0
             #channelmix.stereo-widen = 0.0
             #channelmix.hilbert-taps = 0
-            channelmix.disable     = true
+            #channelmix.disable     = false
             #dither.noise = 0
             #node.param.Props      = {
             #    params = 
@@ -308,7 +381,11 @@
             #        channels = 4
             #    }
             #}
+            #node.param.Props    = {
+            #    channelVolumes =  0.5 0.4 0.3 0.5 
+            #}
         }
+        condition =  { minimal.use-udev = false } 
     }
     # This creates a new Source node. It will have input ports
     # that you can link, to provide audio for this source.
@@ -319,6 +396,7 @@
     #        node.description = "Microphone"
     #        media.class      = "Audio/Source/Virtual"
     #        audio.position   = "FL,FR"
+    #        monitor.passthrough = true
     #        adapter.auto-port-config = {
     #            mode = dsp
     #            monitor = true
@@ -348,7 +426,7 @@
 
 context.exec = 
     #{   path = <program-name>
-    #    ( args = "<arguments>" )
+    #    ( args = "<arguments>" |  <arg1> <arg2> ...  )
     #    ( condition =  { <key> = <value> ... } ...  )
     #}
     #
@@ -361,3 +439,38 @@
     #
     #@pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
 
+
+node.rules = 
+    {   matches = 
+            {
+                # all keys must match the value. ! negates. ~ starts regex.
+                #alsa.card_name = "ICUSBAUDIO7D"
+                #api.alsa.pcm.stream = "playback"
+            }
+        
+        actions = {
+            update-props = {
+                #node.name = "alsa_playback.ICUSBAUDIO7D"
+            }
+        }
+    }
+
+device.rules = 
+    {   matches = 
+            {
+                #alsa.card_name = "ICUSBAUDIO7D"
+            }
+        
+        actions = {
+            update-props = {
+                #device.name = "alsa_card.ICUSBAUDIO7D"
+                #api.acp.auto-profile = false
+                #api.acp.auto-port = false
+                #device.param.Profile    = {
+                #    #idx = 0
+                #    name = off
+                #}
+            }
+        }
+    }
+

pipewire-1.0.1.tar.bz2/src/daemon/pipewire-aes67.conf.in -> pipewire-1.2.0.tar.gz/src/daemon/pipewire-aes67.conf.in Changed

@@ -36,9 +36,13 @@
             # This driver should only be used for network nodes marked with group
             priority.driver = 100000
             clock.name      = "clock.system.ptp0"
+            ### Please select the PTP hardware clock here
+            # Interface name is the preferred method of specifying the PHC
+            clock.interface = "eth0"
+            #clock.device    = "/dev/ptp0"
             #clock.id        = tai
-            clock.device    = "/dev/ptp0"
-            #clock.interface = "eth0"
+            # Lower this in case of periodic out-of-sync
+            resync.ms       = 1.5
             object.export   = true
         }
     }
@@ -48,7 +52,7 @@
     { name = libpipewire-module-rt
         args = {
             nice.level   = -11
-            #rt.prio      = 88
+            #rt.prio      = @rtprio_client@
             #rt.time.soft = -1
             #rt.time.hard = -1
         }
@@ -60,11 +64,15 @@
     { name = libpipewire-module-adapter }
     { name = libpipewire-module-rtp-sap
         args = {
+            ### Please select the interface here
             local.ifname = eth0
             sap.ip = 239.255.255.255
             sap.port = 9875
             net.ttl = 32
-            net.loop = true
+            net.loop = false
+            # If you use another PTPv2 daemon supporting management
+            # messages over a UNIX socket, specify its path here
+            ptp.management-socket = "/var/run/ptp4lro"
 
             stream.rules = 
                 {
@@ -78,7 +86,8 @@
                             node.virtual = false
                             media.class = "Audio/Source"
                             device.api = aes67
-                            sess.latency.msec = 10
+                            # You can adjust the latency buffering here. Use integer values only
+                            sess.latency.msec = 3
                             node.group = pipewire.ptp0
                         }
                     }
@@ -98,27 +107,37 @@
     },
     { name = libpipewire-module-rtp-sink
         args = {
+            ### Please select the interface here
             local.ifname = eth0
+            ### If you want to create multiple output streams, please copy the whole
+            ### module-rtp-sink block, but change this multicast IP to another unused
+            ### one keeping 239.69.x.x range unless you know you need another one
             destination.ip = 239.69.150.243
             destination.port = 5004
             net.mtu = 1280
             net.ttl = 32
-            net.loop = true
+            net.loop = false
+            # These should typically be equal
+            # You can customize packet length, but 1 ms should work for every device
+            # Consult receiver documentation to ensure it supports the value you set
             sess.min-ptime = 1
             sess.max-ptime = 1
+            ### Please change this, especially if you create multiple sinks
             sess.name = "PipeWire RTP stream"
             sess.media = "audio"
+            # This property is used if you aren't using ptp4l 4
             sess.ts-refclk = "ptp=traceable"
             sess.ts-offset = 0
-            sess.ptime = 1
-            sess.latency.msec = 1
-            sess.announce = true
+            # You can adjust the latency buffering here. Use integer values only
+            sess.latency.msec = 3
             audio.format = "S24BE"
             audio.rate = 48000
             audio.channels = 2
-            audio.position =  FL FR 
+            # These channel names will be visible both to applications and AES67 receivers
+            node.channel-names = "CH1", "CH2"
 
             stream.props = {
+                ### Please change the sink name, this is necessary when you create multiple sinks
                 node.name = "rtp-sink"
                 media.class = "Audio/Sink"
                 node.virtual = false
@@ -126,6 +145,8 @@
                 sess.sap.announce = true
                 node.always-process = true
                 node.group = pipewire.ptp0
+                rtp.ntp = 0
+                rtp.fetch-ts-refclk = true
             }
         }
     },

pipewire-1.0.1.tar.bz2/src/daemon/pipewire-avb.conf.in -> pipewire-1.2.0.tar.gz/src/daemon/pipewire-avb.conf.in Changed

pipewire-1.0.1.tar.bz2/src/daemon/pipewire-pulse.conf.avail/meson.build -> pipewire-1.2.0.tar.gz/src/daemon/pipewire-pulse.conf.avail/meson.build Changed

pipewire-1.0.1.tar.bz2/src/daemon/pipewire-pulse.conf.in -> pipewire-1.2.0.tar.gz/src/daemon/pipewire-pulse.conf.in Changed

@@ -27,8 +27,7 @@
     { name = libpipewire-module-rt
         args = {
             nice.level   = -11
-            #rt.prio      = 88
-            rt.prio      = 65
+            #rt.prio      = @rtprio_client@
             #rt.time.soft = -1
             #rt.time.hard = -1
             #uclamp.min = 0
@@ -63,6 +62,9 @@
 #      ( flags =  nofail  )
 pulse.cmd = 
     { cmd = "load-module" args = "module-always-sink" flags =   }
+    { cmd = "load-module" args = "module-device-manager" flags =   }
+    { cmd = "load-module" args = "module-device-restore" flags =   }
+    { cmd = "load-module" args = "module-stream-restore" flags =   }
     #{ cmd = "load-module" args = "module-switch-on-connect" }
     #{ cmd = "load-module" args = "module-gsettings" flags =  nofail  }
 
@@ -99,6 +101,7 @@
         #}
     
     #server.dbus-name       = "org.pulseaudio.Server"
+    #pulse.allow-module-loading = true
     #pulse.min.req          = 128/48000     # 2.7ms
     #pulse.default.req      = 960/48000     # 20 milliseconds
     #pulse.min.frag         = 128/48000     # 2.7ms
@@ -108,12 +111,19 @@
     #pulse.idle.timeout     = 0             # don't pause after underruns
     #pulse.default.format   = F32
     #pulse.default.position =  FL FR 
-    # These overrides are only applied when running in a vm.
-    vm.overrides = {
-        pulse.min.quantum = 1024/48000      # 22ms
-    }
 }
 
+pulse.properties.rules = 
+    {   matches =  { cpu.vm.name = !null } 
+        actions = {
+            update-props = {
+            # These overrides are only applied when running in a vm.
+                pulse.min.quantum = 1024/48000      # 22ms
+	    }
+        }
+    }
+
+
 # client/stream specific properties
 pulse.rules = 
     {

pipewire-1.0.1.tar.bz2/src/daemon/pipewire-vulkan.conf.in -> pipewire-1.2.0.tar.gz/src/daemon/pipewire-vulkan.conf.in Changed

@@ -9,8 +9,6 @@
     #library.name.system                   = support/libspa-support
     #context.data-loop.library.name.system = support/libspa-support
     #support.dbus                          = true
-    #link.max-buffers                      = 64
-    #link.max-buffers                       = 16                       # version < 3 clients can't handle more
     #mem.warn-mlock                        = false
     #mem.allow-mlock                       = true
     #mem.mlock-all                         = false
@@ -30,6 +28,7 @@
     #
     api.vulkan.*    = vulkan/libspa-vulkan
     support.*       = support/libspa-support
+    video.convert.* = videoconvert/libspa-videoconvert
 }
 
 context.modules = 
@@ -52,7 +51,7 @@
     { name = libpipewire-module-rt
         args = {
             nice.level    = -11
-            #rt.prio      = 88
+            #rt.prio      = @rtprio_client@
             #rt.time.soft = -1
             #rt.time.hard = -1
         }
@@ -95,4 +94,6 @@
     #{ factory = adapter            args = { factory.name = audiotestsrc node.name = my-test node.description = audiotestsrc } }
     { factory = spa-node-factory   args = { factory.name = api.vulkan.compute.source node.name = vulkan-compute-source object.export = true } }
     { factory = spa-node-factory   args = { factory.name = api.vulkan.compute.filter node.name = vulkan-compute-filter object.export = true } }
+    { factory = spa-node-factory   args = { factory.name = api.vulkan.blit.filter node.name = vulkan-blit-filter object.export = true } }
+    { factory = spa-node-factory   args = { factory.name = api.vulkan.blit.dsp-filter node.name = vulkan-blit-dsp-filter object.export = true } }

pipewire-1.0.1.tar.bz2/src/daemon/pipewire.c -> pipewire-1.2.0.tar.gz/src/daemon/pipewire.c Changed

@@ -9,6 +9,9 @@
 #include <locale.h>
 
 #include <spa/utils/result.h>
+#include <spa/utils/cleanup.h>
+#include <spa/debug/file.h>
+
 #include <pipewire/pipewire.h>
 
 #include <pipewire/i18n.h>
@@ -25,8 +28,10 @@
 {
 	fprintf(stdout, _("%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"),
+		"  -c, --config                          Load config (Default %s)\n"
+		"  -P  --properties                      Set context properties\n"),
 		name,
 		config_name);
 }
@@ -41,13 +46,15 @@
 		{ "version",	no_argument,		NULL, 'V' },
 		{ "config",	required_argument,	NULL, 'c' },
 		{ "verbose",	no_argument,		NULL, 'v' },
+		{ "properties",	required_argument,	NULL, 'P' },
 
 		{ NULL, 0, NULL, 0}
 	};
 	int c, res = 0;
 	char pathPATH_MAX;
 	const char *config_name;
-	enum spa_log_level level = pw_log_level;
+	enum spa_log_level level;
+	struct spa_error_location loc;
 
 	if (setenv("PIPEWIRE_INTERNAL", "1", 1) < 0)
 		fprintf(stderr, "can't set PIPEWIRE_INTERNAL env: %m");
@@ -58,7 +65,13 @@
 	setlocale(LC_ALL, "");
 	pw_init(&argc, &argv);
 
-	while ((c = getopt_long(argc, argv, "hVc:v", long_options, NULL)) != -1) {
+	level = pw_log_level;
+
+	properties = pw_properties_new(
+				PW_KEY_CONFIG_NAME, config_name,
+				NULL);
+
+	while ((c = getopt_long(argc, argv, "hVc:vP:", long_options, NULL)) != -1) {
 		switch (c) {
 		case 'v':
 			if (level < SPA_LOG_LEVEL_TRACE)
@@ -77,17 +90,24 @@
 			return 0;
 		case 'c':
 			config_name = optarg;
+			pw_properties_set(properties, PW_KEY_CONFIG_NAME, config_name);
 			break;
+
+		case 'P':
+			if (pw_properties_update_string_checked(properties, optarg, strlen(optarg), &loc) < 0) {
+				spa_debug_file_error_location(stderr, &loc,
+						"error: syntax error in --properties: %s",
+						loc.reason);
+				goto done;
+			}
+			break;
+
 		default:
 			res = -EINVAL;
 			goto done;
 		}
 	}
 
-	properties = pw_properties_new(
-				PW_KEY_CONFIG_NAME, config_name,
-				NULL);
-
 	loop = pw_main_loop_new(&properties->dict);
 	if (loop == NULL) {
 		pw_log_error("failed to create main-loop: %m");
@@ -98,8 +118,7 @@
 	pw_loop_add_signal(pw_main_loop_get_loop(loop), SIGINT, do_quit, loop);
 	pw_loop_add_signal(pw_main_loop_get_loop(loop), SIGTERM, do_quit, loop);
 
-	context = pw_context_new(pw_main_loop_get_loop(loop), properties, 0);
-	properties = NULL;
+	context = pw_context_new(pw_main_loop_get_loop(loop), spa_steal_ptr(properties), 0);
 
 	if (context == NULL) {
 		pw_log_error("failed to create context: %m");

pipewire-1.0.1.tar.bz2/src/daemon/pipewire.conf.avail/meson.build -> pipewire-1.2.0.tar.gz/src/daemon/pipewire.conf.avail/meson.build Changed

pipewire-1.0.1.tar.bz2/src/daemon/pipewire.conf.in -> pipewire-1.2.0.tar.gz/src/daemon/pipewire.conf.in Changed

@@ -22,6 +22,20 @@
     #log.level                             = 2
     #cpu.zero.denormals                    = false
 
+    #loop.rt-prio = -1            # -1 = use module-rt prio, 0 disable rt
+    #loop.class = data.rt
+    #thread.affinity =  0 1     # optional array of CPUs
+    #context.num-data-loops = 1   # -1 = num-cpus, 0 = no data loops
+    #
+    #context.data-loops = 
+    #    {   loop.rt-prio = -1
+    #        loop.class =  data.rt audio.rt 
+    #        #library.name.system = support/libspa-support
+    #        thread.name = data-loop.0
+    #        #thread.affinity =  0 1     # optional array of CPUs
+    #    }
+    #
+
     core.daemon = true              # listening for socket connections
     core.name   = pipewire-0        # core name and socket name
 
@@ -32,6 +46,7 @@
     #default.clock.min-quantum   = 32
     #default.clock.max-quantum   = 2048
     #default.clock.quantum-limit = 8192
+    #default.clock.quantum-floor = 4
     #default.video.width         = 640
     #default.video.height        = 480
     #default.video.rate.num      = 25
@@ -39,11 +54,6 @@
     #
     #settings.check-quantum      = false
     #settings.check-rate         = false
-    #
-    # These overrides are only applied when running in a vm.
-    vm.overrides = {
-        default.clock.min-quantum = 1024
-    }
 
     # keys checked below to disable module loading
     module.x11.bell = true
@@ -54,6 +64,17 @@
     module.jackdbus-detect = true
 }
 
+context.properties.rules = 
+    {   matches =  { cpu.vm.name = !null } 
+        actions = {
+            update-props = {
+                # These overrides are only applied when running in a vm.
+                default.clock.min-quantum = 1024
+	    }
+        }
+    }
+
+
 context.spa-libs = {
     #<factory-name regex> = <library-name>
     #
@@ -70,6 +91,7 @@
     api.vulkan.*    = vulkan/libspa-vulkan
     api.jack.*      = jack/libspa-jack
     support.*       = support/libspa-support
+    video.convert.* = videoconvert/libspa-videoconvert
     #videotestsrc   = videotestsrc/libspa-videotestsrc
     #audiotestsrc   = audiotestsrc/libspa-audiotestsrc
 }
@@ -95,7 +117,7 @@
     { name = libpipewire-module-rt
         args = {
             nice.level    = -11
-            #rt.prio      = 88
+            rt.prio       = @rtprio_server@
             #rt.time.soft = -1
             #rt.time.hard = -1
             #uclamp.min = 0
@@ -172,7 +194,7 @@
     # Use libcanberra to play X11 Bell
     { name = libpipewire-module-x11-bell
         args = {
-            #sink.name = "@DEFAULT_SINK@"
+            #sink.name = "\@DEFAULT_SINK\@"
             #sample.name = "bell-window-system"
             #x11.display = null
             #x11.xauthority = null
@@ -231,6 +253,7 @@
             factory.name    = support.node.driver
             node.name       = Dummy-Driver
             node.group      = pipewire.dummy
+            node.sync-group  = sync.dummy
             priority.driver = 20000
             #clock.id       = monotonic # realtime | tai | monotonic-raw | boottime
             #clock.name     = "clock.system.monotonic"
@@ -242,7 +265,9 @@
             node.name       = Freewheel-Driver
             priority.driver = 19000
             node.group      = pipewire.freewheel
+            node.sync-group  = sync.dummy
             node.freewheel  = true
+            #freewheel.wait = 10
         }
     }
 
@@ -255,6 +280,7 @@
     #        node.description = "Microphone"
     #        media.class      = "Audio/Source/Virtual"
     #        audio.position   = "FL,FR"
+    #        monitor.passthrough = true
     #    }
     #}
 
@@ -293,7 +319,7 @@
 
 context.exec = 
     #{   path = <program-name>
-    #    ( args = "<arguments>" )
+    #    ( args = "<arguments>" |  <arg1> <arg2> ...  )
     #    ( condition =  { <key> = <value> ... } ...  )
     #}
     #
@@ -313,6 +339,6 @@
     # It can be interesting to start another daemon here that listens
     # on another address with the -a option (eg. -a tcp:4713).
     #
-    @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf"
+    @pulse_comment@{ path = "@pipewire_path@" args =  "-c" "pipewire-pulse.conf" 
     @pulse_comment@  condition =  { exec.pipewire-pulse = null } { exec.pipewire-pulse = true }  }

pipewire-1.0.1.tar.bz2/src/examples/audio-capture.c -> pipewire-1.2.0.tar.gz/src/examples/audio-capture.c Changed

pipewire-1.0.1.tar.bz2/src/examples/audio-dsp-src.c -> pipewire-1.2.0.tar.gz/src/examples/audio-dsp-src.c Changed

pipewire-1.0.1.tar.bz2/src/examples/audio-src.c -> pipewire-1.2.0.tar.gz/src/examples/audio-src.c Changed

@@ -17,17 +17,17 @@
 
 #include <pipewire/pipewire.h>
 
-#define M_PI_M2 ( M_PI + M_PI )
+#define M_PI_M2f (float)(M_PI+M_PI)
 
 #define DEFAULT_RATE		44100
 #define DEFAULT_CHANNELS	2
-#define DEFAULT_VOLUME		0.7
+#define DEFAULT_VOLUME		0.7f
 
 struct data {
 	struct pw_main_loop *loop;
 	struct pw_stream *stream;
 
-	double accumulator;
+	float accumulator;
 };
 
 static void fill_f32(struct data *d, void *dest, int n_frames)
@@ -36,11 +36,11 @@
 	int i, c;
 
         for (i = 0; i < n_frames; i++) {
-                d->accumulator += M_PI_M2 * 440 / DEFAULT_RATE;
-                if (d->accumulator >= M_PI_M2)
-                        d->accumulator -= M_PI_M2;
+                d->accumulator += M_PI_M2f * 440 / DEFAULT_RATE;
+                if (d->accumulator >= M_PI_M2f)
+                        d->accumulator -= M_PI_M2f;
 
-                val = sin(d->accumulator) * DEFAULT_VOLUME;
+                val = sinf(d->accumulator) * DEFAULT_VOLUME;
                 for (c = 0; c < DEFAULT_CHANNELS; c++)
                         *dst++ = val;
         }
@@ -73,7 +73,9 @@
 		return;
 
 	stride = sizeof(float) * DEFAULT_CHANNELS;
-	n_frames = SPA_MIN(b->requested, buf->datas0.maxsize / stride);
+	n_frames = buf->datas0.maxsize / stride;
+	if (b->requested)
+		n_frames = SPA_MIN((int)b->requested, n_frames);
 
 	fill_f32(data, p, n_frames);

pipewire-1.0.1.tar.bz2/src/examples/bluez-session.c -> pipewire-1.2.0.tar.gz/src/examples/bluez-session.c Changed

pipewire-1.0.1.tar.bz2/src/examples/export-sink.c -> pipewire-1.2.0.tar.gz/src/examples/export-sink.c Changed

@@ -29,7 +29,7 @@
 
 #include "sdl.h"
 
-#define M_PI_M2 ( M_PI + M_PI )
+#define M_PI_M2f (float)(M_PI+M_PI)
 
 #define MAX_BUFFERS	64
 
@@ -65,7 +65,7 @@
 	struct spa_io_buffers *io;
 	struct spa_io_sequence *io_notify;
 	uint32_t io_notify_size;
-	double param_accum;
+	float param_accum;
 
 	uint8_t buffer1024;
 
@@ -106,13 +106,13 @@
 	spa_pod_builder_control(&b, 0, SPA_CONTROL_Properties);
 	spa_pod_builder_push_object(&b, &f1, SPA_TYPE_OBJECT_Props, 0);
 	spa_pod_builder_prop(&b, SPA_PROP_contrast, 0);
-	spa_pod_builder_float(&b, (sin(data->param_accum) * 127.0) + 127.0);
+	spa_pod_builder_float(&b, (sinf(data->param_accum) * 127.0f) + 127.0f);
 	spa_pod_builder_pop(&b, &f1);
 	spa_pod_builder_pop(&b, &f0);
 
-        data->param_accum += M_PI_M2 / 30.0;
-        if (data->param_accum >= M_PI_M2)
-                data->param_accum -= M_PI_M2;
+        data->param_accum += M_PI_M2f / 30.0f;
+        if (data->param_accum >= M_PI_M2f)
+                data->param_accum -= M_PI_M2f;
 }
 
 static int impl_send_command(void *object, const struct spa_command *command)
@@ -369,9 +369,9 @@
 
 	if (buf->datas0.type == SPA_DATA_MemFd ||
 	    buf->datas0.type == SPA_DATA_DmaBuf) {
-		map = mmap(NULL, buf->datas0.maxsize + buf->datas0.mapoffset, PROT_READ,
-			   MAP_PRIVATE, buf->datas0.fd, 0);
-		sdata = SPA_PTROFF(map, buf->datas0.mapoffset, uint8_t);
+		map = mmap(NULL, buf->datas0.maxsize, PROT_READ,
+			   MAP_PRIVATE, buf->datas0.fd, buf->datas0.mapoffset);
+		sdata = map;
 	} else if (buf->datas0.type == SPA_DATA_MemPtr) {
 		map = NULL;
 		sdata = buf->datas0.data;
@@ -413,7 +413,7 @@
 	SDL_RenderPresent(d->renderer);
 
 	if (map)
-		munmap(map, buf->datas0.maxsize + buf->datas0.mapoffset);
+		munmap(map, buf->datas0.maxsize);
 
 	return 0;
 }

pipewire-1.0.1.tar.bz2/src/examples/export-source.c -> pipewire-1.2.0.tar.gz/src/examples/export-source.c Changed

@@ -23,7 +23,7 @@
 
 #include <pipewire/pipewire.h>
 
-#define M_PI_M2 ( M_PI + M_PI )
+#define M_PI_M2f (float)(M_PI + M_PI)
 
 #define BUFFER_SAMPLES	128
 #define MAX_BUFFERS	32
@@ -64,8 +64,8 @@
 	uint32_t n_buffers;
 	struct spa_list empty;
 
-	double accumulator;
-	double volume_accum;
+	float accumulator;
+	float volume_accum;
 };
 
 static void update_volume(struct data *data)
@@ -81,13 +81,13 @@
 	spa_pod_builder_control(&b, 0, SPA_CONTROL_Properties);
 	spa_pod_builder_push_object(&b, &f1, SPA_TYPE_OBJECT_Props, 0);
 	spa_pod_builder_prop(&b, SPA_PROP_volume, 0);
-	spa_pod_builder_float(&b, (sin(data->volume_accum) / 2.0) + 0.5);
+	spa_pod_builder_float(&b, (sinf(data->volume_accum) / 2.0f) + 0.5f);
 	spa_pod_builder_pop(&b, &f1);
 	spa_pod_builder_pop(&b, &f0);
 
-        data->volume_accum += M_PI_M2 / 1000.0;
-        if (data->volume_accum >= M_PI_M2)
-                data->volume_accum -= M_PI_M2;
+        data->volume_accum += M_PI_M2f / 1000.0f;
+        if (data->volume_accum >= M_PI_M2f)
+                data->volume_accum -= M_PI_M2f;
 }
 
 static int impl_send_command(void *object, const struct spa_command *command)
@@ -319,14 +319,13 @@
 		}
 		else if (datas0.type == SPA_DATA_MemFd ||
 			 datas0.type == SPA_DATA_DmaBuf) {
-			b->ptr = mmap(NULL, datas0.maxsize + datas0.mapoffset, PROT_WRITE,
-				      MAP_SHARED, datas0.fd, 0);
+			b->ptr = mmap(NULL, datas0.maxsize, PROT_WRITE,
+				      MAP_SHARED, datas0.fd, datas0.mapoffset);
 			if (b->ptr == MAP_FAILED) {
 				pw_log_error("failed to buffer mem");
 				return -errno;
 
 			}
-			b->ptr = SPA_PTROFF(b->ptr, datas0.mapoffset, void);
 			b->mapped = true;
 		}
 		else {
@@ -365,11 +364,11 @@
         for (i = 0; i < n_samples; i++) {
 		float val;
 
-                d->accumulator += M_PI_M2 * 440 / d->format.rate;
-                if (d->accumulator >= M_PI_M2)
-                        d->accumulator -= M_PI_M2;
+                d->accumulator += M_PI_M2f * 440 / d->format.rate;
+                if (d->accumulator >= M_PI_M2f)
+                        d->accumulator -= M_PI_M2f;
 
-                val = sin(d->accumulator);
+                val = sinf(d->accumulator);
 
                 for (c = 0; c < d->format.channels; c++)
                         *dst++ = val;
@@ -386,11 +385,11 @@
         for (i = 0; i < n_samples; i++) {
                 int16_t val;
 
-                d->accumulator += M_PI_M2 * 440 / d->format.rate;
-                if (d->accumulator >= M_PI_M2)
-                        d->accumulator -= M_PI_M2;
+                d->accumulator += M_PI_M2f * 440 / d->format.rate;
+                if (d->accumulator >= M_PI_M2f)
+                        d->accumulator -= M_PI_M2f;
 
-                val = (int16_t) (sin(d->accumulator) * 32767.0);
+                val = (int16_t) (sinf(d->accumulator) * 32767.0f);
 
                 for (c = 0; c < d->format.channels; c++)
                         *dst++ = val;

pipewire-1.0.1.tar.bz2/src/examples/local-v4l2.c -> pipewire-1.2.0.tar.gz/src/examples/local-v4l2.c Changed

pipewire-1.0.1.tar.bz2/src/examples/meson.build -> pipewire-1.2.0.tar.gz/src/examples/meson.build Changed

pipewire-1.2.0.tar.gz/src/examples/midi-src.c Added

@@ -0,0 +1,264 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2024 Pauli Virtanen */
+/* SPDX-License-Identifier: MIT */
+
+/*
+ title
+ MIDI source using \ref pw_filter "pw_filter".
+ title
+ */
+
+#include <stdio.h>
+#include <errno.h>
+#include <math.h>
+#include <signal.h>
+#include <getopt.h>
+
+#include <pipewire/pipewire.h>
+#include <pipewire/filter.h>
+
+#include <spa/pod/builder.h>
+#include <spa/control/control.h>
+
+
+#define PERIOD_NSEC	(SPA_NSEC_PER_SEC/8)
+
+struct port {
+};
+
+struct data {
+	struct pw_main_loop *loop;
+	struct pw_filter *filter;
+	struct port *port;
+	uint32_t clock_id;
+	int64_t offset;
+	uint64_t position;
+};
+
+static void on_process(void *userdata, struct spa_io_position *position)
+{
+	struct data *data = userdata;
+	struct port *port = data->port;
+	struct pw_buffer *buf;
+	struct spa_data *d;
+	struct spa_pod_builder builder;
+	struct spa_pod_frame frame;
+	uint64_t sample_offset, sample_period, sample_position, cycle;
+
+	/*
+	 * Use the clock sample position.
+	 *
+	 * If the playback switches to using a different clock, we reset
+	 * playback as the sample position can then be discontinuous.
+	 */
+	if (data->clock_id != position->clock.id) {
+		pw_log_info("switch to clock %u", position->clock.id);
+		data->offset = position->clock.position - data->position;
+		data->clock_id = position->clock.id;
+	}
+
+	sample_position = position->clock.position - data->offset;
+	data->position = sample_position + position->clock.duration;
+
+	/*
+	 * Produce note on/off every `PERIOD_NSEC` nanoseconds (rounded down to
+	 * samples, for simplicity).
+	 *
+	 * We want to place the notes on the playback timeline, so we use sample
+	 * positions (not real time!).
+	 */
+
+	sample_period = PERIOD_NSEC * position->clock.rate.denom
+		/ position->clock.rate.num / SPA_NSEC_PER_SEC;
+
+	cycle = sample_position / sample_period;
+	if (sample_position % sample_period != 0)
+		++cycle;
+
+	sample_offset = cycle*sample_period - sample_position;
+
+	if (sample_offset >= position->clock.duration)
+		return;  /* don't need to produce anything yet */
+
+	/* Get output buffer */
+	if ((buf = pw_filter_dequeue_buffer(port)) == NULL)
+		return;
+
+	/* Midi buffers always have exactly one data block */
+	spa_assert(buf->buffer->n_datas == 1);
+
+	d = &buf->buffer->datas0;
+	d->chunk->offset = 0;
+	d->chunk->size = 0;
+	d->chunk->stride = 1;
+	d->chunk->flags = 0;
+
+	/*
+	 * MIDI buffers contain a SPA POD with a sequence of
+	 * control messages and their raw MIDI data.
+	 */
+	spa_pod_builder_init(&builder, d->data, d->maxsize);
+	spa_pod_builder_push_sequence(&builder, &frame, 0);
+
+	while (sample_offset < position->clock.duration) {
+		if (cycle % 2 == 0) {
+			/* MIDI note on, channel 0, middle C, max velocity */
+			uint8_t buf = { 0x90, 0x3c, 0x7f };
+
+			/* The time position of the message in the graph cycle
+			 * is given as offset from the cycle start, in
+			 * samples. The cycle has duration of `clock.duration`
+			 * samples, and the sample offset should satisfy
+			 * 0 <= sample_offset < position->clock.duration.
+			 */
+			spa_pod_builder_control(&builder, sample_offset, SPA_CONTROL_Midi);
+
+			/* Raw MIDI data for the message */
+			spa_pod_builder_bytes(&builder, buf, sizeof(buf));
+
+			pw_log_info("note on at %"PRIu64, sample_position + sample_offset);
+		} else {
+			/* MIDI note off, channel 0, middle C, max velocity */
+			uint8_t buf = { 0x80, 0x3c, 0x7f };
+
+			spa_pod_builder_control(&builder, sample_offset, SPA_CONTROL_Midi);
+			spa_pod_builder_bytes(&builder, buf, sizeof(buf));
+
+			pw_log_info("note off at %"PRIu64, sample_position + sample_offset);
+		}
+
+		sample_offset += sample_period;
+		++cycle;
+	}
+
+	/*
+	 * Finish the sequence and queue buffer to output.
+	 */
+        spa_pod_builder_pop(&builder, &frame);
+        d->chunk->size = builder.state.offset;
+
+	pw_log_trace("produced %u/%u bytes", d->chunk->size, d->maxsize);
+
+	pw_filter_queue_buffer(port, buf);
+}
+
+static void state_changed(void *userdata, enum pw_filter_state old,
+		enum pw_filter_state state, const char *error)
+{
+	struct data *data = userdata;
+
+	switch (state) {
+	case PW_FILTER_STATE_STREAMING:
+		/* reset playback position */
+		pw_log_info("start playback");
+		data->clock_id = SPA_ID_INVALID;
+		data->offset = 0;
+		data->position = 0;
+		break;
+	default:
+		break;
+	}
+}
+
+static const struct pw_filter_events filter_events = {
+	PW_VERSION_FILTER_EVENTS,
+	.process = on_process,
+	.state_changed = state_changed,
+};
+
+static void do_quit(void *userdata, int signal_number)
+{
+	struct data *data = userdata;
+	pw_main_loop_quit(data->loop);
+}
+
+int main(int argc, char *argv)
+{
+	struct data data = {};
+	uint8_t buffer1024;
+	struct spa_pod_builder builder;
+	struct spa_pod *params1;
+
+	pw_init(&argc, &argv);
+
+	/* make a main loop. If you already have another main loop, you can add
+	 * the fd of this pipewire mainloop to it. */
+	data.loop = pw_main_loop_new(NULL);
+
+	pw_loop_add_signal(pw_main_loop_get_loop(data.loop), SIGINT, do_quit, &data);
+	pw_loop_add_signal(pw_main_loop_get_loop(data.loop), SIGTERM, do_quit, &data);
+
+	/* Create a simple filter, the simple filter manages the core and remote
+	 * objects for you if you don't need to deal with them.
+	 *
+	 * Pass your events and a user_data pointer as the last arguments. This
+	 * will inform you about the filter state. The most important event
+	 * you need to listen to is the process event where you need to process
+	 * the data.
+	 */
+	data.filter = pw_filter_new_simple(
+			pw_main_loop_get_loop(data.loop),
+			"midi-src",
+			pw_properties_new(
+				PW_KEY_MEDIA_TYPE, "Midi",
+				PW_KEY_MEDIA_CATEGORY, "Playback",
+				PW_KEY_MEDIA_CLASS, "Midi/Source",
+				NULL),
+			&filter_events,
+			&data);
+
+	/* Make a midi output port */
+	data.port = pw_filter_add_port(data.filter,
+			PW_DIRECTION_OUTPUT,
+			PW_FILTER_PORT_FLAG_MAP_BUFFERS,
+			sizeof(struct port),
+			pw_properties_new(
+				PW_KEY_FORMAT_DSP, "8 bit raw midi",
+				PW_KEY_PORT_NAME, "output",
+				NULL),
+			NULL, 0);
+
+	/* Update SPA_PARAM_Buffers to request a specific sizes and counts.
+	 * This is not mandatory: if you skip this, you'll get default sized
+	 * buffers, usually 4k or 32k bytes or so.
+	 *
+	 * We'll here ask for 4096 bytes as that's enough.
+	 */
+	spa_pod_builder_init(&builder, buffer, sizeof(buffer));
+
+	params0 = spa_pod_builder_add_object(&builder,
+			/* POD Object for the buffer parameter */
+			SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
+			/* Default 1 buffer, minimum of 1, max of 32 buffers.
+			 * We can do with 1 buffer as we dequeue and queue in the same
+			 * cycle.
+			 */
+			SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(1, 1, 32),
+			/* MIDI buffers always have 1 data block */
+			SPA_PARAM_BUFFERS_blocks,  SPA_POD_Int(1),
+			/* Buffer size: request default 4096 bytes, min 4096, no maximum */
+			SPA_PARAM_BUFFERS_size,    SPA_POD_CHOICE_RANGE_Int(4096, 4096, INT32_MAX),
+			/* MIDI buffers have stride 1 */
+			SPA_PARAM_BUFFERS_stride,  SPA_POD_Int(1));
+
+	pw_filter_update_params(data.filter, data.port,
+			(const struct spa_pod **)params, SPA_N_ELEMENTS(params));
+
+	/* Now connect this filter. We ask that our process function is
+	 * called in a realtime thread. */
+	if (pw_filter_connect(data.filter,
+				PW_FILTER_FLAG_RT_PROCESS,
+				NULL, 0) < 0) {
+		fprintf(stderr, "can't connect\n");
+		return -1;
+	}
+
+	/* and wait while we let things run */
+	pw_main_loop_run(data.loop);
+
+	pw_filter_destroy(data.filter);
+	pw_main_loop_destroy(data.loop);
+	pw_deinit();
+
+	return 0;
+}

pipewire-1.0.1.tar.bz2/src/examples/video-dsp-play.c -> pipewire-1.2.0.tar.gz/src/examples/video-dsp-play.c Changed

pipewire-1.2.0.tar.gz/src/examples/video-dsp-src.c Added

@@ -0,0 +1,374 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
+/* SPDX-FileCopyrightText: Copyright © 2023 Columbarius */
+/* SPDX-License-Identifier: MIT */
+
+/*
+ title
+ Video source using \ref pw_stream.
+ title
+ */
+
+#include <stdio.h>
+#include <errno.h>
+#include <signal.h>
+#include <math.h>
+
+#include <spa/param/video/format-utils.h>
+#include <spa/param/tag-utils.h>
+#include <spa/debug/pod.h>
+
+#include <pipewire/pipewire.h>
+
+#define BPP		16
+#define CURSOR_WIDTH	64
+#define CURSOR_HEIGHT	64
+#define CURSOR_BPP	4
+
+#define MAX_BUFFERS	64
+
+#define M_PI_M2 ( M_PI + M_PI )
+
+struct pixel {
+	float r, g, b, a;
+};
+
+struct data {
+	struct pw_main_loop *loop;
+	struct spa_source *timer;
+
+	struct pw_context *context;
+	struct pw_core *core;
+
+	struct pw_stream *stream;
+	struct spa_hook stream_listener;
+
+	struct spa_video_info_dsp format;
+	int32_t stride;
+	struct spa_io_position *position;
+
+	int counter;
+	uint32_t seq;
+
+	double crop;
+	double accumulator;
+	int res;
+};
+
+static void draw_elipse(uint32_t *dst, int width, int height, uint32_t color)
+{
+	int i, j, r1, r2, r12, r22, r122;
+
+	r1 = width/2;
+	r12 = r1 * r1;
+	r2 = height/2;
+	r22 = r2 * r2;
+	r122 = r12 * r22;
+
+	for (i = -r2; i < r2; i++) {
+		for (j = -r1; j < r1; j++) {
+			dst(i + r2)*width+(j+r1) =
+				(i * i * r12 + j * j * r22 <= r122) ? color : 0x00000000;
+		}
+	}
+}
+
+static inline float map_value(int value)
+{
+	return (value%256)/255.0f;
+}
+
+static void on_process(void *userdata)
+{
+	struct data *data = userdata;
+	struct pw_buffer *b;
+	struct spa_buffer *buf;
+	uint32_t i, j;
+	uint8_t *p;
+	struct pixel *px;
+	struct spa_meta *m;
+	struct spa_meta_header *h;
+	struct spa_meta_region *mc;
+	struct spa_meta_cursor *mcs;
+
+	if ((b = pw_stream_dequeue_buffer(data->stream)) == NULL) {
+		pw_log_warn("out of buffers: %m");
+		return;
+	}
+
+	buf = b->buffer;
+	if ((p = buf->datas0.data) == NULL)
+		return;
+
+	if ((h = spa_buffer_find_meta_data(buf, SPA_META_Header, sizeof(*h)))) {
+#if 0
+		h->pts = pw_stream_get_nsec(data->stream);
+#else
+		h->pts = -1;
+#endif
+		h->flags = 0;
+		h->seq = data->seq++;
+		h->dts_offset = 0;
+	}
+	if ((m = spa_buffer_find_meta(buf, SPA_META_VideoDamage))) {
+		struct spa_meta_region *r = spa_meta_first(m);
+
+		if (spa_meta_check(r, m)) {
+			r->region.position = SPA_POINT(0,0);
+			r->region.size = data->position->video.size;
+			r++;
+		}
+		if (spa_meta_check(r, m))
+			r->region = SPA_REGION(0,0,0,0);
+	}
+	if ((mc = spa_buffer_find_meta_data(buf, SPA_META_VideoCrop, sizeof(*mc)))) {
+		data->crop = (sin(data->accumulator) + 1.0) * 32.0;
+		mc->region.position.x = (int32_t)data->crop;
+		mc->region.position.y = (int32_t)data->crop;
+		mc->region.size.width = data->position->video.size.width - (int32_t)(data->crop*2);
+		mc->region.size.height = data->position->video.size.height - (int32_t)(data->crop*2);
+	}
+	if ((mcs = spa_buffer_find_meta_data(buf, SPA_META_Cursor, sizeof(*mcs)))) {
+		struct spa_meta_bitmap *mb;
+		uint32_t *bitmap, color;
+
+		mcs->id = 1;
+		mcs->position.x = (int32_t)((sin(data->accumulator) + 1.0) * 160.0 + 80);
+		mcs->position.y = (int32_t)((cos(data->accumulator) + 1.0) * 100.0 + 50);
+		mcs->hotspot.x = 0;
+		mcs->hotspot.y = 0;
+		mcs->bitmap_offset = sizeof(struct spa_meta_cursor);
+
+		mb = SPA_PTROFF(mcs, mcs->bitmap_offset, struct spa_meta_bitmap);
+		mb->format = SPA_VIDEO_FORMAT_ARGB;
+		mb->size.width = CURSOR_WIDTH;
+		mb->size.height = CURSOR_HEIGHT;
+		mb->stride = CURSOR_WIDTH * CURSOR_BPP;
+		mb->offset = sizeof(struct spa_meta_bitmap);
+
+		bitmap = SPA_PTROFF(mb, mb->offset, uint32_t);
+		color = (uint32_t)((cos(data->accumulator) + 1.0) * (1 << 23));
+		color |= 0xff000000;
+
+		draw_elipse(bitmap, mb->size.width, mb->size.height, color);
+	}
+
+	for (i = 0; i < data->position->video.size.height; i++) {
+		px = (struct pixel *)p;
+		for (j = 0; j < data->position->video.size.width; j++) {
+			pxj = (struct pixel){map_value(data->counter + j * i), map_value(data->counter + j * (i + 1)), map_value(data->counter + j * (i + 2)),  1.0f};
+		}
+		p += data->stride;
+		data->counter += 13;
+	}
+
+	data->accumulator += M_PI_M2 / 50.0;
+	if (data->accumulator >= M_PI_M2)
+		data->accumulator -= M_PI_M2;
+
+	buf->datas0.chunk->offset = 0;
+	buf->datas0.chunk->size = data->position->video.size.height * data->stride;
+	buf->datas0.chunk->stride = data->stride;
+
+	pw_stream_queue_buffer(data->stream, b);
+}
+
+static void on_timeout(void *userdata, uint64_t expirations)
+{
+	struct data *data = userdata;
+	pw_log_trace("timeout");
+	pw_stream_trigger_process(data->stream);
+}
+
+static void on_stream_state_changed(void *_data, enum pw_stream_state old, enum pw_stream_state state,
+				    const char *error)
+{
+	struct data *data = _data;
+
+	printf("stream state: \"%s\"\n", pw_stream_state_as_string(state));
+
+	switch (state) {
+	case PW_STREAM_STATE_ERROR:
+	case PW_STREAM_STATE_UNCONNECTED:
+		pw_main_loop_quit(data->loop);
+		break;
+
+	case PW_STREAM_STATE_PAUSED:
+		printf("node id: %d\n", pw_stream_get_node_id(data->stream));
+		pw_loop_update_timer(pw_main_loop_get_loop(data->loop),
+				data->timer, NULL, NULL, false);
+		break;
+	case PW_STREAM_STATE_STREAMING:
+	{
+		struct timespec timeout, interval;
+
+		timeout.tv_sec = 0;
+		timeout.tv_nsec = 1;
+		interval.tv_sec = 0;
+		interval.tv_nsec = 40 * SPA_NSEC_PER_MSEC;
+
+		pw_loop_update_timer(pw_main_loop_get_loop(data->loop),
+				data->timer, &timeout, &interval, false);
+		break;
+	}
+	default:
+		break;
+	}
+}
+
+static void
+on_stream_io_changed(void *_data, uint32_t id, void *area, uint32_t size)
+{
+	struct data *data = _data;
+
+	switch (id) {
+	case SPA_IO_Position:
+		data->position = area;
+		if (data->position)
+			pw_log_info("Position: %ux%u", data->position->video.size.width, data->position->video.size.height);
+		break;
+	}
+}
+
+static void
+on_stream_param_changed(void *_data, uint32_t id, const struct spa_pod *param)
+{
+	struct data *data = _data;
+	struct pw_stream *stream = data->stream;
+	uint8_t params_buffer1024;
+	struct spa_pod_builder b = SPA_POD_BUILDER_INIT(params_buffer, sizeof(params_buffer));
+	const struct spa_pod *params5;
+
+	if (param != NULL && id == SPA_PARAM_Tag) {
+		spa_debug_pod(0, NULL, param);
+		return;
+	}
+	if (param == NULL || id != SPA_PARAM_Format)
+		return;
+
+	spa_format_video_dsp_parse(param, &data->format);
+
+	data->stride = SPA_ROUND_UP_N(data->position->video.size.width * BPP, 4);
+
+	params0 = spa_pod_builder_add_object(&b,
+		SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
+		SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(8, 2, MAX_BUFFERS),
+		SPA_PARAM_BUFFERS_blocks,  SPA_POD_Int(1),
+		SPA_PARAM_BUFFERS_size,    SPA_POD_Int(data->stride * data->position->video.size.height),
+		SPA_PARAM_BUFFERS_stride,  SPA_POD_Int(data->stride));
+
+	params1 = spa_pod_builder_add_object(&b,
+		SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
+		SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header),
+		SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header)));
+
+	params2 = spa_pod_builder_add_object(&b,
+		SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
+		SPA_PARAM_META_type, SPA_POD_Id(SPA_META_VideoDamage),
+		SPA_PARAM_META_size, SPA_POD_CHOICE_RANGE_Int(
+					sizeof(struct spa_meta_region) * 16,
+					sizeof(struct spa_meta_region) * 1,
+					sizeof(struct spa_meta_region) * 16));
+	params3 = spa_pod_builder_add_object(&b,
+		SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
+		SPA_PARAM_META_type, SPA_POD_Id(SPA_META_VideoCrop),
+		SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_region)));
+#define CURSOR_META_SIZE(w,h)	(sizeof(struct spa_meta_cursor) + \
+				 sizeof(struct spa_meta_bitmap) + w * h * CURSOR_BPP)
+	params4 = spa_pod_builder_add_object(&b,
+		SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
+		SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Cursor),
+		SPA_PARAM_META_size, SPA_POD_Int(
+			CURSOR_META_SIZE(CURSOR_WIDTH,CURSOR_HEIGHT)));
+
+	pw_stream_update_params(stream, params, 5);
+}
+
+static void
+on_trigger_done(void *_data)
+{
+	pw_log_trace("trigger done");
+}
+
+static const struct pw_stream_events stream_events = {
+	PW_VERSION_STREAM_EVENTS,
+	.process = on_process,
+	.state_changed = on_stream_state_changed,
+	.param_changed = on_stream_param_changed,
+	.io_changed = on_stream_io_changed,
+	.trigger_done = on_trigger_done,
+};
+
+static void do_quit(void *userdata, int signal_number)
+{
+	struct data *data = userdata;
+	pw_main_loop_quit(data->loop);
+}
+
+int main(int argc, char *argv)
+{
+	struct data data = { 0, };
+	const struct spa_pod *params2;
+	uint8_t buffer1024;
+	struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
+
+	pw_init(&argc, &argv);
+
+	data.loop = pw_main_loop_new(NULL);
+
+	pw_loop_add_signal(pw_main_loop_get_loop(data.loop), SIGINT, do_quit, &data);
+	pw_loop_add_signal(pw_main_loop_get_loop(data.loop), SIGTERM, do_quit, &data);
+
+	data.context = pw_context_new(pw_main_loop_get_loop(data.loop), NULL, 0);
+
+	data.timer = pw_loop_add_timer(pw_main_loop_get_loop(data.loop), on_timeout, &data);
+
+	data.core = pw_context_connect(data.context, NULL, 0);
+	if (data.core == NULL) {
+		fprintf(stderr, "can't connect: %m\n");
+		data.res = -errno;
+		goto cleanup;
+	}
+
+	data.stream = pw_stream_new(data.core, "video-src",
+		pw_properties_new(
+			PW_KEY_MEDIA_CLASS, "Video/Source",
+			NULL));
+
+	params0 = spa_pod_builder_add_object(&b,
+		SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
+		SPA_FORMAT_mediaType,       SPA_POD_Id(SPA_MEDIA_TYPE_video),
+		SPA_FORMAT_mediaSubtype,    SPA_POD_Id(SPA_MEDIA_SUBTYPE_dsp),
+		SPA_FORMAT_VIDEO_format,    SPA_POD_Id(SPA_VIDEO_FORMAT_DSP_F32));
+
+	{
+		struct spa_pod_frame f;
+		struct spa_dict_item items1;
+		/* send a tag, output tags travel downstream */
+		spa_tag_build_start(&b, &f, SPA_PARAM_Tag, SPA_DIRECTION_OUTPUT);
+		items0 = SPA_DICT_ITEM_INIT("my-tag-key", "my-special-tag-value");
+		spa_tag_build_add_dict(&b, &SPA_DICT_INIT(items, 1));
+		params1 = spa_tag_build_end(&b, &f);
+	}
+
+	pw_stream_add_listener(data.stream,
+			       &data.stream_listener,
+			       &stream_events,
+			       &data);
+
+	pw_stream_connect(data.stream,
+			  PW_DIRECTION_OUTPUT,
+			  PW_ID_ANY,
+			  PW_STREAM_FLAG_DRIVER |
+			  PW_STREAM_FLAG_MAP_BUFFERS,
+			  params, 2);
+
+	pw_main_loop_run(data.loop);
+
+cleanup:
+	pw_context_destroy(data.context);
+	pw_main_loop_destroy(data.loop);
+	pw_deinit();
+
+	return data.res;
+}

pipewire-1.0.1.tar.bz2/src/examples/video-play-pull.c -> pipewire-1.2.0.tar.gz/src/examples/video-play-pull.c Changed

pipewire-1.0.1.tar.bz2/src/examples/video-play.c -> pipewire-1.2.0.tar.gz/src/examples/video-play.c Changed

@@ -16,6 +16,7 @@
 #include <spa/param/video/format-utils.h>
 #include <spa/param/tag-utils.h>
 #include <spa/param/props.h>
+#include <spa/param/latency-utils.h>
 #include <spa/debug/format.h>
 #include <spa/debug/pod.h>
 
@@ -89,6 +90,7 @@
 	int sstride, dstride, ostride;
 	struct spa_meta_region *mc;
 	struct spa_meta_cursor *mcs;
+	struct spa_meta_header *h;
 	uint32_t i, j;
 	uint8_t *src, *dst;
 	bool render_cursor = false;
@@ -116,6 +118,12 @@
 	if ((sdata = buf->datas0.data) == NULL)
 		goto done;
 
+	if ((h = spa_buffer_find_meta_data(buf, SPA_META_Header, sizeof(*h)))) {
+		uint64_t now = pw_stream_get_nsec(stream);
+		pw_log_debug("now:%"PRIu64" pts:%"PRIu64" diff:%"PRIi64,
+				now, h->pts, now - h->pts);
+	}
+
 	/* get the videocrop metadata if any */
 	if ((mc = spa_buffer_find_meta_data(buf, SPA_META_VideoCrop, sizeof(*mc))) &&
 	    spa_meta_region_is_valid(mc)) {
@@ -197,10 +205,10 @@
 			for (i = 0; i < data->size.height; i++) {
 				struct pixel *p = (struct pixel *) src;
 				for (j = 0; j < data->size.width; j++) {
-					dstj * 4 + 0 = SPA_CLAMP(pj.r * 255.0f, 0, 255);
-					dstj * 4 + 1 = SPA_CLAMP(pj.g * 255.0f, 0, 255);
-					dstj * 4 + 2 = SPA_CLAMP(pj.b * 255.0f, 0, 255);
-					dstj * 4 + 3 = SPA_CLAMP(pj.a * 255.0f, 0, 255);
+					dstj * 4 + 0 = SPA_CLAMP((uint8_t)(pj.r * 255.0f), 0u, 255u);
+					dstj * 4 + 1 = SPA_CLAMP((uint8_t)(pj.g * 255.0f), 0u, 255u);
+					dstj * 4 + 2 = SPA_CLAMP((uint8_t)(pj.b * 255.0f), 0u, 255u);
+					dstj * 4 + 3 = SPA_CLAMP((uint8_t)(pj.a * 255.0f), 0u, 255u);
 				}
 				src += sstride;
 				dst += dstride;
@@ -284,6 +292,12 @@
 		spa_debug_pod(0, NULL, param);
 		return;
 	}
+	if (param != NULL && id == SPA_PARAM_Latency) {
+		struct spa_latency_info info;
+		if (spa_latency_parse(param, &info) >= 0)
+			fprintf(stderr, "got latency: %"PRIu64"\n", (info.min_ns + info.max_ns) / 2);
+		return;
+	}
 	/* NULL means to clear the format */
 	if (param == NULL || id != SPA_PARAM_Format)
 		return;

pipewire-1.0.1.tar.bz2/src/examples/video-src-alloc.c -> pipewire-1.2.0.tar.gz/src/examples/video-src-alloc.c Changed

@@ -90,9 +90,7 @@
 
 	if ((h = spa_buffer_find_meta_data(buf, SPA_META_Header, sizeof(*h)))) {
 #if 0
-		struct timespec now;
-		clock_gettime(CLOCK_MONOTONIC, &now);
-		h->pts = SPA_TIMESPEC_TO_NSEC(&now);
+		h->pts = pw_stream_get_nsec(data->stream));
 #else
 		h->pts = -1;
 #endif
@@ -113,18 +111,18 @@
 	}
 	if ((mc = spa_buffer_find_meta_data(buf, SPA_META_VideoCrop, sizeof(*mc)))) {
 		data->crop = (sin(data->accumulator) + 1.0) * 32.0;
-		mc->region.position.x = data->crop;
-		mc->region.position.y = data->crop;
-		mc->region.size.width = data->format.size.width - data->crop*2;
-		mc->region.size.height = data->format.size.height - data->crop*2;
+		mc->region.position.x = (int32_t)data->crop;
+		mc->region.position.y = (int32_t)data->crop;
+		mc->region.size.width = data->format.size.width - (int32_t)(data->crop*2);
+		mc->region.size.height = data->format.size.height - (int32_t)(data->crop*2);
 	}
 	if ((mcs = spa_buffer_find_meta_data(buf, SPA_META_Cursor, sizeof(*mcs)))) {
 		struct spa_meta_bitmap *mb;
 		uint32_t *bitmap, color;
 
 		mcs->id = 1;
-		mcs->position.x = (sin(data->accumulator) + 1.0) * 160.0 + 80;
-		mcs->position.y = (cos(data->accumulator) + 1.0) * 100.0 + 50;
+		mcs->position.x = (int32_t)((sin(data->accumulator) + 1.0) * 160.0 + 80);
+		mcs->position.y = (int32_t)((cos(data->accumulator) + 1.0) * 100.0 + 50);
 		mcs->hotspot.x = 0;
 		mcs->hotspot.y = 0;
 		mcs->bitmap_offset = sizeof(struct spa_meta_cursor);
@@ -137,7 +135,7 @@
 		mb->offset = sizeof(struct spa_meta_bitmap);
 
 		bitmap = SPA_PTROFF(mb, mb->offset, uint32_t);
-		color = (cos(data->accumulator) + 1.0) * (1 << 23);
+		color = (uint32_t)((cos(data->accumulator) + 1.0) * (1 << 23));
 		color |= 0xff000000;
 
 		draw_elipse(bitmap, mb->size.width, mb->size.height, color);
@@ -225,7 +223,7 @@
 
 	/* create the memfd on the buffer, set the type and flags */
 	d0.type = SPA_DATA_MemFd;
-	d0.flags = SPA_DATA_FLAG_READWRITE;
+	d0.flags = SPA_DATA_FLAG_READWRITE | SPA_DATA_FLAG_MAPPABLE;
 #ifdef HAVE_MEMFD_CREATE
 	d0.fd = memfd_create("video-src-memfd", MFD_CLOEXEC | MFD_ALLOW_SEALING);
 #else

pipewire-1.0.1.tar.bz2/src/examples/video-src-fixate.c -> pipewire-1.2.0.tar.gz/src/examples/video-src-fixate.c Changed

@@ -164,9 +164,7 @@
 
 	if ((h = spa_buffer_find_meta_data(buf, SPA_META_Header, sizeof(*h)))) {
 #if 0
-		struct timespec now;
-		clock_gettime(CLOCK_MONOTONIC, &now);
-		h->pts = SPA_TIMESPEC_TO_NSEC(&now);
+		h->pts = pw_stream_get_nsec(data->stream);
 #else
 		h->pts = -1;
 #endif
@@ -187,18 +185,18 @@
 	}
 	if ((mc = spa_buffer_find_meta_data(buf, SPA_META_VideoCrop, sizeof(*mc)))) {
 		data->crop = (sin(data->accumulator) + 1.0) * 32.0;
-		mc->region.position.x = data->crop;
-		mc->region.position.y = data->crop;
-		mc->region.size.width = data->format.size.width - data->crop*2;
-		mc->region.size.height = data->format.size.height - data->crop*2;
+		mc->region.position.x = (int32_t)data->crop;
+		mc->region.position.y = (int32_t)data->crop;
+		mc->region.size.width = data->format.size.width - (int32_t)(data->crop*2);
+		mc->region.size.height = data->format.size.height - (int32_t)(data->crop*2);
 	}
 	if ((mcs = spa_buffer_find_meta_data(buf, SPA_META_Cursor, sizeof(*mcs)))) {
 		struct spa_meta_bitmap *mb;
 		uint32_t *bitmap, color;
 
 		mcs->id = 1;
-		mcs->position.x = (sin(data->accumulator) + 1.0) * 160.0 + 80;
-		mcs->position.y = (cos(data->accumulator) + 1.0) * 100.0 + 50;
+		mcs->position.x = (int32_t)((sin(data->accumulator) + 1.0) * 160.0 + 80);
+		mcs->position.y = (int32_t)((cos(data->accumulator) + 1.0) * 100.0 + 50);
 		mcs->hotspot.x = 0;
 		mcs->hotspot.y = 0;
 		mcs->bitmap_offset = sizeof(struct spa_meta_cursor);
@@ -211,7 +209,7 @@
 		mb->offset = sizeof(struct spa_meta_bitmap);
 
 		bitmap = SPA_PTROFF(mb, mb->offset, uint32_t);
-		color = (cos(data->accumulator) + 1.0) * (1 << 23);
+		color = (uint32_t)((cos(data->accumulator) + 1.0) * (1 << 23));
 		color |= 0xff000000;
 
 		draw_elipse(bitmap, mb->size.width, mb->size.height, color);
@@ -310,7 +308,7 @@
 	printf("use memfd\n");
 	/* create the memfd on the buffer, set the type and flags */
 	d0.type = SPA_DATA_MemFd;
-	d0.flags = SPA_DATA_FLAG_READWRITE;
+	d0.flags = SPA_DATA_FLAG_READWRITE | SPA_DATA_FLAG_MAPPABLE;
 #ifdef HAVE_MEMFD_CREATE
 	d0.fd = memfd_create("video-src-fixate-memfd", MFD_CLOEXEC | MFD_ALLOW_SEALING);
 #else

pipewire-1.0.1.tar.bz2/src/examples/video-src-reneg.c -> pipewire-1.2.0.tar.gz/src/examples/video-src-reneg.c Changed

@@ -94,9 +94,7 @@
 
 	if ((h = spa_buffer_find_meta_data(buf, SPA_META_Header, sizeof(*h)))) {
 #if 0
-		struct timespec now;
-		clock_gettime(CLOCK_MONOTONIC, &now);
-		h->pts = SPA_TIMESPEC_TO_NSEC(&now);
+		h->pts = pw_stream_get_nsec(data->stream);
 #else
 		h->pts = -1;
 #endif
@@ -117,18 +115,18 @@
 	}
 	if ((mc = spa_buffer_find_meta_data(buf, SPA_META_VideoCrop, sizeof(*mc)))) {
 		data->crop = (sin(data->accumulator) + 1.0) * 32.0;
-		mc->region.position.x = data->crop;
-		mc->region.position.y = data->crop;
-		mc->region.size.width = data->format.size.width - data->crop*2;
-		mc->region.size.height = data->format.size.height - data->crop*2;
+		mc->region.position.x = (int32_t)data->crop;
+		mc->region.position.y = (int32_t)data->crop;
+		mc->region.size.width = data->format.size.width - (int32_t)(data->crop*2);
+		mc->region.size.height = data->format.size.height - (int32_t)(data->crop*2);
 	}
 	if ((mcs = spa_buffer_find_meta_data(buf, SPA_META_Cursor, sizeof(*mcs)))) {
 		struct spa_meta_bitmap *mb;
 		uint32_t *bitmap, color;
 
 		mcs->id = 1;
-		mcs->position.x = (sin(data->accumulator) + 1.0) * 160.0 + 80;
-		mcs->position.y = (cos(data->accumulator) + 1.0) * 100.0 + 50;
+		mcs->position.x = (int32_t)((sin(data->accumulator) + 1.0) * 160.0 + 80);
+		mcs->position.y = (int32_t)((cos(data->accumulator) + 1.0) * 100.0 + 50);
 		mcs->hotspot.x = 0;
 		mcs->hotspot.y = 0;
 		mcs->bitmap_offset = sizeof(struct spa_meta_cursor);
@@ -141,7 +139,7 @@
 		mb->offset = sizeof(struct spa_meta_bitmap);
 
 		bitmap = SPA_PTROFF(mb, mb->offset, uint32_t);
-		color = (cos(data->accumulator) + 1.0) * (1 << 23);
+		color = (uint32_t)((cos(data->accumulator) + 1.0) * (1 << 23));
 		color |= 0xff000000;
 
 		draw_elipse(bitmap, mb->size.width, mb->size.height, color);
@@ -239,7 +237,7 @@
 
 	/* create the memfd on the buffer, set the type and flags */
 	d0.type = SPA_DATA_MemFd;
-	d0.flags = SPA_DATA_FLAG_READWRITE;
+	d0.flags = SPA_DATA_FLAG_READWRITE | SPA_DATA_FLAG_MAPPABLE;
 #ifdef HAVE_MEMFD_CREATE
 	d0.fd = memfd_create("video-src-memfd", MFD_CLOEXEC | MFD_ALLOW_SEALING);
 #else

pipewire-1.0.1.tar.bz2/src/examples/video-src.c -> pipewire-1.2.0.tar.gz/src/examples/video-src.c Changed

@@ -90,9 +90,7 @@
 
 	if ((h = spa_buffer_find_meta_data(buf, SPA_META_Header, sizeof(*h)))) {
 #if 0
-		struct timespec now;
-		clock_gettime(CLOCK_MONOTONIC, &now);
-		h->pts = SPA_TIMESPEC_TO_NSEC(&now);
+		h->pts = pw_stream_get_nsec(data->stream);
 #else
 		h->pts = -1;
 #endif
@@ -113,18 +111,18 @@
 	}
 	if ((mc = spa_buffer_find_meta_data(buf, SPA_META_VideoCrop, sizeof(*mc)))) {
 		data->crop = (sin(data->accumulator) + 1.0) * 32.0;
-		mc->region.position.x = data->crop;
-		mc->region.position.y = data->crop;
-		mc->region.size.width = data->format.size.width - data->crop*2;
-		mc->region.size.height = data->format.size.height - data->crop*2;
+		mc->region.position.x = (int32_t)data->crop;
+		mc->region.position.y = (int32_t)data->crop;
+		mc->region.size.width = data->format.size.width - (int32_t)(data->crop*2);
+		mc->region.size.height = data->format.size.height - (int32_t)(data->crop*2);
 	}
 	if ((mcs = spa_buffer_find_meta_data(buf, SPA_META_Cursor, sizeof(*mcs)))) {
 		struct spa_meta_bitmap *mb;
 		uint32_t *bitmap, color;
 
 		mcs->id = 1;
-		mcs->position.x = (sin(data->accumulator) + 1.0) * 160.0 + 80;
-		mcs->position.y = (cos(data->accumulator) + 1.0) * 100.0 + 50;
+		mcs->position.x = (int32_t)((sin(data->accumulator) + 1.0) * 160.0 + 80);
+		mcs->position.y = (int32_t)((cos(data->accumulator) + 1.0) * 100.0 + 50);
 		mcs->hotspot.x = 0;
 		mcs->hotspot.y = 0;
 		mcs->bitmap_offset = sizeof(struct spa_meta_cursor);
@@ -137,7 +135,7 @@
 		mb->offset = sizeof(struct spa_meta_bitmap);
 
 		bitmap = SPA_PTROFF(mb, mb->offset, uint32_t);
-		color = (cos(data->accumulator) + 1.0) * (1 << 23);
+		color = (uint32_t)((cos(data->accumulator) + 1.0) * (1 << 23));
 		color |= 0xff000000;
 
 		draw_elipse(bitmap, mb->size.width, mb->size.height, color);

pipewire-1.0.1.tar.bz2/src/gst/gstpipewireclock.c -> pipewire-1.2.0.tar.gz/src/gst/gstpipewireclock.c Changed

@@ -14,12 +14,12 @@
 G_DEFINE_TYPE (GstPipeWireClock, gst_pipewire_clock, GST_TYPE_SYSTEM_CLOCK);
 
 GstClock *
-gst_pipewire_clock_new (struct pw_stream *stream, GstClockTime last_time)
+gst_pipewire_clock_new (GstPipeWireStream *stream, GstClockTime last_time)
 {
   GstPipeWireClock *clock;
 
   clock = g_object_new (GST_TYPE_PIPEWIRE_CLOCK, NULL);
-  clock->stream = stream;
+  g_weak_ref_set (&clock->stream, stream);
   clock->last_time = last_time;
   clock->time_offset = last_time;
 
@@ -30,28 +30,31 @@
 gst_pipewire_clock_get_internal_time (GstClock * clock)
 {
   GstPipeWireClock *pclock = (GstPipeWireClock *) clock;
+  g_autoptr (GstPipeWireStream) s = g_weak_ref_get (&pclock->stream);
   GstClockTime result;
-  struct timespec ts;
+  uint64_t now;
 
-  clock_gettime(CLOCK_MONOTONIC, &ts);
+  if (G_UNLIKELY (!s))
+    return pclock->last_time;
+
+  now = pw_stream_get_nsec(s->pwstream);
 #if 0
   struct pw_time t;
-  if (pclock->stream == NULL ||
-      pw_stream_get_time (pclock->stream, &t) < 0 ||
+  if (s->pwstream == NULL ||
+      pw_stream_get_time_n (s->pwstream, &t, sizeof(t)) < 0 ||
       t.rate.denom == 0)
     return pclock->last_time;
 
   result = gst_util_uint64_scale_int (t.ticks, GST_SECOND * t.rate.num, t.rate.denom);
-  result += SPA_TIMESPEC_TO_NSEC(&ts) - t.now;
+  result += now - t.now;
 
   result += pclock->time_offset;
   pclock->last_time = result;
 
-  GST_DEBUG ("%"PRId64", %d/%d %"PRId64" %"PRId64,
-                t.ticks, t.rate.num, t.rate.denom, t.now, result);
+  GST_DEBUG ("%"PRId64", %d/%d %"PRId64" %"PRId64" %"PRId64,
+                t.ticks, t.rate.num, t.rate.denom, t.now, result, now);
 #else
-  result = SPA_TIMESPEC_TO_NSEC(&ts);
-  result += pclock->time_offset;
+  result = now + pclock->time_offset;
   pclock->last_time = result;
 #endif
 
@@ -65,6 +68,8 @@
 
   GST_DEBUG_OBJECT (clock, "finalize");
 
+  g_weak_ref_set (&clock->stream, NULL);
+
   G_OBJECT_CLASS (gst_pipewire_clock_parent_class)->finalize (object);
 }

pipewire-1.0.1.tar.bz2/src/gst/gstpipewireclock.h -> pipewire-1.2.0.tar.gz/src/gst/gstpipewireclock.h Changed

@@ -5,43 +5,27 @@
 #ifndef __GST_PIPEWIRE_CLOCK_H__
 #define __GST_PIPEWIRE_CLOCK_H__
 
-#include <gst/gst.h>
+#include "config.h"
+#include "gstpipewirestream.h"
 
+#include <gst/gst.h>
 #include <pipewire/pipewire.h>
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_PIPEWIRE_CLOCK \
-  (gst_pipewire_clock_get_type())
-#define GST_PIPEWIRE_CLOCK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PIPEWIRE_CLOCK,GstPipeWireClock))
-#define GST_PIPEWIRE_CLOCK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PIPEWIRE_CLOCK,GstPipeWireClockClass))
-#define GST_IS_PIPEWIRE_CLOCK(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PIPEWIRE_CLOCK))
-#define GST_IS_PIPEWIRE_CLOCK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PIPEWIRE_CLOCK))
-#define GST_PIPEWIRE_CLOCK_GET_CLASS(klass) \
-  (G_TYPE_INSTANCE_GET_CLASS ((klass), GST_TYPE_PIPEWIRE_CLOCK, GstPipeWireClockClass))
-
-typedef struct _GstPipeWireClock GstPipeWireClock;
-typedef struct _GstPipeWireClockClass GstPipeWireClockClass;
+#define GST_TYPE_PIPEWIRE_CLOCK (gst_pipewire_clock_get_type())
+G_DECLARE_FINAL_TYPE (GstPipeWireClock, gst_pipewire_clock, GST, PIPEWIRE_CLOCK, GstSystemClock)
 
 struct _GstPipeWireClock {
   GstSystemClock parent;
 
-  struct pw_stream *stream;
+  GWeakRef stream;
+
   GstClockTime last_time;
   GstClockTimeDiff time_offset;
 };
 
-struct _GstPipeWireClockClass {
-  GstSystemClockClass parent_class;
-};
-
-GType gst_pipewire_clock_get_type (void);
-
-GstClock *      gst_pipewire_clock_new           (struct pw_stream *stream,
+GstClock *      gst_pipewire_clock_new           (GstPipeWireStream *stream,
                                                   GstClockTime last_time);
 void            gst_pipewire_clock_reset         (GstPipeWireClock *clock,
                                                   GstClockTime time);

pipewire-1.0.1.tar.bz2/src/gst/gstpipewirecore.c -> pipewire-1.2.0.tar.gz/src/gst/gstpipewirecore.c Changed

pipewire-1.0.1.tar.bz2/src/gst/gstpipewiredeviceprovider.c -> pipewire-1.2.0.tar.gz/src/gst/gstpipewiredeviceprovider.c Changed

pipewire-1.0.1.tar.bz2/src/gst/gstpipewiredeviceprovider.h -> pipewire-1.2.0.tar.gz/src/gst/gstpipewiredeviceprovider.h Changed

@@ -14,16 +14,9 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GstPipeWireDevice GstPipeWireDevice;
-typedef struct _GstPipeWireDeviceClass GstPipeWireDeviceClass;
-
-#define GST_TYPE_PIPEWIRE_DEVICE                 (gst_pipewire_device_get_type())
-#define GST_IS_PIPEWIRE_DEVICE(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PIPEWIRE_DEVICE))
-#define GST_IS_PIPEWIRE_DEVICE_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PIPEWIRE_DEVICE))
-#define GST_PIPEWIRE_DEVICE_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_PIPEWIRE_DEVICE, GstPipeWireDeviceClass))
-#define GST_PIPEWIRE_DEVICE(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PIPEWIRE_DEVICE, GstPipeWireDevice))
-#define GST_PIPEWIRE_DEVICE_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_DEVICE, GstPipeWireDeviceClass))
-#define GST_PIPEWIRE_DEVICE_CAST(obj)            ((GstPipeWireDevice *)(obj))
+#define GST_TYPE_PIPEWIRE_DEVICE (gst_pipewire_device_get_type())
+#define GST_PIPEWIRE_DEVICE_CAST(obj) ((GstPipeWireDevice *)(obj))
+G_DECLARE_FINAL_TYPE (GstPipeWireDevice, gst_pipewire_device, GST, PIPEWIRE_DEVICE, GstDevice)
 
 typedef enum {
   GST_PIPEWIRE_DEVICE_TYPE_UNKNOWN,
@@ -42,22 +35,9 @@
   int                 priority;
 };
 
-struct _GstPipeWireDeviceClass {
-  GstDeviceClass    parent_class;
-};
-
-GType        gst_pipewire_device_get_type (void);
-
-typedef struct _GstPipeWireDeviceProvider GstPipeWireDeviceProvider;
-typedef struct _GstPipeWireDeviceProviderClass GstPipeWireDeviceProviderClass;
-
-#define GST_TYPE_PIPEWIRE_DEVICE_PROVIDER                 (gst_pipewire_device_provider_get_type())
-#define GST_IS_PIPEWIRE_DEVICE_PROVIDER(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PIPEWIRE_DEVICE_PROVIDER))
-#define GST_IS_PIPEWIRE_DEVICE_PROVIDER_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PIPEWIRE_DEVICE_PROVIDER))
-#define GST_PIPEWIRE_DEVICE_PROVIDER_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_PIPEWIRE_DEVICE_PROVIDER, GstPipeWireDeviceProviderClass))
-#define GST_PIPEWIRE_DEVICE_PROVIDER(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PIPEWIRE_DEVICE_PROVIDER, GstPipeWireDeviceProvider))
-#define GST_PIPEWIRE_DEVICE_PROVIDER_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_DEVICE_PROVIDER, GstPipeWireDeviceProviderClass))
-#define GST_PIPEWIRE_DEVICE_PROVIDER_CAST(obj)            ((GstPipeWireDeviceProvider *)(obj))
+#define GST_TYPE_PIPEWIRE_DEVICE_PROVIDER (gst_pipewire_device_provider_get_type())
+#define GST_PIPEWIRE_DEVICE_PROVIDER_CAST(obj) ((GstPipeWireDeviceProvider *)(obj))
+G_DECLARE_FINAL_TYPE (GstPipeWireDeviceProvider, gst_pipewire_device_provider, GST, PIPEWIRE_DEVICE_PROVIDER, GstDeviceProvider)
 
 struct _GstPipeWireDeviceProvider {
   GstDeviceProvider         parent;
@@ -78,12 +58,6 @@
   GList *devices;
 };
 
-struct _GstPipeWireDeviceProviderClass {
-  GstDeviceProviderClass    parent_class;
-};
-
-GType        gst_pipewire_device_provider_get_type (void);
-
 G_END_DECLS
 
 #endif /* __GST_PIPEWIRE_DEVICE_PROVIDER_H__ */

pipewire-1.0.1.tar.bz2/src/gst/gstpipewireformat.c -> pipewire-1.2.0.tar.gz/src/gst/gstpipewireformat.c Changed

@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include <gst/gst.h>
@@ -13,10 +15,14 @@
 #include <spa/utils/type.h>
 #include <spa/param/video/format-utils.h>
 #include <spa/param/audio/format-utils.h>
-#include <spa/pod/builder.h>
+#include <spa/pod/dynamic.h>
 
 #include "gstpipewireformat.h"
 
+#ifndef DRM_FORMAT_INVALID
+#define DRM_FORMAT_INVALID 0
+#endif
+
 #ifndef DRM_FORMAT_MOD_INVALID
 #define DRM_FORMAT_MOD_INVALID ((1ULL << 56) - 1)
 #endif
@@ -169,9 +175,7 @@
 };
 
 typedef struct {
-  struct spa_pod_builder b;
   const struct media_type *type;
-  uint32_t id;
   const GstCapsFeatures *cf;
   const GstStructure *cs;
   GPtrArray *array;
@@ -358,48 +362,28 @@
   return SPA_CHOICE_Range;
 }
 
-static gboolean
-handle_video_fields (ConvertData *d)
+static void
+add_limits (struct spa_pod_dynamic_builder *b, ConvertData *d)
 {
-  const GValue *value, *value2;
-  int i;
   struct spa_pod_choice *choice;
   struct spa_pod_frame f;
+  const GValue *value, *value2;
+  int i;
 
-  value = gst_structure_get_value (d->cs, "format");
-  if (value) {
-    const char *v;
-    int idx;
-    for (i = 0; (v = get_nth_string (value, i)); i++) {
-      if (i == 0) {
-        spa_pod_builder_prop (&d->b, SPA_FORMAT_VIDEO_format, 0);
-        spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0);
-      }
-
-      idx = gst_video_format_from_string (v);
-      if (idx != GST_VIDEO_FORMAT_UNKNOWN && idx < (int)SPA_N_ELEMENTS (video_format_map))
-        spa_pod_builder_id (&d->b, video_format_mapidx);
-    }
-    if (i > 0) {
-      choice = spa_pod_builder_pop(&d->b, &f);
-      if (i == 1)
-        choice->body.type = SPA_CHOICE_None;
-    }
-  }
   value = gst_structure_get_value (d->cs, "width");
   value2 = gst_structure_get_value (d->cs, "height");
   if (value && value2) {
     struct spa_rectangle v;
     for (i = 0; get_nth_rectangle (value, value2, i, &v); i++) {
       if (i == 0) {
-        spa_pod_builder_prop (&d->b, SPA_FORMAT_VIDEO_size, 0);
-        spa_pod_builder_push_choice(&d->b, &f, get_range_type2 (value, value2), 0);
+        spa_pod_builder_prop (&b->b, SPA_FORMAT_VIDEO_size, 0);
+        spa_pod_builder_push_choice(&b->b, &f, get_range_type2 (value, value2), 0);
       }
 
-      spa_pod_builder_rectangle (&d->b, v.width, v.height);
+      spa_pod_builder_rectangle (&b->b, v.width, v.height);
     }
     if (i > 0) {
-      choice = spa_pod_builder_pop(&d->b, &f);
+      choice = spa_pod_builder_pop(&b->b, &f);
       if (i == 1)
         choice->body.type = SPA_CHOICE_None;
     }
@@ -410,14 +394,14 @@
     struct spa_fraction v;
     for (i = 0; get_nth_fraction (value, i, &v); i++) {
       if (i == 0) {
-        spa_pod_builder_prop (&d->b, SPA_FORMAT_VIDEO_framerate, 0);
-        spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0);
+        spa_pod_builder_prop (&b->b, SPA_FORMAT_VIDEO_framerate, 0);
+        spa_pod_builder_push_choice(&b->b, &f, get_range_type (value), 0);
       }
 
-      spa_pod_builder_fraction (&d->b, v.num, v.denom);
+      spa_pod_builder_fraction (&b->b, v.num, v.denom);
     }
     if (i > 0) {
-      choice = spa_pod_builder_pop(&d->b, &f);
+      choice = spa_pod_builder_pop(&b->b, &f);
       if (i == 1)
         choice->body.type = SPA_CHOICE_None;
     }
@@ -428,19 +412,178 @@
     struct spa_fraction v;
     for (i = 0; get_nth_fraction (value, i, &v); i++) {
       if (i == 0) {
-        spa_pod_builder_prop (&d->b, SPA_FORMAT_VIDEO_maxFramerate, 0);
-        spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0);
+        spa_pod_builder_prop (&b->b, SPA_FORMAT_VIDEO_maxFramerate, 0);
+        spa_pod_builder_push_choice(&b->b, &f, get_range_type (value), 0);
       }
 
-      spa_pod_builder_fraction (&d->b, v.num, v.denom);
+      spa_pod_builder_fraction (&b->b, v.num, v.denom);
     }
     if (i > 0) {
-      choice = spa_pod_builder_pop(&d->b, &f);
+      choice = spa_pod_builder_pop(&b->b, &f);
       if (i == 1)
         choice->body.type = SPA_CHOICE_None;
     }
   }
-  return TRUE;
+}
+
+static void
+add_video_format (gpointer format_ptr,
+                  gpointer modifiers_ptr,
+                  gpointer user_data)
+{
+  uint32_t format = GPOINTER_TO_UINT (format_ptr);
+  GHashTable *modifiers = modifiers_ptr;
+  ConvertData *d = user_data;
+  struct spa_pod_dynamic_builder b;
+  struct spa_pod_frame f;
+  int n_mods;
+
+  spa_pod_dynamic_builder_init (&b, NULL, 0, 1024);
+
+  spa_pod_builder_push_object (&b.b, &f, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat);
+
+  spa_pod_builder_prop (&b.b, SPA_FORMAT_mediaType, 0);
+  spa_pod_builder_id(&b.b, d->type->media_type);
+
+  spa_pod_builder_prop (&b.b, SPA_FORMAT_mediaSubtype, 0);
+  spa_pod_builder_id(&b.b, d->type->media_subtype);
+
+  spa_pod_builder_prop (&b.b, SPA_FORMAT_VIDEO_format, 0);
+  spa_pod_builder_id (&b.b, format);
+
+  n_mods = g_hash_table_size (modifiers);
+  if (n_mods > 0) {
+    struct spa_pod_frame f2;
+    GHashTableIter iter;
+    gpointer key, value;
+    uint32_t flags, choice_type;
+
+    flags = SPA_POD_PROP_FLAG_MANDATORY;
+    if (n_mods > 1) {
+      choice_type = SPA_CHOICE_Enum;
+      flags |= SPA_POD_PROP_FLAG_DONT_FIXATE;
+    } else {
+      choice_type = SPA_CHOICE_None;
+    }
+
+    spa_pod_builder_prop (&b.b, SPA_FORMAT_VIDEO_modifier, flags);
+    spa_pod_builder_push_choice (&b.b, &f2, choice_type, 0);
+
+    g_hash_table_iter_init (&iter, modifiers);
+    g_hash_table_iter_next (&iter, &key, &value);
+    spa_pod_builder_long (&b.b, (uint64_t) key);
+
+    if (n_mods > 1) {
+      do {
+        spa_pod_builder_long (&b.b, (uint64_t) key);
+      } while (g_hash_table_iter_next (&iter, &key, &value));
+    }
+
+    spa_pod_builder_pop (&b.b, &f2);
+  }
+
+  add_limits (&b, d);
+
+  g_ptr_array_add (d->array, spa_pod_builder_pop (&b.b, &f));
+}
+
+static void
+handle_video_fields (ConvertData *d)
+{
+  g_autoptr (GHashTable) formats = NULL;
+  const GValue *value;
+  gboolean dmabuf_caps;
+  int i;
+
+  formats = g_hash_table_new_full (NULL, NULL, NULL,
+                                   (GDestroyNotify) g_hash_table_unref);
+  dmabuf_caps = (d->cf &&
+                 gst_caps_features_contains (d->cf,
+                                             GST_CAPS_FEATURE_MEMORY_DMABUF));
+
+  value = gst_structure_get_value (d->cs, "format");
+  if (value) {
+    const char *v;
+
+    for (i = 0; (v = get_nth_string (value, i)); i++) {
+      int idx;
+
+      idx = gst_video_format_from_string (v);
+#ifdef HAVE_GSTREAMER_DMA_DRM
+      if (dmabuf_caps && idx == GST_VIDEO_FORMAT_DMA_DRM) {
+        const GValue *value2;
+
+        value2 = gst_structure_get_value (d->cs, "drm-format");
+        if (value2) {
+          const char *v2;
+          int j;
+
+          for (j = 0; (v2 = get_nth_string (value2, j)); j++) {
+            uint32_t fourcc;
+            uint64_t mod;
+            int idx2;
+
+            fourcc = gst_video_dma_drm_fourcc_from_string (v2, &mod);
+            idx2 = gst_video_dma_drm_fourcc_to_format (fourcc);
+
+            if (idx2 != GST_VIDEO_FORMAT_UNKNOWN &&
+                idx2 < (int)SPA_N_ELEMENTS (video_format_map)) {
+              GHashTable *modifiers =
+                  g_hash_table_lookup (formats,
+                                       GINT_TO_POINTER (video_format_mapidx2));
+              if (!modifiers) {
+                modifiers = g_hash_table_new (NULL, NULL);
+                g_hash_table_insert (formats,
+                                     GINT_TO_POINTER (video_format_mapidx2),
+                                     modifiers);
+              }
+
+              g_hash_table_add (modifiers, GINT_TO_POINTER (mod));
+            }
+          }
+        }
+      } else
+#endif
+      if (idx != GST_VIDEO_FORMAT_UNKNOWN &&
+          idx < (int)SPA_N_ELEMENTS (video_format_map)) {
+          GHashTable *modifiers =
+              g_hash_table_lookup (formats,
+                                   GINT_TO_POINTER (video_format_mapidx));
+          if (!modifiers) {
+            modifiers = g_hash_table_new (NULL, NULL);
+            g_hash_table_insert (formats,
+                                 GINT_TO_POINTER (video_format_mapidx),
+                                 modifiers);
+          }
+
+          if (dmabuf_caps) {
+            g_hash_table_add (modifiers, GINT_TO_POINTER (DRM_FORMAT_MOD_LINEAR));
+            g_hash_table_add (modifiers, GINT_TO_POINTER (DRM_FORMAT_MOD_INVALID));
+          }
+      }
+    }
+  }
+
+  if (g_hash_table_size (formats) > 0) {
+    g_hash_table_foreach (formats, add_video_format, d);
+  } else if (!dmabuf_caps) {
+    struct spa_pod_dynamic_builder b;
+    struct spa_pod_frame f;
+
+    spa_pod_dynamic_builder_init (&b, NULL, 0, 1024);
+
+    spa_pod_builder_push_object (&b.b, &f, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat);
+
+    spa_pod_builder_prop (&b.b, SPA_FORMAT_mediaType, 0);
+    spa_pod_builder_id(&b.b, d->type->media_type);
+
+    spa_pod_builder_prop (&b.b, SPA_FORMAT_mediaSubtype, 0);
+    spa_pod_builder_id(&b.b, d->type->media_subtype);
+
+    add_limits (&b, d);
+
+    g_ptr_array_add (d->array, spa_pod_builder_pop (&b.b, &f));
+  }
 }
 
 static void
@@ -481,45 +624,57 @@
         SPA_POD_Array(sizeof(uint32_t), SPA_TYPE_Id, channels, position), 0);
 }
 
-static gboolean
+static void
 handle_audio_fields (ConvertData *d)
 {
   const GValue *value;
+  struct spa_pod_dynamic_builder b;
   struct spa_pod_choice *choice;
-  struct spa_pod_frame f;
+  struct spa_pod_frame f, f0;
   int i = 0;
 
+  spa_pod_dynamic_builder_init (&b, NULL, 0, 1024);
+
+  spa_pod_builder_push_object (&b.b, &f0, SPA_TYPE_OBJECT_Format,
+                               SPA_PARAM_EnumFormat);
+
+  spa_pod_builder_prop (&b.b, SPA_FORMAT_mediaType, 0);
+  spa_pod_builder_id(&b.b, d->type->media_type);
+
+  spa_pod_builder_prop (&b.b, SPA_FORMAT_mediaSubtype, 0);
+  spa_pod_builder_id(&b.b, d->type->media_subtype);
+
   value = gst_structure_get_value (d->cs, "format");
   if (value) {
     const char *v;
     int idx;
     for (i = 0; (v = get_nth_string (value, i)); i++) {
       if (i == 0) {
-        spa_pod_builder_prop (&d->b, SPA_FORMAT_AUDIO_format, 0);
-        spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0);
+        spa_pod_builder_prop (&b.b, SPA_FORMAT_AUDIO_format, 0);
+        spa_pod_builder_push_choice(&b.b, &f, get_range_type (value), 0);
       }
 
       idx = gst_audio_format_from_string (v);
       if (idx < (int)SPA_N_ELEMENTS (audio_format_map))
-        spa_pod_builder_id (&d->b, audio_format_mapidx);
+        spa_pod_builder_id (&b.b, audio_format_mapidx);
     }
     if (i > 0) {
-      choice = spa_pod_builder_pop(&d->b, &f);
+      choice = spa_pod_builder_pop(&b.b, &f);
       if (i == 1)
         choice->body.type = SPA_CHOICE_None;
     }
   } else if (strcmp(d->type->name, "audio/x-mulaw") == 0) {
-        spa_pod_builder_prop (&d->b, SPA_FORMAT_AUDIO_format, 0);
-        spa_pod_builder_id (&d->b, SPA_AUDIO_FORMAT_ULAW);
+        spa_pod_builder_prop (&b.b, SPA_FORMAT_AUDIO_format, 0);
+        spa_pod_builder_id (&b.b, SPA_AUDIO_FORMAT_ULAW);
   } else if (strcmp(d->type->name, "audio/x-alaw") == 0) {
-        spa_pod_builder_prop (&d->b, SPA_FORMAT_AUDIO_format, 0);
-        spa_pod_builder_id (&d->b, SPA_AUDIO_FORMAT_ALAW);
+        spa_pod_builder_prop (&b.b, SPA_FORMAT_AUDIO_format, 0);
+        spa_pod_builder_id (&b.b, SPA_AUDIO_FORMAT_ALAW);
   } else if (strcmp(d->type->name, "audio/mpeg") == 0) {
-        spa_pod_builder_prop (&d->b, SPA_FORMAT_AUDIO_format, 0);
-        spa_pod_builder_id (&d->b, SPA_AUDIO_FORMAT_ENCODED);
+        spa_pod_builder_prop (&b.b, SPA_FORMAT_AUDIO_format, 0);
+        spa_pod_builder_id (&b.b, SPA_AUDIO_FORMAT_ENCODED);
   } else if (strcmp(d->type->name, "audio/x-flac") == 0) {
-        spa_pod_builder_prop (&d->b, SPA_FORMAT_AUDIO_format, 0);
-        spa_pod_builder_id (&d->b, SPA_AUDIO_FORMAT_ENCODED);
+        spa_pod_builder_prop (&b.b, SPA_FORMAT_AUDIO_format, 0);
+        spa_pod_builder_id (&b.b, SPA_AUDIO_FORMAT_ENCODED);
   }
 
 #if 0
@@ -537,14 +692,14 @@
         break;
 
       if (i == 0) {
-        spa_pod_builder_prop (&d->b, SPA_FORMAT_AUDIO_layout, 0);
-        spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0);
+        spa_pod_builder_prop (&b.b, SPA_FORMAT_AUDIO_layout, 0);
+        spa_pod_builder_push_choice(&b.b, &f, get_range_type (value), 0);
       }
 
-      spa_pod_builder_id (&d->b, layout);
+      spa_pod_builder_id (&b.b, layout);
     }
     if (i > 0) {
-      choice = spa_pod_builder_pop(&d->b, &f);
+      choice = spa_pod_builder_pop(&b.b, &f);
       if (i == 1)
         choice->body.type = SPA_CHOICE_None;
     }
@@ -555,14 +710,14 @@
     int v;
     for (i = 0; get_nth_int (value, i, &v); i++) {
       if (i == 0) {
-        spa_pod_builder_prop (&d->b, SPA_FORMAT_AUDIO_rate, 0);
-        spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0);
+        spa_pod_builder_prop (&b.b, SPA_FORMAT_AUDIO_rate, 0);
+        spa_pod_builder_push_choice(&b.b, &f, get_range_type (value), 0);
       }
 
-      spa_pod_builder_int (&d->b, v);
+      spa_pod_builder_int (&b.b, v);
     }
     if (i > 0) {
-      choice = spa_pod_builder_pop(&d->b, &f);
+      choice = spa_pod_builder_pop(&b.b, &f);
       if (i == 1)
         choice->body.type = SPA_CHOICE_None;
     }
@@ -572,132 +727,78 @@
     int v;
     for (i = 0; get_nth_int (value, i, &v); i++) {
       if (i == 0) {
-        spa_pod_builder_prop (&d->b, SPA_FORMAT_AUDIO_channels, 0);
-        spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0);
+        spa_pod_builder_prop (&b.b, SPA_FORMAT_AUDIO_channels, 0);
+        spa_pod_builder_push_choice(&b.b, &f, get_range_type (value), 0);
       }
 
-      spa_pod_builder_int (&d->b, v);
+      spa_pod_builder_int (&b.b, v);
     }
     if (i > 0) {
-      choice = spa_pod_builder_pop(&d->b, &f);
+      choice = spa_pod_builder_pop(&b.b, &f);
       if (i == 1) {
         choice->body.type = SPA_CHOICE_None;
-        set_default_channels (&d->b, v);
+        set_default_channels (&b.b, v);
       }
     }
   }
-  return TRUE;
-}
 
-static int
-builder_overflow (void *event_data, uint32_t size)
-{
-  struct spa_pod_builder *b = event_data;
-  b->size = SPA_ROUND_UP_N (size, 512);
-  b->data = realloc (b->data, b->size);
-  if (b->data == NULL)
-    return -errno;
-  return 0;
+  g_ptr_array_add (d->array, spa_pod_builder_pop (&b.b, &f0));
 }
 
-static const struct spa_pod_builder_callbacks builder_callbacks = {
-        SPA_VERSION_POD_BUILDER_CALLBACKS,
-        .overflow = builder_overflow
-};
-
-static struct spa_pod *
-convert_1 (ConvertData *d)
+static void
+handle_fields (ConvertData *d)
 {
-  struct spa_pod_frame f;
-
   if (!(d->type = find_media_types (gst_structure_get_name (d->cs))))
-    return NULL;
-
-  spa_pod_builder_set_callbacks(&d->b, &builder_callbacks, &d->b);
-
-  spa_pod_builder_push_object (&d->b, &f, SPA_TYPE_OBJECT_Format, d->id);
-
-  spa_pod_builder_prop (&d->b, SPA_FORMAT_mediaType, 0);
-  spa_pod_builder_id(&d->b, d->type->media_type);
-
-  spa_pod_builder_prop (&d->b, SPA_FORMAT_mediaSubtype, 0);
-  spa_pod_builder_id(&d->b, d->type->media_subtype);
-
-  if (d->cf && gst_caps_features_contains (d->cf, GST_CAPS_FEATURE_MEMORY_DMABUF)) {
-    struct spa_pod_frame f2;
-
-    spa_pod_builder_prop (&d->b, SPA_FORMAT_VIDEO_modifier,
-                          (SPA_POD_PROP_FLAG_MANDATORY | SPA_POD_PROP_FLAG_DONT_FIXATE));
-    spa_pod_builder_push_choice (&d->b, &f2, SPA_CHOICE_Enum, 0);
-    spa_pod_builder_long (&d->b, DRM_FORMAT_MOD_INVALID);
-    spa_pod_builder_long (&d->b, DRM_FORMAT_MOD_INVALID);
-    spa_pod_builder_long (&d->b, DRM_FORMAT_MOD_LINEAR);
-    spa_pod_builder_pop (&d->b, &f2);
-  }
+    return;
 
   if (d->type->media_type == SPA_MEDIA_TYPE_video)
     handle_video_fields (d);
   else if (d->type->media_type == SPA_MEDIA_TYPE_audio)
     handle_audio_fields (d);
-
-  spa_pod_builder_pop (&d->b, &f);
-
-  return SPA_PTROFF (d->b.data, 0, struct spa_pod);
 }
 
-struct spa_pod *
-gst_caps_to_format (GstCaps *caps, guint index, uint32_t id)
+static gboolean
+foreach_func_dmabuf (GstCapsFeatures *features,
+                     GstStructure    *structure,
+                     ConvertData     *d)
 {
-  ConvertData d;
-  struct spa_pod *res;
+  if (!features || !gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_DMABUF))
+    return TRUE;
 
-  g_return_val_if_fail (GST_IS_CAPS (caps), NULL);
-  g_return_val_if_fail (gst_caps_is_fixed (caps), NULL);
-
-  spa_zero (d);
-  d.cf = gst_caps_get_features (caps, index);
-  d.cs = gst_caps_get_structure (caps, index);
-  d.id = id;
+  d->cf = features;
+  d->cs = structure;
 
-  res = convert_1 (&d);
+  handle_fields (d);
 
-  return res;
+  return TRUE;
 }
 
 static gboolean
-foreach_func (GstCapsFeatures *features,
-              GstStructure    *structure,
-              ConvertData     *d)
+foreach_func_no_dmabuf (GstCapsFeatures *features,
+                        GstStructure    *structure,
+                        ConvertData     *d)
 {
-  struct spa_pod *fmt;
-  int idx;
+  if (features && gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_DMABUF))
+    return TRUE;
 
-  spa_zero(d->b);
   d->cf = features;
   d->cs = structure;
 
-  if (d->cf && gst_caps_features_contains (d->cf, GST_CAPS_FEATURE_MEMORY_DMABUF))
-    idx = 0;
-  else
-    idx = -1;
-
-  if ((fmt = convert_1 (d)))
-    g_ptr_array_insert (d->array, idx, fmt);
+  handle_fields (d);
 
   return TRUE;
 }
 
 
 GPtrArray *
-gst_caps_to_format_all (GstCaps *caps, uint32_t id)
+gst_caps_to_format_all (GstCaps *caps)
 {
   ConvertData d;
 
-  spa_zero (d);
-  d.id = id;
   d.array = g_ptr_array_new_full (gst_caps_get_size (caps), (GDestroyNotify)g_free);
 
-  gst_caps_foreach (caps, (GstCapsForeachFunc) foreach_func, &d);
+  gst_caps_foreach (caps, (GstCapsForeachFunc) foreach_func_dmabuf, &d);
+  gst_caps_foreach (caps, (GstCapsForeachFunc) foreach_func_no_dmabuf, &d);
 
   return d.array;
 }
@@ -712,6 +813,18 @@
   return gst_video_format_to_string(idx);
 }
 
+#ifdef HAVE_GSTREAMER_DMA_DRM
+static char *video_id_to_dma_drm_fourcc(uint32_t id, uint64_t mod)
+{
+  int idx;
+  guint32 fourcc;
+  if ((idx = find_index(video_format_map, SPA_N_ELEMENTS(video_format_map), id)) == -1)
+    return NULL;
+  fourcc = gst_video_dma_drm_fourcc_from_format(idx);
+  return gst_video_dma_drm_fourcc_to_string(fourcc, mod);
+}
+#endif
+
 static const char *audio_id_to_string(uint32_t id)
 {
   int idx;
@@ -729,7 +842,7 @@
   uint32_t i, n_items, choice;
 
   val = spa_pod_get_values(&prop->value, &n_items, &choice);
-  if (val->type != SPA_TYPE_Id)
+  if (val->type != SPA_TYPE_Id || n_items == 0)
           return;
 
   id = SPA_POD_BODY(val);
@@ -763,6 +876,114 @@
 }
 
 static void
+handle_dmabuf_prop (const struct spa_pod_prop *prop,
+    const struct spa_pod_prop *prop_modifier, GstCaps *res)
+{
+  g_autoptr (GPtrArray) fmt_array = NULL;
+  g_autoptr (GPtrArray) drm_fmt_array = NULL;
+  const struct spa_pod *pod_modifier;
+  struct spa_pod *val;
+  uint32_t *id, n_fmts, n_mods, choice, i, j;
+  uint64_t *mods;
+
+  val = spa_pod_get_values (&prop->value, &n_fmts, &choice);
+  if (val->type != SPA_TYPE_Id || n_fmts == 0)
+    return;
+  if (choice != SPA_CHOICE_None && choice != SPA_CHOICE_Enum)
+    return;
+
+  id = SPA_POD_BODY (val);
+  if (n_fmts > 1) {
+    n_fmts--;
+    id++;
+  }
+
+  pod_modifier = spa_pod_get_values (&prop_modifier->value, &n_mods, &choice);
+  if (pod_modifier->type != SPA_TYPE_Long || n_mods == 0)
+    return;
+  if (choice != SPA_CHOICE_None && choice != SPA_CHOICE_Enum)
+    return;
+
+  mods = SPA_POD_BODY (pod_modifier);
+  if (n_mods > 1) {
+    n_mods--;
+    mods++;
+  }
+
+  fmt_array = g_ptr_array_new_with_free_func (g_free);
+  drm_fmt_array = g_ptr_array_new_with_free_func (g_free);
+
+  for (i = 0; i < n_fmts; i++) {
+    for (j = 0; j < n_mods; j++) {
+      const char *fmt_str;
+
+      if ((modsj == DRM_FORMAT_MOD_LINEAR ||
+           modsj == DRM_FORMAT_MOD_INVALID) &&
+          (fmt_str = video_id_to_string(idi)))
+        g_ptr_array_add(fmt_array, g_strdup_printf ("%s", fmt_str));
+
+#ifdef HAVE_GSTREAMER_DMA_DRM
+      {
+        char *drm_str;
+
+        if ((drm_str = video_id_to_dma_drm_fourcc(idi, modsj)))
+          g_ptr_array_add(drm_fmt_array, drm_str);
+      }
+#endif
+    }
+  }
+
+#ifdef HAVE_GSTREAMER_DMA_DRM
+  if (drm_fmt_array->len > 0) {
+    g_ptr_array_add (fmt_array, g_strdup_printf ("DMA_DRM"));
+
+    if (drm_fmt_array->len == 1) {
+      gst_caps_set_simple (res, "drm-format", G_TYPE_STRING,
+          g_ptr_array_index (drm_fmt_array, 0), NULL);
+    } else {
+      GValue list = { 0 };
+
+      g_value_init (&list, GST_TYPE_LIST);
+      for (i = 0; i < drm_fmt_array->len; i++) {
+        GValue v = { 0 };
+
+        g_value_init (&v, G_TYPE_STRING);
+        g_value_set_string (&v, g_ptr_array_index (drm_fmt_array, i));
+        gst_value_list_append_and_take_value (&list, &v);
+      }
+
+      gst_caps_set_value (res, "drm-format", &list);
+      g_value_unset (&list);
+    }
+  }
+#endif
+
+  if (fmt_array->len > 0) {
+    gst_caps_set_features_simple (res,
+        gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_DMABUF));
+
+    if (fmt_array->len == 1) {
+      gst_caps_set_simple (res, "format", G_TYPE_STRING,
+          g_ptr_array_index (fmt_array, 0), NULL);
+    } else {
+      GValue list = { 0 };
+
+      g_value_init (&list, GST_TYPE_LIST);
+      for (i = 0; i < fmt_array->len; i++) {
+        GValue v = { 0 };
+
+        g_value_init (&v, G_TYPE_STRING);
+        g_value_set_string (&v, g_ptr_array_index (fmt_array, i));
+        gst_value_list_append_and_take_value (&list, &v);
+      }
+
+      gst_caps_set_value (res, "format", &list);
+      g_value_unset (&list);
+    }
+  }
+}
+
+static void
 handle_int_prop (const struct spa_pod_prop *prop, const char *key, GstCaps *res)
 {
   struct spa_pod *val;
@@ -770,7 +991,7 @@
   uint32_t i, n_items, choice;
 
   val = spa_pod_get_values(&prop->value, &n_items, &choice);
-  if (val->type != SPA_TYPE_Int)
+  if (val->type != SPA_TYPE_Int || n_items == 0)
           return;
 
   ints = SPA_POD_BODY(val);
@@ -814,7 +1035,7 @@
   uint32_t i, n_items, choice;
 
   val = spa_pod_get_values(&prop->value, &n_items, &choice);
-  if (val->type != SPA_TYPE_Rectangle)
+  if (val->type != SPA_TYPE_Rectangle || n_items == 0)
           return;
 
   rect = SPA_POD_BODY(val);
@@ -867,7 +1088,7 @@
   uint32_t i, n_items, choice;
 
   val = spa_pod_get_values(&prop->value, &n_items, &choice);
-  if (val->type != SPA_TYPE_Fraction)
+  if (val->type != SPA_TYPE_Fraction || n_items == 0)
           return;
 
   fract = SPA_POD_BODY(val);
@@ -916,9 +1137,17 @@
 
   if (media_type == SPA_MEDIA_TYPE_video) {
     if (media_subtype == SPA_MEDIA_SUBTYPE_raw) {
+      const struct spa_pod_prop *prop_modifier;
+
       res = gst_caps_new_empty_simple ("video/x-raw");
-      if ((prop = spa_pod_object_find_prop (obj, prop, SPA_FORMAT_VIDEO_format))) {
-        handle_id_prop (prop, "format", video_id_to_string, res);
+
+      if ((prop = spa_pod_object_find_prop (obj, prop, SPA_FORMAT_VIDEO_format)) &&
+          (prop_modifier = spa_pod_object_find_prop (obj, NULL, SPA_FORMAT_VIDEO_modifier))) {
+        handle_dmabuf_prop (prop, prop_modifier, res);
+      } else {
+        if ((prop = spa_pod_object_find_prop (obj, prop, SPA_FORMAT_VIDEO_format))) {
+          handle_id_prop (prop, "format", video_id_to_string, res);
+        }
       }
     }
     else if (media_subtype == SPA_MEDIA_SUBTYPE_mjpg) {
@@ -959,3 +1188,99 @@
   }
   return res;
 }
+
+static gboolean
+filter_dmabuf_caps (GstCapsFeatures *features,
+                    GstStructure    *structure,
+                    gpointer         user_data)
+{
+  const GValue *value;
+  const char *v;
+
+  if (!gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_DMABUF))
+    return TRUE;
+
+  if (!(value = gst_structure_get_value (structure, "format")) ||
+      !(v = get_nth_string (value, 0)))
+    return FALSE;
+
+#ifdef HAVE_GSTREAMER_DMA_DRM
+  {
+    int idx;
+
+    idx = gst_video_format_from_string (v);
+    if (idx == GST_VIDEO_FORMAT_UNKNOWN)
+      return FALSE;
+
+    if (idx == GST_VIDEO_FORMAT_DMA_DRM &&
+        !gst_structure_get_value (structure, "drm-format"))
+      return FALSE;
+  }
+#endif
+
+  return TRUE;
+}
+
+void
+gst_caps_sanitize (GstCaps **caps)
+{
+  g_return_if_fail (GST_IS_CAPS (*caps));
+
+  *caps = gst_caps_make_writable (*caps);
+  gst_caps_filter_and_map_in_place (*caps, filter_dmabuf_caps, NULL);
+}
+
+void
+gst_caps_maybe_fixate_dma_format (GstCaps *caps)
+{
+#ifdef HAVE_GSTREAMER_DMA_DRM
+  GstCapsFeatures *features;
+  GstStructure *structure;
+  const GValue *format_value;
+  const GValue *drm_format_value;
+  const char *format_string;
+  const char *drm_format_string;
+  uint32_t fourcc;
+  uint64_t mod;
+  int drm_idx;
+  int i;
+
+  g_return_if_fail (GST_IS_CAPS (caps));
+
+  if (gst_caps_is_fixed (caps) || gst_caps_get_size(caps) != 1)
+    return;
+
+  features = gst_caps_get_features (caps, 0);
+  if (!gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_DMABUF))
+    return;
+
+  structure = gst_caps_get_structure (caps, 0);
+  if (!gst_structure_has_field (structure, "format") ||
+      !gst_structure_has_field (structure, "drm-format"))
+    return;
+
+  format_value = gst_structure_get_value (structure, "format");
+  drm_format_value = gst_structure_get_value (structure, "drm-format");
+  if (G_VALUE_TYPE (format_value) != GST_TYPE_LIST ||
+      ((GArray *) g_value_peek_pointer (format_value))->len != 2 ||
+      G_VALUE_TYPE (drm_format_value) != G_TYPE_STRING)
+    return;
+
+  drm_format_string = g_value_get_string (drm_format_value);
+  fourcc = gst_video_dma_drm_fourcc_from_string (drm_format_string, &mod);
+  drm_idx = gst_video_dma_drm_fourcc_to_format (fourcc);
+  if (drm_idx == GST_VIDEO_FORMAT_UNKNOWN || mod != DRM_FORMAT_MOD_LINEAR)
+    return;
+
+  for (i = 0; (format_string = get_nth_string (format_value, i)); i++) {
+    int idx;
+
+    idx = gst_video_format_from_string (format_string);
+    if (idx != GST_VIDEO_FORMAT_DMA_DRM && idx != drm_idx)
+      return;
+  }
+
+  gst_caps_set_simple (caps, "format", G_TYPE_STRING, "DMA_DRM", NULL);
+  g_warn_if_fail (gst_caps_is_fixed (caps));
+#endif
+}

pipewire-1.0.1.tar.bz2/src/gst/gstpipewireformat.h -> pipewire-1.2.0.tar.gz/src/gst/gstpipewireformat.h Changed

pipewire-1.0.1.tar.bz2/src/gst/gstpipewirepool.c -> pipewire-1.2.0.tar.gz/src/gst/gstpipewirepool.c Changed

@@ -15,6 +15,8 @@
 
 #include "gstpipewirepool.h"
 
+#include <spa/debug/types.h>
+
 GST_DEBUG_CATEGORY_STATIC (gst_pipewire_pool_debug_category);
 #define GST_CAT_DEFAULT gst_pipewire_pool_debug_category
 
@@ -33,11 +35,12 @@
 static GQuark pool_data_quark;
 
 GstPipeWirePool *
-gst_pipewire_pool_new (void)
+gst_pipewire_pool_new (GstPipeWireStream *stream)
 {
   GstPipeWirePool *pool;
 
   pool = g_object_new (GST_TYPE_PIPEWIRE_POOL, NULL);
+  g_weak_ref_set (&pool->stream, stream);
 
   return pool;
 }
@@ -57,7 +60,7 @@
   uint32_t i;
   GstPipeWirePoolData *data;
 
-  GST_LOG_OBJECT (pool, "wrap buffer");
+  GST_DEBUG_OBJECT (pool, "wrap buffer");
 
   data = g_slice_new (GstPipeWirePoolData);
 
@@ -67,21 +70,20 @@
     struct spa_data *d = &b->buffer->datasi;
     GstMemory *gmem = NULL;
 
-    GST_LOG_OBJECT (pool, "wrap buffer %d %d", d->mapoffset, d->maxsize);
+    GST_DEBUG_OBJECT (pool, "wrap data (%s %d) %d %d",
+        spa_debug_type_find_short_name(spa_type_data_type, d->type), d->type,
+        d->mapoffset, d->maxsize);
     if (d->type == SPA_DATA_MemFd) {
-      GST_LOG_OBJECT (pool, "memory type MemFd");
       gmem = gst_fd_allocator_alloc (pool->fd_allocator, dup(d->fd),
                 d->mapoffset + d->maxsize, GST_FD_MEMORY_FLAG_NONE);
       gst_memory_resize (gmem, d->mapoffset, d->maxsize);
     }
     else if(d->type == SPA_DATA_DmaBuf) {
-      GST_LOG_OBJECT (pool, "memory type DmaBuf");
       gmem = gst_fd_allocator_alloc (pool->dmabuf_allocator, dup(d->fd),
                 d->mapoffset + d->maxsize, GST_FD_MEMORY_FLAG_NONE);
       gst_memory_resize (gmem, d->mapoffset, d->maxsize);
     }
     else if (d->type == SPA_DATA_MemPtr) {
-      GST_LOG_OBJECT (pool, "memory type MemPtr");
       gmem = gst_memory_new_wrapped (0, d->data, d->maxsize, 0,
                                      d->maxsize, NULL, NULL);
     }
@@ -116,58 +118,50 @@
                              data,
                              pool_data_destroy);
   b->user_data = data;
-}
 
-GstPipeWirePoolData *gst_pipewire_pool_get_data (GstBuffer *buffer)
-{
-  return gst_mini_object_get_qdata (GST_MINI_OBJECT_CAST (buffer), pool_data_quark);
+  pool->n_buffers++;
 }
 
-#if 0
-gboolean
-gst_pipewire_pool_add_buffer (GstPipeWirePool *pool, GstBuffer *buffer)
+void gst_pipewire_pool_remove_buffer (GstPipeWirePool *pool, struct pw_buffer *b)
 {
-  g_return_val_if_fail (GST_IS_PIPEWIRE_POOL (pool), FALSE);
-  g_return_val_if_fail (GST_IS_BUFFER (buffer), FALSE);
+  GstPipeWirePoolData *data = b->user_data;
 
-  GST_OBJECT_LOCK (pool);
-  g_queue_push_tail (&pool->available, buffer);
-  g_cond_signal (&pool->cond);
-  GST_OBJECT_UNLOCK (pool);
+  data->b = NULL;
+  data->header = NULL;
+  data->crop = NULL;
+  data->videotransform = NULL;
 
-  return TRUE;
-}
+  gst_buffer_remove_all_memory (data->buf);
 
-gboolean
-gst_pipewire_pool_remove_buffer (GstPipeWirePool *pool, GstBuffer *buffer)
-{
-  gboolean res;
+  /* this will also destroy the pool data, if this is the last reference */
+  gst_clear_buffer (&data->buf);
 
-  g_return_val_if_fail (GST_IS_PIPEWIRE_POOL (pool), FALSE);
-  g_return_val_if_fail (GST_IS_BUFFER (buffer), FALSE);
-
-  GST_OBJECT_LOCK (pool);
-  res = g_queue_remove (&pool->available, buffer);
-  GST_OBJECT_UNLOCK (pool);
+  pool->n_buffers--;
+}
 
-  return res;
+GstPipeWirePoolData *gst_pipewire_pool_get_data (GstBuffer *buffer)
+{
+  return gst_mini_object_get_qdata (GST_MINI_OBJECT_CAST (buffer), pool_data_quark);
 }
-#endif
 
 static GstFlowReturn
 acquire_buffer (GstBufferPool * pool, GstBuffer ** buffer,
         GstBufferPoolAcquireParams * params)
 {
   GstPipeWirePool *p = GST_PIPEWIRE_POOL (pool);
+  g_autoptr (GstPipeWireStream) s = g_weak_ref_get (&p->stream);
   GstPipeWirePoolData *data;
   struct pw_buffer *b;
 
+  if (G_UNLIKELY (!s))
+    return GST_FLOW_ERROR;
+
   GST_OBJECT_LOCK (pool);
   while (TRUE) {
     if (G_UNLIKELY (GST_BUFFER_POOL_IS_FLUSHING (pool)))
       goto flushing;
 
-    if ((b = pw_stream_dequeue_buffer(p->stream)))
+    if ((b = pw_stream_dequeue_buffer(s->pwstream)))
       break;
 
     if (params && (params->flags & GST_BUFFER_POOL_ACQUIRE_FLAG_DONTWAIT))
@@ -181,7 +175,7 @@
   *buffer = data->buf;
 
   GST_OBJECT_UNLOCK (pool);
-  GST_DEBUG ("acquire buffer %p", *buffer);
+  GST_LOG_OBJECT (pool, "acquire buffer %p", *buffer);
 
   return GST_FLOW_OK;
 
@@ -210,6 +204,7 @@
 {
   GstPipeWirePool *p = GST_PIPEWIRE_POOL (pool);
   GstCaps *caps;
+  GstStructure *structure;
   guint size, min_buffers, max_buffers;
   gboolean has_video;
 
@@ -223,7 +218,14 @@
     return FALSE;
   }
 
-  has_video = gst_video_info_from_caps (&p->video_info, caps);
+  structure = gst_caps_get_structure (caps, 0);
+  if (g_str_has_prefix (gst_structure_get_name (structure), "video/") ||
+      g_str_has_prefix (gst_structure_get_name (structure), "image/")) {
+    has_video = TRUE;
+    gst_video_info_from_caps (&p->video_info, caps);
+  } else {
+    has_video = FALSE;
+  }
 
   p->add_metavideo = has_video && gst_buffer_pool_config_has_option (config,
       GST_BUFFER_POOL_OPTION_VIDEO_META);
@@ -250,7 +252,7 @@
 static void
 release_buffer (GstBufferPool * pool, GstBuffer *buffer)
 {
-  GST_DEBUG ("release buffer %p", buffer);
+  GST_LOG_OBJECT (pool, "release buffer %p", buffer);
 }
 
 static gboolean
@@ -266,6 +268,7 @@
   GstPipeWirePool *pool = GST_PIPEWIRE_POOL (object);
 
   GST_DEBUG_OBJECT (pool, "finalize");
+  g_weak_ref_set (&pool->stream, NULL);
   g_object_unref (pool->fd_allocator);
   g_object_unref (pool->dmabuf_allocator);

pipewire-1.0.1.tar.bz2/src/gst/gstpipewirepool.h -> pipewire-1.2.0.tar.gz/src/gst/gstpipewirepool.h Changed

@@ -5,6 +5,8 @@
 #ifndef __GST_PIPEWIRE_POOL_H__
 #define __GST_PIPEWIRE_POOL_H__
 
+#include "gstpipewirestream.h"
+
 #include <gst/gst.h>
 
 #include <gst/video/video.h>
@@ -13,23 +15,10 @@
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_PIPEWIRE_POOL \
-  (gst_pipewire_pool_get_type())
-#define GST_PIPEWIRE_POOL(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PIPEWIRE_POOL,GstPipeWirePool))
-#define GST_PIPEWIRE_POOL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PIPEWIRE_POOL,GstPipeWirePoolClass))
-#define GST_IS_PIPEWIRE_POOL(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PIPEWIRE_POOL))
-#define GST_IS_PIPEWIRE_POOL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PIPEWIRE_POOL))
-#define GST_PIPEWIRE_POOL_GET_CLASS(klass) \
-  (G_TYPE_INSTANCE_GET_CLASS ((klass), GST_TYPE_PIPEWIRE_POOL, GstPipeWirePoolClass))
+#define GST_TYPE_PIPEWIRE_POOL (gst_pipewire_pool_get_type())
+G_DECLARE_FINAL_TYPE (GstPipeWirePool, gst_pipewire_pool, GST, PIPEWIRE_POOL, GstBufferPool)
 
 typedef struct _GstPipeWirePoolData GstPipeWirePoolData;
-typedef struct _GstPipeWirePool GstPipeWirePool;
-typedef struct _GstPipeWirePoolClass GstPipeWirePoolClass;
-
 struct _GstPipeWirePoolData {
   GstPipeWirePool *pool;
   void *owner;
@@ -45,8 +34,8 @@
 struct _GstPipeWirePool {
   GstBufferPool parent;
 
-  struct pw_stream *stream;
-  struct pw_type *t;
+  GWeakRef stream;
+  guint n_buffers;
 
   gboolean add_metavideo;
   GstVideoInfo video_info;
@@ -57,20 +46,18 @@
   GCond cond;
 };
 
-struct _GstPipeWirePoolClass {
-  GstBufferPoolClass parent_class;
-};
-
-GType gst_pipewire_pool_get_type (void);
-
-GstPipeWirePool *  gst_pipewire_pool_new           (void);
+GstPipeWirePool *  gst_pipewire_pool_new (GstPipeWireStream *stream);
 
 void gst_pipewire_pool_wrap_buffer (GstPipeWirePool *pool, struct pw_buffer *buffer);
+void gst_pipewire_pool_remove_buffer (GstPipeWirePool *pool, struct pw_buffer *buffer);
 
-GstPipeWirePoolData *gst_pipewire_pool_get_data (GstBuffer *buffer);
+static inline gboolean
+gst_pipewire_pool_has_buffers (GstPipeWirePool *pool)
+{
+  return pool->n_buffers > 0;
+}
 
-//gboolean        gst_pipewire_pool_add_buffer    (GstPipeWirePool *pool, GstBuffer *buffer);
-//gboolean        gst_pipewire_pool_remove_buffer (GstPipeWirePool *pool, GstBuffer *buffer);
+GstPipeWirePoolData *gst_pipewire_pool_get_data (GstBuffer *buffer);
 
 G_END_DECLS

pipewire-1.0.1.tar.bz2/src/gst/gstpipewiresink.c -> pipewire-1.2.0.tar.gz/src/gst/gstpipewiresink.c Changed

@@ -29,6 +29,7 @@
 
 #include <gst/video/video.h>
 
+#include "gstpipewireclock.h"
 #include "gstpipewireformat.h"
 
 GST_DEBUG_CATEGORY_STATIC (pipewire_sink_debug);
@@ -95,23 +96,40 @@
 
 static GstFlowReturn gst_pipewire_sink_render (GstBaseSink * psink,
     GstBuffer * buffer);
-static gboolean gst_pipewire_sink_start (GstBaseSink * basesink);
-static gboolean gst_pipewire_sink_stop (GstBaseSink * basesink);
+
+static GstClock *
+gst_pipewire_sink_provide_clock (GstElement * elem)
+{
+  GstPipeWireSink *pwsink = GST_PIPEWIRE_SINK (elem);
+  GstClock *clock;
+
+  GST_OBJECT_LOCK (pwsink);
+  if (!GST_OBJECT_FLAG_IS_SET (pwsink, GST_ELEMENT_FLAG_PROVIDE_CLOCK))
+    goto clock_disabled;
+
+  if (pwsink->stream->clock)
+    clock = GST_CLOCK_CAST (gst_object_ref (pwsink->stream->clock));
+  else
+    clock = NULL;
+  GST_OBJECT_UNLOCK (pwsink);
+
+  return clock;
+
+  /* ERRORS */
+clock_disabled:
+  {
+    GST_DEBUG_OBJECT (pwsink, "clock provide disabled");
+    GST_OBJECT_UNLOCK (pwsink);
+    return NULL;
+  }
+}
 
 static void
 gst_pipewire_sink_finalize (GObject * object)
 {
   GstPipeWireSink *pwsink = GST_PIPEWIRE_SINK (object);
 
-  g_object_unref (pwsink->pool);
-
-  if (pwsink->stream_properties)
-    gst_structure_free (pwsink->stream_properties);
-  if (pwsink->client_properties)
-    gst_structure_free (pwsink->client_properties);
-  g_free (pwsink->path);
-  g_free (pwsink->target_object);
-  g_free (pwsink->client_name);
+  gst_clear_object (&pwsink->stream);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -121,7 +139,7 @@
 {
   GstPipeWireSink *pwsink = GST_PIPEWIRE_SINK (bsink);
 
-  gst_query_add_allocation_pool (query, GST_BUFFER_POOL_CAST (pwsink->pool), 0, 0, 0);
+  gst_query_add_allocation_pool (query, GST_BUFFER_POOL_CAST (pwsink->stream->pool), 0, 0, 0);
   gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL);
   return TRUE;
 }
@@ -206,11 +224,12 @@
                                                       G_PARAM_READWRITE |
                                                       G_PARAM_STATIC_STRINGS));
 
+  gstelement_class->provide_clock = gst_pipewire_sink_provide_clock;
   gstelement_class->change_state = gst_pipewire_sink_change_state;
 
   gst_element_class_set_static_metadata (gstelement_class,
-      "PipeWire sink", "Sink/Video",
-      "Send video to PipeWire", "Wim Taymans <wim.taymans@gmail.com>");
+      "PipeWire sink", "Sink/Audio/Video",
+      "Send audio/video to PipeWire", "Wim Taymans <wim.taymans@gmail.com>");
 
   gst_element_class_add_pad_template (gstelement_class,
       gst_static_pad_template_get (&gst_pipewire_sink_template));
@@ -218,8 +237,6 @@
   gstbasesink_class->set_caps = gst_pipewire_sink_setcaps;
   gstbasesink_class->fixate = gst_pipewire_sink_sink_fixate;
   gstbasesink_class->propose_allocation = gst_pipewire_sink_propose_allocation;
-  gstbasesink_class->start = gst_pipewire_sink_start;
-  gstbasesink_class->stop = gst_pipewire_sink_stop;
   gstbasesink_class->render = gst_pipewire_sink_render;
 
   GST_DEBUG_CATEGORY_INIT (pipewire_sink_debug, "pipewiresink", 0,
@@ -227,8 +244,9 @@
 }
 
 static void
-pool_activated (GstPipeWirePool *pool, GstPipeWireSink *sink)
+gst_pipewire_sink_update_params (GstPipeWireSink *sink)
 {
+  GstPipeWirePool *pool = sink->stream->pool;
   GstStructure *config;
   GstCaps *caps;
   guint size;
@@ -244,24 +262,19 @@
 
   spa_pod_builder_init (&b, buffer, sizeof (buffer));
   spa_pod_builder_push_object (&b, &f, SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers);
-  if (size == 0)
-    spa_pod_builder_add (&b,
-        SPA_PARAM_BUFFERS_size, SPA_POD_CHOICE_RANGE_Int(0, 0, INT32_MAX),
-        0);
-  else
-    spa_pod_builder_add (&b,
-        SPA_PARAM_BUFFERS_size, SPA_POD_CHOICE_RANGE_Int(size, size, INT32_MAX),
-        0);
+  spa_pod_builder_add (&b,
+      SPA_PARAM_BUFFERS_size, SPA_POD_CHOICE_RANGE_Int(size, size, INT32_MAX),
+      0);
 
   spa_pod_builder_add (&b,
       SPA_PARAM_BUFFERS_stride,  SPA_POD_CHOICE_RANGE_Int(0, 0, INT32_MAX),
       SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(
-	      SPA_MAX(MIN_BUFFERS, min_buffers),
-	      SPA_MAX(MIN_BUFFERS, min_buffers),
-	      max_buffers ? max_buffers : INT32_MAX),
+              SPA_MAX(MIN_BUFFERS, min_buffers),
+              SPA_MAX(MIN_BUFFERS, min_buffers),
+              max_buffers ? max_buffers : INT32_MAX),
       SPA_PARAM_BUFFERS_dataType, SPA_POD_CHOICE_FLAGS_Int(
-						(1<<SPA_DATA_MemFd) |
-						(1<<SPA_DATA_MemPtr)),
+                                                (1<<SPA_DATA_MemFd) |
+                                                (1<<SPA_DATA_MemPtr)),
       0);
   port_params0 = spa_pod_builder_pop (&b, &f);
 
@@ -275,20 +288,28 @@
       SPA_PARAM_META_type, SPA_POD_Id(SPA_META_VideoCrop),
       SPA_PARAM_META_size, SPA_POD_Int(sizeof (struct spa_meta_region)));
 
-  pw_thread_loop_lock (sink->core->loop);
-  pw_stream_update_params (sink->stream, port_params, 3);
-  pw_thread_loop_unlock (sink->core->loop);
+  pw_thread_loop_lock (sink->stream->core->loop);
+  pw_stream_update_params (sink->stream->pwstream, port_params, 3);
+  pw_thread_loop_unlock (sink->stream->core->loop);
+}
+
+static void
+pool_activated (GstPipeWirePool *pool, GstPipeWireSink *sink)
+{
+  GST_DEBUG_OBJECT (pool, "activated");
+  g_cond_signal (&sink->stream->pool->cond);
 }
 
 static void
 gst_pipewire_sink_init (GstPipeWireSink * sink)
 {
-  sink->pool =  gst_pipewire_pool_new ();
-  sink->client_name = g_strdup(pw_get_client_name());
+  sink->stream =  gst_pipewire_stream_new (GST_ELEMENT (sink));
+
   sink->mode = DEFAULT_PROP_MODE;
-  sink->fd = -1;
 
-  g_signal_connect (sink->pool, "activated", G_CALLBACK (pool_activated), sink);
+  GST_OBJECT_FLAG_SET (sink, GST_ELEMENT_FLAG_PROVIDE_CLOCK);
+
+  g_signal_connect (sink->stream->pool, "activated", G_CALLBACK (pool_activated), sink);
 }
 
 static GstCaps *
@@ -350,31 +371,31 @@
 
   switch (prop_id) {
     case PROP_PATH:
-      g_free (pwsink->path);
-      pwsink->path = g_value_dup_string (value);
+      g_free (pwsink->stream->path);
+      pwsink->stream->path = g_value_dup_string (value);
       break;
 
     case PROP_TARGET_OBJECT:
-      g_free (pwsink->target_object);
-      pwsink->target_object = g_value_dup_string (value);
+      g_free (pwsink->stream->target_object);
+      pwsink->stream->target_object = g_value_dup_string (value);
       break;
 
     case PROP_CLIENT_NAME:
-      g_free (pwsink->client_name);
-      pwsink->client_name = g_value_dup_string (value);
+      g_free (pwsink->stream->client_name);
+      pwsink->stream->client_name = g_value_dup_string (value);
       break;
 
     case PROP_CLIENT_PROPERTIES:
-      if (pwsink->client_properties)
-        gst_structure_free (pwsink->client_properties);
-      pwsink->client_properties =
+      if (pwsink->stream->client_properties)
+        gst_structure_free (pwsink->stream->client_properties);
+      pwsink->stream->client_properties =
           gst_structure_copy (gst_value_get_structure (value));
       break;
 
     case PROP_STREAM_PROPERTIES:
-      if (pwsink->stream_properties)
-        gst_structure_free (pwsink->stream_properties);
-      pwsink->stream_properties =
+      if (pwsink->stream->stream_properties)
+        gst_structure_free (pwsink->stream->stream_properties);
+      pwsink->stream->stream_properties =
           gst_structure_copy (gst_value_get_structure (value));
       break;
 
@@ -383,7 +404,7 @@
       break;
 
     case PROP_FD:
-      pwsink->fd = g_value_get_int (value);
+      pwsink->stream->fd = g_value_get_int (value);
       break;
 
     default:
@@ -400,23 +421,23 @@
 
   switch (prop_id) {
     case PROP_PATH:
-      g_value_set_string (value, pwsink->path);
+      g_value_set_string (value, pwsink->stream->path);
       break;
 
     case PROP_TARGET_OBJECT:
-      g_value_set_string (value, pwsink->target_object);
+      g_value_set_string (value, pwsink->stream->target_object);
       break;
 
     case PROP_CLIENT_NAME:
-      g_value_set_string (value, pwsink->client_name);
+      g_value_set_string (value, pwsink->stream->client_name);
       break;
 
     case PROP_CLIENT_PROPERTIES:
-      gst_value_set_structure (value, pwsink->client_properties);
+      gst_value_set_structure (value, pwsink->stream->client_properties);
       break;
 
     case PROP_STREAM_PROPERTIES:
-      gst_value_set_structure (value, pwsink->stream_properties);
+      gst_value_set_structure (value, pwsink->stream->stream_properties);
       break;
 
     case PROP_MODE:
@@ -424,7 +445,7 @@
       break;
 
     case PROP_FD:
-      g_value_set_int (value, pwsink->fd);
+      g_value_set_int (value, pwsink->stream->fd);
       break;
 
     default:
@@ -437,18 +458,23 @@
 on_add_buffer (void *_data, struct pw_buffer *b)
 {
   GstPipeWireSink *pwsink = _data;
-  gst_pipewire_pool_wrap_buffer (pwsink->pool, b);
+  GST_DEBUG_OBJECT (pwsink, "add pw_buffer %p", b);
+  gst_pipewire_pool_wrap_buffer (pwsink->stream->pool, b);
 }
 
 static void
 on_remove_buffer (void *_data, struct pw_buffer *b)
 {
   GstPipeWireSink *pwsink = _data;
-  GstPipeWirePoolData *data = b->user_data;
-
-  GST_LOG_OBJECT (pwsink, "remove buffer");
-
-  gst_buffer_unref (data->buf);
+  GST_DEBUG_OBJECT (pwsink, "remove pw_buffer %p", b);
+  gst_pipewire_pool_remove_buffer (pwsink->stream->pool, b);
+
+  if (!gst_pipewire_pool_has_buffers (pwsink->stream->pool) &&
+      !GST_BUFFER_POOL_IS_FLUSHING (GST_BUFFER_POOL_CAST (pwsink->stream->pool))) {
+    GST_ELEMENT_ERROR (pwsink, RESOURCE, NOT_FOUND,
+        ("all buffers have been removed"),
+        ("PipeWire link to remote node was destroyed"));
+  }
 }
 
 static void
@@ -461,6 +487,8 @@
 
   data = gst_pipewire_pool_get_data(buffer);
 
+  GST_LOG_OBJECT (pwsink, "queue buffer %p, pw_buffer %p", buffer, data->b);
+
   b = data->b->buffer;
 
   if (data->header) {
@@ -485,7 +513,7 @@
     GstMemory *mem = gst_buffer_peek_memory (buffer, i);
     d->chunk->offset = mem->offset;
     d->chunk->size = mem->size;
-    d->chunk->stride = pwsink->pool->video_info.stridei;
+    d->chunk->stride = pwsink->stream->pool->video_info.stridei;
   }
 
   GstVideoMeta *meta = gst_buffer_get_video_meta (buffer);
@@ -500,11 +528,11 @@
         video_size += d->chunk->size;
       }
     } else {
-      GST_ERROR ("plane num not matching, meta:%u buffer:%u", meta->n_planes, b->n_datas);
+      GST_ERROR_OBJECT (pwsink, "plane num not matching, meta:%u buffer:%u", meta->n_planes, b->n_datas);
     }
   }
 
-  if ((res = pw_stream_queue_buffer (pwsink->stream, data->b)) < 0) {
+  if ((res = pw_stream_queue_buffer (pwsink->stream->pwstream, data->b)) < 0) {
     g_warning ("can't send buffer %s", spa_strerror(res));
   }
 }
@@ -514,8 +542,8 @@
 on_process (void *data)
 {
   GstPipeWireSink *pwsink = data;
-  GST_DEBUG ("signal");
-  g_cond_signal (&pwsink->pool->cond);
+  GST_LOG_OBJECT (pwsink, "signal");
+  g_cond_signal (&pwsink->stream->pool->cond);
 }
 
 static void
@@ -523,7 +551,8 @@
 {
   GstPipeWireSink *pwsink = data;
 
-  GST_DEBUG ("got stream state %d", state);
+  GST_DEBUG_OBJECT (pwsink, "got stream state \"%s\" (%d)",
+      pw_stream_state_as_string(state), state);
 
   switch (state) {
     case PW_STREAM_STATE_UNCONNECTED:
@@ -531,54 +560,67 @@
     case PW_STREAM_STATE_PAUSED:
       break;
     case PW_STREAM_STATE_STREAMING:
-      if (pw_stream_is_driving (pwsink->stream))
-        pw_stream_trigger_process (pwsink->stream);
+      if (pw_stream_is_driving (pwsink->stream->pwstream))
+        pw_stream_trigger_process (pwsink->stream->pwstream);
       break;
     case PW_STREAM_STATE_ERROR:
       /* make the error permanent, if it is not already;
          pw_stream_set_error() will recursively call us again */
-      if (pw_stream_get_state (pwsink->stream, NULL) != PW_STREAM_STATE_ERROR)
-        pw_stream_set_error (pwsink->stream, -EPIPE, "%s", error);
+      if (pw_stream_get_state (pwsink->stream->pwstream, NULL) != PW_STREAM_STATE_ERROR)
+        pw_stream_set_error (pwsink->stream->pwstream, -EPIPE, "%s", error);
       else
         GST_ELEMENT_ERROR (pwsink, RESOURCE, FAILED,
             ("stream error: %s", error), (NULL));
       break;
   }
-  pw_thread_loop_signal (pwsink->core->loop, FALSE);
+  pw_thread_loop_signal (pwsink->stream->core->loop, FALSE);
 }
 
 static void
 on_param_changed (void *data, uint32_t id, const struct spa_pod *param)
 {
   GstPipeWireSink *pwsink = data;
+  GstPipeWirePool *pool = pwsink->stream->pool;
 
   if (param == NULL || id != SPA_PARAM_Format)
-          return;
+    return;
 
-  if (gst_buffer_pool_is_active (GST_BUFFER_POOL_CAST (pwsink->pool)))
-    pool_activated (pwsink->pool, pwsink);
+  GST_OBJECT_LOCK (pool);
+  while (!gst_buffer_pool_is_active (GST_BUFFER_POOL (pool))) {
+    GST_DEBUG_OBJECT (pool, "waiting for pool to become active");
+    g_cond_wait(&pool->cond, GST_OBJECT_GET_LOCK (pool));
+  }
+  GST_OBJECT_UNLOCK (pool);
+
+  gst_pipewire_sink_update_params (pwsink);
 }
 
 static gboolean
 gst_pipewire_sink_setcaps (GstBaseSink * bsink, GstCaps * caps)
 {
   GstPipeWireSink *pwsink;
-  GPtrArray *possible;
+  g_autoptr(GPtrArray) possible = NULL;
   enum pw_stream_state state;
   const char *error = NULL;
   gboolean res = FALSE;
-  GstStructure *config;
+  GstStructure *config, *s;
   guint size;
   guint min_buffers;
   guint max_buffers;
   struct timespec abstime;
+  gint rate;
 
   pwsink = GST_PIPEWIRE_SINK (bsink);
 
-  possible = gst_caps_to_format_all (caps, SPA_PARAM_EnumFormat);
+  s = gst_caps_get_structure (caps, 0);
+  rate = 0;
+  if (gst_structure_has_name (s, "audio/x-raw"))
+    gst_structure_get_int (s, "rate", &rate);
 
-  pw_thread_loop_lock (pwsink->core->loop);
-  state = pw_stream_get_state (pwsink->stream, &error);
+  possible = gst_caps_to_format_all (caps);
+
+  pw_thread_loop_lock (pwsink->stream->core->loop);
+  state = pw_stream_get_state (pwsink->stream->pwstream, &error);
 
   if (state == PW_STREAM_STATE_ERROR)
     goto start_error;
@@ -586,6 +628,9 @@
   if (state == PW_STREAM_STATE_UNCONNECTED) {
     enum pw_stream_flags flags;
     uint32_t target_id;
+    struct spa_dict_item items3;
+    uint32_t n_items = 0;
+    char buf64;
 
     flags = PW_STREAM_FLAG_ASYNC;
     if (pwsink->mode != GST_PIPEWIRE_SINK_MODE_PROVIDE)
@@ -593,41 +638,40 @@
     else
       flags |= PW_STREAM_FLAG_DRIVER;
 
-    target_id = pwsink->path ? (uint32_t)atoi(pwsink->path) : PW_ID_ANY;
+    target_id = pwsink->stream->path ? (uint32_t)atoi(pwsink->stream->path) : PW_ID_ANY;
 
-    if (pwsink->target_object) {
-      struct spa_dict_item items2 = {
-        SPA_DICT_ITEM_INIT(PW_KEY_TARGET_OBJECT, pwsink->target_object),
-	/* XXX deprecated but the portal and some example apps only
-	 * provide the object id */
-        SPA_DICT_ITEM_INIT(PW_KEY_NODE_TARGET, NULL),
-      };
-      struct spa_dict dict = SPA_DICT_INIT_ARRAY(items);
+    if (pwsink->stream->target_object) {
       uint64_t serial;
 
+      itemsn_items++ = SPA_DICT_ITEM_INIT(PW_KEY_TARGET_OBJECT, pwsink->stream->target_object);
+
       /* If target.object is a name, set it also to node.target */
-      if (spa_atou64(pwsink->target_object, &serial, 0)) {
-        dict.n_items = 1;
-      } else {
+      if (!spa_atou64(pwsink->stream->target_object, &serial, 0)) {
         target_id = PW_ID_ANY;
-        items1.value = pwsink->target_object;
+        /* XXX deprecated but the portal and some example apps only
+         * provide the object id */
+        itemsn_items++ = SPA_DICT_ITEM_INIT(PW_KEY_NODE_TARGET, pwsink->stream->target_object);
       }
-
-      pw_stream_update_properties (pwsink->stream, &dict);
     }
+    if (rate != 0) {
+      snprintf(buf, sizeof(buf), "1/%u", rate);
+      itemsn_items++ = SPA_DICT_ITEM_INIT(PW_KEY_NODE_RATE, buf);
+    }
+    if (n_items > 0)
+	    pw_stream_update_properties (pwsink->stream->pwstream, &SPA_DICT_INIT(items, n_items));
 
-    pw_stream_connect (pwsink->stream,
+    pw_stream_connect (pwsink->stream->pwstream,
                           PW_DIRECTION_OUTPUT,
                           target_id,
                           flags,
                           (const struct spa_pod **) possible->pdata,
                           possible->len);
 
-    pw_thread_loop_get_time (pwsink->core->loop, &abstime,
+    pw_thread_loop_get_time (pwsink->stream->core->loop, &abstime,
               GST_PIPEWIRE_DEFAULT_TIMEOUT * SPA_NSEC_PER_SEC);
 
     while (TRUE) {
-      state = pw_stream_get_state (pwsink->stream, &error);
+      state = pw_stream_get_state (pwsink->stream->pwstream, &error);
 
       if (state >= PW_STREAM_STATE_PAUSED)
         break;
@@ -635,7 +679,7 @@
       if (state == PW_STREAM_STATE_ERROR)
         goto start_error;
 
-      if (pw_thread_loop_timed_wait_full (pwsink->core->loop, &abstime) < 0) {
+      if (pw_thread_loop_timed_wait_full (pwsink->stream->core->loop, &abstime) < 0) {
         error = "timeout";
         goto start_error;
       }
@@ -643,12 +687,14 @@
   }
   res = TRUE;
 
-  config = gst_buffer_pool_get_config (GST_BUFFER_POOL_CAST (pwsink->pool));
+  gst_pipewire_clock_reset (GST_PIPEWIRE_CLOCK (pwsink->stream->clock), 0);
+
+  config = gst_buffer_pool_get_config (GST_BUFFER_POOL_CAST (pwsink->stream->pool));
   gst_buffer_pool_config_get_params (config, NULL, &size, &min_buffers, &max_buffers);
   gst_buffer_pool_config_set_params (config, caps, size, min_buffers, max_buffers);
-  gst_buffer_pool_set_config (GST_BUFFER_POOL_CAST (pwsink->pool), config);
+  gst_buffer_pool_set_config (GST_BUFFER_POOL_CAST (pwsink->stream->pool), config);
 
-  pw_thread_loop_unlock (pwsink->core->loop);
+  pw_thread_loop_unlock (pwsink->stream->core->loop);
 
   pwsink->negotiated = res;
 
@@ -656,9 +702,8 @@
 
 start_error:
   {
-    GST_ERROR ("could not start stream: %s", error);
-    pw_thread_loop_unlock (pwsink->core->loop);
-    g_ptr_array_unref (possible);
+    GST_ERROR_OBJECT (pwsink, "could not start stream: %s", error);
+    pw_thread_loop_unlock (pwsink->stream->core->loop);
     return FALSE;
   }
 }
@@ -676,13 +721,13 @@
   if (!pwsink->negotiated)
     goto not_negotiated;
 
-  if (buffer->pool != GST_BUFFER_POOL_CAST (pwsink->pool) &&
-      !gst_buffer_pool_is_active (GST_BUFFER_POOL_CAST (pwsink->pool))) {
+  if (buffer->pool != GST_BUFFER_POOL_CAST (pwsink->stream->pool) &&
+      !gst_buffer_pool_is_active (GST_BUFFER_POOL_CAST (pwsink->stream->pool))) {
     GstStructure *config;
     GstCaps *caps;
     guint size, min_buffers, max_buffers;
 
-    config = gst_buffer_pool_get_config (GST_BUFFER_POOL_CAST (pwsink->pool));
+    config = gst_buffer_pool_get_config (GST_BUFFER_POOL_CAST (pwsink->stream->pool));
     gst_buffer_pool_config_get_params (config, &caps, &size, &min_buffers, &max_buffers);
 
     if (size == 0) {
@@ -692,23 +737,23 @@
     }
 
     gst_buffer_pool_config_set_params (config, caps, size, min_buffers, max_buffers);
-    gst_buffer_pool_set_config (GST_BUFFER_POOL_CAST (pwsink->pool), config);
+    gst_buffer_pool_set_config (GST_BUFFER_POOL_CAST (pwsink->stream->pool), config);
 
-    gst_buffer_pool_set_active (GST_BUFFER_POOL_CAST (pwsink->pool), TRUE);
+    gst_buffer_pool_set_active (GST_BUFFER_POOL_CAST (pwsink->stream->pool), TRUE);
   }
 
-  pw_thread_loop_lock (pwsink->core->loop);
-  if (pw_stream_get_state (pwsink->stream, &error) != PW_STREAM_STATE_STREAMING)
+  pw_thread_loop_lock (pwsink->stream->core->loop);
+  if (pw_stream_get_state (pwsink->stream->pwstream, &error) != PW_STREAM_STATE_STREAMING)
     goto done_unlock;
 
-  if (buffer->pool != GST_BUFFER_POOL_CAST (pwsink->pool)) {
+  if (buffer->pool != GST_BUFFER_POOL_CAST (pwsink->stream->pool)) {
     GstBuffer *b = NULL;
     GstMapInfo info = { 0, };
     GstBufferPoolAcquireParams params = { 0, };
 
-    pw_thread_loop_unlock (pwsink->core->loop);
+    pw_thread_loop_unlock (pwsink->stream->core->loop);
 
-    if ((res = gst_buffer_pool_acquire_buffer (GST_BUFFER_POOL_CAST (pwsink->pool), &b, &params)) != GST_FLOW_OK)
+    if ((res = gst_buffer_pool_acquire_buffer (GST_BUFFER_POOL_CAST (pwsink->stream->pool), &b, &params)) != GST_FLOW_OK)
       goto done;
 
     gst_buffer_map (b, &info, GST_MAP_WRITE);
@@ -719,21 +764,20 @@
     buffer = b;
     unref_buffer = TRUE;
 
-    pw_thread_loop_lock (pwsink->core->loop);
-    if (pw_stream_get_state (pwsink->stream, &error) != PW_STREAM_STATE_STREAMING)
+    pw_thread_loop_lock (pwsink->stream->core->loop);
+    if (pw_stream_get_state (pwsink->stream->pwstream, &error) != PW_STREAM_STATE_STREAMING)
       goto done_unlock;
   }
 
-  GST_DEBUG ("push buffer");
   do_send_buffer (pwsink, buffer);
   if (unref_buffer)
     gst_buffer_unref (buffer);
 
-  if (pw_stream_is_driving (pwsink->stream))
-    pw_stream_trigger_process (pwsink->stream);
+  if (pw_stream_is_driving (pwsink->stream->pwstream))
+    pw_stream_trigger_process (pwsink->stream->pwstream);
 
 done_unlock:
-  pw_thread_loop_unlock (pwsink->core->loop);
+  pw_thread_loop_unlock (pwsink->stream->core->loop);
 done:
   return res;
 
@@ -743,26 +787,6 @@
   }
 }
 
-static gboolean
-copy_properties (GQuark field_id,
-                 const GValue *value,
-                 gpointer user_data)
-{
-  struct pw_properties *properties = user_data;
-  GValue dst = { 0 };
-
-  if (g_value_type_transformable (G_VALUE_TYPE(value), G_TYPE_STRING)) {
-    g_value_init(&dst, G_TYPE_STRING);
-    if (g_value_transform(value, &dst)) {
-      pw_properties_set (properties,
-                         g_quark_to_string (field_id),
-                         g_value_get_string (&dst));
-    }
-    g_value_unset(&dst);
-  }
-  return TRUE;
-}
-
 static const struct pw_stream_events stream_events = {
         PW_VERSION_STREAM_EVENTS,
         .state_changed = on_state_changed,
@@ -772,114 +796,6 @@
         .process = on_process,
 };
 
-static gboolean
-gst_pipewire_sink_start (GstBaseSink * basesink)
-{
-  GstPipeWireSink *pwsink = GST_PIPEWIRE_SINK (basesink);
-  struct pw_properties *props;
-
-  pwsink->negotiated = FALSE;
-
-  pw_thread_loop_lock (pwsink->core->loop);
-
-  props = pw_properties_new (NULL, NULL);
-  if (pwsink->client_name) {
-    pw_properties_set (props, PW_KEY_NODE_NAME, pwsink->client_name);
-    pw_properties_set (props, PW_KEY_NODE_DESCRIPTION, pwsink->client_name);
-  }
-  if (pwsink->stream_properties) {
-    gst_structure_foreach (pwsink->stream_properties, copy_properties, props);
-  }
-
-  if ((pwsink->stream = pw_stream_new (pwsink->core->core, pwsink->client_name, props)) == NULL)
-    goto no_stream;
-
-  pwsink->pool->stream = pwsink->stream;
-
-  pw_stream_add_listener(pwsink->stream,
-                         &pwsink->stream_listener,
-                         &stream_events,
-                         pwsink);
-
-  pw_thread_loop_unlock (pwsink->core->loop);
-
-  return TRUE;
-
-no_stream:
-  {
-    GST_ELEMENT_ERROR (pwsink, RESOURCE, FAILED, ("can't create stream"), (NULL));
-    pw_thread_loop_unlock (pwsink->core->loop);
-    return FALSE;
-  }
-}
-
-static gboolean
-gst_pipewire_sink_stop (GstBaseSink * basesink)
-{
-  GstPipeWireSink *pwsink = GST_PIPEWIRE_SINK (basesink);
-
-  pw_thread_loop_lock (pwsink->core->loop);
-  if (pwsink->stream) {
-    pw_stream_destroy (pwsink->stream);
-    pwsink->stream = NULL;
-    pwsink->pool->stream = NULL;
-  }
-  pw_thread_loop_unlock (pwsink->core->loop);
-
-  pwsink->negotiated = FALSE;
-
-  return TRUE;
-}
-
-static gboolean
-gst_pipewire_sink_open (GstPipeWireSink * pwsink)
-{
-  struct pw_properties *props;
-
-  GST_DEBUG_OBJECT (pwsink, "open");
-
-  pwsink->core = gst_pipewire_core_get(pwsink->fd);
-  if (pwsink->core == NULL)
-      goto connect_error;
-
-  pw_thread_loop_lock (pwsink->core->loop);
-
-  props = pw_properties_new (NULL, NULL);
-  if (pwsink->client_properties) {
-    gst_structure_foreach (pwsink->client_properties, copy_properties, props);
-    pw_core_update_properties (pwsink->core->core, &props->dict);
-  }
-  pw_properties_free(props);
-  pw_thread_loop_unlock (pwsink->core->loop);
-
-  return TRUE;
-
-  /* ERRORS */
-connect_error:
-  {
-    GST_ELEMENT_ERROR (pwsink, RESOURCE, FAILED,
-        ("Failed to connect"), (NULL));
-    return FALSE;
-  }
-}
-
-static gboolean
-gst_pipewire_sink_close (GstPipeWireSink * pwsink)
-{
-  pw_thread_loop_lock (pwsink->core->loop);
-  if (pwsink->stream) {
-    pw_stream_destroy (pwsink->stream);
-    pwsink->stream = NULL;
-  }
-  pw_thread_loop_unlock (pwsink->core->loop);
-
-  if (pwsink->core) {
-    gst_pipewire_core_release (pwsink->core);
-    pwsink->core = NULL;
-  }
-  return TRUE;
-}
-
 static GstStateChangeReturn
 gst_pipewire_sink_change_state (GstElement * element, GstStateChange transition)
 {
@@ -888,24 +804,33 @@
 
   switch (transition) {
     case GST_STATE_CHANGE_NULL_TO_READY:
-      if (!gst_pipewire_sink_open (this))
+      if (!gst_pipewire_stream_open (this->stream, &stream_events))
         goto open_failed;
       break;
     case GST_STATE_CHANGE_READY_TO_PAUSED:
+      /* the initial stream state is active, which is needed for linking and
+       * negotiation to happen and the bufferpool to be set up. We don't know
+       * if we'll go to plaing, so we deactivate the stream until that
+       * transition happens. This is janky, but because of how bins propagate
+       * state changes one transition at a time, there may not be a better way
+       * to do this. PAUSED -> READY -> PAUSED transitions, this is a noop */
+      pw_thread_loop_lock (this->stream->core->loop);
+      pw_stream_set_active(this->stream->pwstream, false);
+      pw_thread_loop_unlock (this->stream->core->loop);
       break;
     case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
       /* uncork and start play */
-      pw_thread_loop_lock (this->core->loop);
-      pw_stream_set_active(this->stream, true);
-      pw_thread_loop_unlock (this->core->loop);
-      gst_buffer_pool_set_flushing(GST_BUFFER_POOL_CAST(this->pool), FALSE);
+      pw_thread_loop_lock (this->stream->core->loop);
+      pw_stream_set_active(this->stream->pwstream, true);
+      pw_thread_loop_unlock (this->stream->core->loop);
+      gst_buffer_pool_set_flushing(GST_BUFFER_POOL_CAST(this->stream->pool), FALSE);
       break;
     case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
       /* stop play ASAP by corking */
-      pw_thread_loop_lock (this->core->loop);
-      pw_stream_set_active(this->stream, false);
-      pw_thread_loop_unlock (this->core->loop);
-      gst_buffer_pool_set_flushing(GST_BUFFER_POOL_CAST(this->pool), TRUE);
+      pw_thread_loop_lock (this->stream->core->loop);
+      pw_stream_set_active(this->stream->pwstream, false);
+      pw_thread_loop_unlock (this->stream->core->loop);
+      gst_buffer_pool_set_flushing(GST_BUFFER_POOL_CAST(this->stream->pool), TRUE);
       break;
     default:
       break;
@@ -917,10 +842,11 @@
     case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
       break;
     case GST_STATE_CHANGE_PAUSED_TO_READY:
-      gst_buffer_pool_set_active(GST_BUFFER_POOL_CAST(this->pool), FALSE);
+      gst_buffer_pool_set_active(GST_BUFFER_POOL_CAST(this->stream->pool), FALSE);
+      this->negotiated = FALSE;
       break;
     case GST_STATE_CHANGE_READY_TO_NULL:
-      gst_pipewire_sink_close (this);
+      gst_pipewire_stream_close (this->stream);
       break;
     default:
       break;

pipewire-1.0.1.tar.bz2/src/gst/gstpipewiresink.h -> pipewire-1.2.0.tar.gz/src/gst/gstpipewiresink.h Changed

@@ -5,6 +5,8 @@
 #ifndef __GST_PIPEWIRE_SINK_H__
 #define __GST_PIPEWIRE_SINK_H__
 
+#include "gstpipewirestream.h"
+
 #include <gst/gst.h>
 #include <gst/base/gstbasesink.h>
 
@@ -14,22 +16,9 @@
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_PIPEWIRE_SINK \
-  (gst_pipewire_sink_get_type())
-#define GST_PIPEWIRE_SINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PIPEWIRE_SINK,GstPipeWireSink))
-#define GST_PIPEWIRE_SINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PIPEWIRE_SINK,GstPipeWireSinkClass))
-#define GST_IS_PIPEWIRE_SINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PIPEWIRE_SINK))
-#define GST_IS_PIPEWIRE_SINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PIPEWIRE_SINK))
-#define GST_PIPEWIRE_SINK_CAST(obj) \
-  ((GstPipeWireSink *) (obj))
-
-typedef struct _GstPipeWireSink GstPipeWireSink;
-typedef struct _GstPipeWireSinkClass GstPipeWireSinkClass;
-
+#define GST_TYPE_PIPEWIRE_SINK (gst_pipewire_sink_get_type())
+#define GST_PIPEWIRE_SINK_CAST(obj) ((GstPipeWireSink *) (obj))
+G_DECLARE_FINAL_TYPE (GstPipeWireSink, gst_pipewire_sink, GST, PIPEWIRE_SINK, GstBaseSink)
 
 /**
  * GstPipeWireSinkMode:
@@ -57,32 +46,14 @@
   GstBaseSink element;
 
   /*< private >*/
-  gchar *path;
-  gchar *target_object;
-  gchar *client_name;
-  int fd;
+  GstPipeWireStream *stream;
 
   /* video state */
   gboolean negotiated;
 
-  GstPipeWireCore *core;
-  struct spa_hook core_listener;
-  GstStructure *client_properties;
-
-  struct pw_stream *stream;
-  struct spa_hook stream_listener;
-
-  GstStructure *stream_properties;
   GstPipeWireSinkMode mode;
-
-  GstPipeWirePool *pool;
-};
-
-struct _GstPipeWireSinkClass {
-  GstBaseSinkClass parent_class;
 };
 
-GType gst_pipewire_sink_get_type (void);
 GType gst_pipewire_sink_mode_get_type (void);
 
 G_END_DECLS

pipewire-1.0.1.tar.bz2/src/gst/gstpipewiresrc.c -> pipewire-1.2.0.tar.gz/src/gst/gstpipewiresrc.c Changed

@@ -15,7 +15,6 @@
 
 #define PW_ENABLE_DEPRECATED
 
-#include "config.h"
 #include "gstpipewiresrc.h"
 #include "gstpipewireformat.h"
 
@@ -102,31 +101,31 @@
 
   switch (prop_id) {
     case PROP_PATH:
-      g_free (pwsrc->path);
-      pwsrc->path = g_value_dup_string (value);
+      g_free (pwsrc->stream->path);
+      pwsrc->stream->path = g_value_dup_string (value);
       break;
 
     case PROP_TARGET_OBJECT:
-      g_free (pwsrc->target_object);
-      pwsrc->target_object = g_value_dup_string (value);
+      g_free (pwsrc->stream->target_object);
+      pwsrc->stream->target_object = g_value_dup_string (value);
       break;
 
     case PROP_CLIENT_NAME:
-      g_free (pwsrc->client_name);
-      pwsrc->client_name = g_value_dup_string (value);
+      g_free (pwsrc->stream->client_name);
+      pwsrc->stream->client_name = g_value_dup_string (value);
       break;
 
     case PROP_CLIENT_PROPERTIES:
-      if (pwsrc->client_properties)
-        gst_structure_free (pwsrc->client_properties);
-      pwsrc->client_properties =
+      if (pwsrc->stream->client_properties)
+        gst_structure_free (pwsrc->stream->client_properties);
+      pwsrc->stream->client_properties =
           gst_structure_copy (gst_value_get_structure (value));
       break;
 
     case PROP_STREAM_PROPERTIES:
-      if (pwsrc->stream_properties)
-        gst_structure_free (pwsrc->stream_properties);
-      pwsrc->stream_properties =
+      if (pwsrc->stream->stream_properties)
+        gst_structure_free (pwsrc->stream->stream_properties);
+      pwsrc->stream->stream_properties =
           gst_structure_copy (gst_value_get_structure (value));
       break;
 
@@ -143,7 +142,7 @@
       break;
 
     case PROP_FD:
-      pwsrc->fd = g_value_get_int (value);
+      pwsrc->stream->fd = g_value_get_int (value);
       break;
 
     case PROP_RESEND_LAST:
@@ -172,23 +171,23 @@
 
   switch (prop_id) {
     case PROP_PATH:
-      g_value_set_string (value, pwsrc->path);
+      g_value_set_string (value, pwsrc->stream->path);
       break;
 
     case PROP_TARGET_OBJECT:
-      g_value_set_string (value, pwsrc->target_object);
+      g_value_set_string (value, pwsrc->stream->target_object);
       break;
 
     case PROP_CLIENT_NAME:
-      g_value_set_string (value, pwsrc->client_name);
+      g_value_set_string (value, pwsrc->stream->client_name);
       break;
 
     case PROP_CLIENT_PROPERTIES:
-      gst_value_set_structure (value, pwsrc->client_properties);
+      gst_value_set_structure (value, pwsrc->stream->client_properties);
       break;
 
     case PROP_STREAM_PROPERTIES:
-      gst_value_set_structure (value, pwsrc->stream_properties);
+      gst_value_set_structure (value, pwsrc->stream->stream_properties);
       break;
 
     case PROP_ALWAYS_COPY:
@@ -204,7 +203,7 @@
       break;
 
     case PROP_FD:
-      g_value_set_int (value, pwsrc->fd);
+      g_value_set_int (value, pwsrc->stream->fd);
       break;
 
     case PROP_RESEND_LAST:
@@ -235,8 +234,8 @@
   if (!GST_OBJECT_FLAG_IS_SET (pwsrc, GST_ELEMENT_FLAG_PROVIDE_CLOCK))
     goto clock_disabled;
 
-  if (pwsrc->clock && pwsrc->is_live)
-    clock = GST_CLOCK_CAST (gst_object_ref (pwsrc->clock));
+  if (pwsrc->stream->clock && pwsrc->is_live)
+    clock = GST_CLOCK_CAST (gst_object_ref (pwsrc->stream->clock));
   else
     clock = NULL;
   GST_OBJECT_UNLOCK (pwsrc);
@@ -257,16 +256,7 @@
 {
   GstPipeWireSrc *pwsrc = GST_PIPEWIRE_SRC (object);
 
-  if (pwsrc->stream_properties)
-    gst_structure_free (pwsrc->stream_properties);
-  if (pwsrc->client_properties)
-    gst_structure_free (pwsrc->client_properties);
-  if (pwsrc->clock)
-    gst_object_unref (pwsrc->clock);
-  g_free (pwsrc->path);
-  g_free (pwsrc->target_object);
-  g_free (pwsrc->client_name);
-  g_object_unref(pwsrc->pool);
+  gst_clear_object (&pwsrc->stream);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -402,8 +392,8 @@
   gstelement_class->send_event = gst_pipewire_src_send_event;
 
   gst_element_class_set_static_metadata (gstelement_class,
-      "PipeWire source", "Source/Video",
-      "Uses PipeWire to create video", "Wim Taymans <wim.taymans@gmail.com>");
+      "PipeWire source", "Source/Audio/Video",
+      "Uses PipeWire to create audio/video", "Wim Taymans <wim.taymans@gmail.com>");
 
   gst_element_class_add_pad_template (gstelement_class,
       gst_static_pad_template_get (&gst_pipewire_src_template));
@@ -435,17 +425,16 @@
 
   GST_OBJECT_FLAG_SET (src, GST_ELEMENT_FLAG_PROVIDE_CLOCK);
 
+  src->stream = gst_pipewire_stream_new (GST_ELEMENT (src));
+
   src->always_copy = DEFAULT_ALWAYS_COPY;
   src->min_buffers = DEFAULT_MIN_BUFFERS;
   src->max_buffers = DEFAULT_MAX_BUFFERS;
-  src->fd = -1;
   src->resend_last = DEFAULT_RESEND_LAST;
   src->keepalive_time = DEFAULT_KEEPALIVE_TIME;
   src->autoconnect = DEFAULT_AUTOCONNECT;
-
-  src->client_name = g_strdup(pw_get_client_name ());
-
-  src->pool =  gst_pipewire_pool_new ();
+  src->min_latency = 0;
+  src->max_latency = GST_CLOCK_TIME_NONE;
 }
 
 static gboolean
@@ -466,9 +455,9 @@
   GST_BUFFER_FLAGS (obj) = data->flags;
   src = data->owner;
 
-  pw_thread_loop_lock (src->core->loop);
+  pw_thread_loop_lock (src->stream->core->loop);
   if (!obj->dispose) {
-    pw_thread_loop_unlock (src->core->loop);
+    pw_thread_loop_unlock (src->stream->core->loop);
     GST_OBJECT_UNLOCK (data->pool);
     return TRUE;
   }
@@ -477,12 +466,12 @@
 
   data->queued = TRUE;
 
-  if ((res = pw_stream_queue_buffer (src->stream, data->b)) < 0)
+  if ((res = pw_stream_queue_buffer (src->stream->pwstream, data->b)) < 0)
     GST_WARNING_OBJECT (src, "can't queue recycled buffer %p, %s", obj, spa_strerror(res));
   else
     GST_LOG_OBJECT (src, "recycle buffer %p", obj);
 
-  pw_thread_loop_unlock (src->core->loop);
+  pw_thread_loop_unlock (src->stream->core->loop);
 
   GST_OBJECT_UNLOCK (data->pool);
 
@@ -495,7 +484,7 @@
   GstPipeWireSrc *pwsrc = _data;
   GstPipeWirePoolData *data;
 
-  gst_pipewire_pool_wrap_buffer (pwsrc->pool, b);
+  gst_pipewire_pool_wrap_buffer (pwsrc->stream->pool, b);
   data = b->user_data;
   GST_DEBUG_OBJECT (pwsrc, "add buffer %p", data->buf);
   data->owner = pwsrc;
@@ -518,7 +507,7 @@
   if (data->queued) {
     gst_buffer_unref (buf);
   } else {
-    if ((res = pw_stream_queue_buffer (pwsrc->stream, b)) < 0)
+    if ((res = pw_stream_queue_buffer (pwsrc->stream->pwstream, b)) < 0)
       GST_WARNING_OBJECT (pwsrc, "can't queue removed buffer %p, %s", buf, spa_strerror(res));
   }
 }
@@ -550,9 +539,10 @@
   struct spa_meta_header *h;
   struct spa_meta_region *crop;
   struct spa_meta_videotransform *videotransform;
+  struct pw_time time;
   guint i;
 
-  b = pw_stream_dequeue_buffer (pwsrc->stream);
+  b = pw_stream_dequeue_buffer (pwsrc->stream->pwstream);
   if (b == NULL)
           return NULL;
 
@@ -568,6 +558,17 @@
     return NULL;
   }
 
+  pw_stream_get_time_n(pwsrc->stream->pwstream, &time, sizeof(time));
+
+  if (pwsrc->delay != time.delay && time.rate.denom != 0) {
+    pwsrc->min_latency = time.delay * GST_SECOND * time.rate.num / time.rate.denom;
+    GST_LOG_OBJECT (pwsrc, "latency changed %"PRIi64" -> %"PRIi64" %"PRIu64,
+		    pwsrc->delay, time.delay, pwsrc->min_latency);
+    pwsrc->delay = time.delay;
+    gst_element_post_message (GST_ELEMENT_CAST (pwsrc),
+      gst_message_new_latency (GST_OBJECT_CAST (pwsrc)));
+  }
+
   GST_LOG_OBJECT (pwsrc, "got new buffer %p", data->buf);
 
   buf = gst_buffer_new ();
@@ -586,7 +587,21 @@
         GST_BUFFER_DTS (buf) = GST_BUFFER_PTS (buf) + h->dts_offset;
     }
     GST_BUFFER_OFFSET (buf) = h->seq;
+  } else {
+    GST_BUFFER_PTS (buf) = b->time - pwsrc->delay;
+    GST_BUFFER_DTS (buf) = b->time - pwsrc->delay;
   }
+
+  if (pwsrc->is_video) {
+    if (pwsrc->video_info.fps_n) {
+      GST_BUFFER_DURATION (buf) = gst_util_uint64_scale (GST_SECOND,
+          pwsrc->video_info.fps_d, pwsrc->video_info.fps_n);
+    }
+  } else {
+    GST_BUFFER_DURATION (buf) = gst_util_uint64_scale (GST_SECOND,
+        time.size * time.rate.num, time.rate.denom);
+  }
+
   crop = data->crop;
   if (crop) {
     GstVideoCropMeta *meta = gst_buffer_get_video_crop_meta(buf);
@@ -662,7 +677,7 @@
 on_process (void *_data)
 {
   GstPipeWireSrc *pwsrc = _data;
-  pw_thread_loop_signal (pwsrc->core->loop, FALSE);
+  pw_thread_loop_signal (pwsrc->stream->core->loop, FALSE);
 }
 
 static void
@@ -683,14 +698,14 @@
     case PW_STREAM_STATE_ERROR:
       /* make the error permanent, if it is not already;
          pw_stream_set_error() will recursively call us again */
-      if (pw_stream_get_state (pwsrc->stream, NULL) != PW_STREAM_STATE_ERROR)
-        pw_stream_set_error (pwsrc->stream, -EPIPE, "%s", error);
+      if (pw_stream_get_state (pwsrc->stream->pwstream, NULL) != PW_STREAM_STATE_ERROR)
+        pw_stream_set_error (pwsrc->stream->pwstream, -EPIPE, "%s", error);
       else
         GST_ELEMENT_ERROR (pwsrc, RESOURCE, FAILED,
             ("stream error: %s", error), (NULL));
       break;
   }
-  pw_thread_loop_signal (pwsrc->core->loop, FALSE);
+  pw_thread_loop_signal (pwsrc->stream->core->loop, FALSE);
 }
 
 static void
@@ -702,12 +717,6 @@
   GST_OBJECT_LOCK (pwsrc);
   var = pw_properties_get (props, PW_KEY_STREAM_IS_LIVE);
   is_live = pwsrc->is_live = var ? pw_properties_parse_bool(var) : TRUE;
-
-  var = pw_properties_get (props, PW_KEY_STREAM_LATENCY_MIN);
-  pwsrc->min_latency = var ? (GstClockTime) atoi (var) : 0;
-
-  var = pw_properties_get (props, PW_KEY_STREAM_LATENCY_MAX);
-  pwsrc->max_latency = var ? (GstClockTime) atoi (var) : GST_CLOCK_TIME_NONE;
   GST_OBJECT_UNLOCK (pwsrc);
 
   GST_DEBUG_OBJECT (pwsrc, "live %d", is_live);
@@ -721,14 +730,14 @@
   const char *error = NULL;
   struct timespec abstime;
 
-  pw_thread_loop_lock (pwsrc->core->loop);
+  pw_thread_loop_lock (pwsrc->stream->core->loop);
   GST_DEBUG_OBJECT (pwsrc, "doing stream start");
 
-  pw_thread_loop_get_time (pwsrc->core->loop, &abstime,
+  pw_thread_loop_get_time (pwsrc->stream->core->loop, &abstime,
                   GST_PIPEWIRE_DEFAULT_TIMEOUT * SPA_NSEC_PER_SEC);
 
   while (TRUE) {
-    enum pw_stream_state state = pw_stream_get_state (pwsrc->stream, &error);
+    enum pw_stream_state state = pw_stream_get_state (pwsrc->stream->pwstream, &error);
 
     GST_DEBUG_OBJECT (pwsrc, "waiting for STREAMING, now %s", pw_stream_state_as_string (state));
     if (state == PW_STREAM_STATE_STREAMING)
@@ -742,25 +751,26 @@
       goto start_error;
     }
 
-    if (pw_thread_loop_timed_wait_full (pwsrc->core->loop, &abstime) < 0) {
+    if (pw_thread_loop_timed_wait_full (pwsrc->stream->core->loop, &abstime) < 0) {
       error = "timeout";
       goto start_error;
     }
   }
 
-  parse_stream_properties (pwsrc, pw_stream_get_properties (pwsrc->stream));
+  parse_stream_properties (pwsrc, pw_stream_get_properties (pwsrc->stream->pwstream));
   GST_DEBUG_OBJECT (pwsrc, "signal started");
   pwsrc->started = TRUE;
-  pw_thread_loop_signal (pwsrc->core->loop, FALSE);
-  pw_thread_loop_unlock (pwsrc->core->loop);
+  pw_thread_loop_signal (pwsrc->stream->core->loop, FALSE);
+  pw_thread_loop_unlock (pwsrc->stream->core->loop);
 
   return TRUE;
 
 start_error:
   {
     GST_DEBUG_OBJECT (pwsrc, "error starting stream: %s", error);
-    pw_thread_loop_signal (pwsrc->core->loop, FALSE);
-    pw_thread_loop_unlock (pwsrc->core->loop);
+    pwsrc->started = FALSE;
+    pw_thread_loop_signal (pwsrc->stream->core->loop, FALSE);
+    pw_thread_loop_unlock (pwsrc->stream->core->loop);
     return FALSE;
   }
 }
@@ -771,20 +781,29 @@
   enum pw_stream_state state, prev_state = PW_STREAM_STATE_UNCONNECTED;
   const char *error = NULL;
   struct timespec abstime;
+  gboolean restart = FALSE;
 
-  pw_thread_loop_lock (this->core->loop);
+  pw_thread_loop_lock (this->stream->core->loop);
 
-  pw_thread_loop_get_time (this->core->loop, &abstime,
+  pw_thread_loop_get_time (this->stream->core->loop, &abstime,
                   GST_PIPEWIRE_DEFAULT_TIMEOUT * SPA_NSEC_PER_SEC);
 
+  /* when started already is true then expects a re-start, so allow prev_state
+   * degrade until turned around. */
+  if (this->started) {
+    GST_DEBUG_OBJECT (this, "restart in progress");
+    restart = TRUE;
+    this->started = FALSE;
+  }
+
   while (TRUE) {
-    state = pw_stream_get_state (this->stream, &error);
+    state = pw_stream_get_state (this->stream->pwstream, &error);
 
     GST_DEBUG_OBJECT (this, "waiting for started signal, state now %s",
         pw_stream_state_as_string (state));
 
     if (state == PW_STREAM_STATE_ERROR ||
-        (state == PW_STREAM_STATE_UNCONNECTED && prev_state > PW_STREAM_STATE_UNCONNECTED) ||
+        (state == PW_STREAM_STATE_UNCONNECTED && prev_state > PW_STREAM_STATE_UNCONNECTED && !restart) ||
         this->flushing) {
       state = PW_STREAM_STATE_ERROR;
       break;
@@ -793,16 +812,22 @@
     if (this->started)
       break;
 
-    if (pw_thread_loop_timed_wait_full (this->core->loop, &abstime) < 0) {
-      state = PW_STREAM_STATE_ERROR;
-      break;
+    if (this->autoconnect) {
+      if (pw_thread_loop_timed_wait_full (this->stream->core->loop, &abstime) < 0) {
+        state = PW_STREAM_STATE_ERROR;
+        break;
+      }
+    } else {
+      pw_thread_loop_wait (this->stream->core->loop);
     }
 
+    if (restart)
+      restart = state != PW_STREAM_STATE_UNCONNECTED;
     prev_state = state;
   }
   GST_DEBUG_OBJECT (this, "got started signal: %s",
                   pw_stream_state_as_string (state));
-  pw_thread_loop_unlock (this->core->loop);
+  pw_thread_loop_unlock (this->stream->core->loop);
 
   return state;
 }
@@ -811,11 +836,12 @@
 gst_pipewire_src_negotiate (GstBaseSrc * basesrc)
 {
   GstPipeWireSrc *pwsrc = GST_PIPEWIRE_SRC (basesrc);
-  GstCaps *thiscaps;
-  GstCaps *caps = NULL;
-  GstCaps *peercaps = NULL;
+  g_autoptr (GstCaps) thiscaps = NULL;
+  g_autoptr (GstCaps) possible_caps = NULL;
+  g_autoptr (GstCaps) negotiated_caps = NULL;
+  g_autoptr (GstCaps) peercaps = NULL;
+  g_autoptr (GPtrArray) possible = NULL;
   gboolean result = FALSE;
-  GPtrArray *possible;
   const char *error = NULL;
   struct timespec abstime;
   uint32_t target_id;
@@ -835,47 +861,62 @@
   GST_DEBUG_OBJECT (basesrc, "caps of peer: %" GST_PTR_FORMAT, peercaps);
   if (peercaps) {
     /* The result is already a subset of our caps */
-    caps = peercaps;
-    gst_caps_unref (thiscaps);
+    possible_caps = g_steal_pointer (&peercaps);
   } else {
     /* no peer, work with our own caps then */
-    caps = thiscaps;
+    possible_caps = g_steal_pointer (&thiscaps);
   }
-  if (caps == NULL || gst_caps_is_empty (caps))
+
+  GST_DEBUG_OBJECT (basesrc, "have common caps: %" GST_PTR_FORMAT, possible_caps);
+  gst_caps_sanitize (&possible_caps);
+
+  if (gst_caps_is_empty (possible_caps))
     goto no_common_caps;
 
-  GST_DEBUG_OBJECT (basesrc, "have common caps: %" GST_PTR_FORMAT, caps);
+  GST_DEBUG_OBJECT (basesrc, "have common caps (sanitized): %" GST_PTR_FORMAT, possible_caps);
+
+  if (pw_stream_get_state(pwsrc->stream->pwstream, NULL) == PW_STREAM_STATE_STREAMING) {
+    g_autoptr (GstCaps) current_caps = NULL;
+    g_autoptr (GstCaps) preferred_new_caps = NULL;
+
+    current_caps = gst_pad_get_current_caps (GST_BASE_SRC_PAD (pwsrc));
+    preferred_new_caps = gst_caps_copy_nth (possible_caps, 0);
+
+    if (current_caps && gst_caps_is_equal (current_caps, preferred_new_caps)) {
+      GST_DEBUG_OBJECT (pwsrc,
+                        "Stream running and new caps equal current ones. "
+                        "Skipping renegotiation.");
+      goto no_nego_needed;
+    }
+  }
 
   /* open a connection with these caps */
-  possible = gst_caps_to_format_all (caps, SPA_PARAM_EnumFormat);
-  gst_caps_unref (caps);
+  possible = gst_caps_to_format_all (possible_caps);
 
   /* first disconnect */
-  pw_thread_loop_lock (pwsrc->core->loop);
-  if (pw_stream_get_state(pwsrc->stream, &error) != PW_STREAM_STATE_UNCONNECTED) {
+  pw_thread_loop_lock (pwsrc->stream->core->loop);
+  if (pw_stream_get_state(pwsrc->stream->pwstream, &error) != PW_STREAM_STATE_UNCONNECTED) {
     GST_DEBUG_OBJECT (basesrc, "disconnect capture");
-    pw_stream_disconnect (pwsrc->stream);
+    pw_stream_disconnect (pwsrc->stream->pwstream);
     while (TRUE) {
-      enum pw_stream_state state = pw_stream_get_state (pwsrc->stream, &error);
+      enum pw_stream_state state = pw_stream_get_state (pwsrc->stream->pwstream, &error);
 
       GST_DEBUG_OBJECT (basesrc, "waiting for UNCONNECTED, now %s", pw_stream_state_as_string (state));
       if (state == PW_STREAM_STATE_UNCONNECTED)
         break;
 
-      if (state == PW_STREAM_STATE_ERROR || pwsrc->flushing) {
-        g_ptr_array_unref (possible);
+      if (state == PW_STREAM_STATE_ERROR || pwsrc->flushing)
         goto connect_error;
-      }
 
-      pw_thread_loop_wait (pwsrc->core->loop);
+      pw_thread_loop_wait (pwsrc->stream->core->loop);
     }
   }
 
-  target_id = pwsrc->path ? (uint32_t)atoi(pwsrc->path) : PW_ID_ANY;
+  target_id = pwsrc->stream->path ? (uint32_t)atoi(pwsrc->stream->path) : PW_ID_ANY;
 
-  if (pwsrc->target_object) {
+  if (pwsrc->stream->target_object) {
       struct spa_dict_item items2 = {
-        SPA_DICT_ITEM_INIT(PW_KEY_TARGET_OBJECT, pwsrc->target_object),
+        SPA_DICT_ITEM_INIT(PW_KEY_TARGET_OBJECT, pwsrc->stream->target_object),
 	/* XXX deprecated but the portal and some example apps only
 	 * provide the object id */
         SPA_DICT_ITEM_INIT(PW_KEY_NODE_TARGET, NULL),
@@ -884,37 +925,39 @@
       uint64_t serial;
 
       /* If target.object is a name, set it also to node.target */
-      if (spa_atou64(pwsrc->target_object, &serial, 0)) {
+      if (spa_atou64(pwsrc->stream->target_object, &serial, 0)) {
         dict.n_items = 1;
       } else {
         target_id = PW_ID_ANY;
-        items1.value = pwsrc->target_object;
+        items1.value = pwsrc->stream->target_object;
       }
 
-      pw_stream_update_properties (pwsrc->stream, &dict);
+      pw_stream_update_properties (pwsrc->stream->pwstream, &dict);
   }
 
   GST_DEBUG_OBJECT (basesrc, "connect capture with path %s, target-object %s",
-                    pwsrc->path, pwsrc->target_object);
-  pwsrc->negotiated = FALSE;
+                    pwsrc->stream->path, pwsrc->stream->target_object);
+
   enum pw_stream_flags flags;
   flags = PW_STREAM_FLAG_DONT_RECONNECT |
 	  PW_STREAM_FLAG_ASYNC;
   if (pwsrc->autoconnect)
     flags |= PW_STREAM_FLAG_AUTOCONNECT;
-  pw_stream_connect (pwsrc->stream,
+  pw_stream_connect (pwsrc->stream->pwstream,
                      PW_DIRECTION_INPUT,
                      target_id,
                      flags,
                      (const struct spa_pod **)possible->pdata,
                      possible->len);
-  g_ptr_array_free (possible, TRUE);
 
-  pw_thread_loop_get_time (pwsrc->core->loop, &abstime,
+  pw_thread_loop_get_time (pwsrc->stream->core->loop, &abstime,
                   GST_PIPEWIRE_DEFAULT_TIMEOUT * SPA_NSEC_PER_SEC);
 
+  pwsrc->possible_caps = possible_caps;
+  pwsrc->negotiated = FALSE;
+
   while (TRUE) {
-    enum pw_stream_state state = pw_stream_get_state (pwsrc->stream, &error);
+    enum pw_stream_state state = pw_stream_get_state (pwsrc->stream->pwstream, &error);
 
     GST_DEBUG_OBJECT (basesrc, "waiting for NEGOTIATED, now %s", pw_stream_state_as_string (state));
     if (state == PW_STREAM_STATE_ERROR || pwsrc->flushing)
@@ -923,33 +966,35 @@
     if (pwsrc->negotiated)
       break;
 
-    if (pw_thread_loop_timed_wait_full (pwsrc->core->loop, &abstime) < 0)
+    if (pwsrc->autoconnect) {
+      if (pw_thread_loop_timed_wait_full (pwsrc->stream->core->loop, &abstime) < 0)
         goto connect_error;
+    } else {
+      pw_thread_loop_wait (pwsrc->stream->core->loop);
+    }
   }
-  caps = pwsrc->caps;
-  pwsrc->caps = NULL;
-  pw_thread_loop_unlock (pwsrc->core->loop);
 
-  if (caps == NULL)
+  negotiated_caps = g_steal_pointer (&pwsrc->caps);
+  pwsrc->possible_caps = NULL;
+  pw_thread_loop_unlock (pwsrc->stream->core->loop);
+
+  if (negotiated_caps == NULL)
     goto no_caps;
 
-  gst_pipewire_clock_reset (GST_PIPEWIRE_CLOCK (pwsrc->clock), 0);
+  gst_pipewire_clock_reset (GST_PIPEWIRE_CLOCK (pwsrc->stream->clock), 0);
 
-  GST_DEBUG_OBJECT (pwsrc, "set format %" GST_PTR_FORMAT, caps);
-  result = gst_base_src_set_caps (GST_BASE_SRC (pwsrc), caps);
-  gst_caps_unref (caps);
+  GST_DEBUG_OBJECT (pwsrc, "set format %" GST_PTR_FORMAT, negotiated_caps);
+  result = gst_base_src_set_caps (GST_BASE_SRC (pwsrc), negotiated_caps);
+  if (!result)
+    goto no_caps;
 
   result = gst_pipewire_src_stream_start (pwsrc);
 
-  pwsrc->started = result;
-
   return result;
 
 no_nego_needed:
   {
     GST_DEBUG_OBJECT (basesrc, "no negotiation needed");
-    if (thiscaps)
-      gst_caps_unref (thiscaps);
     return TRUE;
   }
 no_caps:
@@ -959,10 +1004,7 @@
     GST_ELEMENT_ERROR (basesrc, STREAM, FORMAT,
         ("%s", error_string),
         ("This element did not produce valid caps"));
-    pw_stream_set_error (pwsrc->stream, -EINVAL, "%s", error_string);
-
-    if (thiscaps)
-      gst_caps_unref (thiscaps);
+    pw_stream_set_error (pwsrc->stream->pwstream, -EINVAL, "%s", error_string);
     return FALSE;
   }
 no_common_caps:
@@ -972,41 +1014,78 @@
     GST_ELEMENT_ERROR (basesrc, STREAM, FORMAT,
         ("%s", error_string),
         ("This element does not have formats in common with the peer"));
-    pw_stream_set_error (pwsrc->stream, -EPIPE, "%s", error_string);
-
-    if (caps)
-      gst_caps_unref (caps);
+    pw_stream_set_error (pwsrc->stream->pwstream, -EPIPE, "%s", error_string);
     return FALSE;
   }
 connect_error:
   {
+    g_clear_pointer (&pwsrc->caps, gst_caps_unref);
+    pwsrc->possible_caps = NULL;
     GST_DEBUG_OBJECT (basesrc, "connect error");
-    pw_thread_loop_unlock (pwsrc->core->loop);
+    pw_thread_loop_unlock (pwsrc->stream->core->loop);
     return FALSE;
   }
 }
 
 static void
-on_param_changed (void *data, uint32_t id,
+handle_format_change (GstPipeWireSrc *pwsrc,
                    const struct spa_pod *param)
 {
-  GstPipeWireSrc *pwsrc = data;
+  GstStructure *structure;
+  g_autoptr (GstCaps) pw_peer_caps = NULL;
 
-  if (param == NULL || id != SPA_PARAM_Format) {
+  g_clear_pointer (&pwsrc->caps, gst_caps_unref);
+  if (param == NULL) {
     GST_DEBUG_OBJECT (pwsrc, "clear format");
+    pwsrc->negotiated = FALSE;
+    pwsrc->is_video = FALSE;
     return;
   }
-  if (pwsrc->caps)
-          gst_caps_unref(pwsrc->caps);
-  pwsrc->caps = gst_caps_from_format (param);
 
-  pwsrc->is_video = pwsrc->caps != NULL
-                      ? gst_video_info_from_caps (&pwsrc->video_info, pwsrc->caps)
-                      : FALSE;
+  pw_peer_caps = gst_caps_from_format (param);
+  if (pw_peer_caps) {
+    pwsrc->caps = gst_caps_intersect_full (pw_peer_caps,
+                                           pwsrc->possible_caps,
+                                           GST_CAPS_INTERSECT_FIRST);
+    gst_caps_maybe_fixate_dma_format (pwsrc->caps);
+  }
 
-  pwsrc->negotiated = pwsrc->caps != NULL;
+  if (pwsrc->caps && gst_caps_is_fixed (pwsrc->caps)) {
+    pwsrc->negotiated = TRUE;
+
+    structure = gst_caps_get_structure (pwsrc->caps, 0);
+    if (g_str_has_prefix (gst_structure_get_name (structure), "video/") ||
+        g_str_has_prefix (gst_structure_get_name (structure), "image/")) {
+      pwsrc->is_video = TRUE;
+
+#ifdef HAVE_GSTREAMER_DMA_DRM
+      if (gst_video_is_dma_drm_caps (pwsrc->caps)) {
+        if (!gst_video_info_dma_drm_from_caps (&pwsrc->drm_info, pwsrc->caps)) {
+          GST_WARNING_OBJECT (pwsrc, "Can't create drm video info from caps");
+          pw_stream_set_error (pwsrc->stream->pwstream, -EINVAL, "internal error");
+          return;
+        }
+
+        if (!gst_video_info_dma_drm_to_video_info (&pwsrc->drm_info,
+                                                   &pwsrc->video_info)) {
+          GST_WARNING_OBJECT (pwsrc, "Can't create video info from drm video info");
+          pw_stream_set_error (pwsrc->stream->pwstream, -EINVAL, "internal error");
+          return;
+        }
+      } else {
+        gst_video_info_dma_drm_init (&pwsrc->drm_info);
+#endif
+        gst_video_info_from_caps (&pwsrc->video_info, pwsrc->caps);
+#ifdef HAVE_GSTREAMER_DMA_DRM
+      }
+#endif
+    }
+  } else {
+    pwsrc->negotiated = FALSE;
+    pwsrc->is_video = FALSE;
+  }
 
-  if (pwsrc->negotiated) {
+  if (pwsrc->caps) {
     const struct spa_pod *params4;
     struct spa_pod_builder b = { NULL };
     uint8_t buffer512;
@@ -1014,12 +1093,7 @@
     int buffertypes;
 
     buffertypes = (1<<SPA_DATA_DmaBuf);
-    if (spa_pod_find_prop (param, NULL, SPA_FORMAT_VIDEO_modifier)) {
-      gst_caps_features_remove (gst_caps_get_features (pwsrc->caps, 0),
-          GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY);
-      gst_caps_features_add (gst_caps_get_features (pwsrc->caps, 0),
-          GST_CAPS_FEATURE_MEMORY_DMABUF);
-    } else {
+    if (!spa_pod_find_prop (param, NULL, SPA_FORMAT_VIDEO_modifier)) {
       buffertypes |= ((1<<SPA_DATA_MemFd) | (1<<SPA_DATA_MemPtr));
     }
 
@@ -1050,12 +1124,24 @@
         SPA_PARAM_META_size, SPA_POD_Int(sizeof (struct spa_meta_videotransform)));
 
     GST_DEBUG_OBJECT (pwsrc, "doing finish format");
-    pw_stream_update_params (pwsrc->stream, params, SPA_N_ELEMENTS(params));
+    pw_stream_update_params (pwsrc->stream->pwstream, params, SPA_N_ELEMENTS(params));
   } else {
     GST_WARNING_OBJECT (pwsrc, "finish format with error");
-    pw_stream_set_error (pwsrc->stream, -EINVAL, "unhandled format");
+    pw_stream_set_error (pwsrc->stream->pwstream, -EINVAL, "unhandled format");
+  }
+  pw_thread_loop_signal (pwsrc->stream->core->loop, FALSE);
+}
+
+static void
+on_param_changed (void *data, uint32_t id,
+                   const struct spa_pod *param)
+{
+  GstPipeWireSrc *pwsrc = data;
+  switch (id) {
+    case SPA_PARAM_Format:
+      handle_format_change(pwsrc, param);
+      break;
   }
-  pw_thread_loop_signal (pwsrc->core->loop, FALSE);
 }
 
 static gboolean
@@ -1063,11 +1149,11 @@
 {
   GstPipeWireSrc *pwsrc = GST_PIPEWIRE_SRC (basesrc);
 
-  pw_thread_loop_lock (pwsrc->core->loop);
+  pw_thread_loop_lock (pwsrc->stream->core->loop);
   GST_DEBUG_OBJECT (pwsrc, "setting flushing");
   pwsrc->flushing = TRUE;
-  pw_thread_loop_signal (pwsrc->core->loop, FALSE);
-  pw_thread_loop_unlock (pwsrc->core->loop);
+  pw_thread_loop_signal (pwsrc->stream->core->loop, FALSE);
+  pw_thread_loop_unlock (pwsrc->stream->core->loop);
 
   return TRUE;
 }
@@ -1077,10 +1163,10 @@
 {
   GstPipeWireSrc *pwsrc = GST_PIPEWIRE_SRC (basesrc);
 
-  pw_thread_loop_lock (pwsrc->core->loop);
+  pw_thread_loop_lock (pwsrc->stream->core->loop);
   GST_DEBUG_OBJECT (pwsrc, "unsetting flushing");
   pwsrc->flushing = FALSE;
-  pw_thread_loop_unlock (pwsrc->core->loop);
+  pw_thread_loop_unlock (pwsrc->stream->core->loop);
 
   return TRUE;
 }
@@ -1123,8 +1209,6 @@
   switch (GST_QUERY_TYPE (query)) {
     case GST_QUERY_LATENCY:
       GST_OBJECT_LOCK (pwsrc);
-      pwsrc->min_latency = 10000000;
-      pwsrc->max_latency = GST_CLOCK_TIME_NONE;
       gst_query_set_latency (query, pwsrc->is_live, pwsrc->min_latency, pwsrc->max_latency);
       GST_OBJECT_UNLOCK (pwsrc);
       res = TRUE;
@@ -1176,7 +1260,7 @@
 
   pwsrc = GST_PIPEWIRE_SRC (psrc);
 
-  pw_thread_loop_lock (pwsrc->core->loop);
+  pw_thread_loop_lock (pwsrc->stream->core->loop);
   if (!pwsrc->negotiated)
     goto not_negotiated;
 
@@ -1189,7 +1273,7 @@
     if (pwsrc->stream == NULL)
       goto streaming_error;
 
-    state = pw_stream_get_state (pwsrc->stream, &error);
+    state = pw_stream_get_state (pwsrc->stream->pwstream, &error);
     if (state == PW_STREAM_STATE_ERROR)
       goto streaming_error;
 
@@ -1198,13 +1282,13 @@
 
     if ((caps = pwsrc->caps) != NULL) {
       pwsrc->caps = NULL;
-      pw_thread_loop_unlock (pwsrc->core->loop);
+      pw_thread_loop_unlock (pwsrc->stream->core->loop);
 
       GST_DEBUG_OBJECT (pwsrc, "set format %" GST_PTR_FORMAT, caps);
       gst_base_src_set_caps (GST_BASE_SRC (pwsrc), caps);
       gst_caps_unref (caps);
 
-      pw_thread_loop_lock (pwsrc->core->loop);
+      pw_thread_loop_lock (pwsrc->stream->core->loop);
       continue;
     }
 
@@ -1235,15 +1319,15 @@
     timeout = FALSE;
     if (pwsrc->keepalive_time > 0) {
       struct timespec abstime;
-      pw_thread_loop_get_time(pwsrc->core->loop, &abstime,
+      pw_thread_loop_get_time(pwsrc->stream->core->loop, &abstime,
                       pwsrc->keepalive_time * SPA_NSEC_PER_MSEC);
-      if (pw_thread_loop_timed_wait_full (pwsrc->core->loop, &abstime) == -ETIMEDOUT)
+      if (pw_thread_loop_timed_wait_full (pwsrc->stream->core->loop, &abstime) == -ETIMEDOUT)
         timeout = TRUE;
     } else {
-      pw_thread_loop_wait (pwsrc->core->loop);
+      pw_thread_loop_wait (pwsrc->stream->core->loop);
     }
   }
-  pw_thread_loop_unlock (pwsrc->core->loop);
+  pw_thread_loop_unlock (pwsrc->stream->core->loop);
 
   *buffer = buf;
 
@@ -1270,22 +1354,22 @@
 
 not_negotiated:
   {
-    pw_thread_loop_unlock (pwsrc->core->loop);
+    pw_thread_loop_unlock (pwsrc->stream->core->loop);
     return GST_FLOW_NOT_NEGOTIATED;
   }
 streaming_eos:
   {
-    pw_thread_loop_unlock (pwsrc->core->loop);
+    pw_thread_loop_unlock (pwsrc->stream->core->loop);
     return GST_FLOW_EOS;
   }
 streaming_error:
   {
-    pw_thread_loop_unlock (pwsrc->core->loop);
+    pw_thread_loop_unlock (pwsrc->stream->core->loop);
     return GST_FLOW_ERROR;
   }
 streaming_stopped:
   {
-    pw_thread_loop_unlock (pwsrc->core->loop);
+    pw_thread_loop_unlock (pwsrc->stream->core->loop);
     return GST_FLOW_FLUSHING;
   }
 }
@@ -1303,32 +1387,12 @@
 
   pwsrc = GST_PIPEWIRE_SRC (basesrc);
 
-  pw_thread_loop_lock (pwsrc->core->loop);
+  pw_thread_loop_lock (pwsrc->stream->core->loop);
   pwsrc->eos = false;
   gst_buffer_replace (&pwsrc->last_buffer, NULL);
   gst_caps_replace(&pwsrc->caps, NULL);
-  pw_thread_loop_unlock (pwsrc->core->loop);
-
-  return TRUE;
-}
+  pw_thread_loop_unlock (pwsrc->stream->core->loop);
 
-static gboolean
-copy_properties (GQuark field_id,
-                 const GValue *value,
-                 gpointer user_data)
-{
-  struct pw_properties *properties = user_data;
-  GValue dst = { 0 };
-
-  if (g_value_type_transformable (G_VALUE_TYPE(value), G_TYPE_STRING)) {
-    g_value_init(&dst, G_TYPE_STRING);
-    if (g_value_transform(value, &dst)) {
-      pw_properties_set (properties,
-                         g_quark_to_string (field_id),
-                         g_value_get_string (&dst));
-    }
-    g_value_unset(&dst);
-  }
   return TRUE;
 }
 
@@ -1342,94 +1406,6 @@
 };
 
 static gboolean
-gst_pipewire_src_open (GstPipeWireSrc * pwsrc)
-{
-  struct pw_properties *props;
-
-  GST_DEBUG_OBJECT (pwsrc, "open");
-
-  pwsrc->core = gst_pipewire_core_get(pwsrc->fd);
-  if (pwsrc->core == NULL)
-      goto connect_error;
-
-  pw_thread_loop_lock (pwsrc->core->loop);
-
-  props = pw_properties_new (NULL, NULL);
-  if (pwsrc->client_properties) {
-    gst_structure_foreach (pwsrc->client_properties, copy_properties, props);
-    pw_core_update_properties (pwsrc->core->core, &props->dict);
-    pw_properties_clear(props);
-  }
-  if (pwsrc->client_name) {
-    pw_properties_set (props, PW_KEY_NODE_NAME, pwsrc->client_name);
-    pw_properties_set (props, PW_KEY_NODE_DESCRIPTION, pwsrc->client_name);
-  }
-  if (pwsrc->stream_properties) {
-    gst_structure_foreach (pwsrc->stream_properties, copy_properties, props);
-  }
-
-  if ((pwsrc->stream = pw_stream_new (pwsrc->core->core,
-                                  pwsrc->client_name, props)) == NULL)
-    goto no_stream;
-
-
-  pw_stream_add_listener(pwsrc->stream,
-                         &pwsrc->stream_listener,
-                         &stream_events,
-                         pwsrc);
-
-  pwsrc->clock = gst_pipewire_clock_new (pwsrc->stream, pwsrc->last_time);
-  pw_thread_loop_unlock (pwsrc->core->loop);
-
-  return TRUE;
-
-  /* ERRORS */
-connect_error:
-  {
-    GST_ELEMENT_ERROR (pwsrc, RESOURCE, FAILED, ("can't connect"), (NULL));
-    return FALSE;
-  }
-no_stream:
-  {
-    GST_ELEMENT_ERROR (pwsrc, RESOURCE, FAILED, ("can't create stream"), (NULL));
-    pw_thread_loop_unlock (pwsrc->core->loop);
-    gst_pipewire_core_release (pwsrc->core);
-    pwsrc->core = NULL;
-    return FALSE;
-  }
-}
-
-static void
-gst_pipewire_src_close (GstPipeWireSrc * pwsrc)
-{
-  pwsrc->last_time = gst_clock_get_time (pwsrc->clock);
-
-  GST_DEBUG_OBJECT (pwsrc, "close");
-
-  gst_element_post_message (GST_ELEMENT (pwsrc),
-    gst_message_new_clock_lost (GST_OBJECT_CAST (pwsrc), pwsrc->clock));
-
-  GST_OBJECT_LOCK (pwsrc);
-  GST_PIPEWIRE_CLOCK (pwsrc->clock)->stream = NULL;
-  g_clear_object (&pwsrc->clock);
-  GST_OBJECT_UNLOCK (pwsrc);
-
-  GST_OBJECT_LOCK (pwsrc->pool);
-  pw_thread_loop_lock (pwsrc->core->loop);
-  if (pwsrc->stream) {
-    pw_stream_destroy (pwsrc->stream);
-    pwsrc->stream = NULL;
-  }
-  pw_thread_loop_unlock (pwsrc->core->loop);
-  GST_OBJECT_UNLOCK (pwsrc->pool);
-
-  if (pwsrc->core) {
-    gst_pipewire_core_release (pwsrc->core);
-    pwsrc->core = NULL;
-  }
-}
-
-static gboolean
 gst_pipewire_src_send_event (GstElement * elem, GstEvent * event)
 {
   GstPipeWireSrc *this = GST_PIPEWIRE_SRC_CAST (elem);
@@ -1438,10 +1414,10 @@
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_EOS:
       GST_DEBUG_OBJECT (this, "got EOS");
-      pw_thread_loop_lock (this->core->loop);
+      pw_thread_loop_lock (this->stream->core->loop);
       this->eos = true;
-      pw_thread_loop_signal (this->core->loop, FALSE);
-      pw_thread_loop_unlock (this->core->loop);
+      pw_thread_loop_signal (this->stream->core->loop, FALSE);
+      pw_thread_loop_unlock (this->stream->core->loop);
       ret = TRUE;
       break;
     default:
@@ -1459,22 +1435,22 @@
 
   switch (transition) {
     case GST_STATE_CHANGE_NULL_TO_READY:
-      if (!gst_pipewire_src_open (this))
+      if (!gst_pipewire_stream_open (this->stream, &stream_events))
         goto open_failed;
       break;
     case GST_STATE_CHANGE_READY_TO_PAUSED:
       break;
     case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
       /* uncork and start recording */
-      pw_thread_loop_lock (this->core->loop);
-      pw_stream_set_active(this->stream, true);
-      pw_thread_loop_unlock (this->core->loop);
+      pw_thread_loop_lock (this->stream->core->loop);
+      pw_stream_set_active (this->stream->pwstream, true);
+      pw_thread_loop_unlock (this->stream->core->loop);
       break;
     case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
       /* stop recording ASAP by corking */
-      pw_thread_loop_lock (this->core->loop);
-      pw_stream_set_active(this->stream, false);
-      pw_thread_loop_unlock (this->core->loop);
+      pw_thread_loop_lock (this->stream->core->loop);
+      pw_stream_set_active (this->stream->pwstream, false);
+      pw_thread_loop_unlock (this->stream->core->loop);
       break;
     default:
       break;
@@ -1487,18 +1463,28 @@
       if (wait_started (this) == PW_STREAM_STATE_ERROR)
         goto open_failed;
 
+      pw_thread_loop_lock (this->stream->core->loop);
+      /* the initial stream state is active, which is needed for linking and
+       * negotiation to happen and the bufferpool to be set up. We don't know
+       * if we'll go to playing, so we deactivate the stream until that
+       * transition happens. This is janky, but because of how bins propagate
+       * state changes one transition at a time, there may not be a better way
+       * to do this. */
+      pw_stream_set_active (this->stream->pwstream, false);
+      pw_thread_loop_unlock (this->stream->core->loop);
+
       if (gst_base_src_is_live (GST_BASE_SRC (element)))
         ret = GST_STATE_CHANGE_NO_PREROLL;
       break;
     case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
       break;
     case GST_STATE_CHANGE_PAUSED_TO_READY:
-      pw_thread_loop_lock (this->core->loop);
+      pw_thread_loop_lock (this->stream->core->loop);
       this->negotiated = FALSE;
-      pw_thread_loop_unlock (this->core->loop);
+      pw_thread_loop_unlock (this->stream->core->loop);
       break;
     case GST_STATE_CHANGE_READY_TO_NULL:
-      gst_pipewire_src_close (this);
+      gst_pipewire_stream_close (this->stream);
       break;
     default:
       break;

pipewire-1.0.1.tar.bz2/src/gst/gstpipewiresrc.h -> pipewire-1.2.0.tar.gz/src/gst/gstpipewiresrc.h Changed

@@ -5,6 +5,10 @@
 #ifndef __GST_PIPEWIRE_SRC_H__
 #define __GST_PIPEWIRE_SRC_H__
 
+#include "config.h"
+
+#include "gstpipewirestream.h"
+
 #include <gst/gst.h>
 #include <gst/base/gstpushsrc.h>
 
@@ -16,21 +20,10 @@
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_PIPEWIRE_SRC \
-  (gst_pipewire_src_get_type())
-#define GST_PIPEWIRE_SRC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PIPEWIRE_SRC,GstPipeWireSrc))
-#define GST_PIPEWIRE_SRC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PIPEWIRE_SRC,GstPipeWireSrcClass))
-#define GST_IS_PIPEWIRE_SRC(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PIPEWIRE_SRC))
-#define GST_IS_PIPEWIRE_SRC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PIPEWIRE_SRC))
-#define GST_PIPEWIRE_SRC_CAST(obj) \
-  ((GstPipeWireSrc *) (obj))
-
-typedef struct _GstPipeWireSrc GstPipeWireSrc;
-typedef struct _GstPipeWireSrcClass GstPipeWireSrcClass;
+#define GST_TYPE_PIPEWIRE_SRC (gst_pipewire_src_get_type())
+#define GST_PIPEWIRE_SRC_CAST(obj) ((GstPipeWireSrc *) (obj))
+G_DECLARE_FINAL_TYPE (GstPipeWireSrc, gst_pipewire_src, GST, PIPEWIRE_SRC, GstPushSrc)
+
 
 /**
  * GstPipeWireSrc:
@@ -40,22 +33,24 @@
 struct _GstPipeWireSrc {
   GstPushSrc element;
 
+  GstPipeWireStream *stream;
+
   /*< private >*/
-  gchar *path;
-  gchar *target_object;
-  gchar *client_name;
   gboolean always_copy;
   gint min_buffers;
   gint max_buffers;
-  int fd;
   gboolean resend_last;
   gint keepalive_time;
   gboolean autoconnect;
 
   GstCaps *caps;
+  GstCaps *possible_caps;
 
   gboolean is_video;
   GstVideoInfo video_info;
+#ifdef HAVE_GSTREAMER_DMA_DRM
+  GstVideoInfoDmaDrm drm_info;
+#endif
 
   gboolean negotiated;
   gboolean flushing;
@@ -63,34 +58,15 @@
   gboolean eos;
 
   gboolean is_live;
+  int64_t delay;
   GstClockTime min_latency;
   GstClockTime max_latency;
 
-  GstStructure *client_properties;
-  GstPipeWireCore *core;
-  struct spa_hook core_listener;
-  int last_seq;
-  int pending_seq;
-
-  struct pw_stream *stream;
-  struct spa_hook stream_listener;
-
   GstBuffer *last_buffer;
-  GstStructure *stream_properties;
-
-  GstPipeWirePool *pool;
-  GstClock *clock;
-  GstClockTime last_time;
 
   enum spa_meta_videotransform_value transform_value;
 };
 
-struct _GstPipeWireSrcClass {
-  GstPushSrcClass parent_class;
-};
-
-GType gst_pipewire_src_get_type (void);
-
 G_END_DECLS
 
 #endif /* __GST_PIPEWIRE_SRC_H__ */

pipewire-1.2.0.tar.gz/src/gst/gstpipewirestream.c Added

@@ -0,0 +1,166 @@
+/* GStreamer */
+/* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
+/* SPDX-FileCopyrightText: Copyright © 2024 Collabora Ltd. */
+/* SPDX-License-Identifier: MIT */
+
+#include "gstpipewirestream.h"
+
+#include "gstpipewirepool.h"
+#include "gstpipewireclock.h"
+
+GST_DEBUG_CATEGORY_STATIC (pipewire_stream_debug);
+#define GST_CAT_DEFAULT pipewire_stream_debug
+
+G_DEFINE_TYPE (GstPipeWireStream, gst_pipewire_stream, GST_TYPE_OBJECT)
+
+static void
+gst_pipewire_stream_init (GstPipeWireStream * self)
+{
+  self->fd = -1;
+  self->client_name = g_strdup (pw_get_client_name());
+  self->pool = gst_pipewire_pool_new (self);
+}
+
+static void
+gst_pipewire_stream_finalize (GObject * object)
+{
+  GstPipeWireStream * self = GST_PIPEWIRE_STREAM (object);
+
+  g_clear_object (&self->pool);
+  g_free (self->path);
+  g_free (self->target_object);
+  g_free (self->client_name);
+  gst_clear_structure (&self->client_properties);
+  gst_clear_structure (&self->stream_properties);
+
+  G_OBJECT_CLASS(gst_pipewire_stream_parent_class)->finalize (object);
+}
+
+void
+gst_pipewire_stream_class_init (GstPipeWireStreamClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->finalize = gst_pipewire_stream_finalize;
+
+  GST_DEBUG_CATEGORY_INIT (pipewire_stream_debug, "pipewirestream", 0,
+      "PipeWire Stream");
+}
+
+GstPipeWireStream *
+gst_pipewire_stream_new (GstElement * element)
+{
+  GstPipeWireStream *stream;
+
+  stream = g_object_new (GST_TYPE_PIPEWIRE_STREAM, NULL);
+  stream->element = element;
+
+  return stream;
+}
+
+static gboolean
+copy_properties (GQuark field_id,
+                 const GValue *value,
+                 gpointer user_data)
+{
+  struct pw_properties *properties = user_data;
+  GValue dst = { 0 };
+
+  if (g_value_type_transformable (G_VALUE_TYPE(value), G_TYPE_STRING)) {
+    g_value_init (&dst, G_TYPE_STRING);
+    if (g_value_transform (value, &dst)) {
+      pw_properties_set (properties,
+                         g_quark_to_string (field_id),
+                         g_value_get_string (&dst));
+    }
+    g_value_unset (&dst);
+  }
+  return TRUE;
+}
+
+gboolean
+gst_pipewire_stream_open (GstPipeWireStream * self,
+    const struct pw_stream_events * pwstream_events)
+{
+  struct pw_properties *props;
+
+  g_return_val_if_fail (self->core == NULL, FALSE);
+
+  GST_DEBUG_OBJECT (self, "open");
+
+  /* acquire the core */
+  self->core = gst_pipewire_core_get (self->fd);
+  if (self->core == NULL)
+      goto connect_error;
+
+  pw_thread_loop_lock (self->core->loop);
+
+  /* update the client properties */
+  if (self->client_properties) {
+    props = pw_properties_new (NULL, NULL);
+    gst_structure_foreach (self->client_properties, copy_properties, props);
+    pw_core_update_properties (self->core->core, &props->dict);
+    pw_properties_free (props);
+  }
+
+  /* create stream */
+  props = pw_properties_new (NULL, NULL);
+  if (self->client_name) {
+    pw_properties_set (props, PW_KEY_NODE_NAME, self->client_name);
+    pw_properties_set (props, PW_KEY_NODE_DESCRIPTION, self->client_name);
+  }
+  if (self->stream_properties) {
+    gst_structure_foreach (self->stream_properties, copy_properties, props);
+  }
+
+  if ((self->pwstream = pw_stream_new (self->core->core,
+                                       self->client_name, props)) == NULL)
+    goto no_stream;
+
+  pw_stream_add_listener(self->pwstream,
+                         &self->pwstream_listener,
+                         pwstream_events,
+                         self->element);
+
+  /* create clock */
+  self->clock = gst_pipewire_clock_new (self, 0);
+
+  pw_thread_loop_unlock (self->core->loop);
+
+  return TRUE;
+
+  /* ERRORS */
+connect_error:
+  {
+    GST_ELEMENT_ERROR (self->element, RESOURCE, FAILED,
+        ("Failed to connect"), (NULL));
+    return FALSE;
+  }
+no_stream:
+  {
+    GST_ELEMENT_ERROR (self->element, RESOURCE, FAILED,
+        ("can't create stream"), (NULL));
+    pw_thread_loop_unlock (self->core->loop);
+    return FALSE;
+  }
+}
+
+void
+gst_pipewire_stream_close (GstPipeWireStream * self)
+{
+  GST_DEBUG_OBJECT (self, "close");
+
+  /* destroy the clock */
+  gst_element_post_message (GST_ELEMENT (self->element),
+    gst_message_new_clock_lost (GST_OBJECT_CAST (self->element), self->clock));
+  g_weak_ref_set (&GST_PIPEWIRE_CLOCK (self->clock)->stream, NULL);
+  g_clear_object (&self->clock);
+
+  /* destroy the pw stream */
+  pw_thread_loop_lock (self->core->loop);
+  g_clear_pointer (&self->pwstream, pw_stream_destroy);
+  pw_thread_loop_unlock (self->core->loop);
+
+  /* release the core */
+  g_clear_pointer (&self->core, gst_pipewire_core_release);
+}

pipewire-1.2.0.tar.gz/src/gst/gstpipewirestream.h Added

@@ -0,0 +1,53 @@
+/* GStreamer */
+/* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
+/* SPDX-FileCopyrightText: Copyright © 2024 Collabora Ltd. */
+/* SPDX-License-Identifier: MIT */
+
+#ifndef __GST_PIPEWIRE_STREAM_H__
+#define __GST_PIPEWIRE_STREAM_H__
+
+#include "config.h"
+
+#include "gstpipewirecore.h"
+
+#include <gst/gst.h>
+#include <pipewire/pipewire.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GstPipeWirePool GstPipeWirePool;
+
+#define GST_TYPE_PIPEWIRE_STREAM (gst_pipewire_stream_get_type())
+G_DECLARE_FINAL_TYPE(GstPipeWireStream, gst_pipewire_stream, GST, PIPEWIRE_STREAM, GstObject)
+
+struct _GstPipeWireStream {
+  GstObject parent;
+
+  /* relatives */
+  GstElement *element;
+  GstPipeWireCore *core;
+  GstPipeWirePool *pool;
+  GstClock *clock;
+
+  /* the actual pw stream */
+  struct pw_stream *pwstream;
+  struct spa_hook pwstream_listener;
+
+  /* common properties */
+  int fd;
+  gchar *path;
+  gchar *target_object;
+  gchar *client_name;
+  GstStructure *client_properties;
+  GstStructure *stream_properties;
+};
+
+GstPipeWireStream * gst_pipewire_stream_new (GstElement * element);
+
+gboolean gst_pipewire_stream_open (GstPipeWireStream * self,
+    const struct pw_stream_events * pwstream_events);
+void gst_pipewire_stream_close (GstPipeWireStream * self);
+
+G_END_DECLS
+
+#endif /* __GST_PIPEWIRE_STREAM_H__ */

pipewire-1.0.1.tar.bz2/src/gst/meson.build -> pipewire-1.2.0.tar.gz/src/gst/meson.build Changed

pipewire-1.0.1.tar.bz2/src/modules/meson.build -> pipewire-1.2.0.tar.gz/src/modules/meson.build Changed

@@ -24,6 +24,7 @@
   'module-metadata.c',
   'module-netjack2-driver.c',
   'module-netjack2-manager.c',
+  'module-parametric-equalizer.c',
   'module-pipe-tunnel.c',
   'module-portal.c',
   'module-profiler.c',
@@ -38,6 +39,7 @@
   'module-rtp-session.c',
   'module-rtp-source.c',
   'module-rtp-sink.c',
+  'module-snapcast-discover.c',
   'module-vban-recv.c',
   'module-vban-send.c',
   'module-session-manager.c',
@@ -69,6 +71,11 @@
   dependencies : spa_dep, mathlib, dl_lib, pipewire_dep,
 )
 
+plugin_dependencies = 
+if get_option('spa-plugins').allowed()
+  plugin_dependencies += audioconvert_dep
+endif
+
 simd_cargs = 
 simd_dependencies = 
 
@@ -122,7 +129,7 @@
   'module-filter-chain/convolver.c'
 
 filter_chain_dependencies = 
-  mathlib, dl_lib, pipewire_dep, sndfile_dep, audioconvert_dep
+  mathlib, dl_lib, pipewire_dep, sndfile_dep, plugin_dependencies
 
 
 pipewire_module_filter_chain = shared_library('pipewire-module-filter-chain',
@@ -175,7 +182,7 @@
   install : true,
   install_dir : modules_install_dir,
   install_rpath: modules_install_dir,
-  dependencies : mathlib, dl_lib, pipewire_dep, audioconvert_dep,
+  dependencies : mathlib, dl_lib, pipewire_dep, plugin_dependencies,
 )
 
 build_module_jack_tunnel = jack_dep.found()
@@ -246,6 +253,15 @@
   dependencies : spa_dep, mathlib, dl_lib, pipewire_dep, opus_custom_dep,
 )
 
+pipewire_module_parametric_equalizer = shared_library('pipewire-module-parametric-equalizer',
+   'module-parametric-equalizer.c' ,
+  include_directories : configinc,
+  install : true,
+  install_dir : modules_install_dir,
+  install_rpath: modules_install_dir,
+  dependencies : filter_chain_dependencies,
+)
+
 pipewire_module_profiler = shared_library('pipewire-module-profiler',
    'module-profiler.c',
     'module-profiler/protocol-native.c', ,
@@ -326,6 +342,7 @@
     'module-protocol-native/protocol-native.c',
     'module-protocol-native/v0/protocol-native.c',
     'module-protocol-native/protocol-footer.c',
+    'module-protocol-native/security-context.c',
     'module-protocol-native/connection.c' ,
   include_directories : configinc,
   install : true,
@@ -342,9 +359,6 @@
   'module-protocol-pulse/collect.c',
   'module-protocol-pulse/cmd.c',
   'module-protocol-pulse/extension.c',
-  'module-protocol-pulse/extensions/ext-device-manager.c',
-  'module-protocol-pulse/extensions/ext-device-restore.c',
-  'module-protocol-pulse/extensions/ext-stream-restore.c',
   'module-protocol-pulse/format.c',
   'module-protocol-pulse/manager.c',
   'module-protocol-pulse/message.c',
@@ -366,6 +380,8 @@
   'module-protocol-pulse/modules/module-alsa-source.c',
   'module-protocol-pulse/modules/module-always-sink.c',
   'module-protocol-pulse/modules/module-combine-sink.c',
+  'module-protocol-pulse/modules/module-device-manager.c',
+  'module-protocol-pulse/modules/module-device-restore.c',
   'module-protocol-pulse/modules/module-echo-cancel.c',
   'module-protocol-pulse/modules/module-jackdbus-detect.c',
   'module-protocol-pulse/modules/module-ladspa-sink.c',
@@ -384,6 +400,7 @@
   'module-protocol-pulse/modules/module-rtp-recv.c',
   'module-protocol-pulse/modules/module-rtp-send.c',
   'module-protocol-pulse/modules/module-simple-protocol-tcp.c',
+  'module-protocol-pulse/modules/module-stream-restore.c',
   'module-protocol-pulse/modules/module-switch-on-connect.c',
   'module-protocol-pulse/modules/module-tunnel-sink.c',
   'module-protocol-pulse/modules/module-tunnel-source.c',
@@ -393,6 +410,13 @@
   'module-protocol-pulse/modules/module-zeroconf-discover.c',
 
 
+if snap_dep.found() and glib2_snap_dep.found() and gio2_snap_dep.found() and apparmor_snap_dep.found()
+  pipewire_module_protocol_pulse_sources += 
+    'module-protocol-pulse/snap-policy.c',
+  
+  pipewire_module_protocol_pulse_deps += snap_deps
+endif
+
 if dbus_dep.found()
   pipewire_module_protocol_pulse_sources += 
     'module-protocol-pulse/dbus-name.c',
@@ -415,6 +439,15 @@
   
   pipewire_module_protocol_pulse_deps += gio_dep
   cdata.set('HAVE_GIO', true)
+  if get_option('gsettings-pulse-schema').enabled()
+    install_data('module-protocol-pulse/modules/org.freedesktop.pulseaudio.gschema.xml',
+      install_dir: pipewire_datadir / 'glib-2.0' / 'schemas'
+    )
+    gnome = import('gnome')
+    gnome.post_install(
+      glib_compile_schemas: true
+    )
+  endif
 endif
 
 if flatpak_support
@@ -609,6 +642,20 @@
 endif
 summary({'raop-discover (needs Avahi)': build_module_raop_discover}, bool_yn: true, section: 'Optional Modules')
 
+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' ,
+    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,
+  )
+endif
+summary({'snapcast-discover (needs Avahi)': build_module_snapcast_discover}, bool_yn: true, section: 'Optional Modules')
+
 build_module_raop = openssl_lib.found()
 if build_module_raop
   pipewire_module_raop_sink = shared_library('pipewire-module-raop-sink',

pipewire-1.0.1.tar.bz2/src/modules/module-access.c -> pipewire-1.2.0.tar.gz/src/modules/module-access.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-adapter/adapter.c -> pipewire-1.2.0.tar.gz/src/modules/module-adapter/adapter.c Changed

@@ -70,30 +70,6 @@
 	.free = node_free,
 };
 
-static int handle_node_param(struct pw_impl_node *node, const char *key, const char *value)
-{
-	const struct spa_type_info *ti;
-	uint8_t buffer1024;
-	struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
-	struct spa_pod *pod;
-	int res;
-
-	ti = spa_debug_type_find_short(spa_type_param, key);
-	if (ti == NULL)
-		return -ENOENT;
-
-	if ((res = spa_json_to_pod(&b, 0, ti, value, strlen(value))) < 0)
-		return res;
-
-	if ((pod = spa_pod_builder_deref(&b, 0)) == NULL)
-		return -ENOSPC;
-
-	if ((res = pw_impl_node_set_param(node, ti->type, 0, pod)) < 0)
-		return res;
-
-	return 0;
-}
-
 static int find_format(struct spa_node *node, enum pw_direction direction,
 		uint32_t *media_type, uint32_t *media_subtype)
 {
@@ -124,117 +100,6 @@
 	return 0;
 }
 
-static int do_auto_port_config(struct node *n, const char *str)
-{
-	uint32_t state = 0, i;
-	uint8_t buffer4096;
-	struct spa_pod_builder b;
-#define POSITION_PRESERVE 0
-#define POSITION_AUX 1
-#define POSITION_UNKNOWN 2
-	int res, position = POSITION_PRESERVE;
-	struct spa_pod *param;
-	uint32_t media_type, media_subtype;
-	bool have_format = false, monitor = false, control = false;
-	struct spa_audio_info format = { 0, };
-	enum spa_param_port_config_mode mode = SPA_PARAM_PORT_CONFIG_MODE_none;
-	struct spa_json it2;
-	char key1024, val256;
-
-	spa_json_init(&it0, str, strlen(str));
-	if (spa_json_enter_object(&it0, &it1) <= 0)
-		return -EINVAL;
-
-	while (spa_json_get_string(&it1, key, sizeof(key)) > 0) {
-		if (spa_json_get_string(&it1, val, sizeof(val)) <= 0)
-			break;
-
-		if (spa_streq(key, "mode")) {
-			mode = spa_debug_type_find_type_short(spa_type_param_port_config_mode, val);
-			if (mode == SPA_ID_INVALID)
-				mode = SPA_PARAM_PORT_CONFIG_MODE_none;
-		} else if (spa_streq(key, "monitor")) {
-			monitor = spa_atob(val);
-		} else if (spa_streq(key, "control")) {
-			control = spa_atob(val);
-		} else if (spa_streq(key, "position")) {
-			if (spa_streq(val, "unknown"))
-				position = POSITION_UNKNOWN;
-			else if (spa_streq(val, "aux"))
-				position = POSITION_AUX;
-			else
-				position = POSITION_PRESERVE;
-		}
-        }
-
-	while (true) {
-		struct spa_audio_info info = { 0, };
-		struct spa_pod *position = NULL;
-		uint32_t n_position = 0;
-
-		spa_pod_builder_init(&b, buffer, sizeof(buffer));
-		if ((res = spa_node_port_enum_params_sync(n->follower,
-					n->direction == PW_DIRECTION_INPUT ?
-						SPA_DIRECTION_INPUT :
-						SPA_DIRECTION_OUTPUT, 0,
-					SPA_PARAM_EnumFormat, &state,
-					NULL, &param, &b)) != 1)
-			break;
-
-		if ((res = spa_format_parse(param, &media_type, &media_subtype)) < 0)
-			continue;
-
-		if (media_type != SPA_MEDIA_TYPE_audio ||
-		    media_subtype != SPA_MEDIA_SUBTYPE_raw)
-			continue;
-
-		spa_pod_object_fixate((struct spa_pod_object*)param);
-
-		if (spa_pod_parse_object(param,
-				SPA_TYPE_OBJECT_Format, NULL,
-				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_OPT_Pod(&position)) < 0)
-			continue;
-
-		if (position != NULL)
-			n_position = spa_pod_copy_array(position, SPA_TYPE_Id,
-					info.info.raw.position, SPA_AUDIO_MAX_CHANNELS);
-		if (n_position == 0 || n_position != info.info.raw.channels)
-			SPA_FLAG_SET(info.info.raw.flags, SPA_AUDIO_FLAG_UNPOSITIONED);
-
-		if (format.info.raw.channels >= info.info.raw.channels)
-			continue;
-
-		format = info;
-		have_format = true;
-	}
-	if (!have_format)
-		return -ENOENT;
-
-	if (position == POSITION_AUX) {
-		for (i = 0; i < format.info.raw.channels; i++)
-			format.info.raw.positioni = SPA_AUDIO_CHANNEL_START_Aux + i;
-	} else if (position == POSITION_UNKNOWN) {
-		for (i = 0; i < format.info.raw.channels; i++)
-			format.info.raw.positioni = SPA_AUDIO_CHANNEL_UNKNOWN;
-	}
-
-	spa_pod_builder_init(&b, buffer, sizeof(buffer));
-	param = spa_format_audio_raw_build(&b, SPA_PARAM_Format, &format.info.raw);
-	param = spa_pod_builder_add_object(&b,
-		SPA_TYPE_OBJECT_ParamPortConfig, SPA_PARAM_PortConfig,
-		SPA_PARAM_PORT_CONFIG_direction, SPA_POD_Id(n->direction),
-		SPA_PARAM_PORT_CONFIG_mode,      SPA_POD_Id(mode),
-		SPA_PARAM_PORT_CONFIG_monitor,   SPA_POD_Bool(monitor),
-		SPA_PARAM_PORT_CONFIG_control,   SPA_POD_Bool(control),
-		SPA_PARAM_PORT_CONFIG_format,    SPA_POD_Pod(param));
-	pw_impl_node_set_param(n->node, SPA_PARAM_PortConfig, 0, param);
-
-	return 0;
-}
-
 struct info_data {
 	struct spa_hook listener;
 	struct spa_node *node;
@@ -283,8 +148,6 @@
 	enum pw_direction direction;
 	int res;
 	uint32_t media_type, media_subtype;
-	const struct spa_dict_item *it;
-	struct pw_properties *copy;
 	struct info_data info;
 
 	spa_zero(info);
@@ -313,13 +176,8 @@
 	if ((str = pw_properties_get(props, PW_KEY_NODE_ID)) != NULL)
 		pw_properties_set(props, PW_KEY_NODE_SESSION, str);
 
-	if (pw_properties_get(props, "factory.mode") == NULL) {
-		if (direction == PW_DIRECTION_INPUT)
-			str = "merge";
-		else
-			str = "split";
-		pw_properties_set(props, "factory.mode", str);
-	}
+	if (pw_properties_get(props, PW_KEY_PORT_GROUP) == NULL)
+		pw_properties_setf(props, PW_KEY_PORT_GROUP, "stream.0");
 
 	if ((res = find_format(follower, direction, &media_type, &media_subtype)) < 0)
 		goto error;
@@ -344,16 +202,10 @@
 		goto error;
 	}
 
-	copy = pw_properties_new(NULL, NULL);
-	spa_dict_for_each(it, &props->dict) {
-		if (!spa_strstartswith(it->key, "node.param.") &&
-		    !spa_strstartswith(it->key, "port.param."))
-			pw_properties_set(copy, it->key, it->value);
-	}
 	node = pw_spa_node_load(context,
 				factory_name,
 				PW_SPA_NODE_FLAG_ACTIVATE | PW_SPA_NODE_FLAG_NO_REGISTER,
-				copy, sizeof(struct node) + user_data_size);
+				pw_properties_copy(props), sizeof(struct node) + user_data_size);
         if (node == NULL) {
 		res = -errno;
 		pw_log_error("can't load spa node: %m");
@@ -375,15 +227,6 @@
 
 	pw_impl_node_add_listener(node, &n->node_listener, &node_events, n);
 
-	if ((str = pw_properties_get(props, "adapter.auto-port-config")) != NULL)
-		do_auto_port_config(n, str);
-
-	spa_dict_for_each(it, &props->dict) {
-		if (spa_strstartswith(it->key, "node.param.")) {
-			if ((res = handle_node_param(node, &it->key11, it->value)) < 0)
-				pw_log_warn("can't set node param: %s", spa_strerror(res));
-		}
-	}
 	return node;
 
 error:

pipewire-1.0.1.tar.bz2/src/modules/module-avb/avb.c -> pipewire-1.2.0.tar.gz/src/modules/module-avb/avb.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-avb/maap.c -> pipewire-1.2.0.tar.gz/src/modules/module-avb/maap.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-client-node/client-node.c -> pipewire-1.2.0.tar.gz/src/modules/module-client-node/client-node.c Changed

@@ -31,7 +31,8 @@
 #define MAX_BUFFERS	64
 #define MAX_METAS	16u
 #define MAX_DATAS	64u
-#define AREA_SIZE	(4096u / sizeof(struct spa_io_buffers))
+#define AREA_SLOT	(sizeof(struct spa_io_async_buffers))
+#define AREA_SIZE	(4096u / AREA_SLOT)
 #define MAX_AREAS	32
 
 #define CHECK_FREE_PORT(impl,d,p)	(p <= pw_map_get_size(&impl->portsd) && !CHECK_PORT(impl,d,p))
@@ -53,6 +54,7 @@
 	struct port *port;
 	uint32_t peer_id;
 	uint32_t n_buffers;
+	uint32_t impl_mix_id;
 	struct buffer buffersMAX_BUFFERS;
 };
 
@@ -69,6 +71,7 @@
 	uint32_t id;
 
 	struct spa_node mix_node;
+	struct spa_hook_list mix_hooks;
 
 	struct spa_port_info info;
 	struct pw_properties *properties;
@@ -228,6 +231,7 @@
 	mix->mix_id = mix_id;
 	mix->port = p;
 	mix->n_buffers = 0;
+	mix->impl_mix_id = SPA_ID_INVALID;
 	return mix;
 
 fail:
@@ -236,18 +240,6 @@
 	return NULL;
 }
 
-static void free_mix(struct port *p, struct mix *mix)
-{
-	if (mix == NULL)
-		return;
-
-	/* never realloc so it's safe to call from pw_map_foreach */
-	if (mix->mix_id < pw_map_get_size(&p->mix))
-		pw_map_insert_at(&p->mix, mix->mix_id, NULL);
-
-	free(mix);
-}
-
 static void clear_data(struct impl *impl, struct spa_data *d)
 {
 	switch (d->type) {
@@ -295,6 +287,27 @@
 	return 0;
 }
 
+static void free_mix(struct port *p, struct mix *mix)
+{
+	struct impl *impl = p->impl;
+
+	if (mix == NULL)
+		return;
+
+	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);
+	}
+
+	clear_buffers(impl, mix);
+
+	/* never realloc so it's safe to call from pw_map_foreach */
+	if (mix->mix_id < pw_map_get_size(&p->mix))
+		pw_map_insert_at(&p->mix, mix->mix_id, NULL);
+
+	free(mix);
+}
+
 static void mix_clear(struct impl *impl, struct mix *mix)
 {
 	struct port *port = mix->port;
@@ -572,12 +585,11 @@
 }
 
 static int
-impl_node_port_enum_params(void *object, int seq,
+node_port_enum_params(struct impl *impl, int seq,
 			   enum spa_direction direction, uint32_t port_id,
 			   uint32_t id, uint32_t start, uint32_t num,
-			   const struct spa_pod *filter)
+			   const struct spa_pod *filter, struct spa_hook_list *hooks)
 {
-	struct impl *impl = object;
 	struct port *port;
 	uint8_t buffer1024;
 	struct spa_pod_dynamic_builder b;
@@ -617,7 +629,7 @@
 		spa_pod_dynamic_builder_init(&b, buffer, sizeof(buffer), 4096);
 		if (spa_pod_filter(&b.b, &result.param, param, filter) == 0) {
 			pw_log_debug("%p: %d param %u", impl, seq, result.index);
-			spa_node_emit_result(&impl->hooks, seq, 0, SPA_RESULT_TYPE_NODE_PARAMS, &result);
+			spa_node_emit_result(hooks, seq, 0, SPA_RESULT_TYPE_NODE_PARAMS, &result);
 			count++;
 		}
 		spa_pod_dynamic_builder_clean(&b);
@@ -628,6 +640,17 @@
 	return found ? 0 : -ENOENT;
 }
 
+static int
+impl_node_port_enum_params(void *object, int seq,
+			   enum spa_direction direction, uint32_t port_id,
+			   uint32_t id, uint32_t start, uint32_t num,
+			   const struct spa_pod *filter)
+{
+	struct impl *impl = object;
+	return node_port_enum_params(impl, seq, direction, port_id, id,
+			start, num, filter, &impl->hooks);
+}
+
 static int clear_buffers_cb(void *item, void *data)
 {
 	if (item)
@@ -681,14 +704,18 @@
 			direction == SPA_DIRECTION_INPUT ? "input" : "output",
 			port_id, mix_id, data, size);
 
+	old = pw_mempool_find_tag(impl->client_pool, tag, sizeof(tag));
+
 	port = GET_PORT(impl, direction, port_id);
-	if (port == NULL)
+	if (port == NULL) {
+		pw_memmap_free(old);
 		return data == NULL ? 0 : -EINVAL;
+	}
 
-	if ((mix = find_mix(port, mix_id)) == NULL)
+	if ((mix = find_mix(port, mix_id)) == NULL) {
+		pw_memmap_free(old);
 		return -EINVAL;
-
-	old = pw_mempool_find_tag(impl->client_pool, tag, sizeof(tag));
+	}
 
 	if (data) {
 		mm = pw_mempool_import_map(impl->client_pool,
@@ -840,9 +867,12 @@
 			switch (d->type) {
 			case SPA_DATA_DmaBuf:
 			case SPA_DATA_MemFd:
+			case SPA_DATA_SyncObj:
 			{
 				uint32_t flags = PW_MEMBLOCK_FLAG_DONT_CLOSE;
 
+				if (!(d->flags & SPA_DATA_FLAG_MAPPABLE))
+					flags |= PW_MEMBLOCK_FLAG_UNMAPPABLE;
 				if (d->flags & SPA_DATA_FLAG_READABLE)
 					flags |= PW_MEMBLOCK_FLAG_READABLE;
 				if (d->flags & SPA_DATA_FLAG_WRITABLE)
@@ -1069,16 +1099,27 @@
 		for (j = 0; j < b->buffer.n_datas; j++) {
 			struct spa_chunk *oldchunk = oldbuf->datasj.chunk;
 			struct spa_data *d = &newbuf->datasj;
+			uint32_t flags = d->flags;
+
+			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, "
+						"fixing to ensure backwards compatibility.",
+						i, j);
+				flags |= SPA_DATA_FLAG_MAPPABLE;
+			}
 
 			/* overwrite everything except the chunk */
 			oldbuf->datasj = *d;
+			oldbuf->datasj.flags = flags;
 			oldbuf->datasj.chunk = oldchunk;
 
 			b->datasj.type = d->type;
+			b->datasj.flags = flags;
 			b->datasj.fd = d->fd;
 
 			spa_log_debug(impl->log, " data %d type:%d fl:%08x fd:%d, offs:%d max:%d",
-					j, d->type, d->flags, (int) d->fd, d->mapoffset,
+					j, d->type, flags, (int) d->fd, d->mapoffset,
 					d->maxsize);
 		}
 	}
@@ -1151,12 +1192,8 @@
 
 static int
 impl_init(struct impl *impl,
-	  struct spa_dict *info,
-	  const struct spa_support *support,
-	  uint32_t n_support)
+	  struct spa_dict *info)
 {
-	impl->log = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_Log);
-
 	impl->node.iface = SPA_INTERFACE_INIT(
 			SPA_TYPE_INTERFACE_Node,
 			SPA_VERSION_NODE,
@@ -1310,8 +1347,6 @@
 					  0,
 					  sizeof(struct pw_node_activation));
 
-	node_peer_added(impl, node);
-
 	if (impl->bind_node_id) {
 		pw_global_bind(global, client, PW_PERM_ALL,
 				impl->bind_node_version, impl->bind_node_id);
@@ -1323,12 +1358,12 @@
 	size_t size;
 	struct pw_memblock *area;
 
-	size = sizeof(struct spa_io_buffers) * AREA_SIZE;
+	size = AREA_SLOT * AREA_SIZE;
 
 	area = pw_mempool_alloc(impl->context_pool,
 			PW_MEMBLOCK_FLAG_READWRITE |
-			PW_MEMBLOCK_FLAG_MAP |
-			PW_MEMBLOCK_FLAG_SEAL,
+			PW_MEMBLOCK_FLAG_SEAL |
+			PW_MEMBLOCK_FLAG_MAP,
 			SPA_DATA_MemFd, size);
 	if (area == NULL)
                 return -errno;
@@ -1409,6 +1444,7 @@
 	struct mix *m;
 	uint32_t idx, pos, len;
 	struct pw_memblock *area;
+	struct spa_io_async_buffers *ab;
 
 	if ((m = create_mix(port, mix->port.port_id)) == NULL)
 		return -ENOMEM;
@@ -1432,19 +1468,23 @@
 	}
 	area = *pw_array_get_unchecked(&impl->io_areas, idx, struct pw_memblock*);
 
-	mix->io = SPA_PTROFF(area->map->ptr,
-			pos * sizeof(struct spa_io_buffers), void);
-	*mix->io = SPA_IO_BUFFERS_INIT;
+	ab = SPA_PTROFF(area->map->ptr, pos * AREA_SLOT, void);
+	mix->io_data = ab;
+	mix->io0 = &ab->buffers0;
+	mix->io1 = &ab->buffers1;
+	*mix->io0 = SPA_IO_BUFFERS_INIT;
+	*mix->io1 = SPA_IO_BUFFERS_INIT;
 
 	m->peer_id = mix->peer_id;
+	m->impl_mix_id = mix->id;
 
 	if (impl->resource && impl->resource->version >= 4)
 		pw_client_node_resource_port_set_mix_info(impl->resource,
 					 mix->port.direction, mix->p->port_id,
 					 mix->port.port_id, mix->peer_id, NULL);
 
-	pw_log_debug("%p: init mix id:%d io:%p base:%p", impl,
-			mix->id, mix->io, area->map->ptr);
+	pw_log_debug("%p: init mix id:%d io:%p/%p base:%p", impl,
+			mix->id, mix->io0, mix->io1, area->map->ptr);
 
 	return 0;
 no_mem:
@@ -1462,7 +1502,7 @@
 	pw_log_debug("%p: remove mix id:%d io:%p",
 			impl, mix->id, mix->io);
 
-	if ((m = find_mix(port, mix->port.port_id)) == NULL)
+	if (!pw_map_has_item(&impl->io_map, mix->id))
 		return -EINVAL;
 
 	if (impl->resource && impl->resource->version >= 4)
@@ -1471,7 +1511,13 @@
 					 mix->port.port_id, SPA_ID_INVALID, NULL);
 
 	pw_map_remove(&impl->io_map, mix->id);
-	free_mix(port, m);
+
+	m = find_mix(port, mix->port.port_id);
+	if (m && m->impl_mix_id == mix->id)
+		free_mix(port, m);
+	else
+		pw_log_debug("%p: already cleared mix id:%d port-id:%d",
+				impl, mix->id, mix->port.port_id);
 
 	return 0;
 }
@@ -1483,18 +1529,27 @@
 };
 
 static int
+impl_mix_add_listener(void *object, struct spa_hook *listener,
+		const struct spa_node_events *events, void *data)
+{
+	struct port *port = object;
+	spa_hook_list_append(&port->mix_hooks, listener, events, data);
+	return 0;
+}
+
+static int
 impl_mix_port_enum_params(void *object, int seq,
-			   enum spa_direction direction, uint32_t port_id,
-			   uint32_t id, uint32_t start, uint32_t num,
-			   const struct spa_pod *filter)
+		enum spa_direction direction, uint32_t port_id,
+		uint32_t id, uint32_t start, uint32_t num,
+		const struct spa_pod *filter)
 {
 	struct port *port = object;
 
 	if (port->direction != direction)
 		return -ENOTSUP;
 
-	return impl_node_port_enum_params(&port->impl->node, seq, direction, port->id,
-			id, start, num, filter);
+	return node_port_enum_params(port->impl, seq, direction, port->id,
+			id, start, num, filter, &port->mix_hooks);
 }
 
 static int
@@ -1550,11 +1605,24 @@
 	if (mix == NULL)
 		return -EINVAL;
 
-	if (id == SPA_IO_Buffers) {
+	switch (id) {
+	case SPA_IO_Buffers:
 		if (data && size >= sizeof(struct spa_io_buffers))
-			mix->io = data;
+			mix->io0 = mix->io1 = data;
 		else
-			mix->io = NULL;
+			mix->io0 = mix->io1 = NULL;
+		break;
+	case SPA_IO_AsyncBuffers:
+		if (data && size >= sizeof(struct spa_io_async_buffers)) {
+			struct spa_io_async_buffers *ab = data;
+			mix->io0 = &ab->buffers0;
+			mix->io1 = &ab->buffers1;
+		}
+		else
+			mix->io0 = mix->io1 = NULL;
+		break;
+	default:
+		break;
 	}
 	return do_port_set_io(impl,
 			      direction, port->port_id, mix->port.port_id,
@@ -1565,7 +1633,7 @@
 impl_mix_port_reuse_buffer(void *object, uint32_t port_id, uint32_t buffer_id)
 {
 	struct port *p = object;
-	return impl_node_port_reuse_buffer(&p->impl->node, p->id, buffer_id);
+	return impl_node_port_reuse_buffer(p->impl, p->id, buffer_id);
 }
 
 static int impl_mix_process(void *object)
@@ -1575,6 +1643,7 @@
 
 static const struct spa_node_methods impl_port_mix = {
 	SPA_VERSION_NODE_METHODS,
+	.add_listener = impl_mix_add_listener,
 	.port_enum_params = impl_mix_port_enum_params,
 	.port_set_param = impl_mix_port_set_param,
 	.add_port = impl_mix_add_port,
@@ -1599,6 +1668,7 @@
 	p->id = port->port_id;
 	p->impl = impl;
 	pw_map_init(&p->mix, 2, 2);
+	spa_hook_list_init(&p->mix_hooks);
 	p->mix_node.iface = SPA_INTERFACE_INIT(
 			SPA_TYPE_INTERFACE_Node,
 			SPA_VERSION_NODE,
@@ -1635,16 +1705,6 @@
 	clear_port(impl, p);
 }
 
-static void node_driver_changed(void *data, struct pw_impl_node *old, struct pw_impl_node *driver)
-{
-	struct impl *impl = data;
-
-	pw_log_debug("%p: driver changed %p -> %p", impl, old, driver);
-
-	node_peer_removed(data, old);
-	node_peer_added(data, driver);
-}
-
 static const struct pw_impl_node_events node_events = {
 	PW_VERSION_IMPL_NODE_EVENTS,
 	.free = node_free,
@@ -1654,7 +1714,6 @@
 	.port_removed = node_port_removed,
 	.peer_added = node_peer_added,
 	.peer_removed = node_peer_removed,
-	.driver_changed = node_driver_changed,
 };
 
 static const struct pw_resource_events resource_events = {
@@ -1683,8 +1742,6 @@
 	struct pw_impl_client_node *this;
 	struct pw_impl_client *client = pw_resource_get_client(resource);
 	struct pw_context *context = pw_impl_client_get_context(client);
-	const struct spa_support *support;
-	uint32_t n_support;
 	int res;
 
 	impl = calloc(1, sizeof(struct impl));
@@ -1709,8 +1766,8 @@
 	impl->data_source.fd = -1;
 	pw_log_debug("%p: new", &impl->node);
 
-	support = pw_context_get_support(impl->context, &n_support);
-	impl_init(impl, NULL, support, n_support);
+	impl_init(impl, NULL);
+	impl->log = pw_log_get();
 	impl->resource = resource;
 	impl->client = client;
 	impl->client_pool = pw_impl_client_get_mempool(client);
@@ -1742,6 +1799,11 @@
 
 	this->node->remote = true;
 	this->flags = 0;
+	if (resource->version < PW_VERSION_CLIENT_NODE) {
+		pw_log_warn("detected old client version %d", resource->version);
+		if (resource->version < 6)
+			this->node->rt.target.activation->client_version = 0;
+	}
 
 	pw_resource_add_listener(this->resource,
 				&impl->resource_listener,

pipewire-1.0.1.tar.bz2/src/modules/module-client-node/remote-node.c -> pipewire-1.2.0.tar.gz/src/modules/module-client-node/remote-node.c Changed

@@ -71,9 +71,6 @@
 	struct spa_hook proxy_client_node_listener;
 
 	struct spa_list links;
-
-	struct spa_io_clock *clock;
-	struct spa_io_position *position;
 };
 
 struct link {
@@ -97,21 +94,10 @@
 	return NULL;
 }
 
-static int
-do_deactivate_link(struct spa_loop *loop,
-                bool async, uint32_t seq, const void *data, size_t size, void *user_data)
-{
-	struct link *link = user_data;
-	pw_log_trace("link %p deactivate", link);
-	spa_list_remove(&link->target.link);
-	return 0;
-}
-
 static void clear_link(struct node_data *data, struct link *link)
 {
 	pw_log_debug("link %p", link);
-	pw_loop_invoke(data->data_loop,
-		do_deactivate_link, SPA_ID_INVALID, NULL, 0, true, link);
+	pw_impl_node_remove_target(data->node, &link->target);
 	pw_memmap_free(link->map);
 	spa_system_close(link->target.system, link->target.fd);
 	spa_list_remove(&link->link);
@@ -122,6 +108,7 @@
 {
 	struct link *l;
 	uint32_t tag5 = { data->remote_id, };
+	struct pw_impl_node *node = data->node;
 	struct pw_memmap *mm;
 
 	if (!data->have_transport)
@@ -132,13 +119,13 @@
 
 	while ((mm = pw_mempool_find_tag(data->pool, tag, sizeof(uint32_t))) != NULL) {
 		if (mm->tag1 == SPA_ID_INVALID)
-			spa_node_set_io(data->node->node, mm->tag2, NULL, 0);
+			spa_node_set_io(node->node, mm->tag2, NULL, 0);
 
 		pw_memmap_free(mm);
 	}
 
 	pw_memmap_free(data->activation);
-	data->node->rt.target.activation = data->node->activation->map->ptr;
+	node->rt.target.activation = node->activation->map->ptr;
 
 	spa_system_close(data->data_system, data->rtwritefd);
 	data->have_transport = false;
@@ -208,16 +195,22 @@
 	}
 
 	node->rt.target.activation = data->activation->ptr;
-	node->rt.position = &node->rt.target.activation->position;
-	node->info.id = node->rt.target.activation->position.clock.id;
-	node->rt.target.id = node->info.id;
+
+	pw_impl_node_set_io(node, SPA_IO_Clock,
+			&node->rt.target.activation->position.clock,
+			sizeof(struct spa_io_clock));
+	pw_impl_node_set_io(node, SPA_IO_Position,
+			&node->rt.target.activation->position,
+			sizeof(struct spa_io_position));
 
 	pw_log_debug("remote-node %p: fds:%d %d node:%u activation:%p",
 		proxy, readfd, writefd, data->remote_id, data->activation->ptr);
 
 	data->rtwritefd = writefd;
-	spa_system_close(data->data_system, node->source.fd);
-	node->source.fd = readfd;
+	spa_system_close(node->rt.target.system, node->source.fd);
+	node->rt.target.fd = node->source.fd = readfd;
+
+	node->rt.target.activation->client_version = PW_VERSION_NODE_ACTIVATION;
 
 	data->have_transport = true;
 
@@ -313,11 +306,25 @@
 				continue;
 
 			for (idx = 0;;) {
+				struct spa_node *qnode;
+				uint32_t qport;
+
 				spa_pod_dynamic_builder_init(&b, buf, sizeof(buf), 4096);
 
-	                        res = spa_node_port_enum_params_sync(port->node->node,
-							port->direction, port->port_id,
-							id, &idx, NULL, &param, &b.b);
+				switch (id) {
+				case SPA_PARAM_IO:
+					qnode = port->mix;
+					qport = SPA_ID_INVALID;
+					break;
+				default:
+					qnode = port->node->node;
+					qport = port->port_id;
+					break;
+				}
+				res = spa_node_port_enum_params_sync(qnode,
+						port->direction, qport,
+						id, &idx, NULL, &param, &b.b);
+
 				if (res == 1) {
 					void *p;
 					p = pw_reallocarray(params, n_params + 1, sizeof(struct spa_pod*));
@@ -397,6 +404,7 @@
 		   uint32_t size)
 {
 	struct node_data *data = _data;
+	struct pw_impl_node *node = data->node;
 	struct pw_proxy *proxy = (struct pw_proxy*)data->client_node;
 	struct pw_memmap *old, *mm;
 	void *ptr;
@@ -422,18 +430,7 @@
 	pw_log_debug("node %p: set io %s %p", proxy,
 			spa_debug_type_find_name(spa_type_io, id), ptr);
 
-	switch(id) {
-	case SPA_IO_Clock:
-		data->clock = size >= sizeof(*data->clock) ? ptr : NULL;
-		break;
-	case SPA_IO_Position:
-		data->position = size >= sizeof(*data->position) ? ptr : NULL;
-		break;
-	}
-	data->node->driving = data->clock && data->position &&
-		data->position->clock.id == data->clock->id;
-
-	res =  spa_node_set_io(data->node->node, id, ptr, size);
+	res =  pw_impl_node_set_io(node, id, ptr, size);
 
 	pw_memmap_free(old);
 exit:
@@ -455,6 +452,7 @@
 static int client_node_command(void *_data, const struct spa_command *command)
 {
 	struct node_data *data = _data;
+	struct pw_impl_node *node = data->node;
 	struct pw_proxy *proxy = (struct pw_proxy*)data->client_node;
 	int res;
 	uint32_t id = SPA_NODE_COMMAND_ID(command);
@@ -464,27 +462,27 @@
 
 	switch (id) {
 	case SPA_NODE_COMMAND_Pause:
-		if ((res = pw_impl_node_set_state(data->node, PW_NODE_STATE_IDLE)) < 0) {
+		if ((res = pw_impl_node_set_state(node, PW_NODE_STATE_IDLE)) < 0) {
 			pw_log_warn("node %p: pause failed", proxy);
 			pw_proxy_error(proxy, res, "pause failed");
 		}
 
 		break;
 	case SPA_NODE_COMMAND_Start:
-		if ((res = pw_impl_node_set_state(data->node, PW_NODE_STATE_RUNNING)) < 0) {
+		if ((res = pw_impl_node_set_state(node, PW_NODE_STATE_RUNNING)) < 0) {
 			pw_log_warn("node %p: start failed", proxy);
 			pw_proxy_error(proxy, res, "start failed");
 		}
 		break;
 
 	case SPA_NODE_COMMAND_Suspend:
-		if ((res = pw_impl_node_set_state(data->node, PW_NODE_STATE_SUSPENDED)) < 0) {
+		if ((res = pw_impl_node_set_state(node, PW_NODE_STATE_SUSPENDED)) < 0) {
 			pw_log_warn("node %p: suspend failed", proxy);
 			pw_proxy_error(proxy, res, "suspend failed");
 		}
 		break;
 	case SPA_NODE_COMMAND_RequestProcess:
-		res = pw_impl_node_send_command(data->node, command);
+		res = pw_impl_node_send_command(node, command);
 		break;
 	default:
 		pw_log_warn("unhandled node command %d (%s)", id,
@@ -524,7 +522,7 @@
 	int res;
 
         pw_log_debug("port %p: clear %zd buffers mix:%d", port,
-			pw_array_get_len(&mix->buffers, struct buffer *),
+			pw_array_get_len(&mix->buffers, struct buffer),
 			mix->mix.id);
 
 	if ((res = pw_impl_port_use_buffers(port, &mix->mix, 0, NULL, 0)) < 0) {
@@ -698,14 +696,14 @@
 				d->type = bm->type;
 				d->data = NULL;
 
-				pw_log_debug(" data %d %u -> fd %d maxsize %d",
-						j, bm->id, bm->fd, d->maxsize);
+				pw_log_debug(" data %d %u -> fd %d maxsize %d flags:%08x",
+						j, bm->id, bm->fd, d->maxsize, d->flags);
 			} else if (d->type == SPA_DATA_MemPtr) {
 				int offs = SPA_PTR_TO_INT(d->data);
 				d->data = SPA_PTROFF(mm->ptr, offs, void);
 				d->fd = -1;
-				pw_log_debug(" data %d id:%u -> mem:%p offs:%d maxsize:%d",
-						j, bid->id, d->data, offs, d->maxsize);
+				pw_log_debug(" data %d id:%u -> mem:%p offs:%d maxsize:%d flags:%08x",
+						j, bid->id, d->data, offs, d->maxsize, d->flags);
 			} else {
 				pw_log_warn("unknown buffer data type %d", d->type);
 			}
@@ -796,17 +794,6 @@
 }
 
 static int
-do_activate_link(struct spa_loop *loop,
-                bool async, uint32_t seq, const void *data, size_t size, void *user_data)
-{
-	struct link *link = user_data;
-	struct node_data *d = link->data;
-	pw_log_trace("link %p activate", link);
-	spa_list_append(&d->node->rt.target_list, &link->target.link);
-	return 0;
-}
-
-static int
 client_node_set_activation(void *_data,
                         uint32_t node_id,
                         int signalfd,
@@ -854,10 +841,11 @@
 		link->target.activation = ptr;
 		link->target.system = data->data_system;
 		link->target.fd = signalfd;
+		link->target.trigger = link->target.activation->server_version < 1 ?
+			trigger_target_v0 : trigger_target_v1;
 		spa_list_append(&data->links, &link->link);
 
-		pw_loop_invoke(data->data_loop,
-                       do_activate_link, SPA_ID_INVALID, NULL, 0, false, link);
+		pw_impl_node_add_target(node, &link->target);
 
 		pw_log_debug("node %p: add link %p: memid:%u fd:%d id:%u state:%p pending:%d/%d",
 				node, link, memid, signalfd, node_id,
@@ -950,28 +938,29 @@
 
 static void do_node_init(struct node_data *data)
 {
+	struct pw_impl_node *node = data->node;
 	struct pw_impl_port *port;
 	struct mix *mix;
 
-	pw_log_debug("%p: node %p init", data, data->node);
+	pw_log_debug("%p: node %p init", data, node);
 	add_node_update(data, PW_CLIENT_NODE_UPDATE_PARAMS |
 				PW_CLIENT_NODE_UPDATE_INFO,
 				SPA_NODE_CHANGE_MASK_FLAGS |
 				SPA_NODE_CHANGE_MASK_PROPS |
 				SPA_NODE_CHANGE_MASK_PARAMS);
 
-	spa_list_for_each(port, &data->node->input_ports, link) {
+	spa_list_for_each(port, &node->input_ports, link) {
 		mix = create_mix(data, port, SPA_ID_INVALID, SPA_ID_INVALID);
 		if (mix == NULL)
-			pw_log_error("%p: failed to create port mix: %m", data->node);
+			pw_log_error("%p: failed to create port mix: %m", node);
 		add_port_update(data, port,
 				PW_CLIENT_NODE_PORT_UPDATE_PARAMS |
 				PW_CLIENT_NODE_PORT_UPDATE_INFO);
 	}
-	spa_list_for_each(port, &data->node->output_ports, link) {
+	spa_list_for_each(port, &node->output_ports, link) {
 		mix = create_mix(data, port, SPA_ID_INVALID, SPA_ID_INVALID);
 		if (mix == NULL)
-			pw_log_error("%p: failed to create port mix: %m", data->node);
+			pw_log_error("%p: failed to create port mix: %m", node);
 		add_port_update(data, port,
 				PW_CLIENT_NODE_PORT_UPDATE_PARAMS |
 				PW_CLIENT_NODE_PORT_UPDATE_INFO);
@@ -1125,21 +1114,22 @@
 static void client_node_removed(void *_data)
 {
 	struct node_data *data = _data;
+	struct pw_impl_node *node = data->node;
 	pw_log_debug("%p: removed", data);
 
 	spa_hook_remove(&data->proxy_client_node_listener);
 	spa_hook_remove(&data->client_node_listener);
 
-	if (data->node) {
+	if (node) {
 		spa_hook_remove(&data->node_listener);
-		pw_impl_node_remove_rt_listener(data->node,
+		pw_impl_node_remove_rt_listener(node,
 				&data->node_rt_listener);
-		pw_impl_node_set_state(data->node, PW_NODE_STATE_SUSPENDED);
+		pw_impl_node_set_state(node, PW_NODE_STATE_SUSPENDED);
 
 		clean_node(data);
 
 		if (data->do_free)
-			pw_impl_node_destroy(data->node);
+			pw_impl_node_destroy(node);
 	}
 	data->client_node = NULL;
 }
@@ -1197,6 +1187,8 @@
 	if (node->data_loop == NULL)
 		goto error;
 
+	pw_log_debug("%p: export node %p", core, object);
+
 	user_data_size = SPA_ROUND_UP_N(user_data_size, __alignof__(struct node_data));
 
 	client_node = pw_core_create_object(core,
@@ -1219,6 +1211,11 @@
 	data->client_node = (struct pw_client_node *)client_node;
 	data->remote_id = SPA_ID_INVALID;
 
+	/* the node might have been registered and added to a driver. When we export,
+	 * we will be assigned a new driver target from the server and we can forget our
+	 * local ones. */
+	pw_node_peer_unref(spa_steal_ptr(node->from_driver_peer));
+	pw_node_peer_unref(spa_steal_ptr(node->to_driver_peer));
 
 	data->allow_mlock = pw_properties_get_bool(node->properties, "mem.allow-mlock",
 						   data->context->settings.mem_allow_mlock);

pipewire-1.0.1.tar.bz2/src/modules/module-client-node/v0/transport.c -> pipewire-1.2.0.tar.gz/src/modules/module-client-node/v0/transport.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-combine-stream.c -> pipewire-1.2.0.tar.gz/src/modules/module-combine-stream.c Changed

@@ -21,10 +21,12 @@
 #include <spa/utils/json.h>
 #include <spa/utils/ringbuffer.h>
 #include <spa/debug/types.h>
+#include <spa/debug/log.h>
 #include <spa/pod/builder.h>
 #include <spa/param/audio/format-utils.h>
 #include <spa/param/audio/raw.h>
 #include <spa/param/latency-utils.h>
+#include <spa/param/tag-utils.h>
 
 #include <pipewire/impl.h>
 #include <pipewire/i18n.h>
@@ -96,7 +98,7 @@
  *             {
  *                 matches = 
  *                     # any of the items in matches needs to match, if one does,
- *                     # actions are emited.
+ *                     # actions are emitted.
  *                     {
  *                         # all keys must match the value. ! negates. ~ starts regex.
  *                         #node.name = "~alsa_input.*"
@@ -235,7 +237,7 @@
 struct impl {
 	struct pw_context *context;
 	struct pw_loop *main_loop;
-	struct pw_data_loop *data_loop;
+	struct pw_loop *data_loop;
 
 	struct pw_properties *props;
 
@@ -304,13 +306,12 @@
 
 	struct spa_audio_info_raw info;
 	uint32_t remapSPA_AUDIO_MAX_CHANNELS;
-	uint32_t rate;
 
 	void *delaybuf;
 	struct ringbuffer delaySPA_AUDIO_MAX_CHANNELS;
 
-	int64_t delay_nsec;		/* for main loop */
-	int64_t data_delay_nsec;	/* for data loop */
+	int64_t delay_samples;		/* for main loop */
+	int64_t data_delay_samples;	/* for data loop */
 
 	unsigned int ready:1;
 	unsigned int added:1;
@@ -440,11 +441,10 @@
 {
 	struct pw_time t;
 
-	if (pw_stream_get_time_n(s->stream, &t, sizeof(t)) < 0 ||
-			t.rate.denom == 0)
+	if (pw_stream_get_time_n(s->stream, &t, sizeof(t)) < 0)
 		return INT64_MIN;
 
-	return t.delay * SPA_NSEC_PER_SEC * t.rate.num / t.rate.denom;
+	return t.delay;  /* samples at graph rate */
 }
 
 static void update_latency(struct impl *impl)
@@ -541,7 +541,7 @@
 	for (i = 0; i < channels; ++i)
 		ringbuffer_init(&info.delayi, SPA_PTROFF(info.buf, i*size, void), size);
 
-	pw_data_loop_invoke(stream->impl->data_loop, do_replace_delay, 0, NULL, 0, true, &info);
+	pw_loop_invoke(stream->impl->data_loop, do_replace_delay, 0, NULL, 0, true, &info);
 
 	free(info.buf);
 }
@@ -557,20 +557,19 @@
 	spa_list_for_each(s, &impl->streams, link) {
 		int64_t delay = get_stream_delay(s);
 
-		if (delay != s->delay_nsec && delay != INT64_MIN)
-			pw_log_debug("stream %d delay:%"PRIi64" ns", s->id, delay);
+		if (delay != s->delay_samples && delay != INT64_MIN)
+			pw_log_debug("stream %d delay:%"PRIi64" samples", s->id, delay);
 
 		max_delay = SPA_MAX(max_delay, delay);
-		s->delay_nsec = delay;
+		s->delay_samples = delay;
 	}
 
 	spa_list_for_each(s, &impl->streams, link) {
 		uint32_t size = 0;
 
-		if (s->delay_nsec != INT64_MIN) {
-			int64_t delay = max_delay - s->delay_nsec;
-			size = delay * s->rate / SPA_NSEC_PER_SEC;
-			size *= sizeof(float);
+		if (s->delay_samples != INT64_MIN) {
+			int64_t delay = max_delay - s->delay_samples;
+			size = delay * sizeof(float);
 		}
 
 		resize_delay(s, size);
@@ -605,7 +604,7 @@
 
 static void clear_delaybuf(struct impl *impl)
 {
-	pw_data_loop_invoke(impl->data_loop, do_clear_delaybuf, 0, NULL, 0, true, impl);
+	pw_loop_invoke(impl->data_loop, do_clear_delaybuf, 0, NULL, 0, true, impl);
 }
 
 static int do_add_stream(struct spa_loop *loop, bool async, uint32_t seq,
@@ -621,6 +620,27 @@
 	return 0;
 }
 
+static void param_tag_changed(struct impl *impl, const struct spa_pod *param)
+{
+	if (param == NULL)
+		return;
+
+	pw_log_debug("tag update");
+	struct stream *s;
+	struct spa_tag_info tag;
+	const struct spa_pod *params1 = { param };
+	void *state = NULL;
+
+	if (spa_tag_parse(param, &tag, &state) < 0)
+		return;
+	spa_list_for_each(s, &impl->streams, link) {
+		if (s->stream == NULL)
+			continue;
+		pw_log_debug("updating stream %d", s->id);
+		pw_stream_update_params(s->stream, params, 1);
+	}
+}
+
 static int do_remove_stream(struct spa_loop *loop, bool async, uint32_t seq,
                 const void *data, size_t size, void *user_data)
 {
@@ -637,7 +657,7 @@
 {
 	pw_log_debug("destroy stream %d", s->id);
 
-	pw_data_loop_invoke(s->impl->data_loop, do_remove_stream, 0, NULL, 0, true, s);
+	pw_loop_invoke(s->impl->data_loop, do_remove_stream, 0, NULL, 0, true, s);
 
 	if (destroy && s->stream) {
 		spa_hook_remove(&s->stream_listener);
@@ -707,22 +727,9 @@
 {
 	struct stream *s = d;
 	struct spa_latency_info latency;
-	struct spa_audio_info format = { 0 };
 
 	switch (id) {
 	case SPA_PARAM_Format:
-		if (!param) {
-			s->rate = 0;
-		} else {
-			if (spa_format_parse(param, &format.media_type, &format.media_subtype) < 0)
-				break;
-			if (format.media_type != SPA_MEDIA_TYPE_audio ||
-					format.media_subtype != SPA_MEDIA_SUBTYPE_raw)
-				break;
-			if (spa_format_audio_raw_parse(param, &format.info.raw) < 0)
-				break;
-			s->rate = format.info.raw.rate;
-		}
 		update_delay(s->impl);
 		break;
 	case SPA_PARAM_Latency:
@@ -734,6 +741,7 @@
 			s->latency = latency;
 		}
 		update_latency(s->impl);
+		update_delay(s->impl);
 		break;
 	default:
 		break;
@@ -875,7 +883,7 @@
 			direction, PW_ID_ANY, flags, params, n_params)) < 0)
 		goto error;
 
-	pw_data_loop_invoke(impl->data_loop, do_add_stream, 0, NULL, 0, true, s);
+	pw_loop_invoke(impl->data_loop, do_add_stream, 0, NULL, 0, true, s);
 	update_delay(impl);
 	return 0;
 
@@ -1074,10 +1082,10 @@
 		return false;
 
 	delay = get_stream_delay(s);
-	if (delay == INT64_MIN || delay == s->data_delay_nsec)
+	if (delay == INT64_MIN || delay == s->data_delay_samples)
 		return false;
 
-	s->data_delay_nsec = delay;
+	s->data_delay_samples = delay;
 	return true;
 }
 
@@ -1262,6 +1270,10 @@
 		update_latency(impl);
 		break;
 	}
+	case SPA_PARAM_Tag: {
+		param_tag_changed(impl, param);
+		break;
+	}
 	default:
 		break;
 	}
@@ -1399,6 +1411,8 @@
 			pw_core_disconnect(impl->core);
 		impl->core = NULL;
 	}
+	if (impl->data_loop)
+		pw_context_release_loop(impl->context, impl->data_loop);
 
 	pw_properties_free(impl->stream_props);
 	pw_properties_free(impl->combine_props);
@@ -1439,6 +1453,7 @@
 	struct impl *impl;
 	const char *str, *prefix;
 	int res;
+	struct spa_error_location loc = {};
 
 	PW_LOG_TOPIC_INIT(mod_topic);
 
@@ -1447,22 +1462,29 @@
 		return -errno;
 
 	pw_log_debug("module %p: new %s", impl, args);
-	impl->main_loop = pw_context_get_main_loop(context);
-	impl->data_loop = pw_context_get_data_loop(context);
+	impl->module = module;
+	impl->context = context;
 
 	spa_list_init(&impl->streams);
 
 	if (args == NULL)
 		args = "";
 
-	props = pw_properties_new_string(args);
+	props = pw_properties_new_string_checked(args, strlen(args), &loc);
 	if (props == NULL) {
 		res = -errno;
-		pw_log_error( "can't create properties: %m");
+		if (loc.reason)
+			spa_debug_log_error_location(pw_log_get(), SPA_LOG_LEVEL_ERROR, &loc,
+					"invalid module arguments: %s", loc.reason);
+		else
+			pw_log_error("can't create properties: %m");
 		goto error;
 	}
 	impl->props = props;
 
+	impl->main_loop = pw_context_get_main_loop(context);
+	impl->data_loop = pw_context_acquire_loop(context, &props->dict);
+
 	if ((str = pw_properties_get(props, "combine.mode")) == NULL)
 		str = "sink";
 
@@ -1497,8 +1519,7 @@
 		goto error;
 	}
 
-	impl->module = module;
-	impl->context = context;
+	pw_properties_set(props, PW_KEY_NODE_LOOP_NAME, impl->data_loop->name);
 
 	if (pw_properties_get(props, PW_KEY_NODE_GROUP) == NULL)
 		pw_properties_setf(props, PW_KEY_NODE_GROUP, "combine-%s-%u-%u",
@@ -1532,6 +1553,7 @@
 	if ((str = pw_properties_get(props, "stream.props")) != NULL)
 		pw_properties_update_string(impl->stream_props, str, strlen(str));
 
+	copy_props(props, impl->combine_props, PW_KEY_NODE_LOOP_NAME);
 	copy_props(props, impl->combine_props, PW_KEY_AUDIO_CHANNELS);
 	copy_props(props, impl->combine_props, SPA_KEY_AUDIO_POSITION);
 	copy_props(props, impl->combine_props, PW_KEY_NODE_NAME);
@@ -1542,13 +1564,16 @@
 	copy_props(props, impl->combine_props, PW_KEY_NODE_VIRTUAL);
 	copy_props(props, impl->combine_props, PW_KEY_MEDIA_CLASS);
 	copy_props(props, impl->combine_props, "resample.prefill");
+	copy_props(props, impl->combine_props, "resample.disable");
 
 	parse_audio_info(impl->combine_props, &impl->info);
 
+	copy_props(props, impl->stream_props, PW_KEY_NODE_LOOP_NAME);
 	copy_props(props, impl->stream_props, PW_KEY_NODE_GROUP);
 	copy_props(props, impl->stream_props, PW_KEY_NODE_VIRTUAL);
 	copy_props(props, impl->stream_props, PW_KEY_NODE_LINK_GROUP);
 	copy_props(props, impl->stream_props, "resample.prefill");
+	copy_props(props, impl->stream_props, "resample.disable");
 
 	if (pw_properties_get(impl->stream_props, PW_KEY_MEDIA_ROLE) == NULL)
 		pw_properties_set(props, PW_KEY_MEDIA_ROLE, "filter");

pipewire-1.0.1.tar.bz2/src/modules/module-echo-cancel.c -> pipewire-1.2.0.tar.gz/src/modules/module-echo-cancel.c Changed

@@ -249,6 +249,7 @@
 {
 	spa_audio_aec_run(impl->aec, rec, play, out, n_samples);
 
+#ifdef HAVE_SPA_PLUGINS
 	if (SPA_UNLIKELY(impl->wav_path0)) {
 		if (impl->wav_file == NULL) {
 			struct wav_file_info info;
@@ -287,6 +288,7 @@
 		wav_file_close(impl->wav_file);
 		impl->wav_file = NULL;
 	}
+#endif
 }
 
 static void process(struct impl *impl)
@@ -524,17 +526,38 @@
 		enum pw_stream_state state, const char *error)
 {
 	struct impl *impl = data;
+	int res;
+
 	switch (state) {
 	case PW_STREAM_STATE_PAUSED:
 		pw_stream_flush(impl->source, false);
 		pw_stream_flush(impl->capture, false);
+
+		if (old == PW_STREAM_STATE_STREAMING) {
+			if (pw_stream_get_state(impl->sink, NULL) != PW_STREAM_STATE_STREAMING) {
+				pw_log_debug("%p: deactivate %s", impl, impl->aec->name);
+				res = spa_audio_aec_deactivate(impl->aec);
+				if (res < 0 && res != -EOPNOTSUPP) {
+					pw_log_error("aec plugin %s deactivate failed: %s", impl->aec->name, spa_strerror(res));
+				}
+			}
+		}
+		break;
+	case PW_STREAM_STATE_STREAMING:
+		if (pw_stream_get_state(impl->sink, NULL) == PW_STREAM_STATE_STREAMING) {
+			pw_log_debug("%p: activate %s", impl, impl->aec->name);
+			res = spa_audio_aec_activate(impl->aec);
+			if (res < 0 && res != -EOPNOTSUPP) {
+				pw_log_error("aec plugin %s activate failed: %s", impl->aec->name, spa_strerror(res));
+			}
+		}
 		break;
 	case PW_STREAM_STATE_UNCONNECTED:
-		pw_log_info("%p: input unconnected", impl);
+		pw_log_info("%p: capture unconnected", impl);
 		pw_impl_module_schedule_destroy(impl->module);
 		break;
 	case PW_STREAM_STATE_ERROR:
-		pw_log_info("%p: input error: %s", impl, error);
+		pw_log_info("%p: capture error: %s", impl, error);
 		break;
 	default:
 		break;
@@ -545,34 +568,18 @@
 		enum pw_stream_state state, const char *error)
 {
 	struct impl *impl = data;
-	int res;
 
 	switch (state) {
 	case PW_STREAM_STATE_PAUSED:
 		pw_stream_flush(impl->source, false);
 		pw_stream_flush(impl->capture, false);
-
-		if (old == PW_STREAM_STATE_STREAMING) {
-			pw_log_debug("%p: deactivate %s", impl, impl->aec->name);
-			res = spa_audio_aec_deactivate(impl->aec);
-			if (res < 0 && res != -EOPNOTSUPP) {
-				pw_log_error("aec plugin %s deactivate failed: %s", impl->aec->name, spa_strerror(res));
-			}
-		}
-		break;
-	case PW_STREAM_STATE_STREAMING:
-		pw_log_debug("%p: activate %s", impl, impl->aec->name);
-		res = spa_audio_aec_activate(impl->aec);
-		if (res < 0 && res != -EOPNOTSUPP) {
-			pw_log_error("aec plugin %s activate failed: %s", impl->aec->name, spa_strerror(res));
-		}
 		break;
 	case PW_STREAM_STATE_UNCONNECTED:
-		pw_log_info("%p: input unconnected", impl);
+		pw_log_info("%p: source unconnected", impl);
 		pw_impl_module_schedule_destroy(impl->module);
 		break;
 	case PW_STREAM_STATE_ERROR:
-		pw_log_info("%p: input error: %s", impl, error);
+		pw_log_info("%p: source error: %s", impl, error);
 		break;
 	default:
 		break;
@@ -677,10 +684,34 @@
 	return 1;
 }
 
-static void input_param_changed(void *data, uint32_t id, const struct spa_pod* param)
+static void props_changed(struct impl* impl, const struct spa_pod *param)
 {
-	struct spa_pod_object* obj = (struct spa_pod_object*)param;
+	uint8_t buffer1024;
+	struct spa_pod_dynamic_builder b;
+	const struct spa_pod* params1;
 	const struct spa_pod_prop* prop;
+	struct spa_pod_object* obj = (struct spa_pod_object*)param;
+
+	if (param == NULL)
+		return;
+
+	SPA_POD_OBJECT_FOREACH(obj, prop) {
+		if (prop->key == SPA_PROP_params)
+			set_params(impl, &prop->value);
+	}
+
+	spa_pod_dynamic_builder_init(&b, buffer, sizeof(buffer), 4096);
+	params0 = get_props_param(impl, &b.b);
+	if (params0) {
+		pw_stream_update_params(impl->capture, params, 1);
+		if (impl->playback != NULL)
+			pw_stream_update_params(impl->playback, params, 1);
+	}
+	spa_pod_dynamic_builder_clean(&b);
+}
+
+static void input_param_changed(void *data, uint32_t id, const struct spa_pod* param)
+{
 	struct impl* impl = data;
 
 	switch (id) {
@@ -692,27 +723,7 @@
 		input_param_latency_changed(impl, param);
 		break;
 	case SPA_PARAM_Props:
-		if (param != NULL) {
-			uint8_t buffer1024;
-			struct spa_pod_dynamic_builder b;
-			const struct spa_pod* params1;
-
-			SPA_POD_OBJECT_FOREACH(obj, prop) {
-				if (prop->key == SPA_PROP_params)
-					set_params(impl, &prop->value);
-			}
-
-			spa_pod_dynamic_builder_init(&b, buffer, sizeof(buffer), 4096);
-			params0 = get_props_param(impl, &b.b);
-			if (params0) {
-				pw_stream_update_params(impl->capture, params, 1);
-				if (impl->playback != NULL)
-					pw_stream_update_params(impl->playback, params, 1);
-			}
-			spa_pod_dynamic_builder_clean(&b);
-		} else {
-			pw_log_warn("param is null");
-		}
+		props_changed(impl, param);
 		break;
 	}
 }
@@ -739,10 +750,37 @@
 	.param_changed = input_param_changed
 };
 
-static void output_state_changed(void *data, enum pw_stream_state old,
+static void playback_state_changed(void *data, enum pw_stream_state old,
+		enum pw_stream_state state, const char *error)
+{
+	struct impl *impl = data;
+	switch (state) {
+	case PW_STREAM_STATE_PAUSED:
+		pw_stream_flush(impl->sink, false);
+		if (impl->playback != NULL)
+			pw_stream_flush(impl->playback, false);
+		if (old == PW_STREAM_STATE_STREAMING) {
+			impl->current_delay = 0;
+		}
+		break;
+	case PW_STREAM_STATE_UNCONNECTED:
+		pw_log_info("%p: playback unconnected", impl);
+		pw_impl_module_schedule_destroy(impl->module);
+		break;
+	case PW_STREAM_STATE_ERROR:
+		pw_log_info("%p: playback error: %s", impl, error);
+		break;
+	default:
+		break;
+	}
+}
+
+static void sink_state_changed(void *data, enum pw_stream_state old,
 		enum pw_stream_state state, const char *error)
 {
 	struct impl *impl = data;
+	int res;
+
 	switch (state) {
 	case PW_STREAM_STATE_PAUSED:
 		pw_stream_flush(impl->sink, false);
@@ -750,14 +788,31 @@
 			pw_stream_flush(impl->playback, false);
 		if (old == PW_STREAM_STATE_STREAMING) {
 			impl->current_delay = 0;
+
+			if (pw_stream_get_state(impl->capture, NULL) != PW_STREAM_STATE_STREAMING) {
+				pw_log_debug("%p: deactivate %s", impl, impl->aec->name);
+				res = spa_audio_aec_deactivate(impl->aec);
+				if (res < 0 && res != -EOPNOTSUPP) {
+					pw_log_error("aec plugin %s deactivate failed: %s", impl->aec->name, spa_strerror(res));
+				}
+			}
+		}
+		break;
+	case PW_STREAM_STATE_STREAMING:
+		if (pw_stream_get_state(impl->capture, NULL) == PW_STREAM_STATE_STREAMING) {
+			pw_log_debug("%p: activate %s", impl, impl->aec->name);
+			res = spa_audio_aec_activate(impl->aec);
+			if (res < 0 && res != -EOPNOTSUPP) {
+				pw_log_error("aec plugin %s activate failed: %s", impl->aec->name, spa_strerror(res));
+			}
 		}
 		break;
 	case PW_STREAM_STATE_UNCONNECTED:
-		pw_log_info("%p: output unconnected", impl);
+		pw_log_info("%p: sink unconnected", impl);
 		pw_impl_module_schedule_destroy(impl->module);
 		break;
 	case PW_STREAM_STATE_ERROR:
-		pw_log_info("%p: output error: %s", impl, error);
+		pw_log_info("%p: sink error: %s", impl, error);
 		break;
 	default:
 		break;
@@ -785,8 +840,6 @@
 
 static void output_param_changed(void *data, uint32_t id, const struct spa_pod *param)
 {
-	struct spa_pod_object *obj = (struct spa_pod_object *) param;
-	const struct spa_pod_prop *prop;
 	struct impl *impl = data;
 
 	switch (id) {
@@ -798,26 +851,7 @@
 		output_param_latency_changed(impl, param);
 		break;
 	case SPA_PARAM_Props:
-		if (param != NULL) {
-			uint8_t buffer1024;
-			struct spa_pod_dynamic_builder b;
-			const struct spa_pod* params1;
-
-			SPA_POD_OBJECT_FOREACH(obj, prop)
-			{
-				if (prop->key == SPA_PROP_params) {
-					spa_audio_aec_set_params(impl->aec, &prop->value);
-				}
-			}
-			spa_pod_dynamic_builder_init(&b, buffer, sizeof(buffer), 4096);
-			params0 = get_props_param(impl, &b.b);
-			if (params0 != NULL) {
-				pw_stream_update_params(impl->capture, params, 1);
-				if (impl->playback != NULL)
-					pw_stream_update_params(impl->playback, params, 1);
-			}
-			spa_pod_dynamic_builder_clean(&b);
-		}
+		props_changed(impl, param);
 		break;
 	}
 }
@@ -904,23 +938,25 @@
 static const struct pw_stream_events playback_events = {
 	PW_VERSION_STREAM_EVENTS,
 	.destroy = playback_destroy,
-	.state_changed = output_state_changed,
+	.state_changed = playback_state_changed,
 	.param_changed = output_param_changed
 };
 static const struct pw_stream_events sink_events = {
 	PW_VERSION_STREAM_EVENTS,
 	.destroy = sink_destroy,
 	.process = sink_process,
-	.state_changed = output_state_changed,
+	.state_changed = sink_state_changed,
 	.param_changed = output_param_changed
 };
 
+#define MAX_PARAMS	512u
+
 static int setup_streams(struct impl *impl)
 {
 	int res;
 	uint32_t n_params, i;
-	uint32_t offsets512;
-	const struct spa_pod *params512;
+	uint32_t offsetsMAX_PARAMS;
+	const struct spa_pod *paramsMAX_PARAMS;
 	struct spa_pod_dynamic_builder b;
 
 	impl->capture = pw_stream_new(impl->core,
@@ -970,15 +1006,28 @@
 	n_params = 0;
 	spa_pod_dynamic_builder_init(&b, NULL, 0, 4096);
 
-	offsetsn_params++ = b.b.state.offset;
-	spa_format_audio_raw_build(&b.b, SPA_PARAM_EnumFormat, &impl->capture_info);
-
+	if (n_params < MAX_PARAMS) {
+		offsetsn_params++ = b.b.state.offset;
+		spa_format_audio_raw_build(&b.b, SPA_PARAM_EnumFormat, &impl->capture_info);
+	}
 	int nbr_of_external_props = spa_audio_aec_enum_props(impl->aec, 0, NULL);
-	if (nbr_of_external_props > 0) {
-		for (int i = 0; i < nbr_of_external_props; i++) {
+	for (int i = 0; i < nbr_of_external_props; i++) {
+		if (n_params < MAX_PARAMS) {
 			offsetsn_params++ = b.b.state.offset;
 			spa_audio_aec_enum_props(impl->aec, i, &b.b);
 		}
+	}
+	if (n_params < MAX_PARAMS) {
+		offsetsn_params++ = b.b.state.offset;
+		spa_pod_builder_add_object(&b.b,
+                                SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo,
+                                SPA_PROP_INFO_name, SPA_POD_String("debug.aec.wav-path"),
+                                SPA_PROP_INFO_description, SPA_POD_String("Path to WAV file"),
+                                SPA_PROP_INFO_type, SPA_POD_String(impl->wav_path),
+                                SPA_PROP_INFO_params, SPA_POD_Bool(true));
+	}
+	if (n_params < MAX_PARAMS) {
+		offsetsn_params++ = b.b.state.offset;
 		get_props_param(impl, &b.b);
 	}

pipewire-1.0.1.tar.bz2/src/modules/module-example-filter.c -> pipewire-1.2.0.tar.gz/src/modules/module-example-filter.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-ffado-driver.c -> pipewire-1.2.0.tar.gz/src/modules/module-ffado-driver.c Changed

@@ -50,10 +50,14 @@
  * - `ffado.slave-mode`: slave mode
  * - `ffado.snoop-mode`: snoop mode
  * - `ffado.verbose`: ffado verbose level
+ * - `ffado.rtprio`: ffado realtime priority, this is by default the PipeWire server
+ *                   priority + 5
+ * - `ffado.realtime`: ffado realtime mode. this requires correctly configured rlimits
+ *                     to acquire FIFO scheduling at the ffado.rtprio priority
  * - `latency.internal.input`: extra input latency in frames
  * - `latency.internal.output`: extra output latency in frames
- * - `source.props`: Extra properties for the source filter.
- * - `sink.props`: Extra properties for the sink filter.
+ * - `source.props`: Extra properties for the source filter
+ * - `sink.props`: Extra properties for the sink filter
  *
  * ## General options
  *
@@ -82,6 +86,8 @@
  *         #ffado.slave-mode  = false
  *         #ffado.snoop-mode  = false
  *         #ffado.verbose     = 0
+ *         #ffado.rtprio      = 65
+ *         #ffado.realtime    = true
  *         #latency.internal.input  = 0
  *         #latency.internal.output = 0
  *         #audio.position    =  FL FR 
@@ -103,6 +109,7 @@
 #define PW_LOG_TOPIC_DEFAULT mod_topic
 
 #define MAX_PORTS	128
+#define FFADO_RT_PRIORITY_PACKETIZER_RELATIVE   5
 
 #define DEFAULT_DEVICES		" \"hw:0\" "
 #define DEFAULT_PERIOD_SIZE	1024
@@ -111,21 +118,25 @@
 #define DEFAULT_SLAVE_MODE	false
 #define DEFAULT_SNOOP_MODE	false
 #define DEFAULT_VERBOSE		0
+#define DEFAULT_RTPRIO		(RTPRIO_SERVER + FFADO_RT_PRIORITY_PACKETIZER_RELATIVE)
+#define DEFAULT_REALTIME	true
 
 #define DEFAULT_POSITION	" FL FR "
 #define DEFAULT_MIDI_PORTS	1
 
-#define MODULE_USAGE	"( remote.name=<remote> ) "				\
-			"( driver.mode=<sink|source|duplex> ) "			\
-			"( ffado.devices=<devices array size, default \"hw:0\"> ) "	\
-			"( ffado.period-size=<period size, default 1024> ) "	\
-			"( ffado.period-num=<period num, default 3> ) "		\
-			"( ffado.sample-rate=<sampe rate, default 48000> ) "	\
-			"( ffado.slave-mode=<slave mode, default false> ) "	\
-			"( ffado.snoop-mode=<snoop mode, default false> ) "	\
-			"( ffado.verbose=<verbose level, default 0> ) "		\
-			"( audio.position=<channel map> ) "			\
-			"( source.props=<properties> ) "			\
+#define MODULE_USAGE	"( remote.name=<remote> ) "					\
+			"( driver.mode=<sink|source|duplex, default duplex> ) "		\
+			"( ffado.devices=<devices array, default "DEFAULT_DEVICES"> ) "	\
+			"( ffado.period-size=<period size, default 1024> ) "		\
+			"( ffado.period-num=<period num, default 3> ) "			\
+			"( ffado.sample-rate=<sampe rate, default 48000> ) "		\
+			"( ffado.slave-mode=<slave mode, default false> ) "		\
+			"( ffado.snoop-mode=<snoop mode, default false> ) "		\
+			"( ffado.verbose=<verbose level, default 0> ) "			\
+			"( ffado.rtprio=<realtime priority, default "SPA_STRINGIFY(DEFAULT_RTPRIO)"> ) "	\
+			"( ffado.realtime=<realtime mode, default true> ) "		\
+			"( audio.position=<channel map> ) "				\
+			"( source.props=<properties> ) "				\
 			"( sink.props=<properties> ) "
 
 
@@ -136,12 +147,29 @@
 	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
 };
 
+struct port_data {
+	struct port *port;
+};
+
 struct port {
 	enum spa_direction direction;
+	ffado_streaming_stream_type stream_type;
+	char name280;
+
 	struct spa_latency_info latency2;
 	bool latency_changed2;
 	unsigned int is_midi:1;
+	unsigned int cleared:1;
 	void *buffer;
+
+	uint8_t event_byte;
+	uint8_t event_type;
+	uint32_t event_time;
+	uint8_t event_buffer512;
+	uint32_t event_pos;
+	int event_pending;
+
+	struct port_data *data;
 };
 
 struct volume {
@@ -162,14 +190,17 @@
 	struct port *portsMAX_PORTS;
 	struct volume volume;
 
+	unsigned int ready:1;
 	unsigned int running:1;
+	unsigned int transfered:1;
 };
 
 struct impl {
 	struct pw_context *context;
 	struct pw_loop *main_loop;
+	struct pw_loop *data_loop;
 	struct spa_system *system;
-	struct spa_thread_utils *utils;
+	struct spa_source *ffado_timer;
 
 	ffado_device_info_t device_info;
 	ffado_options_t device_options;
@@ -189,6 +220,8 @@
 	struct spa_hook core_proxy_listener;
 	struct spa_hook core_listener;
 
+	uint32_t reset_work_id;
+
 	struct spa_io_position *position;
 
 	uint32_t latency2;
@@ -204,6 +237,8 @@
 	bool slave_mode;
 	bool snoop_mode;
 	uint32_t verbose;
+	int32_t rtprio;
+	bool realtime;
 
 	uint32_t input_latency;
 	uint32_t output_latency;
@@ -213,15 +248,21 @@
 	uint32_t ffado_xrun;
 	uint32_t frame_time;
 
+	unsigned int do_disconnect:1;
+	unsigned int fix_midi:1;
+	unsigned int started:1;
+
 	pthread_t thread;
 
-	unsigned int do_disconnect:1;
 	unsigned int done:1;
 	unsigned int triggered:1;
 	unsigned int new_xrun:1;
-	unsigned int fix_midi:1;
 };
 
+static int stop_ffado_device(struct impl *impl);
+static int start_ffado_device(struct impl *impl);
+static void schedule_reset_ffado_device(struct impl *impl);
+
 static void reset_volume(struct volume *vol, uint32_t n_volumes)
 {
 	uint32_t i;
@@ -246,6 +287,15 @@
 	}
 }
 
+static void clear_port_buffer(struct port *p, uint32_t n_samples)
+{
+	if (!p->cleared) {
+		if (p->buffer)
+			memset(p->buffer, 0, n_samples * sizeof(uint32_t));
+		p->cleared = true;
+	}
+}
+
 static inline void fix_midi_event(uint8_t *data, size_t size)
 {
 	/* fixup NoteOn with vel 0 */
@@ -255,11 +305,13 @@
 	}
 }
 
-static void midi_to_ffado(struct impl *impl, float *dst, float *src, uint32_t n_samples)
+static void midi_to_ffado(struct port *p, float *src, uint32_t n_samples)
 {
 	struct spa_pod *pod;
 	struct spa_pod_sequence *seq;
 	struct spa_pod_control *c;
+	uint32_t i, index = 0, unhandled = 0;
+	uint32_t *dst = p->buffer;
 
 	if (src == NULL)
 		return;
@@ -271,6 +323,15 @@
 
 	seq = (struct spa_pod_sequence*)pod;
 
+	clear_port_buffer(p, n_samples);
+
+	/* first leftovers from previous cycle, always start at offset 0 */
+	for (i = 0; i < p->event_pos; i++) {
+		dstindex = 0x01000000 | (uint32_t) p->event_bufferi;
+		index += 8;
+	}
+	p->event_pos = 0;
+
 	SPA_POD_SEQUENCE_FOREACH(seq, c) {
 		switch(c->type) {
 		case SPA_CONTROL_Midi:
@@ -278,37 +339,206 @@
 			uint8_t *data = SPA_POD_BODY(&c->value);
 			size_t size = SPA_POD_BODY_SIZE(&c->value);
 
-			if (impl->fix_midi)
-				fix_midi_event(data, size);
-
+			if (index < c->offset)
+				index = SPA_ROUND_UP_N(c->offset, 8);
+			for (i = 0; i < size; i++) {
+				if (index >= n_samples) {
+					/* keep events that don't fit for the next cycle */
+					if (p->event_pos < sizeof(p->event_buffer))
+						p->event_bufferp->event_pos++ = datai;
+					else
+						unhandled++;
+				}
+				else
+					dstindex = 0x01000000 | (uint32_t) datai;
+				index += 8;
+			}
 			break;
 		}
 		default:
 			break;
 		}
 	}
+	if (unhandled > 0)
+		pw_log_warn("%u MIDI events dropped (index %d)", unhandled, index);
+	else if (p->event_pos > 0)
+		pw_log_debug("%u MIDI events saved (index %d)", p->event_pos, index);
+}
+
+static int take_bytes(struct port *p, uint32_t *frame, uint8_t **bytes, size_t *size)
+{
+	if (p->event_pos == 0)
+		return 0;
+	*frame = p->event_time;
+	*bytes = p->event_buffer;
+	*size = p->event_pos;
+	return 1;
 }
 
-static void ffado_to_midi(float *dst, float *src, uint32_t size)
+static const int status_len = {
+	2,		/* noteoff */
+	2,		/* noteon */
+	2,		/* keypress */
+	2,		/* controller */
+	1,		/* pgmchange */
+	1,		/* chanpress */
+	2,		/* pitchbend */
+	-1,		/* invalid */
+	1,		/* sysex 0xf0 */
+	1,		/* qframe 0xf1 */
+	2,		/* songpos 0xf2 */
+	1,		/* songsel 0xf3 */
+	-1,		/* none 0xf4 */
+	-1,		/* none 0xf5 */
+	0,		/* tune request 0xf6 */
+	-1,		/* none 0xf7 */
+	0,		/* clock 0xf8 */
+	-1,		/* none 0xf9 */
+	0,		/* start 0xfa */
+	0,		/* continue 0xfb */
+	0,		/* stop 0xfc */
+	-1,		/* none 0xfd */
+	0,		/* sensing 0xfe */
+	0,		/* reset 0xff */
+};
+
+static int process_byte(struct port *p, uint32_t time, uint8_t byte,
+		uint32_t *frame, uint8_t **bytes, size_t *size)
+{
+	int res = 0;
+	if (byte >= 0xf8) {
+		if (byte == 0xfd) {
+			pw_log_warn("dropping invalid MIDI status bytes %08x", byte);
+			return false;
+		}
+		p->event_byte = byte;
+		*frame = time;
+		*bytes = &p->event_byte;
+		*size = 1;
+		return 1;
+	}
+	if ((byte & 0x80) && (byte != 0xf7 || p->event_type != 8)) {
+		if (p->event_pending > 0)
+			pw_log_warn("incomplete MIDI message %02x dropped %u time:%u",
+					p->event_type, p->event_pending, time);
+		/* new command */
+		p->event_buffer0 = byte;
+		p->event_time = time;
+		if ((byte & 0xf0) == 0xf0) /* system message */
+			p->event_type = (byte & 0x0f) + 8;
+		else
+			p->event_type = (byte >> 4) & 0x07;
+		p->event_pos = 1;
+		p->event_pending = status_lenp->event_type;
+	} else {
+		 if (p->event_pending > 0) {
+			/* rest of command */
+			if (p->event_pos < sizeof(p->event_buffer))
+				p->event_bufferp->event_pos++ = byte;
+			if (p->event_type != 8)
+				p->event_pending--;
+		} else {
+			/* running status */
+			p->event_buffer1 = byte;
+			p->event_time = time;
+			p->event_pending = status_lenp->event_type - 1;
+			p->event_pos = 2;
+		}
+	}
+	if (p->event_pending == 0) {
+		res = take_bytes(p, frame, bytes, size);
+		if (p->event_type >= 8)
+			p->event_type = 7;
+	} else if (p->event_type == 8) {
+		if (byte == 0xf7 || p->event_pos >= sizeof(p->event_buffer)) {
+			res = take_bytes(p, frame, bytes, size);
+			p->event_pos = 0;
+			if (byte == 0xf7) {
+				p->event_pending = 0;
+				p->event_type = 7;
+			}
+		}
+	}
+	return res;
+}
+
+static void ffado_to_midi(struct port *p, float *dst, uint32_t *src, uint32_t size)
 {
 	struct spa_pod_builder b = { 0, };
 	uint32_t i, count;
 	struct spa_pod_frame f;
 
-	count = src ? 0 : 0;
+	count = src ? size : 0;
 
 	spa_pod_builder_init(&b, dst, size);
 	spa_pod_builder_push_sequence(&b, &f, 0);
 	for (i = 0; i < count; i++) {
-	}
+		uint32_t data = srci, frame;
+		uint8_t *bytes;
+		size_t size;
+
+		if ((data & 0xff000000) == 0)
+			continue;
+
+		if (process_byte(p, i, data & 0xff, &frame, &bytes, &size)) {
+			spa_pod_builder_control(&b, frame, SPA_CONTROL_Midi);
+	                spa_pod_builder_bytes(&b, bytes, size);
+		}
+        }
 	spa_pod_builder_pop(&b, &f);
+	if (p->event_pending > 0)
+		/* make sure the rest of the MIDI message is sent first in the next cycle */
+		p->event_time = 0;
+}
+
+static inline uint64_t get_time_ns(struct impl *impl)
+{
+	uint64_t nsec;
+	if (impl->sink.filter)
+		nsec = pw_filter_get_nsec(impl->sink.filter);
+	else if (impl->source.filter)
+		nsec = pw_filter_get_nsec(impl->source.filter);
+	else
+		nsec = 0;
+	return nsec;
+}
+
+static int set_timeout(struct impl *impl, uint64_t time)
+{
+	struct timespec timeout, interval;
+	timeout.tv_sec = time / SPA_NSEC_PER_SEC;
+	timeout.tv_nsec = time % SPA_NSEC_PER_SEC;
+	interval.tv_sec = 0;
+	interval.tv_nsec = 0;
+	pw_loop_update_timer(impl->data_loop,
+                                impl->ffado_timer, &timeout, &interval, true);
+	return 0;
 }
 
 static void stream_destroy(void *d)
 {
 	struct stream *s = d;
+	uint32_t i;
+	for (i = 0; i < s->n_ports; i++) {
+		struct port *p = s->portsi;
+		if (p != NULL) {
+			s->portsi = NULL;
+			free(p->buffer);
+			free(p);
+		}
+	}
+	s->n_ports = 0;
 	spa_hook_remove(&s->listener);
 	s->filter = NULL;
+	s->ready = false;
+	s->running = false;
+}
+
+static void check_start(struct impl *impl)
+{
+	if ((!(impl->mode & MODE_SINK) || (impl->sink.ready && impl->sink.running)) &&
+	    (!(impl->mode & MODE_SOURCE) || (impl->source.ready && impl->source.running)))
+		start_ffado_device(impl);
 }
 
 static void stream_state_changed(void *d, enum pw_filter_state old,
@@ -318,14 +548,19 @@
 	struct impl *impl = s->impl;
 	switch (state) {
 	case PW_FILTER_STATE_ERROR:
+		pw_log_error("filter state %d error: %s", state, error);
+		SPA_FALLTHROUGH;
 	case PW_FILTER_STATE_UNCONNECTED:
 		pw_impl_module_schedule_destroy(impl->module);
 		break;
 	case PW_FILTER_STATE_PAUSED:
 		s->running = false;
+		if (!impl->sink.running && !impl->source.running)
+			stop_ffado_device(impl);
 		break;
 	case PW_FILTER_STATE_STREAMING:
 		s->running = true;
+		check_start(impl);
 		break;
 	default:
 		break;
@@ -338,7 +573,8 @@
 	struct impl *impl = s->impl;
 	uint32_t i, n_samples = position->clock.duration;
 
-	if (impl->mode & MODE_SINK && impl->triggered) {
+	pw_log_trace_fp("process %d", impl->triggered);
+	if (impl->mode == MODE_SINK && impl->triggered) {
 		impl->triggered = false;
 		return;
 	}
@@ -346,54 +582,81 @@
 	for (i = 0; i < s->n_ports; i++) {
 		struct port *p = s->portsi;
 		float *src;
-		if (p == NULL)
+		if (p == NULL || p->data == NULL)
 			continue;
 
-		src = pw_filter_get_dsp_buffer(p, n_samples);
-		if (src == NULL)
+		src = pw_filter_get_dsp_buffer(p->data, n_samples);
+		if (src == NULL) {
+			clear_port_buffer(p, n_samples);
 			continue;
+		}
 
 		if (SPA_UNLIKELY(p->is_midi))
-			midi_to_ffado(impl, p->buffer, src, n_samples);
+			midi_to_ffado(p, src, n_samples);
 		else
 			do_volume(p->buffer, src, &s->volume, i, n_samples);
+
+		p->cleared = false;
 	}
 	ffado_streaming_transfer_playback_buffers(impl->dev);
+	s->transfered = true;
 
-	pw_log_trace_fp("done %u", impl->frame_time);
-	if (impl->mode & MODE_SINK) {
+	if (impl->mode == MODE_SINK) {
+		pw_log_trace_fp("done %u", impl->frame_time);
 		impl->done = true;
+		set_timeout(impl, position->clock.nsec);
 	}
 }
 
+static void silence_playback(struct impl *impl)
+{
+	uint32_t i;
+	struct stream *s = &impl->sink;
+
+	for (i = 0; i < s->n_ports; i++) {
+		struct port *p = s->portsi;
+		if (p != NULL)
+			clear_port_buffer(p, impl->period_size);
+	}
+	ffado_streaming_transfer_playback_buffers(impl->dev);
+	s->transfered = true;
+}
+
 static void source_process(void *d, struct spa_io_position *position)
 {
 	struct stream *s = d;
 	struct impl *impl = s->impl;
 	uint32_t i, n_samples = position->clock.duration;
 
-	if (impl->mode == MODE_SOURCE && !impl->triggered) {
+	pw_log_trace_fp("process %d", impl->triggered);
+
+	if (!impl->triggered) {
 		pw_log_trace_fp("done %u", impl->frame_time);
 		impl->done = true;
+		if (!impl->sink.transfered)
+			silence_playback(impl);
+		set_timeout(impl, position->clock.nsec);
 		return;
 	}
+
 	impl->triggered = false;
 
 	ffado_streaming_transfer_capture_buffers(impl->dev);
+	s->transfered = true;
 
 	for (i = 0; i < s->n_ports; i++) {
 		struct port *p = s->portsi;
 		float *dst;
 
-		if (p == NULL || p->buffer == NULL)
+		if (p == NULL || p->data == NULL || p->buffer == NULL)
 			continue;
 
-		dst = pw_filter_get_dsp_buffer(p, n_samples);
+		dst = pw_filter_get_dsp_buffer(p->data, n_samples);
 		if (dst == NULL)
 			continue;
 
 		if (SPA_UNLIKELY(p->is_midi))
-			ffado_to_midi(dst, p->buffer, n_samples);
+			ffado_to_midi(p, dst, p->buffer, n_samples);
 		else
 			do_volume(dst, p->buffer, &s->volume, i, n_samples);
 	}
@@ -415,8 +678,9 @@
 }
 
 static void param_latency_changed(struct stream *s, const struct spa_pod *param,
-		struct port *port)
+		struct port_data *data)
 {
+	struct port *port = data->port;
 	struct spa_latency_info latency;
 	bool update = false;
 	enum spa_direction direction = port->direction;
@@ -430,60 +694,57 @@
 	}
 }
 
-static void make_stream_ports(struct stream *s)
+static int make_stream_ports(struct stream *s)
 {
 	struct impl *impl = s->impl;
 	struct pw_properties *props;
-	char name512;
 	uint8_t buffer1024;
 	struct spa_pod_builder b;
 	struct spa_latency_info latency;
 	const struct spa_pod *params2;
-	uint32_t i, n_params = 0;
+	uint32_t i, n_params = 0, n_channels = 0;
 	bool is_midi;
 
 	for (i = 0; i < s->n_ports; i++) {
 		struct port *port = s->portsi;
-		ffado_streaming_stream_type stream_type;
-		char portname256;
-
-		if (port != NULL) {
-			s->portsi = NULL;
+		if (port->data != NULL) {
 			free(port->buffer);
-			pw_filter_remove_port(port);
+			pw_filter_remove_port(port->data);
+			port->data = NULL;
 		}
+	}
+	for (i = 0; i < s->n_ports; i++) {
+		struct port *port = s->portsi;
+		char channel32;
 
-		if (s->direction == PW_DIRECTION_INPUT) {
-			ffado_streaming_get_playback_stream_name(impl->dev, i, portname, sizeof(portname));
-			stream_type = ffado_streaming_get_playback_stream_type(impl->dev, i);
-			snprintf(name, sizeof(name), "%s_out", portname);
-		} else {
-			ffado_streaming_get_capture_stream_name(impl->dev, i, portname, sizeof(portname));
-			stream_type = ffado_streaming_get_capture_stream_type(impl->dev, i);
-			snprintf(name, sizeof(name), "%s_in", portname);
-		}
+		snprintf(channel, sizeof(channel), "AUX%u", n_channels % SPA_AUDIO_MAX_CHANNELS);
 
-		switch (stream_type) {
+		switch (port->stream_type) {
 		case ffado_stream_type_audio:
 			props = pw_properties_new(
 					PW_KEY_FORMAT_DSP, "32 bit float mono audio",
 					PW_KEY_PORT_PHYSICAL, "true",
-					PW_KEY_PORT_NAME, name,
+					PW_KEY_PORT_TERMINAL, "true",
+					PW_KEY_PORT_NAME, port->name,
+					PW_KEY_AUDIO_CHANNEL, channel,
 					NULL);
 			is_midi = false;
+			n_channels++;
 			break;
 		case ffado_stream_type_midi:
 			props = pw_properties_new(
 					PW_KEY_FORMAT_DSP, "8 bit raw midi",
-					PW_KEY_PORT_NAME, name,
+					PW_KEY_PORT_NAME, port->name,
 					PW_KEY_PORT_PHYSICAL, "true",
+					PW_KEY_PORT_TERMINAL, "true",
+					PW_KEY_PORT_CONTROL, "true",
 					NULL);
 
 			is_midi = true;
 			break;
 		default:
 			pw_log_info("not registering unknown stream %d %s (type %d)", i,
-					name, stream_type);
+					port->name, port->stream_type);
 			continue;
 
 		}
@@ -497,38 +758,46 @@
 		n_params = 0;
 		paramsn_params++ = spa_latency_build(&b, SPA_PARAM_Latency, &latency);
 
-		port = pw_filter_add_port(s->filter,
+		port->data = pw_filter_add_port(s->filter,
                         s->direction,
                         PW_FILTER_PORT_FLAG_MAP_BUFFERS,
-                        sizeof(struct port),
-			props, params, n_params);
-		if (port == NULL) {
+                        sizeof(struct port_data), props, params, n_params);
+		if (port->data == NULL) {
 			pw_log_error("Can't create port: %m");
-			return;
+			return -errno;
 		}
+		port->data->port = port;
 
 		port->latencys->direction = latency;
 		port->is_midi = is_midi;
 		port->buffer = calloc(impl->quantum_limit, sizeof(float));
 		if (port->buffer == NULL) {
 			pw_log_error("Can't create port buffer: %m");
-			return;
+			return -errno;
 		}
+	}
+	return 0;
+}
+
+static void setup_stream_ports(struct stream *s)
+{
+	struct impl *impl = s->impl;
+	uint32_t i;
+	for (i = 0; i < s->n_ports; i++) {
+		struct port *port = s->portsi;
 		if (s->direction == PW_DIRECTION_INPUT) {
 			if (ffado_streaming_set_playback_stream_buffer(impl->dev, i, port->buffer))
-				pw_log_error("cannot configure port buffer for %s", name);
+				pw_log_error("cannot configure port buffer for %s", port->name);
 
 			if (ffado_streaming_playback_stream_onoff(impl->dev, i, 1))
-				pw_log_error("cannot enable port %s", name);
+				pw_log_error("cannot enable port %s", port->name);
 		} else {
 			if (ffado_streaming_set_capture_stream_buffer(impl->dev, i, port->buffer))
-				pw_log_error("cannot configure port buffer for %s", name);
+				pw_log_error("cannot configure port buffer for %s", port->name);
 
 			if (ffado_streaming_capture_stream_onoff(impl->dev, i, 1))
-				pw_log_error("cannot enable port %s", name);
+				pw_log_error("cannot enable port %s", port->name);
 		}
-
-		s->portsi = port;
 	}
 }
 
@@ -584,6 +853,7 @@
 		const struct spa_pod *param)
 {
 	struct stream *s = data;
+
 	if (port_data != NULL) {
 		switch (id) {
 		case SPA_PARAM_Latency:
@@ -594,7 +864,10 @@
 		switch (id) {
 		case SPA_PARAM_PortConfig:
 			pw_log_debug("PortConfig");
-			make_stream_ports(s);
+			if (make_stream_ports(s) >= 0) {
+				s->ready = true;
+				check_start(s->impl);
+			}
 			break;
 		case SPA_PARAM_Props:
 			pw_log_debug("Props");
@@ -635,11 +908,11 @@
 	n_params = 0;
 	spa_pod_builder_init(&b, buffer, sizeof(buffer));
 
-	s->filter = pw_filter_new(impl->core, name, s->props);
-	s->props = NULL;
+	s->filter = pw_filter_new(impl->core, name, pw_properties_copy(s->props));
 	if (s->filter == NULL)
 		return -errno;
 
+	spa_zero(s->listener);
 	if (s->direction == PW_DIRECTION_INPUT) {
 		pw_filter_add_listener(s->filter, &s->listener,
 				&sink_events, s);
@@ -664,105 +937,152 @@
 			params, n_params);
 }
 
-static int create_filters(struct impl *impl)
+static void destroy_stream(struct stream *s)
 {
-	int res = 0;
-
-	if (impl->mode & MODE_SINK)
-		res = make_stream(&impl->sink, "FFADO Sink");
-
-	if (impl->mode & MODE_SOURCE)
-		res = make_stream(&impl->source, "FFADO Source");
-
-	return res;
+	if (s->filter)
+		pw_filter_destroy(s->filter);
 }
 
-static inline uint64_t get_time_ns(void)
+static void on_ffado_timeout(void *data, uint64_t expirations)
 {
-	struct timespec ts;
-	clock_gettime(CLOCK_MONOTONIC, &ts);
-	return SPA_TIMESPEC_TO_NSEC(&ts);
-}
-
-static void *ffado_process_thread(void *arg)
-{
-	struct impl *impl = arg;
+	struct impl *impl = data;
 	bool source_running, sink_running;
 	uint64_t nsec;
+	ffado_wait_response response;
 
-	while (true) {
-		ffado_wait_response response;
+	pw_log_trace_fp("wakeup %d", impl->done);
 
-		response = ffado_streaming_wait(impl->dev);
-		nsec = get_time_ns();
+	if (!impl->done) {
+		impl->pw_xrun++;
+		impl->new_xrun = true;
+		ffado_streaming_reset(impl->dev);
+	}
+again:
+	pw_log_trace_fp("FFADO wait");
+	response = ffado_streaming_wait(impl->dev);
+	nsec = get_time_ns(impl);
 
-		switch (response) {
-		case ffado_wait_ok:
-			break;
-		case ffado_wait_xrun:
-			pw_log_warn("FFADO xrun");
-			break;
-		case ffado_wait_shutdown:
-			pw_log_info("FFADO shutdown");
-			return NULL;
-		case ffado_wait_error:
-		default:
-			pw_log_error("FFADO error");
-			return NULL;
-		}
-		source_running = impl->source.running;
-		sink_running = impl->sink.running;
+	switch (response) {
+	case ffado_wait_ok:
+		break;
+	case ffado_wait_xrun:
+		pw_log_debug("FFADO xrun");
+		impl->ffado_xrun++;
+		impl->new_xrun = true;
+		goto again;
+	case ffado_wait_shutdown:
+		pw_log_info("FFADO shutdown");
+		return;
+	case ffado_wait_error:
+	default:
+		pw_log_error("FFADO error");
+		return;
+	}
+	source_running = impl->source.running && impl->sink.ready;
+	sink_running = impl->sink.running && impl->source.ready;
 
-		pw_log_trace_fp("process %d %u %u %p %d", impl->period_size, source_running,
-				sink_running, impl->position, impl->frame_time);
+	impl->source.transfered = false;
+	impl->sink.transfered = false;
 
-		if (impl->new_xrun) {
-			pw_log_warn("Xrun FFADO:%u PipeWire:%u", impl->ffado_xrun, impl->pw_xrun);
-			impl->new_xrun = false;
-		}
+	if (!source_running) {
+		ffado_streaming_transfer_capture_buffers(impl->dev);
+		impl->source.transfered = true;
+	}
+	if (!sink_running)
+		silence_playback(impl);
+
+	pw_log_trace_fp("process %d %u %u %p %d %"PRIu64, impl->period_size, source_running,
+			sink_running, impl->position, impl->frame_time, nsec);
 
-		if (impl->position) {
-			struct spa_io_clock *c = &impl->position->clock;
+	if (impl->new_xrun) {
+		pw_log_warn("Xrun FFADO:%u PipeWire:%u source:%d sink:%d",
+				impl->ffado_xrun, impl->pw_xrun, source_running, sink_running);
+		impl->new_xrun = false;
+	}
 
-			c->nsec = nsec;
-			c->rate = SPA_FRACTION(1, impl->sample_rate);
-			c->position += impl->period_size;
-			c->duration = impl->period_size;
-			c->delay = 0;
-			c->rate_diff = 1.0;
-			c->next_nsec = nsec;
+	if (impl->position) {
+		struct spa_io_clock *c = &impl->position->clock;
 
-			c->target_rate = c->rate;
-			c->target_duration = c->duration;
-		}
-		if (impl->mode & MODE_SINK && sink_running) {
-			impl->done = false;
-			impl->triggered = true;
-			pw_filter_trigger_process(impl->sink.filter);
-		} else if (impl->mode == MODE_SOURCE && source_running) {
-			impl->done = false;
-			impl->triggered = true;
-			pw_filter_trigger_process(impl->source.filter);
+#if 0
+		if (c->target_duration != (uint64_t) impl->period_size) {
+			ffado_streaming_transfer_capture_buffers(impl->dev);
+			silence_playback(impl);
+
+			if (ffado_streaming_set_period_size(impl->dev, c->target_duration) != 0) {
+				pw_log_warn("can't change period size");
+			} else {
+				sleep(1);
+				impl->period_size = c->target_duration;
+			}
+			goto again;
 		}
+#endif
+
+		c->nsec = nsec;
+		c->rate = SPA_FRACTION(1, impl->sample_rate);
+		c->position += impl->period_size;
+		c->duration = impl->period_size;
+		c->delay = 0;
+		c->rate_diff = 1.0;
+		c->next_nsec = nsec + (c->duration * SPA_NSEC_PER_SEC) / impl->sample_rate;
+
+		c->target_rate = c->rate;
+		c->target_duration = c->duration;
+	}
+	if (impl->mode & MODE_SOURCE && source_running) {
+		impl->done = false;
+		impl->triggered = true;
+		set_timeout(impl, nsec + SPA_NSEC_PER_SEC);
+		pw_filter_trigger_process(impl->source.filter);
+	} else if (impl->mode == MODE_SINK && sink_running) {
+		impl->done = false;
+		impl->triggered = true;
+		set_timeout(impl, nsec + SPA_NSEC_PER_SEC);
+		pw_filter_trigger_process(impl->sink.filter);
+	} else {
+		impl->done = true;
+		set_timeout(impl, nsec);
 	}
-	return NULL;
+}
+
+static void close_ffado_device(struct impl *impl)
+{
+	if (impl->dev == NULL)
+		return;
+
+	stop_ffado_device(impl);
+	ffado_streaming_finish(impl->dev);
+	impl->dev = NULL;
+
+	pw_log_info("closed FFADO device %s", impl->devices0);
 }
 
 static int open_ffado_device(struct impl *impl)
 {
-	ffado_streaming_stream_type stream_type;
-	uint32_t i;
+	int32_t target_rate, target_period;
+
+	if (impl->dev != NULL)
+		return 0;
+
+	if (impl->position) {
+		struct spa_io_clock *c = &impl->position->clock;
+		target_rate = c->target_rate.denom;
+		target_period = c->target_duration;
+	} else {
+		target_rate = impl->sample_rate;
+		target_period = impl->period_size;
+	}
 
 	spa_zero(impl->device_info);
 	impl->device_info.device_spec_strings = impl->devices;
 	impl->device_info.nb_device_spec_strings = impl->n_devices;
 
 	spa_zero(impl->device_options);
-	impl->device_options.sample_rate = impl->sample_rate;
-	impl->device_options.period_size = impl->period_size;
+	impl->device_options.sample_rate = target_rate;
+	impl->device_options.period_size = target_period;
 	impl->device_options.nb_buffers = impl->n_periods;
-	impl->device_options.realtime = 1;
-	impl->device_options.packetizer_priority = 88;
+	impl->device_options.realtime = impl->realtime;
+	impl->device_options.packetizer_priority = impl->rtprio;
 	impl->device_options.verbose = impl->verbose;
 	impl->device_options.slave_mode = impl->slave_mode;
 	impl->device_options.snoop_mode = impl->snoop_mode;
@@ -783,70 +1103,170 @@
 	ffado_streaming_set_audio_datatype(impl->dev, ffado_audio_datatype_float);
 
 	impl->sample_rate = impl->device_options.sample_rate;
+	impl->period_size = impl->device_options.period_size;
 	impl->source.info.rate = impl->sample_rate;
 	impl->sink.info.rate = impl->sample_rate;
 
-	impl->source.info.channels = 0;
 	impl->source.n_ports = ffado_streaming_get_nb_capture_streams(impl->dev);
+	impl->sink.n_ports = ffado_streaming_get_nb_playback_streams(impl->dev);
+
+	if (impl->source.n_ports == 0 && impl->sink.n_ports == 0) {
+		close_ffado_device(impl);
+		return -EIO;
+	}
+
+	pw_log_info("opened FFADO device %s source:%d sink:%d rate:%d period:%d %p",
+			impl->devices0, impl->source.n_ports, impl->sink.n_ports,
+			impl->sample_rate, impl->period_size, impl->position);
+
+	return 0;
+}
+
+static int probe_ffado_device(struct impl *impl)
+{
+	int res;
+	uint32_t i, n_channels;
+	struct port *port;
+	char name256;
+
+	if ((res = open_ffado_device(impl)) < 0)
+		return res;
+
+	n_channels = 0;
 	for (i = 0; i < impl->source.n_ports; i++) {
-		stream_type = ffado_streaming_get_capture_stream_type(impl->dev, i);
-		switch (stream_type) {
+		port = calloc(1, sizeof(struct port));
+		if (port == NULL)
+			return -errno;
+
+		port->direction = impl->source.direction;
+		port->stream_type = ffado_streaming_get_capture_stream_type(impl->dev, i);
+		ffado_streaming_get_capture_stream_name(impl->dev, i, name, sizeof(name));
+		snprintf(port->name, sizeof(port->name), "%s_out", name);
+
+		switch (port->stream_type) {
 		case ffado_stream_type_audio:
-			impl->source.info.channels++;
+			n_channels++;
 			break;
 		default:
 			break;
 		}
+		impl->source.portsi = port;
 	}
-	impl->sink.info.channels = 0;
-	impl->sink.n_ports = ffado_streaming_get_nb_playback_streams(impl->dev);
+	if (impl->source.info.channels != n_channels) {
+		impl->source.info.channels = n_channels;
+		for (i = 0; i < SPA_MIN(impl->source.info.channels, SPA_AUDIO_MAX_CHANNELS); i++)
+			impl->source.info.positioni = SPA_AUDIO_CHANNEL_AUX0 + i;
+	}
+
+	n_channels = 0;
 	for (i = 0; i < impl->sink.n_ports; i++) {
-		stream_type = ffado_streaming_get_playback_stream_type(impl->dev, i);
-		switch (stream_type) {
+		port = calloc(1, sizeof(struct port));
+		if (port == NULL)
+			return -errno;
+
+		port->direction = impl->sink.direction;
+		port->stream_type = ffado_streaming_get_playback_stream_type(impl->dev, i);
+		ffado_streaming_get_playback_stream_name(impl->dev, i, name, sizeof(name));
+		snprintf(port->name, sizeof(port->name), "%s_in", name);
+
+		switch (port->stream_type) {
 		case ffado_stream_type_audio:
-			impl->sink.info.channels++;
+			n_channels++;
 			break;
 		default:
 			break;
 		}
+		impl->sink.portsi = port;
 	}
-	if (ffado_streaming_prepare(impl->dev)) {
-		pw_log_error("Could not prepare streaming");
-		return -EIO;
+	if (impl->sink.info.channels != n_channels) {
+		impl->sink.info.channels = n_channels;
+		for (i = 0; i < SPA_MIN(impl->sink.info.channels, SPA_AUDIO_MAX_CHANNELS); i++)
+			impl->sink.info.positioni = SPA_AUDIO_CHANNEL_AUX0 + i;
 	}
-	return 0;
+
+	if (impl->mode & MODE_SINK) {
+		if ((res = make_stream(&impl->sink, "FFADO Sink")) < 0)
+			goto exit;
+	}
+	if (impl->mode & MODE_SOURCE) {
+		if ((res = make_stream(&impl->source, "FFADO Source")) < 0)
+			goto exit;
+	}
+exit:
+	close_ffado_device(impl);
+
+	return res;
 }
 
+
 static int start_ffado_device(struct impl *impl)
 {
-	struct spa_thread *thr;
+	int res;
 
-	if (ffado_streaming_start(impl->dev)) {
-		pw_log_error("Could not start streaming");
+	if (impl->started)
+		return 0;
+
+	if ((res = open_ffado_device(impl)) < 0)
+		return res;
+
+	setup_stream_ports(&impl->source);
+	setup_stream_ports(&impl->sink);
+
+	if (ffado_streaming_prepare(impl->dev)) {
+		pw_log_error("Could not prepare streaming");
+		schedule_reset_ffado_device(impl);
 		return -EIO;
 	}
 
-	thr = spa_thread_utils_create(impl->utils, NULL, ffado_process_thread, impl);
-	impl->thread = (pthread_t)thr;
-	if (thr == NULL) {
-		pw_log_error("%p: can't create thread: %m", impl);
-		return -errno;
+	if (ffado_streaming_start(impl->dev)) {
+		pw_log_warn("Could not start FFADO streaming, try reset");
+		schedule_reset_ffado_device(impl);
+		return -EIO;
 	}
-	spa_thread_utils_acquire_rt(impl->utils, thr, -1);
+	pw_log_info("FFADO started streaming");
 
+	impl->started = true;
+	impl->done = true;
+	set_timeout(impl, get_time_ns(impl));
 	return 0;
 }
 
 static int stop_ffado_device(struct impl *impl)
 {
-	if (ffado_streaming_stop(impl->dev)) {
-		pw_log_error("Could not stop streaming");
-	}
-	spa_thread_utils_join(impl->utils, (struct spa_thread*)impl->thread, NULL);
+	if (!impl->started)
+		return 0;
+
+	impl->started = false;
+	set_timeout(impl, 0);
+	if (ffado_streaming_stop(impl->dev))
+		pw_log_error("Could not stop FFADO streaming");
+	else
+		pw_log_info("FFADO stopped streaming");
+
+	close_ffado_device(impl);
 
 	return 0;
 }
 
+
+static void do_reset_ffado(void *obj, void *data, int res, uint32_t id)
+{
+	struct impl *impl = obj;
+
+	impl->reset_work_id = SPA_ID_INVALID;
+	close_ffado_device(impl);
+	open_ffado_device(impl);
+}
+
+static void schedule_reset_ffado_device(struct impl *impl)
+{
+	if (impl->reset_work_id != SPA_ID_INVALID)
+		return;
+
+	impl->reset_work_id = pw_work_queue_add(pw_context_get_work_queue(impl->context),
+						  impl, 0, do_reset_ffado, NULL);
+}
+
 static void core_error(void *data, uint32_t id, int seq, int res, const char *message)
 {
 	struct impl *impl = data;
@@ -879,17 +1299,22 @@
 {
 	uint32_t i;
 
-	if (impl->dev) {
-		stop_ffado_device(impl);
-		ffado_streaming_finish(impl->dev);
-		impl->dev = NULL;
-	}
-	if (impl->source.filter)
-		pw_filter_destroy(impl->source.filter);
-	if (impl->sink.filter)
-		pw_filter_destroy(impl->sink.filter);
+	if (impl->reset_work_id != SPA_ID_INVALID)
+		pw_work_queue_cancel(pw_context_get_work_queue(impl->context),
+				     impl, SPA_ID_INVALID);
+
+	close_ffado_device(impl);
+
+	destroy_stream(&impl->source);
+	destroy_stream(&impl->sink);
+
 	if (impl->core && impl->do_disconnect)
 		pw_core_disconnect(impl->core);
+	if (impl->ffado_timer)
+		pw_loop_destroy_source(impl->data_loop, impl->ffado_timer);
+
+	if (impl->data_loop)
+		pw_context_release_loop(impl->context, impl->data_loop);
 
 	pw_properties_free(impl->sink.props);
 	pw_properties_free(impl->source.props);
@@ -1024,11 +1449,14 @@
 			"ffado.snoop-mode", DEFAULT_SNOOP_MODE);
 	impl->verbose = pw_properties_get_uint32(props,
 			"ffado.verbose", DEFAULT_VERBOSE);
+	impl->rtprio = pw_properties_get_uint32(props,
+			"ffado.rtprio", DEFAULT_RTPRIO);
+	impl->realtime = pw_properties_get_bool(props,
+			"ffado.realtime", DEFAULT_REALTIME);
 	impl->input_latency = pw_properties_get_uint32(props,
 			"latency.internal.input", 0);
 	impl->output_latency = pw_properties_get_uint32(props,
 			"latency.internal.output", 0);
-	impl->utils = pw_thread_utils_get();
 
 	impl->quantum_limit = pw_properties_get_uint32(
 			pw_context_get_properties(context),
@@ -1045,7 +1473,9 @@
 	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->system = impl->main_loop->system;
+	impl->reset_work_id = SPA_ID_INVALID;
 
 	impl->source.impl = impl;
 	impl->source.direction = PW_DIRECTION_OUTPUT;
@@ -1066,21 +1496,32 @@
 			goto error;
 		}
 	}
+	impl->ffado_timer = pw_loop_add_timer(impl->data_loop, on_ffado_timeout, impl);
+	if (impl->ffado_timer == NULL) {
+		pw_log_error("can't create ffado timer: %m");
+		res = -errno;
+		goto error;
+	}
 
+	pw_properties_set(props, PW_KEY_NODE_LOOP_NAME, impl->data_loop->name);
 	if (pw_properties_get(props, PW_KEY_NODE_VIRTUAL) == NULL)
 		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_ALWAYS_PROCESS) == NULL)
-		pw_properties_set(props, PW_KEY_NODE_ALWAYS_PROCESS, "true");
+	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");
 
 	pw_properties_set(impl->sink.props, PW_KEY_MEDIA_CLASS, "Audio/Sink");
-	pw_properties_set(impl->sink.props, PW_KEY_PRIORITY_DRIVER, "35001");
+	pw_properties_set(impl->sink.props, PW_KEY_PRIORITY_DRIVER, "35000");
+	pw_properties_set(impl->sink.props, PW_KEY_PRIORITY_SESSION, "2000");
 	pw_properties_set(impl->sink.props, PW_KEY_NODE_NAME, "ffado_sink");
 	pw_properties_set(impl->sink.props, PW_KEY_NODE_DESCRIPTION, "FFADO Sink");
 
 	pw_properties_set(impl->source.props, PW_KEY_MEDIA_CLASS, "Audio/Source");
-	pw_properties_set(impl->source.props, PW_KEY_PRIORITY_DRIVER, "35000");
+	pw_properties_set(impl->source.props, PW_KEY_PRIORITY_DRIVER, "35001");
+	pw_properties_set(impl->source.props, PW_KEY_PRIORITY_SESSION, "2001");
 	pw_properties_set(impl->source.props, PW_KEY_NODE_NAME, "ffado_source");
 	pw_properties_set(impl->source.props, PW_KEY_NODE_DESCRIPTION, "FFADO Source");
 
@@ -1089,9 +1530,11 @@
 	if ((str = pw_properties_get(props, "source.props")) != NULL)
 		pw_properties_update_string(impl->source.props, str, strlen(str));
 
-	copy_props(impl, props, PW_KEY_NODE_ALWAYS_PROCESS);
+	copy_props(impl, props, PW_KEY_NODE_LOOP_NAME);
+	copy_props(impl, props, PW_KEY_NODE_LINK_GROUP);
 	copy_props(impl, props, PW_KEY_NODE_GROUP);
 	copy_props(impl, props, PW_KEY_NODE_VIRTUAL);
+	copy_props(impl, props, PW_KEY_NODE_PAUSE_ON_IDLE);
 
 	parse_audio_info(impl->source.props, &impl->source.info);
 	parse_audio_info(impl->sink.props, &impl->sink.info);
@@ -1119,13 +1562,7 @@
 			&impl->core_listener,
 			&core_events, impl);
 
-	if ((res = open_ffado_device(impl)) < 0)
-		goto error;
-
-	if ((res = create_filters(impl)) < 0)
-		goto error;
-
-	if ((res = start_ffado_device(impl)) < 0)
+	if ((res = probe_ffado_device(impl)) < 0)
 		goto error;
 
 	pw_impl_module_add_listener(module, &impl->module_listener, &module_events, impl);

pipewire-1.0.1.tar.bz2/src/modules/module-filter-chain.c -> pipewire-1.2.0.tar.gz/src/modules/module-filter-chain.c Changed

@@ -23,6 +23,7 @@
 #include <spa/param/tag-utils.h>
 #include <spa/pod/dynamic.h>
 #include <spa/debug/types.h>
+#include <spa/debug/log.h>
 
 #include <pipewire/utils.h>
 #include <pipewire/impl.h>
@@ -128,7 +129,7 @@
  * use a mixer if you want the output of multiple filters to go into one
  * filter input port.
  *
- * links can be omited when the graph has just 1 filter.
+ * links can be omitted when the graph has just 1 filter.
  *
  * ### Inputs and Outputs
  *
@@ -389,7 +390,7 @@
  * It has an output port "Out" and also a control output port "notify".
  *
  * "Freq", "Ampl", "Offset" and "Phase" can be used to control the sine wave
- * frequence, amplitude, offset and phase.
+ * frequency, amplitude, offset and phase.
  *
  * ## SOFA filter
  *
@@ -461,13 +462,13 @@
  * - \ref PW_KEY_NODE_GROUP
  * - \ref PW_KEY_NODE_LINK_GROUP
  * - \ref PW_KEY_NODE_VIRTUAL
- * - \ref PW_KEY_NODE_NAME: See notes below. If not specified, defaults to
- *	'filter-chain-<pid>-<module-id>'.
+ * - \ref PW_KEY_NODE_NAME : See notes below. If not specified, defaults to
+ *	'filter-chain-PID-MODULEID'.
  *
  * Stream only properties:
  *
  * - \ref PW_KEY_MEDIA_CLASS
- * - \ref PW_KEY_NODE_NAME:  if not given per stream, the global node.name will be
+ * - \ref PW_KEY_NODE_NAME :  if not given per stream, the global node.name will be
  *         prefixed with 'input.' and 'output.' to generate a capture and playback
  *         stream node.name respectively.
  *
@@ -514,8 +515,6 @@
  * to a stereo Dolby Surround signal.
  *
  *\code{.unparsed}
- *
- *\code{.unparsed}
  * context.modules = 
  * {   name = libpipewire-module-filter-chain
  *     args = {
@@ -1023,12 +1022,12 @@
 		}
 	} else if (p->hint & FC_HINT_INTEGER) {
 		if (min == max) {
-			spa_pod_builder_int(b, def);
+			spa_pod_builder_int(b, (int32_t)def);
 		} else {
 			spa_pod_builder_push_choice(b, &f1, SPA_CHOICE_Range, 0);
-			spa_pod_builder_int(b, def);
-			spa_pod_builder_int(b, min);
-			spa_pod_builder_int(b, max);
+			spa_pod_builder_int(b, (int32_t)def);
+			spa_pod_builder_int(b, (int32_t)min);
+			spa_pod_builder_int(b, (int32_t)max);
 			spa_pod_builder_pop(b, &f1);
 		}
 	} else {
@@ -1074,7 +1073,7 @@
 		if (p->hint & FC_HINT_BOOLEAN) {
 			spa_pod_builder_bool(b, port->control_data0 <= 0.0f ? false : true);
 		} else if (p->hint & FC_HINT_INTEGER) {
-			spa_pod_builder_int(b, port->control_data0);
+			spa_pod_builder_int(b, (int32_t)port->control_data0);
 		} else {
 			spa_pod_builder_float(b, port->control_data0);
 		}
@@ -1141,7 +1140,7 @@
 		if (spa_pod_parser_get_float(&prs, &value) >= 0) {
 			val = &value;
 		} else if (spa_pod_parser_get_double(&prs, &dbl_val) >= 0) {
-			value = dbl_val;
+			value = (float)dbl_val;
 			val = &value;
 		} else if (spa_pod_parser_get_int(&prs, &int_val) >= 0) {
 			value = int_val;
@@ -1218,7 +1217,7 @@
 		float v = vol->mute ? 0.0f : vol->volumesi;
 		switch (vol->scalen_port) {
 		case SCALE_CUBIC:
-			v = cbrt(v);
+			v = cbrtf(v);
 			break;
 		}
 		v = v * (vol->maxn_port - vol->minn_port) + vol->minn_port;
@@ -1874,24 +1873,35 @@
  */
 static int parse_config(struct node *node, struct spa_json *config)
 {
-	const char *val;
-	int len;
-
-	if ((len = spa_json_next(config, &val)) <= 0)
-		return len;
+	const char *val, *s = config->cur;
+	int res = 0, len;
+	struct spa_error_location loc;
 
+	if ((len = spa_json_next(config, &val)) <= 0) {
+		res = -EINVAL;
+		goto done;
+	}
 	if (spa_json_is_null(val, len))
-		return 0;
+		goto done;
 
-	if (spa_json_is_container(val, len))
+	if (spa_json_is_container(val, len)) {
 		len = spa_json_container_len(config, val, len);
-
-	if ((node->config = malloc(len+1)) == NULL)
-		return -errno;
+		if (len == 0) {
+			res = -EINVAL;
+			goto done;
+		}
+	}
+	if ((node->config = malloc(len+1)) == NULL) {
+		res = -errno;
+		goto done;
+	}
 
 	spa_json_parse_stringn(val, len, node->config, len+1);
-
-	return 0;
+done:
+	if (spa_json_get_error(config, s, &loc))
+		spa_debug_log_error_location(pw_log_get(), SPA_LOG_LEVEL_WARN,
+				&loc, "error: %s", loc.reason);
+	return res;
 }
 
 /**
@@ -1955,8 +1965,11 @@
 				return -EINVAL;
 			}
 		}
-		else if (spa_json_next(json, &val) < 0)
-			break;
+		else {
+			pw_log_error("unexpected link key '%s'", key);
+			if (spa_json_next(json, &val) < 0)
+				break;
+		}
 	}
 	def_out_node = spa_list_first(&graph->node_list, struct node, link);
 	def_in_node = spa_list_last(&graph->node_list, struct node, link);
@@ -2066,8 +2079,11 @@
 				return -EINVAL;
 			}
 		}
-		else if (spa_json_next(json, &val) < 0)
-			break;
+		else {
+			pw_log_error("unexpected volume key '%s'", key);
+			if (spa_json_next(json, &val) < 0)
+				break;
+		}
 	}
 	if (capture)
 		def_control = spa_list_first(&graph->node_list, struct node, link);
@@ -2162,12 +2178,18 @@
 			have_config = true;
 			if (spa_json_next(json, &val) < 0)
 				break;
-		} else if (spa_json_next(json, &val) < 0)
-			break;
+		} else {
+			pw_log_warn("unexpected node key '%s'", key);
+			if (spa_json_next(json, &val) < 0)
+				break;
+		}
 	}
-
 	if (spa_streq(type, "builtin"))
 		snprintf(plugin, sizeof(plugin), "%s", "builtin");
+	else if (spa_streq(type, "")) {
+		pw_log_error("missing plugin type");
+		return -EINVAL;
+	}
 
 	pw_log_info("loading type:%s plugin:%s label:%s", type, plugin, label);
 
@@ -2756,8 +2778,11 @@
 				return -EINVAL;
 			}
 			ppvolumes = &pvolumes;
-		} else if (spa_json_next(&it1, &val) < 0)
-			break;
+		} else {
+			pw_log_warn("unexpected graph key '%s'", key);
+			if (spa_json_next(&it1, &val) < 0)
+				break;
+		}
 	}
 	if (pnodes == NULL) {
 		pw_log_error("filter.graph is missing a nodes array");
@@ -2995,8 +3020,7 @@
 	}
 
 	cpu_iface = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_CPU);
-	impl->dsp.cpu_flags = cpu_iface ? spa_cpu_get_flags(cpu_iface) : 0;
-	dsp_ops_init(&impl->dsp);
+	dsp_ops_init(&impl->dsp, cpu_iface ? spa_cpu_get_flags(cpu_iface) : 0);
 
 	if (pw_properties_get(props, PW_KEY_NODE_GROUP) == NULL)
 		pw_properties_setf(props, PW_KEY_NODE_GROUP, "filter-chain-%u-%u", pid, id);

pipewire-1.0.1.tar.bz2/src/modules/module-filter-chain/biquad.c -> pipewire-1.2.0.tar.gz/src/modules/module-filter-chain/biquad.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-filter-chain/builtin_plugin.c -> pipewire-1.2.0.tar.gz/src/modules/module-filter-chain/builtin_plugin.c Changed

@@ -752,10 +752,10 @@
         if (samples == NULL)
 		return NULL;
 
-	gain *= 2 / M_PI;
+	gain *= 2 / (float)M_PI;
 	h = length / 2;
 	for (i = 1; i < h; i += 2) {
-		v = (gain / i) * (0.43f + 0.57f * cosf(i * M_PI / h));
+		v = (gain / i) * (0.43f + 0.57f * cosf(i * (float)M_PI / h));
 		samplesdelay + h + i = -v;
 		samplesdelay + h - i =  v;
 	}
@@ -784,6 +784,7 @@
 static float *resample_buffer(float *samples, int *n_samples,
 		unsigned long in_rate, unsigned long out_rate, uint32_t quality)
 {
+#ifdef HAVE_SPA_PLUGINS
 	uint32_t in_len, out_len, total_out = 0;
 	int out_n_samples;
 	float *out_samples, *out_buf, *in_buf;
@@ -849,6 +850,12 @@
 	free(samples);
 	free(out_samples);
 	return NULL;
+#else
+	pw_log_error("compiled without spa-plugins support, can't resample");
+	float *out_samples = calloc(*n_samples, sizeof(float));
+	memcpy(out_samples, samples, *n_samples * sizeof(float));
+	return out_samples;
+#endif
 }
 
 static void * convolver_instantiate(const struct fc_descriptor * Descriptor,
@@ -1127,7 +1134,7 @@
 		return NULL;
 
 	impl->rate = SampleRate;
-	impl->buffer_samples = max_delay * impl->rate;
+	impl->buffer_samples = (uint32_t)(max_delay * impl->rate);
 	pw_log_info("max-delay:%f seconds rate:%lu samples:%d", max_delay, impl->rate, impl->buffer_samples);
 
 	impl->buffer = calloc(impl->buffer_samples, sizeof(float));
@@ -1156,7 +1163,7 @@
 	uint32_t r, w;
 
 	if (delay != impl->delay) {
-		impl->delay_samples = SPA_CLAMP(delay * impl->rate, 0, impl->buffer_samples-1);
+		impl->delay_samples = SPA_CLAMP((uint32_t)(delay * impl->rate), 0u, impl->buffer_samples-1);
 		impl->delay = delay;
 	}
 	r = impl->ptr;
@@ -1446,7 +1453,7 @@
 	{ .index = 4,
 	  .name = "Base",
 	  .flags = FC_PORT_INPUT | FC_PORT_CONTROL,
-	  .def = M_E, .min = -10.0f, .max = 10.0f
+	  .def = (float)M_E, .min = -10.0f, .max = 10.0f
 	},
 };
 
@@ -1503,7 +1510,7 @@
 	{ .index = 4,
 	  .name = "Base",
 	  .flags = FC_PORT_INPUT | FC_PORT_CONTROL,
-	  .def = M_E, .min = 2.0f, .max = 100.0f
+	  .def = (float)M_E, .min = 2.0f, .max = 100.0f
 	},
 	{ .index = 5,
 	  .name = "M1",
@@ -1604,7 +1611,7 @@
 	.cleanup = builtin_cleanup,
 };
 
-#define M_PI_M2 ( M_PI + M_PI )
+#define M_PI_M2f (float)(M_PI+M_PI)
 
 /* sine */
 static void sine_run(void * Instance, unsigned long SampleCount)
@@ -1619,13 +1626,13 @@
 
 	for (n = 0; n < SampleCount; n++) {
 		if (out != NULL)
-			outn = sin(impl->accum) * ampl + offs;
+			outn = sinf(impl->accum) * ampl + offs;
 		if (notify != NULL && n == 0)
-			notify0 = sin(impl->accum) * ampl + offs;
+			notify0 = sinf(impl->accum) * ampl + offs;
 
-		impl->accum += M_PI_M2 * freq / impl->rate;
-		if (impl->accum >= M_PI_M2)
-			impl->accum -= M_PI_M2;
+		impl->accum += M_PI_M2f * freq / impl->rate;
+		if (impl->accum >= M_PI_M2f)
+			impl->accum -= M_PI_M2f;
 	}
 }
 
@@ -1651,7 +1658,7 @@
 	{ .index = 4,
 	  .name = "Phase",
 	  .flags = FC_PORT_INPUT | FC_PORT_CONTROL,
-	  .def = 0.0f, .min = -M_PI, .max = M_PI
+	  .def = 0.0f, .min = (float)-M_PI, .max = (float)M_PI
 	},
 	{ .index = 5,
 	  .name = "Offset",

pipewire-1.0.1.tar.bz2/src/modules/module-filter-chain/convolver.c -> pipewire-1.2.0.tar.gz/src/modules/module-filter-chain/convolver.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-filter-chain/dsp-ops.c -> pipewire-1.2.0.tar.gz/src/modules/module-filter-chain/dsp-ops.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-filter-chain/dsp-ops.h -> pipewire-1.2.0.tar.gz/src/modules/module-filter-chain/dsp-ops.h Changed

pipewire-1.0.1.tar.bz2/src/modules/module-filter-chain/lv2_plugin.c -> pipewire-1.2.0.tar.gz/src/modules/module-filter-chain/lv2_plugin.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-filter-chain/pffft.c -> pipewire-1.2.0.tar.gz/src/modules/module-filter-chain/pffft.c Changed

@@ -1273,7 +1273,7 @@
 	int k1, j, ii;
 
 	int nf = decompose(n, ifac, ntryh);
-	float argh = (2 * M_PI) / n;
+	float argh = (2 * (float)M_PI) / n;
 	int is = 0;
 	int nfm1 = nf - 1;
 	int l1 = 1;
@@ -1291,8 +1291,8 @@
 			for (ii = 3; ii <= ido; ii += 2) {
 				i += 2;
 				fi += 1;
-				wai - 2 = cos(fi * argld);
-				wai - 1 = sin(fi * argld);
+				wai - 2 = cosf(fi * argld);
+				wai - 1 = sinf(fi * argld);
 			}
 			is += ido;
 		}
@@ -1306,7 +1306,7 @@
 	int k1, j, ii;
 
 	int nf = decompose(n, ifac, ntryh);
-	float argh = (2 * M_PI) / (float)n;
+	float argh = (2 * (float)M_PI) / (float)n;
 	int i = 1;
 	int l1 = 1;
 	for (k1 = 1; k1 <= nf; k1++) {
@@ -1326,8 +1326,8 @@
 			for (ii = 4; ii <= idot; ii += 2) {
 				i += 2;
 				fi += 1;
-				wai - 1 = cos(fi * argld);
-				wai = sin(fi * argld);
+				wai - 1 = cosf(fi * argld);
+				wai = sinf(fi * argld);
 			}
 			if (ip > 5) {
 				wai1 - 1 = wai - 1;
@@ -1440,11 +1440,11 @@
 			int i = k / SIMD_SZ;
 			int j = k % SIMD_SZ;
 			for (m = 0; m < SIMD_SZ - 1; ++m) {
-				float A = -2 * M_PI * (m + 1) * k / N;
+				float A = -2 * (float)M_PI * (m + 1) * k / N;
 				s->e(2 * (i * 3 + m) + 0) * SIMD_SZ + j =
-				    cos(A);
+				    cosf(A);
 				s->e(2 * (i * 3 + m) + 1) * SIMD_SZ + j =
-				    sin(A);
+				    sinf(A);
 			}
 		}
 		rffti1_ps(N / SIMD_SZ, s->twiddle, s->ifac);
@@ -1453,11 +1453,11 @@
 			int i = k / SIMD_SZ;
 			int j = k % SIMD_SZ;
 			for (m = 0; m < SIMD_SZ - 1; ++m) {
-				float A = -2 * M_PI * (m + 1) * k / N;
+				float A = -2 * (float)M_PI * (m + 1) * k / N;
 				s->e(2 * (i * 3 + m) + 0) * SIMD_SZ + j =
-				    cos(A);
+				    cosf(A);
 				s->e(2 * (i * 3 + m) + 1) * SIMD_SZ + j =
-				    sin(A);
+				    sinf(A);
 			}
 		}
 		cffti1_ps(N / SIMD_SZ, s->twiddle, s->ifac);
@@ -1765,7 +1765,7 @@
 	v4sf_union cr, ci, *uout = (v4sf_union *) out;
 	v4sf save = in7, zero = VZERO();
 	float xr0, xi0, xr1, xi1, xr2, xi2, xr3, xi3;
-	static const float s = M_SQRT2 / 2;
+	static const float s = (float)M_SQRT2 / 2;
 
 	cr.v = in0;
 	ci.v = inNcvec * 2 - 1;
@@ -1871,7 +1871,7 @@
 
 	v4sf_union Xr, Xi, *uout = (v4sf_union *) out;
 	float cr0, ci0, cr1, ci1, cr2, ci2, cr3, ci3;
-	static const float s = M_SQRT2;
+	static const float s = (float)M_SQRT2;
 	assert(in != out);
 	for (k = 0; k < 4; ++k) {
 		Xr.fk = ((float *)in)8 * k;

pipewire-1.0.1.tar.bz2/src/modules/module-filter-chain/sofa_plugin.c -> pipewire-1.2.0.tar.gz/src/modules/module-filter-chain/sofa_plugin.c Changed

@@ -42,12 +42,16 @@
 	char filenamePATH_MAX = "";
 
 	errno = EINVAL;
-	if (config == NULL)
+	if (config == NULL) {
+		pw_log_error("spatializer: no config was given");
 		return NULL;
+	}
 
 	spa_json_init(&it0, config, strlen(config));
-	if (spa_json_enter_object(&it0, &it1) <= 0)
+	if (spa_json_enter_object(&it0, &it1) <= 0) {
+		pw_log_error("spatializer: expected object in config");
 		return NULL;
+	}
 
 	impl = calloc(1, sizeof(*impl));
 	if (impl == NULL) {
@@ -91,8 +95,75 @@
 	impl->sofa = mysofa_open_cached(filename, SampleRate, &impl->n_samples, &ret);
 
 	if (ret != MYSOFA_OK) {
-		pw_log_error("Unable to load HRTF from %s: %d", filename, ret);
-		errno = ENOENT;
+		const char *reason;
+		switch (ret) {
+		case MYSOFA_INVALID_FORMAT:
+			reason = "Invalid format";
+			errno = EINVAL;
+			break;
+		case MYSOFA_UNSUPPORTED_FORMAT:
+			reason = "Unsupported format";
+			errno = ENOTSUP;
+			break;
+		case MYSOFA_NO_MEMORY:
+			reason = "No memory";
+			errno = ENOMEM;
+			break;
+		case MYSOFA_READ_ERROR:
+			reason = "Read error";
+			errno = ENOENT;
+			break;
+		case MYSOFA_INVALID_ATTRIBUTES:
+			reason = "Invalid attributes";
+			errno = EINVAL;
+			break;
+		case MYSOFA_INVALID_DIMENSIONS:
+			reason = "Invalid dimensions";
+			errno = EINVAL;
+			break;
+		case MYSOFA_INVALID_DIMENSION_LIST:
+			reason = "Invalid dimension list";
+			errno = EINVAL;
+			break;
+		case MYSOFA_INVALID_COORDINATE_TYPE:
+			reason = "Invalid coordinate type";
+			errno = EINVAL;
+			break;
+		case MYSOFA_ONLY_EMITTER_WITH_ECI_SUPPORTED:
+			reason = "Only emitter with ECI supported";
+			errno = ENOTSUP;
+			break;
+		case MYSOFA_ONLY_DELAYS_WITH_IR_OR_MR_SUPPORTED:
+			reason = "Only delays with IR or MR supported";
+			errno = ENOTSUP;
+			break;
+		case MYSOFA_ONLY_THE_SAME_SAMPLING_RATE_SUPPORTED:
+			reason = "Only the same sampling rate supported";
+			errno = ENOTSUP;
+			break;
+		case MYSOFA_RECEIVERS_WITH_RCI_SUPPORTED:
+			reason = "Receivers with RCI supported";
+			errno = ENOTSUP;
+			break;
+		case MYSOFA_RECEIVERS_WITH_CARTESIAN_SUPPORTED:
+			reason = "Receivers with cartesian supported";
+			errno = ENOTSUP;
+			break;
+		case MYSOFA_INVALID_RECEIVER_POSITIONS:
+			reason = "Invalid receiver positions";
+			errno = EINVAL;
+			break;
+		case MYSOFA_ONLY_SOURCES_WITH_MC_SUPPORTED:
+			reason = "Only sources with MC supported";
+			errno = ENOTSUP;
+			break;
+		default:
+		case MYSOFA_INTERNAL_ERROR:
+			errno = EIO;
+			reason = "Internal error";
+			break;
+		}
+		pw_log_error("Unable to load HRTF from %s: %s (%d)", filename, reason, ret);
 		goto error;
 	}
 
@@ -158,7 +229,7 @@
 	);
 
 	// TODO: make use of delay
-	if ((left_delay || right_delay) && (!isnan(left_delay) || !isnan(right_delay))) {
+	if ((left_delay != 0.0f || right_delay != 0.0f) && (!isnan(left_delay) || !isnan(right_delay))) {
 		pw_log_warn("delay dropped l: %f, r: %f", left_delay, right_delay);
 	}

pipewire-1.0.1.tar.bz2/src/modules/module-jack-tunnel.c -> pipewire-1.2.0.tar.gz/src/modules/module-jack-tunnel.c Changed

@@ -664,6 +664,18 @@
 	return res;
 }
 
+static inline uint64_t get_time_nsec(struct impl *impl)
+{
+	uint64_t nsec;
+	if (impl->sink.filter)
+		nsec = pw_filter_get_nsec(impl->sink.filter);
+	else if (impl->source.filter)
+		nsec = pw_filter_get_nsec(impl->source.filter);
+	else
+		nsec = 0;
+	return nsec;
+}
+
 static void *jack_process_thread(void *arg)
 {
 	struct impl *impl = arg;
@@ -693,11 +705,22 @@
 			jack_time_t next_usecs;
 			float period_usecs;
 			jack_position_t pos;
+			uint64_t t1, t2, t3;
+			int64_t d1;
 
 			jack.get_cycle_times(impl->client,
 					&current_frames, &current_usecs,
 					&next_usecs, &period_usecs);
 
+			/* convert from JACK (likely MONOTONIC_RAW) to MONOTONIC */
+			t1 = get_time_nsec(impl) / 1000;
+			t2 = jack.get_time();
+			t3 = get_time_nsec(impl) / 1000;
+			d1 = t1 + (t3 - t1) / 2 - t2;
+
+			current_usecs += d1;
+			next_usecs += d1;
+
 			c->nsec = current_usecs * SPA_NSEC_PER_USEC;
 			c->rate = SPA_FRACTION(1, impl->samplerate);
 			c->position = current_frames;

pipewire-1.0.1.tar.bz2/src/modules/module-jack-tunnel/weakjack.h -> pipewire-1.2.0.tar.gz/src/modules/module-jack-tunnel/weakjack.h Changed

pipewire-1.0.1.tar.bz2/src/modules/module-jackdbus-detect.c -> pipewire-1.2.0.tar.gz/src/modules/module-jackdbus-detect.c Changed

@@ -18,6 +18,7 @@
 #include <spa/utils/string.h>
 #include <spa/utils/result.h>
 #include <spa/support/dbus.h>
+#include <spa-private/dbus-helpers.h>
 
 #include "pipewire/context.h"
 #include "pipewire/impl-client.h"
@@ -27,7 +28,7 @@
 
 /** \page page_module_jackdbus_detect JACK DBus detect
  *
- * Automaticall creates a sink/source when a jackdbus server is started
+ * Automatically creates a sink/source when a jackdbus server is started
  * and connect to JACK.
  *
  * ## Module Name
@@ -158,6 +159,8 @@
 {
 	set_started(impl, false);
 
+	cancel_and_unref(&impl->pending_call);
+
 	if (impl->bus)
 		dbus_connection_unref(impl->bus);
 	spa_dbus_connection_destroy(impl->conn);
@@ -179,28 +182,15 @@
 	.destroy = module_destroy,
 };
 
-static void set_pending_call(struct impl *impl, DBusPendingCall *pending)
-{
-	if (impl->pending_call != NULL) {
-		dbus_pending_call_cancel(impl->pending_call);
-		dbus_pending_call_unref(impl->pending_call);
-	}
-	impl->pending_call = pending;
-}
-
 static void on_is_started_received(DBusPendingCall *pending,
 				   void *user_data)
 {
 	struct impl *impl = user_data;
-	DBusMessage *m;
-	DBusError error;
+	spa_auto(DBusError) error = DBUS_ERROR_INIT;
 	dbus_bool_t started = false;
 
-	m = dbus_pending_call_steal_reply(pending);
-	dbus_pending_call_unref(pending);
-	impl->pending_call = NULL;
-
-	dbus_error_init(&error);
+	spa_assert(impl->pending_call == pending);
+	spa_autoptr(DBusMessage) m = steal_reply_and_unref(&impl->pending_call);
 
 	if (!m) {
 		pw_log_error("Failed to receive reply");
@@ -221,7 +211,6 @@
 	dbus_message_get_args(m, &error,
 			DBUS_TYPE_BOOLEAN, &started,
 			DBUS_TYPE_INVALID);
-	dbus_message_unref(m);
 
 	if (dbus_error_is_set(&error)) {
 		pw_log_warn("Could not get jackdbus state: %s", error.message);
@@ -234,37 +223,33 @@
 	return;
 error:
 	impl->is_started = false;
-	dbus_error_free(&error);
 }
 
 static void check_jack_running(struct impl *impl)
 {
-	DBusMessage *m;
-	DBusPendingCall *pending;
-
 	impl->is_started = false;
+	cancel_and_unref(&impl->pending_call);
 
-	m = dbus_message_new_method_call(JACK_SERVICE_NAME,
-			JACK_INTERFACE_PATH,
-			JACK_INTERFACE_NAME,
-			"IsStarted");
+	spa_autoptr(DBusMessage) m = dbus_message_new_method_call(JACK_SERVICE_NAME,
+								  JACK_INTERFACE_PATH,
+								  JACK_INTERFACE_NAME,
+								  "IsStarted");
+	if (!m)
+		return;
 
-	dbus_connection_send_with_reply(impl->bus, m, &pending, -1);
-	dbus_pending_call_set_notify(pending, on_is_started_received, impl, NULL);
+	dbus_message_set_auto_start(m, false);
 
-	set_pending_call(impl, pending);
+	impl->pending_call = send_with_reply(impl->bus, m, on_is_started_received, impl);
 }
 
 static DBusHandlerResult filter_handler(DBusConnection *connection,
 		DBusMessage *message, void *user_data)
 {
 	struct impl *impl = user_data;
-	DBusError error;
-
-	dbus_error_init(&error);
 
 	if (dbus_message_is_signal(message, "org.freedesktop.DBus",
 				   "NameOwnerChanged")) {
+		spa_auto(DBusError) error = DBUS_ERROR_INIT;
 		const char *name, *old, *new;
 		if (!dbus_message_get_args(message, &error,
 					   DBUS_TYPE_STRING, &name,
@@ -273,14 +258,14 @@
 					   DBUS_TYPE_INVALID)) {
 			pw_log_error("Failed to get OwnerChanged args: %s",
 					error.message);
-			goto not_handled;
+			return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 		}
 		if (!spa_streq(name, JACK_SERVICE_NAME))
-			goto not_handled;
+			return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
 		pw_log_info("NameOwnerChanged %s -> %s", old, new);
 		if (spa_streq(new, "")) {
-			set_pending_call(impl, NULL);
+			cancel_and_unref(&impl->pending_call);
 			set_started(impl, false);
 		} else {
 			check_jack_running(impl);
@@ -297,21 +282,15 @@
 		set_started(impl, false);
 	}
 	return DBUS_HANDLER_RESULT_HANDLED;
-
-not_handled:
-	dbus_error_free(&error);
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
 static int init_dbus_connection(struct impl *impl)
 {
-	DBusError error;
-
 	impl->bus = spa_dbus_connection_get(impl->conn);
 	if (impl->bus == NULL)
 		return -EIO;
 
-	dbus_error_init(&error);
+	spa_auto(DBusError) error = DBUS_ERROR_INIT;
 
 	/* XXX: we don't handle dbus reconnection yet, so ref the handle instead */
 	dbus_connection_ref(impl->bus);
@@ -322,7 +301,8 @@
 			"type='signal',"
 			"sender='org.freedesktop.DBus',"
 			"interface='org.freedesktop.DBus',"
-			"member='NameOwnerChanged'", &error);
+			"member='NameOwnerChanged',"
+			"arg0='" JACK_SERVICE_NAME "'", &error);
 	if (dbus_error_is_set(&error))
 		goto error;
 
@@ -347,7 +327,6 @@
 	return 0;
 error:
 	pw_log_error("Failed to add listener: %s", error.message);
-	dbus_error_free(&error);
 	return -EIO;
 }

pipewire-1.0.1.tar.bz2/src/modules/module-loopback.c -> pipewire-1.2.0.tar.gz/src/modules/module-loopback.c Changed

@@ -57,16 +57,26 @@
  * - \ref PW_KEY_NODE_GROUP
  * - \ref PW_KEY_NODE_LINK_GROUP
  * - \ref PW_KEY_NODE_VIRTUAL
- * - \ref PW_KEY_NODE_NAME: See notes below. If not specified, defaults to
- *   	'loopback-<pid>-<module-id>'.
+ * - \ref PW_KEY_NODE_NAME : See notes below. If not specified, defaults to
+ *   	'loopback-PID-MODULEID'.
  *
  * Stream only properties:
  *
  * - \ref PW_KEY_MEDIA_CLASS
- * - \ref PW_KEY_NODE_NAME:  if not given per stream, the global node.name will be
+ * - \ref PW_KEY_NODE_NAME :  if not given per stream, the global node.name will be
  *         prefixed with 'input.' and 'output.' to generate a capture and playback
  *         stream node.name respectively.
  *
+ * ## Channel handling
+ *
+ * Channels from the capture stream are copied, in order, to the channels of the
+ * output stream. The remaining streams are ignored (when capture has more channels)
+ * or filled with silence (when playback has more channels).
+ *
+ * When a global channel position is set, both capture and playback will be converted
+ * to and from this common channel layout. This can be used to implement up or
+ * downmixing loopback sinks/sources.
+ *
  * ## Example configuration of a virtual sink
  *
  * This Virtual sink routes stereo input to the rear channels of a 7.1 sink.
@@ -104,18 +114,49 @@
  * context.modules = 
  * {   name = libpipewire-module-loopback
  *     args = {
- *       node.description = "Scarlett Focusrite Line 1"
- *       capture.props = {
- *           audio.position =  FL 
- *           stream.dont-remix = true
- *           node.target = "alsa_input.usb-Focusrite_Scarlett_Solo_USB_Y7ZD17C24495BC-00.analog-stereo"
- *           node.passive = true
- *       }
- *       playback.props = {
- *           node.name = "SF_mono_in_1"
- *           media.class = "Audio/Source"
- *           audio.position =  MONO 
- *       }
+ *         node.description = "Scarlett Focusrite Line 1"
+ *         capture.props = {
+ *             audio.position =  FL 
+ *             stream.dont-remix = true
+ *             node.target = "alsa_input.usb-Focusrite_Scarlett_Solo_USB_Y7ZD17C24495BC-00.analog-stereo"
+ *             node.passive = true
+ *         }
+ *         playback.props = {
+ *             node.name = "SF_mono_in_1"
+ *             media.class = "Audio/Source"
+ *             audio.position =  MONO 
+ *         }
+ *     }
+ * }
+ * 
+ *\endcode
+ *
+ * ## Example configuration of an upmix sink
+ *
+ * This Virtual sink has 2 input channels and 6 output channels. It will perform upmixing
+ * using the PSD algorithm on the playback stream.
+ *
+ *\code{.unparsed}
+ * context.modules = 
+ * {   name = libpipewire-module-loopback
+ *     args = {
+ *         node.description = "Upmix Sink"
+ *         audio.position =  FL FR 
+ *         capture.props = {
+ *             node.name = "effect_input.upmix"
+ *             media.class = Audio/Sink
+ *         }
+ *         playback.props = {
+ *             node.name = "effect_output.upmix"
+ *             audio.position =  FL FR RL RR FC LFE 
+ *             node.passive = true
+ *             stream.dont-remix = true
+ *             channelmix.upmix = true
+ *             channelmix.upmix-method = psd
+ *             channelmix.lfe-cutoff = 150
+ *             channelmix.fc-cutoff = 12000
+ *             channelmix.rear-delay = 12.0
+ *         }
  *     }
  * }
  * 
@@ -171,6 +212,8 @@
 	struct spa_hook core_proxy_listener;
 	struct spa_hook core_listener;
 
+	struct spa_audio_info_raw info;
+
 	struct pw_properties *capture_props;
 	struct pw_stream *capture;
 	struct spa_hook capture_listener;
@@ -185,8 +228,11 @@
 	unsigned int recalc_delay:1;
 
 	struct spa_io_position *position;
-	struct spa_audio_info_raw info;
+
+	uint32_t target_rate;
 	uint32_t rate;
+	uint32_t target_channels;
+	uint32_t channels;
 	float target_delay;
 	struct spa_ringbuffer buffer;
 	uint8_t *buffer_data;
@@ -202,7 +248,7 @@
 
 static void recalculate_delay(struct impl *impl)
 {
-	uint32_t target = impl->rate * impl->target_delay, cdelay, pdelay;
+	uint32_t target = (uint32_t)(impl->rate * impl->target_delay), cdelay, pdelay;
 	uint32_t delay, w;
 	struct pw_time pwt;
 
@@ -345,14 +391,55 @@
 	pw_stream_update_params(other, params, 1);
 }
 
+static void param_format_changed(struct impl *impl, const struct spa_pod *param,
+		struct pw_stream *stream, bool capture)
+{
+	struct spa_audio_info_raw info;
+
+	spa_zero(info);
+	if (param != NULL) {
+		if (spa_format_audio_raw_parse(param, &info) < 0 ||
+		    info.channels == 0 ||
+		    info.channels > SPA_AUDIO_MAX_CHANNELS)
+			return;
+
+		if ((impl->info.format != 0 && impl->info.format != info.format) ||
+		    (impl->info.rate != 0 && impl->info.rate != info.rate) ||
+		    (impl->info.channels != 0 &&
+		     (impl->info.channels != info.channels ||
+		      memcmp(impl->info.position, info.position,
+			      info.channels * sizeof(uint32_t)) != 0))) {
+			uint8_t buffer1024;
+			struct spa_pod_builder b;
+			const struct spa_pod *params1;
+
+			if (impl->info.format != 0)
+				info.format = impl->info.format;
+			if (impl->info.rate != 0)
+				info.rate = impl->info.rate;
+			if (impl->info.channels != 0) {
+				info.channels = impl->info.channels;
+				memcpy(info.position, impl->info.position, sizeof(info.position));
+			}
+			spa_pod_builder_init(&b, buffer, sizeof(buffer));
+			params0 = spa_format_audio_raw_build(&b, SPA_PARAM_Format, &info);
+			pw_stream_update_params(stream, params, 1);
+		}
+	}
+	if (capture) {
+		impl->target_rate = info.rate;
+		impl->target_channels = info.channels;
+	}
+}
+
 static void recalculate_buffer(struct impl *impl)
 {
-	if (impl->target_delay > 0.0f) {
-		uint32_t delay = impl->rate * impl->target_delay;
+	if (impl->target_delay > 0.0f && impl->channels > 0 && impl->rate > 0) {
+		uint32_t delay = (uint32_t)(impl->rate * impl->target_delay);
 		void *data;
 
 		impl->buffer_size = (delay + (1u<<15)) * 4;
-		data = realloc(impl->buffer_data, impl->buffer_size * impl->info.channels);
+		data = realloc(impl->buffer_data, impl->buffer_size * impl->channels);
 		if (data == NULL) {
 			pw_log_warn("can't allocate delay buffer, delay disabled: %m");
 			impl->buffer_size = 0;
@@ -388,12 +475,13 @@
 		break;
 	case PW_STREAM_STATE_STREAMING:
 	{
-		uint32_t target = impl->info.rate;
+		uint32_t target = impl->target_rate;
 		if (target == 0)
 			target = impl->position ?
 				impl->position->clock.target_rate.denom : DEFAULT_RATE;
-		if (impl->rate != target) {
+		if (impl->rate != target || impl->target_channels != impl->channels) {
 			impl->rate = target;
+			impl->channels = impl->target_channels;
 			recalculate_buffer(impl);
 		}
 		break;
@@ -409,19 +497,8 @@
 
 	switch (id) {
 	case SPA_PARAM_Format:
-	{
-		struct spa_audio_info_raw info;
-		spa_zero(info);
-		if (param != NULL) {
-			if (spa_format_audio_raw_parse(param, &info) < 0 ||
-			    info.channels == 0 ||
-			    info.channels > SPA_AUDIO_MAX_CHANNELS)
-				return;
-		}
-		impl->rate = 0;
-		impl->info = info;
+		param_format_changed(impl, param, impl->capture, true);
 		break;
-	}
 	case SPA_PARAM_Latency:
 		param_latency_changed(impl, param, impl->playback);
 		break;
@@ -464,6 +541,9 @@
 	struct impl *impl = data;
 
 	switch (id) {
+	case SPA_PARAM_Format:
+		param_format_changed(impl, param, impl->playback, false);
+		break;
 	case SPA_PARAM_Latency:
 		param_latency_changed(impl, param, impl->capture);
 		break;
@@ -748,6 +828,7 @@
 	if (pw_properties_get(impl->playback_props, PW_KEY_NODE_DESCRIPTION) == NULL)
 		pw_properties_set(impl->playback_props, PW_KEY_NODE_DESCRIPTION, str);
 
+	parse_audio_info(props, &impl->info);
 	parse_audio_info(impl->capture_props, &impl->capture_info);
 	parse_audio_info(impl->playback_props, &impl->playback_info);

pipewire-1.0.1.tar.bz2/src/modules/module-metadata/metadata.c -> pipewire-1.2.0.tar.gz/src/modules/module-metadata/metadata.c Changed

@@ -37,7 +37,7 @@
 	pw_resource_call_res(r,struct pw_metadata_events,m,v,__VA_ARGS__)
 
 #define pw_metadata_resource_property(r,...)        \
-        pw_metadata_resource(r,property,0,__VA_ARGS__)
+	pw_metadata_resource(r,property,0,__VA_ARGS__)
 
 static int metadata_property(void *data,
 			uint32_t subject,
@@ -51,7 +51,9 @@
 	struct impl *impl = d->impl;
 
 	if (impl->pending == 0 || d->pong_seq != 0) {
-		if (pw_impl_client_check_permissions(client, subject, PW_PERM_R) >= 0)
+		int res = pw_impl_client_check_permissions(client, subject, PW_PERM_R);
+		if (res >= 0 ||
+		    (res == -ENOENT && key == NULL && type == NULL && value == NULL))
 			pw_metadata_resource_property(d->resource, subject, key, type, value);
 	}
 	return 0;
@@ -147,31 +149,31 @@
 
 static int
 global_bind(void *object, struct pw_impl_client *client, uint32_t permissions,
-            uint32_t version, uint32_t id)
+		uint32_t version, uint32_t id)
 {
 	struct impl *impl = object;
 	struct pw_resource *resource;
 	struct resource_data *data;
 
 	resource = pw_resource_new(client, id, permissions, PW_TYPE_INTERFACE_Metadata, version, sizeof(*data));
-        if (resource == NULL)
-                return -errno;
+	if (resource == NULL)
+		return -errno;
 
-        data = pw_resource_get_user_data(resource);
-        data->impl = impl;
-        data->resource = resource;
+	data = pw_resource_get_user_data(resource);
+	data->impl = impl;
+	data->resource = resource;
 
 	pw_global_add_resource(impl->global, resource);
 
 	/* listen for when the resource goes away */
-        pw_resource_add_listener(resource,
-                        &data->resource_listener,
-                        &resource_events, data);
+	pw_resource_add_listener(resource,
+			&data->resource_listener,
+			&resource_events, data);
 
 	/* resource methods -> implementation */
 	pw_resource_add_object_listener(resource,
 			&data->object_listener,
-                        &metadata_methods, data);
+			&metadata_methods, data);
 
 	pw_impl_client_set_busy(client, true);
 
@@ -182,7 +184,7 @@
 
 	pw_resource_add_listener(impl->resource,
 			&data->impl_resource_listener,
-                        &impl_resource_events, data);
+			&impl_resource_events, data);
 
 	data->pong_seq = pw_resource_ping(impl->resource, data->pong_seq);
 	impl->pending++;
@@ -208,6 +210,8 @@
 static void context_global_removed(void *data, struct pw_global *global)
 {
 	struct impl *impl = data;
+	pw_log_trace("Clearing properties for global %u in %u",
+				 pw_global_get_id(global), pw_global_get_id(impl->global));
 	pw_metadata_set_property(impl->metadata,
 			pw_global_get_id(global), NULL, NULL, NULL);
 }

pipewire-1.0.1.tar.bz2/src/modules/module-netjack2-driver.c -> pipewire-1.2.0.tar.gz/src/modules/module-netjack2-driver.c Changed

@@ -34,6 +34,7 @@
 
 #include "module-netjack2/packets.h"
 #include "module-netjack2/peer.c"
+#include "network-utils.h"
 
 #ifndef IPTOS_DSCP
 #define IPTOS_DSCP_MASK 0xfc
@@ -416,7 +417,7 @@
 
 		if (i < s->info.channels) {
 			str = spa_debug_type_find_short_name(spa_type_audio_channel,
-					s->info.positioni);
+					s->info.positioni % SPA_AUDIO_MAX_CHANNELS);
 			if (str)
 				snprintf(name, sizeof(name), "%s_%s", prefix, str);
 			else
@@ -606,12 +607,16 @@
 	return res;
 }
 
-
-static inline uint64_t get_time_ns(void)
+static inline uint64_t get_time_nsec(struct impl *impl)
 {
-	struct timespec ts;
-	clock_gettime(CLOCK_MONOTONIC, &ts);
-	return SPA_TIMESPEC_TO_NSEC(&ts);
+	uint64_t nsec;
+	if (impl->sink.filter)
+		nsec = pw_filter_get_nsec(impl->sink.filter);
+	else if (impl->source.filter)
+		nsec = pw_filter_get_nsec(impl->source.filter);
+	else
+		nsec = 0;
+	return nsec;
 }
 
 static void
@@ -633,7 +638,7 @@
 		if (nframes == 0)
 			return;
 
-		nsec = get_time_ns();
+		nsec = get_time_nsec(impl);
 
 		if (!impl->done) {
 			impl->pw_xrun++;
@@ -689,26 +694,6 @@
 	}
 }
 
-static int parse_address(const char *address, uint16_t port,
-		struct sockaddr_storage *addr, socklen_t *len)
-{
-	struct sockaddr_in *sa4 = (struct sockaddr_in*)addr;
-	struct sockaddr_in6 *sa6 = (struct sockaddr_in6*)addr;
-
-	if (inet_pton(AF_INET, address, &sa4->sin_addr) > 0) {
-		sa4->sin_family = AF_INET;
-		sa4->sin_port = htons(port);
-		*len = sizeof(*sa4);
-	} else if (inet_pton(AF_INET6, address, &sa6->sin6_addr) > 0) {
-		sa6->sin6_family = AF_INET6;
-		sa6->sin6_port = htons(port);
-		*len = sizeof(*sa6);
-	} else
-		return -EINVAL;
-
-	return 0;
-}
-
 static bool is_multicast(struct sockaddr *sa, socklen_t salen)
 {
 	if (sa->sa_family == AF_INET) {
@@ -777,19 +762,6 @@
 	return res;
 }
 
-static const char *get_ip(const struct sockaddr_storage *sa, char *ip, size_t len)
-{
-	if (sa->ss_family == AF_INET) {
-		struct sockaddr_in *in = (struct sockaddr_in*)sa;
-		inet_ntop(sa->ss_family, &in->sin_addr, ip, len);
-	} else if (sa->ss_family == AF_INET6) {
-		struct sockaddr_in6 *in = (struct sockaddr_in6*)sa;
-		inet_ntop(sa->ss_family, &in->sin6_addr, ip, len);
-	} else
-		snprintf(ip, len, "invalid ip");
-	return ip;
-}
-
 static void update_timer(struct impl *impl, uint64_t timeout)
 {
 	struct timespec value, interval;
@@ -819,6 +791,7 @@
 {
 	int res;
 	struct netjack2_peer *peer = &impl->peer;
+	uint32_t i;
 
 	pw_log_info("got follower setup");
 	nj2_dump_session_params(params);
@@ -842,10 +815,18 @@
 
 	impl->source.n_ports = peer->params.send_audio_channels + peer->params.send_midi_channels;
 	impl->source.info.rate =  peer->params.sample_rate;
-	impl->source.info.channels =  peer->params.send_audio_channels;
+	if ((uint32_t)peer->params.send_audio_channels != impl->source.info.channels) {
+		impl->source.info.channels = peer->params.send_audio_channels;
+		for (i = 0; i < SPA_MIN(impl->source.info.channels, SPA_AUDIO_MAX_CHANNELS); i++)
+			impl->source.info.positioni = SPA_AUDIO_CHANNEL_AUX0 + i;
+	}
 	impl->sink.n_ports = peer->params.recv_audio_channels + peer->params.recv_midi_channels;
 	impl->sink.info.rate =  peer->params.sample_rate;
-	impl->sink.info.channels =  peer->params.recv_audio_channels;
+	if ((uint32_t)peer->params.recv_audio_channels != impl->sink.info.channels) {
+		impl->sink.info.channels =  peer->params.recv_audio_channels;
+		for (i = 0; i < SPA_MIN(impl->sink.info.channels, SPA_AUDIO_MAX_CHANNELS); i++)
+			impl->sink.info.positioni = SPA_AUDIO_CHANNEL_AUX0 + i;
+	}
 	impl->samplerate = peer->params.sample_rate;
 	impl->period_size = peer->params.period_size;
 
@@ -920,7 +901,7 @@
 		if (len < (int)sizeof(struct nj2_session_params))
 			goto short_packet;
 
-		if (strcmp(params.type, "params") != 0)
+		if (strncmp(params.type, "params", sizeof(params.type)) != 0)
 			goto wrong_type;
 
 		switch(ntohl(params.packet_id)) {
@@ -950,7 +931,7 @@
 
 	pw_loop_update_io(impl->main_loop, impl->setup_socket, SPA_IO_IN);
 
-	pw_log_info("sending AVAILABLE to %s", get_ip(&impl->dst_addr, buffer, sizeof(buffer)));
+	pw_log_info("sending AVAILABLE to %s", pw_net_get_ip_fmt(&impl->dst_addr, buffer, sizeof(buffer)));
 
 	client_name = pw_properties_get(impl->props, "netjack2.client-name");
 	if (client_name == NULL)
@@ -987,11 +968,11 @@
 		port = DEFAULT_NET_PORT;
 	if ((str = pw_properties_get(impl->props, "net.ip")) == NULL)
 		str = DEFAULT_NET_IP;
-	if ((res = parse_address(str, port, &impl->dst_addr, &impl->dst_len)) < 0) {
+	if ((res = pw_net_parse_address(str, port, &impl->dst_addr, &impl->dst_len)) < 0) {
 		pw_log_error("invalid net.ip %s: %s", str, spa_strerror(res));
 		goto out;
 	}
-	if ((res = parse_address("0.0.0.0", 0, &impl->src_addr, &impl->src_len)) < 0) {
+	if ((res = pw_net_parse_address("0.0.0.0", 0, &impl->src_addr, &impl->src_len)) < 0) {
 		pw_log_error("invalid source.ip: %s", spa_strerror(res));
 		goto out;
 	}
@@ -1143,6 +1124,9 @@
 	if (impl->timer)
 		pw_loop_destroy_source(impl->main_loop, impl->timer);
 
+	if (impl->data_loop)
+		pw_context_release_loop(impl->context, impl->data_loop);
+
 	pw_properties_free(impl->sink.props);
 	pw_properties_free(impl->source.props);
 	pw_properties_free(impl->props);
@@ -1219,7 +1203,6 @@
 {
 	struct pw_context *context = pw_impl_module_get_context(module);
 	struct pw_properties *props = NULL;
-	struct pw_data_loop *data_loop;
 	struct impl *impl;
 	const char *str;
 	int res;
@@ -1230,6 +1213,9 @@
 	if (impl == NULL)
 		return -errno;
 
+	impl->module = module;
+	impl->context = context;
+
 	pw_log_debug("module %p: new %s", impl, args);
 
 	if (args == NULL)
@@ -1242,8 +1228,7 @@
 		goto error;
 	}
 	impl->props = props;
-	data_loop = pw_context_get_data_loop(context);
-	impl->data_loop = pw_data_loop_get_loop(data_loop);
+	impl->data_loop = pw_context_acquire_loop(context, &props->dict);
 	impl->quantum_limit = pw_properties_get_uint32(
 			pw_context_get_properties(context),
 			"default.clock.quantum-limit", 8192u);
@@ -1256,8 +1241,6 @@
 		goto error;
 	}
 
-	impl->module = module;
-	impl->context = context;
 	impl->main_loop = pw_context_get_main_loop(context);
 	impl->system = impl->main_loop->system;
 
@@ -1283,6 +1266,7 @@
 	impl->latency = pw_properties_get_uint32(impl->props, "netjack2.latency",
 			DEFAULT_NETWORK_LATENCY);
 
+	pw_properties_set(props, PW_KEY_NODE_LOOP_NAME, impl->data_loop->name);
 	if (pw_properties_get(props, PW_KEY_NODE_VIRTUAL) == NULL)
 		pw_properties_set(props, PW_KEY_NODE_VIRTUAL, "true");
 	if (pw_properties_get(props, PW_KEY_NODE_GROUP) == NULL)
@@ -1303,6 +1287,7 @@
 	if ((str = pw_properties_get(props, "source.props")) != NULL)
 		pw_properties_update_string(impl->source.props, str, strlen(str));
 
+	copy_props(impl, props, PW_KEY_NODE_LOOP_NAME);
 	copy_props(impl, props, PW_KEY_AUDIO_CHANNELS);
 	copy_props(impl, props, SPA_KEY_AUDIO_POSITION);
 	copy_props(impl, props, PW_KEY_NODE_ALWAYS_PROCESS);

pipewire-1.0.1.tar.bz2/src/modules/module-netjack2-manager.c -> pipewire-1.2.0.tar.gz/src/modules/module-netjack2-manager.c Changed

@@ -36,6 +36,11 @@
 #include "module-netjack2/packets.h"
 
 #include "module-netjack2/peer.c"
+#include "network-utils.h"
+
+#ifdef __FreeBSD__
+#define ifr_ifindex ifr_index
+#endif
 
 #ifndef IPTOS_DSCP
 #define IPTOS_DSCP_MASK 0xfc
@@ -434,7 +439,7 @@
 		if (len < (int)sizeof(params))
 			goto short_packet;
 
-		if (strcmp(params.type, "params") != 0)
+		if (strncmp(params.type, "params", sizeof(params.type)) != 0)
 			goto wrong_type;
 
 		switch(ntohl(params.packet_id)) {
@@ -734,26 +739,6 @@
 	return res;
 }
 
-static int parse_address(const char *address, uint16_t port,
-		struct sockaddr_storage *addr, socklen_t *len)
-{
-	struct sockaddr_in *sa4 = (struct sockaddr_in*)addr;
-	struct sockaddr_in6 *sa6 = (struct sockaddr_in6*)addr;
-
-	if (inet_pton(AF_INET, address, &sa4->sin_addr) > 0) {
-		sa4->sin_family = AF_INET;
-		sa4->sin_port = htons(port);
-		*len = sizeof(*sa4);
-	} else if (inet_pton(AF_INET6, address, &sa6->sin6_addr) > 0) {
-		sa6->sin6_family = AF_INET6;
-		sa6->sin6_port = htons(port);
-		*len = sizeof(*sa6);
-	} else
-		return -EINVAL;
-
-	return 0;
-}
-
 static bool is_multicast(struct sockaddr *sa, socklen_t salen)
 {
 	if (sa->sa_family == AF_INET) {
@@ -878,20 +863,6 @@
 	return res;
 }
 
-static const char *get_ip(const struct sockaddr_storage *sa, char *ip, size_t len)
-{
-	if (sa->ss_family == AF_INET) {
-		struct sockaddr_in *in = (struct sockaddr_in*)sa;
-		inet_ntop(sa->ss_family, &in->sin_addr, ip, len);
-	} else if (sa->ss_family == AF_INET6) {
-		struct sockaddr_in6 *in = (struct sockaddr_in6*)sa;
-		inet_ntop(sa->ss_family, &in->sin6_addr, ip, len);
-	} else {
-		snprintf(ip, len, "invalid address");
-	}
-	return ip;
-}
-
 static int handle_follower_available(struct impl *impl, struct nj2_session_params *params,
 	struct sockaddr_storage *addr, socklen_t addr_len)
 {
@@ -1035,8 +1006,8 @@
 
 	nj2_session_params_hton(params, &peer->params);
 	params->packet_id = htonl(NJ2_ID_FOLLOWER_SETUP);
-
-	pw_log_info("sending follower setup to %s", get_ip(addr, buffer, sizeof(buffer)));
+	pw_log_info("sending follower setup to %s",
+			pw_net_get_ip_fmt(addr, buffer, sizeof(buffer)));
 	nj2_dump_session_params(params);
 	send(follower->socket->fd, params, sizeof(*params), 0);
 
@@ -1072,7 +1043,7 @@
 		if (len < (int)sizeof(params))
 			goto short_packet;
 
-		if (strcmp(params.type, "params") != 0)
+		if (strncmp(params.type, "params", sizeof(params.type)) != 0)
 			goto wrong_type;
 
 		switch(ntohl(params.packet_id)) {
@@ -1109,7 +1080,7 @@
 	if ((str = pw_properties_get(impl->props, "net.ip")) == NULL)
 		str = DEFAULT_NET_IP;
 
-	if ((res = parse_address(str, port, &impl->src_addr, &impl->src_len)) < 0) {
+	if ((res = pw_net_parse_address(str, port, &impl->src_addr, &impl->src_len)) < 0) {
 		pw_log_error("invalid net.ip %s: %s", str, spa_strerror(res));
 		goto out;
 	}
@@ -1135,7 +1106,7 @@
 		goto out;
 	}
 	pw_log_info("listening for AVAILABLE on %s",
-			get_ip(&impl->src_addr, buffer, sizeof(buffer)));
+			pw_net_get_ip_fmt(&impl->src_addr, buffer, sizeof(buffer)));
 	return 0;
 out:
 	return res;
@@ -1183,6 +1154,9 @@
 	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->sink_props);
 	pw_properties_free(impl->source_props);
 	pw_properties_free(impl->props);
@@ -1259,7 +1233,6 @@
 {
 	struct pw_context *context = pw_impl_module_get_context(module);
 	struct pw_properties *props = NULL;
-	struct pw_data_loop *data_loop;
 	struct impl *impl;
 	const char *str;
 	int res;
@@ -1273,6 +1246,9 @@
 	pw_log_debug("module %p: new %s", impl, args);
 	spa_list_init(&impl->follower_list);
 
+	impl->module = module;
+	impl->context = context;
+
 	if (args == NULL)
 		args = "";
 
@@ -1283,8 +1259,7 @@
 		goto error;
 	}
 	impl->props = props;
-	data_loop = pw_context_get_data_loop(context);
-	impl->data_loop = pw_data_loop_get_loop(data_loop);
+	impl->data_loop = pw_context_acquire_loop(context, &props->dict);
 	impl->quantum_limit = pw_properties_get_uint32(
 			pw_context_get_properties(context),
 			"default.clock.quantum-limit", 8192u);
@@ -1297,8 +1272,6 @@
 		goto error;
 	}
 
-	impl->module = module;
-	impl->context = context;
 	impl->main_loop = pw_context_get_main_loop(context);
 	impl->system = impl->main_loop->system;
 
@@ -1342,6 +1315,7 @@
 	impl->kbps = pw_properties_get_uint32(impl->props, "netjack2.kbps",
 			DEFAULT_KBPS);
 
+	pw_properties_set(props, PW_KEY_NODE_LOOP_NAME, impl->data_loop->name);
 	if (pw_properties_get(props, PW_KEY_NODE_VIRTUAL) == NULL)
 		pw_properties_set(props, PW_KEY_NODE_VIRTUAL, "true");
 	if (pw_properties_get(props, PW_KEY_NODE_NETWORK) == NULL)
@@ -1366,6 +1340,7 @@
 	if ((str = pw_properties_get(props, "source.props")) != NULL)
 		pw_properties_update_string(impl->source_props, str, strlen(str));
 
+	copy_props(impl, props, PW_KEY_NODE_LOOP_NAME);
 	copy_props(impl, props, PW_KEY_NODE_VIRTUAL);
 	copy_props(impl, props, PW_KEY_NODE_NETWORK);
 	copy_props(impl, props, PW_KEY_NODE_LINK_GROUP);

pipewire-1.0.1.tar.bz2/src/modules/module-netjack2/packets.h -> pipewire-1.2.0.tar.gz/src/modules/module-netjack2/packets.h Changed

pipewire-1.0.1.tar.bz2/src/modules/module-netjack2/peer.c -> pipewire-1.2.0.tar.gz/src/modules/module-netjack2/peer.c Changed

pipewire-1.2.0.tar.gz/src/modules/module-parametric-equalizer.c Added

@@ -0,0 +1,463 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2024 Wim Taymans <wim.taymans@gmail.com> */
+/* SPDX-FileCopyrightText: Copyright © 2024 Asymptotic Inc. */
+/* SPDX-License-Identifier: MIT */
+
+#include <errno.h>
+
+#include "config.h"
+
+#include <spa/utils/result.h>
+#include <spa/param/audio/raw.h>
+
+#include <pipewire/impl.h>
+
+/** \page page_module_parametric_equalizer Parametric-Equalizer
+ *
+ * The `parametric-equalizer` module loads parametric equalizer configuration
+ * generated from the AutoEQ project or Squiglink. Both the projects allow
+ * equalizing headphones or an in-ear monitor to a target curve. While these
+ * generate a file for parametric equalization for a given target, but this
+ * is not a format that can be directly given to filter chain module.
+ *
+ * A popular example of the above being EQ'ing to the Harman target curve
+ * or EQ'ing one headphone/IEM to another.
+ *
+ * For AutoEQ, see https://github.com/jaakkopasanen/AutoEq.
+ * For SquigLink, see https://squig.link/.
+ *
+ * Parametric equalizer configuration generated from AutoEQ or Squiglink looks
+ * like below.
+ *
+ * Preamp: -6.8 dB
+ * Filter 1: ON PK Fc 21 Hz Gain 6.7 dB Q 1.100
+ * Filter 2: ON PK Fc 85 Hz Gain 6.9 dB Q 3.000
+ * Filter 3: ON PK Fc 110 Hz Gain -2.6 dB Q 2.700
+ * Filter 4: ON PK Fc 210 Hz Gain 5.9 dB Q 2.100
+ * Filter 5: ON PK Fc 710 Hz Gain -1.0 dB Q 0.600
+ * Filter 6: ON PK Fc 1600 Hz Gain 2.3 dB Q 2.700
+ *
+ * Fc, Gain and Q specify the frequency, gain and Q factor respectively.
+ * The fourth column can be one of PK, LSC or HSC specifying peaking, low
+ * shelf and high shelf filter respectively. More often than not only peaking
+ * filters are involved.
+ *
+ * This module parses a configuration like above and loads the filter chain
+ * module with the above configuration translated to filter chain arguments.
+ *
+ * ## Module Name
+ *
+ * `libpipewire-module-parametric-equalizer`
+ *
+ * ## Module Options
+ *
+ * Options specific to the behaviour of this module
+ *
+ * - `equalizer.filepath = <str>` path of the file with parametric EQ
+ * - `equalizer.description = <str>`: Name which will show up in
+ * - `audio.channels = <int>`: Number of audio channels, default 2
+ * - `audio.position = <str>`: Channel map, default "FL, FR"
+ * - `remote.name =<str>`: environment with remote name, default "pipewire-0"
+ *
+ * ## General options
+ *
+ * Options with well-known behaviour:
+ *
+ * - \ref PW_KEY_AUDIO_CHANNELS
+ * - \ref SPA_KEY_AUDIO_POSITION
+ * - \ref PW_KEY_REMOTE_NAME
+ *
+ * ## Example configuration
+ *\code{.unparsed}
+ * context.modules = 
+ * {   name = libpipewire-module-parametric-equalizer
+ *     args = {
+ *         #remote.name = "pipewire-0"
+ *         #equalizer.filepath = "/a/b/EQ.txt"
+ *         #equalizer.description = "Parametric EQ Sink"
+ *         #audio.channels = 2
+ *         #audio.position = FL, FR
+ *     }
+ * }
+ * 
+ *\endcode
+ *
+ * \since 1.0.6
+ */
+
+#define NAME "parametric-eq"
+
+PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
+#define PW_LOG_TOPIC_DEFAULT mod_topic
+
+#define DEFAULT_DESCRIPTION "Parametric Equalizer Sink";
+#define DEFAULT_CHANNELS 2
+#define DEFAULT_POSITION " FL FR "
+
+#define MODULE_USAGE	"( remote.name=<remote> ) "			\
+			"( equalizer.filepath=<filepath> )"		\
+			"( equalizer.description=<description> )"	\
+			"( audio.channels=<number of channels>)"	\
+			"( audio.position=<channel map>)"
+
+static const struct spa_dict_item module_props = {
+	{ PW_KEY_MODULE_AUTHOR, "Sanchayan Maity <sanchayan@asymptotic.io>" },
+	{ PW_KEY_MODULE_DESCRIPTION, "Creates a module-filter-chain from Parametric EQ file" },
+	{ PW_KEY_MODULE_USAGE, MODULE_USAGE },
+	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
+};
+
+struct impl {
+	struct pw_context *context;
+	struct pw_properties *props;
+
+	struct pw_core *core;
+	struct pw_impl_module *module;
+	struct pw_impl_module *eq_module;
+
+	struct spa_hook core_proxy_listener;
+	struct spa_hook core_listener;
+	struct spa_hook module_listener;
+	struct spa_hook eq_module_listener;
+
+	char position64;
+	uint32_t channels;
+	unsigned int do_disconnect:1;
+};
+
+struct eq_node_param {
+	char filter_type4;
+	char filter4;
+	uint32_t freq;
+	float gain;
+	float q_fact;
+};
+
+static void filter_chain_module_destroy(void *d)
+{
+	struct impl *impl = d;
+	spa_hook_remove(&impl->eq_module_listener);
+	impl->eq_module = NULL;
+}
+
+static const struct pw_impl_module_events filter_chain_module_events = {
+	PW_VERSION_IMPL_MODULE_EVENTS,
+	.destroy = filter_chain_module_destroy,
+};
+
+void init_eq_node(FILE *f, const char *node_desc) {
+	fprintf(f, "{\n");
+	fprintf(f, "node.description = \"%s\"\n", node_desc);
+	fprintf(f, "media.name = \"%s\"\n", node_desc);
+	fprintf(f, "filter.graph = {\n");
+	fprintf(f, "nodes = \n");
+}
+
+void add_eq_node(FILE *f, struct eq_node_param *param, uint32_t eq_band_idx) {
+	fprintf(f, "{\n");
+	fprintf(f, "type = builtin\n");
+	fprintf(f, "name = eq_band_%d\n", eq_band_idx);
+
+	if (strcmp(param->filter_type, "PK") == 0) {
+		fprintf(f, "label = bq_peaking\n");
+	} else if (strcmp(param->filter_type, "LSC") == 0) {
+		fprintf(f, "label = bq_lowshelf\n");
+	} else if (strcmp(param->filter_type, "HSC") == 0) {
+		fprintf(f, "label = bq_highshelf\n");
+	} else {
+		fprintf(f, "label = bq_peaking\n");
+	}
+
+	fprintf(f, "control = { \"Freq\" = %d \"Q\" = %f \"Gain\" = %f }\n", param->freq, param->q_fact, param->gain);
+
+	fprintf(f, "}\n");
+}
+
+void end_eq_node(struct impl *impl, FILE *f, uint32_t number_of_nodes) {
+	fprintf(f, "\n");
+
+	fprintf(f, "links = \n");
+	for (uint32_t i = 1; i < number_of_nodes; i++) {
+		fprintf(f, "{ output = \"eq_band_%d:Out\" input = \"eq_band_%d:In\" }\n", i, i + 1);
+	}
+	fprintf(f, "\n");
+
+	fprintf(f, "}\n");
+	fprintf(f, "audio.channels = %d\n", impl->channels);
+	fprintf(f, "audio.position = %s\n", impl->position);
+
+	fprintf(f, "capture.props = {\n");
+	fprintf(f, "node.name = \"effect_input.eq%d\"\n", number_of_nodes);
+	fprintf(f, "media.class = Audio/Sink\n");
+	fprintf(f, "}\n");
+
+	fprintf(f, "playback.props = {\n");
+	fprintf(f, "node.name = \"effect_output.eq%d\"\n", number_of_nodes);
+	fprintf(f, "node.passive = true\n");
+	fprintf(f, "}\n");
+
+	fprintf(f, "}\n");
+}
+
+int32_t parse_eq_filter_file(struct impl *impl, FILE *f)
+{
+	struct eq_node_param eq_param;
+	FILE *memstream = NULL;
+	const char* str;
+
+	char *args = NULL;
+	char *line = NULL;
+	ssize_t nread;
+	size_t len, size;
+	uint32_t eq_band_idx = 1;
+	uint32_t eq_bands = 0;
+	int32_t res = 0;
+
+	if ((memstream = open_memstream(&args, &size)) == NULL) {
+		res = -errno;
+		pw_log_error("Can't open memstream: %m");
+		goto done;
+	}
+
+	if ((str = pw_properties_get(impl->props, "equalizer.description")) == NULL)
+		str = DEFAULT_DESCRIPTION;
+	init_eq_node(memstream, str);
+
+	/*
+	 * Read the Preamp gain line.
+	 * Example: Preamp: -6.8 dB
+	 *
+	 * When a pre-amp gain is required, which is usually the case when
+	 * applying EQ, we need to modify the first EQ band to apply a
+	 * bq_highshelf filter at frequency 0 Hz with the provided negative
+	 * gain.
+	 *
+	 * Pre-amp gain is always negative to offset the effect of possible
+	 * clipping introduced by the amplification resulting from EQ.
+	 */
+	spa_zero(eq_param);
+	nread = getline(&line, &len, f);
+	if (nread != -1 && sscanf(line, "%*s %6f %*s", &eq_param.gain) == 1) {
+		memcpy(eq_param.filter, "ON", 2);
+		memcpy(eq_param.filter_type, "HSC", 3);
+		eq_param.freq = 0;
+		eq_param.q_fact = 1.0;
+
+		add_eq_node(memstream, &eq_param, eq_band_idx);
+
+		eq_band_idx++;
+		eq_bands++;
+	}
+
+	/* Read the filter bands */
+	while ((nread = getline(&line, &len, f)) != -1) {
+		spa_zero(eq_param);
+
+		/*
+		 * On field widths:
+		 * - filter can be ON or OFF
+		 * - filter type can be PK, LSC, HSC
+		 * - freq can be at most 5 decimal digits
+		 * - gain can be -xy.z
+		 * - Q can be x.y00
+		 *
+		 * Use a field width of 6 for gain and Q to account for any
+		 * possible zeros.
+		 */
+		if (sscanf(line, "%*s %*d: %3s %3s %*s %5d %*s %*s %6f %*s %*c %6f", eq_param.filter, eq_param.filter_type, &eq_param.freq, &eq_param.gain, &eq_param.q_fact) == 5) {
+			if (strcmp(eq_param.filter, "ON") == 0) {
+				add_eq_node(memstream, &eq_param, eq_band_idx);
+
+				eq_band_idx++;
+				eq_bands++;
+			}
+		}
+	}
+
+	if (eq_bands > 0) {
+		end_eq_node(impl, memstream, eq_bands);
+	} else {
+		pw_log_error("failed to parse equalizer configuration");
+		res = -errno;
+		goto done;
+	}
+
+	fclose(memstream);
+	memstream = NULL;
+
+	pw_log_info("loading new module-filter-chain with args: %s", args);
+	impl->eq_module = pw_context_load_module(impl->context,
+				"libpipewire-module-filter-chain",
+				args, NULL);
+	if (!impl->eq_module) {
+		res = -errno;
+		pw_log_error("Can't load module: %m");
+		goto done;
+	}
+	pw_log_info("loaded new module-filter-chain");
+
+	pw_impl_module_add_listener(impl->eq_module,
+			&impl->eq_module_listener,
+			&filter_chain_module_events, impl);
+
+	res = 0;
+
+done:
+	if (memstream != NULL)
+		fclose(memstream);
+	free(args);
+
+	return res;
+}
+
+static void core_error(void *data, uint32_t id, int seq, int res, const char *message)
+{
+	struct impl *impl = data;
+
+	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 = core_error,
+};
+
+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)
+{
+	if (impl->core && impl->do_disconnect)
+		pw_core_disconnect(impl->core);
+	pw_properties_free(impl->props);
+	free(impl);
+}
+
+static void module_destroy(void *data)
+{
+	struct impl *impl = data;
+	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,
+};
+
+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 pw_properties *props = NULL;
+	struct impl *impl;
+	const char *str;
+	FILE *f = NULL;
+	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);
+
+	if (args == NULL)
+		args = "";
+
+	props = pw_properties_new_string(args);
+	if (props == NULL) {
+		res = -errno;
+		pw_log_error( "can't create properties: %m");
+		goto error;
+	}
+	impl->props = props;
+
+	impl->module = module;
+	impl->context = context;
+
+	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 error;
+	}
+
+	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->channels = pw_properties_get_uint32(impl->props, PW_KEY_AUDIO_CHANNELS, DEFAULT_CHANNELS);
+	if (impl->channels == 0) {
+		res = -EINVAL;
+		pw_log_error("invalid channels '%d'", impl->channels);
+		goto error;
+	}
+
+	if ((str = pw_properties_get(impl->props, SPA_KEY_AUDIO_POSITION)) == NULL)
+		str = DEFAULT_POSITION;
+	strncpy(impl->position, str, strlen(str));
+
+	if ((str = pw_properties_get(props, "equalizer.filepath")) == NULL) {
+		res = -errno;
+		pw_log_error( "missing property equalizer.filepath: %m");
+		goto error;
+	}
+
+	pw_log_info("Loading equalizer file %s for parsing", str);
+
+	if ((f = fopen(str, "r")) == NULL) {
+		res = -errno;
+		pw_log_error("failed to open equalizer file: %m");
+		goto error;
+	}
+
+	if (parse_eq_filter_file(impl, f) == -1) {
+		res = -EINVAL;
+		pw_log_error("failed to parse equalizer file: %m");
+		goto error;
+	}
+
+	fclose(f);
+
+	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:
+	if (f != NULL)
+		fclose(f);
+
+	impl_destroy(impl);
+
+	return res;
+}

pipewire-1.0.1.tar.bz2/src/modules/module-pipe-tunnel.c -> pipewire-1.2.0.tar.gz/src/modules/module-pipe-tunnel.c Changed

@@ -199,10 +199,11 @@
 
 	struct spa_dll dll;
 	float max_error;
-	float corr;
+	double corr;
 
 	uint64_t next_time;
 	unsigned int have_sync:1;
+	unsigned int underrun:1;
 };
 
 static uint64_t get_time_ns(struct impl *impl)
@@ -243,7 +244,7 @@
 	pw_log_debug("timeout %"PRIu64, duration);
 
 	current_time = impl->next_time;
-	impl->next_time += duration / impl->corr * 1e9 / rate;
+	impl->next_time += (uint64_t)(duration / impl->corr * 1e9 / rate);
 	avail = spa_ringbuffer_get_read_index(&impl->ring, &index);
 
 	if (SPA_LIKELY(pos)) {
@@ -375,7 +376,7 @@
 
 	if (!impl->driving) {
 		SPA_FLAG_SET(impl->rate_match->flags, SPA_IO_RATE_MATCH_FLAG_ACTIVE);
-		impl->rate_match->rate = 1.0f / impl->corr;
+		impl->rate_match->rate = 1.0 / impl->corr;
 	}
 }
 
@@ -407,11 +408,18 @@
 	if (avail < (int32_t)size) {
 		memset(bd->data, 0, size);
 		if (avail >= 0) {
-			pw_log_warn("underrun %d < %u", avail, size);
+			if (!impl->underrun) {
+				pw_log_warn("underrun %d < %u", avail, size);
+				impl->underrun = true;
+			}
 			pause_stream(impl, true);
 		}
 		impl->have_sync = false;
 	}
+	if (avail > (int32_t)(impl->target_buffer * 3)) {
+		pw_log_warn("resync %d > %u", avail, (int32_t)(impl->target_buffer * 3));
+		impl->have_sync = false;
+	}
 	if (avail > (int32_t)RINGBUFFER_SIZE) {
 		index += avail - impl->target_buffer;
 		avail = impl->target_buffer;
@@ -429,6 +437,7 @@
 
 		index += avail;
 		spa_ringbuffer_read_update(&impl->ring, index);
+		impl->underrun = false;
 	}
 	bd->chunk->offset = 0;
 	bd->chunk->size = size;
@@ -722,6 +731,8 @@
 	if (impl->fd >= 0)
 		close(impl->fd);
 
+	pw_context_release_loop(impl->context, impl->data_loop);
+
 	pw_properties_free(impl->stream_props);
 	pw_properties_free(impl->props);
 
@@ -848,7 +859,6 @@
 	struct pw_properties *props = NULL;
 	struct impl *impl;
 	const char *str, *media_class = NULL;
-	struct pw_data_loop *data_loop;
 	int res;
 
 	PW_LOG_TOPIC_INIT(mod_topic);
@@ -882,8 +892,7 @@
 	impl->module = module;
 	impl->context = context;
 	impl->main_loop = pw_context_get_main_loop(context);
-	data_loop = pw_context_get_data_loop(context);
-	impl->data_loop = pw_data_loop_get_loop(data_loop);
+	impl->data_loop = pw_context_acquire_loop(context, &props->dict);
 
 	if ((str = pw_properties_get(props, "tunnel.mode")) == NULL)
 		str = "playback";
@@ -914,6 +923,7 @@
 	if ((str = pw_properties_get(props, "tunnel.may-pause")) != NULL)
 		impl->may_pause = spa_atob(str);
 
+	pw_properties_set(props, PW_KEY_NODE_LOOP_NAME, impl->data_loop->name);
 	if (pw_properties_get(props, PW_KEY_NODE_VIRTUAL) == NULL)
 		pw_properties_set(props, PW_KEY_NODE_VIRTUAL, "true");
 	if (pw_properties_get(props, PW_KEY_MEDIA_CLASS) == NULL)
@@ -922,6 +932,7 @@
 	if ((str = pw_properties_get(props, "stream.props")) != NULL)
 		pw_properties_update_string(impl->stream_props, str, strlen(str));
 
+	copy_props(impl, props, PW_KEY_NODE_LOOP_NAME);
 	copy_props(impl, props, PW_KEY_AUDIO_FORMAT);
 	copy_props(impl, props, PW_KEY_AUDIO_RATE);
 	copy_props(impl, props, PW_KEY_AUDIO_CHANNELS);
@@ -947,7 +958,7 @@
 	if (impl->info.rate != 0 &&
 	    pw_properties_get(props, PW_KEY_NODE_RATE) == NULL)
 		pw_properties_setf(props, PW_KEY_NODE_RATE,
-				"1/%u", impl->info.rate),
+				"1/%u", impl->info.rate);
 
 	copy_props(impl, props, PW_KEY_NODE_RATE);

pipewire-1.0.1.tar.bz2/src/modules/module-portal.c -> pipewire-1.2.0.tar.gz/src/modules/module-portal.c Changed

@@ -18,6 +18,7 @@
 #include <spa/utils/string.h>
 #include <spa/utils/result.h>
 #include <spa/support/dbus.h>
+#include <spa-private/dbus-helpers.h>
 
 #include "pipewire/context.h"
 #include "pipewire/impl-client.h"
@@ -65,6 +66,8 @@
 
 #define NAME "portal"
 
+#define PORTAL_SERVICE_NAME "org.freedesktop.portal.Desktop"
+
 PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 #define PW_LOG_TOPIC_DEFAULT mod_topic
 
@@ -127,6 +130,8 @@
 	spa_hook_remove(&impl->context_listener);
 	spa_hook_remove(&impl->module_listener);
 
+	cancel_and_unref(&impl->portal_pid_pending);
+
 	if (impl->bus)
 		dbus_connection_unref(impl->bus);
 	spa_dbus_connection_destroy(impl->conn);
@@ -145,13 +150,10 @@
 				   void *user_data)
 {
 	struct impl *impl = user_data;
-	DBusMessage *m;
-	DBusError error;
 	uint32_t portal_pid = 0;
 
-	m = dbus_pending_call_steal_reply(pending);
-	dbus_pending_call_unref(pending);
-	impl->portal_pid_pending = NULL;
+	spa_assert(impl->portal_pid_pending == pending);
+	spa_autoptr(DBusMessage) m = steal_reply_and_unref(&impl->portal_pid_pending);
 
 	if (!m) {
 		pw_log_error("Failed to receive portal pid");
@@ -169,15 +171,13 @@
 		return;
 	}
 
-	dbus_error_init(&error);
+	spa_auto(DBusError) error = DBUS_ERROR_INIT;
 	dbus_message_get_args(m, &error, DBUS_TYPE_UINT32, &portal_pid,
 			      DBUS_TYPE_INVALID);
-	dbus_message_unref(m);
 
 	if (dbus_error_is_set(&error)) {
 		impl->portal_pid = 0;
 		pw_log_warn("Could not get portal pid: %s", error.message);
-		dbus_error_free(&error);
 	} else {
 		pw_log_info("Got portal pid %d", portal_pid);
 		impl->portal_pid = portal_pid;
@@ -186,29 +186,22 @@
 
 static void update_portal_pid(struct impl *impl)
 {
-	DBusMessage *m;
-	const char *name;
-	DBusPendingCall *pending;
-
 	impl->portal_pid = 0;
+	cancel_and_unref(&impl->portal_pid_pending);
 
-	m = dbus_message_new_method_call("org.freedesktop.DBus",
-					 "/org/freedesktop/DBus",
-					 "org.freedesktop.DBus",
-					 "GetConnectionUnixProcessID");
-
-	name = "org.freedesktop.portal.Desktop";
-	dbus_message_append_args(m,
-				 DBUS_TYPE_STRING, &name,
-				 DBUS_TYPE_INVALID);
-
-	dbus_connection_send_with_reply(impl->bus, m, &pending, -1);
-	dbus_pending_call_set_notify(pending, on_portal_pid_received, impl, NULL);
-	if (impl->portal_pid_pending != NULL) {
-		dbus_pending_call_cancel(impl->portal_pid_pending);
-		dbus_pending_call_unref(impl->portal_pid_pending);
-	}
-	impl->portal_pid_pending = pending;
+	spa_autoptr(DBusMessage) m = dbus_message_new_method_call("org.freedesktop.DBus",
+								  "/org/freedesktop/DBus",
+								  "org.freedesktop.DBus",
+								  "GetConnectionUnixProcessID");
+	if (!m)
+		return;
+
+	if (!dbus_message_append_args(m,
+				      DBUS_TYPE_STRING, &(const char *){ PORTAL_SERVICE_NAME },
+				      DBUS_TYPE_INVALID))
+		return;
+
+	impl->portal_pid_pending = send_with_reply(impl->bus, m, on_portal_pid_received, impl);
 }
 
 static DBusHandlerResult name_owner_changed_handler(DBusConnection *connection,
@@ -233,15 +226,12 @@
 		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 	}
 
-	if (!spa_streq(name, "org.freedesktop.portal.Desktop"))
+	if (!spa_streq(name, PORTAL_SERVICE_NAME))
 		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
 	if (spa_streq(new_owner, "")) {
 		impl->portal_pid = 0;
-		if (impl->portal_pid_pending != NULL) {
-			dbus_pending_call_cancel(impl->portal_pid_pending);
-			dbus_pending_call_unref(impl->portal_pid_pending);
-		}
+		cancel_and_unref(&impl->portal_pid_pending);
 	}
 	else {
 		update_portal_pid(impl);
@@ -252,8 +242,6 @@
 
 static int init_dbus_connection(struct impl *impl)
 {
-	DBusError error;
-
 	impl->bus = spa_dbus_connection_get(impl->conn);
 	if (impl->bus == NULL)
 		return -EIO;
@@ -261,18 +249,18 @@
 	/* XXX: we don't handle dbus reconnection yet, so ref the handle instead */
 	dbus_connection_ref(impl->bus);
 
-	dbus_error_init(&error);
+	spa_auto(DBusError) error = DBUS_ERROR_INIT;
 
 	dbus_bus_add_match(impl->bus,
 			   "type='signal',\
 			   sender='org.freedesktop.DBus',\
 			   interface='org.freedesktop.DBus',\
-			   member='NameOwnerChanged'",
+			   member='NameOwnerChanged',\
+			   arg0='" PORTAL_SERVICE_NAME "'",
 			   &error);
 	if (dbus_error_is_set(&error)) {
 		pw_log_error("Failed to add name owner changed listener: %s",
 			     error.message);
-		dbus_error_free(&error);
 		return -EIO;
 	}

pipewire-1.0.1.tar.bz2/src/modules/module-profiler.c -> pipewire-1.2.0.tar.gz/src/modules/module-profiler.c Changed

@@ -58,7 +58,7 @@
 
 #define TMP_BUFFER		(16 * 1024)
 #define DATA_BUFFER		(32 * 1024)
-#define FLUSH_BUFFER		(8 * 1024 * 1024)
+#define FLUSH_BUFFER		(8 * 1024)
 
 int pw_protocol_native_ext_profiler_init(struct pw_context *context);
 
@@ -94,7 +94,6 @@
 	struct pw_properties *properties;
 
 	struct pw_loop *main_loop;
-	struct pw_loop *data_loop;
 
 	struct spa_hook context_listener;
 	struct spa_hook module_listener;
@@ -108,12 +107,8 @@
 	struct spa_source *flush_event;
 	unsigned int listening:1;
 
-#ifdef max_align_t
-	alignas(max_align_t)
-#else
-	alignas(64)
-#endif
-	uint8_t flushFLUSH_BUFFER + sizeof(struct spa_pod_struct);
+	uint8_t *flush;
+	size_t flush_size;
 };
 
 struct resource_data {
@@ -139,16 +134,27 @@
 
 		avail = spa_ringbuffer_get_read_index(&n->buffer, &idx);
 
-		pw_log_trace("%p avail %d", impl, avail);
+		pw_log_trace("%p: avail %d", impl, avail);
 
 		if (avail > 0) {
-			if (total + avail < FLUSH_BUFFER) {
-				spa_ringbuffer_read_data(&n->buffer, n->data, DATA_BUFFER,
-						idx % DATA_BUFFER,
-						SPA_PTROFF(p, sizeof(struct spa_pod_struct) + total, void),
-						avail);
-				total += avail;
+			size_t size = total + avail + sizeof(struct spa_pod_struct);
+			if (size > impl->flush_size) {
+				uint8_t *flush;
+				flush = realloc(impl->flush, size);
+				if (flush == NULL) {
+					pw_log_warn("%p: failed to realloc flush size %zu", impl, impl->flush_size);
+					continue;
+				}
+				impl->flush = flush;
+				impl->flush_size = size;
+				pw_log_debug("%p: new flush buffer size %zu", impl, impl->flush_size);
+				p = (struct spa_pod_struct *)impl->flush;
 			}
+			spa_ringbuffer_read_data(&n->buffer, n->data, DATA_BUFFER,
+					idx % DATA_BUFFER,
+					SPA_PTROFF(p, sizeof(struct spa_pod_struct) + total, void),
+					avail);
+			total += avail;
 			spa_ringbuffer_read_update(&n->buffer, idx + avail);
 		}
 	}
@@ -199,8 +205,8 @@
 			SPA_POD_Long(pos->clock.duration),
 			SPA_POD_Long(pos->clock.delay),
 			SPA_POD_Double(pos->clock.rate_diff),
-			SPA_POD_Long(pos->clock.next_nsec));
-
+			SPA_POD_Long(pos->clock.next_nsec),
+			SPA_POD_Int(pos->state));
 
 	spa_pod_builder_prop(&b, SPA_PROFILER_driverBlock, 0);
 	spa_pod_builder_add_struct(&b,
@@ -219,7 +225,7 @@
 		struct pw_node_activation *na;
 		struct spa_fraction latency;
 
-		if (t->id == id || t->flags & PW_NODE_TARGET_PEER)
+		if (t->id == id)
 			continue;
 
 		if (n != NULL) {
@@ -412,6 +418,7 @@
 
 	pw_loop_destroy_source(impl->main_loop, impl->flush_event);
 
+	free(impl->flush);
 	free(impl);
 }
 
@@ -441,16 +448,18 @@
 	struct pw_context *context = pw_impl_module_get_context(module);
 	struct pw_properties *props;
 	struct impl *impl;
-	static const char * const keys = {
-		PW_KEY_OBJECT_SERIAL,
-		NULL
-	};
 
 	PW_LOG_TOPIC_INIT(mod_topic);
 
 	impl = calloc(1, sizeof(struct impl));
 	if (impl == NULL)
 		return -errno;
+	impl->flush_size = FLUSH_BUFFER + sizeof(struct spa_pod_struct);
+	impl->flush = malloc(impl->flush_size);
+	if (impl->flush == NULL) {
+		free(impl);
+		return -errno;
+	}
 
 	spa_list_init(&impl->node_list);
 	pw_protocol_native_ext_profiler_init(context);
@@ -465,7 +474,6 @@
 	impl->context = context;
 	impl->properties = props;
 	impl->main_loop = pw_context_get_main_loop(impl->context);
-	impl->data_loop = pw_data_loop_get_loop(pw_context_get_data_loop(impl->context));
 
 	impl->global = pw_global_new(context,
 			PW_TYPE_INTERFACE_Profiler,
@@ -474,6 +482,7 @@
 			pw_properties_copy(props),
 			global_bind, impl);
 	if (impl->global == NULL) {
+		free(impl->flush);
 		free(impl);
 		return -errno;
 	}
@@ -483,8 +492,6 @@
 
 	impl->flush_event = pw_loop_add_event(impl->main_loop, do_flush_event, impl);
 
-	pw_global_update_keys(impl->global, &impl->properties->dict, keys);
-
 	pw_impl_module_add_listener(module, &impl->module_listener, &module_events, impl);
 
 	pw_impl_module_update_properties(module, &SPA_DICT_INIT_ARRAY(module_props));

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-native.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-native.c Changed

@@ -29,9 +29,11 @@
 #include <spa/pod/iter.h>
 #include <spa/pod/parser.h>
 #include <spa/pod/builder.h>
+#include <spa/utils/cleanup.h>
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
+#include <spa/debug/log.h>
 
 #ifdef HAVE_SYSTEMD
 #include <systemd/sd-daemon.h>
@@ -43,7 +45,6 @@
 
 #include <pipewire/impl.h>
 #include <pipewire/extensions/protocol-native.h>
-#include <pipewire/cleanup.h>
 
 #include "pipewire/private.h"
 
@@ -79,12 +80,15 @@
  *
  * The module supports the following arguments:
  *
- * - `sockets`: ` { name = "socket-name", owner = "owner", group = "group", mode = "mode", selinux.context = "context" }, ... `
+ * - `sockets`: ` { name = "socket-name", owner = "owner", group = "group", mode = "mode", selinux.context = "context" }, props = { ... }, ... `
  *
  *   Array of Unix socket names and (optionally) owner/permissions to serve,
  *   if the context is a server. If not absolute paths, the sockets are created
  *   in the default runtime directory.
  *
+ *   The props are copied directly to any client that connects through this server
+ *   socket and can be used to configure special permissions.
+ *
  *   Has the default value ` { name = "CORENAME" }, { name = "CORENAME-manager" } `,
  *   where `CORENAME` is the name of the PipeWire core, usually `pipewire-0`.
  *
@@ -137,7 +141,16 @@
  *\code{.unparsed}
  * context.modules = 
  *  { name = libpipewire-module-protocol-native,
- *    args = { sockets =  { name = "pipewire-0" }, { name = "pipewire-0-manager" }  } }
+ *    args = {
+ *        sockets = 
+ *            { name = "pipewire-0" }
+ *            { name = "pipewire-0-manager" }
+ *            { name = "pipewire-1"
+ *              props = { my.connection = "the other one" }
+ *            }
+ *        
+ *    }
+ *  }
  * 
  *\endcode
  */
@@ -157,19 +170,22 @@
 #define SO_PEERSEC 31
 #endif
 
-static bool debug_messages = 0;
-
 #define LOCK_SUFFIX     ".lock"
 #define LOCK_SUFFIXLEN  5
 
 void pw_protocol_native_init(struct pw_protocol *protocol);
 void pw_protocol_native0_init(struct pw_protocol *protocol);
+void *protocol_native_security_context_init(struct pw_impl_module *module, struct pw_protocol *protocol);
+void protocol_native_security_context_free(void *data);
 
 struct protocol_data {
 	struct pw_impl_module *module;
 	struct spa_hook module_listener;
 	struct pw_protocol *protocol;
 
+	struct pw_properties *props;
+	void *security;
+
 	struct server *local;
 };
 
@@ -214,11 +230,13 @@
 	int fd_lock;
 	struct sockaddr_un addr;
 	char lock_addrUNIX_PATH_MAX + LOCK_SUFFIXLEN;
-	struct socket_info socket_info;
+
+	struct pw_properties *props;
 
 	struct pw_loop *loop;
 	struct spa_source *source;
 	struct spa_source *resume;
+	struct spa_source *close;
 	unsigned int activated:1;
 };
 
@@ -244,16 +262,24 @@
 static void debug_msg(const char *prefix, const struct pw_protocol_native_message *msg, bool hex)
 {
 	struct spa_pod *pod;
+	struct spa_debug_log_ctx c;
+
+	if (!pw_log_topic_custom_enabled(SPA_LOG_LEVEL_DEBUG, mod_topic_connection))
+		return;
+
+	c = SPA_LOGT_DEBUG_INIT(pw_log_get(),
+				SPA_LOG_LEVEL_DEBUG, mod_topic_connection);
+
 	pw_logt_debug(mod_topic_connection,
 		      "%s: id:%d op:%d size:%d seq:%d fds:%d", prefix,
 		      msg->id, msg->opcode, msg->size, msg->seq, msg->n_fds);
 
 	if ((pod = get_first_pod_from_data(msg->data, msg->size, 0)) != NULL)
-		spa_debug_pod(0, NULL, pod);
+		spa_debugc_pod(&c.ctx, 0, NULL, pod);
 	else
 		hex = true;
 	if (hex)
-		spa_debug_mem(0, msg->data, msg->size);
+		spa_debugc_mem(&c.ctx, 0, msg->data, msg->size);
 
 	pw_logt_debug(mod_topic_connection, "%s ****", prefix);
 
@@ -341,7 +367,7 @@
 		pw_log_trace("%p: got message %d from %u", client->protocol,
 			     msg->opcode, msg->id);
 
-		if (debug_messages)
+		if (pw_log_topic_custom_enabled(SPA_LOG_LEVEL_DEBUG, mod_topic_connection))
 			debug_msg("<<<<<< in", msg, false);
 
 		pre_demarshal(conn, msg, client, footer_client_demarshal,
@@ -580,12 +606,10 @@
 	struct protocol_data *d = pw_protocol_get_user_data(protocol);
 	int i, res;
 
-	props = pw_properties_new(PW_KEY_PROTOCOL, "protocol-native", NULL);
+	props = pw_properties_copy(s->props);
 	if (props == NULL)
 		goto exit;
 
-	pw_properties_set(props, PW_KEY_SEC_SOCKET, s->socket_info.name);
-
 #if defined(__linux__)
 	len = sizeof(ucred);
 	if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &ucred, &len) < 0) {
@@ -797,6 +821,17 @@
 	}
 }
 
+static void
+close_data(void *data, int fd, uint32_t mask)
+{
+	struct server *s = data;
+
+	if (mask & (SPA_IO_HUP | SPA_IO_ERR)) {
+		pw_log_info("server %p: closed socket %d %08x", s, fd, mask);
+		pw_protocol_server_destroy(&s->this);
+	}
+}
+
 static int write_socket_address(struct server *s)
 {
 	long v;
@@ -835,9 +870,8 @@
 	return res;
 }
 
-static int set_socket_permissions(struct server *s)
+static int set_socket_permissions(struct server *s, struct socket_info *info)
 {
-	struct socket_info *info = &s->socket_info;
 	const char *path = s->addr.sun_path;
 
 	if (info->has_owner)
@@ -860,7 +894,7 @@
 	return 0;
 }
 
-static int add_socket(struct pw_protocol *protocol, struct server *s)
+static int add_socket(struct pw_protocol *protocol, struct server *s, struct socket_info *info)
 {
 	socklen_t size;
 	int fd = -1, res;
@@ -907,10 +941,10 @@
 			goto error_close;
 		}
 
-		if ((res = set_socket_permissions(s)) < 0) {
+		if ((res = set_socket_permissions(s, info)) < 0) {
 			errno = -res;
 			pw_log_error("server %p: failed to set socket %s permissions: %m",
-					s, s->socket_info.name);
+					s, info->name);
 			goto error_close;
 		}
 
@@ -920,9 +954,9 @@
 			goto error_close;
 		}
 	} else {
-		if (s->socket_info.has_owner || s->socket_info.has_mode || s->socket_info.selinux_context)
+		if (info->has_owner || info->has_mode || info->selinux_context)
 			pw_log_info("server %p: permissions ignored for socket %s from systemd",
-					s, s->socket_info.name);
+					s, info->name);
 	}
 
 	res = write_socket_address(s);
@@ -995,7 +1029,7 @@
 
 		this->recv_seq = msg->seq;
 
-		if (debug_messages)
+		if (pw_log_topic_custom_enabled(SPA_LOG_LEVEL_DEBUG, mod_topic_connection))
 			debug_msg("<<<<<< in", msg, false);
 
 		pre_demarshal(conn, msg, this, footer_core_demarshal,
@@ -1326,14 +1360,15 @@
 		pw_loop_destroy_source(s->loop, s->source);
 	if (s->resume)
 		pw_loop_destroy_source(s->loop, s->resume);
+	if (s->close)
+		pw_loop_destroy_source(s->loop, s->close);
 	if (s->addr.sun_path0 && !s->activated)
 		unlink(s->addr.sun_path);
 	if (s->lock_addr0)
 		unlink(s->lock_addr);
 	if (s->fd_lock != -1)
 		close(s->fd_lock);
-	free(s->socket_info.name);
-	free(s->socket_info.selinux_context);
+	pw_properties_free(s->props);
 	free(s);
 }
 
@@ -1379,6 +1414,12 @@
 	if ((s = calloc(1, sizeof(struct server))) == NULL)
 		return NULL;
 
+	s->props = pw_properties_new(PW_KEY_PROTOCOL, "protocol-native", NULL);
+	if (s->props == NULL) {
+		free(s);
+		return NULL;
+	}
+	pw_properties_update(s->props, props);
 	s->fd_lock = -1;
 
 	this = &s->this;
@@ -1386,7 +1427,6 @@
 	this->core = core;
 	spa_list_init(&this->client_list);
 	this->destroy = destroy_server;
-
 	spa_list_append(&protocol->server_list, &this->link);
 
 	pw_log_debug("%p: created server %p", protocol, this);
@@ -1410,16 +1450,12 @@
 
 	this = &s->this;
 
-	if (socket_info) {
-		s->socket_info = *socket_info;
-		s->socket_info.name = strdup(socket_info->name);
-		s->socket_info.selinux_context = socket_info->selinux_context ?
-			strdup(socket_info->selinux_context) : NULL;
+	if (socket_info)
 		name = socket_info->name;
-	} else {
+	else
 		name = get_server_name(props);
-		s->socket_info.name = strdup(name);
-	}
+
+	pw_properties_set(s->props, PW_KEY_SEC_SOCKET, name);
 
 	if ((res = init_socket_name(s, name)) < 0)
 		goto error;
@@ -1427,11 +1463,13 @@
 	if ((res = lock_socket(s)) < 0)
 		goto error;
 
-	if ((res = add_socket(protocol, s)) < 0)
+	if ((res = add_socket(protocol, s, socket_info)) < 0)
 		goto error;
 
-	if ((s->resume = pw_loop_add_event(s->loop, do_resume, s)) == NULL)
+	if ((s->resume = pw_loop_add_event(s->loop, do_resume, s)) == NULL) {
+		res = -errno;
 		goto error;
+	}
 
 	pw_log_info("%p: Listening on '%s'", protocol, name);
 
@@ -1451,10 +1489,58 @@
 	return add_server(protocol, core, props, NULL);
 }
 
+static struct pw_protocol_server *
+impl_add_fd_server(struct pw_protocol *protocol,
+		struct pw_impl_core *core,
+		int listen_fd, int close_fd,
+                const struct spa_dict *props)
+{
+	struct pw_protocol_server *this;
+	struct server *s;
+	int res;
+
+	if ((s = create_server(protocol, core, props)) == NULL)
+		return NULL;
+
+	this = &s->this;
+
+	pw_properties_setf(s->props, PW_KEY_SEC_SOCKET, "pipewire-fd-%d", listen_fd);
+
+	s->loop = pw_context_get_main_loop(protocol->context);
+	if (s->loop == NULL) {
+		res = -errno;
+		goto error;
+	}
+	s->source = pw_loop_add_io(s->loop, listen_fd, SPA_IO_IN, true, socket_data, s);
+	if (s->source == NULL) {
+		res = -errno;
+		goto error;
+	}
+	s->close = pw_loop_add_io(s->loop, close_fd, 0, true, close_data, s);
+	if (s->close == NULL) {
+		res = -errno;
+		goto error;
+	}
+	if ((s->resume = pw_loop_add_event(s->loop, do_resume, s)) == NULL) {
+		res = -errno;
+		goto error;
+	}
+
+	pw_log_info("%p: Listening on fd:%d", protocol, listen_fd);
+
+	return this;
+
+error:
+	destroy_server(this);
+	errno = -res;
+	return NULL;
+}
+
 static const struct pw_protocol_implementation protocol_impl = {
 	PW_VERSION_PROTOCOL_IMPLEMENTATION,
 	.new_client = impl_new_client,
 	.add_server = impl_add_server,
+	.add_fd_server = impl_add_fd_server,
 };
 
 static struct spa_pod_builder *
@@ -1544,7 +1630,10 @@
 {
 	struct protocol_data *d = data;
 
+	if (d->security)
+		protocol_native_security_context_free(d->security);
 	spa_hook_remove(&d->module_listener);
+	pw_properties_free(d->props);
 
 	pw_protocol_destroy(d->protocol);
 }
@@ -1571,13 +1660,14 @@
 {
 	const char *sockets = args ? pw_properties_get(args, "sockets") : NULL;
 	struct spa_json it3;
+	spa_autoptr(pw_properties) p = pw_properties_copy(props);
 
 	if (sockets == NULL) {
 		struct socket_info info = {0};
 		spa_autofree char *manager_name = NULL;
 
-		info.name = (char *)get_server_name(&props->dict);
-		if (add_server(this, core, &props->dict, &info) == NULL)
+		info.name = (char *)get_server_name(&p->dict);
+		if (add_server(this, core, &p->dict, &info) == NULL)
 			return -errno;
 
 		manager_name = spa_aprintf("%s-manager", info.name);
@@ -1585,7 +1675,7 @@
 			return -ENOMEM;
 
 		info.name = manager_name;
-		if (add_server(this, core, &props->dict, &info) == NULL)
+		if (add_server(this, core, &p->dict, &info) == NULL)
 			return -errno;
 
 		return 0;
@@ -1605,6 +1695,9 @@
 		info.uid = getuid();
 		info.gid = getgid();
 
+		pw_properties_clear(p);
+		pw_properties_update(p, &props->dict);
+
 		while (spa_json_get_string(&it2, key, sizeof(key)) > 0) {
 			const char *value;
 			int len;
@@ -1667,13 +1760,18 @@
 					goto error_invalid;
 
 				info.has_mode = true;
+			} else if (spa_streq(key, "props")) {
+				if (spa_json_is_container(value, len))
+	                                len = spa_json_container_len(&it2, value, len);
+
+				pw_properties_update_string(p, value, len);
 			}
 		}
 
 		if (info.name == NULL)
 			goto error_invalid;
 
-		if (add_server(this, core, &props->dict, &info) == NULL)
+		if (add_server(this, core, &p->dict, &info) == NULL)
 			return -errno;
 	}
 
@@ -1694,6 +1792,10 @@
 	const struct pw_properties *props;
 	spa_autoptr(pw_properties) args = NULL;
 	int res;
+	static const char * const keys = {
+		PW_KEY_CORE_NAME,
+		NULL
+	};
 
 	PW_LOG_TOPIC_INIT(mod_topic);
 	PW_LOG_TOPIC_INIT(mod_topic_connection);
@@ -1709,25 +1811,36 @@
 	if (this == NULL)
 		return -errno;
 
-	debug_messages = mod_topic_connection->level >= SPA_LOG_LEVEL_DEBUG;
-
 	this->implementation = &protocol_impl;
 	this->extension = &protocol_ext_impl;
 
 	pw_protocol_native_init(this);
 	pw_protocol_native0_init(this);
 
-	pw_log_debug("%p: new debug:%d", this, debug_messages);
+	pw_log_debug("%p: new", this);
 
 	d = pw_protocol_get_user_data(this);
 	d->protocol = this;
 	d->module = module;
+	d->props = pw_properties_new(NULL, NULL);
+	if (d->props == NULL) {
+		res = -ENOMEM;
+		goto error_cleanup;
+	}
+
+	d->security = protocol_native_security_context_init(module, this);
+	if (d->security == NULL) {
+		res = -errno;
+		goto error_cleanup;
+	}
 
 	props = pw_context_get_properties(context);
-	d->local = create_server(this, core, &props->dict);
+	pw_properties_update_keys(d->props, &props->dict, keys);
+
+	d->local = create_server(this, core, &d->props->dict);
 
 	if (need_server(context, &props->dict))
-		if ((res = create_servers(this, core, props, args)) < 0)
+		if ((res = create_servers(this, core, d->props, args)) < 0)
 			goto error_cleanup;
 
 	pw_impl_module_add_listener(module, &d->module_listener, &module_events, d);
@@ -1737,6 +1850,9 @@
 	return 0;
 
 error_cleanup:
+	pw_properties_free(d->props);
+	if (d->security)
+		protocol_native_security_context_free(d->security);
 	pw_protocol_destroy(this);
 	return res;
 }

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-native/connection.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-native/connection.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-native/protocol-native.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-native/protocol-native.c Changed

@@ -11,6 +11,7 @@
 
 #include <pipewire/impl.h>
 #include <pipewire/extensions/protocol-native.h>
+#include <pipewire/extensions/security-context.h>
 
 #include "connection.h"
 
@@ -1879,6 +1880,63 @@
 	return pw_protocol_native_end_proxy(proxy, b);
 }
 
+static int security_context_method_marshal_add_listener(void *object,
+			struct spa_hook *listener,
+			const struct pw_security_context_events *events,
+			void *data)
+{
+	struct pw_proxy *proxy = object;
+	pw_proxy_add_object_listener(proxy, listener, events, data);
+	return 0;
+}
+
+static int security_context_marshal_create(void *object,
+		int listen_fd, int close_fd, const struct spa_dict *props)
+{
+	struct pw_proxy *proxy = object;
+	struct spa_pod_builder *b;
+	struct spa_pod_frame f;
+
+	b = pw_protocol_native_begin_proxy(proxy, PW_SECURITY_CONTEXT_METHOD_CREATE, NULL);
+
+	spa_pod_builder_push_struct(b, &f);
+	spa_pod_builder_add(b,
+			SPA_POD_Fd(pw_protocol_native_add_proxy_fd(proxy, listen_fd)),
+			SPA_POD_Fd(pw_protocol_native_add_proxy_fd(proxy, close_fd)),
+			NULL);
+	push_dict(b, props);
+	spa_pod_builder_pop(b, &f);
+
+	return pw_protocol_native_end_proxy(proxy, b);
+}
+
+static int security_context_demarshal_create(void *object, const struct pw_protocol_native_message *msg)
+{
+	struct pw_resource *resource = object;
+	struct spa_dict props = SPA_DICT_INIT(NULL, 0);
+	struct spa_pod_parser prs;
+	struct spa_pod_frame f2;
+	int64_t listen_idx, close_idx;
+	int listen_fd, close_fd;
+
+	spa_pod_parser_init(&prs, msg->data, msg->size);
+	if (spa_pod_parser_push_struct(&prs, &f0) < 0)
+		return -EINVAL;
+	if (spa_pod_parser_get(&prs,
+				SPA_POD_Fd(&listen_idx),
+				SPA_POD_Fd(&close_idx),
+				NULL) < 0)
+		return -EINVAL;
+	parse_dict_struct(&prs, &f1, &props);
+
+	listen_fd = pw_protocol_native_get_resource_fd(resource, listen_idx);
+	close_fd = pw_protocol_native_get_resource_fd(resource, close_idx);
+
+	return pw_resource_notify(resource, struct pw_security_context_methods, create, 0,
+			listen_fd, close_fd, &props);
+}
+
+
 static const struct pw_core_methods pw_protocol_native_core_method_marshal = {
 	PW_VERSION_CORE_METHODS,
 	.add_listener = &core_method_marshal_add_listener,
@@ -2253,6 +2311,40 @@
 	.client_demarshal = pw_protocol_native_link_event_demarshal,
 };
 
+
+static const struct pw_security_context_methods pw_protocol_native_security_context_method_marshal = {
+	PW_VERSION_LINK_METHODS,
+	.add_listener = &security_context_method_marshal_add_listener,
+	.create = &security_context_marshal_create,
+};
+
+static const struct pw_protocol_native_demarshal
+pw_protocol_native_security_context_method_demarshalPW_SECURITY_CONTEXT_METHOD_NUM =
+{
+	PW_SECURITY_CONTEXT_METHOD_ADD_LISTENER = { NULL, 0, },
+	PW_SECURITY_CONTEXT_METHOD_CREATE = { &security_context_demarshal_create, 0, },
+};
+
+static const struct pw_security_context_events pw_protocol_native_security_context_event_marshal = {
+	PW_VERSION_LINK_EVENTS,
+};
+
+static const struct pw_protocol_native_demarshal
+pw_protocol_native_security_context_event_demarshalPW_SECURITY_CONTEXT_EVENT_NUM =
+{
+};
+
+static const struct pw_protocol_marshal pw_protocol_native_security_context_marshal = {
+	PW_TYPE_INTERFACE_SecurityContext,
+	PW_VERSION_SECURITY_CONTEXT,
+	0,
+	PW_SECURITY_CONTEXT_METHOD_NUM,
+	PW_SECURITY_CONTEXT_EVENT_NUM,
+	.client_marshal = &pw_protocol_native_security_context_method_marshal,
+	.server_demarshal = pw_protocol_native_security_context_method_demarshal,
+	.server_marshal = &pw_protocol_native_security_context_event_marshal,
+	.client_demarshal = pw_protocol_native_security_context_event_demarshal,
+};
 void pw_protocol_native_init(struct pw_protocol *protocol)
 {
 	pw_protocol_add_marshal(protocol, &pw_protocol_native_core_marshal);
@@ -2264,4 +2356,5 @@
 	pw_protocol_add_marshal(protocol, &pw_protocol_native_factory_marshal);
 	pw_protocol_add_marshal(protocol, &pw_protocol_native_client_marshal);
 	pw_protocol_add_marshal(protocol, &pw_protocol_native_link_marshal);
+	pw_protocol_add_marshal(protocol, &pw_protocol_native_security_context_marshal);
 }

pipewire-1.2.0.tar.gz/src/modules/module-protocol-native/security-context.c Added

@@ -0,0 +1,181 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2024 Wim Taymans */
+/* SPDX-License-Identifier: MIT */
+
+
+#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>
+#include <pipewire/private.h>
+#include <pipewire/extensions/security-context.h>
+
+PW_LOG_TOPIC_EXTERN(mod_topic);
+#define PW_LOG_TOPIC_DEFAULT mod_topic
+PW_LOG_TOPIC_EXTERN(mod_topic_connection);
+
+struct impl {
+	struct pw_context *context;
+	struct pw_global *global;
+	struct spa_hook listener;
+
+	struct pw_protocol *protocol;
+};
+
+struct resource_data {
+	struct impl *impl;
+
+	struct pw_resource *resource;
+	struct spa_hook resource_listener;
+	struct spa_hook object_listener;
+};
+
+static int security_context_create(void *object,
+			int listen_fd,
+			int close_fd,
+			const struct spa_dict *props)
+{
+	struct resource_data *d = object;
+	struct impl *impl = d->impl;
+	struct pw_impl_client *client;
+	const struct pw_properties *p;
+	int res = 0;
+
+	if ((client = impl->context->current_client) == NULL)
+		goto invalid_state;
+	if (client->protocol != impl->protocol)
+		goto invalid_state;
+
+	/* we can't make a nested security context */
+	p = pw_impl_client_get_properties(client);
+	if (pw_properties_get(p, PW_KEY_SEC_ENGINE) != NULL)
+		goto not_allowed;
+
+	if (pw_protocol_add_fd_server(impl->protocol, impl->context->core,
+			listen_fd, close_fd, props) == NULL) {
+		res = -errno;
+		pw_resource_errorf(d->resource, res, "can't add fd server: %m");
+	}
+	return res;
+
+invalid_state:
+	pw_resource_errorf(d->resource, -EIO, "invalid client protocol");
+	return -EIO;
+not_allowed:
+	pw_resource_errorf(d->resource, -EPERM, "Nested security context is not allowed");
+	return -EPERM;
+}
+
+static const struct pw_security_context_methods security_context_methods = {
+	PW_VERSION_SECURITY_CONTEXT_METHODS,
+	.create = security_context_create,
+};
+
+static void global_unbind(void *data)
+{
+	struct resource_data *d = data;
+	if (d->resource) {
+	        spa_hook_remove(&d->resource_listener);
+	}
+}
+
+static const struct pw_resource_events resource_events = {
+	PW_VERSION_RESOURCE_EVENTS,
+	.destroy = global_unbind,
+};
+
+static int
+global_bind(void *object, struct pw_impl_client *client, uint32_t permissions,
+            uint32_t version, uint32_t id)
+{
+	struct impl *impl = object;
+	struct pw_resource *resource;
+	struct resource_data *data;
+
+	resource = pw_resource_new(client, id, permissions,
+			PW_TYPE_INTERFACE_SecurityContext,
+			version, sizeof(*data));
+	if (resource == NULL)
+		return -errno;
+
+	data = pw_resource_get_user_data(resource);
+	data->impl = impl;
+	data->resource = resource;
+
+	pw_global_add_resource(impl->global, resource);
+
+	/* listen for when the resource goes away */
+	pw_resource_add_listener(resource,
+			&data->resource_listener,
+			&resource_events, data);
+
+	/* resource methods -> implementation */
+	pw_resource_add_object_listener(resource,
+			&data->object_listener,
+			&security_context_methods, data);
+
+	return 0;
+}
+
+
+static void global_free(void *data)
+{
+	struct impl *impl = data;
+	if (impl->global) {
+		spa_hook_remove(&impl->listener);
+		impl->global = NULL;
+	}
+}
+
+static const struct pw_global_events global_events = {
+	PW_VERSION_GLOBAL_EVENTS,
+	.free = global_free
+};
+
+void protocol_native_security_context_free(void *data)
+{
+	struct impl *impl = data;
+	if (impl->global)
+		pw_global_destroy(impl->global);
+	free(impl);
+}
+
+void *protocol_native_security_context_init(struct pw_impl_module *module, struct pw_protocol *protocol)
+{
+	struct pw_context *context = pw_impl_module_get_context(module);
+	struct impl *impl;
+	char serial_str32;
+	struct spa_dict_item items1 = {
+		SPA_DICT_ITEM_INIT(PW_KEY_OBJECT_SERIAL, serial_str),
+	};
+	struct spa_dict extra_props = SPA_DICT_INIT_ARRAY(items);
+	static const char * const keys = {
+		PW_KEY_OBJECT_SERIAL,
+		NULL
+	};
+
+	impl = calloc(1, sizeof(struct impl));
+	if (impl == NULL)
+		return NULL;
+
+	impl->context = context;
+	impl->protocol = protocol;
+
+	impl->global = pw_global_new(context,
+			PW_TYPE_INTERFACE_SecurityContext,
+			PW_VERSION_SECURITY_CONTEXT,
+			PW_SECURITY_CONTEXT_PERM_MASK,
+			NULL,
+			global_bind, impl);
+	if (impl->global == NULL) {
+		free(impl);
+		return NULL;
+	}
+	spa_scnprintf(serial_str, sizeof(serial_str), "%"PRIu64,
+			pw_global_get_serial(impl->global));
+	pw_global_update_keys(impl->global, &extra_props, keys);
+
+	pw_global_add_listener(impl->global, &impl->listener, &global_events, impl);
+
+	pw_global_register(impl->global);
+
+	return impl;
+}

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse.c Changed

@@ -63,6 +63,8 @@
  *         #  client.access = "restricted"     # permissions for clients
  *         #}
  *     
+ *     #server.dbus-name       = "org.pulseaudio.Server"
+ *     #pulse.allow-module-loading = true
  *     #pulse.min.req          = 128/48000     # 2.7ms
  *     #pulse.default.req      = 960/48000     # 20 milliseconds
  *     #pulse.min.frag         = 128/48000     # 2.7ms
@@ -71,11 +73,19 @@
  *     #pulse.min.quantum      = 128/48000     # 2.7ms
  *     #pulse.default.format   = F32
  *     #pulse.default.position =  FL FR 
- *     # These overrides are only applied when running in a vm.
- *     vm.overrides = {
- *         pulse.min.quantum = 1024/48000      # 22ms
- *     }
+ *     #pulse.idle.timeout     = 0
  * }
+ *
+ * pulse.properties.rules = 
+ *     {   matches =  { cpu.vm.name = !null } 
+ *         actions = {
+ *             update-props = {
+ *                 # These overrides are only applied when running in a vm.
+ *                 pulse.min.quantum = 1024/48000      # 22ms
+ *             }
+ *         }
+ *     }
+ * 
  *\endcode
  *
  * ### Connection options
@@ -111,6 +121,20 @@
  * By default network access is given the "restricted" permissions. The session manager is responsible
  * for assigning permission to clients with restricted permissions (usually read-only permissions).
  *
+ *\code{.unparsed}
+ *     server.dbus-name       = "org.pulseaudio.Server"
+ *\endcode
+ *
+ * The DBus name to reserve for the server. If you have multiple servers, you might want
+ * to change the name.
+ *
+ *\code{.unparsed}
+ *     pulse.allow-module-loading = true
+ *\endcode
+ *
+ * By default, clients are allowed to load and unload modules. You can disable this
+ * feature with this option.
+ *
  * ### Playback buffering options
  *
  *\code{.unparsed}
@@ -185,19 +209,6 @@
  * This is equivalent to the PulseAudio `default-sample-channels` and
  * `default-channel-map` options in `/etc/pulse/daemon.conf`.
  *
- * ### VM options
- *
- *\code{.unparsed}
- *     vm.overrides = {
- *         pulse.min.quantum = 1024/48000      # 22ms
- *     }
- *\endcode
- *
- * When running in a VM, the `vm.override` section will override the properties
- * in pulse.properties with the given values. This might be interesting because
- * VMs usually can't support the low latency settings that are possible on real
- * hardware.
- *
  * ### Quirk options
  *
  *\code{.unparsed}
@@ -224,6 +235,16 @@
  * Normally the channels would be fixed to the sink/source that the stream connects
  * to. When an invalid position (null or "") is set, the FIX_CHANNELS flag is ignored.
  *
+ *\code{.unparsed}
+ *     pulse.idle.timeout = 0
+ *\endcode
+ *
+ * Some clients are not sending data when they should and cause underruns. When
+ * setting this option such clients will be set to paused if they underrun
+ * for the given amount of seconds. This makes sure that sinks can suspend and
+ * save battery power. When the client resumes, it will unpause again.
+ * A value of 0 disables this feature.
+ *
  * ## Command execution
  *
  * As part of the server startup sequence, a set of commands can be executed.
@@ -240,6 +261,30 @@
  *     #{ cmd = "load-module" args = "module-gsettings" flags =  "nofail"  }
  * 
  *\endcode
+
+ * ## Dynamic properties
+ *
+ * The pulse.properties can be dynamically updated with rules. It supports
+ * an `update-props` action. The matches will be performed on the values in
+ * context.properties.
+ *
+ *\code{.unparsed}
+ * pulse.properties.rules = 
+ *     {   matches =  { cpu.vm.name = !null } 
+ *         actions = {
+ *             update-props = {
+ *                 # These overrides are only applied when running in a vm.
+ *                 pulse.min.quantum = 1024/48000      # 22ms
+ *             }
+ *         }
+ *     }
+ * 
+ *\endcode
+ *
+ * In the above example, when running in a VM, the rule will override the properties
+ * in pulse.properties with the given values. This might be interesting because
+ * VMs usually can't support the low latency settings that are possible on real
+ * hardware.
  *
  * ## Stream settings and rules
  *
@@ -269,6 +314,7 @@
  *             update-props = {
  *                 pulse.min.req          = 1024/48000     # 21ms
  *                 pulse.min.quantum      = 1024/48000     # 21ms
+ *                 pulse.idle.timeout     = 5              # pause after 5 seconds of underrun
  *             }
  *         }
  *     }
@@ -324,6 +370,7 @@
  *            update-props = {
  *                pulse.min.req          = 1024/48000     # 21ms
  *                pulse.min.quantum      = 1024/48000     # 21ms
+ *                pulse.idle.timeout     = 5              # pause after 5 seconds of underrun
  *            }
  *        }
  *    }

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/client.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/client.c Changed

@@ -29,7 +29,10 @@
 #include "server.h"
 #include "stream.h"
 
+PW_LOG_TOPIC_EXTERN(pulse_conn);
+
 #define client_emit_disconnect(c) spa_hook_list_call(&(c)->listener_list, struct client_events, disconnect, 0)
+#define client_emit_routes_changed(c) spa_hook_list_call(&(c)->listener_list, struct client_events, routes_changed, 0)
 
 struct client *client_new(struct server *server)
 {
@@ -167,6 +170,16 @@
 	free(client);
 }
 
+void client_update_routes(struct client *client, const char *key, const char *value)
+{
+	if (key == NULL)
+		pw_properties_clear(client->routes);
+	else
+		pw_properties_set(client->routes, key, value);
+
+	client_emit_routes_changed(client);
+}
+
 int client_queue_message(struct client *client, struct message *msg)
 {
 	struct impl *impl = client->impl;
@@ -232,8 +245,9 @@
 			data = m->data + idx;
 			size = m->length - idx;
 		} else {
-			if (debug_messages && m->channel == SPA_ID_INVALID)
-				message_dump(SPA_LOG_LEVEL_INFO, m);
+			if (m->channel == SPA_ID_INVALID &&
+			    pw_log_topic_custom_enabled(SPA_LOG_LEVEL_INFO, pulse_conn))
+				message_dump(SPA_LOG_LEVEL_INFO, ">>", m);
 			message_free(m, true, false);
 			client->out_index = 0;
 			continue;
@@ -296,11 +310,11 @@
 
 	/* NOTE: reverse iteration */
 	spa_list_for_each_safe_reverse(m, t, &client->out_messages, link) {
-		if (m->extra0 != COMMAND_SUBSCRIBE_EVENT)
+		if (m->type != MESSAGE_TYPE_SUBSCRIPTION_EVENT)
 			continue;
-		if ((m->extra1 ^ event) & SUBSCRIPTION_EVENT_FACILITY_MASK)
+		if ((m->u.subscription_event.event ^ event) & SUBSCRIPTION_EVENT_FACILITY_MASK)
 			continue;
-		if (m->extra2 != index)
+		if (m->u.subscription_event.index != index)
 			continue;
 
 		if ((event & SUBSCRIPTION_EVENT_TYPE_MASK) == SUBSCRIPTION_EVENT_REMOVE) {
@@ -308,7 +322,7 @@
 			 * point in keeping the old events regarding
 			 * entry in the queue. */
 
-			bool is_new = (m->extra1 & SUBSCRIPTION_EVENT_TYPE_MASK) == SUBSCRIPTION_EVENT_NEW;
+			bool is_new = (m->u.subscription_event.event & SUBSCRIPTION_EVENT_TYPE_MASK) == SUBSCRIPTION_EVENT_NEW;
 
 			if (drop_from_out_queue(client, m)) {
 				pw_log_debug("client %p: dropped redundant event due to remove event for object %u",
@@ -354,9 +368,12 @@
 		return 0;
 
 	struct message *reply = message_alloc(client->impl, -1, 0);
-	reply->extra0 = COMMAND_SUBSCRIBE_EVENT;
-	reply->extra1 = event;
-	reply->extra2 = index;
+	if (!reply)
+		return -errno;
+
+	reply->type = MESSAGE_TYPE_SUBSCRIPTION_EVENT;
+	reply->u.subscription_event.event = event;
+	reply->u.subscription_event.index = index;
 
 	message_put(reply,
 		TAG_U32, COMMAND_SUBSCRIBE_EVENT,

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/client.h -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/client.h Changed

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/cmd.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/cmd.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/defs.h -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/defs.h Changed

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/extension.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/extension.c Changed

@@ -5,21 +5,45 @@
 #include <spa/utils/defs.h>
 #include <spa/utils/string.h>
 
+#include "client.h"
 #include "defs.h"
 #include "extension.h"
-#include "extensions/registry.h"
+#include "message.h"
+#include "module.h"
 
-static const struct extension extensions = {
-	{ "module-stream-restore", 0 | MODULE_EXTENSION_FLAG, do_extension_stream_restore, },
-	{ "module-device-restore", 1 | MODULE_EXTENSION_FLAG, do_extension_device_restore, },
-	{ "module-device-manager", 2 | MODULE_EXTENSION_FLAG, do_extension_device_manager, },
-};
-
-const struct extension *extension_find(uint32_t index, const char *name)
+static const struct extension *find_extension_command(struct module *module, uint32_t command)
 {
-	SPA_FOR_EACH_ELEMENT_VAR(extensions, ext) {
-		if (index == ext->index || spa_streq(name, ext->name))
-			return ext;
+	uint32_t i;
+
+	if (module->info->extension == NULL)
+		return NULL;
+
+	for (i = 0; module->info->extensioni.name; i++) {
+		if (module->info->extensioni.command == command)
+			return &module->info->extensioni;
 	}
 	return NULL;
 }
+
+int extension_process(struct module *module, struct client *client, uint32_t tag, struct message *m)
+{
+	uint32_t command;
+	const struct extension *ext;
+	int res;
+
+	if ((res = message_get(m,
+			TAG_U32, &command,
+			TAG_INVALID)) < 0)
+		return -EPROTO;
+
+	ext = find_extension_command(module, command);
+	if (ext == NULL)
+		return -ENOTSUP;
+	if (ext->process == NULL)
+		return -EPROTO;
+
+	pw_log_info("client %p %s: %s %s tag:%u",
+		    client, client->name, module->info->name, ext->name, tag);
+
+	return ext->process(module, client, command, tag, m);
+}

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/extension.h -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/extension.h Changed

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/format.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/format.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/internal.h -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/internal.h Changed

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/manager.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/manager.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/message-handler.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/message-handler.c Changed

@@ -21,6 +21,7 @@
 #include "collect.h"
 #include "log.h"
 #include "manager.h"
+#include "module.h"
 #include "message-handler.h"
 
 static int bluez_card_object_message_handler(struct client *client, struct pw_manager_object *o, const char *message, const char *params, FILE *response)
@@ -114,6 +115,33 @@
 		int res = malloc_trim(0);
 		fprintf(response, "%d", res);
 #endif
+	} else if (spa_streq(message, "pipewire-pulse:log-level")) {
+		int res = pw_log_set_level_string(params);
+		fprintf(response, "%d", res);
+	} else if (spa_streq(message, "pipewire-pulse:describe-module")) {
+		const struct module_info *i = module_info_find(client->impl, params);
+
+		if (i != NULL) {
+			fprintf(response, "Name: %s\n", i->name);
+		        if (i->properties == NULL) {
+				fprintf(response, "No module information available\n");
+			} else {
+				const char *s;
+				if ((s = spa_dict_lookup(i->properties, PW_KEY_MODULE_VERSION)))
+					fprintf(response, "Version: %s\n", s);
+				if ((s = spa_dict_lookup(i->properties, PW_KEY_MODULE_DESCRIPTION)))
+					fprintf(response, "Description: %s\n", s);
+				if ((s = spa_dict_lookup(i->properties, PW_KEY_MODULE_AUTHOR)))
+					fprintf(response, "Author: %s\n", s);
+				if ((s = spa_dict_lookup(i->properties, PW_KEY_MODULE_USAGE)))
+					fprintf(response, "Usage: %s\n", s);
+				fprintf(response, "Load Once: %s\n", i->load_once ? "Yes": "No");
+				if ((s = spa_dict_lookup(i->properties, PW_KEY_MODULE_DEPRECATED)))
+					fprintf(response, "Warning, deprecated: %s\n", s);
+			}
+		} else {
+			fprintf(response, "Failed to open module.\n");
+		}
 	} else {
 		return -ENOSYS;
 	}

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/message.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/message.c Changed

@@ -8,8 +8,10 @@
 #include <spa/debug/buffer.h>
 #include <spa/utils/defs.h>
 #include <spa/utils/string.h>
+#include <spa/debug/log.h>
 #include <pipewire/log.h>
 
+#include "commands.h"
 #include "defs.h"
 #include "format.h"
 #include "internal.h"
@@ -120,6 +122,12 @@
 				TAG_INVALID)) < 0)
 			return res;
 
+		if (length != size)
+			return -EINVAL;
+
+		if (strnlen(data, size) != size - 1)
+			continue;
+
 		if (remap && (map = str_map_find(props_key_map, NULL, key)) != NULL) {
 			key = map->pw_str;
 			if (map->child != NULL &&
@@ -413,9 +421,9 @@
 {
 	write_8(m, s ? TAG_STRING : TAG_STRING_NULL);
 	if (s != NULL) {
-		int len = strlen(s) + 1;
+		size_t len = strlen(s) + 1;
 		if (ensure_size(m, len) > 0)
-			strcpy(SPA_PTROFF(m->data, m->length, char), s);
+			memcpy(SPA_PTROFF(m->data, m->length, char), s, len);
 		m->length += len;
 	}
 }
@@ -628,7 +636,7 @@
 			write_dict(m, va_arg(va, struct spa_dict*), true);
 			break;
 		case TAG_VOLUME:
-			write_volume(m, va_arg(va, double));
+			write_volume(m, (float)va_arg(va, double));
 			break;
 		case TAG_FORMAT_INFO:
 			write_format_info(m, va_arg(va, struct format_info*));
@@ -643,12 +651,14 @@
 	return 0;
 }
 
-int message_dump(enum spa_log_level level, struct message *m)
+int message_dump(enum spa_log_level level, const char *prefix, struct message *m)
 {
 	int res;
 	uint32_t i, offset = m->offset, o;
 
-	pw_log(level, "message: len:%d alloc:%u", m->length, m->allocated);
+	m->offset = 0;
+
+	pw_log(level, "%s message: len:%d alloc:%u", prefix, m->length, m->allocated);
 	while (true) {
 		uint8_t tag;
 
@@ -662,18 +672,18 @@
 			char *val;
 			if ((res = read_string(m, &val)) < 0)
 				return res;
-			pw_log(level, "%u: string: '%s'", o, val);
+			pw_log(level, "%s %u: string: '%s'", prefix, o, val);
 			break;
 			}
 		case TAG_STRING_NULL:
-			pw_log(level, "%u: string: NULL", o);
+			pw_log(level, "%s %u: string: NULL", prefix, o);
 			break;
 		case TAG_U8:
 		{
 			uint8_t val;
 			if ((res = read_u8(m, &val)) < 0)
 				return res;
-			pw_log(level, "%u: u8: %u", o, val);
+			pw_log(level, "%s %u: u8: %u", prefix, o, val);
 			break;
 		}
 		case TAG_U32:
@@ -681,7 +691,13 @@
 			uint32_t val;
 			if ((res = read_u32(m, &val)) < 0)
 				return res;
-			pw_log(level, "%u: u32: %u", o, val);
+			if (o == 0) {
+				pw_log(level, "%s %u: u32: %u (command %s)",
+						prefix, o, val,
+						val < COMMAND_MAX ? commandsval.name : "INVALID");
+			} else {
+				pw_log(level, "%s %u: u32: %u", prefix, o, val);
+			}
 			break;
 		}
 		case TAG_S64:
@@ -689,7 +705,7 @@
 			uint64_t val;
 			if ((res = read_u64(m, &val)) < 0)
 				return res;
-			pw_log(level, "%u: s64: %"PRIi64"", o, (int64_t)val);
+			pw_log(level, "%s %u: s64: %"PRIi64"", prefix, o, (int64_t)val);
 			break;
 		}
 		case TAG_U64:
@@ -697,7 +713,7 @@
 			uint64_t val;
 			if ((res = read_u64(m, &val)) < 0)
 				return res;
-			pw_log(level, "%u: u64: %"PRIu64"", o, val);
+			pw_log(level, "%s %u: u64: %"PRIu64"", prefix, o, val);
 			break;
 		}
 		case TAG_USEC:
@@ -705,7 +721,7 @@
 			uint64_t val;
 			if ((res = read_u64(m, &val)) < 0)
 				return res;
-			pw_log(level, "%u: u64: %"PRIu64"", o, val);
+			pw_log(level, "%s %u: u64: %"PRIu64"", prefix, o, val);
 			break;
 		}
 		case TAG_SAMPLE_SPEC:
@@ -713,7 +729,7 @@
 			struct sample_spec ss;
 			if ((res = read_sample_spec(m, &ss)) < 0)
 				return res;
-			pw_log(level, "%u: ss: format:%s rate:%d channels:%u", o,
+			pw_log(level, "%s %u: ss: format:%s rate:%d channels:%u", prefix, o,
 					format_id2name(ss.format), ss.rate,
 					ss.channels);
 			break;
@@ -724,21 +740,22 @@
 			size_t len;
 			if ((res = read_arbitrary(m, &mem, &len)) < 0)
 				return res;
-			spa_debug_mem(0, mem, len);
+			spa_debug_log_mem(pw_log_get(), level, 0, mem, len);
 			break;
 		}
 		case TAG_BOOLEAN_TRUE:
-			pw_log(level, "%u: bool: true", o);
+			pw_log(level, "%s %u: bool: true", prefix, o);
 			break;
 		case TAG_BOOLEAN_FALSE:
-			pw_log(level, "%u: bool: false", o);
+			pw_log(level, "%s %u: bool: false", prefix, o);
 			break;
 		case TAG_TIMEVAL:
 		{
 			struct timeval tv;
 			if ((res = read_timeval(m, &tv)) < 0)
 				return res;
-			pw_log(level, "%u: timeval: %lu:%lu", o, tv.tv_sec, tv.tv_usec);
+			pw_log(level, "%s %u: timeval: %jd:%jd", prefix, o,
+				(intmax_t) tv.tv_sec, (intmax_t) tv.tv_usec);
 			break;
 		}
 		case TAG_CHANNEL_MAP:
@@ -746,9 +763,9 @@
 			struct channel_map map;
 			if ((res = read_channel_map(m, &map)) < 0)
 				return res;
-			pw_log(level, "%u: channelmap: channels:%u", o, map.channels);
+			pw_log(level, "%s %u: channelmap: channels:%u", prefix, o, map.channels);
 			for (i = 0; i < map.channels; i++)
-				pw_log(level, "    %d: %s", i, channel_id2name(map.mapi));
+				pw_log(level, "%s     %d: %s", prefix, i, channel_id2name(map.mapi));
 			break;
 		}
 		case TAG_CVOLUME:
@@ -756,9 +773,9 @@
 			struct volume vol;
 			if ((res = read_cvolume(m, &vol)) < 0)
 				return res;
-			pw_log(level, "%u: cvolume: channels:%u", o, vol.channels);
+			pw_log(level, "%s %u: cvolume: channels:%u", prefix, o, vol.channels);
 			for (i = 0; i < vol.channels; i++)
-				pw_log(level, "    %d: %f", i, vol.valuesi);
+				pw_log(level, "%s     %d: %f", prefix, i, vol.valuesi);
 			break;
 		}
 		case TAG_PROPLIST:
@@ -767,9 +784,9 @@
 			const struct spa_dict_item *it;
 			res = read_props(m, props, false);
 			if (res >= 0) {
-				pw_log(level, "%u: props: n_items:%u", o, props->dict.n_items);
+				pw_log(level, "%s %u: props: n_items:%u", prefix, o, props->dict.n_items);
 				spa_dict_for_each(it, &props->dict)
-					pw_log(level, "     '%s': '%s'", it->key, it->value);
+					pw_log(level, "%s      '%s': '%s'", prefix, it->key, it->value);
 			}
 			pw_properties_free(props);
 			if (res < 0)
@@ -781,7 +798,7 @@
 			float vol;
 			if ((res = read_volume(m, &vol)) < 0)
 				return res;
-			pw_log(level, "%u: volume: %f", o, vol);
+			pw_log(level, "%s %u: volume: %f", prefix, o, vol);
 			break;
 		}
 		case TAG_FORMAT_INFO:
@@ -790,11 +807,12 @@
 			const struct spa_dict_item *it;
 			if ((res = read_format_info(m, &info)) < 0)
 				return res;
-			pw_log(level, "%u: format-info: enc:%s n_items:%u",
-					o, format_encoding2name(info.encoding),
+			pw_log(level, "%s %u: format-info: enc:%s n_items:%u",
+					prefix, o, format_encoding2name(info.encoding),
 					info.props->dict.n_items);
 			spa_dict_for_each(it, &info.props->dict)
-				pw_log(level, "     '%s': '%s'", it->key, it->value);
+				pw_log(level, "%s      '%s': '%s'", prefix, it->key, it->value);
+			format_info_clear(&info);
 			break;
 		}
 		}
@@ -829,7 +847,7 @@
 		return NULL;
 	}
 
-	spa_zero(msg->extra);
+	msg->type = MESSAGE_TYPE_UNSPECIFIED;
 	msg->channel = channel;
 	msg->offset = 0;
 	msg->length = size;

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/message.h -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/message.h Changed

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/module.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/module.c Changed

@@ -7,11 +7,11 @@
 #include <string.h>
 #include <ctype.h>
 
+#include <spa/utils/cleanup.h>
 #include <spa/utils/defs.h>
 #include <spa/utils/list.h>
 #include <spa/utils/hook.h>
 #include <spa/utils/string.h>
-#include <pipewire/cleanup.h>
 #include <pipewire/log.h>
 #include <pipewire/map.h>
 #include <pipewire/properties.h>
@@ -293,7 +293,7 @@
 	}
 }
 
-static const struct module_info *find_module_info(const char *name)
+const struct module_info *module_info_find(struct impl *impl, const char *name)
 {
 	extern const struct module_info __start_pw_mod_pulse_modules;
 	extern const struct module_info __stop_pw_mod_pulse_modules;
@@ -323,7 +323,7 @@
 	struct module *module;
 	int res;
 
-	info = find_module_info(name);
+	info = module_info_find(impl, name);
 	if (info == NULL) {
 		errno = ENOENT;
 		return NULL;
@@ -375,3 +375,19 @@
 	return NULL;
 
 }
+
+struct module *module_lookup(struct impl *impl, uint32_t index, const char *name)
+{
+	union pw_map_item *item;
+
+	if (index != SPA_ID_INVALID)
+		return pw_map_lookup(&impl->modules, index);
+
+	pw_array_for_each(item, &impl->modules.items) {
+		struct module *m = item->data;
+		if (!pw_map_item_is_free(item) &&
+		    spa_streq(m->info->name, name))
+			return m;
+	}
+	return NULL;
+}

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/module.h -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/module.h Changed

@@ -13,6 +13,9 @@
 
 struct module;
 struct pw_properties;
+struct client;
+struct message;
+struct extension;
 
 struct module_info {
 	const char *name;
@@ -23,6 +26,7 @@
 	int (*load) (struct module *module);
 	int (*unload) (struct module *module);
 
+	const struct extension *extension;
 	const char* const *valid_args;
 	const struct spa_dict *properties;
 	size_t data_size;
@@ -58,12 +62,16 @@
 #define module_emit_loaded(m,r) spa_hook_list_call(&m->listener_list, struct module_events, loaded, 0, r)
 #define module_emit_destroy(m) spa_hook_list_call(&(m)->listener_list, struct module_events, destroy, 0)
 
+const struct module_info *module_info_find(struct impl *impl, const char *name);
+
 struct module *module_create(struct impl *impl, const char *name, const char *args);
 void module_free(struct module *module);
 int module_load(struct module *module);
 int module_unload(struct module *module);
 void module_schedule_unload(struct module *module);
 
+struct module *module_lookup(struct impl *impl, uint32_t index, const char *name);
+
 void module_add_listener(struct module *module,
 			 struct spa_hook *listener,
 			 const struct module_events *events, void *data);

pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/modules/module-device-manager.c Added

@@ -0,0 +1,63 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2024 Wim Taymans <wim.taymans@gmail.com> */
+/* SPDX-License-Identifier: MIT */
+
+#include <pipewire/pipewire.h>
+
+#include "../module.h"
+
+/** \page page_pulse_module_device_manager Device manager extension
+ *
+ * ## Module Name
+ *
+ * `module-device-manager`
+ *
+ * ## Module Options
+ *
+ * @pulse_module_options@
+ */
+
+static const char *const pulse_module_options =
+	"do_routing=<Automatically route streams based on a priority list (unique per-role)?> "
+	"on_hotplug=<When new device becomes available, recheck streams?> "
+	"on_rescue=<When device becomes unavailable, recheck streams?>";
+
+#define NAME "device-manager"
+
+PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
+#define PW_LOG_TOPIC_DEFAULT mod_topic
+
+struct module_device_manager_data {
+	struct module *module;
+};
+
+static const struct spa_dict_item module_device_manager_info = {
+	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
+	{ PW_KEY_MODULE_DESCRIPTION, "Keep track of devices (and their descriptions) both past and present and prioritise by role" },
+	{ PW_KEY_MODULE_USAGE, pulse_module_options },
+	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
+};
+
+static int module_device_manager_prepare(struct module * const module)
+{
+	PW_LOG_TOPIC_INIT(mod_topic);
+
+	struct module_device_manager_data * const data = module->user_data;
+	data->module = module;
+
+	return 0;
+}
+
+static int module_device_manager_load(struct module *module)
+{
+	return 0;
+}
+
+DEFINE_MODULE_INFO(module_device_manager) = {
+	.name = "module-device-manager",
+	.load_once = true,
+	.prepare = module_device_manager_prepare,
+	.load = module_device_manager_load,
+	.properties = &SPA_DICT_INIT_ARRAY(module_device_manager_info),
+	.data_size = sizeof(struct module_device_manager_data),
+};

pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/modules/module-device-restore.c Added

@@ -0,0 +1,493 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2024 Wim Taymans <wim.taymans@gmail.com> */
+/* SPDX-License-Identifier: MIT */
+
+#include <pipewire/pipewire.h>
+
+#include "../module.h"
+
+/** \page page_pulse_module_device_restore Device restore extension
+ *
+ * ## Module Name
+ *
+ * `module-device-restore`
+ *
+ * ## Module Options
+ *
+ * @pulse_module_options@
+ */
+
+#define EXT_DEVICE_RESTORE_VERSION	1
+
+enum {
+    SUBCOMMAND_TEST,
+    SUBCOMMAND_SUBSCRIBE,
+    SUBCOMMAND_EVENT,
+    SUBCOMMAND_READ_FORMATS_ALL,
+    SUBCOMMAND_READ_FORMATS,
+    SUBCOMMAND_SAVE_FORMATS
+};
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <spa/pod/builder.h>
+#include <spa/utils/defs.h>
+#include <spa/utils/dict.h>
+#include <spa/utils/string.h>
+#include <spa/utils/json.h>
+#include <spa/param/audio/format.h>
+#include <spa/param/props.h>
+
+#include <pipewire/log.h>
+#include <pipewire/properties.h>
+
+#include "../client.h"
+#include "../collect.h"
+#include "../commands.h"
+#include "../defs.h"
+#include "../extension.h"
+#include "../format.h"
+#include "../manager.h"
+#include "../message.h"
+#include "../operation.h"
+#include "../reply.h"
+#include "../volume.h"
+
+static const char *const pulse_module_options =
+	"restore_port=<Save/restore port?> "
+	"restore_volume=<Save/restore volumes?> "
+	"restore_muted=<Save/restore muted states?> "
+	"restore_formats=<Save/restore saved formats?>";
+
+#define NAME "device-restore"
+
+PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
+#define PW_LOG_TOPIC_DEFAULT mod_topic
+
+struct module_device_restore_data {
+	struct module *module;
+
+	struct spa_list subscribed;
+};
+
+static const struct spa_dict_item module_device_restore_info = {
+	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
+	{ PW_KEY_MODULE_DESCRIPTION, "Automatically restore the volume/mute state of devices" },
+	{ PW_KEY_MODULE_USAGE, pulse_module_options },
+	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
+};
+
+#define DEVICE_TYPE_SINK	0
+#define DEVICE_TYPE_SOURCE	1
+
+static int do_extension_device_restore_test(struct module *module, struct client *client, uint32_t command, uint32_t tag, struct message *m)
+{
+	struct message *reply;
+
+	reply = reply_new(client, tag);
+	message_put(reply,
+			TAG_U32, EXT_DEVICE_RESTORE_VERSION,
+			TAG_INVALID);
+
+	return client_queue_message(client, reply);
+}
+
+struct subscribe {
+	struct spa_list link;
+	struct module_device_restore_data *data;
+
+	struct client *client;
+	struct spa_hook listener;
+
+	struct spa_hook manager_listener;
+};
+
+static void remove_subscribe(struct subscribe *s)
+{
+	spa_list_remove(&s->link);
+	spa_hook_remove(&s->listener);
+	spa_hook_remove(&s->manager_listener);
+	free(s);
+}
+
+static void emit_event(struct subscribe *s, uint32_t type, uint32_t idx)
+{
+	struct client *client = s->client;
+	struct message *msg = message_alloc(client->impl, -1, 0);
+
+	pw_log_info("%s EVENT index:%u name:%s %d/%d", client->name,
+			s->data->module->index, s->data->module->info->name, type, idx);
+
+	message_put(msg,
+		TAG_U32, COMMAND_EXTENSION,
+		TAG_U32, 0,
+		TAG_U32, s->data->module->index,
+		TAG_STRING, s->data->module->info->name,
+		TAG_U32, SUBCOMMAND_EVENT,
+		TAG_U32, type,
+		TAG_U32, idx,
+		TAG_INVALID);
+
+	client_queue_message(client, msg);
+}
+
+static void module_client_disconnect(void *data)
+{
+	struct subscribe *s = data;
+	remove_subscribe(s);
+}
+
+static const struct client_events module_client_events = {
+	VERSION_CLIENT_EVENTS,
+	.disconnect = module_client_disconnect,
+};
+
+static void manager_updated(void *data, struct pw_manager_object *object)
+{
+	struct subscribe *s = data;
+	uint32_t i;
+
+	if (!pw_manager_object_is_sink(object))
+		return;
+
+	for (i = 0; i < object->n_params; i++) {
+		if (object->paramsi.id == SPA_PARAM_EnumFormat &&
+		    object->paramsi.user != 0)
+			emit_event(s, DEVICE_TYPE_SINK, object->index);
+	}
+}
+
+struct pw_manager_events manager_events = {
+	PW_VERSION_MANAGER_EVENTS,
+	.added = manager_updated,
+	.updated = manager_updated,
+};
+
+static struct subscribe *add_subscribe(struct module_device_restore_data *data, struct client *c)
+{
+	struct subscribe *s;
+	s = calloc(1, sizeof(*s));
+	if (s == NULL)
+		return NULL;
+	s->data = data;
+	s->client = c;
+	client_add_listener(c, &s->listener, &module_client_events, s);
+	spa_list_append(&data->subscribed, &s->link);
+
+	pw_manager_add_listener(c->manager, &s->manager_listener,
+			&manager_events, s);
+	return s;
+}
+
+static struct subscribe *find_subscribe(struct module_device_restore_data *data, struct client *c)
+{
+	struct subscribe *s;
+	spa_list_for_each(s, &data->subscribed, link) {
+		if (s->client == c)
+			return s;
+	}
+	return NULL;
+}
+
+static int do_extension_device_restore_subscribe(struct module *module, struct client *client, uint32_t command, uint32_t tag, struct message *m)
+{
+	struct module_device_restore_data * const d = module->user_data;
+	int res;
+	bool enabled;
+	struct subscribe *s;
+
+	if ((res = message_get(m,
+			TAG_BOOLEAN, &enabled,
+			TAG_INVALID)) < 0)
+		return -EPROTO;
+
+	s = find_subscribe(d, client);
+	if (enabled) {
+		if (s == NULL)
+			s = add_subscribe(d, client);
+		if (s == NULL)
+			return -errno;
+	} else {
+		if (s != NULL)
+			remove_subscribe(s);
+	}
+	return reply_simple_ack(client, tag);
+}
+
+struct format_data {
+        struct client *client;
+        struct message *reply;
+};
+
+static int do_sink_read_format(void *data, struct pw_manager_object *o)
+{
+	struct format_data *d = data;
+	struct pw_manager_param *p;
+	struct format_info info32;
+	uint32_t i, n_info = 0;
+
+	if (!pw_manager_object_is_sink(o))
+		return 0;
+
+	spa_list_for_each(p, &o->param_list, link) {
+		uint32_t index = 0;
+
+		if (p->id != SPA_PARAM_EnumFormat)
+			continue;
+
+		while (n_info < SPA_N_ELEMENTS(info)) {
+			spa_zero(infon_info);
+			if (format_info_from_param(&infon_info, p->param, index++) < 0)
+				break;
+			if (infon_info.encoding == ENCODING_ANY) {
+				format_info_clear(&infon_info);
+				continue;
+			}
+			n_info++;
+		}
+	}
+	message_put(d->reply,
+		TAG_U32, DEVICE_TYPE_SINK,
+		TAG_U32, o->index,			/* sink index */
+		TAG_U8, n_info,				/* n_formats */
+		TAG_INVALID);
+	for (i = 0; i < n_info; i++) {
+		message_put(d->reply,
+			TAG_FORMAT_INFO, &infoi,
+			TAG_INVALID);
+		format_info_clear(&infoi);
+	}
+	return 0;
+}
+
+static int do_extension_device_restore_read_formats_all(struct module *module, struct client *client,
+		uint32_t command, uint32_t tag, struct message *m)
+{
+	struct pw_manager *manager = client->manager;
+	struct format_data data;
+
+	spa_zero(data);
+	data.client = client;
+	data.reply = reply_new(client, tag);
+
+	pw_manager_for_each_object(manager, do_sink_read_format, &data);
+
+	return client_queue_message(client, data.reply);
+}
+
+static int do_extension_device_restore_read_formats(struct module *module, struct client *client,
+		uint32_t command, uint32_t tag, struct message *m)
+{
+	struct pw_manager *manager = client->manager;
+	struct format_data data;
+	uint32_t type, sink_index;
+	struct selector sel;
+	struct pw_manager_object *o;
+	int res;
+
+	if ((res = message_get(m,
+			TAG_U32, &type,
+			TAG_U32, &sink_index,
+			TAG_INVALID)) < 0)
+		return -EPROTO;
+
+	if (type != DEVICE_TYPE_SINK) {
+		pw_log_info("Device format reading is only supported on sinks");
+		return -ENOTSUP;
+	}
+
+	spa_zero(sel);
+	sel.index = sink_index;
+	sel.type = pw_manager_object_is_sink;
+
+	o = select_object(manager, &sel);
+        if (o == NULL)
+		return -ENOENT;
+
+	spa_zero(data);
+	data.client = client;
+	data.reply = reply_new(client, tag);
+
+	do_sink_read_format(&data, o);
+
+	return client_queue_message(client, data.reply);
+}
+
+static int set_card_codecs(struct pw_manager_object *o, uint32_t port_index,
+		uint32_t device_id, uint32_t n_codecs, uint32_t *codecs)
+{
+	char buf1024;
+	struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buf, sizeof(buf));
+	struct spa_pod_frame f2;
+	struct spa_pod *param;
+
+	if (!SPA_FLAG_IS_SET(o->permissions, PW_PERM_W | PW_PERM_X))
+		return -EACCES;
+
+	if (o->proxy == NULL)
+		return -ENOENT;
+
+	spa_pod_builder_push_object(&b, &f0,
+			SPA_TYPE_OBJECT_ParamRoute, SPA_PARAM_Route);
+	spa_pod_builder_add(&b,
+			SPA_PARAM_ROUTE_index, SPA_POD_Int(port_index),
+			SPA_PARAM_ROUTE_device, SPA_POD_Int(device_id),
+			0);
+	spa_pod_builder_prop(&b, SPA_PARAM_ROUTE_props, 0);
+	spa_pod_builder_push_object(&b, &f1,
+			SPA_TYPE_OBJECT_Props,  SPA_PARAM_Props);
+	spa_pod_builder_add(&b,
+			SPA_PROP_iec958Codecs, SPA_POD_Array(sizeof(uint32_t),
+				SPA_TYPE_Id, n_codecs, codecs), 0);
+	spa_pod_builder_pop(&b, &f1);
+	spa_pod_builder_prop(&b, SPA_PARAM_ROUTE_save, 0);
+	spa_pod_builder_bool(&b, true);
+	param = spa_pod_builder_pop(&b, &f0);
+
+	pw_device_set_param((struct pw_device*)o->proxy,
+			SPA_PARAM_Route, 0, param);
+	return 0;
+}
+
+static int set_node_codecs(struct pw_manager_object *o, uint32_t n_codecs, uint32_t *codecs)
+{
+	char buf1024;
+	struct spa_pod_builder b;
+	struct spa_pod *param;
+
+	if (!SPA_FLAG_IS_SET(o->permissions, PW_PERM_W | PW_PERM_X))
+		return -EACCES;
+
+	if (o->proxy == NULL)
+		return -ENOENT;
+
+	spa_pod_builder_init(&b, buf, sizeof(buf));
+	param = spa_pod_builder_add_object(&b,
+			SPA_TYPE_OBJECT_Props, SPA_PARAM_Props,
+			SPA_PROP_iec958Codecs, SPA_POD_Array(sizeof(uint32_t),
+				SPA_TYPE_Id, n_codecs, codecs));
+
+	pw_node_set_param((struct pw_node*)o->proxy,
+			SPA_PARAM_Props, 0, param);
+
+	return 0;
+}
+
+static int do_extension_device_restore_save_formats(struct module *module, struct client *client,
+		uint32_t command, uint32_t tag, struct message *m)
+{
+	struct pw_manager *manager = client->manager;
+	struct selector sel;
+	struct pw_manager_object *o, *card = NULL;
+	struct pw_node_info *info;
+	int res;
+	uint32_t type, sink_index;
+	uint8_t i, n_formats;
+	uint32_t n_codecs = 0, codec, iec958codecs32;
+	struct device_info dev_info;
+
+	if ((res = message_get(m,
+			TAG_U32, &type,
+			TAG_U32, &sink_index,
+			TAG_U8, &n_formats,
+			TAG_INVALID)) < 0)
+		return -EPROTO;
+	if (n_formats < 1)
+		return -EPROTO;
+
+	if (type != DEVICE_TYPE_SINK)
+		return -ENOTSUP;
+
+	for (i = 0; i < n_formats; ++i) {
+		struct format_info format;
+		spa_zero(format);
+		if (message_get(m,
+				TAG_FORMAT_INFO, &format,
+				TAG_INVALID) < 0)
+			return -EPROTO;
+
+		codec = format_encoding2id(format.encoding);
+		if (codec != SPA_ID_INVALID && n_codecs < SPA_N_ELEMENTS(iec958codecs))
+			iec958codecsn_codecs++ = codec;
+
+		format_info_clear(&format);
+	}
+	if (n_codecs == 0)
+		return -ENOTSUP;
+
+	spa_zero(sel);
+	sel.index = sink_index;
+	sel.type = pw_manager_object_is_sink;
+
+	o = select_object(manager, &sel);
+	if (o == NULL || (info = o->info) == NULL || info->props == NULL)
+		return -ENOENT;
+
+	get_device_info(o, &dev_info, SPA_DIRECTION_INPUT, false);
+
+	if (dev_info.card_id != SPA_ID_INVALID) {
+		struct selector sel = { .id = dev_info.card_id, .type = pw_manager_object_is_card, };
+		card = select_object(manager, &sel);
+	}
+	if (card != NULL && dev_info.active_port != SPA_ID_INVALID) {
+		res = set_card_codecs(card, dev_info.active_port,
+				dev_info.device, n_codecs, iec958codecs);
+	} else {
+		res = set_node_codecs(o, n_codecs, iec958codecs);
+	}
+	if (res < 0)
+		return res;
+
+	return reply_simple_ack(client, tag);
+}
+
+static const struct extension module_device_restore_extension = {
+	{ "TEST", SUBCOMMAND_TEST, do_extension_device_restore_test, },
+	{ "SUBSCRIBE", SUBCOMMAND_SUBSCRIBE, do_extension_device_restore_subscribe, },
+	{ "EVENT", SUBCOMMAND_EVENT, },
+	{ "READ_FORMATS_ALL", SUBCOMMAND_READ_FORMATS_ALL, do_extension_device_restore_read_formats_all, },
+	{ "READ_FORMATS", SUBCOMMAND_READ_FORMATS, do_extension_device_restore_read_formats, },
+	{ "SAVE_FORMATS", SUBCOMMAND_SAVE_FORMATS, do_extension_device_restore_save_formats, },
+	{ NULL },
+};
+
+static int module_device_restore_prepare(struct module * const module)
+{
+	PW_LOG_TOPIC_INIT(mod_topic);
+
+	struct module_device_restore_data * const data = module->user_data;
+	data->module = module;
+
+	return 0;
+}
+
+static int module_device_restore_load(struct module *module)
+{
+	struct module_device_restore_data * const data = module->user_data;
+	spa_list_init(&data->subscribed);
+	return 0;
+}
+static int module_device_restore_unload(struct module *module)
+{
+	struct module_device_restore_data * const data = module->user_data;
+	struct subscribe *s;
+
+	spa_list_consume(s, &data->subscribed, link)
+		remove_subscribe(s);
+	return 0;
+}
+
+DEFINE_MODULE_INFO(module_device_restore) = {
+	.name = "module-device-restore",
+	.load_once = true,
+	.prepare = module_device_restore_prepare,
+	.load = module_device_restore_load,
+	.unload = module_device_restore_unload,
+	.extension = module_device_restore_extension,
+	.properties = &SPA_DICT_INIT_ARRAY(module_device_restore_info),
+	.data_size = sizeof(struct module_device_restore_data),
+};

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/modules/module-echo-cancel.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/modules/module-echo-cancel.c Changed

@@ -176,7 +176,7 @@
 static int rename_geometry(struct pw_properties *props, const char *pa_key, const char *pw_key)
 {
 	const char *str;
-	int len;
+	int i = 0, len;
 	char *args;
 	size_t size;
 	FILE *f;
@@ -189,19 +189,26 @@
 	if ((f = open_memstream(&args, &size)) == NULL)
 		return -errno;
 
-	fprintf(f, " ");
+	fprintf(f, "");
 	while (true) {
 		float p3;
+		char ps064, ps164, ps264;
 		if ((len = parse_point(&str, p)) < 0)
 			break;
 
-		fprintf(f, " %f %f %f  ", p0, p1, p2);
+		pw_log_info("Got mic #%d position: (%g, %g, %g)", i, p0, p1, p2);
+
+		fprintf(f, "%s  %s, %s, %s ", i == 0 ?  "" : ",",
+				spa_dtoa(ps0, sizeof(ps0), p0),
+				spa_dtoa(ps1, sizeof(ps1), p1),
+				spa_dtoa(ps2, sizeof(ps2), p2));
 		str += len;
 		if (*str != ',')
 			break;
 		str++;
+		i++;
 	}
-	fprintf(f, "");
+	fprintf(f, " ");
 	fclose(f);
 
 	pw_properties_set(props, pw_key, args);
@@ -216,6 +223,7 @@
 	const char *str;
 	int res;
 	float f3;
+	char fs064, fs164, fs264;
 
 	if ((str = pw_properties_get(props, pa_key)) == NULL)
 		return 0;
@@ -225,7 +233,12 @@
 	if ((res = parse_point(&str, f)) < 0)
 		return res;
 
-	pw_properties_setf(props, pw_key, " %f %f %f ", f0, f1, f2);
+	pw_log_info("Got target direction: (%g, %g, %g)", f0, f1, f2);
+
+	pw_properties_setf(props, pw_key, " %s, %s, %s ",
+				spa_dtoa(fs0, sizeof(fs0), f0),
+				spa_dtoa(fs1, sizeof(fs1), f1),
+				spa_dtoa(fs2, sizeof(fs2), f2));
 	pw_properties_set(props, pa_key, NULL);
 	return 0;
 }
@@ -319,8 +332,14 @@
 			rename_bool_prop(aec_props, "extended_filter", "webrtc.extended_filter");
 			rename_bool_prop(aec_props, "experimental_agc", "webrtc.experimental_agc");
 			rename_bool_prop(aec_props, "beamforming", "webrtc.beamforming");
-			rename_geometry(aec_props, "mic_geometry", "webrtc.mic-geometry");
-			rename_direction(aec_props, "target_direction", "webrtc.target-direction");
+			if ((res = rename_geometry(aec_props, "mic_geometry", "webrtc.mic-geometry")) < 0) {
+				pw_log_warn("failed to parse mic_geometry: %s", spa_strerror(res));
+				goto out;
+			}
+			if ((res = rename_direction(aec_props, "target_direction", "webrtc.target-direction")) < 0) {
+				pw_log_warn("failed to parse target_direction: %s", spa_strerror(res));
+				goto out;
+			}
 		}
 		pw_properties_set(props, "aec_args", NULL);
 	}

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/modules/module-null-sink.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/modules/module-null-sink.c Changed

pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/modules/module-stream-restore.c Added

@@ -0,0 +1,467 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2024 Wim Taymans <wim.taymans@gmail.com> */
+/* SPDX-License-Identifier: MIT */
+
+#include <pipewire/pipewire.h>
+
+#include "../module.h"
+#include "../commands.h"
+
+/** \page page_pulse_module_stream_restore Stream restore extension
+ *
+ * ## Module Name
+ *
+ * `module-stream-restore`
+ *
+ * ## Module Options
+ *
+ * @pulse_module_options@
+ */
+
+static const char *const pulse_module_options =
+	"restore_device=<Save/restore sinks/sources?> "
+	"restore_volume=<Save/restore volumes?> "
+	"restore_muted=<Save/restore muted states?> "
+	"on_hotplug=<This argument is obsolete, please remove it from configuration> "
+	"on_rescue=<This argument is obsolete, please remove it from configuration> "
+	"fallback_table=<filename>";
+
+#define NAME "stream-restore"
+
+PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
+#define PW_LOG_TOPIC_DEFAULT mod_topic
+
+struct module_stream_restore_data {
+	struct module *module;
+
+	struct spa_list subscribed;
+};
+
+static const struct spa_dict_item module_stream_restore_info = {
+	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
+	{ PW_KEY_MODULE_DESCRIPTION, "Automatically restore the volume/mute/device state of streams" },
+	{ PW_KEY_MODULE_USAGE, pulse_module_options },
+	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
+};
+
+#define EXT_STREAM_RESTORE_VERSION	1
+
+enum {
+    SUBCOMMAND_TEST,
+    SUBCOMMAND_READ,
+    SUBCOMMAND_WRITE,
+    SUBCOMMAND_DELETE,
+    SUBCOMMAND_SUBSCRIBE,
+    SUBCOMMAND_EVENT
+};
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <spa/utils/defs.h>
+#include <spa/utils/dict.h>
+#include <spa/utils/string.h>
+#include <spa/utils/json.h>
+#include <pipewire/log.h>
+#include <pipewire/properties.h>
+
+#include "../client.h"
+#include "../defs.h"
+#include "../extension.h"
+#include "../format.h"
+#include "../manager.h"
+#include "../message.h"
+#include "../remap.h"
+#include "../reply.h"
+#include "../volume.h"
+
+PW_LOG_TOPIC_EXTERN(pulse_ext_stream_restore);
+#undef PW_LOG_TOPIC_DEFAULT
+#define PW_LOG_TOPIC_DEFAULT pulse_ext_stream_restore
+
+static int do_extension_stream_restore_test(struct module *module, struct client *client, uint32_t command, uint32_t tag, struct message *m)
+{
+	struct message *reply;
+
+	reply = reply_new(client, tag);
+	message_put(reply,
+			TAG_U32, EXT_STREAM_RESTORE_VERSION,
+			TAG_INVALID);
+
+	return client_queue_message(client, reply);
+}
+
+static int key_from_name(const char *name, char *key, size_t maxlen)
+{
+	const char *media_class, *select, *str;
+
+	if (spa_strstartswith(name, "sink-input-"))
+		media_class = "Output/Audio";
+	else if (spa_strstartswith(name, "source-output-"))
+		media_class = "Input/Audio";
+	else
+		return -1;
+
+	if ((str = strstr(name, "-by-media-role:")) != NULL) {
+		const struct str_map *map;
+		str += strlen("-by-media-role:");
+		map = str_map_find(media_role_map, NULL, str);
+		str = map ? map->pw_str : str;
+		select = "media.role";
+	}
+	else if ((str = strstr(name, "-by-application-id:")) != NULL) {
+		str += strlen("-by-application-id:");
+		select = "application.id";
+	}
+	else if ((str = strstr(name, "-by-application-name:")) != NULL) {
+		str += strlen("-by-application-name:");
+		select = "application.name";
+	}
+	else if ((str = strstr(name, "-by-media-name:")) != NULL) {
+		str += strlen("-by-media-name:");
+		select = "media.name";
+	} else
+		return -1;
+
+	snprintf(key, maxlen, "restore.stream.%s.%s:%s",
+				media_class, select, str);
+	return 0;
+}
+
+static int key_to_name(const char *key, char *name, size_t maxlen)
+{
+	const char *type, *select, *str;
+
+	if (spa_strstartswith(key, "restore.stream.Output/Audio."))
+		type = "sink-input";
+	else if (spa_strstartswith(key, "restore.stream.Input/Audio."))
+		type = "source-output";
+	else
+		type = "stream";
+
+	if ((str = strstr(key, ".media.role:")) != NULL) {
+		const struct str_map *map;
+		str += strlen(".media.role:");
+		map = str_map_find(media_role_map, str, NULL);
+		select = "media-role";
+		str = map ? map->pa_str : str;
+	}
+	else if ((str = strstr(key, ".application.id:")) != NULL) {
+		str += strlen(".application.id:");
+		select = "application-id";
+	}
+	else if ((str = strstr(key, ".application.name:")) != NULL) {
+		str += strlen(".application.name:");
+		select = "application-name";
+	}
+	else if ((str = strstr(key, ".media.name:")) != NULL) {
+		str += strlen(".media.name:");
+		select = "media-name";
+	}
+	else
+		return -1;
+
+	snprintf(name, maxlen, "%s-by-%s:%s", type, select, str);
+	return 0;
+
+}
+
+static int do_extension_stream_restore_read(struct module *module, struct client *client, uint32_t command, uint32_t tag, struct message *m)
+{
+	struct message *reply;
+	const struct spa_dict_item *item;
+
+	reply = reply_new(client, tag);
+
+	spa_dict_for_each(item, &client->routes->dict) {
+		struct spa_json it3;
+		const char *value;
+		char name1024, key128;
+		char device_name1024 = "\0";
+		bool mute = false;
+		struct volume vol = VOLUME_INIT;
+		struct channel_map map = CHANNEL_MAP_INIT;
+		float volume = 0.0f;
+
+		if (key_to_name(item->key, name, sizeof(name)) < 0)
+			continue;
+
+		pw_log_debug("%s -> %s: %s", item->key, name, item->value);
+
+		spa_json_init(&it0, item->value, strlen(item->value));
+		if (spa_json_enter_object(&it0, &it1) <= 0)
+			continue;
+
+		while (spa_json_get_string(&it1, key, sizeof(key)) > 0) {
+			if (spa_streq(key, "volume")) {
+				if (spa_json_get_float(&it1, &volume) <= 0)
+					continue;
+			}
+			else if (spa_streq(key, "mute")) {
+				if (spa_json_get_bool(&it1, &mute) <= 0)
+					continue;
+			}
+			else if (spa_streq(key, "volumes")) {
+				vol = VOLUME_INIT;
+				if (spa_json_enter_array(&it1, &it2) <= 0)
+					continue;
+
+				for (vol.channels = 0; vol.channels < CHANNELS_MAX; vol.channels++) {
+					if (spa_json_get_float(&it2, &vol.valuesvol.channels) <= 0)
+						break;
+				}
+			}
+			else if (spa_streq(key, "channels")) {
+				if (spa_json_enter_array(&it1, &it2) <= 0)
+					continue;
+
+				for (map.channels = 0; map.channels < CHANNELS_MAX; map.channels++) {
+					char chname16;
+					if (spa_json_get_string(&it2, chname, sizeof(chname)) <= 0)
+						break;
+					map.mapmap.channels = channel_name2id(chname);
+				}
+			}
+			else if (spa_streq(key, "target-node")) {
+				if (spa_json_get_string(&it1, device_name, sizeof(device_name)) <= 0)
+					continue;
+			}
+			else if (spa_json_next(&it1, &value) <= 0)
+				break;
+		}
+		message_put(reply,
+			TAG_STRING, name,
+			TAG_CHANNEL_MAP, &map,
+			TAG_CVOLUME, &vol,
+			TAG_STRING, device_name0 ? device_name : NULL,
+			TAG_BOOLEAN, mute,
+			TAG_INVALID);
+	}
+
+	return client_queue_message(client, reply);
+}
+
+static int do_extension_stream_restore_write(struct module *module, struct client *client, uint32_t command, uint32_t tag, struct message *m)
+{
+	int res;
+	uint32_t mode;
+	bool apply;
+
+	if ((res = message_get(m,
+			TAG_U32, &mode,
+			TAG_BOOLEAN, &apply,
+			TAG_INVALID)) < 0)
+		return -EPROTO;
+
+	while (m->offset < m->length) {
+		const char *name, *device_name = NULL;
+		struct channel_map map;
+		struct volume vol;
+		bool mute = false;
+		uint32_t i;
+		FILE *f;
+		char *ptr;
+		size_t size;
+		char key1024, buf128;
+
+		spa_zero(map);
+		spa_zero(vol);
+
+		if (message_get(m,
+				TAG_STRING, &name,
+				TAG_CHANNEL_MAP, &map,
+				TAG_CVOLUME, &vol,
+				TAG_STRING, &device_name,
+				TAG_BOOLEAN, &mute,
+				TAG_INVALID) < 0)
+			return -EPROTO;
+
+		if (name == NULL || name0 == '\0')
+			return -EPROTO;
+
+		if ((f = open_memstream(&ptr, &size)) == NULL)
+			return -errno;
+
+		fprintf(f, "{");
+		fprintf(f, " \"mute\": %s", mute ? "true" : "false");
+		if (vol.channels > 0) {
+			fprintf(f, ", \"volumes\": ");
+			for (i = 0; i < vol.channels; i++)
+				fprintf(f, "%s%s", (i == 0 ? " ":", "),
+						spa_json_format_float(buf, sizeof(buf), vol.valuesi));
+			fprintf(f, " ");
+		}
+		if (map.channels > 0) {
+			fprintf(f, ", \"channels\": ");
+			for (i = 0; i < map.channels; i++)
+				fprintf(f, "%s\"%s\"", (i == 0 ? " ":", "), channel_id2name(map.mapi));
+			fprintf(f, " ");
+		}
+		if (device_name != NULL && device_name0 &&
+		    (client->default_source == NULL || !spa_streq(device_name, client->default_source)) &&
+		    (client->default_sink == NULL || !spa_streq(device_name, client->default_sink)))
+			fprintf(f, ", \"target-node\": \"%s\"", device_name);
+		fprintf(f, " }");
+		fclose(f);
+		if (key_from_name(name, key, sizeof(key)) >= 0) {
+			pw_log_debug("%s -> %s: %s", name, key, ptr);
+			if ((res = pw_manager_set_metadata(client->manager,
+							client->metadata_routes,
+							PW_ID_CORE, key, "Spa:String:JSON", "%s", ptr)) < 0)
+				pw_log_warn("failed to set metadata %s = %s, %s", key, ptr, strerror(-res));
+		}
+		free(ptr);
+	}
+
+	return reply_simple_ack(client, tag);
+}
+
+static int do_extension_stream_restore_delete(struct module *module, struct client *client, uint32_t command, uint32_t tag, struct message *m)
+{
+	return reply_simple_ack(client, tag);
+}
+
+struct subscribe {
+	struct spa_list link;
+	struct module_stream_restore_data *data;
+
+	struct client *client;
+	struct spa_hook listener;
+};
+
+static void remove_subscribe(struct subscribe *s)
+{
+	spa_list_remove(&s->link);
+	spa_hook_remove(&s->listener);
+	free(s);
+}
+
+static void module_client_disconnect(void *data)
+{
+	struct subscribe *s = data;
+	remove_subscribe(s);
+}
+
+static void module_client_routes_changed(void *data)
+{
+	struct subscribe *s = data;
+	struct client *client = s->client;
+	struct message *msg = message_alloc(client->impl, -1, 0);
+
+	pw_log_info("%s EVENT index:%u name:%s", client->name,
+			s->data->module->index, s->data->module->info->name);
+
+	message_put(msg,
+		TAG_U32, COMMAND_EXTENSION,
+		TAG_U32, 0,
+		TAG_U32, s->data->module->index,
+		TAG_STRING, s->data->module->info->name,
+		TAG_U32, SUBCOMMAND_EVENT,
+		TAG_INVALID);
+
+	client_queue_message(client, msg);
+}
+
+static const struct client_events module_client_events = {
+	VERSION_CLIENT_EVENTS,
+	.disconnect = module_client_disconnect,
+	.routes_changed = module_client_routes_changed,
+};
+
+static struct subscribe *add_subscribe(struct module_stream_restore_data *data, struct client *c)
+{
+	struct subscribe *s;
+	s = calloc(1, sizeof(*s));
+	if (s == NULL)
+		return NULL;
+	s->data = data;
+	s->client = c;
+	client_add_listener(c, &s->listener, &module_client_events, s);
+	spa_list_append(&data->subscribed, &s->link);
+	return s;
+}
+
+static struct subscribe *find_subscribe(struct module_stream_restore_data *data, struct client *c)
+{
+	struct subscribe *s;
+	spa_list_for_each(s, &data->subscribed, link) {
+		if (s->client == c)
+			return s;
+	}
+	return NULL;
+}
+
+static int do_extension_stream_restore_subscribe(struct module *module, struct client *client, uint32_t command, uint32_t tag, struct message *m)
+{
+	struct module_stream_restore_data * const d = module->user_data;
+	int res;
+	bool enabled;
+	struct subscribe *s;
+
+	if ((res = message_get(m,
+			TAG_BOOLEAN, &enabled,
+			TAG_INVALID)) < 0)
+		return -EPROTO;
+
+	s = find_subscribe(d, client);
+	if (enabled) {
+		if (s == NULL)
+			s = add_subscribe(d, client);
+		if (s == NULL)
+			return -errno;
+	} else {
+		if (s != NULL)
+			remove_subscribe(s);
+	}
+	return reply_simple_ack(client, tag);
+}
+
+static const struct extension module_stream_restore_extension = {
+	{ "TEST", SUBCOMMAND_TEST, do_extension_stream_restore_test, },
+	{ "READ", SUBCOMMAND_READ, do_extension_stream_restore_read, },
+	{ "WRITE", SUBCOMMAND_WRITE, do_extension_stream_restore_write, },
+	{ "DELETE", SUBCOMMAND_DELETE, do_extension_stream_restore_delete, },
+	{ "SUBSCRIBE", SUBCOMMAND_SUBSCRIBE, do_extension_stream_restore_subscribe, },
+	{ "EVENT", SUBCOMMAND_EVENT, },
+	{ NULL, },
+};
+
+static int module_stream_restore_prepare(struct module * const module)
+{
+	PW_LOG_TOPIC_INIT(mod_topic);
+
+	struct module_stream_restore_data * const data = module->user_data;
+	data->module = module;
+
+	return 0;
+}
+
+static int module_stream_restore_load(struct module *module)
+{
+	struct module_stream_restore_data * const data = module->user_data;
+	spa_list_init(&data->subscribed);
+	return 0;
+}
+static int module_stream_restore_unload(struct module *module)
+{
+	struct module_stream_restore_data * const data = module->user_data;
+	struct subscribe *s;
+
+	spa_list_consume(s, &data->subscribed, link)
+		remove_subscribe(s);
+	return 0;
+}
+
+DEFINE_MODULE_INFO(module_stream_restore) = {
+	.name = "module-stream-restore",
+	.load_once = true,
+	.prepare = module_stream_restore_prepare,
+	.load = module_stream_restore_load,
+	.unload = module_stream_restore_unload,
+	.extension = module_stream_restore_extension,
+	.properties = &SPA_DICT_INIT_ARRAY(module_stream_restore_info),
+	.data_size = sizeof(struct module_stream_restore_data),
+};

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/modules/module-tunnel-source.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/modules/module-tunnel-source.c Changed

pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/modules/org.freedesktop.pulseaudio.gschema.xml Added

@@ -0,0 +1,115 @@
+<schemalist gettext-domain="pulseaudio">
+  
+  <schema id="org.freedesktop.pulseaudio.module-groups" path="/org/freedesktop/pulseaudio/module-groups/">
+    <child name="combine" schema="org.freedesktop.pulseaudio.module-group"/>
+    <child name="remote-access" schema="org.freedesktop.pulseaudio.module-group"/>
+    <child name="zeroconf-discover" schema="org.freedesktop.pulseaudio.module-group"/>
+    <child name="raop-discover" schema="org.freedesktop.pulseaudio.module-group"/>
+    <child name="rtp-recv" schema="org.freedesktop.pulseaudio.module-group"/>
+    <child name="rtp-send" schema="org.freedesktop.pulseaudio.module-group"/>
+    <child name="upnp-media-server" schema="org.freedesktop.pulseaudio.module-group"/>
+  </schema>
+
+  
+  <schema id="org.freedesktop.pulseaudio.module-group">
+    <key name="name" type="s">
+      <default>''</default>
+      <summary>Module group name</summary>
+      <description>Module group name</description>
+    </key>
+
+    <key name="enabled" type="b">
+      <default>false</default>
+    </key>
+
+    <key name="locked" type="b">
+      <default>false</default>
+    </key>
+
+    <key name="args0" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="args1" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="args2" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="args3" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="args4" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="args5" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="args6" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="args7" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="args8" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="args9" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="name0" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="name1" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="name2" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="name3" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="name4" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="name5" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="name6" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="name7" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="name8" type="s">
+      <default>''</default>
+    </key>
+
+    <key name="name9" type="s">
+      <default>''</default>
+    </key>
+  </schema>
+
+</schemalist>

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/pulse-server.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/pulse-server.c Changed

@@ -16,6 +16,7 @@
 #include "log.h"
 
 #include <spa/support/cpu.h>
+#include <spa/utils/cleanup.h>
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/debug/dict.h>
@@ -28,7 +29,6 @@
 #include <spa/utils/ringbuffer.h>
 #include <spa/utils/json.h>
 
-#include <pipewire/cleanup.h>
 #include <pipewire/pipewire.h>
 #include <pipewire/extensions/metadata.h>
 
@@ -56,6 +56,7 @@
 #include "utils.h"
 #include "volume.h"
 
+#define DEFAULT_ALLOW_MODULE_LOADING 	"true"
 #define DEFAULT_MIN_REQ		"128/48000"
 #define DEFAULT_DEFAULT_REQ	"960/48000"
 #define DEFAULT_MIN_FRAG	"128/48000"
@@ -73,10 +74,6 @@
 
 #define TEMPORARY_MOVE_TIMEOUT	(SPA_NSEC_PER_SEC)
 
-PW_LOG_TOPIC_EXTERN(pulse_conn);
-
-bool debug_messages = false;
-
 struct latency_offset_data {
 	int64_t prev_latency_offset;
 	uint8_t initialized:1;
@@ -208,7 +205,7 @@
 {
 	uint32_t event = 0, mask = 0, res_index = o->index;
 
-	pw_log_debug("index:%d id:%d %08lx type:%u", o->index, o->id, o->change_mask, type);
+	pw_log_debug("index:%d id:%d %08" PRIx64 " type:%u", o->index, o->id, o->change_mask, type);
 
 	if (pw_manager_object_is_sink(o) && o->change_mask & PW_MANAGER_OBJECT_FLAG_SINK) {
 		client_queue_subscribe_event(client,
@@ -597,6 +594,8 @@
 	if (peer && pw_manager_object_is_sink(peer)) {
 		peer_index = peer->index;
 		peer_name = pw_properties_get(peer->props, PW_KEY_NODE_NAME);
+		if (peer_name == NULL)
+			peer_name = "unknown";
 	} else {
 		peer_index = SPA_ID_INVALID;
 		peer_name = NULL;
@@ -751,6 +750,8 @@
 		peer = find_linked(manager, peer->id, PW_DIRECTION_OUTPUT);
 	if (peer && pw_manager_object_is_source_or_monitor(peer)) {
 		name = pw_properties_get(peer->props, PW_KEY_NODE_NAME);
+		if (name == NULL)
+			name = "unknown";
 		peer_index = peer->index;
 		if (!pw_manager_object_is_source(peer)) {
 			size_t len = (name ? strlen(name) : 5) + 10;
@@ -860,6 +861,8 @@
 				s->peer_index = peer->index;
 
 				peer_name = pw_properties_get(peer->props, PW_KEY_NODE_NAME);
+				if (peer_name == NULL)
+					peer_name = "unknown";
 				if (peer_name && s->direction == PW_DIRECTION_INPUT &&
 				    pw_manager_object_is_monitor(peer)) {
 					int len = strlen(peer_name) + 10;
@@ -993,12 +996,8 @@
 		if (changed)
 			send_default_change_subscribe_event(client, true, true);
 	}
-	if (subject == PW_ID_CORE && o == client->metadata_routes) {
-		if (key == NULL)
-			pw_properties_clear(client->routes);
-		else
-			pw_properties_set(client->routes, key, value);
-	}
+	if (subject == PW_ID_CORE && o == client->metadata_routes)
+		client_update_routes(client, key, value);
 }
 
 
@@ -4200,7 +4199,7 @@
 
 	if (command == COMMAND_GET_MODULE_INFO && (sel.index & MODULE_FLAG) != 0) {
 		struct module *module;
-		module = pw_map_lookup(&impl->modules, sel.index & MODULE_INDEX_MASK);
+		module = module_lookup(impl, sel.index & MODULE_INDEX_MASK, NULL);
 		if (module == NULL)
 			goto error_noentity;
 		fill_ext_module_info(client, reply, module);
@@ -4560,7 +4559,7 @@
 
 	stream->rate = rate;
 
-	corr = (double)rate/(double)stream->ss.rate;
+	corr = (float)rate/(float)stream->ss.rate;
 	pw_stream_set_control(stream->stream, SPA_PROP_rate, 1, &corr, NULL);
 
 	return reply_simple_ack(client, tag);
@@ -4568,9 +4567,10 @@
 
 static int do_extension(struct client *client, uint32_t command, uint32_t tag, struct message *m)
 {
+	struct impl *impl = client->impl;
 	uint32_t index;
 	const char *name;
-	const struct extension *ext;
+	struct module *module;
 
 	if (message_get(m,
 			TAG_U32, &index,
@@ -4585,11 +4585,11 @@
 	    (index != SPA_ID_INVALID && name != NULL))
 		return -EINVAL;
 
-	ext = extension_find(index, name);
-	if (ext == NULL)
+	module = module_lookup(impl, index, name);
+	if (module == NULL)
 		return -ENOENT;
 
-	return ext->process(client, tag, m);
+	return extension_process(module, client, tag, m);
 }
 
 static int do_set_profile(struct client *client, uint32_t command, uint32_t tag, struct message *m)
@@ -5015,6 +5015,9 @@
 	struct pending_module *pm;
 	int r;
 
+	if (!impl->defs.allow_module_loading)
+		return -EACCES;
+
 	if (message_get(m,
 			TAG_STRING, &name,
 			TAG_STRING, &argument,
@@ -5060,6 +5063,9 @@
 	struct module *module;
 	uint32_t module_index;
 
+	if (!impl->defs.allow_module_loading)
+		return -EACCES;
+
 	if (message_get(m,
 			TAG_U32, &module_index,
 			TAG_INVALID) < 0)
@@ -5073,7 +5079,7 @@
 	if ((module_index & MODULE_FLAG) == 0)
 		return -EPERM;
 
-	module = pw_map_lookup(&impl->modules, module_index & MODULE_INDEX_MASK);
+	module = module_lookup(impl, module_index & MODULE_INDEX_MASK, NULL);
 	if (module == NULL)
 		return -ENOENT;
 
@@ -5450,9 +5456,22 @@
 	pw_log_info(": defaults: %s = %u", key, *res);
 	return 0;
 }
+static int parse_bool(struct pw_properties *props, const char *key, const char *def,
+		bool *res)
+{
+	const char *str;
+	if (props == NULL ||
+	    (str = pw_properties_get(props, key)) == NULL)
+		str = def;
+	*res = spa_atob(str);
+	pw_log_info(": defaults: %s = %s", key, *res ? "true" : "false");
+	return 0;
+}
 
 static void load_defaults(struct defs *def, struct pw_properties *props)
 {
+	parse_bool(props, "pulse.allow-module-loading", DEFAULT_ALLOW_MODULE_LOADING,
+			&def->allow_module_loading);
 	parse_frac(props, "pulse.min.req", DEFAULT_MIN_REQ, &def->min_req);
 	parse_frac(props, "pulse.default.req", DEFAULT_DEFAULT_REQ, &def->default_req);
 	parse_frac(props, "pulse.min.frag", DEFAULT_MIN_FRAG, &def->min_frag);
@@ -5476,8 +5495,6 @@
 	const char *str;
 	int res = 0;
 
-	debug_messages = pw_log_topic_enabled(SPA_LOG_LEVEL_INFO, pulse_conn);
-
 	impl = calloc(1, sizeof(*impl) + user_data_size);
 	if (impl == NULL)
 		goto error_free_props;
@@ -5505,6 +5522,8 @@
 	pw_context_conf_update_props(context, "pulse.properties", props);
 
 	if ((str = pw_properties_get(props, "vm.overrides")) != NULL) {
+		pw_log_warn("vm.overrides in pulse.properties are deprecated, "
+				"use pulse.properties.rules instead");
 		if (cpu != NULL && spa_cpu_get_vm_type(cpu) != SPA_CPU_VM_NONE)
 			pw_properties_update_string(props, str, strlen(str));
 		pw_properties_set(props, "vm.overrides", NULL);

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/server.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/server.c Changed

@@ -25,10 +25,10 @@
 #include <systemd/sd-daemon.h>
 #endif
 
+#include <spa/utils/cleanup.h>
 #include <spa/utils/defs.h>
 #include <spa/utils/json.h>
 #include <spa/utils/result.h>
-#include <pipewire/cleanup.h>
 #include <pipewire/pipewire.h>
 
 #include "client.h"
@@ -42,10 +42,15 @@
 #include "stream.h"
 #include "utils.h"
 #include "flatpak-utils.h"
+#ifdef HAVE_SNAP
+#include "snap-policy.h"
+#endif
 
 #define LISTEN_BACKLOG 32
 #define MAX_CLIENTS 64
 
+PW_LOG_TOPIC_EXTERN(pulse_conn);
+
 static int handle_packet(struct client *client, struct message *msg)
 {
 	uint32_t command, tag;
@@ -67,9 +72,9 @@
 		goto finish;
 	}
 
-	if (debug_messages) {
+	if (pw_log_topic_custom_enabled(SPA_LOG_LEVEL_INFO, pulse_conn)) {
 		pw_log_debug("client %p: command:%s", client, commandscommand.name);
-		message_dump(SPA_LOG_LEVEL_INFO, msg);
+		message_dump(SPA_LOG_LEVEL_INFO, "<<", msg);
 	}
 
 	const struct command *cmd = &commandscommand;
@@ -405,7 +410,10 @@
 		client_access = server->client_access;
 
 	if (server->addr.ss_family == AF_UNIX) {
-		spa_autofree char *app_id = NULL, *devices = NULL;
+		spa_autofree char *app_id = NULL, *snap_app_id = NULL, *devices = NULL;
+#ifdef HAVE_SNAP
+		pw_sandbox_access_t snap_access;
+#endif
 
 #ifdef SO_PRIORITY
 		val = 6;
@@ -444,6 +452,21 @@
 			else
 				pw_properties_set(client->props, PW_KEY_MEDIA_CATEGORY, NULL);
 		}
+		// check SNAP permissions
+#ifdef HAVE_SNAP
+		snap_access = pw_snap_get_audio_permissions(client, client_fd, &snap_app_id);
+		if ((snap_access & PW_SANDBOX_ACCESS_NOT_A_SANDBOX) == 0) {
+			pw_properties_set(client->props, PW_KEY_SNAP_ID, snap_app_id);
+
+			pw_properties_set(client->props,
+					  PW_KEY_SNAP_PLAYBACK_ALLOWED,
+					  (snap_access & PW_SANDBOX_ACCESS_PLAYBACK) ? "true" : "false");
+
+			pw_properties_set(client->props,
+					  PW_KEY_SNAP_RECORD_ALLOWED,
+					  (snap_access & PW_SANDBOX_ACCESS_RECORD) ? "true" : "false");
+		}
+#endif
 	}
 	else if (server->addr.ss_family == AF_INET || server->addr.ss_family == AF_INET6) {

pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/snap-policy.c Added

@@ -0,0 +1,203 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2022 Canonical Ltd. */
+/* SPDX-License-Identifier: MIT */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+#include <snapd-glib/snapd-glib.h>
+#include <pipewire/pipewire.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include "client.h"
+#include <sys/apparmor.h>
+#include <errno.h>
+#include "snap-policy.h"
+#include <fcntl.h>
+#include <assert.h>
+
+#define SNAP_LABEL_PREFIX "snap."
+
+static gboolean check_is_same_snap(gchar *snap1, gchar *snap2)
+{
+	// Checks if two apparmor labels belong to the same snap
+	g_auto(GStrv) strings1 = NULL;
+	g_auto(GStrv) strings2 = NULL;
+
+	if (!g_str_has_prefix(snap1, SNAP_LABEL_PREFIX)) {
+		return FALSE;
+	}
+	if (!g_str_has_prefix(snap2, SNAP_LABEL_PREFIX)) {
+		return FALSE;
+	}
+	strings1 = g_strsplit(snap1, ".", 3);
+	strings2 = g_strsplit(snap2, ".", 3);
+
+	if (g_str_equal(strings11, strings21) && (strings11 != NULL)) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
+pw_sandbox_access_t pw_snap_get_audio_permissions(struct client *client, int fd, char **app_id)
+{
+	g_autofree gchar* aa_label = NULL;
+	gchar* snap_id = NULL;
+	gchar* snap_confinement = NULL;
+	gchar *separator = NULL;
+	g_autofree gchar *aacon = NULL;
+	gchar *aamode = NULL;
+	g_autoptr(SnapdClient) snapdclient = NULL;
+	g_autoptr(GPtrArray) plugs = NULL;
+	gboolean retv;
+	pw_sandbox_access_t permissions = PW_SANDBOX_ACCESS_NONE;
+	SnapdPlug **plug = NULL;
+	g_autoptr(GError) error = NULL;
+	int exit_code;
+
+	*app_id = g_strdup("unknown");
+	assert(client != NULL);
+
+	if (aa_getpeercon(fd, &aa_label, &snap_confinement) == -1) {
+		if (errno == EINVAL) {
+			// if apparmor isn't enabled, we can safely assume that there are no SNAPs in the system
+			return PW_SANDBOX_ACCESS_NOT_A_SANDBOX;
+		}
+		if  (errno == ENOPROTOOPT) {
+			static bool warned;
+
+			// if fine grained unix mediation isn't available, we can't know if this is a snap or
+			// not, so we have no choice but give full access
+			if (!warned) {
+				pw_log_warn("snap_get_audio_permissions: kernel lacks 'fine grained unix mediation'; "
+						"snap audio permissions won't be honored.");
+				warned = true;
+			}
+			return PW_SANDBOX_ACCESS_NOT_A_SANDBOX;
+		}
+ 		pw_log_warn("snap_get_audio_permissions: failed to get the AppArmor info: %s.", strerror(errno));
+		return PW_SANDBOX_ACCESS_NONE;
+	}
+	if (!g_str_has_prefix(aa_label, SNAP_LABEL_PREFIX)) {
+		// not a SNAP.
+		pw_log_info("snap_get_audio_permissions: not an snap.");
+		return PW_SANDBOX_ACCESS_NOT_A_SANDBOX;
+	}
+
+	snap_id = g_strdup(aa_label + strlen(SNAP_LABEL_PREFIX));
+	separator = strchr(snap_id, '.');
+	if (separator == NULL) {
+		g_free(snap_id);
+		pw_log_info("snap_get_audio_permissions: aa_label has only one dot; not a valid ID.");
+		return PW_SANDBOX_ACCESS_NONE;
+	}
+	*separator = 0;
+	g_free(*app_id);
+	*app_id = snap_id;
+
+	// it's a "classic" or a "devmode" confinement snap, so we give it full access
+	if (g_str_equal(snap_confinement, "complain")) {
+		return PW_SANDBOX_ACCESS_ALL;
+	}
+
+	snapdclient = snapd_client_new();
+	if (snapdclient == NULL) {
+		pw_log_warn("snap_get_audio_permissions: error creating SnapdClient object.");
+		return PW_SANDBOX_ACCESS_NONE;
+	}
+
+	if (aa_getcon(&aacon, &aamode) == -1) {
+		pw_log_warn("snap_get_audio_permissions: error checking if pipewire-pulse is inside a snap.");
+		return PW_SANDBOX_ACCESS_NONE; // failed to get access to apparmor
+	}
+
+	// If pipewire-pulse is inside a snap, use snapctl API
+	if (g_str_has_prefix(aacon, SNAP_LABEL_PREFIX)) {
+		// If the snap wanting to get access is the same that contains pipewire,
+		// give to it full access.
+		if (check_is_same_snap(aacon, aa_label))
+			return PW_SANDBOX_ACCESS_ALL;
+		snapd_client_set_socket_path(snapdclient, "/run/snapd-snap.socket");
+
+		/* Take context from the environment if available */
+		const char *context = g_getenv("SNAP_COOKIE");
+		if (!context)
+			context = "";
+
+		char *snapctl_command = { "is-connected", "--apparmor-label", aa_label, "pulseaudio", NULL };
+		if (!snapd_client_run_snapctl2_sync(snapdclient, context, (char **) snapctl_command, NULL, NULL, &exit_code, NULL, &error)) {
+			pw_log_warn("snap_get_audio_permissions: error summoning snapctl2 for pulseaudio interface: %s", error->message);
+			return PW_SANDBOX_ACCESS_NONE;
+		}
+		if (exit_code != 1) {
+			// 0  = Connected
+			// 10 = Classic environment
+			// 11 = Not a snap
+			return PW_SANDBOX_ACCESS_ALL;
+		}
+		char *snapctl_command2 = { "is-connected", "--apparmor-label", aa_label, "audio-record", NULL };
+		if (!snapd_client_run_snapctl2_sync(snapdclient, context, (char **) snapctl_command2, NULL, NULL, &exit_code, NULL, &error)) {
+			pw_log_warn("snap_get_audio_permissions: error summoning snapctl2 for audio-record interface: %s", error->message);
+			return PW_SANDBOX_ACCESS_NONE;
+		}
+		if (exit_code == 1) {
+			return PW_SANDBOX_ACCESS_PLAYBACK;
+		}
+		return PW_SANDBOX_ACCESS_ALL;
+	}
+
+	retv = snapd_client_get_connections2_sync(snapdclient,
+						  SNAPD_GET_CONNECTIONS_FLAGS_NONE,
+						  snap_id,
+						  NULL,
+						  NULL,
+						  NULL,
+						  &plugs,
+						  NULL,
+						  NULL,
+						  &error);
+	if (retv == FALSE) {
+		pw_log_warn("Failed to get Snap connections for snap %s: %s\n", snap_id, error->message);
+		return PW_SANDBOX_ACCESS_NONE;
+	}
+	if (plugs == NULL) {
+		pw_log_warn("Failed to get Snap connections for snap %s: %s\n", snap_id, error->message);
+		return PW_SANDBOX_ACCESS_NONE;
+	}
+	if (plugs->pdata == NULL) {
+		pw_log_warn("Failed to get Snap connections for snap %s: %s\n", snap_id, error->message);
+		return PW_SANDBOX_ACCESS_NONE;
+	}
+
+	plug = (SnapdPlug **)plugs->pdata;
+	for (guint p = 0; p < plugs->len; p++, plug++) {
+		pw_sandbox_access_t add_permission;
+		const gchar *plug_name = snapd_plug_get_name(*plug);
+		if (g_str_equal("audio-record", plug_name)) {
+			add_permission = PW_SANDBOX_ACCESS_RECORD;
+		} else if (g_str_equal("audio-playback", plug_name)) {
+			add_permission = PW_SANDBOX_ACCESS_PLAYBACK;
+		} else if (g_str_equal("pulseaudio", plug_name)) {
+			add_permission = PW_SANDBOX_ACCESS_ALL;
+		} else {
+			continue;
+		}
+		GPtrArray *slots = snapd_plug_get_connected_slots(*plug);
+		if (slots == NULL)
+			continue;
+		SnapdSlotRef **slot = (SnapdSlotRef**) slots->pdata;
+
+		for (guint q = 0; q < slots->len; q++, slot++) {
+			const gchar *slot_name = snapd_slot_ref_get_slot(*slot);
+			const gchar *snap_name = snapd_slot_ref_get_snap(*slot);
+			if ((g_str_equal(snap_name, "snapd") ||
+			     g_str_equal(snap_name, "core")) &&
+			     g_str_equal(slot_name, plug_name))
+				permissions |= add_permission;
+		}
+	}
+
+	return permissions;
+}

pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/snap-policy.h Added

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-pulse/volume.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-pulse/volume.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-protocol-simple.c -> pipewire-1.2.0.tar.gz/src/modules/module-protocol-simple.c Changed

@@ -9,6 +9,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
@@ -29,6 +30,8 @@
 
 #include <pipewire/impl.h>
 
+#include "network-utils.h"
+
 /** \page page_module_protocol_simple Protocol Simple
  *
  * The simple protocol provides a bidirectional audio stream on a network
@@ -40,20 +43,23 @@
  * Each client that connects will create a capture and/or playback stream,
  * depending on the configuration options.
  *
+ * You can also use it to feed audio data to other clients such as the snapcast
+ * server.
+ *
  * ## Module Name
  *
  * `libpipewire-module-protocol-simple`
  *
  * ## Module Options
  *
- *  - `capture`: boolean if capture is enabled. This will create a capture stream
- *               for each connected client.
- *  - `playback`: boolean if playback is enabled. This will create a playback
- *               stream for each connected client.
- *  - `capture.node`: an optional node serial or name to use for capture.
- *  - `playback.node`: an optional node serial or name to use for playback.
+ *  - `capture`: boolean if capture is enabled. This will create a capture stream or
+ *               sink for each connected client.
+ *  - `playback`: boolean if playback is enabled. This will create a playback or
+ *               source stream for each connected client.
  *  - `server.address = `: an array of server addresses to listen on as
  *                            tcp:(<ip>:)<port>.
+ *  - `capture.props`: optional properties for the capture stream
+ *  - `playback.props`: optional properties for the playback stream
  *
  * ## General options
  *
@@ -67,6 +73,8 @@
  * - \ref PW_KEY_NODE_LATENCY
  * - \ref PW_KEY_NODE_RATE
  * - \ref PW_KEY_STREAM_CAPTURE_SINK
+ * - \ref PW_KEY_NODE_NAME
+ * - \ref PW_KEY_TARGET_OBJECT
  *
  * By default the server will work with stereo 16 bits samples at 44.1KHz.
  *
@@ -82,15 +90,6 @@
  *         # Provide playback stream, client can send data to PipeWire for playback
  *         playback = true
  *         #
- *         # The node name or id to use for capture.
- *         #capture.node = null
- *         #
- *         # To make the capture stream capture the monitor ports
- *         #stream.capture.sink = false
- *         #
- *         # The node name or id to use for playback.
- *         #playback.node = null
- *         #
  *         #audio.rate = 44100
  *         #audio.format = S16
  *         #audio.channels = 2
@@ -101,10 +100,65 @@
  *         server.address = 
  *             "tcp:4711"
  *         
+ *         capture.props = {
+ *             # The node name or id to use for capture.
+ *             #target.object = null
+ *             #
+ *             # To make the capture stream capture the monitor ports
+ *             #stream.capture.sink = false
+ *             #
+ *             # Make this a sink instead of a capture stream
+ *             #media.class = Audio/Sink
+ *         }
+ *         playback.props = {
+ *             # The node name or id to use for playback.
+ *             #target.object = null
+ *             #
+ *             # Make this a source instead of a playback stream
+ *             #media.class = Audio/Source
+ *         }
  *     }
  * }
  * 
  *\endcode
+ *
+ * ## Example configuration for a snapcast server
+ *
+ *\code{.unparsed}
+ * context.modules = 
+ * {   name = libpipewire-module-protocol-simple
+ *     args = {
+ *         # Provide sink
+ *         capture = true
+ *         audio.rate = 48000
+ *         audio.format = S16
+ *         audio.channels = 2
+ *         audio.position =  FL FR 
+ *
+ *         # The addresses this server listens on for new
+ *         # client connections
+ *         server.address = 
+ *             "tcp:4711"
+ *         
+ *         capture.props = {
+ *             # Make this a sink instead of a capture stream
+ *             media.class = Audio/Sink
+ *         }
+ *     }
+ * }
+ * 
+ *
+ * On the snapcast server, add the following to the `snapserver.conf` file:
+ *
+ *\code{.unparsed}
+ * stream
+ * sampleformat =  48000:16:2
+ * source = tcp://127.0.0.1:4711?name=PipeWireSnapcast&mode=client
+ *\endcode
+ *
+ * Snapcast will try to connect to the protocol-simple server and fetch the
+ * samples from it. Snapcast tries to reconnect when the connection is somehow
+ * broken.
  */
 
 #define NAME "protocol-simple"
@@ -115,26 +169,24 @@
 #define DEFAULT_PORT 4711
 #define DEFAULT_SERVER " \"tcp:"SPA_STRINGIFY(DEFAULT_PORT)"\" "
 
-#define DEFAULT_FORMAT "S16"
+#define DEFAULT_FORMAT "S16LE"
 #define DEFAULT_RATE 44100
 #define DEFAULT_CHANNELS 2
 #define DEFAULT_POSITION " FL FR "
-#define DEFAULT_LATENCY "1024/44100"
 
 #define MAX_CLIENTS	10
 
 #define MODULE_USAGE	"( capture=<bool> ) "						\
 			"( playback=<bool> ) "						\
 			"( remote.name=<remote> ) "					\
-			"( node.latency=<num/denom, default:"DEFAULT_LATENCY"> ) "	\
 			"( node.rate=<1/rate, default:1/"SPA_STRINGIFY(DEFAULT_RATE)"> ) "	\
-			"( capture.node=<source-target> ( stream.capture.sink=true )) "	\
-			"( playback.node=<sink-target> ) "				\
 			"( audio.rate=<sample-rate, default:"SPA_STRINGIFY(DEFAULT_RATE)"> ) "		\
 			"( audio.format=<format, default:"DEFAULT_FORMAT"> ) "		\
 			"( audio.channels=<channels, default: "SPA_STRINGIFY(DEFAULT_CHANNELS)"> ) "	\
 			"( audio.position=<position, default:"DEFAULT_POSITION"> ) "	\
-			"( server.address=< tcp:(<ip>:)<port>(,...) , default:"DEFAULT_SERVER"> )"	\
+			"( server.address=< tcp:(<ip>:)<port>(,...) , default:"DEFAULT_SERVER"> ) "	\
+			"( capture.props={ ... } ) "	\
+			"( playback.props={ ... } )"	\
 
 static const struct spa_dict_item module_props = {
 	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
@@ -153,11 +205,16 @@
 
 	struct pw_work_queue *work_queue;
 
+	struct pw_properties *capture_props;
+	struct pw_properties *playback_props;
+
 	bool capture;
 	bool playback;
 
-	struct spa_audio_info_raw info;
-	uint32_t frame_size;
+	struct spa_audio_info_raw capture_info;
+	struct spa_audio_info_raw playback_info;
+	uint32_t capture_frame_size;
+	uint32_t playback_frame_size;
 };
 
 struct client {
@@ -188,9 +245,9 @@
 
 #define SERVER_TYPE_INVALID	0
 #define SERVER_TYPE_UNIX	1
-#define SERVER_TYPE_INET	2
+#define SERVER_TYPE_TCP		2
 	uint32_t type;
-	struct sockaddr_un addr;
+	struct sockaddr_storage addr;
 	struct spa_source *source;
 
 	struct spa_list client_list;
@@ -305,10 +362,11 @@
 		if (res < 0) {
 			if (errno == EINTR)
 				continue;
-			if (errno != EAGAIN && errno != EWOULDBLOCK)
+			if (errno != EAGAIN && errno != EWOULDBLOCK) {
 				pw_log_warn("%p: client:%p %s send error %d: %m", impl,
 						client, client->name, res);
-			client_cleanup(client);
+				client_cleanup(client);
+			}
 			break;
 		}
 		offset += res;
@@ -335,7 +393,7 @@
 
 	size = d->maxsize;
 	if (buf->requested)
-		size = SPA_MIN(size, buf->requested * impl->frame_size);
+		size = SPA_MIN(size, buf->requested * impl->playback_frame_size);
 
 	offset = 0;
 	while (size > 0) {
@@ -362,7 +420,7 @@
 	}
 	d->chunk->offset = 0;
 	d->chunk->size = offset;
-	d->chunk->stride = impl->frame_size;
+	d->chunk->stride = impl->playback_frame_size;
 
 	pw_stream_queue_buffer(client->playback, buf);
 }
@@ -421,24 +479,12 @@
 	uint32_t n_params;
 	const struct spa_pod *params1;
 	uint8_t buffer1024;
-	struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
+	struct spa_pod_builder b;
 	struct pw_properties *props;
-	const char *latency;
 	int res;
 
-	if ((latency = pw_properties_get(impl->props, PW_KEY_NODE_LATENCY)) == NULL)
-		latency = DEFAULT_LATENCY;
-
 	if (impl->capture) {
-		props = pw_properties_new(
-			PW_KEY_NODE_LATENCY, latency,
-			PW_KEY_NODE_RATE, pw_properties_get(impl->props, PW_KEY_NODE_RATE),
-			PW_KEY_TARGET_OBJECT, pw_properties_get(impl->props, "capture.node"),
-			PW_KEY_STREAM_CAPTURE_SINK, pw_properties_get(impl->props,
-				PW_KEY_STREAM_CAPTURE_SINK),
-			PW_KEY_NODE_NETWORK, "true",
-			NULL);
-		if (props == NULL)
+		if ((props = pw_properties_copy(impl->capture_props)) == NULL)
 			return -errno;
 
 		pw_properties_setf(props,
@@ -453,12 +499,7 @@
 				&capture_stream_events, client);
 	}
 	if (impl->playback) {
-		props = pw_properties_new(
-			PW_KEY_NODE_LATENCY, latency,
-			PW_KEY_NODE_RATE, pw_properties_get(impl->props, PW_KEY_NODE_RATE),
-			PW_KEY_TARGET_OBJECT, pw_properties_get(impl->props, "playback.node"),
-			PW_KEY_NODE_NETWORK, "true",
-			NULL);
+		props = pw_properties_copy(impl->playback_props);
 		if (props == NULL)
 			return -errno;
 
@@ -475,11 +516,13 @@
 				&playback_stream_events, client);
 	}
 
-	n_params = 0;
-	paramsn_params++ = spa_format_audio_raw_build(&b, SPA_PARAM_EnumFormat,
-				&impl->info);
 
 	if (impl->capture) {
+		n_params = 0;
+		spa_pod_builder_init(&b, buffer, sizeof(buffer));
+		paramsn_params++ = spa_format_audio_raw_build(&b, SPA_PARAM_EnumFormat,
+				&impl->capture_info);
+
 		if ((res = pw_stream_connect(client->capture,
 				PW_DIRECTION_INPUT,
 				PW_ID_ANY,
@@ -490,6 +533,11 @@
 			return res;
 	}
 	if (impl->playback) {
+		n_params = 0;
+		spa_pod_builder_init(&b, buffer, sizeof(buffer));
+		paramsn_params++ = spa_format_audio_raw_build(&b, SPA_PARAM_EnumFormat,
+				&impl->playback_info);
+
 		if ((res = pw_stream_connect(client->playback,
 				PW_DIRECTION_OUTPUT,
 				PW_ID_ANY,
@@ -568,11 +616,11 @@
 
 	pw_properties_setf(props,
 			"protocol.server.type", "%s",
-			server->type == SERVER_TYPE_INET ? "tcp" : "unix");
+			server->type == SERVER_TYPE_TCP ? "tcp" : "unix");
 
 	if (server->type == SERVER_TYPE_UNIX) {
 		goto error;
-	} else if (server->type == SERVER_TYPE_INET) {
+	} else if (server->type == SERVER_TYPE_TCP) {
 		val = 1;
 		if (setsockopt(client_fd, IPPROTO_TCP, TCP_NODELAY,
 					(const void *) &val, sizeof(val)) < 0)
@@ -606,32 +654,51 @@
 	return;
 }
 
-static int make_inet_socket(struct server *server, const char *name)
+static uint16_t parse_port(const char *str, uint16_t def)
 {
-	struct sockaddr_in addr;
+	uint32_t val;
+	if (spa_atou32(str, &val, 0) && val <= 65535u)
+		return val;
+	return def;
+}
+
+static int make_tcp_socket(struct server *server, const char *name)
+{
+	struct sockaddr_storage addr;
 	int res, fd, on;
-	uint32_t address = INADDR_ANY;
 	uint16_t port;
-	char *col;
+	char *br = NULL, *col, *n;
+	socklen_t len = 0;
+
+	n = strdupa(name);
+
+	col = strrchr(n, ':');
+	if (n0 == '') {
+		br = strchr(n, '');
+		if (br == NULL)
+			return -EINVAL;
+		n++;
+		*br = 0;
+	} else {
+	}
+	if (br && col && col < br)
+		col = NULL;
 
-	col = strchr(name, ':');
 	if (col) {
-		struct in_addr ipv4;
-		char *n;
-		port = atoi(col+1);
-		n = strndupa(name, col - name);
-		if (inet_pton(AF_INET, n, &ipv4) > 0)
-			address = ntohl(ipv4.s_addr);
-		else
-			address = INADDR_ANY;
+		*col = '\0';
+		port = parse_port(col+1, DEFAULT_PORT);
 	} else {
-		address = INADDR_ANY;
-		port = atoi(name);
+		port = parse_port(n, DEFAULT_PORT);
+		n = strdupa("0.0.0.0");
 	}
-	if (port == 0)
-		port = DEFAULT_PORT;
 
-	if ((fd = socket(PF_INET, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)) < 0) {
+	if ((res = pw_net_parse_address(n, port, &addr, &len)) < 0) {
+		pw_log_error("%p: can't parse address:%s port:%d: %s", server,
+				n, port, 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;
@@ -641,12 +708,7 @@
 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const void *) &on, sizeof(on)) < 0)
 		pw_log_warn("%p: setsockopt(): %m", server);
 
-	spa_zero(addr);
-	addr.sin_family = AF_INET;
-	addr.sin_port = htons(port);
-	addr.sin_addr.s_addr = htonl(address);
-
-	if (bind(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+	if (bind(fd, (struct sockaddr *) &addr, len) < 0) {
 		res = -errno;
 		pw_log_error("%p: bind() failed: %m", server);
 		goto error_close;
@@ -656,8 +718,14 @@
 		pw_log_error("%p: listen() failed: %m", server);
 		goto error_close;
 	}
-	server->type = SERVER_TYPE_INET;
-	pw_log_info("listening on tcp:%08x:%u", address, port);
+	if (getsockname(fd, (struct sockaddr *)&addr, &len) < 0) {
+		res = -errno;
+		pw_log_error("%p: getsockname() failed: %m", server);
+		goto error_close;
+	}
+
+	server->type = SERVER_TYPE_TCP;
+	server->addr = addr;
 
 	return fd;
 
@@ -696,8 +764,9 @@
 	spa_list_append(&impl->server_list, &server->link);
 
 	if (spa_strstartswith(address, "tcp:")) {
-		fd = make_inet_socket(server, address+4);
+		fd = make_tcp_socket(server, address+4);
 	} else {
+		pw_log_error("address %s does not start with tcp:", address);
 		fd = -EINVAL;
 	}
 	if (fd < 0) {
@@ -727,6 +796,8 @@
 	spa_hook_remove(&impl->module_listener);
 	spa_list_consume(s, &impl->server_list, link)
 		server_free(s);
+	pw_properties_free(impl->capture_props);
+	pw_properties_free(impl->playback_props);
 	pw_properties_free(impl->props);
 	free(impl);
 }
@@ -751,21 +822,88 @@
 	return SPA_AUDIO_CHANNEL_UNKNOWN;
 }
 
-static inline uint32_t parse_position(uint32_t *pos, const char *val, size_t len)
+static void parse_position(struct spa_audio_info_raw *info, const char *val, size_t len)
 {
-	uint32_t channels = 0;
 	struct spa_json it2;
 	char v256;
 
 	spa_json_init(&it0, val, len);
-	if (spa_json_enter_array(&it0, &it1) <= 0)
-		spa_json_init(&it1, val, len);
+        if (spa_json_enter_array(&it0, &it1) <= 0)
+                spa_json_init(&it1, val, len);
 
+	info->channels = 0;
 	while (spa_json_get_string(&it1, v, sizeof(v)) > 0 &&
-			channels < SPA_AUDIO_MAX_CHANNELS) {
-		poschannels++ = channel_from_name(v);
+	    info->channels < SPA_AUDIO_MAX_CHANNELS) {
+		info->positioninfo->channels++ = channel_from_name(v);
+	}
+}
+
+static int calc_frame_size(struct spa_audio_info_raw *info)
+{
+	int res = info->channels;
+	switch (info->format) {
+	case SPA_AUDIO_FORMAT_U8:
+	case SPA_AUDIO_FORMAT_S8:
+	case SPA_AUDIO_FORMAT_ALAW:
+	case SPA_AUDIO_FORMAT_ULAW:
+		return res;
+	case SPA_AUDIO_FORMAT_S16:
+	case SPA_AUDIO_FORMAT_S16_OE:
+	case SPA_AUDIO_FORMAT_U16:
+		return res * 2;
+	case SPA_AUDIO_FORMAT_S24:
+	case SPA_AUDIO_FORMAT_S24_OE:
+	case SPA_AUDIO_FORMAT_U24:
+		return res * 3;
+	case SPA_AUDIO_FORMAT_S24_32:
+	case SPA_AUDIO_FORMAT_S24_32_OE:
+	case SPA_AUDIO_FORMAT_S32:
+	case SPA_AUDIO_FORMAT_S32_OE:
+	case SPA_AUDIO_FORMAT_U32:
+	case SPA_AUDIO_FORMAT_U32_OE:
+	case SPA_AUDIO_FORMAT_F32:
+	case SPA_AUDIO_FORMAT_F32_OE:
+		return res * 4;
+	case SPA_AUDIO_FORMAT_F64:
+	case SPA_AUDIO_FORMAT_F64_OE:
+		return res * 8;
+	default:
+		return 0;
+	}
+}
+
+static int parse_audio_info(const struct pw_properties *props, struct spa_audio_info_raw *info)
+{
+	const char *str;
+
+	spa_zero(*info);
+	if ((str = pw_properties_get(props, PW_KEY_AUDIO_FORMAT)) == NULL)
+		str = DEFAULT_FORMAT;
+	info->format = format_from_name(str, strlen(str));
+
+	info->rate = pw_properties_get_uint32(props, PW_KEY_AUDIO_RATE, info->rate);
+	if (info->rate == 0)
+		info->rate = DEFAULT_RATE;
+
+	info->channels = pw_properties_get_uint32(props, PW_KEY_AUDIO_CHANNELS, info->channels);
+	info->channels = SPA_MIN(info->channels, SPA_AUDIO_MAX_CHANNELS);
+	if ((str = pw_properties_get(props, SPA_KEY_AUDIO_POSITION)) != NULL)
+		parse_position(info, str, strlen(str));
+	if (info->channels == 0)
+		parse_position(info, DEFAULT_POSITION, strlen(DEFAULT_POSITION));
+
+	return calc_frame_size(info);
+}
+
+static void copy_props(struct impl *impl, const char *key)
+{
+	const char *str;
+	if ((str = pw_properties_get(impl->props, key)) != NULL) {
+		if (pw_properties_get(impl->capture_props, key) == NULL)
+			pw_properties_set(impl->capture_props, key, str);
+		if (pw_properties_get(impl->playback_props, key) == NULL)
+			pw_properties_set(impl->playback_props, key, str);
 	}
-	return channels;
 }
 
 static int parse_params(struct impl *impl)
@@ -781,49 +919,62 @@
 		return -EINVAL;
 	}
 
-	if ((str = pw_properties_get(impl->props, "audio.format")) == NULL)
-		str = DEFAULT_FORMAT;
-	impl->info.format = format_from_name(str, strlen(str));
-	if (impl->info.format == SPA_AUDIO_FORMAT_UNKNOWN) {
-		pw_log_error("invalid format '%s'", str);
-		return -EINVAL;
-	}
-	impl->info.rate = pw_properties_get_uint32(impl->props, "audio.rate", DEFAULT_RATE);
-	if (impl->info.rate == 0) {
-		pw_log_error("invalid rate '%s'", str);
-		return -EINVAL;
-	}
-	impl->info.channels = pw_properties_get_uint32(impl->props, "audio.channels", DEFAULT_CHANNELS);
-	if (impl->info.channels == 0) {
-		pw_log_error("invalid channels '%s'", str);
-		return -EINVAL;
+	if (pw_properties_get(impl->props, PW_KEY_NODE_VIRTUAL) == NULL)
+		pw_properties_set(impl->props, PW_KEY_NODE_VIRTUAL, "true");
+	if (pw_properties_get(impl->props, PW_KEY_NODE_NETWORK) == NULL)
+		pw_properties_set(impl->props, PW_KEY_NODE_NETWORK, "true");
+
+	impl->capture_props = pw_properties_new(
+			PW_KEY_TARGET_OBJECT, pw_properties_get(impl->props, "capture.node"),
+			PW_KEY_STREAM_CAPTURE_SINK, pw_properties_get(impl->props,
+				PW_KEY_STREAM_CAPTURE_SINK),
+			NULL);
+	impl->playback_props = pw_properties_new(
+			PW_KEY_TARGET_OBJECT, pw_properties_get(impl->props, "playback.node"),
+			NULL);
+	if (impl->capture_props == NULL || impl->playback_props == NULL) {
+		pw_log_error("can't create props: %m");
+		return -errno;
 	}
-	if ((str = pw_properties_get(impl->props, "audio.position")) == NULL)
-		str = DEFAULT_POSITION;
-	if (parse_position(impl->info.position, str, strlen(str)) != impl->info.channels) {
-		pw_log_error("invalid position '%s'", str);
+
+	if ((str = pw_properties_get(impl->props, "capture.props")) != NULL)
+		pw_properties_update_string(impl->capture_props, str, strlen(str));
+	if ((str = pw_properties_get(impl->props, "playback.props")) != NULL)
+		pw_properties_update_string(impl->playback_props, str, strlen(str));
+
+	copy_props(impl, PW_KEY_AUDIO_FORMAT);
+	copy_props(impl, PW_KEY_AUDIO_RATE);
+	copy_props(impl, PW_KEY_AUDIO_CHANNELS);
+	copy_props(impl, SPA_KEY_AUDIO_POSITION);
+	copy_props(impl, PW_KEY_NODE_RATE);
+	copy_props(impl, PW_KEY_NODE_NAME);
+	copy_props(impl, PW_KEY_NODE_DESCRIPTION);
+	copy_props(impl, PW_KEY_NODE_GROUP);
+	copy_props(impl, PW_KEY_NODE_LATENCY);
+	copy_props(impl, PW_KEY_NODE_VIRTUAL);
+	copy_props(impl, PW_KEY_NODE_NETWORK);
+
+	impl->capture_frame_size = parse_audio_info(impl->capture_props, &impl->capture_info);
+	if (impl->capture_frame_size == 0) {
+		pw_log_error("unsupported capture audio format:%d channels:%d",
+				impl->capture_info.format, impl->capture_info.channels);
 		return -EINVAL;
 	}
 
-	switch (impl->info.format) {
-	case SPA_AUDIO_FORMAT_U8:
-		impl->frame_size = 1;
-		break;
-	case SPA_AUDIO_FORMAT_S16_LE:
-	case SPA_AUDIO_FORMAT_S16_BE:
-	case SPA_AUDIO_FORMAT_S16P:
-		impl->frame_size = 2;
-		break;
-	case SPA_AUDIO_FORMAT_S24_LE:
-	case SPA_AUDIO_FORMAT_S24_BE:
-	case SPA_AUDIO_FORMAT_S24P:
-		impl->frame_size = 3;
-		break;
-	default:
-		impl->frame_size = 4;
-		break;
+	impl->playback_frame_size = parse_audio_info(impl->playback_props, &impl->playback_info);
+	if (impl->playback_frame_size == 0) {
+		pw_log_error("unsupported playback audio format:%d channels:%d",
+				impl->playback_info.format, impl->playback_info.channels);
+		return -EINVAL;
 	}
-	impl->frame_size *= impl->info.channels;
+	if (impl->capture_info.rate != 0 &&
+	    pw_properties_get(impl->capture_props, PW_KEY_NODE_RATE) == NULL)
+		pw_properties_setf(impl->capture_props, PW_KEY_NODE_RATE,
+				"1/%u", impl->capture_info.rate);
+	if (impl->playback_info.rate != 0 &&
+	    pw_properties_get(impl->playback_props, PW_KEY_NODE_RATE) == NULL)
+		pw_properties_setf(impl->playback_props, PW_KEY_NODE_RATE,
+				"1/%u", impl->playback_info.rate);
 
 	if ((str = pw_properties_get(impl->props, "server.address")) == NULL)
 		str = DEFAULT_SERVER;
@@ -858,7 +1009,12 @@
 	struct pw_context *context = pw_impl_module_get_context(module);
 	struct pw_properties *props;
 	struct impl *impl;
+	struct server *s;
+	FILE *f;
+	char *str;
+	size_t size;
 	int res;
+	struct spa_dict_item it1;
 
 	PW_LOG_TOPIC_INIT(mod_topic);
 
@@ -887,6 +1043,32 @@
 	if ((res = parse_params(impl)) < 0)
 		goto error_free;
 
+	if ((f = open_memstream(&str, &size)) == NULL) {
+		res = -errno;
+		pw_log_error("Can't open memstream: %m");
+		goto error_free;
+	}
+
+	fprintf(f, "");
+
+	spa_list_for_each(s, &impl->server_list, link) {
+		char ip128;
+		uint16_t port = 0;
+		bool ipv4;
+
+		if (pw_net_get_ip(&s->addr, ip, sizeof(ip), &ipv4, &port) >= 0)
+			fprintf(f, " \"%s%s%s:%d\"", ipv4 ? "" : "",
+					ip, ipv4 ? "" : "", port);
+	}
+	fprintf(f, " ");
+	fclose(f);
+
+	pw_log_info("listening on %s", str);
+	it0 = SPA_DICT_ITEM_INIT("server.address", str);
+	pw_impl_module_update_properties(module, &SPA_DICT_INIT_ARRAY(it));
+
+	free(str);
+
 	return 0;
 
 error_free:

pipewire-1.0.1.tar.bz2/src/modules/module-pulse-tunnel.c -> pipewire-1.2.0.tar.gz/src/modules/module-pulse-tunnel.c Changed

@@ -58,6 +58,9 @@
  * - `pulse.server.address`: the address of the PulseAudio server to tunnel to.
  * - `pulse.latency`: the latency to end-to-end latency in milliseconds to
  *                    maintain (Default 200).
+ * - `reconnect.interval.ms`: when the remote connection is broken, retry to connect
+ *                  with this interval in millisconds. A value of 0 disables recovery
+ *                  and will result in a module unload. (Default 0) (Since 1.1.0)
  * - `stream.props`: Extra properties for the local stream.
  *
  * ## General options
@@ -87,6 +90,7 @@
  *         # Set the remote address to tunnel to
  *         pulse.server.address = "tcp:192.168.1.126"
  *         #pulse.latency = 200
+ *         #reconnect.interval.ms = 0
  *         #audio.rate=<sample rate>
  *         #audio.channels=<number of channels>
  *         #audio.position=<channel map>
@@ -121,6 +125,7 @@
 			"( audio.position=<channel map>  "			\
 			"pulse.server.address=<address> "			\
 			"( pulse.latency=<latency in msec, default 200> ) "	\
+			"( reconnect.interval.ms=<reconnect interval in msec, default 0> ) "	\
 			"( tunnel.mode=source|sink, default sink ) "				\
 			"( stream.props=<properties> ) "
 
@@ -184,9 +189,16 @@
 	float max_error;
 	unsigned resync:1;
 
-	unsigned int do_disconnect:1;
+	bool do_disconnect:1;
+	bool stopping;
+
+	struct spa_source *timer;
+	uint32_t reconnect_interval_ms;
+	bool recovering;
 };
 
+static int start_pulse_connection(struct impl *impl);
+
 static void cork_stream(struct impl *impl, bool cork)
 {
 	pa_operation *operation;
@@ -327,7 +339,7 @@
 	error = (float)impl->target_latency - (float)(current_latency);
 	error = SPA_CLAMP(error, -impl->max_error, impl->max_error);
 
-	corr = spa_dll_update(&impl->dll, error);
+	corr = (float)spa_dll_update(&impl->dll, error);
 	pw_log_debug("error:%f corr:%f current:%u target:%u",
 			error, corr,
 			current_latency, impl->target_latency);
@@ -463,8 +475,8 @@
 	struct spa_pod_builder b;
 	struct spa_latency_info latency;
 
-	impl->stream = pw_stream_new(impl->core, "pulse", impl->stream_props);
-	impl->stream_props = NULL;
+	impl->stream = pw_stream_new(impl->core, "pulse",
+			pw_properties_copy(impl->stream_props));
 
 	if (impl->stream == NULL)
 		return -errno;
@@ -503,66 +515,104 @@
 	return 0;
 }
 
+static void cleanup_streams(struct impl *impl)
+{
+	if (impl->pa_mainloop) {
+		pa_threaded_mainloop_stop(impl->pa_mainloop);
+		pa_threaded_mainloop_lock(impl->pa_mainloop);
+	}
+	if (impl->pa_stream) {
+		pa_stream_unref(impl->pa_stream);
+		impl->pa_stream = NULL;
+	}
+	if (impl->pa_context) {
+		pa_context_disconnect(impl->pa_context);
+		pa_context_unref(impl->pa_context);
+		impl->pa_context = NULL;
+	}
+	if (impl->pa_mainloop) {
+		pa_threaded_mainloop_unlock(impl->pa_mainloop);
+		pa_threaded_mainloop_free(impl->pa_mainloop);
+		impl->pa_mainloop = NULL;
+	}
+	if (impl->stream)
+		pw_stream_destroy(impl->stream);
+}
+
+static void on_timer_event(void *data, uint64_t expirations)
+{
+	struct impl *impl = data;
+	cleanup_streams(impl);
+	start_pulse_connection(impl);
+}
+
 static int
-do_schedule_destroy(struct spa_loop *loop,
+do_schedule_recovery(struct spa_loop *loop,
 	bool async, uint32_t seq, const void *data, size_t size, void *user_data)
 {
 	struct impl *impl = user_data;
-	if (impl->module)
-		pw_impl_module_schedule_destroy(impl->module);
+	if (impl->reconnect_interval_ms > 0) {
+		struct timespec value;
+		uint64_t timestamp;
+
+		timestamp = impl->reconnect_interval_ms * SPA_NSEC_PER_MSEC;
+		value.tv_sec = timestamp / SPA_NSEC_PER_SEC;
+		value.tv_nsec = timestamp % SPA_NSEC_PER_SEC;
+		pw_loop_update_timer(impl->main_loop, impl->timer, &value, NULL, false);
+	} else {
+		if (impl->module)
+			pw_impl_module_schedule_destroy(impl->module);
+	}
 	return 0;
 }
 
-static void module_schedule_destroy(struct impl *impl)
+static void schedule_recovery(struct impl *impl)
 {
-	pw_loop_invoke(impl->main_loop, do_schedule_destroy, 1, NULL, 0, false, impl);
+	if (!impl->stopping)
+		pw_loop_invoke(impl->main_loop, do_schedule_recovery, 1, NULL, 0, false, impl);
 }
 
-static void context_state_cb(pa_context *c, void *userdata)
+static int
+do_create_stream(struct spa_loop *loop,
+	bool async, uint32_t seq, const void *data, size_t size, void *user_data)
 {
-	struct impl *impl = userdata;
-	bool do_destroy = false;
-	switch (pa_context_get_state(c)) {
-	case PA_CONTEXT_TERMINATED:
-	case PA_CONTEXT_FAILED:
-		do_destroy = true;
-		SPA_FALLTHROUGH;
-	case PA_CONTEXT_READY:
-		pa_threaded_mainloop_signal(impl->pa_mainloop, 0);
-		break;
-	case PA_CONTEXT_UNCONNECTED:
-		do_destroy = true;
-		break;
-	case PA_CONTEXT_CONNECTING:
-	case PA_CONTEXT_AUTHORIZING:
-	case PA_CONTEXT_SETTING_NAME:
-		break;
+	struct impl *impl = user_data;
+	int res;
+	if (impl->stream == NULL) {
+		if ((res = create_stream(impl)) < 0) {
+			pw_log_error("failed to create stream: %s", spa_strerror(res));
+			if (impl->module)
+				pw_impl_module_schedule_destroy(impl->module);
+		}
 	}
-	if (do_destroy)
-		module_schedule_destroy(impl);
+	return 0;
 }
 
 static void stream_state_cb(pa_stream *s, void * userdata)
 {
 	struct impl *impl = userdata;
 	bool do_destroy = false;
-	switch (pa_stream_get_state(s)) {
-	case PA_STREAM_FAILED:
-	case PA_STREAM_TERMINATED:
-		do_destroy = true;
-		SPA_FALLTHROUGH;
+	pa_stream_state_t state = pa_stream_get_state(s);
+
+	pw_log_debug("stream state %d", state);
+
+	switch (state) {
+	case PA_STREAM_CREATING:
+		break;
 	case PA_STREAM_READY:
 		impl->pa_index = pa_stream_get_index(impl->pa_stream);
-		pa_threaded_mainloop_signal(impl->pa_mainloop, 0);
+		pw_loop_invoke(impl->main_loop, do_create_stream, 1, NULL, 0, false, impl);
 		break;
+	case PA_STREAM_FAILED:
+	case PA_STREAM_TERMINATED:
 	case PA_STREAM_UNCONNECTED:
 		do_destroy = true;
 		break;
-	case PA_STREAM_CREATING:
-		break;
 	}
-	if (do_destroy)
-		module_schedule_destroy(impl);
+	if (do_destroy) {
+		pw_log_warn("stream failure: %d", state);
+		schedule_recovery(impl);
+	}
 }
 
 static void stream_read_request_cb(pa_stream *s, size_t length, void *userdata)
@@ -697,14 +747,96 @@
 
 static void stream_latency_update_cb(pa_stream *s, void *userdata)
 {
-	struct impl *impl = userdata;
 	pa_usec_t usec;
 	int negative;
-
 	pa_stream_get_latency(s, &usec, &negative);
-
 	pw_log_debug("latency %ld negative %d", usec, negative);
-	pa_threaded_mainloop_signal(impl->pa_mainloop, 0);
+}
+
+static int create_pulse_stream(struct impl *impl)
+{
+	pa_sample_spec ss;
+	pa_channel_map map;
+	uint32_t latency_bytes, i, aux = 0;
+	const char *remote_node_target;
+	char stream_name1024;
+	pa_buffer_attr bufferattr;
+	int err = PA_ERR_IO;
+
+	ss.format = (pa_sample_format_t) format_id2pa(impl->info.format);
+	ss.channels = impl->info.channels;
+	ss.rate = impl->info.rate;
+
+	map.channels = impl->info.channels;
+	for (i = 0; i < map.channels; i++)
+		map.mapi = (pa_channel_position_t)channel_id2pa(impl->info.positioni, &aux);
+
+	snprintf(stream_name, sizeof(stream_name), _("Tunnel for %s@%s"),
+			pw_get_user_name(), pw_get_host_name());
+
+	pw_log_info("create stream %s", stream_name);
+
+	if (!(impl->pa_stream = pa_stream_new(impl->pa_context, stream_name, &ss, &map))) {
+		err = pa_context_errno(impl->pa_context);
+		goto exit;
+	}
+
+	pa_stream_set_state_callback(impl->pa_stream, stream_state_cb, impl);
+	pa_stream_set_read_callback(impl->pa_stream, stream_read_request_cb, impl);
+	pa_stream_set_write_callback(impl->pa_stream, stream_write_request_cb, impl);
+	pa_stream_set_underflow_callback(impl->pa_stream, stream_underflow_cb, impl);
+	pa_stream_set_overflow_callback(impl->pa_stream, stream_overflow_cb, impl);
+	pa_stream_set_latency_update_callback(impl->pa_stream, stream_latency_update_cb, impl);
+
+	remote_node_target = pw_properties_get(impl->props, PW_KEY_TARGET_OBJECT);
+
+	bufferattr.fragsize = (uint32_t) -1;
+	bufferattr.minreq = (uint32_t) -1;
+	bufferattr.maxlength = (uint32_t) -1;
+	bufferattr.prebuf = (uint32_t) -1;
+
+	latency_bytes = pa_usec_to_bytes(impl->latency_msec * SPA_USEC_PER_MSEC, &ss);
+
+	impl->target_latency = latency_bytes / impl->frame_size;
+
+	/* half in our buffer, half in the network + remote */
+	impl->target_buffer = latency_bytes / 2;
+
+	if (impl->mode == MODE_SOURCE) {
+		bufferattr.fragsize = latency_bytes / 2;
+
+		pa_context_subscribe(impl->pa_context,
+				PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT, NULL, impl);
+
+		if ((err = pa_stream_connect_record(impl->pa_stream,
+				remote_node_target, &bufferattr,
+				PA_STREAM_DONT_MOVE |
+				PA_STREAM_INTERPOLATE_TIMING |
+				PA_STREAM_ADJUST_LATENCY |
+				PA_STREAM_AUTO_TIMING_UPDATE)) != 0)
+			err = pa_context_errno(impl->pa_context);
+	} else {
+		bufferattr.tlength = latency_bytes / 2;
+		bufferattr.minreq = bufferattr.tlength / 4;
+		bufferattr.prebuf = bufferattr.tlength;
+
+		pa_context_subscribe(impl->pa_context,
+				PA_SUBSCRIPTION_MASK_SINK_INPUT, NULL, impl);
+
+		if ((err = pa_stream_connect_playback(impl->pa_stream,
+				remote_node_target, &bufferattr,
+				PA_STREAM_DONT_MOVE |
+				PA_STREAM_INTERPOLATE_TIMING |
+				PA_STREAM_ADJUST_LATENCY |
+				PA_STREAM_AUTO_TIMING_UPDATE,
+				NULL, NULL)) != 0)
+			err = pa_context_errno(impl->pa_context);
+	}
+
+exit:
+	if (err != PA_OK)
+		pw_log_error("failed to create stream: %s", pa_strerror(err));
+	return err_to_res(err);
 }
 
 static int
@@ -721,7 +853,7 @@
 	float soft_volsSPA_AUDIO_MAX_CHANNELS;
 
 	for (i = 0; i < impl->volume.channels; i++) {
-		volsi = pa_sw_volume_to_linear(impl->volume.valuesi);
+		volsi = (float)pa_sw_volume_to_linear(impl->volume.valuesi);
 		soft_volsi = 1.0f;
 	}
 
@@ -779,6 +911,36 @@
 				idx, sink_input_info_cb, impl);
 }
 
+static void context_state_cb(pa_context *c, void *userdata)
+{
+	struct impl *impl = userdata;
+	bool do_destroy = false;
+	pa_context_state_t state = pa_context_get_state(c);
+
+	pw_log_debug("state %d", state);
+
+	switch (state) {
+	case PA_CONTEXT_CONNECTING:
+	case PA_CONTEXT_AUTHORIZING:
+	case PA_CONTEXT_SETTING_NAME:
+		break;
+	case PA_CONTEXT_READY:
+		if (impl->pa_stream == NULL)
+			if (create_pulse_stream(impl) < 0)
+				do_destroy = true;
+		break;
+	case PA_CONTEXT_TERMINATED:
+	case PA_CONTEXT_UNCONNECTED:
+	case PA_CONTEXT_FAILED:
+		do_destroy = true;
+		break;
+	}
+	if (do_destroy) {
+		pw_log_warn("connection failure: %s", pa_strerror(pa_context_errno(c)));
+		schedule_recovery(impl);
+	}
+}
+
 static pa_proplist* tunnel_new_proplist(struct impl *impl)
 {
 	pa_proplist *proplist = pa_proplist_new();
@@ -788,20 +950,15 @@
 	return proplist;
 }
 
-static int create_pulse_stream(struct impl *impl)
+static int start_pulse_connection(struct impl *impl)
 {
-	pa_sample_spec ss;
-	pa_channel_map map;
-	const char *server_address, *remote_node_target;
+	const char *server_address;
 	pa_proplist *props = NULL;
 	pa_mainloop_api *api;
-	char stream_name1024;
-	pa_buffer_attr bufferattr;
-	int res = -EIO;
-	uint32_t latency_bytes, i, aux = 0;
+	int err = PA_ERR_IO;
 
 	if ((impl->pa_mainloop = pa_threaded_mainloop_new()) == NULL)
-		goto error;
+		goto exit;
 
 	api = pa_threaded_mainloop_get_api(impl->pa_mainloop);
 
@@ -810,15 +967,17 @@
 	pa_proplist_free(props);
 
 	if (impl->pa_context == NULL)
-		goto error;
+		goto exit;
 
 	pa_context_set_state_callback(impl->pa_context, context_state_cb, impl);
 
 	server_address = pw_properties_get(impl->props, "pulse.server.address");
 
+	pw_log_info("connecting to %s...", server_address);
+
 	if (pa_context_connect(impl->pa_context, server_address, 0, NULL) < 0) {
-		res = pa_context_errno(impl->pa_context);
-		goto error;
+		err = pa_context_errno(impl->pa_context);
+		goto exit;
 	}
 
 	pa_threaded_mainloop_lock(impl->pa_mainloop);
@@ -826,122 +985,18 @@
 	pa_context_set_subscribe_callback(impl->pa_context, context_subscribe_cb, impl);
 
 	if (pa_threaded_mainloop_start(impl->pa_mainloop) < 0)
-		goto error_unlock;
-
-	for (;;) {
-		pa_context_state_t state;
-
-		state = pa_context_get_state(impl->pa_context);
-		if (state == PA_CONTEXT_READY)
-			break;
-
-		if (!PA_CONTEXT_IS_GOOD(state)) {
-			res = pa_context_errno(impl->pa_context);
-			goto error_unlock;
-		}
-		/* Wait until the context is ready */
-		pa_threaded_mainloop_wait(impl->pa_mainloop);
-	}
-
-	ss.format = (pa_sample_format_t) format_id2pa(impl->info.format);
-	ss.channels = impl->info.channels;
-	ss.rate = impl->info.rate;
-
-	map.channels = impl->info.channels;
-	for (i = 0; i < map.channels; i++)
-		map.mapi = (pa_channel_position_t)channel_id2pa(impl->info.positioni, &aux);
-
-	snprintf(stream_name, sizeof(stream_name), _("Tunnel for %s@%s"),
-			pw_get_user_name(), pw_get_host_name());
-
-	if (!(impl->pa_stream = pa_stream_new(impl->pa_context, stream_name, &ss, &map))) {
-		res = pa_context_errno(impl->pa_context);
-		goto error_unlock;
-	}
-
-	pa_stream_set_state_callback(impl->pa_stream, stream_state_cb, impl);
-	pa_stream_set_read_callback(impl->pa_stream, stream_read_request_cb, impl);
-	pa_stream_set_write_callback(impl->pa_stream, stream_write_request_cb, impl);
-	pa_stream_set_underflow_callback(impl->pa_stream, stream_underflow_cb, impl);
-	pa_stream_set_overflow_callback(impl->pa_stream, stream_overflow_cb, impl);
-	pa_stream_set_latency_update_callback(impl->pa_stream, stream_latency_update_cb, impl);
-
-	remote_node_target = pw_properties_get(impl->props, PW_KEY_TARGET_OBJECT);
-
-	bufferattr.fragsize = (uint32_t) -1;
-	bufferattr.minreq = (uint32_t) -1;
-	bufferattr.maxlength = (uint32_t) -1;
-	bufferattr.prebuf = (uint32_t) -1;
-
-	latency_bytes = pa_usec_to_bytes(impl->latency_msec * SPA_USEC_PER_MSEC, &ss);
-
-	impl->target_latency = latency_bytes / impl->frame_size;
-
-	/* half in our buffer, half in the network + remote */
-	impl->target_buffer = latency_bytes / 2;
-
-	if (impl->mode == MODE_SOURCE) {
-		bufferattr.fragsize = latency_bytes / 2;
-
-		pa_context_subscribe(impl->pa_context,
-				PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT, NULL, impl);
-
-		res = pa_stream_connect_record(impl->pa_stream,
-				remote_node_target, &bufferattr,
-				PA_STREAM_DONT_MOVE |
-				PA_STREAM_INTERPOLATE_TIMING |
-				PA_STREAM_ADJUST_LATENCY |
-				PA_STREAM_AUTO_TIMING_UPDATE);
-	} else {
-		bufferattr.tlength = latency_bytes / 2;
-		bufferattr.minreq = bufferattr.tlength / 4;
-		bufferattr.prebuf = bufferattr.tlength;
-
-		pa_context_subscribe(impl->pa_context,
-				PA_SUBSCRIPTION_MASK_SINK_INPUT, NULL, impl);
-
-		res = pa_stream_connect_playback(impl->pa_stream,
-				remote_node_target, &bufferattr,
-				PA_STREAM_DONT_MOVE |
-				PA_STREAM_INTERPOLATE_TIMING |
-				PA_STREAM_ADJUST_LATENCY |
-				PA_STREAM_AUTO_TIMING_UPDATE,
-				NULL, NULL);
-	}
+		goto exit_unlock;
 
-	if (res < 0) {
-		res = pa_context_errno(impl->pa_context);
-		goto error_unlock;
-	}
+	err = PA_OK;
 
-	for (;;) {
-		pa_stream_state_t state;
-
-		state = pa_stream_get_state(impl->pa_stream);
-		if (state == PA_STREAM_READY)
-			break;
-
-		if (!PA_STREAM_IS_GOOD(state)) {
-			res = pa_context_errno(impl->pa_context);
-			goto error_unlock;
-		}
-
-		/* Wait until the stream is ready */
-		pa_threaded_mainloop_wait(impl->pa_mainloop);
-	}
-
-	pa_threaded_mainloop_unlock(impl->pa_mainloop);
-
-	return 0;
-
-error_unlock:
+exit_unlock:
 	pa_threaded_mainloop_unlock(impl->pa_mainloop);
-error:
-	pw_log_error("failed to connect: %s", pa_strerror(res));
-	return err_to_res(res);
+exit:
+	if (err != PA_OK)
+		pw_log_error("failed to connect: %s", pa_strerror(err));
+	return err_to_res(err);
 }
 
-
 static void core_error(void *data, uint32_t id, int seq, int res, const char *message)
 {
 	struct impl *impl = data;
@@ -975,20 +1030,10 @@
 
 static void impl_destroy(struct impl *impl)
 {
+	impl->stopping = true;
 
-	if (impl->pa_mainloop)
-		pa_threaded_mainloop_stop(impl->pa_mainloop);
-	if (impl->pa_stream)
-		pa_stream_unref(impl->pa_stream);
-	if (impl->pa_context) {
-		pa_context_disconnect(impl->pa_context);
-		pa_context_unref(impl->pa_context);
-	}
-	if (impl->pa_mainloop)
-		pa_threaded_mainloop_free(impl->pa_mainloop);
+	cleanup_streams(impl);
 
-	if (impl->stream)
-		pw_stream_destroy(impl->stream);
 	if (impl->core && impl->do_disconnect)
 		pw_core_disconnect(impl->core);
 
@@ -997,6 +1042,9 @@
 	pw_properties_free(impl->stream_props);
 	pw_properties_free(impl->props);
 
+	if (impl->timer)
+		pw_loop_destroy_source(impl->main_loop, impl->timer);
+
 	free(impl->buffer);
 	free(impl);
 }
@@ -1170,9 +1218,17 @@
 			goto error;
 		}
 	}
+	impl->reconnect_interval_ms = pw_properties_get_uint32(props,
+			"reconnect.interval.ms", 0);
 
-	impl->latency_msec = pw_properties_get_uint32(props, "pulse.latency", DEFAULT_LATENCY_MSEC);
+	impl->timer = pw_loop_add_timer(impl->main_loop, on_timer_event, impl);
+	if (impl->timer == NULL) {
+		res = -errno;
+		pw_log_error("can't create timer source: %m");
+		goto error;
+	}
 
+	impl->latency_msec = pw_properties_get_uint32(props, "pulse.latency", DEFAULT_LATENCY_MSEC);
 
 	if (pw_properties_get(props, PW_KEY_NODE_VIRTUAL) == NULL)
 		pw_properties_set(props, PW_KEY_NODE_VIRTUAL, "true");
@@ -1234,10 +1290,7 @@
 			&impl->core_listener,
 			&core_events, impl);
 
-	if ((res = create_pulse_stream(impl)) < 0)
-		goto error;
-
-	if ((res = create_stream(impl)) < 0)
+	if ((res = start_pulse_connection(impl)) < 0)
 		goto error;
 
 	pw_impl_module_add_listener(module, &impl->module_listener, &module_events, impl);

pipewire-1.0.1.tar.bz2/src/modules/module-raop-discover.c -> pipewire-1.2.0.tar.gz/src/modules/module-raop-discover.c Changed

@@ -45,6 +45,8 @@
  *
  * Options specific to the behavior of this module
  *
+ * - `roap.discover-local` = allow discovery of local services as well.
+ *    false by default.
  * - `raop.latency.ms` = latency for all streams in microseconds. This
  *    can be overwritten in the stream rules.
  * - `stream.rules` = <rules>: match rules, use create-stream actions. See
@@ -56,12 +58,11 @@
  * context.modules = 
  * {   name = libpipewire-raop-discover
  *     args = {
+ *         #roap.discover-local = false;
  *         #raop.latency.ms = 1000
  *         stream.rules = 
  *             {   matches = 
  *                     {    raop.ip = "~.*"
- *                          #raop.ip.version = 4 | 6
- *                          #raop.ip.version = 4
  *                          #raop.port = 1000
  *                          #raop.name = ""
  *                          #raop.hostname = ""
@@ -119,6 +120,8 @@
 struct impl {
 	struct pw_context *context;
 
+	bool discover_local;
+
 	struct pw_impl_module *module;
 	struct spa_hook module_listener;
 
@@ -247,7 +250,7 @@
 			value = "none";
 		pw_properties_set(props, "raop.encryption.type", value);
 	} else if (spa_streq(key, "cn")) {
-		/* Suported audio codecs:
+		/* Supported audio codecs:
 		 *  0 = PCM,
 		 *  1 = ALAC,
 		 *  2 = AAC,
@@ -365,11 +368,10 @@
 	struct impl *impl = userdata;
 	struct tunnel_info tinfo;
 	struct tunnel *t;
-	const char *str;
+	const char *str, *link_local_range = "169.254.";
 	AvahiStringList *l;
 	struct pw_properties *props = NULL;
-	char atAVAHI_ADDRESS_STR_MAX;
-	int ipv;
+	char atAVAHI_ADDRESS_STR_MAX, if_suffix16 = "";
 
 	if (event != AVAHI_RESOLVER_FOUND) {
 		pw_log_error("Resolving of '%s' failed: %s", name,
@@ -377,6 +379,12 @@
 		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 - skipping tunnel creation", at);
+		goto done;
+	}
+
 	tinfo = TUNNEL_INFO(.name = name);
 
 	t = find_tunnel(impl, &tinfo);
@@ -387,7 +395,7 @@
 		goto done;
 	}
 	if (t->module != NULL) {
-		pw_log_info("found duplicate mdns entry - skipping tunnel creation");
+		pw_log_info("found duplicate mdns entry for %s on IP %s - skipping tunnel creation", name, at);
 		goto done;
 	}
 
@@ -397,10 +405,13 @@
 		goto done;
 	}
 
-	avahi_address_snprint(at, sizeof(at), a);
-	ipv = protocol == AVAHI_PROTO_INET ? 4 : 6;
-	pw_properties_setf(props, "raop.ip", "%s", at);
-	pw_properties_setf(props, "raop.ip.version", "%d", ipv);
+	if (a->proto == AVAHI_PROTO_INET6 &&
+	    a->data.ipv6.address0 == 0xfe &&
+	    (a->data.ipv6.address1 & 0xc0) == 0x80)
+		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);
@@ -449,7 +460,7 @@
 	struct tunnel_info info;
 	struct tunnel *t;
 
-	if (flags & AVAHI_LOOKUP_RESULT_LOCAL)
+	if ((flags & AVAHI_LOOKUP_RESULT_LOCAL) && !impl->discover_local)
 		return;
 
 	info = TUNNEL_INFO(.name = name);
@@ -583,6 +594,9 @@
 	impl->context = context;
 	impl->properties = props;
 
+	impl->discover_local =  pw_properties_get_bool(impl->properties,
+			"raop.discover-local", 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));

pipewire-1.0.1.tar.bz2/src/modules/module-raop-sink.c -> pipewire-1.2.0.tar.gz/src/modules/module-raop-sink.c Changed

@@ -26,9 +26,11 @@
 #include <openssl/engine.h>
 #include <openssl/aes.h>
 #include <openssl/md5.h>
+#include <openssl/evp.h>
 
 #include "config.h"
 
+#include <spa/utils/cleanup.h>
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
@@ -39,10 +41,11 @@
 #include <spa/param/audio/raw.h>
 #include <spa/param/latency-utils.h>
 
-#include <pipewire/cleanup.h>
 #include <pipewire/impl.h>
 #include <pipewire/i18n.h>
 
+#include "network-utils.h"
+
 #include "module-raop/rtsp-client.h"
 #include "module-rtp/rtp.h"
 #include "module-rtp/stream.h"
@@ -123,7 +126,7 @@
 
 #define NAME "raop-sink"
 
-PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
+PW_LOG_TOPIC(mod_topic, "mod." NAME);
 #define PW_LOG_TOPIC_DEFAULT mod_topic
 
 #define BUFFER_SIZE		(1u<<22)
@@ -252,7 +255,7 @@
 	struct spa_source *server_source;
 
 	uint32_t psamples;
-	uint64_t rate;
+	uint32_t rate;
 	uint32_t mtu;
 	uint32_t stride;
 	uint32_t latency;
@@ -586,38 +589,25 @@
 static int connect_socket(struct impl *impl, int type, int fd, uint16_t port)
 {
 	const char *host;
-	struct sockaddr_in sa4;
-	struct sockaddr_in6 sa6;
-	struct sockaddr *sa;
-	size_t salen;
-	int res, af;
+	struct sockaddr_storage addr;
+	socklen_t len = 0;
+	int res;
 
 	host = pw_properties_get(impl->props, "raop.ip");
 	if (host == NULL)
 		return -EINVAL;
 
-	if (inet_pton(AF_INET, host, &sa4.sin_addr) > 0) {
-		sa4.sin_family = af = AF_INET;
-		sa4.sin_port = htons(port);
-		sa = (struct sockaddr *) &sa4;
-		salen = sizeof(sa4);
-	} else if (inet_pton(AF_INET6, host, &sa6.sin6_addr) > 0) {
-		sa6.sin6_family = af = AF_INET6;
-		sa6.sin6_port = htons(port);
-		sa = (struct sockaddr *) &sa6;
-		salen = sizeof(sa6);
-	} else {
-		pw_log_error("Invalid host '%s'", host);
+	if ((res = pw_net_parse_address(host, port, &addr, &len)) < 0) {
+		pw_log_error("Invalid host '%s' port:%d", host, port);
 		return -EINVAL;
 	}
-
 	if (fd < 0 &&
-	    (fd = socket(af, type | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)) < 0) {
+	    (fd = socket(addr.ss_family, type | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)) < 0) {
 		pw_log_error("socket failed: %m");
 		return -errno;
 	}
 
-	res = connect(fd, sa, salen);
+	res = connect(fd, (struct sockaddr*)&addr, len);
 	if (res < 0 && errno != EINPROGRESS) {
 		res = -errno;
 		pw_log_error("connect failed: %m");
@@ -864,7 +854,7 @@
 
 static uint32_t msec_to_samples(struct impl *impl, uint32_t msec)
 {
-	return msec * impl->rate / 1000;
+	return (uint64_t) msec * impl->rate / 1000;
 }
 
 static int rtsp_record_reply(void *data, int status, const struct spa_dict *headers, const struct pw_array *content)
@@ -880,6 +870,13 @@
 	struct timespec timeout, interval;
 
 	pw_log_info("record status: %d", status);
+	switch (status) {
+	case 200:
+		break;
+	default:
+		pw_impl_module_schedule_destroy(impl->module);
+		return 0;
+	}
 
 	timeout.tv_sec = 2;
 	timeout.tv_nsec = 0;
@@ -971,6 +968,7 @@
 	return;
 error:
 	pw_loop_update_io(impl->loop, impl->server_source, 0);
+	pw_impl_module_schedule_destroy(impl->module);
 }
 
 static int rtsp_setup_reply(void *data, int status, const struct spa_dict *headers, const struct pw_array *content)
@@ -982,6 +980,13 @@
 	uint16_t control_port, timing_port;
 
 	pw_log_info("setup status: %d", status);
+	switch (status) {
+	case 200:
+		break;
+	default:
+		pw_impl_module_schedule_destroy(impl->module);
+		return 0;
+	}
 
 	if ((str = spa_dict_lookup(headers, "Session")) == NULL) {
 		pw_log_error("missing Session header");
@@ -1110,6 +1115,13 @@
 	struct impl *impl = data;
 
 	pw_log_info("announce status: %d", status);
+	switch (status) {
+	case 200:
+		break;
+	default:
+		pw_impl_module_schedule_destroy(impl->module);
+		return 0;
+	}
 
 	pw_properties_set(impl->headers, "Apple-Challenge", NULL);
 
@@ -1232,7 +1244,7 @@
 				"a=rtpmap:96 AppleLossless\r\n"
 				"a=fmtp:96 %d 0 16 40 10 14 2 255 0 0 %u\r\n",
 				impl->session_id, ip_version, local_ip,
-				ip_version, host, impl->psamples, (uint32_t)impl->rate);
+				ip_version, host, impl->psamples, impl->rate);
 		if (!sdp)
 			return -errno;
 		break;
@@ -1247,7 +1259,7 @@
 				"a=fmtp:96 %d 0 16 40 10 14 2 255 0 0 %u\r\n"
 				"a=min-latency:%d",
 				impl->session_id, ip_version, local_ip,
-				ip_version, host, impl->psamples, (uint32_t)impl->rate,
+				ip_version, host, impl->psamples, impl->rate,
 				rtp_latency);
 		if (!sdp)
 			return -errno;
@@ -1284,7 +1296,7 @@
 				"a=rsaaeskey:%s\r\n"
 				"a=aesiv:%s\r\n",
 				impl->session_id, ip_version, local_ip,
-				ip_version, host, impl->psamples, (uint32_t)impl->rate,
+				ip_version, host, impl->psamples, impl->rate,
 				key, iv);
 		if (!sdp)
 			return -errno;
@@ -1302,6 +1314,13 @@
 	struct impl *impl = data;
 
 	pw_log_info("auth-setup status: %d", status);
+	switch (status) {
+	case 200:
+		break;
+	default:
+		pw_impl_module_schedule_destroy(impl->module);
+		return 0;
+	}
 
 	return rtsp_do_announce(impl);
 }
@@ -1332,6 +1351,9 @@
 		else
 			res = rtsp_do_announce(impl);
 		break;
+	default:
+		pw_impl_module_schedule_destroy(impl->module);
+		return 0;
 	}
 	return res;
 }
@@ -1405,6 +1427,9 @@
 		else
 			res = rtsp_do_announce(impl);
 		break;
+	default:
+		pw_impl_module_schedule_destroy(impl->module);
+		return 0;
 	}
 	return res;
 }
@@ -1521,8 +1546,6 @@
 		pw_impl_module_schedule_destroy(impl->module);
 		return;
 	}
-	if (started)
-		rtsp_do_record(impl);
 }
 
 static int rtsp_do_connect(struct impl *impl)
@@ -1616,7 +1639,7 @@
 					soft_volsi = 1.0f;
 				}
 				volume /= n_vols;
-				volume = SPA_CLAMPF(cbrt(volume) * 30 - 30, VOLUME_MIN, VOLUME_MAX);
+				volume = SPA_CLAMPF(cbrtf(volume) * 30 - 30, VOLUME_MIN, VOLUME_MAX);
 				impl->volume = volume;
 
 				rtsp_send_volume(impl);
@@ -1858,7 +1881,7 @@
 	if (pw_properties_get(props, PW_KEY_AUDIO_FORMAT) == NULL)
 		pw_properties_setf(props, PW_KEY_AUDIO_FORMAT, "%s", RAOP_FORMAT);
 	if (pw_properties_get(props, PW_KEY_AUDIO_RATE) == NULL)
-		pw_properties_setf(props, PW_KEY_AUDIO_RATE, "%ld", impl->rate);
+		pw_properties_setf(props, PW_KEY_AUDIO_RATE, "%u", impl->rate);
 	if (pw_properties_get(props, PW_KEY_DEVICE_ICON_NAME) == NULL)
 		pw_properties_set(props, PW_KEY_DEVICE_ICON_NAME, "audio-speakers");
 	if (pw_properties_get(props, PW_KEY_NODE_NAME) == NULL)
@@ -1869,7 +1892,7 @@
 	if (pw_properties_get(props, PW_KEY_NODE_DESCRIPTION) == NULL)
 		pw_properties_setf(props, PW_KEY_NODE_DESCRIPTION, "%s", name);
 	if (pw_properties_get(props, PW_KEY_NODE_LATENCY) == NULL)
-		pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%d/%ld",
+		pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%u/%u",
 				impl->psamples, impl->rate);
 	if (pw_properties_get(props, PW_KEY_NODE_VIRTUAL) == NULL)
 		pw_properties_set(props, PW_KEY_NODE_VIRTUAL, "true");
@@ -1882,7 +1905,7 @@
 	if (pw_properties_get(props, "rtp.sender-ts-offset") == NULL)
 		pw_properties_setf(props, "rtp.sender-ts-offset", "%d", 0);
 	if (pw_properties_get(props, "sess.ts-direct") == NULL)
-		pw_properties_set(props, "sess.ts-direct", 0);
+		pw_properties_setf(props, "sess.ts-direct", "%d", 0);
 	if (pw_properties_get(props, "sess.media") == NULL)
 		pw_properties_set(props, "sess.media", "raop");
 	if (pw_properties_get(props, "sess.latency.msec") == NULL)

pipewire-1.0.1.tar.bz2/src/modules/module-roc-sink.c -> pipewire-1.2.0.tar.gz/src/modules/module-roc-sink.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-roc-source.c -> pipewire-1.2.0.tar.gz/src/modules/module-roc-source.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-rt.c -> pipewire-1.2.0.tar.gz/src/modules/module-rt.c Changed

@@ -54,6 +54,7 @@
 
 #ifdef HAVE_DBUS
 #include <spa/support/dbus.h>
+#include <spa-private/dbus-helpers.h>
 #include <dbus/dbus.h>
 #endif
 
@@ -135,7 +136,7 @@
 
 #define DEFAULT_NICE_LEVEL	20 	/* invalid value by default, see above */
 #define DEFAULT_RT_PRIO_MIN	11
-#define DEFAULT_RT_PRIO		88
+#define DEFAULT_RT_PRIO		RTPRIO_CLIENT
 #define DEFAULT_RT_TIME_SOFT	-1
 #define DEFAULT_RT_TIME_HARD	-1
 
@@ -337,102 +338,73 @@
 static long long rtkit_get_int_property(struct impl *impl, const char *propname,
 					long long *propval)
 {
-	DBusMessage *m = NULL, *r = NULL;
+	spa_autoptr(DBusMessage) m = NULL, r = NULL;
 	DBusMessageIter iter, subiter;
 	dbus_int64_t i64;
 	dbus_int32_t i32;
-	DBusError error;
-	int current_type;
-	long long ret;
 	struct pw_rtkit_bus *connection = impl->rtkit_bus;
 
-	dbus_error_init(&error);
-
 	if (!(m = dbus_message_new_method_call(impl->service_name,
 					       impl->object_path,
 					       "org.freedesktop.DBus.Properties", "Get"))) {
-		ret = -ENOMEM;
-		goto finish;
+		return -ENOMEM;
 	}
 
 	if (!dbus_message_append_args(m,
 				      DBUS_TYPE_STRING, &impl->interface,
 				      DBUS_TYPE_STRING, &propname, DBUS_TYPE_INVALID)) {
-		ret = -ENOMEM;
-		goto finish;
-	}
-
-	if (!(r = dbus_connection_send_with_reply_and_block(connection->bus, m, -1, &error))) {
-		ret = translate_error(error.name);
-		goto finish;
+		return -ENOMEM;
 	}
 
-	if (dbus_set_error_from_message(&error, r)) {
-		ret = translate_error(error.name);
-		goto finish;
-	}
+	spa_auto(DBusError) error = DBUS_ERROR_INIT;
 
-	ret = -EBADMSG;
-	dbus_message_iter_init(r, &iter);
-	while ((current_type = dbus_message_iter_get_arg_type(&iter)) != DBUS_TYPE_INVALID) {
+	if (!(r = dbus_connection_send_with_reply_and_block(connection->bus, m, -1, &error)))
+		return translate_error(error.name);
 
-		if (current_type == DBUS_TYPE_VARIANT) {
-			dbus_message_iter_recurse(&iter, &subiter);
+	if (dbus_set_error_from_message(&error, r))
+		return translate_error(error.name);
 
-			while ((current_type =
-				dbus_message_iter_get_arg_type(&subiter)) != DBUS_TYPE_INVALID) {
+	if (!dbus_message_has_signature(r, "v"))
+		return -EBADMSG;
 
-				if (current_type == DBUS_TYPE_INT32) {
-					dbus_message_iter_get_basic(&subiter, &i32);
-					*propval = i32;
-					ret = 0;
-				}
-
-				if (current_type == DBUS_TYPE_INT64) {
-					dbus_message_iter_get_basic(&subiter, &i64);
-					*propval = i64;
-					ret = 0;
-				}
+	dbus_message_iter_init(r, &iter);
 
-				dbus_message_iter_next(&subiter);
-			}
-		}
-		dbus_message_iter_next(&iter);
+	if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT)
+		return -EBADMSG;
+
+	dbus_message_iter_recurse(&iter, &subiter);
+
+	switch (dbus_message_iter_get_arg_type(&subiter)) {
+	case DBUS_TYPE_INT32:
+		dbus_message_iter_get_basic(&subiter, &i32);
+		*propval = i32;
+		break;
+	case DBUS_TYPE_INT64:
+		dbus_message_iter_get_basic(&subiter, &i64);
+		*propval = i64;
+		break;
+	default:
+		return -EBADMSG;
 	}
 
-finish:
-
-	if (m)
-		dbus_message_unref(m);
-
-	if (r)
-		dbus_message_unref(r);
-
-	dbus_error_free(&error);
-
-	return ret;
+	return 0;
 }
 
 static int pw_rtkit_make_realtime(struct impl *impl, pid_t thread, int priority)
 {
-	DBusMessage *m = NULL;
+	spa_autoptr(DBusMessage) m = NULL;
 	dbus_uint64_t pid;
 	dbus_uint64_t u64;
-	dbus_uint32_t u32, serial;
-	DBusError error;
-	int ret;
+	dbus_uint32_t u32;
 	struct pw_rtkit_bus *connection = impl->rtkit_bus;
 
-	dbus_error_init(&error);
-
 	if (thread == 0)
 		thread = _gettid();
 
 	if (!(m = dbus_message_new_method_call(impl->service_name,
 					       impl->object_path, impl->interface,
 					       "MakeThreadRealtimeWithPID"))) {
-		ret = -ENOMEM;
-		goto finish;
+		return -ENOMEM;
 	}
 
 	pid = (dbus_uint64_t) getpid();
@@ -443,33 +415,21 @@
 				      DBUS_TYPE_UINT64, &pid,
 				      DBUS_TYPE_UINT64, &u64,
 				      DBUS_TYPE_UINT32, &u32, DBUS_TYPE_INVALID)) {
-		ret = -ENOMEM;
-		goto finish;
-	}
-
-	if (!dbus_connection_send(connection->bus, m, &serial)) {
-		ret = translate_error(error.name);
-		goto finish;
+		return -ENOMEM;
 	}
-	ret = 0;
-
-finish:
 
-	if (m)
-		dbus_message_unref(m);
+	if (!dbus_connection_send(connection->bus, m, NULL))
+		return -EIO;
 
-	return ret;
+	return 0;
 }
 
-
 static int pw_rtkit_make_high_priority(struct impl *impl, pid_t thread, int nice_level)
 {
-	DBusMessage *m = NULL;
+	spa_autoptr(DBusMessage) m = NULL;
 	dbus_uint64_t pid;
 	dbus_uint64_t u64;
 	dbus_int32_t s32;
-	dbus_uint32_t serial;
-	int ret;
 	struct pw_rtkit_bus *connection = impl->rtkit_bus;
 
 	if (thread == 0)
@@ -478,8 +438,7 @@
 	if (!(m = dbus_message_new_method_call(impl->service_name,
 					       impl->object_path, impl->interface,
 					       "MakeThreadHighPriorityWithPID"))) {
-		ret = -ENOMEM;
-		goto finish;
+		return -ENOMEM;
 	}
 
 	pid = (dbus_uint64_t) getpid();
@@ -490,21 +449,13 @@
 				      DBUS_TYPE_UINT64, &pid,
 				      DBUS_TYPE_UINT64, &u64,
 				      DBUS_TYPE_INT32, &s32, DBUS_TYPE_INVALID)) {
-		ret = -ENOMEM;
-		goto finish;
-	}
-	if (!dbus_connection_send(connection->bus, m, &serial)) {
-		ret = -EIO;
-		goto finish;
+		return -ENOMEM;
 	}
-	ret = 0;
-
-finish:
 
-	if (m)
-		dbus_message_unref(m);
+	if (!dbus_connection_send(connection->bus, m, NULL))
+		return -EIO;
 
-	return ret;
+	return 0;
 }
 #endif /* HAVE_DBUS */
 
@@ -573,6 +524,7 @@
 			pw_log_warn("Failed to check RLIMIT_RTPRIO: %s", strerror(err));
 			break;
 		}
+		min = max = 0;
 		if ((err = get_rt_priority_range(&min, &max)) < 0) {
 			pw_log_warn("Failed to get priority range: %s", strerror(err));
 			break;
@@ -696,6 +648,7 @@
 	struct sched_param sp;
 	pthread_t pt = (pthread_t)thread;
 
+	min = max = 0;
 	if ((err = get_rt_priority_range(&min, &max)) < 0)
 		return err;
 
@@ -1003,7 +956,7 @@
 			impl->interface = RTKIT_INTERFACE;
 		} else {
 			res = -errno;
-			pw_log_warn("Realtime scheduling disabled: unsufficient realtime privileges, "
+			pw_log_warn("Realtime scheduling disabled: insufficient realtime privileges, "
 				"Portal not found on session bus, and no system bus for RTKit: %m");
 			return res;
 		}
@@ -1055,7 +1008,7 @@
 }
 #endif /* HAVE_DBUS */
 
-int set_uclamp(int uclamp_min, int uclamp_max, pid_t pid) {
+static int set_uclamp(int uclamp_min, int uclamp_max, pid_t pid) {
 #ifdef __linux__
 	int ret;
 	struct sched_attr {

pipewire-1.0.1.tar.bz2/src/modules/module-rtp-sap.c -> pipewire-1.2.0.tar.gz/src/modules/module-rtp-sap.c Changed

@@ -15,17 +15,22 @@
 #include <net/if.h>
 #include <ctype.h>
 
+#include <spa/utils/cleanup.h>
 #include <spa/utils/hook.h>
 #include <spa/utils/result.h>
+#include <spa/utils/json.h>
 #include <spa/debug/types.h>
 
 #include <pipewire/pipewire.h>
 #include <pipewire/impl.h>
 
 #include <module-rtp/sap.h>
+#include <module-rtp/ptp.h>
+#include "network-utils.h"
 
 #ifdef __FreeBSD__
 #define ifr_ifindex ifr_index
+#define SO_PASSCRED LOCAL_CREDS_PERSISTENT
 #endif
 
 /** \page page_module_rtp_sap SAP Announce and create RTP streams
@@ -56,6 +61,8 @@
  * - `net.ttl = <int>`: TTL to use, default 1
  * - `net.loop = <bool>`: loopback multicast, default false
  * - `stream.rules` = <rules>: match rules, use create-stream and announce-stream actions
+ * - `sap.preamble-extra = strings`: extra attributes to add to the atomic SDP preamble
+ * - `sap.end-extra = strings`: extra attributes to add to the end of the SDP message
  *
  * ## General options
  *
@@ -78,7 +85,7 @@
  *         stream.rules = 
  *             {   matches = 
  *                     # any of the items in matches needs to match, if one does,
- *                     # actions are emited.
+ *                     # actions are emitted.
  *                     {   # all keys must match the value. ! negates. ~ starts regex.
  *                         #rtp.origin = "wim 3883629975 0 IN IP4 0.0.0.0"
  *                         #rtp.payload = "127"
@@ -142,6 +149,7 @@
 #define DEFAULT_SAP_PORT	9875
 
 #define DEFAULT_SOURCE_IP	"0.0.0.0"
+#define DEFAULT_SOURCE_IP6	"::"
 #define DEFAULT_TTL		1
 #define DEFAULT_LOOP		false
 
@@ -161,9 +169,18 @@
 	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
 };
 
+#define PTP_MESSAGE_TYPE_MANAGEMENT 0x0d
+#define PTP_VERSION_1588_2008_2_1 0x12
+#define PTP_DEFAULT_LOG_MESSAGE_INTERVAL 127
+#define PTP_MGMT_ACTION_GET 0
+#define PTP_MGMT_ACTION_RESPONSE 2
+#define PTP_TLV_TYPE_MGMT 0x0001
+#define PTP_MGMT_ID_PARENT_DATA_SET 0x2002
+
 struct sdp_info {
 	uint16_t hash;
 	uint32_t ntp;
+	uint32_t t_ntp;
 
 	char *origin;
 	char *session_name;
@@ -183,6 +200,7 @@
 	uint32_t channels;
 
 	float ptime;
+	uint32_t framecount;
 
 	uint32_t ts_offset;
 	char *ts_refclk;
@@ -193,6 +211,7 @@
 
 	bool announce;
 	uint64_t timestamp;
+	bool ts_refclk_ptp;
 
 	struct impl *impl;
 	struct node *node;
@@ -254,6 +273,15 @@
 
 	uint32_t n_sessions;
 	struct spa_list sessions;
+
+	char *extra_attrs_preamble;
+	char *extra_attrs_end;
+
+	char *ptp_mgmt_socket;
+	int ptp_fd;
+	uint32_t ptp_seq;
+	uint8_t clock_id8;
+	uint8_t gm_id8;
 };
 
 struct format_info {
@@ -296,11 +324,16 @@
 	spa_zero(*info);
 }
 
-static void session_touch(struct session *sess)
+static uint64_t get_time_nsec(struct impl *impl)
 {
 	struct timespec ts;
 	clock_gettime(CLOCK_MONOTONIC, &ts);
-	sess->timestamp = SPA_TIMESPEC_TO_NSEC(&ts);
+	return SPA_TIMESPEC_TO_NSEC(&ts);
+}
+
+static void session_touch(struct session *sess)
+{
+	sess->timestamp = get_time_nsec(sess->impl);
 }
 
 static void session_free(struct session *sess)
@@ -326,26 +359,6 @@
 	free(sess);
 }
 
-static int parse_address(const char *address, uint16_t port,
-		struct sockaddr_storage *addr, socklen_t *len)
-{
-	struct sockaddr_in *sa4 = (struct sockaddr_in*)addr;
-	struct sockaddr_in6 *sa6 = (struct sockaddr_in6*)addr;
-
-	if (inet_pton(AF_INET, address, &sa4->sin_addr) > 0) {
-		sa4->sin_family = AF_INET;
-		sa4->sin_port = htons(port);
-		*len = sizeof(*sa4);
-	} else if (inet_pton(AF_INET6, address, &sa6->sin6_addr) > 0) {
-		sa6->sin6_family = AF_INET6;
-		sa6->sin6_port = htons(port);
-		*len = sizeof(*sa6);
-	} else
-		return -EINVAL;
-
-	return 0;
-}
-
 static bool is_multicast(struct sockaddr *sa, socklen_t salen)
 {
 	if (sa->sa_family == AF_INET) {
@@ -359,6 +372,33 @@
 	return false;
 }
 
+static int make_unix_socket(const char *path) {
+	struct sockaddr_un addr;
+
+	spa_autoclose int fd = socket(AF_UNIX, SOCK_DGRAM, 0);
+	if (fd < 0) {
+		pw_log_warn("Failed to create PTP management socket");
+		return -1;
+	}
+
+	int val = 1;
+	if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &val, sizeof(val)) < 0) {
+		pw_log_warn("Failed to bind PTP management socket");
+		return -1;
+	}
+
+	spa_zero(addr);
+	addr.sun_family = AF_UNIX;
+	strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1);
+
+	if (connect(fd, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
+		pw_log_warn("Failed to connect PTP management socket");
+		return -1;
+	}
+
+	return spa_steal_fd(fd);
+}
+
 static int make_send_socket(
 		struct sockaddr_storage *src, socklen_t src_len,
 		struct sockaddr_storage *sa, socklen_t salen,
@@ -366,7 +406,7 @@
 {
 	int af, fd, val, res;
 
-	af = sa->ss_family;
+	af = src->ss_family;
 	if ((fd = socket(af, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)) < 0) {
 		pw_log_error("socket failed: %m");
 		return -errno;
@@ -382,13 +422,23 @@
 		goto error;
 	}
 	if (is_multicast((struct sockaddr*)sa, salen)) {
-		val = loop;
-		if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP, &val, sizeof(val)) < 0)
-			pw_log_warn("setsockopt(IP_MULTICAST_LOOP) failed: %m");
+		if (sa->ss_family == AF_INET) {
+			val = loop;
+			if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP, &val, sizeof(val)) < 0)
+				pw_log_warn("setsockopt(IP_MULTICAST_LOOP) failed: %m");
+
+			val = ttl;
+			if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_TTL, &val, sizeof(val)) < 0)
+				pw_log_warn("setsockopt(IP_MULTICAST_TTL) failed: %m");
+		} else {
+			val = loop;
+			if (setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &val, sizeof(val)) < 0)
+				pw_log_warn("setsockopt(IPV6_MULTICAST_LOOP) failed: %m");
 
-		val = ttl;
-		if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_TTL, &val, sizeof(val)) < 0)
-			pw_log_warn("setsockopt(IP_MULTICAST_TTL) failed: %m");
+			val = ttl;
+			if (setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &val, sizeof(val)) < 0)
+				pw_log_warn("setsockopt(IPV6_MULTICAST_HOPS) failed: %m");
+		}
 	}
 	return fd;
 error:
@@ -401,6 +451,7 @@
 {
 	int af, fd, val, res;
 	struct ifreq req;
+	char addr128;
 
 	af = sa->ss_family;
 	if ((fd = socket(af, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)) < 0) {
@@ -429,6 +480,8 @@
 			memset(&mr4, 0, sizeof(mr4));
 			mr4.imr_multiaddr = sa4->sin_addr;
 			mr4.imr_ifindex = req.ifr_ifindex;
+			pw_net_get_ip(sa, addr, sizeof(addr), NULL, NULL);
+			pw_log_info("join IPv4 group: %s iface:%d", addr, req.ifr_ifindex);
 			res = setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mr4, sizeof(mr4));
 		} else {
 			sa4->sin_addr.s_addr = INADDR_ANY;
@@ -440,6 +493,8 @@
 			memset(&mr6, 0, sizeof(mr6));
 			mr6.ipv6mr_multiaddr = sa6->sin6_addr;
 			mr6.ipv6mr_interface = req.ifr_ifindex;
+			pw_net_get_ip(sa, addr, sizeof(addr), NULL, NULL);
+			pw_log_info("join IPv6 group: %s iface:%d", addr, req.ifr_ifindex);
 			res = setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mr6, sizeof(mr6));
 		} else {
 		        sa6->sin6_addr = in6addr_any;
@@ -466,20 +521,116 @@
 	return res;
 }
 
-static int get_ip(const struct sockaddr_storage *sa, char *ip, size_t len, bool *ip4)
+static void update_ts_refclk(struct impl *impl)
 {
-	if (sa->ss_family == AF_INET) {
-		struct sockaddr_in *in = (struct sockaddr_in*)sa;
-		inet_ntop(sa->ss_family, &in->sin_addr, ip, len);
-	} else if (sa->ss_family == AF_INET6) {
-		struct sockaddr_in6 *in = (struct sockaddr_in6*)sa;
-		inet_ntop(sa->ss_family, &in->sin6_addr, ip, len);
-		*ip4 = false;
-	} else
-		return -EIO;
-	if (ip4)
-		*ip4 = sa->ss_family == AF_INET;
-	return 0;
+	if (!impl->ptp_mgmt_socket || impl->ptp_fd < 0)
+		return;
+
+	// Read if something is left in the socket
+	int avail;
+	ioctl(impl->ptp_fd, FIONREAD, &avail);
+	uint8_t tmp;
+	while (avail--) read(impl->ptp_fd, &tmp, 1);
+
+	struct ptp_management_msg req;
+	spa_zero(req);
+
+	req.major_sdo_id_message_type = PTP_MESSAGE_TYPE_MANAGEMENT;
+	req.ver = PTP_VERSION_1588_2008_2_1;
+	req.message_length_be = htobe16(sizeof(struct ptp_management_msg));
+	spa_zero(req.clock_identity);
+	req.source_port_id_be = htobe16(getpid());
+	req.log_message_interval = 127;
+	req.sequence_id_be = htobe16(impl->ptp_seq++);
+	memset(req.target_port_identity, 0xff, 8);
+	req.target_port_id_be = htobe16(0xffff);
+	req.starting_boundary_hops = 1;
+	req.boundary_hops = 1;
+	req.action = PTP_MGMT_ACTION_GET;
+	req.tlv_type_be = htobe16(PTP_TLV_TYPE_MGMT);
+	// sent empty TLV, only sending management_id
+	req.management_message_length_be = htobe16(2);
+	req.management_id_be = htobe16(PTP_MGMT_ID_PARENT_DATA_SET);
+
+	if (write(impl->ptp_fd, &req, sizeof(req)) == -1) {
+		pw_log_warn("Failed to send PTP management request: %m");
+		return;
+	}
+
+	uint8_t bufsizeof(struct ptp_management_msg) + sizeof(struct ptp_parent_data_set);
+	if (read(impl->ptp_fd, &buf, sizeof(buf)) == -1) {
+		pw_log_warn("Failed to receive PTP management response: %m");
+		return;
+	}
+
+	struct ptp_management_msg res = *(struct ptp_management_msg *)buf;
+	struct ptp_parent_data_set parent =
+		*(struct ptp_parent_data_set *)(buf + sizeof(struct ptp_management_msg));
+
+	if ((res.ver & 0x0f) != 2) {
+		pw_log_warn("PTP major version is %d, expected 2", res.ver);
+		return;
+	}
+
+	if ((res.major_sdo_id_message_type & 0x0f) != PTP_MESSAGE_TYPE_MANAGEMENT) {
+		pw_log_warn("PTP management returned type %x, expected management", res.major_sdo_id_message_type);
+		return;
+	}
+
+	if (res.action != PTP_MGMT_ACTION_RESPONSE) {
+		pw_log_warn("PTP management returned action %d, expected response", res.action);
+		return;
+	}
+
+	if (be16toh(res.tlv_type_be) != PTP_TLV_TYPE_MGMT) {
+		pw_log_warn("PTP management returned tlv type %d, expected management", be16toh(res.tlv_type_be));
+		return;
+	}
+
+	if (be16toh(res.management_id_be) != PTP_MGMT_ID_PARENT_DATA_SET) {
+		pw_log_warn("PTP management returned ID %d, expected PARENT_DATA_SET", be16toh(res.management_id_be));
+		return;
+	}
+
+	uint16_t data_len = be16toh(res.management_message_length_be) - 2;
+	if (data_len != sizeof(struct ptp_parent_data_set))
+		pw_log_warn("Unexpected PTP GET PARENT_DATA_SET response length %u, expected %zu", data_len, sizeof(struct ptp_parent_data_set));
+
+	uint8_t *cid = res.clock_identity;
+	if (memcmp(cid, impl->clock_id, 8) != 0)
+		pw_log_info(
+			"Local clock ID: IEEE1588-2008:%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X:%d",
+			cid0,
+			cid1,
+			cid2,
+			cid3,
+			cid4,
+			cid5,
+			cid6,
+			cid7,
+			0 /* domain */
+	  );
+
+	uint8_t *gmid = parent.gm_clock_id;
+	if (memcmp(gmid, impl->gm_id, 8) != 0)
+		pw_log_info(
+			"GM ID: IEEE1588-2008:%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X:%d",
+			gmid0,
+			gmid1,
+			gmid2,
+			gmid3,
+			gmid4,
+			gmid5,
+			gmid6,
+			gmid7,
+			0 /* domain */
+	  );
+
+	// When GM is not equal to own clock we are clocked by external master
+	pw_log_debug("Synced to GM: %s", (memcmp(cid, gmid, 8) != 0) ? "true" : "false");
+
+	memcpy(impl->clock_id, cid, 8);
+	memcpy(impl->gm_id, gmid, 8);
 }
 
 static int send_sap(struct impl *impl, struct session *sess, bool bye)
@@ -506,7 +657,7 @@
 	iov0.iov_base = &header;
 	iov0.iov_len = sizeof(header);
 
-	if ((res = get_ip(&impl->src_addr, src_addr, sizeof(src_addr), &src_ip4)) < 0)
+	if ((res = pw_net_get_ip(&impl->src_addr, src_addr, sizeof(src_addr), &src_ip4, NULL)) < 0)
 		return res;
 
 	if (src_ip4) {
@@ -520,7 +671,7 @@
 	iov2.iov_base = SAP_MIME_TYPE;
 	iov2.iov_len = sizeof(SAP_MIME_TYPE);
 
-	if ((res = get_ip(&sdp->dst_addr, dst_addr, sizeof(dst_addr), &dst_ip4)) < 0)
+	if ((res = pw_net_get_ip(&sdp->dst_addr, dst_addr, sizeof(dst_addr), &dst_ip4, NULL)) < 0)
 		return res;
 
 	if ((user_name = pw_get_user_name()) == NULL)
@@ -544,14 +695,25 @@
 			user_name, sdp->ntp, src_ip4 ? "IP4" : "IP6", src_addr,
 			sdp->session_name,
 			dst_ip4 ? "IP4" : "IP6", dst_addr, dst_ttl,
-			sdp->ntp,
+			sdp->t_ntp,
 			sdp->media_type, sdp->dst_port, sdp->payload);
 
+	if (impl->extra_attrs_preamble)
+		spa_strbuf_append(&buf, "%s", impl->extra_attrs_preamble);
+
 	if (sdp->channels) {
 		if (sdp->channelmap0 != 0) {
+			// Produce Audinate format channel record. It's recognized by RAVENNA
 			spa_strbuf_append(&buf,
 				"i=%d channels: %s\n", sdp->channels,
 				sdp->channelmap);
+		} else {
+			spa_strbuf_append(&buf, "i=%d channels:", sdp->channels);
+			for (uint i = 1; i <= sdp->channels; i++) {
+				if (i > 1) spa_strbuf_append(&buf, ",");
+				spa_strbuf_append(&buf, " AUX%u", i);
+			}
+			spa_strbuf_append(&buf, "\n");
 		}
 		spa_strbuf_append(&buf,
 			"a=recvonly\n"
@@ -564,16 +726,37 @@
 				sdp->payload, sdp->mime_type, sdp->rate);
 	}
 
+	if (is_multicast((struct sockaddr*)&sdp->dst_addr, sdp->dst_len))
+		spa_strbuf_append(&buf,
+			"a=source-filter: incl IN %s %s %s\n", dst_ip4 ? "IP4" : "IP6",
+				dst_addr, src_addr);
+
 	if (sdp->ptime > 0)
 		spa_strbuf_append(&buf,
 			"a=ptime:%.6g\n", sdp->ptime);
 
-	if (sdp->ts_refclk != NULL) {
+	if (sdp->framecount > 0)
 		spa_strbuf_append(&buf,
-				"a=ts-refclk:%s\n"
-				"a=mediaclk:direct=%u\n",
-				sdp->ts_refclk,
-				sdp->ts_offset);
+			"a=framecount:%u\n", sdp->framecount);
+
+	if (sdp->ts_refclk != NULL || sess->ts_refclk_ptp) {
+		// Only broadcast the GM ID when we are synced to external time source
+		if (sess->ts_refclk_ptp && memcmp(impl->clock_id, impl->gm_id, 8) != 0) {
+			spa_strbuf_append(&buf,
+					"a=ts-refclk:ptp=IEEE1588-2008:%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X:%d\n",
+					impl->gm_id0,
+					impl->gm_id1,
+					impl->gm_id2,
+					impl->gm_id3,
+					impl->gm_id4,
+					impl->gm_id5,
+					impl->gm_id6,
+					impl->gm_id7,
+					0/* domain */);
+		} else {
+			spa_strbuf_append(&buf,	"a=ts-refclk:%s\n",	sdp->ts_refclk);
+		}
+		spa_strbuf_append(&buf,	"a=mediaclk:direct=%u\n",	sdp->ts_offset);
 	} else {
 		spa_strbuf_append(&buf, "a=mediaclk:sender\n");
 	}
@@ -583,6 +766,9 @@
 		"a=type:broadcast\n",
 		pw_get_library_version());
 
+	if (impl->extra_attrs_end)
+		spa_strbuf_append(&buf, "%s", impl->extra_attrs_end);
+
 	pw_log_debug("sending SAP for %u %s", sess->node->id, buffer);
 
 	iov3.iov_base = buffer;
@@ -609,12 +795,11 @@
 {
 	struct impl *impl = data;
 	struct session *sess, *tmp;
-	struct timespec ts;
 	uint64_t timestamp, interval;
 
-	clock_gettime(CLOCK_MONOTONIC, &ts);
-	timestamp = SPA_TIMESPEC_TO_NSEC(&ts);
+	timestamp = get_time_nsec(impl);
 	interval = impl->cleanup_interval * SPA_NSEC_PER_SEC;
+	update_ts_refclk(impl);
 
 	spa_list_for_each_safe(sess, tmp, &impl->sessions, link) {
 		if (sess->announce) {
@@ -665,7 +850,8 @@
 	sess->announce = true;
 
 	sdp->hash = pw_rand32();
-	sdp->ntp = (uint32_t) time(NULL) + 2208988800U;
+	sdp->ntp = (uint32_t) time(NULL) + 2208988800U + impl->n_sessions;
+	sdp->t_ntp = pw_properties_get_uint32(props, "rtp.ntp", sdp->ntp);
 	sess->props = props;
 
 	if ((str = pw_properties_get(props, "sess.name")) == NULL)
@@ -680,7 +866,7 @@
 
 	if ((str = pw_properties_get(props, "rtp.destination.ip")) == NULL)
 		goto error_free;
-	if ((res = parse_address(str, sdp->dst_port, &sdp->dst_addr, &sdp->dst_len)) < 0) {
+	if ((res = pw_net_parse_address(str, sdp->dst_port, &sdp->dst_addr, &sdp->dst_len)) < 0) {
 		pw_log_error("invalid destination.ip %s: %s", str, spa_strerror(res));
 		goto error_free;
 	}
@@ -691,6 +877,10 @@
 		if (!spa_atof(str, &sdp->ptime))
 			sdp->ptime = 0.0;
 
+	if ((str = pw_properties_get(props, "rtp.framecount")) != NULL)
+		if (!spa_atou32(str, &sdp->framecount, 0))
+			sdp->framecount = 0;
+
 	if ((str = pw_properties_get(props, "rtp.media")) != NULL)
 		sdp->media_type = strdup(str);
 	if ((str = pw_properties_get(props, "rtp.mime")) != NULL)
@@ -703,8 +893,23 @@
 		sdp->ts_offset = atoi(str);
 	if ((str = pw_properties_get(props, "rtp.ts-refclk")) != NULL)
 		sdp->ts_refclk = strdup(str);
-	if ((str = pw_properties_get(props, PW_KEY_NODE_CHANNELNAMES)) != NULL)
-		snprintf(sdp->channelmap, sizeof(sdp->channelmap), "%s", str);
+	sess->ts_refclk_ptp = pw_properties_get_bool(props, "rtp.fetch-ts-refclk", false);
+	if ((str = pw_properties_get(props, PW_KEY_NODE_CHANNELNAMES)) != NULL) {
+		struct spa_strbuf buf;
+		spa_strbuf_init(&buf, sdp->channelmap, sizeof(sdp->channelmap));
+
+		struct spa_json it2;
+		char v256;
+
+		spa_json_init(&it0, str, strlen(str));
+		if (spa_json_enter_array(&it0, &it1) <= 0)
+			spa_json_init(&it1, str, strlen(str));
+
+		if (spa_json_get_string(&it1, v, sizeof(v)) > 0)
+			spa_strbuf_append(&buf, "%s", v);
+		while (spa_json_get_string(&it1, v, sizeof(v)) > 0)
+			spa_strbuf_append(&buf, ", %s", v);
+	}
 
 	pw_log_info("created new session for node:%u", node->id);
 	node->session = sess;
@@ -769,6 +974,10 @@
 	if ((media = pw_properties_get(props, "sess.media")) == NULL)
 		media = "audio";
 
+	if ((str = pw_properties_get(props, "cleanup.sec")) != NULL) {
+		fprintf(f, "\"cleanup.sec\" = \"%s\", ", str);
+	}
+
 	if (spa_streq(media, "audio")) {
 		const char *mime;
 		const struct format_info *format_info;
@@ -868,7 +1077,7 @@
 	struct session *session;
 	struct pw_properties *props;
 	const char *str;
-	char dst_addr64;
+	char dst_addr64, tmp64;
 
 	if (impl->n_sessions >= MAX_SESSIONS) {
 		pw_log_warn("too many sessions (%u >= %u)", impl->n_sessions, MAX_SESSIONS);
@@ -904,11 +1113,12 @@
 		pw_properties_set(props, PW_KEY_MEDIA_NAME, "RTP Stream");
 	}
 
-	get_ip(&info->dst_addr, dst_addr, sizeof(dst_addr), NULL);
+	pw_net_get_ip(&info->dst_addr, dst_addr, sizeof(dst_addr), NULL, NULL);
 	pw_properties_setf(props, "rtp.destination.ip", "%s", dst_addr);
 	pw_properties_setf(props, "rtp.destination.port", "%u", info->dst_port);
 	pw_properties_setf(props, "rtp.payload", "%u", info->payload);
-	pw_properties_setf(props, "rtp.ptime", "%f", info->ptime);
+	pw_properties_set(props, "rtp.ptime", spa_dtoa(tmp, sizeof(tmp), info->ptime));
+	pw_properties_setf(props, "rtp.framecount", "%u", info->framecount);
 	pw_properties_setf(props, "rtp.media", "%s", info->media_type);
 	pw_properties_setf(props, "rtp.mime", "%s", info->mime_type);
 	pw_properties_setf(props, "rtp.rate", "%u", info->rate);
@@ -1006,7 +1216,8 @@
 /* some AES67 devices have channelmap encoded in i=*
  * if `i` record is found, it matches the template
  * and channel count matches, name the channels respectively
- * `i=2 channels: 01, 08` is the format */
+ * `i=2 channels: 01, 08` is the format
+ * This is Audinate format. TODO: parse RAVENNA `i=CH1,CH2,CH3` format */
 static int parse_sdp_i(struct impl *impl, char *c, struct sdp_info *info)
 {
 	if (!strstr(c, " channels: ")) {
@@ -1060,8 +1271,18 @@
 	} else
 		return -EINVAL;
 
-	pw_log_debug("rate: %d, ch: %d", info->rate, info->channels);
+	pw_log_debug("a=rtpmap: rate: %d, ch: %d", info->rate, info->channels);
+
+	return 0;
+}
+
+static int parse_sdp_a_ptime(struct impl *impl, char *c, struct sdp_info *info)
+{
+	if (!spa_strstartswith(c, "a=ptime:"))
+		return 0;
 
+	c += strlen("a=ptime:");
+	spa_atof(c, &info->ptime);
 	return 0;
 }
 
@@ -1105,7 +1326,7 @@
 			goto too_short;
 
 		sl = 0;
-		pw_log_debug("%d: %s", count, s);
+		pw_log_debug("SDP line: %d: %s", count, s);
 
 		if (count++ == 0 && strcmp(s, "v=0") != 0)
 			goto invalid_version;
@@ -1120,6 +1341,8 @@
 			res = parse_sdp_m(impl, s, info);
 		else if (spa_strstartswith(s, "a=rtpmap:"))
 			res = parse_sdp_a_rtpmap(impl, s, info);
+		else if (spa_strstartswith(s, "a=ptime:"))
+			res = parse_sdp_a_ptime(impl, s, info);
 		else if (spa_strstartswith(s, "a=mediaclk:"))
 			res = parse_sdp_a_mediaclk(impl, s, info);
 		else if (spa_strstartswith(s, "a=ts-refclk:"))
@@ -1172,7 +1395,7 @@
 	if (header->c)
 		return -ENOTSUP;
 
-	offs = header->a ? 12 : 8;
+	offs = header->a ? 20 : 8;
 	offs += header->auth_len * 4;
 	if (len <= offs)
 		return -EINVAL;
@@ -1212,6 +1435,7 @@
 on_sap_io(void *data, int fd, uint32_t mask)
 {
 	struct impl *impl = data;
+	int res;
 
 	if (mask & SPA_IO_IN) {
 		uint8_t buffer2048;
@@ -1225,7 +1449,8 @@
 			return;
 
 		bufferlen = 0;
-		parse_sap(impl, buffer, len);
+		if ((res = parse_sap(impl, buffer, len)) < 0)
+			pw_log_warn("error parsing SAP: %s", spa_strerror(res));
 	}
 }
 
@@ -1233,6 +1458,7 @@
 {
 	int fd, res;
 	struct timespec value, interval;
+	char addr128 = "invalid";
 
 	if ((fd = make_send_socket(&impl->src_addr, impl->src_len,
 					&impl->sap_addr, impl->sap_len,
@@ -1257,7 +1483,8 @@
 	if ((fd = make_recv_socket(&impl->sap_addr, impl->sap_len, impl->ifname)) < 0)
 		return fd;
 
-	pw_log_info("starting SAP listener");
+	pw_net_get_ip(&impl->sap_addr, addr, sizeof(addr), NULL, NULL);
+	pw_log_info("starting SAP listener on %s", addr);
 	impl->sap_source = pw_loop_add_io(impl->loop, fd,
 				SPA_IO_IN, true, on_sap_io, impl);
 	if (impl->sap_source == NULL) {
@@ -1400,9 +1627,15 @@
 
 	if (impl->sap_fd != -1)
 		close(impl->sap_fd);
+	if (impl->ptp_fd != -1)
+		close(impl->ptp_fd);
 
 	pw_properties_free(impl->props);
 
+	free(impl->extra_attrs_preamble);
+	free(impl->extra_attrs_end);
+
+	free(impl->ptp_mgmt_socket);
 	free(impl->ifname);
 	free(impl);
 }
@@ -1472,10 +1705,17 @@
 	str = pw_properties_get(props, "local.ifname");
 	impl->ifname = str ? strdup(str) : NULL;
 
+	str = pw_properties_get(props, "ptp.management-socket");
+	impl->ptp_mgmt_socket = str ? strdup(str) : NULL;
+
+	// TODO: support UDP management access as well
+	if (impl->ptp_mgmt_socket)
+		impl->ptp_fd = make_unix_socket(impl->ptp_mgmt_socket);
+
 	if ((str = pw_properties_get(props, "sap.ip")) == NULL)
 		str = DEFAULT_SAP_IP;
 	port = pw_properties_get_uint32(props, "sap.port", DEFAULT_SAP_PORT);
-	if ((res = parse_address(str, port, &impl->sap_addr, &impl->sap_len)) < 0) {
+	if ((res = pw_net_parse_address(str, port, &impl->sap_addr, &impl->sap_len)) < 0) {
 		pw_log_error("invalid sap.ip %s: %s", str, spa_strerror(res));
 		goto out;
 	}
@@ -1483,13 +1723,12 @@
 			"sap.cleanup.sec", DEFAULT_CLEANUP_SEC);
 
 	if ((str = pw_properties_get(props, "source.ip")) == NULL) {
-		str = DEFAULT_SOURCE_IP;
 		if (impl->ifname) {
-			int fd = socket(AF_INET, SOCK_DGRAM, 0);
+			int fd = socket(impl->sap_addr.ss_family, SOCK_DGRAM, 0);
 			if (fd >= 0) {
 				struct ifreq req;
 				spa_zero(req);
-				req.ifr_addr.sa_family = AF_INET;
+				req.ifr_addr.sa_family = impl->sap_addr.ss_family;
 				snprintf(req.ifr_name, sizeof(req.ifr_name), "%s", impl->ifname);
 				res = ioctl(fd, SIOCGIFADDR, &req);
 				if (res < 0)
@@ -1499,15 +1738,17 @@
 						addr, sizeof(addr));
 				if (str == NULL) {
 					pw_log_warn("can't parse interface ip: %m");
-					str = DEFAULT_SOURCE_IP;
 				} else {
 					pw_log_info("interface %s IP: %s", impl->ifname, str);
 				}
 				close(fd);
 			}
 		}
+		if (str == NULL)
+			str = impl->sap_addr.ss_family == AF_INET ?
+				DEFAULT_SOURCE_IP : DEFAULT_SOURCE_IP6;
 	}
-	if ((res = parse_address(str, 0, &impl->src_addr, &impl->src_len)) < 0) {
+	if ((res = pw_net_parse_address(str, 0, &impl->src_addr, &impl->src_len)) < 0) {
 		pw_log_error("invalid source.ip %s: %s", str, spa_strerror(res));
 		goto out;
 	}
@@ -1515,6 +1756,39 @@
 	impl->ttl = pw_properties_get_uint32(props, "net.ttl", DEFAULT_TTL);
 	impl->mcast_loop = pw_properties_get_bool(props, "net.loop", DEFAULT_LOOP);
 
+	impl->extra_attrs_preamble = NULL;
+	impl->extra_attrs_end = NULL;
+	char buffer2048;
+	struct spa_strbuf buf;
+	if ((str = pw_properties_get(props, "sap.preamble-extra")) != NULL) {
+		spa_strbuf_init(&buf, buffer, sizeof(buffer));
+		struct spa_json it2;
+		char line256;
+
+		spa_json_init(&it0, str, strlen(str));
+		if (spa_json_enter_array(&it0, &it1) <= 0)
+			spa_json_init(&it1, str, strlen(str));
+
+		while (spa_json_get_string(&it1, line, sizeof(line)) > 0)
+			spa_strbuf_append(&buf, "%s\n", line);
+
+		impl->extra_attrs_preamble = strdup(buffer);
+	}
+	if ((str = pw_properties_get(props, "sap.end-extra")) != NULL) {
+		spa_strbuf_init(&buf, buffer, sizeof(buffer));
+		struct spa_json it2;
+		char line256;
+
+		spa_json_init(&it0, str, strlen(str));
+		if (spa_json_enter_array(&it0, &it1) <= 0)
+			spa_json_init(&it1, str, strlen(str));
+
+		while (spa_json_get_string(&it1, line, sizeof(line)) > 0)
+			spa_strbuf_append(&buf, "%s\n", line);
+
+		impl->extra_attrs_end = strdup(buffer);
+	}
+
 	impl->core = pw_context_get_object(context, PW_TYPE_INTERFACE_Core);
 	if (impl->core == NULL) {
 		str = pw_properties_get(props, PW_KEY_REMOTE_NAME);

pipewire-1.0.1.tar.bz2/src/modules/module-rtp-session.c -> pipewire-1.2.0.tar.gz/src/modules/module-rtp-session.c Changed

@@ -22,6 +22,7 @@
 #include <spa/param/audio/format-utils.h>
 #include <spa/debug/types.h>
 #include <spa/debug/mem.h>
+#include <spa/debug/log.h>
 
 #include <pipewire/pipewire.h>
 #include <pipewire/impl.h>
@@ -36,6 +37,7 @@
 #include <module-rtp/rtp.h>
 #include <module-rtp/apple-midi.h>
 #include <module-rtp/stream.h>
+#include "network-utils.h"
 
 #ifdef __FreeBSD__
 #define ifr_ifindex ifr_index
@@ -47,7 +49,7 @@
  * with avahi/mDNS/Bonjour.
  *
  * Other machines on the network that run a compatible session will see
- * eachother and will be able to send audio/midi between eachother.
+ * each other and will be able to send audio/midi between each other.
  *
  * The session setup is based on apple-midi and is compatible with
  * apple-midi when the session is using midi.
@@ -66,6 +68,7 @@
  * - `net.mtu = <int>`: MTU to use, default 1280
  * - `net.ttl = <int>`: TTL to use, default 1
  * - `net.loop = <bool>`: loopback multicast, default false
+ *   `sess.discover-local`: discover local services as well, default false
  * - `sess.min-ptime = <int>`: minimum packet time in milliseconds, default 2
  * - `sess.max-ptime = <int>`: maximum packet time in milliseconds, default 20
  * - `sess.latency.msec = <int>`: receiver latency in milliseconds, default 100
@@ -103,6 +106,7 @@
  *         #net.mtu = 1280
  *         #net.ttl = 1
  *         #net.loop = false
+ *         #sess.discover-local = false
  *         #sess.min-ptime = 2
  *         #sess.max-ptime = 20
  *         #sess.name = "PipeWire RTP stream"
@@ -124,7 +128,7 @@
 
 #define NAME "rtp-session"
 
-PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
+PW_LOG_TOPIC(mod_topic, "mod." NAME);
 #define PW_LOG_TOPIC_DEFAULT mod_topic
 
 #define DEFAULT_CONTROL_IP	"0.0.0.0"
@@ -224,6 +228,7 @@
 	struct spa_hook module_listener;
 	struct pw_properties *props;
 
+	bool discover_local;
 	AvahiPoll *avahi_poll;
 	AvahiClient *client;
 	AvahiServiceBrowser *browser;
@@ -269,7 +274,7 @@
 	ssize_t n;
 	n = sendmsg(fd, msg, MSG_NOSIGNAL);
 	if (n < 0)
-		pw_log_debug("sendmsg() failed: %m");
+		pw_log_warn("sendmsg() failed: %m");
 	return n;
 }
 
@@ -602,26 +607,11 @@
 	} else if (sa->ss_family == AF_INET6 && sb->ss_family == AF_INET6) {
 		struct sockaddr_in6 *ia = (struct sockaddr_in6*)sa;
 		struct sockaddr_in6 *ib = (struct sockaddr_in6*)sb;
-		return ia->sin6_addr.s6_addr == ib->sin6_addr.s6_addr;
+		return ia->sin6_addr.s6_addr == ib->sin6_addr.s6_addr && ia->sin6_scope_id == ib->sin6_scope_id;
 	}
 	return false;
 }
 
-static int get_ip(const struct sockaddr_storage *sa, char *ip, size_t len, uint16_t *port)
-{
-	if (sa->ss_family == AF_INET) {
-		struct sockaddr_in *in = (struct sockaddr_in*)sa;
-		inet_ntop(sa->ss_family, &in->sin_addr, ip, len);
-		*port = ntohs(in->sin_port);
-	} else if (sa->ss_family == AF_INET6) {
-		struct sockaddr_in6 *in = (struct sockaddr_in6*)sa;
-		inet_ntop(sa->ss_family, &in->sin6_addr, ip, len);
-		*port = ntohs(in->sin6_port);
-	} else
-		return -EIO;
-	return 0;
-}
-
 static struct session *make_session(struct impl *impl, struct pw_properties *props)
 {
 	struct session *sess;
@@ -728,7 +718,7 @@
 	initiator = ntohl(hdr->initiator);
 	ssrc = ntohl(hdr->ssrc);
 
-	get_ip(sa, addr, sizeof(addr), &port);
+	pw_net_get_ip(sa, addr, sizeof(addr), NULL, &port);
 	pw_log_info("IN from %s:%d %s ssrc:%08x initiator:%08x",
 			addr, port, hdr->name, ssrc, initiator);
 
@@ -791,7 +781,7 @@
 	msg.msg_iov = iov;
 	msg.msg_iovlen = 2;
 
-	pw_log_debug("send %p %u", msg.msg_name, msg.msg_namelen);
+	pw_log_trace("send %p %u", msg.msg_name, msg.msg_namelen);
 
 	send_packet(ctrl ? impl->ctrl_source->fd : impl->data_source->fd, &msg);
 }
@@ -866,7 +856,7 @@
 		return;
 	}
 
-	pw_log_debug("got CK count %d", hdr->count);
+	pw_log_trace("got CK count %d", hdr->count);
 
 	now = current_time_ns() / 10000;
 	reply = *hdr;
@@ -896,7 +886,7 @@
 		latency = t3 - t1;
 		offset = ((t3 + t1) / 2) - t2;
 
-		pw_log_debug("latency:%f offset:%f", latency / 1e5, offset / 1e5);
+		pw_log_trace("latency:%f offset:%f", latency / 1e5, offset / 1e5);
 		if (hdr->count >= 2)
 			return;
 	}
@@ -912,7 +902,7 @@
 	msg.msg_iov = iov;
 	msg.msg_iovlen = 1;
 
-	pw_log_debug("send %p %u", msg.msg_name, msg.msg_namelen);
+	pw_log_trace("send %p %u", msg.msg_name, msg.msg_namelen);
 
 	send_packet(ctrl ? impl->ctrl_source->fd : impl->data_source->fd, &msg);
 }
@@ -1010,7 +1000,7 @@
 		if (buffer0 == 0xff && buffer1 == 0xff) {
 			parse_apple_midi_cmd(impl, true, buffer, len, &sa, salen);
 		} else {
-			spa_debug_mem(0, buffer, len);
+			spa_debug_log_mem(pw_log_get(), SPA_LOG_LEVEL_DEBUG, 0, buffer, len);
 		}
 	}
 	return;
@@ -1020,7 +1010,7 @@
 	return;
 short_packet:
 	pw_log_warn("short packet received");
-	spa_debug_mem(0, buffer, len);
+	spa_debug_log_mem(pw_log_get(), SPA_LOG_LEVEL_DEBUG, 0, buffer, len);
 	return;
 }
 
@@ -1065,7 +1055,7 @@
 	return;
 short_packet:
 	pw_log_warn("short packet received");
-	spa_debug_mem(0, buffer, len);
+	spa_debug_log_mem(pw_log_get(), SPA_LOG_LEVEL_DEBUG, 0, buffer, len);
 	return;
 unknown_ssrc:
 	pw_log_debug("unknown SSRC %08x", ssrc);
@@ -1158,7 +1148,6 @@
 		pw_log_error("bind() failed: %m");
 		goto error;
 	}
-	/* FIXME AES67 wants IPTOS_DSCP_AF41 */
 	val = IPTOS_LOWDELAY;
 	if (setsockopt(fd, IPPROTO_IP, IP_TOS, &val, sizeof(val)) < 0)
 		pw_log_warn("setsockopt(IP_TOS) failed: %m");
@@ -1232,6 +1221,9 @@
 	if (impl->client)
 		avahi_client_free(impl->client);
 
+	if (impl->data_loop)
+		pw_context_release_loop(impl->context, impl->data_loop);
+
 	pw_properties_free(impl->stream_props);
 	pw_properties_free(impl->props);
 
@@ -1269,26 +1261,6 @@
 	.error = on_core_error,
 };
 
-static int parse_address(const char *address, uint16_t port,
-		struct sockaddr_storage *addr, socklen_t *len)
-{
-	struct sockaddr_in *sa4 = (struct sockaddr_in*)addr;
-	struct sockaddr_in6 *sa6 = (struct sockaddr_in6*)addr;
-
-	if (inet_pton(AF_INET, address, &sa4->sin_addr) > 0) {
-		sa4->sin_family = AF_INET;
-		sa4->sin_port = htons(port);
-		*len = sizeof(*sa4);
-	} else if (inet_pton(AF_INET6, address, &sa6->sin6_addr) > 0) {
-		sa6->sin6_family = AF_INET6;
-		sa6->sin6_port = htons(port);
-		*len = sizeof(*sa6);
-	} else
-		return -EINVAL;
-
-	return 0;
-}
-
 static void free_service(struct service *s)
 {
 	spa_list_remove(&s->link);
@@ -1318,7 +1290,7 @@
 		AvahiStringList *txt)
 {
 	struct service *s = NULL;
-	char atAVAHI_ADDRESS_STR_MAX;
+	char atAVAHI_ADDRESS_STR_MAX, if_suffix16 = "";
 	struct session *sess;
 	int res, ipv;
 	struct pw_properties *props = NULL;
@@ -1415,9 +1387,15 @@
 	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.address0 == 0xfe &&
+	    (s->info.address.data.ipv6.address1 & 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", at);
+	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);
 
 	if (pw_properties_get(props, PW_KEY_NODE_NAME) == NULL)
@@ -1439,10 +1417,10 @@
 	}
 	s->sess = sess;
 
-	if ((res = parse_address(at, s->info.port, &sess->ctrl_addr, &sess->ctrl_len)) < 0) {
+	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 = parse_address(at, s->info.port+1, &sess->data_addr, &sess->data_len)) < 0) {
+	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));
 	}
 	return s;
@@ -1504,7 +1482,7 @@
 	struct service_info info;
 	struct service *s;
 
-	if (flags & AVAHI_LOOKUP_RESULT_LOCAL)
+	if ((flags & AVAHI_LOOKUP_RESULT_LOCAL) && !impl->discover_local)
 		return;
 
 	info = SERVICE_INFO(.interface = interface,
@@ -1714,6 +1692,9 @@
 	}
 	impl->props = props;
 
+	impl->discover_local =  pw_properties_get_bool(impl->props,
+			"sess.discover-local", false);
+
 	stream_props = pw_properties_new(NULL, NULL);
 	if (stream_props == NULL) {
 		res = -errno;
@@ -1725,7 +1706,9 @@
 	impl->module = module;
 	impl->context = context;
 	impl->loop = pw_context_get_main_loop(context);
-	impl->data_loop = pw_data_loop_get_loop(pw_context_get_data_loop(context));
+	impl->data_loop = pw_context_acquire_loop(context, &props->dict);
+
+	pw_properties_set(props, PW_KEY_NODE_LOOP_NAME, impl->data_loop->name);
 
 	if (pw_properties_get(props, "sess.media") == NULL)
 		pw_properties_set(props, "sess.media", "midi");
@@ -1733,6 +1716,7 @@
 	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, PW_KEY_AUDIO_FORMAT);
 	copy_props(impl, props, PW_KEY_AUDIO_RATE);
 	copy_props(impl, props, PW_KEY_AUDIO_CHANNELS);
@@ -1782,11 +1766,11 @@
 
 	impl->ctrl_port = port;
 
-	if ((res = parse_address(str, port, &impl->ctrl_addr, &impl->ctrl_len)) < 0) {
+	if ((res = pw_net_parse_address(str, port, &impl->ctrl_addr, &impl->ctrl_len)) < 0) {
 		pw_log_error("invalid control.ip %s: %s", str, spa_strerror(res));
 		goto out;
 	}
-	if ((res = parse_address(str, port ? port+1 : 0, &impl->data_addr, &impl->data_len)) < 0) {
+	if ((res = pw_net_parse_address(str, port ? port+1 : 0, &impl->data_addr, &impl->data_len)) < 0) {
 		pw_log_error("invalid data.ip %s: %s", str, spa_strerror(res));
 		goto out;
 	}

pipewire-1.0.1.tar.bz2/src/modules/module-rtp-sink.c -> pipewire-1.2.0.tar.gz/src/modules/module-rtp-sink.c Changed

@@ -26,6 +26,7 @@
 #include <pipewire/impl.h>
 
 #include <module-rtp/stream.h>
+#include "network-utils.h"
 
 #ifndef IPTOS_DSCP
 #define IPTOS_DSCP_MASK 0xfc
@@ -47,14 +48,19 @@
  *
  * - `source.ip =<str>`: source IP address, default "0.0.0.0"
  * - `destination.ip =<str>`: destination IP address, default "224.0.0.56"
- * - `destination.port =<int>`: destination port, default random beteen 46000 and 47024
+ * - `destination.port =<int>`: destination port, default random between 46000 and 47024
  * - `local.ifname = <str>`: interface name to use
  * - `net.mtu = <int>`: MTU to use, default 1280
  * - `net.ttl = <int>`: TTL to use, default 1
  * - `net.loop = <bool>`: loopback multicast, default false
- * - `sess.min-ptime = <int>`: minimum packet time in milliseconds, default 2
- * - `sess.max-ptime = <int>`: maximum packet time in milliseconds, default 20
+ * - `sess.min-ptime = <float>`: minimum packet time in milliseconds, default 2
+ * - `sess.max-ptime = <float>`: maximum packet time in milliseconds, default 20
  * - `sess.name = <str>`: a session name
+ * - `rtp.ptime = <float>`: size of the packets in milliseconds, default up to MTU but
+ *       between sess.min-ptime and sess.max-ptime
+ * - `rtp.framecount = <int>`: number of samples per packet, default up to MTU but
+ *       between sess.min-ptime and sess.max-ptime
+ * - `sess.latency.msec = <float>`: target node latency in milliseconds, default as rtp.ptime
  * - `sess.ts-offset = <int>`: an offset to apply to the timestamp, default -1 = random offset
  * - `sess.ts-refclk = <string>`: the name of a reference clock
  * - `sess.media = <string>`: the media type audio|midi|opus, default audio
@@ -110,11 +116,12 @@
 
 #define NAME "rtp-sink"
 
-PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
+PW_LOG_TOPIC(mod_topic, "mod." NAME);
 #define PW_LOG_TOPIC_DEFAULT mod_topic
 
 #define DEFAULT_PORT		46000
 #define DEFAULT_SOURCE_IP	"0.0.0.0"
+#define DEFAULT_SOURCE_IP6	"::"
 #define DEFAULT_DESTINATION_IP	"224.0.0.56"
 #define DEFAULT_TTL		1
 #define DEFAULT_LOOP		false
@@ -124,7 +131,7 @@
 
 #define USAGE	"( source.ip=<source IP address, default:"DEFAULT_SOURCE_IP"> ) "			\
 		"( destination.ip=<destination IP address, default:"DEFAULT_DESTINATION_IP"> ) "	\
- 		"( destination.port=<int, default random beteen 46000 and 47024> ) "			\
+		"( destination.port=<int, default random between 46000 and 47024> ) "			\
 		"( local.ifname=<local interface name to use> ) "					\
 		"( net.mtu=<desired MTU, default:"SPA_STRINGIFY(DEFAULT_MTU)"> ) "			\
 		"( net.ttl=<desired TTL, default:"SPA_STRINGIFY(DEFAULT_TTL)"> ) "			\
@@ -133,7 +140,7 @@
 		"( sess.name=<a name for the session> ) "						\
 		"( sess.min-ptime=<minimum packet time in milliseconds, default:2> ) "			\
 		"( sess.max-ptime=<maximum packet time in milliseconds, default:20> ) "			\
- 		"( sess.media=<string, the media type audio|midi|opus, default audio> ) "		\
+		"( sess.media=<string, the media type audio|midi|opus, default audio> ) "		\
 		"( audio.format=<format, default:"DEFAULT_FORMAT"> ) "					\
 		"( audio.rate=<sample rate, default:"SPA_STRINGIFY(DEFAULT_RATE)"> ) "			\
 		"( audio.channels=<number of channels, default:"SPA_STRINGIFY(DEFAULT_CHANNELS)"> ) "	\
@@ -181,67 +188,6 @@
 	int rtp_fd;
 };
 
-static void stream_destroy(void *d)
-{
-	struct impl *impl = d;
-	impl->stream = NULL;
-}
-
-static void stream_send_packet(void *data, struct iovec *iov, size_t iovlen)
-{
-	struct impl *impl = data;
-	struct msghdr msg;
-	ssize_t n;
-
-	spa_zero(msg);
-	msg.msg_iov = iov;
-	msg.msg_iovlen = iovlen;
-	msg.msg_control = NULL;
-	msg.msg_controllen = 0;
-	msg.msg_flags = 0;
-
-	n = sendmsg(impl->rtp_fd, &msg, MSG_NOSIGNAL);
-	if (n < 0)
-		pw_log_debug("sendmsg() failed: %m");
-}
-
-static void stream_state_changed(void *data, bool started, const char *error)
-{
-	struct impl *impl = data;
-
-	if (error) {
-		pw_log_error("stream error: %s", error);
-		pw_impl_module_schedule_destroy(impl->module);
-	}
-}
-
-static const struct rtp_stream_events stream_events = {
-	RTP_VERSION_STREAM_EVENTS,
-	.destroy = stream_destroy,
-	.state_changed = stream_state_changed,
-	.send_packet = stream_send_packet,
-};
-
-static int parse_address(const char *address, uint16_t port,
-		struct sockaddr_storage *addr, socklen_t *len)
-{
-	struct sockaddr_in *sa4 = (struct sockaddr_in*)addr;
-	struct sockaddr_in6 *sa6 = (struct sockaddr_in6*)addr;
-
-	if (inet_pton(AF_INET, address, &sa4->sin_addr) > 0) {
-		sa4->sin_family = AF_INET;
-		sa4->sin_port = htons(port);
-		*len = sizeof(*sa4);
-	} else if (inet_pton(AF_INET6, address, &sa6->sin6_addr) > 0) {
-		sa6->sin6_family = AF_INET6;
-		sa6->sin6_port = htons(port);
-		*len = sizeof(*sa6);
-	} else
-		return -EINVAL;
-
-	return 0;
-}
-
 static bool is_multicast(struct sockaddr *sa, socklen_t salen)
 {
 	if (sa->sa_family == AF_INET) {
@@ -284,14 +230,26 @@
 		goto error;
 	}
 	if (is_multicast((struct sockaddr*)dst, dst_len)) {
-		val = loop;
-		if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP, &val, sizeof(val)) < 0)
-			pw_log_warn("setsockopt(IP_MULTICAST_LOOP) failed: %m");
-
-		val = ttl;
-		if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_TTL, &val, sizeof(val)) < 0)
-			pw_log_warn("setsockopt(IP_MULTICAST_TTL) failed: %m");
+		if (dst->ss_family == AF_INET) {
+			val = loop;
+			if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP, &val, sizeof(val)) < 0)
+				pw_log_warn("setsockopt(IP_MULTICAST_LOOP) failed: %m");
+
+			val = ttl;
+			if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_TTL, &val, sizeof(val)) < 0)
+				pw_log_warn("setsockopt(IP_MULTICAST_TTL) failed: %m");
+		} else {
+			val = loop;
+			if (setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &val, sizeof(val)) < 0)
+				pw_log_warn("setsockopt(IPV6_MULTICAST_LOOP) failed: %m");
+
+			val = ttl;
+			if (setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &val, sizeof(val)) < 0)
+				pw_log_warn("setsockopt(IPV6_MULTICAST_HOPS) failed: %m");
+		}
 	}
+
+
 #ifdef SO_PRIORITY
 	val = 6;
 	if (setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &val, sizeof(val)) < 0)
@@ -310,19 +268,124 @@
 	return res;
 }
 
-static int get_ip(const struct sockaddr_storage *sa, char *ip, size_t len)
+static void stream_destroy(void *d)
 {
-	if (sa->ss_family == AF_INET) {
-		struct sockaddr_in *in = (struct sockaddr_in*)sa;
-		inet_ntop(sa->ss_family, &in->sin_addr, ip, len);
-	} else if (sa->ss_family == AF_INET6) {
-		struct sockaddr_in6 *in = (struct sockaddr_in6*)sa;
-		inet_ntop(sa->ss_family, &in->sin6_addr, ip, len);
-	} else
-		return -EIO;
-	return 0;
+	struct impl *impl = d;
+	impl->stream = NULL;
+}
+
+static void stream_send_packet(void *data, struct iovec *iov, size_t iovlen)
+{
+	struct impl *impl = data;
+	struct msghdr msg;
+	ssize_t n;
+
+	spa_zero(msg);
+	msg.msg_iov = iov;
+	msg.msg_iovlen = iovlen;
+	msg.msg_control = NULL;
+	msg.msg_controllen = 0;
+	msg.msg_flags = 0;
+
+	n = sendmsg(impl->rtp_fd, &msg, MSG_NOSIGNAL);
+	if (n < 0)
+		pw_log_warn("sendmsg() failed: %m");
+}
+
+static void stream_state_changed(void *data, bool started, const char *error)
+{
+	struct impl *impl = data;
+
+	if (error) {
+		pw_log_error("stream error: %s", error);
+		pw_impl_module_schedule_destroy(impl->module);
+	} else if (started) {
+		int res;
+
+		if ((res = make_socket(&impl->src_addr, impl->src_len,
+					&impl->dst_addr, impl->dst_len,
+					impl->mcast_loop, impl->ttl, impl->dscp,
+					impl->ifname)) < 0) {
+			pw_log_error("can't make socket: %s", spa_strerror(res));
+			rtp_stream_set_error(impl->stream, res, "Can't make socket");
+			return;
+		}
+		impl->rtp_fd = res;
+	} else {
+		close(impl->rtp_fd);
+		impl->rtp_fd = -1;
+	}
+}
+
+static void stream_props_changed(struct impl *impl, uint32_t id, const struct spa_pod *param)
+{
+	struct spa_pod_object *obj = (struct spa_pod_object *)param;
+	struct spa_pod_prop *prop;
+
+	if (param == NULL)
+		return;
+
+	SPA_POD_OBJECT_FOREACH(obj, prop) {
+		if (prop->key == SPA_PROP_params) {
+			struct spa_pod *params = NULL;
+			struct spa_pod_parser prs;
+			struct spa_pod_frame f;
+			const char *key;
+			struct spa_pod *pod;
+			const char *value;
+
+			if (spa_pod_parse_object(param, SPA_TYPE_OBJECT_Props, NULL, SPA_PROP_params,
+					SPA_POD_OPT_Pod(&params)) < 0)
+				return;
+			spa_pod_parser_pod(&prs, params);
+			if (spa_pod_parser_push_struct(&prs, &f) < 0)
+				return;
+
+			while (true) {
+				if (spa_pod_parser_get_string(&prs, &key) < 0)
+					break;
+				if (spa_pod_parser_get_pod(&prs, &pod) < 0)
+					break;
+				if (spa_pod_get_string(pod, &value) < 0)
+					continue;
+				pw_log_info("key '%s', value '%s'", key, value);
+				if (!spa_streq(key, "destination.ip"))
+					continue;
+				if (pw_net_parse_address(value, impl->dst_port, &impl->dst_addr,
+						&impl->dst_len) < 0) {
+					pw_log_error("invalid destination.ip: '%s'", value);
+					break;
+				}
+				pw_properties_set(impl->stream_props, "rtp.destination.ip", value);
+				struct spa_dict_item item1;
+				item0 = SPA_DICT_ITEM_INIT("rtp.destination.ip", value);
+				rtp_stream_update_properties(impl->stream, &SPA_DICT_INIT(item, 1));
+				break;
+			}
+		}
+	}
+}
+
+static void stream_param_changed(void *data, uint32_t id, const struct spa_pod *param)
+{
+	struct impl *impl = data;
+
+	switch (id) {
+	case SPA_PARAM_Props:
+		if (param != NULL)
+			stream_props_changed(impl, id, param);
+		break;
+	}
 }
 
+static const struct rtp_stream_events stream_events = {
+	RTP_VERSION_STREAM_EVENTS,
+	.destroy = stream_destroy,
+	.state_changed = stream_state_changed,
+	.param_changed = stream_param_changed,
+	.send_packet = stream_send_packet,
+};
+
 static void core_destroy(void *d)
 {
 	struct impl *impl = d;
@@ -470,21 +533,21 @@
 	str = pw_properties_get(props, "local.ifname");
 	impl->ifname = str ? strdup(str) : NULL;
 
-	if ((str = pw_properties_get(props, "source.ip")) == NULL)
-		str = DEFAULT_SOURCE_IP;
-	if ((res = parse_address(str, 0, &impl->src_addr, &impl->src_len)) < 0) {
-		pw_log_error("invalid source.ip %s: %s", str, spa_strerror(res));
-		goto out;
-	}
-
 	impl->dst_port = DEFAULT_PORT + ((uint32_t) (pw_rand32() % 512) << 1);
 	impl->dst_port = pw_properties_get_uint32(props, "destination.port", impl->dst_port);
 	if ((str = pw_properties_get(props, "destination.ip")) == NULL)
 		str = DEFAULT_DESTINATION_IP;
-	if ((res = parse_address(str, impl->dst_port, &impl->dst_addr, &impl->dst_len)) < 0) {
+	if ((res = pw_net_parse_address(str, impl->dst_port, &impl->dst_addr, &impl->dst_len)) < 0) {
 		pw_log_error("invalid destination.ip %s: %s", str, spa_strerror(res));
 		goto out;
 	}
+	if ((str = pw_properties_get(props, "source.ip")) == NULL)
+		str = impl->dst_addr.ss_family == AF_INET ?
+			DEFAULT_SOURCE_IP : DEFAULT_SOURCE_IP6;
+	if ((res = pw_net_parse_address(str, 0, &impl->src_addr, &impl->src_len)) < 0) {
+		pw_log_error("invalid source.ip %s: %s", str, spa_strerror(res));
+		goto out;
+	}
 
 	impl->ttl = pw_properties_get_uint32(props, "net.ttl", DEFAULT_TTL);
 	impl->mcast_loop = pw_properties_get_bool(props, "net.loop", DEFAULT_LOOP);
@@ -495,9 +558,9 @@
 		ts_offset = pw_rand32();
 	pw_properties_setf(stream_props, "rtp.sender-ts-offset", "%u", (uint32_t)ts_offset);
 
-	get_ip(&impl->src_addr, addr, sizeof(addr));
+	pw_net_get_ip(&impl->src_addr, addr, sizeof(addr), NULL, NULL);
 	pw_properties_set(stream_props, "rtp.source.ip", addr);
-	get_ip(&impl->dst_addr, addr, sizeof(addr));
+	pw_net_get_ip(&impl->dst_addr, addr, sizeof(addr), NULL, NULL);
 	pw_properties_set(stream_props, "rtp.destination.ip", addr);
 	pw_properties_setf(stream_props, "rtp.destination.port", "%u", impl->dst_port);
 	pw_properties_setf(stream_props, "rtp.ttl", "%u", impl->ttl);
@@ -526,15 +589,6 @@
 			&impl->core_listener,
 			&core_events, impl);
 
-	if ((res = make_socket(&impl->src_addr, impl->src_len,
-					&impl->dst_addr, impl->dst_len,
-					impl->mcast_loop, impl->ttl, impl->dscp,
-					impl->ifname)) < 0) {
-		pw_log_error("can't make socket: %s", spa_strerror(res));
-		goto out;
-	}
-	impl->rtp_fd = res;
-
 	impl->stream = rtp_stream_new(impl->core,
 			PW_DIRECTION_INPUT, pw_properties_copy(stream_props),
 			&stream_events, impl);

pipewire-1.0.1.tar.bz2/src/modules/module-rtp-source.c -> pipewire-1.2.0.tar.gz/src/modules/module-rtp-source.c Changed

@@ -30,6 +30,7 @@
 #include <pipewire/impl.h>
 
 #include <module-rtp/stream.h>
+#include "network-utils.h"
 
 #ifdef __FreeBSD__
 #define ifr_ifindex ifr_index
@@ -52,10 +53,11 @@
  * Options specific to the behavior of this module
  *
  * - `local.ifname = <str>`: interface name to use
- * - `source.ip = <str>`: the source ip address, default 224.0.0.56
+ * - `source.ip = <str>`: the source ip address, default 224.0.0.56. Set this to the IP address
+ *                you want to receive packets from or 0.0.0.0 to receive from any source address.
  * - `source.port = <int>`: the source port
  * - `node.always-process = <bool>`: true to receive even when not running
- * - `sess.latency.msec = <str>`: target network latency in milliseconds, default 100
+ * - `sess.latency.msec = <float>`: target network latency in milliseconds, default 100
  * - `sess.ignore-ssrc = <bool>`: ignore SSRC, default false
  * - `sess.media = <string>`: the media type audio|midi|opus, default audio
  * - `stream.props = {}`: properties to be passed to the stream
@@ -107,7 +109,7 @@
 
 #define NAME "rtp-source"
 
-PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
+PW_LOG_TOPIC(mod_topic, "mod." NAME);
 #define PW_LOG_TOPIC_DEFAULT mod_topic
 
 #define DEFAULT_CLEANUP_SEC		60
@@ -163,6 +165,7 @@
 	struct spa_source *source;
 
 	unsigned receiving:1;
+	unsigned last_receiving:1;
 };
 
 static void
@@ -179,8 +182,10 @@
 		if (len < 12)
 			goto short_packet;
 
-		if (SPA_LIKELY(impl->stream))
-			rtp_stream_receive_packet(impl->stream, buffer, len);
+		if (SPA_LIKELY(impl->stream)) {
+			if (rtp_stream_receive_packet(impl->stream, buffer, len) < 0)
+				goto receive_error;
+		}
 
 		impl->receiving = true;
 	}
@@ -194,35 +199,19 @@
 	return;
 }
 
-static int parse_address(const char *address, uint16_t port,
-		struct sockaddr_storage *addr, socklen_t *len)
-{
-	struct sockaddr_in *sa4 = (struct sockaddr_in*)addr;
-	struct sockaddr_in6 *sa6 = (struct sockaddr_in6*)addr;
-
-	if (inet_pton(AF_INET, address, &sa4->sin_addr) > 0) {
-		sa4->sin_family = AF_INET;
-		sa4->sin_port = htons(port);
-		*len = sizeof(*sa4);
-	} else if (inet_pton(AF_INET6, address, &sa6->sin6_addr) > 0) {
-		sa6->sin6_family = AF_INET6;
-		sa6->sin6_port = htons(port);
-		*len = sizeof(*sa6);
-	} else
-		return -EINVAL;
-
-	return 0;
-}
-
 static int make_socket(const struct sockaddr* sa, socklen_t salen, char *ifname)
 {
 	int af, fd, val, res;
 	struct ifreq req;
+	struct sockaddr_storage ba = *(struct sockaddr_storage *)sa;
+	bool do_connect = false;
+	char addr128;
 
 	af = sa->sa_family;
 	if ((fd = socket(af, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)) < 0) {
+		res = -errno;
 		pw_log_error("socket failed: %m");
-		return -errno;
+		return res;
 	}
 #ifdef SO_TIMESTAMP
 	val = 1;
@@ -255,9 +244,15 @@
 			memset(&mr4, 0, sizeof(mr4));
 			mr4.imr_multiaddr = sa4->sin_addr;
 			mr4.imr_ifindex = req.ifr_ifindex;
+			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));
 		} else {
-			sa4->sin_addr.s_addr = INADDR_ANY;
+			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;
+			}
 		}
 	} else if (af == AF_INET6) {
 		struct sockaddr_in6 *sa6 = (struct sockaddr_in6*)sa;
@@ -266,9 +261,12 @@
 			memset(&mr6, 0, sizeof(mr6));
 			mr6.ipv6mr_multiaddr = sa6->sin6_addr;
 			mr6.ipv6mr_interface = req.ifr_ifindex;
+			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));
 		} else {
-		        sa6->sin6_addr = in6addr_any;
+			struct sockaddr_in6 *ba6 = (struct sockaddr_in6*)&ba;
+			ba6->sin6_addr = in6addr_any;
 		}
 	} else {
 		res = -EINVAL;
@@ -281,11 +279,18 @@
 		goto error;
 	}
 
-	if (bind(fd, sa, salen) < 0) {
+	if (bind(fd, (struct sockaddr*)&ba, salen) < 0) {
 		res = -errno;
 		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);
@@ -304,7 +309,7 @@
 	if ((fd = make_socket((const struct sockaddr *)&impl->src_addr,
 					impl->src_len, impl->ifname)) < 0) {
 		pw_log_error("failed to create socket: %m");
-		return fd;
+		return -errno;
 	}
 
 	impl->source = pw_loop_add_io(impl->data_loop, fd,
@@ -337,29 +342,103 @@
 static void stream_state_changed(void *data, bool started, const char *error)
 {
 	struct impl *impl = data;
+	int res;
 
 	if (error) {
 		pw_log_error("stream error: %s", error);
 		pw_impl_module_schedule_destroy(impl->module);
 	} else if (started) {
-		if ((errno = -stream_start(impl)) < 0)
-			pw_log_error("failed to start RTP stream: %m");
+		if ((res = stream_start(impl)) < 0) {
+			pw_log_error("failed to start RTP stream: %s", spa_strerror(res));
+			rtp_stream_set_error(impl->stream, res, "Can't start RTP stream");
+		}
 	} else {
 		if (!impl->always_process)
 			stream_stop(impl);
 	}
 }
 
+static void stream_props_changed(struct impl *impl, uint32_t id, const struct spa_pod *param)
+{
+	struct spa_pod_object *obj = (struct spa_pod_object *)param;
+	struct spa_pod_prop *prop;
+
+	if (param == NULL)
+		return;
+
+	SPA_POD_OBJECT_FOREACH(obj, prop) {
+		if (prop->key == SPA_PROP_params) {
+			struct spa_pod *params = NULL;
+			struct spa_pod_parser prs;
+			struct spa_pod_frame f;
+			const char *key;
+			struct spa_pod *pod;
+			const char *value;
+
+			if (spa_pod_parse_object(param, SPA_TYPE_OBJECT_Props, NULL, SPA_PROP_params,
+					SPA_POD_OPT_Pod(&params)) < 0)
+				return;
+			spa_pod_parser_pod(&prs, params);
+			if (spa_pod_parser_push_struct(&prs, &f) < 0)
+				return;
+
+			while (true) {
+				if (spa_pod_parser_get_string(&prs, &key) < 0)
+					break;
+				if (spa_pod_parser_get_pod(&prs, &pod) < 0)
+					break;
+				if (spa_pod_get_string(pod, &value) < 0)
+					continue;
+				pw_log_info("key '%s', value '%s'", key, value);
+				if (!spa_streq(key, "source.ip"))
+					continue;
+				if (pw_net_parse_address(value, impl->src_port, &impl->src_addr,
+						&impl->src_len) < 0) {
+					pw_log_error("invalid source.ip: '%s'", value);
+					break;
+				}
+				pw_properties_set(impl->stream_props, "rtp.source.ip", value);
+				struct spa_dict_item item1;
+				item0 = SPA_DICT_ITEM_INIT("rtp.source.ip", value);
+				rtp_stream_update_properties(impl->stream, &SPA_DICT_INIT(item, 1));
+				break;
+			}
+		}
+	}
+}
+
+static void stream_param_changed(void *data, uint32_t id, const struct spa_pod *param)
+{
+	struct impl *impl = data;
+
+	switch (id) {
+	case SPA_PARAM_Props:
+		if (param != NULL)
+			stream_props_changed(impl, id, param);
+		break;
+	}
+}
+
 static const struct rtp_stream_events stream_events = {
 	RTP_VERSION_STREAM_EVENTS,
 	.destroy = stream_destroy,
 	.state_changed = stream_state_changed,
+	.param_changed = stream_param_changed,
 };
 
 static void on_timer_event(void *data, uint64_t expirations)
 {
 	struct impl *impl = data;
 
+	if (impl->receiving != impl->last_receiving) {
+		struct spa_dict_item item1;
+
+		impl->last_receiving = impl->receiving;
+
+		item0 = SPA_DICT_ITEM_INIT("rtp.receiving", impl->receiving ? "true" : "false");
+		rtp_stream_update_properties(impl->stream, &SPA_DICT_INIT(item, 1));
+	}
+
 	if (!impl->receiving) {
 		pw_log_info("timeout, inactive RTP source");
 		//pw_impl_module_schedule_destroy(impl->module);
@@ -394,6 +473,9 @@
 	if (impl->timer)
 		pw_loop_destroy_source(impl->loop, impl->timer);
 
+	if (impl->data_loop)
+		pw_context_release_loop(impl->context, impl->data_loop);
+
 	pw_properties_free(impl->stream_props);
 	pw_properties_free(impl->props);
 
@@ -447,6 +529,7 @@
 	struct timespec value, interval;
 	struct pw_properties *props, *stream_props;
 	int64_t ts_offset;
+	char addr128;
 	int res = 0;
 
 	PW_LOG_TOPIC_INIT(mod_topic);
@@ -469,11 +552,12 @@
 	impl->module = module;
 	impl->context = context;
 	impl->loop = pw_context_get_main_loop(context);
-	impl->data_loop = pw_data_loop_get_loop(pw_context_get_data_loop(context));
+	impl->data_loop = pw_context_acquire_loop(context, &props->dict);
 
 	if ((sess_name = pw_properties_get(props, "sess.name")) == NULL)
 		sess_name = pw_get_host_name();
 
+	pw_properties_set(props, PW_KEY_NODE_LOOP_NAME, impl->data_loop->name);
 	if (pw_properties_get(props, PW_KEY_NODE_NAME) == NULL)
 		pw_properties_setf(props, PW_KEY_NODE_NAME, "rtp_session.%s", sess_name);
 	if (pw_properties_get(props, PW_KEY_NODE_DESCRIPTION) == NULL)
@@ -485,6 +569,7 @@
 	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, PW_KEY_AUDIO_FORMAT);
 	copy_props(impl, props, PW_KEY_AUDIO_RATE);
 	copy_props(impl, props, PW_KEY_AUDIO_CHANNELS);
@@ -511,15 +596,19 @@
 
 	impl->src_port = pw_properties_get_uint32(props, "source.port", 0);
 	if (impl->src_port == 0) {
+		res = -EINVAL;
 		pw_log_error("invalid source.port");
 		goto out;
 	}
 	if ((str = pw_properties_get(props, "source.ip")) == NULL)
 		str = DEFAULT_SOURCE_IP;
-	if ((res = parse_address(str, impl->src_port, &impl->src_addr, &impl->src_len)) < 0) {
+	if ((res = pw_net_parse_address(str, impl->src_port, &impl->src_addr, &impl->src_len)) < 0) {
 		pw_log_error("invalid source.ip %s: %s", str, spa_strerror(res));
 		goto out;
 	}
+	pw_net_get_ip(&impl->src_addr, addr, sizeof(addr), NULL, NULL);
+	pw_properties_set(stream_props, "rtp.source.ip", addr);
+	pw_properties_setf(stream_props, "rtp.source.port", "%u", impl->src_port);
 
 	ts_offset = pw_properties_get_int64(props, "sess.ts-offset", DEFAULT_TS_OFFSET);
 	if (ts_offset == -1)

pipewire-1.0.1.tar.bz2/src/modules/module-rtp/audio.c -> pipewire-1.2.0.tar.gz/src/modules/module-rtp/audio.c Changed

@@ -11,7 +11,7 @@
 	int32_t avail;
 
 	if ((buf = pw_stream_dequeue_buffer(impl->stream)) == NULL) {
-		pw_log_debug("Out of stream buffers: %m");
+		pw_log_info("Out of stream buffers: %m");
 		return;
 	}
 	d = buf->buffer->datas;
@@ -66,9 +66,9 @@
 			error = (float)target_buffer - (float)avail;
 			error = SPA_CLAMP(error, -impl->max_error, impl->max_error);
 
-			corr = spa_dll_update(&impl->dll, error);
+			corr = (float)spa_dll_update(&impl->dll, error);
 
-			pw_log_debug("avail:%u target:%u error:%f corr:%f", avail,
+			pw_log_trace("avail:%u target:%u error:%f corr:%f", avail,
 					target_buffer, error, corr);
 
 			if (impl->io_rate_match) {
@@ -165,7 +165,7 @@
 				BUFFER_SIZE / stride);
 		impl->have_sync = false;
 	} else {
-		pw_log_debug("got samples:%u", samples);
+		pw_log_trace("got samples:%u", samples);
 		spa_ringbuffer_write_data(&impl->ring,
 				impl->buffer,
 				BUFFER_SIZE,
@@ -181,7 +181,7 @@
 	return -EINVAL;
 invalid_version:
 	pw_log_warn("invalid RTP version");
-	spa_debug_mem(0, buffer, len);
+	spa_debug_log_mem(pw_log_get(), SPA_LOG_LEVEL_INFO, 0, buffer, len);
 	return -EPROTO;
 invalid_len:
 	pw_log_warn("invalid RTP length");
@@ -192,6 +192,18 @@
 	return -EINVAL;
 }
 
+static void set_timer(struct impl *impl, uint64_t time, uint64_t itime)
+{
+	struct itimerspec ts;
+	ts.it_value.tv_sec = time / SPA_NSEC_PER_SEC;
+	ts.it_value.tv_nsec = time % SPA_NSEC_PER_SEC;
+	ts.it_interval.tv_sec = itime / SPA_NSEC_PER_SEC;
+	ts.it_interval.tv_nsec = itime % SPA_NSEC_PER_SEC;
+	spa_system_timerfd_settime(impl->data_loop->system,
+			impl->timer->fd, SPA_FD_TIMER_ABSTIME, &ts, NULL);
+	impl->timer_running = time != 0 && itime != 0;
+}
+
 static inline void
 set_iovec(struct spa_ringbuffer *rbuf, void *buffer, uint32_t size,
 		uint32_t offset, struct iovec *iov, uint32_t len)
@@ -202,7 +214,7 @@
 	iov1.iov_base = buffer;
 }
 
-static void rtp_audio_flush_packets(struct impl *impl)
+static void rtp_audio_flush_packets(struct impl *impl, uint32_t num_packets)
 {
 	int32_t avail, tosend;
 	uint32_t stride, timestamp;
@@ -211,9 +223,16 @@
 
 	avail = spa_ringbuffer_get_read_index(&impl->ring, &timestamp);
 	tosend = impl->psamples;
-
 	if (avail < tosend)
-		return;
+		if (impl->started)
+			goto done;
+		else {
+			/* send last packet before emitting state_changed */
+			tosend = avail;
+			num_packets = 1;
+		}
+	else
+		num_packets = SPA_MIN(num_packets, (uint32_t)(avail / tosend));
 
 	stride = impl->stride;
 
@@ -225,7 +244,7 @@
 	iov0.iov_base = &header;
 	iov0.iov_len = sizeof(header);
 
-	while (avail >= tosend) {
+	while (num_packets > 0) {
 		if (impl->marker_on_first && impl->first)
 			header.m = 1;
 		else
@@ -238,7 +257,8 @@
 			(timestamp * stride) & BUFFER_MASK,
 			&iov1, tosend * stride);
 
-		pw_log_trace("sending %d avail:%d ts_offset:%d timestamp:%d", tosend, avail, impl->ts_offset, timestamp);
+		pw_log_trace("sending %d packet:%d ts_offset:%d timestamp:%d",
+				tosend, num_packets, impl->ts_offset, timestamp);
 
 		rtp_stream_emit_send_packet(impl, iov, 3);
 
@@ -246,8 +266,30 @@
 		impl->first = false;
 		timestamp += tosend;
 		avail -= tosend;
+		num_packets--;
 	}
 	spa_ringbuffer_read_update(&impl->ring, timestamp);
+done:
+	if (impl->timer_running) {
+		if (impl->started) {
+			if (avail < tosend) {
+				set_timer(impl, 0, 0);
+			}
+		} else if (avail <= 0) {
+			bool started = false;
+
+			/* the stream has been stopped and all packets have been sent */
+			set_timer(impl, 0, 0);
+			pw_loop_invoke(impl->main_loop, do_emit_state_changed, SPA_ID_INVALID, &started, sizeof started, false, impl);
+		}
+	}
+}
+
+static void rtp_audio_flush_timeout(struct impl *impl, uint64_t expirations)
+{
+	if (expirations > 1)
+		pw_log_warn("missing timeout %"PRIu64, expirations);
+	rtp_audio_flush_packets(impl, expirations);
 }
 
 static void rtp_audio_process_capture(void *data)
@@ -257,9 +299,12 @@
 	struct spa_data *d;
 	uint32_t offs, size, timestamp, expected_timestamp, stride;
 	int32_t filled, wanted;
+	uint32_t pending, num_queued;
+	struct spa_io_position *pos;
+	uint64_t next_nsec, quantum;
 
 	if ((buf = pw_stream_dequeue_buffer(impl->stream)) == NULL) {
-		pw_log_debug("Out of stream buffers: %m");
+		pw_log_info("Out of stream buffers: %m");
 		return;
 	}
 	d = buf->buffer->datas;
@@ -271,11 +316,17 @@
 
 	filled = spa_ringbuffer_get_write_index(&impl->ring, &expected_timestamp);
 
-	if (SPA_LIKELY(impl->io_position)) {
-		uint32_t rate = impl->io_position->clock.rate.denom;
-		timestamp = impl->io_position->clock.position * impl->rate / rate;
-	} else
+	pos = impl->io_position;
+	if (SPA_LIKELY(pos)) {
+		uint32_t rate = pos->clock.rate.denom;
+		timestamp = pos->clock.position * impl->rate / rate;
+		next_nsec = pos->clock.next_nsec;
+		quantum = (uint64_t)(pos->clock.duration * SPA_NSEC_PER_SEC / (rate * pos->clock.rate_diff));
+	} else {
 		timestamp = expected_timestamp;
+		next_nsec = 0;
+		quantum = 0;
+	}
 
 	if (!impl->have_sync) {
 		pw_log_info("sync to timestamp:%u seq:%u ts_offset:%u SSRC:%u",
@@ -284,6 +335,7 @@
 		memset(impl->buffer, 0, BUFFER_SIZE);
 		impl->have_sync = true;
 		expected_timestamp = timestamp;
+		filled = 0;
 	} else {
 		if (SPA_ABS((int32_t)expected_timestamp - (int32_t)timestamp) > 32) {
 			pw_log_warn("expected %u != timestamp %u", expected_timestamp, timestamp);
@@ -291,6 +343,7 @@
 		} else if (filled + wanted > (int32_t)(BUFFER_SIZE / stride)) {
 			pw_log_warn("overrun %u + %u > %u", filled, wanted, BUFFER_SIZE / stride);
 			impl->have_sync = false;
+			filled = 0;
 		}
 	}
 
@@ -304,7 +357,22 @@
 
 	pw_stream_queue_buffer(impl->stream, buf);
 
-	rtp_audio_flush_packets(impl);
+	pending = filled / impl->psamples;
+	num_queued = (filled + wanted) / impl->psamples;
+
+	if (num_queued > 0) {
+		/* flush all previous packets plus new one right away */
+		rtp_audio_flush_packets(impl, pending + 1);
+		num_queued -= SPA_MIN(num_queued, pending + 1);
+
+		if (num_queued > 0) {
+			/* schedule timer for remaining */
+			int64_t interval = quantum / (num_queued + 1);
+			uint64_t time = next_nsec - num_queued * interval;
+			pw_log_trace("%u %u %"PRIu64" %"PRIu64, pending, num_queued, time, interval);
+			set_timer(impl, time, interval);
+		}
+	}
 }
 
 static int rtp_audio_init(struct impl *impl, enum spa_direction direction)
@@ -314,5 +382,6 @@
 	else
 		impl->stream_events.process = rtp_audio_process_playback;
 	impl->receive_rtp = rtp_audio_receive;
+	impl->flush_timeout = rtp_audio_flush_timeout;
 	return 0;
 }

pipewire-1.0.1.tar.bz2/src/modules/module-rtp/midi.c -> pipewire-1.2.0.tar.gz/src/modules/module-rtp/midi.c Changed

@@ -15,7 +15,7 @@
 	struct spa_pod_control *c;
 
 	if ((buf = pw_stream_dequeue_buffer(impl->stream)) == NULL) {
-		pw_log_debug("Out of stream buffers: %m");
+		pw_log_info("Out of stream buffers: %m");
 		return;
 	}
 	d = buf->buffer->datas;
@@ -137,16 +137,16 @@
 
 static double get_time(struct impl *impl)
 {
-	struct timespec ts;
+	uint64_t now;
 	struct spa_io_position *pos;
 	double t;
 
-	clock_gettime(CLOCK_MONOTONIC, &ts);
+	now = pw_stream_get_nsec(impl->stream);
 	if ((pos = impl->io_position) != NULL) {
 		t = pos->clock.position / (double) pos->clock.rate.denom;
-		t += (SPA_TIMESPEC_TO_NSEC(&ts) - pos->clock.nsec) / (double)SPA_NSEC_PER_SEC;
+		t += (now - pos->clock.nsec) / (double)SPA_NSEC_PER_SEC;
 	} else {
-		t = SPA_TIMESPEC_TO_NSEC(&ts);
+		t = now;
 	}
 	return t;
 }
@@ -204,12 +204,12 @@
 			/* our current time is now the estimated time */
 			t = estimated;
 		}
-		pw_log_debug("%f %f %f %f", t, estimated, diff, impl->corr);
+		pw_log_trace("%f %f %f %f", t, estimated, diff, impl->corr);
 
-		timestamp = t * impl->rate;
+		timestamp = (uint32_t)(t * impl->rate);
 
-		impl->last_timestamp = ts;
-		impl->last_time = t;
+		impl->last_timestamp = (float)ts;
+		impl->last_time = (float)t;
 	}
 
 	filled = spa_ringbuffer_get_write_index(&impl->ring, &write);
@@ -248,7 +248,7 @@
 		else
 			offs += parse_varlen(&packetoffs, end - offs, &delta);
 
-		timestamp += delta * impl->corr;
+		timestamp += (uint32_t)(delta * impl->corr);
 		spa_pod_builder_control(&b, timestamp, SPA_CONTROL_Midi);
 
 		size = get_midi_size(&packetoffs, end - offs);
@@ -315,7 +315,7 @@
 	return -EINVAL;
 invalid_version:
 	pw_log_warn("invalid RTP version");
-	spa_debug_mem(0, buffer, len);
+	spa_debug_log_mem(pw_log_get(), SPA_LOG_LEVEL_INFO, 0, buffer, len);
 	return -EPROTO;
 invalid_len:
 	pw_log_warn("invalid RTP length");
@@ -400,7 +400,7 @@
 			}
 			iov2.iov_len = len;
 
-			pw_log_debug("sending %d timestamp:%d %u %u",
+			pw_log_trace("sending %d timestamp:%d %u %u",
 					len, timestamp + base,
 					offset, impl->psamples);
 			rtp_stream_emit_send_packet(impl, iov, 3);
@@ -436,7 +436,7 @@
 		}
 		iov2.iov_len = len;
 
-		pw_log_debug("sending %d timestamp:%d", len, base);
+		pw_log_trace("sending %d timestamp:%d", len, base);
 		rtp_stream_emit_send_packet(impl, iov, 3);
 		impl->seq++;
 	}
@@ -452,7 +452,7 @@
 	void *ptr;
 
 	if ((buf = pw_stream_dequeue_buffer(impl->stream)) == NULL) {
-		pw_log_debug("Out of stream buffers: %m");
+		pw_log_info("Out of stream buffers: %m");
 		return;
 	}
 	d = buf->buffer->datas;

pipewire-1.0.1.tar.bz2/src/modules/module-rtp/opus.c -> pipewire-1.2.0.tar.gz/src/modules/module-rtp/opus.c Changed

@@ -16,7 +16,7 @@
 	int32_t avail;
 
 	if ((buf = pw_stream_dequeue_buffer(impl->stream)) == NULL) {
-		pw_log_debug("Out of stream buffers: %m");
+		pw_log_info("Out of stream buffers: %m");
 		return;
 	}
 	d = buf->buffer->datas;
@@ -71,9 +71,9 @@
 			error = (float)target_buffer - (float)avail;
 			error = SPA_CLAMP(error, -impl->max_error, impl->max_error);
 
-			corr = spa_dll_update(&impl->dll, error);
+			corr = (float)spa_dll_update(&impl->dll, error);
 
-			pw_log_debug("avail:%u target:%u error:%f corr:%f", avail,
+			pw_log_trace("avail:%u target:%u error:%f corr:%f", avail,
 					target_buffer, error, corr);
 
 			if (impl->io_rate_match) {
@@ -183,7 +183,7 @@
 		if (end > BUFFER_SIZE2)
 			memmove(impl->buffer, &impl->bufferBUFFER_SIZE2, end - BUFFER_SIZE2);
 
-		pw_log_debug("receiving %zd len:%d timestamp:%d %u", plen, res, timestamp, index);
+		pw_log_info("receiving %zd len:%d timestamp:%d %u", plen, res, timestamp, index);
 		samples = res;
 
 		write += samples;
@@ -196,7 +196,7 @@
 	return -EINVAL;
 invalid_version:
 	pw_log_warn("invalid RTP version");
-	spa_debug_mem(0, buffer, len);
+	spa_debug_log_mem(pw_log_get(), SPA_LOG_LEVEL_INFO, 0, buffer, len);
 	return -EPROTO;
 invalid_len:
 	pw_log_warn("invalid RTP length");
@@ -244,7 +244,7 @@
 				(const float*)&impl->bufferoffset * stride, tosend,
 				out, sizeof(out));
 
-		pw_log_debug("sending %d len:%d timestamp:%d", tosend, res, timestamp);
+		pw_log_trace("sending %d len:%d timestamp:%d", tosend, res, timestamp);
 		iov1.iov_len = res;
 
 		rtp_stream_emit_send_packet(impl, iov, 2);
@@ -255,7 +255,7 @@
 		avail -= tosend;
 	}
 
-	pw_log_debug("move %d offset:%d", avail, offset);
+	pw_log_trace("move %d offset:%d", avail, offset);
 	memmove(impl->buffer, &impl->bufferoffset * stride, avail * stride);
 
 	spa_ringbuffer_read_update(&impl->ring, timestamp);
@@ -270,7 +270,7 @@
 	int32_t filled, wanted;
 
 	if ((buf = pw_stream_dequeue_buffer(impl->stream)) == NULL) {
-		pw_log_debug("Out of stream buffers: %m");
+		pw_log_info("Out of stream buffers: %m");
 		return;
 	}
 	d = buf->buffer->datas;

pipewire-1.2.0.tar.gz/src/modules/module-rtp/ptp.h Added

@@ -0,0 +1,61 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2024 Dmitry Sharshakov <d3dx12.xx@gmail.com> */
+/* SPDX-License-Identifier: MIT */
+
+#ifndef PIPEWIRE_PTP_H
+#define PIPEWIRE_PTP_H
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct ptp_management_msg {
+	// 4 for major_sdo, 4 for msg_type
+	uint8_t  major_sdo_id_message_type;
+	// 4 for minor, 4 for major
+	uint8_t  ver;
+	uint16_t message_length_be;
+	uint8_t  domain_number;
+	uint8_t  minor_sdo_id;
+	uint16_t flags_be;
+	uint8_t  correction_field8;
+	uint32_t message_type_specific;
+	uint8_t  clock_identity8;
+	uint16_t source_port_id_be;
+	uint16_t sequence_id_be;
+	uint8_t  control_field;
+	uint8_t  log_message_interval;
+	uint8_t  target_port_identity8;
+	uint16_t target_port_id_be;
+	uint8_t  starting_boundary_hops;
+	uint8_t  boundary_hops;
+	uint8_t  action;
+	uint8_t  reserved;
+	uint16_t tlv_type_be;
+	// length of data after this + 2 for management_id
+	uint16_t management_message_length_be;
+	uint16_t management_id_be;
+} __attribute__((packed));
+
+struct ptp_parent_data_set {
+	uint8_t  parent_clock_id8;
+	uint16_t parent_port_id_be;
+	uint8_t  parent_stats;
+	uint8_t  reserved;
+	uint16_t log_variance_be;
+	int32_t  phase_change_rate_be;
+	uint8_t  gm_prio1;
+	uint8_t  gm_clock_class;
+	uint8_t  gm_clock_accuracy;
+	uint16_t gm_clock_variance_be;
+	uint8_t  gm_prio2;
+	uint8_t  gm_clock_id8;
+} __attribute__((packed));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PIPEWIRE_PTP_H */

pipewire-1.0.1.tar.bz2/src/modules/module-rtp/stream.c -> pipewire-1.2.0.tar.gz/src/modules/module-rtp/stream.c Changed

@@ -13,6 +13,7 @@
 #include <spa/control/control.h>
 #include <spa/debug/types.h>
 #include <spa/debug/mem.h>
+#include <spa/debug/log.h>
 
 #include "config.h"
 
@@ -23,6 +24,9 @@
 #include <module-rtp/stream.h>
 #include <module-rtp/apple-midi.h>
 
+PW_LOG_TOPIC_EXTERN(mod_topic);
+#define PW_LOG_TOPIC_DEFAULT mod_topic
+
 #define BUFFER_SIZE			(1u<<22)
 #define BUFFER_MASK			(BUFFER_SIZE-1)
 #define BUFFER_SIZE2			(BUFFER_SIZE>>1)
@@ -40,6 +44,8 @@
 	struct spa_audio_info info;
 	struct spa_audio_info stream_info;
 
+	struct pw_context *context;
+
 	struct pw_stream *stream;
 	struct spa_hook stream_listener;
 	struct pw_stream_events stream_events;
@@ -84,9 +90,24 @@
 	unsigned receiving:1;
 	unsigned first:1;
 
+	struct pw_loop *main_loop;
+	struct pw_loop *data_loop;
+	struct spa_source *timer;
+	bool timer_running;
+
 	int (*receive_rtp)(struct impl *impl, uint8_t *buffer, ssize_t len);
+	void (*flush_timeout)(struct impl *impl, uint64_t expirations);
 };
 
+static int do_emit_state_changed(struct spa_loop *loop, bool async, uint32_t seq, const void *data, size_t size, void *user_data)
+{
+	struct impl *impl = user_data;
+	bool *started = (bool *)data;
+
+	rtp_stream_emit_state_changed(impl, *started, NULL);
+	return 0;
+}
+
 #include "module-rtp/audio.c"
 #include "module-rtp/midi.c"
 #include "module-rtp/opus.c"
@@ -148,7 +169,9 @@
 	if (!impl->started)
 		return 0;
 
-	rtp_stream_emit_state_changed(impl, false, NULL);
+	/* if timer is running, the state changed event must be emitted by the timer after all packets have been sent */
+	if (!impl->timer_running)
+		rtp_stream_emit_state_changed(impl, false, NULL);
 
 	impl->started = false;
 	return 0;
@@ -165,7 +188,6 @@
 			break;
 		case PW_STREAM_STATE_ERROR:
 			pw_log_error("stream error: %s", error);
-			rtp_stream_emit_state_changed(impl, false, error);
 			break;
 		case PW_STREAM_STATE_STREAMING:
 			if ((errno = -stream_start(impl)) < 0)
@@ -261,9 +283,19 @@
 		parse_position(info, DEFAULT_POSITION, strlen(DEFAULT_POSITION));
 }
 
-static uint32_t msec_to_samples(struct impl *impl, uint32_t msec)
+static uint32_t msec_to_samples(struct impl *impl, float msec)
+{
+	return (uint32_t)(msec * impl->rate / 1000);
+}
+static float samples_to_msec(struct impl *impl, uint32_t samples)
+{
+	return samples * 1000.0f / impl->rate;
+}
+
+static void on_flush_timeout(void *d, uint64_t expirations)
 {
-	return msec * impl->rate / 1000;
+	struct impl *impl = d;
+	impl->flush_timeout(d, expirations);
 }
 
 struct rtp_stream *rtp_stream_new(struct pw_core *core,
@@ -272,24 +304,33 @@
 {
 	struct impl *impl;
 	const char *str;
+	char tmp64;
 	uint8_t buffer1024;
 	struct spa_pod_builder b;
 	uint32_t n_params, min_samples, max_samples;
 	float min_ptime, max_ptime;
 	const struct spa_pod *params1;
 	enum pw_stream_flags flags;
-	int latency_msec;
+	float latency_msec;
 	int res;
 
 	impl = calloc(1, sizeof(*impl));
 	if (impl == NULL) {
 		res = -errno;
 		goto out;
-		return NULL;
 	}
 	impl->first = true;
 	spa_hook_list_init(&impl->listener_list);
 	impl->stream_events = stream_events;
+	impl->context = pw_core_get_context(core);
+	impl->main_loop = pw_context_get_main_loop(impl->context);
+	impl->data_loop = pw_context_acquire_loop(impl->context, &props->dict);
+	impl->timer = pw_loop_add_timer(impl->data_loop, on_flush_timeout, impl);
+	if (impl->timer == NULL) {
+		res = -errno;
+		pw_log_error("can't create timer");
+		goto out;
+	}
 
 	if ((str = pw_properties_get(props, "sess.media")) == NULL)
 		str = "audio";
@@ -303,7 +344,6 @@
 		impl->info.media_type = SPA_MEDIA_TYPE_audio;
 		impl->info.media_subtype = SPA_MEDIA_SUBTYPE_raw;
 		impl->payload = 0x60;
-		impl->marker_on_first = 1;
 	}
 	else if (spa_streq(str, "midi")) {
 		impl->info.media_type = SPA_MEDIA_TYPE_application;
@@ -383,6 +423,8 @@
 		pw_properties_set(props, PW_KEY_NODE_NETWORK, "true");
 
 	impl->marker_on_first = pw_properties_get_bool(props, "sess.marker-on-first", false);
+	if (spa_streq(str, "raop"))
+		impl->marker_on_first = 1;
 	impl->ignore_ssrc = pw_properties_get_bool(props, "sess.ignore-ssrc", false);
 	impl->direct_timestamp = pw_properties_get_bool(props, "sess.ts-direct", false);
 
@@ -407,32 +449,74 @@
 	if (!spa_atof(str, &max_ptime))
 		max_ptime = DEFAULT_MAX_PTIME;
 
-	min_samples = min_ptime * impl->rate / 1000;
-	max_samples = max_ptime * impl->rate / 1000;
+	min_samples = msec_to_samples(impl, min_ptime);
+	max_samples = msec_to_samples(impl, max_ptime);
 
 	float ptime = 0;
 	if ((str = pw_properties_get(props, "rtp.ptime")) != NULL)
 		if (!spa_atof(str, &ptime))
-			ptime = 0.0;
-
-	if (ptime) {
-		impl->psamples = ptime * impl->rate / 1000;
+			ptime = 0.0f;
+
+	uint32_t framecount = 0;
+	if ((str = pw_properties_get(props, "rtp.framecount")) != NULL)
+		if (!spa_atou32(str, &framecount, 0))
+			framecount = 0;
+
+	if (ptime > 0.0f || framecount > 0) {
+		if (!framecount) {
+			impl->psamples = msec_to_samples(impl, ptime);
+			pw_properties_setf(props, "rtp.framecount", "%u", impl->psamples);
+		} else if (ptime == 0.0f) {
+			impl->psamples = framecount;
+			pw_properties_set(props, "rtp.ptime",
+					spa_dtoa(tmp, sizeof(tmp),
+						samples_to_msec(impl, impl->psamples)));
+		} else if (fabsf((samples_to_msec(impl, framecount)) - ptime) > 0.1f) {
+			impl->psamples = msec_to_samples(impl, ptime);
+			pw_log_warn("rtp.ptime doesn't match rtp.framecount. Choosing rtp.ptime");
+		}
 	} else {
 		impl->psamples = impl->mtu / impl->stride;
 		impl->psamples = SPA_CLAMP(impl->psamples, min_samples, max_samples);
-		if (direction == PW_DIRECTION_INPUT)
-			pw_properties_setf(props, "rtp.ptime", "%f",
-					impl->psamples * 1000.0 / impl->rate);
+		if (direction == PW_DIRECTION_INPUT) {
+			pw_properties_set(props, "rtp.ptime",
+					spa_dtoa(tmp, sizeof(tmp),
+						samples_to_msec(impl, impl->psamples)));
+
+			pw_properties_setf(props, "rtp.framecount", "%u", impl->psamples);
+		}
+	}
+
+	ptime = samples_to_msec(impl, impl->psamples);
+
+	/* For senders, the default latency is ptime and for a receiver it is
+	 * DEFAULT_SESS_LATENCY. Setting the sess.latency.msec for a sender to
+	 * something smaller/bigger will influence the quantum and the amount
+	 * of packets we send in one cycle */
+	str = pw_properties_get(props, "sess.latency.msec");
+	if (!spa_atof(str, &latency_msec)) {
+		latency_msec = direction == PW_DIRECTION_INPUT ?
+			ptime :
+			DEFAULT_SESS_LATENCY;
 	}
-	latency_msec = pw_properties_get_uint32(props,
-			"sess.latency.msec", DEFAULT_SESS_LATENCY);
 	impl->target_buffer = msec_to_samples(impl, latency_msec);
 	impl->max_error = msec_to_samples(impl, ERROR_MSEC);
 
+	if (impl->target_buffer < ptime) {
+		pw_log_warn("sess.latency.msec cannot be lower than rtp.ptime");
+		impl->target_buffer = impl->psamples;
+	}
+
+	/* We're not expecting odd ptimes, so this modulo should be 0 */
+	if (fmodf(impl->target_buffer, ptime) != 0) {
+		pw_log_warn("sess.latency.msec should be an integer multiple of rtp.ptime");
+		impl->target_buffer = (uint32_t)((impl->target_buffer / ptime) * impl->psamples);
+	}
+
 	pw_properties_setf(props, PW_KEY_NODE_RATE, "1/%d", impl->rate);
 	if (direction == PW_DIRECTION_INPUT) {
 		pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%d/%d",
-				impl->psamples, impl->rate);
+				impl->target_buffer, impl->rate);
 	} else {
 		pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%d/%d",
 				impl->target_buffer / 2, impl->rate);
@@ -527,17 +611,29 @@
 	if (impl->stream)
 		pw_stream_destroy(impl->stream);
 
+	if (impl->timer)
+		pw_loop_destroy_source(impl->data_loop, impl->timer);
+
+	if (impl->data_loop)
+		pw_context_release_loop(impl->context, impl->data_loop);
+
 	spa_hook_list_clean(&impl->listener_list);
 	free(impl);
 }
 
+int rtp_stream_update_properties(struct rtp_stream *s, const struct spa_dict *dict)
+{
+	struct impl *impl = (struct impl*)s;
+	return pw_stream_update_properties(impl->stream, dict);
+}
+
 int rtp_stream_receive_packet(struct rtp_stream *s, uint8_t *buffer, size_t len)
 {
 	struct impl *impl = (struct impl*)s;
 	return impl->receive_rtp(impl, buffer, len);
 }
 
-uint64_t rtp_stream_get_time(struct rtp_stream *s, uint64_t *rate)
+uint64_t rtp_stream_get_time(struct rtp_stream *s, uint32_t *rate)
 {
 	struct impl *impl = (struct impl*)s;
 	struct spa_io_position *pos = impl->io_position;
@@ -564,6 +660,12 @@
 	impl->first = true;
 }
 
+void rtp_stream_set_error(struct rtp_stream *s, int res, const char *error)
+{
+	struct impl *impl = (struct impl*)s;
+	pw_stream_set_error(impl->stream, res, "%s: %s", error, spa_strerror(res));
+}
+
 enum pw_stream_state rtp_stream_get_state(struct rtp_stream *s, const char **error)
 {
 	struct impl *impl = (struct impl*)s;
@@ -583,6 +685,5 @@
 			uint32_t n_params)
 {
 	struct impl *impl = (struct impl*)s;
-	
 	return pw_stream_update_params(impl->stream, params, n_params);
-}
\ No newline at end of file
+}

pipewire-1.0.1.tar.bz2/src/modules/module-rtp/stream.h -> pipewire-1.2.0.tar.gz/src/modules/module-rtp/stream.h Changed

@@ -16,12 +16,12 @@
 #define DEFAULT_CHANNELS	2
 #define DEFAULT_POSITION	" FL FR "
 
-#define ERROR_MSEC			2
-#define DEFAULT_SESS_LATENCY		100
+#define ERROR_MSEC		2.0f
+#define DEFAULT_SESS_LATENCY	100.0f
 
 #define DEFAULT_MTU		1280
-#define DEFAULT_MIN_PTIME	2
-#define DEFAULT_MAX_PTIME	20
+#define DEFAULT_MIN_PTIME	2.0f
+#define DEFAULT_MAX_PTIME	20.0f
 
 struct rtp_stream_events {
 #define RTP_VERSION_STREAM_EVENTS        0
@@ -44,14 +44,17 @@
 
 void rtp_stream_destroy(struct rtp_stream *s);
 
+int rtp_stream_update_properties(struct rtp_stream *s, const struct spa_dict *dict);
+
 int rtp_stream_receive_packet(struct rtp_stream *s, uint8_t *buffer, size_t len);
 
-uint64_t rtp_stream_get_time(struct rtp_stream *s, uint64_t *rate);
+uint64_t rtp_stream_get_time(struct rtp_stream *s, uint32_t *rate);
 
 uint16_t rtp_stream_get_seq(struct rtp_stream *s);
 
 void rtp_stream_set_first(struct rtp_stream *s);
 
+void rtp_stream_set_error(struct rtp_stream *s, int res, const char *error);
 enum pw_stream_state rtp_stream_get_state(struct rtp_stream *s, const char **error);
 
 int rtp_stream_set_param(struct rtp_stream *s, uint32_t id, const struct spa_pod *param);

pipewire-1.0.1.tar.bz2/src/modules/module-session-manager.c -> pipewire-1.2.0.tar.gz/src/modules/module-session-manager.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-session-manager/client-endpoint/endpoint.c -> pipewire-1.2.0.tar.gz/src/modules/module-session-manager/client-endpoint/endpoint.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-session-manager/client-session/session.c -> pipewire-1.2.0.tar.gz/src/modules/module-session-manager/client-session/session.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-session-manager/endpoint-link.c -> pipewire-1.2.0.tar.gz/src/modules/module-session-manager/endpoint-link.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-session-manager/endpoint-stream.c -> pipewire-1.2.0.tar.gz/src/modules/module-session-manager/endpoint-stream.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-session-manager/endpoint.c -> pipewire-1.2.0.tar.gz/src/modules/module-session-manager/endpoint.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-session-manager/session.c -> pipewire-1.2.0.tar.gz/src/modules/module-session-manager/session.c Changed

pipewire-1.2.0.tar.gz/src/modules/module-snapcast-discover.c Added

@@ -0,0 +1,916 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2024 Wim Taymans */
+/* SPDX-License-Identifier: MIT */
+
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <net/if.h>
+#include <ifaddrs.h>
+
+#include "config.h"
+
+#include <spa/utils/result.h>
+#include <spa/utils/string.h>
+#include <spa/utils/json.h>
+#include <spa/param/audio/format.h>
+#include <spa/debug/types.h>
+
+#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 "module-zeroconf-discover/avahi-poll.h"
+
+/** \page page_module_snapcast_discover Snapcast Discover
+ *
+ * Automatically creates a Snapcast sink device based on zeroconf
+ * information.
+ *
+ * This module will load module-protocol-simple for each announced stream that matches
+ * the rule with the create-stream action and passes the properties to the module.
+ *
+ * If no stream.rules are given, it will create a sink for all announced
+ * snapcast servers.
+ *
+ * A new stream will be created on the snapcast server with the given
+ * `snapcast.stream-name` or `PipeWire-<hostname>`. You will need to route this new
+ * stream to clients with the snapcast control application.
+ *
+ * ## Module Name
+ *
+ * `libpipewire-module-snapcast-discover`
+ *
+ * ## Module Options
+ *
+ * Options specific to the behavior of this module
+ *
+ * - `snapcast.discover-local` = allow discovery of local services as well.
+ *    false by default.
+ * - `stream.rules` = <rules>: match rules, use create-stream actions. See
+ *   \ref page_module_protocol_simple for module properties.
+ *
+ * ## Example configuration
+ *
+ *\code{.unparsed}
+ * context.modules = 
+ * {   name = libpipewire-snapcast-discover
+ *     args = {
+ *         stream.rules = 
+ *             {   matches = 
+ *                     {    snapcast.ip = "~.*"
+ *                          #snapcast.ifindex = 1
+ *                          #snapcast.ifname = eth0
+ *                          #snapcast.port = 1000
+ *                          #snapcast.name = ""
+ *                          #snapcast.hostname = ""
+ *                          #snapcast.domain = ""
+ *                     }
+ *                 
+ *                 actions = {
+ *                     create-stream = {
+ *                         #audio.rate = 44100
+ *                         #audio.format = S16LE   # S16LE, S24_32LE, S32LE
+ *                         #audio.channels = 2
+ *                         #audio.position =  FL FR 
+ *                         #
+ *                         #snapcast.stream-name = "PipeWire"
+ *                         #
+ *                         #capture = true
+ *                         #capture.props = {
+ *                             #target.object = ""
+ *                             #media.class = "Audio/Sink"
+ *                         #}
+ *                     }
+ *                 }
+ *             }
+ *         
+ *     }
+ * }
+ * 
+ *\endcode
+ *
+ * ## See also
+ *
+ * \ref page_module_protocol_simple
+ */
+
+#define NAME "snapcast-discover"
+
+PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
+#define PW_LOG_TOPIC_DEFAULT mod_topic
+
+#define MODULE_USAGE "( stream.rules=<rules>, use create-stream actions )"
+
+#define DEFAULT_FORMAT "S16LE"
+#define DEFAULT_RATE 48000
+#define DEFAULT_CHANNELS 2
+#define DEFAULT_POSITION " FL FR "
+
+#define DEFAULT_CREATE_RULES	\
+        " { matches =  { snapcast.ip = \"~.*\" }  actions = { create-stream = { } } }  "
+
+static const struct spa_dict_item module_props = {
+	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
+	{ PW_KEY_MODULE_DESCRIPTION, "Discover remote Snapcast streams" },
+	{ PW_KEY_MODULE_USAGE, MODULE_USAGE },
+	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
+};
+
+#define SERVICE_TYPE_CONTROL "_snapcast-jsonrpc._tcp"
+
+struct impl {
+	struct pw_context *context;
+	struct pw_loop *loop;
+
+	struct pw_impl_module *module;
+	struct spa_hook module_listener;
+
+	struct pw_properties *properties;
+	bool discover_local;
+
+	AvahiPoll *avahi_poll;
+	AvahiClient *client;
+	AvahiServiceBrowser *sink_browser;
+
+	struct spa_list tunnel_list;
+};
+
+struct tunnel_info {
+	const char *name;
+	const char *host;
+	uint16_t port;
+};
+
+#define TUNNEL_INFO(...) ((struct tunnel_info){ __VA_ARGS__ })
+
+struct tunnel {
+	struct impl *impl;
+	struct spa_list link;
+	struct tunnel_info info;
+	struct pw_impl_module *module;
+	struct spa_hook module_listener;
+	char *server_address;
+	char *stream_name;
+	struct spa_audio_info_raw audio_info;
+	struct spa_source *source;
+	bool connecting;
+	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;
+
+	t = calloc(1, sizeof(*t));
+	if (t == NULL)
+		return NULL;
+
+	t->info.name = info->name ? strdup(info->name) : NULL;
+	t->info.host = info->host ? strdup(info->host) : NULL;
+	t->info.port = info->port;
+	t->impl = impl;
+	spa_list_append(&impl->tunnel_list, &t->link);
+
+	return t;
+}
+
+static struct tunnel *find_tunnel(struct impl *impl, const struct tunnel_info *info)
+{
+	struct tunnel *t;
+	spa_list_for_each(t, &impl->tunnel_list, link) {
+		if (spa_streq(t->info.name, info->name))
+			return t;
+	}
+	return NULL;
+}
+
+static void free_tunnel(struct tunnel *t)
+{
+	spa_list_remove(&t->link);
+	if (t->module)
+		pw_impl_module_destroy(t->module);
+	free((char *) t->info.name);
+	free((char *) t->info.host);
+	free(t->server_address);
+	free(t->stream_name);
+	free(t);
+}
+
+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);
+	pw_properties_free(impl->properties);
+	free(impl);
+}
+
+static void module_destroy(void *data)
+{
+	struct impl *impl = data;
+	spa_hook_remove(&impl->module_listener);
+	impl_free(impl);
+}
+
+static const struct pw_impl_module_events module_events = {
+	PW_VERSION_IMPL_MODULE_EVENTS,
+	.destroy = module_destroy,
+};
+
+static void pw_properties_from_avahi_string(const char *key, const char *value,
+		struct pw_properties *props)
+{
+}
+
+static void submodule_destroy(void *data)
+{
+	struct tunnel *t = data;
+	spa_hook_remove(&t->module_listener);
+	t->module = NULL;
+}
+
+static const struct pw_impl_module_events submodule_events = {
+	PW_VERSION_IMPL_MODULE_EVENTS,
+	.destroy = submodule_destroy,
+};
+
+static int snapcast_disconnect(struct tunnel *t)
+{
+	if (t->source)
+		pw_loop_destroy_source(t->impl->loop, t->source);
+	t->source = NULL;
+	return 0;
+}
+
+static int get_bps(uint32_t format)
+{
+	switch (format) {
+	case SPA_AUDIO_FORMAT_S16_LE:
+		return 16;
+	case SPA_AUDIO_FORMAT_S24_32_LE:
+		return 24;
+	case SPA_AUDIO_FORMAT_S32_LE:
+		return 32;
+	default:
+		return 0;
+	}
+}
+
+static int handle_connect(struct tunnel *t, int fd)
+{
+	int res;
+	socklen_t len;
+	char *str;
+
+	len = sizeof(res);
+	if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &res, &len) < 0) {
+		pw_log_error("getsockopt: %m");
+		return -errno;
+	}
+	if (res != 0)
+		return -res;
+
+	t->connecting = false;
+	pw_log_info("connected");
+
+	str = "{\"id\":8,\"jsonrpc\": \"2.0\",\"method\":\"Server.GetRPCVersion\"}\r\n";
+	res = write(t->source->fd, str, strlen(str));
+	pw_log_info("wrote %s: %d", str, res);
+
+	str = spa_aprintf("{\"id\":4,\"jsonrpc\":\"2.0\",\"method\":\"Stream.RemoveStream\","
+			"\"params\":{\"id\":\"%s\"}}\r\n", t->stream_name);
+	res = write(t->source->fd, str, strlen(str));
+	pw_log_info("wrote %s: %d", str, res);
+	free(str);
+
+	str = spa_aprintf("{\"id\":4,\"jsonrpc\":\"2.0\",\"method\":\"Stream.AddStream\""
+		",\"params\":{\"streamUri\":\"tcp://%s?name=%s&mode=client&"
+		"sampleformat=%d:%d:%d&codec=pcm&chunk_ms=20\"}}\r\n",
+		t->server_address, t->stream_name, t->audio_info.rate,
+		get_bps(t->audio_info.format), t->audio_info.channels);
+
+	res = write(t->source->fd, str, strlen(str));
+	pw_log_info("wrote %s: %d", str, res);
+	free(str);
+
+	return 0;
+}
+
+static int process_input(struct tunnel *t)
+{
+	char buffer1024 = "";
+	int res = 0;
+
+	while (true) {
+		res = read(t->source->fd, buffer, sizeof(buffer));
+		pw_log_info("%d", res);
+		if (res == 0)
+			return -EPIPE;
+		if (res < 0) {
+			res = -errno;
+			if (res == -EINTR)
+				continue;
+			if (res != -EAGAIN && res != -EWOULDBLOCK)
+				return res;
+			break;
+		}
+	}
+
+	pw_log_info("%s", buffer);
+	return 0;
+}
+
+static int flush_output(struct tunnel *t)
+{
+	t->need_flush = false;
+	return 0;
+}
+
+static void
+on_source_io(void *data, int fd, uint32_t mask)
+{
+	struct tunnel *t = data;
+	int res;
+
+	if (mask & (SPA_IO_ERR | SPA_IO_HUP)) {
+		res = -EPIPE;
+		goto error;
+	}
+	if (mask & SPA_IO_IN) {
+		if ((res = process_input(t)) < 0)
+			goto error;
+	}
+	if (mask & SPA_IO_OUT || t->need_flush) {
+		if (t->connecting) {
+			if ((res = handle_connect(t, fd)) < 0)
+				goto error;
+		}
+		res = flush_output(t);
+		if (res >= 0) {
+			pw_loop_update_io(t->impl->loop, t->source,
+				t->source->mask & ~SPA_IO_OUT);
+		} else if (res != -EAGAIN)
+			goto error;
+	}
+done:
+	return;
+error:
+	pw_log_error("%p: got connection error %d (%s)", t, res, spa_strerror(res));
+	snapcast_disconnect(t);
+	goto done;
+}
+
+
+static int snapcast_connect(struct tunnel *t)
+{
+	struct addrinfo hints;
+	struct addrinfo *result, *rp;
+	int res, fd;
+	char port_str12;
+
+	if (t->server_address == NULL)
+		return 0;
+
+	if (t->source != NULL)
+		snapcast_disconnect(t);
+
+	pw_log_info("%p: connect %s:%u", t, t->info.host, t->info.port);
+
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = AF_UNSPEC;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_flags = 0;
+	hints.ai_protocol = 0;
+
+	spa_scnprintf(port_str, sizeof(port_str), "%u", t->info.port);
+
+	if ((res = getaddrinfo(t->info.host, port_str, &hints, &result)) != 0) {
+		pw_log_error("getaddrinfo: %s", gai_strerror(res));
+		return -EINVAL;
+	}
+	res = -ENOENT;
+	for (rp = result; rp != NULL; rp = rp->ai_next) {
+		fd = socket(rp->ai_family,
+				rp->ai_socktype | SOCK_CLOEXEC | SOCK_NONBLOCK,
+				rp->ai_protocol);
+		if (fd == -1)
+			continue;
+
+		res = connect(fd, rp->ai_addr, rp->ai_addrlen);
+		if (res == 0 || (res < 0 && errno == EINPROGRESS))
+			break;
+
+		res = -errno;
+		close(fd);
+	}
+	freeaddrinfo(result);
+
+	if (rp == NULL) {
+		pw_log_error("Could not connect to %s:%u: %s", t->info.host, t->info.port,
+				spa_strerror(res));
+		return -EINVAL;
+	}
+
+	t->source = pw_loop_add_io(t->impl->loop, fd,
+			SPA_IO_IN | SPA_IO_OUT | SPA_IO_HUP | SPA_IO_ERR,
+			true, on_source_io, t);
+
+	if (t->source == NULL) {
+		res = -errno;
+		pw_log_error("%p: source create failed: %m", t);
+		close(fd);
+		return res;
+	}
+	t->connecting = true;
+	pw_log_info("%p: connecting", t);
+
+	return 0;
+
+}
+
+static int add_snapcast_stream(struct impl *impl, struct tunnel *t,
+		struct pw_properties *props, const char *servers)
+{
+	struct spa_json it2;
+	char v256;
+
+	spa_json_init(&it0, servers, strlen(servers));
+        if (spa_json_enter_array(&it0, &it1) <= 0)
+                spa_json_init(&it1, servers, strlen(servers));
+
+	while (spa_json_get_string(&it1, v, sizeof(v)) > 0) {
+		t->server_address = strdup(v);
+		snapcast_connect(t);
+		break;
+	}
+	return 0;
+}
+
+static inline uint32_t format_from_name(const char *name, size_t len)
+{
+	int i;
+	for (i = 0; spa_type_audio_formati.name; i++) {
+		if (strncmp(name, spa_debug_type_short_name(spa_type_audio_formati.name), len) == 0)
+			return spa_type_audio_formati.type;
+	}
+	return SPA_AUDIO_FORMAT_UNKNOWN;
+}
+
+static inline uint32_t channel_from_name(const char *name)
+{
+	int i;
+	for (i = 0; spa_type_audio_channeli.name; i++) {
+		if (spa_streq(name, spa_debug_type_short_name(spa_type_audio_channeli.name)))
+			return spa_type_audio_channeli.type;
+	}
+	return SPA_AUDIO_CHANNEL_UNKNOWN;
+}
+
+static void parse_position(struct spa_audio_info_raw *info, const char *val, size_t len)
+{
+	struct spa_json it2;
+	char v256;
+
+	spa_json_init(&it0, val, len);
+        if (spa_json_enter_array(&it0, &it1) <= 0)
+                spa_json_init(&it1, val, len);
+
+	info->channels = 0;
+	while (spa_json_get_string(&it1, v, sizeof(v)) > 0 &&
+	    info->channels < SPA_AUDIO_MAX_CHANNELS) {
+		info->positioninfo->channels++ = channel_from_name(v);
+	}
+}
+
+static void parse_audio_info(struct pw_properties *props, struct spa_audio_info_raw *info)
+{
+	const char *str;
+
+	spa_zero(*info);
+	if ((str = pw_properties_get(props, PW_KEY_AUDIO_FORMAT)) == NULL)
+		str = DEFAULT_FORMAT;
+	info->format = format_from_name(str, strlen(str));
+	if (info->format == 0) {
+		str = DEFAULT_FORMAT;
+		info->format = format_from_name(str, strlen(str));
+	}
+	pw_properties_set(props, PW_KEY_AUDIO_FORMAT, str);
+
+	info->rate = pw_properties_get_uint32(props, PW_KEY_AUDIO_RATE, info->rate);
+	if (info->rate == 0)
+		info->rate = DEFAULT_RATE;
+	pw_properties_setf(props, PW_KEY_AUDIO_RATE, "%d", info->rate);
+
+	info->channels = pw_properties_get_uint32(props, PW_KEY_AUDIO_CHANNELS, info->channels);
+	info->channels = SPA_MIN(info->channels, SPA_AUDIO_MAX_CHANNELS);
+	if ((str = pw_properties_get(props, SPA_KEY_AUDIO_POSITION)) != NULL)
+		parse_position(info, str, strlen(str));
+	if (info->channels == 0)
+		parse_position(info, DEFAULT_POSITION, strlen(DEFAULT_POSITION));
+	pw_properties_setf(props, PW_KEY_AUDIO_CHANNELS, "%d", info->channels);
+}
+
+static int create_stream(struct impl *impl, struct pw_properties *props,
+		struct tunnel *t)
+{
+	FILE *f;
+	char *args;
+	size_t size;
+	int res = 0;
+	struct pw_impl_module *mod;
+	const struct pw_properties *mod_props;
+	const char *str;
+
+	if ((str = pw_properties_get(props, "snapcast.stream-name")) == NULL)
+		pw_properties_setf(props, "snapcast.stream-name",
+				"PipeWire-%s", pw_get_host_name());
+	if ((str = pw_properties_get(props, "snapcast.stream-name")) == NULL)
+		str = "PipeWire";
+	t->stream_name = strdup(str);
+
+	if ((str = pw_properties_get(props, "capture")) == NULL)
+		pw_properties_set(props, "capture", "true");
+	if ((str = pw_properties_get(props, "capture.props")) == NULL)
+		pw_properties_set(props, "capture.props", "{ media.class = Audio/Sink }");
+
+	parse_audio_info(props, &t->audio_info);
+
+	if ((f = open_memstream(&args, &size)) == NULL) {
+		res = -errno;
+		pw_log_error("Can't open memstream: %m");
+		goto done;
+	}
+
+	fprintf(f, "{");
+	pw_properties_serialize_dict(f, &props->dict, 0);
+	fprintf(f, "}");
+        fclose(f);
+
+	pw_log_info("loading module args:'%s'", args);
+	mod = pw_context_load_module(impl->context,
+			"libpipewire-module-protocol-simple",
+			args, NULL);
+	free(args);
+
+	if (mod == NULL) {
+		res = -errno;
+		pw_log_error("Can't load module: %m");
+                goto done;
+	}
+
+	pw_impl_module_add_listener(mod, &t->module_listener, &submodule_events, t);
+	t->module = mod;
+
+	if ((mod_props = pw_impl_module_get_properties(mod)) != NULL) {
+		const char *addr;
+		if ((addr = pw_properties_get(mod_props, "server.address"))) {
+			add_snapcast_stream(impl, t, props, addr);
+		}
+	}
+done:
+	return res;
+}
+
+struct match_info {
+	struct impl *impl;
+	struct pw_properties *props;
+	struct tunnel *tunnel;
+	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;
+	int res = 0;
+
+	i->matched = true;
+	if (spa_streq(action, "create-stream")) {
+		pw_properties_update_string(i->props, str, len);
+		create_stream(i->impl, i->props, i->tunnel);
+	}
+	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)
+{
+	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 atAVAHI_ADDRESS_STR_MAX;
+	char hbufNI_MAXHOST;
+	char if_suffix16 = "";
+	struct ifreq ifreq;
+	int fd, res, family;
+
+	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 - skipping tunnel creation", at);
+		goto done;
+	}
+	pw_log_info("%s %s", name, at);
+
+	tinfo = TUNNEL_INFO(.name = name, .port = port);
+
+	t = find_tunnel(impl, &tinfo);
+	if (t == NULL)
+		t = make_tunnel(impl, &tinfo);
+	if (t == 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);
+		goto done;
+	}
+
+	props = pw_properties_new(NULL, NULL);
+	if (props == NULL) {
+		pw_log_error("Can't allocate properties: %m");
+		goto done;
+	}
+
+	if (a->proto == AVAHI_PROTO_INET6 &&
+	    a->data.ipv6.address0 == 0xfe &&
+	    (a->data.ipv6.address1 & 0xc0) == 0x80)
+		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);
+	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);
+
+	free((char*)t->info.host);
+	t->info.host = strdup(pw_properties_get(props, "snapcast.ip"));
+
+	family = protocol == AVAHI_PROTO_INET ? AF_INET : AF_INET6;
+
+	spa_zero(ifreq);
+	fd = socket(family, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
+	ifreq.ifr_ifindex = interface;
+	ioctl(fd, SIOCGIFNAME, &ifreq, sizeof(ifreq));
+	pw_properties_setf(props, "snapcast.ifname", "%s", ifreq.ifr_name);
+
+	struct ifaddrs *if_addr, *ifp;
+	if (getifaddrs(&if_addr) < 0)
+		pw_log_error("error: %m");
+
+	for (ifp = if_addr; ifp != NULL; ifp = ifp->ifa_next) {
+		if (ifp->ifa_addr == NULL)
+			continue;
+
+		if (spa_streq(ifp->ifa_name, ifreq.ifr_name) &&
+		    ifp->ifa_addr->sa_family == family) {
+			break;
+		}
+	}
+	if (ifp != NULL) {
+		if ((res = getnameinfo((struct sockaddr *)ifp->ifa_addr,
+				(family == AF_INET) ? sizeof(struct sockaddr_in) :
+						sizeof(struct sockaddr_in6),
+				hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST)) == 0) {
+			pw_properties_setf(props, "server.address", " \"tcp:%s%s%s:0\" ",
+					family == AF_INET ? "" : "",
+					hbuf,
+					family == AF_INET ? "" : "");
+		} else {
+			pw_log_warn("error: %m %d %s", res, gai_strerror(res));
+		}
+	}
+	freeifaddrs(if_addr);
+	close(fd);
+
+	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);
+	}
+
+	if ((str = pw_properties_get(impl->properties, "stream.rules")) == NULL)
+		str = DEFAULT_CREATE_RULES;
+	if (str != NULL) {
+		struct match_info minfo = {
+			.impl = impl,
+			.props = props,
+			.tunnel = t,
+		};
+		pw_conf_match_rules(str, strlen(str), NAME, &props->dict,
+				rule_matched, &minfo);
+
+		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)
+{
+	struct impl *impl = userdata;
+	struct tunnel_info info;
+	struct tunnel *t;
+
+	if ((flags & AVAHI_LOOKUP_RESULT_LOCAL) && !impl->discover_local)
+		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;
+	}
+}
+
+
+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_CONTROL);
+		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)
+{
+	struct pw_loop *loop;
+
+	loop = pw_context_get_main_loop(impl->context);
+	impl->avahi_poll = pw_avahi_poll_new(loop);
+
+	return start_client(impl);
+}
+
+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 pw_properties *props;
+	struct impl *impl;
+	int res;
+
+	PW_LOG_TOPIC_INIT(mod_topic);
+
+	impl = calloc(1, sizeof(struct impl));
+	if (impl == NULL)
+		goto error_errno;
+
+	pw_log_debug("module %p: new %s", impl, args);
+
+	if (args == NULL)
+		args = "";
+
+	props = pw_properties_new_string(args);
+	if (props == NULL)
+		goto error_errno;
+
+	spa_list_init(&impl->tunnel_list);
+
+	impl->loop = pw_context_get_main_loop(context);
+	impl->module = module;
+	impl->context = context;
+	impl->properties = props;
+
+	impl->discover_local =  pw_properties_get_bool(impl->properties,
+			"snapcast.discover-local", 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);
+
+	return 0;
+
+error_errno:
+	res = -errno;
+	if (impl)
+		impl_free(impl);
+	return res;
+}

pipewire-1.0.1.tar.bz2/src/modules/module-vban-recv.c -> pipewire-1.2.0.tar.gz/src/modules/module-vban-recv.c Changed

@@ -30,6 +30,7 @@
 #include <pipewire/impl.h>
 
 #include <module-vban/stream.h>
+#include "network-utils.h"
 
 #ifdef __FreeBSD__
 #define ifr_ifindex ifr_index
@@ -189,26 +190,6 @@
 	return;
 }
 
-static int parse_address(const char *address, uint16_t port,
-		struct sockaddr_storage *addr, socklen_t *len)
-{
-	struct sockaddr_in *sa4 = (struct sockaddr_in*)addr;
-	struct sockaddr_in6 *sa6 = (struct sockaddr_in6*)addr;
-
-	if (inet_pton(AF_INET, address, &sa4->sin_addr) > 0) {
-		sa4->sin_family = AF_INET;
-		sa4->sin_port = htons(port);
-		*len = sizeof(*sa4);
-	} else if (inet_pton(AF_INET6, address, &sa6->sin6_addr) > 0) {
-		sa6->sin6_family = AF_INET6;
-		sa6->sin6_port = htons(port);
-		*len = sizeof(*sa6);
-	} else
-		return -EINVAL;
-
-	return 0;
-}
-
 static int make_socket(const struct sockaddr* sa, socklen_t salen, char *ifname)
 {
 	int af, fd, val, res;
@@ -389,6 +370,9 @@
 	if (impl->timer)
 		pw_loop_destroy_source(impl->loop, impl->timer);
 
+	if (impl->data_loop)
+		pw_context_release_loop(impl->context, impl->data_loop);
+
 	pw_properties_free(impl->stream_props);
 	pw_properties_free(impl->props);
 
@@ -463,11 +447,12 @@
 	impl->module = module;
 	impl->context = context;
 	impl->loop = pw_context_get_main_loop(context);
-	impl->data_loop = pw_data_loop_get_loop(pw_context_get_data_loop(context));
+	impl->data_loop = pw_context_acquire_loop(context, &props->dict);
 
 	if ((sess_name = pw_properties_get(props, "sess.name")) == NULL)
 		sess_name = pw_get_host_name();
 
+	pw_properties_set(props, PW_KEY_NODE_LOOP_NAME, impl->data_loop->name);
 	if (pw_properties_get(props, PW_KEY_NODE_NAME) == NULL)
 		pw_properties_setf(props, PW_KEY_NODE_NAME, "vban_session.%s", sess_name);
 	if (pw_properties_get(props, PW_KEY_NODE_DESCRIPTION) == NULL)
@@ -479,6 +464,7 @@
 	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, PW_KEY_AUDIO_FORMAT);
 	copy_props(impl, props, PW_KEY_AUDIO_RATE);
 	copy_props(impl, props, PW_KEY_AUDIO_CHANNELS);
@@ -508,7 +494,7 @@
 	}
 	if ((str = pw_properties_get(props, "source.ip")) == NULL)
 		str = DEFAULT_SOURCE_IP;
-	if ((res = parse_address(str, impl->src_port, &impl->src_addr, &impl->src_len)) < 0) {
+	if ((res = pw_net_parse_address(str, impl->src_port, &impl->src_addr, &impl->src_len)) < 0) {
 		pw_log_error("invalid source.ip %s: %s", str, spa_strerror(res));
 		goto out;
 	}

pipewire-1.0.1.tar.bz2/src/modules/module-vban-send.c -> pipewire-1.2.0.tar.gz/src/modules/module-vban-send.c Changed

@@ -26,6 +26,7 @@
 #include <pipewire/impl.h>
 
 #include <module-vban/stream.h>
+#include "network-utils.h"
 
 #ifndef IPTOS_DSCP
 #define IPTOS_DSCP_MASK 0xfc
@@ -218,26 +219,6 @@
 	.send_packet = stream_send_packet,
 };
 
-static int parse_address(const char *address, uint16_t port,
-		struct sockaddr_storage *addr, socklen_t *len)
-{
-	struct sockaddr_in *sa4 = (struct sockaddr_in*)addr;
-	struct sockaddr_in6 *sa6 = (struct sockaddr_in6*)addr;
-
-	if (inet_pton(AF_INET, address, &sa4->sin_addr) > 0) {
-		sa4->sin_family = AF_INET;
-		sa4->sin_port = htons(port);
-		*len = sizeof(*sa4);
-	} else if (inet_pton(AF_INET6, address, &sa6->sin6_addr) > 0) {
-		sa6->sin6_family = AF_INET6;
-		sa6->sin6_port = htons(port);
-		*len = sizeof(*sa6);
-	} else
-		return -EINVAL;
-
-	return 0;
-}
-
 static bool is_multicast(struct sockaddr *sa, socklen_t salen)
 {
 	if (sa->sa_family == AF_INET) {
@@ -299,19 +280,6 @@
 	return res;
 }
 
-static int get_ip(const struct sockaddr_storage *sa, char *ip, size_t len)
-{
-	if (sa->ss_family == AF_INET) {
-		struct sockaddr_in *in = (struct sockaddr_in*)sa;
-		inet_ntop(sa->ss_family, &in->sin_addr, ip, len);
-	} else if (sa->ss_family == AF_INET6) {
-		struct sockaddr_in6 *in = (struct sockaddr_in6*)sa;
-		inet_ntop(sa->ss_family, &in->sin6_addr, ip, len);
-	} else
-		return -EIO;
-	return 0;
-}
-
 static void core_destroy(void *d)
 {
 	struct impl *impl = d;
@@ -460,7 +428,7 @@
 
 	if ((str = pw_properties_get(props, "source.ip")) == NULL)
 		str = DEFAULT_SOURCE_IP;
-	if ((res = parse_address(str, 0, &impl->src_addr, &impl->src_len)) < 0) {
+	if ((res = pw_net_parse_address(str, 0, &impl->src_addr, &impl->src_len)) < 0) {
 		pw_log_error("invalid source.ip %s: %s", str, spa_strerror(res));
 		goto out;
 	}
@@ -468,7 +436,7 @@
 	impl->dst_port = pw_properties_get_uint32(props, "destination.port", DEFAULT_PORT);
 	if ((str = pw_properties_get(props, "destination.ip")) == NULL)
 		str = DEFAULT_DESTINATION_IP;
-	if ((res = parse_address(str, impl->dst_port, &impl->dst_addr, &impl->dst_len)) < 0) {
+	if ((res = pw_net_parse_address(str, impl->dst_port, &impl->dst_addr, &impl->dst_len)) < 0) {
 		pw_log_error("invalid destination.ip %s: %s", str, spa_strerror(res));
 		goto out;
 	}
@@ -477,9 +445,9 @@
 	impl->mcast_loop = pw_properties_get_bool(props, "net.loop", DEFAULT_LOOP);
 	impl->dscp = pw_properties_get_uint32(props, "net.dscp", DEFAULT_DSCP);
 
-	get_ip(&impl->src_addr, addr, sizeof(addr));
+	pw_net_get_ip(&impl->src_addr, addr, sizeof(addr), NULL, NULL);
 	pw_properties_set(stream_props, "vban.source.ip", addr);
-	get_ip(&impl->dst_addr, addr, sizeof(addr));
+	pw_net_get_ip(&impl->dst_addr, addr, sizeof(addr), NULL, NULL);
 	pw_properties_set(stream_props, "vban.destination.ip", addr);
 	pw_properties_setf(stream_props, "vban.destination.port", "%u", impl->dst_port);
 	pw_properties_setf(stream_props, "vban.ttl", "%u", impl->ttl);

pipewire-1.0.1.tar.bz2/src/modules/module-vban/audio.c -> pipewire-1.2.0.tar.gz/src/modules/module-vban/audio.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-vban/midi.c -> pipewire-1.2.0.tar.gz/src/modules/module-vban/midi.c Changed

pipewire-1.0.1.tar.bz2/src/modules/module-vban/stream.c -> pipewire-1.2.0.tar.gz/src/modules/module-vban/stream.c Changed

@@ -13,6 +13,7 @@
 #include <spa/control/control.h>
 #include <spa/debug/types.h>
 #include <spa/debug/mem.h>
+#include <spa/debug/log.h>
 
 #include "config.h"
 
@@ -253,6 +254,7 @@
 {
 	struct impl *impl;
 	const char *str;
+	char tmp64;
 	uint8_t buffer1024;
 	struct spa_pod_builder b;
 	uint32_t n_params, min_samples, max_samples;
@@ -356,22 +358,23 @@
 	if (!spa_atof(str, &max_ptime))
 		max_ptime = DEFAULT_MAX_PTIME;
 
-	min_samples = min_ptime * impl->rate / 1000;
-	max_samples = SPA_MIN(256, max_ptime * impl->rate / 1000);
+	min_samples = (uint32_t)(min_ptime * impl->rate / 1000);
+	max_samples = SPA_MIN(256u, (uint32_t)(max_ptime * impl->rate / 1000));
 
-	float ptime = 0;
+	float ptime = 0.f;
 	if ((str = pw_properties_get(props, "vban.ptime")) != NULL)
 		if (!spa_atof(str, &ptime))
-			ptime = 0.0;
+			ptime = 0.0f;
 
-	if (ptime) {
-		impl->psamples = ptime * impl->rate / 1000;
+	if (ptime != 0.f) {
+		impl->psamples = (uint32_t)(ptime * impl->rate / 1000);
 	} else {
 		impl->psamples = impl->mtu / impl->stride;
 		impl->psamples = SPA_CLAMP(impl->psamples, min_samples, max_samples);
 		if (direction == PW_DIRECTION_OUTPUT)
-			pw_properties_setf(props, "vban.ptime", "%f",
-					impl->psamples * 1000.0 / impl->rate);
+			pw_properties_set(props, "vban.ptime",
+					spa_dtoa(tmp, sizeof(tmp),
+						impl->psamples * 1000.0 / impl->rate));
 	}
 	latency_msec = pw_properties_get_uint32(props,
 			"sess.latency.msec", DEFAULT_SESS_LATENCY);

pipewire-1.0.1.tar.bz2/src/modules/module-zeroconf-discover.c -> pipewire-1.2.0.tar.gz/src/modules/module-zeroconf-discover.c Changed

@@ -40,6 +40,8 @@
  *
  * ## Module Options
  *
+ * - `pulse.discover-local` = allow discovery of local services as well.
+ *    false by default.
  * - `pulse.latency`: the latency to end-to-end latency in milliseconds to
  *                    maintain (Default 200ms).
  *
@@ -80,6 +82,7 @@
 
 	struct pw_properties *properties;
 
+	bool discover_local;
 	AvahiPoll *avahi_poll;
 	AvahiClient *client;
 	AvahiServiceBrowser *sink_browser;
@@ -375,7 +378,7 @@
 	struct tunnel_info info;
 	struct tunnel *t;
 
-	if (flags & AVAHI_LOOKUP_RESULT_LOCAL)
+	if ((flags & AVAHI_LOOKUP_RESULT_LOCAL) && !impl->discover_local)
 		return;
 
 	info = TUNNEL_INFO(.name = name);
@@ -519,6 +522,9 @@
 	impl->context = context;
 	impl->properties = props;
 
+	impl->discover_local =  pw_properties_get_bool(impl->properties,
+			"pulse.discover-local", 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));

pipewire-1.2.0.tar.gz/src/modules/network-utils.h Added

@@ -0,0 +1,78 @@
+#ifndef NETWORK_UTILS_H
+#define NETWORK_UTILS_H
+
+#include <stdio.h>
+#include <netdb.h>
+#include <string.h>
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <errno.h>
+
+static inline int pw_net_parse_address(const char *address, uint16_t port,
+		struct sockaddr_storage *addr, socklen_t *len)
+{
+	struct addrinfo hints;
+	struct addrinfo *result, *rp;
+	int res;
+	char port_str6;
+
+	snprintf(port_str, sizeof(port_str), "%u", port);
+
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = AF_UNSPEC;
+	hints.ai_socktype = SOCK_DGRAM;
+	hints.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV;
+
+	res = getaddrinfo(address, port_str, &hints, &result);
+
+	if (res != 0)
+		return -EINVAL;
+
+	for (rp = result; rp != NULL; rp = rp->ai_next) {
+		memcpy(addr, rp->ai_addr, rp->ai_addrlen);
+		*len = rp->ai_addrlen;
+		break;
+	}
+	freeaddrinfo(result);
+
+	return 0;
+}
+
+static inline int pw_net_get_ip(const struct sockaddr_storage *sa, char *ip, size_t len, bool *ip4, uint16_t *port)
+{
+	if (sa->ss_family == AF_INET) {
+		struct sockaddr_in *in = (struct sockaddr_in*)sa;
+		inet_ntop(sa->ss_family, &in->sin_addr, ip, len);
+		if (port)
+			*port = ntohs(in->sin_port);
+	} else if (sa->ss_family == AF_INET6) {
+		struct sockaddr_in6 *in = (struct sockaddr_in6*)sa;
+		inet_ntop(sa->ss_family, &in->sin6_addr, ip, len);
+		if (port)
+			*port = ntohs(in->sin6_port);
+		if (in->sin6_scope_id == 0 || len <= 1)
+			goto finish;
+
+		size_t curlen = strlen(ip);
+		if (len-(curlen+1) >= IFNAMSIZ) {
+			ip += curlen+1;
+			ip-1 = '%';
+			if (if_indextoname(in->sin6_scope_id, ip) == NULL)
+				ip-1 = 0;
+		}
+	} else
+		return -EINVAL;
+finish:
+	if (ip4)
+		*ip4 = sa->ss_family == AF_INET;
+	return 0;
+}
+
+static inline char *pw_net_get_ip_fmt(const struct sockaddr_storage *sa, char *ip, size_t len)
+{
+	if (pw_net_get_ip(sa, ip, len, NULL, NULL) != 0)
+		snprintf(ip, len, "invalid ip");
+	return ip;
+}
+
+#endif /* NETWORK_UTILS_H */

pipewire-1.0.1.tar.bz2/src/modules/spa/module-device.c -> pipewire-1.2.0.tar.gz/src/modules/spa/module-device.c Changed

pipewire-1.0.1.tar.bz2/src/modules/spa/module-node-factory.c -> pipewire-1.2.0.tar.gz/src/modules/spa/module-node-factory.c Changed

pipewire-1.0.1.tar.bz2/src/modules/spa/module-node.c -> pipewire-1.2.0.tar.gz/src/modules/spa/module-node.c Changed

pipewire-1.0.1.tar.bz2/src/modules/spa/spa-device.c -> pipewire-1.2.0.tar.gz/src/modules/spa/spa-device.c Changed

pipewire-1.0.1.tar.bz2/src/modules/spa/spa-node.c -> pipewire-1.2.0.tar.gz/src/modules/spa/spa-node.c Changed

@@ -10,6 +10,7 @@
 
 #include <spa/node/node.h>
 #include <spa/node/utils.h>
+#include <spa/utils/cleanup.h>
 #include <spa/utils/result.h>
 #include <spa/param/props.h>
 #include <spa/pod/iter.h>
@@ -210,6 +211,22 @@
 	return 0;
 }
 
+struct match {
+	struct pw_properties *props;
+	int count;
+};
+#define MATCH_INIT(p) ((struct match){ .props = (p) })
+
+static int execute_match(void *data, const char *location, const char *action,
+		const char *val, size_t len)
+{
+	struct match *match = data;
+	if (spa_streq(action, "update-props")) {
+		match->count += pw_properties_update_string(match->props, val, len);
+	}
+	return 1;
+}
+
 
 struct pw_impl_node *pw_spa_node_load(struct pw_context *context,
 				 const char *factory_name,
@@ -223,16 +240,33 @@
 	struct spa_handle *handle;
 	void *iface;
 	const struct pw_properties *p;
+	struct pw_loop *loop;
+	struct match match;
 
 	if (properties) {
 		p = pw_context_get_properties(context);
 		pw_properties_set(properties, "clock.quantum-limit",
 				pw_properties_get(p, "default.clock.quantum-limit"));
+	} else {
+		properties = pw_properties_new(NULL, NULL);
+		if (properties == NULL)
+			return NULL;
+	}
+
+	match = MATCH_INIT(properties);
+	pw_context_conf_section_match_rules(context, "node.rules",
+			&properties->dict, execute_match, &match);
+
+	loop =  pw_context_acquire_loop(context, &properties->dict);
+	if (loop == NULL) {
+		res = -errno;
+		goto error_exit;
 	}
 
-	handle = pw_context_load_spa_handle(context,
-			factory_name,
-			properties ? &properties->dict : NULL);
+	pw_properties_set(properties, PW_KEY_NODE_LOOP_NAME, loop->name);
+	pw_context_release_loop(context, loop);
+
+	handle = pw_context_load_spa_handle(context, factory_name, &properties->dict);
 	if (handle == NULL) {
 		res = -errno;
 		goto error_exit;
@@ -247,20 +281,15 @@
 
 	spa_node = iface;
 
-	if (properties != NULL) {
-		if ((res = setup_props(context, spa_node, properties)) < 0) {
-			pw_log_warn("can't setup properties: %s", spa_strerror(res));
-		}
-	}
+	if ((res = setup_props(context, spa_node, properties)) < 0)
+		pw_log_warn("can't setup properties: %s", spa_strerror(res));
 
 	this = pw_spa_node_new(context, flags,
-			       spa_node, handle, properties, user_data_size);
+			       spa_node, handle, spa_steal_ptr(properties), user_data_size);
 	if (this == NULL) {
 		res = -errno;
-		properties = NULL;
 		goto error_exit_unload;
 	}
-
 	return this;
 
 error_exit_unload:

pipewire-1.0.1.tar.bz2/src/pipewire/array.h -> pipewire-1.2.0.tar.gz/src/pipewire/array.h Changed

@@ -29,18 +29,21 @@
 	void *data;		/**< pointer to array data */
 	size_t size;		/**< length of array in bytes */
 	size_t alloc;		/**< number of allocated memory in \a data */
-	size_t extend;		/**< number of bytes to extend with */
+	size_t extend;		/**< number of bytes to extend with, 0 when the
+				  *  data should not expand */
 };
 
+/** Initialize an array. The new array is empty. */
 #define PW_ARRAY_INIT(extend) ((struct pw_array) { NULL, 0, 0, (extend) })
 
+/** Return the length of an array. */
 #define pw_array_get_len_s(a,s)			((a)->size / (s))
 #define pw_array_get_unchecked_s(a,idx,s,t)	SPA_PTROFF((a)->data,(idx)*(s),t)
 #define pw_array_check_index_s(a,idx,s)		((idx) < pw_array_get_len_s(a,s))
 
 /** Get the number of items of type \a t in array */
 #define pw_array_get_len(a,t)			pw_array_get_len_s(a,sizeof(t))
-/** Get the item with index \a idx and type \a t from array */
+/** Get the item with index \a idx and type \a t from array. No bounds check is done. */
 #define pw_array_get_unchecked(a,idx,t)		pw_array_get_unchecked_s(a,idx,sizeof(t),t)
 /** Check if an item with index \a idx and type \a t exist in array */
 #define pw_array_check_index(a,idx,t)		pw_array_check_index_s(a,idx,sizeof(t))
@@ -66,7 +69,8 @@
                 SPA_PTRDIFF(pw_array_end(a),(p)));			\
 })
 
-/** Initialize the array with given extend */
+/** Initialize the array with given extend. Extend needs to be > 0 or else
+ * the array will not be able to expand. */
 static inline void pw_array_init(struct pw_array *arr, size_t extend)
 {
 	arr->data = NULL;
@@ -74,13 +78,22 @@
 	arr->extend = extend;
 }
 
-/** Clear the array */
+/** Clear the array. This should be called when pw_array_init() was called.  */
 static inline void pw_array_clear(struct pw_array *arr)
 {
-	free(arr->data);
+	if (arr->extend > 0)
+		free(arr->data);
 	pw_array_init(arr, arr->extend);
 }
 
+/** Initialize a static array. */
+static inline void pw_array_init_static(struct pw_array *arr, void *data, size_t size)
+{
+	arr->data = data;
+	arr->alloc = size;
+	arr->size = arr->extend = 0;
+}
+
 /** Reset the array */
 static inline void pw_array_reset(struct pw_array *arr)
 {
@@ -97,10 +110,9 @@
 
 	if (SPA_UNLIKELY(alloc < need)) {
 		void *data;
-		alloc = SPA_MAX(alloc, arr->extend);
-		spa_assert(alloc != 0); /* forgot pw_array_init */
-		while (alloc < need)
-			alloc *= 2;
+		if (arr->extend == 0)
+			return -ENOSPC;
+		alloc = SPA_ROUND_UP(need, arr->extend);
 		if (SPA_UNLIKELY((data = realloc(arr->data, alloc)) == NULL))
 			return -errno;
 		arr->data = data;
@@ -110,7 +122,8 @@
 }
 
 /** Add \a ref size bytes to \a arr. A pointer to memory that can
- * hold at least \a size bytes is returned */
+ * hold at least \a size bytes is returned or NULL when an error occurred
+ * and errno will be set.*/
 static inline void *pw_array_add(struct pw_array *arr, size_t size)
 {
 	void *p;
@@ -124,27 +137,17 @@
 	return p;
 }
 
-/** Add \a ref size bytes to \a arr. When there is not enough memory to
- * hold \a size bytes, NULL is returned */
-static inline void *pw_array_add_fixed(struct pw_array *arr, size_t size)
+/** Add a pointer to array. Returns 0 on success and a negative errno style
+ * error on failure. */
+static inline int pw_array_add_ptr(struct pw_array *arr, void *ptr)
 {
-	void *p;
-
-	if (SPA_UNLIKELY(arr->alloc < arr->size + size)) {
-		errno = ENOSPC;
-		return NULL;
-	}
-
-	p = SPA_PTROFF(arr->data, arr->size, void);
-	arr->size += size;
-
-	return p;
+	void **p = (void **)pw_array_add(arr, sizeof(void*));
+	if (p == NULL)
+		return -errno;
+	*p = ptr;
+	return 0;
 }
 
-/** Add a pointer to array */
-#define pw_array_add_ptr(a,p)					\
-	*((void**) pw_array_add(a, sizeof(void*))) = (p)
-
 /**
  * \}
  */

pipewire-1.0.1.tar.bz2/src/pipewire/buffers.c -> pipewire-1.2.0.tar.gz/src/pipewire/buffers.c Changed

@@ -6,6 +6,7 @@
 #include <spa/pod/parser.h>
 #include <spa/param/param.h>
 #include <spa/buffer/alloc.h>
+#include <spa/debug/types.h>
 
 #include "pipewire/keys.h"
 #include "pipewire/private.h"
@@ -27,8 +28,8 @@
 /* Allocate an array of buffers that can be shared */
 static int alloc_buffers(struct pw_mempool *pool,
 			 uint32_t n_buffers,
-			 uint32_t n_params,
-			 struct spa_pod **params,
+			 uint32_t n_metas,
+			 struct spa_meta *metas,
 			 uint32_t n_datas,
 			 uint32_t *data_sizes,
 			 int32_t *data_strides,
@@ -40,8 +41,6 @@
 	struct spa_buffer **buffers;
 	void *skel, *data;
 	uint32_t i;
-	uint32_t n_metas;
-	struct spa_meta *metas;
 	struct spa_data *datas;
 	struct pw_memblock *m;
 	struct spa_buffer_alloc_info info = { 0, };
@@ -49,30 +48,8 @@
 	if (!SPA_FLAG_IS_SET(flags, PW_BUFFERS_FLAG_SHARED))
 		SPA_FLAG_SET(info.flags, SPA_BUFFER_ALLOC_FLAG_INLINE_ALL);
 
-	n_metas = 0;
-
-	metas = alloca(sizeof(struct spa_meta) * n_params);
 	datas = alloca(sizeof(struct spa_data) * n_datas);
 
-	/* collect metadata */
-	for (i = 0; i < n_params; i++) {
-		if (spa_pod_is_object_type (paramsi, SPA_TYPE_OBJECT_ParamMeta)) {
-			uint32_t type, size;
-
-			if (spa_pod_parse_object(paramsi,
-				SPA_TYPE_OBJECT_ParamMeta, NULL,
-				SPA_PARAM_META_type, SPA_POD_Id(&type),
-				SPA_PARAM_META_size, SPA_POD_Int(&size)) < 0)
-				continue;
-
-			pw_log_debug("%p: enable meta %d %d", allocation, type, size);
-
-			metasn_metas.type = type;
-			metasn_metas.size = size;
-			n_metas++;
-		}
-	}
-
 	for (i = 0; i < n_datas; i++) {
 		struct spa_data *d = &datasi;
 
@@ -120,8 +97,8 @@
 		data = NULL;
 	}
 
-	pw_log_debug("%p: layout buffers skel:%p data:%p buffers:%p",
-			allocation, skel, data, buffers);
+	pw_log_debug("%p: layout buffers skel:%p data:%p n_buffers:%d buffers:%p",
+			allocation, skel, data, n_buffers, buffers);
 	spa_buffer_alloc_layout_array(&info, n_buffers, buffers, skel, data);
 
 	allocation->mem = m;
@@ -200,27 +177,17 @@
 	return num;
 }
 
-static struct spa_pod *find_param(struct spa_pod **params, uint32_t n_params, uint32_t type)
-{
-	uint32_t i;
-
-	for (i = 0; i < n_params; i++) {
-		if (spa_pod_is_object_type(paramsi, type))
-			return paramsi;
-	}
-	return NULL;
-}
-
 SPA_EXPORT
 int pw_buffers_negotiate(struct pw_context *context, uint32_t flags,
 		struct spa_node *outnode, uint32_t out_port_id,
 		struct spa_node *innode, uint32_t in_port_id,
 		struct pw_buffers *result)
 {
-	struct spa_pod **params, *param;
+	struct spa_pod **params;
 	uint8_t buffer4096;
 	struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
-	uint32_t i, offset, n_params;
+	uint32_t i, j, offset, n_params, n_metas;
+	struct spa_meta *metas;
 	uint32_t max_buffers, blocks;
 	size_t minsize, stride, align;
 	uint32_t *data_sizes;
@@ -237,6 +204,7 @@
 		input = tmp;
 	}
 
+	/* collect buffers */
 	res = param_filter(result, &input, &output, SPA_PARAM_Buffers, &b);
 	if (res < 0) {
 		pw_context_debug_port_params(context, input.node, input.direction,
@@ -247,17 +215,41 @@
 				"output param");
 		return res;
 	}
+
+	/* collect metadata */
 	n_params = res;
 	if ((res = param_filter(result, &input, &output, SPA_PARAM_Meta, &b)) > 0)
 		n_params += res;
 
+	metas = alloca(sizeof(struct spa_meta) * n_params);
+
+	n_metas = 0;
 	params = alloca(n_params * sizeof(struct spa_pod *));
 	for (i = 0, offset = 0; i < n_params; i++) {
+		uint32_t type, size;
+
 		paramsi = SPA_PTROFF(buffer, offset, struct spa_pod);
 		spa_pod_fixate(paramsi);
 		pw_log_debug("%p: fixated param %d:", result, i);
 		pw_log_pod(SPA_LOG_LEVEL_DEBUG, paramsi);
 		offset += SPA_ROUND_UP_N(SPA_POD_SIZE(paramsi), 8);
+
+		if (!spa_pod_is_object_type (paramsi, SPA_TYPE_OBJECT_ParamMeta))
+			continue;
+		if (spa_pod_parse_object(paramsi,
+					SPA_TYPE_OBJECT_ParamMeta, NULL,
+					SPA_PARAM_META_type, SPA_POD_Id(&type),
+					SPA_PARAM_META_size, SPA_POD_Int(&size)) < 0) {
+			pw_log_warn("%p: invalid Meta param", result);
+			continue;
+		}
+
+		pw_log_debug("%p: enable meta %s size:%d", result,
+				spa_debug_type_find_name(spa_type_meta_type, type), size);
+
+		metasn_metas.type = type;
+		metasn_metas.size = size;
+		n_metas++;
 	}
 
 	max_buffers = context->settings.link_max_buffers;
@@ -268,20 +260,30 @@
 	types = SPA_ID_INVALID; /* bitmask of allowed types */
 	blocks = 1;
 
-	param = find_param(params, n_params, SPA_TYPE_OBJECT_ParamBuffers);
-	if (param) {
+	for (i = 0; i < n_params; i++) {
 		uint32_t qmax_buffers = max_buffers,
 		    qminsize = minsize, qstride = stride, qalign = align;
-		uint32_t qtypes = types, qblocks = blocks;
-
-		spa_pod_parse_object(param,
-			SPA_TYPE_OBJECT_ParamBuffers, NULL,
-			SPA_PARAM_BUFFERS_buffers,  SPA_POD_OPT_Int(&qmax_buffers),
-			SPA_PARAM_BUFFERS_blocks,   SPA_POD_OPT_Int(&qblocks),
-			SPA_PARAM_BUFFERS_size,     SPA_POD_OPT_Int(&qminsize),
-			SPA_PARAM_BUFFERS_stride,   SPA_POD_OPT_Int(&qstride),
-			SPA_PARAM_BUFFERS_align,    SPA_POD_OPT_Int(&qalign),
-			SPA_PARAM_BUFFERS_dataType, SPA_POD_OPT_Int(&qtypes));
+		uint32_t qtypes = types, qblocks = blocks, qmetas = 0;
+
+		if (!spa_pod_is_object_type (paramsi, SPA_TYPE_OBJECT_ParamBuffers))
+			continue;
+
+		if (spa_pod_parse_object(paramsi,
+				SPA_TYPE_OBJECT_ParamBuffers, NULL,
+				SPA_PARAM_BUFFERS_buffers,  SPA_POD_OPT_Int(&qmax_buffers),
+				SPA_PARAM_BUFFERS_blocks,   SPA_POD_OPT_Int(&qblocks),
+				SPA_PARAM_BUFFERS_size,     SPA_POD_OPT_Int(&qminsize),
+				SPA_PARAM_BUFFERS_stride,   SPA_POD_OPT_Int(&qstride),
+				SPA_PARAM_BUFFERS_align,    SPA_POD_OPT_Int(&qalign),
+				SPA_PARAM_BUFFERS_dataType, SPA_POD_OPT_Int(&qtypes),
+				SPA_PARAM_BUFFERS_metaType, SPA_POD_OPT_Int(&qmetas)) < 0) {
+			pw_log_warn("%p: invalid Buffers param", result);
+			continue;
+		}
+		for (j = 0; qmetas != 0 && j < n_metas; j++)
+			SPA_FLAG_CLEAR(qmetas, 1<<metasj.type);
+		if (qmetas != 0)
+			continue;
 
 		max_buffers =
 		    qmax_buffers == 0 ? max_buffers : SPA_MIN(qmax_buffers,
@@ -292,18 +294,20 @@
 		align = SPA_MAX(align, qalign);
 		types = qtypes;
 
-		if (SPA_FLAG_IS_SET(flags, PW_BUFFERS_FLAG_ASYNC))
-			max_buffers = SPA_MAX(2u, max_buffers);
-
 		pw_log_debug("%p: %d %d %d %d %d %d -> %d %zd %zd %d %zd %d", result,
 				qblocks, qminsize, qstride, qmax_buffers, qalign, qtypes,
 				blocks, minsize, stride, max_buffers, align, types);
-	} else {
+		break;
+	}
+	if (i == n_params) {
 		pw_log_warn("%p: no buffers param", result);
 		minsize = context->settings.clock_quantum_limit;
-		max_buffers = 2;
+		max_buffers = 2u;
 	}
 
+	if (SPA_FLAG_IS_SET(flags, PW_BUFFERS_FLAG_ASYNC))
+		max_buffers = SPA_MAX(2u, max_buffers);
+
 	if (SPA_FLAG_IS_SET(flags, PW_BUFFERS_FLAG_SHARED_MEM)) {
 		if (types != SPA_ID_INVALID)
 			SPA_FLAG_CLEAR(types, 1<<SPA_DATA_MemPtr);
@@ -328,8 +332,8 @@
 
 	if ((res = alloc_buffers(context->pool,
 				 max_buffers,
-				 n_params,
-				 params,
+				 n_metas,
+				 metas,
 				 blocks,
 				 data_sizes, data_strides,
 				 data_aligns, data_types,

pipewire-1.0.1.tar.bz2/src/pipewire/conf.c -> pipewire-1.2.0.tar.gz/src/pipewire/conf.c Changed

@@ -24,11 +24,12 @@
 #endif
 #endif
 
+#include <spa/utils/cleanup.h>
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
+#include <spa/debug/log.h>
 
-#include <pipewire/cleanup.h>
 #include <pipewire/impl.h>
 #include <pipewire/private.h>
 
@@ -162,6 +163,7 @@
 static int get_config_dir(char *path, size_t size, const char *prefix, const char *name, int *level)
 {
 	int res;
+	bool no_config;
 
 	if (prefix == NULL) {
 		prefix = name;
@@ -173,7 +175,8 @@
 		return -ENOENT;
 	}
 
-	if (pw_check_option("no-config", "true"))
+	no_config = pw_check_option("no-config", "true");
+	if (no_config)
 		goto no_config;
 
 	if ((res = get_envconf_path(path, size, prefix, name)) != 0) {
@@ -183,9 +186,12 @@
 	}
 
 	if (*level == 0) {
+no_config:
 		(*level)++;
-		if ((res = get_homeconf_path(path, size, prefix, name)) != 0)
+		if ((res = get_confdata_path(path, size, prefix, name)) != 0)
 			return res;
+		if (no_config)
+			return 0;
 	}
 	if (*level == 1) {
 		(*level)++;
@@ -193,9 +199,8 @@
 			return res;
 	}
 	if (*level == 2) {
-no_config:
 		(*level)++;
-		if ((res = get_confdata_path(path, size, prefix, name)) != 0)
+		if ((res = get_homeconf_path(path, size, prefix, name)) != 0)
 			return res;
 	}
 	return 0;
@@ -380,9 +385,11 @@
 
 static int conf_load(const char *path, struct pw_properties *conf)
 {
-	char *data;
+	char *data = MAP_FAILED;
 	struct stat sbuf;
 	int count;
+	struct spa_error_location loc = { 0 };
+	int res;
 
 	spa_autoclose int fd = open(path,  O_CLOEXEC | O_RDONLY);
 	if (fd < 0)
@@ -395,7 +402,11 @@
 		if ((data = mmap(NULL, sbuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0)) == MAP_FAILED)
 			goto error;
 
-		count = pw_properties_update_string(conf, data, sbuf.st_size);
+		count = pw_properties_update_string_checked(conf, data, sbuf.st_size, &loc);
+		if (count < 0) {
+			errno = EINVAL;
+			goto error;
+		}
 		munmap(data, sbuf.st_size);
 	} else {
 		count = 0;
@@ -406,8 +417,17 @@
 	return 0;
 
 error:
-	pw_log_warn("%p: error loading config '%s': %m", conf, path);
-	return -errno;
+	res = -errno;
+	if (loc.line != 0)
+		spa_debug_log_error_location(pw_log_get(), SPA_LOG_LEVEL_WARN, &loc,
+				"%p: error in config '%s': %s", conf, path, loc.reason);
+	else
+		pw_log_warn("%p: error loading config '%s': %m", conf, path);
+
+	if (data != MAP_FAILED)
+		munmap(data, sbuf.st_size);
+
+	return res;
 }
 
 static bool check_override(struct pw_properties *conf, const char *name, int level)
@@ -547,17 +567,27 @@
 	struct pw_context *context = d->context;
 	struct spa_json it2;
 	char key512, value512;
+	int res;
 
 	spa_json_init(&it0, str, len);
 	if (spa_json_enter_object(&it0, &it1) < 0) {
-		pw_log_error("config file error: context.spa-libs is not an object");
+		pw_log_error("config file error: context.spa-libs is not an "
+				"object in '%.*s'", (int)len, str);
 		return -EINVAL;
 	}
 
 	while (spa_json_get_string(&it1, key, sizeof(key)) > 0) {
 		if (spa_json_get_string(&it1, value, sizeof(value)) > 0) {
-			pw_context_add_spa_lib(context, key, value);
+			if ((res = pw_context_add_spa_lib(context, key, value)) < 0) {
+				pw_log_error("error adding spa-libs for '%s' in '%.*s': %s",
+					key, (int)len, str, spa_strerror(res));
+				return res;
+			}
 			d->count++;
+		} else {
+			pw_log_warn("config file error: missing spa-libs "
+					"library name for '%s' in '%.*s'",
+					key, (int)len, str);
 		}
 	}
 	return 0;
@@ -590,54 +620,98 @@
  *     <key> = <value>
  *     ...
  * }
+ *
+ * Some things that can match:
+ *
+ *  null -> matches when the property is not found
+ *  "null" -> matches when the property is found and has the string "null"
+ *  !null -> matches when the property is found (any value)
+ *  "!null" -> same as !null
+ *  !"null" and "!\"null\"" matches anything that is not the string "null"
  */
-static bool find_match(struct spa_json *arr, const struct spa_dict *props)
+static bool find_match(struct spa_json *arr, const struct spa_dict *props, bool condition)
 {
 	struct spa_json it1;
+	const char *as = arr->cur;
+	int az = (int)(arr->end - arr->cur), r, count = 0;
 
-	while (spa_json_enter_object(arr, &it0) > 0) {
+	while ((r = spa_json_enter_object(arr, &it0)) > 0) {
 		char key256, val1024;
 		const char *str, *value;
 		int match = 0, fail = 0;
 		int len;
 
 		while (spa_json_get_string(&it0, key, sizeof(key)) > 0) {
-			bool success = false;
+			bool success = false, is_null, reg = false, parse_string = true;
 			int skip = 0;
 
-			if ((len = spa_json_next(&it0, &value)) <= 0)
+			if ((len = spa_json_next(&it0, &value)) <= 0) {
+				pw_log_warn("malformed match rule: key '%s' has "
+						"no value in '%.*s'", key, az, as);
 				break;
+			}
 
-			str = spa_dict_lookup(props, key);
-
-			if (spa_json_is_null(value, len)) {
-				success = str == NULL;
-			} else {
-				if (spa_json_parse_stringn(value, len, val, sizeof(val)) < 0)
+			/* first decode a string, when there was a string, we assume it
+			 * can not be null but the "null" string, unless there is a modifier,
+			 * see below. */
+			if (spa_json_is_string(value, len)) {
+				if (spa_json_parse_stringn(value, len, val, sizeof(val)) < 0) {
+					pw_log_warn("invalid string '%.*s' in '%.*s'",
+							len, value, az, as);
 					continue;
+				}
 				value = val;
 				len = strlen(val);
-				if (len > 0 && value0 == '!') {
+				parse_string = false;
+			}
+
+			/* parse the modifiers, after the modifier we unescape the string
+			 * again to be able to detect and handle null and "null" */
+			if (len > skip && valueskip == '!') {
+				success = !success;
+				skip++;
+				parse_string = true;
+			}
+			if (len > skip && valueskip == '~') {
+				reg = true;
+				skip++;
+				parse_string = true;
+			}
+
+			str = spa_dict_lookup(props, key);
+
+			/* parse the remaining part of the string, if there was a modifier,
+			 * we need to check for null again. Otherwise null was in quotes without
+			 * a modifier. */
+			is_null = parse_string && spa_json_is_null(value+skip, len-skip);
+			if (is_null || str == NULL) {
+				if (is_null && str == NULL)
 					success = !success;
-					skip++;
+			} else {
+				/* only unescape string once or again after modifier */
+				if (!parse_string) {
+					memmove(val, value+skip, len-skip);
+					vallen-skip = '\0';
+				} else if (spa_json_parse_stringn(value+skip, len-skip, val, sizeof(val)) < 0) {
+					pw_log_warn("invalid string '%.*s' in '%.*s'",
+							len-skip, value+skip, az, as);
+					continue;
 				}
-			}
-			if (str != NULL) {
-				if (valueskip == '~') {
+
+				if (reg) {
 					regex_t preg;
 					int res;
-					skip++;
-					if ((res = regcomp(&preg, value+skip, REG_EXTENDED | REG_NOSUB)) != 0) {
+					if ((res = regcomp(&preg, val, REG_EXTENDED | REG_NOSUB)) != 0) {
 						char errbuf1024;
 						regerror(res, &preg, errbuf, sizeof(errbuf));
-						pw_log_warn("invalid regex %s: %s", value+skip, errbuf);
+						pw_log_warn("invalid regex %s: %s in '%.*s'",
+								val, errbuf, az, as);
 					} else {
 						if (regexec(&preg, str, 0, NULL, 0) == 0)
 							success = !success;
 						regfree(&preg);
 					}
-				} else if (strncmp(str, value+skip, len-skip) == 0 &&
-				    strlen(str) == (size_t)(len-skip)) {
+				} else if (strcmp(str, val) == 0) {
 					success = !success;
 				}
 			}
@@ -653,7 +727,14 @@
 		}
 		if (match > 0 && fail == 0)
 			return true;
+		count++;
 	}
+	if (r < 0)
+		pw_log_warn("malformed object array in '%.*s'", az, as);
+	else if (count == 0 && condition)
+		/* empty match for condition means success */
+		return true;
+
 	return false;
 }
 
@@ -673,58 +754,69 @@
 	struct pw_context *context = d->context;
 	struct spa_json it4;
 	char key512;
-	int res = 0;
+	int res = 0, r;
 
 	spa_autofree char *s = strndup(str, len);
 	spa_json_init(&it0, s, len);
 	if (spa_json_enter_array(&it0, &it1) < 0) {
-		pw_log_error("config file error: context.modules is not an array");
+		pw_log_error("context.modules is not an array in '%.*s'",
+				(int)len, str);
 		return -EINVAL;
 	}
 
-	while (spa_json_enter_object(&it1, &it2) > 0) {
+	while ((r = spa_json_enter_object(&it1, &it2)) > 0) {
 		char *name = NULL, *args = NULL, *flags = NULL;
 		bool have_match = true;
 
 		while (spa_json_get_string(&it2, key, sizeof(key)) > 0) {
 			const char *val;
-			int len;
+			int l;
 
-			if ((len = spa_json_next(&it2, &val)) <= 0)
+			if ((l = spa_json_next(&it2, &val)) <= 0) {
+				pw_log_warn("malformed module: key '%s' has no "
+						"value in '%.*s'", key, (int)len, str);
 				break;
+			}
 
 			if (spa_streq(key, "name")) {
 				name = (char*)val;
-				spa_json_parse_stringn(val, len, name, len+1);
+				spa_json_parse_stringn(val, l, name, l+1);
 			} else if (spa_streq(key, "args")) {
-				if (spa_json_is_container(val, len))
-					len = spa_json_container_len(&it2, val, len);
+				if (spa_json_is_container(val, l))
+					l = spa_json_container_len(&it2, val, l);
 
 				args = (char*)val;
-				spa_json_parse_stringn(val, len, args, len+1);
+				spa_json_parse_stringn(val, l, args, l+1);
 			} else if (spa_streq(key, "flags")) {
-				if (spa_json_is_container(val, len))
-					len = spa_json_container_len(&it2, val, len);
+				if (spa_json_is_container(val, l))
+					l = spa_json_container_len(&it2, val, l);
 				flags = (char*)val;
-				spa_json_parse_stringn(val, len, flags, len+1);
+				spa_json_parse_stringn(val, l, flags, l+1);
 			} else if (spa_streq(key, "condition")) {
-				if (!spa_json_is_array(val, len))
+				if (!spa_json_is_array(val, l)) {
+					pw_log_warn("expected array for condition in '%.*s'",
+							(int)len, str);
 					break;
+				}
 				spa_json_enter(&it2, &it3);
-				have_match = find_match(&it3, &context->properties->dict);
+				have_match = find_match(&it3, &context->properties->dict, true);
+			} else {
+				pw_log_warn("unknown module key '%s' in '%.*s'", key,
+						(int)len, str);
 			}
 		}
 		if (!have_match)
 			continue;
 
-		if (name != NULL)
+		if (name != NULL) {
 			res = load_module(context, name, args, flags);
-
-		if (res < 0)
-			break;
-
-		d->count++;
+			if (res < 0)
+				break;
+			d->count++;
+		}
 	}
+	if (r < 0)
+		pw_log_warn("malformed object array in '%.*s'", (int)len, str);
 
 	return res;
 }
@@ -772,7 +864,7 @@
 	struct pw_context *context = d->context;
 	struct spa_json it4;
 	char key512;
-	int res = 0;
+	int res = 0, r;
 
 	spa_autofree char *s = strndup(str, len);
 	spa_json_init(&it0, s, len);
@@ -781,85 +873,127 @@
 		return -EINVAL;
 	}
 
-	while (spa_json_enter_object(&it1, &it2) > 0) {
+	while ((r = spa_json_enter_object(&it1, &it2)) > 0) {
 		char *factory = NULL, *args = NULL, *flags = NULL;
 		bool have_match = true;
 
 		while (spa_json_get_string(&it2, key, sizeof(key)) > 0) {
 			const char *val;
-			int len;
+			int l;
 
-			if ((len = spa_json_next(&it2, &val)) <= 0)
+			if ((l = spa_json_next(&it2, &val)) <= 0) {
+				pw_log_warn("malformed object: key '%s' has no "
+						"value in '%.*s'", key, (int)len, str);
 				break;
+			}
 
 			if (spa_streq(key, "factory")) {
 				factory = (char*)val;
-				spa_json_parse_stringn(val, len, factory, len+1);
+				spa_json_parse_stringn(val, l, factory, l+1);
 			} else if (spa_streq(key, "args")) {
-				if (spa_json_is_container(val, len))
-					len = spa_json_container_len(&it2, val, len);
+				if (spa_json_is_container(val, l))
+					l = spa_json_container_len(&it2, val, l);
 
 				args = (char*)val;
-				spa_json_parse_stringn(val, len, args, len+1);
+				spa_json_parse_stringn(val, l, args, l+1);
 			} else if (spa_streq(key, "flags")) {
-				if (spa_json_is_container(val, len))
-					len = spa_json_container_len(&it2, val, len);
+				if (spa_json_is_container(val, l))
+					l = spa_json_container_len(&it2, val, l);
 
 				flags = (char*)val;
-				spa_json_parse_stringn(val, len, flags, len+1);
+				spa_json_parse_stringn(val, l, flags, l+1);
 			} else if (spa_streq(key, "condition")) {
-				if (!spa_json_is_array(val, len))
+				if (!spa_json_is_array(val, l)) {
+					pw_log_warn("expected array for condition in '%.*s'",
+							(int)len, str);
 					break;
+				}
 				spa_json_enter(&it2, &it3);
-				have_match = find_match(&it3, &context->properties->dict);
+				have_match = find_match(&it3, &context->properties->dict, true);
+			} else {
+				pw_log_warn("unknown object key '%s' in '%.*s'", key,
+						(int)len, str);
 			}
 		}
 		if (!have_match)
 			continue;
 
-		if (factory != NULL)
+		if (factory != NULL) {
 			res = create_object(context, factory, args, flags);
-
-		if (res < 0)
-			break;
-		d->count++;
+			if (res < 0)
+				break;
+			d->count++;
+		}
 	}
+	if (r < 0)
+		pw_log_warn("malformed object array in '%.*s'", (int)len, str);
 
 	return res;
 }
 
-static int do_exec(struct pw_context *context, const char *key, const char *args)
+static char **pw_strv_insert_at(char **strv, int len, int pos, const char *str)
 {
-	int pid, res, n_args;
+	char **n;
+
+	if (len < 0) {
+		len = 0;
+		while (strv != NULL && strvlen != NULL)
+			len++;
+	}
+	if (pos < 0 || pos > len)
+		pos = len+1;
+
+	n = realloc(strv, sizeof(char*) * (len + 2));
+	if (n == NULL) {
+		free(strv);
+		return NULL;
+	}
+	strv = n;
+
+	memmove(strv+pos+1, strv+pos, sizeof(char*) * (len+1-pos));
+	strvpos = strdup(str);
+	return strv;
+}
+
+static int do_exec(struct pw_context *context, const char *path, const char *args)
+{
+	int pid, res;
 
 	pid = fork();
 
 	if (pid == 0) {
-		char *cmd, **argv;
+		char **arg;
+		int n_args;
 
 		/* Double fork to avoid zombies; we don't want to set SIGCHLD handler */
 		pid = fork();
 
 		if (pid < 0) {
 			pw_log_error("fork error: %m");
-			exit(1);
+			goto done;
 		} else if (pid != 0) {
 			exit(0);
 		}
 
-		cmd = spa_aprintf("%s %s", key, args ? args : "");
-		argv = pw_split_strv(cmd, " \t", INT_MAX, &n_args);
-		free(cmd);
-
-		pw_log_info("exec %s '%s'", key, args);
-		res = execvp(key, argv);
-		pw_free_strv(argv);
+		arg = pw_strv_parse(args, strlen(args), INT_MAX, &n_args);
+		if (arg == NULL) {
+			pw_log_error("error parsing arguments: %m");
+			goto done;
+		}
+		arg = pw_strv_insert_at(arg, n_args, 0, path);
+		if (arg == NULL) {
+			pw_log_error("error constructing arguments: %m");
+			goto done;
+		}
+		pw_log_info("exec %s '%s'", path, args);
+		res = execvp(path, arg);
+		pw_free_strv(arg);
 
 		if (res == -1) {
 			res = -errno;
-			pw_log_error("execvp error '%s': %m", key);
+			pw_log_error("execvp error '%s': %m", path);
 		}
-
+done:
 		exit(1);
 	} else if (pid < 0) {
 		pw_log_error("fork error: %m");
@@ -877,7 +1011,7 @@
 /*
  * context.exec = 
  *   {   path = <program-name>
- *       ( args = "<arguments>" )
+ *       ( args = "<arguments>" |  <arg1> <arg2> ...  )
  *       ( condition =  { key = value, .. } ..  )
  *   }
  * 
@@ -889,50 +1023,63 @@
 	struct pw_context *context = d->context;
 	struct spa_json it4;
 	char key512;
-	int res = 0;
+	int r, res = 0;
 
 	spa_autofree char *s = strndup(str, len);
 	spa_json_init(&it0, s, len);
 	if (spa_json_enter_array(&it0, &it1) < 0) {
-		pw_log_error("config file error: context.exec is not an array");
+		pw_log_error("config file error: context.exec is not an array in '%.*s'",
+				(int)len, str);
 		return -EINVAL;
 	}
 
-	while (spa_json_enter_object(&it1, &it2) > 0) {
+	while ((r = spa_json_enter_object(&it1, &it2)) > 0) {
 		char *path = NULL, *args = NULL;
 		bool have_match = true;
 
 		while (spa_json_get_string(&it2, key, sizeof(key)) > 0) {
 			const char *val;
-			int len;
+			int l;
 
-			if ((len = spa_json_next(&it2, &val)) <= 0)
+			if ((l = spa_json_next(&it2, &val)) <= 0) {
+				pw_log_warn("malformed exec: key '%s' has no "
+						"value in '%.*s'", key, (int)len, str);
 				break;
+			}
 
 			if (spa_streq(key, "path")) {
 				path = (char*)val;
-				spa_json_parse_stringn(val, len, path, len+1);
+				spa_json_parse_stringn(val, l, path, l+1);
 			} else if (spa_streq(key, "args")) {
+				if (spa_json_is_container(val, l))
+					l = spa_json_container_len(&it2, val, l);
 				args = (char*)val;
-				spa_json_parse_stringn(val, len, args, len+1);
+				spa_json_parse_stringn(val, l, args, l+1);
 			} else if (spa_streq(key, "condition")) {
-				if (!spa_json_is_array(val, len))
+				if (!spa_json_is_array(val, l)) {
+					pw_log_warn("expected array for condition in '%.*s'",
+							(int)len, str);
 					break;
+				}
 				spa_json_enter(&it2, &it3);
-				have_match = find_match(&it3, &context->properties->dict);
+				have_match = find_match(&it3, &context->properties->dict, true);
+			} else {
+				pw_log_warn("unknown exec key '%s' in '%.*s'", key,
+						(int)len, str);
 			}
 		}
 		if (!have_match)
 			continue;
 
-		if (path != NULL)
+		if (path != NULL) {
 			res = do_exec(context, path, args);
-
-		if (res < 0)
-			break;
-
-		d->count++;
+			if (res < 0)
+				break;
+			d->count++;
+		}
 	}
+	if (r < 0)
+		pw_log_warn("malformed object array in '%.*s'", (int)len, str);
 
 	return res;
 }
@@ -977,26 +1124,38 @@
 }
 
 SPA_EXPORT
-int pw_conf_section_update_props(const struct spa_dict *conf,
-		const char *section, struct pw_properties *props)
+int pw_conf_section_update_props_rules(const struct spa_dict *conf,
+		const struct spa_dict *context, const char *section,
+		struct pw_properties *props)
 {
 	struct data data = { .props = props };
 	int res;
 	const char *str;
+	char key128;
 
 	res = pw_conf_section_for_each(conf, section,
 			update_props, &data);
 
 	str = pw_properties_get(props, "config.ext");
 	if (res == 0 && str != NULL) {
-		char key128;
 		snprintf(key, sizeof(key), "%s.%s", section, str);
 		res = pw_conf_section_for_each(conf, key,
 				update_props, &data);
 	}
+	if (res == 0 && context != NULL) {
+		snprintf(key, sizeof(key), "%s.rules", section);
+		res = pw_conf_section_match_rules(conf, key, context, update_props, &data);
+	}
 	return res == 0 ? data.count : res;
 }
 
+SPA_EXPORT
+int pw_conf_section_update_props(const struct spa_dict *conf,
+		const char *section, struct pw_properties *props)
+{
+	return pw_conf_section_update_props_rules(conf, NULL, section, props);
+}
+
 static bool valid_conf_name(const char *str)
 {
 	return spa_streq(str, "null") || spa_strendswith(str, ".conf");
@@ -1086,7 +1245,7 @@
  *     {
  *         matches = 
  *             # any of the items in matches needs to match, if one does,
- *             # actions are emited.
+ *             # actions are emitted.
  *             {
  *                 # all keys must match the value. ! negates. ~ starts regex.
  *                 <key> = <value>
@@ -1110,38 +1269,60 @@
 {
 	const char *val;
 	struct spa_json it4, actions;
+	int r;
 
 	spa_json_init(&it0, str, len);
-	if (spa_json_enter_array(&it0, &it1) < 0)
+	if (spa_json_enter_array(&it0, &it1) < 0) {
+		pw_log_warn("expect array of match rules in: '%.*s'", (int)len, str);
 		return 0;
+	}
 
-	while (spa_json_enter_object(&it1, &it2) > 0) {
+	while ((r = spa_json_enter_object(&it1, &it2)) > 0) {
 		char key64;
 		bool have_match = false, have_actions = false;
 
 		while (spa_json_get_string(&it2, key, sizeof(key)) > 0) {
 			if (spa_streq(key, "matches")) {
-				if (spa_json_enter_array(&it2, &it3) < 0)
+				if (spa_json_enter_array(&it2, &it3) < 0) {
+					pw_log_warn("expected array as matches in '%.*s'",
+							(int)len, str);
 					break;
+				}
 
-				have_match = find_match(&it3, props);
+				have_match = find_match(&it3, props, false);
 			}
 			else if (spa_streq(key, "actions")) {
 				if (spa_json_enter_object(&it2, &actions) > 0)
 					have_actions = true;
+				else
+					pw_log_warn("expected object as match actions in '%.*s'",
+							(int)len, str);
+			}
+			else {
+				pw_log_warn("unknown match key '%s'", key);
+				if (spa_json_next(&it2, &val) <= 0) {
+					pw_log_warn("malformed match rule: key '%s' has "
+							"no value in '%.*s'", key, (int)len, str);
+					break;
+				}
 			}
-			else if (spa_json_next(&it2, &val) <= 0)
-                                break;
 		}
-		if (!have_match || !have_actions)
+		if (!have_match)
 			continue;
+		if (!have_actions) {
+			pw_log_warn("no actions for match rule '%.*s'", (int)len, str);
+			continue;
+		}
 
 		while (spa_json_get_string(&actions, key, sizeof(key)) > 0) {
 			int res, len;
 			pw_log_debug("action %s", key);
 
-			if ((len = spa_json_next(&actions, &val)) <= 0)
+			if ((len = spa_json_next(&actions, &val)) <= 0) {
+				pw_log_warn("malformed action: key '%s' has no value in '%.*s'",
+						key, (int)len, str);
 				break;
+			}
 
 			if (spa_json_is_container(val, len))
 				len = spa_json_container_len(&actions, val, len);
@@ -1150,6 +1331,8 @@
 				return res;
 		}
 	}
+	if (r < 0)
+		pw_log_warn("malformed object array in '%.*s'", (int)len, str);
 	return 0;
 }
 
@@ -1199,8 +1382,8 @@
 int pw_context_conf_update_props(struct pw_context *context,
 		const char *section, struct pw_properties *props)
 {
-	return pw_conf_section_update_props(&context->conf->dict,
-			section, props);
+	return pw_conf_section_update_props_rules(&context->conf->dict,
+			&context->properties->dict, section, props);
 }
 
 SPA_EXPORT
@@ -1221,16 +1404,16 @@
 	int res;
 
 	if (spa_streq(section, "context.spa-libs"))
-		res = pw_context_conf_section_for_each(context, section,
+		res = pw_conf_section_for_each(&conf->dict, section,
 				parse_spa_libs, &data);
 	else if (spa_streq(section, "context.modules"))
-		res = pw_context_conf_section_for_each(context, section,
+		res = pw_conf_section_for_each(&conf->dict, section,
 				parse_modules, &data);
 	else if (spa_streq(section, "context.objects"))
-		res = pw_context_conf_section_for_each(context, section,
+		res = pw_conf_section_for_each(&conf->dict, section,
 				parse_objects, &data);
 	else if (spa_streq(section, "context.exec"))
-		res = pw_context_conf_section_for_each(context, section,
+		res = pw_conf_section_for_each(&conf->dict, section,
 				parse_exec, &data);
 	else
 		res = -EINVAL;

pipewire-1.0.1.tar.bz2/src/pipewire/conf.h -> pipewire-1.2.0.tar.gz/src/pipewire/conf.h Changed

pipewire-1.0.1.tar.bz2/src/pipewire/context.c -> pipewire-1.2.0.tar.gz/src/pipewire/context.c Changed

@@ -9,6 +9,7 @@
 #include <regex.h>
 #include <limits.h>
 #include <sys/mman.h>
+#include <fnmatch.h>
 
 #include <pipewire/log.h>
 
@@ -20,6 +21,8 @@
 #include <spa/utils/atomic.h>
 #include <spa/utils/names.h>
 #include <spa/utils/string.h>
+#include <spa/utils/json.h>
+#include <spa/utils/cleanup.h>
 #include <spa/debug/types.h>
 
 #include <pipewire/impl.h>
@@ -33,6 +36,21 @@
 #define PW_LOG_TOPIC_DEFAULT log_context
 
 #define MAX_HOPS	64
+#define MAX_SYNC	4u
+#define MAX_LOOPS	64u
+
+#define DEFAULT_DATA_LOOPS	1
+
+#if !defined(FNM_EXTMATCH)
+#define FNM_EXTMATCH 0
+#endif
+
+struct data_loop {
+	struct pw_data_loop *impl;
+	bool autostart;
+	bool started;
+	int ref;
+};
 
 /** \cond */
 struct impl {
@@ -42,7 +60,10 @@
 	unsigned int recalc:1;
 	unsigned int recalc_pending:1;
 
-	struct pw_data_loop *data_loop_impl;
+	uint32_t cpu_count;
+
+	uint32_t n_data_loops;
+	struct data_loop data_loopsMAX_LOOPS;
 };
 
 
@@ -82,6 +103,10 @@
 		pw_properties_set(properties, PW_KEY_WINDOW_X11_DISPLAY,
 				  getenv("DISPLAY"));
 	}
+}
+static void fill_core_properties(struct pw_context *context)
+{
+	struct pw_properties *properties = context->properties;
 	pw_properties_set(properties, PW_KEY_CORE_VERSION, context->core->info.version);
 	pw_properties_set(properties, PW_KEY_CORE_NAME, context->core->info.name);
 }
@@ -90,24 +115,27 @@
 {
 	struct impl *impl = SPA_CONTAINER_OF(context, struct impl, this);
 	struct spa_thread *thr;
+	uint32_t i;
 	int res = 0;
 
-	if ((thr = pw_data_loop_get_thread(impl->data_loop_impl)) == NULL)
-		return -EIO;
+	for (i = 0; i < impl->n_data_loops; i++) {
+		if (impl->data_loopsi.impl == NULL ||
+		    (thr = pw_data_loop_get_thread(impl->data_loopsi.impl)) == NULL)
+			continue;
 
-	if (freewheel) {
-		pw_log_info("%p: enter freewheel", context);
-		if (context->thread_utils)
-			res = spa_thread_utils_drop_rt(context->thread_utils, thr);
-	} else {
-		pw_log_info("%p: exit freewheel", context);
-		/* Use the priority as configured within the realtime module */
-		if (context->thread_utils)
-			res = spa_thread_utils_acquire_rt(context->thread_utils, thr, -1);
+		if (freewheel) {
+			pw_log_info("%p: enter freewheel", context);
+			if (context->thread_utils)
+				res = spa_thread_utils_drop_rt(context->thread_utils, thr);
+		} else {
+			pw_log_info("%p: exit freewheel", context);
+			/* Use the priority as configured within the realtime module */
+			if (context->thread_utils)
+				res = spa_thread_utils_acquire_rt(context->thread_utils, thr, -1);
+		}
+		if (res < 0)
+			pw_log_info("%p: freewheel error:%s", context, spa_strerror(res));
 	}
-	if (res < 0)
-		pw_log_info("%p: freewheel error:%s", context, spa_strerror(res));
-
 	context->freewheeling = freewheel;
 
 	return res;
@@ -163,6 +191,120 @@
 	return 0;
 }
 
+static int setup_data_loops(struct impl *impl)
+{
+	struct pw_properties *pr;
+	struct pw_context *this = &impl->this;
+	const char *str, *lib_name;
+	uint32_t i;
+	int res = 0;
+
+	pr = pw_properties_copy(this->properties);
+
+	lib_name = pw_properties_get(this->properties, "context.data-loop." PW_KEY_LIBRARY_NAME_SYSTEM);
+
+	if ((str = pw_properties_get(this->properties, "context.data-loops")) != NULL) {
+		struct spa_json it4;
+		char key512;
+		int r, len = strlen(str);
+		spa_autofree char *s = strndup(str, len);
+
+		i = 0;
+		spa_json_init(&it0, s, len);
+		if (spa_json_enter_array(&it0, &it1) < 0) {
+			pw_log_error("context.data-loops is not an array in '%s'", str);
+			res = -EINVAL;
+			goto exit;
+		}
+		while ((r = spa_json_enter_object(&it1, &it2)) > 0) {
+			char *props = NULL;
+
+			if (i >= MAX_LOOPS) {
+				pw_log_warn("too many context.data-loops, using first %d",
+					MAX_LOOPS);
+				break;
+			}
+
+			pw_properties_clear(pr);
+			pw_properties_update(pr, &this->properties->dict);
+			pw_properties_set(pr, PW_KEY_LIBRARY_NAME_SYSTEM, lib_name);
+
+			while (spa_json_get_string(&it2, key, sizeof(key)) > 0) {
+				const char *val;
+				int l;
+
+				if ((l = spa_json_next(&it2, &val)) <= 0) {
+					pw_log_warn("malformed data-loop: key '%s' has no "
+							"value in '%.*s'", key, (int)len, str);
+					break;
+				}
+				if (spa_json_is_container(val, l))
+					l = spa_json_container_len(&it2, val, l);
+
+				props = (char*)val;
+				spa_json_parse_stringn(val, l, props, l+1);
+				pw_properties_set(pr, key, props);
+				pw_log_info("loop %d: \"%s\" = %s", i, key, props);
+			}
+			impl->data_loopsi.impl = pw_data_loop_new(&pr->dict);
+			if (impl->data_loopsi.impl == NULL)  {
+				res = -errno;
+				goto exit;
+			}
+			i++;
+		}
+		impl->n_data_loops = i;
+	} else {
+		int32_t count = pw_properties_get_int32(pr, "context.num-data-loops",
+				DEFAULT_DATA_LOOPS);
+		if (count < 0)
+			count = impl->cpu_count;
+
+		impl->n_data_loops = count;
+		if (impl->n_data_loops > MAX_LOOPS) {
+			pw_log_warn("too many context.num-data-loops: %d, using %d",
+					impl->n_data_loops, MAX_LOOPS);
+			impl->n_data_loops = MAX_LOOPS;
+		}
+		for (i = 0; i < impl->n_data_loops; i++) {
+			pw_properties_setf(pr, SPA_KEY_THREAD_NAME,  "data-loop.%d", i);
+			impl->data_loopsi.impl = pw_data_loop_new(&pr->dict);
+			if (impl->data_loopsi.impl == NULL)  {
+				res = -errno;
+				goto exit;
+			}
+			pw_log_info("created data loop '%s'", impl->data_loopsi.impl->loop->name);
+		}
+	}
+	pw_log_info("created %d data-loops", impl->n_data_loops);
+exit:
+	pw_properties_free(pr);
+	return res;
+}
+
+static int data_loop_start(struct impl *impl, struct data_loop *loop)
+{
+	int res;
+	if (loop->started || loop->impl == NULL)
+		return 0;
+
+	pw_log_info("starting data loop %s", loop->impl->loop->name);
+	if ((res = pw_data_loop_start(loop->impl)) < 0)
+		return res;
+
+	pw_data_loop_invoke(loop->impl, do_data_loop_setup, 0, NULL, 0, false, &impl->this);
+	loop->started = true;
+	return 0;
+}
+
+static void data_loop_stop(struct impl *impl, struct data_loop *loop)
+{
+	if (!loop->started || loop->impl == NULL)
+		return;
+	pw_data_loop_stop(loop->impl);
+	loop->started = false;
+}
+
 /** Create a new context object
  *
  * \param main_loop the main loop to use
@@ -179,8 +321,8 @@
 	struct pw_context *this;
 	const char *lib, *str;
 	void *dbus_iface = NULL;
-	uint32_t n_support;
-	struct pw_properties *pr, *conf;
+	uint32_t i, n_support, vm_type;
+	struct pw_properties *conf;
 	struct spa_cpu *cpu;
 	int res = 0;
 
@@ -231,6 +373,8 @@
 	}
 	this->properties = properties;
 
+	fill_properties(this);
+
 	conf = pw_properties_new(NULL, NULL);
 	if (conf == NULL) {
 		res = -errno;
@@ -243,6 +387,10 @@
 	n_support = pw_get_support(this->support, SPA_N_ELEMENTS(this->support) - 6);
 	cpu = spa_support_find(this->support, n_support, SPA_TYPE_INTERFACE_CPU);
 
+	vm_type = SPA_CPU_VM_NONE;
+	if (cpu != NULL && (vm_type = spa_cpu_get_vm_type(cpu)) != SPA_CPU_VM_NONE)
+		pw_properties_set(properties, "cpu.vm.name", spa_cpu_vm_type_to_string(vm_type));
+
 	res = pw_context_conf_update_props(this, "context.properties", properties);
 	pw_log_info("%p: parsed %d context.properties items", this, res);
 
@@ -252,7 +400,9 @@
 	}
 
 	if ((str = pw_properties_get(properties, "vm.overrides")) != NULL) {
-		if (cpu != NULL && spa_cpu_get_vm_type(cpu) != SPA_CPU_VM_NONE)
+		pw_log_warn("vm.overrides in context.properties are deprecated, "
+				"use context.properties.rules instead");
+		if (vm_type != SPA_CPU_VM_NONE)
 			pw_properties_update_string(properties, str, strlen(str));
 		pw_properties_set(properties, "vm.overrides", NULL);
 	}
@@ -260,11 +410,14 @@
 		if (pw_properties_get(properties, PW_KEY_CPU_MAX_ALIGN) == NULL)
 			pw_properties_setf(properties, PW_KEY_CPU_MAX_ALIGN,
 				"%u", spa_cpu_get_max_align(cpu));
+		impl->cpu_count = spa_cpu_get_count(cpu);
 	}
 
 	if (getenv("PIPEWIRE_DEBUG") == NULL &&
-	    (str = pw_properties_get(properties, "log.level")) != NULL)
-		pw_log_set_level(atoi(str));
+			(str = pw_properties_get(properties, "log.level")) != NULL) {
+		if (pw_log_set_level_string(str) < 0)
+			pw_log_warn("%p: invalid log.level in context properties", this);
+	}
 
 	if (pw_properties_get_bool(properties, "mem.mlock-all", false)) {
 		if (mlockall(MCL_CURRENT | MCL_FUTURE) < 0)
@@ -276,16 +429,8 @@
 	pw_settings_init(this);
 	this->settings = this->defaults;
 
-	pr = pw_properties_copy(properties);
-	if ((str = pw_properties_get(pr, "context.data-loop." PW_KEY_LIBRARY_NAME_SYSTEM)))
-		pw_properties_set(pr, PW_KEY_LIBRARY_NAME_SYSTEM, str);
-
-	impl->data_loop_impl = pw_data_loop_new(&pr->dict);
-	pw_properties_free(pr);
-	if (impl->data_loop_impl == NULL)  {
-		res = -errno;
+	if ((res = setup_data_loops(impl)) < 0)
 		goto error_free;
-	}
 
 	this->pool = pw_mempool_new(NULL);
 	if (this->pool == NULL) {
@@ -293,10 +438,7 @@
 		goto error_free;
 	}
 
-	this->data_loop = pw_data_loop_get_loop(impl->data_loop_impl);
-	this->data_system = this->data_loop->system;
 	this->main_loop = main_loop;
-
 	this->work_queue = pw_work_queue_new(this->main_loop);
 	if (this->work_queue == NULL) {
 		res = -errno;
@@ -308,8 +450,6 @@
 	this->supportn_support++ = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_System, this->main_loop->system);
 	this->supportn_support++ = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_Loop, this->main_loop->loop);
 	this->supportn_support++ = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_LoopUtils, this->main_loop->utils);
-	this->supportn_support++ = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_DataSystem, this->data_system);
-	this->supportn_support++ = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_DataLoop, this->data_loop->loop);
 	this->supportn_support++ = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_PluginLoader, &impl->plugin_loader);
 
 	if ((str = pw_properties_get(properties, "support.dbus")) == NULL ||
@@ -341,14 +481,14 @@
 	}
 	pw_impl_core_register(this->core, NULL);
 
-	fill_properties(this);
+	fill_core_properties(this);
 
 	if ((res = pw_context_parse_conf_section(this, conf, "context.spa-libs")) < 0)
 		goto error_free;
 	pw_log_info("%p: parsed %d context.spa-libs items", this, res);
 	if ((res = pw_context_parse_conf_section(this, conf, "context.modules")) < 0)
 		goto error_free;
-	if (res > 0)
+	if (res > 0 || pw_properties_get_bool(properties, "context.modules.allow-empty", false))
 		pw_log_info("%p: parsed %d context.modules items", this, res);
 	else
 		pw_log_warn("%p: no modules loaded from context.modules", this);
@@ -359,11 +499,13 @@
 		goto error_free;
 	pw_log_info("%p: parsed %d context.exec items", this, res);
 
-	if ((res = pw_data_loop_start(impl->data_loop_impl)) < 0)
-		goto error_free;
-
-	pw_data_loop_invoke(impl->data_loop_impl,
-			do_data_loop_setup, 0, NULL, 0, false, this);
+	for (i = 0; i < impl->n_data_loops; i++) {
+		struct data_loop *dl = &impl->data_loopsi;
+		if (!dl->autostart)
+			continue;
+		if ((res = data_loop_start(impl, dl)) < 0)
+			goto error_free;
+	}
 
 	pw_settings_expose(this);
 
@@ -396,6 +538,7 @@
 	struct factory_entry *entry;
 	struct pw_impl_metadata *metadata;
 	struct pw_impl_core *core_impl;
+	uint32_t i;
 
 	pw_log_debug("%p: destroy", context);
 	pw_context_emit_destroy(context);
@@ -415,8 +558,8 @@
 	spa_list_consume(resource, &context->registry_resource_list, link)
 		pw_resource_destroy(resource);
 
-	if (impl->data_loop_impl)
-		pw_data_loop_stop(impl->data_loop_impl);
+	for (i = 0; i < impl->n_data_loops; i++)
+		data_loop_stop(impl, &impl->data_loopsi);
 
 	spa_list_consume(module, &context->module_list, link)
 		pw_impl_module_destroy(module);
@@ -433,8 +576,11 @@
 	pw_log_debug("%p: free", context);
 	pw_context_emit_free(context);
 
-	if (impl->data_loop_impl)
-		pw_data_loop_destroy(impl->data_loop_impl);
+	for (i = 0; i < impl->n_data_loops; i++) {
+		if (impl->data_loopsi.impl)
+			pw_data_loop_destroy(impl->data_loopsi.impl);
+
+	}
 
 	if (context->pool)
 		pw_mempool_destroy(context->pool);
@@ -481,11 +627,25 @@
 	spa_hook_list_append(&context->listener_list, listener, events, data);
 }
 
+const struct spa_support *context_get_support(struct pw_context *context, uint32_t *n_support,
+		const struct spa_dict *info)
+{
+	uint32_t n = context->n_support;
+	struct pw_loop *loop;
+
+	loop = pw_context_acquire_loop(context, info);
+	if (loop != NULL) {
+		context->supportn++ = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_DataSystem, loop->system);
+		context->supportn++ = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_DataLoop, loop->loop);
+	}
+	*n_support = n;
+	return context->support;
+}
+
 SPA_EXPORT
 const struct spa_support *pw_context_get_support(struct pw_context *context, uint32_t *n_support)
 {
-	*n_support = context->n_support;
-	return context->support;
+	return context_get_support(context, n_support, NULL);
 }
 
 SPA_EXPORT
@@ -494,11 +654,102 @@
 	return context->main_loop;
 }
 
+static struct pw_data_loop *acquire_data_loop(struct impl *impl, const char *name, const char *klass)
+{
+	uint32_t i, j;
+	struct data_loop *best_loop = NULL;
+	int best_score = 0, res;
+
+	for (i = 0; i < impl->n_data_loops; i++) {
+		struct data_loop *l = &impl->data_loopsi;
+		const char *ln = l->impl->loop->name;
+		int score = 0;
+
+		if (klass == NULL)
+			klass = l->impl->class;
+
+		if (name && ln && fnmatch(name, ln, FNM_EXTMATCH) == 0)
+			score += 2;
+		if (klass && l->impl->classes) {
+			for (j = 0; l->impl->classesj; j++) {
+				if (fnmatch(klass, l->impl->classesj, FNM_EXTMATCH) == 0) {
+					score += 1;
+					break;
+				}
+			}
+		}
+
+		pw_log_debug("%d: name:'%s' class:'%s' score:%d ref:%d", i,
+				ln, l->impl->class, score, l->ref);
+
+		if ((best_loop == NULL) ||
+		    (score > best_score) ||
+		    (score == best_score && l->ref < best_loop->ref)) {
+			best_loop = l;
+			best_score = score;
+		}
+	}
+	if (best_loop == NULL)
+		return NULL;
+
+	best_loop->ref++;
+	if ((res = data_loop_start(impl, best_loop)) < 0) {
+		errno = -res;
+		return NULL;
+	}
+
+	pw_log_info("%p: using name:'%s' class:'%s' ref:%d", impl,
+			best_loop->impl->loop->name,
+			best_loop->impl->class, best_loop->ref);
+
+	return best_loop->impl;
+}
+
 SPA_EXPORT
 struct pw_data_loop *pw_context_get_data_loop(struct pw_context *context)
 {
 	struct impl *impl = SPA_CONTAINER_OF(context, struct impl, this);
-	return impl->data_loop_impl;
+	return acquire_data_loop(impl, NULL, NULL);
+}
+
+SPA_EXPORT
+struct pw_loop *pw_context_acquire_loop(struct pw_context *context, const struct spa_dict *props)
+{
+	struct impl *impl = SPA_CONTAINER_OF(context, struct impl, this);
+	const char *name, *klass;
+	struct pw_data_loop *loop;
+
+	name = props ? spa_dict_lookup(props, PW_KEY_NODE_LOOP_NAME) : NULL;
+	klass = props ? spa_dict_lookup(props, PW_KEY_NODE_LOOP_CLASS) : NULL;
+
+	pw_log_info("%p: looking for name:'%s' class:'%s'", context, name, klass);
+
+	if ((impl->n_data_loops == 0) ||
+	    (name && fnmatch(name, context->main_loop->name, FNM_EXTMATCH) == 0) ||
+	    (klass && fnmatch(klass, "main", FNM_EXTMATCH) == 0)) {
+		pw_log_info("%p: using main loop num-data-loops:%d", context, impl->n_data_loops);
+		return context->main_loop;
+	}
+
+	loop = acquire_data_loop(impl, name, klass);
+	return loop ? loop->loop : NULL;
+}
+
+SPA_EXPORT
+void pw_context_release_loop(struct pw_context *context, struct pw_loop *loop)
+{
+	struct impl *impl = SPA_CONTAINER_OF(context, struct impl, this);
+	uint32_t i;
+
+	for (i = 0; i < impl->n_data_loops; i++) {
+		struct data_loop *l = &impl->data_loopsi;
+		if (l->impl->loop == loop) {
+			l->ref--;
+			pw_log_info("release name:'%s' class:'%s' ref:%d", l->impl->loop->name,
+					l->impl->class, l->ref);
+			return;
+		}
+	}
 }
 
 SPA_EXPORT
@@ -551,6 +802,19 @@
 	return true;
 }
 
+static bool global_is_stale(struct pw_context *context, struct pw_global *global)
+{
+	struct pw_impl_client *client = context->current_client;
+
+	if (!client)
+		return false;
+
+	if (client->recv_generation != 0 && global->generation > client->recv_generation)
+		return true;
+
+	return false;
+}
+
 SPA_EXPORT
 int pw_context_for_each_global(struct pw_context *context,
 			    int (*callback) (void *data, struct pw_global *global),
@@ -560,7 +824,7 @@
 	int res;
 
 	spa_list_for_each_safe(g, t, &context->global_list, link) {
-		if (!global_can_read(context, g))
+		if (!global_can_read(context, g) || global_is_stale(context, g))
 			continue;
 		if ((res = callback(data, g)) != 0)
 			return res;
@@ -579,6 +843,11 @@
 		return NULL;
 	}
 
+	if (global_is_stale(context, global)) {
+		errno = global_can_read(context, global) ? ESTALE : ENOENT;
+		return NULL;
+	}
+
 	if (!global_can_read(context, global)) {
 		errno = EACCES;
 		return NULL;
@@ -643,7 +912,9 @@
  */
 int pw_context_find_format(struct pw_context *context,
 			struct pw_impl_port *output,
+			uint32_t output_mix,
 			struct pw_impl_port *input,
+			uint32_t input_mix,
 			struct pw_properties *props,
 			uint32_t n_format_filters,
 			struct spa_pod **format_filters,
@@ -657,10 +928,27 @@
 	struct spa_pod_builder fb = { 0 };
 	uint8_t fbuf4096;
 	struct spa_pod *filter;
+	struct spa_node *in_node, *out_node;
+	uint32_t in_port, out_port;
 
 	out_state = output->state;
 	in_state = input->state;
 
+	if (output_mix == SPA_ID_INVALID) {
+		out_node = output->node->node;
+		out_port = output->port_id;
+	} else {
+		out_node = output->mix;
+		out_port = output_mix;
+	}
+	if (input_mix == SPA_ID_INVALID) {
+		in_node = input->node->node;
+		in_port = input->port_id;
+	} else {
+		in_node = input->mix;
+		in_port = input_mix;
+	}
+
 	pw_log_debug("%p: finding best format %d %d", context, out_state, in_state);
 
 	/* when a port is configured but the node is idle, we can reconfigure with a different format */
@@ -674,8 +962,8 @@
 	if (in_state == PW_IMPL_PORT_STATE_CONFIGURE && out_state > PW_IMPL_PORT_STATE_CONFIGURE) {
 		/* only input needs format */
 		spa_pod_builder_init(&fb, fbuf, sizeof(fbuf));
-		if ((res = spa_node_port_enum_params_sync(output->node->node,
-						     output->direction, output->port_id,
+		if ((res = spa_node_port_enum_params_sync(out_node,
+						     output->direction, out_port,
 						     SPA_PARAM_Format, &oidx,
 						     NULL, &filter, &fb)) != 1) {
 			if (res < 0)
@@ -687,8 +975,8 @@
 		pw_log_debug("%p: Got output format:", context);
 		pw_log_format(SPA_LOG_LEVEL_DEBUG, filter);
 
-		if ((res = spa_node_port_enum_params_sync(input->node->node,
-						     input->direction, input->port_id,
+		if ((res = spa_node_port_enum_params_sync(in_node,
+						     input->direction, in_port,
 						     SPA_PARAM_EnumFormat, &iidx,
 						     filter, format, builder)) <= 0) {
 			if (res == -ENOENT || res == 0) {
@@ -703,8 +991,8 @@
 	} else if (out_state >= PW_IMPL_PORT_STATE_CONFIGURE && in_state > PW_IMPL_PORT_STATE_CONFIGURE) {
 		/* only output needs format */
 		spa_pod_builder_init(&fb, fbuf, sizeof(fbuf));
-		if ((res = spa_node_port_enum_params_sync(input->node->node,
-						     input->direction, input->port_id,
+		if ((res = spa_node_port_enum_params_sync(in_node,
+						     input->direction, in_port,
 						     SPA_PARAM_Format, &iidx,
 						     NULL, &filter, &fb)) != 1) {
 			if (res < 0)
@@ -716,8 +1004,8 @@
 		pw_log_debug("%p: Got input format:", context);
 		pw_log_format(SPA_LOG_LEVEL_DEBUG, filter);
 
-		if ((res = spa_node_port_enum_params_sync(output->node->node,
-						     output->direction, output->port_id,
+		if ((res = spa_node_port_enum_params_sync(out_node,
+						     output->direction, out_port,
 						     SPA_PARAM_EnumFormat, &oidx,
 						     filter, format, builder)) <= 0) {
 			if (res == -ENOENT || res == 0) {
@@ -734,8 +1022,8 @@
 		/* both ports need a format */
 		pw_log_debug("%p: do enum input %d", context, iidx);
 		spa_pod_builder_init(&fb, fbuf, sizeof(fbuf));
-		if ((res = spa_node_port_enum_params_sync(input->node->node,
-						     input->direction, input->port_id,
+		if ((res = spa_node_port_enum_params_sync(in_node,
+						     input->direction, in_port,
 						     SPA_PARAM_EnumFormat, &iidx,
 						     NULL, &filter, &fb)) != 1) {
 			if (res == -ENOENT) {
@@ -752,8 +1040,8 @@
 		pw_log_debug("%p: enum output %d with filter: %p", context, oidx, filter);
 		pw_log_format(SPA_LOG_LEVEL_DEBUG, filter);
 
-		if ((res = spa_node_port_enum_params_sync(output->node->node,
-						     output->direction, output->port_id,
+		if ((res = spa_node_port_enum_params_sync(out_node,
+						     output->direction, out_port,
 						     SPA_PARAM_EnumFormat, &oidx,
 						     filter, format, builder)) != 1) {
 			if (res == 0 && filter != NULL) {
@@ -875,7 +1163,8 @@
  * 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)
+static int collect_nodes(struct pw_context *context, struct pw_impl_node *node, struct spa_list *collect,
+		char **sync)
 {
 	struct spa_list queue;
 	struct pw_impl_node *n, *t;
@@ -900,6 +1189,11 @@
 		if (!n->active)
 			continue;
 
+		if (sync0 != NULL) {
+			if (pw_strv_find_common(n->sync_groups, sync) < 0)
+				continue;
+		}
+
 		spa_list_for_each(p, &n->input_ports, link) {
 			spa_list_for_each(l, &p->links, input_link) {
 				t = l->output->node;
@@ -944,13 +1238,15 @@
 		}
 		/* 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) {
+		if (n->groups != NULL || n->link_groups != NULL || sync0 != NULL) {
 			spa_list_for_each(t, &context->node_list, link) {
 				if (t->exported || !t->active || t->visited)
 					continue;
 				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->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;
@@ -994,7 +1290,7 @@
 }
 
 static inline void get_quantums(struct pw_context *context, uint32_t *def,
-		uint32_t *min, uint32_t *max, uint32_t *limit, uint32_t *rate)
+		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) {
@@ -1006,7 +1302,8 @@
 		*max = s->clock_max_quantum;
 		*rate = s->clock_rate;
 	}
-	*limit = s->clock_quantum_limit;
+	*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,
@@ -1115,7 +1412,7 @@
 
 	/* 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 eachother or multiples of a common rate.
+	 * 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
@@ -1199,10 +1496,11 @@
 	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, lim_quantum, rate_quantum;
-	uint32_t n_rates, def_rate;
-	bool freewheel = false, global_force_rate, global_force_quantum;
+	uint32_t max_quantum, min_quantum, def_quantum, rate_quantum, floor_quantum, ceil_quantum;
+	uint32_t n_rates, def_rate, n_sync;
+	bool freewheel, global_force_rate, global_force_quantum, transport_start;
 	struct spa_list collect;
+	char *syncMAX_SYNC+1;
 
 	pw_log_info("%p: busy:%d reason:%s", context, impl->recalc, reason);
 
@@ -1213,15 +1511,30 @@
 
 again:
 	impl->recalc = true;
+	freewheel = false;
+	transport_start = false;
 
-	/* clean up the flags first */
+	/* clean up the flags first and collect sync */
+	n_sync = 0;
+	sync0 = NULL;
 	spa_list_for_each(n, &context->node_list, link) {
 		n->visited = false;
 		n->checked = 0;
 		n->runnable = n->always_process && n->active;
+		if (n->sync) {
+			for (uint32_t i = 0; n->sync_groupsi; i++) {
+				if (n_sync >= MAX_SYNC)
+					break;
+				if (pw_strv_find(sync, n->sync_groupsi) >= 0)
+					continue;
+				syncn_sync++ = n->sync_groupsi;
+				syncn_sync = NULL;
+			}
+		}
 	}
 
-	get_quantums(context, &def_quantum, &min_quantum, &max_quantum, &lim_quantum, &rate_quantum);
+	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;
@@ -1238,7 +1551,7 @@
 
 		if (!n->visited) {
 			spa_list_init(&collect);
-			collect_nodes(context, n, &collect);
+			collect_nodes(context, n, &collect, sync);
 			move_to_driver(context, &collect, n);
 		}
 		/* from now on we are only interested in active driving nodes
@@ -1292,7 +1605,7 @@
 
 		/* collect all nodes in this group */
 		spa_list_init(&collect);
-		collect_nodes(context, n, &collect);
+		collect_nodes(context, n, &collect, sync);
 
 		driver = NULL;
 		spa_list_for_each(t, &collect, sort_link) {
@@ -1500,7 +1813,7 @@
 			if (latency.denom != 0)
 				target_quantum = (latency.num * current_rate / latency.denom);
 			target_quantum = SPA_CLAMP(target_quantum, node_min_quantum, node_max_quantum);
-			target_quantum = SPA_MIN(target_quantum, lim_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);
@@ -1554,12 +1867,20 @@
 
 		/* 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)
+				transport_start = true;
 			if (s == n)
 				continue;
 			pw_log_debug("%p: follower %p: active:%d '%s'",
 					context, s, s->active, s->name);
 			ensure_state(s, running);
 		}
+
+		SPA_ATOMIC_STORE(n->rt.target.activation->command,
+				transport_start ?
+					PW_NODE_ACTIVATION_COMMAND_START :
+					PW_NODE_ACTIVATION_COMMAND_STOP);
+
 		/* now that all the followers are ready, start the driver */
 		ensure_state(n, running);
 	}
@@ -1631,7 +1952,7 @@
 		return NULL;
 	}
 
-	support = pw_context_get_support(context, &n_support);
+	support = context_get_support(context, &n_support, info);
 
 	handle = pw_load_spa_handle(lib, factory_name,
 			info, n_support, support);
@@ -1698,10 +2019,15 @@
 		entry->value = value;
 	}
 	if (spa_streq(type, SPA_TYPE_INTERFACE_ThreadUtils)) {
+		uint32_t i;
+
 		context->thread_utils = value;
-		if (impl->data_loop_impl)
-			pw_data_loop_set_thread_utils(impl->data_loop_impl,
-					context->thread_utils);
+
+		for (i = 0; i < impl->n_data_loops; i++) {
+			if (impl->data_loopsi.impl)
+				pw_data_loop_set_thread_utils(impl->data_loopsi.impl,
+						context->thread_utils);
+		}
 	}
 	return 0;
 }

pipewire-1.0.1.tar.bz2/src/pipewire/context.h -> pipewire-1.2.0.tar.gz/src/pipewire/context.h Changed

@@ -71,10 +71,17 @@
 	void (*driver_removed) (void *data, struct pw_impl_node *node);
 };
 
-/** Make a new context object for a given main_loop. Ownership of the properties is taken */
-struct pw_context * pw_context_new(struct pw_loop *main_loop,		/**< a main loop to run in */
-			     struct pw_properties *props,	/**< extra properties */
-			     size_t user_data_size		/**< extra user data size */);
+/** Make a new context object for a given main_loop. Ownership of the properties is taken, even
+ * if the function returns NULL.
+ *
+ * \param main_loop A main loop to run in. This must stay alive unil pw_context_destroy() is called.
+ * \param props extra properties
+ * \param user_data_size extra user data size
+ * \return The context object on success, or NULL on failure, in which case errno is set.
+ * */
+struct pw_context * pw_context_new(struct pw_loop *main_loop,
+			     struct pw_properties *props,
+			     size_t user_data_size);
 
 /** destroy a context object, all resources except the main_loop will be destroyed */
 void pw_context_destroy(struct pw_context *context);
@@ -119,16 +126,25 @@
 /** Get the context support objects */
 const struct spa_support *pw_context_get_support(struct pw_context *context, uint32_t *n_support);
 
-/** get the context main loop */
+/** Get the context main loop. Returns the value passed to pw_context_new(). */
 struct pw_loop *pw_context_get_main_loop(struct pw_context *context);
 
-/** get the context data loop. Since 0.3.56 */
+/** Get the context data loop. This loop runs on the realtime thread. This
+ * acquires a loop from the generic data.rt class. Use pw_context_acquire_loop() instead.
+ * Since 0.3.56 */
 struct pw_data_loop *pw_context_get_data_loop(struct pw_context *context);
 
+/** Get a data-loop.
+ * Since 1.1.0 */
+struct pw_loop *pw_context_acquire_loop(struct pw_context *context, const struct spa_dict *props);
+/** Release a data-loop.
+ * Since 1.1.0 */
+void pw_context_release_loop(struct pw_context *context, struct pw_loop *loop);
+
 /** Get the work queue from the context: Since 0.3.26 */
 struct pw_work_queue *pw_context_get_work_queue(struct pw_context *context);
 
-/** Get the memmory pool from the context: Since 0.3.74 */
+/** Get the memory pool from the context: Since 0.3.74 */
 struct pw_mempool *pw_context_get_mempool(struct pw_context *context);
 
 /** Iterate the globals of the context. The callback should return
@@ -139,7 +155,10 @@
 			    int (*callback) (void *data, struct pw_global *global),
 			    void *data);
 
-/** Find a context global by id */
+/** Find a context global by id.
+ *
+ * \return The global on success, or NULL on failure. If id is \ref PW_ID_CORE,
+ *         this function will always return a non-NULL value. */
 struct pw_global *pw_context_find_global(struct pw_context *context,	/**< the context */
 				      uint32_t id		/**< the global id */);
 
@@ -149,6 +168,7 @@
 /** find the library name for a spa factory */
 const char * pw_context_find_spa_lib(struct pw_context *context, const char *factory_name);
 
+/** Load a SPA handle from a context. On failure returns NULL and sets errno. */
 struct spa_handle *pw_context_load_spa_handle(struct pw_context *context,
 		const char *factory_name,
 		const struct spa_dict *info);
@@ -169,9 +189,21 @@
 /** find information about registered export type */
 const struct pw_export_type *pw_context_find_export_type(struct pw_context *context, const char *type);
 
-/** add an object to the context */
+/** add an object to the context
+ *
+ * \param context The context.
+ * \param type The type of the object, usually a `TYPE_INTERFACE_` value.
+ * \param value The object value. Must last as long as the context and must
+ *              be of the type corresponding to the type.
+ * \return A negative number on failure (out of memory).
+ * */
 int pw_context_set_object(struct pw_context *context, const char *type, void *value);
-/** get an object from the context */
+/** get an object from the context
+ *
+ * \param context The context.
+ * \param type The string corresponding to the object's interface.
+ * \return The object, or NULL if the object does not exist.
+ * */
 void *pw_context_get_object(struct pw_context *context, const char *type);
 
 /**

pipewire-1.0.1.tar.bz2/src/pipewire/control.h -> pipewire-1.2.0.tar.gz/src/pipewire/control.h Changed

pipewire-1.0.1.tar.bz2/src/pipewire/core.c -> pipewire-1.2.0.tar.gz/src/pipewire/core.c Changed

pipewire-1.0.1.tar.bz2/src/pipewire/core.h -> pipewire-1.2.0.tar.gz/src/pipewire/core.h Changed

@@ -69,11 +69,13 @@
 #include <pipewire/properties.h>
 #include <pipewire/proxy.h>
 
-/** Update an existing \ref pw_core_info with \a update with reset */
+/** Update an existing \ref pw_core_info with \a update with reset. When info is NULL,
+ * a new one will be allocated. Returns NULL on failure. */
 struct pw_core_info *
 pw_core_info_update(struct pw_core_info *info,
 		const struct pw_core_info *update);
-/** Update an existing \ref pw_core_info with \a update */
+/** Update an existing \ref pw_core_info with \a update. When info is NULL, a new one
+ * will be allocated. Returns NULL on failure */
 struct pw_core_info *
 pw_core_info_merge(struct pw_core_info *info,
 		const struct pw_core_info *update, bool reset);
@@ -164,6 +166,9 @@
 	 * global ID. It is emitted before the global becomes visible in the
 	 * registry.
 	 *
+	 * The bound_props event is an enhanced version of this event that
+	 * also contains the extra global properties.
+	 *
 	 * \param id bound object ID
 	 * \param global_id the global id bound to
 	 */
@@ -192,6 +197,21 @@
 	 */
 	void (*remove_mem) (void *data, uint32_t id);
 
+	/**
+	 * Notify an object binding
+	 *
+	 * This event is emitted when a local object ID is bound to a
+	 * global ID. It is emitted before the global becomes visible in the
+	 * registry.
+	 *
+	 * This is an enhanced version of the bound_id event.
+	 *
+	 * \param id bound object ID
+	 * \param global_id the global id bound to
+	 * \param props The properties of the new global object.
+	 *
+	 * Since version 4:1
+	 */
 	void (*bound_props) (void *data, uint32_t id, uint32_t global_id, const struct spa_dict *props);
 };

pipewire-1.0.1.tar.bz2/src/pipewire/data-loop.c -> pipewire-1.2.0.tar.gz/src/pipewire/data-loop.c Changed

@@ -4,12 +4,14 @@
 
 #include <pthread.h>
 #include <errno.h>
+#include <limits.h>
 #include <sys/resource.h>
 
 #include "pipewire/log.h"
 #include "pipewire/data-loop.h"
 #include "pipewire/private.h"
 #include "pipewire/thread.h"
+#include "pipewire/utils.h"
 
 PW_LOG_TOPIC_EXTERN(log_data_loop);
 #define PW_LOG_TOPIC_DEFAULT log_data_loop
@@ -86,7 +88,7 @@
 static struct pw_data_loop *loop_new(struct pw_loop *loop, const struct spa_dict *props)
 {
 	struct pw_data_loop *this;
-	const char *str;
+	const char *str, *name = NULL, *class = NULL;
 	int res;
 
 	this = calloc(1, sizeof(struct pw_data_loop));
@@ -107,11 +109,29 @@
 		goto error_free;
 	}
 	this->loop = loop;
-
-	if (props != NULL &&
-	    (str = spa_dict_lookup(props, "loop.cancel")) != NULL)
-		this->cancel = pw_properties_parse_bool(str);
-
+	this->rt_prio = -1;
+
+	if (props != NULL) {
+		if ((str = spa_dict_lookup(props, PW_KEY_LOOP_CANCEL)) != NULL)
+			this->cancel = pw_properties_parse_bool(str);
+		if ((str = spa_dict_lookup(props, PW_KEY_LOOP_CLASS)) != NULL)
+			class = str;
+		if ((str = spa_dict_lookup(props, PW_KEY_LOOP_RT_PRIO)) != NULL)
+			this->rt_prio = atoi(str);
+		if ((str = spa_dict_lookup(props, SPA_KEY_THREAD_NAME)) != NULL)
+			name = str;
+		if ((str = spa_dict_lookup(props, SPA_KEY_THREAD_AFFINITY)) != NULL)
+			this->affinity = strdup(str);
+	}
+	if (class == NULL)
+		class = this->rt_prio != 0 ? "data.rt" : "data";
+	if (name == NULL)
+		name = "data-loop";
+
+	this->class = strdup(class);
+	this->classes = pw_strv_parse(class, strlen(class), INT_MAX, NULL);
+	if (!this->loop->name0)
+		pw_loop_set_name(this->loop, name);
 	spa_hook_list_init(&this->listener_list);
 
 	return this;
@@ -151,6 +171,9 @@
 
 	spa_hook_list_clean(&loop->listener_list);
 
+	free(loop->affinity);
+	free(loop->class);
+	pw_free_strv(loop->classes);
 	free(loop);
 }
 
@@ -170,6 +193,36 @@
 	return loop->loop;
 }
 
+/** Get the loop name
+ * \param loop the data loop to query
+ * \return the data loop name
+ *
+ * Get the name of the data loop. The data loop name is a unique name that
+ * identifies this data loop.
+ *
+ * \since 1.1.0
+ */
+SPA_EXPORT
+const char * pw_data_loop_get_name(struct pw_data_loop *loop)
+{
+	return loop->loop->name;
+}
+
+/** Get the loop class
+ * \param loop the data loop to query
+ * \return the data loop class
+ *
+ * Get the class of the data loop. Multiple data loop can have the same class
+ * and processing can be assigned to any data loop from the same class.
+ *
+ * \since 1.1.0
+ */
+SPA_EXPORT
+const char * pw_data_loop_get_class(struct pw_data_loop *loop)
+{
+	return loop->class;
+}
+
 /** Start a data loop
  * \param loop the data loop to start
  * \return 0 if ok, -1 on error
@@ -183,24 +236,28 @@
 	if (!loop->running) {
 		struct spa_thread_utils *utils;
 		struct spa_thread *thr;
+		struct spa_dict_item items2;
+		uint32_t n_items = 0;
 
 		loop->running = true;
 
 		if ((utils = loop->thread_utils) == NULL)
 			utils = pw_thread_utils_get();
 
-		static const struct spa_dict_item items = {
-			{ SPA_KEY_THREAD_NAME, "pw-data-loop" },
-		};
+		itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_THREAD_NAME, loop->loop->name);
+		if (loop->affinity)
+			itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_THREAD_AFFINITY,
+					loop->affinity);
 
-		thr = spa_thread_utils_create(utils, &SPA_DICT_INIT_ARRAY(items), do_loop, loop);
+		thr = spa_thread_utils_create(utils, &SPA_DICT_INIT(items, n_items), do_loop, loop);
 		loop->thread = (pthread_t)thr;
 		if (thr == NULL) {
 			pw_log_error("%p: can't create thread: %m", loop);
 			loop->running = false;
 			return -errno;
 		}
-		spa_thread_utils_acquire_rt(utils, thr, -1);
+		if (loop->rt_prio != 0)
+			spa_thread_utils_acquire_rt(utils, thr, loop->rt_prio);
 	}
 	return 0;
 }

pipewire-1.0.1.tar.bz2/src/pipewire/data-loop.h -> pipewire-1.2.0.tar.gz/src/pipewire/data-loop.h Changed

@@ -58,6 +58,11 @@
 struct pw_loop *
 pw_data_loop_get_loop(struct pw_data_loop *loop);
 
+/** Get the loop name. Since 1.1.0 */
+const char * pw_data_loop_get_name(struct pw_data_loop *loop);
+/** Get the loop class. Since 1.1.0 */
+const char * pw_data_loop_get_class(struct pw_data_loop *loop);
+
 /** Destroy the loop */
 void pw_data_loop_destroy(struct pw_data_loop *loop);
 
@@ -67,13 +72,38 @@
 /** Stop the processing thread */
 int pw_data_loop_stop(struct pw_data_loop *loop);
 
-/** Check if the current thread is the processing thread */
+/** Check if the current thread is the processing thread.
+ * May be called from any thread. */
 bool pw_data_loop_in_thread(struct pw_data_loop *loop);
 /** Get the thread object */
 struct spa_thread *pw_data_loop_get_thread(struct pw_data_loop *loop);
 
 /** invoke func in the context of the thread or in the caller thread when
- * the loop is not running. Since 0.3.3 */
+ * the loop is not running. May be called from the loop's thread, but otherwise
+ * can only be called by a single thread at a time.
+ * If called from the loop's thread, all callbacks previously queued with
+ * pw_data_loop_invoke() will be run synchronously, which might cause
+ * unexpected reentrancy problems.
+ *
+ * \paramin loop The loop to invoke func on.
+ * \param func The function to be invoked.
+ * \param seq A sequence number, opaque to PipeWire. This will be made
+ *            available to func.
+ * \paramin data Data that will be copied into the internal ring buffer and made
+ *             available to func. Because this data is copied, it is okay to
+ *             pass a pointer to a local variable, but do not pass a pointer to
+ *             an object that has identity.
+ * \param size The size of data to copy.
+ * \param block If \true, do not return until func has been called. Otherwise,
+ *              returns immediately. Passing \true does not risk a deadlock because
+ *              the data thread is never allowed to wait on any other thread.
+ * \param user_data An opaque pointer passed to func.
+ * \return `-EPIPE` if the internal ring buffer filled up,
+ *         if block is \false, 0 is returned when seq is SPA_ID_INVALID or the
+ *         sequence number with the ASYNC bit set otherwise. When block is \true,
+ *         the return value of func is returned.
+ *
+ * Since 0.3.3 */
 int pw_data_loop_invoke(struct pw_data_loop *loop,
 		spa_invoke_func_t func, uint32_t seq, const void *data, size_t size,
 		bool block, void *user_data);

pipewire-1.0.1.tar.bz2/src/pipewire/extensions/client-node.h -> pipewire-1.2.0.tar.gz/src/pipewire/extensions/client-node.h Changed

pipewire-1.0.1.tar.bz2/src/pipewire/extensions/meson.build -> pipewire-1.2.0.tar.gz/src/pipewire/extensions/meson.build Changed

pipewire-1.2.0.tar.gz/src/pipewire/extensions/security-context.h Added

@@ -0,0 +1,118 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2019 Wim Taymans */
+/* SPDX-License-Identifier: MIT */
+
+#ifndef PIPEWIRE_EXT_SECURITY_CONTEXT_H
+#define PIPEWIRE_EXT_SECURITY_CONTEXT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <spa/utils/defs.h>
+
+/** \defgroup pw_security_context Security Context
+ * Security Context interface
+ */
+
+/**
+ * \addtogroup pw_security_context
+ * \{
+ */
+#define PW_TYPE_INTERFACE_SecurityContext		PW_TYPE_INFO_INTERFACE_BASE "SecurityContext"
+
+#define PW_SECURITY_CONTEXT_PERM_MASK			PW_PERM_RWX
+
+#define PW_VERSION_SECURITY_CONTEXT			3
+struct pw_security_context;
+
+#define PW_EXTENSION_MODULE_SECURITY_CONTEXT		PIPEWIRE_MODULE_PREFIX "module-security-context"
+
+#define PW_SECURITY_CONTEXT_EVENT_NUM			0
+
+
+/** \ref pw_security_context events */
+struct pw_security_context_events {
+#define PW_VERSION_SECURITY_CONTEXT_EVENTS		0
+	uint32_t version;
+};
+
+#define PW_SECURITY_CONTEXT_METHOD_ADD_LISTENER		0
+#define PW_SECURITY_CONTEXT_METHOD_CREATE		1
+#define PW_SECURITY_CONTEXT_METHOD_NUM			2
+
+/** \ref pw_security_context methods */
+struct pw_security_context_methods {
+#define PW_VERSION_SECURITY_CONTEXT_METHODS		0
+	uint32_t version;
+
+	int (*add_listener) (void *object,
+			struct spa_hook *listener,
+			const struct pw_security_context_events *events,
+			void *data);
+
+	/**
+	 * Create a new security context
+	 *
+	 * Creates a new security context with a socket listening FD.
+	 * PipeWire will accept new client connections on listen_fd.
+	 *
+	 * listen_fd must be ready to accept new connections when this request is
+	 * sent by the client. In other words, the client must call bind(2) and
+	 * listen(2) before sending the FD.
+	 *
+	 * close_fd is a FD closed by the client when PipeWire should stop
+	 * accepting new connections on listen_fd.
+	 *
+	 * PipeWire must continue to accept connections on listen_fd when
+	 * the client which created the security context disconnects.
+	 *
+	 * After sending this request, closing listen_fd and close_fd remains the
+	 * only valid operation on them.
+	 *
+	 * \param listen_fd the fd to listen on for new connections
+	 * \param close_fd the fd used to stop listening
+	 * \param props extra properties. These will be copied on the client
+	 *     that connects through this context.
+	 *
+	 * Some properties to set:
+	 *
+	 *  - pipewire.sec.engine with the engine name.
+	 *  - pipewire.sec.app-id with the application id, this is an opaque,
+	 *      engine specific id for an application
+	 *  - pipewire.sec.instance-id with the instance id, this is an opaque,
+	 *      engine specific id for a running instance of an application.
+	 *
+	 * See https://gitlab.freedesktop.org/wayland/wayland-protocols/-/blob/main/staging/security-context/engines.md
+	 * For a list of engine names and the properties to set.
+	 *
+	 * This requires X and W permissions on the security_context.
+	 */
+	int (*create) (void *object,
+			int listen_fd,
+			int close_fd,
+			const struct spa_dict *props);
+};
+
+
+#define pw_security_context_method(o,method,version,...)		\
+({									\
+	int _res = -ENOTSUP;						\
+	spa_interface_call_res((struct spa_interface*)o,		\
+			struct pw_security_context_methods, _res,	\
+			method, version, ##__VA_ARGS__);		\
+	_res;								\
+})
+
+#define pw_security_context_add_listener(c,...)	pw_security_context_method(c,add_listener,0,__VA_ARGS__)
+#define pw_security_context_create(c,...)	pw_security_context_method(c,create,0,__VA_ARGS__)
+
+/**
+ * \}
+ */
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#endif /* PIPEWIRE_EXT_SECURITY_CONTEXT_H */

pipewire-1.0.1.tar.bz2/src/pipewire/filter.c -> pipewire-1.2.0.tar.gz/src/pipewire/filter.c Changed

@@ -12,13 +12,13 @@
 #include <spa/param/props.h>
 #include <spa/node/io.h>
 #include <spa/node/utils.h>
+#include <spa/utils/cleanup.h>
 #include <spa/utils/ringbuffer.h>
 #include <spa/utils/string.h>
 #include <spa/pod/filter.h>
 #include <spa/pod/dynamic.h>
 #include <spa/debug/types.h>
 
-#include <pipewire/cleanup.h>
 #include "pipewire/pipewire.h"
 #include "pipewire/filter.h"
 #include "pipewire/private.h"
@@ -32,8 +32,6 @@
 
 static bool mlock_warned = false;
 
-static uint32_t mappable_dataTypes = (1<<SPA_DATA_MemFd);
-
 struct buffer {
 	struct pw_buffer this;
 	uint32_t id;
@@ -116,12 +114,6 @@
 	struct spa_node impl_node;
 	struct spa_hook_list hooks;
 	struct spa_callbacks callbacks;
-	struct spa_io_clock *clock;
-	struct spa_io_position *position;
-
-	struct {
-		struct spa_io_position *position;
-	} rt;
 
 	struct spa_list port_list;
 	struct pw_map ports2;
@@ -152,8 +144,6 @@
 	unsigned int drained:1;
 	unsigned int allow_mlock:1;
 	unsigned int warn_mlock:1;
-	unsigned int process_rt:1;
-	unsigned int driving:1;
 	unsigned int trigger:1;
 	int in_emit_param_changed;
 };
@@ -218,28 +208,31 @@
 	pw_log_debug("dataType: %u", dataType);
 	if (dataType & (1u << SPA_DATA_MemPtr)) {
 		SPA_POD_VALUE(struct spa_pod_int, &vals0) =
-			dataType | mappable_dataTypes;
+			dataType | (1<<SPA_DATA_MemFd);
 		pw_log_debug("Change dataType: %u -> %u", dataType,
 				SPA_POD_VALUE(struct spa_pod_int, &vals0));
 	}
 }
 
-static struct param *add_param(struct filter *impl, struct port *port,
+static int add_param(struct filter *impl, struct port *port,
 		uint32_t id, uint32_t flags, const struct spa_pod *param)
 {
 	struct param *p;
 	int idx;
 
-	if (param == NULL || !spa_pod_is_object(param)) {
-		errno = EINVAL;
-		return NULL;
-	}
+	if (param != NULL && !spa_pod_is_object(param))
+		return -EINVAL;
+	if (param == NULL || !spa_pod_object_has_props((struct spa_pod_object*)param))
+		return 0;
+
+	pw_log_pod(SPA_LOG_LEVEL_DEBUG, param);
+
 	if (id == SPA_ID_INVALID)
 		id = SPA_POD_OBJECT_ID(param);
 
 	p = malloc(sizeof(struct param) + SPA_POD_SIZE(param));
 	if (p == NULL)
-		return NULL;
+		return -errno;
 
 	if (id == SPA_PARAM_ProcessLatency && port == NULL)
 		spa_process_latency_parse(param, &impl->process_latency);
@@ -275,7 +268,7 @@
 			impl->paramsidx.user++;
 		}
 	}
-	return p;
+	return 0;
 }
 
 static void clear_params(struct filter *impl, struct port *port, uint32_t id)
@@ -490,38 +483,12 @@
 	return 0;
 }
 
-static int
-do_set_position(struct spa_loop *loop,
-		bool async, uint32_t seq, const void *data, size_t size, void *user_data)
-{
-	struct filter *impl = user_data;
-	impl->rt.position = impl->position;
-	return 0;
-}
-
 static int impl_set_io(void *object, uint32_t id, void *data, size_t size)
 {
 	struct filter *impl = object;
 
 	pw_log_debug("%p: io %d %p/%zd", impl, id, data, size);
 
-	switch(id) {
-	case SPA_IO_Clock:
-		if (data && size >= sizeof(struct spa_io_clock))
-			impl->clock = data;
-		else
-			impl->clock = NULL;
-		break;
-	case SPA_IO_Position:
-		if (data && size >= sizeof(struct spa_io_position))
-			impl->position = data;
-		else
-			impl->position = NULL;
-		pw_loop_invoke(impl->data_loop,
-			do_set_position, 1, NULL, 0, true, impl);
-		break;
-	}
-	impl->driving = impl->clock && impl->position && impl->position->clock.id == impl->clock->id;
 	pw_filter_emit_io_changed(&impl->this, NULL, id, data, size);
 
 	return 0;
@@ -702,10 +669,8 @@
 			}
 			continue;
 		}
-		if (add_param(impl, port, id, 0, paramsi) == NULL) {
-			res = -errno;
+		if ((res = add_param(impl, port, id, 0, paramsi)) < 0)
 			break;
-		}
 	}
 	if (port != NULL && update_latency) {
 		uint8_t buffer4096;
@@ -779,9 +744,11 @@
 		if (SPA_FLAG_IS_SET(b->flags, BUFFER_FLAG_MAPPED)) {
 			for (j = 0; j < b->this.buffer->n_datas; j++) {
 				struct spa_data *d = &b->this.buffer->datasj;
-				pw_log_debug("%p: clear buffer %d mem",
-						impl, b->id);
-				unmap_data(impl, d);
+				if (SPA_FLAG_IS_SET(d->flags, SPA_DATA_FLAG_MAPPABLE)) {
+					pw_log_debug("%p: clear buffer %d mem",
+							impl, b->id);
+					unmap_data(impl, d);
+				}
 			}
 		}
 	}
@@ -944,7 +911,7 @@
 		if (SPA_FLAG_IS_SET(impl_flags, PW_FILTER_PORT_FLAG_MAP_BUFFERS)) {
 			for (j = 0; j < buffersi->n_datas; j++) {
 				struct spa_data *d = &buffersi->datasj;
-				if ((mappable_dataTypes & (1<<d->type)) > 0) {
+				if (SPA_FLAG_IS_SET(d->flags, SPA_DATA_FLAG_MAPPABLE)) {
 					if ((res = map_data(impl, d, prot)) < 0)
 						return res;
 					SPA_FLAG_SET(b->flags, BUFFER_FLAG_MAPPED);
@@ -954,6 +921,8 @@
 					return -EINVAL;
 				}
 				buf_size += d->maxsize;
+				pw_log_debug("%p:  data:%d type:%d flags:%08x size:%d", filter, j,
+						d->type, d->flags, d->maxsize);
 			}
 
 			if (size > 0 && buf_size != size) {
@@ -962,7 +931,7 @@
 			} else
 				size = buf_size;
 		}
-		pw_log_debug("%p: got buffer %d %d datas, mapped size %d", filter, i,
+		pw_log_debug("%p: got buffer id:%d datas:%d mapped size %d", filter, i,
 				buffersi->n_datas, size);
 	}
 
@@ -1000,28 +969,12 @@
 	return 0;
 }
 
-static int
-do_call_process(struct spa_loop *loop,
-                 bool async, uint32_t seq, const void *data, size_t size, void *user_data)
-{
-	struct filter *impl = user_data;
-	struct pw_filter *filter = &impl->this;
-	pw_log_trace("%p: do process", filter);
-	pw_filter_emit_process(filter, impl->position);
-	return 0;
-}
-
 static void call_process(struct filter *impl)
 {
 	pw_log_trace_fp("%p: call process", impl);
-	if (SPA_FLAG_IS_SET(impl->flags, PW_FILTER_FLAG_RT_PROCESS)) {
-		if (impl->rt_callbacks.funcs)
-			spa_callbacks_call_fast(&impl->rt_callbacks, struct pw_filter_events,
-					process, 0, impl->rt.position);
-	} else {
-		pw_loop_invoke(impl->main_loop,
-			do_call_process, 1, NULL, 0, false, impl);
-	}
+	if (impl->rt_callbacks.funcs)
+		spa_callbacks_call_fast(&impl->rt_callbacks, struct pw_filter_events,
+				process, 0, impl->this.node->rt.position);
 }
 
 static int
@@ -1049,7 +1002,7 @@
 	bool drained = true;
 	int res = 0;
 
-	pw_log_trace_fp("%p: do process %p", impl, impl->rt.position);
+	pw_log_trace_fp("%p: do process %p", impl, impl->this.node->rt.position);
 
 	/** first dequeue and recycle buffers */
 	spa_list_for_each(p, &impl->port_list, link) {
@@ -1254,10 +1207,12 @@
 	spa_hook_list_init(&impl->hooks);
 	this->properties = props;
 
-	if (pw_properties_get(props, PW_KEY_NODE_NAME) == NULL && extra) {
-		str = pw_properties_get(extra, PW_KEY_APP_NAME);
-		if (str == NULL)
-			str = pw_properties_get(extra, PW_KEY_APP_PROCESS_BINARY);
+	if ((str = pw_properties_get(props, PW_KEY_NODE_NAME)) == NULL) {
+		if (extra) {
+			str = pw_properties_get(extra, PW_KEY_APP_NAME);
+			if (str == NULL)
+				str = pw_properties_get(extra, PW_KEY_APP_PROCESS_BINARY);
+		}
 		if (str == NULL)
 			str = name;
 		pw_properties_set(props, PW_KEY_NODE_NAME, str);
@@ -1605,8 +1560,6 @@
 	pw_log_debug("%p: connect", filter);
 	impl->flags = flags;
 
-	impl->process_rt = SPA_FLAG_IS_SET(flags, PW_FILTER_FLAG_RT_PROCESS);
-
 	impl->warn_mlock = pw_properties_get_bool(filter->properties, "mem.warn-mlock", impl->warn_mlock);
 
 	impl->impl_node.iface = SPA_INTERFACE_INIT(
@@ -1623,7 +1576,7 @@
 	impl->info.max_input_ports = UINT32_MAX;
 	impl->info.max_output_ports = UINT32_MAX;
 	impl->info.flags = SPA_NODE_FLAG_RT;
-	if (!impl->process_rt || SPA_FLAG_IS_SET(flags, PW_FILTER_FLAG_ASYNC))
+	if (SPA_FLAG_IS_SET(flags, PW_FILTER_FLAG_ASYNC))
 		impl->info.flags |= SPA_NODE_FLAG_ASYNC;
 	impl->info.props = &filter->properties->dict;
 	impl->paramsNODE_PropInfo = SPA_PARAM_INFO(SPA_PARAM_PropInfo, 0);
@@ -1636,15 +1589,18 @@
 	impl->info.change_mask = impl->change_mask_all;
 
 	clear_params(impl, NULL, SPA_ID_INVALID);
-	for (i = 0; i < n_params; i++) {
+	for (i = 0; i < n_params; i++)
 		add_param(impl, NULL, SPA_ID_INVALID, 0, paramsi);
-	}
 
 	impl->disconnecting = false;
 	impl->draining = false;
-	impl->driving = false;
 	filter_set_state(filter, PW_FILTER_STATE_CONNECTING, 0, NULL);
 
+	if (!SPA_FLAG_IS_SET(flags, PW_FILTER_FLAG_RT_PROCESS)) {
+		if (pw_properties_get(filter->properties, PW_KEY_NODE_LOOP_CLASS) == NULL)
+			pw_properties_set(filter->properties, PW_KEY_NODE_LOOP_CLASS, "main");
+		pw_properties_set(filter->properties, PW_KEY_NODE_ASYNC, "true");
+	}
 	if (flags & PW_FILTER_FLAG_DRIVER)
 		pw_properties_set(filter->properties, PW_KEY_NODE_DRIVER, "true");
 	if (flags & PW_FILTER_FLAG_TRIGGER) {
@@ -1662,7 +1618,7 @@
 		struct spa_fraction q;
 		if (sscanf(str, "%u/%u", &q.num, &q.denom) == 2 && q.denom != 0) {
 			pw_properties_setf(filter->properties, PW_KEY_NODE_FORCE_RATE,
-					"1/%u", q.denom);
+					"%u", q.denom);
 			pw_properties_setf(filter->properties, PW_KEY_NODE_FORCE_QUANTUM,
 					"%u", q.num);
 		}
@@ -1837,6 +1793,9 @@
 	if ((p = alloc_port(impl, direction, port_data_size)) == NULL)
 		goto error_cleanup;
 
+	if (pw_properties_get(props, PW_KEY_PORT_GROUP) == NULL)
+		pw_properties_setf(props, PW_KEY_PORT_GROUP, "stream.%u", p->id);
+
 	p->props = props;
 	p->flags = flags;
 
@@ -1974,7 +1933,7 @@
 int pw_filter_get_time(struct pw_filter *filter, struct pw_time *time)
 {
 	struct filter *impl = SPA_CONTAINER_OF(filter, struct filter, this);
-	struct spa_io_position *p = impl->position;
+	struct spa_io_position *p = filter->node->rt.position;
 
 	if (SPA_LIKELY(p != NULL)) {
 		impl->time.now = p->clock.nsec;
@@ -1994,6 +1953,21 @@
 }
 
 SPA_EXPORT
+uint64_t pw_filter_get_nsec(struct pw_filter *filter)
+{
+	struct timespec ts;
+	clock_gettime(CLOCK_MONOTONIC, &ts);
+	return SPA_TIMESPEC_TO_NSEC(&ts);
+}
+
+SPA_EXPORT
+struct pw_loop *pw_filter_get_data_loop(struct pw_filter *filter)
+{
+	struct filter *impl = SPA_CONTAINER_OF(filter, struct filter, this);
+	return impl->data_loop;
+}
+
+SPA_EXPORT
 struct pw_buffer *pw_filter_dequeue_buffer(void *port_data)
 {
 	struct port *p = SPA_CONTAINER_OF(port_data, struct port, user_data);
@@ -2083,8 +2057,7 @@
 SPA_EXPORT
 bool pw_filter_is_driving(struct pw_filter *filter)
 {
-	struct filter *impl = SPA_CONTAINER_OF(filter, struct filter, this);
-	return impl->driving;
+	return filter->node->driving;
 }
 
 static int
@@ -2116,11 +2089,11 @@
 	struct filter *impl = SPA_CONTAINER_OF(filter, struct filter, this);
 	int res = 0;
 
-	pw_log_trace_fp("%p: driving:%d", impl, impl->driving);
+	pw_log_trace_fp("%p: driving:%d", impl, filter->node->driving);
 
 	if (impl->trigger) {
 		pw_impl_node_trigger(filter->node);
-	} else if (impl->driving) {
+	} else if (filter->node->driving) {
 		res = pw_loop_invoke(impl->data_loop,
 			do_trigger_process, 1, NULL, 0, false, impl);
 	} else {

pipewire-1.0.1.tar.bz2/src/pipewire/filter.h -> pipewire-1.2.0.tar.gz/src/pipewire/filter.h Changed

@@ -120,13 +120,14 @@
 
 enum pw_filter_port_flags {
 	PW_FILTER_PORT_FLAG_NONE		= 0,		/**< no flags */
-	PW_FILTER_PORT_FLAG_MAP_BUFFERS		= (1 << 0),	/**< mmap the buffers except DmaBuf */
+	PW_FILTER_PORT_FLAG_MAP_BUFFERS		= (1 << 0),	/**< mmap the buffers except DmaBuf that is not
+								  *  explicitly marked as mappable. */
 	PW_FILTER_PORT_FLAG_ALLOC_BUFFERS	= (1 << 1),	/**< the application will allocate buffer
 								  *  memory. In the add_buffer event, the
 								  *  data of the buffer should be set */
 };
 
-/** Create a new unconneced \ref pw_filter
+/** Create a new unconnected \ref pw_filter
  * \return a newly allocated \ref pw_filter */
 struct pw_filter *
 pw_filter_new(struct pw_core *core,		/**< a \ref pw_core */
@@ -214,6 +215,14 @@
 SPA_DEPRECATED
 int pw_filter_get_time(struct pw_filter *filter, struct pw_time *time);
 
+/** Get the current time in nanoseconds. This value can be compared with
+ * the nsec value in the spa_io_position. Since 1.1.0 */
+uint64_t pw_filter_get_nsec(struct pw_filter *filter);
+
+/** Get the data loop that is doing the processing of this filter. This loop
+ * is assigned after pw_filter_connect().  * Since 1.1.0 */
+struct pw_loop *pw_filter_get_data_loop(struct pw_filter *filter);
+
 /** Get a buffer that can be filled for output ports or consumed
  * for input ports.  */
 struct pw_buffer *pw_filter_dequeue_buffer(void *port_data);

pipewire-1.0.1.tar.bz2/src/pipewire/global.c -> pipewire-1.2.0.tar.gz/src/pipewire/global.c Changed

pipewire-1.0.1.tar.bz2/src/pipewire/impl-client.c -> pipewire-1.2.0.tar.gz/src/pipewire/impl-client.c Changed

@@ -117,15 +117,16 @@
 	struct pw_impl_client *sender = resource->client;
 	struct pw_impl_client *client = data->client;
 	struct error_data d = { id, res, error };
-	struct pw_global *global;
 
 	/* Check the global id provided by sender refers to a registered global
 	 * known to the sender.
 	 */
-	if ((global = pw_context_find_global(resource->context, id)) == NULL)
-		goto error_no_id;
-	if (sender->recv_generation != 0 && global->generation > sender->recv_generation)
-		goto error_stale_id;
+	if (pw_context_find_global(resource->context, id) == NULL) {
+		if (errno == ESTALE)
+			goto error_stale_id;
+		else
+			goto error_no_id;
+	}
 
 	pw_log_debug("%p: sender %p: error for global %u", client, sender, id);
 	pw_map_for_each(&client->objects, error_resource, &d);
@@ -136,8 +137,8 @@
 	pw_resource_errorf(resource, -ENOENT, "no global %u", id);
 	return -ENOENT;
 error_stale_id:
-	pw_log_debug("%p: sender %p: error for stale global %u generation:%"PRIu64" recv-generation:%"PRIu64,
-			client, sender, id, global->generation, sender->recv_generation);
+	pw_log_debug("%p: sender %p: error for stale global %u recv-generation:%"PRIu64,
+			client, sender, id, sender->recv_generation);
 	pw_resource_errorf(resource, -ESTALE, "no global %u any more", id);
 	return -ESTALE;
 }
@@ -381,7 +382,7 @@
 	if (client->core_resource) {
 		pw_core_resource_add_mem(client->core_resource,
 				block->id, block->type, block->fd,
-				block->flags & PW_MEMBLOCK_FLAG_READWRITE);
+				block->flags & (PW_MEMBLOCK_FLAG_READWRITE | PW_MEMBLOCK_FLAG_UNMAPPABLE));
 	}
 }
 
@@ -518,7 +519,6 @@
 		       struct pw_properties *properties)
 {
 	static const char * const keys = {
-		PW_KEY_OBJECT_SERIAL,
 		PW_KEY_MODULE_ID,
 		PW_KEY_PROTOCOL,
 		PW_KEY_SEC_PID,
@@ -804,10 +804,7 @@
 	uint32_t perms;
 
 	if ((global = pw_context_find_global(context, global_id)) == NULL)
-		return -ENOENT;
-
-	if (client->recv_generation != 0 && global->generation > client->recv_generation)
-		return -ESTALE;
+		return (errno == ESTALE) ? -ESTALE : -ENOENT;
 
 	perms = pw_global_get_permissions(global, client);
 	if ((perms & permissions) != permissions)

pipewire-1.0.1.tar.bz2/src/pipewire/impl-core.c -> pipewire-1.2.0.tar.gz/src/pipewire/impl-core.c Changed

@@ -33,17 +33,18 @@
 	struct pw_global *global;
 	uint32_t permissions, new_id = user_data_size;
 
-	if ((global = pw_context_find_global(context, id)) == NULL)
-		goto error_no_id;
+	if ((global = pw_context_find_global(context, id)) == NULL) {
+		if (errno == ESTALE)
+			goto error_stale_id;
+		else
+			goto error_no_id;
+	}
 
 	permissions = pw_global_get_permissions(global, client);
 
 	if (!PW_PERM_IS_R(permissions))
 		goto error_no_id;
 
-	if (resource->client->recv_generation != 0 && global->generation > resource->client->recv_generation)
-		goto error_stale_id;
-
 	if (!spa_streq(global->type, type))
 		goto error_wrong_interface;
 
@@ -57,8 +58,8 @@
 
 error_stale_id:
 	pw_log_debug("registry %p: not binding stale global "
-			"id %u to %u, generation:%"PRIu64" recv-generation:%"PRIu64,
-			resource, id, new_id, global->generation, resource->client->recv_generation);
+			"id %u to %u recv-generation:%"PRIu64,
+			resource, id, new_id, resource->client->recv_generation);
 	pw_resource_errorf_id(resource, new_id, -ESTALE, "no global %u any more", id);
 	goto error_exit_clean;
 error_no_id:
@@ -88,17 +89,18 @@
 	uint32_t permissions;
 	int res;
 
-	if ((global = pw_context_find_global(context, id)) == NULL)
-		goto error_no_id;
+	if ((global = pw_context_find_global(context, id)) == NULL) {
+		if (errno == ESTALE)
+			goto error_stale_id;
+		else
+			goto error_no_id;
+	}
 
 	permissions = pw_global_get_permissions(global, client);
 
 	if (!PW_PERM_IS_R(permissions))
 		goto error_no_id;
 
-	if (resource->client->recv_generation != 0 && global->generation > resource->client->recv_generation)
-		goto error_stale_id;
-
 	if (id == PW_ID_CORE || !PW_PERM_IS_X(permissions))
 		goto error_not_allowed;
 
@@ -109,8 +111,8 @@
 
 error_stale_id:
 	pw_log_debug("registry %p: not destroying stale global "
-			"id %u, generation:%"PRIu64" recv-generation:%"PRIu64,
-			resource, id, global->generation, resource->client->recv_generation);
+			"id %u, recv-generation:%"PRIu64,
+			resource, id, resource->client->recv_generation);
 	pw_resource_errorf(resource, -ESTALE, "no global %u any more", id);
 	res = -ESTALE;
 	goto error_exit;
@@ -571,7 +573,6 @@
 			 struct pw_properties *properties)
 {
 	static const char * const keys = {
-		PW_KEY_OBJECT_SERIAL,
 		PW_KEY_USER_NAME,
 		PW_KEY_HOST_NAME,
 		PW_KEY_CORE_NAME,

pipewire-1.0.1.tar.bz2/src/pipewire/impl-device.c -> pipewire-1.2.0.tar.gz/src/pipewire/impl-device.c Changed

@@ -9,6 +9,7 @@
 #include <spa/pod/filter.h>
 #include <spa/pod/dynamic.h>
 #include <spa/utils/string.h>
+#include <spa/utils/json-pod.h>
 
 #include "pipewire/impl.h"
 #include "pipewire/private.h"
@@ -66,6 +67,7 @@
 #define OBJECT_DEVICE	1
 	uint32_t type;
 	struct spa_handle *handle;
+	struct spa_handle *subhandle;
 	void *object;
 	struct spa_hook listener;
 };
@@ -94,22 +96,53 @@
 	}
 }
 
-static void object_register(struct object_data *od)
+static void object_register(struct object_data *od, uint32_t device_id)
 {
+	char id64;
+	struct spa_dict_item it1;
+	snprintf(id, sizeof(id), "%u", device_id);
+
+	it0 = SPA_DICT_ITEM_INIT(PW_KEY_DEVICE_ID, id);
 	switch (od->type) {
 	case OBJECT_NODE:
+		pw_impl_node_update_properties(od->object, &SPA_DICT_INIT_ARRAY(it));
 		pw_impl_node_register(od->object, NULL);
 		pw_impl_node_set_active(od->object, true);
 		break;
 	case OBJECT_DEVICE:
+		pw_impl_device_update_properties(od->object, &SPA_DICT_INIT_ARRAY(it));
 		pw_impl_device_register(od->object, NULL);
 		break;
 	}
 }
 
+struct match {
+	struct pw_impl_device *device;
+	int count;
+};
+#define MATCH_INIT(n) ((struct match){ .device = (n) })
+
+static int execute_match(void *data, const char *location, const char *action,
+		const char *val, size_t len)
+{
+	struct match *match = data;
+	struct pw_impl_device *this = match->device;
+	if (spa_streq(action, "update-props")) {
+		match->count += pw_properties_update_string(this->properties, val, len);
+		this->info.props = &this->properties->dict;
+	}
+	return 1;
+}
+
 static void check_properties(struct pw_impl_device *device)
 {
+	struct pw_context *context = device->context;
 	const char *str;
+	struct match match;
+
+	match = MATCH_INIT(device);
+	pw_context_conf_section_match_rules(context, "device.rules",
+			&device->properties->dict, execute_match, &match);
 
 	if ((str = pw_properties_get(device->properties, PW_KEY_DEVICE_NAME)) &&
 	    (device->name == NULL || !spa_streq(str, device->name))) {
@@ -352,6 +385,16 @@
 	return res;
 }
 
+SPA_EXPORT
+int pw_impl_device_set_param(struct pw_impl_device *device,
+		uint32_t id, uint32_t flags, const struct spa_pod *param)
+{
+	pw_log_debug("%p: set_param id:%d (%s) flags:%08x param:%p", device, id,
+			spa_debug_type_find_name(spa_type_param, id), flags, param);
+	return spa_device_set_param(device->device, id, flags, param);
+}
+
+
 static int reply_param(void *data, int seq, uint32_t id,
 		uint32_t index, uint32_t next, struct spa_pod *param)
 {
@@ -538,7 +581,6 @@
 		       struct pw_properties *properties)
 {
 	static const char * const keys = {
-		PW_KEY_OBJECT_SERIAL,
 		PW_KEY_OBJECT_PATH,
 		PW_KEY_MODULE_ID,
 		PW_KEY_FACTORY_ID,
@@ -584,7 +626,7 @@
 	pw_global_register(device->global);
 
 	spa_list_for_each(od, &device->object_list, link)
-		object_register(od);
+		object_register(od, device->info.id);
 
 	return 0;
 
@@ -603,6 +645,8 @@
 {
 	struct object_data *od = data;
 	pw_unload_spa_handle(od->handle);
+	if (od->subhandle)
+		pw_unload_spa_handle(od->subhandle);
 }
 
 static const struct pw_impl_node_events node_object_events = {
@@ -647,11 +691,10 @@
 
 	pw_log_debug("%p: updated %d properties", device, changed);
 
-	if (!changed)
-		return 0;
-
-	device->info.change_mask |= PW_DEVICE_CHANGE_MASK_PROPS;
-
+	if (changed) {
+		check_properties(device);
+		device->info.change_mask |= PW_DEVICE_CHANGE_MASK_PROPS;
+	}
 	return changed;
 }
 
@@ -758,37 +801,72 @@
 		const struct spa_device_object_info *info)
 {
 	struct pw_context *context = device->context;
-	struct spa_handle *handle;
-	struct pw_properties *props;
+	struct spa_handle *handle, *subhandle = NULL;
+	spa_autoptr(pw_properties) props = NULL;
+	const struct pw_properties *p;
 	int res;
 	void *iface;
 	struct object_data *od = NULL;
+	const char *str;
 
 	if (info->factory_name == NULL) {
 		pw_log_debug("%p: missing factory name", device);
 		return;
 	}
 
-	handle = pw_context_load_spa_handle(context, info->factory_name, info->props);
+	props = pw_properties_new(NULL, NULL);
+	if (props == NULL) {
+		pw_log_warn("%p: allocation error: %m", device);
+		return;
+	}
+	if (info->props)
+		pw_properties_update(props, info->props);
+	if ((str = pw_properties_get(device->properties, "device.object.properties")))
+		pw_properties_update_string(props, str, strlen(str));
+
+	p = pw_context_get_properties(context);
+	pw_properties_set(props, "clock.quantum-limit",
+			pw_properties_get(p, "default.clock.quantum-limit"));
+
+	handle = pw_context_load_spa_handle(context, info->factory_name, &props->dict);
 	if (handle == NULL) {
 		pw_log_warn("%p: can't load handle %s: %m",
 				device, info->factory_name);
-		return;
+		goto cleanup;
 	}
 
 	if ((res = spa_handle_get_interface(handle, info->type, &iface)) < 0) {
 		pw_log_error("%p: can't get %s interface: %s", device, info->type,
 				spa_strerror(res));
-		return;
+		goto cleanup;
 	}
 
-	props = pw_properties_copy(device->properties);
-	if (info->props && props)
-		pw_properties_update(props, info->props);
-
 	if (spa_streq(info->type, SPA_TYPE_INTERFACE_Node)) {
 		struct pw_impl_node *node;
-		node = pw_context_create_node(context, props, sizeof(struct object_data));
+
+		if ((str = pw_properties_get(props, "node.adapter")) != NULL) {
+			char name64;
+			snprintf(name, sizeof(name), "%s.follower", str);
+	                pw_properties_setf(props, name, "pointer:%p", iface);
+
+			subhandle = handle;
+
+			handle = pw_context_load_spa_handle(context, str, &props->dict);
+			if (handle == NULL) {
+				pw_log_warn("%p: can't load handle %s: %m", device, str);
+				goto cleanup;
+			}
+			if ((res = spa_handle_get_interface(handle, info->type, &iface)) < 0) {
+				pw_log_error("%p: can't get %s interface: %s", device, info->type,
+						spa_strerror(res));
+				goto cleanup;
+			}
+		}
+
+		node = pw_context_create_node(context, spa_steal_ptr(props),
+				sizeof(struct object_data));
+		if (node == NULL)
+			goto cleanup;
 
 		od = pw_impl_node_get_user_data(node);
 		od->object = node;
@@ -797,7 +875,10 @@
 		pw_impl_node_set_implementation(node, iface);
 	} else if (spa_streq(info->type, SPA_TYPE_INTERFACE_Device)) {
 		struct pw_impl_device *dev;
-		dev = pw_context_create_device(context, props, sizeof(struct object_data));
+		dev = pw_context_create_device(context, spa_steal_ptr(props),
+				sizeof(struct object_data));
+		if (dev == NULL)
+			goto cleanup;
 
 		od = pw_impl_device_get_user_data(dev);
 		od->object = dev;
@@ -806,17 +887,24 @@
 		pw_impl_device_set_implementation(dev, iface);
 	} else {
 		pw_log_warn("%p: unknown type %s", device, info->type);
-		pw_properties_free(props);
+		goto cleanup;
 	}
-
 	if (od) {
 		od->id = id;
 		od->handle = handle;
+		od->subhandle = subhandle;
 		spa_list_append(&device->object_list, &od->link);
 		if (device->global)
-			object_register(od);
+			object_register(od, device->info.id);
 	}
 	return;
+
+cleanup:
+	if (handle)
+		pw_unload_spa_handle(handle);
+	if (subhandle)
+		pw_unload_spa_handle(subhandle);
+	return;
 }
 
 static struct object_data *find_object(struct pw_impl_device *device, uint32_t id)
@@ -857,9 +945,36 @@
 	.object_info = device_object_info,
 };
 
+static int handle_device_param(struct pw_impl_device *device, const char *key, const char *value)
+{
+	const struct spa_type_info *ti;
+	uint8_t buffer1024;
+	struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
+	struct spa_pod *pod;
+	int res;
+
+	ti = spa_debug_type_find_short(spa_type_param, key);
+	if (ti == NULL)
+		return -ENOENT;
+
+	if ((res = spa_json_to_pod(&b, 0, ti, value, strlen(value))) < 0)
+		return res;
+
+	if ((pod = spa_pod_builder_deref(&b, 0)) == NULL)
+		return -ENOSPC;
+
+	if ((res = pw_impl_device_set_param(device, ti->type, 0, pod)) < 0)
+		return res;
+
+	return 0;
+}
+
 SPA_EXPORT
 int pw_impl_device_set_implementation(struct pw_impl_device *device, struct spa_device *spa_device)
 {
+	int res;
+	const struct spa_dict_item *it;
+
 	pw_log_debug("%p: implementation %p", device, spa_device);
 
 	if (device->device) {
@@ -868,10 +983,19 @@
 		return -EEXIST;
 	}
 	device->device = spa_device;
-	spa_device_add_listener(device->device,
+	res = spa_device_add_listener(device->device,
 			&device->listener, &device_events, device);
 
-	return 0;
+again:
+	spa_dict_for_each(it, &device->properties->dict) {
+		if (spa_strstartswith(it->key, "device.param.")) {
+			if ((res = handle_device_param(device, &it->key13, it->value)) < 0)
+				pw_log_warn("can't set device param: %s", spa_strerror(res));
+			pw_properties_set(device->properties, it->key, NULL);
+			goto again;
+		}
+	}
+	return res;
 }
 
 SPA_EXPORT

pipewire-1.0.1.tar.bz2/src/pipewire/impl-factory.c -> pipewire-1.2.0.tar.gz/src/pipewire/impl-factory.c Changed

pipewire-1.0.1.tar.bz2/src/pipewire/impl-link.c -> pipewire-1.2.0.tar.gz/src/pipewire/impl-link.c Changed

@@ -44,86 +44,14 @@
 	struct spa_hook output_node_listener;
 	struct spa_hook output_global_listener;
 
-	struct spa_io_buffers io;
+	struct spa_io_buffers io2;
 
 	struct pw_impl_node *inode, *onode;
+	bool async;
 };
 
 /** \endcond */
 
-static struct pw_node_peer *pw_node_peer_ref(struct pw_impl_node *onode, struct pw_impl_node *inode)
-{
-	struct pw_node_peer *peer;
-
-	spa_list_for_each(peer, &onode->peer_list, link) {
-		if (peer->target.id == inode->info.id) {
-			pw_log_debug("exiting peer %p from %p to %p", peer, onode, inode);
-			peer->ref++;
-			return peer;
-		}
-	}
-	peer = calloc(1, sizeof(*peer));
-	if (peer == NULL)
-		return NULL;
-
-	peer->ref = 1;
-	peer->output = onode;
-	peer->active_count = 0;
-	copy_target(&peer->target, &inode->rt.target);
-	peer->target.flags = PW_NODE_TARGET_PEER;
-
-	spa_list_append(&onode->peer_list, &peer->link);
-	pw_log_debug("new peer %p from %p to %p", peer, onode, inode);
-	pw_impl_node_emit_peer_added(onode, inode);
-
-	return peer;
-}
-
-static void pw_node_peer_unref(struct pw_node_peer *peer)
-{
-	if (--peer->ref > 0)
-		return;
-	spa_list_remove(&peer->link);
-	pw_log_debug("remove peer %p from %p to %p", peer, peer->output, peer->target.node);
-	pw_impl_node_emit_peer_removed(peer->output, peer->target.node);
-	free(peer);
-}
-
-static void pw_node_peer_activate(struct pw_node_peer *peer)
-{
-	struct pw_node_activation_state *state;
-
-	state = &peer->target.activation->state0;
-
-	if (peer->active_count++ == 0) {
-		spa_list_append(&peer->output->rt.target_list, &peer->target.link);
-		if (!peer->target.active && peer->output->rt.driver_target.node != NULL) {
-			state->required++;
-			peer->target.active = true;
-		}
-	}
-	pw_log_trace("%p: node:%s state:%p pending:%d/%d", peer->output,
-			peer->target.name, state, state->pending, state->required);
-}
-
-static void pw_node_peer_deactivate(struct pw_node_peer *peer)
-{
-	struct pw_node_activation_state *state;
-	state = &peer->target.activation->state0;
-	if (--peer->active_count == 0) {
-
-		spa_list_remove(&peer->target.link);
-
-		if (peer->target.active) {
-			state->required--;
-			peer->target.active = false;
-		}
-	}
-	pw_log_trace("%p: node:%s state:%p pending:%d/%d", peer->output,
-			peer->target.name, state, state->pending, state->required);
-}
-
-
 static void info_changed(struct pw_impl_link *link)
 {
 	struct pw_resource *resource;
@@ -333,6 +261,8 @@
 	struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
 	uint32_t index, busy_id;
 	uint32_t in_state, out_state;
+	struct spa_node *in_node, *out_node;
+	uint32_t in_port, out_port;
 
 	if (this->info.state >= PW_LINK_STATE_NEGOTIATING)
 		return 0;
@@ -352,10 +282,23 @@
 
 	input = this->input;
 	output = this->output;
+#if 0
+	in_node = input->mix;
+	in_port = this->rt.in_mix.port.port_id;
+	out_node = output->mix;
+	out_port = this->rt.out_mix.port.port_id;
+#else
+	in_node = input->node->node;
+	in_port = input->port_id;
+	out_node = output->node->node;
+	out_port = output->port_id;
+#endif
 
 	/* find a common format for the ports */
 	if ((res = pw_context_find_format(context,
-					output, input, NULL, 0, NULL,
+					output, SPA_ID_INVALID,
+					input, SPA_ID_INVALID,
+					NULL, 0, NULL,
 					&format, &b, &error)) < 0) {
 		format = NULL;
 		goto error;
@@ -369,8 +312,8 @@
 	/* if output port had format and is idle, check if it changed. If so, renegotiate */
 	if (out_state > PW_IMPL_PORT_STATE_CONFIGURE && output->node->info.state == PW_NODE_STATE_IDLE) {
 		index = 0;
-		res = spa_node_port_enum_params_sync(output->node->node,
-				output->direction, output->port_id,
+		res = spa_node_port_enum_params_sync(out_node,
+				output->direction, out_port,
 				SPA_PARAM_Format, &index,
 				NULL, &current, &b);
 		switch (res) {
@@ -403,8 +346,8 @@
 	/* if input port had format and is idle, check if it changed. If so, renegotiate */
 	if (in_state > PW_IMPL_PORT_STATE_CONFIGURE && input->node->info.state == PW_NODE_STATE_IDLE) {
 		index = 0;
-		res = spa_node_port_enum_params_sync(input->node->node,
-				input->direction, input->port_id,
+		res = spa_node_port_enum_params_sync(in_node,
+				input->direction, in_port,
 				SPA_PARAM_Format, &index,
 				NULL, &current, &b);
 		switch (res) {
@@ -492,12 +435,12 @@
 	return res;
 
 error:
-	pw_context_debug_port_params(context, input->node->node, input->direction,
-			input->port_id, SPA_PARAM_EnumFormat, res,
-			"input format (%s)", error);
-	pw_context_debug_port_params(context, output->node->node, output->direction,
-			output->port_id, SPA_PARAM_EnumFormat, res,
-			"output format (%s)", error);
+	pw_context_debug_port_params(context, in_node,
+			input->direction, in_port,
+			SPA_PARAM_EnumFormat, res, "input format (%s)", error);
+	pw_context_debug_port_params(context, out_node,
+			output->direction, out_port,
+			SPA_PARAM_EnumFormat, res, "output format (%s)", error);
 	link_update_state(this, PW_LINK_STATE_ERROR, res, error);
 	free(format);
 	return res;
@@ -532,14 +475,15 @@
 	struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
 	struct spa_io_buffers *io;
 
-	io = this->rt.in_mix.io;
+	io = this->rt.in_mix.io_data;
 	if (io == NULL)
-		io = this->rt.out_mix.io;
+		io = this->rt.out_mix.io_data;
 	if (io == NULL)
-		io = &impl->io;
+		io = impl->io;
 
 	this->io = io;
-	*this->io = SPA_IO_BUFFERS_INIT;
+	this->io0 = SPA_IO_BUFFERS_INIT;
+	this->io1 = SPA_IO_BUFFERS_INIT;
 }
 
 static int do_allocation(struct pw_impl_link *this)
@@ -584,10 +528,15 @@
 		this->rt.out_mix.have_buffers = true;
 	} else {
 		uint32_t flags, alloc_flags;
+		struct spa_node *in_node, *out_node;
+		uint32_t in_port, out_port;
 
 		flags = 0;
 		/* always shared buffers for the link */
 		alloc_flags = PW_BUFFERS_FLAG_SHARED;
+		/* always enable async mode */
+		alloc_flags |= PW_BUFFERS_FLAG_ASYNC;
+
 		if (output->node->remote || input->node->remote)
 			alloc_flags |= PW_BUFFERS_FLAG_SHARED_MEM;
 
@@ -599,10 +548,21 @@
 			SPA_FLAG_SET(alloc_flags, PW_BUFFERS_FLAG_NO_MEM);
 			flags |= SPA_NODE_BUFFERS_FLAG_ALLOC;
 		}
+#if 0
+		in_node = input->mix;
+		in_port = this->rt.in_mix.port.port_id;
+		out_node = output->mix;
+		out_port = this->rt.out_mix.port.port_id;
+#else
+		in_node = input->node->node;
+		in_port = input->port_id;
+		out_node = output->node->node;
+		out_port = output->port_id;
+#endif
 
 		if ((res = pw_buffers_negotiate(this->context, alloc_flags,
-						output->node->node, output->port_id,
-						input->node->node, input->port_id,
+						out_node, out_port,
+						in_node, in_port,
 						&output->buffers)) < 0) {
 			error = spa_aprintf("error alloc buffers: %s", spa_strerror(res));
 			goto error;
@@ -658,21 +618,11 @@
 	return res;
 }
 
-static int
-do_activate_link(struct spa_loop *loop,
-		 bool async, uint32_t seq, const void *data, size_t size, void *user_data)
-{
-	struct pw_impl_link *this = user_data;
-	pw_log_trace("%p: activate", this);
-	if (this->peer)
-		pw_node_peer_activate(this->peer);
-	return 0;
-}
-
 int pw_impl_link_activate(struct pw_impl_link *this)
 {
 	struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
 	int res;
+	uint32_t io_type, io_size;
 
 	pw_log_debug("%p: activate activated:%d state:%s", this, impl->activated,
 			pw_link_state_as_string(this->info.state));
@@ -681,26 +631,34 @@
 		!impl->inode->runnable || !impl->onode->runnable)
 		return 0;
 
-	if ((res = port_set_io(this, this->input, SPA_IO_Buffers, this->io,
-			sizeof(struct spa_io_buffers), &this->rt.in_mix)) < 0)
-		return res;
-
-	if ((res = port_set_io(this, this->output, SPA_IO_Buffers, this->io,
-			sizeof(struct spa_io_buffers), &this->rt.out_mix)) < 0) {
-		port_set_io(this, this->input, SPA_IO_Buffers, NULL, 0,
-				&this->rt.in_mix);
-		return res;
+	if (impl->async) {
+		io_type = SPA_IO_AsyncBuffers;
+		io_size = sizeof(struct spa_io_async_buffers);
+	} else {
+		io_type = SPA_IO_Buffers;
+		io_size = sizeof(struct spa_io_buffers);
 	}
 
-	pw_loop_invoke(this->output->node->data_loop,
-	       do_activate_link, SPA_ID_INVALID, NULL, 0, false, this);
+	if ((res = port_set_io(this, this->input, io_type, this->io,
+					io_size, &this->rt.in_mix)) < 0)
+		goto error;
+	if ((res = port_set_io(this, this->output, io_type, this->io,
+					io_size, &this->rt.out_mix)) < 0)
+		goto error_clean;
 
 	impl->activated = true;
 	pw_log_info("(%s) activated", this->name);
 	link_update_state(this, PW_LINK_STATE_ACTIVE, 0, NULL);
 
 	return 0;
+
+error_clean:
+	port_set_io(this, this->input, io_type, NULL, 0, &this->rt.in_mix);
+error:
+	pw_log_error("%p: can't activate link: %s", this, spa_strerror(res));
+	return res;
 }
+
 static void check_states(void *obj, void *user_data, int res, uint32_t id)
 {
 	struct pw_impl_link *this = obj;
@@ -854,17 +812,6 @@
 	return 0;
 }
 
-static int
-do_deactivate_link(struct spa_loop *loop,
-		   bool async, uint32_t seq, const void *data, size_t size, void *user_data)
-{
-        struct pw_impl_link *this = user_data;
-	pw_log_trace("%p: disable out %p", this, &this->rt.out_mix);
-	if (this->peer)
-		pw_node_peer_deactivate(this->peer);
-	return 0;
-}
-
 int pw_impl_link_deactivate(struct pw_impl_link *this)
 {
 	struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
@@ -874,9 +821,6 @@
 	if (!impl->activated)
 		return 0;
 
-	pw_loop_invoke(this->output->node->data_loop,
-		       do_deactivate_link, SPA_ID_INVALID, NULL, 0, true, this);
-
 	port_set_io(this, this->output, SPA_IO_Buffers, NULL, 0,
 			&this->rt.out_mix);
 	port_set_io(this, this->input, SPA_IO_Buffers, NULL, 0,
@@ -884,7 +828,7 @@
 
 	impl->activated = false;
 	pw_log_info("(%s) deactivated", this->name);
-	
+
 	if (this->info.state < PW_LINK_STATE_PAUSED || this->destroyed)
 		link_update_state(this, PW_LINK_STATE_INIT, 0, NULL);
 	else
@@ -1377,6 +1321,13 @@
 	if (this->passive && str == NULL)
 		 pw_properties_set(properties, PW_KEY_LINK_PASSIVE, "true");
 
+	impl->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);
+
+	if (impl->async)
+		 pw_properties_set(properties, PW_KEY_LINK_ASYNC, "true");
+
 	spa_hook_list_init(&this->listener_list);
 
 	impl->format_filter = format_filter;
@@ -1406,8 +1357,6 @@
 	spa_list_append(&output->links, &this->output_link);
 	spa_list_append(&input->links, &this->input_link);
 
-	impl->io = SPA_IO_BUFFERS_INIT;
-
 	select_io(this);
 
 	if (this->feedback) {
@@ -1426,7 +1375,8 @@
 	this->name = spa_aprintf("%d.%d.%d -> %d.%d.%d",
 			output_node->info.id, output->port_id, this->rt.out_mix.port.port_id,
 			input_node->info.id, input->port_id, this->rt.in_mix.port.port_id);
-	pw_log_info("(%s) (%s) -> (%s)", this->name, output_node->name, input_node->name);
+	pw_log_info("(%s) (%s) -> (%s) async:%04x:%04x:%d", this->name, output_node->name,
+			input_node->name, output->flags, input->flags, impl->async);
 
 	pw_impl_port_emit_link_added(output, this);
 	pw_impl_port_emit_link_added(input, this);
@@ -1496,7 +1446,6 @@
 		     struct pw_properties *properties)
 {
 	static const char * const keys = {
-		PW_KEY_OBJECT_SERIAL,
 		PW_KEY_OBJECT_PATH,
 		PW_KEY_MODULE_ID,
 		PW_KEY_FACTORY_ID,

pipewire-1.0.1.tar.bz2/src/pipewire/impl-metadata.c -> pipewire-1.2.0.tar.gz/src/pipewire/impl-metadata.c Changed

@@ -5,9 +5,9 @@
 #include <errno.h>
 
 #include <spa/debug/types.h>
+#include <spa/utils/cleanup.h>
 #include <spa/utils/string.h>
 
-#include <pipewire/cleanup.h>
 #include "pipewire/impl.h"
 #include "pipewire/private.h"
 
@@ -353,6 +353,7 @@
 		spa_hook_remove(&metadata->global_listener);
 		pw_global_destroy(metadata->global);
 	}
+	spa_hook_remove(&metadata->context_listener);
 
 	pw_impl_metadata_emit_free(metadata);
 	pw_log_debug("%p: free", metadata);
@@ -382,7 +383,9 @@
 	struct pw_resource *resource = d->resource;
 	struct pw_impl_client *client = pw_resource_get_client(resource);
 
-	if (pw_impl_client_check_permissions(client, subject, PW_PERM_R) >= 0)
+	int res = pw_impl_client_check_permissions(client, subject, PW_PERM_R);
+	if (res >= 0 ||
+		    (res == -ENOENT && key == NULL && type == NULL && value == NULL))
 		pw_metadata_resource_property(d->resource, subject, key, type, value);
 	return 0;
 }
@@ -462,7 +465,7 @@
         data->impl = this;
         data->resource = resource;
 
-	pw_log_debug("%p: bound to %d", this, resource->id);
+	pw_log_debug("%p: %u bound to %d", this, id, resource->id);
 	pw_global_add_resource(global, resource);
 
 	/* listen for when the resource goes away */
@@ -487,6 +490,20 @@
 	return -errno;
 }
 
+static void context_global_removed(void *data, struct pw_global *global)
+{
+	struct impl *impl = data;
+	uint32_t id = pw_global_get_id(global);
+	pw_log_trace("Clearing properties for global %u in %u",
+				 id, pw_global_get_id(impl->this.global));
+	impl_set_property(&impl->def, id, NULL, NULL, NULL);
+}
+
+static const struct pw_context_events context_events = {
+	PW_VERSION_CONTEXT_EVENTS,
+	.global_removed = context_global_removed,
+};
+
 static void global_destroy(void *data)
 {
 	struct pw_impl_metadata *metadata = data;
@@ -506,7 +523,6 @@
 {
 	struct pw_context *context = metadata->context;
 	static const char * const keys = {
-		PW_KEY_OBJECT_SERIAL,
 		PW_KEY_MODULE_ID,
 		PW_KEY_FACTORY_ID,
 		PW_KEY_METADATA_NAME,
@@ -534,6 +550,8 @@
 
 	pw_global_update_keys(metadata->global, &metadata->properties->dict, keys);
 
+	pw_context_add_listener(context, &metadata->context_listener, &context_events,
+							SPA_CONTAINER_OF(metadata, struct impl, this));
 	pw_global_add_listener(metadata->global, &metadata->global_listener, &global_events, metadata);
 	pw_global_register(metadata->global);

pipewire-1.0.1.tar.bz2/src/pipewire/impl-module.c -> pipewire-1.2.0.tar.gz/src/pipewire/impl-module.c Changed

pipewire-1.0.1.tar.bz2/src/pipewire/impl-module.h -> pipewire-1.2.0.tar.gz/src/pipewire/impl-module.h Changed

pipewire-1.0.1.tar.bz2/src/pipewire/impl-node.c -> pipewire-1.2.0.tar.gz/src/pipewire/impl-node.c Changed

@@ -18,6 +18,7 @@
 #include <spa/node/utils.h>
 #include <spa/debug/types.h>
 #include <spa/utils/string.h>
+#include <spa/utils/json-pod.h>
 
 #include "pipewire/impl-node.h"
 #include "pipewire/private.h"
@@ -46,6 +47,7 @@
 
 	char *group;
 	char *link_group;
+	char *sync_group;
 };
 
 #define pw_node_resource(r,m,v,...)	pw_resource_call(r,struct pw_node_events,m,v,__VA_ARGS__)
@@ -68,133 +70,177 @@
 	struct spa_hook listener;
 };
 
-/** \endcond */
-
-/* Called from the node data loop when a node needs to be scheduled by
- * the given driver. 3 things needs to happen:
- *
- * - the node is added to the driver target list and the required state
- *   is incremented. This makes sure the node is woken up when the driver
- *   starts a new cycle.
- * - the node needs to trigger the driver when it completes. This means
- *   the driver is added to the target list.
- * - the node targets (including the driver we added above) have their
- *   required state incremented.
- *
- * This code is called from the data-loop to ensure synchronization
- */
-static void add_node(struct pw_impl_node *this, struct pw_impl_node *driver)
+SPA_EXPORT
+struct pw_node_peer *pw_node_peer_ref(struct pw_impl_node *onode, struct pw_impl_node *inode)
 {
-	struct pw_node_activation_state *dstate, *nstate;
-	struct pw_node_target *t;
+	struct pw_node_peer *peer;
 
-	if (this->exported)
-		return;
-
-	pw_log_trace("%p: add to driver %p %p %p", this, driver,
-			driver->rt.target.activation, this->rt.target.activation);
-
-	/* let the driver trigger us as part of the processing cycle */
-	spa_list_append(&driver->rt.target_list, &this->rt.target.link);
-	nstate = &this->rt.target.activation->state0;
-	if (!this->rt.target.active) {
-		nstate->required++;
-		this->rt.target.active = true;
+	spa_list_for_each(peer, &onode->peer_list, link) {
+		if (peer->target.id == inode->info.id) {
+			pw_log_debug("exiting peer %p from %p to %p", peer, onode, inode);
+			peer->ref++;
+			return peer;
+		}
 	}
+	peer = calloc(1, sizeof(*peer));
+	if (peer == NULL)
+		return NULL;
 
-	/* trigger the driver when we complete */
-	copy_target(&this->rt.driver_target, &driver->rt.target);
-	spa_list_append(&this->rt.target_list, &this->rt.driver_target.link);
+	peer->ref = 1;
+	peer->output = onode;
+	copy_target(&peer->target, &inode->rt.target);
 
-	/* now increment the required states of all this node targets, including
-	 * the driver we added above */
-	spa_list_for_each(t, &this->rt.target_list, link) {
-		dstate = &t->activation->state0;
-		if (!t->active) {
-			dstate->required++;
-			t->active = true;
-		}
-		pw_log_trace("%p: driver state:%p pending:%d/%d, node state:%p pending:%d/%d",
-				this, dstate, dstate->pending, dstate->required,
-				nstate, nstate->pending, nstate->required);
-	}
+	spa_list_append(&onode->peer_list, &peer->link);
+	pw_log_debug("new peer %p from %p to %p", peer, onode, inode);
+	pw_impl_node_add_target(onode, &peer->target);
+
+	return peer;
 }
 
-/* called from the data loop and undoes the changes done in add_node.  */
-static void remove_node(struct pw_impl_node *this)
+SPA_EXPORT
+void pw_node_peer_unref(struct pw_node_peer *peer)
 {
-	struct pw_node_activation_state *dstate, *nstate;
-	struct pw_node_target *t;
-
-	if (this->exported)
+	if (peer == NULL || --peer->ref > 0)
 		return;
+	spa_list_remove(&peer->link);
+	pw_log_debug("remove peer %p from %p to %p", peer, peer->output, peer->target.node);
+	pw_impl_node_remove_target(peer->output, &peer->target);
+	free(peer);
+}
 
-	pw_log_trace("%p: remove from driver %s %p %p",
-			this, this->rt.driver_target.name,
-			this->rt.driver_target.activation, this->rt.target.activation);
-
-	spa_list_remove(&this->rt.target.link);
-
-	nstate = &this->rt.target.activation->state0;
-	if (this->rt.target.active) {
-		nstate->required--;
-		this->rt.target.active = false;
+static inline void activate_target(struct pw_impl_node *node, struct pw_node_target *t)
+{
+	struct pw_node_activation_state *state = &t->activation->state0;
+	if (!t->active) {
+		if ((!node->async || node->driving) && !node->exported) {
+			SPA_ATOMIC_INC(state->required);
+			SPA_ATOMIC_INC(state->pending);
+		}
+		t->active = true;
+		pw_log_debug("%p: target state:%p id:%d pending:%d/%d",
+				node, state, t->id, state->pending, state->required);
 	}
+}
 
-	spa_list_for_each(t, &this->rt.target_list, link) {
-		dstate = &t->activation->state0;
-		if (t->active) {
-			dstate->required--;
-			t->active = false;
+static inline void deactivate_target(struct pw_impl_node *node, struct pw_node_target *t, uint64_t trigger)
+{
+	if (t->active) {
+		struct pw_node_activation_state *state = &t->activation->state0;
+		if (!node->async || node->driving) {
+			/* the driver copies the required to the pending state
+			 * so first try to resume the node and then decrement the
+			 * required state. This way we either resume with the old value
+			 * or we don't when the driver has not yet copied */
+			if (trigger != 0)
+				t->trigger(t, trigger);
+			if (!node->exported)
+				SPA_ATOMIC_DEC(state->required);
 		}
-		pw_log_trace("%p: driver state:%p pending:%d/%d, node state:%p pending:%d/%d",
-				this, dstate, dstate->pending, dstate->required,
-				nstate, nstate->pending, nstate->required);
+		t->active = false;
+		pw_log_debug("%p: target state:%p id:%d pending:%d/%d trigger:%"PRIu64,
+				node, state, t->id, state->pending, state->required, trigger);
 	}
-	spa_list_remove(&this->rt.driver_target.link);
+}
+
+/* called from data-loop when all the targets of a node need to be triggered */
+static inline void trigger_targets(struct pw_impl_node *node, int status, uint64_t nsec)
+{
+	struct pw_node_target *ta;
 
-	spa_zero(this->rt.driver_target);
+	pw_log_trace_fp("%p: (%s-%u) trigger targets %"PRIu64,
+			node, node->name, node->info.id, nsec);
+
+	spa_list_for_each(ta, &node->rt.target_list, link)
+		ta->trigger(ta, nsec);
 }
 
+/** \endcond */
+
+/* Called from the node data loop when a node needs to be scheduled by
+ * the given driver.
+ *
+ * - the node adds the source to the data loop
+ * - from all the targets of the node, we can now be scheduled ourselves
+ *   so activate our target.
+ * - When we get scheduled, we will activate our peer targets
+ */
 static int
-do_node_add(struct spa_loop *loop, bool async, uint32_t seq,
+do_node_prepare(struct spa_loop *loop, bool async, uint32_t seq,
 		const void *data, size_t size, void *user_data)
 {
 	struct pw_impl_node *this = user_data;
-	struct pw_impl_node *driver = this->driver_node;
+	struct pw_node_target *t;
+	uint64_t dummy;
+	int res;
 
-	if (!this->added) {
-		uint64_t dummy;
-		int res;
+	pw_log_trace("%p: prepare %d remote:%d", this, this->rt.prepared, this->remote);
 
+	if (this->rt.prepared)
+		return 0;
+
+	if (!this->remote) {
 		/* clear the eventfd in case it was written to while the node was stopped */
-		res = spa_system_eventfd_read(this->data_system, this->source.fd, &dummy);
+		res = spa_system_eventfd_read(this->rt.target.system, this->source.fd, &dummy);
 		if (SPA_UNLIKELY(res != -EAGAIN && res != 0))
 			pw_log_warn("%p: read failed %m", this);
 
-		this->added = true;
-		/* remote nodes have their source added in client-node instead */
-		if (!this->remote)
-			spa_loop_add_source(loop, &this->source);
-		add_node(this, driver);
+		spa_loop_add_source(loop, &this->source);
 	}
+	if (!this->remote || this->rt.target.activation->client_version < 1)
+		SPA_ATOMIC_STORE(this->rt.target.activation->status, PW_NODE_ACTIVATION_FINISHED);
+
+	spa_list_for_each(t, &this->rt.target_list, link)
+		activate_target(this, t);
+
+	this->rt.prepared = true;
+
 	return 0;
 }
 
+static void add_node_to_graph(struct pw_impl_node *node)
+{
+	pw_loop_invoke(node->data_loop, do_node_prepare, 1, NULL, 0, true, node);
+}
+
+/* called from the node data loop and undoes the changes done in do_node_prepare.  */
 static int
-do_node_remove(struct spa_loop *loop, bool async, uint32_t seq,
+do_node_unprepare(struct spa_loop *loop, bool async, uint32_t seq,
 		const void *data, size_t size, void *user_data)
 {
 	struct pw_impl_node *this = user_data;
-	if (this->added) {
-		if (!this->remote)
-			spa_loop_remove_source(loop, &this->source);
-		remove_node(this);
-		this->added = false;
+	struct pw_node_target *t;
+	int old_state;
+	uint64_t trigger = 0;
+
+	pw_log_trace("%p: unprepare %d remote:%d", this, this->rt.prepared, this->remote);
+
+	if (!this->rt.prepared)
+		return 0;
+
+	if (!this->remote || this->rt.target.activation->client_version < 1) {
+		/* We mark ourself as finished now, this will avoid going further into the process loop
+		 * in case our fd was ready (removing ourselfs from the loop should avoid that as well).
+		 * If we were supposed to be scheduled make sure we continue the graph for the peers we
+		 * were supposed to trigger */
+		old_state = SPA_ATOMIC_XCHG(this->rt.target.activation->status, PW_NODE_ACTIVATION_INACTIVE);
+		if (old_state != PW_NODE_ACTIVATION_FINISHED)
+			trigger = get_time_ns(this->rt.target.system);
 	}
+	if (!this->remote)
+		spa_loop_remove_source(loop, &this->source);
+
+	spa_list_for_each(t, &this->rt.target_list, link)
+		deactivate_target(this, t, trigger);
+
+	this->rt.prepared = false;
 	return 0;
 }
 
+static void remove_node_from_graph(struct pw_impl_node *node)
+{
+	pw_loop_invoke(node->data_loop, do_node_unprepare, 1, NULL, 0, true, node);
+}
+
 static void node_deactivate(struct pw_impl_node *this)
 {
 	struct pw_impl_port *port;
@@ -203,7 +249,7 @@
 	pw_log_debug("%p: deactivate", this);
 
 	/* make sure the node doesn't get woken up while not active */
-	pw_loop_invoke(this->data_loop, do_node_remove, 1, NULL, 0, true, this);
+	remove_node_from_graph(this);
 
 	spa_list_for_each(port, &this->input_ports, link) {
 		spa_list_for_each(link, &port->links, input_link)
@@ -268,8 +314,8 @@
 	if (impl->pending_state >= PW_NODE_STATE_RUNNING)
 		return 0;
 
-	pw_log_debug("%p: start node driving:%d driver:%d added:%d", this,
-			this->driving, this->driver, this->added);
+	pw_log_debug("%p: start node driving:%d driver:%d prepared:%d", this,
+			this->driving, this->driver, this->rt.prepared);
 
 	if (!(this->driving && this->driver)) {
 		impl->pending_play = true;
@@ -368,11 +414,11 @@
 
 	switch (state) {
 	case PW_NODE_STATE_RUNNING:
-		pw_log_debug("%p: start node driving:%d driver:%d added:%d", node,
-				node->driving, node->driver, node->added);
+		pw_log_debug("%p: start node driving:%d driver:%d prepared:%d", node,
+				node->driving, node->driver, node->rt.prepared);
 
 		if (res >= 0) {
-			pw_loop_invoke(node->data_loop, do_node_add, 1, NULL, 0, true, node);
+			add_node_to_graph(node);
 		}
 		if (node->driving && node->driver) {
 			res = spa_node_send_command(node->node,
@@ -380,7 +426,7 @@
 			if (res < 0) {
 				state = PW_NODE_STATE_ERROR;
 				error = spa_aprintf("Start error: %s", spa_strerror(res));
-				pw_loop_invoke(node->data_loop, do_node_remove, 1, NULL, 0, true, node);
+				remove_node_from_graph(node);
 			}
 		}
 		break;
@@ -388,7 +434,7 @@
 	case PW_NODE_STATE_SUSPENDED:
 	case PW_NODE_STATE_ERROR:
 		if (state != PW_NODE_STATE_IDLE || node->pause_on_idle)
-			pw_loop_invoke(node->data_loop, do_node_remove, 1, NULL, 0, true, node);
+			remove_node_from_graph(node);
 		break;
 	default:
 		break;
@@ -442,8 +488,8 @@
 
 	node_deactivate(this);
 
-	pw_log_debug("%p: suspend node driving:%d driver:%d added:%d", this,
-			this->driving, this->driver, this->added);
+	pw_log_debug("%p: suspend node driving:%d driver:%d prepared:%d", this,
+			this->driving, this->driver, this->rt.prepared);
 
 	res = spa_node_send_command(this->node,
 				    &SPA_NODE_COMMAND_INIT(SPA_NODE_COMMAND_Suspend));
@@ -479,6 +525,7 @@
 {
 	pw_free_strv(this->groups);
 	pw_free_strv(this->link_groups);
+	pw_free_strv(this->sync_groups);
 	free(this->name);
 	free((char*)this->info.error);
 }
@@ -704,34 +751,143 @@
 	pw_context_emit_driver_removed(context, node);
 }
 
-static void update_io(struct pw_impl_node *node)
+static int
+do_update_position(struct spa_loop *loop,
+		bool async, uint32_t seq, const void *data, size_t size, void *user_data)
 {
-	struct pw_node_target *t = &node->rt.target;
+	struct pw_impl_node *node = user_data;
+	void *position = *(void**)data;
+	pw_log_trace("%p: set position %p", node, position);
+	node->rt.position = position;
+	if (position) {
+		node->target_rate = node->rt.position->clock.target_rate;
+		node->target_quantum = node->rt.position->clock.target_duration;
+	}
+	return 0;
+}
 
-	pw_log_debug("%p: id:%d", node, node->info.id);
+SPA_EXPORT
+int pw_impl_node_set_io(struct pw_impl_node *this, uint32_t id, void *data, size_t size)
+{
+	int res;
+	struct pw_impl_port *port;
 
-	if (spa_node_set_io(node->node,
-			    SPA_IO_Position,
-			    &t->activation->position,
-			    sizeof(struct spa_io_position)) >= 0) {
-		pw_log_debug("%p: set position %p", node, &t->activation->position);
-		node->rt.position = &t->activation->position;
+	switch (id) {
+	case SPA_IO_Position:
+		if (data != NULL && size < sizeof(struct spa_io_position))
+			return -EINVAL;
+		pw_log_debug("%p: set position %p", this, data);
+		pw_loop_invoke(this->data_loop,
+				do_update_position, SPA_ID_INVALID, &data, sizeof(void*), true, this);
+		break;
+	case SPA_IO_Clock:
+		if (data != NULL && size < sizeof(struct spa_io_clock))
+			return -EINVAL;
+		pw_log_debug("%p: set clock %p", this, data);
+		this->rt.clock = data;
+		if (this->rt.clock) {
+			this->info.id = this->rt.clock->id;
+			this->rt.target.id = this->info.id;
+		}
+		break;
+	}
+	this->driving = this->driver && this->rt.clock && this->rt.position &&
+		this->rt.position->clock.id == this->rt.clock->id;
 
-		node->target_rate = node->rt.position->clock.target_rate;
-		node->target_quantum = node->rt.position->clock.target_duration;
-		node->target_pending = false;
+	pw_log_debug("%p: driving:%d clock-id:%d driver-id:%d", this, this->driving,
+			this->rt.clock ? this->rt.clock->id : SPA_ID_INVALID,
+			this->rt.position ? this->rt.position->clock.id : SPA_ID_INVALID);
+
+	spa_list_for_each(port, &this->input_ports, link)
+		spa_node_set_io(port->mix, id, data, size);
+	spa_list_for_each(port, &this->output_ports, link)
+		spa_node_set_io(port->mix, id, data, size);
+
+	res = spa_node_set_io(this->node, id, data, size);
+
+	if (res >= 0 && !SPA_RESULT_IS_ASYNC(res) && this->rt.position)
+		this->rt.target.activation->active_driver_id = this->rt.position->clock.id;
 
-		pw_impl_node_emit_peer_added(node, node);
-	} else if (node->driver) {
-		pw_log_warn("%p: can't set position on driver", node);
+	pw_log_debug("%p: set io: %s", this, spa_strerror(res));
+
+	return res;
+}
+
+static int
+do_add_target(struct spa_loop *loop,
+                bool async, uint32_t seq, const void *data, size_t size, void *user_data)
+{
+	struct pw_node_target *t = user_data;
+	struct pw_impl_node *node = *(struct pw_impl_node**)data;
+
+	pw_log_debug("%p: target:%p id:%d added:%d prepared:%d", node, t, t->id, t->added, node->rt.prepared);
+
+	if (!t->added) {
+		spa_list_append(&node->rt.target_list, &t->link);
+		t->added = true;
+		if (node->rt.prepared)
+			activate_target(node, t);
 	}
-	if (spa_node_set_io(node->node,
-			    SPA_IO_Clock,
-			    &t->activation->position.clock,
-			    sizeof(struct spa_io_clock)) >= 0) {
-		pw_log_debug("%p: set clock %p", node, &t->activation->position.clock);
-		node->rt.clock = &t->activation->position.clock;
+	return 0;
+}
+
+SPA_EXPORT
+int pw_impl_node_add_target(struct pw_impl_node *node, struct pw_node_target *t)
+{
+	pw_loop_invoke(node->data_loop,
+			do_add_target, SPA_ID_INVALID, &node, sizeof(void *), true, t);
+	if (t->node)
+		pw_impl_node_emit_peer_added(node, t->node);
+
+	return 0;
+}
+
+static int
+do_remove_target(struct spa_loop *loop,
+                bool async, uint32_t seq, const void *data, size_t size, void *user_data)
+{
+	struct pw_node_target *t = user_data;
+	struct pw_impl_node *node = *(struct pw_impl_node**)data;
+
+	pw_log_debug("%p: target:%p id:%d added:%d prepared:%d", node, t, t->id, t->added, node->rt.prepared);
+
+	if (t->added) {
+		spa_list_remove(&t->link);
+		t->added = false;
+		if (node->rt.prepared) {
+			int old_state = SPA_ATOMIC_LOAD(node->rt.target.activation->status);
+			uint64_t trigger = 0;
+			if (old_state != PW_NODE_ACTIVATION_FINISHED)
+				trigger = get_time_ns(node->rt.target.system);
+			deactivate_target(node, t, trigger);
+		}
 	}
+	return 0;
+}
+
+SPA_EXPORT
+int pw_impl_node_remove_target(struct pw_impl_node *node, struct pw_node_target *t)
+{
+	/* we also update the target list for remote nodes so that the profiler
+	 * can inspect the nodes as well */
+	pw_loop_invoke(node->data_loop,
+			do_remove_target, SPA_ID_INVALID, &node, sizeof(void *), true, t);
+	if (t->node)
+		pw_impl_node_emit_peer_removed(node, t->node);
+
+	return 0;
+}
+
+static void update_io(struct pw_impl_node *node)
+{
+	struct pw_node_target *t = &node->rt.target;
+
+	pw_log_debug("%p: id:%d", node, node->info.id);
+
+	pw_impl_node_set_io(node, SPA_IO_Clock, &t->activation->position.clock,
+                            sizeof(struct spa_io_clock));
+	pw_impl_node_set_io(node, SPA_IO_Position, &t->activation->position,
+                            sizeof(struct spa_io_position));
 }
 
 SPA_EXPORT
@@ -739,7 +895,6 @@
 		     struct pw_properties *properties)
 {
 	static const char * const keys = {
-		PW_KEY_OBJECT_SERIAL,
 		PW_KEY_OBJECT_PATH,
 		PW_KEY_MODULE_ID,
 		PW_KEY_FACTORY_ID,
@@ -763,7 +918,7 @@
 	struct pw_context *context = this->context;
 	struct pw_impl_port *port;
 
-	pw_log_debug("%p: register", this);
+	pw_log_debug("%p: register remote:%d exported:%d", this, this->remote, this->exported);
 
 	if (this->registered)
 		goto error_existed;
@@ -783,11 +938,14 @@
 		insert_driver(context, this);
 	this->registered = true;
 
-	this->rt.target.activation->position.clock.id = this->global->id;
-
 	this->info.id = this->global->id;
 	this->rt.target.id = this->info.id;
-	pw_properties_setf(this->properties, PW_KEY_OBJECT_ID, "%d", this->info.id);
+	this->rt.target.activation->position.clock.id = this->global->id;
+
+	this->from_driver_peer = pw_node_peer_ref(this, this);
+	this->to_driver_peer = pw_node_peer_ref(this, this);
+
+	pw_properties_setf(this->properties, PW_KEY_OBJECT_ID, "%d", this->global->id);
 	pw_properties_setf(this->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64,
 			pw_global_get_serial(this->global));
 	this->info.props = &this->properties->dict;
@@ -826,29 +984,6 @@
 	return 0;
 }
 
-static int
-do_move_nodes(struct spa_loop *loop,
-		bool async, uint32_t seq, const void *data, size_t size, void *user_data)
-{
-	struct impl *impl = user_data;
-	struct pw_impl_node *driver = *(struct pw_impl_node **)data;
-	struct pw_impl_node *node = &impl->this;
-
-	pw_log_trace("%p: driver:%p->%p", node, node->driver_node, driver);
-
-	pw_log_trace("%p: set position %p", node, &driver->rt.target.activation->position);
-	node->rt.position = &driver->rt.target.activation->position;
-
-	node->target_rate = node->rt.position->clock.target_rate;
-	node->target_quantum = node->rt.position->clock.target_duration;
-
-	if (node->added) {
-		remove_node(node);
-		add_node(node, driver);
-	}
-	return 0;
-}
-
 static void remove_segment_owner(struct pw_impl_node *driver, uint32_t node_id)
 {
 	struct pw_node_activation *a = driver->rt.target.activation;
@@ -861,10 +996,9 @@
 {
 	struct impl *impl = SPA_CONTAINER_OF(node, struct impl, this);
 	struct pw_impl_node *old = node->driver_node;
-	int res;
-	bool was_driving;
+	bool was_driving, no_driver = (driver == NULL);
 
-	if (driver == NULL)
+	if (no_driver)
 		driver = node;
 
 	spa_list_remove(&node->follower_link);
@@ -876,7 +1010,6 @@
 	remove_segment_owner(old, node->info.id);
 
 	was_driving = node->driving;
-	node->driving = node->driver && driver == node;
 
 	/* When a node was driver (and is waiting for all nodes to complete
 	 * the Start command) cancel the pending state and let the new driver
@@ -891,28 +1024,61 @@
 			node->name, node->info.id,
 			old->name, old->info.id, driver->name, driver->info.id);
 
+	/* make sure the old driver doesn't trigger the node anymore */
+	pw_node_peer_unref(spa_steal_ptr(node->from_driver_peer));
+	/* make sure the node doesn't trigger the old driver anymore */
+	pw_node_peer_unref(spa_steal_ptr(node->to_driver_peer));
+
 	node->driver_node = driver;
 	node->moved = true;
 
-	if ((res = spa_node_set_io(node->node,
-		    SPA_IO_Position,
-		    &driver->rt.target.activation->position,
-		    sizeof(struct spa_io_position))) < 0) {
-		pw_log_debug("%p: set position: %s", node, spa_strerror(res));
-	}
+	/* first send new driver target to node, the node is not yet being
+	 * scheduled so it won't trigger yet */
+	node->to_driver_peer = pw_node_peer_ref(node, driver);
 
-	pw_loop_invoke(node->data_loop,
-		       do_move_nodes, SPA_ID_INVALID, &driver, sizeof(struct pw_impl_node *),
-		       true, impl);
+	/* then set the new driver node activation */
+	pw_impl_node_set_io(node, SPA_IO_Position,
+			&driver->rt.target.activation->position,
+			sizeof(struct spa_io_position));
+
+	/* and then make the driver trigger the node */
+	node->from_driver_peer = pw_node_peer_ref(driver, node);
 
 	pw_impl_node_emit_driver_changed(node, old, driver);
 
-	pw_impl_node_emit_peer_removed(old, node);
-	pw_impl_node_emit_peer_added(driver, node);
+	if (no_driver) {
+		/* We don't have a driver, so remove the property */
+		pw_properties_set(node->properties, PW_KEY_NODE_DRIVER_ID, NULL);
+	} else if (node->driver_node->global) {
+		/* Expose the driver ID if it is available as a global */
+		pw_properties_setf(node->properties, PW_KEY_NODE_DRIVER_ID, "%u",
+				pw_global_get_id(node->driver_node->global));
+	}
+
+	node->info.change_mask |= PW_NODE_CHANGE_MASK_PROPS;
+	pw_impl_node_emit_info_changed(driver, &node->info);
 
 	return 0;
 }
 
+struct match {
+	struct pw_impl_node *node;
+	int count;
+};
+#define MATCH_INIT(n) ((struct match){ .node = (n) })
+
+static int execute_match(void *data, const char *location, const char *action,
+		const char *val, size_t len)
+{
+	struct match *match = data;
+	struct pw_impl_node *this = match->node;
+	if (spa_streq(action, "update-props")) {
+		match->count += pw_properties_update_string(this->properties, val, len);
+		this->info.props = &this->properties->dict;
+	}
+	return 1;
+}
+
 static void check_properties(struct pw_impl_node *node)
 {
 	struct impl *impl = SPA_CONTAINER_OF(node, struct impl, this);
@@ -920,11 +1086,24 @@
 	const char *str, *recalc_reason = NULL;
 	struct spa_fraction frac;
 	uint32_t value;
-	bool driver, trigger;
+	bool driver, trigger, transport, sync, async;
+	struct match match;
+
+	match = MATCH_INIT(node);
+	pw_context_conf_section_match_rules(context, "node.rules",
+			&node->properties->dict, execute_match, &match);
 
 	if ((str = pw_properties_get(node->properties, PW_KEY_PRIORITY_DRIVER))) {
-		node->priority_driver = pw_properties_parse_int(str);
-		pw_log_debug("%p: priority driver %d", node, node->priority_driver);
+		value = pw_properties_parse_int(str);
+		if (value != node->priority_driver) {
+			pw_log_debug("%p: priority driver %d -> %d", node, node->priority_driver, value);
+			node->priority_driver = value;
+			if (node->registered && node->driver) {
+				remove_driver(context, node);
+				insert_driver(context, node);
+				recalc_reason = "driver priority changed";
+			}
+		}
 	}
 
 	if ((str = pw_properties_get(node->properties, PW_KEY_NODE_NAME)) &&
@@ -947,9 +1126,8 @@
 		if (node->registered) {
 			if (driver)
 				insert_driver(context, node);
-			else {
+			else
 				remove_driver(context, node);
-			}
 		}
 		if (driver && node->driver_node == node)
 			node->driving = true;
@@ -961,9 +1139,9 @@
 	if (trigger != node->trigger) {
 		node->trigger = trigger;
 		if (trigger)
-			node->rt.target.activation->state0.required++;
+			SPA_ATOMIC_INC(node->rt.target.activation->state0.required);
 		else
-			node->rt.target.activation->state0.required--;
+			SPA_ATOMIC_DEC(node->rt.target.activation->state0.required);
 	}
 
 	/* group defines what nodes are scheduled together */
@@ -991,6 +1169,38 @@
 		recalc_reason = "link group changed";
 	}
 
+	/* sync group defines what nodes are part of the same sync */
+	str = pw_properties_get(node->properties, PW_KEY_NODE_SYNC_GROUP);
+	if (str == NULL)
+		str = "group.sync.0";
+	if (!spa_streq(str, impl->sync_group)) {
+		pw_log_info("%p: sync group '%s'->'%s'", node, impl->sync_group, str);
+		free(impl->sync_group);
+		impl->sync_group = str ? strdup(str) : NULL;
+		pw_free_strv(node->sync_groups);
+		node->sync_groups = impl->sync_group ?
+			pw_strv_parse(impl->sync_group, strlen(impl->sync_group), INT_MAX, NULL) : NULL;
+		recalc_reason = "sync group changed";
+	}
+	sync = pw_properties_get_bool(node->properties, PW_KEY_NODE_SYNC, false);
+	if (sync != node->sync) {
+		pw_log_info("%p: sync %d -> %d", node, node->sync, sync);
+		node->sync = sync;
+		recalc_reason = "sync changed";
+	}
+
+	transport = pw_properties_get_bool(node->properties, PW_KEY_NODE_TRANSPORT, false);
+	if (transport != node->transport) {
+		pw_log_info("%p: transport %d -> %d", node, node->transport, transport);
+		node->transport = transport;
+		recalc_reason = "transport changed";
+	}
+	async = pw_properties_get_bool(node->properties, PW_KEY_NODE_ASYNC, false);
+	if (async != node->async) {
+		pw_log_info("%p: async %d -> %d", node, node->async, async);
+		node->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;
@@ -1090,95 +1300,106 @@
 		return "awake";
 	case PW_NODE_ACTIVATION_FINISHED:
 		return "finished";
+	case PW_NODE_ACTIVATION_INACTIVE:
+		return "inactive";
 	}
 	return "unknown";
 }
 
-static void update_xrun_stats(struct pw_node_activation *a, uint64_t trigger, uint64_t delay)
+static inline void update_xrun_stats(struct pw_node_activation *a, uint32_t count, uint64_t trigger, uint64_t delay)
 {
-	a->xrun_count++;
+	a->xrun_count += count;
 	a->xrun_time = trigger;
 	a->xrun_delay = delay;
 	a->max_delay = SPA_MAX(a->max_delay, delay);
 }
 
-static void check_states(struct pw_impl_node *driver, uint64_t nsec)
+static inline void debug_xrun_target(struct pw_impl_node *driver,
+		struct pw_node_target *t, int status, uint64_t nsec)
 {
-	struct pw_node_target *t;
-	struct pw_node_activation *na = driver->rt.target.activation;
-	struct spa_io_clock *cl = &na->position.clock;
+	struct pw_node_activation *a = t->activation;
+	struct pw_node_activation_state *state = &a->state0;
+	int suppressed;
 	enum spa_log_level level = SPA_LOG_LEVEL_DEBUG;
+
+	if ((suppressed = spa_ratelimit_test(&driver->rt.rate_limit, nsec)) >= 0)
+		level = SPA_LOG_LEVEL_WARN;
+
+	pw_log(level, "(%s-%u) xrun state:%p pending:%d/%d s:%"PRIu64" a:%"PRIu64" f:%"PRIu64
+		" waiting:%"PRIu64" process:%"PRIu64" status:%s (%d suppressed)",
+		t->name, t->id, state,
+		state->pending, state->required,
+		a->signal_time,
+		a->awake_time,
+		a->finish_time,
+		a->awake_time - a->signal_time,
+		a->finish_time - a->awake_time,
+		str_status(status), suppressed);
+}
+
+static inline void debug_xrun_graph(struct pw_impl_node *driver, uint64_t nsec)
+{
 	int suppressed;
+	enum spa_log_level level = SPA_LOG_LEVEL_DEBUG;
+	struct pw_node_target *t;
 
 	if ((suppressed = spa_ratelimit_test(&driver->rt.rate_limit, nsec)) >= 0)
-		level = SPA_LOG_LEVEL_INFO;
+		level = SPA_LOG_LEVEL_WARN;
+
+	pw_log(level, "(%s-%u) graph xrun (%d suppressed)",
+			driver->name, driver->info.id, suppressed);
 
 	spa_list_for_each(t, &driver->rt.target_list, link) {
 		struct pw_node_activation *a = t->activation;
 		struct pw_node_activation_state *state = &a->state0;
 
-		if (t->id == driver->info.id)
-			continue;
-
 		if (a->status == PW_NODE_ACTIVATION_TRIGGERED ||
 		    a->status == PW_NODE_ACTIVATION_AWAKE) {
-			update_xrun_stats(a, nsec / 1000, 0);
+			pw_log(level, "(%s-%u) xrun state:%p pending:%d/%d s:%"PRIu64" a:%"PRIu64" f:%"PRIu64
+					" waiting:%"PRIu64" process:%"PRIu64" status:%s",
+					t->name, t->id, state,
+					state->pending, state->required,
+					a->signal_time,
+					a->awake_time,
+					a->finish_time,
+					a->awake_time - a->signal_time,
+					a->finish_time - a->awake_time,
+					str_status(a->status));
 
-			pw_log(level, "(%s-%u) client too slow! rate:%u/%u pos:%"PRIu64" status:%s (%u suppressed)",
-				t->name, t->id,
-				(uint32_t)(cl->rate.num * cl->duration), cl->rate.denom,
-				cl->position, str_status(a->status),
-				suppressed);
 		}
-		pw_log_debug("(%s-%u) state:%p pending:%d/%d s:%"PRIu64" a:%"PRIu64" f:%"PRIu64
-				" waiting:%"PRIu64" process:%"PRIu64" status:%s sync:%d",
-				t->name, t->id, state,
-				state->pending, state->required,
-				a->signal_time,
-				a->awake_time,
-				a->finish_time,
-				a->awake_time - a->signal_time,
-				a->finish_time - a->awake_time,
-				str_status(a->status), a->pending_sync);
 	}
 }
 
-static inline uint64_t get_time_ns(struct spa_system *system)
-{
-	struct timespec ts;
-	spa_system_clock_gettime(system, CLOCK_MONOTONIC, &ts);
-	return SPA_TIMESPEC_TO_NSEC(&ts);
-}
-
-static inline void node_trigger(struct pw_impl_node *this)
-{
-	pw_log_trace_fp("node %p %s", this, this->name);
-	if (SPA_UNLIKELY(spa_system_eventfd_write(this->data_system, this->source.fd, 1) < 0))
-		pw_log_warn("node %p: write failed %m", this);
-}
-
-/* called from data-loop when all the targets of a node need to be triggered */
-static inline int trigger_targets(struct pw_impl_node *this, int status, uint64_t nsec)
+static void debug_sync_timeout(struct pw_impl_node *driver, uint64_t nsec)
 {
 	struct pw_node_target *t;
+	enum spa_log_level level = SPA_LOG_LEVEL_DEBUG;
+	int suppressed;
 
-	pw_log_trace_fp("%p: %s trigger targets %"PRIu64, this, this->name, nsec);
+	if ((suppressed = spa_ratelimit_test(&driver->rt.rate_limit, nsec)) >= 0)
+		level = SPA_LOG_LEVEL_WARN;
+
+	pw_log(level, "(%s-%u) sync timeout, going to RUNNING (%d suppressed)",
+				driver->name, driver->info.id, suppressed);
 
-	spa_list_for_each(t, &this->rt.target_list, link) {
+	spa_list_for_each(t, &driver->rt.target_list, link) {
 		struct pw_node_activation *a = t->activation;
 		struct pw_node_activation_state *state = &a->state0;
 
-		pw_log_trace_fp("%p: (%s-%u) state:%p pending:%d/%d", t->node,
-				t->name, t->id, state, state->pending, state->required);
+		if (!a->pending_sync)
+			continue;
 
-		if (pw_node_activation_state_dec(state)) {
-			a->status = PW_NODE_ACTIVATION_TRIGGERED;
-			a->signal_time = nsec;
-			if (SPA_UNLIKELY(spa_system_eventfd_write(t->system, t->fd, 1) < 0))
-				pw_log_warn("node %p: write failed %m", this);
-		}
+		pw_log(level, "(%s-%u) sync state:%p pending:%d/%d s:%"PRIu64" a:%"PRIu64" f:%"PRIu64
+				" waiting:%"PRIu64" process:%"PRIu64" status:%s",
+				t->name, t->id, state,
+				state->pending, state->required,
+				a->signal_time,
+				a->awake_time,
+				a->finish_time,
+				a->awake_time - a->signal_time,
+				a->finish_time - a->awake_time,
+				str_status(a->status));
 	}
-	return 0;
 }
 
 static inline void calculate_stats(struct pw_impl_node *this,  struct pw_node_activation *a)
@@ -1207,26 +1428,29 @@
  *
  * This code runs on the client and the server, depending on where the node is.
  */
-static inline int process_node(void *data)
+static inline int process_node(void *data, uint64_t nsec)
 {
 	struct pw_impl_node *this = data;
 	struct pw_impl_port *p;
 	struct pw_node_activation *a = this->rt.target.activation;
-	struct spa_system *data_system = this->data_system;
-	int status;
-	uint64_t nsec;
+	struct spa_system *data_system = this->rt.target.system;
+	int status, old_status;
+
+	if (!SPA_ATOMIC_CAS(a->status,
+				PW_NODE_ACTIVATION_TRIGGERED,
+				PW_NODE_ACTIVATION_AWAKE))
+		return 0;
 
-	nsec = get_time_ns(data_system);
-	pw_log_trace_fp("%p: %s process remote:%u exported:%u %"PRIu64,
-			this, this->name, this->remote, this->exported, nsec);
-	a->status = PW_NODE_ACTIVATION_AWAKE;
 	a->awake_time = nsec;
+	pw_log_trace_fp("%p: %s process remote:%u exported:%u %"PRIu64" %"PRIu64,
+			this, this->name, this->remote, this->exported,
+			a->signal_time, nsec);
 
 	/* when transport sync is not supported, just clear the flag */
 	if (SPA_UNLIKELY(!this->transport_sync))
 		a->pending_sync = false;
 
-	if (SPA_LIKELY(this->added)) {
+	if (SPA_LIKELY(this->rt.prepared)) {
 		/* process input mixers */
 		spa_list_for_each(p, &this->rt.input_mix, rt.node_link)
 			spa_node_process_fast(p->mix);
@@ -1249,21 +1473,21 @@
 	a->state0.status = status;
 
 	nsec = get_time_ns(data_system);
+	old_status = SPA_ATOMIC_XCHG(a->status, PW_NODE_ACTIVATION_FINISHED);
+	a->finish_time = nsec;
 
 	pw_log_trace_fp("%p: finished status:%d %"PRIu64, this, status, nsec);
-	a->status = PW_NODE_ACTIVATION_FINISHED;
-	a->finish_time = nsec;
 
 	/* we don't need to trigger targets when the node was driving the
 	 * graph because that means we finished the graph. */
 	if (SPA_LIKELY(!this->driving)) {
-		trigger_targets(this, status, nsec);
+		if ((!this->async || a->server_version < 1) && old_status == PW_NODE_ACTIVATION_AWAKE)
+			trigger_targets(this, status, nsec);
 	} else {
 		/* calculate CPU time when finished */
 		a->signal_time = this->driver_start;
 		calculate_stats(this, a);
 		pw_impl_node_rt_emit_complete(this);
-//		pw_context_driver_emit_complete(this->context, this);
 	}
 
 	if (SPA_UNLIKELY(status & SPA_STATUS_DRAINED))
@@ -1274,15 +1498,9 @@
 
 int pw_impl_node_trigger(struct pw_impl_node *node)
 {
-	struct pw_node_activation *a = node->rt.target.activation;
-	struct pw_node_activation_state *state = &a->state0;
-
-	if (pw_node_activation_state_dec(state)) {
-		uint64_t nsec = get_time_ns(node->data_system);
-		a->status = PW_NODE_ACTIVATION_TRIGGERED;
-		a->signal_time = nsec;
-		node_trigger(node);
-	}
+	uint64_t nsec = get_time_ns(node->rt.target.system);
+	struct pw_node_target *t = &node->rt.target;
+	t->trigger(t, nsec);
 	return 0;
 }
 
@@ -1295,17 +1513,24 @@
 		return;
 	}
 	if (SPA_LIKELY(source->rmask & SPA_IO_IN)) {
-		uint64_t cmd;
+		uint64_t cmd, nsec;
+		struct spa_system *data_system = this->rt.target.system;
+
+		nsec = get_time_ns(data_system);
 
-		if (SPA_UNLIKELY(spa_system_eventfd_read(this->data_system, this->source.fd, &cmd) < 0))
+		if (SPA_UNLIKELY(spa_system_eventfd_read(data_system, this->source.fd, &cmd) < 0))
 			pw_log_warn("%p: read failed %m", this);
-		else if (SPA_UNLIKELY(cmd > 1))
+		else if (SPA_UNLIKELY(cmd > 1)) {
 			pw_log_info("(%s-%u) client missed %"PRIu64" wakeups",
 				this->name, this->info.id, cmd - 1);
+			update_xrun_stats(this->rt.target.activation, cmd - 1,
+					nsec / 1000, 0);
+		}
+
+		pw_log_trace_fp("%p: remote:%u exported:%u %s got process %"PRIu64,
+				this, this->remote, this->exported, this->name, nsec);
 
-		pw_log_trace_fp("%p: remote:%u exported:%u %s got process", this, this->remote,
-				this->exported, this->name);
-		process_node(this);
+		process_node(this, nsec);
 	}
 }
 
@@ -1361,12 +1586,7 @@
 	this = &impl->this;
 	this->context = context;
 	this->name = strdup("node");
-
-	this->data_loop = pw_context_get_data_loop(context)->loop;
-	this->data_system = this->data_loop->system;
-
-	if (user_data_size > 0)
-                this->user_data = SPA_PTROFF(impl, sizeof(struct impl), void);
+	this->source.fd = -1;
 
 	if (properties == NULL)
 		properties = pw_properties_new(NULL, NULL);
@@ -1375,14 +1595,24 @@
 		goto error_clean;
 	}
 
+	this->data_loop = pw_context_acquire_loop(context, &properties->dict);
+	if (this->data_loop == NULL) {
+		pw_log_error("can't find data-loop");
+		res = -ENOENT;
+		goto error_clean;
+	}
+
+	if (user_data_size > 0)
+                this->user_data = SPA_PTROFF(impl, sizeof(struct impl), void);
+
 	this->properties = properties;
 
 	/* the eventfd used to signal the node */
-	if ((res = spa_system_eventfd_create(this->data_system,
+	if ((res = spa_system_eventfd_create(this->data_loop->system,
 					SPA_FD_CLOEXEC | SPA_FD_NONBLOCK)) < 0)
 		goto error_clean;
 
-	pw_log_debug("%p: new fd:%d", this, res);
+	pw_log_debug("%p: new fd:%d loop:%s", this, res, this->data_loop->name);
 
 	this->source.fd = res;
 	this->source.func = node_on_fd_events;
@@ -1426,21 +1656,24 @@
 
 	this->rt.target.activation = this->activation->map->ptr;
 	this->rt.target.node = this;
-	this->rt.target.system = this->data_system;
+	this->rt.target.system = this->data_loop->system;
 	this->rt.target.fd = this->source.fd;
+	this->rt.target.trigger = trigger_target_v1;
 
 	reset_position(this, &this->rt.target.activation->position);
 	this->rt.target.activation->sync_timeout = DEFAULT_SYNC_TIMEOUT;
 	this->rt.target.activation->sync_left = 0;
+	this->rt.target.activation->status = PW_NODE_ACTIVATION_INACTIVE;
+	this->rt.target.activation->server_version = PW_VERSION_NODE_ACTIVATION;
+	this->rt.target.activation->client_version = PW_VERSION_NODE_ACTIVATION;
 
 	this->rt.rate_limit.interval = 2 * SPA_NSEC_PER_SEC;
 	this->rt.rate_limit.burst = 1;
 
-	check_properties(this);
-
 	this->driver_node = this;
 	spa_list_append(&this->follower_list, &this->follower_link);
-	this->driving = this->driver;
+
+	check_properties(this);
 
 	return this;
 
@@ -1448,7 +1681,10 @@
 	if (this->activation)
 		pw_memblock_unref(this->activation);
 	if (this->source.fd != -1)
-		spa_system_close(this->data_system, this->source.fd);
+		spa_system_close(this->data_loop->system, this->source.fd);
+	if (this->data_loop)
+		pw_context_release_loop(context, this->data_loop);
+	free(this->name);
 	free(impl);
 error_exit:
 	pw_properties_free(properties);
@@ -1739,10 +1975,8 @@
 
 	if (SPA_UNLIKELY(a->position.state == SPA_IO_POSITION_STATE_STARTING)) {
 		if (!all_ready && --a->sync_left == 0) {
-			pw_log_warn("(%s-%u) sync timeout, going to RUNNING",
-					node->name, node->info.id);
-			check_states(node, nsec);
 			pw_impl_node_rt_emit_timeout(node);
+			debug_sync_timeout(node, nsec);
 			all_ready = true;
 		}
 		if (all_ready)
@@ -1762,15 +1996,15 @@
 	struct pw_impl_node *node = data;
 	struct pw_impl_node *driver = node->driver_node;
 	struct pw_node_activation *a = node->rt.target.activation;
-	struct spa_system *data_system = node->data_system;
+	struct spa_system *data_system = node->rt.target.system;
 	struct pw_node_target *t, *reposition_target = NULL;;
 	struct pw_impl_port *p;
 	uint64_t nsec;
 
-	pw_log_trace_fp("%p: ready driver:%d exported:%d %p status:%d added:%d", node,
-			node->driver, node->exported, driver, status, node->added);
+	pw_log_trace_fp("%p: ready driver:%d exported:%d %p status:%d prepared:%d", node,
+			node->driver, node->exported, driver, status, node->rt.prepared);
 
-	if (SPA_UNLIKELY(!node->added)) {
+	if (SPA_UNLIKELY(!node->rt.prepared)) {
 		/* This can happen when we are stopping a node and removed it from the
 		 * graph but we still have not completed the Pause/Suspend command on
 		 * the node. In that case, the node might still emit ready events,
@@ -1783,33 +2017,35 @@
 
 	if (SPA_LIKELY(node == driver)) {
 		struct pw_node_activation_state *state = &a->state0;
+		struct spa_io_clock *cl = &node->rt.position->clock;
 		int sync_type, all_ready, update_sync, target_sync;
 		uint32_t owner2, reposition_owner;
 		uint64_t min_timeout = UINT64_MAX;
-
-		if (SPA_UNLIKELY(a->status != PW_NODE_ACTIVATION_FINISHED)) {
-			pw_log_debug("(%s-%u) graph not finished: state:%p quantum:%"PRIu64
-					" pending %d/%d", node->name, node->info.id,
-					state, a->position.clock.duration,
-					state->pending, state->required);
-			check_states(node, nsec);
-			pw_impl_node_rt_emit_incomplete(node);
+		int32_t pending;
+		int old_status;
+
+		if (SPA_UNLIKELY((pending = pw_node_activation_state_xchg(state)) > 0)) {
+			pw_impl_node_rt_emit_incomplete(driver);
+			old_status = SPA_ATOMIC_LOAD(a->status);
+			if (old_status != PW_NODE_ACTIVATION_FINISHED) {
+				SPA_ATOMIC_STORE(a->status, PW_NODE_ACTIVATION_TRIGGERED);
+				process_node(node, nsec);
+				debug_xrun_graph(node, nsec);
+			}
 		}
 
 		/* This update is done too late, the driver should do this
 		 * before calling the ready callback so that it can use the new target
 		 * duration and rate to schedule the next update. We do this here to
 		 * help drivers that don't support this yet */
-		if (SPA_UNLIKELY(node->rt.position->clock.duration != node->rt.position->clock.target_duration ||
-		    node->rt.position->clock.rate.denom != node->rt.position->clock.target_rate.denom)) {
+		if (SPA_UNLIKELY(cl->duration != cl->target_duration ||
+		    cl->rate.denom != cl->target_rate.denom)) {
 			pw_log_warn("driver %s did not update duration/rate (%"PRIu64"/%"PRIu64" %u/%u)",
 					node->name,
-					node->rt.position->clock.duration,
-					node->rt.position->clock.target_duration,
-					node->rt.position->clock.rate.denom,
-					node->rt.position->clock.target_rate.denom);
-			node->rt.position->clock.duration = node->rt.position->clock.target_duration;
-			node->rt.position->clock.rate = node->rt.position->clock.target_rate;
+					cl->duration, cl->target_duration,
+					cl->rate.denom, cl->target_rate.denom);
+			cl->duration = cl->target_duration;
+			cl->rate = cl->target_rate;
 		}
 
 		sync_type = check_updates(node, &reposition_owner);
@@ -1824,8 +2060,27 @@
 			struct pw_node_activation *ta = t->activation;
 			uint32_t id = t->id;
 
-			ta->status = PW_NODE_ACTIVATION_NOT_TRIGGERED;
+			ta->driver_id = driver->info.id;
+retry_status:
 			pw_node_activation_state_reset(&ta->state0);
+			/* we don't change the state of inactive nodes and don't use them
+			 * for reposition. The pending will be at least 1 and they might
+			 * get decremented to 0 but since the status is inactive, we don't
+			 * do the atomic CAS from NOT_TRIGGERED to TRIGGERED and we don't
+			 * write the eventfd. */
+			old_status = SPA_ATOMIC_LOAD(ta->status);
+			if (SPA_UNLIKELY(old_status == PW_NODE_ACTIVATION_INACTIVE))
+				continue;
+
+			/* if this fails, the node might just have stopped and we need to retry */
+			if (SPA_UNLIKELY(!SPA_ATOMIC_CAS(ta->status, old_status, PW_NODE_ACTIVATION_NOT_TRIGGERED)))
+				goto retry_status;
+
+			if (old_status == PW_NODE_ACTIVATION_TRIGGERED ||
+			    old_status == PW_NODE_ACTIVATION_AWAKE) {
+				update_xrun_stats(ta, 1, nsec / 1000, 0);
+				debug_xrun_target(node, t, old_status, nsec);
+			}
 
 			/* this is the node with reposition info */
 			if (SPA_UNLIKELY(id == reposition_owner))
@@ -1847,9 +2102,7 @@
 			}
 		}
 
-		a->status = PW_NODE_ACTIVATION_TRIGGERED;
 		a->prev_signal_time = a->signal_time;
-		a->signal_time = nsec;
 		node->driver_start = nsec;
 
 		a->sync_timeout = SPA_MIN(min_timeout, DEFAULT_SYNC_TIMEOUT);
@@ -1864,6 +2117,7 @@
 
 		update_position(node, all_ready, nsec);
 
+		a->position.clock.cycle++;
 		pw_impl_node_rt_emit_start(node);
 	}
 	/* this should not happen, driver nodes that are not currently driving
@@ -1882,7 +2136,8 @@
 			spa_node_process_fast(p->mix);
 	}
 	/* now signal all the nodes we drive */
-	return trigger_targets(node, status, nsec);
+	trigger_targets(node, status, nsec);
+	return 0;
 }
 
 static int node_reuse_buffer(void *data, uint32_t port_id, uint32_t buffer_id)
@@ -1903,17 +2158,16 @@
 {
 	struct pw_impl_node *this = data;
 	struct pw_node_activation *a = this->rt.target.activation;
-	struct pw_node_activation *da = this->rt.driver_target.activation;
-	struct spa_system *data_system = this->data_system;
+	struct spa_system *data_system = this->rt.target.system;
 	uint64_t nsec = get_time_ns(data_system);
 	int suppressed;
 
-	update_xrun_stats(a, trigger, delay);
+	update_xrun_stats(a, 1, trigger, delay);
 
 	if ((suppressed = spa_ratelimit_test(&this->rt.rate_limit, nsec)) >= 0) {
 		struct spa_fraction rate;
-		if (da) {
-			struct spa_io_clock *cl = &da->position.clock;
+		if (a) {
+			struct spa_io_clock *cl = &a->position.clock;
 			rate.num = cl->rate.num * cl->duration;
 			rate.denom = cl->rate.denom;
 		} else {
@@ -1939,11 +2193,36 @@
 	.xrun = node_xrun,
 };
 
+static int handle_node_param(struct pw_impl_node *node, const char *key, const char *value)
+{
+	const struct spa_type_info *ti;
+	uint8_t buffer1024;
+	struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
+	struct spa_pod *pod;
+	int res;
+
+	ti = spa_debug_type_find_short(spa_type_param, key);
+	if (ti == NULL)
+		return -ENOENT;
+
+	if ((res = spa_json_to_pod(&b, 0, ti, value, strlen(value))) < 0)
+		return res;
+
+	if ((pod = spa_pod_builder_deref(&b, 0)) == NULL)
+		return -ENOSPC;
+
+	if ((res = pw_impl_node_set_param(node, ti->type, 0, pod)) < 0)
+		return res;
+
+	return 0;
+}
+
 SPA_EXPORT
 int pw_impl_node_set_implementation(struct pw_impl_node *node,
 			struct spa_node *spa_node)
 {
 	int res;
+	const struct spa_dict_item *it;
 
 	pw_log_debug("%p: implementation %p", node, spa_node);
 
@@ -1956,6 +2235,16 @@
 	spa_node_set_callbacks(node->node, &node_callbacks, node);
 	res = spa_node_add_listener(node->node, &node->listener, &node_events, node);
 
+again:
+	spa_dict_for_each(it, &node->properties->dict) {
+		if (spa_strstartswith(it->key, "node.param.")) {
+			if ((res = handle_node_param(node, &it->key11, it->value)) < 0)
+				pw_log_warn("can't set node param: %s", spa_strerror(res));
+			pw_properties_set(node->properties, it->key, NULL);
+			goto again;
+		}
+	}
+
 	if (node->registered)
 		update_io(node);
 
@@ -2054,7 +2343,8 @@
 
 	/* remove ourself as a follower from the driver node */
 	spa_list_remove(&node->follower_link);
-	pw_impl_node_emit_peer_removed(node->driver_node, node);
+	pw_node_peer_unref(spa_steal_ptr(node->from_driver_peer));
+	pw_node_peer_unref(spa_steal_ptr(node->to_driver_peer));
 	remove_segment_owner(node->driver_node, node->info.id);
 
 	spa_list_consume(follower, &node->follower_list, follower_link) {
@@ -2107,9 +2397,14 @@
 
 	clear_info(node);
 
-	spa_system_close(node->data_system, node->source.fd);
+	spa_system_close(node->rt.target.system, node->source.fd);
+
+	if (node->data_loop)
+		pw_context_release_loop(context, node->data_loop);
+
 	free(impl->group);
 	free(impl->link_group);
+	free(impl->sync_group);
 	free(impl);
 
 #ifdef HAVE_MALLOC_TRIM
@@ -2468,7 +2763,7 @@
 			pw_context_recalc_graph(node->context,
 					active ? "node activate" : "node deactivate");
 		else if (!active && node->exported)
-			pw_loop_invoke(node->data_loop, do_node_remove, 1, NULL, 0, true, node);
+			remove_node_from_graph(node);
 	}
 	return 0;
 }

pipewire-1.0.1.tar.bz2/src/pipewire/impl-node.h -> pipewire-1.2.0.tar.gz/src/pipewire/impl-node.h Changed

pipewire-1.0.1.tar.bz2/src/pipewire/impl-port.c -> pipewire-1.2.0.tar.gz/src/pipewire/impl-port.c Changed

@@ -29,7 +29,11 @@
 struct impl {
 	struct pw_impl_port this;
 	struct spa_node mix_node;	/**< mix node implementation */
-	struct spa_list mix_list;
+	struct spa_hook_list mix_hooks;
+
+	struct {
+		struct spa_list mix_list;
+	} rt;
 
 	struct spa_list param_list;
 	struct spa_list pending_list;
@@ -115,6 +119,71 @@
 	}
 }
 
+static int mix_add_listener(void *object, struct spa_hook *listener,
+		const struct spa_node_events *events, void *data)
+{
+	struct impl *impl = object;
+	spa_hook_list_append(&impl->mix_hooks, listener, events, data);
+	return 0;
+}
+
+static int mix_port_enum_params(void *object, int seq,
+		enum spa_direction direction, uint32_t port_id,
+		uint32_t id, uint32_t start, uint32_t max,
+		const struct spa_pod *filter)
+{
+	struct impl *impl = object;
+	struct spa_pod *param;
+	struct spa_result_node_params result;
+	struct spa_pod_builder b = { 0 };
+	uint8_t buffer1024;
+	uint32_t count = 0;
+	int res;
+
+	pw_log_trace("%p: %d", impl, id);
+
+	result.id = id;
+	result.next = start;
+next:
+	result.index = result.next++;
+
+	spa_pod_builder_init(&b, buffer, sizeof(buffer));
+
+	switch (id) {
+	case SPA_PARAM_IO:
+		switch (result.index) {
+		case 0:
+			param = spa_pod_builder_add_object(&b,
+				SPA_TYPE_OBJECT_ParamIO, id,
+				SPA_PARAM_IO_id,   SPA_POD_Id(SPA_IO_Buffers),
+				SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_buffers)));
+			break;
+		case 1:
+			param = spa_pod_builder_add_object(&b,
+				SPA_TYPE_OBJECT_ParamIO, id,
+				SPA_PARAM_IO_id,   SPA_POD_Id(SPA_IO_AsyncBuffers),
+				SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_buffers)));
+			break;
+		default:
+			return 0;
+		}
+		break;
+	default:
+		res = -ENOTSUP;
+		return res;
+	}
+
+	if (spa_pod_filter(&b, &result.param, param, filter) < 0)
+		goto next;
+
+	spa_node_emit_result(&impl->mix_hooks, seq, 0, SPA_RESULT_TYPE_NODE_PARAMS, &result);
+
+	if (++count != max)
+		goto next;
+
+	return 0;
+}
+
 static struct pw_impl_port_mix *find_mix(struct pw_impl_port *port,
 		enum spa_direction direction, uint32_t port_id)
 {
@@ -134,9 +203,9 @@
 	struct pw_impl_port *this = mix->p;
 	struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
 	pw_log_trace("%p: add mix %p", this, mix);
-	if (!mix->active) {
-		spa_list_append(&impl->mix_list, &mix->rt_link);
-		mix->active = true;
+	if (!mix->rt.active) {
+		spa_list_append(&impl->rt.mix_list, &mix->rt.link);
+		mix->rt.active = true;
 	}
 	return 0;
 }
@@ -148,9 +217,9 @@
 	struct pw_impl_port_mix *mix = user_data;
 	struct pw_impl_port *this = mix->p;
 	pw_log_trace("%p: remove mix %p", this, mix);
-	if (mix->active) {
-		spa_list_remove(&mix->rt_link);
-		mix->active = false;
+	if (mix->rt.active) {
+		spa_list_remove(&mix->rt.link);
+		mix->rt.active = false;
 	}
 	return 0;
 }
@@ -167,13 +236,22 @@
 	if (mix == NULL)
 		return -ENOENT;
 
-	if (id == SPA_IO_Buffers) {
+	switch (id) {
+	case SPA_IO_Buffers:
+	case SPA_IO_AsyncBuffers:
 		if (data == NULL || size == 0) {
 			pw_loop_invoke(this->node->data_loop,
 			       do_remove_mix, SPA_ID_INVALID, NULL, 0, true, mix);
-			mix->io = NULL;
+			mix->io_data = mix->io0 = mix->io1 = NULL;
 		} else if (data != NULL && size >= sizeof(struct spa_io_buffers)) {
-			mix->io = data;
+			if (size >= sizeof(struct spa_io_async_buffers)) {
+				struct spa_io_async_buffers *ab = data;
+				mix->io_data = data;
+				mix->io0 = &ab->buffersthis->direction;
+				mix->io1 = &ab->buffersthis->direction^1;
+			} else {
+				mix->io_data = mix->io0 = mix->io1 = data;
+			}
 			pw_loop_invoke(this->node->data_loop,
 			       do_add_mix, SPA_ID_INVALID, NULL, 0, false, mix);
 		}
@@ -187,12 +265,13 @@
 	struct pw_impl_port *this = &impl->this;
 	struct pw_impl_port_mix *mix;
 	struct spa_io_buffers *io = &this->rt.io;
+	uint32_t cycle = this->node->rt.position->clock.cycle & 1;
 
-	pw_log_trace_fp("%p: tee input %d %d", this, io->status, io->buffer_id);
-	spa_list_for_each(mix, &impl->mix_list, rt_link) {
-		pw_log_trace_fp("%p: port %d %p->%p %d", this,
-				mix->port.port_id, io, mix->io, mix->io->buffer_id);
-		*mix->io = *io;
+	pw_log_trace_fp("%p: tee input status:%d id:%d cycle:%d", this, io->status, io->buffer_id, cycle);
+	spa_list_for_each(mix, &impl->rt.mix_list, rt.link) {
+		pw_log_trace_fp("%p: port %d %p->%p id:%d", this,
+				mix->port.port_id, io, mix->iocycle, mix->iocycle->buffer_id);
+		*mix->iocycle = *io;
 	}
 	io->status = SPA_STATUS_NEED_DATA;
 
@@ -211,9 +290,11 @@
 
 static const struct spa_node_methods schedule_tee_node = {
 	SPA_VERSION_NODE_METHODS,
-	.process = tee_process,
+	.add_listener = mix_add_listener,
+	.port_enum_params = mix_port_enum_params,
 	.port_set_io = port_set_io,
 	.port_reuse_buffer = tee_reuse_buffer,
+	.process = tee_process,
 };
 
 static int schedule_mix_input(void *object)
@@ -222,15 +303,17 @@
 	struct pw_impl_port *this = &impl->this;
 	struct spa_io_buffers *io = &this->rt.io;
 	struct pw_impl_port_mix *mix;
+	uint32_t cycle = this->node->rt.position->clock.cycle & 1;
 
 	if (SPA_UNLIKELY(PW_IMPL_PORT_IS_CONTROL(this)))
 		return SPA_STATUS_HAVE_DATA | SPA_STATUS_NEED_DATA;
 
-	spa_list_for_each(mix, &impl->mix_list, rt_link) {
-		pw_log_trace_fp("%p: mix input %d %p->%p %d %d", this,
-				mix->port.port_id, mix->io, io, mix->io->status, mix->io->buffer_id);
-		*io = *mix->io;
-		mix->io->status = SPA_STATUS_NEED_DATA;
+	spa_list_for_each(mix, &impl->rt.mix_list, rt.link) {
+		pw_log_trace_fp("%p: mix input %d %p->%p status:%d id:%d cycle:%d", this,
+				mix->port.port_id, mix->iocycle, io,
+				mix->iocycle->status, mix->iocycle->buffer_id, cycle);
+		*io = *mix->iocycle;
+		mix->iocycle->status = SPA_STATUS_NEED_DATA;
 		break;
 	}
         return SPA_STATUS_HAVE_DATA | SPA_STATUS_NEED_DATA;
@@ -241,7 +324,7 @@
 	struct impl *impl = object;
 	struct pw_impl_port_mix *mix;
 
-	spa_list_for_each(mix, &impl->mix_list, rt_link) {
+	spa_list_for_each(mix, &impl->rt.mix_list, rt.link) {
 		pw_log_trace_fp("%p: reuse buffer %d %d", impl, port_id, buffer_id);
 		/* FIXME send reuse buffer to peer */
 		break;
@@ -251,9 +334,11 @@
 
 static const struct spa_node_methods schedule_mix_node = {
 	SPA_VERSION_NODE_METHODS,
-	.process = schedule_mix_input,
+	.add_listener = mix_add_listener,
+	.port_enum_params = mix_port_enum_params,
 	.port_set_io = port_set_io,
 	.port_reuse_buffer = schedule_mix_reuse_buffer,
+	.process = schedule_mix_input,
 };
 
 SPA_EXPORT
@@ -348,7 +433,7 @@
 		spa_node_port_set_io(node->node,
 				     port->direction, port->port_id,
 				     SPA_IO_Buffers,
-				     NULL, sizeof(port->rt.io));
+				     NULL, 0);
 
 		pw_impl_port_set_param(port, SPA_PARAM_Format, 0, NULL);
 	}
@@ -440,6 +525,40 @@
 	}
 }
 
+static int check_param_io(void *data, int seq, uint32_t id,
+		uint32_t index, uint32_t next, struct spa_pod *param)
+{
+	struct pw_impl_port *port = data;
+	struct pw_impl_node *node = port->node;
+	uint32_t pid, psize;
+
+	if (spa_pod_parse_object(param,
+			SPA_TYPE_OBJECT_ParamIO, NULL,
+			SPA_PARAM_IO_id,   SPA_POD_Id(&pid),
+			SPA_PARAM_IO_size, SPA_POD_Int(&psize)) < 0)
+		return 0;
+
+	pw_log_debug("%p: got io id:%d (%s)", port, pid,
+			spa_debug_type_find_name(spa_type_io, pid));
+
+	switch (pid) {
+	case SPA_IO_Control:
+	case SPA_IO_Notify:
+		pw_control_new(node->context, port, pid, psize, 0);
+		SPA_FLAG_SET(port->flags, PW_IMPL_PORT_FLAG_CONTROL);
+		break;
+	case SPA_IO_AsyncBuffers:
+		SPA_FLAG_SET(port->flags, PW_IMPL_PORT_FLAG_ASYNC);
+		SPA_FALLTHROUGH;
+	case SPA_IO_Buffers:
+		SPA_FLAG_SET(port->flags, PW_IMPL_PORT_FLAG_BUFFERS);
+		break;
+	default:
+		break;
+	}
+	return 0;
+}
+
 static int process_latency_param(void *data, int seq,
 		uint32_t id, uint32_t index, uint32_t next, struct spa_pod *param)
 {
@@ -498,6 +617,21 @@
 	return 0;
 }
 
+static void check_params(struct pw_impl_port *port)
+{
+	uint32_t i;
+	for (i = 0; i < port->info.n_params; i++)
+		port->info.paramsi.user = 0;
+
+	port->flags &= ~(PW_IMPL_PORT_FLAG_CONTROL |
+			PW_IMPL_PORT_FLAG_ASYNC |
+			PW_IMPL_PORT_FLAG_BUFFERS);
+
+	pw_impl_port_for_each_param(port, 0, SPA_PARAM_IO, 0, 0, NULL, check_param_io, port);
+	pw_impl_port_for_each_param(port, 0, SPA_PARAM_Latency, 0, 0, NULL, process_latency_param, port);
+	pw_impl_port_for_each_param(port, 0, SPA_PARAM_Tag, 0, 0, NULL, process_tag_param, port);
+}
+
 static void update_info(struct pw_impl_port *port, const struct spa_port_info *info)
 {
 	uint32_t changed_idsMAX_PARAMS, n_changed_ids = 0;
@@ -585,7 +719,7 @@
 	spa_list_init(&impl->param_list);
 	spa_list_init(&impl->pending_list);
 	impl->cache_params = true;
-	spa_list_init(&impl->mix_list);
+	spa_list_init(&impl->rt.mix_list);
 
 	this = &impl->this;
 
@@ -641,6 +775,7 @@
 			SPA_TYPE_INTERFACE_Node,
 			SPA_VERSION_NODE,
 			mix_methods, impl);
+	spa_hook_list_init(&impl->mix_hooks);
 
 	pw_impl_port_set_mix(this, NULL, 0);
 
@@ -682,6 +817,7 @@
 			     pw_direction_reverse(port->direction), 0,
 			     SPA_IO_Buffers, NULL, 0);
 	}
+
 	if (port->mix_handle != NULL) {
 		pw_unload_spa_handle(port->mix_handle);
 		port->mix_handle = NULL;
@@ -690,7 +826,7 @@
 	port->mix_flags = flags;
 	port->mix = node;
 
-	if (port->mix) {
+	if (port->mix && !port->destroying) {
 		spa_list_for_each(mix, &port->mix_list, link)
 			spa_node_add_port(port->mix, mix->port.direction, mix->port.port_id, NULL);
 
@@ -698,6 +834,14 @@
 			     pw_direction_reverse(port->direction), 0,
 			     SPA_IO_Buffers,
 			     &port->rt.io, sizeof(port->rt.io));
+
+		if (port->node && port->node->rt.position) {
+			spa_node_set_io(port->mix,
+				     SPA_IO_Position,
+				     port->node->rt.position,
+				     sizeof(struct spa_io_position));
+		}
+		check_params(port);
 	}
 	return 0;
 }
@@ -708,7 +852,7 @@
 	int res;
 	const char *fallback_lib, *factory_name;
 	struct spa_handle *handle;
-	struct spa_dict_item items2;
+	struct spa_dict_item items3;
 	char quantum_limit16;
 	void *iface;
 	struct pw_context *context = port->node->context;
@@ -716,7 +860,7 @@
 	if ((res = spa_format_parse(param, &media_type, &media_subtype)) < 0)
 		return res;
 
-	pw_log_debug("%p: %s/%s", port,
+	pw_log_debug("%p/%p: %s/%s", port->node, port,
 			spa_debug_type_find_name(spa_type_media_type, media_type),
 			spa_debug_type_find_name(spa_type_media_subtype, media_subtype));
 
@@ -764,6 +908,7 @@
 	spa_scnprintf(quantum_limit, sizeof(quantum_limit), "%u",
 			context->settings.clock_quantum_limit);
 	items1 = SPA_DICT_ITEM_INIT("clock.quantum-limit", quantum_limit);
+	items2 = SPA_DICT_ITEM_INIT(PW_KEY_NODE_LOOP_NAME, port->node->data_loop->name);
 
 	handle = pw_context_load_spa_handle(context, factory_name,
 			&SPA_DICT_INIT_ARRAY(items));
@@ -776,7 +921,8 @@
 		return res;
 	}
 
-	pw_log_debug("mix node handle:%p iface:%p", handle, iface);
+	pw_log_debug("mix node %s (%s) handle:%p iface:%p", factory_name, fallback_lib,
+			handle, iface);
 	pw_impl_port_set_mix(port, (struct spa_node*)iface,
 			PW_IMPL_PORT_MIX_FLAG_MULTI |
 			PW_IMPL_PORT_MIX_FLAG_NEGOTIATE);
@@ -849,46 +995,20 @@
 {
         struct pw_impl_port *this = user_data;
 
-	pw_log_trace("%p: add port", this);
+	pw_log_trace("%p: add port, added:%d", this, this->rt.added);
+
+	if (this->rt.added)
+		return 0;
+
 	if (this->direction == PW_DIRECTION_INPUT)
 		spa_list_append(&this->node->rt.input_mix, &this->rt.node_link);
 	else
 		spa_list_append(&this->node->rt.output_mix, &this->rt.node_link);
+	this->rt.added = true;
 
 	return 0;
 }
 
-static int check_param_io(void *data, int seq, uint32_t id,
-		uint32_t index, uint32_t next, struct spa_pod *param)
-{
-	struct pw_impl_port *port = data;
-	struct pw_impl_node *node = port->node;
-	uint32_t pid, psize;
-
-	if (spa_pod_parse_object(param,
-			SPA_TYPE_OBJECT_ParamIO, NULL,
-			SPA_PARAM_IO_id,   SPA_POD_Id(&pid),
-			SPA_PARAM_IO_size, SPA_POD_Int(&psize)) < 0)
-		return 0;
-
-	pw_log_debug("%p: got io id:%d (%s)", port, pid,
-			spa_debug_type_find_name(spa_type_io, pid));
-
-	switch (pid) {
-	case SPA_IO_Control:
-	case SPA_IO_Notify:
-		pw_control_new(node->context, port, pid, psize, 0);
-		SPA_FLAG_SET(port->flags, PW_IMPL_PORT_FLAG_CONTROL);
-		break;
-	case SPA_IO_Buffers:
-		SPA_FLAG_SET(port->flags, PW_IMPL_PORT_FLAG_BUFFERS);
-		break;
-	default:
-		break;
-	}
-	return 0;
-}
-
 static int reply_param(void *data, int seq, uint32_t id,
 		uint32_t index, uint32_t next, struct spa_pod *param)
 {
@@ -1014,7 +1134,6 @@
 		     struct pw_properties *properties)
 {
 	static const char * const keys = {
-		PW_KEY_OBJECT_SERIAL,
 		PW_KEY_OBJECT_PATH,
 		PW_KEY_FORMAT_DSP,
 		PW_KEY_NODE_ID,
@@ -1029,6 +1148,7 @@
 		PW_KEY_PORT_ALIAS,
 		PW_KEY_PORT_EXTRA,
 		PW_KEY_PORT_IGNORE_LATENCY,
+		PW_KEY_PORT_GROUP,
 		NULL
 	};
 
@@ -1099,9 +1219,7 @@
 
 	pw_impl_node_emit_port_init(node, port);
 
-	pw_impl_port_for_each_param(port, 0, SPA_PARAM_IO, 0, 0, NULL, check_param_io, port);
-	pw_impl_port_for_each_param(port, 0, SPA_PARAM_Latency, 0, 0, NULL, process_latency_param, port);
-	pw_impl_port_for_each_param(port, 0, SPA_PARAM_Tag, 0, 0, NULL, process_tag_param, port);
+	check_params(port);
 
 	nprops = pw_impl_node_get_properties(node);
 	media_class = pw_properties_get(nprops, PW_KEY_MEDIA_CLASS);
@@ -1224,11 +1342,11 @@
 	if (is_control) {
 		pw_log_debug("%p: setting node control", port);
 	} else {
-		pw_log_debug("%p: setting mixer io", port);
-		spa_node_port_set_io(port->mix,
-			     pw_direction_reverse(port->direction), 0,
-			     SPA_IO_Buffers,
-			     &port->rt.io, sizeof(port->rt.io));
+		pw_log_debug("%p: setting mixer position io", port);
+		spa_node_set_io(port->mix,
+			     SPA_IO_Position,
+			     node->rt.position,
+			     sizeof(struct spa_io_position));
 	}
 
 	pw_log_debug("%p: %d add to node %p", port, port_id, node);
@@ -1271,8 +1389,11 @@
 {
 	struct pw_impl_port *this = user_data;
 
-	pw_log_trace("%p: remove port", this);
-	spa_list_remove(&this->rt.node_link);
+	pw_log_trace("%p: remove port, added:%d", this, this->rt.added);
+	if (this->rt.added) {
+		spa_list_remove(&this->rt.node_link);
+		this->rt.added = false;
+	}
 
 	return 0;
 }
@@ -1285,13 +1406,9 @@
 	if (node == NULL)
 		return;
 
-	pw_log_debug("%p: remove added:%d", port, port->added);
+	pw_log_debug("%p: remove", port);
 
-	if (port->added) {
-		pw_loop_invoke(node->data_loop, do_remove_port,
-			       SPA_ID_INVALID, NULL, 0, true, port);
-		port->added = false;
-	}
+	pw_loop_invoke(node->data_loop, do_remove_port, SPA_ID_INVALID, NULL, 0, true, port);
 
 	if (SPA_FLAG_IS_SET(port->flags, PW_IMPL_PORT_FLAG_TO_REMOVE)) {
 		if ((res = spa_node_remove_port(node->node, port->direction, port->port_id)) < 0)
@@ -1403,7 +1520,6 @@
 {
 	int res;
 	struct impl *impl = SPA_CONTAINER_OF(port, struct impl, this);
-	struct pw_impl_node *node = port->node;
 	struct result_port_params_data user_data = { impl, data, callback, seq, false };
 	struct spa_hook listener;
 	struct spa_param_info *pi;
@@ -1455,6 +1571,9 @@
 		}
 		res = 0;
 	} else {
+		struct spa_node *qnode;
+		uint32_t qport;
+
 		user_data.cache = impl->cache_params &&
 			(filter == NULL && index == 0 && max == UINT32_MAX);
 
@@ -1462,11 +1581,20 @@
 			pw_param_add(&impl->pending_list, seq, param_id, NULL);
 
 		spa_zero(listener);
-		spa_node_add_listener(node->node, &listener, &node_events, &user_data);
-		res = spa_node_port_enum_params(node->node, seq,
-						port->direction, port->port_id,
-						param_id, index, max,
-						filter);
+		switch (param_id) {
+		case SPA_PARAM_IO:
+			qnode = port->mix;
+			qport = SPA_ID_INVALID;
+			break;
+		default:
+			qnode = port->node->node;
+			qport = port->port_id;
+			break;
+		}
+		spa_node_add_listener(qnode, &listener, &node_events, &user_data);
+		res = spa_node_port_enum_params(qnode, seq,
+				port->direction, qport,
+				param_id, index, max, filter);
 		spa_hook_remove(&listener);
 
 		if (user_data.cache) {
@@ -1716,7 +1844,7 @@
 	pw_log_debug("%p: %d set param on node %d:%d id:%d (%s): %d (%s)", port, port->state,
 			port->direction, port->port_id, id,
 			spa_debug_type_find_name(spa_type_param, id),
-			res, spa_strerror(res));
+			res, res <= 0 ? spa_strerror(res) : "modified");
 
 	/* set the parameters on all ports of the mixer node if possible */
 	if (res >= 0) {
@@ -1741,10 +1869,7 @@
 	if (id == SPA_PARAM_Format) {
 		pw_log_debug("%p: %d %p %d", port, port->state, param, res);
 
-		if (port->added) {
-			pw_loop_invoke(node->data_loop, do_remove_port, SPA_ID_INVALID, NULL, 0, true, port);
-			port->added = false;
-		}
+		pw_loop_invoke(node->data_loop, do_remove_port, SPA_ID_INVALID, NULL, 0, true, port);
 		/* setting the format always destroys the negotiated buffers */
 		if (port->direction == PW_DIRECTION_OUTPUT) {
 			struct pw_impl_link *l;
@@ -1790,10 +1915,7 @@
 				port, port->direction, port->port_id, n_buffers, node->node,
 				alloc_flags);
 
-		if (port->added) {
-			pw_loop_invoke(node->data_loop, do_remove_port, SPA_ID_INVALID, NULL, 0, true, port);
-			port->added = false;
-		}
+		pw_loop_invoke(node->data_loop, do_remove_port, SPA_ID_INVALID, NULL, 0, true, port);
 
 		pw_buffers_clear(&port->mix_buffers);
 
@@ -1824,10 +1946,8 @@
 			     pw_direction_reverse(port->direction), 0,
 			     0, buffers, n_buffers);
 	}
-	if (!port->added && n_buffers > 0) {
+	if (n_buffers > 0)
 		pw_loop_invoke(node->data_loop, do_add_port, SPA_ID_INVALID, NULL, 0, false, port);
-		port->added = true;
-	}
 	return res;
 }

pipewire-1.0.1.tar.bz2/src/pipewire/keys.h -> pipewire-1.2.0.tar.gz/src/pipewire/keys.h Changed

@@ -40,6 +40,12 @@
 
 #define PW_KEY_SEC_SOCKET		"pipewire.sec.socket"	/**< client socket name, set by protocol */
 
+#define PW_KEY_SEC_ENGINE		"pipewire.sec.engine"	/**< client secure context engine, set by protocol.
+								  *  This can also be set by a client when making a
+								  *  new security context. */
+#define PW_KEY_SEC_APP_ID		"pipewire.sec.app-id"	/**< client secure application id */
+#define PW_KEY_SEC_INSTANCE_ID		"pipewire.sec.instance-id"	/**< client secure instance id */
+
 #define PW_KEY_LIBRARY_NAME_SYSTEM	"library.name.system"	/**< name of the system library to use */
 #define PW_KEY_LIBRARY_NAME_LOOP	"library.name.loop"	/**< name of the loop library to use */
 #define PW_KEY_LIBRARY_NAME_DBUS	"library.name.dbus"	/**< name of the dbus library to use */
@@ -63,6 +69,15 @@
 #define PW_KEY_CONFIG_OVERRIDE_PREFIX	"config.override.prefix"	/**< a config override prefix directory */
 #define PW_KEY_CONFIG_OVERRIDE_NAME	"config.override.name"	/**< a config override file name */
 
+/* loop */
+#define PW_KEY_LOOP_NAME		"loop.name"		/**< the name of a loop */
+#define PW_KEY_LOOP_CLASS		"loop.class"		/**< the classes this loop handles, array of strings */
+#define PW_KEY_LOOP_RT_PRIO		"loop.rt-prio"		/**< realtime priority of the loop */
+#define PW_KEY_LOOP_CANCEL		"loop.cancel"		/**< if the loop can be canceled */
+#define PW_KEY_LOOP_RETRY_TIMEOUT	"loop.retry-timeout"	/**< when the loop invoke queue is full, the timeout
+								  *  in microseconds before retrying.
+								  *  default = 1 second, 0 = disable */
+
 /* context */
 #define PW_KEY_CONTEXT_PROFILE_MODULES	"context.profile.modules"	/**< a context profile for modules, deprecated */
 #define PW_KEY_USER_NAME		"context.user-name"	/**< The user name that runs pipewire */
@@ -139,6 +154,12 @@
 								  *  in the same group are always scheduled
 								  *  with the same driver. Can be an array of
 								  *  group names. */
+#define PW_KEY_NODE_SYNC_GROUP		"node.sync-group"	/**< the sync group this node is part of. Nodes
+								  *  in the same sync group are always scheduled
+								  *  together with the same driver when the sync
+								  *  is active. Can be an array of sync names. */
+#define PW_KEY_NODE_SYNC		"node.sync"		/**< if the sync-group is active or not */
+#define PW_KEY_NODE_TRANSPORT		"node.transport"	/**< if the transport is active or not */
 #define PW_KEY_NODE_EXCLUSIVE		"node.exclusive"	/**< node wants exclusive access to resources */
 #define PW_KEY_NODE_AUTOCONNECT		"node.autoconnect"	/**< node wants to be automatically connected
 								  *  to a compatible node */
@@ -170,6 +191,11 @@
 #define PW_KEY_NODE_CACHE_PARAMS	"node.cache-params"	/**< cache the node params */
 #define PW_KEY_NODE_TRANSPORT_SYNC	"node.transport.sync"	/**< the node handles transport sync */
 #define PW_KEY_NODE_DRIVER		"node.driver"		/**< node can drive the graph */
+#define PW_KEY_NODE_DRIVER_ID		"node.driver-id"	/**< the node id of the node assigned as driver
+								  *   for this node */
+#define PW_KEY_NODE_ASYNC		"node.async"		/**< the node wants async scheduling */
+#define PW_KEY_NODE_LOOP_NAME		"node.loop.name"	/**< the loop name fnmatch pattern to run in */
+#define PW_KEY_NODE_LOOP_CLASS		"node.loop.class"	/**< the loop class fnmatch pattern to run in */
 #define PW_KEY_NODE_STREAM		"node.stream"		/**< node is a stream, the server side should
 								  *  add a converter */
 #define PW_KEY_NODE_VIRTUAL		"node.virtual"		/**< the node is some sort of virtual
@@ -205,6 +231,7 @@
 								  *  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_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 */
 
 /** link properties */
 #define PW_KEY_LINK_ID			"link.id"		/**< a link id */
@@ -218,6 +245,7 @@
 #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 */
+#define PW_KEY_LINK_ASYNC		"link.async"		/**< the link is using async io */
 
 /** device properties */
 #define PW_KEY_DEVICE_ID		"device.id"		/**< device id */
@@ -268,6 +296,7 @@
 #define PW_KEY_MODULE_USAGE		"module.usage"		/**< a human readable usage description of
 								  *  the module's arguments. */
 #define PW_KEY_MODULE_VERSION		"module.version"	/**< a version string for the module. */
+#define PW_KEY_MODULE_DEPRECATED	"module.deprecated"	/**< the module is deprecated with this message */
 
 /** Factory properties */
 #define PW_KEY_FACTORY_ID		"factory.id"		/**< the factory id */
@@ -303,6 +332,7 @@
 #define PW_KEY_MEDIA_NAME		"media.name"		/**< media name. Ex: "Pink Floyd: Time" */
 #define PW_KEY_MEDIA_TITLE		"media.title"		/**< title. Ex: "Time" */
 #define PW_KEY_MEDIA_ARTIST		"media.artist"		/**< artist. Ex: "Pink Floyd" */
+#define PW_KEY_MEDIA_ALBUM		"media.album"		/**< album. Ex: "Dark Side of the Moon" */
 #define PW_KEY_MEDIA_COPYRIGHT		"media.copyright"	/**< copyright string */
 #define PW_KEY_MEDIA_SOFTWARE		"media.software"	/**< generator software */
 #define PW_KEY_MEDIA_LANGUAGE		"media.language"	/**< language in POSIX format. Ex: en_GB */

pipewire-1.0.1.tar.bz2/src/pipewire/log.c -> pipewire-1.2.0.tar.gz/src/pipewire/log.c Changed

@@ -4,6 +4,7 @@
 
 #include <limits.h>
 #include <fnmatch.h>
+#include <pthread.h>
 
 #include <spa/support/log-impl.h>
 
@@ -12,23 +13,38 @@
 #include <spa/debug/format.h>
 #include <spa/pod/iter.h>
 #include <spa/utils/list.h>
+#include <spa/utils/string.h>
 
 #include <pipewire/log.h>
 #include <pipewire/private.h>
 
 SPA_LOG_IMPL(default_log);
 
-#define DEFAULT_LOG_LEVEL SPA_LOG_LEVEL_WARN
-
 SPA_EXPORT
 enum spa_log_level pw_log_level = DEFAULT_LOG_LEVEL;
 
 static struct spa_log *global_log = &default_log.log;
 
 SPA_EXPORT
-struct spa_log_topic *PW_LOG_TOPIC_DEFAULT;
+struct spa_log_topic * const PW_LOG_TOPIC_DEFAULT;
+
+struct topic {
+	struct spa_list link;
+	struct spa_log_topic *t;
+	unsigned int refcnt;
+};
+
+struct pattern {
+	struct spa_list link;
+	enum spa_log_level level;
+	char pattern;
+};
+
+static struct spa_list topics = SPA_LIST_INIT(&topics);
+static struct spa_list patterns = SPA_LIST_INIT(&patterns);
+
+static pthread_mutex_t topics_lock = PTHREAD_MUTEX_INITIALIZER;
 
-PW_LOG_TOPIC_STATIC(log_topic, "pw.log"); /* log topic for this file here */
 PW_LOG_TOPIC(log_buffers, "pw.buffers");
 PW_LOG_TOPIC(log_client, "pw.client");
 PW_LOG_TOPIC(log_conf, "pw.conf");
@@ -57,6 +73,126 @@
 
 PW_LOG_TOPIC(PW_LOG_TOPIC_DEFAULT, "default");
 
+
+static struct topic *find_topic(struct spa_log_topic *t)
+{
+	struct topic *topic;
+
+	spa_list_for_each(topic, &topics, link)
+		if (topic->t == t)
+			return topic;
+
+	return NULL;
+}
+
+static struct topic *add_topic(struct spa_log_topic *t)
+{
+	struct topic *topic;
+
+	topic = calloc(1, sizeof(struct topic));
+	if (!topic)
+		return NULL;
+
+	topic->t = t;
+	spa_list_append(&topics, &topic->link);
+	return topic;
+}
+
+static void update_topic_level(struct spa_log_topic *t)
+{
+	enum spa_log_level level = pw_log_level;
+	bool has_custom_level = false;
+	const char *topic = t->topic;
+	struct pattern *pattern;
+
+	spa_list_for_each(pattern, &patterns, link) {
+		if (fnmatch(pattern->pattern, topic, 0) != 0)
+			continue;
+
+		level = pattern->level;
+		has_custom_level = true;
+		break;
+	}
+
+	t->level = level;
+	t->has_custom_level = has_custom_level;
+}
+
+static void update_all_topic_levels(void)
+{
+	struct topic *topic;
+
+	pthread_mutex_lock(&topics_lock);
+
+	spa_list_for_each(topic, &topics, link)
+		update_topic_level(topic->t);
+
+	pthread_mutex_unlock(&topics_lock);
+}
+
+SPA_EXPORT
+void pw_log_topic_register(struct spa_log_topic *t)
+{
+	struct topic *topic;
+
+	pthread_mutex_lock(&topics_lock);
+
+	topic = find_topic(t);
+	if (!topic) {
+		update_topic_level(t);
+		topic = add_topic(t);
+		if (!topic)
+			goto done;
+	}
+
+	++topic->refcnt;
+
+done:
+	pthread_mutex_unlock(&topics_lock);
+}
+
+SPA_EXPORT
+void pw_log_topic_unregister(struct spa_log_topic *t)
+{
+	struct topic *topic;
+
+	pthread_mutex_lock(&topics_lock);
+
+	topic = find_topic(t);
+	if (!topic)
+		goto done;
+
+	if (topic->refcnt-- <= 1) {
+		spa_list_remove(&topic->link);
+		free(topic);
+	}
+
+done:
+	pthread_mutex_unlock(&topics_lock);
+}
+
+void pw_log_topic_register_enum(const struct spa_log_topic_enum *e)
+{
+	struct spa_log_topic * const *t;
+
+	if (!e)
+		return;
+
+	for (t = e->topics; t < e->topics_end; ++t)
+		pw_log_topic_register(*t);
+}
+
+void pw_log_topic_unregister_enum(const struct spa_log_topic_enum *e)
+{
+	struct spa_log_topic * const *t;
+
+	if (!e)
+		return;
+
+	for (t = e->topics; t < e->topics_end; ++t)
+		pw_log_topic_unregister(*t);
+}
+
 /** Set the global log interface
  * \param log the global log to set
  */
@@ -89,6 +225,118 @@
 {
 	pw_log_level = level;
 	global_log->level = level;
+
+	update_all_topic_levels();
+}
+
+static int add_pattern(struct spa_list *list, const char *str, enum spa_log_level level)
+{
+	struct pattern *pattern;
+	size_t len = strlen(str);
+
+	pattern = calloc(1, sizeof(struct pattern) + len + 1);
+	if (!pattern)
+		return -errno;
+
+	pattern->level = level;
+	memcpy(pattern->pattern, str, len);
+	spa_list_append(list, &pattern->link);
+	return 0;
+}
+
+static bool
+parse_log_level(const char *str, enum spa_log_level *l)
+{
+	uint32_t lvl;
+
+	if (!str)
+		return false;
+
+	if (strlen(str) == 1) {
+		/* SPA levels, plus a few duplicate codes that
+		 * WirePlumber supports for some GLib levels. */
+		switch (str0) {
+		case 'X': lvl = SPA_LOG_LEVEL_NONE; break;
+		case 'F': lvl = SPA_LOG_LEVEL_NONE; break; /* fatal */
+		case 'E': lvl = SPA_LOG_LEVEL_ERROR; break;
+		case 'W': lvl = SPA_LOG_LEVEL_WARN; break;
+		case 'N': lvl = SPA_LOG_LEVEL_WARN; break; /* notice */
+		case 'I': lvl = SPA_LOG_LEVEL_INFO; break;
+		case 'D': lvl = SPA_LOG_LEVEL_DEBUG; break;
+		case 'T': lvl = SPA_LOG_LEVEL_TRACE; break;
+		default:
+			goto check_int;
+		}
+	} else {
+	check_int:
+		if (!spa_atou32(str, &lvl, 0))
+			return false;
+		if (lvl > SPA_LOG_LEVEL_TRACE)
+			return false;
+	}
+
+	*l = lvl;
+	return true;
+}
+
+static int
+parse_log_string(const char *str, struct spa_list *list, enum spa_log_level *level)
+{
+	struct spa_list new_patterns = SPA_LIST_INIT(&new_patterns);
+	int n_tokens;
+
+	*level = DEFAULT_LOG_LEVEL;
+	if (!str || !*str)
+		return 0;
+
+	spa_auto(pw_strv) tokens = pw_split_strv(str, ",", INT_MAX, &n_tokens);
+	if (n_tokens > 0) {
+		int i;
+
+		for (i = 0; i < n_tokens; i++) {
+			int n_tok;
+			char *tok2;
+			enum spa_log_level lvl;
+
+			n_tok = pw_split_ip(tokensi, ":", SPA_N_ELEMENTS(tok), tok);
+			if (n_tok == 2 && parse_log_level(tok1, &lvl)) {
+				add_pattern(&new_patterns, tok0, lvl);
+			} else if (n_tok == 1 && parse_log_level(tok0, &lvl)) {
+				*level = lvl;
+			} else {
+				pw_log_warn("Ignoring invalid format in log level: '%s'",
+						tokensi);
+			}
+		}
+	}
+	spa_list_insert_list(list, &new_patterns);
+	return 0;
+}
+
+SPA_EXPORT
+int pw_log_set_level_string(const char *str)
+{
+	struct spa_list new_patterns = SPA_LIST_INIT(&new_patterns);
+	struct pattern *pattern;
+	enum spa_log_level level;
+	int res;
+
+	if ((res = parse_log_string(str, &new_patterns, &level)) < 0)
+		return res;
+
+	pthread_mutex_lock(&topics_lock);
+
+	spa_list_consume(pattern, &patterns, link) {
+		spa_list_remove(&pattern->link);
+		free(pattern);
+	}
+
+	spa_list_insert_list(&patterns, &new_patterns);
+
+	pthread_mutex_unlock(&topics_lock);
+
+	pw_log_set_level(level);
+	return 0;
 }
 
 /** Log a message for the given topic
@@ -236,31 +484,23 @@
 void
 pw_log_init(void)
 {
-	PW_LOG_TOPIC_INIT(PW_LOG_TOPIC_DEFAULT);
-	PW_LOG_TOPIC_INIT(log_buffers);
-	PW_LOG_TOPIC_INIT(log_client);
-	PW_LOG_TOPIC_INIT(log_conf);
-	PW_LOG_TOPIC_INIT(log_context);
-	PW_LOG_TOPIC_INIT(log_core);
-	PW_LOG_TOPIC_INIT(log_data_loop);
-	PW_LOG_TOPIC_INIT(log_device);
-	PW_LOG_TOPIC_INIT(log_factory);
-	PW_LOG_TOPIC_INIT(log_filter);
-	PW_LOG_TOPIC_INIT(log_global);
-	PW_LOG_TOPIC_INIT(log_link);
-	PW_LOG_TOPIC_INIT(log_loop);
-	PW_LOG_TOPIC_INIT(log_main_loop);
-	PW_LOG_TOPIC_INIT(log_mem);
-	PW_LOG_TOPIC_INIT(log_metadata);
-	PW_LOG_TOPIC_INIT(log_module);
-	PW_LOG_TOPIC_INIT(log_node);
-	PW_LOG_TOPIC_INIT(log_port);
-	PW_LOG_TOPIC_INIT(log_properties);
-	PW_LOG_TOPIC_INIT(log_protocol);
-	PW_LOG_TOPIC_INIT(log_proxy);
-	PW_LOG_TOPIC_INIT(log_resource);
-	PW_LOG_TOPIC_INIT(log_stream);
-	PW_LOG_TOPIC_INIT(log_thread_loop);
-	PW_LOG_TOPIC_INIT(log_topic);
-	PW_LOG_TOPIC_INIT(log_work_queue);
+}
+
+void
+pw_log_deinit(void)
+{
+	struct pattern *pattern;
+
+	pthread_mutex_lock(&topics_lock);
+
+	spa_list_consume(pattern, &patterns, link) {
+		spa_list_remove(&pattern->link);
+		free(pattern);
+	}
+
+	pthread_mutex_unlock(&topics_lock);
+
+	/* don't free log topics, since they usually won't get re-registered */
+
+	pw_log_set(NULL);
 }

pipewire-1.0.1.tar.bz2/src/pipewire/log.h -> pipewire-1.2.0.tar.gz/src/pipewire/log.h Changed

@@ -6,6 +6,7 @@
 #define PIPEWIRE_LOG_H
 
 #include <spa/support/log.h>
+#include <spa/utils/defs.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -27,7 +28,7 @@
 /** The global log level */
 extern enum spa_log_level pw_log_level;
 
-extern struct spa_log_topic *PW_LOG_TOPIC_DEFAULT;
+extern struct spa_log_topic * const PW_LOG_TOPIC_DEFAULT;
 
 /** Configure a logging module. This is usually done automatically
  * in pw_init() but you can install a custom logger before calling
@@ -40,6 +41,14 @@
 /** Configure the logging level */
 void pw_log_set_level(enum spa_log_level level);
 
+/**
+ * Configure the logging level using a string
+ * in PIPEWIRE_DEBUG format.
+ *
+ * \since 1.1.0
+ */
+int pw_log_set_level_string(const char *str);
+
 /** Log a message for a topic */
 void
 pw_log_logt(enum spa_log_level level,
@@ -73,6 +82,16 @@
 	    const char *fmt, va_list args) SPA_PRINTF_FUNC(5, 0);
 
 /**
+ * Define a static \ref spa_log_topic and its constructor/destructor functions.
+ *
+ * \since 1.1.0
+ */
+#define PW_LOG_TOPIC_DEFINE_STATIC(var, topic) \
+  static struct spa_log_topic var = SPA_LOG_TOPIC(SPA_VERSION_LOG_TOPIC, topic); \
+  static void __attribute__((constructor)) var ## _register_construct(void) { pw_log_topic_register(&var); } \
+  static void __attribute__((destructor)) var ## _register_destroy(void) { pw_log_topic_unregister(&var); }
+
+/**
  * Declare a static log topic named \a var. The usual usage is:
  * \code
  *  PW_LOG_TOPIC_STATIC(my_topic);
@@ -82,33 +101,61 @@
  *      pw_log_debug("bar");
  *  }
  * \endcode
+ *
+ * This macro also emits GCC attribute constructor/destructor
+ * functions that automatically call pw_log_topic_register/unregister.
  */
 #define PW_LOG_TOPIC_STATIC(var, topic) \
-  static struct spa_log_topic var##__LINE__ = SPA_LOG_TOPIC(0, topic); \
-  static struct spa_log_topic *var = &(var##__LINE__)
+  PW_LOG_TOPIC_DEFINE_STATIC(var ## _value, topic) \
+  static struct spa_log_topic * const var = &(var ## _value)
 
 /**
  * Declare a static log topic named \a var.
  * See \ref PW_LOG_TOPIC_STATIC for an example usage.
  */
 #define PW_LOG_TOPIC_EXTERN(var) \
-  extern struct spa_log_topic *var
+  extern struct spa_log_topic * const var
 
 /**
  * Declare a static log topic named \a var.
  * See \ref PW_LOG_TOPIC_STATIC for an example usage.
  */
 #define PW_LOG_TOPIC(var, topic) \
-  struct spa_log_topic var##__LINE__ = SPA_LOG_TOPIC(0, topic); \
-  struct spa_log_topic *var = &(var##__LINE__)
+  PW_LOG_TOPIC_DEFINE_STATIC(var ## _value, topic) \
+  struct spa_log_topic * const var = &(var ## _value)
 
+/**
+ * \deprecated Use \ref pw_log_topic_register and \ref pw_log_topic_unregister
+ * instead, or rely on the auto-registration by \ref PW_LOG_TOPIC and
+ * \ref PW_LOG_TOPIC_STATIC.
+ */
 #define PW_LOG_TOPIC_INIT(var) \
    spa_log_topic_init(pw_log_get(), var);
 
+/**
+ * Register log topic with the logger, to enable dynamic log levels.
+ * Topic must be unregistered before freeing it or plugin unload.
+ * May be used instead of \ref PW_LOG_TOPIC_INIT
+ * This function is threadsafe.
+ *
+ * \since 1.1.0
+ */
+void pw_log_topic_register(struct spa_log_topic *t);
+
+/**
+ * Unregister log topic. This function is threadsafe.
+ *
+ * \since 1.1.0
+ */
+void pw_log_topic_unregister(struct spa_log_topic *t);
+
 /** Check if a loglevel is enabled */
 #define pw_log_level_enabled(lev) (pw_log_level >= (lev))
 #define pw_log_topic_enabled(lev,t) ((t) && (t)->has_custom_level ? (t)->level >= (lev) : pw_log_level_enabled((lev)))
 
+/* check is a custom level was assigned to a topic. \since 1.1.0 */
+#define pw_log_topic_custom_enabled(lev,t) ((t) && (t)->has_custom_level && (t)->level >= (lev))
+
 #define pw_logtv(lev,topic,fmt,ap)						\
 ({										\
 	if (SPA_UNLIKELY(pw_log_topic_enabled(lev,topic)))			\

pipewire-1.0.1.tar.bz2/src/pipewire/loop.c -> pipewire-1.2.0.tar.gz/src/pipewire/loop.c Changed

pipewire-1.0.1.tar.bz2/src/pipewire/loop.h -> pipewire-1.2.0.tar.gz/src/pipewire/loop.h Changed

pipewire-1.0.1.tar.bz2/src/pipewire/main-loop.c -> pipewire-1.2.0.tar.gz/src/pipewire/main-loop.c Changed

pipewire-1.0.1.tar.bz2/src/pipewire/main-loop.h -> pipewire-1.2.0.tar.gz/src/pipewire/main-loop.h Changed

pipewire-1.0.1.tar.bz2/src/pipewire/mem.c -> pipewire-1.2.0.tar.gz/src/pipewire/mem.c Changed

@@ -57,6 +57,32 @@
 #define MFD_ALLOW_SEALING 0x0002U
 #endif
 
+#ifndef MFD_HUGETLB
+#define MFD_HUGETLB 0x0004U
+#endif
+
+#ifndef MFD_NOEXEC_SEAL
+#define MFD_NOEXEC_SEAL 0x0008U
+#endif
+
+#ifndef MFD_EXEC
+#define MFD_EXEC 0x0010U
+#endif
+
+#ifdef HAVE_MEMFD_CREATE
+static int pw_memfd_create(const char *name, unsigned int flags)
+{
+	int res;
+
+	res = memfd_create(name, flags);
+
+	if (res == -1 && errno == EINVAL && flags & MFD_NOEXEC_SEAL)
+		res = memfd_create(name, flags & ~MFD_NOEXEC_SEAL);
+
+	return res;
+}
+#endif
+
 /* fcntl() seals-related flags */
 
 #ifndef F_LINUX_SPECIFIC_BASE
@@ -78,6 +104,9 @@
 #define pw_mempool_emit_added(p,b)	pw_mempool_emit(p, added, 0, b)
 #define pw_mempool_emit_removed(p,b)	pw_mempool_emit(p, removed, 0, b)
 
+#define memblock_emit(b,m,v,...) spa_hook_list_call(&b->listener_list, struct memblock_events, m, v, ##__VA_ARGS__)
+#define memblock_emit_invalidated(b)	memblock_emit(b, invalidated, 0)
+
 struct mempool {
 	struct pw_mempool this;
 
@@ -93,6 +122,15 @@
 	struct spa_list link;		/* link in mempool */
 	struct spa_list mappings;	/* list of struct mapping */
 	struct spa_list memmaps;	/* list of struct memmap */
+	struct memblock *owner;		/* owner of fd, if another memblock */
+	struct spa_hook owner_listener;	/* listen for fd owner memblock events */
+	struct spa_hook_list listener_list;
+};
+
+struct memblock_events {
+#define VERSION_MEMBLOCK_EVENTS	0
+	uint32_t version;
+	void (*invalidated) (void *data);
 };
 
 /* a mapped region of a block */
@@ -285,6 +323,16 @@
 		return NULL;
 	}
 
+	if ((b->this.flags & PW_MEMBLOCK_FLAG_UNMAPPABLE)) {
+		pw_log_error("%p: block:%p can't be mmaped", p, &b->this);
+		errno = EPERM;
+		return NULL;
+	}
+	if (b->this.fd == -1) {
+		pw_log_error("%p: block:%p cannot map memory with stale fd", p, b);
+		errno = EINVAL;
+		return NULL;
+	}
 
 	ptr = mmap(NULL, size, prot, fl, b->this.fd, offset);
 	if (ptr == MAP_FAILED) {
@@ -306,8 +354,8 @@
 	b->this.ref++;
 	spa_list_append(&b->mappings, &m->link);
 
-        pw_log_debug("%p: block:%p fd:%d map:%p ptr:%p (%u %u) block-ref:%d", p, &b->this,
-			b->this.fd, m, m->ptr, offset, size, b->this.ref);
+        pw_log_debug("%p: block:%p fd:%d flags:%08x map:%p ptr:%p (%u %u) block-ref:%d", p, &b->this,
+			b->this.fd, b->this.flags, m, m->ptr, offset, size, b->this.ref);
 
 	return m;
 }
@@ -347,6 +395,12 @@
 	struct pw_map_range range;
 	struct stat sb;
 
+	if (b->this.fd == -1) {
+		pw_log_error("%p: block:%p cannot map memory with stale fd", p, block);
+		errno = EINVAL;
+		return NULL;
+	}
+
 	if (fstat(b->this.fd, &sb) != 0)
 		return NULL;
 
@@ -359,7 +413,7 @@
 		(int64_t) sb.st_size);
 
 	if (!valid) {
-		errno = -EINVAL;
+		errno = EINVAL;
 		return NULL;
 	}
 
@@ -386,8 +440,8 @@
 	mm->this.size = size;
 	mm->this.ptr = SPA_PTROFF(m->ptr, range.start, void);
 
-        pw_log_debug("%p: map:%p block:%p fd:%d ptr:%p (%u %u) mapping:%p ref:%d", p,
-			&mm->this, b, b->this.fd, mm->this.ptr, offset, size, m, m->ref);
+        pw_log_debug("%p: map:%p block:%p fd:%d flags:%08x ptr:%p (%u %u) mapping:%p ref:%d", p,
+			&mm->this, b, b->this.fd, b->this.flags, mm->this.ptr, offset, size, m, m->ref);
 
 	if (tag) {
 		memcpy(mm->this.tag, tag, sizeof(mm->this.tag));
@@ -475,6 +529,12 @@
 	if (b == NULL)
 		return NULL;
 
+	if (type != SPA_DATA_MemFd) {
+		res = -ENOTSUP;
+		pw_log_error("%p: alloc failure: only MemFd is supported", pool);
+		goto error_free;
+	}
+
 	b->this.ref = 1;
 	b->this.pool = pool;
 	b->this.flags = flags;
@@ -482,6 +542,7 @@
 	b->this.size = size;
 	spa_list_init(&b->mappings);
 	spa_list_init(&b->memmaps);
+	spa_hook_list_init(&b->listener_list);
 
 #ifdef HAVE_MEMFD_CREATE
 	char name128;
@@ -489,7 +550,7 @@
 		 "pipewire-memfd:flags=0x%08x,type=%" PRIu32 ",size=%zu",
 		 (unsigned int) flags, type, size);
 
-	b->this.fd = memfd_create(name, MFD_CLOEXEC | MFD_ALLOW_SEALING);
+	b->this.fd = pw_memfd_create(name, MFD_CLOEXEC | MFD_ALLOW_SEALING | MFD_NOEXEC_SEAL);
 	if (b->this.fd == -1) {
 		res = -errno;
 		pw_log_error("%p: Failed to create memfd: %m", pool);
@@ -544,8 +605,8 @@
 
 	b->this.id = pw_map_insert_new(&impl->map, b);
 	spa_list_append(&impl->blocks, &b->link);
-	pw_log_debug("%p: block:%p id:%d type:%u size:%zu", pool,
-			&b->this, b->this.id, type, size);
+	pw_log_debug("%p: block:%p id:%d type:%u flags:%08x size:%zu", pool,
+			&b->this, b->this.id, type, flags, size);
 
 	if (!SPA_FLAG_IS_SET(flags, PW_MEMBLOCK_FLAG_DONT_NOTIFY))
 		pw_mempool_emit_added(impl, &b->this);
@@ -567,6 +628,9 @@
 	struct memblock *b;
 
 	spa_list_for_each(b, &impl->blocks, link) {
+		if (b->this.fd == -1)
+			continue;
+
 		if (fd == b->this.fd) {
 			pw_log_debug("%p: found %p id:%u fd:%d ref:%d",
 					pool, &b->this, b->this.id, fd, b->this.ref);
@@ -583,6 +647,12 @@
 	struct mempool *impl = SPA_CONTAINER_OF(pool, struct mempool, this);
 	struct memblock *b;
 
+	if (fd < 0) {
+		pw_log_error("%p: cannot import invalid fd:%d", pool, fd);
+		errno = EINVAL;
+		return NULL;
+	}
+
 	b = mempool_find_fd(pool, fd);
 	if (b != NULL) {
 		b->this.ref++;
@@ -595,6 +665,7 @@
 
 	spa_list_init(&b->memmaps);
 	spa_list_init(&b->mappings);
+	spa_hook_list_init(&b->listener_list);
 
 	b->this.ref = 1;
 	b->this.pool = pool;
@@ -605,7 +676,7 @@
 	spa_list_append(&impl->blocks, &b->link);
 
 	pw_log_debug("%p: block:%p id:%u flags:%08x type:%u fd:%d",
-			pool, b, b->this.id, flags, type, fd);
+			pool, &b->this, b->this.id, flags, type, fd);
 
 	if (!SPA_FLAG_IS_SET(flags, PW_MEMBLOCK_FLAG_DONT_NOTIFY))
 		pw_mempool_emit_added(impl, &b->this);
@@ -613,15 +684,57 @@
 	return &b->this;
 }
 
+static void memblock_invalidated(void *data)
+{
+	struct memblock *b = data;
+
+	if (!b->owner)
+		return;
+
+	pw_log_debug("%p: invalidated block:%p id:%u fd:%d ref:%d owner:%p",
+			b->this.pool, b, b->this.id, b->this.fd, b->this.ref, b->owner);
+
+	spa_hook_remove(&b->owner_listener);
+	b->owner = NULL;
+
+	b->this.fd = -1;
+}
+
+static const struct memblock_events memblock_events = {
+	VERSION_MEMBLOCK_EVENTS,
+	.invalidated = memblock_invalidated,
+};
+
 SPA_EXPORT
 struct pw_memblock * pw_mempool_import_block(struct pw_mempool *pool,
 		struct pw_memblock *mem)
 {
-	pw_log_debug("%p: import block:%p type:%d fd:%d", pool,
-			mem, mem->type, mem->fd);
-	return pw_mempool_import(pool,
+	struct pw_memblock *block;
+	struct memblock *b;
+
+	block = pw_mempool_import(pool,
 			mem->flags | PW_MEMBLOCK_FLAG_DONT_CLOSE,
 			mem->type, mem->fd);
+	if (!block)
+		return NULL;
+
+	pw_log_debug("%p: import block:%p flags:%08x type:%d fd:%d as %p", pool,
+			mem, mem->flags, mem->type, mem->fd, block);
+
+	b = SPA_CONTAINER_OF(block, struct memblock, this);
+	if (!b->owner) {
+		struct memblock *bmem = SPA_CONTAINER_OF(mem, struct memblock, this);
+
+		while (bmem->owner)
+			bmem = bmem->owner;
+
+		if (!(bmem->this.flags & PW_MEMBLOCK_FLAG_DONT_CLOSE)) {
+			b->owner = bmem;
+			spa_hook_list_append(&bmem->listener_list, &b->owner_listener, &memblock_events, b);
+		}
+	}
+
+	return block;
 }
 
 SPA_EXPORT
@@ -725,6 +838,13 @@
 	if (!SPA_FLAG_IS_SET(block->flags, PW_MEMBLOCK_FLAG_DONT_NOTIFY))
 		pw_mempool_emit_removed(impl, block);
 
+	if (b->owner) {
+		spa_hook_remove(&b->owner_listener);
+		b->owner = NULL;
+	}
+
+	memblock_emit_invalidated(b);
+
 	spa_list_consume(mm, &b->memmaps, link)
 		pw_memmap_free(&mm->this);
 
@@ -737,6 +857,9 @@
 		pw_log_debug("%p: close fd:%d", pool, block->fd);
 		close(block->fd);
 	}
+
+	spa_hook_list_clean(&b->listener_list);
+
 	free(b);
 }

pipewire-1.0.1.tar.bz2/src/pipewire/mem.h -> pipewire-1.2.0.tar.gz/src/pipewire/mem.h Changed

pipewire-1.0.1.tar.bz2/src/pipewire/pipewire.c -> pipewire-1.2.0.tar.gz/src/pipewire/pipewire.c Changed

@@ -25,7 +25,6 @@
 #include <spa/support/cpu.h>
 #include <spa/support/i18n.h>
 
-#include <pipewire/cleanup.h>
 #include "pipewire.h"
 #include "private.h"
 #include "i18n.h"
@@ -47,6 +46,7 @@
 	void *hnd;
 	spa_handle_factory_enum_func_t enum_func;
 	int ref;
+	const struct spa_log_topic_enum *log_topic_enum;
 };
 
 struct handle {
@@ -131,9 +131,12 @@
 	plugin->filename = strdup(filename);
 	plugin->hnd = hnd;
 	plugin->enum_func = enum_func;
+	plugin->log_topic_enum = dlsym(hnd, SPA_LOG_TOPIC_ENUM_NAME);
 
 	spa_list_append(&registry->plugins, &plugin->link);
 
+	pw_log_topic_register_enum(plugin->log_topic_enum);
+
 	return plugin;
 
 error_dlclose:
@@ -148,6 +151,7 @@
 {
 	if (--plugin->ref == 0) {
 		spa_list_remove(&plugin->link);
+		pw_log_topic_unregister_enum(plugin->log_topic_enum);
 		pw_log_debug("unloaded plugin:'%s'", plugin->filename);
 		if (pw_should_dlclose())
 			dlclose(plugin->hnd);
@@ -469,78 +473,6 @@
 }
 #endif
 
-static bool
-parse_log_level(const char *str, enum spa_log_level *l)
-{
-	uint32_t lvl;
-	if (strlen(str) == 1) {
-		switch(str0) {
-		case 'X': lvl = SPA_LOG_LEVEL_NONE; break;
-		case 'E': lvl = SPA_LOG_LEVEL_ERROR; break;
-		case 'W': lvl = SPA_LOG_LEVEL_WARN; break;
-		case 'I': lvl = SPA_LOG_LEVEL_INFO; break;
-		case 'D': lvl = SPA_LOG_LEVEL_DEBUG; break;
-		case 'T': lvl = SPA_LOG_LEVEL_TRACE; break;
-		default:
-			  goto check_int;
-		}
-	} else {
-check_int:
-		  if (!spa_atou32(str, &lvl, 0))
-			  return false;
-		  if (lvl > SPA_LOG_LEVEL_TRACE)
-			  return false;
-	}
-	*l = lvl;
-	return true;
-}
-
-static char *
-parse_pw_debug_env(void)
-{
-	const char *str;
-	int n_tokens;
-	char json1024 = {0};
-	char *pos = json;
-	char *end = pos + sizeof(json) - 1;
-	enum spa_log_level lvl;
-
-	str = getenv("PIPEWIRE_DEBUG");
-
-	if (!str || !*str)
-		return NULL;
-
-	/* String format is PIPEWIRE_DEBUG=<glob>:<level>,...,
-	 * converted into { conn.* = 0}, {glob = level}, {glob = level}, .... ,
-	 * with the connection namespace disabled by default.
-	 */
-	pos += spa_scnprintf(pos, end - pos, " { conn.* = %d },", SPA_LOG_LEVEL_NONE);
-
-	spa_auto(pw_strv) tokens = pw_split_strv(str, ",", INT_MAX, &n_tokens);
-	if (n_tokens > 0) {
-		int i;
-		for (i = 0; i < n_tokens; i++) {
-			int n_tok;
-			char *tok2;
-
-			n_tok = pw_split_ip(tokensi, ":", SPA_N_ELEMENTS(tok), tok);
-			if (n_tok == 2 && parse_log_level(tok1, &lvl)) {
-				char *pattern = tok0;
-				pos += spa_scnprintf(pos, end - pos, "{ %s = %d },",
-						     pattern, lvl);
-			} else if (n_tok == 1 && parse_log_level(tok0, &lvl)) {
-				pw_log_set_level(lvl);
-			} else {
-				pw_log_warn("Ignoring invalid format in PIPEWIRE_DEBUG: '%s'",
-						tokensi);
-			}
-		}
-	}
-
-	pos += spa_scnprintf(pos, end - pos, "");
-	return strdup(json);
-}
-
 /** Initialize PipeWire
  *
  * \param argc pointer to argc
@@ -595,8 +527,6 @@
 	spa_list_init(&support->registry.handles);
 
 	if (pw_log_is_default()) {
-		char *patterns = NULL;
-
 		n_items = 0;
 		if (!support->no_color) {
 			if ((str = getenv("PIPEWIRE_LOG_COLOR")) == NULL)
@@ -610,8 +540,6 @@
 		itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_LOG_LEVEL, level);
 		if ((str = getenv("PIPEWIRE_LOG")) != NULL)
 			itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_LOG_FILE, str);
-		if ((patterns = parse_pw_debug_env()) != NULL)
-			itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_LOG_PATTERNS, patterns);
 		info = SPA_DICT_INIT(items, n_items);
 
 		log = add_interface(support, SPA_NAME_SUPPORT_LOG, SPA_TYPE_INTERFACE_Log, &info);
@@ -625,7 +553,10 @@
 				pw_log_set(log);
 		}
 #endif
-		free(patterns);
+
+		str = getenv("PIPEWIRE_DEBUG");
+		if (str && *str)
+			pw_log_set_level_string(str);
 	} else {
 		support->supportsupport->n_support++ =
 			SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_Log, pw_log_get());
@@ -678,7 +609,7 @@
 		goto done;
 
 	pthread_mutex_lock(&support_lock);
-	pw_log_set(NULL);
+	pw_log_deinit();
 
 	spa_list_consume(h, &registry->handles, link)
 		unref_handle(h);

pipewire-1.0.1.tar.bz2/src/pipewire/private.h -> pipewire-1.2.0.tar.gz/src/pipewire/private.h Changed

@@ -5,6 +5,8 @@
 #ifndef PIPEWIRE_PRIVATE_H
 #define PIPEWIRE_PRIVATE_H
 
+/** \privatesection */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -28,8 +30,9 @@
 #endif
 
 #define MAX_RATES				32u
-#define CLOCK_MIN_QUANTUM			4u
-#define CLOCK_MAX_QUANTUM			65536u
+#define CLOCK_QUANTUM_FLOOR			1u
+#define CLOCK_QUANTUM_LIMIT			65536u
+#define DEFAULT_LOG_LEVEL			SPA_LOG_LEVEL_WARN
 
 struct settings {
 	uint32_t log_level;
@@ -39,7 +42,8 @@
 	uint32_t clock_quantum;			/* default quantum */
 	uint32_t clock_min_quantum;		/* min quantum */
 	uint32_t clock_max_quantum;		/* max quantum */
-	uint32_t clock_quantum_limit;		/* quantum limit */
+	uint32_t clock_quantum_limit;		/* quantum limit (upper bound) */
+	uint32_t clock_quantum_floor;		/* quantum floor (lower bound) */
 	struct spa_rectangle video_size;
 	struct spa_fraction video_rate;
 	uint32_t link_max_buffers;
@@ -214,6 +218,7 @@
 	struct spa_list link;			/**< link in context metadata_list */
 	struct pw_global *global;		/**< global for this metadata */
 	struct spa_hook global_listener;
+	struct spa_hook context_listener;
 
 	struct pw_properties *properties;	/**< properties of the metadata */
 
@@ -414,8 +419,6 @@
 
 	struct spa_thread_utils *thread_utils;
 	struct pw_loop *main_loop;		/**< main loop for control */
-	struct pw_loop *data_loop;		/**< data loop for data passing */
-	struct spa_system *data_system;		/**< data system for data passing */
 	struct pw_work_queue *work_queue;	/**< work queue */
 
 	struct spa_support support16;	/**< support for spa plugins */
@@ -438,6 +441,10 @@
 struct pw_data_loop {
 	struct pw_loop *loop;
 
+	char *affinity;
+	char *class;
+	char **classes;
+	int rt_prio;
 	struct spa_hook_list listener_list;
 
 	struct spa_thread_utils *thread_utils;
@@ -517,15 +524,14 @@
 
 static inline void pw_node_activation_state_reset(struct pw_node_activation_state *state)
 {
-        state->pending = state->required;
+	SPA_ATOMIC_STORE(state->pending, SPA_ATOMIC_LOAD(state->required));
 }
 
 #define pw_node_activation_state_dec(s) (SPA_ATOMIC_DEC(s->pending) == 0)
+#define pw_node_activation_state_xchg(s) SPA_ATOMIC_XCHG(s->pending, 0)
 
 struct pw_node_target {
 	struct spa_list link;
-#define PW_NODE_TARGET_NONE	0
-#define PW_NODE_TARGET_PEER	1
 	uint32_t flags;
 	uint32_t id;
 	char name128;
@@ -533,7 +539,9 @@
 	struct pw_node_activation *activation;
 	struct spa_system *system;
 	int fd;
+	void (*trigger)(struct pw_node_target *t, uint64_t nsec);
 	unsigned int active:1;
+	unsigned int added:1;
 };
 
 static inline void copy_target(struct pw_node_target *dst, const struct pw_node_target *src)
@@ -544,13 +552,37 @@
 	dst->activation = src->activation;
 	dst->system = src->system;
 	dst->fd = src->fd;
+	dst->trigger = src->trigger;
 }
 
+/* versions:
+ * 0 baseline
+ * 1 the activation status needs to be CAS
+ *   async nodes, driver resumes async nodes
+ *   transport with sync.group properties instead of client command
+ */
+#define PW_VERSION_NODE_ACTIVATION	1
+
+/* nodes start as INACTIVE, when they are ready to be scheduled, they add their
+ * fd to the loop and change status to FINISHED. When the node shuts down, the
+ * status is set back to INACTIVE.
+ *
+ * We have status changes (using compare-and-swap) from
+ *
+ *   INACTIVE -> FINISHED (node is added to loop and can be scheduled)
+ *   * -> INACTIVE (node can not be scheduled anymore)
+ *
+ *   !INACTIVE -> NOT_TRIGGERED (node is prepared by the driver)
+ *   NOT_TRIGGERED -> TRIGGERED (eventfd is written)
+ *   TRIGGERED -> AWAKE (eventfd is read, node starts processing)
+ *   AWAKE -> FINISHED (node completed processing and triggered the peers)
+ */
 struct pw_node_activation {
 #define PW_NODE_ACTIVATION_NOT_TRIGGERED	0
 #define PW_NODE_ACTIVATION_TRIGGERED		1
 #define PW_NODE_ACTIVATION_AWAKE		2
 #define PW_NODE_ACTIVATION_FINISHED		3
+#define PW_NODE_ACTIVATION_INACTIVE		4
 	uint32_t status;
 
 	unsigned int version:1;
@@ -574,7 +606,12 @@
 	uint32_t segment_owner16;			/* id of owners for each segment info struct.
 							 * nodes that want to update segment info need to
 							 * CAS their node id in this array. */
-	uint32_t padding15;
+	uint32_t padding11;				/* must be 0 */
+	uint32_t client_version;			/* verions of client, see above */
+	uint32_t server_version;			/* verions of server, see above */
+
+	uint32_t active_driver_id;			/* driver active on client */
+	uint32_t driver_id;				/* the current node driver id */
 #define PW_NODE_ACTIVATION_FLAG_NONE		0
 #define PW_NODE_ACTIVATION_FLAG_PROFILER	(1<<0)	/* the profiler is running */
 	uint32_t flags;					/* extra flags */
@@ -602,6 +639,60 @@
 							 * to update wins */
 };
 
+static inline uint64_t get_time_ns(struct spa_system *system)
+{
+	struct timespec ts;
+	spa_system_clock_gettime(system, CLOCK_MONOTONIC, &ts);
+	return SPA_TIMESPEC_TO_NSEC(&ts);
+}
+
+/* called from data-loop decrement the dependency counter of the target and when
+ * there are no more dependencies, trigger the node. */
+static inline void trigger_target_v1(struct pw_node_target *t, uint64_t nsec)
+{
+	struct pw_node_activation *a = t->activation;
+	struct pw_node_activation_state *state = &a->state0;
+
+	pw_log_trace_fp("%p: (%s-%u) state:%p pending:%d/%d", t->node,
+			t->name, t->id, state, state->pending, state->required);
+
+	if (pw_node_activation_state_dec(state)) {
+		if (SPA_ATOMIC_CAS(a->status,
+					PW_NODE_ACTIVATION_NOT_TRIGGERED,
+					PW_NODE_ACTIVATION_TRIGGERED)) {
+			a->signal_time = nsec;
+			if (SPA_UNLIKELY(spa_system_eventfd_write(t->system, t->fd, 1) < 0))
+				pw_log_warn("%p: write failed %m", t->node);
+		}
+	}
+}
+
+static inline void trigger_target_v0(struct pw_node_target *t, uint64_t nsec)
+{
+	struct pw_node_activation *a = t->activation;
+	struct pw_node_activation_state *state = &a->state0;
+
+	pw_log_trace_fp("%p: (%s-%u) state:%p pending:%d/%d", t->node,
+			t->name, t->id, state, state->pending, state->required);
+
+	if (pw_node_activation_state_dec(state)) {
+		SPA_ATOMIC_STORE(a->status, PW_NODE_ACTIVATION_TRIGGERED);
+		a->signal_time = nsec;
+		if (SPA_UNLIKELY(spa_system_eventfd_write(t->system, t->fd, 1) < 0))
+			pw_log_warn("%p: write failed %m", t->node);
+	}
+}
+
+struct pw_node_peer {
+	int ref;
+	struct spa_list link;			/**< link in peer list */
+	struct pw_impl_node *output;		/**< the output node */
+	struct pw_node_target target;		/**< target of the input node */
+};
+
+struct pw_node_peer *pw_node_peer_ref(struct pw_impl_node *onode, struct pw_impl_node *inode);
+void pw_node_peer_unref(struct pw_node_peer *peer);
+
 #define pw_impl_node_emit(o,m,v,...) spa_hook_list_call(&o->listener_list, struct pw_impl_node_events, m, v, ##__VA_ARGS__)
 #define pw_impl_node_emit_destroy(n)			pw_impl_node_emit(n, destroy, 0)
 #define pw_impl_node_emit_free(n)			pw_impl_node_emit(n, free, 0)
@@ -645,6 +736,7 @@
 	uint32_t priority_driver;	/** priority for being driver */
 	char **groups;			/** groups to schedule this node in */
 	char **link_groups;		/** groups this node is linked to */
+	char **sync_groups;		/** sync groups this node is in */
 	uint64_t spa_flags;
 
 	unsigned int registered:1;
@@ -668,7 +760,6 @@
 	unsigned int transport_sync:1;	/**< supports transport sync */
 	unsigned int target_pending:1;	/**< a quantum/rate update is pending */
 	unsigned int moved:1;		/**< the node was moved drivers */
-	unsigned int added:1;		/**< the node was add to graph */
 	unsigned int pause_on_idle:1;	/**< Pause processing when IDLE */
 	unsigned int suspend_on_idle:1;
 	unsigned int need_resume:1;
@@ -678,6 +769,9 @@
 					  *  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 transport:1;	/**< the transport is active */
+	unsigned int async:1;		/**< async processing, one cycle latency */
 
 	uint32_t port_user_data_size;	/**< extra size for port user data */
 
@@ -702,7 +796,6 @@
 	struct spa_hook_list rt_listener_list;
 
 	struct pw_loop *data_loop;		/**< the data loop for this node */
-	struct spa_system *data_system;
 
 	struct spa_fraction latency;		/**< requested latency */
 	struct spa_fraction max_latency;	/**< maximum latency */
@@ -718,7 +811,6 @@
 
 		struct spa_list target_list;		/* list of targets to signal after
 							 * this node */
-		struct pw_node_target driver_target;	/* driver target that we signal */
 		struct spa_list input_mix;		/* our input ports (and mixers) */
 		struct spa_list output_mix;		/* output ports (and mixers) */
 
@@ -727,7 +819,11 @@
 		struct spa_list driver_link;		/* our link in driver */
 
 		struct spa_ratelimit rate_limit;
+
+		bool prepared;				/**< the node was added to loop */
 	} rt;
+	struct pw_node_peer *to_driver_peer;		/* node -> driver */
+	struct pw_node_peer *from_driver_peer;		/* driver -> node */
 	struct spa_fraction target_rate;
 	uint64_t target_quantum;
 
@@ -739,17 +835,21 @@
 
 struct pw_impl_port_mix {
 	struct spa_list link;
-	struct spa_list rt_link;
 	struct pw_impl_port *p;
 	struct {
 		enum spa_direction direction;
 		uint32_t port_id;
 	} port;
-	struct spa_io_buffers *io;
+	struct spa_io_buffers *io2;
+	void *io_data;
 	uint32_t id;
 	uint32_t peer_id;
-	unsigned int have_buffers:1;
-	unsigned int active:1;
+	bool have_buffers;
+
+	struct {
+		bool active;
+		struct spa_list link;
+	} rt;
 };
 
 struct pw_impl_port_implementation {
@@ -801,6 +901,7 @@
 #define PW_IMPL_PORT_FLAG_BUFFERS		(1<<1)		/**< port has data */
 #define PW_IMPL_PORT_FLAG_CONTROL		(1<<2)		/**< port has control */
 #define PW_IMPL_PORT_FLAG_NO_MIXER		(1<<3)		/**< don't try to add mixer to port */
+#define PW_IMPL_PORT_FLAG_ASYNC			(1<<4)		/**< port support async io */
 	uint32_t flags;
 	uint64_t spa_flags;
 
@@ -840,8 +941,8 @@
 	struct {
 		struct spa_io_buffers io;	/**< io area of the port */
 		struct spa_list node_link;
+		bool added;
 	} rt;					/**< data only accessed from the data thread */
-	unsigned int added:1;
 	unsigned int destroying:1;
 	unsigned int passive:1;
 	int busy_count;
@@ -868,14 +969,6 @@
 	unsigned int valid:1;
 };
 
-struct pw_node_peer {
-	int ref;
-	int active_count;
-	struct spa_list link;			/**< link in peer list */
-	struct pw_impl_node *output;		/**< the output node */
-	struct pw_node_target target;		/**< target of the input node */
-};
-
 #define pw_impl_link_emit(o,m,v,...) spa_hook_list_call(&o->listener_list, struct pw_impl_link_events, m, v, ##__VA_ARGS__)
 #define pw_impl_link_emit_destroy(l)		pw_impl_link_emit(l, destroy, 0)
 #define pw_impl_link_emit_free(l)		pw_impl_link_emit(l, free, 0)
@@ -1148,7 +1241,9 @@
 /** Find a good format between 2 ports */
 int pw_context_find_format(struct pw_context *context,
 			struct pw_impl_port *output,
+			uint32_t output_mix,
 			struct pw_impl_port *input,
+			uint32_t input_mix,
 			struct pw_properties *props,
 			uint32_t n_format_filters,
 			struct spa_pod **format_filters,
@@ -1240,6 +1335,11 @@
 
 int pw_impl_node_trigger(struct pw_impl_node *node);
 
+int pw_impl_node_set_io(struct pw_impl_node *node, uint32_t id, void *data, size_t 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);
@@ -1294,7 +1394,8 @@
 
 bool pw_should_dlclose(void);
 
-/** \endcond */
+void pw_log_topic_register_enum(const struct spa_log_topic_enum *e);
+void pw_log_topic_unregister_enum(const struct spa_log_topic_enum *e);
 
 #ifdef __cplusplus
 }

pipewire-1.0.1.tar.bz2/src/pipewire/properties.c -> pipewire-1.2.0.tar.gz/src/pipewire/properties.c Changed

@@ -8,6 +8,9 @@
 #include <spa/utils/ansi.h>
 #include <spa/utils/json.h>
 #include <spa/utils/string.h>
+#include <spa/utils/cleanup.h>
+#include <spa/utils/result.h>
+#include <spa/debug/log.h>
 
 #include "pipewire/array.h"
 #include "pipewire/log.h"
@@ -25,24 +28,38 @@
 };
 /** \endcond */
 
-static int add_func(struct pw_properties *this, char *key, char *value)
+static int add_item(struct properties *impl, const char *key, bool take_key, const char *value, bool take_value)
 {
 	struct spa_dict_item *item;
-	struct properties *impl = SPA_CONTAINER_OF(this, struct properties, this);
+	const char *k, *v;
 
-	item = pw_array_add(&impl->items, sizeof(struct spa_dict_item));
-	if (item == NULL) {
-		free(key);
-		free(value);
-		return -errno;
-	}
+	k = take_key ? key : NULL;
+	v = take_value ? value: NULL;
+
+	if (!take_key && key && (k = strdup(key)) == NULL)
+		goto error;
+	if (!take_value && value && (v = strdup(value)) == NULL)
+		goto error;
 
-	item->key = key;
-	item->value = value;
+	item = pw_array_add(&impl->items, sizeof(struct spa_dict_item));
+	if (item == NULL)
+		goto error;
 
-	this->dict.items = impl->items.data;
-	this->dict.n_items++;
+	item->key = k;
+	item->value = v;
 	return 0;
+
+error:
+	free((char*)k);
+	free((char*)v);
+	return -errno;
+}
+
+static void update_dict(struct pw_properties *properties)
+{
+	struct properties *impl = SPA_CONTAINER_OF(properties, struct properties, this);
+	properties->dict.items = impl->items.data;
+	properties->dict.n_items = pw_array_get_len(&impl->items, struct spa_dict_item);
 }
 
 static void clear_item(struct spa_dict_item *item)
@@ -51,26 +68,20 @@
 	free((char *) item->value);
 }
 
-static int find_index(const struct pw_properties *this, const char *key)
+static void properties_init(struct properties *impl, int prealloc)
 {
-	const struct spa_dict_item *item;
-	item = spa_dict_lookup_item(&this->dict, key);
-	if (item == NULL)
-		return -1;
-	return item - this->dict.items;
+	pw_array_init(&impl->items, 16);
+	pw_array_ensure_size(&impl->items, sizeof(struct spa_dict_item) * prealloc);
 }
 
 static struct properties *properties_new(int prealloc)
 {
 	struct properties *impl;
 
-	impl = calloc(1, sizeof(struct properties));
-	if (impl == NULL)
+	if ((impl = calloc(1, sizeof(struct properties))) == NULL)
 		return NULL;
 
-	pw_array_init(&impl->items, 16);
-	pw_array_ensure_size(&impl->items, sizeof(struct spa_dict_item) * prealloc);
-
+	properties_init(impl, prealloc);
 	return impl;
 }
 
@@ -86,6 +97,7 @@
 	struct properties *impl;
 	va_list varargs;
 	const char *value;
+	int res = 0;
 
 	impl = properties_new(16);
 	if (impl == NULL)
@@ -95,12 +107,18 @@
 	while (key != NULL) {
 		value = va_arg(varargs, char *);
 		if (value && key0)
-			add_func(&impl->this, strdup(key), strdup(value));
+			if ((res = add_item(impl, key, false, value, false)) < 0)
+				goto error;
 		key = va_arg(varargs, char *);
 	}
 	va_end(varargs);
+	update_dict(&impl->this);
 
 	return &impl->this;
+error:
+	pw_properties_free(&impl->this);
+	errno = -res;
+	return NULL;
 }
 
 /** Make a new properties object from the given dictionary
@@ -113,6 +131,7 @@
 {
 	uint32_t i;
 	struct properties *impl;
+	int res;
 
 	impl = properties_new(SPA_ROUND_UP_N(dict->n_items, 16));
 	if (impl == NULL)
@@ -121,28 +140,85 @@
 	for (i = 0; i < dict->n_items; i++) {
 		const struct spa_dict_item *it = &dict->itemsi;
 		if (it->key != NULL && it->key0 && it->value != NULL)
-			add_func(&impl->this, strdup(it->key),
-				 strdup(it->value));
+			if ((res = add_item(impl, it->key, false, it->value, false)) < 0)
+				goto error;
 	}
+	update_dict(&impl->this);
 
 	return &impl->this;
+
+error:
+	pw_properties_free(&impl->this);
+	errno = -res;
+	return NULL;
 }
 
-/** Update the properties from the given string, overwriting any
- * existing keys with the new values from \a str.
- *
- * \a str should be a whitespace separated list of key=value
- * strings or a json object, see pw_properties_new_string().
- *
- * \return The number of properties added or updated
- */
-SPA_EXPORT
-int pw_properties_update_string(struct pw_properties *props, const char *str, size_t size)
+static int do_replace(struct pw_properties *properties, const char *key, bool take_key,
+		const char *value, bool take_value)
+{
+	struct properties *impl = SPA_CONTAINER_OF(properties, struct properties, this);
+	struct spa_dict_item *item;
+	int res = 0;
+
+	if (key == NULL || key0 == 0)
+		goto exit_noupdate;
+
+	item = (struct spa_dict_item*) spa_dict_lookup_item(&properties->dict, key);
+
+	if (item == NULL) {
+		if (value == NULL)
+			goto exit_noupdate;
+		if ((res = add_item(impl, key, take_key, value, take_value)) < 0)
+			return res;
+		SPA_FLAG_CLEAR(properties->dict.flags, SPA_DICT_FLAG_SORTED);
+	} else {
+		if (value && spa_streq(item->value, value))
+			goto exit_noupdate;
+
+		if (value == NULL) {
+			struct spa_dict_item *last = pw_array_get_unchecked(&impl->items,
+						     pw_array_get_len(&impl->items, struct spa_dict_item) - 1,
+						     struct spa_dict_item);
+			clear_item(item);
+			item->key = last->key;
+			item->value = last->value;
+			impl->items.size -= sizeof(struct spa_dict_item);
+			SPA_FLAG_CLEAR(properties->dict.flags, SPA_DICT_FLAG_SORTED);
+		} else {
+			char *v = NULL;
+			if (!take_value && value && (v = strdup(value)) == NULL) {
+				res = -errno;
+				goto exit_noupdate;
+			}
+			free((char *) item->value);
+			item->value = take_value ? value : v;
+		}
+		if (take_key)
+			free((char*)key);
+	}
+	update_dict(properties);
+	return 1;
+
+exit_noupdate:
+	if (take_key)
+		free((char*)key);
+	if (take_value)
+		free((char*)value);
+	return res;
+}
+
+static int update_string(struct pw_properties *props, const char *str, size_t size,
+		int *count, struct spa_error_location *loc)
 {
-	struct properties *impl = SPA_CONTAINER_OF(props, struct properties, this);
 	struct spa_json it2;
-	char key1024, *val;
-	int count = 0;
+	char key1024;
+	struct spa_error_location el;
+	bool err;
+	int res, cnt = 0;
+	struct properties changes;
+
+	if (props)
+		properties_init(&changes, 16);
 
 	spa_json_init(&it0, str, size);
 	if (spa_json_enter_object(&it0, &it1) <= 0)
@@ -151,6 +227,7 @@
 	while (spa_json_get_string(&it1, key, sizeof(key)) > 0) {
 		int len;
 		const char *value;
+		char *val = NULL;
 
 		if ((len = spa_json_next(&it1, &value)) <= 0)
 			break;
@@ -160,13 +237,101 @@
 		else {
 			if (spa_json_is_container(value, len))
 				len = spa_json_container_len(&it1, value, len);
+			if (len <= 0)
+				break;
 
-			if ((val = malloc(len+1)) != NULL)
+			if (props) {
+				if ((val = malloc(len+1)) == NULL) {
+					it1.state = SPA_JSON_ERROR_FLAG;
+					break;
+				}
 				spa_json_parse_stringn(value, len, val, len+1);
+			}
 		}
-		count += pw_properties_set(&impl->this, key, val);
-		free(val);
+		if (props) {
+			const struct spa_dict_item *item;
+			item = spa_dict_lookup_item(&props->dict, key);
+			if (item && spa_streq(item->value, val)) {
+				free(val);
+				continue;
+			}
+			/* item changed or added, apply changes later */
+			if ((errno = -add_item(&changes, key, false, val, true) < 0)) {
+				it1.state = SPA_JSON_ERROR_FLAG;
+				break;
+			}
+		}
+	}
+	if ((err = spa_json_get_error(&it1, str, &el))) {
+		if (loc == NULL)
+			spa_debug_log_error_location(pw_log_get(), SPA_LOG_LEVEL_WARN,
+					&el, "error parsing more than %d properties: %s",
+					cnt, el.reason);
+		else
+			*loc = el;
 	}
+	if (props) {
+		struct spa_dict_item *item;
+		if (loc == NULL || !err) {
+			pw_array_for_each(item, &changes.items)
+				if ((res = do_replace(props, item->key, true, item->value, true)) < 0)
+					pw_log_warn("error updating property: %s", spa_strerror(res));
+				else
+					cnt += res;
+
+		} else {
+			pw_array_for_each(item, &changes.items)
+				clear_item(item);
+		}
+		pw_array_clear(&changes.items);
+	}
+	if (count)
+		*count = cnt;
+
+	return !err;
+}
+
+/** Update the properties from the given string, overwriting any
+ * existing keys with the new values from \a str.
+ *
+ * \a str should be a whitespace separated list of key=value
+ * strings or a json object, see pw_properties_new_string().
+ *
+ * \return The number of properties added or updated
+ */
+SPA_EXPORT
+int pw_properties_update_string(struct pw_properties *props, const char *str, size_t size)
+{
+	int count = 0;
+	update_string(props, str, size, &count, NULL);
+	return count;
+}
+
+/** Check \a str is a well-formed properties JSON string and update
+ * the properties on success.
+ *
+ * \a str should be a whitespace separated list of key=value
+ * strings or a json object, see pw_properties_new_string().
+ *
+ * When the check fails, this function will not update \a props.
+ *
+ * \param props  The properties to attempt to update, maybe be NULL
+ *            to simply check the JSON string.
+ * \param str  The JSON object with new values
+ * \param size  The length of the JSON string.
+ * \param loc  Return value for parse error location
+ * \return a negative value when string is not valid and \a loc contains
+ *         the error location or the number of updated properties in
+ *         \a props.
+ * \since 1.1.0
+ */
+SPA_EXPORT
+int pw_properties_update_string_checked(struct pw_properties *props,
+		const char *str, size_t size, struct spa_error_location *loc)
+{
+	int count = 0;
+	if (!update_string(props, str, size, &count, loc))
+		return -EINVAL;
 	return count;
 }
 
@@ -199,6 +364,27 @@
 	return NULL;
 }
 
+SPA_EXPORT
+struct pw_properties *
+pw_properties_new_string_checked(const char *object, size_t size, struct spa_error_location *loc)
+{
+	struct properties *impl;
+	int res;
+
+	impl = properties_new(16);
+	if (impl == NULL)
+		return NULL;
+
+	if ((res = pw_properties_update_string_checked(&impl->this, object, size, loc)) < 0)
+		goto error;
+
+	return &impl->this;
+error:
+	pw_properties_free(&impl->this);
+	errno = -res;
+	return NULL;
+}
+
 /** Copy a properties object
  *
  * \param properties properties to copy
@@ -221,12 +407,17 @@
 int pw_properties_update_keys(struct pw_properties *props,
 		const struct spa_dict *dict, const char * const keys)
 {
-	int i, changed = 0;
+	int i, res, changed = 0;
 	const char *str;
 
 	for (i = 0; keysi; i++) {
-		if ((str = spa_dict_lookup(dict, keysi)) != NULL)
-			changed += pw_properties_set(props, keysi, str);
+		if ((str = spa_dict_lookup(dict, keysi)) != NULL) {
+			if ((res = pw_properties_set(props, keysi, str)) < 0)
+				pw_log_warn("error updating property %s:%s: %s",
+						keysi, str, spa_strerror(res));
+			else
+				changed += res;
+		}
 	}
 	return changed;
 }
@@ -246,11 +437,16 @@
 		const struct spa_dict *dict, const char * const ignore)
 {
 	const struct spa_dict_item *it;
-	int changed = 0;
+	int res, changed = 0;
 
 	spa_dict_for_each(it, dict) {
-		if (ignore == NULL || !has_key(ignore, it->key))
-			changed += pw_properties_set(props, it->key, it->value);
+		if (ignore == NULL || !has_key(ignore, it->key)) {
+			if ((res = pw_properties_set(props, it->key, it->value)) < 0)
+				pw_log_warn("error updating property %s:%s: %s",
+						it->key, it->value, spa_strerror(res));
+			else
+				changed += res;
+		}
 	}
 	return changed;
 }
@@ -285,11 +481,15 @@
 		         const struct spa_dict *dict)
 {
 	const struct spa_dict_item *it;
-	int changed = 0;
-
-	spa_dict_for_each(it, dict)
-		changed += pw_properties_set(props, it->key, it->value);
+	int res, changed = 0;
 
+	spa_dict_for_each(it, dict) {
+		if ((res = pw_properties_set(props, it->key, it->value)) < 0)
+			pw_log_warn("error updating property %s:%s: %s",
+					it->key, it->value, spa_strerror(res));
+		else
+			changed += res;
+	}
 	return changed;
 }
 
@@ -306,11 +506,17 @@
 		         const struct spa_dict *dict)
 {
 	uint32_t i;
-	int added = 0;
+	int res, added = 0;
 
 	for (i = 0; i < dict->n_items; i++) {
-		if (pw_properties_get(props, dict->itemsi.key) == NULL)
-			added += pw_properties_set(props, dict->itemsi.key, dict->itemsi.value);
+		const struct spa_dict_item *it = &dict->itemsi;
+		if (pw_properties_get(props, it->key) == NULL) {
+			if ((res = pw_properties_set(props, it->key, it->value)) < 0)
+				pw_log_warn("error updating property %s:%s: %s",
+						it->key, it->value, spa_strerror(res));
+			else
+				added += res;
+		}
 	}
 	return added;
 }
@@ -330,14 +536,19 @@
 		const struct spa_dict *dict, const char * const keys)
 {
 	uint32_t i;
-	int added = 0;
+	int res, added = 0;
 	const char *str;
 
 	for (i = 0; keysi; i++) {
 		if ((str = spa_dict_lookup(dict, keysi)) == NULL)
 			continue;
-		if (pw_properties_get(props, keysi) == NULL)
-			added += pw_properties_set(props, keysi, str);
+		if (pw_properties_get(props, keysi) == NULL) {
+			if ((res = pw_properties_set(props, keysi, str)) < 0)
+				pw_log_warn("error updating property %s:%s: %s",
+						keysi, str, spa_strerror(res));
+			else
+				added += res;
+		}
 	}
 	return added;
 }
@@ -360,50 +571,6 @@
 	free(impl);
 }
 
-static int do_replace(struct pw_properties *properties, const char *key, char *value, bool copy)
-{
-	struct properties *impl = SPA_CONTAINER_OF(properties, struct properties, this);
-	int index;
-
-	if (key == NULL || key0 == 0)
-		goto exit_noupdate;
-
-	index = find_index(properties, key);
-
-	if (index == -1) {
-		if (value == NULL)
-			return 0;
-		add_func(properties, strdup(key), copy ? strdup(value) : value);
-		SPA_FLAG_CLEAR(properties->dict.flags, SPA_DICT_FLAG_SORTED);
-	} else {
-		struct spa_dict_item *item =
-		    pw_array_get_unchecked(&impl->items, index, struct spa_dict_item);
-
-		if (value && spa_streq(item->value, value))
-			goto exit_noupdate;
-
-		if (value == NULL) {
-			struct spa_dict_item *last = pw_array_get_unchecked(&impl->items,
-						     pw_array_get_len(&impl->items, struct spa_dict_item) - 1,
-						     struct spa_dict_item);
-			clear_item(item);
-			item->key = last->key;
-			item->value = last->value;
-			impl->items.size -= sizeof(struct spa_dict_item);
-			properties->dict.n_items--;
-			SPA_FLAG_CLEAR(properties->dict.flags, SPA_DICT_FLAG_SORTED);
-		} else {
-			free((char *) item->value);
-			item->value = copy ? strdup(value) : value;
-		}
-	}
-	return 1;
-exit_noupdate:
-	if (!copy)
-		free(value);
-	return 0;
-}
-
 /** Set a property value
  *
  * \param properties the properties to change
@@ -411,7 +578,7 @@
  * \param value a value or NULL to remove the key
  * \return 1 if the properties were changed. 0 if nothing was changed because
  *  the property already existed with the same value or because the key to remove
- *  did not exist.
+ *  did not exist. < 0 if an error occurred and nothing was changed.
  *
  * Set the property in \a properties with \a key to \a value. Any previous value
  * of \a key will be overwritten. When \a value is NULL, the key will be
@@ -420,7 +587,7 @@
 SPA_EXPORT
 int pw_properties_set(struct pw_properties *properties, const char *key, const char *value)
 {
-	return do_replace(properties, key, (char*)value, true);
+	return do_replace(properties, key, false, (char*)value, false);
 }
 
 SPA_EXPORT
@@ -432,7 +599,7 @@
 		if (vasprintf(&value, format, args) < 0)
 			return -errno;
 	}
-	return do_replace(properties, key, value, false);
+	return do_replace(properties, key, false, value, true);
 }
 
 /** Set a property value by format
@@ -472,13 +639,7 @@
 SPA_EXPORT
 const char *pw_properties_get(const struct pw_properties *properties, const char *key)
 {
-	struct properties *impl = SPA_CONTAINER_OF(properties, struct properties, this);
-	int index = find_index(properties, key);
-
-	if (index == -1)
-		return NULL;
-
-	return pw_array_get_unchecked(&impl->items, index, struct spa_dict_item)->value;
+	return spa_dict_lookup(&properties->dict, key);
 }
 
 /** Fetch a property as uint32_t.

pipewire-1.0.1.tar.bz2/src/pipewire/properties.h -> pipewire-1.2.0.tar.gz/src/pipewire/properties.h Changed

@@ -11,6 +11,7 @@
 
 #include <stdarg.h>
 
+#include <spa/utils/cleanup.h>
 #include <spa/utils/dict.h>
 #include <spa/utils/string.h>
 
@@ -41,6 +42,10 @@
 pw_properties_new_string(const char *args);
 
 struct pw_properties *
+pw_properties_new_string_checked(const char *args, size_t size,
+		struct spa_error_location *loc);
+
+struct pw_properties *
 pw_properties_copy(const struct pw_properties *properties);
 
 int pw_properties_update_keys(struct pw_properties *props,
@@ -51,10 +56,14 @@
 /* Update props with all key/value pairs from dict */
 int pw_properties_update(struct pw_properties *props,
 		     const struct spa_dict *dict);
+
 /* Update props with all key/value pairs from str */
 int pw_properties_update_string(struct pw_properties *props,
 		const char *str, size_t size);
 
+int pw_properties_update_string_checked(struct pw_properties *props,
+		const char *str, size_t size, struct spa_error_location *loc);
+
 int pw_properties_add(struct pw_properties *oldprops,
 		     const struct spa_dict *dict);
 int pw_properties_add_keys(struct pw_properties *oldprops,
@@ -176,6 +185,10 @@
  * \}
  */
 
+SPA_DEFINE_AUTOPTR_CLEANUP(pw_properties, struct pw_properties, {
+	spa_clear_ptr(*thing, pw_properties_free);
+})
+
 #ifdef __cplusplus
 }
 #endif

pipewire-1.0.1.tar.bz2/src/pipewire/protocol.h -> pipewire-1.2.0.tar.gz/src/pipewire/protocol.h Changed

@@ -81,7 +81,7 @@
 };
 
 struct pw_protocol_implementation {
-#define PW_VERSION_PROTOCOL_IMPLEMENTATION	0
+#define PW_VERSION_PROTOCOL_IMPLEMENTATION	1
 	uint32_t version;
 
 	struct pw_protocol_client * (*new_client) (struct pw_protocol *protocol,
@@ -90,6 +90,10 @@
 	struct pw_protocol_server * (*add_server) (struct pw_protocol *protocol,
 						   struct pw_impl_core *core,
 						   const struct spa_dict *props);
+	struct pw_protocol_server * (*add_fd_server) (struct pw_protocol *protocol,
+						   struct pw_impl_core *core,
+						   int listen_fd, int close_fd,
+						   const struct spa_dict *props);
 };
 
 struct pw_protocol_events {
@@ -101,6 +105,7 @@
 
 #define pw_protocol_new_client(p,...)	(pw_protocol_get_implementation(p)->new_client(p,__VA_ARGS__))
 #define pw_protocol_add_server(p,...)	(pw_protocol_get_implementation(p)->add_server(p,__VA_ARGS__))
+#define pw_protocol_add_fd_server(p,...)	(pw_protocol_get_implementation(p)->add_fd_server(p,__VA_ARGS__))
 #define pw_protocol_ext(p,type,method,...)	(((type*)pw_protocol_get_extension(p))->method( __VA_ARGS__))
 
 struct pw_protocol *pw_protocol_new(struct pw_context *context, const char *name, size_t user_data_size);

pipewire-1.0.1.tar.bz2/src/pipewire/settings.c -> pipewire-1.2.0.tar.gz/src/pipewire/settings.c Changed

@@ -26,6 +26,7 @@
 #define DEFAULT_CLOCK_MIN_QUANTUM		32u
 #define DEFAULT_CLOCK_MAX_QUANTUM		2048u
 #define DEFAULT_CLOCK_QUANTUM_LIMIT		8192u
+#define DEFAULT_CLOCK_QUANTUM_FLOOR		4u
 #define DEFAULT_CLOCK_POWER_OF_TWO_QUANTUM	true
 #define DEFAULT_VIDEO_WIDTH			640
 #define DEFAULT_VIDEO_HEIGHT			480
@@ -142,8 +143,8 @@
 		return 0;
 
 	if (spa_streq(key, "log.level")) {
-		v = value ? atoi(value) : 3;
-		pw_log_set_level(v);
+		if (pw_log_set_level_string(value) < 0)
+			pw_log_warn("Ignoring unknown settings metadata log.level '%s'", value);
 	} else if (spa_streq(key, "clock.rate")) {
 		v = value ? atoi(value) : 0;
 		s->clock_rate = v == 0 ? d->clock_rate : v;
@@ -212,6 +213,7 @@
 	d->clock_min_quantum = get_default_int(p, "default.clock.min-quantum", DEFAULT_CLOCK_MIN_QUANTUM);
 	d->clock_max_quantum = get_default_int(p, "default.clock.max-quantum", DEFAULT_CLOCK_MAX_QUANTUM);
 	d->clock_quantum_limit = get_default_int(p, "default.clock.quantum-limit", DEFAULT_CLOCK_QUANTUM_LIMIT);
+	d->clock_quantum_floor = get_default_int(p, "default.clock.quantum-floor", DEFAULT_CLOCK_QUANTUM_FLOOR);
 	d->video_size.width = get_default_int(p, "default.video.width", DEFAULT_VIDEO_WIDTH);
 	d->video_size.height = get_default_int(p, "default.video.height", DEFAULT_VIDEO_HEIGHT);
 	d->video_rate.num = get_default_int(p, "default.video.rate.num", DEFAULT_VIDEO_RATE_NUM);
@@ -227,12 +229,16 @@
 	d->check_quantum = get_default_bool(p, "settings.check-quantum", DEFAULT_CHECK_QUANTUM);
 	d->check_rate = get_default_bool(p, "settings.check-rate", DEFAULT_CHECK_RATE);
 
+	d->link_max_buffers = SPA_MAX(d->link_max_buffers, 1u);
+
 	d->clock_quantum_limit = SPA_CLAMP(d->clock_quantum_limit,
-			CLOCK_MIN_QUANTUM, CLOCK_MAX_QUANTUM);
+			CLOCK_QUANTUM_FLOOR, CLOCK_QUANTUM_LIMIT);
+	d->clock_quantum_floor = SPA_CLAMP(d->clock_quantum_floor,
+			CLOCK_QUANTUM_FLOOR, d->clock_quantum_limit);
 	d->clock_max_quantum = SPA_CLAMP(d->clock_max_quantum,
-			CLOCK_MIN_QUANTUM, d->clock_quantum_limit);
+			d->clock_quantum_floor, d->clock_quantum_limit);
 	d->clock_min_quantum = SPA_CLAMP(d->clock_min_quantum,
-			CLOCK_MIN_QUANTUM, d->clock_max_quantum);
+			d->clock_quantum_floor, d->clock_max_quantum);
 	d->clock_quantum = SPA_CLAMP(d->clock_quantum,
 			d->clock_min_quantum, d->clock_max_quantum);
 }

pipewire-1.0.1.tar.bz2/src/pipewire/stream.c -> pipewire-1.2.0.tar.gz/src/pipewire/stream.c Changed

@@ -13,6 +13,7 @@
 #include <spa/param/format-utils.h>
 #include <spa/node/io.h>
 #include <spa/node/utils.h>
+#include <spa/utils/cleanup.h>
 #include <spa/utils/ringbuffer.h>
 #include <spa/pod/filter.h>
 #include <spa/pod/dynamic.h>
@@ -20,7 +21,6 @@
 
 #define PW_ENABLE_DEPRECATED
 
-#include <pipewire/cleanup.h>
 #include "pipewire/pipewire.h"
 #include "pipewire/stream.h"
 #include "pipewire/private.h"
@@ -34,8 +34,6 @@
 
 static bool mlock_warned = false;
 
-static uint32_t mappable_dataTypes = (1<<SPA_DATA_MemFd);
-
 struct buffer {
 	struct pw_buffer this;
 	uint32_t id;
@@ -95,14 +93,10 @@
 	struct spa_hook_list hooks;
 	struct spa_callbacks callbacks;
 
-	struct spa_io_clock *clock;
-	struct spa_io_position *position;
 	struct spa_io_buffers *io;
 	struct spa_io_rate_match *rate_match;
 	uint32_t rate_queued;
-	struct {
-		struct spa_io_position *position;
-	} rt;
+	uint64_t rate_size;
 
 	uint64_t port_change_mask_all;
 	struct spa_port_info port_info;
@@ -153,11 +147,10 @@
 	unsigned int drained:1;
 	unsigned int allow_mlock:1;
 	unsigned int warn_mlock:1;
-	unsigned int process_rt:1;
-	unsigned int driving:1;
 	unsigned int using_trigger:1;
 	unsigned int trigger:1;
 	unsigned int early_process:1;
+	unsigned int trigger_done_rt:1;
 	int in_set_param;
 	int in_emit_param_changed;
 };
@@ -220,28 +213,31 @@
 	pw_log_debug("dataType: %u", dataType);
 	if (dataType & (1u << SPA_DATA_MemPtr)) {
 		SPA_POD_VALUE(struct spa_pod_int, &vals0) =
-			dataType | mappable_dataTypes;
+			dataType | (1<<SPA_DATA_MemFd);
 		pw_log_debug("Change dataType: %u -> %u", dataType,
 				SPA_POD_VALUE(struct spa_pod_int, &vals0));
 	}
 }
 
-static struct param *add_param(struct stream *impl,
+static int add_param(struct stream *impl,
 		uint32_t id, uint32_t flags, const struct spa_pod *param)
 {
 	struct param *p;
 	int idx;
 
-	if (param == NULL || !spa_pod_is_object(param)) {
-		errno = EINVAL;
-		return NULL;
-	}
+	if (param != NULL && !spa_pod_is_object(param))
+		return -EINVAL;
+	if (param == NULL || !spa_pod_object_has_props((struct spa_pod_object*)param))
+		return 0;
+
+	pw_log_pod(SPA_LOG_LEVEL_DEBUG, param);
+
 	if (id == SPA_ID_INVALID)
 		id = SPA_POD_OBJECT_ID(param);
 
 	p = malloc(sizeof(struct param) + SPA_POD_SIZE(param));
 	if (p == NULL)
-		return NULL;
+		return -errno;
 
 	p->id = id;
 	p->flags = flags;
@@ -266,7 +262,7 @@
 		impl->port_paramsidx.flags |= SPA_PARAM_INFO_READ;
 		impl->port_paramsidx.user++;
 	}
-	return p;
+	return 0;
 }
 
 static void clear_params(struct stream *impl, uint32_t id)
@@ -326,10 +322,8 @@
 		}
 	}
 	for (i = 0; i < n_params; i++) {
-		if (add_param(impl, id, 0, paramsi) == NULL) {
-			res = -errno;
+		if ((res = add_param(impl, id, 0, paramsi)) < 0)
 			break;
-		}
 	}
 	return res;
 }
@@ -420,9 +414,8 @@
 
 static inline uint32_t update_requested(struct stream *impl)
 {
-	uint32_t index, id, res = 0;
+	uint32_t index, id;
 	struct buffer *buffer;
-	struct spa_io_rate_match *r = impl->rate_match;
 
 	if (spa_ringbuffer_get_read_index(&impl->dequeued.ring, &index) < 1) {
 		pw_log_debug("%p: no free buffers %d", impl, impl->n_buffers);
@@ -431,42 +424,21 @@
 
 	id = impl->dequeued.idsindex & MASK_BUFFERS;
 	buffer = &impl->buffersid;
-	if (r) {
-		buffer->this.requested = r->size;
-		res = r->size > 0 ? 1 : 0;
-	} else {
-		buffer->this.requested = impl->quantum;
-		res = 1;
-	}
+	buffer->this.requested = impl->rate_size;
+
 	pw_log_trace_fp("%p: update buffer:%u req:%"PRIu64, impl, id, buffer->this.requested);
-	return res;
-}
 
-static int
-do_call_process(struct spa_loop *loop,
-                 bool async, uint32_t seq, const void *data, size_t size, void *user_data)
-{
-	struct stream *impl = user_data;
-	struct pw_stream *stream = &impl->this;
-	pw_log_trace_fp("%p: do process", stream);
-	if (!impl->disconnecting)
-		pw_stream_emit_process(stream);
-	return 0;
+	return buffer->this.requested > 0 ? 1 : 0;
 }
 
 static inline void call_process(struct stream *impl)
 {
-	pw_log_trace_fp("%p: call process rt:%u", impl, impl->process_rt);
+	pw_log_trace_fp("%p: call process buffers:%d", impl, impl->n_buffers);
 	if (impl->n_buffers == 0 ||
 	    (impl->direction == SPA_DIRECTION_OUTPUT && update_requested(impl) <= 0))
 		return;
-	if (impl->process_rt) {
-		if (impl->rt_callbacks.funcs)
-			spa_callbacks_call_fast(&impl->rt_callbacks, struct pw_stream_events, process, 0);
-	} else {
-		pw_loop_invoke(impl->main_loop,
-			do_call_process, 1, NULL, 0, false, impl);
-	}
+	if (impl->rt_callbacks.funcs)
+		spa_callbacks_call_fast(&impl->rt_callbacks, struct pw_stream_events, process, 0);
 }
 
 static int
@@ -500,17 +472,14 @@
 
 static void call_trigger_done(struct stream *impl)
 {
-	pw_loop_invoke(impl->main_loop,
-		do_call_trigger_done, 1, NULL, 0, false, impl);
-}
-
-static int
-do_set_position(struct spa_loop *loop,
-		bool async, uint32_t seq, const void *data, size_t size, void *user_data)
-{
-	struct stream *impl = user_data;
-	impl->rt.position = impl->position;
-	return 0;
+	pw_log_trace_fp("%p: call trigger_done rt:%u", impl, impl->trigger_done_rt);
+	if (impl->trigger_done_rt) {
+		if (impl->rt_callbacks.funcs)
+			spa_callbacks_call(&impl->rt_callbacks, struct pw_stream_events, trigger_done, 2);
+	} else {
+		pw_loop_invoke(impl->main_loop,
+			do_call_trigger_done, 1, NULL, 0, false, impl);
+	}
 }
 
 static int impl_set_io(void *object, uint32_t id, void *data, size_t size)
@@ -521,26 +490,6 @@
 	pw_log_debug("%p: set io id %d (%s) %p %zd", impl, id,
 			spa_debug_type_find_name(spa_type_io, id), data, size);
 
-	switch(id) {
-	case SPA_IO_Clock:
-		if (data && size >= sizeof(struct spa_io_clock))
-			impl->clock = data;
-		else
-			impl->clock = NULL;
-		break;
-	case SPA_IO_Position:
-		if (data && size >= sizeof(struct spa_io_position))
-			impl->position = data;
-		else
-			impl->position = NULL;
-
-		pw_loop_invoke(impl->data_loop,
-				do_set_position, 1, NULL, 0, true, impl);
-		break;
-	default:
-		break;
-	}
-	impl->driving = impl->clock && impl->position && impl->position->clock.id == impl->clock->id;
 	pw_stream_emit_io_changed(stream, id, data, size);
 
 	return 0;
@@ -607,9 +556,50 @@
 	impl->in_emit_param_changed--;
 }
 
+static void emit_node_info(struct stream *d, bool full)
+{
+	uint32_t i;
+	uint64_t old = full ? d->info.change_mask : 0;
+	if (full)
+		d->info.change_mask = d->change_mask_all;
+	if (d->info.change_mask != 0) {
+		if (d->info.change_mask & SPA_NODE_CHANGE_MASK_PARAMS) {
+			for (i = 0; i < d->info.n_params; i++) {
+				if (d->paramsi.user > 0) {
+					d->paramsi.flags ^= SPA_PARAM_INFO_SERIAL;
+					d->paramsi.user = 0;
+				}
+			}
+		}
+		spa_node_emit_info(&d->hooks, &d->info);
+	}
+	d->info.change_mask = old;
+}
+
+static void emit_port_info(struct stream *d, bool full)
+{
+	uint32_t i;
+	uint64_t old = full ? d->port_info.change_mask : 0;
+	if (full)
+		d->port_info.change_mask = d->port_change_mask_all;
+	if (d->port_info.change_mask != 0) {
+		if (d->port_info.change_mask & SPA_PORT_CHANGE_MASK_PARAMS) {
+			for (i = 0; i < d->port_info.n_params; i++) {
+				if (d->port_paramsi.user > 0) {
+					d->port_paramsi.flags ^= SPA_PARAM_INFO_SERIAL;
+					d->port_paramsi.user = 0;
+				}
+			}
+		}
+		spa_node_emit_port_info(&d->hooks, d->direction, 0, &d->port_info);
+	}
+	d->port_info.change_mask = old;
+}
+
 static int impl_set_param(void *object, uint32_t id, uint32_t flags, const struct spa_pod *param)
 {
 	struct stream *impl = object;
+	struct pw_stream *stream = &impl->this;
 
 	if (id != SPA_PARAM_Props)
 		return -ENOTSUP;
@@ -617,12 +607,17 @@
 	if (impl->in_set_param == 0)
 		emit_param_changed(impl, id, param);
 
+	if (stream->state == PW_STREAM_STATE_ERROR)
+		return stream->error_res;
+
+	emit_node_info(impl, false);
+	emit_port_info(impl, false);
 	return 0;
 }
 
 static inline void copy_position(struct stream *impl, int64_t queued)
 {
-	struct spa_io_position *p = impl->rt.position;
+	struct spa_io_position *p = impl->this.node->rt.position;
 
 	SPA_SEQ_WRITE(impl->seq);
 	if (SPA_LIKELY(p != NULL)) {
@@ -637,8 +632,13 @@
 		impl->time.queued = queued;
 		impl->quantum = p->clock.duration;
 	}
-	if (SPA_LIKELY(impl->rate_match != NULL))
+	if (SPA_LIKELY(impl->rate_match != NULL)) {
 		impl->rate_queued = impl->rate_match->delay;
+		impl->rate_size = impl->rate_match->size;
+	} else {
+		impl->rate_queued = 0;
+		impl->rate_size = impl->quantum;
+	}
 	SPA_SEQ_WRITE(impl->seq);
 }
 
@@ -665,17 +665,13 @@
 		break;
 	case SPA_NODE_COMMAND_Start:
 		if (stream->state == PW_STREAM_STATE_PAUSED) {
-			pw_log_debug("%p: start %d", stream, impl->direction);
+			pw_log_debug("%p: start direction:%d", stream, impl->direction);
 
 			if (impl->direction == SPA_DIRECTION_INPUT) {
 				if (impl->io != NULL)
 					impl->io->status = SPA_STATUS_NEED_DATA;
 			}
-			else if (!impl->process_rt && !impl->driving) {
-				copy_position(impl, impl->queued.incount);
-				call_process(impl);
-			}
-
+			copy_position(impl, impl->queued.incount);
 			stream_set_state(stream, PW_STREAM_STATE_STREAMING, 0, NULL);
 		}
 		break;
@@ -686,46 +682,6 @@
 	return 0;
 }
 
-static void emit_node_info(struct stream *d, bool full)
-{
-	uint32_t i;
-	uint64_t old = full ? d->info.change_mask : 0;
-	if (full)
-		d->info.change_mask = d->change_mask_all;
-	if (d->info.change_mask != 0) {
-		if (d->info.change_mask & SPA_NODE_CHANGE_MASK_PARAMS) {
-			for (i = 0; i < d->info.n_params; i++) {
-				if (d->paramsi.user > 0) {
-					d->paramsi.flags ^= SPA_PARAM_INFO_SERIAL;
-					d->paramsi.user = 0;
-				}
-			}
-		}
-		spa_node_emit_info(&d->hooks, &d->info);
-	}
-	d->info.change_mask = old;
-}
-
-static void emit_port_info(struct stream *d, bool full)
-{
-	uint32_t i;
-	uint64_t old = full ? d->port_info.change_mask : 0;
-	if (full)
-		d->port_info.change_mask = d->port_change_mask_all;
-	if (d->port_info.change_mask != 0) {
-		if (d->port_info.change_mask & SPA_PORT_CHANGE_MASK_PARAMS) {
-			for (i = 0; i < d->port_info.n_params; i++) {
-				if (d->port_paramsi.user > 0) {
-					d->port_paramsi.flags ^= SPA_PARAM_INFO_SERIAL;
-					d->port_paramsi.user = 0;
-				}
-			}
-		}
-		spa_node_emit_port_info(&d->hooks, d->direction, 0, &d->port_info);
-	}
-	d->port_info.change_mask = old;
-}
-
 static int impl_add_listener(void *object,
 		struct spa_hook *listener,
 		const struct spa_node_events *events,
@@ -850,9 +806,11 @@
 		if (SPA_FLAG_IS_SET(b->flags, BUFFER_FLAG_MAPPED)) {
 			for (j = 0; j < b->this.buffer->n_datas; j++) {
 				struct spa_data *d = &b->this.buffer->datasj;
-				pw_log_debug("%p: clear buffer %d mem",
-						stream, b->id);
-				unmap_data(impl, d);
+				if (SPA_FLAG_IS_SET(d->flags, SPA_DATA_FLAG_MAPPABLE)) {
+					pw_log_debug("%p: clear buffer %d mem",
+							stream, b->id);
+					unmap_data(impl, d);
+				}
 			}
 		}
 	}
@@ -901,6 +859,7 @@
 {
 	struct stream *impl = object;
 	struct pw_stream *stream = &impl->this;
+	uint32_t user;
 	int res;
 
 	pw_log_debug("%p: port:%d.%d id:%d (%s) param:%p disconnecting:%d", impl,
@@ -920,6 +879,7 @@
 	switch (id) {
 	case SPA_PARAM_Format:
 		clear_buffers(stream);
+		user = impl->paramsNODE_Format.user;
 		break;
 	case SPA_PARAM_Latency:
 		parse_latency(stream, param);
@@ -933,10 +893,17 @@
 	if (stream->state == PW_STREAM_STATE_ERROR)
 		return stream->error_res;
 
+	switch (id) {
+	case SPA_PARAM_Format:
+		if (user != impl->paramsNODE_Format.user)
+			res++;
+		break;
+	}
+
 	emit_node_info(impl, false);
 	emit_port_info(impl, false);
 
-	return 0;
+	return res;
 }
 
 static int impl_port_use_buffers(void *object,
@@ -973,7 +940,7 @@
 		if (SPA_FLAG_IS_SET(impl_flags, PW_STREAM_FLAG_MAP_BUFFERS)) {
 			for (j = 0; j < buffersi->n_datas; j++) {
 				struct spa_data *d = &buffersi->datasj;
-				if ((mappable_dataTypes & (1<<d->type)) > 0) {
+				if (SPA_FLAG_IS_SET(d->flags, SPA_DATA_FLAG_MAPPABLE)) {
 					if ((res = map_data(impl, d, prot)) < 0)
 						return res;
 					SPA_FLAG_SET(b->flags, BUFFER_FLAG_MAPPED);
@@ -983,15 +950,16 @@
 					return -EINVAL;
 				}
 				buf_size += d->maxsize;
+				pw_log_debug("%p:  data:%d type:%d flags:%08x size:%d", stream, j,
+						d->type, d->flags, d->maxsize);
 			}
-
 			if (size > 0 && buf_size != size) {
 				pw_log_error("%p: invalid buffer size %d", stream, buf_size);
 				return -EINVAL;
 			} else
 				size = buf_size;
 		}
-		pw_log_debug("%p: got buffer id:%d datas:%d, mapped size %d", stream, i,
+		pw_log_debug("%p: got buffer id:%d datas:%d mapped size %d", stream, i,
 				buffersi->n_datas, size);
 	}
 	impl->n_buffers = n_buffers;
@@ -1028,7 +996,7 @@
 	struct stream *impl = object;
 	struct pw_stream *stream = &impl->this;
 	struct spa_io_buffers *io = impl->io;
-	struct buffer *b;
+	struct buffer *b = NULL;
 
 	if (io == NULL)
 		return -EIO;
@@ -1045,10 +1013,13 @@
 				SPA_ATOMIC_INC(b->busy->count);
 		}
 	}
-	if (!queue_is_empty(impl, &impl->dequeued)) {
-		copy_position(impl, impl->dequeued.incount);
+
+	copy_position(impl, impl->dequeued.incount);
+	if (b != NULL)
+		b->this.time = impl->time.now;
+
+	if (!queue_is_empty(impl, &impl->dequeued))
 		call_process(impl);
-	}
 
 	if (io->status != SPA_STATUS_NEED_DATA || io->buffer_id == SPA_ID_INVALID) {
 		/* pop buffer to recycle */
@@ -1061,7 +1032,7 @@
 		}
 		io->status = SPA_STATUS_NEED_DATA;
 	}
-	if (impl->driving && impl->using_trigger)
+	if (stream->node->driving && impl->using_trigger)
 		call_trigger_done(impl);
 
 	return SPA_STATUS_NEED_DATA | SPA_STATUS_HAVE_DATA;
@@ -1096,16 +1067,6 @@
 			impl->drained = false;
 			io->buffer_id = b->id;
 			res = io->status = SPA_STATUS_HAVE_DATA;
-			/* we have a buffer, if we are not rt and don't follow
-			 * any rate matching and there are no more
-			 * buffers queued and there is a buffer to dequeue, ask for
-			 * more buffers so that we have one in the next round.
-			 * If we are using rate matching we need to wait until the
-			 * rate matching node (audioconvert) has been scheduled to
-			 * update the values. */
-			ask_more = !impl->process_rt && impl->rate_match == NULL &&
-				(impl->early_process || queue_is_empty(impl, &impl->queued)) &&
-				!queue_is_empty(impl, &impl->dequeued);
 			pw_log_trace_fp("%p: pop %d %p ask_more:%u %p", stream, b->id, io,
 					ask_more, impl->rate_match);
 		} else if (impl->draining || impl->drained) {
@@ -1120,30 +1081,21 @@
 			pw_log_trace_fp("%p: no more buffers %p", stream, io);
 			ask_more = true;
 		}
-	} else {
-		ask_more = !impl->process_rt &&
-			(impl->early_process || queue_is_empty(impl, &impl->queued)) &&
-			!queue_is_empty(impl, &impl->dequeued);
 	}
 
 	copy_position(impl, impl->queued.outcount);
 
-	if (!impl->draining && !impl->driving) {
+	if (!impl->draining && !stream->node->driving && ask_more) {
 		/* we're not draining, not a driver check if we need to get
 		 * more buffers */
-		if (ask_more) {
-			call_process(impl);
-			/* realtime, we can try again now if there is something.
-			 * non-realtime, we will have to try in the next round */
-			if (impl->process_rt &&
-			    (impl->draining || !queue_is_empty(impl, &impl->queued)))
-				goto again;
-		}
+		call_process(impl);
+		if (impl->draining || !queue_is_empty(impl, &impl->queued))
+			goto again;
 	}
 
 	pw_log_trace_fp("%p: res %d", stream, res);
 
-	if (impl->driving && impl->using_trigger && res != SPA_STATUS_HAVE_DATA)
+	if (stream->node->driving && impl->using_trigger && res != SPA_STATUS_HAVE_DATA)
 		call_trigger_done(impl);
 
 	return res;
@@ -1257,17 +1209,21 @@
 		}
 
 		pod = spa_pod_get_values(type, &n_vals, &choice);
+		if (n_vals == 0) {
+			free(c);
+			return -EINVAL;
+		}
 
 		c->type = SPA_POD_TYPE(pod);
 		if (spa_pod_is_float(pod))
 			vals = SPA_POD_BODY(pod);
 		else if (spa_pod_is_double(pod)) {
 			double *v = SPA_POD_BODY(pod);
-			dbl0 = v0;
+			dbl0 = (float)v0;
 			if (n_vals > 1)
-				dbl1 = v1;
+				dbl1 = (float)v1;
 			if (n_vals > 2)
-				dbl2 = v2;
+				dbl2 = (float)v2;
 			vals = dbl;
 		}
 		else if (spa_pod_is_bool(pod) && n_vals > 0) {
@@ -1345,7 +1301,7 @@
 				if (spa_pod_get_double(&prop->value, &value_d) < 0)
 					continue;
 				n_values = 1;
-				value_f = value_d;
+				value_f = (float)value_d;
 				values = &value_f;
 				break;
 			case SPA_TYPE_Bool:
@@ -1516,10 +1472,12 @@
 
 	if (pw_properties_get(props, PW_KEY_STREAM_IS_LIVE) == NULL)
 		pw_properties_set(props, PW_KEY_STREAM_IS_LIVE, "true");
-	if (pw_properties_get(props, PW_KEY_NODE_NAME) == NULL && extra) {
-		str = pw_properties_get(extra, PW_KEY_APP_NAME);
-		if (str == NULL)
-			str = pw_properties_get(extra, PW_KEY_APP_PROCESS_BINARY);
+	if ((str = pw_properties_get(props, PW_KEY_NODE_NAME)) == NULL) {
+		if (extra) {
+			str = pw_properties_get(extra, PW_KEY_APP_NAME);
+			if (str == NULL)
+				str = pw_properties_get(extra, PW_KEY_APP_PROCESS_BINARY);
+		}
 		if (str == NULL)
 			str = name;
 		pw_properties_set(props, PW_KEY_NODE_NAME, str);
@@ -1912,7 +1870,7 @@
 	else
 		impl->node_methods.process = impl_node_process_output;
 
-	impl->process_rt = SPA_FLAG_IS_SET(flags, PW_STREAM_FLAG_RT_PROCESS);
+	impl->trigger_done_rt = SPA_FLAG_IS_SET(flags, PW_STREAM_FLAG_RT_TRIGGER_DONE);
 	impl->early_process = SPA_FLAG_IS_SET(flags, PW_STREAM_FLAG_EARLY_PROCESS);
 
 	impl->impl_node.iface = SPA_INTERFACE_INIT(
@@ -1936,9 +1894,7 @@
 	/* we're always RT safe, if the stream was marked RT_PROCESS,
 	 * the callback must be RT safe */
 	impl->info.flags = SPA_NODE_FLAG_RT;
-	/* if the callback was not marked RT_PROCESS, we will offload
-	 * the process callback in the main thread and we are ASYNC */
-	if (!impl->process_rt || SPA_FLAG_IS_SET(flags, PW_STREAM_FLAG_ASYNC))
+	if (SPA_FLAG_IS_SET(flags, PW_STREAM_FLAG_ASYNC))
 		impl->info.flags |= SPA_NODE_FLAG_ASYNC;
 	impl->info.props = &stream->properties->dict;
 	impl->paramsNODE_PropInfo = SPA_PARAM_INFO(SPA_PARAM_PropInfo, 0);
@@ -1982,9 +1938,9 @@
 	impl->disconnecting = false;
 	impl->drained = false;
 	impl->draining = false;
-	impl->driving = false;
 	impl->trigger = false;
 	impl->using_trigger = false;
+
 	stream_set_state(stream, PW_STREAM_STATE_CONNECTING, 0, NULL);
 
 	if (target_id != PW_ID_ANY)
@@ -2001,23 +1957,47 @@
 		if (pw_properties_get(stream->properties, PW_KEY_NODE_DONT_RECONNECT) == NULL)
 			pw_properties_set(stream->properties, PW_KEY_NODE_DONT_RECONNECT, "true");
 
+	if (!SPA_FLAG_IS_SET(flags, PW_STREAM_FLAG_RT_PROCESS)) {
+		if (pw_properties_get(stream->properties, PW_KEY_NODE_LOOP_CLASS) == NULL)
+			pw_properties_set(stream->properties, PW_KEY_NODE_LOOP_CLASS, "main");
+		pw_properties_set(stream->properties, PW_KEY_NODE_ASYNC, "true");
+	}
 	if (flags & PW_STREAM_FLAG_DRIVER)
 		pw_properties_set(stream->properties, PW_KEY_NODE_DRIVER, "true");
 	if (flags & PW_STREAM_FLAG_TRIGGER) {
 		pw_properties_set(stream->properties, PW_KEY_NODE_TRIGGER, "true");
 		impl->trigger = true;
 	}
-	if ((pw_properties_get(stream->properties, PW_KEY_MEDIA_CLASS) == NULL)) {
+	if (((str = pw_properties_get(stream->properties, PW_KEY_MEDIA_CLASS)) == NULL)) {
 		const char *media_type = pw_properties_get(stream->properties, PW_KEY_MEDIA_TYPE);
 		pw_properties_setf(stream->properties, PW_KEY_MEDIA_CLASS, "Stream/%s/%s",
 				direction == PW_DIRECTION_INPUT ? "Input" : "Output",
 				media_type ? media_type : get_media_class(impl));
+	} else {
+		enum pw_direction expected;
+
+		if (strstr(str, "Input") || strstr(str, "Sink"))
+			expected = PW_DIRECTION_INPUT;
+		else if (strstr(str, "Output") || strstr(str, "Source"))
+			expected = PW_DIRECTION_OUTPUT;
+		else
+			expected = direction;
+
+		if (direction != expected)
+			pw_log_warn("media.class %s does not expect %s stream direction", str,
+					direction == PW_DIRECTION_INPUT ? "Input" : "Output");
+
 	}
 	if ((str = pw_properties_get(stream->properties, PW_KEY_FORMAT_DSP)) != NULL)
 		pw_properties_set(impl->port_props, PW_KEY_FORMAT_DSP, str);
 	else if (impl->media_type == SPA_MEDIA_TYPE_application &&
 	    impl->media_subtype == SPA_MEDIA_SUBTYPE_control)
 		pw_properties_set(impl->port_props, PW_KEY_FORMAT_DSP, "8 bit raw midi");
+	if (pw_properties_get(impl->port_props, PW_KEY_PORT_GROUP) == NULL)
+		pw_properties_set(impl->port_props, PW_KEY_PORT_GROUP, "stream.0");
+
+	if ((str = pw_properties_get(stream->properties, PW_KEY_NODE_ASYNC)) != NULL && spa_atob(str))
+		SPA_FLAG_SET(impl->info.flags, SPA_NODE_FLAG_ASYNC);
 
 	match = MATCH_INIT(stream);
 	pw_context_conf_section_match_rules(impl->context, "stream.rules",
@@ -2035,7 +2015,7 @@
 		struct spa_fraction q;
 		if (sscanf(str, "%u/%u", &q.num, &q.denom) == 2 && q.denom != 0) {
 			pw_properties_setf(stream->properties, PW_KEY_NODE_FORCE_RATE,
-					"1/%u", q.denom);
+					"%u", q.denom);
 			pw_properties_setf(stream->properties, PW_KEY_NODE_FORCE_QUANTUM,
 					"%u", q.num);
 		}
@@ -2050,8 +2030,6 @@
 	if ((str = pw_properties_get(stream->properties, "mem.allow-mlock")) != NULL)
 		impl->allow_mlock = pw_properties_parse_bool(str);
 
-	impl->port_info.props = &impl->port_props->dict;
-
 	if (stream->core == NULL) {
 		stream->core = pw_context_connect(impl->context,
 				pw_properties_copy(stream->properties), 0);
@@ -2078,8 +2056,12 @@
 		pw_properties_set(props, "channelmix.normalize", "true");
 		pw_properties_set(props, PW_KEY_PORT_IGNORE_LATENCY, "true");
 	}
+	if (pw_properties_get(props, PW_KEY_PORT_GROUP) == NULL)
+		pw_properties_set(props, PW_KEY_PORT_GROUP, "stream.0");
 
-	if (impl->media_type == SPA_MEDIA_TYPE_audio) {
+	if (impl->media_type == SPA_MEDIA_TYPE_audio
+			|| (impl->media_type == SPA_MEDIA_TYPE_video
+				&& pw_properties_get(props, "video.adapt.converter"))) {
 		factory = pw_context_find_factory(impl->context, "adapter");
 		if (factory == NULL) {
 			pw_log_error("%p: no adapter factory found", stream);
@@ -2199,9 +2181,10 @@
 	if ((res = update_params(impl, SPA_ID_INVALID, params, n_params)) < 0)
 		return res;
 
-	emit_node_info(impl, false);
-	emit_port_info(impl, false);
-
+	if (impl->in_emit_param_changed == 0) {
+		emit_node_info(impl, false);
+		emit_port_info(impl, false);
+	}
 	return res;
 }
 
@@ -2339,13 +2322,14 @@
 {
 	struct stream *impl = SPA_CONTAINER_OF(stream, struct stream, this);
 	uintptr_t seq1, seq2;
-	uint32_t buffered, quantum, index;
+	uint32_t buffered, quantum, index, rate_size;
 	int32_t avail_buffers;
 
 	do {
 		seq1 = SPA_SEQ_READ(impl->seq);
 		memcpy(time, &impl->time, SPA_MIN(size, sizeof(struct pw_time)));
 		buffered = impl->rate_queued;
+		rate_size = impl->rate_size;
 		quantum = impl->quantum;
 		seq2 = SPA_SEQ_READ(impl->seq);
 	} while (!SPA_SEQ_READ_SUCCESS(seq1, seq2));
@@ -2355,7 +2339,7 @@
 	else
 		time->queued = (int64_t)(impl->queued.incount - time->queued);
 
-	time->delay += ((impl->latency.min_quantum + impl->latency.max_quantum) / 2) * quantum;
+	time->delay += (int64_t)(((impl->latency.min_quantum + impl->latency.max_quantum) / 2.0f) * quantum);
 	time->delay += (impl->latency.min_rate + impl->latency.max_rate) / 2;
 	time->delay += ((impl->latency.min_ns + impl->latency.max_ns) / 2) * time->rate.denom / SPA_NSEC_PER_SEC;
 
@@ -2366,8 +2350,10 @@
 		time->buffered = buffered;
 	if (size >= offsetof(struct pw_time, avail_buffers))
 		time->queued_buffers = impl->n_buffers - avail_buffers;
-	if (size >= sizeof(struct pw_time))
+	if (size >= offsetof(struct pw_time, size))
 		time->avail_buffers = avail_buffers;
+	if (size >= sizeof(struct pw_time))
+		time->size = rate_size;
 
 	pw_log_trace_fp("%p: %"PRIi64" %"PRIi64" %"PRIu64" %d/%d %"PRIu64" %"
 			PRIu64" %"PRIu64" %"PRIu64" %"PRIu64" %d/%d", stream,
@@ -2379,6 +2365,21 @@
 	return 0;
 }
 
+SPA_EXPORT
+uint64_t pw_stream_get_nsec(struct pw_stream *stream)
+{
+	struct timespec ts;
+	clock_gettime(CLOCK_MONOTONIC, &ts);
+	return SPA_TIMESPEC_TO_NSEC(&ts);
+}
+
+SPA_EXPORT
+struct pw_loop *pw_stream_get_data_loop(struct pw_stream *stream)
+{
+	struct stream *impl = SPA_CONTAINER_OF(stream, struct stream, this);
+	return impl->data_loop;
+}
+
 static int
 do_trigger_deprecated(struct spa_loop *loop,
                  bool async, uint32_t seq, const void *data, size_t size, void *user_data)
@@ -2432,7 +2433,7 @@
 		return res;
 
 	if (impl->direction == SPA_DIRECTION_OUTPUT &&
-	    impl->driving && !impl->using_trigger) {
+	    stream->node->driving && !impl->using_trigger) {
 		pw_log_debug("deprecated: use pw_stream_trigger_process() to drive the stream.");
 		res = pw_loop_invoke(impl->data_loop,
 			do_trigger_deprecated, 1, NULL, 0, false, impl);
@@ -2500,8 +2501,7 @@
 SPA_EXPORT
 bool pw_stream_is_driving(struct pw_stream *stream)
 {
-	struct stream *impl = SPA_CONTAINER_OF(stream, struct stream, this);
-	return impl->driving;
+	return stream->node->driving;
 }
 
 static int
@@ -2511,8 +2511,7 @@
 	struct stream *impl = user_data;
 	int res;
 	if (impl->direction == SPA_DIRECTION_OUTPUT) {
-		if (impl->process_rt)
-			call_process(impl);
+		call_process(impl);
 		res = impl->node_methods.process(impl);
 	} else {
 		res = SPA_STATUS_NEED_DATA;
@@ -2540,16 +2539,14 @@
 	struct stream *impl = SPA_CONTAINER_OF(stream, struct stream, this);
 	int res = 0;
 
-	pw_log_trace_fp("%p: trigger:%d driving:%d", impl, impl->trigger, impl->driving);
+	pw_log_trace_fp("%p: trigger:%d driving:%d", impl, impl->trigger, stream->node->driving);
 
 	/* flag to check for old or new behaviour */
 	impl->using_trigger = true;
 
 	if (impl->trigger) {
 		pw_impl_node_trigger(stream->node);
-	} else if (impl->driving) {
-		if (!impl->process_rt)
-			call_process(impl);
+	} else if (stream->node->driving) {
 		res = pw_loop_invoke(impl->data_loop,
 			do_trigger_driver, 1, NULL, 0, false, impl);
 	} else {

pipewire-1.0.1.tar.bz2/src/pipewire/stream.h -> pipewire-1.2.0.tar.gz/src/pipewire/stream.h Changed

@@ -58,11 +58,15 @@
 
  * \li PW_DIRECTION_INPUT for a stream that *consumes* data. This can be a
  * stream that captures from a Source or a when the stream is used to
- * implement a Sink.
+ * implement a Sink. An application will use a \ref PW_DIRECTION_INPUT
+ * stream to record data. A virtual sound card will use a
+ * \ref PW_DIRECTION_INPUT stream to implement audio playback.
  *
  * \li PW_DIRECTION_OUTPUT for a stream that *produces* data. This can be a
  * stream that plays to a Sink or when the stream is used to implement
- * a Source.
+ * a Source. An application will use a \ref PW_DIRECTION_OUTPUT
+ * stream to produce data. A virtual sound card or camera will use a
+ * \ref PW_DIRECTION_OUTPUT stream to implement audio or video recording.
  *
  * \subsection ssec_stream_target Stream target
  *
@@ -141,6 +145,18 @@
  * The process event is emitted when PipeWire has emptied a buffer that
  * can now be refilled.
  *
+ * \section sec_stream_driving Driving the graph
+ *
+ * Starting in 0.3.34, it is possible for a stream to drive the graph.
+ * This allows interrupt-driven scheduling for drivers implemented as
+ * PipeWire streams, without having to reimplement the stream as a SPA
+ * plugin.
+ *
+ * A stream cannot drive the graph unless it is in the
+ * \ref PW_STREAM_STATE_STREAMING state and \ref pw_stream_is_driving() returns
+ * true. It must then use pw_stream_trigger_process() to start the graph
+ * cycle.
+ *
  * \section sec_stream_disconnect Disconnect
  *
  * Use \ref pw_stream_disconnect() to disconnect a stream after use.
@@ -187,19 +203,29 @@
 };
 
 /** a buffer structure obtained from pw_stream_dequeue_buffer(). The size of this
-  * structure can grow as more field are added in the future */
+  * structure can grow as more fields are added in the future */
 struct pw_buffer {
 	struct spa_buffer *buffer;	/**< the spa buffer */
-	void *user_data;		/**< user data attached to the buffer */
+	void *user_data;		/**< user data attached to the buffer. The user of
+					  *  the stream can set custom data associated with the
+					  *  buffer, typically in the add_buffer event. Any
+					  *  cleanup should be performed in the remove_buffer
+					  *  event. The user data is returned unmodified each
+					  *  time a buffer is dequeued. */
 	uint64_t size;			/**< This field is set by the user and the sum of
-					  *  all queued buffer is returned in the time info.
+					  *  all queued buffers is returned in the time info.
 					  *  For audio, it is advised to use the number of
-					  *  samples in the buffer for this field. */
+					  *  frames in the buffer for this field. */
 	uint64_t requested;		/**< For playback streams, this field contains the
 					  *  suggested amount of data to provide. For audio
-					  *  streams this will be the amount of samples
+					  *  streams this will be the amount of frames
 					  *  required by the resampler. This field is 0
 					  *  when no suggestion is provided. Since 0.3.49 */
+	uint64_t time;			/**< For capture streams, this field contains the
+					  *  cycle time in nanoseconds when this buffer was
+					  *  queued in the stream. It can be compared against
+					  *  the pw_time values or pw_stream_get_nsec()
+					  *  Since 1.0.5 */
 };
 
 struct pw_stream_control {
@@ -229,9 +255,8 @@
  * to the current time like this:
  *
  *\code{.c}
- *    struct timespec ts;
- *    clock_gettime(CLOCK_MONOTONIC, &ts);
- *    int64_t diff = SPA_TIMESPEC_TO_NSEC(&ts) - pw_time.now;
+ *    uint64_t now = pw_stream_get_nsec(stream);
+ *    int64_t diff = now - pw_time.now;
  *    int64_t elapsed = (pw_time.rate.denom * diff) / (pw_time.rate.num * SPA_NSEC_PER_SEC);
  *\endcode
  *
@@ -245,10 +270,10 @@
  *
  * pw_time.queued is the sum of all the pw_buffer.size fields of the buffers that are
  * currently queued in the stream but not yet processed. The application can choose
- * the units of this value, for example, time, samples or bytes (below expressed
- * as app.rate).
+ * the units of this value, for example, time, samples, frames or bytes (below
+ * expressed as app.rate).
  *
- * pw_time.buffered is format dependent, for audio/raw it contains the number of samples
+ * pw_time.buffered is format dependent, for audio/raw it contains the number of frames
  * that are buffered inside the resampler/converter.
  *
  * The total delay of data in a stream is the sum of the queued and buffered data
@@ -288,12 +313,12 @@
  *\endcode
  */
 struct pw_time {
-	int64_t now;			/**< the monotonic time in nanoseconds. This is the time
-					  *  when this time report was updated. It is usually
-					  *  updated every graph cycle. You can use the current
-					  *  monotonic time to calculate the elapsed time between
-					  *  this report and the current state and calculate
-					  *  updated ticks and delay values. */
+	int64_t now;			/**< the time in nanoseconds. This is the time when this
+					  *  time report was updated. It is usually updated every
+					  *  graph cycle. You can use pw_stream_get_nsec() to
+					  *  calculate the elapsed time between this report and
+					  *  the current time and calculate updated ticks and delay
+					  *  values. */
 	struct spa_fraction rate;	/**< the rate of \a ticks and delay. This is usually
 					  *  expressed in 1/<samplerate>. */
 	uint64_t ticks;			/**< the ticks at \a now. This is the current time that
@@ -312,10 +337,14 @@
 					  *  of the size fields in the pw_buffer that are
 					  *  currently queued */
 	uint64_t buffered;		/**< for audio/raw streams, this contains the extra
-					  *  number of samples buffered in the resampler.
+					  *  number of frames buffered in the resampler.
 					  *  Since 0.3.50. */
-	uint32_t queued_buffers;	/**< The number of buffers that are queued. Since 0.3.50 */
-	uint32_t avail_buffers;		/**< The number of buffers that can be dequeued. Since 0.3.50 */
+	uint32_t queued_buffers;	/**< the number of buffers that are queued. Since 0.3.50 */
+	uint32_t avail_buffers;		/**< the number of buffers that can be dequeued. Since 0.3.50 */
+	uint64_t size;			/**< for audio/raw playback streams, this contains the number of
+					  *  samples requested by the resampler for the current
+					  *  quantum. for audio/raw capture streams this will be the number
+					  *  of samples available for the current quantum. Since 1.1.0 */
 };
 
 #include <pipewire/port.h>
@@ -356,7 +385,10 @@
 	/** A command notify, Since 0.3.39:1 */
 	void (*command) (void *data, const struct spa_command *command);
 
-	/** a trigger_process completed. Since version 0.3.40:2 */
+	/** a trigger_process completed. Since version 0.3.40:2.
+	 *  This is normally called from the mainloop but since 1.1.0 it
+	 *  can also be called directly from the realtime data
+	 *  thread if the user is prepared to deal with this. */
 	void (*trigger_done) (void *data);
 };
 
@@ -371,7 +403,8 @@
 	PW_STREAM_FLAG_INACTIVE		= (1 << 1),	/**< start the stream inactive,
 							  *  pw_stream_set_active() needs to be
 							  *  called explicitly */
-	PW_STREAM_FLAG_MAP_BUFFERS	= (1 << 2),	/**< mmap the buffers except DmaBuf */
+	PW_STREAM_FLAG_MAP_BUFFERS	= (1 << 2),	/**< mmap the buffers except DmaBuf that is not
+							  *  explicitly marked as mappable. */
 	PW_STREAM_FLAG_DRIVER		= (1 << 3),	/**< be a driver */
 	PW_STREAM_FLAG_RT_PROCESS	= (1 << 4),	/**< call process from the realtime
 							  *  thread. You MUST use RT safe functions
@@ -401,9 +434,12 @@
 							  *  playback and when not using RT_PROCESS. It
 							  *  can be used to keep the maximum number of
 							  *  buffers queued. Since 0.3.81 */
+	PW_STREAM_FLAG_RT_TRIGGER_DONE	= (1 << 12),	/**< Call trigger_done from the realtime
+							  *  thread. You MUST use RT safe functions
+							  *  in the trigger_done callback. Since 1.1.0 */
 };
 
-/** Create a new unconneced \ref pw_stream
+/** Create a new unconnected \ref pw_stream
  * \return a newly allocated \ref pw_stream */
 struct pw_stream *
 pw_stream_new(struct pw_core *core,		/**< a \ref pw_core */
@@ -411,7 +447,7 @@
 	      struct pw_properties *props	/**< stream properties, ownership is taken */);
 
 struct pw_stream *
-pw_stream_new_simple(struct pw_loop *loop,	/**< a \ref pw_loop to use */
+pw_stream_new_simple(struct pw_loop *loop,	/**< a \ref pw_loop to use as the main loop */
 		     const char *name,		/**< a stream media name */
 		     struct pw_properties *props,/**< stream properties, ownership is taken */
 		     const struct pw_stream_events *events,	/**< stream events */
@@ -496,6 +532,14 @@
 /** Query the time on the stream */
 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
+ * the \ref pw_time.now value. Since 1.1.0 */
+uint64_t pw_stream_get_nsec(struct pw_stream *stream);
+
+/** Get the data loop that is doing the processing of this stream. This loop
+ * is assigned after pw_stream_connect().  * Since 1.1.0 */
+struct pw_loop *pw_stream_get_data_loop(struct pw_stream *stream);
+
 /** Query the time on the stream, deprecated since 0.3.50,
  * use pw_stream_get_time_n() to get the fields added since 0.3.50. */
 SPA_DEPRECATED
@@ -522,7 +566,23 @@
 bool pw_stream_is_driving(struct pw_stream *stream);
 
 /** Trigger a push/pull on the stream. One iteration of the graph will
- * scheduled and process() will be called. Since 0.3.34 */
+ * be scheduled. If it successfully finishes, process() will be called.
+ * It is possible for the graph iteration to not finish, so
+ * pw_stream_trigger_process() needs to be called again even if process()
+ * is not called.
+ *
+ * If there is a deadline after which the stream will have xrun,
+ * pw_stream_trigger_process() should be called then, whether or not
+ * process() has been called. Sound hardware will xrun if there is
+ * any delay in audio processing, so the ALSA plugin triggers the
+ * graph every quantum to ensure audio keeps flowing. Drivers that
+ * do not have a deadline, such as the freewheel driver, should
+ * use a timeout to ensure that forward progress keeps being made.
+ * A reasonable choice of deadline is three times the quantum: if
+ * the graph is taking 3x longer than normal, it is likely that it
+ * is hung and should be retriggered.
+ *
+ * Since 0.3.34 */
 int pw_stream_trigger_process(struct pw_stream *stream);
 
 /**

pipewire-1.0.1.tar.bz2/src/pipewire/thread-loop.c -> pipewire-1.2.0.tar.gz/src/pipewire/thread-loop.c Changed

pipewire-1.0.1.tar.bz2/src/pipewire/thread.c -> pipewire-1.2.0.tar.gz/src/pipewire/thread.c Changed

@@ -10,6 +10,7 @@
 #include <spa/utils/dict.h>
 #include <spa/utils/defs.h>
 #include <spa/utils/list.h>
+#include <spa/utils/json.h>
 
 #include <pipewire/log.h>
 #include <pipewire/private.h>
@@ -24,6 +25,23 @@
 	}								\
 } while(false);
 
+static int parse_affinity(const char *affinity, cpu_set_t *set)
+{
+	struct spa_json it2;
+	int v;
+
+	CPU_ZERO(set);
+	spa_json_init(&it0, affinity, strlen(affinity));
+	if (spa_json_enter_array(&it0, &it1) <= 0)
+		spa_json_init(&it1, affinity, strlen(affinity));
+
+	while (spa_json_get_int(&it1, &v) > 0) {
+		if (v >= 0 && v < CPU_SETSIZE)
+			CPU_SET(v, set);
+        }
+	return 0;
+}
+
 SPA_EXPORT
 void *pw_thread_fill_attr(const struct spa_dict *props, void *_attr)
 {
@@ -57,6 +75,13 @@
 int pthread_setname_np(pthread_t thread, const char *name) { return 0; }
 #endif
 
+static int thread_setaffinity(pthread_t thread, const char *affinity)
+{
+	cpu_set_t set;
+	parse_affinity(affinity, &set);
+	return -pthread_setaffinity_np(thread, sizeof(set), &set);
+}
+
 static struct spa_thread *impl_create(void *object,
 			const struct spa_dict *props,
 			void *(*start)(void*), void *arg)
@@ -81,6 +106,9 @@
 		if ((str = spa_dict_lookup(props, SPA_KEY_THREAD_NAME)) != NULL &&
 		    (err = pthread_setname_np(pt, str)) != 0)
 			pw_log_warn("pthread_setname error: %s", strerror(err));
+		if ((str = spa_dict_lookup(props, SPA_KEY_THREAD_AFFINITY)) != NULL &&
+		    (err = thread_setaffinity(pt, str)) != 0)
+			pw_log_warn("pthread_setaffinity error: %s", strerror(err));
 	}
 	return (struct spa_thread*)pt;
 }
@@ -102,13 +130,13 @@
 }
 static int impl_acquire_rt(void *object, struct spa_thread *thread, int priority)
 {
-	pw_log_warn("acquire_rt thread:%p prio:%d not implemented", thread, priority);
+	pw_log_info("acquire_rt thread:%p prio:%d not implemented", thread, priority);
 	return -ENOTSUP;
 }
 
 static int impl_drop_rt(void *object, struct spa_thread *thread)
 {
-	pw_log_warn("drop_rt thread:%p not implemented", thread);
+	pw_log_info("drop_rt thread:%p not implemented", thread);
 	return -ENOTSUP;
 }

pipewire-1.0.1.tar.bz2/src/pipewire/utils.c -> pipewire-1.2.0.tar.gz/src/pipewire/utils.c Changed

@@ -14,6 +14,7 @@
 #include <time.h>
 
 #include <spa/utils/json.h>
+#include <spa/debug/log.h>
 
 #include <pipewire/array.h>
 #include <pipewire/log.h>
@@ -130,28 +131,57 @@
 {
 	struct pw_array arr;
 	struct spa_json it2;
-	char v256;
-	int n = 0;
+	int n = 0, l, res;
+	const char *value;
+	struct spa_error_location el;
 
 	if (val == NULL)
 		return NULL;
 
-	pw_array_init(&arr, 16);
+	pw_array_init(&arr, sizeof(char*) * 16);
 
 	spa_json_init(&it0, val, len);
         if (spa_json_enter_array(&it0, &it1) <= 0)
                 spa_json_init(&it1, val, len);
 
-	while (spa_json_get_string(&it1, v, sizeof(v)) > 0 && n + 1 < max_tokens) {
-		pw_array_add_ptr(&arr, strdup(v));
+	while ((l = spa_json_next(&it1, &value)) > 0 && n + 1 < max_tokens) {
+		char *s;
+
+		if ((s = malloc(l+1)) == NULL)
+			goto error_errno;
+
+		spa_json_parse_stringn(value, l, s, l+1);
+
+		if ((res = pw_array_add_ptr(&arr, s)) < 0) {
+			free(s);
+			goto error;
+		}
 		n++;
 	}
-	pw_array_add_ptr(&arr, NULL);
-
+	if ((res = pw_array_add_ptr(&arr, NULL)) < 0)
+		goto error;
+done:
+	if ((res = spa_json_get_error(&it1, val, &el))) {
+		spa_debug_log_error_location(pw_log_get(), SPA_LOG_LEVEL_WARN,
+				&el, "error parsing strv: %s", el.reason);
+
+		char **s;
+		pw_array_for_each(s, &arr)
+			free(*s);
+		pw_array_clear(&arr);
+		n = 0;
+	}
 	if (n_tokens != NULL)
 		*n_tokens = n;
 
 	return arr.data;
+
+error_errno:
+	res = -errno;
+error:
+	it1.state = SPA_JSON_ERROR_FLAG;
+	errno = -res;
+	goto done;
 }
 
 /** Find a string in a NULL terminated array of strings.

pipewire-1.0.1.tar.bz2/src/pipewire/utils.h -> pipewire-1.2.0.tar.gz/src/pipewire/utils.h Changed

pipewire-1.0.1.tar.bz2/src/pipewire/work-queue.c -> pipewire-1.2.0.tar.gz/src/pipewire/work-queue.c Changed

pipewire-1.0.1.tar.bz2/src/tests/meson.build -> pipewire-1.2.0.tar.gz/src/tests/meson.build Changed

pipewire-1.0.1.tar.bz2/src/tests/test-endpoint.c -> pipewire-1.2.0.tar.gz/src/tests/test-endpoint.c Changed

pipewire-1.2.0.tar.gz/src/tests/test-security-context.c Added

@@ -0,0 +1,174 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2024 Wim Taymans */
+/* SPDX-License-Identifier: MIT */
+
+#include <stdlib.h>
+#include <sys/socket.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <unistd.h>
+
+#include <pipewire/pipewire.h>
+#include <pipewire/main-loop.h>
+#include <pipewire/extensions/security-context.h>
+
+#include <spa/utils/string.h>
+
+#define TEST_FUNC(a,b,func)	\
+do {				\
+	a.func = b.func;	\
+	spa_assert_se(SPA_PTRDIFF(&a.func, &a) == SPA_PTRDIFF(&b.func, &b)); \
+} while(0)
+
+static void test_abi(void)
+{
+	static const struct {
+		uint32_t version;
+	} test = { PW_VERSION_SECURITY_CONTEXT_EVENTS,  };
+	struct pw_security_context_events ev;
+
+	spa_assert_se(PW_VERSION_SECURITY_CONTEXT_EVENTS == 0);
+	spa_assert_se(sizeof(ev) == sizeof(test));
+}
+
+struct roundtrip_data
+{
+	struct pw_main_loop *loop;
+	int pending;
+	int done;
+};
+
+static void core_event_done(void *object, uint32_t id, int seq)
+{
+	struct roundtrip_data *data = object;
+	if (id == PW_ID_CORE && seq == data->pending) {
+		data->done = 1;
+		pw_main_loop_quit(data->loop);
+	}
+}
+
+static int roundtrip(struct pw_core *core, struct pw_main_loop *loop)
+{
+	struct spa_hook core_listener;
+	struct roundtrip_data data = { .loop = loop };
+	const struct pw_core_events core_events = {
+		PW_VERSION_CORE_EVENTS,
+		.done = core_event_done,
+	};
+	spa_zero(core_listener);
+	pw_core_add_listener(core, &core_listener,
+			&core_events, &data);
+
+	data.pending = pw_core_sync(core, PW_ID_CORE, 0);
+
+	while (!data.done)
+		pw_main_loop_run(loop);
+
+	spa_hook_remove(&core_listener);
+	return 0;
+}
+
+struct registry_info {
+	struct pw_registry *registry;
+	struct pw_security_context *sec;
+};
+
+static void registry_global(void *data, uint32_t id,
+		uint32_t permissions, const char *type, uint32_t version,
+		const struct spa_dict *props)
+{
+	struct registry_info *info = data;
+
+	if (spa_streq(type, PW_TYPE_INTERFACE_SecurityContext)) {
+		info->sec = pw_registry_bind(info->registry, id, type, version, 0);
+	}
+}
+
+static const struct pw_registry_events registry_events = {
+	PW_VERSION_REGISTRY_EVENTS,
+	.global = registry_global
+};
+
+static void test_create(void)
+{
+	struct pw_main_loop *loop;
+	struct pw_context *context;
+	struct pw_core *core;
+	struct registry_info info;
+	struct spa_hook listener;
+	int res, listen_fd, close_fd2;
+	char tempPATH_MAX = "/tmp/pipewire-XXXXXX";
+	struct sockaddr_un sockaddr = {0};
+
+	loop = pw_main_loop_new(NULL);
+	context = pw_context_new(pw_main_loop_get_loop(loop), NULL, 12);
+	spa_assert_se(context != NULL);
+	core = pw_context_connect(context, NULL, 0);
+	if (core == NULL && errno == EHOSTDOWN)
+		goto cleanup;
+	spa_assert_se(core != NULL);
+
+	spa_zero(info);
+	info.registry = pw_core_get_registry(core, PW_VERSION_REGISTRY, 0);
+	spa_assert_se(info.registry != NULL);
+
+	pw_registry_add_listener(info.registry, &listener, &registry_events, &info);
+
+	roundtrip(core, loop);
+
+	if (info.sec == NULL)
+		goto cleanup;
+
+	res = mkstemp(temp);
+	spa_assert_se(res >= 0);
+	close(res);
+
+	unlink(temp);
+
+	listen_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	spa_assert_se(listen_fd >= 0);
+
+	sockaddr.sun_family = AF_UNIX;
+	snprintf(sockaddr.sun_path, sizeof(sockaddr.sun_path), "%s", temp);
+	if (bind(listen_fd, (struct sockaddr *) &sockaddr, sizeof (sockaddr)) != 0)
+		spa_assert_not_reached();
+
+	if (listen(listen_fd, 0) != 0)
+		spa_assert_not_reached();
+
+	res = pipe2(close_fd, O_CLOEXEC);
+	spa_assert_se(res >= 0);
+
+	static const struct spa_dict_item items = {
+		{ "pipewire.foo.bar", "baz" },
+		{ PW_KEY_SEC_ENGINE, "org.flatpak" },
+		{ PW_KEY_ACCESS, "restricted" },
+	};
+
+	pw_security_context_create(info.sec,
+			listen_fd, close_fd1,
+			&SPA_DICT_INIT_ARRAY(items));
+
+	roundtrip(core, loop);
+
+	unlink(temp);
+
+	pw_proxy_destroy((struct pw_proxy*)info.sec);
+	pw_proxy_destroy((struct pw_proxy*)info.registry);
+
+cleanup:
+	pw_context_destroy(context);
+	pw_main_loop_destroy(loop);
+}
+
+int main(int argc, char *argv)
+{
+	pw_init(&argc, &argv);
+
+	test_abi();
+	test_create();
+
+	pw_deinit();
+
+	return 0;
+}

pipewire-1.0.1.tar.bz2/src/tests/test-stream.c -> pipewire-1.2.0.tar.gz/src/tests/test-stream.c Changed

pipewire-1.0.1.tar.bz2/src/tools/meson.build -> pipewire-1.2.0.tar.gz/src/tools/meson.build Changed

pipewire-1.0.1.tar.bz2/src/tools/midifile.c -> pipewire-1.2.0.tar.gz/src/tools/midifile.c Changed

pipewire-1.0.1.tar.bz2/src/tools/pw-cat.c -> pipewire-1.2.0.tar.gz/src/tools/pw-cat.c Changed

@@ -26,8 +26,8 @@
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
 #include <spa/debug/types.h>
+#include <spa/debug/file.h>
 
-#include <pipewire/cleanup.h>
 #include <pipewire/pipewire.h>
 #include <pipewire/i18n.h>
 #include <pipewire/extensions/metadata.h>
@@ -845,7 +845,8 @@
 		bool null_frame = false;
 
 		n_frames = d->maxsize / data->stride;
-		n_frames = SPA_MIN(n_frames, (int)b->requested);
+		if (b->requested)
+			n_frames = SPA_MIN(n_frames, (int)b->requested);
 
 		/* Note that when playing encoded audio, the encoded_playback_fill()
 		 * fill callback actually returns number of bytes, not frames, since
@@ -931,11 +932,11 @@
 	pw_stream_get_time_n(data->stream, &time, sizeof(time));
 	printf("stream time: now:%"PRIi64" rate:%u/%u ticks:%"PRIu64
 			" delay:%"PRIi64" queued:%"PRIu64
-			" buffered:%"PRIi64" buffers:%u avail:%u\n",
+			" buffered:%"PRIi64" buffers:%u avail:%u size:%"PRIu64"\n",
 		time.now,
 		time.rate.num, time.rate.denom,
 		time.ticks, time.delay, time.queued, time.buffered,
-		time.queued_buffers, time.avail_buffers);
+		time.queued_buffers, time.avail_buffers, time.size);
 }
 
 enum {
@@ -986,21 +987,21 @@
 
 	fp = is_error ? stderr : stdout;
 
-        fprintf(fp,
+	fprintf(fp,
 	   _("%s options <file>|-\n"
-             "  -h, --help                            Show this help\n"
-             "      --version                         Show version\n"
-             "  -v, --verbose                         Enable verbose operations\n"
+	     "  -h, --help                            Show this help\n"
+	     "      --version                         Show version\n"
+	     "  -v, --verbose                         Enable verbose operations\n"
 	     "\n"), name);
 
 	fprintf(fp,
-           _("  -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 serial or name (default %s)\n"
+	   _("  -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 serial or name (default %s)\n"
 	     "                                          0 means don't link\n"
-             "      --latency                         Set node latency (default %s)\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"
@@ -1012,12 +1013,12 @@
 	     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"
-             "      --channel-map                     Channel map\n"
+	   _("      --rate                            Sample rate (req. for rec) (default %u)\n"
+	     "      --channels                        Number of channels (req. for rec) (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"
+	     "      --format                          Sample format %s (req. for rec) (default %s)\n"
 	     "      --volume                          Stream volume 0-1.0 (default %.3f)\n"
 	     "  -q  --quality                         Resampler quality (0 - 15) (default %d)\n"
 	     "\n"),
@@ -1051,7 +1052,7 @@
 	spa_zero(b);
 	spa_pod_builder_init(&b, src, n_frames);
 
-        spa_pod_builder_push_sequence(&b, &f, 0);
+	spa_pod_builder_push_sequence(&b, &f, 0);
 
 	first_frame = d->clock_time;
 	last_frame = first_frame + d->position->clock.duration;
@@ -1068,7 +1069,7 @@
 			return res;
 		}
 
-		frame = ev.sec * d->position->clock.rate.denom;
+		frame = (uint32_t)(ev.sec * d->position->clock.rate.denom);
 		if (frame < first_frame)
 			frame = 0;
 		else if (frame < last_frame)
@@ -1263,6 +1264,7 @@
 		SF_STR_COPYRIGHT = PW_KEY_MEDIA_COPYRIGHT,
 		SF_STR_SOFTWARE = PW_KEY_MEDIA_SOFTWARE,
 		SF_STR_ARTIST = PW_KEY_MEDIA_ARTIST,
+		SF_STR_ALBUM = PW_KEY_MEDIA_ALBUM,
 		SF_STR_COMMENT = PW_KEY_MEDIA_COMMENT,
 		SF_STR_DATE = PW_KEY_MEDIA_DATE
 	};
@@ -1571,13 +1573,13 @@
 		nom = data->latency_value * data->rate;
 		break;
 	case unit_msec:
-		nom = nearbyint((data->latency_value * data->rate) / 1000.0);
+		nom = (unsigned int)nearbyint((data->latency_value * data->rate) / 1000.0);
 		break;
 	case unit_usec:
-		nom = nearbyint((data->latency_value * data->rate) / 1000000.0);
+		nom = (unsigned int)nearbyint((data->latency_value * data->rate) / 1000000.0);
 		break;
 	case unit_nsec:
-		nom = nearbyint((data->latency_value * data->rate) / 1000000000.0);
+		nom = (unsigned int)nearbyint((data->latency_value * data->rate) / 1000000000.0);
 		break;
 	case unit_samples:
 		nom = data->latency_value;
@@ -1607,6 +1609,7 @@
 	const char *prog;
 	int exit_code = EXIT_FAILURE, c, ret;
 	enum pw_stream_flags flags = 0;
+	struct spa_error_location loc;
 
 	setlocale(LC_ALL, "");
 	pw_init(&argc, &argv);
@@ -1728,7 +1731,12 @@
 			break;
 
 		case 'P':
-			pw_properties_update_string(data.props, optarg, strlen(optarg));
+			if (pw_properties_update_string_checked(data.props, optarg, strlen(optarg), &loc) < 0) {
+				spa_debug_file_error_location(stderr, &loc,
+						"error: syntax error in --properties: %s",
+						loc.reason);
+				goto error_usage;
+			}
 			break;
 
 		case OPT_TARGET:
@@ -1770,7 +1778,7 @@
 			break;
 
 		case OPT_VOLUME:
-			data.volume = atof(optarg);
+			data.volume = (float)atof(optarg);
 			break;
 		default:
 			goto error_usage;

pipewire-1.0.1.tar.bz2/src/tools/pw-cli.c -> pipewire-1.2.0.tar.gz/src/tools/pw-cli.c Changed

@@ -66,6 +66,7 @@
 	struct pw_map vars;
 	unsigned int interactive:1;
 	unsigned int monitoring:1;
+	unsigned int monitoring_info:1;
 	unsigned int quit:1;
 };
 
@@ -164,7 +165,7 @@
 
 static bool do_not_implemented(struct data *data, const char *cmd, char *args, char **error)
 {
-        *error = spa_aprintf("Command \"%s\" not yet implemented", cmd);
+	*error = spa_aprintf("Command \"%s\" not yet implemented", cmd);
 	return false;
 }
 
@@ -213,10 +214,15 @@
 	{ "quit", "q", "Quit", do_quit },
 };
 
-static bool do_quit(struct data *data, const char *cmd, char *args, char **error)
+static void program_quit(struct data *data)
 {
-	pw_main_loop_quit(data->loop);
 	data->quit = true;
+	pw_main_loop_quit(data->loop);
+}
+
+static bool do_quit(struct data *data, const char *cmd, char *args, char **error)
+{
+	program_quit(data);
 	return true;
 }
 
@@ -433,7 +439,7 @@
 			continue;
 		if (global_matches(g, pattern))
 			return g;
-        }
+	}
 	return NULL;
 }
 
@@ -446,7 +452,7 @@
 			id, seq, res, spa_strerror(res), message);
 
 	if (id == PW_ID_CORE && res == -EPIPE)
-		pw_main_loop_quit(data->loop);
+		program_quit(data);
 }
 
 static const struct pw_core_events remote_core_events = {
@@ -490,7 +496,7 @@
 static bool do_connect(struct data *data, const char *cmd, char *args, char **error)
 {
 	char *a1;
-        int n;
+	int n;
 	struct pw_properties *props = NULL;
 	struct pw_core *core;
 	struct remote_data *rd;
@@ -535,7 +541,7 @@
 static bool do_disconnect(struct data *data, const char *cmd, char *args, char **error)
 {
 	char *a1;
-        int n;
+	int n;
 	uint32_t idx;
 	struct remote_data *rd = data->current;
 
@@ -559,8 +565,8 @@
 
 	return true;
 
-      no_remote:
-        *error = spa_aprintf("Remote %d does not exist", idx);
+no_remote:
+	*error = spa_aprintf("Remote %d does not exist", idx);
 	return false;
 }
 
@@ -577,7 +583,7 @@
 static bool do_switch_remote(struct data *data, const char *cmd, char *args, char **error)
 {
 	char *a1;
-        int n, idx = 0;
+	int n, idx = 0;
 	struct remote_data *rd;
 
 	n = pw_split_ip(args, WHITESPACE, 1, a);
@@ -594,8 +600,8 @@
 
 	return true;
 
-      no_remote:
-        *error = spa_aprintf("Remote %d does not exist", idx);
+no_remote:
+	*error = spa_aprintf("Remote %d does not exist", idx);
 	return false;
 }
 
@@ -651,18 +657,20 @@
 	info_global(pd);
 	if (info == NULL)
 		return;
-	printf("%c\tinput ports: %u/%u\n", MARK_CHANGE(PW_NODE_CHANGE_MASK_INPUT_PORTS),
-			info->n_input_ports, info->max_input_ports);
-	printf("%c\toutput ports: %u/%u\n", MARK_CHANGE(PW_NODE_CHANGE_MASK_OUTPUT_PORTS),
-			info->n_output_ports, info->max_output_ports);
-	printf("%c\tstate: \"%s\"", MARK_CHANGE(PW_NODE_CHANGE_MASK_STATE),
-			pw_node_state_as_string(info->state));
+	if (info->change_mask & PW_NODE_CHANGE_MASK_INPUT_PORTS)
+		printf("%c\tinput ports: %u/%u\n", '*', info->n_input_ports, info->max_input_ports);
+	if (info->change_mask & PW_NODE_CHANGE_MASK_OUTPUT_PORTS)
+		printf("%c\toutput ports: %u/%u\n", '*', info->n_output_ports, info->max_output_ports);
+	if (info->change_mask & PW_NODE_CHANGE_MASK_STATE)
+		printf("%c\tstate: \"%s\"", '*', pw_node_state_as_string(info->state));
 	if (info->state == PW_NODE_STATE_ERROR && info->error)
 		printf(" \"%s\"\n", info->error);
 	else
 		printf("\n");
-	print_properties(info->props, MARK_CHANGE(PW_NODE_CHANGE_MASK_PROPS), true);
-	print_params(info->params, info->n_params, MARK_CHANGE(PW_NODE_CHANGE_MASK_PARAMS), true);
+	if (info->change_mask & PW_NODE_CHANGE_MASK_PROPS)
+		print_properties(info->props, '*', true);
+	if (info->change_mask & PW_NODE_CHANGE_MASK_PARAMS)
+		print_params(info->params, info->n_params, '*', true);
 	info->change_mask = 0;
 }
 
@@ -674,8 +682,10 @@
 	if (info == NULL)
 		return;
 	printf("\tdirection: \"%s\"\n", pw_direction_as_string(info->direction));
-	print_properties(info->props, MARK_CHANGE(PW_PORT_CHANGE_MASK_PROPS), true);
-	print_params(info->params, info->n_params, MARK_CHANGE(PW_PORT_CHANGE_MASK_PARAMS), true);
+	if (info->change_mask & PW_PORT_CHANGE_MASK_PROPS)
+		print_properties(info->props, '*', true);
+	if (info->change_mask & PW_PORT_CHANGE_MASK_PARAMS)
+		print_params(info->params, info->n_params, '*', true);
 	info->change_mask = 0;
 }
 
@@ -715,18 +725,20 @@
 	printf("\tinput-node-id: %u\n", info->input_node_id);
 	printf("\tinput-port-id: %u\n", info->input_port_id);
 
-	printf("%c\tstate: \"%s\"", MARK_CHANGE(PW_LINK_CHANGE_MASK_STATE),
-			pw_link_state_as_string(info->state));
+	if (info->change_mask & PW_LINK_CHANGE_MASK_STATE)
+		printf("%c\tstate: \"%s\"", '*', pw_link_state_as_string(info->state));
 	if (info->state == PW_LINK_STATE_ERROR && info->error)
 		printf(" \"%s\"\n", info->error);
 	else
 		printf("\n");
-	printf("%c\tformat:\n", MARK_CHANGE(PW_LINK_CHANGE_MASK_FORMAT));
+	if (info->change_mask & PW_LINK_CHANGE_MASK_FORMAT)
+		printf("%c\tformat:\n", '*');
 	if (info->format)
 		spa_debug_pod(2, NULL, info->format);
 	else
 		printf("\t\tnone\n");
-	print_properties(info->props, MARK_CHANGE(PW_LINK_CHANGE_MASK_PROPS), true);
+	if (info->change_mask & PW_LINK_CHANGE_MASK_STATE)
+		print_properties(info->props, '*', true);
 	info->change_mask = 0;
 }
 
@@ -737,8 +749,10 @@
 	info_global(pd);
 	if (info == NULL)
 		return;
-	print_properties(info->props, MARK_CHANGE(PW_DEVICE_CHANGE_MASK_PROPS), true);
-	print_params(info->params, info->n_params, MARK_CHANGE(PW_DEVICE_CHANGE_MASK_PARAMS), true);
+	if (info->change_mask & PW_DEVICE_CHANGE_MASK_PROPS)
+		print_properties(info->props, '*', true);
+	if (info->change_mask & PW_DEVICE_CHANGE_MASK_PARAMS)
+		print_params(info->params, info->n_params, '*', true);
 	info->change_mask = 0;
 }
 
@@ -810,7 +824,7 @@
 		pd->global = pw_map_lookup(&rd->globals, info->id);
 	if (pd->global && pd->global->info_pending) {
 		info_core(pd);
-		pd->global->info_pending = false;
+		pd->global->info_pending = rd->data->monitoring_info;
 	}
 }
 
@@ -831,7 +845,7 @@
 		pd->global = pw_map_lookup(&rd->globals, info->id);
 	if (pd->global && pd->global->info_pending) {
 		info_module(pd);
-		pd->global->info_pending = false;
+		pd->global->info_pending = rd->data->monitoring_info;
 	}
 }
 
@@ -851,14 +865,14 @@
 		pd->global = pw_map_lookup(&rd->globals, info->id);
 	if (pd->global && pd->global->info_pending) {
 		info_node(pd);
-		pd->global->info_pending = false;
+		pd->global->info_pending = rd->data->monitoring_info;
 	}
 }
 
 static void event_param(void *_data, int seq, uint32_t id,
 		uint32_t index, uint32_t next, const struct spa_pod *param)
 {
-        struct proxy_data *data = _data;
+	struct proxy_data *data = _data;
 	struct remote_data *rd = data->rd;
 
 	if (rd->data->interactive)
@@ -886,7 +900,7 @@
 		pd->global = pw_map_lookup(&rd->globals, info->id);
 	if (pd->global && pd->global->info_pending) {
 		info_port(pd);
-		pd->global->info_pending = false;
+		pd->global->info_pending = rd->data->monitoring_info;
 	}
 }
 
@@ -907,7 +921,7 @@
 		pd->global = pw_map_lookup(&rd->globals, info->id);
 	if (pd->global && pd->global->info_pending) {
 		info_factory(pd);
-		pd->global->info_pending = false;
+		pd->global->info_pending = rd->data->monitoring_info;
 	}
 }
 
@@ -927,14 +941,14 @@
 		pd->global = pw_map_lookup(&rd->globals, info->id);
 	if (pd->global && pd->global->info_pending) {
 		info_client(pd);
-		pd->global->info_pending = false;
+		pd->global->info_pending = rd->data->monitoring_info;
 	}
 }
 
 static void client_event_permissions(void *_data, uint32_t index,
 		uint32_t n_permissions, const struct pw_permission *permissions)
 {
-        struct proxy_data *data = _data;
+	struct proxy_data *data = _data;
 	struct remote_data *rd = data->rd;
 	uint32_t i;
 
@@ -968,7 +982,7 @@
 		pd->global = pw_map_lookup(&rd->globals, info->id);
 	if (pd->global && pd->global->info_pending) {
 		info_link(pd);
-		pd->global->info_pending = false;
+		pd->global->info_pending = rd->data->monitoring_info;
 	}
 }
 
@@ -989,7 +1003,7 @@
 		pd->global = pw_map_lookup(&rd->globals, info->id);
 	if (pd->global && pd->global->info_pending) {
 		info_device(pd);
-		pd->global->info_pending = false;
+		pd->global->info_pending = rd->data->monitoring_info;
 	}
 }
 
@@ -1034,7 +1048,7 @@
 		pd->global = pw_map_lookup(&rd->globals, update->id);
 	if (pd->global && pd->global->info_pending) {
 		info_session(pd);
-		pd->global->info_pending = false;
+		pd->global->info_pending = rd->data->monitoring_info;
 	}
 }
 
@@ -1090,7 +1104,7 @@
 		pd->global = pw_map_lookup(&rd->globals, update->id);
 	if (pd->global && pd->global->info_pending) {
 		info_endpoint(pd);
-		pd->global->info_pending = false;
+		pd->global->info_pending = rd->data->monitoring_info;
 	}
 }
 
@@ -1139,7 +1153,7 @@
 		pd->global = pw_map_lookup(&rd->globals, update->id);
 	if (pd->global && pd->global->info_pending) {
 		info_endpoint_stream(pd);
-		pd->global->info_pending = false;
+		pd->global->info_pending = rd->data->monitoring_info;
 	}
 }
 
@@ -1176,9 +1190,9 @@
 }
 
 static const struct pw_proxy_events proxy_events = {
-        PW_VERSION_PROXY_EVENTS,
-        .removed = removed_proxy,
-        .destroy = destroy_proxy,
+	PW_VERSION_PROXY_EVENTS,
+	.removed = removed_proxy,
+	.destroy = destroy_proxy,
 };
 
 static bool do_list_objects(struct data *data, const char *cmd, char *args, char **error)
@@ -1353,6 +1367,7 @@
 		pd = pw_proxy_get_user_data(global->proxy);
 		if (pd->class->info)
 			pd->class->info(pd);
+		pd->global->info_pending = rd->data->monitoring_info;
 	}
 	return true;
 }
@@ -1375,7 +1390,7 @@
 {
 	struct remote_data *rd = data->current;
 	char *a1;
-        int n;
+	int n;
 	struct global *global;
 
 	n = pw_split_ip(args, WHITESPACE, 1, a);
@@ -1397,6 +1412,19 @@
 	return true;
 }
 
+static struct pw_properties *properties_new_checked(const char *str, char **error)
+{
+	struct pw_properties *props;
+	struct spa_error_location loc;
+
+	props = pw_properties_new_string_checked(str, strlen(str), &loc);
+	if (!props) {
+		*error = spa_aprintf("syntax error in properties, line:%d col:%d: %s",
+				loc.line, loc.col, loc.reason);
+	}
+	return props;
+}
+
 static bool do_create_device(struct data *data, const char *cmd, char *args, char **error)
 {
 	struct remote_data *rd = data->current;
@@ -1412,8 +1440,10 @@
 		*error = spa_aprintf("%s <factory-name> <properties>", cmd);
 		return false;
 	}
-	if (n == 2)
-		props = pw_properties_new_string(a1);
+	if (n == 2) {
+		if ((props = properties_new_checked(a1, error)) == NULL)
+			return false;
+	}
 
 	proxy = pw_core_create_object(rd->core, a0,
 					    PW_TYPE_INTERFACE_Device,
@@ -1441,7 +1471,7 @@
 {
 	struct remote_data *rd = data->current;
 	char *a2;
-        int n;
+	int n;
 	uint32_t id;
 	struct pw_proxy *proxy;
 	struct pw_properties *props = NULL;
@@ -1452,8 +1482,10 @@
 		*error = spa_aprintf("%s <factory-name> <properties>", cmd);
 		return false;
 	}
-	if (n == 2)
-		props = pw_properties_new_string(a1);
+	if (n == 2) {
+		if ((props = properties_new_checked(a1, error)) == NULL)
+			return false;
+	}
 
 	proxy = pw_core_create_object(rd->core, a0,
 					    PW_TYPE_INTERFACE_Node,
@@ -1466,9 +1498,9 @@
 	pd = pw_proxy_get_user_data(proxy);
 	pd->rd = rd;
 	pd->proxy = proxy;
-        pd->class = &node_class;
-        pw_proxy_add_object_listener(proxy, &pd->object_listener, &node_events, pd);
-        pw_proxy_add_listener(proxy, &pd->proxy_listener, &proxy_events, pd);
+	pd->class = &node_class;
+	pw_proxy_add_object_listener(proxy, &pd->object_listener, &node_events, pd);
+	pw_proxy_add_listener(proxy, &pd->proxy_listener, &proxy_events, pd);
 
 	id = pw_map_insert_new(&data->vars, proxy);
 	if (rd->data->interactive)
@@ -1481,7 +1513,7 @@
 {
 	struct remote_data *rd = data->current;
 	char *a1;
-        int n;
+	int n;
 	struct global *global;
 
 	n = pw_split_ip(args, WHITESPACE, 1, a);
@@ -1569,10 +1601,12 @@
 		*error = spa_aprintf("%s <node-id> <port> <node-id> <port> <properties>", cmd);
 		return false;
 	}
-	if (n == 5)
-		props = pw_properties_new_string(a4);
-	else
+	if (n == 5) {
+		if ((props = properties_new_checked(a4, error)) == NULL)
+			return false;
+	} else {
 		props = pw_properties_new(NULL, NULL);
+	}
 
 	if (!spa_streq(a0, "-"))
 		pw_properties_set(props, PW_KEY_LINK_OUTPUT_NODE, a0);
@@ -1678,8 +1712,8 @@
 
 	return true;
 
-      no_remote:
-        *error = spa_aprintf("Remote %d does not exist", idx);
+no_remote:
+	*error = spa_aprintf("Remote %d does not exist", idx);
 	return false;
 }
 
@@ -1842,7 +1876,7 @@
 {
 	struct remote_data *rd = data->current;
 	char *a3;
-        int n;
+	int n;
 	struct global *global;
 
 	n = pw_split_ip(args, WHITESPACE, 1, a);
@@ -2127,7 +2161,7 @@
 			return c->func(data, cmd, args, error);
 		}
 	}
-        *error = spa_aprintf("Command \"%s\" does not exist. Type 'help' for usage.", cmd);
+	*error = spa_aprintf("Command \"%s\" does not exist. Type 'help' for usage.", cmd);
 	return false;
 }
 
@@ -2239,8 +2273,7 @@
 static void do_quit_on_signal(void *data, int signal_number)
 {
 	struct data *d = data;
-	d->quit = true;
-	pw_main_loop_quit(d->loop);
+	program_quit(d);
 }
 
 static void show_help(struct data *data, const char *name, bool error)
@@ -2362,6 +2395,9 @@
 			p = stpcpy(p, " ");
 		}
 
+		// If we're monitoring, surface info changes as well
+		data.monitoring_info = monitor;
+
 		pw_main_loop_run(data.loop);
 
 		if (!parse(&data, buf, &error)) {

pipewire-1.0.1.tar.bz2/src/tools/pw-config.c -> pipewire-1.2.0.tar.gz/src/tools/pw-config.c Changed

pipewire-1.2.0.tar.gz/src/tools/pw-container.c Added

@@ -0,0 +1,303 @@
+/* PipeWire */
+/* SPDX-FileCopyrightText: Copyright © 2024 Wim Taymans */
+/* SPDX-License-Identifier: MIT */
+
+#include <stdio.h>
+#include <signal.h>
+#include <getopt.h>
+#include <unistd.h>
+#include <unistd.h>
+#include <limits.h>
+#include <locale.h>
+#include <fcntl.h>
+#include <sys/socket.h>
+
+#include <spa/utils/result.h>
+#include <spa/utils/string.h>
+#include <spa/utils/ansi.h>
+#include <spa/debug/pod.h>
+#include <spa/debug/format.h>
+#include <spa/debug/types.h>
+#include <spa/debug/file.h>
+
+#include <pipewire/pipewire.h>
+#include <pipewire/extensions/security-context.h>
+
+struct data {
+	struct pw_main_loop *loop;
+	struct pw_context *context;
+
+	struct pw_core *core;
+	struct spa_hook core_listener;
+
+	struct pw_registry *registry;
+	struct spa_hook registry_listener;
+
+	struct pw_properties *props;
+
+	struct pw_security_context *sec;
+
+	int pending_create;
+	int create_result;
+	int pending;
+	int done;
+};
+
+static void registry_event_global(void *data, uint32_t id,
+				  uint32_t permissions, const char *type, uint32_t version,
+				  const struct spa_dict *props)
+{
+	struct data *d = data;
+
+	if (spa_streq(type, PW_TYPE_INTERFACE_SecurityContext))
+		d->sec = pw_registry_bind(d->registry, id, type, version, 0);
+}
+
+static void registry_event_global_remove(void *data, uint32_t id)
+{
+}
+
+static const struct pw_registry_events registry_events = {
+	PW_VERSION_REGISTRY_EVENTS,
+	.global = registry_event_global,
+	.global_remove = registry_event_global_remove,
+};
+
+static void on_core_error(void *_data, uint32_t id, int seq, int res, const char *message)
+{
+	struct data *data = _data;
+
+	pw_log_error("error id:%u seq:%d res:%d (%s): %s",
+			id, seq, res, spa_strerror(res), message);
+
+	if (seq == SPA_RESULT_ASYNC_SEQ(data->pending_create))
+		data->create_result = res;
+
+	if (id == PW_ID_CORE && res == -EPIPE) {
+		data->done = true;
+		pw_main_loop_quit(data->loop);
+	}
+}
+
+static const struct pw_core_events core_events = {
+	PW_VERSION_CORE_EVENTS,
+	.error = on_core_error,
+};
+
+static void core_event_done(void *object, uint32_t id, int seq)
+{
+	struct data *data = object;
+	if (id == PW_ID_CORE && seq == data->pending) {
+		data->done = true;
+		pw_main_loop_quit(data->loop);
+	}
+}
+
+static int roundtrip(struct data *data)
+{
+	struct spa_hook core_listener;
+	const struct pw_core_events core_events = {
+	PW_VERSION_CORE_EVENTS,
+		.done = core_event_done,
+	};
+	spa_zero(core_listener);
+	pw_core_add_listener(data->core, &core_listener,
+			&core_events, data);
+
+	data->done = false;
+	data->pending = pw_core_sync(data->core, PW_ID_CORE, 0);
+
+	while (!data->done)
+		pw_main_loop_run(data->loop);
+
+	spa_hook_remove(&core_listener);
+	return 0;
+}
+
+
+static void do_quit(void *data, int signal_number)
+{
+	struct data *d = data;
+	pw_main_loop_quit(d->loop);
+}
+
+static void show_help(struct data *d, const char *name, bool error)
+{
+	FILE *out = error ? stderr : stdout;
+	fprintf(out, "%s options application\n"
+		"  -h, --help                            Show this help\n"
+		"      --version                         Show version\n"
+		"  -r, --remote                          Remote daemon name\n"
+		"  -P, --properties                      Context properties\n",
+		name);
+	fprintf(out, "\nDefault Context properties:\n");
+	pw_properties_serialize_dict(out, &d->props->dict,
+			PW_PROPERTIES_FLAG_NL | PW_PROPERTIES_FLAG_ENCLOSE);
+	fprintf(out, "\n");
+}
+
+int main(int argc, char *argv)
+{
+	struct data data = { 0 };
+	struct pw_loop *l;
+	const char *opt_remote = NULL;
+	static const struct option long_options = {
+		{ "help",		no_argument,		NULL, 'h' },
+		{ "version",		no_argument,		NULL, 'V' },
+		{ "remote",		required_argument,	NULL, 'r' },
+		{ "properties",		required_argument,	NULL, 'P' },
+		{ NULL,	0, NULL, 0}
+	};
+	struct spa_error_location loc;
+	int c, res, listen_fd, close_fd2;
+	char tempPATH_MAX = "/tmp/pipewire-XXXXXX";
+	struct sockaddr_un sockaddr = {0};
+
+	data.props = pw_properties_new(
+			PW_KEY_SEC_ENGINE, "org.flatpak",
+			PW_KEY_ACCESS, "restricted",
+			NULL);
+
+	setlocale(LC_ALL, "");
+	pw_init(&argc, &argv);
+
+	while ((c = getopt_long(argc, argv, "hVr:P:", long_options, NULL)) != -1) {
+		switch (c) {
+		case 'h':
+			show_help(&data, argv0, false);
+			return 0;
+		case 'V':
+			printf("%s\n"
+				"Compiled with libpipewire %s\n"
+				"Linked with libpipewire %s\n",
+				argv0,
+				pw_get_headers_version(),
+				pw_get_library_version());
+			return 0;
+		case 'r':
+			opt_remote = optarg;
+			break;
+		case 'P':
+			if (pw_properties_update_string_checked(data.props, optarg, strlen(optarg), &loc) < 0) {
+				spa_debug_file_error_location(stderr, &loc,
+						"error: syntax error in --properties: %s",
+						loc.reason);
+				return -1;
+			}
+			break;
+		default:
+			show_help(&data, argv0, true);
+			return -1;
+		}
+	}
+
+	data.loop = pw_main_loop_new(NULL);
+	if (data.loop == NULL) {
+		fprintf(stderr, "can't create main loop: %m\n");
+		return -1;
+	}
+
+	l = pw_main_loop_get_loop(data.loop);
+	pw_loop_add_signal(l, SIGINT, do_quit, &data);
+	pw_loop_add_signal(l, SIGTERM, do_quit, &data);
+
+	data.context = pw_context_new(l, NULL, 0);
+	if (data.context == NULL) {
+		fprintf(stderr, "can't create context: %m\n");
+		return -1;
+	}
+
+	data.core = pw_context_connect(data.context,
+			pw_properties_new(
+				PW_KEY_REMOTE_NAME, opt_remote ? opt_remote :
+					("" PW_DEFAULT_REMOTE "-manager," PW_DEFAULT_REMOTE ""),
+				NULL),
+			0);
+	if (data.core == NULL) {
+		fprintf(stderr, "can't connect: %m\n");
+		return -1;
+	}
+
+	pw_core_add_listener(data.core,
+				   &data.core_listener,
+				   &core_events, &data);
+	data.registry = pw_core_get_registry(data.core,
+					  PW_VERSION_REGISTRY, 0);
+	pw_registry_add_listener(data.registry,
+				       &data.registry_listener,
+				       &registry_events, &data);
+
+	roundtrip(&data);
+
+	if (data.sec == NULL) {
+		fprintf(stderr, "no security context object found\n");
+		return -1;
+	}
+
+	res = mkstemp(temp);
+	if (res < 0) {
+		fprintf(stderr, "can't make temp file with template %s: %m\n", temp);
+		return -1;
+	}
+	close(res);
+	unlink(temp);
+
+	listen_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (listen_fd < 0) {
+		fprintf(stderr, "can't make unix socket: %m\n");
+		return -1;
+	}
+
+	sockaddr.sun_family = AF_UNIX;
+	snprintf(sockaddr.sun_path, sizeof(sockaddr.sun_path), "%s", temp);
+	if (bind(listen_fd, (struct sockaddr *) &sockaddr, sizeof (sockaddr)) != 0) {
+		fprintf(stderr, "can't bind unix socket to %s: %m\n", temp);
+		return -1;
+	}
+	if (listen(listen_fd, 0) != 0) {
+		fprintf(stderr, "can't listen unix socket: %m\n");
+		return -1;
+	}
+
+	res = pipe2(close_fd, O_CLOEXEC);
+	if (res < 0) {
+		fprintf(stderr, "can't create pipe: %m\n");
+		return -1;
+	}
+	setenv("PIPEWIRE_REMOTE", temp, 1);
+
+	data.create_result = 0;
+	data.pending_create = pw_security_context_create(data.sec,
+			listen_fd, close_fd1, &data.props->dict);
+
+	if (SPA_RESULT_IS_ASYNC(data.pending_create)) {
+		pw_log_debug("create: %d", data.pending_create);
+		roundtrip(&data);
+	}
+	pw_log_debug("create result: %d", data.create_result);
+
+	if (data.create_result < 0) {
+		fprintf(stderr, "can't create security context: %s\n",
+				spa_strerror(data.create_result));
+		return -1;
+	}
+
+	if (optind < argc) {
+		system(argvoptind++);
+	} else {
+		fprintf(stdout, "new socket: %s\n", temp);
+		pw_main_loop_run(data.loop);
+	}
+	unlink(temp);
+
+	spa_hook_remove(&data.registry_listener);
+	pw_proxy_destroy((struct pw_proxy*)data.sec);
+	pw_proxy_destroy((struct pw_proxy*)data.registry);
+	spa_hook_remove(&data.core_listener);
+	pw_context_destroy(data.context);
+	pw_main_loop_destroy(data.loop);
+	pw_properties_free(data.props);
+	pw_deinit();
+
+	return 0;
+}

pipewire-1.0.1.tar.bz2/src/tools/pw-dot.c -> pipewire-1.2.0.tar.gz/src/tools/pw-dot.c Changed

@@ -16,17 +16,26 @@
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
 #include <spa/debug/types.h>
+#include <spa/debug/file.h>
 
 #include <pipewire/pipewire.h>
 
 #define GLOBAL_ID_NONE UINT32_MAX
 #define DEFAULT_DOT_PATH "pw.dot"
+#define DEFAULT_DOT_DATA_SIZE 2048
+#define MAX_ESCAPED_LEN 128
 
 struct global;
 
 typedef void (*draw_t)(struct global *g);
 typedef void *(*info_update_t) (void *info, const void *update);
 
+struct dot_data {
+	char *data;
+	size_t size;
+	size_t max_size;
+};
+
 struct data {
 	struct pw_main_loop *loop;
 	struct pw_context *context;
@@ -38,7 +47,7 @@
 	struct spa_hook registry_listener;
 
 	struct spa_list globals;
-	char *dot_str;
+	struct dot_data dot_data;
 	const char *dot_rankdir;
 	bool dot_orthoedges;
 
@@ -67,126 +76,194 @@
 	pw_destroy_t info_destroy;
 	info_update_t info_update;
 	draw_t draw;
+	bool drawn;
 
 	struct spa_hook proxy_listener;
 	struct spa_hook object_listener;
 };
 
-static char *dot_str_new(void)
+static bool dot_data_init(struct dot_data * dd, size_t size)
 {
-        return strdup("");
+	if (size <= 0)
+		return false;
+
+	dd->data = malloc(sizeof (char) * size);
+	dd->data0 = '\0';
+	dd->size = 0;
+	dd->max_size = size;
+	return true;
 }
 
-static void dot_str_clear(char **str)
+static void dot_data_clear(struct dot_data * dd)
 {
-	if (str && *str) {
-		  free(*str);
-		  *str = NULL;
+	if (dd->data) {
+		free(dd->data);
+		dd->data = NULL;
 	}
+	dd->size = 0;
 }
 
-static SPA_PRINTF_FUNC(2,0) void dot_str_vadd(char **str, const char *fmt, va_list varargs)
+static void dot_data_ensure_max_size (struct dot_data * dd, size_t size)
 {
-	char *res = NULL;
-	char *fmt2 = NULL;
+	size_t new_size = dd->size + size + 1;
+	if (new_size > dd->max_size) {
+		size_t next_size = new_size * 2;
+		dd->data = realloc (dd->data, next_size);
+		dd->max_size = next_size;
+	}
+}
 
-	spa_return_if_fail(str != NULL);
-	spa_return_if_fail(fmt != NULL);
+static void dot_data_add_uint32 (struct dot_data * dd, uint32_t value)
+{
+	int size;
+	dot_data_ensure_max_size (dd, 16);
+	size = snprintf (dd->data + dd->size, dd->max_size - dd->size, "%u", value);
+	dd->size += size;
+}
 
-	if (asprintf(&fmt2, "%s%s", *str, fmt) < 0) {
-		spa_assert_not_reached();
-		return;
-	}
+static void dot_data_add_string (struct dot_data * dd, const char *value)
+{
+	int size;
+	dot_data_ensure_max_size (dd, strlen (value));
+	size = snprintf (dd->data + dd->size, dd->max_size - dd->size, "%s", value);
+	dd->size += size;
+}
 
-	if (vasprintf(&res, fmt2, varargs) < 0) {
-		free (fmt2);
-		spa_assert_not_reached();
-		return;
-	}
-	free (fmt2);
+static int escape_quotes(char *str, int size, const char *val)
+{
+	int len = 0;
+#define __PUT(c) { if (len < size) *str++ = c; len++; }
+	while (*val) {
+		switch (*val) {
+		case '"':
+			__PUT('\\'); __PUT(*val);
+			break;
+		default:
+			__PUT(*val);
+			break;
+		}
+		val++;
 
-	free(*str);
-	*str = res;
+		/* Truncate with "..." if string has more than escaped len characters. */
+		if (len >= MAX_ESCAPED_LEN) {
+			__PUT('.'); __PUT('.'); __PUT('.');
+			break;
+		}
+	}
+	__PUT('\0');
+#undef __PUT
+	return len-1;
 }
 
-static SPA_PRINTF_FUNC(2,3) void dot_str_add(char **str, const char *fmt, ...)
+static void dot_data_add_string_escaped (struct dot_data * dd, const char *value)
 {
-	va_list varargs;
-	va_start(varargs, fmt);
-	dot_str_vadd(str, fmt, varargs);
-	va_end(varargs);
+	size_t escaped_size = escape_quotes (dd->data + dd->size,
+			dd->max_size - dd->size, value);
+	if (escaped_size + 1 > dd->max_size - dd->size) {
+		dot_data_ensure_max_size (dd, escaped_size);
+		escaped_size = escape_quotes (dd->data + dd->size,
+				dd->max_size - dd->size, value);
+	}
+	dd->size += escaped_size;
 }
 
-static void draw_dict(char **str, const char *title,
-		      const struct spa_dict *props)
+static void draw_dict(struct dot_data * dd, const char *title,
+				const struct spa_dict *props)
 {
 	const struct spa_dict_item *item;
 
-	dot_str_add(str, "%s:\\l", title);
+	dot_data_add_string(dd, title);
+	dot_data_add_string(dd, ":\\l");
 	if (props == NULL || props->n_items == 0) {
-		dot_str_add(str, "- none\\l");
+		dot_data_add_string(dd, "- none\\l");
 		return;
 	}
 
 	spa_dict_for_each(item, props) {
-		if (item->value)
-			dot_str_add(str, "- %s: %s\\l", item->key, item->value);
-		else
-			dot_str_add(str, "- %s: (null)\\l", item->key);
+		if (item->value) {
+			dot_data_add_string(dd, "- ");
+			dot_data_add_string_escaped(dd, item->key);
+			dot_data_add_string(dd, ": ");
+			dot_data_add_string_escaped(dd, item->value);
+			dot_data_add_string(dd, "\\l");
+		} else {
+			dot_data_add_string(dd, "- ");
+			dot_data_add_string_escaped(dd, item->key);
+			dot_data_add_string(dd, ": (null)\\l");
+		}
 	}
 }
 
-static SPA_PRINTF_FUNC(6,0) void draw_vlabel(char **str, const char *name, uint32_t id, bool detail,
-		       const struct spa_dict *props, const char *fmt, va_list varargs)
+static void draw_port(struct global *g)
 {
-	/* draw the label header */
-	dot_str_add(str, "%s_%u label=\"", name, id);
+	spa_assert(g != NULL);
+	spa_assert(g->info != NULL);
+	spa_assert(g->type == INTERFACE_Port);
 
-	/* draw the label body */
-	dot_str_vadd(str, fmt, varargs);
+	struct pw_port_info *info = g->info;
+	struct dot_data *dd = &g->data->dot_data;
 
-	if (detail)
-		draw_dict(str, "properties", props);
+	const char *port_name = spa_dict_lookup(info->props, PW_KEY_PORT_NAME);
 
-	/*draw the label footer */
-	dot_str_add(str, "%s", "\";\n");
-}
+	/* draw the box */
+	dot_data_add_string(dd, "port_");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, " shape=box style=filled fillcolor=");
+	dot_data_add_string(dd, info->direction == PW_DIRECTION_INPUT ? "lightslateblue" : "lightcoral");
+	dot_data_add_string(dd, ";");
 
-static SPA_PRINTF_FUNC(6,7) void draw_label(char **str, const char *name, uint32_t id, bool detail,
-		       const struct spa_dict *props, const char *fmt, ...)
-{
-	va_list varargs;
-	va_start(varargs, fmt);
-	draw_vlabel(str, name, id, detail, props, fmt, varargs);
-	va_end(varargs);
+	/* draw the label header */
+	dot_data_add_string(dd, "port_");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, " label=\"");
+
+	/* draw the label body */
+	dot_data_add_string(dd, "port_id: ");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, "\\lname: ");
+	dot_data_add_string_escaped(dd, port_name ? port_name : "(null)");
+	dot_data_add_string(dd, "\\ldirection: ");
+	dot_data_add_string_escaped(dd, pw_direction_as_string(info->direction));
+	dot_data_add_string(dd, "\\l");
+	if (g->data->show_detail)
+		draw_dict(dd, "properties", info->props);
+
+	/* draw the label footer */
+	dot_data_add_string(dd, "\";\n");
 }
 
-static void draw_port(struct global *g)
+static void draw_node_arrows(struct global *g)
 {
 	spa_assert(g != NULL);
 	spa_assert(g->info != NULL);
-	spa_assert(g->type == INTERFACE_Port);
+	spa_assert(g->type == INTERFACE_Node);
 
-	struct pw_port_info *info = g->info;
-	char **dot_str = &g->data->dot_str;
+	struct pw_node_info *info = g->info;
+	struct dot_data *dd = &g->data->dot_data;
 
-	/* draw the box */
-	dot_str_add(dot_str,
-		"port_%u shape=box style=filled fillcolor=%s;\n",
-		g->id,
-		info->direction == PW_DIRECTION_INPUT ? "lightslateblue" : "lightcoral"
-	);
-
-	/* draw the label */
-	draw_label(dot_str,
-		"port", g->id, g->data->show_detail, info->props,
-		"port_id: %u\\lname: %s\\ldirection: %s\\l",
-		g->id,
-		spa_dict_lookup(info->props, PW_KEY_PORT_NAME),
-		pw_direction_as_string(info->direction)
-	);
-}
+	const char *client_id_str, *factory_id_str;
+	uint32_t client_id = GLOBAL_ID_NONE, factory_id = GLOBAL_ID_NONE;
 
+	client_id_str = spa_dict_lookup(info->props, PW_KEY_CLIENT_ID);
+	factory_id_str = spa_dict_lookup(info->props, PW_KEY_FACTORY_ID);
+	spa_atou32(client_id_str, &client_id, 10);
+	spa_atou32(factory_id_str, &factory_id, 10);
+
+	if (client_id != GLOBAL_ID_NONE) {
+		dot_data_add_string(dd, "node_");
+		dot_data_add_uint32(dd, g->id);
+		dot_data_add_string(dd, " -> client_");
+		dot_data_add_uint32(dd, client_id);
+		dot_data_add_string(dd, " style=dashed;\n");
+	}
+	if (factory_id != GLOBAL_ID_NONE) {
+		dot_data_add_string(dd, "node_");
+		dot_data_add_uint32(dd, g->id);
+		dot_data_add_string(dd, " -> factory_");
+		dot_data_add_uint32(dd, factory_id);
+		dot_data_add_string(dd, " style=dashed;\n");
+	}
+}
 
 static void draw_node(struct global *g)
 {
@@ -195,47 +272,55 @@
 	spa_assert(g->type == INTERFACE_Node);
 
 	struct pw_node_info *info = g->info;
-	char **dot_str = &g->data->dot_str;
+	struct dot_data *dd = &g->data->dot_data;
 
-	const char *client_id_str, *factory_id_str;
-	uint32_t client_id, factory_id;
+	const char *node_name, *media_class, *client_id_str, *factory_id_str;
+	uint32_t client_id = GLOBAL_ID_NONE, factory_id = GLOBAL_ID_NONE;
 
+	node_name = spa_dict_lookup(info->props, PW_KEY_NODE_NAME);
+	media_class = spa_dict_lookup(info->props, PW_KEY_MEDIA_CLASS);
 	client_id_str = spa_dict_lookup(info->props, PW_KEY_CLIENT_ID);
 	factory_id_str = spa_dict_lookup(info->props, PW_KEY_FACTORY_ID);
-	client_id = client_id_str ? (uint32_t)atoi(client_id_str) : GLOBAL_ID_NONE;
-	factory_id = factory_id_str ? (uint32_t)atoi(factory_id_str) : GLOBAL_ID_NONE;
+	spa_atou32(client_id_str, &client_id, 10);
+	spa_atou32(factory_id_str, &factory_id, 10);
 
 	/* draw the node header */
-	dot_str_add(dot_str, "subgraph cluster_node_%u {\n", g->id);
-	dot_str_add(dot_str, "bgcolor=palegreen;\n");
+	dot_data_add_string(dd, "subgraph cluster_node_");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, "{\n");
+	dot_data_add_string(dd, "bgcolor=palegreen;\n");
 
 	/* draw the label header */
-	dot_str_add(dot_str, "label=\"");
+	dot_data_add_string(dd, "label=\"");
 
 	/* draw the label body */
-	dot_str_add(dot_str, "node_id: %u\\lname: %s\\lmedia_class: %s\\l",
-		g->id,
-		spa_dict_lookup(info->props, PW_KEY_NODE_NAME),
-		spa_dict_lookup(info->props, PW_KEY_MEDIA_CLASS));
-
+	dot_data_add_string(dd, "node_id: ");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, "\\lname: ");
+	dot_data_add_string_escaped(dd, node_name ? node_name : "(null)");
+	dot_data_add_string(dd, "\\lmedia_class: ");
+	dot_data_add_string_escaped(dd, media_class ? media_class : "(null)");
+	dot_data_add_string(dd, "\\l");
 	if (g->data->show_detail)
-		draw_dict(dot_str, "properties", info->props);
+		draw_dict(dd, "properties", info->props);
 
-	/*draw the label footer */
-	dot_str_add(dot_str, "%s", "\"\n");
+	/* draw the label footer */
+	dot_data_add_string(dd, "\"\n");
 
 	/* draw all node ports */
 	struct global *p;
 	const char *prop_node_id;
 	spa_list_for_each(p, &g->data->globals, link) {
 		struct pw_port_info *pinfo;
+		uint32_t node_id = GLOBAL_ID_NONE;
 		if (p->info == NULL)
 			continue;
 		if (p->type != INTERFACE_Port)
 			continue;
 		pinfo = p->info;
 		prop_node_id = spa_dict_lookup(pinfo->props, PW_KEY_NODE_ID);
-		if (!prop_node_id || (uint32_t)atoi(prop_node_id) != g->id)
+		spa_atou32(prop_node_id, &node_id, 10);
+		if (node_id == GLOBAL_ID_NONE || node_id != g->id)
 			continue;
 		if (p->draw)
 			p->draw(p);
@@ -243,18 +328,27 @@
 
 	/* draw the client/factory box if all option is enabled */
 	if (g->data->show_all) {
-		dot_str_add(dot_str, "node_%u shape=box style=filled fillcolor=white;\n", g->id);
-		dot_str_add(dot_str, "node_%u label=\"client_id: %u\\lfactory_id: %u\\l\";\n", g->id, client_id, factory_id);
+		dot_data_add_string(dd, "node_");
+		dot_data_add_uint32(dd, g->id);
+		dot_data_add_string(dd, " shape=box style=filled fillcolor=white;\n");
+		dot_data_add_string(dd, "node_");
+		dot_data_add_uint32(dd, g->id);
+		dot_data_add_string(dd, " label=\"");
+		if (client_id != GLOBAL_ID_NONE) {
+			dot_data_add_string(dd, "client_id: ");
+			dot_data_add_uint32(dd, client_id);
+			dot_data_add_string(dd, "\\l");
+		}
+		if (factory_id != GLOBAL_ID_NONE) {
+			dot_data_add_string(dd, "factory_id: ");
+			dot_data_add_uint32(dd, factory_id);
+			dot_data_add_string(dd, "\\l");
+		}
+		dot_data_add_string(dd, "\";\n");
 	}
 
 	/* draw the node footer */
-	dot_str_add(dot_str, "}\n");
-
-	/* draw the client/factory arrows if all option is enabled */
-	if (g->data->show_all) {
-		dot_str_add(dot_str, "node_%u -> client_%u style=dashed;\n", g->id, client_id);
-		dot_str_add(dot_str, "node_%u -> factory_%u style=dashed;\n", g->id, factory_id);
-	}
+	dot_data_add_string(dd, "}\n");
 }
 
 static void draw_link(struct global *g)
@@ -264,25 +358,46 @@
 	spa_assert(g->type == INTERFACE_Link);
 
 	struct pw_link_info *info = g->info;
-	char **dot_str = &g->data->dot_str;
+	struct dot_data *dd = &g->data->dot_data;
 
 	/* draw the box */
-	dot_str_add(dot_str, "link_%u shape=box style=filled fillcolor=lightblue;\n", g->id);
-
-	/* draw the label */
-	draw_label(dot_str,
-		"link", g->id, g->data->show_detail, info->props,
-		"link_id: %u\\loutput_node_id: %u\\linput_node_id: %u\\loutput_port_id: %u\\linput_port_id: %u\\lstate: %s\\l",
-		g->id,
-		info->output_node_id,
-		info->input_node_id,
-		info->output_port_id,
-		info->input_port_id,
-		pw_link_state_as_string(info->state)
-	);
+	dot_data_add_string(dd, "link_");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, " shape=box style=filled fillcolor=lightblue;\n");
+
+	/* draw the label header */
+	dot_data_add_string(dd, "link_");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, " label=\"");
+
+	/* draw the label body */
+	dot_data_add_string(dd, "link_id: ");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, "\\loutput_node_id: ");
+	dot_data_add_uint32(dd, info->output_node_id);
+	dot_data_add_string(dd, "\\linput_node_id: ");
+	dot_data_add_uint32(dd, info->output_node_id);
+	dot_data_add_string(dd, "\\loutput_port_id: ");
+	dot_data_add_uint32(dd, info->output_port_id);
+	dot_data_add_string(dd, "\\linput_node_id: ");
+	dot_data_add_uint32(dd, info->input_port_id);
+	dot_data_add_string(dd, "\\lstate: ");
+	dot_data_add_string_escaped(dd, pw_link_state_as_string(info->state));
+	dot_data_add_string(dd, "\\l");
+	if (g->data->show_detail)
+		draw_dict(dd, "properties", info->props);
+
+	/* draw the label footer */
+	dot_data_add_string(dd, "\";\n");
 
 	/* draw the arrows */
-	dot_str_add(dot_str, "port_%u -> link_%u -> port_%u;\n", info->output_port_id, g->id, info->input_port_id);
+	dot_data_add_string(dd, "port_");
+	dot_data_add_uint32(dd, info->output_port_id);
+	dot_data_add_string(dd, " -> link_");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, " -> port_");
+	dot_data_add_uint32(dd, info->input_port_id);
+	dot_data_add_string(dd, ";\n");
 }
 
 static void draw_client(struct global *g)
@@ -292,19 +407,34 @@
 	spa_assert(g->type == INTERFACE_Client);
 
 	struct pw_client_info *info = g->info;
-	char **dot_str = &g->data->dot_str;
+	struct dot_data *dd = &g->data->dot_data;
+
+	const char *app_name = spa_dict_lookup(info->props, PW_KEY_APP_NAME);
+	const char *app_process_id = spa_dict_lookup(info->props, PW_KEY_APP_PROCESS_ID);
 
 	/* draw the box */
-	dot_str_add(dot_str, "client_%u shape=box style=filled fillcolor=tan1;\n", g->id);
-
-	/* draw the label */
-	draw_label(dot_str,
-		"client", g->id, g->data->show_detail, info->props,
-		"client_id: %u\\lname: %s\\lpid: %s\\l",
-		g->id,
-		spa_dict_lookup(info->props, PW_KEY_APP_NAME),
-		spa_dict_lookup(info->props, PW_KEY_APP_PROCESS_ID)
-	);
+	dot_data_add_string(dd, "client_");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, " shape=box style=filled fillcolor=tan1;\n");
+
+	/* draw the label header */
+	dot_data_add_string(dd, "client_");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, " label=\"");
+
+	/* draw the label body */
+	dot_data_add_string(dd, "client_id: ");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, "\\lname: ");
+	dot_data_add_string_escaped(dd, app_name ? app_name : "(null)");
+	dot_data_add_string(dd, "\\lpid: ");
+	dot_data_add_string(dd, app_process_id ? app_process_id : "(null)");
+	dot_data_add_string(dd, "\\l");
+	if (g->data->show_detail)
+		draw_dict(dd, "properties", info->props);
+
+	/* draw the label footer */
+	dot_data_add_string(dd, "\";\n");
 }
 
 static void draw_device(struct global *g)
@@ -314,30 +444,62 @@
 	spa_assert(g->type == INTERFACE_Device);
 
 	struct pw_device_info *info = g->info;
-	char **dot_str = &g->data->dot_str;
+	struct dot_data *dd = &g->data->dot_data;
 
+	const char *app_name = spa_dict_lookup(info->props, PW_KEY_APP_NAME);
+	const char *media_class = spa_dict_lookup(info->props, PW_KEY_MEDIA_CLASS);
+	const char *device_api = spa_dict_lookup(info->props, PW_KEY_DEVICE_API);
+	const char *path = spa_dict_lookup(info->props, PW_KEY_OBJECT_PATH);
 	const char *client_id_str = spa_dict_lookup(info->props, PW_KEY_CLIENT_ID);
 	const char *factory_id_str = spa_dict_lookup(info->props, PW_KEY_FACTORY_ID);
-	uint32_t client_id = client_id_str ? (uint32_t)atoi(client_id_str) : GLOBAL_ID_NONE;
-	uint32_t factory_id = factory_id_str ? (uint32_t)atoi(factory_id_str) : GLOBAL_ID_NONE;
+	uint32_t client_id = GLOBAL_ID_NONE, factory_id = GLOBAL_ID_NONE;
+
+	spa_atou32(client_id_str, &client_id, 10);
+	spa_atou32(factory_id_str, &factory_id, 10);
 
 	/* draw the box */
-	dot_str_add(dot_str, "device_%u shape=box style=filled fillcolor=lightpink;\n", g->id);
-
-	/* draw the label */
-	draw_label(dot_str,
-		"device", g->id, g->data->show_detail, info->props,
-		"device_id: %u\\lname: %s\\lmedia_class: %s\\lapi: %s\\lpath: %s\\l",
-		g->id,
-		spa_dict_lookup(info->props, PW_KEY_DEVICE_NAME),
-		spa_dict_lookup(info->props, PW_KEY_MEDIA_CLASS),
-		spa_dict_lookup(info->props, PW_KEY_DEVICE_API),
-		spa_dict_lookup(info->props, PW_KEY_OBJECT_PATH)
-	);
+	dot_data_add_string(dd, "device_");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, " shape=box style=filled fillcolor=lightpink;\n");
+
+	/* draw the label header */
+	dot_data_add_string(dd, "device_");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, " label=\"");
+
+	/* draw the label body */
+	dot_data_add_string(dd, "device_id: ");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, "\\lname: ");
+	dot_data_add_string_escaped(dd, app_name ? app_name : "(null)");
+	dot_data_add_string(dd, "\\lmedia_class: ");
+	dot_data_add_string_escaped(dd, media_class ? media_class : "(null)");
+	dot_data_add_string(dd, "\\lapi: ");
+	dot_data_add_string_escaped(dd, device_api ? device_api : "(null)");
+	dot_data_add_string(dd, "\\lpath: ");
+	dot_data_add_string_escaped(dd, path ? path : "(null)");
+	dot_data_add_string(dd, "\\l");
+	if (g->data->show_detail)
+		draw_dict(dd, "properties", info->props);
+
+	/* draw the label footer */
+	dot_data_add_string(dd, "\";\n");
 
 	/* draw the arrows */
-	dot_str_add(dot_str, "device_%u -> client_%u style=dashed;\n", g->id, client_id);
-	dot_str_add(dot_str, "device_%u -> factory_%u style=dashed;\n", g->id, factory_id);
+	if (client_id != GLOBAL_ID_NONE) {
+		dot_data_add_string(dd, "device_");
+		dot_data_add_uint32(dd, g->id);
+		dot_data_add_string(dd, " -> client_");
+		dot_data_add_uint32(dd, client_id);
+		dot_data_add_string(dd, " style=dashed;\n");
+	}
+	if (factory_id != GLOBAL_ID_NONE) {
+		dot_data_add_string(dd, "device_");
+		dot_data_add_uint32(dd, g->id);
+		dot_data_add_string(dd, " -> factory_");
+		dot_data_add_uint32(dd, factory_id);
+		dot_data_add_string(dd, " style=dashed;\n");
+	}
 }
 
 static void draw_factory(struct global *g)
@@ -347,23 +509,46 @@
 	spa_assert(g->type == INTERFACE_Factory);
 
 	struct pw_factory_info *info = g->info;
-	char **dot_str = &g->data->dot_str;
-
+	struct dot_data *dd = &g->data->dot_data;
 	const char *module_id_str = spa_dict_lookup(info->props, PW_KEY_MODULE_ID);
-	uint32_t module_id = module_id_str ? (uint32_t)atoi(module_id_str) : GLOBAL_ID_NONE;
+	uint32_t module_id = GLOBAL_ID_NONE;
+
+	spa_atou32(module_id_str, &module_id, 10);
 
 	/* draw the box */
-	dot_str_add(dot_str, "factory_%u shape=box style=filled fillcolor=lightyellow;\n", g->id);
+	dot_data_add_string(dd, "factory_");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, " shape=box style=filled fillcolor=lightyellow;\n");
 
-	/* draw the label */
-	draw_label(dot_str,
-		"factory", g->id, g->data->show_detail, info->props,
-		"factory_id: %u\\lname: %s\\lmodule_id: %u\\l",
-		g->id, info->name, module_id
-	);
+	/* draw the label header */
+	dot_data_add_string(dd, "factory_");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, " label=\"");
+
+	/* draw the label body */
+	dot_data_add_string(dd, "factory_id: ");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, "\\lname: ");
+	dot_data_add_string_escaped(dd, info->name);
+	if (module_id != GLOBAL_ID_NONE) {
+		dot_data_add_string(dd, "\\lmodule_id: ");
+		dot_data_add_uint32(dd, module_id);
+		dot_data_add_string(dd, "\\l");
+	}
+	if (g->data->show_detail)
+		draw_dict(dd, "properties", info->props);
+
+	/* draw the label footer */
+	dot_data_add_string(dd, "\";\n");
 
 	/* draw the arrow */
-	dot_str_add(dot_str, "factory_%u -> module_%u style=dashed;\n", g->id, module_id);
+	if (module_id != GLOBAL_ID_NONE) {
+		dot_data_add_string(dd, "factory_");
+		dot_data_add_uint32(dd, g->id);
+		dot_data_add_string(dd, " -> module_");
+		dot_data_add_uint32(dd, module_id);
+		dot_data_add_string(dd, " style=dashed;\n");
+	}
 }
 
 static void draw_module(struct global *g)
@@ -373,51 +558,128 @@
 	spa_assert(g->type == INTERFACE_Module);
 
 	struct pw_module_info *info = g->info;
-	char **dot_str = &g->data->dot_str;
+	struct dot_data *dd = &g->data->dot_data;
 
 	/* draw the box */
-	dot_str_add(dot_str, "module_%u shape=box style=filled fillcolor=lightgrey;\n", g->id);
-
-	/* draw the label */
-	draw_label(dot_str,
-		"module", g->id, g->data->show_detail, info->props,
-		"module_id: %u\\lname: %s\\l",
-		g->id, info->name
-	);
+	dot_data_add_string(dd, "module_");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, " shape=box style=filled fillcolor=lightgrey;\n");
+
+	/* draw the label header */
+	dot_data_add_string(dd, "module_");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, " label=\"");
+
+	/* draw the label body */
+	dot_data_add_string(dd, "module_id: ");
+	dot_data_add_uint32(dd, g->id);
+	dot_data_add_string(dd, "\\lname: ");
+	dot_data_add_string_escaped(dd, info->name);
+	dot_data_add_string(dd, "\\l");
+	if (g->data->show_detail)
+		draw_dict(dd, "properties", info->props);
+
+	/* draw the label footer */
+	dot_data_add_string(dd, "\";\n");
+}
+
+static void draw_group(struct data *d, const char *group)
+{
+	struct spa_list *globals = &d->globals;
+	struct dot_data *dd = &d->dot_data;
+	static uint32_t group_id = 0;
+
+	/* draw the group header */
+	dot_data_add_string(dd, "subgraph cluster_group_");
+	dot_data_add_uint32(dd, group_id++);
+	dot_data_add_string(dd, "{\n");
+	dot_data_add_string(dd, "bgcolor=lavender;\n");
+
+	/* draw the label header */
+	dot_data_add_string(dd, "label=\"");
+
+	/* draw the label body */
+	dot_data_add_string(dd, group);
+	dot_data_add_string(dd, "\\l");
+
+	/* draw the label footer */
+	dot_data_add_string(dd, "\"\n");
+
+	/* draw all nodes for this group */
+	struct global *n;
+	const char *node_link_group;
+	spa_list_for_each(n, globals, link) {
+		struct pw_node_info *info;
+		if (n->info == NULL)
+			continue;
+		if (n->type != INTERFACE_Node)
+			continue;
+		if (n->drawn)
+			continue;
+		info = n->info;
+		node_link_group = spa_dict_lookup(info->props, PW_KEY_NODE_LINK_GROUP);
+		if (node_link_group == NULL || !spa_streq (node_link_group, group))
+			continue;
+		if (n->draw) {
+			n->draw(n);
+			n->drawn = true;
+		}
+	}
+
+	/* draw the group footer */
+	dot_data_add_string(dd, "}\n");
+
+	/* draw the client/factory arrows if all option is enabled */
+	if (d->show_all) {
+		spa_list_for_each(n, globals, link) {
+			struct pw_node_info *info;
+			if (n->info == NULL)
+				continue;
+			if (n->type != INTERFACE_Node)
+				continue;
+			info = n->info;
+			node_link_group = spa_dict_lookup(info->props, PW_KEY_NODE_LINK_GROUP);
+			if (node_link_group == NULL || !spa_streq (node_link_group, group))
+				continue;
+			draw_node_arrows(n);
+		}
+	}
 }
 
 static bool is_node_id_link_referenced(uint32_t id, struct spa_list *globals)
 {
-        struct global *g;
-        struct pw_link_info *info;
-        spa_list_for_each(g, globals, link) {
-                if (g->info == NULL)
-                        continue;
-                if (g->type != INTERFACE_Link)
-                        continue;
-                info = g->info;
-                if (info->input_node_id == id || info->output_node_id == id)
-                        return true;
-        }
-        return false;
+	struct global *g;
+	struct pw_link_info *info;
+	spa_list_for_each(g, globals, link) {
+		if (g->info == NULL)
+			continue;
+		if (g->type != INTERFACE_Link)
+			continue;
+		info = g->info;
+		if (info->input_node_id == id || info->output_node_id == id)
+			return true;
+	}
+	return false;
 }
 
 static bool is_module_id_factory_referenced(uint32_t id, struct spa_list *globals)
 {
-        struct global *g;
-        struct pw_factory_info *info;
-        const char *module_id_str;
-        spa_list_for_each(g, globals, link) {
-                if (g->info == NULL)
-                        continue;
-                if (g->type != INTERFACE_Factory)
-                        continue;
-                info = g->info;
-                module_id_str = spa_dict_lookup(info->props, PW_KEY_MODULE_ID);
-                if (module_id_str && (uint32_t)atoi(module_id_str) == id)
-                        return true;
-        }
-        return false;
+	struct global *g;
+	struct pw_factory_info *info;
+	const char *module_id_str;
+	spa_list_for_each(g, globals, link) {
+		uint32_t module_id = GLOBAL_ID_NONE;
+		if (g->info == NULL)
+			continue;
+		if (g->type != INTERFACE_Factory)
+			continue;
+		info = g->info;
+		module_id_str = spa_dict_lookup(info->props, PW_KEY_MODULE_ID);
+		spa_atou32(module_id_str, &module_id, 10);
+		if (module_id != GLOBAL_ID_NONE && module_id == id)
+			return true;
+	}
+	return false;
 }
 
 static bool is_global_referenced(struct global *g)
@@ -440,16 +702,18 @@
 	struct global *g;
 
 	/* draw the header */
-	dot_str_add(&d->dot_str, "digraph pipewire {\n");
+	dot_data_add_string(&d->dot_data, "digraph pipewire {\n");
 
 	if (d->dot_rankdir) {
 		/* set rank direction, if provided */
-		dot_str_add(&d->dot_str, "rankdir = \"%s\";\n", d->dot_rankdir);
+		dot_data_add_string(&d->dot_data, "rankdir = \"");
+		dot_data_add_string(&d->dot_data, d->dot_rankdir);
+		dot_data_add_string(&d->dot_data, "\";\n");
 	}
 
 	if (d->dot_orthoedges) {
 		/* enable orthogonal edges */
-		dot_str_add(&d->dot_str, "splines = ortho;\n");
+		dot_data_add_string(&d->dot_data, "splines = ortho;\n");
 	}
 
 	/* iterate the globals */
@@ -479,17 +743,37 @@
 		if (d->show_smart && !is_global_referenced(g))
 			continue;
 
+		/* skip already drawn globals */
+		if (g->drawn)
+			continue;
+
+		/* Draw groups (nodes with node.link-group property) */
+		if (g->type == INTERFACE_Node) {
+			struct pw_node_info *info = g->info;
+			const char *group = spa_dict_lookup(info->props, PW_KEY_NODE_LINK_GROUP);
+			if (group != NULL) {
+				draw_group (d, group);
+				continue;
+			}
+		}
+
 		/* draw the global */
-		if (g->draw)
+		if (g->draw) {
 			g->draw(g);
+			g->drawn = true;
+		}
+
+		/* Draw the node arrows */
+		if (d->show_all && g->type == INTERFACE_Node)
+			draw_node_arrows (g);
 	}
 
 	/* draw the footer */
-	dot_str_add(&d->dot_str, "}\n");
+	dot_data_add_string(&d->dot_data, "}\n");
 
 	if (spa_streq(path, "-")) {
 		/* wire the dot graph into to stdout */
-		fputs(d->dot_str, stdout);
+		fputs(d->dot_data.data, stdout);
 	} else {
 		/* open the file */
 		fp = fopen(path, "we");
@@ -499,7 +783,7 @@
 		}
 
 		/* wire the dot graph into the file */
-		fputs(d->dot_str, fp);
+		fputs(d->dot_data.data, fp);
 		fclose(fp);
 	}
 	return 0;
@@ -507,18 +791,18 @@
 
 static void global_event_info(struct global *g, const void *info)
 {
-        if (g->info_update)
-                g->info = g->info_update(g->info, info);
+	if (g->info_update)
+		g->info = g->info_update(g->info, info);
 }
 
 static void port_event_info(void *data, const struct pw_port_info *info)
 {
-        global_event_info(data, info);
+	global_event_info(data, info);
 }
 
 static const struct pw_port_events port_events = {
-        PW_VERSION_PORT_EVENTS,
-        .info = port_event_info,
+	PW_VERSION_PORT_EVENTS,
+	.info = port_event_info,
 };
 
 static void node_event_info(void *data, const struct pw_node_info *info)
@@ -604,15 +888,15 @@
 				  const char *type, uint32_t version,
 				  const struct spa_dict *props)
 {
-        struct data *d = data;
-        struct pw_proxy *proxy;
-        uint32_t client_version;
+	struct data *d = data;
+	struct pw_proxy *proxy;
+	uint32_t client_version;
 	uint32_t object_type;
-        const void *events;
-        pw_destroy_t info_destroy;
-        info_update_t info_update;
-        draw_t draw;
-        struct global *g;
+	const void *events;
+	pw_destroy_t info_destroy;
+	info_update_t info_update;
+	draw_t draw;
+	struct global *g;
 
 	if (spa_streq(type, PW_TYPE_INTERFACE_Port)) {
 		events = &port_events;
@@ -696,11 +980,11 @@
 	g->info_update = info_update;
 	g->draw = draw;
 
-        pw_proxy_add_object_listener(proxy, &g->object_listener, events, g);
-        pw_proxy_add_listener(proxy, &g->proxy_listener, &proxy_events, g);
+	pw_proxy_add_object_listener(proxy, &g->object_listener, events, g);
+	pw_proxy_add_listener(proxy, &g->proxy_listener, &proxy_events, g);
 
-        /* add the global to the list */
-        spa_list_insert(&d->globals, &g->link);
+	/* add the global to the list */
+	spa_list_insert(&d->globals, &g->link);
 }
 
 static const struct pw_registry_events registry_events = {
@@ -808,6 +1092,7 @@
 
 	g = calloc(1, sizeof (struct global));
 	g->data = data;
+	g->draw = false;
 
 	if (spa_streq(str, PW_TYPE_INTERFACE_Port)) {
 		g->info_destroy = (pw_destroy_t)pw_port_info_free;
@@ -993,6 +1278,7 @@
 	struct stat sbuf;
 	struct spa_json it2;
 	const char *value;
+	struct spa_error_location loc;
 
 	if ((fd = open(json_path,  O_CLOEXEC | O_RDONLY)) < 0) {
 		fprintf(stderr, "error opening file '%s': %m\n", json_path);
@@ -1028,12 +1314,19 @@
 	}
 
 	munmap(json, sbuf.st_size);
+
+	if (spa_json_get_error(&it0, json, &loc)) {
+		spa_debug_file_error_location(stderr, &loc,
+				"JSON syntax error: %s\n", loc.reason);
+		return -1;
+	}
+
 	return 0;
 }
 
 static void show_help(const char *name, bool error)
 {
-        fprintf(error ? stderr : stdout, "%s options\n"
+	fprintf(error ? stderr : stdout, "%s options\n"
 		"  -h, --help                            Show this help\n"
 		"      --version                         Show version\n"
 		"  -a, --all                             Show all object types\n"
@@ -1124,7 +1417,7 @@
 		}
 	}
 
-	if (!(data.dot_str = dot_str_new()))
+	if (!dot_data_init(&data.dot_data, DEFAULT_DOT_DATA_SIZE))
 		return -1;
 
 	spa_list_init(&data.globals);
@@ -1136,7 +1429,7 @@
 
 	draw_graph(&data, dot_path);
 
-	dot_str_clear(&data.dot_str);
+	dot_data_clear(&data.dot_data);
 	spa_list_consume(g, &data.globals, link) {
 		if (g->info && g->info_destroy)
 			g->info_destroy(g->info);

pipewire-1.0.1.tar.bz2/src/tools/pw-dump.c -> pipewire-1.2.0.tar.gz/src/tools/pw-dump.c Changed

@@ -279,7 +279,7 @@
 {
 	char buf128;
 	put_fmt(d, key, "%s%s%s", NUMBER,
-			spa_json_format_float(buf, sizeof(buf), val), NORMAL);
+			spa_json_format_float(buf, sizeof(buf), (float)val), NORMAL);
 }
 
 static void put_value(struct data *d, const char *key, const char *val)
@@ -349,7 +349,7 @@
 		break;
 	case SPA_TYPE_Rectangle:
 	{
-                struct spa_rectangle *r = (struct spa_rectangle *)body;
+		struct spa_rectangle *r = (struct spa_rectangle *)body;
 		put_begin(d, NULL, "{", STATE_SIMPLE);
 		put_int(d, "width", r->width);
 		put_int(d, "height", r->height);
@@ -358,7 +358,7 @@
 	}
 	case SPA_TYPE_Fraction:
 	{
-                struct spa_fraction *f = (struct spa_fraction *)body;
+		struct spa_fraction *f = (struct spa_fraction *)body;
 		put_begin(d, NULL, "{", STATE_SIMPLE);
 		put_int(d, "num", f->num);
 		put_int(d, "denom", f->denom);
@@ -436,7 +436,7 @@
 		break;
 	}
 	case SPA_TYPE_Object:
-        {
+	{
 		put_begin(d, NULL, "{", 0);
 		struct spa_pod_object_body *b = (struct spa_pod_object_body *)body;
 		struct spa_pod_prop *p;
@@ -1231,6 +1231,7 @@
 		e->changed++;
 	}
 	o->changed++;
+	core_sync(o->data);
 	return 0;
 }
 
@@ -1299,13 +1300,13 @@
 		if (o->class->destroy)
 	                o->class->destroy(o);
 	}
-        o->proxy = NULL;
+	o->proxy = NULL;
 }
 
 static const struct pw_proxy_events proxy_events = {
-        PW_VERSION_PROXY_EVENTS,
-        .removed = destroy_removed,
-        .destroy = destroy_proxy,
+	PW_VERSION_PROXY_EVENTS,
+	.removed = destroy_removed,
+	.destroy = destroy_proxy,
 };
 
 static void registry_event_global(void *data, uint32_t id,
@@ -1329,6 +1330,7 @@
 	spa_list_init(&o->param_list);
 	spa_list_init(&o->pending_list);
 	spa_list_init(&o->data_list);
+	spa_list_append(&d->object_list, &o->link);
 
 	o->class = find_class(type, version);
 	if (o->class != NULL) {
@@ -1350,15 +1352,13 @@
 	} else {
 		o->changed++;
 	}
-	spa_list_append(&d->object_list, &o->link);
 
 	core_sync(d);
 	return;
 
 bind_failed:
 	pw_log_error("can't bind object for %u %s/%d: %m", id, type, version);
-	pw_properties_free(o->props);
-	free(o);
+	object_destroy(o);
 	return;
 }
 
@@ -1396,20 +1396,20 @@
 	if ((o = find_object(d, id)) == NULL)
 		return;
 
-	d->state = STATE_FIRST;
-	if (d->pattern != NULL && !object_matches(o, d->pattern))
-		return;
-	if (d->state == STATE_FIRST)
-		put_begin(d, NULL, "", 0);
-	put_begin(d, NULL, "{", 0);
-	put_int(d, "id", o->id);
-	if (o->class && o->class->dump)
-		put_value(d, "info", NULL);
-	else if (o->props)
-		put_value(d, "props", NULL);
-	put_end(d, "}", 0);
-	if (d->state != STATE_FIRST)
-		put_end(d, "\n", 0);
+	if (!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);
+		if (o->class && o->class->dump)
+			put_value(d, "info", NULL);
+		else if (o->props)
+			put_value(d, "props", NULL);
+		put_end(d, "}", 0);
+		if (d->state != STATE_FIRST)
+			put_end(d, "\n", 0);
+	}
 
 	object_destroy(o);
 }
@@ -1541,7 +1541,7 @@
 	pw_init(&argc, &argv);
 
 	data.out = stdout;
-	if (isatty(fileno(data.out)) && getenv("NO_COLOR") == NULL)
+	if (getenv("NO_COLOR") == NULL && isatty(fileno(data.out)))
 		colors = true;
 	setlinebuf(data.out);

pipewire-1.0.1.tar.bz2/src/tools/pw-link.c -> pipewire-1.2.0.tar.gz/src/tools/pw-link.c Changed

@@ -9,40 +9,74 @@
 #include <regex.h>
 #include <locale.h>
 
+#include <spa/utils/cleanup.h>
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/defs.h>
+#include <spa/debug/file.h>
 
 #include <pipewire/pipewire.h>
 #include <pipewire/filter.h>
 
+enum object_type {
+	OBJECT_ANY,
+	OBJECT_NODE,
+	OBJECT_PORT,
+	OBJECT_LINK,
+};
+
+union object_data {
+	struct {
+		enum pw_direction direction;
+		uint32_t node;
+	} port;
+	struct {
+		uint32_t output_port;
+		uint32_t input_port;
+	} link;
+};
+
 struct object {
 	struct spa_list link;
 
 	uint32_t id;
-#define OBJECT_ANY	0
-#define OBJECT_NODE	1
-#define OBJECT_PORT	2
-#define OBJECT_LINK	3
-	uint32_t type;
+	enum object_type type;
 	struct pw_properties *props;
-	uint32_t extra2;
+	union object_data data;
+};
+
+struct target_link {
+	struct spa_list link;
+	struct data *data;
+	struct pw_proxy *proxy;
+	struct spa_hook listener, link_listener;
+	enum pw_link_state state;
+	int result;
+};
+
+enum mode {
+	MODE_CONNECT,
+	MODE_DISCONNECT,
+	MODE_LIST,
+};
+
+enum list_target {
+	LIST_OUTPUT = 1 << 0,
+	LIST_INPUT = 1 << 1,
+	LIST_PORTS = LIST_OUTPUT | LIST_INPUT,
+	LIST_LINKS = 1 << 2,
 };
 
 struct data {
 	struct pw_main_loop *loop;
 
 	const char *opt_remote;
-#define MODE_LIST_OUTPUT	(1<<0)
-#define MODE_LIST_INPUT		(1<<1)
-#define MODE_LIST_PORTS		(MODE_LIST_OUTPUT|MODE_LIST_INPUT)
-#define MODE_LIST_LINKS		(1<<2)
-#define MODE_LIST		(MODE_LIST_PORTS|MODE_LIST_LINKS)
-#define MODE_MONITOR		(1<<3)
-#define MODE_DISCONNECT		(1<<4)
-	uint32_t opt_mode;
+	enum mode opt_mode;
+	enum list_target opt_list; /* for `MODE_LIST` */
 	bool opt_id;
 	bool opt_verbose;
+	bool opt_wait;
+	bool opt_monitor;
 	const char *opt_output;
 	const char *opt_input;
 	struct pw_properties *props;
@@ -56,9 +90,11 @@
 	struct spa_hook registry_listener;
 
 	struct spa_list objects;
+	struct spa_list target_links;
 
 	int sync;
-	int link_res;
+	int nb_links;
+	bool new_object;
 	bool monitoring;
 	bool list_inputs;
 	bool list_outputs;
@@ -68,51 +104,86 @@
 	regex_t in_port_regex, *in_regex;
 };
 
-static void link_proxy_error(void *data, int seq, int res, const char *message)
+static void link_event(struct target_link *tl, enum pw_link_state state, int result)
 {
-	struct data *d = data;
-	d->link_res = res;
-}
+	/* Ignore non definitive states (negotiating, allocating, etc). */
+	if (state != PW_LINK_STATE_ERROR &&
+	    state != PW_LINK_STATE_PAUSED &&
+	    state != PW_LINK_STATE_ACTIVE)
+		return;
 
-static const struct pw_proxy_events link_proxy_events = {
-	PW_VERSION_PROXY_EVENTS,
-	.error = link_proxy_error,
-};
+	/* Keep the first definitive state. For example, once a link is marked
+	 * as paused, we start ignoring all errors. */
+	if (tl->state == PW_LINK_STATE_INIT) {
+		tl->state = state;
+		tl->result = result;
+	}
 
-static void core_sync(struct data *data)
+	/* End if all links have a definitive state. */
+	struct target_link *m;
+	spa_list_for_each(m, &tl->data->target_links, link) {
+		if (m->state == PW_LINK_STATE_INIT)
+			return;
+	}
+	pw_main_loop_quit(tl->data->loop);
+}
+
+static void link_proxy_destroy(void *data)
 {
-	data->sync = pw_core_sync(data->core, PW_ID_CORE, data->sync);
+	struct target_link *tl = data;
+
+	spa_hook_remove(&tl->listener);
+	spa_hook_remove(&tl->link_listener);
+	tl->proxy = NULL;
+
+	link_event(tl, PW_LINK_STATE_ERROR, -EINVAL);
 }
 
-static int create_link(struct data *data)
+static void link_proxy_removed(void *data)
 {
-	struct pw_proxy *proxy;
-	struct spa_hook listener;
+	struct target_link *tl = data;
+	pw_proxy_destroy(tl->proxy);
+}
 
-	data->link_res = 0;
+static void link_proxy_error(void *data, int seq, int res, const char *message)
+{
+	struct target_link *tl = data;
+	link_event(tl, PW_LINK_STATE_ERROR, res);
+}
 
-	proxy = pw_core_create_object(data->core,
-			"link-factory",
-			PW_TYPE_INTERFACE_Link,
-			PW_VERSION_LINK,
-			&data->props->dict, 0);
-	if (proxy == NULL)
-		return -errno;
+static const struct pw_proxy_events link_proxy_events = {
+	PW_VERSION_PROXY_EVENTS,
+	.destroy = link_proxy_destroy,
+	.removed = link_proxy_removed,
+	.error = link_proxy_error,
+};
 
-	spa_zero(listener);
-	pw_proxy_add_listener(proxy, &listener, &link_proxy_events, data);
+static void link_event_info(void *data, const struct pw_link_info *info)
+{
+	struct target_link *tl = data;
+	int result = 0;
 
-	core_sync(data);
-	pw_main_loop_run(data->loop);
+	/*
+	 * Invent an error code to always have one if state == error. That does
+	 * not occur currently; on link error a proxy error is raised first.
+	 */
+	if (tl->state == PW_LINK_STATE_ERROR)
+		result = -EINVAL;
 
-        spa_hook_remove(&listener);
+	link_event(tl, info->state, result);
+}
 
-        pw_proxy_destroy(proxy);
+static const struct pw_link_events link_events = {
+	PW_VERSION_LINK_EVENTS,
+	.info = link_event_info,
+};
 
-	return data->link_res;
+static void core_sync(struct data *data)
+{
+	data->sync = pw_core_sync(data->core, PW_ID_CORE, data->sync);
 }
 
-static struct object *find_object(struct data *data, uint32_t type, uint32_t id)
+static struct object *find_object(struct data *data, enum object_type type, uint32_t id)
 {
 	struct object *o;
 	spa_list_for_each(o, &data->objects, link)
@@ -129,9 +200,9 @@
 		const char *o_port_id;
 		if (o->type != OBJECT_PORT)
 			continue;
-		if (o->extra1 != node->id)
+		if (o->data.port.node != node->id)
 			continue;
-		if (o->extra0 != direction)
+		if (o->data.port.direction != direction)
 			continue;
 		if ((o_port_id = pw_properties_get(o->props, PW_KEY_PORT_ID)) == NULL)
 			continue;
@@ -147,8 +218,9 @@
 	const char *name;
 	buffer0 = '\0';
 	if ((name = pw_properties_get(n->props, PW_KEY_NODE_NAME)) == NULL)
-		return buffer;
-	snprintf(buffer, size, "%s", name);
+		snprintf(buffer, size, "node.id.%d", n->id);
+	else
+		snprintf(buffer, size, "%s", name);
 	return buffer;
 }
 
@@ -157,8 +229,9 @@
 	const char *name;
 	buffer0 = '\0';
 	if ((name = pw_properties_get(n->props, PW_KEY_OBJECT_PATH)) == NULL)
-		return buffer;
-	snprintf(buffer, size, "%s", name);
+		snprintf(buffer, size, "node.path.%d", n->id);
+	else
+		snprintf(buffer, size, "%s", name);
 	return buffer;
 }
 
@@ -166,11 +239,16 @@
 {
 	const char *name1, *name2;
 	buffer0 = '\0';
-	if ((name1 = pw_properties_get(n->props, PW_KEY_NODE_NAME)) == NULL)
-		return buffer;
-	if ((name2 = pw_properties_get(p->props, PW_KEY_PORT_NAME)) == NULL)
-		return buffer;
-	snprintf(buffer, size, "%s:%s", name1, name2);
+	name1 = pw_properties_get(n->props, PW_KEY_NODE_NAME);
+	name2 = pw_properties_get(p->props, PW_KEY_PORT_NAME);
+	if (name1 && name2)
+		snprintf(buffer, size, "%s:%s", name1, name2);
+	else if (name1)
+		snprintf(buffer, size, "%s:port.id.%d", name1, p->id);
+	else if (name2)
+		snprintf(buffer, size, "node.id.%d:%s", n->id, name2);
+	else
+		snprintf(buffer, size, "node.id.%d:port.id.%d", n->id, p->id);
 	return buffer;
 }
 
@@ -179,8 +257,9 @@
 	const char *name;
 	buffer0 = '\0';
 	if ((name = pw_properties_get(p->props, PW_KEY_OBJECT_PATH)) == NULL)
-		return buffer;
-	snprintf(buffer, size, "%s", name);
+		snprintf(buffer, size, "port.path.%d", p->id);
+	else
+		snprintf(buffer, size, "%s", name);
 	return buffer;
 }
 
@@ -189,8 +268,9 @@
 	const char *name;
 	buffer0 = '\0';
 	if ((name = pw_properties_get(p->props, PW_KEY_PORT_ALIAS)) == NULL)
-		return buffer;
-	snprintf(buffer, size, "%s", name);
+		snprintf(buffer, size, "port_alias.%d", p->id);
+	else
+		snprintf(buffer, size, "%s", name);
 	return buffer;
 }
 
@@ -222,7 +302,7 @@
 	struct object *n, *p;
 	if ((p = find_object(data, OBJECT_PORT, peer)) == NULL)
 		return;
-	if ((n = find_object(data, OBJECT_NODE, p->extra1)) == NULL)
+	if ((n = find_object(data, OBJECT_NODE, p->data.port.node)) == NULL)
 		return;
 	print_port(data, prefix, n, p, false);
 }
@@ -232,7 +312,7 @@
 	struct object *o;
 	bool first = false;
 
-	if ((data->opt_mode & MODE_LIST_PORTS) == 0)
+	if (!(data->opt_list & LIST_PORTS))
 		first = true;
 
 	spa_list_for_each(o, &data->objects, link) {
@@ -245,14 +325,14 @@
 		if (o->type != OBJECT_LINK)
 			continue;
 
-		if (port->extra0 == PW_DIRECTION_OUTPUT &&
-		    o->extra0 == port->id) {
-			peer = o->extra1;
+		if (port->data.port.direction == PW_DIRECTION_OUTPUT &&
+		    o->data.link.output_port == port->id) {
+			peer = o->data.link.input_port;
 			snprintf(prefix, sizeof(prefix), "%s  |-> ", id);
 		}
-		else if (port->extra0 == PW_DIRECTION_INPUT &&
-		    o->extra1 == port->id) {
-			peer = o->extra0;
+		else if (port->data.port.direction == PW_DIRECTION_INPUT &&
+		    o->data.link.input_port == port->id) {
+			peer = o->data.link.output_port;
 			snprintf(prefix, sizeof(prefix), "%s  |<- ", id);
 		}
 		else
@@ -309,17 +389,17 @@
 	spa_list_for_each(o, &data->objects, link) {
 		if (o->type != OBJECT_PORT)
 			continue;
-		if (o->extra1 != node->id)
+		if (o->data.port.node != node->id)
 			continue;
-		if (o->extra0 != direction)
+		if (o->data.port.direction != direction)
 			continue;
 
 		if (regex && !port_regex(data, node, o, regex))
 			continue;
 
-		if (data->opt_mode & MODE_LIST_PORTS)
+		if (data->opt_list & LIST_PORTS)
 			print_port(data, "", node, o, data->opt_verbose);
-		if (data->opt_mode & MODE_LIST_LINKS)
+		if (data->opt_list & LIST_LINKS)
 			do_list_port_links(data, node, o);
 	}
 }
@@ -338,12 +418,47 @@
 	}
 }
 
-static int do_link_ports(struct data *data)
+static int create_link_target(struct data *data)
+{
+	struct target_link *tl = calloc(1, sizeof(*tl));
+	if (!tl)
+		return -ENOMEM;
+
+	tl->proxy = pw_core_create_object(data->core,
+			"link-factory", PW_TYPE_INTERFACE_Link,
+			PW_VERSION_LINK, &data->props->dict, 0);
+	if (tl->proxy == NULL) {
+		free(tl);
+		return -errno;
+	}
+
+	tl->data = data;
+	tl->state = PW_LINK_STATE_INIT;
+	pw_proxy_add_listener(tl->proxy, &tl->listener, &link_proxy_events, tl);
+	pw_proxy_add_object_listener(tl->proxy, &tl->link_listener, &link_events, tl);
+	spa_list_append(&data->target_links, &tl->link);
+	return 0;
+}
+
+/*
+ * create_link_proxies() looks at the current objects and tries to find the
+ * matching output and input nodes (multiple links) or the matching output and
+ * input ports.
+ *
+ * If successful, it fills data->target_links with proxies for all links and
+ * returns the number of links. This can be zero (two nodes with no ports). It
+ * might return (negative) errors. -ENOENT means no matching nodes or ports
+ * were found.
+ */
+static int create_link_proxies(struct data *data)
 {
 	uint32_t in_port = 0, out_port = 0;
 	struct object *n, *p;
 	struct object *in_node = NULL, *out_node = NULL;
 
+	spa_assert(data->opt_output);
+	spa_assert(data->opt_input);
+
 	spa_list_for_each(n, &data->objects, link) {
 		if (n->type != OBJECT_NODE)
 			continue;
@@ -359,22 +474,21 @@
 		spa_list_for_each(p, &data->objects, link) {
 			if (p->type != OBJECT_PORT)
 				continue;
-			if (p->extra1 != n->id)
+			if (p->data.port.node != n->id)
 				continue;
 
-			if (out_port == 0 && p->extra0 == PW_DIRECTION_OUTPUT &&
+			if (out_port == 0 && p->data.port.direction == PW_DIRECTION_OUTPUT &&
 			    port_matches(data, n, p, data->opt_output))
 				out_port = p->id;
-			else if (in_port == 0 && p->extra0 == PW_DIRECTION_INPUT &&
+			else if (in_port == 0 && p->data.port.direction == PW_DIRECTION_INPUT &&
 			    port_matches(data, n, p, data->opt_input))
 				in_port = p->id;
 		}
 	}
 
 	if (in_node && out_node) {
-		int i, ret;
+		int i;
 		char port_id32;
-		bool all_links_exist = true;
 
 		for (i=0;; i++) {
 			snprintf(port_id, sizeof(port_id), "%d", i);
@@ -382,27 +496,17 @@
 			struct object *port_out = find_node_port(data, out_node, PW_DIRECTION_OUTPUT, port_id);
 			struct object *port_in = find_node_port(data, in_node, PW_DIRECTION_INPUT, port_id);
 
-			if (!port_out && !port_in) {
-				fprintf(stderr, "Input & output port do not exist\n");
-				goto no_port;
-			} else if (!port_in) {
-				fprintf(stderr, "Input port does not exist\n");
-				goto no_port;
-			} else if (!port_out) {
-				fprintf(stderr, "Output port does not exist\n");
-				goto no_port;
-			}
+			if (!port_out || !port_in)
+				return i;
 
 			pw_properties_setf(data->props, PW_KEY_LINK_OUTPUT_PORT, "%u", port_out->id);
 			pw_properties_setf(data->props, PW_KEY_LINK_INPUT_PORT, "%u", port_in->id);
 
-			if ((ret = create_link(data)) < 0 && ret != -EEXIST)
+			int ret = create_link_target(data);
+			if (ret)
 				return ret;
-
-			if (ret >= 0)
-				all_links_exist = false;
 		}
-		return (all_links_exist ? -EEXIST : 0);
+		return i;
 	}
 
 	if (in_port == 0 || out_port == 0)
@@ -411,10 +515,12 @@
 	pw_properties_setf(data->props, PW_KEY_LINK_OUTPUT_PORT, "%u", out_port);
 	pw_properties_setf(data->props, PW_KEY_LINK_INPUT_PORT, "%u", in_port);
 
-	return create_link(data);
-
-no_port:
-	return -ENOENT;
+	/*
+	 * create_link_target() returns zero on success. We return the number of
+	 * links on success, meaning 1.
+	 */
+	int ret = create_link_target(data);
+	return !ret ? 1 : ret;
 }
 
 static int do_unlink_ports(struct data *data)
@@ -423,6 +529,8 @@
 	bool found_any = false;
 	struct object *in_node = NULL, *out_node = NULL;
 
+	spa_assert(data->opt_output);
+
 	if (data->opt_input != NULL) {
 		/* 2 args, check if they are node names */
 		spa_list_for_each(n, &data->objects, link) {
@@ -449,31 +557,31 @@
 				continue;
 		} else if (out_node && in_node) {
 			/* 2 args, check nodes */
-			if ((p = find_object(data, OBJECT_PORT, l->extra0)) == NULL)
+			if ((p = find_object(data, OBJECT_PORT, l->data.link.output_port)) == NULL)
 				continue;
-			if ((n = find_object(data, OBJECT_NODE, p->extra1)) == NULL)
+			if ((n = find_object(data, OBJECT_NODE, p->data.port.node)) == NULL)
 				continue;
 			if (n->id != out_node->id)
 				continue;
 
-			if ((p = find_object(data, OBJECT_PORT, l->extra1)) == NULL)
+			if ((p = find_object(data, OBJECT_PORT, l->data.link.input_port)) == NULL)
 				continue;
-			if ((n = find_object(data, OBJECT_NODE, p->extra1)) == NULL)
+			if ((n = find_object(data, OBJECT_NODE, p->data.port.node)) == NULL)
 				continue;
 			if (n->id != in_node->id)
 				continue;
 		} else {
 			/* 2 args, check port names */
-			if ((p = find_object(data, OBJECT_PORT, l->extra0)) == NULL)
+			if ((p = find_object(data, OBJECT_PORT, l->data.link.output_port)) == NULL)
 				continue;
-			if ((n = find_object(data, OBJECT_NODE, p->extra1)) == NULL)
+			if ((n = find_object(data, OBJECT_NODE, p->data.port.node)) == NULL)
 				continue;
 			if (!port_matches(data, n, p, data->opt_output))
 				continue;
 
-			if ((p = find_object(data, OBJECT_PORT, l->extra1)) == NULL)
+			if ((p = find_object(data, OBJECT_PORT, l->data.link.input_port)) == NULL)
 				continue;
-			if ((n = find_object(data, OBJECT_NODE, p->extra1)) == NULL)
+			if ((n = find_object(data, OBJECT_NODE, p->data.port.node)) == NULL)
 				continue;
 			if (!port_matches(data, n, p, data->opt_input))
 				continue;
@@ -496,18 +604,18 @@
 	bool do_print = false;
 	struct object *node;
 
-	if (port->extra0 == PW_DIRECTION_OUTPUT && data->list_outputs) {
+	if (port->data.port.direction == PW_DIRECTION_OUTPUT && data->list_outputs) {
 		regex = data->out_regex;
 		do_print = true;
 	}
-	if (port->extra0 == PW_DIRECTION_INPUT && data->list_inputs) {
+	if (port->data.port.direction == PW_DIRECTION_INPUT && data->list_inputs) {
 		regex = data->in_regex;
 		do_print = true;
 	}
 	if (!do_print)
 		return 0;
 
-	if ((node = find_object(data, OBJECT_NODE, port->extra1)) == NULL)
+	if ((node = find_object(data, OBJECT_NODE, port->data.port.node)) == NULL)
 		return -ENOENT;
 
 	if (regex && !port_regex(data, node, port, regex))
@@ -522,19 +630,19 @@
 	char buffer11024, buffer21024, id64 = "";
 	struct object *n1, *n2, *p1, *p2;
 
-	if (!(data->opt_mode & MODE_LIST_LINKS))
+	if (!(data->opt_list & LIST_LINKS))
 		return 0;
 
-	if ((p1 = find_object(data, OBJECT_PORT, link->extra0)) == NULL)
+	if ((p1 = find_object(data, OBJECT_PORT, link->data.link.output_port)) == NULL)
 		return -ENOENT;
-	if ((n1 = find_object(data, OBJECT_NODE, p1->extra1)) == NULL)
+	if ((n1 = find_object(data, OBJECT_NODE, p1->data.port.node)) == NULL)
 		return -ENOENT;
 	if (data->out_regex && !port_regex(data, n1, p1, data->out_regex))
 		return 0;
 
-	if ((p2 = find_object(data, OBJECT_PORT, link->extra1)) == NULL)
+	if ((p2 = find_object(data, OBJECT_PORT, link->data.link.input_port)) == NULL)
 		return -ENOENT;
-	if ((n2 = find_object(data, OBJECT_NODE, p2->extra1)) == NULL)
+	if ((n2 = find_object(data, OBJECT_NODE, p2->data.port.node)) == NULL)
 		return -ENOENT;
 	if (data->in_regex && !port_regex(data, n2, p2, data->in_regex))
 		return 0;
@@ -553,7 +661,8 @@
 				  const struct spa_dict *props)
 {
 	struct data *d = data;
-	uint32_t t, extra2;
+	enum object_type t;
+	union object_data extra = {0};
 	struct object *obj;
 	const char *str;
 
@@ -564,26 +673,31 @@
 	if (spa_streq(type, PW_TYPE_INTERFACE_Node)) {
 		t = OBJECT_NODE;
 	} else if (spa_streq(type, PW_TYPE_INTERFACE_Port)) {
+		if (!d->new_object && d->opt_wait && spa_list_is_empty(&d->target_links)) {
+			d->new_object = true;
+			core_sync(d);
+		}
+
 		t = OBJECT_PORT;
 		if ((str = spa_dict_lookup(props, PW_KEY_PORT_DIRECTION)) == NULL)
 			return;
 		if (spa_streq(str, "in"))
-			extra0 = PW_DIRECTION_INPUT;
+			extra.port.direction = PW_DIRECTION_INPUT;
 		else if (spa_streq(str, "out"))
-			extra0 = PW_DIRECTION_OUTPUT;
+			extra.port.direction = PW_DIRECTION_OUTPUT;
 		else
 			return;
 		if ((str = spa_dict_lookup(props, PW_KEY_NODE_ID)) == NULL)
 			return;
-		extra1 = atoi(str);
+		extra.port.node = atoi(str);
 	} else if (spa_streq(type, PW_TYPE_INTERFACE_Link)) {
 		t = OBJECT_LINK;
 		if ((str = spa_dict_lookup(props, PW_KEY_LINK_OUTPUT_PORT)) == NULL)
 			return;
-		extra0 = atoi(str);
+		extra.link.output_port = atoi(str);
 		if ((str = spa_dict_lookup(props, PW_KEY_LINK_INPUT_PORT)) == NULL)
 			return;
-		extra1 = atoi(str);
+		extra.link.input_port = atoi(str);
 	} else
 		return;
 
@@ -591,12 +705,16 @@
 	obj->type = t;
 	obj->id = id;
 	obj->props = pw_properties_new_dict(props);
-	memcpy(obj->extra, extra, sizeof(extra));
+	obj->data = extra;
 	spa_list_append(&d->objects, &obj->link);
 
 	if (d->monitoring) {
 		d->prefix = "+ ";
 		switch (obj->type) {
+		case OBJECT_ANY:
+			spa_assert_not_reached();
+		case OBJECT_NODE:
+			break;
 		case OBJECT_PORT:
 			do_monitor_port(d, obj);
 			break;
@@ -607,6 +725,13 @@
 	}
 }
 
+static void destroy_object(struct object *obj)
+{
+	spa_list_remove(&obj->link);
+	pw_properties_free(obj->props);
+	free(obj);
+}
+
 static void registry_event_global_remove(void *data, uint32_t id)
 {
 	struct data *d = data;
@@ -618,6 +743,10 @@
 	if (d->monitoring) {
 		d->prefix = "- ";
 		switch (obj->type) {
+		case OBJECT_ANY:
+			spa_assert_not_reached();
+		case OBJECT_NODE:
+			break;
 		case OBJECT_PORT:
 			do_monitor_port(d, obj);
 			break;
@@ -627,9 +756,7 @@
 		}
 	}
 
-	spa_list_remove(&obj->link);
-	pw_properties_free(obj->props);
-	free(obj);
+	destroy_object(obj);
 }
 
 static const struct pw_registry_events registry_events = {
@@ -641,8 +768,22 @@
 static void on_core_done(void *data, uint32_t id, int seq)
 {
 	struct data *d = data;
-	if (d->sync == seq)
-		pw_main_loop_quit(d->loop);
+
+	if (d->sync != seq)
+		return;
+
+	/* Connect mode, look for our targets. */
+	if (d->opt_mode == MODE_CONNECT) {
+		d->nb_links = create_link_proxies(d);
+		/* In wait mode, if none exist, keep running. */
+		if (d->opt_wait && d->nb_links == -ENOENT) {
+			d->new_object = false;
+			return;
+		}
+	}
+
+	pw_main_loop_quit(d->loop);
+
 }
 
 static void on_core_error(void *data, uint32_t id, int seq, int res, const char *message)
@@ -670,7 +811,7 @@
 
 static void show_help(struct data *data, const char *name, bool error)
 {
-        fprintf(error ? stderr : stdout, "%1$s : PipeWire port and link manager.\n"
+	fprintf(error ? stderr : stdout, "%1$s : PipeWire port and link manager.\n"
 		"Generic: %1$s options\n"
 		"  -h, --help                            Show this help\n"
 		"      --version                         Show version\n"
@@ -686,18 +827,60 @@
 		"  -L, --linger                          Linger (default, unless -m is used)\n"
 		"  -P, --passive                         Passive link\n"
 		"  -p, --props=PROPS                     Properties as JSON object\n"
+		"  -w, --wait                            Wait until link creation attempt\n"
 		"Disconnect: %1$s -d options output input\n"
 		"            %1$s -d options link-id\n"
 		"  -d, --disconnect                      Disconnect ports\n",
 		name);
 }
 
-int main(int argc, char *argv)
+static void data_clear(struct data *data)
 {
-	struct data data = { 0, };
+	struct object *o;
+	spa_list_consume(o, &data->objects, link)
+		destroy_object(o);
+
+	struct target_link *tl;
+	spa_list_consume(tl, &data->target_links, link) {
+		if (tl->proxy != NULL) {
+			spa_hook_remove(&tl->listener);
+			spa_hook_remove(&tl->link_listener);
+			pw_proxy_destroy(tl->proxy);
+		}
+		spa_list_remove(&tl->link);
+		free(tl);
+	}
+
+	if (data->out_regex)
+		regfree(data->out_regex);
+	if (data->in_regex)
+		regfree(data->in_regex);
+
+	if (data->registry) {
+		spa_hook_remove(&data->registry_listener);
+		pw_proxy_destroy((struct pw_proxy *) data->registry);
+	}
+
+	if (data->core) {
+		spa_hook_remove(&data->core_listener);
+		pw_core_disconnect(data->core);
+	}
+
+	spa_clear_ptr(data->context, pw_context_destroy);
+	spa_clear_ptr(data->loop, pw_main_loop_destroy);
+
+	pw_properties_free(data->props);
+}
+
+static int run(int argc, char *argv)
+{
+	spa_cleanup(data_clear) struct data data = {
+		.opt_mode = MODE_CONNECT,
+		.objects = SPA_LIST_INIT(&data.objects),
+		.target_links = SPA_LIST_INIT(&data.target_links),
+	};
 	int res = 0, c;
-	regex_t out_port_regex;
-	regex_t in_port_regex;
+	struct spa_error_location loc;
 	static const struct option long_options = {
 		{ "help",	no_argument,		NULL, 'h' },
 		{ "version",	no_argument,		NULL, 'V' },
@@ -711,26 +894,21 @@
 		{ "linger",	no_argument,		NULL, 'L' },
 		{ "passive",	no_argument,		NULL, 'P' },
 		{ "props",	required_argument,	NULL, 'p' },
+		{ "wait",	no_argument,		NULL, 'w' },
 		{ "disconnect",	no_argument,		NULL, 'd' },
 		{ NULL,	0, NULL, 0}
 	};
 
-	setlocale(LC_ALL, "");
-	pw_init(&argc, &argv);
-	spa_list_init(&data.objects);
-
-	setlinebuf(stdout);
-
 	data.props = pw_properties_new(NULL, NULL);
 	if (data.props == NULL) {
 		fprintf(stderr, "can't create properties: %m\n");
 		return -1;
 	}
 
-	while ((c = getopt_long(argc, argv, "hVr:oilmIvLPp:d", long_options, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "hVr:oilmIvLPp:wd", long_options, NULL)) != -1) {
 		switch (c) {
 		case 'h':
-			show_help(&data, argv0, NULL);
+			show_help(&data, argv0, false);
 			return 0;
 		case 'V':
 			printf("%s\n"
@@ -744,16 +922,19 @@
 			data.opt_remote = optarg;
 			break;
 		case 'o':
-			data.opt_mode |= MODE_LIST_OUTPUT;
+			data.opt_mode = MODE_LIST;
+			data.opt_list |= LIST_OUTPUT;
 			break;
 		case 'i':
-			data.opt_mode |= MODE_LIST_INPUT;
+			data.opt_mode = MODE_LIST;
+			data.opt_list |= LIST_INPUT;
 			break;
 		case 'l':
-			data.opt_mode |= MODE_LIST_LINKS;
+			data.opt_mode = MODE_LIST;
+			data.opt_list |= LIST_LINKS;
 			break;
 		case 'm':
-			data.opt_mode |= MODE_MONITOR;
+			data.opt_monitor = true;
 			break;
 		case 'I':
 			data.opt_id = true;
@@ -768,10 +949,17 @@
 			pw_properties_set(data.props, PW_KEY_LINK_PASSIVE, "true");
 			break;
 		case 'p':
-			pw_properties_update_string(data.props, optarg, strlen(optarg));
+			if (pw_properties_update_string_checked(data.props, optarg, strlen(optarg), &loc) < 0) {
+				spa_debug_file_error_location(stderr, &loc,
+						"error: syntax error in --props: %s", loc.reason);
+				return -1;
+			}
 			break;
 		case 'd':
-			data.opt_mode |= MODE_DISCONNECT;
+			data.opt_mode = MODE_DISCONNECT;
+			break;
+		case 'w':
+			data.opt_wait = true;
 			break;
 		default:
 			show_help(&data, argv0, true);
@@ -781,12 +969,12 @@
 	if (argc == 1)
 		show_help(&data, argv0, true);
 
-	if (data.opt_id && (data.opt_mode & MODE_LIST) == 0) {
+	if (data.opt_id && data.opt_mode != MODE_LIST) {
 		fprintf(stderr, "-I option needs one or more of -l, -i or -o\n");
 		return -1;
 	}
 
-	if ((data.opt_mode & MODE_MONITOR) == 0)
+	if (!data.opt_monitor)
 		pw_properties_set(data.props, PW_KEY_OBJECT_LINGER, "true");
 
 	if (optind < argc)
@@ -794,6 +982,23 @@
 	if (optind < argc)
 		data.opt_input = argvoptind++;
 
+	switch (data.opt_mode) {
+	case MODE_LIST:
+		break;
+	case MODE_DISCONNECT:
+		if (data.opt_output == NULL) {
+			fprintf(stderr, "missing link-id or output and input port names to disconnect\n");
+			return -1;
+		}
+		break;
+	case MODE_CONNECT:
+		if (data.opt_output == NULL || data.opt_input == NULL) {
+			fprintf(stderr, "missing output and input port names to connect\n");
+			return -1;
+		}
+		break;
+	}
+
 	data.loop = pw_main_loop_new(NULL);
 	if (data.loop == NULL) {
 		fprintf(stderr, "can't create mainloop: %m\n");
@@ -828,66 +1033,74 @@
 			&data.registry_listener,
 			&registry_events, &data);
 
-	data.prefix = (data.opt_mode & MODE_MONITOR) ? "= " : "";
+	data.prefix = data.opt_monitor ? "= " : "";
 
 	core_sync(&data);
 	pw_main_loop_run(data.loop);
 
-	if ((data.opt_mode & (MODE_LIST_PORTS|MODE_LIST_LINKS)) == MODE_LIST_LINKS)
+	if ((data.opt_list & (LIST_PORTS|LIST_LINKS)) == LIST_LINKS)
 		data.list_inputs = data.list_outputs = true;
-	if ((data.opt_mode & MODE_LIST_INPUT) == MODE_LIST_INPUT)
+	if ((data.opt_list & LIST_INPUT) == LIST_INPUT)
 		data.list_inputs = true;
-	if ((data.opt_mode & MODE_LIST_OUTPUT) == MODE_LIST_OUTPUT)
+	if ((data.opt_list & LIST_OUTPUT) == LIST_OUTPUT)
 		data.list_outputs = true;
 
 	if (data.opt_output) {
-		if (regcomp(&out_port_regex, data.opt_output, REG_EXTENDED | REG_NOSUB) == 0)
-			data.out_regex = &out_port_regex;
+		if (regcomp(&data.out_port_regex, data.opt_output, REG_EXTENDED | REG_NOSUB) == 0)
+			data.out_regex = &data.out_port_regex;
 	}
 	if (data.opt_input) {
-		if (regcomp(&in_port_regex, data.opt_input, REG_EXTENDED | REG_NOSUB) == 0)
-			data.in_regex = &in_port_regex;
+		if (regcomp(&data.in_port_regex, data.opt_input, REG_EXTENDED | REG_NOSUB) == 0)
+			data.in_regex = &data.in_port_regex;
 	}
 
-	if (data.opt_mode & (MODE_LIST)) {
+	switch (data.opt_mode) {
+	case MODE_LIST:
 		do_list(&data);
-	} else if (data.opt_mode & MODE_DISCONNECT) {
-		if (data.opt_output == NULL) {
-			fprintf(stderr, "missing link-id or output and input port names to disconnect\n");
-			return -1;
-		}
+		break;
+	case MODE_DISCONNECT:
 		if ((res = do_unlink_ports(&data)) < 0) {
 			fprintf(stderr, "failed to unlink ports: %s\n", spa_strerror(res));
 			return -1;
 		}
-	} else {
-		if (data.opt_output == NULL ||
-		    data.opt_input == NULL) {
-			fprintf(stderr, "missing output and input port names to connect\n");
+		break;
+	case MODE_CONNECT:
+		if (data.nb_links < 0) {
+			fprintf(stderr, "failed to link ports: %s\n", spa_strerror(data.nb_links));
 			return -1;
 		}
-		if ((res = do_link_ports(&data)) < 0) {
-			fprintf(stderr, "failed to link ports: %s\n", spa_strerror(res));
-			return -1;
+
+		if (data.nb_links > 0) {
+			pw_main_loop_run(data.loop);
+
+			struct target_link *tl;
+			spa_list_for_each(tl, &data.target_links, link) {
+				if (tl->state == PW_LINK_STATE_ERROR) {
+					fprintf(stderr, "failed to link ports: %s\n",
+						spa_strerror(tl->result));
+					return -1;
+				}
+			}
 		}
+		break;
 	}
 
-	if (data.opt_mode & MODE_MONITOR) {
+	if (data.opt_monitor) {
 		data.monitoring = true;
 		pw_main_loop_run(data.loop);
 		data.monitoring = false;
 	}
 
-	if (data.out_regex)
-		regfree(data.out_regex);
-	if (data.in_regex)
-		regfree(data.in_regex);
-	spa_hook_remove(&data.registry_listener);
-	pw_proxy_destroy((struct pw_proxy*)data.registry);
-	spa_hook_remove(&data.core_listener);
-	pw_core_disconnect(data.core);
-	pw_context_destroy(data.context);
-	pw_main_loop_destroy(data.loop);
+	return 0;
+}
+
+int main(int argc, char *argv)
+{
+	setlocale(LC_ALL, "");
+	setlinebuf(stdout);
+
+	pw_init(&argc, &argv);
+	int res = run(argc, argv);
 	pw_deinit();
 
 	return res;

pipewire-1.0.1.tar.bz2/src/tools/pw-loopback.c -> pipewire-1.2.0.tar.gz/src/tools/pw-loopback.c Changed

@@ -16,6 +16,7 @@
 #include <spa/param/audio/format-utils.h>
 #include <spa/param/audio/raw.h>
 #include <spa/utils/json.h>
+#include <spa/debug/file.h>
 
 #include <pipewire/pipewire.h>
 #include <pipewire/impl.h>
@@ -65,7 +66,7 @@
 
 static void show_help(struct data *data, const char *name, bool error)
 {
-        fprintf(error ? stderr : stdout, "%s options\n"
+	fprintf(error ? stderr : stdout, "%s options\n"
 		"  -h, --help                            Show this help\n"
 		"      --version                         Show version\n"
 		"  -r, --remote                          Remote daemon name\n"
@@ -111,6 +112,7 @@
 		{ NULL, 0, NULL, 0}
 	};
 	int c, res = -1;
+	struct spa_error_location loc;
 
 	setlocale(LC_ALL, "");
 	pw_init(&argc, &argv);
@@ -161,7 +163,7 @@
 			data.latency = atoi(optarg) * DEFAULT_RATE / SPA_MSEC_PER_SEC;
 			break;
 		case 'd':
-			data.delay = atof(optarg);
+			data.delay = (float)atof(optarg);
 			break;
 		case 'C':
 			pw_properties_set(data.capture_props, PW_KEY_TARGET_OBJECT, optarg);
@@ -170,10 +172,22 @@
 			pw_properties_set(data.playback_props, PW_KEY_TARGET_OBJECT, optarg);
 			break;
 		case 'i':
-			pw_properties_update_string(data.capture_props, optarg, strlen(optarg));
+			if (pw_properties_update_string_checked(data.capture_props,
+						optarg, strlen(optarg), &loc) < 0) {
+				spa_debug_file_error_location(stderr, &loc,
+						"error: syntax error in --capture-props: %s",
+						loc.reason);
+				return -1;
+			}
 			break;
 		case 'o':
-			pw_properties_update_string(data.playback_props, optarg, strlen(optarg));
+			if (pw_properties_update_string_checked(data.playback_props,
+						optarg, strlen(optarg), &loc) < 0) {
+				spa_debug_file_error_location(stderr, &loc,
+						"error: syntax error in --playback-props: %s",
+						loc.reason);
+				return -1;
+			}
 			break;
 		default:
 			show_help(&data, argv0, true);
@@ -198,7 +212,7 @@
 	}
 
 
-        if ((f = open_memstream(&args, &size)) == NULL) {
+	if ((f = open_memstream(&args, &size)) == NULL) {
 		fprintf(stderr, "can't open memstream: %m\n");
 		goto exit;
 	}

pipewire-1.0.1.tar.bz2/src/tools/pw-metadata.c -> pipewire-1.2.0.tar.gz/src/tools/pw-metadata.c Changed

pipewire-1.0.1.tar.bz2/src/tools/pw-mididump.c -> pipewire-1.2.0.tar.gz/src/tools/pw-mididump.c Changed

pipewire-1.0.1.tar.bz2/src/tools/pw-mon.c -> pipewire-1.2.0.tar.gz/src/tools/pw-mon.c Changed

@@ -30,9 +30,9 @@
 };
 
 #define with_prefix(use_prefix_) \
-   for (bool once_ = !!printf("%s", (pprefix!!(use_prefix_)).prefix); \
-	once_; \
-	once_ = false, printf("%s", (pprefix!!(use_prefix_)).suffix))
+	for (bool once_ = !!printf("%s", (pprefix!!(use_prefix_)).prefix); \
+		once_; \
+		once_ = false, printf("%s", (pprefix!!(use_prefix_)).suffix))
 
 
 struct param {
@@ -58,6 +58,7 @@
 
 	bool hide_params;
 	bool hide_props;
+	bool print_separator;
 };
 
 struct proxy_data {
@@ -134,7 +135,7 @@
 static void event_param(void *_data, int seq, uint32_t id,
 		uint32_t index, uint32_t next, const struct spa_pod *param)
 {
-        struct proxy_data *data = _data;
+	struct proxy_data *data = _data;
 	struct param *p;
 
 	/* remove all params with the same id and older seq */
@@ -203,10 +204,10 @@
 
 static void on_core_info(void *_data, const struct pw_core_info *info)
 {
-	struct proxy_data *data = _data;
+	struct data *data = _data;
 	bool hide_props, print_mark = true;
 
-	hide_props = data->data->hide_props;
+	hide_props = data->hide_props;
 
 	printf("\ttype: %s\n", PW_TYPE_INTERFACE_Core);
 	printf("\tcookie: %u\n", info->cookie);
@@ -217,6 +218,8 @@
 	if (!hide_props) {
 		print_properties(info->props, MARK_CHANGE(PW_CORE_CHANGE_MASK_PROPS));
 	}
+	if (data->print_separator)
+		printf("\n");
 }
 
 static void module_event_info(void *_data, const struct pw_module_info *info)
@@ -246,11 +249,13 @@
 	if (!hide_props) {
 		print_properties(info->props, MARK_CHANGE(PW_MODULE_CHANGE_MASK_PROPS));
 	}
+	if (data->data->print_separator)
+		printf("\n");
 }
 
 static const struct pw_module_events module_events = {
 	PW_VERSION_MODULE_EVENTS,
-        .info = module_event_info,
+	.info = module_event_info,
 };
 
 static void print_node(struct proxy_data *data)
@@ -298,11 +303,13 @@
 	if (!hide_props) {
 		print_properties(info->props, MARK_CHANGE(PW_NODE_CHANGE_MASK_PROPS));
 	}
+	if (data->data->print_separator)
+		printf("\n");
 }
 
 static void node_event_info(void *_data, const struct pw_node_info *info)
 {
-        struct proxy_data *data = _data;
+	struct proxy_data *data = _data;
 	uint32_t i;
 
 	info = data->info = pw_node_info_update(data->info, info);
@@ -327,8 +334,8 @@
 
 static const struct pw_node_events node_events = {
 	PW_VERSION_NODE_EVENTS,
-        .info = node_event_info,
-        .param = event_param
+	.info = node_event_info,
+	.param = event_param
 };
 
 static void print_port(struct proxy_data *data)
@@ -363,11 +370,13 @@
 	if (!hide_props) {
 		print_properties(info->props, MARK_CHANGE(PW_PORT_CHANGE_MASK_PROPS));
 	}
+	if (data->data->print_separator)
+		printf("\n");
 }
 
 static void port_event_info(void *_data, const struct pw_port_info *info)
 {
-        struct proxy_data *data = _data;
+	struct proxy_data *data = _data;
 	uint32_t i;
 
 	info = data->info = pw_port_info_update(data->info, info);
@@ -392,13 +401,13 @@
 
 static const struct pw_port_events port_events = {
 	PW_VERSION_PORT_EVENTS,
-        .info = port_event_info,
-        .param = event_param
+	.info = port_event_info,
+	.param = event_param
 };
 
 static void factory_event_info(void *_data, const struct pw_factory_info *info)
 {
-        struct proxy_data *data = _data;
+	struct proxy_data *data = _data;
 	bool hide_props, print_mark;
 
 	hide_props = data->data->hide_props;
@@ -412,7 +421,7 @@
 		print_mark = true;
 	}
 
-        info = data->info = pw_factory_info_update(data->info, info);
+	info = data->info = pw_factory_info_update(data->info, info);
 
 	printf("\tid: %d\n", data->id);
 	printf("\tpermissions: "PW_PERMISSION_FORMAT"\n",
@@ -424,16 +433,18 @@
 	if (!hide_props) {
 		print_properties(info->props, MARK_CHANGE(PW_FACTORY_CHANGE_MASK_PROPS));
 	}
+	if (data->data->print_separator)
+		printf("\n");
 }
 
 static const struct pw_factory_events factory_events = {
 	PW_VERSION_FACTORY_EVENTS,
-        .info = factory_event_info
+	.info = factory_event_info
 };
 
 static void client_event_info(void *_data, const struct pw_client_info *info)
 {
-        struct proxy_data *data = _data;
+	struct proxy_data *data = _data;
 	bool hide_props, print_mark;
 
 	hide_props = data->data->hide_props;
@@ -447,7 +458,7 @@
 		print_mark = true;
 	}
 
-        info = data->info = pw_client_info_update(data->info, info);
+	info = data->info = pw_client_info_update(data->info, info);
 
 	printf("\tid: %d\n", data->id);
 	printf("\tpermissions: "PW_PERMISSION_FORMAT"\n",
@@ -457,16 +468,18 @@
 	if (!hide_props) {
 		print_properties(info->props, MARK_CHANGE(PW_CLIENT_CHANGE_MASK_PROPS));
 	}
+	if (data->data->print_separator)
+		printf("\n");
 }
 
 static const struct pw_client_events client_events = {
 	PW_VERSION_CLIENT_EVENTS,
-        .info = client_event_info
+	.info = client_event_info
 };
 
 static void link_event_info(void *_data, const struct pw_link_info *info)
 {
-        struct proxy_data *data = _data;
+	struct proxy_data *data = _data;
 	bool hide_props, print_mark;
 
 	hide_props = data->data->hide_props;
@@ -480,7 +493,7 @@
 		print_mark = true;
 	}
 
-        info = data->info = pw_link_info_update(data->info, info);
+	info = data->info = pw_link_info_update(data->info, info);
 
 	printf("\tid: %d\n", data->id);
 	printf("\tpermissions: "PW_PERMISSION_FORMAT"\n",
@@ -509,6 +522,8 @@
 		}
 		print_properties(info->props, MARK_CHANGE(PW_LINK_CHANGE_MASK_PROPS));
 	}
+	if (data->data->print_separator)
+		printf("\n");
 }
 
 static const struct pw_link_events link_events = {
@@ -546,12 +561,14 @@
 	if (!hide_props) {
 		print_properties(info->props, MARK_CHANGE(PW_DEVICE_CHANGE_MASK_PROPS));
 	}
+	if (data->data->print_separator)
+		printf("\n");
 }
 
 
 static void device_event_info(void *_data, const struct pw_device_info *info)
 {
-        struct proxy_data *data = _data;
+	struct proxy_data *data = _data;
 	uint32_t i;
 
 	info = data->info = pw_device_info_update(data->info, info);
@@ -576,13 +593,13 @@
 static const struct pw_device_events device_events = {
 	PW_VERSION_DEVICE_EVENTS,
 	.info = device_event_info,
-        .param = event_param
+	.param = event_param
 };
 
 static void
 removed_proxy (void *data)
 {
-        struct proxy_data *pd = data;
+	struct proxy_data *pd = data;
 	pw_proxy_destroy(pd->proxy);
 }
 
@@ -663,6 +680,8 @@
 				PW_PERMISSION_ARGS(permissions));
 		printf("\ttype: %s (version %d)\n", type, version);
 		print_properties(props, false);
+		if (d->print_separator)
+			printf("\n");
 		return;
 	}
 
@@ -712,6 +731,8 @@
 
 	printf("removed:\n");
 	printf("\tid: %u\n", id);
+	if (d->print_separator)
+		printf("\n");
 
 	pd = find_proxy(d, id);
 	if (pd == NULL)
@@ -752,14 +773,15 @@
 
 static void show_help(const char *name, bool error)
 {
-        fprintf(error ? stderr : stdout, "%s options\n"
+	fprintf(error ? stderr : stdout, "%s options\n"
 		"  -h, --help                            Show this help\n"
 		"      --version                         Show version\n"
 		"  -r, --remote                          Remote daemon name\n"
 		"  -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 properties\n"
+		"  -p, --print-separator                 print empty line after every event to help streaming parser\n",
 		name);
 }
 
@@ -776,6 +798,7 @@
 		{ "color",		optional_argument,	NULL, 'C' },
 		{ "hide-props",		no_argument,		NULL, 'o' },
 		{ "hide-params",	no_argument,		NULL, 'a' },
+		{ "print-separator",	no_argument,		NULL, 'p' },
 		{ NULL,	0, NULL, 0}
 	};
 	int c;
@@ -786,10 +809,10 @@
 
 	setlinebuf(stdout);
 
-	if (isatty(STDOUT_FILENO) && getenv("NO_COLOR") == NULL)
+	if (getenv("NO_COLOR") == NULL && isatty(STDOUT_FILENO))
 		colors = true;
 
-	while ((c = getopt_long(argc, argv, "hVr:NCoa", long_options, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "hVr:NCoap", long_options, NULL)) != -1) {
 		switch (c) {
 		case 'h':
 			show_help(argv0, false);
@@ -828,6 +851,9 @@
 		case 'a':
 			data.hide_params = true;
 			break;
+		case 'p':
+			data.print_separator = true;
+			break;
 		default:
 			show_help(argv0, true);
 			return -1;

pipewire-1.0.1.tar.bz2/src/tools/pw-profiler.c -> pipewire-1.2.0.tar.gz/src/tools/pw-profiler.c Changed

@@ -182,8 +182,8 @@
 	int64_t d1, d2;
 	int64_t delay, period_usecs;
 
-#define CLOCK_AS_USEC(cl,val) (val * (float)SPA_USEC_PER_SEC / (cl)->rate.denom)
-#define CLOCK_AS_SUSEC(cl,val) (val * (float)SPA_USEC_PER_SEC / ((cl)->rate.denom * (cl)->rate_diff))
+#define CLOCK_AS_USEC(cl,val) (int64_t)(val * (float)SPA_USEC_PER_SEC / (cl)->rate.denom)
+#define CLOCK_AS_SUSEC(cl,val) (int64_t)(val * (float)SPA_USEC_PER_SEC / ((cl)->rate.denom * (cl)->rate_diff))
 
 	delay = CLOCK_AS_USEC(&point->clock, point->clock.delay);
 	period_usecs = CLOCK_AS_SUSEC(&point->clock, point->clock.duration);
@@ -193,7 +193,7 @@
 
 	if (d1 > period_usecs * 1.3 ||
 	    d2 > period_usecs * 1.3)
-		d1 = d2 = period_usecs * 1.4;
+		d1 = d2 = (int64_t)(period_usecs * 1.4);
 
 	/* 4 columns for the driver */
 	fprintf(d->output, "%"PRIi64"\t%"PRIi64"\t%"PRIi64"\t%"PRIi64"\t",
@@ -406,7 +406,7 @@
 
 static void profiler_profile(void *data, const struct spa_pod *pod)
 {
-        struct data *d = data;
+	struct data *d = data;
 	struct spa_pod *o;
 	struct spa_pod_prop *p;
 	struct point point;
@@ -446,7 +446,7 @@
 
 static const struct pw_profiler_events profiler_events = {
 	PW_VERSION_PROFILER_EVENTS,
-        .profile = profiler_profile,
+	.profile = profiler_profile,
 };
 
 static void registry_event_global(void *data, uint32_t id,
@@ -522,7 +522,7 @@
 
 static void show_help(const char *name, bool error)
 {
-        fprintf(error ? stderr : stdout, "%s options\n"
+	fprintf(error ? stderr : stdout, "%s options\n"
 		"  -h, --help                            Show this help\n"
 		"      --version                         Show version\n"
 		"  -r, --remote                          Remote daemon name\n"

pipewire-1.0.1.tar.bz2/src/tools/pw-reserve.c -> pipewire-1.2.0.tar.gz/src/tools/pw-reserve.c Changed

@@ -70,15 +70,15 @@
 
 static void show_help(const char *name, bool error)
 {
-        fprintf(error ? stderr : stdout, "%s options\n"
-             "  -h, --help                            Show this help\n"
-             "      --version                         Show version\n"
-             "  -n, --name                            Name to reserve (Audio0, Midi0, Video0, ..)\n"
-             "  -a, --appname                         Application Name (default %s)\n"
-             "  -p, --priority                        Priority (default %d)\n"
-             "  -m, --monitor                         Monitor only, don't try to acquire\n"
-             "  -r, --release                         Request release when busy\n",
-	     name, DEFAULT_APPNAME, DEFAULT_PRIORITY);
+	fprintf(error ? stderr : stdout, "%s options\n"
+		"  -h, --help                            Show this help\n"
+		"      --version                         Show version\n"
+		"  -n, --name                            Name to reserve (Audio0, Midi0, Video0, ..)\n"
+		"  -a, --appname                         Application Name (default %s)\n"
+		"  -p, --priority                        Priority (default %d)\n"
+		"  -m, --monitor                         Monitor only, don't try to acquire\n"
+		"  -r, --release                         Request release when busy\n",
+		name, DEFAULT_APPNAME, DEFAULT_PRIORITY);
 }
 
 int main(int argc, char *argv)
@@ -142,8 +142,8 @@
 			return -1;
 		}
 	}
-	if (opt_name == NULL) {
-		fprintf(stderr, "name must be given\n");
+	if (opt_name == NULL || !rd_device_valid_device_name(opt_name)) {
+		fprintf(stderr, "valid name must be given\n");
 		return -1;
 	}
 
@@ -190,6 +190,11 @@
 			opt_appname,
 			opt_priority,
 			&reserve_callbacks, &impl);
+	if (!impl.device) {
+		res = -errno;
+		fprintf(stderr, "dbus connection failed: %m\n");
+		goto exit;
+	}
 
 	if (!opt_monitor) {
 		res = rd_device_acquire(impl.device);

pipewire-1.0.1.tar.bz2/src/tools/pw-top.c -> pipewire-1.2.0.tar.gz/src/tools/pw-top.c Changed

@@ -29,6 +29,7 @@
 	float cpu_load3;
 	struct spa_io_clock clock;
 	uint32_t xrun_count;
+	uint32_t transport_state;
 };
 
 struct measurement {
@@ -130,7 +131,8 @@
 			SPA_POD_Long(&info->clock.duration),
 			SPA_POD_Long(&info->clock.delay),
 			SPA_POD_Double(&info->clock.rate_diff),
-			SPA_POD_Long(&info->clock.next_nsec));
+			SPA_POD_Long(&info->clock.next_nsec),
+			SPA_POD_OPT_Int(&info->transport_state));
 }
 
 static struct node *find_node(struct data *d, uint32_t id)
@@ -165,6 +167,32 @@
 
 static void do_refresh(struct data *d, bool force_refresh);
 
+static const char *find_node_name(const struct spa_dict *props)
+{
+	static const char * const name_keys = {
+		PW_KEY_NODE_NAME,
+		PW_KEY_NODE_DESCRIPTION,
+		PW_KEY_APP_NAME,
+		PW_KEY_MEDIA_NAME,
+	};
+
+	SPA_FOR_EACH_ELEMENT_VAR(name_keys, key) {
+		const char *name = spa_dict_lookup(props, *key);
+		if (name)
+			return name;
+	}
+
+	return NULL;
+}
+
+static void set_node_name(struct node *n, const char *name)
+{
+	if (name)
+		snprintf(n->name, sizeof(n->name), "%s", name);
+	else
+		snprintf(n->name, sizeof(n->name), "%u", n->id);
+}
+
 static void node_info(void *data, const struct pw_node_info *info)
 {
 	struct node *n = data;
@@ -173,6 +201,9 @@
 		n->state = info->state;
 		do_refresh(n->data, !n->data->batch_mode);
 	}
+
+	if (info->change_mask & PW_NODE_CHANGE_MASK_PROPS)
+		set_node_name(n, find_node_name(info->props));
 }
 
 static void node_param(void *data, int seq,
@@ -294,13 +325,10 @@
 	if ((n = calloc(1, sizeof(*n))) == NULL)
 		return NULL;
 
-	if (name)
-		strncpy(n->name, name, MAX_NAME);
-	else
-		snprintf(n->name, sizeof(n->name), "%u", id);
 	n->data = d;
 	n->id = id;
 	n->driver = n;
+
 	n->proxy = pw_registry_bind(d->registry, id, PW_TYPE_INTERFACE_Node, PW_VERSION_NODE, 0);
 	if (n->proxy) {
 		uint32_t ids1 = { SPA_PARAM_Format };
@@ -318,6 +346,8 @@
 	if (!d->batch_mode)
 		d->pending_refresh = true;
 
+	set_node_name(n, name);
+
 	return n;
 }
 
@@ -420,14 +450,16 @@
 		snprintf(buf, len, " --- ");
 	} else if (val == (uint64_t)-2) {
 		snprintf(buf, len, " +++ ");
+	} else if (quantum == 0.0f) {
+		snprintf(buf, len, " ??? ");
 	} else {
 		float frac = val / 1000000000.f;
-		snprintf(buf, len, "%5.2f", quantum == 0.0f ? 0.0f : frac/quantum);
+		snprintf(buf, len, "%5.2f", frac/quantum);
 	}
 	return buf;
 }
 
-static const char *state_as_string(enum pw_node_state state)
+static const char *state_as_string(enum pw_node_state state, uint32_t transport)
 {
 	switch (state) {
 	case PW_NODE_STATE_ERROR:
@@ -439,7 +471,14 @@
 	case PW_NODE_STATE_IDLE:
 		return "I";
 	case PW_NODE_STATE_RUNNING:
-		return "R";
+		switch (transport) {
+		case SPA_IO_POSITION_STATE_STARTING:
+			return "t";
+		case SPA_IO_POSITION_STATE_RUNNING:
+			return "T";
+		default:
+			return "R";
+		}
 	}
 	return "!";
 }
@@ -467,7 +506,7 @@
 	if (i->clock.rate.denom)
 		quantum = (float)i->clock.duration * i->clock.rate.num / (float)i->clock.rate.denom;
 	else
-		quantum = 0.0;
+		quantum = 0.0f;
 
 	if (n->measurement.awake >= n->measurement.signal)
 		waiting = n->measurement.awake - n->measurement.signal;
@@ -484,7 +523,7 @@
 		busy = -1;
 
 	print_mode_dependent(d, y, 0, "%s %4.1u %6.1u %6.1u %s %s %s %s  %3.1u %16.16s %s%s",
-			state_as_string(n->state),
+			state_as_string(n->state, i->transport_state),
 			n->id,
 			frac.num, frac.denom,
 			print_time(buf1, active, 64, waiting),
@@ -540,7 +579,7 @@
 				continue;
 
 			print_node(d, &n->info, f, y++);
-			if(y > LINES)
+			if(!d->batch_mode && y > LINES)
 				break;
 
 		}
@@ -572,7 +611,7 @@
 
 static void profiler_profile(void *data, const struct spa_pod *pod)
 {
-        struct data *d = data;
+	struct data *d = data;
 	struct spa_pod *o;
 	struct spa_pod_prop *p;
 	struct point point;
@@ -612,7 +651,7 @@
 
 static const struct pw_profiler_events profiler_events = {
 	PW_VERSION_PROFILER_EVENTS,
-        .profile = profiler_profile,
+	.profile = profiler_profile,
 };
 
 static void registry_event_global(void *data, uint32_t id,
@@ -623,16 +662,8 @@
 	struct pw_proxy *proxy;
 
 	if (spa_streq(type, PW_TYPE_INTERFACE_Node)) {
-		const char *str;
-
-		if ((str = spa_dict_lookup(props, PW_KEY_NODE_NAME)) == NULL &&
-			(str = spa_dict_lookup(props, PW_KEY_NODE_DESCRIPTION)) == NULL) {
-				str = spa_dict_lookup(props, PW_KEY_APP_NAME);
-		}
-
-		if (add_node(d, id, str) == NULL) {
+		if (add_node(d, id, find_node_name(props)) == NULL)
 			pw_log_warn("can add node %u: %m", id);
-		}
 	} else if (spa_streq(type, PW_TYPE_INTERFACE_Profiler)) {
 		if (d->profiler != NULL) {
 			printf("Ignoring profiler %d: already attached\n", id);
@@ -719,7 +750,7 @@
 
 static void show_help(const char *name, bool error)
 {
-        fprintf(error ? stderr : stdout, "Usage:\n%s options\n\n"
+	fprintf(error ? stderr : stdout, "Usage:\n%s options\n\n"
 		"Options:\n"
 		"  -b, --batch-mode		         run in non-interactive batch mode\n"
 		"  -n, --iterations = NUMBER             exit after NUMBER batch iterations\n"

pipewire-1.0.1.tar.bz2/src/tools/reserve.c -> pipewire-1.2.0.tar.gz/src/tools/reserve.c Changed

@@ -11,7 +11,7 @@
 #include <spa/utils/string.h>
 #include <pipewire/log.h>
 
-#define SERVICE_PREFIX "org.freedesktop.ReserveDevice1."
+#define SERVICE_NAMESPACE "org.freedesktop.ReserveDevice1"
 #define OBJECT_PREFIX "/org/freedesktop/ReserveDevice1/"
 
 static const char introspection =
@@ -307,6 +307,34 @@
 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
+bool rd_device_valid_device_name(const char *name)
+{
+	const char *p = name;
+
+	if (!p || !*p)
+		return false;
+
+	/* cf. dbus-marshal-validate.c:_dbus_validate_bus_name_full */
+	while (*p) {
+		switch (*p) {
+		case 'A' ... 'Z':
+		case 'a' ... 'z':
+		case '-':
+		case '_':
+			break;
+		case '0' ... '9':
+			if (p == name)
+				return false;
+			break;
+		default:
+			return false;
+		}
+		++p;
+	}
+
+	return true;
+}
+
 struct rd_device *
 rd_device_new(DBusConnection *connection, const char *device_name, const char *application_name,
 		int32_t priority, const struct rd_device_callbacks *callbacks, void *data)
@@ -314,6 +342,11 @@
 	struct rd_device *d;
 	int res;
 
+	if (!rd_device_valid_device_name(device_name)) {
+		errno = EINVAL;
+		return NULL;
+	}
+
 	d = calloc(1, sizeof(struct rd_device));
 	if (d == NULL)
 		return NULL;
@@ -330,7 +363,7 @@
 		res = -errno;
 		goto error_free;
 	}
-	d->service_name = spa_aprintf(SERVICE_PREFIX "%s", device_name);
+	d->service_name = spa_aprintf(SERVICE_NAMESPACE ".%s", device_name);
 	if (d->service_name == NULL) {
 		res = -errno;
 		goto error_free;
@@ -351,7 +384,7 @@
                         "interface='org.freedesktop.DBus',member='NameAcquired'", NULL);
 	dbus_bus_add_match(d->connection,
                         "type='signal',sender='org.freedesktop.DBus',"
-                        "interface='org.freedesktop.DBus',member='NameOwnerChanged'", NULL);
+                        "interface='org.freedesktop.DBus',member='NameOwnerChanged',arg0namespace='" SERVICE_NAMESPACE "'", NULL);
 
 	dbus_connection_ref(d->connection);
 
@@ -403,6 +436,7 @@
 int rd_device_request_release(struct rd_device *d)
 {
 	DBusMessage *m = NULL;
+	int res = 0;
 
 	if (d->priority <= INT32_MIN)
 		return -EBUSY;
@@ -413,16 +447,22 @@
 					"RequestRelease")) == NULL) {
 		return -ENOMEM;
 	}
-        if (!dbus_message_append_args(m,
+
+	if (!dbus_message_append_args(m,
 				DBUS_TYPE_INT32, &d->priority,
 				DBUS_TYPE_INVALID)) {
-		dbus_message_unref(m);
-		return -ENOMEM;
-        }
+		res = -ENOMEM;
+		goto exit;
+	}
+
 	if (!dbus_connection_send(d->connection, m, NULL)) {
-		return -EIO;
+		res = -EIO;
+		goto exit;
 	}
-	return 0;
+
+exit:
+	dbus_message_unref(m);
+	return res;
 }
 
 int rd_device_complete_release(struct rd_device *d, int res)

pipewire-1.0.1.tar.bz2/src/tools/reserve.h -> pipewire-1.2.0.tar.gz/src/tools/reserve.h Changed

pipewire-1.2.0.tar.gz/test/data Added

pipewire-1.2.0.tar.gz/test/data/test-spa-json.txt Added

pipewire-1.0.1.tar.bz2/test/meson.build -> pipewire-1.2.0.tar.gz/test/meson.build Changed

pipewire-1.0.1.tar.bz2/test/pwtest.c -> pipewire-1.2.0.tar.gz/test/pwtest.c Changed

pipewire-1.0.1.tar.bz2/test/test-logger.c -> pipewire-1.2.0.tar.gz/test/test-logger.c Changed

pipewire-1.0.1.tar.bz2/test/test-loop.c -> pipewire-1.2.0.tar.gz/test/test-loop.c Changed

pipewire-1.0.1.tar.bz2/test/test-properties.c -> pipewire-1.2.0.tar.gz/test/test-properties.c Changed

pipewire-1.0.1.tar.bz2/test/test-spa-buffer.c -> pipewire-1.2.0.tar.gz/test/test-spa-buffer.c Changed

pipewire-1.0.1.tar.bz2/test/test-spa-json.c -> pipewire-1.2.0.tar.gz/test/test-spa-json.c Changed

@@ -3,12 +3,14 @@
 /* SPDX-License-Identifier: MIT */
 
 #include <locale.h>
+#include <stdio.h>
 
 #include "pwtest.h"
 
 #include <spa/utils/defs.h>
 #include <spa/utils/json.h>
 #include <spa/utils/string.h>
+#include <spa/utils/cleanup.h>
 
 PWTEST(json_abi)
 {
@@ -29,6 +31,7 @@
 #define TYPE_TRUE	5
 #define TYPE_FALSE	6
 #define TYPE_FLOAT	7
+#define TYPE_INT	8
 
 static void check_type(int type, const char *value, int len)
 {
@@ -38,9 +41,25 @@
 	pwtest_bool_eq(spa_json_is_bool(value, len),
 			(type == TYPE_BOOL || type == TYPE_TRUE || type == TYPE_FALSE));
 	pwtest_bool_eq(spa_json_is_null(value, len), (type == TYPE_NULL));
-	pwtest_bool_eq(spa_json_is_true(value, len), (type == TYPE_TRUE || type == TYPE_BOOL));
-	pwtest_bool_eq(spa_json_is_false(value, len), (type == TYPE_FALSE || type == TYPE_BOOL));
-	pwtest_bool_eq(spa_json_is_float(value, len), (type == TYPE_FLOAT));
+	if (type == TYPE_BOOL) {
+		pwtest_bool_true(spa_json_is_true(value, len) || spa_json_is_false(value, len));
+	} else {
+		pwtest_bool_eq(spa_json_is_true(value, len), type == TYPE_TRUE);
+		pwtest_bool_eq(spa_json_is_false(value, len), type == TYPE_FALSE);
+	}
+
+	switch (type) {
+	case TYPE_FLOAT:
+		pwtest_bool_true(spa_json_is_float(value, len));
+		break;
+	case TYPE_INT:
+		pwtest_bool_true(spa_json_is_int(value, len));
+		break;
+	default:
+		pwtest_bool_false(spa_json_is_float(value, len));
+		pwtest_bool_false(spa_json_is_int(value, len));
+		break;
+	}
 }
 
 static void expect_type(struct spa_json *it, int type)
@@ -51,6 +70,49 @@
 	check_type(type, value, len);
 }
 
+static void expect_end(struct spa_json *it)
+{
+	const char *value;
+	struct spa_json it2;
+
+	pwtest_int_eq(spa_json_next(it, &value), 0);
+
+	/* end is idempotent */
+	memcpy(&it2, it, sizeof(*it));
+	pwtest_int_eq(spa_json_next(it, &value), 0);
+	pwtest_int_eq(memcmp(&it2, it, sizeof(*it)), 0);
+}
+
+static void expect_parse_error(struct spa_json *it, const char *str, int line, int col)
+{
+	const char *value;
+	struct spa_json it2;
+	struct spa_error_location loc = { 0 };
+
+	pwtest_int_eq(spa_json_next(it, &value), -1);
+	pwtest_bool_true(spa_json_get_error(it, str, &loc));
+	pwtest_int_eq(loc.line, line);
+	pwtest_int_eq(loc.col, col);
+
+	/* parse error is idempotent also for parents */
+	while (it) {
+		memcpy(&it2, it, sizeof(*it));
+		pwtest_int_eq(spa_json_next(it, &value), -1);
+		pwtest_int_eq(memcmp(&it2, it, sizeof(*it)), 0);
+		it = it->parent;
+	}
+}
+
+static void expect_array(struct spa_json *it, struct spa_json *sub)
+{
+	pwtest_int_eq(spa_json_enter_array(it, sub), 1);
+}
+
+static void expect_object(struct spa_json *it, struct spa_json *sub)
+{
+	pwtest_int_eq(spa_json_enter_object(it, sub), 1);
+}
+
 static void expect_string(struct spa_json *it, const char *str)
 {
 	const char *value;
@@ -59,9 +121,21 @@
 	pwtest_int_gt((len = spa_json_next(it, &value)), 0);
 	check_type(TYPE_STRING, value, len);
 	s = alloca(len+1);
-	spa_json_parse_stringn(value, len, s, len+1);
+	pwtest_int_eq(spa_json_parse_stringn(value, len, s, len+1), 1);
 	pwtest_str_eq(s, str);
 }
+
+static void expect_string_or_bare(struct spa_json *it, const char *str)
+{
+	const char *value;
+	int len;
+	char *s;
+	pwtest_int_gt((len = spa_json_next(it, &value)), 0);
+	s = alloca(len+1);
+	pwtest_int_eq(spa_json_parse_stringn(value, len, s, len+1), 1);
+	pwtest_str_eq(s, str);
+}
+
 static void expect_float(struct spa_json *it, float val)
 {
 	const char *value;
@@ -73,11 +147,42 @@
 	pwtest_double_eq(f, val);
 }
 
+static void expect_int(struct spa_json *it, int val)
+{
+	const char *value;
+	int len;
+	int f = 0;
+	pwtest_int_gt((len = spa_json_next(it, &value)), 0);
+	check_type(TYPE_INT, value, len);
+	pwtest_int_gt(spa_json_parse_int(value, len, &f), 0);
+	pwtest_int_eq(f, val);
+}
+
+static void expect_bool(struct spa_json *it, bool val)
+{
+	const char *value;
+	int len;
+	bool f = false;
+	pwtest_int_gt((len = spa_json_next(it, &value)), 0);
+	check_type(TYPE_BOOL, value, len);
+	check_type(val ? TYPE_TRUE : TYPE_FALSE, value, len);
+	pwtest_int_gt(spa_json_parse_bool(value, len, &f), 0);
+	pwtest_int_eq(f, val);
+}
+
+static void expect_null(struct spa_json *it)
+{
+	const char *value;
+	int len;
+	pwtest_int_gt((len = spa_json_next(it, &value)), 0);
+	check_type(TYPE_NULL, value, len);
+}
+
 PWTEST(json_parse)
 {
 	struct spa_json it5;
 	const char *json = " { "
-			"\"foo\": \"bar\","
+			"\"foo\": \"bar\", # comment\n"
 			"\"foo\\\"  \":   true,       "
 			"\"foo \\n\\r\\t\": false,"
 			"  \"  arr\":  true, false, null, 5, 5.7, \"str\","
@@ -115,6 +220,8 @@
 	expect_float(&it1, -1.8f);
 	expect_string(&it1, "foo 6");
 	expect_float(&it1, +2.8f);
+	expect_end(&it1);
+	expect_end(&it0);
 	/* in the array */
 	expect_type(&it2, TYPE_TRUE);
 	expect_type(&it2, TYPE_FALSE);
@@ -135,6 +242,334 @@
 	expect_string(&it3, "1.9");
 	expect_float(&it3, 1.9f);
 
+	expect_end(&it3);
+	expect_end(&it2);
+
+	pwtest_bool_false(spa_json_get_error(&it0, NULL, NULL));
+	pwtest_bool_false(spa_json_get_error(&it1, NULL, NULL));
+	pwtest_bool_false(spa_json_get_error(&it2, NULL, NULL));
+	pwtest_bool_false(spa_json_get_error(&it3, NULL, NULL));
+
+	json = "section={\"key\":value}, section2=item1,item2";
+
+	spa_json_init(&it0, json, strlen(json));
+	expect_string_or_bare(&it0, "section");
+	expect_object(&it0, &it1);
+	expect_string_or_bare(&it0, "section2");
+	expect_array(&it0, &it1);
+	expect_end(&it0);
+
+	spa_json_init(&it0, json, strlen(json));
+	expect_string_or_bare(&it0, "section");
+	expect_object(&it0, &it1);
+	expect_string(&it1, "key");
+	expect_string_or_bare(&it1, "value");
+	expect_string_or_bare(&it0, "section2");
+	expect_array(&it0, &it1);
+	expect_string_or_bare(&it1, "item1");
+	expect_string_or_bare(&it1, "item2");
+	expect_end(&it0);
+
+	/* 2-byte utf8 */
+	json = "\"\xc3\xa4\", \"\xc3\xa4\"";
+	spa_json_init(&it0, json, strlen(json));
+	expect_string(&it0, "\xc3\xa4");
+	expect_string(&it0, "\xc3\xa4");
+	expect_end(&it0);
+
+	/* 3-byte utf8 */
+	json = "\"\xe6\xad\xa3\", \"\xe6\xad\xa3\"";
+	spa_json_init(&it0, json, strlen(json));
+	expect_string(&it0, "\xe6\xad\xa3");
+	expect_string(&it0, "\xe6\xad\xa3");
+	expect_end(&it0);
+
+	/* 4-byte utf8 */
+	json = "\"\xf0\x92\x80\x80\", \"\xf0\x92\x80\x80\"";
+	spa_json_init(&it0, json, strlen(json));
+	expect_string(&it0, "\xf0\x92\x80\x80");
+	expect_string(&it0, "\xf0\x92\x80\x80");
+	expect_end(&it0);
+
+	/* run-in comment in bare */
+	json = "foo#comment";
+	spa_json_init(&it0, json, strlen(json));
+	expect_string_or_bare(&it0, "foo");
+	expect_end(&it0);
+
+	/* end of parsing idempotent */
+	json = "{}";
+	spa_json_init(&it0, json, strlen(json));
+	expect_object(&it0, &it1);
+	expect_end(&it0);
+	expect_end(&it0);
+
+	/* non-null terminated strings OK */
+	json = "1.234";
+	spa_json_init(&it0, json, 4);
+	expect_float(&it0, 1.23f);
+	expect_end(&it0);
+
+	json = "1234";
+	spa_json_init(&it0, json, 3);
+	expect_int(&it0, 123);
+	expect_end(&it0);
+
+	json = "truey";
+	spa_json_init(&it0, json, 4);
+	expect_bool(&it0, true);
+	expect_end(&it0);
+
+	json = "falsey";
+	spa_json_init(&it0, json, 5);
+	expect_bool(&it0, false);
+	expect_end(&it0);
+
+	json = "nully";
+	spa_json_init(&it0, json, 4);
+	expect_null(&it0);
+	expect_end(&it0);
+
+	json = "{}y{";
+	spa_json_init(&it0, json, 2);
+	expect_object(&it0, &it1);
+	expect_end(&it0);
+
+	json = "y{";
+	spa_json_init(&it0, json, 2);
+	expect_array(&it0, &it1);
+	expect_end(&it0);
+
+	json = "helloy";
+	spa_json_init(&it0, json, 5);
+	expect_string_or_bare(&it0, "hello");
+	expect_end(&it0);
+
+	json = "\"hello\"y";
+	spa_json_init(&it0, json, 7);
+	expect_string(&it0, "hello");
+	expect_end(&it0);
+
+	/* top-level context */
+	json = "x y x y";
+	spa_json_init(&it0, json, strlen(json));
+	expect_string_or_bare(&it0, "x");
+	expect_string_or_bare(&it0, "y");
+	expect_string_or_bare(&it0, "x");
+	expect_string_or_bare(&it0, "y");
+	expect_end(&it0);
+
+	json = "x = y x = y";
+	spa_json_init(&it0, json, strlen(json));
+	expect_string_or_bare(&it0, "x");
+	expect_string_or_bare(&it0, "y");
+	expect_string_or_bare(&it0, "x");
+	expect_string_or_bare(&it0, "y");
+	expect_end(&it0);
+
+	return PWTEST_PASS;
+}
+
+PWTEST(json_parse_fail)
+{
+	char buf2048;
+	struct spa_json it5;
+	const char *json, *value;
+	int i;
+
+	/* = in array */
+	json = " foo = bar ";
+	spa_json_init(&it0, json, strlen(json));
+	expect_array(&it0, &it1);
+	expect_string_or_bare(&it1, "foo");
+	expect_parse_error(&it1, json, 1, 7);
+	expect_parse_error(&it1, json, 1, 7);  /* parse error is idempotent */
+	expect_parse_error(&it0, json, 1, 7);  /* parse error visible in parent */
+
+	/* : in array */
+	json = " foo, bar\n : quux ";
+	spa_json_init(&it0, json, strlen(json));
+	expect_array(&it0, &it1);
+	expect_string_or_bare(&it1, "foo");
+	expect_string_or_bare(&it1, "bar");
+	expect_parse_error(&it1, json, 2, 2);
+
+	/* missing  */
+	json = " foo, bar";
+	spa_json_init(&it0, json, strlen(json));
+	pwtest_int_eq(spa_json_next(&it0, &value), 1);
+	expect_parse_error(&it0, json, 1, 11);
+
+	/* spurious  */
+	json = "foo, bar ";
+	spa_json_init(&it0, json, strlen(json));
+	pwtest_int_eq(spa_json_next(&it0, &value), 3);
+	pwtest_int_eq(spa_json_next(&it0, &value), 3);
+	expect_parse_error(&it0, json, 1, 10);
+
+	/* spurious } */
+	json = "{ foo, bar } }";
+	spa_json_init(&it0, json, strlen(json));
+	expect_object(&it0, &it1);
+	expect_parse_error(&it0, json, 1, 14);
+
+	/* bad nesting */
+	json = "{a: {a:{a:{a:{a:{a:{a:{a:{a:{a:{a:{a:{a: }}}}}}}}}}}} ";
+	spa_json_init(&it0, json, strlen(json));
+	pwtest_int_eq(spa_json_next(&it0, &value), 1);
+	expect_parse_error(&it0, json, 1, strlen(json));
+
+	/* bad nesting */
+	json = " {a:{a:{a:{a:{a:{a:{a:{a:{a:{a:{a:{a: }}}}}}}}}}}} }";
+	spa_json_init(&it0, json, strlen(json));
+	pwtest_int_eq(spa_json_next(&it0, &value), 1);
+	expect_parse_error(&it0, json, 1, strlen(json));
+
+	/* bad object key-values */
+	json = "{ = }";
+	spa_json_init(&it0, json, strlen(json));
+	expect_object(&it0, &it1);
+	expect_parse_error(&it1, json, 1, 3);
+
+	json = "{ x }";
+	spa_json_init(&it0, json, strlen(json));
+	expect_object(&it0, &it1);
+	expect_string_or_bare(&it1, "x");
+	expect_parse_error(&it1, json, 1, 5);
+
+	json = "{ x : }";
+	spa_json_init(&it0, json, strlen(json));
+	expect_object(&it0, &it1);
+	expect_string_or_bare(&it1, "x");
+	expect_parse_error(&it1, json, 1, 7);
+
+	json = "{ x = y, : }";
+	spa_json_init(&it0, json, strlen(json));
+	expect_object(&it0, &it1);
+	expect_string_or_bare(&it1, "x");
+	expect_string_or_bare(&it1, "y");
+	expect_parse_error(&it1, json, 1, 10);
+
+	json = "{ x = {1:3}, z : }";
+	spa_json_init(&it0, json, strlen(json));
+	expect_object(&it0, &it1);
+	expect_string_or_bare(&it1, "x");
+	expect_object(&it1, &it2);
+	expect_string_or_bare(&it1, "z");
+	expect_parse_error(&it1, json, 1, 18);
+
+	json = "{ x y x }";
+	spa_json_init(&it0, json, strlen(json));
+	expect_object(&it0, &it1);
+	expect_string_or_bare(&it1, "x");
+	expect_string_or_bare(&it1, "y");
+	expect_string_or_bare(&it1, "x");
+	expect_parse_error(&it1, json, 1, 9);
+
+	json = "x y x";
+	spa_json_init(&it0, json, strlen(json));
+	expect_string_or_bare(&it0, "x");
+	expect_string_or_bare(&it0, "y");
+	expect_parse_error(&it0, json, 1, 6);
+
+	/* unclosed string */
+	json = "\"foo";
+	spa_json_init(&it0, json, strlen(json));
+	expect_parse_error(&it0, json, 1, 5);
+
+	/* unclosed string */
+	json = "foo\"";
+	spa_json_init(&it0, json, strlen(json));
+	expect_string_or_bare(&it0, "foo");
+	expect_parse_error(&it0, json, 1, 5);
+
+	/* unclosed string */
+	json = "foo\"bar";
+	spa_json_init(&it0, json, strlen(json));
+	expect_string_or_bare(&it0, "foo");
+	expect_parse_error(&it0, json, 1, 8);
+
+	/* unclosed escape */
+	json = "\"\\";
+	spa_json_init(&it0, json, strlen(json));
+	expect_parse_error(&it0, json, 1, 3);
+
+	/* bare escape */
+	json = "foo\\n";
+	spa_json_init(&it0, json, strlen(json));
+	expect_parse_error(&it0, json, 1, 4);
+
+	/* bare escape */
+	json = "\\nfoo";
+	spa_json_init(&it0, json, strlen(json));
+	expect_parse_error(&it0, json, 1, 1);
+
+	/* bad nesting in subparser */
+	json = "{a:";
+	spa_json_init(&it0, json, strlen(json));
+	expect_object(&it0, &it1);
+	expect_string_or_bare(&it1, "a");
+	expect_array(&it1, &it2);
+	expect_parse_error(&it1, json, 1, 6);
+
+	/* entered parser assumes nesting */
+	json = "";
+	spa_json_init(&it0, json, strlen(json));
+	spa_json_enter(&it0, &it1);
+	expect_array(&it1, &it2);
+	expect_parse_error(&it1, json, 1, 3);
+
+	/* overflowing parser nesting stack is an error*/
+	for (i = 0; i < 514; ++i)
+		bufi = '';
+	for (; i < 2*514; ++i)
+		bufi = '';
+	bufi++ = '\0';
+
+	spa_json_init(&it0, buf, strlen(buf));
+	pwtest_int_eq(spa_json_next(&it0, &value), 1);
+	expect_parse_error(&it0, buf, 1, 514);
+
+	/* bad utf8 */
+	json = "\"\xc0\"";
+	spa_json_init(&it0, json, strlen(json));
+	expect_parse_error(&it0, json, 1, 3);
+
+	json = "\"\xe6\xad\"";
+	spa_json_init(&it0, json, strlen(json));
+	expect_parse_error(&it0, json, 1, 4);
+
+	json = "\"\xf0\x92\x80\"";
+	spa_json_init(&it0, json, strlen(json));
+	expect_parse_error(&it0, json, 1, 5);
+
+	/* bad string */
+	json = "\"\x01\"";
+	spa_json_init(&it0, json, strlen(json));
+	expect_parse_error(&it0, json, 1, 2);
+
+	json = "\"\x0f\"";
+	spa_json_init(&it0, json, strlen(json));
+	expect_parse_error(&it0, json, 1, 2);
+
+	/* bad escape */
+	json = "\"\\z\"";
+	spa_json_init(&it0, json, strlen(json));
+	expect_parse_error(&it0, json, 1, 3);
+
+	/* bad bare */
+	json = "\x01x";
+	spa_json_init(&it0, json, strlen(json));
+	expect_parse_error(&it0, json, 1, 1);
+
+	json = "x\x01";
+	spa_json_init(&it0, json, strlen(json));
+	expect_parse_error(&it0, json, 1, 2);
+
+	json = "\xc3\xa4";
+	spa_json_init(&it0, json, strlen(json));
+	expect_parse_error(&it0, json, 1, 1);
+
 	return PWTEST_PASS;
 }
 
@@ -231,7 +666,7 @@
 		{ "00.000100", 00.000100f },
 		{ "-0.000100", -0.000100f },
 	};
-	float v;
+	float v = 0.0f;
 	unsigned i;
 	char buf1128, buf2128, *b1 = buf1, *b2 = buf2;
 
@@ -298,16 +733,350 @@
 	return PWTEST_PASS;
 }
 
+static char *read_json_testcase(FILE *f, char **name, size_t *size, char **result, size_t *result_size)
+{
+	ssize_t res;
+	spa_autofree char *data = NULL;
+	spa_autofree char *resdata = NULL;
+	spa_autofree char *buf = NULL;
+	size_t alloc = 0;
+	size_t len = 0;
+	size_t resdata_len = 0;
+	char **dst = &data;
+	size_t *dst_len = &len;
+
+	*name = NULL;
+
+	do {
+		res = getline(&buf, &alloc, f);
+		if (res <= 0)
+			return NULL;
+
+		if (spa_strstartswith(buf, "<<< ")) {
+			size_t k = strcspn(buf + 4, " \t\n");
+			free(*name);
+			*name = strndup(buf + 4, k);
+			continue;
+		} else if (spa_strstartswith(buf, "==")) {
+			dst = &resdata;
+			dst_len = &resdata_len;
+			continue;
+		} else if (spa_strstartswith(buf, ">>>")) {
+			break;
+		} else if (!*name) {
+			continue;
+		}
+
+		if (!*dst) {
+			*dst = spa_steal_ptr(buf);
+			*dst_len = res;
+			buf = NULL;
+			alloc = 0;
+		} else {
+			char *p = realloc(*dst, *dst_len + res + 1);
+
+			pwtest_ptr_notnull(p);
+
+			*dst = p;
+			memcpy(*dst + *dst_len, buf, res);
+			*dst_len += res;
+			(*dst)*dst_len = '\0';
+		}
+	} while (1);
+
+	if (!*name)
+		return NULL;
+
+	*result = spa_steal_ptr(resdata);
+	*result_size = resdata_len;
+
+	*size = len;
+	return spa_steal_ptr(data);
+}
+
+static int validate_strict_json(struct spa_json *it, int depth, FILE *f)
+{
+	struct spa_json sub;
+	int res = 0, len;
+	char key1024;
+	const char *value;
+
+	len = spa_json_next(it, &value);
+	if (len <= 0)
+		goto done;
+
+	if (depth > 50) {
+		/* stop descending */
+		while ((len = spa_json_next(it, &value)) > 0);
+		goto done;
+	}
+
+	if (spa_json_is_array(value, len)) {
+		bool empty = true;
+
+		fputc('', f);
+		spa_json_enter(it, &sub);
+		while ((res = validate_strict_json(&sub, depth+1, f)) > 0) {
+			empty = false;
+			fputc(',', f);
+		}
+		if (res < 0)
+			return res;
+		if (!empty)
+			fseek(f, -1, SEEK_CUR);
+		fputc('', f);
+	} else if (spa_json_is_object(value, len)) {
+		bool empty = true;
+
+		spa_json_enter(it, &sub);
+
+		fputc('{', f);
+		while (spa_json_get_string(&sub, key, sizeof(key)) > 0) {
+			fprintf(f, "\"%s\":", key);
+
+			res = validate_strict_json(&sub, depth+1, f);
+			if (res < 0)
+				return res;
+			if (res == 0)
+				return -2; /* empty object body */
+			fputc(',', f);
+			empty = false;
+		}
+		if (!empty)
+			fseek(f, -1, SEEK_CUR);
+		fputc('}', f);
+	} else if (spa_json_is_string(value, len)) {
+		char buf1024;
+		int i;
+
+		spa_json_parse_stringn(value, len, buf, sizeof(buf));
+
+		fputc('"', f);
+		for (i = 0; bufi; ++i) {
+			uint8_t c = bufi;
+			switch (c) {
+			case '\n': fputs("\\n", f); break;
+			case '\b': fputs("\\b", f); break;
+			case '\f': fputs("\\f", f); break;
+			case '\t': fputs("\\t", f); break;
+			case '\r': fputs("\\r", f); break;
+			case '"': fputs("\\\"", f); break;
+			case '\\': fputs("\\\\", f); break;
+			default:
+				if (c < 32 || c == 0x7f) {
+					fprintf(f, "\\u%04x", c);
+				} else {
+					fputc(c, f);
+				}
+				break;
+			}
+		}
+		fputc('"', f);
+	} else if (spa_json_is_null(value, len)) {
+		fprintf(f, "null");
+	} else if (spa_json_is_bool(value, len)) {
+		fprintf(f, spa_json_is_true(value, len) ? "true" : "false");
+	} else if (spa_json_is_int(value, len)) {
+		int v;
+		if (spa_json_parse_int(value, len, &v) > 0)
+			fprintf(f, "%d", v);
+	} else if (spa_json_is_float(value, len)) {
+		float v;
+		if (spa_json_parse_float(value, len, &v) > 0)
+			fprintf(f, "%G", v);
+	} else {
+		/* bare value: error here, as we want to test
+		 * int/float/etc parsing */
+		return -2;
+	}
+
+done:
+	if (spa_json_get_error(it, NULL, NULL))
+		return -1;
+
+	return len;
+}
+
+PWTEST(json_data)
+{
+	static const char * const extra_success = {
+		/* indeterminate cases that succeed */
+		"i_number_double_huge_neg_exp.json",
+		"i_number_neg_int_huge_exp.json",
+		"i_number_pos_double_huge_exp.json",
+		"i_number_real_neg_overflow.json",
+		"i_number_real_pos_overflow.json",
+		"i_number_real_underflow.json",
+		"i_number_too_big_neg_int.json",
+		"i_number_too_big_pos_int.json",
+		"i_number_very_big_negative_int.json",
+		"i_object_key_lone_2nd_surrogate.json",
+		"i_string_1st_surrogate_but_2nd_missing.json",
+		"i_string_1st_valid_surrogate_2nd_invalid.json",
+		"i_string_incomplete_surrogate_and_escape_valid.json",
+		"i_string_incomplete_surrogate_pair.json",
+		"i_string_incomplete_surrogates_escape_valid.json",
+		"i_string_invalid_lonely_surrogate.json",
+		"i_string_invalid_surrogate.json",
+		"i_string_inverted_surrogates_U+1D11E.json",
+		"i_string_lone_second_surrogate.json",
+		"i_string_not_in_unicode_range.json",
+		"i_string_overlong_sequence_2_bytes.json",
+		"i_string_UTF8_surrogate_U+D800.json",
+		"i_structure_500_nested_arrays.json",
+
+		/* relaxed JSON parsing */
+		"n_array_1_true_without_comma.json",
+		"n_array_comma_after_close.json",
+		"n_array_comma_and_number.json",
+		"n_array_double_comma.json",
+		"n_array_double_extra_comma.json",
+		"n_array_extra_comma.json",
+		"n_array_just_comma.json",
+		"n_array_missing_value.json",
+		"n_array_number_and_comma.json",
+		"n_array_number_and_several_commas.json",
+		"n_object_comma_instead_of_colon.json",
+		"n_object_double_colon.json",
+		"n_object_missing_semicolon.json",
+		"n_object_non_string_key_but_huge_number_instead.json",
+		"n_object_non_string_key.json",
+		"n_object_repeated_null_null.json",
+		"n_object_several_trailing_commas.json",
+		"n_object_single_quote.json",
+		"n_object_trailing_comma.json",
+		"n_object_two_commas_in_a_row.json",
+		"n_object_unquoted_key.json",
+		"n_object_with_trailing_garbage.json",
+		"n_single_space.json",
+		"n_structure_no_data.json",
+		"n_structure_null-byte-outside-string.json",
+		"n_structure_trailing_#.json",
+		"n_multidigit_number_then_00.json",
+
+		/* SPA JSON accepts more number formats */
+		"n_number_-01.json",
+		"n_number_0.e1.json",
+		"n_number_1_000.json",
+		"n_number_+1.json",
+		"n_number_2.e+3.json",
+		"n_number_2.e-3.json",
+		"n_number_2.e3.json",
+		"n_number_.2e-3.json",
+		"n_number_-2..json",
+		"n_number_hex_1_digit.json",
+		"n_number_hex_2_digits.json",
+		"n_number_neg_int_starting_with_zero.json",
+		"n_number_neg_real_without_int_part.json",
+		"n_number_real_without_fractional_part.json",
+		"n_number_starting_with_dot.json",
+		"n_number_with_leading_zero.json",
+
+		/* \u escape not validated */
+		"n_string_1_surrogate_then_escape_u1.json",
+		"n_string_1_surrogate_then_escape_u1x.json",
+		"n_string_1_surrogate_then_escape_u.json",
+		"n_string_incomplete_escaped_character.json",
+		"n_string_incomplete_surrogate.json",
+		"n_string_invalid_unicode_escape.json",
+	};
+
+	static const char * const ignore_result = {
+		/* Filtering duplicates is for upper layer */
+		"y_object_duplicated_key_and_value.json",
+		"y_object_duplicated_key.json",
+
+		/* spa_json_parse_string API doesn't do \0 */
+		"y_object_escaped_null_in_key.json",
+		"y_string_null_escape.json",
+	};
+
+	const char *basedir = getenv("PWTEST_DATA_DIR");
+	char pathPATH_MAX;
+	spa_autoptr(FILE) f = NULL;
+
+	pwtest_ptr_notnull(basedir);
+	spa_scnprintf(path, sizeof(path), "%s/test-spa-json.txt", basedir);
+	f = fopen(path, "r");
+	pwtest_ptr_notnull(f);
+
+	while (1) {
+		spa_autofree char *data = NULL;
+		spa_autofree char *result = NULL;
+		spa_autofree char *name = NULL;
+		size_t size;
+		size_t result_size;
+		struct spa_json it;
+		int expect = -1;
+		int res;
+		spa_autofree char *f_ptr = NULL;
+		size_t f_size;
+		FILE *fres;
+
+		data = read_json_testcase(f, &name, &size, &result, &result_size);
+		if (!data)
+			break;
+
+		spa_json_init(&it, data, size);
+
+		fres = open_memstream(&f_ptr, &f_size);
+
+		while ((res = validate_strict_json(&it, 0, fres)) > 0);
+
+		fclose(fres);
+
+		SPA_FOR_EACH_ELEMENT_VAR(extra_success, suc) {
+			if (spa_streq(*suc, name)) {
+				expect = false;
+				break;
+			}
+		}
+		if (expect < 0) {
+			if (spa_strstartswith(name, "y_"))
+				expect = false;
+			if (spa_strstartswith(name, "t_"))
+				expect = false;
+		}
+
+		SPA_FOR_EACH_ELEMENT_VAR(ignore_result, suc) {
+			if (spa_streq(*suc, name)) {
+				free(result);
+				result = NULL;
+				break;
+			}
+		}
+
+		fprintf(stdout, "%s (expect %s)\n", name, expect ? "fail" : "ok");
+		fflush(stdout);
+		pwtest_bool_eq(res == -2 || spa_json_get_error(&it, NULL, NULL), expect);
+		if (res == -2)
+			pwtest_bool_false(spa_json_get_error(&it, NULL, NULL));
+
+		if (result) {
+			while (strlen(result) > 0 && resultstrlen(result) - 1 == '\n')
+				resultstrlen(result) - 1 = '\0';
+
+			fprintf(stdout, "\tgot: >>%s<< expected: >>%s<<\n", f_ptr, result);
+			fflush(stdout);
+			pwtest_bool_true(spa_streq(f_ptr, result));
+		}
+	}
+
+	return PWTEST_PASS;
+}
+
 PWTEST_SUITE(spa_json)
 {
 	pwtest_add(json_abi, PWTEST_NOARG);
 	pwtest_add(json_parse, PWTEST_NOARG);
+	pwtest_add(json_parse_fail, PWTEST_NOARG);
 	pwtest_add(json_encode, PWTEST_NOARG);
 	pwtest_add(json_array, PWTEST_NOARG);
 	pwtest_add(json_overflow, PWTEST_NOARG);
 	pwtest_add(json_float, PWTEST_NOARG);
 	pwtest_add(json_float_check, PWTEST_NOARG);
 	pwtest_add(json_int, PWTEST_NOARG);
+	pwtest_add(json_data, PWTEST_NOARG);
 
 	return PWTEST_PASS;
 }

pipewire-1.0.1.tar.bz2/test/test-spa-node.c -> pipewire-1.2.0.tar.gz/test/test-spa-node.c Changed

pipewire-1.0.1.tar.bz2/test/test-spa-utils.c -> pipewire-1.2.0.tar.gz/test/test-spa-utils.c Changed

@@ -6,6 +6,7 @@
 #include <locale.h>
 #include <unistd.h>
 #include <sys/wait.h>
+#include <math.h>
 
 #include <valgrind/valgrind.h>
 
@@ -150,6 +151,13 @@
 	pwtest_int_eq(SPA_CLAMP(-1, 1, 16), 1);
 	pwtest_int_eq(SPA_CLAMP(8, 1, 16), 8);
 
+	pwtest_int_eq(SPA_CMP(INT64_MAX, INT64_MIN), 1);
+	pwtest_int_eq(SPA_CMP(INT64_MIN, INT64_MAX), -1);
+	pwtest_int_eq(SPA_CMP(INT64_MAX, INT64_MAX), 0);
+	pwtest_int_eq(SPA_CMP(1, nan("")), -1);
+	pwtest_int_eq(SPA_CMP(nan(""), 1), 1);
+	pwtest_int_eq(SPA_CMP(nan(""), nan("")), 1);
+
 	/* SPA_MEMBER exists for backwards compatibility but should no
 	 * longer be used, let's make sure it does what we expect it to */
 	pwtest_ptr_eq(SPA_MEMBER(ptr, 4, void), SPA_PTROFF(ptr, 4, void));
@@ -628,14 +636,14 @@
 	pwtest_bool_true(spa_atof("0x1", &v));	pwtest_double_eq(v, 1.0f);
 
 	v = 0xabcd;
-	pwtest_bool_false(spa_atof("0,00", &v));  pwtest_int_eq(v, 0xabcd);
-	pwtest_bool_false(spa_atof("fabc", &v));  pwtest_int_eq(v, 0xabcd);
-	pwtest_bool_false(spa_atof("1.bogus", &v));pwtest_int_eq(v, 0xabcd);
-	pwtest_bool_false(spa_atof("1.0a", &v));  pwtest_int_eq(v, 0xabcd);
-	pwtest_bool_false(spa_atof("  ", &v));	  pwtest_int_eq(v, 0xabcd);
-	pwtest_bool_false(spa_atof(" ", &v));	  pwtest_int_eq(v, 0xabcd);
-	pwtest_bool_false(spa_atof("", &v));	  pwtest_int_eq(v, 0xabcd);
-	pwtest_bool_false(spa_atof(NULL, &v));	  pwtest_int_eq(v, 0xabcd);
+	pwtest_bool_false(spa_atof("0,00", &v));  pwtest_int_eq((int)v, 0xabcd);
+	pwtest_bool_false(spa_atof("fabc", &v));  pwtest_int_eq((int)v, 0xabcd);
+	pwtest_bool_false(spa_atof("1.bogus", &v));pwtest_int_eq((int)v, 0xabcd);
+	pwtest_bool_false(spa_atof("1.0a", &v));  pwtest_int_eq((int)v, 0xabcd);
+	pwtest_bool_false(spa_atof("  ", &v));	  pwtest_int_eq((int)v, 0xabcd);
+	pwtest_bool_false(spa_atof(" ", &v));	  pwtest_int_eq((int)v, 0xabcd);
+	pwtest_bool_false(spa_atof("", &v));	  pwtest_int_eq((int)v, 0xabcd);
+	pwtest_bool_false(spa_atof(NULL, &v));	  pwtest_int_eq((int)v, 0xabcd);
 
 	return PWTEST_PASS;
 }
@@ -651,14 +659,14 @@
 	pwtest_bool_true(spa_atod("0x1", &v));		pwtest_double_eq(v, 1.0);
 
 	v = 0xabcd;
-	pwtest_bool_false(spa_atod("0,00", &v));	pwtest_int_eq(v, 0xabcd);
-	pwtest_bool_false(spa_atod("fabc", &v));	pwtest_int_eq(v, 0xabcd);
-	pwtest_bool_false(spa_atod("1.bogus", &v));	pwtest_int_eq(v, 0xabcd);
-	pwtest_bool_false(spa_atod("1.0a", &v));	pwtest_int_eq(v, 0xabcd);
-	pwtest_bool_false(spa_atod("  ", &v));		pwtest_int_eq(v, 0xabcd);
-	pwtest_bool_false(spa_atod(" ", &v));		pwtest_int_eq(v, 0xabcd);
-	pwtest_bool_false(spa_atod("", &v));		pwtest_int_eq(v, 0xabcd);
-	pwtest_bool_false(spa_atod(NULL, &v));		pwtest_int_eq(v, 0xabcd);
+	pwtest_bool_false(spa_atod("0,00", &v));	pwtest_int_eq((int)v, 0xabcd);
+	pwtest_bool_false(spa_atod("fabc", &v));	pwtest_int_eq((int)v, 0xabcd);
+	pwtest_bool_false(spa_atod("1.bogus", &v));	pwtest_int_eq((int)v, 0xabcd);
+	pwtest_bool_false(spa_atod("1.0a", &v));	pwtest_int_eq((int)v, 0xabcd);
+	pwtest_bool_false(spa_atod("  ", &v));		pwtest_int_eq((int)v, 0xabcd);
+	pwtest_bool_false(spa_atod(" ", &v));		pwtest_int_eq((int)v, 0xabcd);
+	pwtest_bool_false(spa_atod("", &v));		pwtest_int_eq((int)v, 0xabcd);
+	pwtest_bool_false(spa_atod(NULL, &v));		pwtest_int_eq((int)v, 0xabcd);
 
 	return PWTEST_PASS;
 }

pipewire-1.0.1.tar.bz2/test/test-utils.c -> pipewire-1.2.0.tar.gz/test/test-utils.c Changed

Build Results
RPM Lint

Refresh

Comments for request 6066 0

Request History

zaitor created request 4 months ago

New stable branch release

zaitor accepted request 4 months ago

Xin