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

Improve enum_param

Browse source 
Add an argument to pass the result param to the caller instead of
having the caller have to pick it up from the builder.
Improve docs for node, clock and monitor
Pass spa_pod everywhere instead of spa_pod_object.
Pass result argument to spa_pod_filter to make things a little
nicer.
This commit is contained in:
Wim Taymans 2017-11-13 17:57:38 +01:00
parent cd5e697e9f
commit 440f681f4b
70 changed files with 872 additions and 858 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -285,7 +285,7 @@ do_invoke(struct spa_loop *loop,
static int make_nodes(struct data *data, const char *device)
{
int res;
struct spa_pod_object *props;
struct spa_pod *props;
struct spa_pod_builder b = { 0 };
uint8_t buffer[128];
@ -302,7 +302,7 @@ static int make_nodes(struct data *data, const char *device)
":", data->type.props_device, "s", device ? device : "hw:0",
":", data->type.props_min_latency, "i", MIN_LATENCY);
spa_debug_pod(&props->pod, 0);
spa_debug_pod(props, 0);
if ((res = spa_node_set_param(data->sink, data->type.param.idProps, 0, props)) < 0)
printf("got set_props error %d\n", res);
@ -368,8 +368,8 @@ static int make_nodes(struct data *data, const char *device)
static int negotiate_formats(struct data *data)
{
int res, ref;
struct spa_pod_object *format, *filter;
int res;
struct spa_pod *format, *filter;
uint32_t state = 0;
struct spa_pod_builder b = { 0 };
uint8_t buffer[4096];
@ -384,19 +384,16 @@ static int negotiate_formats(struct data *data)
":", data->type.format_audio.rate, "i", 44100,
":", data->type.format_audio.channels, "i", 2);
ref = b.state.offset;
spa_debug_pod(&filter->pod, 0);
spa_debug_pod(filter, 0);
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,
filter, &b)) <= 0)
filter, &format, &b)) <= 0)
return -EBADF;
format = spa_pod_builder_deref(&b, ref);
spa_debug_pod(&format->pod, 0);
spa_debug_pod(format, 0);
spa_log_debug(&default_log.log, "sink set_param");
if ((res = spa_node_port_set_param(data->sink,

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

@ -329,7 +329,7 @@ do_invoke(struct spa_loop *loop,
static int make_nodes(struct data *data, const char *device)
{
int res;
struct spa_pod_object *props;
struct spa_pod *props;
struct spa_pod_builder b = { 0 };
uint8_t buffer[128];
@ -453,8 +453,8 @@ static int make_nodes(struct data *data, const char *device)
static int negotiate_formats(struct data *data)
{
int res;
struct spa_pod_object *format, *filter;
uint32_t state = 0, ref;
struct spa_pod *format, *filter;
uint32_t state = 0;
struct spa_pod_builder b = { 0 };
uint8_t buffer[2048];
@ -468,17 +468,13 @@ static int negotiate_formats(struct data *data)
":", data->type.format_audio.rate, "i", 44100,
":", data->type.format_audio.channels, "i", 2);
ref = b.state.offset;
if ((res =
spa_node_port_enum_params(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.param.idEnumFormat, &state,
filter, &b)) <= 0)
filter, &format, &b)) <= 0)
return -EBADF;
format = spa_pod_builder_deref(&b, ref);
if ((res = spa_node_port_set_param(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.param.idFormat, 0,

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

@ -388,7 +388,7 @@ static int make_nodes(struct data *data)
static int negotiate_formats(struct data *data)
{
int res;
struct spa_pod_object *format;
struct spa_pod *format;
struct spa_pod_builder b = { 0 };
uint8_t buffer[256];

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

@ -258,15 +258,15 @@ static void do_static_struct(struct spa_type_map *map)
int res;
struct spa_fraction frac = { -1, -1 };
res = spa_pod_object_parse(&test_format.fmt,
res = spa_pod_object_parse(&test_format.fmt.pod,
":",type.format_video.format, "I", &format,
":",type.format_video.framerate, "F", &frac, NULL);
printf("%d format %d num %d denom %d\n", res, format, frac.num, frac.denom);
spa_pod_object_fixate(&test_format.fmt);
spa_pod_fixate(&test_format.fmt.pod);
res = spa_pod_object_parse(&test_format.fmt,
res = spa_pod_object_parse(&test_format.fmt.pod,
":",type.format_video.format, "I", &format,
":",type.format_video.framerate, "F", &frac, NULL);

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

@ -88,7 +88,7 @@ int main(int argc, char *argv[])
spa_debug_pod(obj, 0);
struct spa_pod_prop *p = spa_pod_object_find_prop((struct spa_pod_object *) obj, 4);
struct spa_pod_prop *p = spa_pod_find_prop(obj, 4);
printf("%d %d\n", p->body.key, p->body.flags);
spa_debug_pod(&p->body.value, 0);

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

@ -277,7 +277,7 @@ do_invoke(struct spa_loop *loop,
static int make_nodes(struct data *data, const char *device)
{
int res;
struct spa_pod_object *props;
struct spa_pod *props;
struct spa_pod_builder b = { 0 };
uint8_t buffer[128];
@ -317,8 +317,8 @@ static int make_nodes(struct data *data, const char *device)
static int negotiate_formats(struct data *data)
{
int res;
struct spa_pod_object *format, *filter;
uint32_t state = 0, ref;
struct spa_pod *format, *filter;
uint32_t state = 0;
struct spa_pod_builder b = { 0 };
uint8_t buffer[4096];
@ -333,16 +333,12 @@ static int negotiate_formats(struct data *data)
":", data->type.format_audio.rate, "i", 44100,
":", data->type.format_audio.channels, "i", 2);
ref = b.state.offset;
if ((res = spa_node_port_enum_params(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.param.idEnumFormat, &state,
filter, &b)) <= 0)
filter, &format, &b)) <= 0)
return -EBADF;
format = spa_pod_builder_deref(&b, ref);
if ((res = spa_node_port_set_param(data->sink,
SPA_DIRECTION_INPUT, 0,
data->type.param.idFormat, 0,

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

@ -301,7 +301,7 @@ do_invoke(struct spa_loop *loop,
static int make_nodes(struct data *data, const char *device)
{
int res;
struct spa_pod_object *props;
struct spa_pod *props;
struct spa_pod_builder b = { 0 };
uint8_t buffer[256];
@ -390,7 +390,7 @@ static int negotiate_formats(struct data *data)
{
int res;
const struct spa_port_info *info;
struct spa_pod_object *format;
struct spa_pod *format;
uint8_t buffer[256];
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));