add client-stream

A client stream is a more specialized way to send 1 stream to pipewire.
On the client side and receiver side it can do conversion and the
buffer size of the client can be choosen arbitrarily.

src/modules/meson.build

@@ -47,6 +47,7 @@ pipewire_module_mixer = shared_library('pipewire-module-mixer',
 pipewire_module_client_node = shared_library('pipewire-module-client-node',
   [ 'module-client-node.c',
     'module-client-node/client-node.c',
+    'module-client-node/client-stream.c',
     'module-client-node/protocol-native.c',
     'spa/spa-node.c', ],
   c_args : pipewire_module_c_args,

src/modules/module-client-node.c

@@ -30,6 +30,7 @@
 #include "pipewire/module.h"
 
 #include "module-client-node/client-node.h"
+#include "module-client-node/client-stream.h"
 
 struct pw_protocol *pw_protocol_native_ext_client_node_init(struct pw_core *core);
 
@@ -48,7 +49,7 @@ static void *create_object(void *_data,
 			   struct pw_properties *properties,
 			   uint32_t new_id)
 {
-	struct pw_client_node *node;
+	void *result;
 	struct pw_resource *node_resource;
 
 	if (resource == NULL)
@@ -59,11 +60,16 @@ static void *create_object(void *_data,
 	if (node_resource == NULL)
 		goto no_mem;
 
-	node = pw_client_node_new(node_resource, properties);
-	if (node == NULL)
+	if (properties && pw_properties_get(properties, "node.stream") != NULL) {
+		result = pw_client_stream_new(node_resource, properties);
+	}
+	else {
+		result = pw_client_node_new(node_resource, properties, true);
+	}
+	if (result == NULL)
 		goto no_mem;
 
-	return node;
+	return result;
 
       no_resource:
 	pw_log_error("client-node needs a resource");

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

@@ -0,0 +1,906 @@
+/* PipeWire
+ * Copyright (C) 2018 Wim Taymans <wim.taymans@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <string.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <dlfcn.h>
+#include <sys/socket.h>
+#include <sys/mman.h>
+#include <sys/eventfd.h>
+
+#include <spa/node/node.h>
+#include <spa/buffer/alloc.h>
+#include <spa/pod/parser.h>
+#include <spa/lib/pod.h>
+
+#include "pipewire/pipewire.h"
+#include "pipewire/interfaces.h"
+#include "pipewire/private.h"
+
+#include "pipewire/core.h"
+#include "modules/spa/spa-node.h"
+#include "client-node.h"
+#include "client-stream.h"
+
+#include <spa/lib/debug.h>
+
+/** \cond */
+
+struct node {
+	struct spa_node node;
+
+	struct impl *impl;
+
+	struct spa_type_map *map;
+	struct spa_log *log;
+
+	const struct spa_node_callbacks *callbacks;
+	void *callbacks_data;
+
+	uint32_t seq;
+};
+
+struct impl {
+	struct pw_client_stream this;
+
+	struct pw_core *core;
+	struct pw_type *t;
+
+	struct node node;
+
+	struct spa_hook node_listener;
+	struct spa_hook client_node_listener;
+	struct spa_hook resource_listener;
+
+	enum spa_direction direction;
+
+	struct spa_node *cnode;
+	struct spa_node *adapter;
+
+	struct pw_client_node *client_node;
+	struct pw_port *client_port;
+	struct pw_port_mix client_port_mix;
+
+	struct spa_buffer **buffers;
+	uint32_t n_buffers;
+	struct pw_memblock *mem;
+};
+
+/** \endcond */
+
+static int impl_node_enum_params(struct spa_node *node,
+				 uint32_t id, uint32_t *index,
+				 const struct spa_pod *filter,
+				 struct spa_pod **result,
+				 struct spa_pod_builder *builder)
+{
+	return 0;
+}
+
+static int impl_node_set_param(struct spa_node *node, uint32_t id, uint32_t flags,
+			       const struct spa_pod *param)
+{
+	return 0;
+}
+
+static int impl_node_send_command(struct spa_node *node, const struct spa_command *command)
+{
+	struct node *this;
+	struct impl *impl;
+	int res;
+
+	spa_return_val_if_fail(node != NULL, -EINVAL);
+
+	this = SPA_CONTAINER_OF(node, struct node, node);
+	impl = this->impl;
+
+	if ((res = spa_node_send_command(impl->adapter, command)) < 0)
+		return res;
+
+	if ((res = spa_node_send_command(impl->cnode, command)) < 0)
+		return res;
+
+	return res;
+}
+
+static int
+impl_node_set_callbacks(struct spa_node *node,
+			const struct spa_node_callbacks *callbacks,
+			void *data)
+{
+	struct node *this;
+
+	spa_return_val_if_fail(node != NULL, -EINVAL);
+
+	this = SPA_CONTAINER_OF(node, struct node, node);
+	this->callbacks = callbacks;
+	this->callbacks_data = data;
+
+	return 0;
+}
+
+static int
+impl_node_get_n_ports(struct spa_node *node,
+		      uint32_t *n_input_ports,
+		      uint32_t *max_input_ports,
+		      uint32_t *n_output_ports,
+		      uint32_t *max_output_ports)
+{
+	struct node *this;
+	struct impl *impl;
+
+	spa_return_val_if_fail(node != NULL, -EINVAL);
+
+	this = SPA_CONTAINER_OF(node, struct node, node);
+	impl = this->impl;
+
+	if (impl->adapter) {
+		spa_node_get_n_ports(impl->adapter,
+				n_input_ports,
+				max_input_ports,
+				n_output_ports,
+				max_output_ports);
+
+		if (impl->direction == SPA_DIRECTION_OUTPUT) {
+			if (n_input_ports)
+				*n_input_ports = 0;
+			if (max_input_ports)
+				*max_input_ports = 0;
+		} else {
+			if (n_output_ports)
+				*n_output_ports = 0;
+			if (max_output_ports)
+				*max_output_ports = 0;
+		}
+	} else {
+		uint32_t n_inputs = 0, n_outputs = 0;
+
+		if (impl->direction == SPA_DIRECTION_OUTPUT)
+			n_outputs++;
+		else
+			n_inputs++;
+
+		if (n_input_ports)
+			*n_input_ports = n_inputs;
+		if (max_input_ports)
+			*max_input_ports = n_inputs;
+		if (n_output_ports)
+			*n_output_ports = n_outputs;
+		if (max_output_ports)
+			*max_output_ports = n_outputs;
+	}
+	return 0;
+}
+
+static int
+impl_node_get_port_ids(struct spa_node *node,
+		       uint32_t *input_ids,
+		       uint32_t n_input_ids,
+		       uint32_t *output_ids,
+		       uint32_t n_output_ids)
+{
+	struct node *this;
+
+	spa_return_val_if_fail(node != NULL, -EINVAL);
+
+	this = SPA_CONTAINER_OF(node, struct node, node);
+
+	if (this->impl->adapter) {
+		return spa_node_get_port_ids(this->impl->adapter,
+				input_ids,
+				n_input_ids,
+				output_ids,
+				n_output_ids);
+	}
+	else {
+		if (input_ids && n_input_ids > 0)
+			input_ids[0] = 0;
+		if (output_ids && n_output_ids > 0)
+			output_ids[0] = 0;
+	}
+
+	return 0;
+}
+
+static int
+impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+{
+	struct node *this;
+	struct impl *impl;
+
+	spa_return_val_if_fail(node != NULL, -EINVAL);
+
+	this = SPA_CONTAINER_OF(node, struct node, node);
+	impl = this->impl;
+
+	if (direction != impl->direction)
+		return -EINVAL;
+
+	return spa_node_add_port(impl->adapter, direction, port_id);
+}
+
+static int
+impl_node_remove_port(struct spa_node *node, enum spa_direction direction, uint32_t port_id)
+{
+	struct node *this;
+	struct impl *impl;
+
+	spa_return_val_if_fail(node != NULL, -EINVAL);
+
+	this = SPA_CONTAINER_OF(node, struct node, node);
+	impl = this->impl;
+
+	if (direction != this->impl->direction)
+		return -EINVAL;
+
+	return spa_node_remove_port(impl->adapter, direction, port_id);
+}
+
+static int
+impl_node_port_get_info(struct spa_node *node,
+			enum spa_direction direction, uint32_t port_id,
+			const struct spa_port_info **info)
+{
+	struct node *this;
+	struct impl *impl;
+
+	if (node == NULL || info == NULL)
+		return -EINVAL;
+
+	this = SPA_CONTAINER_OF(node, struct node, node);
+	impl = this->impl;
+
+	if (direction != impl->direction)
+		return -EINVAL;
+
+	return spa_node_port_get_info(impl->adapter, direction, port_id, info);
+}
+
+static int
+impl_node_port_enum_params(struct spa_node *node,
+			   enum spa_direction direction, uint32_t port_id,
+			   uint32_t id, uint32_t *index,
+			   const struct spa_pod *filter,
+			   struct spa_pod **result,
+			   struct spa_pod_builder *builder)
+{
+	struct node *this;
+	struct impl *impl;
+
+	spa_return_val_if_fail(node != NULL, -EINVAL);
+	spa_return_val_if_fail(index != NULL, -EINVAL);
+	spa_return_val_if_fail(builder != NULL, -EINVAL);
+
+	this = SPA_CONTAINER_OF(node, struct node, node);
+	impl = this->impl;
+
+	if (direction != impl->direction)
+		return -EINVAL;
+
+	return spa_node_port_enum_params(impl->adapter, direction, port_id, id,
+			index, filter, result, builder);
+}
+
+static int negotiate_format(struct impl *impl)
+{
+	struct node *this = &impl->node;
+	uint32_t state;
+	struct spa_pod *format;
+	uint8_t buffer[4096];
+	struct spa_pod_builder b = { 0 };
+	struct pw_type *t = impl->t;
+	int res;
+
+	spa_pod_builder_init(&b, buffer, sizeof(buffer));
+
+	spa_log_info(this->log, "%p: negiotiate", impl);
+
+	state = 0;
+	if ((res = spa_node_port_enum_params(impl->adapter,
+			       SPA_DIRECTION_INPUT, 0,
+			       t->param.idEnumFormat, &state,
+			       NULL, &format, &b)) <= 0)
+		return -ENOTSUP;
+
+	spa_debug_pod(format, SPA_DEBUG_FLAG_FORMAT);
+
+	state = 0;
+	if ((res = spa_node_port_enum_params(impl->cnode,
+				       SPA_DIRECTION_OUTPUT, 0,
+				       t->param.idEnumFormat, &state,
+				       format, &format, &b)) <= 0)
+			return -ENOTSUP;
+
+	spa_pod_fixate(format);
+	spa_debug_pod(format, SPA_DEBUG_FLAG_FORMAT);
+
+	if ((res = spa_node_port_set_param(impl->adapter,
+				   SPA_DIRECTION_INPUT, 0,
+				   t->param.idFormat, 0,
+				   format)) < 0)
+			return res;
+
+	if ((res = spa_node_port_set_param(impl->cnode,
+					   SPA_DIRECTION_OUTPUT, 0,
+					   t->param.idFormat, 0,
+					   format)) < 0)
+			return res;
+
+	return res;
+}
+
+static int negotiate_buffers(struct impl *impl)
+{
+	struct node *this = &impl->node;
+	struct pw_type *t = impl->t;
+	uint8_t buffer[4096];
+	struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
+	uint32_t state;
+	struct spa_pod *param = NULL;
+	int res, i;
+	bool in_alloc, out_alloc;
+	int32_t size, buffers, blocks, align, flags;
+	uint32_t *aligns, data_size;
+	struct spa_data *datas;
+	const struct spa_port_info *in_info, *out_info;
+        struct spa_buffer_alloc_info info = { 0, };
+        void *skel;
+
+	spa_log_info(this->log, "%p: %d", impl, impl->n_buffers);
+
+	if (impl->n_buffers > 0)
+		return 0;
+
+	state = 0;
+	if ((res = spa_node_port_enum_params(impl->cnode,
+			       SPA_DIRECTION_OUTPUT, 0,
+			       t->param.idBuffers, &state,
+			       param, &param, &b)) < 0)
+		return res;
+
+	if (res == 0)
+		param = NULL;
+	else
+		spa_debug_pod(param, 0);
+
+	state = 0;
+	if ((res = spa_node_port_enum_params(impl->adapter,
+			       SPA_DIRECTION_INPUT, 0,
+			       t->param.idBuffers, &state,
+			       param, &param, &b)) <= 0)
+		return -ENOTSUP;
+
+	spa_pod_fixate(param);
+	spa_debug_pod(param, 0);
+
+	if ((res = spa_node_port_get_info(impl->cnode,
+					SPA_DIRECTION_OUTPUT, 0,
+					&out_info)) < 0)
+		return res;
+	if ((res = spa_node_port_get_info(impl->adapter,
+					SPA_DIRECTION_INPUT, 0,
+					&in_info)) < 0)
+		return res;
+
+	in_alloc = SPA_FLAG_CHECK(in_info->flags, SPA_PORT_INFO_FLAG_CAN_ALLOC_BUFFERS);
+	out_alloc = SPA_FLAG_CHECK(out_info->flags, SPA_PORT_INFO_FLAG_CAN_ALLOC_BUFFERS);
+
+	flags = 0;
+	if (out_alloc || in_alloc) {
+		flags |= SPA_BUFFER_ALLOC_FLAG_NO_DATA;
+		if (out_alloc)
+			in_alloc = false;
+	}
+
+	if (spa_pod_object_parse(param,
+			":", t->param_buffers.buffers, "i", &buffers,
+			":", t->param_buffers.blocks, "i", &blocks,
+			":", t->param_buffers.size, "i", &size,
+			":", t->param_buffers.align, "i", &align,
+			NULL) < 0)
+		return -EINVAL;
+
+	size *= 4;
+
+	datas = alloca(sizeof(struct spa_data) * blocks);
+	memset(datas, 0, sizeof(struct spa_data) * blocks);
+	aligns = alloca(sizeof(uint32_t) * blocks);
+	for (i = 0; i < blocks; i++) {
+		datas[i].type = t->data.MemPtr;
+		datas[i].maxsize = size;
+		aligns[i] = align;
+	}
+
+	spa_buffer_alloc_fill_info(&info, 0, NULL, blocks, datas, aligns);
+	info.skel_size = SPA_ROUND_UP_N(info.skel_size, 16);
+
+	impl->buffers = calloc(blocks, sizeof(struct spa_buffer *) + info.skel_size);
+	if (impl->buffers == NULL)
+		return -ENOMEM;
+
+
+        skel = SPA_MEMBER(impl->buffers, sizeof(struct spa_buffer *) * blocks, void);
+	data_size = info.meta_size + info.chunk_size + info.data_size;
+
+	if ((res = pw_memblock_alloc(PW_MEMBLOCK_FLAG_WITH_FD |
+				     PW_MEMBLOCK_FLAG_MAP_READWRITE |
+				     PW_MEMBLOCK_FLAG_SEAL, blocks * data_size,
+				     &impl->mem)) < 0)
+		return res;
+
+	impl->n_buffers = blocks;
+
+        spa_buffer_alloc_layout_array(&info, impl->n_buffers, impl->buffers,
+			skel, impl->mem->ptr);
+
+
+	if (in_alloc) {
+		if ((res = spa_node_port_alloc_buffers(impl->adapter,
+			       SPA_DIRECTION_INPUT, 0,
+			       NULL, 0,
+			       impl->buffers, &impl->n_buffers)) < 0)
+			return res;
+	}
+	else {
+		if ((res = spa_node_port_use_buffers(impl->adapter,
+			       SPA_DIRECTION_INPUT, 0,
+			       impl->buffers, impl->n_buffers)) < 0)
+			return res;
+	}
+	if (out_alloc) {
+		if ((res = spa_node_port_alloc_buffers(impl->cnode,
+			       SPA_DIRECTION_OUTPUT, 0,
+			       NULL, 0,
+			       impl->buffers, &impl->n_buffers)) < 0)
+			return res;
+	}
+	else {
+		if ((res = spa_node_port_use_buffers(impl->cnode,
+			       SPA_DIRECTION_OUTPUT, 0,
+			       impl->buffers, impl->n_buffers)) < 0)
+			return res;
+	}
+
+	return 0;
+}
+
+static int
+impl_node_port_set_param(struct spa_node *node,
+			 enum spa_direction direction, uint32_t port_id,
+			 uint32_t id, uint32_t flags,
+			 const struct spa_pod *param)
+{
+	struct node *this;
+	struct impl *impl;
+	struct pw_type *t;
+	int res;
+
+	spa_return_val_if_fail(node != NULL, -EINVAL);
+
+	this = SPA_CONTAINER_OF(node, struct node, node);
+	impl = this->impl;
+	t = impl->t;
+
+	if (direction != impl->direction)
+		return -EINVAL;
+
+	if ((res = spa_node_port_set_param(impl->adapter, direction, port_id, id,
+			flags, param)) < 0)
+		return res;
+
+	if (id == t->param.idFormat) {
+		if (param == NULL) {
+		}
+		else {
+			if (port_id == 0)
+				res = negotiate_format(impl);
+		}
+	}
+	return res;
+}
+
+static int
+impl_node_port_set_io(struct spa_node *node,
+		      enum spa_direction direction,
+		      uint32_t port_id,
+		      uint32_t id,
+		      void *data, size_t size)
+{
+	struct node *this;
+	struct impl *impl;
+
+	spa_return_val_if_fail(node != NULL, -EINVAL);
+
+	this = SPA_CONTAINER_OF(node, struct node, node);
+	impl = this->impl;
+
+	if (direction != impl->direction)
+		return -EINVAL;
+
+	return spa_node_port_set_io(impl->adapter, direction, port_id, id, data, size);
+}
+
+static int
+impl_node_port_use_buffers(struct spa_node *node,
+			   enum spa_direction direction,
+			   uint32_t port_id,
+			   struct spa_buffer **buffers,
+			   uint32_t n_buffers)
+{
+	struct node *this;
+	struct impl *impl;
+	int res;
+
+	spa_return_val_if_fail(node != NULL, -EINVAL);
+
+	this = SPA_CONTAINER_OF(node, struct node, node);
+	impl = this->impl;
+
+	if (direction != impl->direction)
+		return -EINVAL;
+
+	if ((res = spa_node_port_use_buffers(impl->adapter,
+					direction, port_id, buffers, n_buffers)) < 0)
+		return res;
+
+
+	spa_log_info(this->log, "%p: %d %d", impl, n_buffers, port_id);
+
+	if (n_buffers > 0) {
+		if (port_id == 0)
+			res = negotiate_buffers(impl);
+	}
+
+
+	return res;
+}
+
+static int
+impl_node_port_alloc_buffers(struct spa_node *node,
+			     enum spa_direction direction,
+			     uint32_t port_id,
+			     struct spa_pod **params,
+			     uint32_t n_params,
+			     struct spa_buffer **buffers,
+			     uint32_t *n_buffers)
+{
+	struct node *this;
+	struct impl *impl;
+
+	spa_return_val_if_fail(node != NULL, -EINVAL);
+
+	this = SPA_CONTAINER_OF(node, struct node, node);
+	impl = this->impl;
+
+	if (direction != impl->direction)
+		return -EINVAL;
+
+	return spa_node_port_alloc_buffers(impl->adapter, direction, port_id,
+			params, n_params, buffers, n_buffers);
+}
+
+static int
+impl_node_port_reuse_buffer(struct spa_node *node, uint32_t port_id, uint32_t buffer_id)
+{
+	struct node *this;
+	struct impl *impl;
+
+	spa_return_val_if_fail(node != NULL, -EINVAL);
+
+	this = SPA_CONTAINER_OF(node, struct node, node);
+	impl = this->impl;
+
+	return spa_node_port_reuse_buffer(impl->adapter, port_id, buffer_id);
+}
+
+static int
+impl_node_port_send_command(struct spa_node *node,
+			    enum spa_direction direction,
+			    uint32_t port_id, const struct spa_command *command)
+{
+	struct node *this;
+	struct impl *impl;
+	int res;
+
+	spa_return_val_if_fail(node != NULL, -EINVAL);
+	spa_return_val_if_fail(command != NULL, -EINVAL);
+
+	this = SPA_CONTAINER_OF(node, struct node, node);
+	impl = this->impl;
+
+	if (direction != impl->direction)
+		return -EINVAL;
+
+	if ((res = spa_node_port_send_command(impl->adapter, direction, port_id, command)) < 0)
+		return res;
+
+	return res;
+}
+
+static int impl_node_process(struct spa_node *node)
+{
+	struct node *this = SPA_CONTAINER_OF(node, struct node, node);
+	struct impl *impl = this->impl;
+	int status;
+
+	spa_log_trace(this->log, "%p: process", this);
+
+	status = spa_node_process(impl->adapter);
+
+	if (impl->client_port_mix.io->status == SPA_STATUS_NEED_BUFFER)
+		spa_graph_run(impl->client_node->node->rt.node.graph);
+
+	if (status == SPA_STATUS_HAVE_BUFFER)
+		spa_graph_node_trigger(&impl->this.node->rt.node);
+
+	return SPA_STATUS_OK;
+}
+
+static const struct spa_node impl_node = {
+	SPA_VERSION_NODE,
+	NULL,
+	impl_node_enum_params,
+	impl_node_set_param,
+	impl_node_send_command,
+	impl_node_set_callbacks,
+	impl_node_get_n_ports,
+	impl_node_get_port_ids,
+	impl_node_add_port,
+	impl_node_remove_port,
+	impl_node_port_get_info,
+	impl_node_port_enum_params,
+	impl_node_port_set_param,
+	impl_node_port_use_buffers,
+	impl_node_port_alloc_buffers,
+	impl_node_port_set_io,
+	impl_node_port_reuse_buffer,
+	impl_node_port_send_command,
+	impl_node_process,
+};
+
+static int
+node_init(struct node *this,
+	  struct spa_dict *info,
+	  const struct spa_support *support,
+	  uint32_t n_support)
+{
+	uint32_t i;
+
+	for (i = 0; i < n_support; i++) {
+		if (strcmp(support[i].type, SPA_TYPE__Log) == 0)
+			this->log = support[i].data;
+		else if (strcmp(support[i].type, SPA_TYPE__TypeMap) == 0)
+			this->map = support[i].data;
+	}
+	if (this->map == NULL) {
+		spa_log_error(this->log, "a type map is needed");
+		return -EINVAL;
+	}
+
+	this->node = impl_node;
+
+	this->seq = 1;
+
+	return SPA_RESULT_RETURN_ASYNC(this->seq++);
+}
+
+static void client_node_initialized(void *data)
+{
+	struct impl *impl = data;
+        uint32_t n_input_ports, n_output_ports, max_input_ports, max_output_ports, state;
+	uint32_t media_type, media_subtype;
+	struct pw_type *t = impl->t;
+	struct spa_pod *format;
+	uint8_t buffer[4096];
+	struct spa_pod_builder b;
+	int res;
+
+	pw_log_debug("client-stream %p: initialized", &impl->this);
+
+//	impl->client_node->node->rt.node.graph->parent = &impl->this.node->rt.node;
+
+	spa_graph_node_trigger(&impl->this.node->rt.node);
+
+	impl->cnode = pw_node_get_implementation(impl->client_node->node);
+
+	if ((res = spa_node_get_n_ports(impl->cnode,
+			     &n_input_ports,
+			     &max_input_ports,
+			     &n_output_ports,
+			     &max_output_ports)) < 0)
+		return;
+
+	if (n_input_ports > 0)
+		impl->direction = SPA_DIRECTION_INPUT;
+	else
+		impl->direction = SPA_DIRECTION_OUTPUT;
+
+	state = 0;
+	spa_pod_builder_init(&b, buffer, sizeof(buffer));
+	if ((res = spa_node_port_enum_params(impl->cnode,
+				impl->direction, 0,
+				t->param.idEnumFormat, &state,
+				NULL, &format, &b)) <= 0)
+		return;
+
+	spa_pod_object_parse(format,
+			"I", &media_type,
+			"I", &media_subtype);
+
+	pw_log_debug("client-stream %p: %s/%s", &impl->this,
+			spa_type_map_get_type(t->map, media_type),
+			spa_type_map_get_type(t->map, media_subtype));
+
+	if ((impl->adapter = pw_load_spa_interface("audioconvert/libspa-audioconvert",
+			"splitter", SPA_TYPE__Node, NULL, 0)) == NULL)
+		return;
+
+	impl->client_port = pw_node_find_port(impl->client_node->node, impl->direction, 0);
+	if (impl->client_port == NULL)
+		return;
+
+	if ((res = pw_port_init_mix(impl->client_port, &impl->client_port_mix)) < 0)
+		return;
+
+	if ((res = spa_node_port_set_io(impl->adapter,
+				SPA_DIRECTION_INPUT, 0,
+				t->io.Buffers,
+				impl->client_port_mix.io,
+				sizeof(impl->client_port_mix.io))) < 0)
+		return;
+
+	if ((res = spa_node_port_set_io(&impl->client_port->mix_node,
+				SPA_DIRECTION_OUTPUT, 0,
+				t->io.Buffers,
+				impl->client_port_mix.io,
+				sizeof(impl->client_port_mix.io))) < 0)
+		return;
+
+	pw_node_register(impl->this.node, NULL, NULL, NULL);
+
+	pw_log_debug("client-stream %p: activating", &impl->this);
+
+	pw_node_set_active(impl->this.node, true);
+}
+
+static void client_node_free(void *data)
+{
+	struct impl *impl = data;
+	pw_log_debug("client-stream %p: free", &impl->this);
+	spa_hook_remove(&impl->client_node_listener);
+	impl->client_node = NULL;
+}
+
+
+static void client_node_async_complete(void *data, uint32_t seq, int res)
+{
+	struct impl *impl = data;
+	struct node *node = &impl->node;
+
+	pw_log_debug("client-stream %p: async complete %d %d", &impl->this, seq, res);
+	node->callbacks->done(node->callbacks_data, seq, res);
+}
+
+static const struct pw_node_events client_node_events = {
+	PW_VERSION_NODE_EVENTS,
+	.free = client_node_free,
+	.initialized = client_node_initialized,
+	.async_complete = client_node_async_complete,
+};
+
+static void node_free(void *data)
+{
+	struct impl *impl = data;
+
+	pw_log_debug("client-stream %p: free", &impl->this);
+	spa_hook_remove(&impl->client_node_listener);
+
+	if (impl->client_node)
+		pw_client_node_destroy(impl->client_node);
+
+	free(impl);
+}
+
+static const struct pw_node_events node_events = {
+	PW_VERSION_NODE_EVENTS,
+	.free = node_free,
+};
+
+/** Create a new client stream
+ * \param client an owner \ref pw_client
+ * \param id an id
+ * \param name a name
+ * \param properties extra properties
+ * \return a newly allocated client stream
+ *
+ * Create a new \ref pw_stream.
+ *
+ * \memberof pw_client_stream
+ */
+struct pw_client_stream *pw_client_stream_new(struct pw_resource *resource,
+					  struct pw_properties *properties)
+{
+	struct impl *impl;
+	struct pw_client_stream *this;
+	struct pw_client *client = pw_resource_get_client(resource);
+	struct pw_core *core = pw_client_get_core(client);
+	const struct spa_support *support;
+	uint32_t n_support;
+	const char *name;
+
+	impl = calloc(1, sizeof(struct impl));
+	if (impl == NULL)
+		return NULL;
+
+	this = &impl->this;
+
+	impl->core = core;
+	impl->t = pw_core_get_type(core);
+
+	pw_log_debug("client-stream %p: new", impl);
+
+	impl->client_node = pw_client_node_new(resource, properties, false);
+	if (impl->client_node == NULL)
+		goto error_no_node;
+
+	support = pw_core_get_support(impl->core, &n_support);
+
+	node_init(&impl->node, NULL, support, n_support);
+	impl->node.impl = impl;
+
+	if ((name = pw_properties_get(properties, "node.name")) == NULL)
+		name = "client-stream";
+
+	this->node = pw_spa_node_new(core,
+				     client,
+				     NULL,
+				     name,
+				     PW_SPA_NODE_FLAG_ASYNC,
+				     &impl->node.node,
+				     NULL,
+				     properties, 0);
+	if (this->node == NULL)
+		goto error_no_node;
+
+	this->node->remote = true;
+
+	pw_node_add_listener(impl->client_node->node, &impl->client_node_listener, &client_node_events, impl);
+	pw_node_add_listener(this->node, &impl->node_listener, &node_events, impl);
+
+	return this;
+
+      error_no_node:
+	pw_resource_destroy(resource);
+	free(impl);
+	return NULL;
+}
+
+/** Destroy a client stream
+ * \param stream the client stream to destroy
+ * \memberof pw_client_stream
+ */
+void pw_client_stream_destroy(struct pw_client_stream *stream)
+{
+	struct impl *impl = SPA_CONTAINER_OF(stream, struct impl, this);
+	pw_client_node_destroy(impl->client_node);
+}

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

@@ -0,0 +1,49 @@
+/* PipeWire
+ * Copyright (C) 2015 Wim Taymans <wim.taymans@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __PIPEWIRE_CLIENT_STREAM_H__
+#define __PIPEWIRE_CLIENT_STREAM_H__
+
+#include <pipewire/node.h>
+#include <extensions/client-stream.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \class pw_client_stream
+ *
+ * PipeWire client stream interface
+ */
+struct pw_client_stream {
+	struct pw_node *node;
+};
+
+struct pw_client_stream *
+pw_client_stream_new(struct pw_resource *resource,
+		   struct pw_properties *properties);
+
+void
+pw_client_stream_destroy(struct pw_client_stream *stream);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __PIPEWIRE_CLIENT_STREAM_H__ */

src/pipewire/stream.c

@@ -1110,6 +1110,7 @@ pw_stream_connect(struct pw_stream *stream,
 		pw_properties_set(stream->properties, PW_NODE_PROP_TARGET_NODE, port_path);
 	if (flags & PW_STREAM_FLAG_AUTOCONNECT)
 		pw_properties_set(stream->properties, PW_NODE_PROP_AUTOCONNECT, "1");
+	pw_properties_set(stream->properties, "node.stream", "1");
 
 	if (pw_remote_get_state(stream->remote, NULL) == PW_REMOTE_STATE_UNCONNECTED)
 		res = pw_remote_connect(stream->remote);