mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add example to play sine wave

Browse source 
Various build fixes and cleanups
Move port_add to private and make node ports based on implementation.
Improve pull based scheduling on remote nodes
This commit is contained in:
Wim Taymans 2017-09-07 10:22:32 +02:00
parent 36ac8a6545
commit 21cd5a2918
26 changed files with 640 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

1
man/meson.build
View file

@ -2,6 +2,7 @@ manpage_conf = configuration_data()
manpage_conf.set('PACKAGE_NAME', meson.project_name())
manpage_conf.set('PACKAGE_VERSION', meson.project_version())
manpage_conf.set('PACKAGE_URL', 'http://pipewire.org')
manpage_conf.set('PACKAGE_BUGREPORT', 'https://github.com/PipeWire/pipewire/issues')
manpage_conf.set('top_srcdir', meson.source_root())
manpage_conf.set('top_builddir', meson.build_root())

1
pkgconfig/meson.build
View file

@ -4,6 +4,7 @@ pkgconf.set('prefix', get_option('prefix'))
pkgconf.set('exec_prefix', '${prefix}')
pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
pkgconf.set('moduledir', '${prefix}/@0@'.format(modules_install_dir))
pkgconf.set('PIPEWIRE_API_VERSION', apiversion)
pkgconf.set('VERSION', pipewire_version)

10
spa/plugins/alsa/alsa-sink.c
View file

@ -32,7 +32,7 @@
#define CHECK_PORT(this,d,p) ((d) == SPA_DIRECTION_INPUT && (p) == 0)
static const char default_device[] = "hw:0";
static const uint32_t default_min_latency = 128;
static const uint32_t default_min_latency = 64;
static void reset_props(struct props *props)
{
@ -368,13 +368,13 @@ impl_node_port_enum_params(struct spa_node *node,
switch (index) {
case 0:
spa_pod_builder_object(&b, &f[0], 0, this->type.param_alloc_buffers.Buffers,
PROP(&f[1], this->type.param_alloc_buffers.size, SPA_POD_TYPE_INT,
this->props.min_latency * this->frame_size),
PROP_U_MM(&f[1], this->type.param_alloc_buffers.size, SPA_POD_TYPE_INT,
this->props.min_latency * this->frame_size,
this->props.min_latency * this->frame_size, INT32_MAX),
PROP(&f[1], this->type.param_alloc_buffers.stride, SPA_POD_TYPE_INT,
0),
PROP_MM(&f[1], this->type.param_alloc_buffers.buffers, SPA_POD_TYPE_INT,
32,
1, 32),
2, 2, 32),
PROP(&f[1], this->type.param_alloc_buffers.align, SPA_POD_TYPE_INT,
16));
break;

6
spa/plugins/audiotestsrc/audiotestsrc.c
View file

@ -265,7 +265,7 @@ static void read_timer(struct impl *this)
uint64_t expirations;
if ((this->callbacks && this->callbacks->have_output) || this->props.live) {
if (read(this->timer_source.fd, &expirations, sizeof(uint64_t)) < sizeof(uint64_t))
if (read(this->timer_source.fd, &expirations, sizeof(uint64_t)) != sizeof(uint64_t))
perror("read timerfd");
}
}
@ -754,7 +754,7 @@ impl_node_port_use_buffers(struct spa_node *node,
spa_log_error(this->log, NAME " %p: invalid memory on buffer %p", this,
buffers[i]);
}
spa_list_insert(this->empty.prev, &b->link);
spa_list_append(&this->empty, &b->link);
}
this->n_buffers = n_buffers;
@ -811,7 +811,7 @@ static inline void reuse_buffer(struct impl *this, uint32_t id)
spa_log_trace(this->log, NAME " %p: reuse buffer %d", this, id);
b->outstanding = false;
spa_list_insert(this->empty.prev, &b->link);
spa_list_append(&this->empty, &b->link);
if (!this->props.live)
set_timer(this, true);

2
spa/plugins/test/fakesink.c
View file

@ -206,7 +206,7 @@ static inline void read_timer(struct impl *this)
uint64_t expirations;
if ((this->callbacks && this->callbacks->need_input) || this->props.live) {
if (read(this->timer_source.fd, &expirations, sizeof(uint64_t)) < sizeof(uint64_t))
if (read(this->timer_source.fd, &expirations, sizeof(uint64_t)) != sizeof(uint64_t))
perror("read timerfd");
}
}

2
spa/plugins/test/fakesrc.c
View file

@ -222,7 +222,7 @@ static inline void read_timer(struct impl *this)
uint64_t expirations;
if ((this->callbacks && this->callbacks->have_output) || this->props.live) {
if (read(this->timer_source.fd, &expirations, sizeof(uint64_t)) < sizeof(uint64_t))
if (read(this->timer_source.fd, &expirations, sizeof(uint64_t)) != sizeof(uint64_t))
perror("read timerfd");
}
}

2
spa/plugins/v4l2/v4l2-utils.c
View file

@ -985,7 +985,7 @@ static int spa_v4l2_use_buffers(struct impl *this, struct spa_buffer **buffers,
return SPA_RESULT_ERROR;
}
spa_log_info(state->log, "v4l2: got %d buffers", reqbuf.count);
if (reqbuf.count < 2) {
if (reqbuf.count < n_buffers) {
spa_log_error(state->log, "v4l2: can't allocate enough buffers");
return SPA_RESULT_ERROR;
}

2
spa/plugins/videotestsrc/videotestsrc.c
View file

@ -247,7 +247,7 @@ static void read_timer(struct impl *this)
uint64_t expirations;
if ((this->callbacks && this->callbacks->have_output) || this->props.live) {
if (read(this->timer_source.fd, &expirations, sizeof(uint64_t)) < sizeof(uint64_t))
if (read(this->timer_source.fd, &expirations, sizeof(uint64_t)) != sizeof(uint64_t))
perror("read timerfd");
}
}

