mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-01 22:58:50 -04:00
Unify props, params and formats
Make enum_params and set_param to configure properties, format and other parameters. This allows us to remove some duplicate code and make the properties and parameters much more extensible. Use the object id to mark the id of the parameter. Remove the spa_format and spa_props. We can now make the client-node easier by merging the various format methods into the params. Make the stream API more powerful now that we can pass params around.
This commit is contained in:
Wim Taymans
parent
b6ee67905d
commit
f3bca48398
87 changed files with 3773 additions and 3580 deletions
|
|
@ -34,7 +34,6 @@
|
|||
#include <spa/type-map-impl.h>
|
||||
#include <spa/audio/format-utils.h>
|
||||
#include <spa/format-utils.h>
|
||||
#include <spa/format-builder.h>
|
||||
|
||||
static SPA_TYPE_MAP_IMPL(default_map, 4096);
|
||||
static SPA_LOG_IMPL(default_log);
|
||||
|
|
@ -55,6 +54,7 @@ struct type {
|
|||
uint32_t props_volume;
|
||||
uint32_t props_min_latency;
|
||||
uint32_t props_live;
|
||||
struct spa_type_param param;
|
||||
struct spa_type_meta meta;
|
||||
struct spa_type_data data;
|
||||
struct spa_type_media_type media_type;
|
||||
|
|
@ -75,6 +75,7 @@ static inline void init_type(struct type *type, struct spa_type_map *map)
|
|||
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_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);
|
||||
|
|
@ -284,7 +285,7 @@ do_invoke(struct spa_loop *loop,
|
|||
static int make_nodes(struct data *data, const char *device)
|
||||
{
|
||||
int res;
|
||||
struct spa_props *props;
|
||||
struct spa_pod_object *props;
|
||||
struct spa_pod_builder b = { 0 };
|
||||
uint8_t buffer[128];
|
||||
|
||||
|
|
@ -296,14 +297,14 @@ static int make_nodes(struct data *data, const char *device)
|
|||
spa_node_set_callbacks(data->sink, &sink_callbacks, data);
|
||||
|
||||
spa_pod_builder_init(&b, buffer, sizeof(buffer));
|
||||
props = spa_pod_builder_props(&b,
|
||||
data->type.props,
|
||||
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);
|
||||
|
||||
spa_debug_pod(&props->object.pod);
|
||||
spa_debug_pod(&props->pod, 0);
|
||||
|
||||
if ((res = spa_node_set_props(data->sink, 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);
|
||||
|
||||
if ((res = make_node(data, &data->volume,
|
||||
|
|
@ -320,13 +321,13 @@ static int make_nodes(struct data *data, const char *device)
|
|||
}
|
||||
|
||||
spa_pod_builder_init(&b, buffer, sizeof(buffer));
|
||||
props = spa_pod_builder_props(&b,
|
||||
data->type.props,
|
||||
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);
|
||||
|
||||
if ((res = spa_node_set_props(data->source, props)) < 0)
|
||||
if ((res = spa_node_set_param(data->source, data->type.param.idProps, 0, props)) < 0)
|
||||
printf("got set_props error %d\n", res);
|
||||
|
||||
data->source_volume_io[0] = SPA_PORT_IO_INIT;
|
||||
|
|
@ -367,31 +368,41 @@ static int make_nodes(struct data *data, const char *device)
|
|||
|
||||
static int negotiate_formats(struct data *data)
|
||||
{
|
||||
int res;
|
||||
struct spa_format *format, *filter;
|
||||
int res, ref;
|
||||
struct spa_pod_object *format, *filter;
|
||||
uint32_t state = 0;
|
||||
struct spa_pod_builder b = { 0 };
|
||||
uint8_t buffer[256];
|
||||
uint8_t buffer[4096];
|
||||
|
||||
spa_pod_builder_init(&b, buffer, sizeof(buffer));
|
||||
filter = spa_pod_builder_format(&b,
|
||||
data->type.format,
|
||||
data->type.media_type.audio, data->type.media_subtype.raw,
|
||||
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);
|
||||
|
||||
if ((res =
|
||||
spa_node_port_enum_formats(data->sink, SPA_DIRECTION_INPUT, 0, &format, filter,
|
||||
state)) < 0)
|
||||
ref = b.offset;
|
||||
|
||||
if ((res = spa_node_port_enum_params(data->sink,
|
||||
SPA_DIRECTION_INPUT, 0,
|
||||
data->type.param.idEnumFormat, &state,
|
||||
filter, &b)) < 0)
|
||||
return res;
|
||||
|
||||
format = SPA_POD_BUILDER_DEREF(&b, ref, struct spa_pod_object);
|
||||
|
||||
if ((res = spa_node_port_set_format(data->sink, SPA_DIRECTION_INPUT, 0, 0, format)) < 0)
|
||||
|
||||
if ((res = spa_node_port_set_param(data->sink,
|
||||
SPA_DIRECTION_INPUT, 0,
|
||||
data->type.param.idFormat, 0, format)) < 0)
|
||||
return res;
|
||||
|
||||
if ((res = spa_node_port_set_format(data->volume, SPA_DIRECTION_OUTPUT, 0, 0, format)) < 0)
|
||||
if ((res = spa_node_port_set_param(data->volume,
|
||||
SPA_DIRECTION_OUTPUT, 0,
|
||||
data->type.param.idFormat, 0, format)) < 0)
|
||||
return res;
|
||||
|
||||
init_buffer(data, data->volume_buffers, data->volume_buffer, 1, BUFFER_SIZE);
|
||||
|
|
@ -404,9 +415,13 @@ static int negotiate_formats(struct data *data)
|
|||
1)) < 0)
|
||||
return res;
|
||||
|
||||
if ((res = spa_node_port_set_format(data->volume, SPA_DIRECTION_INPUT, 0, 0, format)) < 0)
|
||||
if ((res = spa_node_port_set_param(data->volume,
|
||||
SPA_DIRECTION_INPUT, 0,
|
||||
data->type.param.idFormat, 0, format)) < 0)
|
||||
return res;
|
||||
if ((res = spa_node_port_set_format(data->source, SPA_DIRECTION_OUTPUT, 0, 0, format)) < 0)
|
||||
if ((res = spa_node_port_set_param(data->source,
|
||||
SPA_DIRECTION_OUTPUT, 0,
|
||||
data->type.param.idFormat, 0, format)) < 0)
|
||||
return res;
|
||||
|
||||
init_buffer(data, data->source_buffers, data->source_buffer, 1, BUFFER_SIZE);
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
#include <spa/type-map-impl.h>
|
||||
#include <spa/audio/format-utils.h>
|
||||
#include <spa/format-utils.h>
|
||||
#include <spa/format-builder.h>
|
||||
#include <spa/graph.h>
|
||||
#include <spa/graph-scheduler1.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
#include <spa/type-map-impl.h>
|
||||
#include <spa/audio/format-utils.h>
|
||||
#include <spa/format-utils.h>
|
||||
#include <spa/format-builder.h>
|
||||
|
||||
#define USE_GRAPH
|
||||
|
||||
|
|
@ -55,6 +54,7 @@ struct type {
|
|||
uint32_t props_volume;
|
||||
uint32_t props_min_latency;
|
||||
uint32_t props_live;
|
||||
struct spa_type_param param;
|
||||
struct spa_type_meta meta;
|
||||
struct spa_type_data data;
|
||||
struct spa_type_media_type media_type;
|
||||
|
|
@ -75,6 +75,7 @@ static inline void init_type(struct type *type, struct spa_type_map *map)
|
|||
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_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);
|
||||
|
|
@ -326,7 +327,7 @@ do_invoke(struct spa_loop *loop,
|
|||
static int make_nodes(struct data *data, const char *device)
|
||||
{
|
||||
int res;
|
||||
struct spa_props *props;
|
||||
struct spa_pod_object *props;
|
||||
struct spa_pod_builder b = { 0 };
|
||||
uint8_t buffer[128];
|
||||
|
||||
|
|
@ -338,12 +339,12 @@ static int make_nodes(struct data *data, const char *device)
|
|||
spa_node_set_callbacks(data->sink, &sink_callbacks, data);
|
||||
|
||||
spa_pod_builder_init(&b, buffer, sizeof(buffer));
|
||||
props = spa_pod_builder_props(&b,
|
||||
data->type.props,
|
||||
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);
|
||||
|
||||
if ((res = spa_node_set_props(data->sink, 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);
|
||||
|
||||
if ((res = make_node(data, &data->mix,
|
||||
|
|
@ -361,13 +362,13 @@ static int make_nodes(struct data *data, const char *device)
|
|||
}
|
||||
|
||||
spa_pod_builder_init(&b, buffer, sizeof(buffer));
|
||||
props = spa_pod_builder_props(&b,
|
||||
data->type.props,
|
||||
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);
|
||||
|
||||
if ((res = spa_node_set_props(data->source1, props)) < 0)
|
||||
if ((res = spa_node_set_param(data->source1, data->type.param.idProps, 0, props)) < 0)
|
||||
printf("got set_props error %d\n", res);
|
||||
|
||||
if ((res = make_node(data, &data->source2,
|
||||
|
|
@ -378,13 +379,13 @@ static int make_nodes(struct data *data, const char *device)
|
|||
}
|
||||
|
||||
spa_pod_builder_init(&b, buffer, sizeof(buffer));
|
||||
props = spa_pod_builder_props(&b,
|
||||
data->type.props,
|
||||
props = spa_pod_builder_object(&b,
|
||||
0, data->type.props,
|
||||
":", data->type.props_freq, "d", 440.0,
|
||||
":", data->type.props_volume, "d", 0.5,
|
||||
":", data->type.props_live, "b", false);
|
||||
|
||||
if ((res = spa_node_set_props(data->source2, props)) < 0)
|
||||
if ((res = spa_node_set_param(data->source2, data->type.param.idProps, 0, props)) < 0)
|
||||
printf("got set_props error %d\n", res);
|
||||
|
||||
data->mix_ports[0] = 0;
|
||||
|
|
@ -450,29 +451,42 @@ static int make_nodes(struct data *data, const char *device)
|
|||
static int negotiate_formats(struct data *data)
|
||||
{
|
||||
int res;
|
||||
struct spa_format *format, *filter;
|
||||
uint32_t state = 0;
|
||||
struct spa_pod_object *format, *filter;
|
||||
uint32_t state = 0, ref;
|
||||
struct spa_pod_builder b = { 0 };
|
||||
uint8_t buffer[256];
|
||||
uint8_t buffer[2048];
|
||||
|
||||
spa_pod_builder_init(&b, buffer, sizeof(buffer));
|
||||
filter = spa_pod_builder_format(&b,
|
||||
data->type.format,
|
||||
data->type.media_type.audio, data->type.media_subtype.raw,
|
||||
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);
|
||||
|
||||
ref = b.offset;
|
||||
|
||||
if ((res =
|
||||
spa_node_port_enum_formats(data->sink, SPA_DIRECTION_INPUT, 0, &format, filter,
|
||||
state)) < 0)
|
||||
spa_node_port_enum_params(data->sink,
|
||||
SPA_DIRECTION_INPUT, 0,
|
||||
data->type.param.idEnumFormat, &state,
|
||||
filter, &b)) < 0)
|
||||
return res;
|
||||
|
||||
if ((res = spa_node_port_set_format(data->sink, SPA_DIRECTION_INPUT, 0, 0, format)) < 0)
|
||||
format = SPA_POD_BUILDER_DEREF(&b, ref, struct spa_pod_object);
|
||||
|
||||
if ((res = spa_node_port_set_param(data->sink,
|
||||
SPA_DIRECTION_INPUT, 0,
|
||||
data->type.param.idFormat, 0,
|
||||
format)) < 0)
|
||||
return res;
|
||||
|
||||
if ((res = spa_node_port_set_format(data->mix, SPA_DIRECTION_OUTPUT, 0, 0, format)) < 0)
|
||||
if ((res = spa_node_port_set_param(data->mix,
|
||||
SPA_DIRECTION_OUTPUT, 0,
|
||||
data->type.param.idFormat, 0,
|
||||
format)) < 0)
|
||||
return res;
|
||||
|
||||
init_buffer(data, data->mix_buffers, data->mix_buffer, 1, BUFFER_SIZE2);
|
||||
|
|
@ -486,11 +500,16 @@ static int negotiate_formats(struct data *data)
|
|||
return res;
|
||||
|
||||
if ((res =
|
||||
spa_node_port_set_format(data->mix, SPA_DIRECTION_INPUT, data->mix_ports[0], 0,
|
||||
format)) < 0)
|
||||
spa_node_port_set_param(data->mix,
|
||||
SPA_DIRECTION_INPUT, data->mix_ports[0],
|
||||
data->type.param.idFormat, 0,
|
||||
format)) < 0)
|
||||
return res;
|
||||
|
||||
if ((res = spa_node_port_set_format(data->source1, SPA_DIRECTION_OUTPUT, 0, 0, format)) < 0)
|
||||
if ((res = spa_node_port_set_param(data->source1,
|
||||
SPA_DIRECTION_OUTPUT, 0,
|
||||
data->type.param.idFormat, 0,
|
||||
format)) < 0)
|
||||
return res;
|
||||
|
||||
init_buffer(data, data->source1_buffers, data->source1_buffer, 2, BUFFER_SIZE1);
|
||||
|
|
@ -504,11 +523,16 @@ static int negotiate_formats(struct data *data)
|
|||
return res;
|
||||
|
||||
if ((res =
|
||||
spa_node_port_set_format(data->mix, SPA_DIRECTION_INPUT, data->mix_ports[1], 0,
|
||||
format)) < 0)
|
||||
spa_node_port_set_param(data->mix,
|
||||
SPA_DIRECTION_INPUT, data->mix_ports[1],
|
||||
data->type.param.idFormat, 0,
|
||||
format)) < 0)
|
||||
return res;
|
||||
|
||||
if ((res = spa_node_port_set_format(data->source2, SPA_DIRECTION_OUTPUT, 0, 0, format)) < 0)
|
||||
if ((res = spa_node_port_set_param(data->source2,
|
||||
SPA_DIRECTION_OUTPUT, 0,
|
||||
data->type.param.idFormat, 0,
|
||||
format)) < 0)
|
||||
return res;
|
||||
|
||||
init_buffer(data, data->source2_buffers, data->source2_buffer, 2, BUFFER_SIZE2);
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
#include <spa/type-map-impl.h>
|
||||
#include <spa/audio/format-utils.h>
|
||||
#include <spa/format-utils.h>
|
||||
#include <spa/format-builder.h>
|
||||
#include <spa/graph.h>
|
||||
#include <spa/graph-scheduler1.h>
|
||||
|
||||
|
|
@ -55,6 +54,7 @@ struct type {
|
|||
uint32_t props_volume;
|
||||
uint32_t props_min_latency;
|
||||
uint32_t props_live;
|
||||
struct spa_type_param param;
|
||||
struct spa_type_meta meta;
|
||||
struct spa_type_data data;
|
||||
struct spa_type_media_type media_type;
|
||||
|
|
@ -73,6 +73,7 @@ static inline void init_type(struct type *type, struct spa_type_map *map)
|
|||
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_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);
|
||||
|
|
@ -385,19 +386,26 @@ static int make_nodes(struct data *data)
|
|||
static int negotiate_formats(struct data *data)
|
||||
{
|
||||
int res;
|
||||
struct spa_format *format;
|
||||
struct spa_pod_object *format;
|
||||
struct spa_pod_builder b = { 0 };
|
||||
uint8_t buffer[256];
|
||||
|
||||
spa_pod_builder_init(&b, buffer, sizeof(buffer));
|
||||
format = spa_pod_builder_format(&b,
|
||||
data->type.format,
|
||||
data->type.media_type.binary, data->type.media_subtype.raw);
|
||||
format = spa_pod_builder_object(&b,
|
||||
0, data->type.format,
|
||||
"I", data->type.media_type.binary,
|
||||
"I", data->type.media_subtype.raw);
|
||||
|
||||
if ((res = spa_node_port_set_format(data->sink, SPA_DIRECTION_INPUT, 0, 0, format)) < 0)
|
||||
if ((res = spa_node_port_set_param(data->sink,
|
||||
SPA_DIRECTION_INPUT, 0,
|
||||
data->type.param.idFormat, 0,
|
||||
format)) < 0)
|
||||
return res;
|
||||
|
||||
if ((res = spa_node_port_set_format(data->source, SPA_DIRECTION_OUTPUT, 0, 0, format)) < 0)
|
||||
if ((res = spa_node_port_set_param(data->source,
|
||||
SPA_DIRECTION_OUTPUT, 0,
|
||||
data->type.param.idFormat, 0,
|
||||
format)) < 0)
|
||||
return res;
|
||||
|
||||
init_buffer(data, data->source_buffers, data->source_buffer, 1, BUFFER_SIZE);
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
#include <spa/node.h>
|
||||
#include <spa/loop.h>
|
||||
#include <spa/video/format-utils.h>
|
||||
#include <spa/format-builder.h>
|
||||
|
||||
#include <lib/debug.h>
|
||||
|
||||
|
|
@ -187,9 +186,12 @@ static inline void type_init(struct spa_type_map *map)
|
|||
static void do_static_struct(struct spa_type_map *map)
|
||||
{
|
||||
struct _test_format {
|
||||
struct spa_format fmt;
|
||||
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_prop prop_format SPA_ALIGNED(8);
|
||||
struct {
|
||||
uint32_t def_format;
|
||||
|
|
@ -211,9 +213,12 @@ static void do_static_struct(struct spa_type_map *map)
|
|||
} framerate_vals;
|
||||
} props;
|
||||
} test_format = {
|
||||
SPA_FORMAT_INIT(sizeof(test_format.props) + sizeof(struct spa_format_body),
|
||||
type.format, type.media_type.video, type.media_subtype.raw),
|
||||
SPA_POD_OBJECT_INIT(sizeof(test_format.props) + sizeof(struct spa_pod_object_body),
|
||||
0, type.format),
|
||||
{
|
||||
SPA_POD_ID_INIT(type.media_type.video),
|
||||
SPA_POD_ID_INIT(type.media_subtype.raw),
|
||||
|
||||
SPA_POD_PROP_INIT(sizeof(test_format.props.format_vals) +
|
||||
sizeof(struct spa_pod_prop_body),
|
||||
type.format_video.format,
|
||||
|
|
@ -245,23 +250,23 @@ static void do_static_struct(struct spa_type_map *map)
|
|||
}
|
||||
};
|
||||
|
||||
spa_debug_pod(&test_format.fmt.pod);
|
||||
spa_debug_format(&test_format.fmt);
|
||||
spa_debug_pod(&test_format.fmt.pod, 0);
|
||||
spa_debug_pod(&test_format.fmt.pod, SPA_DEBUG_FLAG_FORMAT);
|
||||
|
||||
{
|
||||
uint32_t format = -1;
|
||||
int res;
|
||||
struct spa_fraction frac = { -1, -1 };
|
||||
|
||||
res = spa_format_parse(&test_format.fmt,
|
||||
res = spa_pod_object_parse(&test_format.fmt,
|
||||
":",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_format_fixate(&test_format.fmt);
|
||||
spa_pod_object_fixate(&test_format.fmt);
|
||||
|
||||
res = spa_format_parse(&test_format.fmt,
|
||||
res = spa_pod_object_parse(&test_format.fmt,
|
||||
":",type.format_video.format, "I", &format,
|
||||
":",type.format_video.framerate, "F", &frac, NULL);
|
||||
|
||||
|
|
@ -275,7 +280,7 @@ int main(int argc, char *argv[])
|
|||
struct spa_pod_builder b = { NULL, };
|
||||
struct spa_pod_frame f[2];
|
||||
uint8_t buffer[1024];
|
||||
struct spa_format *fmt;
|
||||
struct spa_pod_object *fmt;
|
||||
struct spa_type_map *map = &default_map.map;
|
||||
|
||||
type_init(map);
|
||||
|
|
@ -283,10 +288,12 @@ int main(int argc, char *argv[])
|
|||
|
||||
spa_pod_builder_init(&b, buffer, sizeof(buffer));
|
||||
|
||||
fmt = SPA_MEMBER(buffer, spa_pod_builder_push_format(&b, &f[0], type.format,
|
||||
type.media_type.video,
|
||||
type.media_subtype.raw),
|
||||
struct spa_format);
|
||||
fmt = SPA_MEMBER(buffer, spa_pod_builder_push_object(&b, &f[0], 0, type.format),
|
||||
struct spa_pod_object);
|
||||
|
||||
spa_pod_builder_id(&b, type.media_type.video);
|
||||
spa_pod_builder_id(&b, type.media_subtype.raw);
|
||||
|
||||
spa_pod_builder_push_prop(&b, &f[1], type.format_video.format,
|
||||
SPA_POD_PROP_RANGE_ENUM | SPA_POD_PROP_FLAG_UNSET);
|
||||
spa_pod_builder_id(&b, type.video_format.I420);
|
||||
|
|
@ -312,13 +319,14 @@ int main(int argc, char *argv[])
|
|||
|
||||
spa_pod_builder_pop(&b, &f[0]);
|
||||
|
||||
spa_debug_pod(&fmt->pod);
|
||||
spa_debug_pod(&fmt->pod, 0);
|
||||
|
||||
spa_pod_builder_init(&b, buffer, sizeof(buffer));
|
||||
|
||||
fmt = spa_pod_builder_format(&b,
|
||||
type.format,
|
||||
type.media_type.video, type.media_subtype.raw,
|
||||
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,
|
||||
|
|
@ -329,8 +337,8 @@ int main(int argc, char *argv[])
|
|||
2, &SPA_FRACTION(0,1),
|
||||
&SPA_FRACTION(INT32_MAX,1));
|
||||
|
||||
spa_debug_pod(&fmt->pod);
|
||||
spa_debug_format(fmt);
|
||||
spa_debug_pod(&fmt->pod, 0);
|
||||
spa_debug_pod(&fmt->pod, SPA_DEBUG_FLAG_FORMAT);
|
||||
|
||||
spa_pod_builder_init(&b, buffer, sizeof(buffer));
|
||||
|
||||
|
|
@ -359,8 +367,8 @@ int main(int argc, char *argv[])
|
|||
&SPA_FRACTION(INT32_MAX,1),
|
||||
">", NULL);
|
||||
|
||||
spa_debug_pod(&fmt->pod);
|
||||
spa_debug_format(fmt);
|
||||
spa_debug_pod(&fmt->pod, 0);
|
||||
spa_debug_pod(&fmt->pod, SPA_DEBUG_FLAG_FORMAT);
|
||||
|
||||
do_static_struct(map);
|
||||
|
||||
|
|
|
|||
|
|
@ -89,11 +89,11 @@ int main(int argc, char *argv[])
|
|||
spa_pod_builder_pop(&b, &frame[0]);
|
||||
|
||||
obj = SPA_POD_BUILDER_DEREF(&b, frame[0].ref, struct spa_pod);
|
||||
spa_debug_pod(obj);
|
||||
spa_debug_pod(obj, 0);
|
||||
|
||||
struct spa_pod_prop *p = spa_pod_object_find_prop((struct spa_pod_object *) obj, 4);
|
||||
printf("%d %d\n", p->body.key, p->body.flags);
|
||||
spa_debug_pod(&p->body.value);
|
||||
spa_debug_pod(&p->body.value, 0);
|
||||
|
||||
obj = SPA_POD_BUILDER_DEREF(&b, frame[2].ref, struct spa_pod);
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ int main(int argc, char *argv[])
|
|||
2, &SPA_FRACTION(0,1),
|
||||
&SPA_FRACTION(INT32_MAX, 1),
|
||||
">", NULL);
|
||||
spa_debug_pod(fmt);
|
||||
spa_debug_pod(fmt, 0);
|
||||
|
||||
spa_pod_parser_pod(&prs, fmt);
|
||||
res = spa_pod_parser_get(&prs,
|
||||
|
|
@ -68,7 +68,7 @@ int main(int argc, char *argv[])
|
|||
printf("media-type:%d media-subtype:%d\n", media_type, media_subtype);
|
||||
printf("framerate:\n");
|
||||
if (pod)
|
||||
spa_debug_pod(pod);
|
||||
spa_debug_pod(pod, 0);
|
||||
printf("format: %d\n", fmt_value);
|
||||
|
||||
spa_pod_builder_init(&b, buffer, sizeof(buffer));
|
||||
|
|
@ -77,7 +77,7 @@ int main(int argc, char *argv[])
|
|||
" P", NULL,
|
||||
" [ i", 44, "i",45,"]"
|
||||
">", NULL);
|
||||
spa_debug_pod(pod);
|
||||
spa_debug_pod(pod, 0);
|
||||
|
||||
spa_pod_parser_pod(&prs, pod);
|
||||
res = spa_pod_parser_get(&prs,
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
#include <spa/type-map-impl.h>
|
||||
#include <spa/audio/format-utils.h>
|
||||
#include <spa/format-utils.h>
|
||||
#include <spa/format-builder.h>
|
||||
|
||||
#include <lib/debug.h>
|
||||
#include <lib/props.h>
|
||||
|
|
@ -49,6 +48,7 @@ struct type {
|
|||
uint32_t props_volume;
|
||||
uint32_t props_min_latency;
|
||||
uint32_t props_live;
|
||||
struct spa_type_param param;
|
||||
struct spa_type_meta meta;
|
||||
struct spa_type_data data;
|
||||
struct spa_type_media_type media_type;
|
||||
|
|
@ -69,6 +69,7 @@ static inline void init_type(struct type *type, struct spa_type_map *map)
|
|||
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_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);
|
||||
|
|
@ -275,7 +276,7 @@ do_invoke(struct spa_loop *loop,
|
|||
static int make_nodes(struct data *data, const char *device)
|
||||
{
|
||||
int res;
|
||||
struct spa_props *props;
|
||||
struct spa_pod_object *props;
|
||||
struct spa_pod_builder b = { 0 };
|
||||
uint8_t buffer[128];
|
||||
|
||||
|
|
@ -287,12 +288,12 @@ static int make_nodes(struct data *data, const char *device)
|
|||
spa_node_set_callbacks(data->sink, &sink_callbacks, data);
|
||||
|
||||
spa_pod_builder_init(&b, buffer, sizeof(buffer));
|
||||
props = spa_pod_builder_props(&b,
|
||||
data->type.props,
|
||||
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);
|
||||
|
||||
if ((res = spa_node_set_props(data->sink, 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);
|
||||
|
||||
if ((res = make_node(data, &data->source,
|
||||
|
|
@ -303,11 +304,11 @@ static int make_nodes(struct data *data, const char *device)
|
|||
}
|
||||
|
||||
spa_pod_builder_init(&b, buffer, sizeof(buffer));
|
||||
props = spa_pod_builder_props(&b,
|
||||
data->type.props,
|
||||
props = spa_pod_builder_object(&b,
|
||||
0, data->type.props,
|
||||
":", data->type.props_live, "b", false);
|
||||
|
||||
if ((res = spa_node_set_props(data->source, props)) < 0)
|
||||
if ((res = spa_node_set_param(data->source, data->type.param.idProps, 0, props)) < 0)
|
||||
printf("got set_props error %d\n", res);
|
||||
return res;
|
||||
}
|
||||
|
|
@ -315,27 +316,36 @@ static int make_nodes(struct data *data, const char *device)
|
|||
static int negotiate_formats(struct data *data)
|
||||
{
|
||||
int res;
|
||||
struct spa_format *format, *filter;
|
||||
uint32_t state = 0;
|
||||
struct spa_pod_object *format, *filter;
|
||||
uint32_t state = 0, ref;
|
||||
struct spa_pod_builder b = { 0 };
|
||||
uint8_t buffer[256];
|
||||
uint8_t buffer[4096];
|
||||
|
||||
spa_pod_builder_init(&b, buffer, sizeof(buffer));
|
||||
filter = spa_pod_builder_format(&b,
|
||||
data->type.format,
|
||||
data->type.media_type.audio, data->type.media_subtype.raw,
|
||||
|
||||
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);
|
||||
|
||||
if ((res =
|
||||
spa_node_port_enum_formats(data->sink, SPA_DIRECTION_INPUT, 0, &format, filter,
|
||||
state)) < 0)
|
||||
ref = b.offset;
|
||||
|
||||
if ((res = spa_node_port_enum_params(data->sink,
|
||||
SPA_DIRECTION_INPUT, 0,
|
||||
data->type.param.idEnumFormat, &state,
|
||||
filter, &b)) < 0)
|
||||
return res;
|
||||
|
||||
format = SPA_POD_BUILDER_DEREF(&b, ref, struct spa_pod_object);
|
||||
|
||||
if ((res = spa_node_port_set_format(data->sink, SPA_DIRECTION_INPUT, 0, 0, format)) < 0)
|
||||
if ((res = spa_node_port_set_param(data->sink,
|
||||
SPA_DIRECTION_INPUT, 0,
|
||||
data->type.param.idFormat, 0,
|
||||
format)) < 0)
|
||||
return res;
|
||||
|
||||
data->source_sink_io[0] = SPA_PORT_IO_INIT;
|
||||
|
|
@ -343,7 +353,10 @@ static int negotiate_formats(struct data *data)
|
|||
spa_node_port_set_io(data->source, SPA_DIRECTION_OUTPUT, 0, &data->source_sink_io[0]);
|
||||
spa_node_port_set_io(data->sink, SPA_DIRECTION_INPUT, 0, &data->source_sink_io[0]);
|
||||
|
||||
if ((res = spa_node_port_set_format(data->source, SPA_DIRECTION_OUTPUT, 0, 0, format)) < 0)
|
||||
if ((res = spa_node_port_set_param(data->source,
|
||||
SPA_DIRECTION_OUTPUT, 0,
|
||||
data->type.param.idFormat, 0,
|
||||
format)) < 0)
|
||||
return res;
|
||||
|
||||
init_buffer(data, data->source_buffers, data->source_buffer, 1, BUFFER_SIZE);
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <spa/node.h>
|
||||
#include <spa/loop.h>
|
||||
#include <spa/video/format-utils.h>
|
||||
#include <spa/format-builder.h>
|
||||
#include <lib/debug.h>
|
||||
#include <lib/props.h>
|
||||
|
||||
|
|
@ -46,6 +45,7 @@ struct type {
|
|||
uint32_t format;
|
||||
uint32_t props_device;
|
||||
uint32_t SDL_Texture;
|
||||
struct spa_type_param param;
|
||||
struct spa_type_meta meta;
|
||||
struct spa_type_data data;
|
||||
struct spa_type_media_type media_type;
|
||||
|
|
@ -63,6 +63,7 @@ static inline void init_type(struct type *type, struct spa_type_map *map)
|
|||
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
|
||||
type->props_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_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);
|
||||
|
|
@ -297,7 +298,7 @@ do_invoke(struct spa_loop *loop,
|
|||
static int make_nodes(struct data *data, const char *device)
|
||||
{
|
||||
int res;
|
||||
struct spa_props *props;
|
||||
struct spa_pod_object *props;
|
||||
struct spa_pod_builder b = { 0 };
|
||||
uint8_t buffer[256];
|
||||
|
||||
|
|
@ -311,11 +312,11 @@ static int make_nodes(struct data *data, const char *device)
|
|||
spa_node_set_callbacks(data->source, &source_callbacks, data);
|
||||
|
||||
spa_pod_builder_init(&b, buffer, sizeof(buffer));
|
||||
props = spa_pod_builder_props(&b,
|
||||
data->type.props,
|
||||
props = spa_pod_builder_object(&b,
|
||||
0, data->type.props,
|
||||
":", data->type.props_device, "s", device ? device : "/dev/video0");
|
||||
|
||||
if ((res = spa_node_set_props(data->source, props)) < 0)
|
||||
if ((res = spa_node_set_param(data->source, data->type.param.idProps, 0, props)) < 0)
|
||||
printf("got set_props error %d\n", res);
|
||||
|
||||
return res;
|
||||
|
|
@ -386,7 +387,7 @@ static int negotiate_formats(struct data *data)
|
|||
{
|
||||
int res;
|
||||
const struct spa_port_info *info;
|
||||
struct spa_format *format;
|
||||
struct spa_pod_object *format;
|
||||
uint8_t buffer[256];
|
||||
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
|
||||
|
||||
|
|
@ -404,15 +405,19 @@ static int negotiate_formats(struct data *data)
|
|||
return res;
|
||||
#else
|
||||
|
||||
format = spa_pod_builder_format(&b,
|
||||
data->type.format,
|
||||
data->type.media_type.video, data->type.media_subtype.raw,
|
||||
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));
|
||||
#endif
|
||||
|
||||
if ((res = spa_node_port_set_format(data->source, SPA_DIRECTION_OUTPUT, 0, 0, format)) < 0)
|
||||
if ((res = spa_node_port_set_param(data->source,
|
||||
SPA_DIRECTION_OUTPUT, 0,
|
||||
data->type.param.idFormat, 0,
|
||||
(struct spa_pod_object*)format)) < 0)
|
||||
return res;
|
||||
|
||||
if ((res = spa_node_port_get_info(data->source, SPA_DIRECTION_OUTPUT, 0, &info)) < 0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue