node: add props to add_port

spa/include/spa/node/node.h

@@ -292,10 +292,13 @@ struct spa_node {
 	 * \param node a  spa_node
 	 * \param direction a #enum spa_direction
 	 * \param port_id an unused port id
+	 * \param props extra properties
 	 * \return 0 on success
 	 *         -EINVAL when node is NULL
 	 */
-	int (*add_port) (struct spa_node *node, enum spa_direction direction, uint32_t port_id);
+	int (*add_port) (struct spa_node *node,
+			enum spa_direction direction, uint32_t port_id,
+			const struct spa_dict *props);
 
 	int (*remove_port) (struct spa_node *node, enum spa_direction direction, uint32_t port_id);
 

spa/plugins/alsa/alsa-sink.c

@@ -298,7 +298,8 @@ impl_node_set_callbacks(struct spa_node *node,
 	return 0;
 }
 
-static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	return -ENOTSUP;
 }

spa/plugins/alsa/alsa-source.c

@@ -285,7 +285,8 @@ impl_node_set_callbacks(struct spa_node *node,
 	return 0;
 }
 
-static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	return -ENOTSUP;
 }

spa/plugins/audioconvert/audioconvert.c

@@ -606,7 +606,8 @@ impl_node_set_callbacks(struct spa_node *node,
 	return 0;
 }
 
-static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	struct impl *this;
 
@@ -614,7 +615,7 @@ static int impl_node_add_port(struct spa_node *node, enum spa_direction directio
 
 	this = SPA_CONTAINER_OF(node, struct impl, node);
 
-	return spa_node_add_port(this->fmt[direction], direction, port_id);
+	return spa_node_add_port(this->fmt[direction], direction, port_id, props);
 }
 
 static int

spa/plugins/audioconvert/channelmix.c

@@ -611,7 +611,8 @@ impl_node_set_callbacks(struct spa_node *node,
 	return 0;
 }
 
-static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	return -ENOTSUP;
 }

spa/plugins/audioconvert/fmtconvert.c

@@ -257,7 +257,8 @@ impl_node_set_callbacks(struct spa_node *node,
 	return 0;
 }
 
-static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
         return -ENOTSUP;
 }

spa/plugins/audioconvert/merger.c

@@ -329,7 +329,8 @@ impl_node_set_callbacks(struct spa_node *node,
 	return 0;
 }
 
-static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	spa_return_val_if_fail(node != NULL, -EINVAL);
 	return -ENOTSUP;

spa/plugins/audioconvert/resample.c

@@ -260,7 +260,8 @@ impl_node_set_callbacks(struct spa_node *node,
 	return 0;
 }
 
-static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	return -ENOTSUP;
 }

spa/plugins/audioconvert/splitter.c

@@ -316,7 +316,8 @@ impl_node_set_callbacks(struct spa_node *node,
 	return 0;
 }
 
-static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	spa_return_val_if_fail(node != NULL, -EINVAL);
 	return -ENOTSUP;

spa/plugins/audiomixer/audiomixer.c

@@ -200,7 +200,8 @@ impl_node_set_callbacks(struct spa_node *node,
 	return 0;
 }
 
-static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	struct impl *this;
 	struct port *port;

spa/plugins/audiotestsrc/audiotestsrc.c

@@ -490,7 +490,8 @@ impl_node_set_callbacks(struct spa_node *node,
 	return 0;
 }
 
-static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	return -ENOTSUP;
 }

spa/plugins/bluez5/a2dp-sink.c

@@ -888,7 +888,8 @@ impl_node_set_callbacks(struct spa_node *node,
 	return 0;
 }
 
-static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	return -ENOTSUP;
 }

spa/plugins/ffmpeg/ffmpeg-dec.c

@@ -147,7 +147,8 @@ impl_node_set_callbacks(struct spa_node *node,
 }
 
 static int
-impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	return -ENOTSUP;
 }

spa/plugins/ffmpeg/ffmpeg-enc.c

