mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-10 13:30:05 -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

4
src/gst/gstpipewiredeviceprovider.c
View file

@ -208,7 +208,7 @@ new_node (GstPipeWireDeviceProvider *self, const struct pw_node_info *info, uint
type = GST_PIPEWIRE_DEVICE_TYPE_SINK;
for (i = 0; i < info->n_input_params; i++) {
if (info->input_params[i]->body.id != t->param.idEnumFormat)
if (!spa_pod_is_object_id(info->input_params[i], t->param.idEnumFormat))
continue;
GstCaps *c1 = gst_caps_from_format (info->input_params[i], t->map);
if (c1)
@ -218,7 +218,7 @@ new_node (GstPipeWireDeviceProvider *self, const struct pw_node_info *info, uint
else if (info->max_output_ports > 0 && info->max_input_ports == 0) {
type = GST_PIPEWIRE_DEVICE_TYPE_SOURCE;
for (i = 0; i < info->n_output_params; i++) {
if (info->output_params[i]->body.id != t->param.idEnumFormat)
if (!spa_pod_is_object_id(info->output_params[i], t->param.idEnumFormat))
continue;
GstCaps *c1 = gst_caps_from_format (info->output_params[i], t->map);
if (c1)

26
src/gst/gstpipewireformat.c
View file

@ -543,7 +543,7 @@ write_pod (struct spa_pod_builder *b, const void *data, uint32_t size)
return ref;
}
static struct spa_pod_object *
static struct spa_pod *
convert_1 (GstCapsFeatures *cf, GstStructure *cs)
{
ConvertData d;
@ -568,15 +568,15 @@ convert_1 (GstCapsFeatures *cf, GstStructure *cs)
spa_pod_builder_pop (&d.b);
return SPA_MEMBER (d.b.data, 0, struct spa_pod_object);
return SPA_MEMBER (d.b.data, 0, struct spa_pod);
}
struct spa_pod_object *
struct spa_pod *
gst_caps_to_format (GstCaps *caps, guint index, struct spa_type_map *map)
{
GstCapsFeatures *f;
GstStructure *s;
struct spa_pod_object *res;
struct spa_pod *res;
g_return_val_if_fail (GST_IS_CAPS (caps), NULL);
g_return_val_if_fail (gst_caps_is_fixed (caps), NULL);
@ -596,7 +596,7 @@ foreach_func (GstCapsFeatures *features,
GstStructure *structure,
GPtrArray *array)
{
struct spa_pod_object *fmt;
struct spa_pod *fmt;
if ((fmt = convert_1 (features, structure)))
g_ptr_array_insert (array, -1, fmt);
@ -794,7 +794,7 @@ handle_fraction_prop (struct spa_pod_prop *prop, const char *key, GstCaps *res)
}
}
GstCaps *
gst_caps_from_format (const struct spa_pod_object *format, struct spa_type_map *map)
gst_caps_from_format (const struct spa_pod *format, struct spa_type_map *map)
{
GstCaps *res = NULL;
uint32_t media_type, media_subtype;
@ -808,7 +808,7 @@ gst_caps_from_format (const struct spa_pod_object *format, struct spa_type_map *
if (media_type == type.media_type.video) {
if (media_subtype == type.media_subtype.raw) {
res = gst_caps_new_empty_simple ("video/x-raw");
if ((prop = spa_pod_object_find_prop (format, type.format_video.format))) {
if ((prop = spa_pod_find_prop (format, type.format_video.format))) {
handle_id_prop (prop, "format", res);
}
}
@ -821,13 +821,13 @@ gst_caps_from_format (const struct spa_pod_object *format, struct spa_type_map *
"alignment", G_TYPE_STRING, "au",
NULL);
}
if ((prop = spa_pod_object_find_prop (format, type.format_video.size))) {
if ((prop = spa_pod_find_prop (format, type.format_video.size))) {
handle_rect_prop (prop, "width", "height", res);
}
if ((prop = spa_pod_object_find_prop (format, type.format_video.framerate))) {
if ((prop = spa_pod_find_prop (format, type.format_video.framerate))) {
handle_fraction_prop (prop, "framerate", res);
}
if ((prop = spa_pod_object_find_prop (format, type.format_video.max_framerate))) {
if ((prop = spa_pod_find_prop (format, type.format_video.max_framerate))) {
handle_fraction_prop (prop, "max-framerate", res);
}
} else if (media_type == type.media_type.audio) {
@ -835,13 +835,13 @@ gst_caps_from_format (const struct spa_pod_object *format, struct spa_type_map *
res = gst_caps_new_simple ("audio/x-raw",
"layout", G_TYPE_STRING, "interleaved",
NULL);
if ((prop = spa_pod_object_find_prop (format, type.format_audio.format))) {
if ((prop = spa_pod_find_prop (format, type.format_audio.format))) {
handle_id_prop (prop, "format", res);
}
if ((prop = spa_pod_object_find_prop (format, type.format_audio.rate))) {
if ((prop = spa_pod_find_prop (format, type.format_audio.rate))) {
handle_int_prop (prop, "rate", res);
}
if ((prop = spa_pod_object_find_prop (format, type.format_audio.channels))) {
if ((prop = spa_pod_find_prop (format, type.format_audio.channels))) {
handle_int_prop (prop, "channels", res);
}
}

6
src/gst/gstpipewireformat.h
View file

@ -27,10 +27,10 @@
G_BEGIN_DECLS
struct spa_pod_object * gst_caps_to_format (GstCaps *caps, guint index, struct spa_type_map *map);
GPtrArray * gst_caps_to_format_all (GstCaps *caps, struct spa_type_map *map);
struct spa_pod * gst_caps_to_format (GstCaps *caps, guint index, struct spa_type_map *map);
GPtrArray * gst_caps_to_format_all (GstCaps *caps, struct spa_type_map *map);
GstCaps * gst_caps_from_format (const struct spa_pod_object *format, struct spa_type_map *map);
GstCaps * gst_caps_from_format (const struct spa_pod *format, struct spa_type_map *map);
G_END_DECLS

6
src/gst/gstpipewiresink.c
View file

@ -224,7 +224,7 @@ pool_activated (GstPipeWirePool *pool, GstPipeWireSink *sink)
guint size;
guint min_buffers;
guint max_buffers;
struct spa_pod_object *port_params[3];
struct spa_pod *port_params[3];
struct spa_pod_builder b = { NULL };
uint8_t buffer[1024];
@ -580,7 +580,7 @@ on_state_changed (void *data, enum pw_stream_state old, enum pw_stream_state sta
}
static void
on_format_changed (void *data, struct spa_pod_object *format)
on_format_changed (void *data, struct spa_pod *format)
{
GstPipeWireSink *pwsink = data;
@ -618,7 +618,7 @@ gst_pipewire_sink_setcaps (GstBaseSink * bsink, GstCaps * caps)
pwsink->path,
flags,
possible->len,
(const struct spa_pod_object **) possible->pdata);
(const struct spa_pod **) possible->pdata);
while (TRUE) {
state = pw_stream_get_state (pwsink->stream, &error);

8
src/gst/gstpipewiresrc.c
View file

@ -663,7 +663,7 @@ gst_pipewire_src_negotiate (GstBaseSrc * basesrc)
pwsrc->path,
PW_STREAM_FLAG_AUTOCONNECT,
possible->len,
(const struct spa_pod_object **)possible->pdata);
(const struct spa_pod **)possible->pdata);
g_ptr_array_free (possible, TRUE);
while (TRUE) {
@ -725,8 +725,8 @@ connect_error:
#define SPA_PROP_RANGE(min,max) 2,min,max
static void
on_format_changed (void *data,
struct spa_pod_object *format)
on_format_changed (void *data,
struct spa_pod *format)
{
GstPipeWireSrc *pwsrc = data;
GstCaps *caps;
@ -746,7 +746,7 @@ on_format_changed (void *data,
gst_caps_unref (caps);
if (res) {
struct spa_pod_object *params[2];
struct spa_pod *params[2];
struct spa_pod_builder b = { NULL };
uint8_t buffer[512];