mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

More type fixes

Browse source 
Param ids and IO ids are now simple enums.
Move some type info in one place, delete some type-info files
Fix type debug
Make audio layout an enum
Mark more enums as enums in types so they show us with their names in
the debug.
This commit is contained in:
Wim Taymans 2018-08-25 12:08:29 +02:00
parent 93a8747a44
commit d26aecfef2
82 changed files with 869 additions and 1118 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,6 @@
#include <spa/param/param.h>
#include <spa/param/props.h>
#include <spa/param/audio/format-utils.h>
#include <spa/param/io.h>
#define M_PI_M2 ( M_PI + M_PI )

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

@ -35,7 +35,6 @@
#include <spa/param/param.h>
#include <spa/param/props.h>
#include <spa/param/audio/format-utils.h>
#include <spa/param/io.h>
#define M_PI_M2 ( M_PI + M_PI )
@ -281,7 +280,7 @@ static int make_nodes(struct data *data, const char *device)
spa_debug_pod(0, spa_debug_types, props);
if ((res = spa_node_set_param(data->sink, SPA_ID_PARAM_Props, 0, props)) < 0)
if ((res = spa_node_set_param(data->sink, SPA_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
if ((res = make_node(data, &data->source,
@ -301,7 +300,7 @@ static int make_nodes(struct data *data, const char *device)
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, SPA_ID_PARAM_Props, 0, props)) < 0)
if ((res = spa_node_set_param(data->source, SPA_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
#if 0
@ -344,11 +343,11 @@ static int make_nodes(struct data *data, const char *device)
spa_node_port_set_io(data->source,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&data->source_sink_io[0], sizeof(data->source_sink_io[0]));
spa_node_port_set_io(data->sink,
SPA_DIRECTION_INPUT, 0,
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&data->source_sink_io[0], sizeof(data->source_sink_io[0]));
spa_graph_node_init(&data->source_node, &data->source_state);
@ -382,7 +381,7 @@ static int negotiate_formats(struct data *data)
"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_layout, "I", SPA_AUDIO_LAYOUT_INTERLEAVED,
":", SPA_FORMAT_AUDIO_rate, "i", 44100,
":", SPA_FORMAT_AUDIO_channels, "i", 2);
@ -391,7 +390,7 @@ static int negotiate_formats(struct data *data)
spa_log_debug(&default_log.log, "enum_params");
if ((res = spa_node_port_enum_params(data->sink,
SPA_DIRECTION_INPUT, 0,
SPA_ID_PARAM_EnumFormat, &state,
SPA_PARAM_EnumFormat, &state,
filter, &format, &b)) <= 0)
return -EBADF;
@ -400,12 +399,12 @@ static int negotiate_formats(struct data *data)
spa_log_debug(&default_log.log, "sink set_param");
if ((res = spa_node_port_set_param(data->sink,
SPA_DIRECTION_INPUT, 0,
SPA_ID_PARAM_Format, 0, format)) < 0)
SPA_PARAM_Format, 0, format)) < 0)
return res;
if ((res = spa_node_port_set_param(data->source,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_PARAM_Format, 0, format)) < 0)
SPA_PARAM_Format, 0, format)) < 0)
return res;
init_buffer(data, data->source_buffers, data->source_buffer, 1, BUFFER_SIZE);

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

@ -211,13 +211,13 @@ static int negotiate_formats(struct data *data)
"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_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,
SPA_ID_PARAM_Format, 0,
SPA_PARAM_Format, 0,
format)) < 0)
return res;
@ -226,11 +226,11 @@ static int negotiate_formats(struct data *data)
spa_node_port_set_io(data->conv,
SPA_DIRECTION_INPUT, 0,
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&data->io_in[0], sizeof(data->io_in[0]));
spa_node_port_set_io(data->conv,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&data->io_out[0], sizeof(data->io_out[0]));
@ -240,14 +240,14 @@ static int negotiate_formats(struct data *data)
"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_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,
SPA_ID_PARAM_Format, 0,
SPA_PARAM_Format, 0,
format)) < 0)
return res;
@ -267,7 +267,7 @@ static int negotiate_buffers(struct data *data)
state = 0;
if ((res = spa_node_port_enum_params(data->conv,
SPA_DIRECTION_INPUT, 0,
SPA_ID_PARAM_Buffers, &state,
SPA_PARAM_Buffers, &state,
NULL, &param, &b)) <= 0)
return -EBADF;
@ -284,7 +284,7 @@ static int negotiate_buffers(struct data *data)
state = 0;
if ((res = spa_node_port_enum_params(data->conv,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_PARAM_Buffers, &state,
SPA_PARAM_Buffers, &state,
NULL, &param, &b)) <= 0)
return -EBADF;

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

@ -32,7 +32,6 @@
#include <spa/node/io.h>
#include <spa/buffer/alloc.h>
#include <spa/param/param.h>
#include <spa/param/buffers.h>
#include <spa/param/props.h>
#include <spa/param/audio/format-utils.h>
#include <spa/debug/pod.h>
@ -174,7 +173,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,
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&link->io, sizeof(link->io));
}
if (in_node != NULL) {
@ -183,7 +182,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,
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&link->io, sizeof(link->io));
}
return 0;
@ -213,7 +212,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,
SPA_ID_PARAM_EnumFormat, &state,
SPA_PARAM_EnumFormat, &state,
filter, &format, &b)) <= 0)
return -ENOTSUP;
@ -223,7 +222,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,
SPA_ID_PARAM_EnumFormat, &state,
SPA_PARAM_EnumFormat, &state,
filter, &format, &b)) <= 0)
return -ENOTSUP;
@ -236,14 +235,14 @@ static int negotiate_link_format(struct data *data, struct link *link, struct sp
if (link->out_node != NULL) {
if ((res = spa_node_port_set_param(link->out_node->node,
SPA_DIRECTION_OUTPUT, link->out_port,
SPA_ID_PARAM_Format, 0,
SPA_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,
SPA_ID_PARAM_Format, 0,
SPA_PARAM_Format, 0,
filter)) < 0)
return res;
}
@ -263,7 +262,7 @@ static int negotiate_formats(struct data *data)
"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_layout, "I", SPA_AUDIO_LAYOUT_INTERLEAVED,
":", SPA_FORMAT_AUDIO_rate, "i", 44100,
":", SPA_FORMAT_AUDIO_channels, "i", 2);
@ -276,7 +275,7 @@ static int negotiate_formats(struct data *data)
"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_layout, "I", SPA_AUDIO_LAYOUT_NON_INTERLEAVED,
":", SPA_FORMAT_AUDIO_rate, "i", 48000,
":", SPA_FORMAT_AUDIO_channels, "i", 1);
@ -311,7 +310,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,
SPA_ID_PARAM_Buffers, &state,
SPA_PARAM_Buffers, &state,
param, &param, &b)) <= 0)
return -ENOTSUP;
}
@ -319,7 +318,7 @@ 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,
SPA_ID_PARAM_Buffers, &state,
SPA_PARAM_Buffers, &state,
param, &param, &b)) <= 0)
return -ENOTSUP;
}

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

@ -263,7 +263,7 @@ static int make_nodes(struct data *data, const char *device)
spa_debug_pod(0, spa_debug_types, props);
if ((res = spa_node_set_param(data->sink, SPA_ID_PARAM_Props, 0, props)) < 0)
if ((res = spa_node_set_param(data->sink, SPA_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
if ((res = make_node(data, &data->volume,
@ -286,7 +286,7 @@ static int make_nodes(struct data *data, const char *device)
":", SPA_PROP_volume, "d", 0.5,
":", SPA_PROP_live, "b", false);
if ((res = spa_node_set_param(data->source, SPA_ID_PARAM_Props, 0, props)) < 0)
if ((res = spa_node_set_param(data->source, SPA_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
data->source_volume_io[0] = SPA_IO_BUFFERS_INIT;
@ -294,19 +294,19 @@ static int make_nodes(struct data *data, const char *device)
spa_node_port_set_io(data->source,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&data->source_volume_io[0], sizeof(data->source_volume_io[0]));
spa_node_port_set_io(data->volume,
SPA_DIRECTION_INPUT, 0,
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&data->source_volume_io[0], sizeof(data->source_volume_io[0]));
spa_node_port_set_io(data->volume,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&data->volume_sink_io[0], sizeof(data->volume_sink_io[0]));
spa_node_port_set_io(data->sink,
SPA_DIRECTION_INPUT, 0,
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&data->volume_sink_io[0], sizeof(data->volume_sink_io[0]));
spa_graph_node_init(&data->source_node, &data->source_state);
@ -351,7 +351,7 @@ static int negotiate_formats(struct data *data)
"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_layout, "I", SPA_AUDIO_LAYOUT_INTERLEAVED,
":", SPA_FORMAT_AUDIO_rate, "i", 44100,
":", SPA_FORMAT_AUDIO_channels, "i", 2);
@ -360,7 +360,7 @@ static int negotiate_formats(struct data *data)
spa_log_debug(&default_log.log, "enum_params");
if ((res = spa_node_port_enum_params(data->sink,
SPA_DIRECTION_INPUT, 0,
SPA_ID_PARAM_EnumFormat, &state,
SPA_PARAM_EnumFormat, &state,
filter, &format, &b)) <= 0)
return -EBADF;
@ -369,13 +369,13 @@ static int negotiate_formats(struct data *data)
spa_log_debug(&default_log.log, "sink set_param");
if ((res = spa_node_port_set_param(data->sink,
SPA_DIRECTION_INPUT, 0,
SPA_ID_PARAM_Format, 0, format)) < 0)
SPA_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,
SPA_ID_PARAM_Format, 0, format)) < 0)
SPA_PARAM_Format, 0, format)) < 0)
return res;
init_buffer(data, data->volume_buffers, data->volume_buffer, 1, BUFFER_SIZE);
@ -390,11 +390,11 @@ static int negotiate_formats(struct data *data)
if ((res = spa_node_port_set_param(data->volume,
SPA_DIRECTION_INPUT, 0,
SPA_ID_PARAM_Format, 0, format)) < 0)
SPA_PARAM_Format, 0, format)) < 0)
return res;
if ((res = spa_node_port_set_param(data->source,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_PARAM_Format, 0, format)) < 0)
SPA_PARAM_Format, 0, format)) < 0)
return res;
init_buffer(data, data->source_buffers, data->source_buffer, 1, BUFFER_SIZE);

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

