mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-14 06:59:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove dynamic types

Browse source 
Do not use dynamic types anymore. The reason is that it's difficult:

- to maintain a shared type database over a network.
- the extra overhead when translating between processes and for
  maintaining the translation tables.
- race conditions in translating in RT-threads, this is a problem
  because we want to make event streams.

We now have simple enums with types and extension points for all
types. This is also nicer to use in general.
We don't need the mapper anymore or pass strings around as types.
There is a parallel type info system to get more info about ids and
enums and their hierarchy. It can also be used for debugging.
This commit is contained in:
Wim Taymans 2018-08-23 17:47:57 +02:00
parent e6977fa178
commit fca3e1d85d
162 changed files with 5200 additions and 7461 deletions
Download patch file Download diff file Expand all files Collapse all files

106
spa/tests/test-bluez5.c
View file

@ -30,7 +30,6 @@
#include <spa/support/loop.h>
#include <spa/support/log.h>
#include <spa/support/type-map.h>
#include <spa/support/dbus.h>
#include <spa/monitor/monitor.h>
#include <spa/node/node.h>
@ -38,7 +37,6 @@
#include <spa/param/param.h>
#include <spa/param/props.h>
#include <spa/param/audio/format-utils.h>
#include <spa/param/format-utils.h>
#include <spa/param/io.h>
#define M_PI_M2 ( M_PI + M_PI )
@ -51,45 +49,7 @@ static struct spa_log *logger;
#include <spa/graph/graph-scheduler2.h>
#include <spa/debug/pod.h>
struct type {
uint32_t log;
uint32_t node;
uint32_t props;
uint32_t format;
struct spa_type_monitor monitor;
struct spa_type_io io;
struct spa_type_param param;
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;
struct spa_type_event_node event_node;
struct spa_type_command_node command_node;
struct spa_type_param_io param_io;
};
static inline void init_type(struct type *type, struct spa_type_map *map)
{
type->log = spa_type_map_get_id(map, SPA_TYPE__Log);
type->node = spa_type_map_get_id(map, SPA_TYPE__Node);
type->props = spa_type_map_get_id(map, SPA_TYPE__Props);
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
spa_type_monitor_map(map, &type->monitor);
spa_type_io_map(map, &type->io);
spa_type_param_map(map, &type->param);
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);
spa_type_event_node_map(map, &type->event_node);
spa_type_command_node_map(map, &type->command_node);
spa_type_param_io_map(map, &type->param_io);
}
#include <spa/debug/types.h>
struct buffer {
struct spa_buffer buffer;
@ -100,8 +60,6 @@ struct buffer {
};
struct data {
struct type type;
struct spa_type_map *map;
struct spa_log *log;
struct spa_loop *loop;
@ -134,22 +92,26 @@ struct data {
static void inspect_item(struct data *data, struct spa_pod *item)
{
spa_debug_pod(0, data->map, item);
spa_debug_pod(0, spa_debug_types, item);
}
static void monitor_event(void *_data, struct spa_event *event)
{
struct data *data = _data;
if (SPA_EVENT_TYPE(event) == data->type.monitor.Added) {
switch (SPA_EVENT_TYPE(event)) {
case SPA_ID_EVENT_MONITOR_Added:
fprintf(stderr, "added:\n");
inspect_item(data, SPA_POD_CONTENTS(struct spa_event, event));
} else if (SPA_EVENT_TYPE(event) == data->type.monitor.Removed) {
break;
case SPA_ID_EVENT_MONITOR_Removed:
fprintf(stderr, "removed:\n");
inspect_item(data, SPA_POD_CONTENTS(struct spa_event, event));
} else if (SPA_EVENT_TYPE(event) == data->type.monitor.Changed) {
break;
case SPA_ID_EVENT_MONITOR_Changed:
fprintf(stderr, "changed:\n");
inspect_item(data, SPA_POD_CONTENTS(struct spa_event, event));
break;
}
}
@ -210,20 +172,6 @@ int main(int argc, char *argv[])
void *iface;
spa_zero(data);
if ((res = get_handle(&data, &handle,
"build/spa/plugins/support/libspa-support.so",
"mapper")) < 0) {
error(-1, res, "can't create mapper");
}
if ((res = spa_handle_get_interface(handle, 0, &iface)) < 0)
error(-1, res, "can't get mapper interface");
data.map = iface;
data.support[0].type = SPA_TYPE__TypeMap;
data.support[0].data = data.map;
data.n_support = 1;
init_type(&data.type, data.map);
if ((res = get_handle(&data, &handle,
"build/spa/plugins/support/libspa-support.so",
"logger")) < 0) {
@ -231,14 +179,13 @@ int main(int argc, char *argv[])
}
if ((res = spa_handle_get_interface(handle,
spa_type_map_get_id(data.map, SPA_TYPE__Log),
SPA_ID_INTERFACE_Log,
&iface)) < 0)
error(-1, res, "can't get log interface");
data.log = iface;
data.support[1].type = SPA_TYPE__Log;
data.support[1].data = data.log;
data.n_support = 2;
data.support[0] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_Log, data.log);
data.n_support = 1;
if ((str = getenv("SPA_DEBUG")))
data.log->level = atoi(str);
@ -249,32 +196,28 @@ int main(int argc, char *argv[])
error(-1, res, "can't create loop");
}
if ((res = spa_handle_get_interface(handle,
spa_type_map_get_id(data.map, SPA_TYPE__Loop),
SPA_ID_INTERFACE_Loop,
&iface)) < 0)
error(-1, res, "can't get loop interface");
data.loop = iface;
if ((res = spa_handle_get_interface(handle,
spa_type_map_get_id(data.map, SPA_TYPE__LoopControl),
SPA_ID_INTERFACE_LoopControl,
&iface)) < 0)
error(-1, res, "can't get loopcontrol interface");
data.loop_control = iface;
if ((res = spa_handle_get_interface(handle,
spa_type_map_get_id(data.map, SPA_TYPE__LoopUtils),
SPA_ID_INTERFACE_LoopUtils,
&iface)) < 0)
error(-1, res, "can't get looputils interface");
data.loop_utils = iface;
data.support[2].type = SPA_TYPE_LOOP__DataLoop;
data.support[2].data = data.loop;
data.support[3].type = SPA_TYPE_LOOP__MainLoop;
data.support[3].data = data.loop;
data.support[4].type = SPA_TYPE__LoopControl;
data.support[4].data = data.loop_control;
data.support[5].type = SPA_TYPE__LoopUtils;
data.support[5].data = data.loop_utils;
data.n_support = 6;
data.support[1] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_DataLoop, data.loop);
data.support[2] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_MainLoop, data.loop);
data.support[3] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_LoopControl, data.loop_control);
data.support[4] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_LoopUtils, data.loop_utils);
data.n_support = 5;
if ((res = get_handle(&data, &handle,
"build/spa/plugins/support/libspa-dbus.so",
@ -283,14 +226,13 @@ int main(int argc, char *argv[])
}
if ((res = spa_handle_get_interface(handle,
spa_type_map_get_id(data.map, SPA_TYPE__DBus),
SPA_ID_INTERFACE_DBus,
&iface)) < 0)
error(-1, res, "can't get dbus interface");
data.dbus = iface;
data.support[6].type = SPA_TYPE__DBus;
data.support[6].data = data.dbus;
data.n_support = 7;
data.support[5] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_DBus, data.dbus);
data.n_support = 6;
if ((res = get_handle(&data, &handle,
"build/spa/plugins/bluez5/libspa-bluez5.so",
@ -299,7 +241,7 @@ int main(int argc, char *argv[])
}
if ((res = spa_handle_get_interface(handle,
spa_type_map_get_id(data.map, SPA_TYPE__Monitor),
SPA_ID_INTERFACE_Monitor,
&iface)) < 0)
error(-1, res, "can't get monitor interface");

128
spa/tests/test-control.c
View file

@ -30,18 +30,15 @@
#include <spa/support/log-impl.h>
#include <spa/support/loop.h>
#include <spa/support/type-map-impl.h>
#include <spa/node/node.h>
#include <spa/node/io.h>
#include <spa/param/param.h>
#include <spa/param/props.h>
#include <spa/param/audio/format-utils.h>
#include <spa/param/format-utils.h>
#include <spa/param/io.h>
#define M_PI_M2 ( M_PI + M_PI )
static SPA_TYPE_MAP_IMPL(default_map, 4096);
static SPA_LOG_IMPL(default_log);
#define spa_debug(f,...) spa_log_trace(&default_log.log, f, __VA_ARGS__)
@ -51,51 +48,6 @@ static SPA_LOG_IMPL(default_log);
#include <spa/debug/pod.h>
struct type {
uint32_t node;
uint32_t props;
uint32_t format;
uint32_t props_device;
uint32_t props_freq;
uint32_t props_volume;
uint32_t props_min_latency;
uint32_t props_live;
struct spa_type_io io;
struct spa_type_param param;
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;
struct spa_type_event_node event_node;
struct spa_type_command_node command_node;
struct spa_type_param_io param_io;
};
static inline void init_type(struct type *type, struct spa_type_map *map)
{
type->node = spa_type_map_get_id(map, SPA_TYPE__Node);
type->props = spa_type_map_get_id(map, SPA_TYPE__Props);
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
type->props_device = spa_type_map_get_id(map, SPA_TYPE_PROPS__device);
type->props_freq = spa_type_map_get_id(map, SPA_TYPE_PROPS__frequency);
type->props_volume = spa_type_map_get_id(map, SPA_TYPE_PROPS__volume);
type->props_min_latency = spa_type_map_get_id(map, SPA_TYPE_PROPS__minLatency);
type->props_live = spa_type_map_get_id(map, SPA_TYPE_PROPS__live);
spa_type_io_map(map, &type->io);
spa_type_param_map(map, &type->param);
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);
spa_type_event_node_map(map, &type->event_node);
spa_type_command_node_map(map, &type->command_node);
spa_type_param_io_map(map, &type->param_io);
}
struct buffer {
struct spa_buffer buffer;
struct spa_meta metas[1];
@ -105,10 +57,8 @@ struct buffer {
};
struct data {
struct spa_type_map *map;
struct spa_log *log;
struct spa_loop data_loop;
struct type type;
struct spa_support support[4];
uint32_t n_support;
@ -170,11 +120,11 @@ init_buffer(struct data *data, struct spa_buffer **bufs, struct buffer *ba, int
b->header.seq = 0;
b->header.pts = 0;
b->header.dts_offset = 0;
b->metas[0].type = data->type.meta.Header;
b->metas[0].type = SPA_META_Header;
b->metas[0].data = &b->header;
b->metas[0].size = sizeof(b->header);
b->datas[0].type = data->type.data.MemPtr;
b->datas[0].type = SPA_DATA_MemPtr;
b->datas[0].flags = 0;
b->datas[0].fd = -1;
b->datas[0].mapoffset = 0;
@ -223,7 +173,7 @@ static int make_node(struct data *data, struct spa_node **node, const char *lib,
printf("can't make factory instance: %d\n", res);
return res;
}
if ((res = spa_handle_get_interface(handle, data->type.node, &iface)) < 0) {
if ((res = spa_handle_get_interface(handle, SPA_ID_INTERFACE_Node, &iface)) < 0) {
printf("can't get interface %d\n", res);
return res;
}
@ -314,7 +264,7 @@ static int make_nodes(struct data *data, const char *device)
struct spa_pod *props;
struct spa_pod_builder b = { 0 };
uint8_t buffer[512];
uint32_t idx;
//uint32_t idx;
if ((res = make_node(data, &data->sink,
"build/spa/plugins/alsa/libspa-alsa.so", "alsa-sink")) < 0) {
@ -325,13 +275,13 @@ static int make_nodes(struct data *data, const char *device)
spa_pod_builder_init(&b, buffer, sizeof(buffer));
props = spa_pod_builder_object(&b,
0, data->type.props,
":", data->type.props_device, "s", device ? device : "hw:0",
":", data->type.props_min_latency, "i", MIN_LATENCY);
0, SPA_ID_OBJECT_Props,
":", SPA_PROP_device, "s", device ? device : "hw:0",
":", SPA_PROP_minLatency, "i", MIN_LATENCY);
spa_debug_pod(0, data->map, props);
spa_debug_pod(0, spa_debug_types, props);
if ((res = spa_node_set_param(data->sink, data->type.param.idProps, 0, props)) < 0)
if ((res = spa_node_set_param(data->sink, SPA_ID_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
if ((res = make_node(data, &data->source,
@ -343,17 +293,18 @@ static int make_nodes(struct data *data, const char *device)
spa_pod_builder_init(&b, buffer, sizeof(buffer));
props = spa_pod_builder_object(&b,
0, data->type.props,
":", data->type.props_freq, "d", 600.0,
":", data->type.props_volume, "d", 0.5,
":", data->type.props_live, "b", false);
0, SPA_ID_OBJECT_Props,
":", SPA_PROP_frequency, "d", 600.0,
":", SPA_PROP_volume, "d", 0.5,
":", SPA_PROP_live, "b", false);
data->ctrl_source_freq = SPA_POD_DOUBLE_INIT(600.0);
data->ctrl_source_volume = SPA_POD_DOUBLE_INIT(0.5);
if ((res = spa_node_set_param(data->source, data->type.param.idProps, 0, props)) < 0)
if ((res = spa_node_set_param(data->source, SPA_ID_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
#if 0
for (idx = 0;;) {
struct spa_pod *param;
uint32_t id = 0, propId = 0;
@ -387,16 +338,17 @@ static int make_nodes(struct data *data, const char *device)
error(0, -res, "set_io volume");
}
}
#endif
data->source_sink_io[0] = SPA_IO_BUFFERS_INIT;
spa_node_port_set_io(data->source,
SPA_DIRECTION_OUTPUT, 0,
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->source_sink_io[0], sizeof(data->source_sink_io[0]));
spa_node_port_set_io(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->source_sink_io[0], sizeof(data->source_sink_io[0]));
spa_graph_node_init(&data->source_node, &data->source_state);
@ -426,34 +378,34 @@ static int negotiate_formats(struct data *data)
spa_pod_builder_init(&b, buffer, sizeof(buffer));
filter = spa_pod_builder_object(&b,
0, data->type.format,
"I", data->type.media_type.audio,
"I", data->type.media_subtype.raw,
":", data->type.format_audio.format, "I", data->type.audio_format.S16,
":", data->type.format_audio.layout, "i", SPA_AUDIO_LAYOUT_INTERLEAVED,
":", data->type.format_audio.rate, "i", 44100,
":", data->type.format_audio.channels, "i", 2);
0, SPA_ID_OBJECT_Format,
"I", SPA_MEDIA_TYPE_audio,
"I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_AUDIO_format, "I", SPA_AUDIO_FORMAT_S16,
":", SPA_FORMAT_AUDIO_layout, "i", SPA_AUDIO_LAYOUT_INTERLEAVED,
":", SPA_FORMAT_AUDIO_rate, "i", 44100,
":", SPA_FORMAT_AUDIO_channels, "i", 2);
spa_debug_pod(0, data->map, filter);
spa_debug_pod(0, spa_debug_types, filter);
spa_log_debug(&default_log.log, "enum_params");
if ((res = spa_node_port_enum_params(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.param.idEnumFormat, &state,
SPA_ID_PARAM_EnumFormat, &state,
filter, &format, &b)) <= 0)
return -EBADF;
spa_debug_pod(0, data->map, format);
spa_debug_pod(0, spa_debug_types, format);
spa_log_debug(&default_log.log, "sink set_param");
if ((res = spa_node_port_set_param(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.param.idFormat, 0, format)) < 0)
SPA_ID_PARAM_Format, 0, format)) < 0)
return res;
if ((res = spa_node_port_set_param(data->source,
SPA_DIRECTION_OUTPUT, 0,
data->type.param.idFormat, 0, format)) < 0)
SPA_ID_PARAM_Format, 0, format)) < 0)
return res;
init_buffer(data, data->source_buffers, data->source_buffer, 1, BUFFER_SIZE);
@ -529,7 +481,7 @@ static void run_async_sink(struct data *data)
int err;
{
struct spa_command cmd = SPA_COMMAND_INIT(data->type.command_node.Start);
struct spa_command cmd = SPA_COMMAND_INIT(SPA_ID_COMMAND_NODE_Start);
if ((res = spa_node_send_command(data->source, &cmd)) < 0)
printf("got source error %d\n", res);
if ((res = spa_node_send_command(data->sink, &cmd)) < 0)
@ -551,7 +503,7 @@ static void run_async_sink(struct data *data)
}
{
struct spa_command cmd = SPA_COMMAND_INIT(data->type.command_node.Pause);
struct spa_command cmd = SPA_COMMAND_INIT(SPA_ID_COMMAND_NODE_Pause);
if ((res = spa_node_send_command(data->sink, &cmd)) < 0)
printf("got error %d\n", res);
if ((res = spa_node_send_command(data->source, &cmd)) < 0)
@ -569,7 +521,6 @@ int main(int argc, char *argv[])
spa_graph_data_init(&data.graph_data, &data.graph);
spa_graph_set_callbacks(&data.graph, &spa_graph_impl_default, &data.graph_data);
data.map = &default_map.map;
data.log = &default_log.log;
data.data_loop.version = SPA_VERSION_LOOP;
data.data_loop.add_source = do_add_source;
@ -580,17 +531,10 @@ int main(int argc, char *argv[])
if ((str = getenv("SPA_DEBUG")))
data.log->level = atoi(str);
data.support[0].type = SPA_TYPE__TypeMap;
data.support[0].data = data.map;
data.support[1].type = SPA_TYPE__Log;
data.support[1].data = data.log;
data.support[2].type = SPA_TYPE_LOOP__DataLoop;
data.support[2].data = &data.data_loop;
data.support[3].type = SPA_TYPE_LOOP__MainLoop;
data.support[3].data = &data.data_loop;
data.n_support = 4;
init_type(&data.type, data.map);
data.support[0] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_Log, data.log);
data.support[1] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_MainLoop, &data.data_loop);
data.support[2] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_DataLoop, &data.data_loop);
data.n_support = 3;
if ((res = make_nodes(&data, argc > 1 ? argv[1] : NULL)) < 0) {
printf("can't make nodes: %d\n", res);

113
spa/tests/test-convert.c
View file

@ -28,62 +28,17 @@
#include <spa/support/log-impl.h>
#include <spa/support/loop.h>
#include <spa/support/type-map-impl.h>
#include <spa/node/node.h>
#include <spa/node/io.h>
#include <spa/param/param.h>
#include <spa/param/props.h>
#include <spa/param/audio/format-utils.h>
#include <spa/param/format-utils.h>
#include <spa/debug/pod.h>
#include <spa/debug/mem.h>
#include <spa/debug/types.h>
static SPA_TYPE_MAP_IMPL(default_map, 4096);
static SPA_LOG_IMPL(default_log);
struct type {
uint32_t node;
uint32_t props;
uint32_t format;
uint32_t props_device;
uint32_t props_freq;
uint32_t props_volume;
uint32_t props_min_latency;
uint32_t props_live;
struct spa_type_io io;
struct spa_type_param param;
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;
struct spa_type_event_node event_node;
struct spa_type_command_node command_node;
};
static inline void init_type(struct type *type, struct spa_type_map *map)
{
type->node = spa_type_map_get_id(map, SPA_TYPE__Node);
type->props = spa_type_map_get_id(map, SPA_TYPE__Props);
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
type->props_device = spa_type_map_get_id(map, SPA_TYPE_PROPS__device);
type->props_freq = spa_type_map_get_id(map, SPA_TYPE_PROPS__frequency);
type->props_volume = spa_type_map_get_id(map, SPA_TYPE_PROPS__volume);
type->props_min_latency = spa_type_map_get_id(map, SPA_TYPE_PROPS__minLatency);
type->props_live = spa_type_map_get_id(map, SPA_TYPE_PROPS__live);
spa_type_io_map(map, &type->io);
spa_type_param_map(map, &type->param);
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);
spa_type_event_node_map(map, &type->event_node);
spa_type_command_node_map(map, &type->command_node);
}
struct buffer {
struct spa_buffer buffer;
struct spa_meta metas[1];
@ -93,9 +48,7 @@ struct buffer {
};
struct data {
struct spa_type_map *map;
struct spa_log *log;
struct type type;
struct spa_support support[4];
uint32_t n_support;
@ -133,14 +86,14 @@ init_buffer(struct data *data, struct spa_buffer **bufs, struct buffer *ba, int
b->header.seq = 0;
b->header.pts = 0;
b->header.dts_offset = 0;
b->metas[0].type = data->type.meta.Header;
b->metas[0].type = SPA_META_Header;
b->metas[0].data = &b->header;
b->metas[0].size = sizeof(b->header);
d = malloc(size * n_datas);
for (j = 0; j < n_datas; j++) {
b->datas[j].type = data->type.data.MemPtr;
b->datas[j].type = SPA_DATA_MemPtr;
b->datas[j].flags = 0;
b->datas[j].fd = -1;
b->datas[j].mapoffset = 0;
@ -190,7 +143,7 @@ static int make_node(struct data *data, struct spa_node **node, const char *lib,
printf("can't make factory instance: %d\n", res);
return res;
}
if ((res = spa_handle_get_interface(handle, data->type.node, &iface)) < 0) {
if ((res = spa_handle_get_interface(handle, SPA_ID_INTERFACE_Node, &iface)) < 0) {
printf("can't get interface %d\n", res);
return res;
}
@ -254,17 +207,17 @@ static int negotiate_formats(struct data *data)
spa_pod_builder_init(&b, buffer, sizeof(buffer));
format = spa_pod_builder_object(&b,
0, data->type.format,
"I", data->type.media_type.audio,
"I", data->type.media_subtype.raw,
":", data->type.format_audio.format, "I", data->type.audio_format.S16,
":", data->type.format_audio.layout, "i", SPA_AUDIO_LAYOUT_INTERLEAVED,
":", data->type.format_audio.rate, "i", 44100,
":", data->type.format_audio.channels, "i", 2);
0, SPA_ID_OBJECT_Format,
"I", SPA_MEDIA_TYPE_audio,
"I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_AUDIO_format, "I", SPA_AUDIO_FORMAT_S16,
":", SPA_FORMAT_AUDIO_layout, "i", SPA_AUDIO_LAYOUT_INTERLEAVED,
":", SPA_FORMAT_AUDIO_rate, "i", 44100,
":", SPA_FORMAT_AUDIO_channels, "i", 2);
if ((res = spa_node_port_set_param(data->conv,
SPA_DIRECTION_INPUT, 0,
data->type.param.idFormat, 0,
SPA_ID_PARAM_Format, 0,
format)) < 0)
return res;
@ -273,28 +226,28 @@ static int negotiate_formats(struct data *data)
spa_node_port_set_io(data->conv,
SPA_DIRECTION_INPUT, 0,
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->io_in[0], sizeof(data->io_in[0]));
spa_node_port_set_io(data->conv,
SPA_DIRECTION_OUTPUT, 0,
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->io_out[0], sizeof(data->io_out[0]));
spa_pod_builder_init(&b, buffer, sizeof(buffer));
format = spa_pod_builder_object(&b,
0, data->type.format,
"I", data->type.media_type.audio,
"I", data->type.media_subtype.raw,
":", data->type.format_audio.format, "I", data->type.audio_format.F32,
":", data->type.format_audio.layout, "i", SPA_AUDIO_LAYOUT_NON_INTERLEAVED,
":", data->type.format_audio.rate, "i", 44100,
":", data->type.format_audio.channels, "i", 2);
0, SPA_ID_OBJECT_Format,
"I", SPA_MEDIA_TYPE_audio,
"I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_AUDIO_format, "I", SPA_AUDIO_FORMAT_F32,
":", SPA_FORMAT_AUDIO_layout, "i", SPA_AUDIO_LAYOUT_NON_INTERLEAVED,
":", SPA_FORMAT_AUDIO_rate, "i", 44100,
":", SPA_FORMAT_AUDIO_channels, "i", 2);
if ((res = spa_node_port_set_param(data->conv,
SPA_DIRECTION_OUTPUT, 0,
data->type.param.idFormat, 0,
SPA_ID_PARAM_Format, 0,
format)) < 0)
return res;
@ -314,11 +267,11 @@ static int negotiate_buffers(struct data *data)
state = 0;
if ((res = spa_node_port_enum_params(data->conv,
SPA_DIRECTION_INPUT, 0,
data->type.param.idBuffers, &state,
SPA_ID_PARAM_Buffers, &state,
NULL, &param, &b)) <= 0)
return -EBADF;
spa_debug_pod(0, data->map, param);
spa_debug_pod(0, spa_debug_types, param);
init_buffer(data, data->in_buffers, data->in_buffer, 1, BUFFER_SIZE, 1);
if ((res =
@ -331,11 +284,11 @@ static int negotiate_buffers(struct data *data)
state = 0;
if ((res = spa_node_port_enum_params(data->conv,
SPA_DIRECTION_OUTPUT, 0,
data->type.param.idBuffers, &state,
SPA_ID_PARAM_Buffers, &state,
NULL, &param, &b)) <= 0)
return -EBADF;
spa_debug_pod(0, data->map, param);
spa_debug_pod(0, spa_debug_types, param);
init_buffer(data, data->out_buffers, data->out_buffer, 1, BUFFER_SIZE, 2);
if ((res =
@ -361,7 +314,7 @@ static void run_convert(struct data *data)
int res;
{
struct spa_command cmd = SPA_COMMAND_INIT(data->type.command_node.Start);
struct spa_command cmd = SPA_COMMAND_INIT(SPA_ID_COMMAND_NODE_Start);
if ((res = spa_node_send_command(data->conv, &cmd)) < 0)
printf("got convert error %d\n", res);
}
@ -383,7 +336,7 @@ static void run_convert(struct data *data)
spa_debug_mem(0, data->out_buffers[0]->datas[1].data, BUFFER_SIZE);
{
struct spa_command cmd = SPA_COMMAND_INIT(data->type.command_node.Pause);
struct spa_command cmd = SPA_COMMAND_INIT(SPA_ID_COMMAND_NODE_Pause);
if ((res = spa_node_send_command(data->conv, &cmd)) < 0)
printf("got convert error %d\n", res);
}
@ -395,19 +348,13 @@ int main(int argc, char *argv[])
int res;
const char *str;
data.map = &default_map.map;
data.log = &default_log.log;
if ((str = getenv("SPA_DEBUG")))
data.log->level = atoi(str);
data.support[0].type = SPA_TYPE__TypeMap;
data.support[0].data = data.map;
data.support[1].type = SPA_TYPE__Log;
data.support[1].data = data.log;
data.n_support = 2;
init_type(&data.type, data.map);
data.support[0] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_Log, data.log);
data.n_support = 1;
if ((res = make_nodes(&data, argc > 1 ? argv[1] : NULL)) < 0) {
printf("can't make nodes: %d\n", res);

122
spa/tests/test-convert2.c
View file

@ -28,7 +28,6 @@
#include <spa/support/log-impl.h>
#include <spa/support/loop.h>
#include <spa/support/type-map-impl.h>
#include <spa/node/node.h>
#include <spa/node/io.h>
#include <spa/buffer/alloc.h>
@ -36,49 +35,13 @@
#include <spa/param/buffers.h>
#include <spa/param/props.h>
#include <spa/param/audio/format-utils.h>
#include <spa/param/format-utils.h>
#include <spa/debug/pod.h>
#include <spa/debug/format.h>
#include <spa/debug/mem.h>
#include <spa/debug/types.h>
static SPA_TYPE_MAP_IMPL(default_map, 4096);
static SPA_LOG_IMPL(default_log);
struct type {
uint32_t node;
uint32_t props;
uint32_t format;
struct spa_type_io io;
struct spa_type_param param;
struct spa_type_param_buffers param_buffers;
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;
struct spa_type_event_node event_node;
struct spa_type_command_node command_node;
};
static inline void init_type(struct type *type, struct spa_type_map *map)
{
type->node = spa_type_map_get_id(map, SPA_TYPE__Node);
type->props = spa_type_map_get_id(map, SPA_TYPE__Props);
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
spa_type_io_map(map, &type->io);
spa_type_param_map(map, &type->param);
spa_type_param_buffers_map(map, &type->param_buffers);
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);
spa_type_event_node_map(map, &type->event_node);
spa_type_command_node_map(map, &type->command_node);
}
struct buffer {
struct spa_buffer buffer;
struct spa_meta metas[1];
@ -104,9 +67,7 @@ struct link {
};
struct data {
struct spa_type_map *map;
struct spa_log *log;
struct type type;
struct spa_support support[4];
uint32_t n_support;
@ -117,7 +78,6 @@ struct data {
static int make_node(struct data *data, struct spa_node **node, const char *lib, const char *name)
{
struct type *t = &data->type;
struct spa_handle *handle;
int res;
void *hnd;
@ -152,7 +112,7 @@ static int make_node(struct data *data, struct spa_node **node, const char *lib,
printf("can't make factory instance: %d\n", res);
return res;
}
if ((res = spa_handle_get_interface(handle, t->node, &iface)) < 0) {
if ((res = spa_handle_get_interface(handle, SPA_ID_INTERFACE_Node, &iface)) < 0) {
printf("can't get interface %d\n", res);
return res;
}
@ -198,8 +158,6 @@ static int make_link(struct data *data, struct link *link,
struct node *out_node, uint32_t out_port,
struct node *in_node, uint32_t in_port)
{
struct type *t = &data->type;
link->out_node = out_node;
link->out_port = out_port;
link->in_node = in_node;
@ -216,7 +174,7 @@ static int make_link(struct data *data, struct link *link,
&link->out_info);
spa_node_port_set_io(out_node->node,
SPA_DIRECTION_OUTPUT, out_port,
t->io.Buffers,
SPA_ID_IO_Buffers,
&link->io, sizeof(link->io));
}
if (in_node != NULL) {
@ -225,7 +183,7 @@ static int make_link(struct data *data, struct link *link,
&link->in_info);
spa_node_port_set_io(in_node->node,
SPA_DIRECTION_INPUT, in_port,
t->io.Buffers,
SPA_ID_IO_Buffers,
&link->io, sizeof(link->io));
}
return 0;
@ -243,7 +201,6 @@ static int link_nodes(struct data *data)
static int negotiate_link_format(struct data *data, struct link *link, struct spa_pod *filter)
{
struct type *t = &data->type;
struct spa_pod_builder b = { 0 };
uint8_t buffer[4096];
uint32_t state;
@ -256,7 +213,7 @@ static int negotiate_link_format(struct data *data, struct link *link, struct sp
state = 0;
if ((res = spa_node_port_enum_params(link->out_node->node,
SPA_DIRECTION_OUTPUT, link->out_port,
t->param.idEnumFormat, &state,
SPA_ID_PARAM_EnumFormat, &state,
filter, &format, &b)) <= 0)
return -ENOTSUP;
@ -266,7 +223,7 @@ static int negotiate_link_format(struct data *data, struct link *link, struct sp
state = 0;
if ((res = spa_node_port_enum_params(link->in_node->node,
SPA_DIRECTION_INPUT, link->in_port,
t->param.idEnumFormat, &state,
SPA_ID_PARAM_EnumFormat, &state,
filter, &format, &b)) <= 0)
return -ENOTSUP;
@ -274,19 +231,19 @@ static int negotiate_link_format(struct data *data, struct link *link, struct sp
}
spa_pod_fixate(filter);
spa_debug_format(0, data->map, filter);
spa_debug_format(0, NULL, filter);
if (link->out_node != NULL) {
if ((res = spa_node_port_set_param(link->out_node->node,
SPA_DIRECTION_OUTPUT, link->out_port,
t->param.idFormat, 0,
SPA_ID_PARAM_Format, 0,
filter)) < 0)
return res;
}
if (link->in_node != NULL) {
if ((res = spa_node_port_set_param(link->in_node->node,
SPA_DIRECTION_INPUT, link->in_port,
t->param.idFormat, 0,
SPA_ID_PARAM_Format, 0,
filter)) < 0)
return res;
}
@ -298,31 +255,30 @@ static int negotiate_formats(struct data *data)
int res;
struct spa_pod *format;
struct spa_pod_builder b = { 0 };
struct type *t = &data->type;
uint8_t buffer[4096];
spa_pod_builder_init(&b, buffer, sizeof(buffer));
format = spa_pod_builder_object(&b,
0, t->format,
"I", t->media_type.audio,
"I", t->media_subtype.raw,
":", t->format_audio.format, "I", t->audio_format.S16,
":", t->format_audio.layout, "i", SPA_AUDIO_LAYOUT_INTERLEAVED,
":", t->format_audio.rate, "i", 44100,
":", t->format_audio.channels, "i", 2);
0, SPA_ID_OBJECT_Format,
"I", SPA_MEDIA_TYPE_audio,
"I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_AUDIO_format, "I", SPA_AUDIO_FORMAT_S16,
":", SPA_FORMAT_AUDIO_layout, "i", SPA_AUDIO_LAYOUT_INTERLEAVED,
":", SPA_FORMAT_AUDIO_rate, "i", 44100,
":", SPA_FORMAT_AUDIO_channels, "i", 2);
if ((res = negotiate_link_format(data, &data->links[0], format)) < 0)
return res;
spa_pod_builder_init(&b, buffer, sizeof(buffer));
format = spa_pod_builder_object(&b,
0, t->format,
"I", t->media_type.audio,
"I", t->media_subtype.raw,
":", t->format_audio.format, "I", t->audio_format.F32,
":", t->format_audio.layout, "i", SPA_AUDIO_LAYOUT_NON_INTERLEAVED,
":", t->format_audio.rate, "i", 48000,
":", t->format_audio.channels, "i", 1);
0, SPA_ID_OBJECT_Format,
"I", SPA_MEDIA_TYPE_audio,
"I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_AUDIO_format, "I", SPA_AUDIO_FORMAT_F32,
":", SPA_FORMAT_AUDIO_layout, "i", SPA_AUDIO_LAYOUT_NON_INTERLEAVED,
":", SPA_FORMAT_AUDIO_rate, "i", 48000,
":", SPA_FORMAT_AUDIO_channels, "i", 1);
if ((res = negotiate_link_format(data, &data->links[4], format)) < 0)
return res;
@ -341,7 +297,6 @@ static int negotiate_formats(struct data *data)
static int negotiate_link_buffers(struct data *data, struct link *link)
{
struct type *t = &data->type;
uint8_t buffer[4096];
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
uint32_t state;
@ -356,7 +311,7 @@ static int negotiate_link_buffers(struct data *data, struct link *link)
state = 0;
if ((res = spa_node_port_enum_params(link->out_node->node,
SPA_DIRECTION_OUTPUT, link->out_port,
t->param.idBuffers, &state,
SPA_ID_PARAM_Buffers, &state,
param, &param, &b)) <= 0)
return -ENOTSUP;
}
@ -364,13 +319,13 @@ static int negotiate_link_buffers(struct data *data, struct link *link)
state = 0;
if ((res = spa_node_port_enum_params(link->in_node->node,
SPA_DIRECTION_INPUT, link->in_port,
t->param.idBuffers, &state,
SPA_ID_PARAM_Buffers, &state,
param, &param, &b)) <= 0)
return -ENOTSUP;
}
spa_pod_fixate(param);
spa_debug_pod(0, data->map, param);
spa_debug_pod(0, spa_debug_types, param);
if (link->in_info)
in_alloc = SPA_FLAG_CHECK(link->in_info->flags, SPA_PORT_INFO_FLAG_CAN_ALLOC_BUFFERS);
@ -390,17 +345,17 @@ static int negotiate_link_buffers(struct data *data, struct link *link)
}
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,
":", SPA_PARAM_BUFFERS_buffers, "i", &buffers,
":", SPA_PARAM_BUFFERS_blocks, "i", &blocks,
":", SPA_PARAM_BUFFERS_size, "i", &size,
":", SPA_PARAM_BUFFERS_align, "i", &align,
NULL) < 0)
return -EINVAL;
datas = alloca(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].type = SPA_DATA_MemPtr;
datas[i].maxsize = size;
aligns[i] = align;
}
@ -476,12 +431,11 @@ static void fill_buffer(struct data *data, struct spa_buffer *buffers[], int id)
static void run_convert(struct data *data)
{
struct type *t = &data->type;
struct spa_buffer *b;
int res, i, j;
{
struct spa_command cmd = SPA_COMMAND_INIT(t->command_node.Start);
struct spa_command cmd = SPA_COMMAND_INIT(SPA_ID_COMMAND_NODE_Start);
for (i = 0; i < 4; i++) {
if ((res = spa_node_send_command(data->nodes[i].node, &cmd)) < 0)
printf("got command error %d\n", res);
@ -514,7 +468,7 @@ static void run_convert(struct data *data)
spa_debug_mem(0, b->datas[i].data, b->datas[i].maxsize);
{
struct spa_command cmd = SPA_COMMAND_INIT(t->command_node.Pause);
struct spa_command cmd = SPA_COMMAND_INIT(SPA_ID_COMMAND_NODE_Pause);
for (i = 0; i < 4; i++) {
if ((res = spa_node_send_command(data->nodes[i].node, &cmd)) < 0)
printf("got command error %d\n", res);
@ -528,19 +482,13 @@ int main(int argc, char *argv[])
int res;
const char *str;
data.map = &default_map.map;
data.log = &default_log.log;
if ((str = getenv("SPA_DEBUG")))
data.log->level = atoi(str);
data.support[0].type = SPA_TYPE__TypeMap;
data.support[0].data = data.map;
data.support[1].type = SPA_TYPE__Log;
data.support[1].data = data.log;
data.n_support = 2;
init_type(&data.type, data.map);
data.support[0] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_Log, data.log);
data.n_support = 1;
if ((res = make_nodes(&data, argc > 1 ? argv[1] : NULL)) < 0) {
printf("can't make nodes: %d\n", res);

131
spa/tests/test-graph.c
View file

@ -28,15 +28,12 @@
#include <spa/support/log-impl.h>
#include <spa/support/loop.h>
#include <spa/support/type-map-impl.h>
#include <spa/node/node.h>
#include <spa/node/io.h>
#include <spa/param/param.h>
#include <spa/param/props.h>
#include <spa/param/audio/format-utils.h>
#include <spa/param/format-utils.h>
static SPA_TYPE_MAP_IMPL(default_map, 4096);
static SPA_LOG_IMPL(default_log);
#define spa_debug(f,...) spa_log_trace(&default_log.log, f, __VA_ARGS__)
@ -45,49 +42,7 @@ static SPA_LOG_IMPL(default_log);
#include <spa/graph/graph-scheduler2.h>
#include <spa/debug/pod.h>
struct type {
uint32_t node;
uint32_t props;
uint32_t format;
uint32_t props_device;
uint32_t props_freq;
uint32_t props_volume;
uint32_t props_min_latency;
uint32_t props_live;
struct spa_type_io io;
struct spa_type_param param;
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;
struct spa_type_event_node event_node;
struct spa_type_command_node command_node;
};
static inline void init_type(struct type *type, struct spa_type_map *map)
{
type->node = spa_type_map_get_id(map, SPA_TYPE__Node);
type->props = spa_type_map_get_id(map, SPA_TYPE__Props);
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
type->props_device = spa_type_map_get_id(map, SPA_TYPE_PROPS__device);
type->props_freq = spa_type_map_get_id(map, SPA_TYPE_PROPS__frequency);
type->props_volume = spa_type_map_get_id(map, SPA_TYPE_PROPS__volume);
type->props_min_latency = spa_type_map_get_id(map, SPA_TYPE_PROPS__minLatency);
type->props_live = spa_type_map_get_id(map, SPA_TYPE_PROPS__live);
spa_type_io_map(map, &type->io);
spa_type_param_map(map, &type->param);
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);
spa_type_event_node_map(map, &type->event_node);
spa_type_command_node_map(map, &type->command_node);
}
#include <spa/debug/types.h>
struct buffer {
struct spa_buffer buffer;
@ -98,10 +53,8 @@ struct buffer {
};
struct data {
struct spa_type_map *map;
struct spa_log *log;
struct spa_loop data_loop;
struct type type;
struct spa_support support[4];
uint32_t n_support;
@ -167,11 +120,11 @@ init_buffer(struct data *data, struct spa_buffer **bufs, struct buffer *ba, int
b->header.seq = 0;
b->header.pts = 0;
b->header.dts_offset = 0;
b->metas[0].type = data->type.meta.Header;
b->metas[0].type = SPA_META_Header;
b->metas[0].data = &b->header;
b->metas[0].size = sizeof(b->header);
b->datas[0].type = data->type.data.MemPtr;
b->datas[0].type = SPA_DATA_MemPtr;
b->datas[0].flags = 0;
b->datas[0].fd = -1;
b->datas[0].mapoffset = 0;
@ -220,7 +173,7 @@ static int make_node(struct data *data, struct spa_node **node, const char *lib,
printf("can't make factory instance: %d\n", res);
return res;
}
if ((res = spa_handle_get_interface(handle, data->type.node, &iface)) < 0) {
if ((res = spa_handle_get_interface(handle, SPA_ID_INTERFACE_Node, &iface)) < 0) {
printf("can't get interface %d\n", res);
return res;
}
@ -304,13 +257,13 @@ static int make_nodes(struct data *data, const char *device)
spa_pod_builder_init(&b, buffer, sizeof(buffer));
props = spa_pod_builder_object(&b,
0, data->type.props,
":", data->type.props_device, "s", device ? device : "hw:0",
":", data->type.props_min_latency, "i", MIN_LATENCY);
0, SPA_ID_OBJECT_Props,
":", SPA_PROP_device, "s", device ? device : "hw:0",
":", SPA_PROP_minLatency, "i", MIN_LATENCY);
spa_debug_pod(0, data->map, props);
spa_debug_pod(0, spa_debug_types, props);
if ((res = spa_node_set_param(data->sink, data->type.param.idProps, 0, props)) < 0)
if ((res = spa_node_set_param(data->sink, SPA_ID_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
if ((res = make_node(data, &data->volume,
@ -328,12 +281,12 @@ static int make_nodes(struct data *data, const char *device)
spa_pod_builder_init(&b, buffer, sizeof(buffer));
props = spa_pod_builder_object(&b,
0, data->type.props,
":", data->type.props_freq, "d", 600.0,
":", data->type.props_volume, "d", 0.5,
":", data->type.props_live, "b", false);
0, SPA_ID_OBJECT_Props,
":", SPA_PROP_frequency, "d", 600.0,
":", SPA_PROP_volume, "d", 0.5,
":", SPA_PROP_live, "b", false);
if ((res = spa_node_set_param(data->source, data->type.param.idProps, 0, props)) < 0)
if ((res = spa_node_set_param(data->source, SPA_ID_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
data->source_volume_io[0] = SPA_IO_BUFFERS_INIT;
@ -341,19 +294,19 @@ static int make_nodes(struct data *data, const char *device)
spa_node_port_set_io(data->source,
SPA_DIRECTION_OUTPUT, 0,
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->source_volume_io[0], sizeof(data->source_volume_io[0]));
spa_node_port_set_io(data->volume,
SPA_DIRECTION_INPUT, 0,
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->source_volume_io[0], sizeof(data->source_volume_io[0]));
spa_node_port_set_io(data->volume,
SPA_DIRECTION_OUTPUT, 0,
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->volume_sink_io[0], sizeof(data->volume_sink_io[0]));
spa_node_port_set_io(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->volume_sink_io[0], sizeof(data->volume_sink_io[0]));
spa_graph_node_init(&data->source_node, &data->source_state);
@ -394,35 +347,35 @@ static int negotiate_formats(struct data *data)
spa_pod_builder_init(&b, buffer, sizeof(buffer));
filter = spa_pod_builder_object(&b,
0, data->type.format,
"I", data->type.media_type.audio,
"I", data->type.media_subtype.raw,
":", data->type.format_audio.format, "I", data->type.audio_format.S16,
":", data->type.format_audio.layout, "i", SPA_AUDIO_LAYOUT_INTERLEAVED,
":", data->type.format_audio.rate, "i", 44100,
":", data->type.format_audio.channels, "i", 2);
0, SPA_ID_OBJECT_Format,
"I", SPA_MEDIA_TYPE_audio,
"I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_AUDIO_format, "I", SPA_AUDIO_FORMAT_S16,
":", SPA_FORMAT_AUDIO_layout, "i", SPA_AUDIO_LAYOUT_INTERLEAVED,
":", SPA_FORMAT_AUDIO_rate, "i", 44100,
":", SPA_FORMAT_AUDIO_channels, "i", 2);
spa_debug_pod(0, data->map, filter);
spa_debug_pod(0, spa_debug_types, filter);
spa_log_debug(&default_log.log, "enum_params");
if ((res = spa_node_port_enum_params(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.param.idEnumFormat, &state,
SPA_ID_PARAM_EnumFormat, &state,
filter, &format, &b)) <= 0)
return -EBADF;
spa_debug_pod(0, data->map, format);
spa_debug_pod(0, spa_debug_types, format);
spa_log_debug(&default_log.log, "sink set_param");
if ((res = spa_node_port_set_param(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.param.idFormat, 0, format)) < 0)
SPA_ID_PARAM_Format, 0, format)) < 0)
return res;
spa_log_debug(&default_log.log, "volume set_param");
if ((res = spa_node_port_set_param(data->volume,
SPA_DIRECTION_OUTPUT, 0,
data->type.param.idFormat, 0, format)) < 0)
SPA_ID_PARAM_Format, 0, format)) < 0)
return res;
init_buffer(data, data->volume_buffers, data->volume_buffer, 1, BUFFER_SIZE);
@ -437,11 +390,11 @@ static int negotiate_formats(struct data *data)
if ((res = spa_node_port_set_param(data->volume,
SPA_DIRECTION_INPUT, 0,
data->type.param.idFormat, 0, format)) < 0)
SPA_ID_PARAM_Format, 0, format)) < 0)
return res;
if ((res = spa_node_port_set_param(data->source,
SPA_DIRECTION_OUTPUT, 0,
data->type.param.idFormat, 0, format)) < 0)
SPA_ID_PARAM_Format, 0, format)) < 0)
return res;
init_buffer(data, data->source_buffers, data->source_buffer, 1, BUFFER_SIZE);
@ -517,7 +470,7 @@ static void run_async_sink(struct data *data)
int err;
{
struct spa_command cmd = SPA_COMMAND_INIT(data->type.command_node.Start);
struct spa_command cmd = SPA_COMMAND_INIT(SPA_ID_COMMAND_NODE_Start);
if ((res = spa_node_send_command(data->source, &cmd)) < 0)
printf("got source error %d\n", res);
if ((res = spa_node_send_command(data->volume, &cmd)) < 0)
@ -541,7 +494,7 @@ static void run_async_sink(struct data *data)
}
{
struct spa_command cmd = SPA_COMMAND_INIT(data->type.command_node.Pause);
struct spa_command cmd = SPA_COMMAND_INIT(SPA_ID_COMMAND_NODE_Pause);
if ((res = spa_node_send_command(data->sink, &cmd)) < 0)
printf("got error %d\n", res);
if ((res = spa_node_send_command(data->volume, &cmd)) < 0)
@ -561,7 +514,6 @@ int main(int argc, char *argv[])
spa_graph_data_init(&data.graph_data, &data.graph);
spa_graph_set_callbacks(&data.graph, &spa_graph_impl_default, &data.graph_data);
data.map = &default_map.map;
data.log = &default_log.log;
data.data_loop.version = SPA_VERSION_LOOP;
data.data_loop.add_source = do_add_source;
@ -572,17 +524,10 @@ int main(int argc, char *argv[])
if ((str = getenv("SPA_DEBUG")))
data.log->level = atoi(str);
data.support[0].type = SPA_TYPE__TypeMap;
data.support[0].data = data.map;
data.support[1].type = SPA_TYPE__Log;
data.support[1].data = data.log;
data.support[2].type = SPA_TYPE_LOOP__DataLoop;
data.support[2].data = &data.data_loop;
data.support[3].type = SPA_TYPE_LOOP__MainLoop;
data.support[3].data = &data.data_loop;
data.n_support = 4;
init_type(&data.type, data.map);
data.support[0] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_Log, data.log);
data.support[1] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_MainLoop, &data.data_loop);
data.support[2] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_DataLoop, &data.data_loop);
data.n_support = 3;
if ((res = make_nodes(&data, argc > 1 ? argv[1] : NULL)) < 0) {
printf("can't make nodes: %d\n", res);

17
spa/tests/test-graph2.c
View file

@ -28,37 +28,23 @@
#include <spa/support/log-impl.h>
#include <spa/support/loop.h>
#include <spa/support/type-map-impl.h>
#include <spa/node/node.h>
#include <spa/param/param.h>
#include <spa/param/props.h>
#include <spa/param/audio/format-utils.h>
#include <spa/param/format-utils.h>
#include <spa/graph/graph.h>
#include <spa/graph/graph-scheduler2.h>
static SPA_TYPE_MAP_IMPL(default_map, 4096);
static SPA_LOG_IMPL(default_log);
struct type {
uint32_t node;
};
static inline void init_type(struct type *type, struct spa_type_map *map)
{
type->node = spa_type_map_get_id(map, SPA_TYPE__Node);
}
struct version {
uint16_t current;
uint16_t pending;
};
struct data {
struct spa_type_map *map;
struct spa_log *log;
struct spa_loop data_loop;
struct type type;
int writers;
struct version version;
@ -233,14 +219,11 @@ int main(int argc, char *argv[])
spa_graph_init(&data.graph[0], &data.graph_state[0]);
spa_graph_init(&data.graph[1], &data.graph_state[1]);
data.map = &default_map.map;
data.log = &default_log.log;
if ((str = getenv("SPA_DEBUG")))
data.log->level = atoi(str);
init_type(&data.type, data.map);
print_graph(&data, 0);
print_graph(&data, 1);
make_graph1(&data);

147
spa/tests/test-mixer.c
View file

@ -31,20 +31,16 @@
#include <spa/support/log.h>
#include <spa/support/log-impl.h>
#include <spa/support/loop.h>
#include <spa/support/type-map.h>
#include <spa/support/type-map-impl.h>
#include <spa/node/node.h>
#include <spa/node/io.h>
#include <spa/param/param.h>
#include <spa/param/props.h>
#include <spa/param/audio/format-utils.h>
#include <spa/param/format-utils.h>
#define USE_GRAPH
#define M_PI_M2 ( M_PI + M_PI )
static SPA_TYPE_MAP_IMPL(default_map, 4096);
static SPA_LOG_IMPL(default_log);
#define spa_debug(...) spa_log_trace(&default_log.log,__VA_ARGS__)
@ -52,51 +48,6 @@ static SPA_LOG_IMPL(default_log);
#include <spa/graph/graph.h>
#include <spa/graph/graph-scheduler2.h>
struct type {
uint32_t node;
uint32_t props;
uint32_t format;
uint32_t props_device;
uint32_t props_freq;
uint32_t props_volume;
uint32_t props_min_latency;
uint32_t props_live;
uint32_t io_inprop_volume;
struct spa_type_io io;
struct spa_type_param param;
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;
struct spa_type_event_node event_node;
struct spa_type_command_node command_node;
};
static inline void init_type(struct type *type, struct spa_type_map *map)
{
type->node = spa_type_map_get_id(map, SPA_TYPE__Node);
type->props = spa_type_map_get_id(map, SPA_TYPE__Props);
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
type->props_device = spa_type_map_get_id(map, SPA_TYPE_PROPS__device);
type->props_freq = spa_type_map_get_id(map, SPA_TYPE_PROPS__frequency);
type->props_volume = spa_type_map_get_id(map, SPA_TYPE_PROPS__volume);
type->props_min_latency = spa_type_map_get_id(map, SPA_TYPE_PROPS__minLatency);
type->props_live = spa_type_map_get_id(map, SPA_TYPE_PROPS__live);
type->io_inprop_volume = spa_type_map_get_id(map, SPA_TYPE_IO_PROP_BASE "volume");
spa_type_io_map(map, &type->io);
spa_type_param_map(map, &type->param);
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);
spa_type_event_node_map(map, &type->event_node);
spa_type_command_node_map(map, &type->command_node);
}
struct buffer {
struct spa_buffer buffer;
struct spa_meta metas[1];
@ -106,10 +57,8 @@ struct buffer {
};
struct data {
struct spa_type_map *map;
struct spa_log *log;
struct spa_loop data_loop;
struct type type;
struct spa_support support[4];
uint32_t n_support;
@ -187,11 +136,11 @@ init_buffer(struct data *data, struct spa_buffer **bufs, struct buffer *ba, int
b->header.seq = 0;
b->header.pts = 0;
b->header.dts_offset = 0;
b->metas[0].type = data->type.meta.Header;
b->metas[0].type = SPA_META_Header;
b->metas[0].data = &b->header;
b->metas[0].size = sizeof(b->header);
b->datas[0].type = data->type.data.MemPtr;
b->datas[0].type = SPA_DATA_MemPtr;
b->datas[0].flags = 0;
b->datas[0].fd = -1;
b->datas[0].mapoffset = 0;
@ -240,7 +189,7 @@ static int make_node(struct data *data, struct spa_node **node, const char *lib,
printf("can't make factory instance: %d\n", res);
return res;
}
if ((res = spa_handle_get_interface(handle, data->type.node, &iface)) < 0) {
if ((res = spa_handle_get_interface(handle, SPA_ID_INTERFACE_Node, &iface)) < 0) {
printf("can't get interface %d\n", res);
return res;
}
@ -370,11 +319,11 @@ static int make_nodes(struct data *data, const char *device)
spa_pod_builder_init(&b, buffer, sizeof(buffer));
props = spa_pod_builder_object(&b,
0, data->type.props,
":", data->type.props_device, "s", device ? device : "hw:0",
":", data->type.props_min_latency, "i", MIN_LATENCY);
0, SPA_ID_OBJECT_Props,
":", SPA_PROP_device, "s", device ? device : "hw:0",
":", SPA_PROP_minLatency, "i", MIN_LATENCY);
if ((res = spa_node_set_param(data->sink, data->type.param.idProps, 0, props)) < 0)
if ((res = spa_node_set_param(data->sink, SPA_ID_PARAM_Props, 0, props)) < 0)
error(0, -res, "set_param props");
if ((res = make_node(data, &data->mix,
@ -393,12 +342,12 @@ static int make_nodes(struct data *data, const char *device)
spa_pod_builder_init(&b, buffer, sizeof(buffer));
props = spa_pod_builder_object(&b,
0, data->type.props,
":", data->type.props_freq, "d", 600.0,
":", data->type.props_volume, "d", 1.0,
":", data->type.props_live, "b", false);
SPA_ID_PARAM_Props, SPA_ID_OBJECT_Props,
":", SPA_PROP_frequency, "d", 600.0,
":", SPA_PROP_volume, "d", 1.0,
":", SPA_PROP_live, "b", false);
if ((res = spa_node_set_param(data->source1, data->type.param.idProps, 0, props)) < 0)
if ((res = spa_node_set_param(data->source1, SPA_ID_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
if ((res = make_node(data, &data->source2,
@ -410,12 +359,12 @@ static int make_nodes(struct data *data, const char *device)
spa_pod_builder_init(&b, buffer, sizeof(buffer));
props = spa_pod_builder_object(&b,
0, data->type.props,
":", data->type.props_freq, "d", 440.0,
":", data->type.props_volume, "d", 1.0,
":", data->type.props_live, "b", false);
SPA_ID_PARAM_Props, SPA_ID_OBJECT_Props,
":", SPA_PROP_frequency, "d", 440.0,
":", SPA_PROP_volume, "d", 1.0,
":", SPA_PROP_live, "b", false);
if ((res = spa_node_set_param(data->source2, data->type.param.idProps, 0, props)) < 0)
if ((res = spa_node_set_param(data->source2, SPA_ID_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
data->mix_ports[0] = 0;
@ -432,32 +381,33 @@ static int make_nodes(struct data *data, const char *device)
spa_node_port_set_io(data->source1,
SPA_DIRECTION_OUTPUT, 0,
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->source1_mix_io[0], sizeof(data->source1_mix_io[0]));
spa_node_port_set_io(data->source2,
SPA_DIRECTION_OUTPUT, 0,
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->source2_mix_io[0], sizeof(data->source2_mix_io[0]));
spa_node_port_set_io(data->mix,
SPA_DIRECTION_INPUT, data->mix_ports[0],
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->source1_mix_io[0], sizeof(data->source1_mix_io[0]));
spa_node_port_set_io(data->mix,
SPA_DIRECTION_INPUT, data->mix_ports[1],
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->source2_mix_io[0], sizeof(data->source2_mix_io[0]));
spa_node_port_set_io(data->mix,
SPA_DIRECTION_OUTPUT, 0,
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->mix_sink_io[0], sizeof(data->mix_sink_io[0]));
spa_node_port_set_io(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->mix_sink_io[0], sizeof(data->mix_sink_io[0]));
data->ctrl_volume[0] = SPA_POD_DOUBLE_INIT(0.5);
data->ctrl_volume[1] = SPA_POD_DOUBLE_INIT(0.5);
#if 0
if ((res = spa_node_port_set_io(data->mix,
SPA_DIRECTION_INPUT, data->mix_ports[0],
data->type.io_inprop_volume,
@ -469,6 +419,7 @@ static int make_nodes(struct data *data, const char *device)
data->type.io_inprop_volume,
&data->ctrl_volume[1], sizeof(data->ctrl_volume[1]))) < 0)
error(0, -res, "set_io volume 1");
#endif
#ifdef USE_GRAPH
@ -522,30 +473,30 @@ static int negotiate_formats(struct data *data)
spa_pod_builder_init(&b, buffer, sizeof(buffer));
filter = spa_pod_builder_object(&b,
0, data->type.format,
"I", data->type.media_type.audio,
"I", data->type.media_subtype.raw,
":", data->type.format_audio.format, "I", data->type.audio_format.S16,
":", data->type.format_audio.layout, "i", SPA_AUDIO_LAYOUT_INTERLEAVED,
":", data->type.format_audio.rate, "i", 44100,
":", data->type.format_audio.channels, "i", 2);
0, SPA_ID_OBJECT_Format,
"I", SPA_MEDIA_TYPE_audio,
"I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_AUDIO_format, "I", SPA_AUDIO_FORMAT_S16,
":", SPA_FORMAT_AUDIO_layout, "i", SPA_AUDIO_LAYOUT_INTERLEAVED,
":", SPA_FORMAT_AUDIO_rate, "i", 44100,
":", SPA_FORMAT_AUDIO_channels, "i", 2);
if ((res =
spa_node_port_enum_params(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.param.idEnumFormat, &state,
SPA_ID_PARAM_EnumFormat, &state,
filter, &format, &b)) <= 0)
return -EBADF;
if ((res = spa_node_port_set_param(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.param.idFormat, 0,
SPA_ID_PARAM_Format, 0,
format)) < 0)
return res;
if ((res = spa_node_port_set_param(data->mix,
SPA_DIRECTION_OUTPUT, 0,
data->type.param.idFormat, 0,
SPA_ID_PARAM_Format, 0,
format)) < 0)
return res;
@ -560,13 +511,13 @@ static int negotiate_formats(struct data *data)
if ((res = spa_node_port_set_param(data->mix,
SPA_DIRECTION_INPUT, data->mix_ports[0],
data->type.param.idFormat, 0,
SPA_ID_PARAM_Format, 0,
format)) < 0)
return res;
if ((res = spa_node_port_set_param(data->source1,
SPA_DIRECTION_OUTPUT, 0,
data->type.param.idFormat, 0,
SPA_ID_PARAM_Format, 0,
format)) < 0)
return res;
@ -583,13 +534,13 @@ static int negotiate_formats(struct data *data)
if ((res =
spa_node_port_set_param(data->mix,
SPA_DIRECTION_INPUT, data->mix_ports[1],
data->type.param.idFormat, 0,
SPA_ID_PARAM_Format, 0,
format)) < 0)
return res;
if ((res = spa_node_port_set_param(data->source2,
SPA_DIRECTION_OUTPUT, 0,
data->type.param.idFormat, 0,
SPA_ID_PARAM_Format, 0,
format)) < 0)
return res;
@ -666,7 +617,7 @@ static void run_async_sink(struct data *data)
int err;
{
struct spa_command cmd = SPA_COMMAND_INIT(data->type.command_node.Start);
struct spa_command cmd = SPA_COMMAND_INIT(SPA_ID_COMMAND_NODE_Start);
if ((res = spa_node_send_command(data->source1, &cmd)) < 0)
printf("got source1 error %d\n", res);
if ((res = spa_node_send_command(data->source2, &cmd)) < 0)
@ -692,7 +643,7 @@ static void run_async_sink(struct data *data)
}
{
struct spa_command cmd = SPA_COMMAND_INIT(data->type.command_node.Pause);
struct spa_command cmd = SPA_COMMAND_INIT(SPA_ID_COMMAND_NODE_Pause);
if ((res = spa_node_send_command(data->sink, &cmd)) < 0)
printf("got error %d\n", res);
if ((res = spa_node_send_command(data->mix, &cmd)) < 0)
@ -710,7 +661,6 @@ int main(int argc, char *argv[])
int res;
const char *str;
data.map = &default_map.map;
data.log = &default_log.log;
data.data_loop.version = SPA_VERSION_LOOP;
data.data_loop.add_source = do_add_source;
@ -725,17 +675,10 @@ int main(int argc, char *argv[])
if ((str = getenv("SPA_DEBUG")))
data.log->level = atoi(str);
data.support[0].type = SPA_TYPE__TypeMap;
data.support[0].data = data.map;
data.support[1].type = SPA_TYPE__Log;
data.support[1].data = data.log;
data.support[2].type = SPA_TYPE_LOOP__DataLoop;
data.support[2].data = &data.data_loop;
data.support[3].type = SPA_TYPE_LOOP__MainLoop;
data.support[3].data = &data.data_loop;
data.n_support = 4;
init_type(&data.type, data.map);
data.support[0] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_Log, data.log);
data.support[1] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_MainLoop, &data.data_loop);
data.support[2] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_DataLoop, &data.data_loop);
data.n_support = 3;
if ((res = make_nodes(&data, argc > 1 ? argv[1] : NULL)) < 0) {
printf("can't make nodes: %d\n", res);

84
spa/tests/test-perf.c
View file

@ -28,13 +28,11 @@
#include <spa/support/log-impl.h>
#include <spa/support/loop.h>
#include <spa/support/type-map-impl.h>
#include <spa/node/node.h>
#include <spa/node/io.h>
#include <spa/param/param.h>
#include <spa/param/props.h>
#include <spa/param/audio/format-utils.h>
#include <spa/param/format-utils.h>
#include <spa/graph/graph.h>
#include <spa/graph/graph-scheduler2.h>
@ -45,48 +43,8 @@
#define MODE_ASYNC_BOTH (MODE_ASYNC_PUSH|MODE_ASYNC_PULL)
#define MODE_DIRECT (1<<4)
static SPA_TYPE_MAP_IMPL(default_map, 4096);
static SPA_LOG_IMPL(default_log);
struct type {
uint32_t node;
uint32_t props;
uint32_t format;
uint32_t props_device;
uint32_t props_freq;
uint32_t props_volume;
uint32_t props_min_latency;
uint32_t props_live;
struct spa_type_io io;
struct spa_type_param param;
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_event_node event_node;
struct spa_type_command_node command_node;
};
static inline void init_type(struct type *type, struct spa_type_map *map)
{
type->node = spa_type_map_get_id(map, SPA_TYPE__Node);
type->props = spa_type_map_get_id(map, SPA_TYPE__Props);
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
type->props_device = spa_type_map_get_id(map, SPA_TYPE_PROPS__device);
type->props_freq = spa_type_map_get_id(map, SPA_TYPE_PROPS__frequency);
type->props_volume = spa_type_map_get_id(map, SPA_TYPE_PROPS__volume);
type->props_min_latency = spa_type_map_get_id(map, SPA_TYPE_PROPS__minLatency);
type->props_live = spa_type_map_get_id(map, SPA_TYPE_PROPS__live);
spa_type_io_map(map, &type->io);
spa_type_param_map(map, &type->param);
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_event_node_map(map, &type->event_node);
spa_type_command_node_map(map, &type->command_node);
}
struct buffer {
struct spa_buffer buffer;
struct spa_meta metas[1];
@ -96,10 +54,8 @@ struct buffer {
};
struct data {
struct spa_type_map *map;
struct spa_log *log;
struct spa_loop data_loop;
struct type type;
int mode;
@ -162,11 +118,11 @@ init_buffer(struct data *data, struct spa_buffer **bufs, struct buffer *ba, int
b->header.seq = 0;
b->header.pts = 0;
b->header.dts_offset = 0;
b->metas[0].type = data->type.meta.Header;
b->metas[0].type = SPA_META_Header;
b->metas[0].data = &b->header;
b->metas[0].size = sizeof(b->header);
b->datas[0].type = data->type.data.MemPtr;
b->datas[0].type = SPA_DATA_MemPtr;
b->datas[0].flags = 0;
b->datas[0].fd = -1;
b->datas[0].mapoffset = 0;
@ -216,7 +172,7 @@ static int make_node(struct data *data, struct spa_node **node, const char *lib,
printf("can't make factory instance: %d\n", res);
return res;
}
if ((res = spa_handle_get_interface(handle, data->type.node, &iface)) < 0) {
if ((res = spa_handle_get_interface(handle, SPA_ID_INTERFACE_Node, &iface)) < 0) {
printf("can't get interface %d\n", res);
return res;
}
@ -368,11 +324,11 @@ static int make_nodes(struct data *data)
spa_node_port_set_io(data->source,
SPA_DIRECTION_OUTPUT, 0,
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->source_sink_io[0], sizeof(data->source_sink_io[0]));
spa_node_port_set_io(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->source_sink_io[0], sizeof(data->source_sink_io[0]));
spa_graph_node_init(&data->source_node, &data->source_state);
@ -403,19 +359,19 @@ static int negotiate_formats(struct data *data)
spa_pod_builder_init(&b, buffer, sizeof(buffer));
format = spa_pod_builder_object(&b,
0, data->type.format,
"I", data->type.media_type.binary,
"I", data->type.media_subtype.raw);
0, SPA_ID_OBJECT_Format,
"I", SPA_MEDIA_TYPE_binary,
"I", SPA_MEDIA_SUBTYPE_raw);
if ((res = spa_node_port_set_param(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.param.idFormat, 0,
SPA_ID_PARAM_Format, 0,
format)) < 0)
return res;
if ((res = spa_node_port_set_param(data->source,
SPA_DIRECTION_OUTPUT, 0,
data->type.param.idFormat, 0,
SPA_ID_PARAM_Format, 0,
format)) < 0)
return res;
@ -495,7 +451,7 @@ static void run_graph(struct data *data)
int64_t start, stop;
{
struct spa_command cmd = SPA_COMMAND_INIT(data->type.command_node.Start);
struct spa_command cmd = SPA_COMMAND_INIT(SPA_ID_COMMAND_NODE_Start);
if ((res = spa_node_send_command(data->source, &cmd)) < 0)
printf("got source error %d\n", res);
if ((res = spa_node_send_command(data->sink, &cmd)) < 0)
@ -530,7 +486,7 @@ static void run_graph(struct data *data)
printf("stopping, elapsed %" PRIi64 "\n", stop - start);
{
struct spa_command cmd = SPA_COMMAND_INIT(data->type.command_node.Pause);
struct spa_command cmd = SPA_COMMAND_INIT(SPA_ID_COMMAND_NODE_Pause);
if ((res = spa_node_send_command(data->sink, &cmd)) < 0)
printf("got error %d\n", res);
if ((res = spa_node_send_command(data->source, &cmd)) < 0)
@ -548,7 +504,6 @@ int main(int argc, char *argv[])
spa_graph_data_init(&data.graph_data, &data.graph);
spa_graph_set_callbacks(&data.graph, &spa_graph_impl_default, &data.graph_data);
data.map = &default_map.map;
data.log = &default_log.log;
data.data_loop.version = SPA_VERSION_LOOP;
data.data_loop.add_source = do_add_source;
@ -564,17 +519,10 @@ int main(int argc, char *argv[])
printf("mode %08x\n", data.mode);
data.support[0].type = SPA_TYPE__TypeMap;
data.support[0].data = data.map;
data.support[1].type = SPA_TYPE__Log;
data.support[1].data = data.log;
data.support[2].type = SPA_TYPE_LOOP__DataLoop;
data.support[2].data = &data.data_loop;
data.support[3].type = SPA_TYPE_LOOP__MainLoop;
data.support[3].data = &data.data_loop;
data.n_support = 4;
init_type(&data.type, data.map);
data.support[0] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_Log, data.log);
data.support[1] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_MainLoop, &data.data_loop);
data.support[2] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_DataLoop, &data.data_loop);
data.n_support = 3;
if ((res = make_nodes(&data)) < 0) {
printf("can't make nodes: %d\n", res);

124
spa/tests/test-props.c
View file

@ -24,13 +24,13 @@
#include <errno.h>
#include <spa/support/log-impl.h>
#include <spa/support/type-map-impl.h>
#include <spa/pod/pod.h>
#include <spa/pod/builder.h>
#include <spa/pod/parser.h>
#include <spa/param/video/format-utils.h>
#include <spa/debug/pod.h>
#include <spa/debug/format.h>
#include <spa/debug/types.h>
#if 0
/* { video/raw,
@ -148,42 +148,23 @@ key: "<name>"
]
spa_build(SPA_MEDIA_TYPE_VIDEO, SPA_MEDIA_SUBTYPE_RAW,
type.format_video.format, SPA_PROP_TYPE_ID,
SPA_FORMAT_VIDEO_format, SPA_PROP_TYPE_ID,
video_format.I420
SPA_POD_PROP_FLAG_UNSET |
SPA_PROP_RANGE_ENUM, 2,
video_format.I420,
video_format.YUY2,
type.format_video.size, SPA_PROP_TYPE_RECTANGLE,
SPA_FORMAT_VIDEO_size, SPA_PROP_TYPE_RECTANGLE,
320, 240,
SPA_POD_PROP_FLAG_UNSET |
SPA_PROP_RANGE_MIN_MAX,
1, 1,
INT32_MAX, INT32_MAX,
type.format_video.framerate, SPA_PROP_TYPE_FRACTION, 25, 1,
SPA_FORMAT_VIDEO_framerate, SPA_PROP_TYPE_FRACTION, 25, 1,
SPA_POD_PROP_FLAG_UNSET | SPA_PROP_RANGE_MIN_MAX, 0, 1, INT32_MAX, 1, 0);
#endif
static SPA_TYPE_MAP_IMPL(default_map, 4096);
static struct {
uint32_t format;
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;
} type = { 0,};
static inline void type_init(struct spa_type_map *map)
{
type.format = spa_type_map_get_id(map, SPA_TYPE__Format);
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);
}
static void do_static_struct(struct spa_type_map *map)
static void do_static_struct(void)
{
struct _test_format {
struct spa_pod_object fmt;
@ -214,23 +195,23 @@ static void do_static_struct(struct spa_type_map *map)
} props;
} test_format = {
SPA_POD_OBJECT_INIT(sizeof(test_format.props) + sizeof(struct spa_pod_object_body),
0, type.format),
0, SPA_ID_OBJECT_Format),
{
SPA_POD_ID_INIT(type.media_type.video),
SPA_POD_ID_INIT(type.media_subtype.raw),
SPA_POD_ID_INIT(SPA_MEDIA_TYPE_video),
SPA_POD_ID_INIT(SPA_MEDIA_SUBTYPE_raw),
SPA_POD_PROP_INIT(sizeof(test_format.props.format_vals) +
sizeof(struct spa_pod_prop_body),
type.format_video.format,
SPA_FORMAT_VIDEO_format,
SPA_POD_PROP_RANGE_ENUM | SPA_POD_PROP_FLAG_UNSET,
sizeof(uint32_t), SPA_POD_TYPE_ID),
{
type.video_format.I420,
{ type.video_format.I420, type.video_format.YUY2 }
SPA_VIDEO_FORMAT_I420,
{ SPA_VIDEO_FORMAT_I420, SPA_VIDEO_FORMAT_YUY2 }
},
SPA_POD_PROP_INIT(sizeof(test_format.props.size_vals) +
sizeof(struct spa_pod_prop_body),
type.format_video.size,
SPA_FORMAT_VIDEO_size,
SPA_POD_PROP_RANGE_MIN_MAX | SPA_POD_PROP_FLAG_UNSET,
sizeof(struct spa_rectangle), SPA_POD_TYPE_RECTANGLE),
@ -240,7 +221,7 @@ static void do_static_struct(struct spa_type_map *map)
},
SPA_POD_PROP_INIT(sizeof(test_format.props.framerate_vals) +
sizeof(struct spa_pod_prop_body),
type.format_video.framerate,
SPA_FORMAT_VIDEO_framerate,
SPA_POD_PROP_RANGE_MIN_MAX | SPA_POD_PROP_FLAG_UNSET,
sizeof(struct spa_fraction), SPA_POD_TYPE_FRACTION),
{
@ -250,8 +231,8 @@ static void do_static_struct(struct spa_type_map *map)
}
};
spa_debug_pod(0, map, &test_format.fmt.pod);
spa_debug_format(0, map, &test_format.fmt.pod);
spa_debug_pod(0, spa_debug_types, &test_format.fmt.pod);
spa_debug_format(0, NULL, &test_format.fmt.pod);
{
uint32_t format = -1;
@ -259,16 +240,16 @@ static void do_static_struct(struct spa_type_map *map)
struct spa_fraction frac = { -1, -1 };
res = spa_pod_object_parse(&test_format.fmt.pod,
":",type.format_video.format, "I", &format,
":",type.format_video.framerate, "F", &frac, NULL);
":", SPA_FORMAT_VIDEO_format, "I", &format,
":", SPA_FORMAT_VIDEO_framerate, "F", &frac, NULL);
printf("%d format %d num %d denom %d\n", res, format, frac.num, frac.denom);
spa_pod_fixate(&test_format.fmt.pod);
res = spa_pod_object_parse(&test_format.fmt.pod,
":",type.format_video.format, "I", &format,
":",type.format_video.framerate, "F", &frac, NULL);
":", SPA_FORMAT_VIDEO_format, "I", &format,
":", SPA_FORMAT_VIDEO_framerate, "F", &frac, NULL);
printf("%d format %d num %d denom %d\n", res, format, frac.num, frac.denom);
}
@ -280,27 +261,24 @@ int main(int argc, char *argv[])
struct spa_pod_builder b = { NULL, };
uint8_t buffer[1024];
struct spa_pod_object *fmt;
struct spa_type_map *map = &default_map.map;
type_init(map);
spa_pod_builder_init(&b, buffer, sizeof(buffer));
spa_pod_builder_push_object(&b, 0, type.format);
spa_pod_builder_push_object(&b, 0, SPA_ID_OBJECT_Format);
spa_pod_builder_id(&b, type.media_type.video);
spa_pod_builder_id(&b, type.media_subtype.raw);
spa_pod_builder_id(&b, SPA_MEDIA_TYPE_video);
spa_pod_builder_id(&b, SPA_MEDIA_SUBTYPE_raw);
spa_pod_builder_push_prop(&b, type.format_video.format,
spa_pod_builder_push_prop(&b, SPA_FORMAT_VIDEO_format,
SPA_POD_PROP_RANGE_ENUM | SPA_POD_PROP_FLAG_UNSET);
spa_pod_builder_id(&b, type.video_format.I420);
spa_pod_builder_id(&b, type.video_format.I420);
spa_pod_builder_id(&b, type.video_format.YUY2);
spa_pod_builder_id(&b, SPA_VIDEO_FORMAT_I420);
spa_pod_builder_id(&b, SPA_VIDEO_FORMAT_I420);
spa_pod_builder_id(&b, SPA_VIDEO_FORMAT_YUY2);
spa_pod_builder_pop(&b);
struct spa_rectangle size_min_max[] = { {1, 1}, {INT32_MAX, INT32_MAX} };
spa_pod_builder_push_prop(&b,
type.format_video.size,
SPA_FORMAT_VIDEO_size,
SPA_POD_PROP_RANGE_MIN_MAX | SPA_POD_PROP_FLAG_UNSET);
spa_pod_builder_rectangle(&b, 320, 240);
spa_pod_builder_raw(&b, size_min_max, sizeof(size_min_max));
@ -308,7 +286,7 @@ int main(int argc, char *argv[])
struct spa_fraction rate_min_max[] = { {0, 1}, {INT32_MAX, 1} };
spa_pod_builder_push_prop(&b,
type.format_video.framerate,
SPA_FORMAT_VIDEO_framerate,
SPA_POD_PROP_RANGE_MIN_MAX | SPA_POD_PROP_FLAG_UNSET);
spa_pod_builder_fraction(&b, 25, 1);
spa_pod_builder_raw(&b, rate_min_max, sizeof(rate_min_max));
@ -316,26 +294,26 @@ int main(int argc, char *argv[])
fmt = spa_pod_builder_pop(&b);
spa_debug_pod(0, map, &fmt->pod);
spa_debug_pod(0, spa_debug_types, &fmt->pod);
spa_pod_builder_init(&b, buffer, sizeof(buffer));
fmt = spa_pod_builder_object(&b,
0, type.format,
"I", type.media_type.video,
"I", type.media_subtype.raw,
":", type.format_video.format, "Ieu", type.video_format.I420,
2, type.video_format.I420,
type.video_format.YUY2,
":", type.format_video.size, "Rru", &SPA_RECTANGLE(320,241),
0, SPA_ID_OBJECT_Format,
"I", SPA_MEDIA_TYPE_video,
"I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_VIDEO_format, "Ieu", SPA_VIDEO_FORMAT_I420,
2, SPA_VIDEO_FORMAT_I420,
SPA_VIDEO_FORMAT_YUY2,
":", SPA_FORMAT_VIDEO_size, "Rru", &SPA_RECTANGLE(320,241),
2, &SPA_RECTANGLE(1,1),
&SPA_RECTANGLE(INT32_MAX,INT32_MAX),
":", type.format_video.framerate, "Fru", &SPA_FRACTION(25,1),
":", SPA_FORMAT_VIDEO_framerate, "Fru", &SPA_FRACTION(25,1),
2, &SPA_FRACTION(0,1),
&SPA_FRACTION(INT32_MAX,1));
spa_debug_pod(0, map, &fmt->pod);
spa_debug_format(0, map, &fmt->pod);
spa_debug_pod(0, spa_debug_types, &fmt->pod);
spa_debug_format(0, NULL, &fmt->pod);
spa_pod_builder_init(&b, buffer, sizeof(buffer));
@ -350,31 +328,33 @@ int main(int argc, char *argv[])
* )
*/
fmt = spa_pod_builder_add(&b,
"<", 0, type.format,
"I", type.media_type.video,
"I", type.media_subtype.raw,
":", type.format_video.format, "Ieu", type.video_format.I420,
2, type.video_format.I420,
type.video_format.YUY2,
":", type.format_video.size, "Rru", &SPA_RECTANGLE(320,242),
"<", 0, SPA_ID_OBJECT_Format,
"I", SPA_MEDIA_TYPE_video,
"I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_VIDEO_format, "Ieu", SPA_VIDEO_FORMAT_I420,
2, SPA_VIDEO_FORMAT_I420,
SPA_VIDEO_FORMAT_YUY2,
":", SPA_FORMAT_VIDEO_size, "Rru", &SPA_RECTANGLE(320,242),
2, &SPA_RECTANGLE(1,1),
&SPA_RECTANGLE(INT32_MAX,INT32_MAX),
":", type.format_video.framerate, "Fru", &SPA_FRACTION(25,1),
":", SPA_FORMAT_VIDEO_framerate, "Fru", &SPA_FRACTION(25,1),
2, &SPA_FRACTION(0,1),
&SPA_FRACTION(INT32_MAX,1),
">", NULL);
spa_debug_pod(0, map, &fmt->pod);
spa_debug_format(0, map, &fmt->pod);
spa_debug_pod(0, spa_debug_types, &fmt->pod);
spa_debug_format(0, NULL, &fmt->pod);
do_static_struct(map);
do_static_struct();
#if 0
printf("media type is enum %d\n", spa_type_is_a(SPA_TYPE__MediaType, SPA_TYPE_ENUM_BASE));
printf("media sybtype is enum %d\n",
spa_type_is_a(SPA_TYPE__MediaSubtype, SPA_TYPE_ENUM_BASE));
printf("format is enum %d\n", spa_type_is_a(SPA_TYPE__Format, SPA_TYPE_ENUM_BASE));
printf("format is pod %d\n", spa_type_is_a(SPA_TYPE__Format, SPA_TYPE_POD_BASE));
printf("format is object %d\n", spa_type_is_a(SPA_TYPE__Format, SPA_TYPE_POD_OBJECT_BASE));
#endif
return 0;
}

9
spa/tests/test-props2.c
View file

@ -24,15 +24,13 @@
#include <errno.h>
#include <spa/support/log-impl.h>
#include <spa/support/type-map-impl.h>
#include <spa/pod/pod.h>
#include <spa/pod/builder.h>
#include <spa/pod/parser.h>
#include <spa/param/video/format.h>
#include <spa/debug/pod.h>
static SPA_TYPE_MAP_IMPL(default_map, 4096);
#include <spa/debug/types.h>
int main(int argc, char *argv[])
{
@ -41,7 +39,6 @@ int main(int argc, char *argv[])
uint32_t ref;
struct spa_pod *obj;
struct spa_pod_parser prs;
struct spa_type_map *map = &default_map.map;
b.data = buffer;
b.size = 1024;
@ -84,11 +81,11 @@ int main(int argc, char *argv[])
spa_pod_builder_pop(&b);
obj = spa_pod_builder_pop(&b);
spa_debug_pod(0, map, obj);
spa_debug_pod(0, spa_debug_types, obj);
struct spa_pod_prop *p = spa_pod_find_prop(obj, 4);
printf("%d %d\n", p->body.key, p->body.flags);
spa_debug_pod(0, map, &p->body.value);
spa_debug_pod(0, spa_debug_types, &p->body.value);
obj = spa_pod_builder_deref(&b, ref);

112
spa/tests/test-ringbuffer.c
View file

@ -28,60 +28,14 @@
#include <spa/support/log-impl.h>
#include <spa/support/loop.h>
#include <spa/support/type-map-impl.h>
#include <spa/node/node.h>
#include <spa/node/io.h>
#include <spa/param/param.h>
#include <spa/param/props.h>
#include <spa/param/audio/format-utils.h>
#include <spa/param/format-utils.h>
static SPA_TYPE_MAP_IMPL(default_map, 4096);
static SPA_LOG_IMPL(default_log);
struct type {
uint32_t node;
uint32_t props;
uint32_t format;
uint32_t props_device;
uint32_t props_freq;
uint32_t props_volume;
uint32_t props_min_latency;
uint32_t props_live;
struct spa_type_io io;
struct spa_type_param param;
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;
struct spa_type_event_node event_node;
struct spa_type_command_node command_node;
};
static inline void init_type(struct type *type, struct spa_type_map *map)
{
type->node = spa_type_map_get_id(map, SPA_TYPE__Node);
type->props = spa_type_map_get_id(map, SPA_TYPE__Props);
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
type->props_device = spa_type_map_get_id(map, SPA_TYPE_PROPS__device);
type->props_freq = spa_type_map_get_id(map, SPA_TYPE_PROPS__frequency);
type->props_volume = spa_type_map_get_id(map, SPA_TYPE_PROPS__volume);
type->props_min_latency = spa_type_map_get_id(map, SPA_TYPE_PROPS__minLatency);
type->props_live = spa_type_map_get_id(map, SPA_TYPE_PROPS__live);
spa_type_io_map(map, &type->io);
spa_type_param_map(map, &type->param);
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);
spa_type_event_node_map(map, &type->event_node);
spa_type_command_node_map(map, &type->command_node);
}
struct buffer {
struct spa_buffer buffer;
struct spa_meta metas[1];
@ -91,10 +45,8 @@ struct buffer {
};
struct data {
struct spa_type_map *map;
struct spa_log *log;
struct spa_loop data_loop;
struct type type;
struct spa_support support[4];
uint32_t n_support;
@ -139,11 +91,11 @@ init_buffer(struct data *data, struct spa_buffer **bufs, struct buffer *ba, int
b->header.seq = 0;
b->header.pts = 0;
b->header.dts_offset = 0;
b->metas[0].type = data->type.meta.Header;
b->metas[0].type = SPA_META_Header;
b->metas[0].data = &b->header;
b->metas[0].size = sizeof(b->header);
b->datas[0].type = data->type.data.MemPtr;
b->datas[0].type = SPA_DATA_MemPtr;
b->datas[0].flags = 0;
b->datas[0].fd = -1;
b->datas[0].mapoffset = 0;
@ -192,7 +144,7 @@ static int make_node(struct data *data, struct spa_node **node, const char *lib,
printf("can't make factory instance: %d\n", res);
return res;
}
if ((res = spa_handle_get_interface(handle, data->type.node, &iface)) < 0) {
if ((res = spa_handle_get_interface(handle, SPA_ID_INTERFACE_Node, &iface)) < 0) {
printf("can't get interface %d\n", res);
return res;
}
@ -284,11 +236,11 @@ static int make_nodes(struct data *data, const char *device)
spa_pod_builder_init(&b, buffer, sizeof(buffer));
props = spa_pod_builder_object(&b,
0, data->type.props,
":", data->type.props_device, "s", device ? device : "hw:0",
":", data->type.props_min_latency, "i", 64);
0, SPA_ID_OBJECT_Props,
":", SPA_PROP_device, "s", device ? device : "hw:0",
":", SPA_PROP_minLatency, "i", 64);
if ((res = spa_node_set_param(data->sink, data->type.param.idProps, 0, props)) < 0)
if ((res = spa_node_set_param(data->sink, SPA_ID_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
if ((res = make_node(data, &data->source,
@ -300,10 +252,10 @@ static int make_nodes(struct data *data, const char *device)
spa_pod_builder_init(&b, buffer, sizeof(buffer));
props = spa_pod_builder_object(&b,
0, data->type.props,
":", data->type.props_live, "b", false);
0, SPA_ID_OBJECT_Props,
":", SPA_PROP_live, "b", false);
if ((res = spa_node_set_param(data->source, data->type.param.idProps, 0, props)) < 0)
if ((res = spa_node_set_param(data->source, SPA_ID_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
return res;
}
@ -319,23 +271,23 @@ static int negotiate_formats(struct data *data)
spa_pod_builder_init(&b, buffer, sizeof(buffer));
filter = spa_pod_builder_object(&b,
0, data->type.format,
"I", data->type.media_type.audio,
"I", data->type.media_subtype.raw,
":", data->type.format_audio.format, "I", data->type.audio_format.S16,
":", data->type.format_audio.layout, "i", SPA_AUDIO_LAYOUT_INTERLEAVED,
":", data->type.format_audio.rate, "i", 44100,
":", data->type.format_audio.channels, "i", 2);
0, SPA_ID_OBJECT_Format,
"I", SPA_MEDIA_TYPE_audio,
"I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_AUDIO_format, "I", SPA_AUDIO_FORMAT_S16,
":", SPA_FORMAT_AUDIO_layout, "i", SPA_AUDIO_LAYOUT_INTERLEAVED,
":", SPA_FORMAT_AUDIO_rate, "i", 44100,
":", SPA_FORMAT_AUDIO_channels, "i", 2);
if ((res = spa_node_port_enum_params(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.param.idEnumFormat, &state,
SPA_ID_PARAM_EnumFormat, &state,
filter, &format, &b)) <= 0)
return -EBADF;
if ((res = spa_node_port_set_param(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.param.idFormat, 0,
SPA_ID_PARAM_Format, 0,
format)) < 0)
return res;
@ -343,16 +295,16 @@ static int negotiate_formats(struct data *data)
spa_node_port_set_io(data->source,
SPA_DIRECTION_OUTPUT, 0,
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->source_sink_io[0], sizeof(data->source_sink_io[0]));
spa_node_port_set_io(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->source_sink_io[0], sizeof(data->source_sink_io[0]));
if ((res = spa_node_port_set_param(data->source,
SPA_DIRECTION_OUTPUT, 0,
data->type.param.idFormat, 0,
SPA_ID_PARAM_Format, 0,
format)) < 0)
return res;
@ -430,7 +382,7 @@ static void run_async_sink(struct data *data)
int err;
{
struct spa_command cmd = SPA_COMMAND_INIT(data->type.command_node.Start);
struct spa_command cmd = SPA_COMMAND_INIT(SPA_ID_COMMAND_NODE_Start);
if ((res = spa_node_send_command(data->source, &cmd)) < 0)
printf("got source error %d\n", res);
if ((res = spa_node_send_command(data->sink, &cmd)) < 0)
@ -452,7 +404,7 @@ static void run_async_sink(struct data *data)
}
{
struct spa_command cmd = SPA_COMMAND_INIT(data->type.command_node.Pause);
struct spa_command cmd = SPA_COMMAND_INIT(SPA_ID_COMMAND_NODE_Pause);
if ((res = spa_node_send_command(data->sink, &cmd)) < 0)
printf("got sink error %d\n", res);
if ((res = spa_node_send_command(data->source, &cmd)) < 0)
@ -466,7 +418,6 @@ int main(int argc, char *argv[])
int res;
const char *str;
data.map = &default_map.map;
data.log = &default_log.log;
data.data_loop.version = SPA_VERSION_LOOP;
data.data_loop.add_source = do_add_source;
@ -477,17 +428,10 @@ int main(int argc, char *argv[])
if ((str = getenv("SPA_DEBUG")))
data.log->level = atoi(str);
data.support[0].type = SPA_TYPE__TypeMap;
data.support[0].data = data.map;
data.support[1].type = SPA_TYPE__Log;
data.support[1].data = data.log;
data.support[2].type = SPA_TYPE_LOOP__DataLoop;
data.support[2].data = &data.data_loop;
data.support[3].type = SPA_TYPE_LOOP__MainLoop;
data.support[3].data = &data.data_loop;
data.n_support = 4;
init_type(&data.type, data.map);
data.support[0] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_Log, data.log);
data.support[1] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_MainLoop, &data.data_loop);
data.support[2] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_DataLoop, &data.data_loop);
data.n_support = 3;
if ((res = make_nodes(&data, argc > 1 ? argv[1] : NULL)) < 0) {
printf("can't make nodes: %d\n", res);

98
spa/tests/test-v4l2.c
View file

@ -31,53 +31,14 @@
#include <spa/support/log-impl.h>
#include <spa/support/loop.h>
#include <spa/support/type-map-impl.h>
#include <spa/node/node.h>
#include <spa/node/io.h>
#include <spa/param/param.h>
#include <spa/param/props.h>
#include <spa/param/video/format-utils.h>
#include <spa/param/format-utils.h>
static SPA_TYPE_MAP_IMPL(default_map, 4096);
static SPA_LOG_IMPL(default_log);
struct type {
uint32_t node;
uint32_t props;
uint32_t format;
uint32_t props_device;
uint32_t SDL_Texture;
struct spa_type_io io;
struct spa_type_param param;
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;
struct spa_type_event_node event_node;
struct spa_type_command_node command_node;
};
static inline void init_type(struct type *type, struct spa_type_map *map)
{
type->node = spa_type_map_get_id(map, SPA_TYPE__Node);
type->props = spa_type_map_get_id(map, SPA_TYPE__Props);
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
type->props_device = spa_type_map_get_id(map, SPA_TYPE_PROPS__device);
type->SDL_Texture = spa_type_map_get_id(map, SPA_TYPE_POINTER_BASE "SDL_Texture");
spa_type_io_map(map, &type->io);
spa_type_param_map(map, &type->param);
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);
spa_type_event_node_map(map, &type->event_node);
spa_type_command_node_map(map, &type->command_node);
}
#define MAX_BUFFERS 8
@ -91,9 +52,6 @@ struct buffer {
};
struct data {
struct type type;
struct spa_type_map *map;
struct spa_log *log;
struct spa_loop data_loop;
@ -160,7 +118,7 @@ static int make_node(struct data *data, struct spa_node **node, const char *lib,
printf("can't make factory instance: %d\n", res);
return res;
}
if ((res = spa_handle_get_interface(handle, data->type.node, &iface)) < 0) {
if ((res = spa_handle_get_interface(handle, SPA_ID_INTERFACE_Node, &iface)) < 0) {
printf("can't get interface %d\n", res);
return res;
}
@ -227,7 +185,7 @@ static void on_source_process(void *_data, int status)
fprintf(stderr, "Couldn't lock texture: %s\n", SDL_GetError());
return;
}
datas[0].type = data->type.data.MemPtr;
datas[0].type = SPA_DATA_MemPtr;
datas[0].flags = 0;
datas[0].fd = -1;
datas[0].mapoffset = 0;
@ -244,12 +202,12 @@ static void on_source_process(void *_data, int status)
return;
}
sdata = datas[0].data;
if (datas[0].type == data->type.data.MemFd ||
datas[0].type == data->type.data.DmaBuf) {
if (datas[0].type == SPA_DATA_MemFd ||
datas[0].type == SPA_DATA_DmaBuf) {
map = mmap(NULL, datas[0].maxsize + datas[0].mapoffset, PROT_READ,
MAP_PRIVATE, datas[0].fd, 0);
sdata = SPA_MEMBER(map, datas[0].mapoffset, uint8_t);
} else if (datas[0].type == data->type.data.MemPtr) {
} else if (datas[0].type == SPA_DATA_MemPtr) {
map = NULL;
sdata = datas[0].data;
} else
@ -330,10 +288,10 @@ static int make_nodes(struct data *data, const char *device)
spa_pod_builder_init(&b, buffer, sizeof(buffer));
props = spa_pod_builder_object(&b,
0, data->type.props,
":", data->type.props_device, "s", device ? device : "/dev/video0");
0, SPA_ID_OBJECT_Props,
":", SPA_PROP_device, "s", device ? device : "/dev/video0");
if ((res = spa_node_set_param(data->source, data->type.param.idProps, 0, props)) < 0)
if ((res = spa_node_set_param(data->source, SPA_ID_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
return res;
@ -360,7 +318,7 @@ static int setup_buffers(struct data *data)
b->header.seq = 0;
b->header.pts = 0;
b->header.dts_offset = 0;
b->metas[0].type = data->type.meta.Header;
b->metas[0].type = SPA_META_Header;
b->metas[0].data = &b->header;
b->metas[0].size = sizeof(b->header);
@ -402,7 +360,7 @@ static int sdl_alloc_buffers(struct data *data)
}
b->texture = texture;
b->datas[0].type = data->type.data.MemPtr;
b->datas[0].type = SPA_DATA_MemPtr;
b->datas[0].maxsize = stride * 240;
b->datas[0].data = ptr;
b->datas[0].chunk->offset = 0;
@ -425,21 +383,21 @@ static int negotiate_formats(struct data *data)
if ((res =
spa_node_port_set_io(data->source,
SPA_DIRECTION_OUTPUT, 0,
data->type.io.Buffers,
SPA_ID_IO_Buffers,
&data->source_output[0], sizeof(data->source_output[0]))) < 0)
return res;
format = spa_pod_builder_object(&b,
0, data->type.format,
"I", data->type.media_type.video,
"I", data->type.media_subtype.raw,
":", data->type.format_video.format, "I", data->type.video_format.YUY2,
":", data->type.format_video.size, "R", &SPA_RECTANGLE(320, 240),
":", data->type.format_video.framerate, "F", &SPA_FRACTION(25,1));
0, SPA_ID_OBJECT_Format,
"I", SPA_MEDIA_TYPE_video,
"I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_VIDEO_format, "I", SPA_VIDEO_FORMAT_YUY2,
":", SPA_FORMAT_VIDEO_size, "R", &SPA_RECTANGLE(320, 240),
":", SPA_FORMAT_VIDEO_framerate, "F", &SPA_FRACTION(25,1));
if ((res = spa_node_port_set_param(data->source,
SPA_DIRECTION_OUTPUT, 0,
data->type.param.idFormat, 0,
SPA_ID_PARAM_Format, 0,
format)) < 0)
return res;
@ -539,7 +497,7 @@ static void run_async_source(struct data *data)
int err;
{
struct spa_command cmd = SPA_COMMAND_INIT(data->type.command_node.Start);
struct spa_command cmd = SPA_COMMAND_INIT(SPA_ID_COMMAND_NODE_Start);
if ((res = spa_node_send_command(data->source, &cmd)) < 0)
printf("got error %d\n", res);
}
@ -558,7 +516,7 @@ static void run_async_source(struct data *data)
}
{
struct spa_command cmd = SPA_COMMAND_INIT(data->type.command_node.Pause);
struct spa_command cmd = SPA_COMMAND_INIT(SPA_ID_COMMAND_NODE_Pause);
if ((res = spa_node_send_command(data->source, &cmd)) < 0)
printf("got error %d\n", res);
}
@ -572,7 +530,6 @@ int main(int argc, char *argv[])
data.use_buffer = true;
data.map = &default_map.map;
data.log = &default_log.log;
if ((str = getenv("SPA_DEBUG")))
@ -584,17 +541,10 @@ int main(int argc, char *argv[])
data.data_loop.remove_source = do_remove_source;
data.data_loop.invoke = do_invoke;
data.support[0].type = SPA_TYPE__TypeMap;
data.support[0].data = data.map;
data.support[1].type = SPA_TYPE__Log;
data.support[1].data = data.log;
data.support[2].type = SPA_TYPE_LOOP__DataLoop;
data.support[2].data = &data.data_loop;
data.support[3].type = SPA_TYPE_LOOP__MainLoop;
data.support[3].data = &data.data_loop;
data.n_support = 4;
init_type(&data.type, data.map);
data.support[0] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_Log, data.log);
data.support[1] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_MainLoop, &data.data_loop);
data.support[2] = SPA_SUPPORT_INIT(SPA_ID_INTERFACE_DataLoop, &data.data_loop);
data.n_support = 3;
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
printf("can't initialize SDL: %s\n", SDL_GetError());