5
src/daemon/main.c
View file

@ -58,7 +58,10 @@ int main(int argc, char *argv[])
core = pw_core_new(pw_main_loop_get_loop(loop), props);
pw_daemon_config_run_commands(config, core);
if (!pw_daemon_config_run_commands(config, core)) {
pw_log_error("failed to run config commands");
return -1;
}
pw_log_info("start main loop");
pw_main_loop_run(loop);

48
src/examples/export-sink.c
View file

@ -69,8 +69,7 @@ struct data {
SDL_Window *window;
SDL_Texture *texture;
bool running;
struct pw_loop *loop;
struct pw_main_loop *loop;
struct pw_core *core;
struct pw_type *t;
@ -79,7 +78,6 @@ struct data {
struct spa_hook remote_listener;
struct pw_node *node;
struct pw_port *port;
struct spa_port_info port_info;
struct spa_node impl_node;
@ -105,7 +103,7 @@ static void handle_events(struct data *data)
while (SDL_PollEvent(&event)) {
switch (event.type) {
case SDL_QUIT:
exit(0);
pw_main_loop_quit(data->loop);
break;
}
}
@ -199,6 +197,28 @@ static int impl_set_callbacks(struct spa_node *node,
return SPA_RESULT_OK;
}
static int impl_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)
{
*n_input_ports = *max_input_ports = 1;
*n_output_ports = *max_output_ports = 0;
return SPA_RESULT_OK;
}
static int impl_get_port_ids(struct spa_node *node,
uint32_t n_input_ports,
uint32_t *input_ids,
uint32_t n_output_ports,
uint32_t *output_ids)
{
if (n_input_ports > 0)
input_ids[0] = 0;
return SPA_RESULT_OK;
}
static int impl_port_set_io(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
struct spa_port_io *io)
{
@ -433,6 +453,8 @@ static const struct spa_node impl_node = {
SPA_VERSION_NODE,
.set_callbacks = impl_set_callbacks,
.send_command = impl_send_command,
.get_n_ports = impl_get_n_ports,
.get_port_ids = impl_get_port_ids,
.port_set_io = impl_port_set_io,
.port_enum_formats = impl_port_enum_formats,
.port_set_format = impl_port_set_format,
@ -455,8 +477,6 @@ static void make_node(struct data *data)
data->impl_node = impl_node;
pw_node_set_implementation(data->node, &data->impl_node);
data->port = pw_port_new(PW_DIRECTION_INPUT, 0, NULL, 0);
pw_port_add(data->port, data->node);
pw_node_register(data->node);
pw_remote_export(data->remote, data->node);
@ -469,7 +489,7 @@ static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remo
switch (state) {
case PW_REMOTE_STATE_ERROR:
printf("remote error: %s\n", error);
data->running = false;
pw_main_loop_quit(data->loop);
break;
case PW_REMOTE_STATE_CONNECTED:
@ -493,9 +513,8 @@ int main(int argc, char *argv[])
pw_init(&argc, &argv);
data.loop = pw_loop_new(NULL);
data.running = true;
data.core = pw_core_new(data.loop, NULL);
data.loop = pw_main_loop_new(NULL);
data.core = pw_core_new(pw_main_loop_get_loop(data.loop), NULL);
data.t = pw_core_get_type(data.core);
data.remote = pw_remote_new(data.core, NULL);
data.path = argc > 1 ? argv[1] : NULL;
@ -521,13 +540,10 @@ int main(int argc, char *argv[])
pw_remote_connect(data.remote);
pw_loop_enter(data.loop);
while (data.running) {
pw_loop_iterate(data.loop, -1);
}
pw_loop_leave(data.loop);
pw_main_loop_run(data.loop);
pw_loop_destroy(data.loop);
pw_core_destroy(data.core);
pw_main_loop_destroy(data.loop);
return 0;
}

435
src/examples/export-source.c Normal file
View file

@ -0,0 +1,435 @@
/* PipeWire
* Copyright (C) 2017 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 <stdio.h>
#include <math.h>
#include <sys/mman.h>
#include <spa/type-map.h>
#include <spa/format-utils.h>
#include <spa/audio/format-utils.h>
#include <spa/format-builder.h>
#include <spa/props.h>
#include <spa/lib/debug.h>
#include <pipewire/pipewire.h>
#include <pipewire/module.h>
#include <pipewire/node-factory.h>
#define M_PI_M2 ( M_PI + M_PI )
struct type {
uint32_t format;
uint32_t props;
struct spa_type_meta meta;
struct spa_type_data data;
struct spa_type_media_type media_type;
struct spa_type_media_subtype media_subtype;
struct spa_type_format_audio format_audio;
struct spa_type_audio_format audio_format;
};
static inline void init_type(struct type *type, struct spa_type_map *map)
{
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
type->props = spa_type_map_get_id(map, SPA_TYPE__Props);
spa_type_meta_map(map, &type->meta);
spa_type_data_map(map, &type->data);
spa_type_media_type_map(map, &type->media_type);
spa_type_media_subtype_map(map, &type->media_subtype);
spa_type_format_audio_map(map, &type->format_audio);
spa_type_audio_format_map(map, &type->audio_format);
}
struct buffer {
struct spa_buffer *buffer;
struct spa_list link;
void *ptr;
size_t size;
bool mapped;
};
struct data {
struct type type;
const char *path;
struct pw_main_loop *loop;
struct pw_core *core;
struct pw_type *t;
struct pw_remote *remote;
struct spa_hook remote_listener;
struct pw_node *node;
struct spa_port_info port_info;
struct spa_node impl_node;
const struct spa_node_callbacks *callbacks;
void *callbacks_data;
struct spa_port_io *io;
uint8_t buffer[1024];
struct spa_audio_info_raw format;
uint8_t params_buffer[1024];
struct spa_param *params[2];
struct buffer buffers[32];
int n_buffers;
struct spa_list empty;
double accumulator;
};
#define PROP(f,key,type,...) \
SPA_POD_PROP (f,key,0,type,1,__VA_ARGS__)
#define PROP_U_MM(f,key,type,...) \
SPA_POD_PROP (f,key,SPA_POD_PROP_FLAG_UNSET | \
SPA_POD_PROP_RANGE_MIN_MAX,type,3,__VA_ARGS__)
static int impl_send_command(struct spa_node *node, const struct spa_command *command)
{
return SPA_RESULT_OK;
}
static int impl_set_callbacks(struct spa_node *node,
const struct spa_node_callbacks *callbacks, void *data)
{
struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node);
d->callbacks = callbacks;
d->callbacks_data = data;
return SPA_RESULT_OK;
}
static int impl_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)
{
*n_input_ports = *max_input_ports = 0;
*n_output_ports = *max_output_ports = 1;
return SPA_RESULT_OK;
}
static int impl_get_port_ids(struct spa_node *node,
uint32_t n_input_ports,
uint32_t *input_ids,
uint32_t n_output_ports,
uint32_t *output_ids)
{
if (n_output_ports > 0)
output_ids[0] = 0;
return SPA_RESULT_OK;
}
static int impl_port_set_io(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
struct spa_port_io *io)
{
struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node);
d->io = io;
return SPA_RESULT_OK;
}
static int impl_port_enum_formats(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
struct spa_format **format,
const struct spa_format *filter,
uint32_t index)
{
struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node);
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(d->buffer, sizeof(d->buffer));
struct spa_pod_frame f[2];
if (index != 0)
return SPA_RESULT_ENUM_END;
spa_pod_builder_push_format(&b, &f[0], d->type.format,
d->type.media_type.audio,
d->type.media_subtype.raw);
spa_pod_builder_add(&b,
PROP(&f[1], d->type.format_audio.format, SPA_POD_TYPE_ID, d->type.audio_format.S16),
PROP(&f[1], d->type.format_audio.channels, SPA_POD_TYPE_INT, 2),
PROP(&f[1], d->type.format_audio.rate, SPA_POD_TYPE_INT, 44100),
0);
spa_pod_builder_pop(&b, &f[0]);
*format = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_format);
spa_debug_format(*format);
return SPA_RESULT_OK;
}
static int impl_port_set_format(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
uint32_t flags, const struct spa_format *format)
{
struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node);
struct pw_type *t = d->t;
struct spa_pod_builder b = { NULL };
struct spa_pod_frame f[2];
if (format == NULL)
return SPA_RESULT_OK;
spa_debug_format(format);
spa_format_audio_raw_parse(format, &d->format, &d->type.format_audio);
if (d->format.format != d->type.audio_format.S16)
return SPA_RESULT_ERROR;
spa_pod_builder_init(&b, d->params_buffer, sizeof(d->params_buffer));
spa_pod_builder_object(&b, &f[0], 0, t->param_alloc_buffers.Buffers,
PROP_U_MM(&f[1], t->param_alloc_buffers.size, SPA_POD_TYPE_INT, 1024, 32, 4096),
PROP (&f[1], t->param_alloc_buffers.stride, SPA_POD_TYPE_INT, 0),
PROP_U_MM(&f[1], t->param_alloc_buffers.buffers, SPA_POD_TYPE_INT, 2, 2, 32),
PROP (&f[1], t->param_alloc_buffers.align, SPA_POD_TYPE_INT, 16));
d->params[0] = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_param);
spa_pod_builder_object(&b, &f[0], 0, t->param_alloc_meta_enable.MetaEnable,
PROP(&f[1], t->param_alloc_meta_enable.type, SPA_POD_TYPE_ID, t->meta.Header),
PROP(&f[1], t->param_alloc_meta_enable.size, SPA_POD_TYPE_INT,
sizeof(struct spa_meta_header)));
d->params[1] = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_param);
return SPA_RESULT_OK;
}
static int impl_port_get_format(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
const struct spa_format **format)
{
struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node);
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(d->buffer, sizeof(d->buffer));
struct spa_pod_frame f[2];
spa_pod_builder_push_format(&b, &f[0], d->type.format,
d->type.media_type.audio,
d->type.media_subtype.raw);
spa_pod_builder_add(&b,
PROP(&f[1], d->type.format_audio.format, SPA_POD_TYPE_ID, d->format.format),
PROP(&f[1], d->type.format_audio.channels, SPA_POD_TYPE_INT, d->format.channels),
PROP(&f[1], d->type.format_audio.rate, SPA_POD_TYPE_INT, d->format.rate),
0);
spa_pod_builder_pop(&b, &f[0]);
*format = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_format);
return SPA_RESULT_OK;
}
static int impl_port_get_info(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
const struct spa_port_info **info)
{
struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node);
d->port_info.flags = SPA_PORT_INFO_FLAG_CAN_USE_BUFFERS;
d->port_info.rate = 0;
d->port_info.props = NULL;
*info = &d->port_info;
return SPA_RESULT_OK;
}
static int impl_port_enum_params(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
uint32_t index, struct spa_param **param)
{
struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node);
if (index >= 2)
return SPA_RESULT_ENUM_END;
*param = d->params[index];
return SPA_RESULT_OK;
}
static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
struct spa_buffer **buffers, uint32_t n_buffers)
{
struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node);
int i;
for (i = 0; i < n_buffers; i++) {
struct buffer *b = &d->buffers[i];
struct spa_data *datas = buffers[i]->datas;
if (datas[0].data != NULL) {
b->ptr = datas[0].data;
b->mapped = false;
}
else if (datas[0].type == d->type.data.MemFd ||
datas[0].type == d->type.data.DmaBuf) {
b->ptr = mmap(NULL, datas[0].maxsize + datas[0].mapoffset, PROT_WRITE,
MAP_SHARED, datas[0].fd, 0);
if (b->ptr == MAP_FAILED) {
pw_log_error("failed to buffer mem");
return SPA_RESULT_ERROR;
}
b->ptr = SPA_MEMBER(b->ptr, datas[0].mapoffset, void);
b->mapped = true;
}
else {
pw_log_error("invalid buffer mem");
return SPA_RESULT_ERROR;
}
b->size = datas[0].maxsize;
b->buffer = buffers[i];
pw_log_info("got buffer %d size %zd", i, b->size);
spa_list_append(&d->empty, &b->link);
}
d->n_buffers = n_buffers;
return SPA_RESULT_OK;
}
static inline void reuse_buffer(struct data *d, uint32_t id)
{
spa_list_append(&d->empty, &d->buffers[id].link);
}
static int impl_node_process_output(struct spa_node *node)
{
struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node);
struct buffer *b;
int i, c, n_samples;
int16_t *dst;
struct spa_port_io *io = d->io;
if (io->status == SPA_RESULT_HAVE_BUFFER)
return SPA_RESULT_HAVE_BUFFER;
if (io->buffer_id < d->n_buffers) {
reuse_buffer(d, io->buffer_id);
io->buffer_id = SPA_ID_INVALID;
}
if (spa_list_is_empty(&d->empty)) {
pw_log_error("sine-source %p: out of buffers", d);
return SPA_RESULT_OUT_OF_BUFFERS;
}
b = spa_list_first(&d->empty, struct buffer, link);
spa_list_remove(&b->link);
dst = b->ptr;
n_samples = b->size / (sizeof(int16_t) * d->format.channels);
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;
val = (int16_t) (sin(d->accumulator) * 32767.0);
for (c = 0; c < d->format.channels; c++)
*dst++ = val;
}
io->buffer_id = b->buffer->id;
io->status = SPA_RESULT_HAVE_BUFFER;
return SPA_RESULT_HAVE_BUFFER;
}
static const struct spa_node impl_node = {
SPA_VERSION_NODE,
.send_command = impl_send_command,
.set_callbacks = impl_set_callbacks,
.get_n_ports = impl_get_n_ports,
.get_port_ids = impl_get_port_ids,
.port_set_io = impl_port_set_io,
.port_enum_formats = impl_port_enum_formats,
.port_set_format = impl_port_set_format,
.port_get_format = impl_port_get_format,
.port_get_info = impl_port_get_info,
.port_enum_params = impl_port_enum_params,
.port_use_buffers = impl_port_use_buffers,
.process_output = impl_node_process_output,
};
static void make_node(struct data *data)
{
struct pw_properties *props;
props = pw_properties_new("pipewire.autoconnect", "1", NULL);
if (data->path)
pw_properties_set(props, "pipewire.target.node", data->path);
data->node = pw_node_new(data->core, NULL, NULL, "sine-source", props, 0);
data->impl_node = impl_node;
pw_node_set_implementation(data->node, &data->impl_node);
pw_node_register(data->node);
pw_remote_export(data->remote, data->node);
}
static void on_state_changed(void *_data, enum pw_remote_state old,
enum pw_remote_state state, const char *error)
{
struct data *data = _data;
switch (state) {
case PW_REMOTE_STATE_ERROR:
printf("remote error: %s\n", error);
pw_main_loop_quit(data->loop);
break;
case PW_REMOTE_STATE_CONNECTED:
make_node(data);
break;
default:
printf("remote state: \"%s\"\n", pw_remote_state_as_string(state));
break;
}
}
static const struct pw_remote_events remote_events = {
PW_VERSION_REMOTE_EVENTS,
.state_changed = on_state_changed,
};
int main(int argc, char *argv[])
{
struct data data = { 0, };
pw_init(&argc, &argv);
data.loop = pw_main_loop_new(NULL);
data.core = pw_core_new(pw_main_loop_get_loop(data.loop), NULL);
data.t = pw_core_get_type(data.core);
data.remote = pw_remote_new(data.core, NULL);
data.path = argc > 1 ? argv[1] : NULL;
spa_list_init(&data.empty);
init_type(&data.type, data.t->map);
spa_debug_set_type_map(data.t->map);
pw_remote_add_listener(data.remote, &data.remote_listener, &remote_events, &data);
pw_remote_connect(data.remote);
pw_main_loop_run(data.loop);
pw_core_destroy(data.core);
pw_main_loop_destroy(data.loop);
return 0;
}

54
src/examples/export-v4l2.c
View file

@ -32,34 +32,8 @@
#include <pipewire/module.h>
#include <pipewire/node-factory.h>
struct type {
uint32_t format;
uint32_t props;
struct spa_type_meta meta;
struct spa_type_data data;
struct spa_type_media_type media_type;
struct spa_type_media_subtype media_subtype;
struct spa_type_format_video format_video;
struct spa_type_video_format video_format;
};
static inline void init_type(struct type *type, struct spa_type_map *map)
{
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
type->props = spa_type_map_get_id(map, SPA_TYPE__Props);
spa_type_meta_map(map, &type->meta);
spa_type_data_map(map, &type->data);
spa_type_media_type_map(map, &type->media_type);
spa_type_media_subtype_map(map, &type->media_subtype);
spa_type_format_video_map(map, &type->format_video);
spa_type_video_format_map(map, &type->video_format);
}
struct data {
struct type type;
bool running;
struct pw_loop *loop;
struct pw_main_loop *loop;
struct pw_core *core;
struct pw_type *t;
@ -90,7 +64,7 @@ static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remo
switch (state) {
case PW_REMOTE_STATE_ERROR:
printf("remote error: %s\n", error);
data->running = false;
pw_main_loop_quit(data->loop);
break;
case PW_REMOTE_STATE_CONNECTED:
@ -112,45 +86,39 @@ static const struct pw_remote_events remote_events = {
static void do_quit(void *data, int signal_number)
{
struct data *d = data;
d->running = false;
pw_main_loop_quit(d->loop);
}
int main(int argc, char *argv[])
{
struct data data = { 0, };
struct pw_loop *l;
pw_init(&argc, &argv);
data.loop = pw_loop_new(NULL);
pw_loop_add_signal(data.loop, SIGINT, do_quit, &data);
pw_loop_add_signal(data.loop, SIGTERM, do_quit, &data);
data.running = true;
data.core = pw_core_new(data.loop, NULL);
data.loop = pw_main_loop_new(NULL);
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.core = pw_core_new(l, NULL);
data.t = pw_core_get_type(data.core);
data.remote = pw_remote_new(data.core, NULL);
pw_module_load(data.core, "libpipewire-module-spa-node-factory", NULL);
init_type(&data.type, data.t->map);
spa_debug_set_type_map(data.t->map);
pw_remote_add_listener(data.remote, &data.remote_listener, &remote_events, &data);
pw_remote_connect(data.remote);
pw_loop_enter(data.loop);
while (data.running) {
pw_loop_iterate(data.loop, 100);
}
pw_loop_leave(data.loop);
pw_main_loop_run(data.loop);
pw_remote_destroy(data.remote);
if (data.node)
pw_node_destroy(data.node);
pw_core_destroy(data.core);
pw_loop_destroy(data.loop);
pw_main_loop_destroy(data.loop);
return 0;
}

47
src/examples/local-v4l2.c
View file

@ -67,14 +67,12 @@ struct data {
SDL_Window *window;
SDL_Texture *texture;
bool running;
struct pw_loop *loop;
struct pw_main_loop *loop;
struct spa_source *timer;
struct pw_core *core;
struct pw_type *t;
struct pw_node *node;
struct pw_port *port;
struct spa_port_info port_info;
struct pw_node *v4l2;
@ -105,7 +103,7 @@ static void handle_events(struct data *data)
while (SDL_PollEvent(&event)) {
switch (event.type) {
case SDL_QUIT:
data->running = false;
pw_main_loop_quit(data->loop);
break;
}
}
@ -199,6 +197,28 @@ static int impl_set_callbacks(struct spa_node *node,
return SPA_RESULT_OK;
}
static int impl_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)
{
*n_input_ports = *max_input_ports = 1;
*n_output_ports = *max_output_ports = 0;
return SPA_RESULT_OK;
}
static int impl_get_port_ids(struct spa_node *node,
uint32_t n_input_ports,
uint32_t *input_ids,
uint32_t n_output_ports,
uint32_t *output_ids)
{
if (n_input_ports > 0)
input_ids[0] = 0;
return SPA_RESULT_OK;
}
static int impl_port_set_io(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
struct spa_port_io *io)
{
@ -414,6 +434,8 @@ static const struct spa_node impl_node = {
NULL,
.send_command = impl_send_command,
.set_callbacks = impl_set_callbacks,
.get_n_ports = impl_get_n_ports,
.get_port_ids = impl_get_port_ids,
.port_set_io = impl_port_set_io,
.port_enum_formats = impl_port_enum_formats,
.port_set_format = impl_port_set_format,
@ -432,8 +454,6 @@ static void make_nodes(struct data *data)
data->impl_node = impl_node;
pw_node_set_implementation(data->node, &data->impl_node);
data->port = pw_port_new(PW_DIRECTION_INPUT, 0, NULL, 0);
pw_port_add(data->port, data->node);
pw_node_register(data->node);
factory = pw_core_find_node_factory(data->core, "spa-node-factory");
@ -444,7 +464,7 @@ static void make_nodes(struct data *data)
data->link = pw_link_new(data->core,
NULL,
pw_node_get_free_port(data->v4l2, PW_DIRECTION_OUTPUT),
data->port,
pw_node_find_port(data->node, PW_DIRECTION_INPUT, 0),
NULL,
NULL,
NULL,
@ -458,9 +478,8 @@ int main(int argc, char *argv[])
pw_init(&argc, &argv);
data.loop = pw_loop_new(NULL);
data.running = true;
data.core = pw_core_new(data.loop, NULL);
data.loop = pw_main_loop_new(NULL);
data.core = pw_core_new(pw_main_loop_get_loop(data.loop), NULL);
data.t = pw_core_get_type(data.core);
pw_module_load(data.core, "libpipewire-module-spa-node-factory", NULL);
@ -482,16 +501,12 @@ int main(int argc, char *argv[])
make_nodes(&data);
pw_loop_enter(data.loop);
while (data.running) {
pw_loop_iterate(data.loop, 100);
}
pw_loop_leave(data.loop);
pw_main_loop_run(data.loop);
pw_link_destroy(data.link);
pw_node_destroy(data.node);
pw_core_destroy(data.core);
pw_loop_destroy(data.loop);
pw_main_loop_destroy(data.loop);
return 0;
}

5
src/examples/meson.build
View file

@ -8,6 +8,11 @@ executable('export-v4l2',
install: false,
dependencies : [pipewire_dep],
)
executable('export-source',
'export-source.c',
install: false,
dependencies : [pipewire_dep, libm],
)
if sdl_dep.found()
executable('video-play',

9
src/modules/module-client-node/client-node.c
View file

@ -783,8 +783,6 @@ static int spa_proxy_node_process_output(struct spa_node *node)
this = SPA_CONTAINER_OF(node, struct proxy, node);
impl = this->impl;
pw_log_trace("process output");
for (i = 0; i < MAX_OUTPUTS; i++) {
struct spa_port_io *io = this->out_ports[i].io, tmp;
@ -792,11 +790,14 @@ static int spa_proxy_node_process_output(struct spa_node *node)
continue;
tmp = impl->transport->outputs[i];
io->status = SPA_RESULT_NEED_BUFFER;
impl->transport->outputs[i] = *io;
if (tmp.status == SPA_RESULT_HAVE_BUFFER)
res = SPA_RESULT_HAVE_BUFFER;
*io = tmp;
pw_log_trace("%d %d %d", io->status, io->buffer_id, io->status);
pw_log_trace("%d %d -> %d %d", io->status, io->buffer_id,
impl->transport->outputs[i].status,
impl->transport->outputs[i].buffer_id);
}
pw_client_node_transport_add_message(impl->transport,
&PW_CLIENT_NODE_MESSAGE_INIT(PW_CLIENT_NODE_MESSAGE_PROCESS_OUTPUT));
@ -929,7 +930,7 @@ static void proxy_on_data_fd_events(struct spa_source *source)
struct pw_client_node_message message;
uint64_t cmd;
if (read(this->data_source.fd, &cmd, 8) != 8)
if (read(this->data_source.fd, &cmd, sizeof(uint64_t)) != sizeof(uint64_t))
spa_log_warn(this->log, "proxy %p: error reading message: %s",
this, strerror(errno));

7
src/modules/module-protocol-native.c
View file

@ -693,6 +693,8 @@ impl_add_server(struct pw_protocol *protocol,
spa_list_init(&this->client_list);
this->destroy = destroy_server;
spa_list_append(&protocol->server_list, &this->link);
name = get_name(pw_core_get_properties(core));
if (!init_socket_name(s, name))
@ -704,8 +706,6 @@ impl_add_server(struct pw_protocol *protocol,
if (!add_socket(protocol, s))
goto error;
spa_list_append(&protocol->server_list, &this->link);
pw_loop_add_hook(pw_core_get_main_loop(core), &s->hook, &impl_hooks, s);
pw_log_info("protocol-native %p: Added server %p", protocol, this);
@ -831,7 +831,8 @@ static bool module_init(struct pw_module *module, struct pw_properties *properti
if ((val = pw_properties_get(pw_core_get_properties(core), "pipewire.daemon"))) {
if (atoi(val) == 1)
impl_add_server(this, core, properties);
if (impl_add_server(this, core, properties) == NULL)
return false;
}
pw_module_add_listener(module, &d->module_listener, &module_events, d);

50
src/modules/spa/spa-node.c
View file

@ -48,53 +48,6 @@ struct impl {
struct spa_hook node_listener;
};
static struct pw_port *
make_port(struct impl *impl, enum pw_direction direction, uint32_t port_id)
{
struct pw_node *node = impl->this;
struct pw_port *port;
port = pw_port_new(direction, port_id, NULL, 0);
if (port == NULL)
return NULL;
pw_port_add(port, node);
return port;
}
static void update_port_ids(struct impl *impl)
{
struct pw_node *this = impl->this;
uint32_t *input_port_ids, *output_port_ids;
uint32_t n_input_ports, n_output_ports, max_input_ports, max_output_ports;
uint32_t i;
spa_node_get_n_ports(impl->node,
&n_input_ports, &max_input_ports, &n_output_ports, &max_output_ports);
pw_node_set_max_ports(this, max_input_ports, max_output_ports);
input_port_ids = alloca(sizeof(uint32_t) * n_input_ports);
output_port_ids = alloca(sizeof(uint32_t) * n_output_ports);
spa_node_get_port_ids(impl->node,
max_input_ports, input_port_ids, max_output_ports, output_port_ids);
pw_log_debug("node %p: update_port ids %u/%u, %u/%u", this,
n_input_ports, max_input_ports, n_output_ports, max_output_ports);
for (i = 0; i < n_input_ports; i++) {
pw_log_debug("node %p: input port added %d", this, input_port_ids[i]);
make_port(impl, PW_DIRECTION_INPUT, input_port_ids[i]);
}
for (i = 0; i < n_output_ports; i++) {
pw_log_debug("node %p: output port added %d", this, output_port_ids[i]);
make_port(impl, PW_DIRECTION_OUTPUT, output_port_ids[i]);
}
}
static void pw_spa_node_destroy(void *data)
{
struct impl *impl = data;
@ -115,7 +68,6 @@ static void pw_spa_node_destroy(void *data)
static void complete_init(struct impl *impl)
{
struct pw_node *this = impl->this;
update_port_ids(impl);
pw_node_register(this);
}
@ -177,7 +129,7 @@ pw_spa_node_new(struct pw_core *core,
impl->async_init = async;
pw_node_add_listener(this, &impl->node_listener, &node_events, impl);
pw_node_set_implementation(this, node);
pw_node_set_implementation(this, impl->node);
if (!async)
complete_init(impl);

15
src/pipewire/link.c
View file

@ -396,9 +396,6 @@ param_filter(struct pw_link *this,
iidx, &iparam) < 0)
break;
if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG))
spa_debug_param(iparam);
for (oidx = 0;; oidx++) {
struct spa_pod_frame f;
uint32_t offset;
@ -407,7 +404,7 @@ param_filter(struct pw_link *this,
out_port->port_id, oidx, &oparam) < 0)
break;
if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG))
if (iidx == 0 && pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG))
spa_debug_param(oparam);
if (iparam->object.body.type != oparam->object.body.type)
@ -427,6 +424,9 @@ param_filter(struct pw_link *this,
spa_pod_builder_pop(result, &f);
num++;
}
if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG))
spa_debug_param(iparam);
}
return num;
}
@ -522,6 +522,7 @@ static int do_allocation(struct pw_link *this, uint32_t in_state, uint32_t out_s
for (i = 0, offset = 0; i < n_params; i++) {
params[i] = SPA_MEMBER(buffer, offset, struct spa_param);
spa_param_fixate(params[i]);
pw_log_debug("fixated param %d:", i);
if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG))
spa_debug_param(params[i]);
offset += SPA_ROUND_UP_N(SPA_POD_SIZE(params[i]), 8);
@ -563,8 +564,12 @@ static int do_allocation(struct pw_link *this, uint32_t in_state, uint32_t out_s
max_buffers);
minsize = SPA_MAX(minsize, qminsize);
stride = SPA_MAX(stride, qstride);
pw_log_debug("%d %d %d -> %zd %zd %d", qminsize, qstride, qmax_buffers,
minsize, stride, max_buffers);
} else {
minsize = 4096;
pw_log_warn("no buffers param");
minsize = 1024;
}
}

12
src/pipewire/main-loop.c
View file

@ -21,6 +21,12 @@
#include "pipewire/main-loop.h"
#include "pipewire/private.h"
static void do_stop(void *data, uint64_t count)
{
struct pw_main_loop *this = data;
this->running = false;
}
/** Create a new new main loop
* \return a newly allocated \ref pw_main_loop
*
@ -42,6 +48,8 @@ struct pw_main_loop *pw_main_loop_new(struct pw_properties *properties)
spa_hook_list_init(&this->listener_list);
this->event = pw_loop_add_event(this->loop, do_stop, this);
return this;
no_loop:
@ -87,7 +95,9 @@ struct pw_loop * pw_main_loop_get_loop(struct pw_main_loop *loop)
void pw_main_loop_quit(struct pw_main_loop *loop)
{
pw_log_debug("main-loop %p: quit", loop);
loop->running = false;
if (loop->running) {
pw_loop_signal_event(loop->loop, loop->event);
}
}
/** Start a main loop

68
src/pipewire/node.c
View file

@ -138,6 +138,58 @@ static void node_unbind_func(void *data)
spa_list_remove(&resource->link);
}
static int update_port_ids(struct pw_node *node)
{
uint32_t *input_port_ids, *output_port_ids;
uint32_t n_input_ports, n_output_ports, max_input_ports, max_output_ports;
struct pw_port *port;
uint32_t i;
int res;
res = spa_node_get_n_ports(node->node,
&n_input_ports,
&max_input_ports,
&n_output_ports,
&max_output_ports);
if (res < 0)
return res;
if (node->info.max_input_ports != max_input_ports) {
node->info.max_input_ports = max_input_ports;
node->info.change_mask |= PW_NODE_CHANGE_MASK_INPUT_PORTS;
}
if (node->info.max_output_ports != max_output_ports) {
node->info.max_output_ports = max_output_ports;
node->info.change_mask |= PW_NODE_CHANGE_MASK_OUTPUT_PORTS;
}
input_port_ids = alloca(sizeof(uint32_t) * n_input_ports);
output_port_ids = alloca(sizeof(uint32_t) * n_output_ports);
res = spa_node_get_port_ids(node->node,
max_input_ports,
input_port_ids,
max_output_ports,
output_port_ids);
if (res < 0)
return res;
pw_log_debug("node %p: update_port ids %u/%u, %u/%u", node,
n_input_ports, max_input_ports, n_output_ports, max_output_ports);
for (i = 0; i < n_input_ports; i++) {
pw_log_debug("node %p: input port added %d", node, input_port_ids[i]);
if ((port = pw_port_new(PW_DIRECTION_INPUT, input_port_ids[i], NULL, 0)))
pw_port_add(port, node);
}
for (i = 0; i < n_output_ports; i++) {
pw_log_debug("node %p: output port added %d", node, output_port_ids[i]);
if ((port = pw_port_new(PW_DIRECTION_OUTPUT, output_port_ids[i], NULL, 0)))
pw_port_add(port, node);
}
return SPA_RESULT_OK;
}
static void
update_info(struct pw_node *this)
{
@ -257,6 +309,7 @@ void pw_node_register(struct pw_node *this)
pw_log_debug("node %p: register", this);
update_port_ids(this);
update_info(this);
pw_loop_invoke(this->data_loop, do_node_add, 1, 0, NULL, false, this);
@ -440,6 +493,7 @@ static const struct spa_node_callbacks node_callbacks = {
.reuse_buffer = node_reuse_buffer,
};
void pw_node_set_implementation(struct pw_node *node,
struct spa_node *spa_node)
{
@ -529,20 +583,6 @@ void pw_node_destroy(struct pw_node *node)
free(impl);
}
void pw_node_set_max_ports(struct pw_node *node,
uint32_t max_input_ports,
uint32_t max_output_ports)
{
if (node->info.max_input_ports != max_input_ports) {
node->info.max_input_ports = max_input_ports;
node->info.change_mask |= PW_NODE_CHANGE_MASK_INPUT_PORTS;
}
if (node->info.max_output_ports != max_output_ports) {
node->info.max_output_ports = max_output_ports;
node->info.change_mask |= PW_NODE_CHANGE_MASK_OUTPUT_PORTS;
}
}
bool pw_node_for_each_port(struct pw_node *node,
enum pw_direction direction,
bool (*callback) (void *data, struct pw_port *port),

5
src/pipewire/node.h
View file

@ -101,11 +101,6 @@ void pw_node_register(struct pw_node *node);
/** Destroy a node */
void pw_node_destroy(struct pw_node *node);
/** Configure the maximum input and output ports */
void pw_node_set_max_ports(struct pw_node *node,
uint32_t max_input_ports,
uint32_t max_output_ports);
/** Get the node info */
const struct pw_node_info *pw_node_get_info(struct pw_node *node);

2
src/pipewire/port.c
View file

@ -166,7 +166,7 @@ struct pw_port *pw_port_new(enum pw_direction direction,
this->port_id = port_id;
this->properties = properties;
this->state = PW_PORT_STATE_INIT;
this->io.status = SPA_RESULT_OK;
this->io.status = SPA_RESULT_NEED_BUFFER;
this->io.buffer_id = SPA_ID_INVALID;
if (user_data_size > 0)

6
src/pipewire/port.h
View file

@ -104,18 +104,12 @@ uint32_t pw_port_get_id(struct pw_port *port);
/** Get the port parent node or NULL when not yet set */
struct pw_node *pw_port_get_node(struct pw_port *port);
/** Add a port to a node \memberof pw_port */
bool pw_port_add(struct pw_port *port, struct pw_node *node);
/** Add an event listener on the port */
void pw_port_add_listener(struct pw_port *port,
struct spa_hook *listener,
const struct pw_port_events *events,
void *data);
/** Destroy a port \memberof pw_port */
void pw_port_destroy(struct pw_port *port);
/** Get the user data of a port, the size of the memory was given \ref in pw_port_new */
void * pw_port_get_user_data(struct pw_port *port);

7
src/pipewire/private.h
View file

@ -155,6 +155,7 @@ struct pw_main_loop {
struct pw_loop *loop;
struct spa_hook_list listener_list;
struct spa_source *event;
bool running;
};
@ -371,6 +372,12 @@ struct pw_node_factory {
void *user_data;
};
/** Add a port to a node \memberof pw_port */
bool pw_port_add(struct pw_port *port, struct pw_node *node);
/** Destroy a port \memberof pw_port */
void pw_port_destroy(struct pw_port *port);
/** Set a format on a port \memberof pw_port */
int pw_port_set_format(struct pw_port *port, uint32_t flags, const struct spa_format *format);

21
src/pipewire/remote.c
View file

@ -422,11 +422,10 @@ static void handle_rtnode_message(struct pw_proxy *proxy, struct pw_client_node_
{
struct node_data *data = proxy->user_data;
struct spa_graph_node *n = &data->node->rt.node;
struct spa_graph_port *port, *pp;
struct spa_graph_node *pn;
if (PW_CLIENT_NODE_MESSAGE_TYPE(message) == PW_CLIENT_NODE_MESSAGE_PROCESS_INPUT) {
struct spa_graph_port *port, *pp;
struct spa_graph_node *pn;
/* process all input in the mixers */
spa_list_for_each(port, &n->ports[SPA_DIRECTION_INPUT], link) {
pn = port->peer->node;
@ -436,15 +435,20 @@ static void handle_rtnode_message(struct pw_proxy *proxy, struct pw_client_node_
else {
pn->ready_in = 0;
spa_list_for_each(pp, &pn->ports[SPA_DIRECTION_INPUT], link) {
if (pp->io->status == SPA_RESULT_OK &&
!(pn->flags & SPA_GRAPH_NODE_FLAG_ASYNC))
pn->ready_in++;
if (pp->io->status == SPA_RESULT_OK &&
!(pn->flags & SPA_GRAPH_NODE_FLAG_ASYNC))
pn->ready_in++;
}
}
}
}
else if (PW_CLIENT_NODE_MESSAGE_TYPE(message) == PW_CLIENT_NODE_MESSAGE_PROCESS_OUTPUT) {
spa_node_process_output(n->implementation);
spa_list_for_each(port, &n->ports[SPA_DIRECTION_OUTPUT], link) {
pn = port->peer->node;
pn->state = spa_node_process_output(pn->implementation);
if (pn->state == SPA_RESULT_NEED_BUFFER)
spa_graph_need_input(data->node->rt.graph, pn);
}
}
else if (PW_CLIENT_NODE_MESSAGE_TYPE(message) == PW_CLIENT_NODE_MESSAGE_REUSE_BUFFER) {
}
@ -469,7 +473,8 @@ on_rtsocket_condition(void *user_data, int fd, enum spa_io mask)
struct pw_client_node_message message;
uint64_t cmd;
read(fd, &cmd, 8);
if (read(fd, &cmd, sizeof(uint64_t)) != sizeof(uint64_t))
pw_log_warn("proxy %p: read failed %m", proxy);
while (pw_client_node_transport_next_message(data->trans, &message) == SPA_RESULT_OK) {
struct pw_client_node_message *msg = alloca(SPA_POD_SIZE(&message));

3
src/pipewire/stream.c
View file

@ -576,7 +576,8 @@ on_rtsocket_condition(void *data, int fd, enum spa_io mask)
struct pw_client_node_message message;
uint64_t cmd;
read(fd, &cmd, 8);
if (read(fd, &cmd, sizeof(uint64_t)) != sizeof(uint64_t))
pw_log_warn("stream %p: read failed %m", impl);
while (pw_client_node_transport_next_message(impl->trans, &message) == SPA_RESULT_OK) {
struct pw_client_node_message *msg = alloca(SPA_POD_SIZE(&message));