@ -323,7 +323,7 @@ static int make_nodes(struct data *data, const char *device)
":", SPA_PROP_device, "s", device ? device : "hw:0",
":", SPA_PROP_minLatency, "i", MIN_LATENCY);
if ((res = spa_node_set_param(data->sink, SPA_ID_PARAM_Props, 0, props)) < 0)
if ((res = spa_node_set_param(data->sink, SPA_PARAM_Props, 0, props)) < 0)
error(0, -res, "set_param props");
if ((res = make_node(data, &data->mix,
@ -342,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,
SPA_ID_PARAM_Props, SPA_ID_OBJECT_Props,
SPA_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, SPA_ID_PARAM_Props, 0, props)) < 0)
if ((res = spa_node_set_param(data->source1, SPA_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
if ((res = make_node(data, &data->source2,
@ -359,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,
SPA_ID_PARAM_Props, SPA_ID_OBJECT_Props,
SPA_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, SPA_ID_PARAM_Props, 0, props)) < 0)
if ((res = spa_node_set_param(data->source2, SPA_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
data->mix_ports[0] = 0;
@ -381,27 +381,27 @@ static int make_nodes(struct data *data, const char *device)
spa_node_port_set_io(data->source1,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&data->source1_mix_io[0], sizeof(data->source1_mix_io[0]));
spa_node_port_set_io(data->source2,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_IO_Buffers,
SPA_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],
SPA_ID_IO_Buffers,
SPA_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],
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&data->source2_mix_io[0], sizeof(data->source2_mix_io[0]));
spa_node_port_set_io(data->mix,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&data->mix_sink_io[0], sizeof(data->mix_sink_io[0]));
spa_node_port_set_io(data->sink,
SPA_DIRECTION_INPUT, 0,
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&data->mix_sink_io[0], sizeof(data->mix_sink_io[0]));
data->ctrl_volume[0] = SPA_POD_DOUBLE_INIT(0.5);
@ -477,26 +477,26 @@ static int negotiate_formats(struct data *data)
"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_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,
SPA_ID_PARAM_EnumFormat, &state,
SPA_PARAM_EnumFormat, &state,
filter, &format, &b)) <= 0)
return -EBADF;
if ((res = spa_node_port_set_param(data->sink,
SPA_DIRECTION_INPUT, 0,
SPA_ID_PARAM_Format, 0,
SPA_PARAM_Format, 0,
format)) < 0)
return res;
if ((res = spa_node_port_set_param(data->mix,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_PARAM_Format, 0,
SPA_PARAM_Format, 0,
format)) < 0)
return res;
@ -511,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],
SPA_ID_PARAM_Format, 0,
SPA_PARAM_Format, 0,
format)) < 0)
return res;
if ((res = spa_node_port_set_param(data->source1,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_PARAM_Format, 0,
SPA_PARAM_Format, 0,
format)) < 0)
return res;
@ -534,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],
SPA_ID_PARAM_Format, 0,
SPA_PARAM_Format, 0,
format)) < 0)
return res;
if ((res = spa_node_port_set_param(data->source2,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_PARAM_Format, 0,
SPA_PARAM_Format, 0,
format)) < 0)
return res;

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

@ -324,11 +324,11 @@ static int make_nodes(struct data *data)
spa_node_port_set_io(data->source,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&data->source_sink_io[0], sizeof(data->source_sink_io[0]));
spa_node_port_set_io(data->sink,
SPA_DIRECTION_INPUT, 0,
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&data->source_sink_io[0], sizeof(data->source_sink_io[0]));
spa_graph_node_init(&data->source_node, &data->source_state);
@ -365,13 +365,13 @@ static int negotiate_formats(struct data *data)
if ((res = spa_node_port_set_param(data->sink,
SPA_DIRECTION_INPUT, 0,
SPA_ID_PARAM_Format, 0,
SPA_PARAM_Format, 0,
format)) < 0)
return res;
if ((res = spa_node_port_set_param(data->source,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_PARAM_Format, 0,
SPA_PARAM_Format, 0,
format)) < 0)
return res;

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