@@ -149,7 +149,8 @@ impl_node_set_callbacks(struct spa_node *node,
 }
 
 static int
-impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	return -ENOTSUP;
 }

spa/plugins/test/fakesink.c

@@ -354,7 +354,8 @@ impl_node_set_callbacks(struct spa_node *node,
 	return 0;
 }
 
-static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+static int impl_node_add_port(struct spa_node *node, enum spa_direction direction,
+                          uint32_t port_id, const struct spa_dict *props)
 {
 	return -ENOTSUP;
 }

spa/plugins/test/fakesrc.c

@@ -370,7 +370,8 @@ impl_node_set_callbacks(struct spa_node *node,
 	return 0;
 }
 
-static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	return -ENOTSUP;
 }

spa/plugins/v4l2/v4l2-source.c

@@ -373,7 +373,7 @@ static int impl_node_set_callbacks(struct spa_node *node,
 
 static int impl_node_add_port(struct spa_node *node,
 			      enum spa_direction direction,
-			      uint32_t port_id)
+			      uint32_t port_id, const struct spa_dict *props)
 {
 	return -ENOTSUP;
 }

spa/plugins/videotestsrc/videotestsrc.c

@@ -434,7 +434,8 @@ impl_node_set_callbacks(struct spa_node *node,
 	return 0;
 }
 
-static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	return -ENOTSUP;
 }

spa/plugins/volume/volume.c

@@ -269,7 +269,8 @@ impl_node_set_callbacks(struct spa_node *node,
 	return 0;
 }
 
-static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	return -ENOTSUP;
 }

src/extensions/client-node.h