@ -170,8 +170,8 @@ static void do_static_struct(void)
struct spa_pod_object fmt;
struct {
struct spa_pod_id media_type SPA_ALIGNED(8);
struct spa_pod_id media_subtype SPA_ALIGNED(8);
struct spa_pod_enum media_type SPA_ALIGNED(8);
struct spa_pod_enum media_subtype SPA_ALIGNED(8);
struct spa_pod_prop prop_format SPA_ALIGNED(8);
struct {
@ -197,8 +197,8 @@ static void do_static_struct(void)
SPA_POD_OBJECT_INIT(sizeof(test_format.props) + sizeof(struct spa_pod_object_body),
0, SPA_ID_OBJECT_Format),
{
SPA_POD_ID_INIT(SPA_MEDIA_TYPE_video),
SPA_POD_ID_INIT(SPA_MEDIA_SUBTYPE_raw),
SPA_POD_ENUM_INIT(SPA_MEDIA_TYPE_video),
SPA_POD_ENUM_INIT(SPA_MEDIA_SUBTYPE_raw),
SPA_POD_PROP_INIT(sizeof(test_format.props.format_vals) +
sizeof(struct spa_pod_prop_body),
@ -266,14 +266,14 @@ int main(int argc, char *argv[])
spa_pod_builder_push_object(&b, 0, SPA_ID_OBJECT_Format);
spa_pod_builder_id(&b, SPA_MEDIA_TYPE_video);
spa_pod_builder_id(&b, SPA_MEDIA_SUBTYPE_raw);
spa_pod_builder_enum(&b, SPA_MEDIA_TYPE_video);
spa_pod_builder_enum(&b, SPA_MEDIA_SUBTYPE_raw);
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, 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_enum(&b, SPA_VIDEO_FORMAT_I420);
spa_pod_builder_enum(&b, SPA_VIDEO_FORMAT_I420);
spa_pod_builder_enum(&b, SPA_VIDEO_FORMAT_YUY2);
spa_pod_builder_pop(&b);
struct spa_rectangle size_min_max[] = { {1, 1}, {INT32_MAX, INT32_MAX} };

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

@ -240,7 +240,7 @@ static int make_nodes(struct data *data, const char *device)
":", SPA_PROP_device, "s", device ? device : "hw:0",
":", SPA_PROP_minLatency, "i", 64);
if ((res = spa_node_set_param(data->sink, SPA_ID_PARAM_Props, 0, props)) < 0)
if ((res = spa_node_set_param(data->sink, SPA_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
if ((res = make_node(data, &data->source,
@ -255,7 +255,7 @@ static int make_nodes(struct data *data, const char *device)
0, SPA_ID_OBJECT_Props,
":", SPA_PROP_live, "b", false);
if ((res = spa_node_set_param(data->source, SPA_ID_PARAM_Props, 0, props)) < 0)
if ((res = spa_node_set_param(data->source, SPA_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
return res;
}
@ -275,19 +275,19 @@ static int negotiate_formats(struct data *data)
"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_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,
SPA_ID_PARAM_EnumFormat, &state,
SPA_PARAM_EnumFormat, &state,
filter, &format, &b)) <= 0)
return -EBADF;
if ((res = spa_node_port_set_param(data->sink,
SPA_DIRECTION_INPUT, 0,
SPA_ID_PARAM_Format, 0,
SPA_PARAM_Format, 0,
format)) < 0)
return res;
@ -295,16 +295,16 @@ static int negotiate_formats(struct data *data)
spa_node_port_set_io(data->source,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&data->source_sink_io[0], sizeof(data->source_sink_io[0]));
spa_node_port_set_io(data->sink,
SPA_DIRECTION_INPUT, 0,
SPA_ID_IO_Buffers,
SPA_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,
SPA_ID_PARAM_Format, 0,
SPA_PARAM_Format, 0,
format)) < 0)
return res;

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

@ -291,7 +291,7 @@ static int make_nodes(struct data *data, const char *device)
0, SPA_ID_OBJECT_Props,
":", SPA_PROP_device, "s", device ? device : "/dev/video0");
if ((res = spa_node_set_param(data->source, SPA_ID_PARAM_Props, 0, props)) < 0)
if ((res = spa_node_set_param(data->source, SPA_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
return res;
@ -383,7 +383,7 @@ static int negotiate_formats(struct data *data)
if ((res =
spa_node_port_set_io(data->source,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_IO_Buffers,
SPA_IO_Buffers,
&data->source_output[0], sizeof(data->source_output[0]))) < 0)
return res;
@ -397,7 +397,7 @@ static int negotiate_formats(struct data *data)
if ((res = spa_node_port_set_param(data->source,
SPA_DIRECTION_OUTPUT, 0,
SPA_ID_PARAM_Format, 0,
SPA_PARAM_Format, 0,
format)) < 0)
return res;