@@ -256,10 +256,12 @@ struct pw_client_node_proxy_events {
 	 *
 	 * \param direction the direction of the port
 	 * \param port_id the new port id
+	 * \param props extra properties
 	 */
 	int (*add_port) (void *object,
 			  enum spa_direction direction,
-			  uint32_t port_id);
+			  uint32_t port_id,
+			  const struct spa_dict *props);
 	/**
 	 * A port was removed from the node
 	 *

src/modules/module-audio-dsp/floatmix.c

@@ -194,7 +194,8 @@ impl_node_set_callbacks(struct spa_node *node,
 	return 0;
 }
 
-static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+static int impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	struct impl *this;
 	struct port *port;

src/modules/module-client-node/client-node.c

@@ -579,7 +579,8 @@ clear_port(struct node *this, struct port *port)
 }
 
 static int
-impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	struct node *this;
 
@@ -588,7 +589,7 @@ impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t
 
 	spa_return_val_if_fail(CHECK_FREE_PORT(this, direction, port_id), -EINVAL);
 
-	return pw_client_node_resource_add_port(this->resource, direction, port_id);
+	return pw_client_node_resource_add_port(this->resource, direction, port_id, props);
 }
 
 static int
@@ -1339,7 +1340,8 @@ impl_mix_port_set_param(struct spa_node *node,
 }
 
 static int
-impl_mix_add_port(struct spa_node *node, enum spa_direction direction, uint32_t mix_id)
+impl_mix_add_port(struct spa_node *node, enum spa_direction direction, uint32_t mix_id,
+		const struct spa_dict *props)
 {
 	struct port *port = SPA_CONTAINER_OF(node, struct port, mix_node);
 	pw_log_debug("client-node %p: add port %d:%d.%d", node, direction, port->id, mix_id);

src/modules/module-client-node/client-stream.c

@@ -341,7 +341,8 @@ impl_node_sync(struct spa_node *node, uint32_t seq)
 }
 
 static int
-impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	struct node *this;
 	struct impl *impl;
@@ -355,7 +356,7 @@ impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t
 	if (direction != impl->direction)
 		return -EINVAL;
 
-	if ((res = spa_node_add_port(impl->adapter_mix, direction, port_id)) < 0)
+	if ((res = spa_node_add_port(impl->adapter_mix, direction, port_id, props)) < 0)
 		return res;
 
 	if ((res = spa_node_port_set_io(impl->adapter_mix,

src/modules/module-client-node/protocol-native.c

@@ -31,6 +31,22 @@
 #include <extensions/protocol-native.h>
 #include <extensions/client-node.h>
 
+static void push_dict(struct spa_pod_builder *b, const struct spa_dict *dict)
+{
+	uint32_t i, n_items;
+	struct spa_pod_frame f;
+
+	n_items = dict ? dict->n_items : 0;
+
+	spa_pod_builder_push_struct(b, &f);
+	spa_pod_builder_int(b, n_items);
+	for (i = 0; i < n_items; i++) {
+		spa_pod_builder_string(b, dict->items[i].key);
+		spa_pod_builder_string(b, dict->items[i].value);
+	}
+	spa_pod_builder_pop(b, &f);
+}
+
 static int
 client_node_marshal_update(void *object,
 			   uint32_t change_mask,
@@ -43,28 +59,21 @@ client_node_marshal_update(void *object,
 	struct pw_proxy *proxy = object;
 	struct spa_pod_builder *b;
 	struct spa_pod_frame f;
-	uint32_t i, n_items;
+	uint32_t i;
 
 	b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_NODE_PROXY_METHOD_UPDATE);
 
 	spa_pod_builder_push_struct(b, &f);
 	spa_pod_builder_add(b,
-			    SPA_POD_Int(change_mask),
-			    SPA_POD_Int(max_input_ports),
-			    SPA_POD_Int(max_output_ports),
-			    SPA_POD_Int(n_params), NULL);
+			SPA_POD_Int(change_mask),
+			SPA_POD_Int(max_input_ports),
+			SPA_POD_Int(max_output_ports),
+			SPA_POD_Int(n_params), NULL);
 
 	for (i = 0; i < n_params; i++)
 		spa_pod_builder_add(b, SPA_POD_Pod(params[i]), NULL);
 
-	n_items = props ? props->n_items : 0;
-	spa_pod_builder_add(b,
-			SPA_POD_Int(n_items), NULL);
-	for (i = 0; i < n_items; i++) {
-		spa_pod_builder_add(b,
-			    SPA_POD_String(props->items[i].key),
-			    SPA_POD_String(props->items[i].value), NULL);
-	}
+	push_dict(b, props);
 	spa_pod_builder_pop(b, &f);
 
 	return pw_protocol_native_end_proxy(proxy, b);
@@ -247,15 +256,37 @@ static int client_node_demarshal_add_port(void *object, void *data, size_t size)
 {
 	struct pw_proxy *proxy = object;
 	struct spa_pod_parser prs;
+	struct spa_pod_frame f[2];
 	int32_t direction, port_id;
+	struct spa_dict props;
+	uint32_t i;
 
 	spa_pod_parser_init(&prs, data, size);
-	if (spa_pod_parser_get_struct(&prs,
+	if (spa_pod_parser_push_struct(&prs, &f[0]) < 0)
+		return -EINVAL;
+
+	if (spa_pod_parser_get(&prs,
 			SPA_POD_Int(&direction),
 			SPA_POD_Int(&port_id)) < 0)
 		return -EINVAL;
 
-	pw_proxy_notify(proxy, struct pw_client_node_proxy_events, add_port, 0, direction, port_id);
+	if (spa_pod_parser_push_struct(&prs, &f[1]) < 0)
+		return -EINVAL;
+	if (spa_pod_parser_get(&prs,
+			 SPA_POD_Int(&props.n_items), NULL) < 0)
+		return -EINVAL;
+
+	props.items = alloca(props.n_items * sizeof(struct spa_dict_item));
+	for (i = 0; i < props.n_items; i++) {
+		if (spa_pod_parser_get(&prs,
+				SPA_POD_String(&props.items[i].key),
+				SPA_POD_String(&props.items[i].value),
+				NULL) < 0)
+			return -EINVAL;
+	}
+
+	pw_proxy_notify(proxy, struct pw_client_node_proxy_events, add_port, 0, direction, port_id,
+			props.n_items ? &props : NULL);
 	return 0;
 }
 
@@ -513,16 +544,21 @@ client_node_marshal_command(void *object, const struct spa_command *command)
 
 static int
 client_node_marshal_add_port(void *object,
-			     enum spa_direction direction, uint32_t port_id)
+			     enum spa_direction direction, uint32_t port_id,
+			     const struct spa_dict *props)
 {
 	struct pw_resource *resource = object;
 	struct spa_pod_builder *b;
+	struct spa_pod_frame f;
 
 	b = pw_protocol_native_begin_resource(resource, PW_CLIENT_NODE_PROXY_EVENT_ADD_PORT);
 
-	spa_pod_builder_add_struct(b,
-			       SPA_POD_Int(direction),
-			       SPA_POD_Int(port_id));
+	spa_pod_builder_push_struct(b, &f);
+	spa_pod_builder_add(b,
+			SPA_POD_Int(direction),
+			SPA_POD_Int(port_id));
+	push_dict(b, props);
+	spa_pod_builder_pop(b, &f);
 
 	return pw_protocol_native_end_resource(resource, b);
 }
@@ -692,14 +728,14 @@ static int client_node_demarshal_update(void *object, void *data, size_t size)
 {
 	struct pw_resource *resource = object;
 	struct spa_pod_parser prs;
-	struct spa_pod_frame f;
+	struct spa_pod_frame f[2];
 	uint32_t change_mask, max_input_ports, max_output_ports, n_params;
 	const struct spa_pod **params;
 	struct spa_dict props;
 	uint32_t i;
 
 	spa_pod_parser_init(&prs, data, size);
-	if (spa_pod_parser_push_struct(&prs, &f) < 0 ||
+	if (spa_pod_parser_push_struct(&prs, &f[0]) < 0 ||
 	    spa_pod_parser_get(&prs,
 			SPA_POD_Int(&change_mask),
 			SPA_POD_Int(&max_input_ports),
@@ -713,15 +749,18 @@ static int client_node_demarshal_update(void *object, void *data, size_t size)
 					SPA_POD_PodObject(&params[i]), NULL) < 0)
 			return -EINVAL;
 
+	if (spa_pod_parser_push_struct(&prs, &f[1]) < 0)
+		return -EINVAL;
 	if (spa_pod_parser_get(&prs,
-			SPA_POD_Int(&props.n_items), NULL) < 0)
+			 SPA_POD_Int(&props.n_items), NULL) < 0)
 		return -EINVAL;
 
 	props.items = alloca(props.n_items * sizeof(struct spa_dict_item));
 	for (i = 0; i < props.n_items; i++) {
 		if (spa_pod_parser_get(&prs,
 				SPA_POD_String(&props.items[i].key),
-				SPA_POD_String(&props.items[i].value), NULL) < 0)
+				SPA_POD_String(&props.items[i].value),
+				NULL) < 0)
 			return -EINVAL;
 	}
 

src/modules/module-client-node/remote-node.c

@@ -576,7 +576,8 @@ static int client_node_command(void *object, const struct spa_command *command)
 }
 
 static int
-client_node_add_port(void *object, enum spa_direction direction, uint32_t port_id)
+client_node_add_port(void *object, enum spa_direction direction, uint32_t port_id,
+		const struct spa_dict *props)
 {
 	struct pw_proxy *proxy = object;
 	pw_log_warn("add port not supported");

src/pipewire/port.c

@@ -206,7 +206,7 @@ int pw_port_init_mix(struct pw_port *port, struct pw_port_mix *mix)
 	adjust_mix_state(port, mix->state, 1);
 
 	if (port->mix->add_port)
-		port->mix->add_port(port->mix, port->direction, port_id);
+		port->mix->add_port(port->mix, port->direction, port_id, NULL);
 
 	if (pi && pi->init_mix)
 		res = pi->init_mix(port->implementation_data, mix);