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

metadata: trigger emission of properties

Browse source 
When the resource does add_listener, send a message to the proxy
to trigger an emission of properties.
Block the client until all properties have been notified, track
this with a ping event to the implementation.
This commit is contained in:
Wim Taymans 2020-04-20 11:42:50 +02:00
parent 209a5e101c
commit 0b68d65ebf
2 changed files with 89 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

92
src/modules/module-metadata/metadata.c
View file

@ -33,6 +33,7 @@ struct impl {
struct pw_metadata *metadata; struct pw_metadata *metadata;
struct pw_resource *resource; struct pw_resource *resource;
struct spa_hook resource_listener; struct spa_hook resource_listener;
int pending;
}; };
struct resource_data { struct resource_data {
@ -42,35 +43,8 @@ struct resource_data {
struct spa_hook resource_listener; struct spa_hook resource_listener;
struct spa_hook object_listener; struct spa_hook object_listener;
struct spa_hook metadata_listener; struct spa_hook metadata_listener;
}; struct spa_hook impl_resource_listener;
int pong_seq;
static int metadata_set_property(void *object,
uint32_t subject,
const char *key,
const char *type,
const char *value)
{
struct resource_data *d = object;
struct impl *impl = d->impl;
pw_log_debug("%p", impl->metadata);
pw_metadata_set_property(impl->metadata, subject, key, type, value);
return 0;
}
static int metadata_clear(void *object)
{
struct resource_data *d = object;
struct impl *impl = d->impl;
pw_log_debug("%p", impl->metadata);
pw_metadata_clear(impl->metadata);
return 0;
}
static const struct pw_metadata_methods metadata_methods = {
PW_VERSION_METADATA_METHODS,
.set_property = metadata_set_property,
.clear = metadata_clear,
}; };
#define pw_metadata_resource(r,m,v,...) \ #define pw_metadata_resource(r,m,v,...) \
@ -86,7 +60,8 @@ static int metadata_property(void *object,
const char *value) const char *value)
{ {
struct resource_data *d = object; struct resource_data *d = object;
pw_log_debug("%p", d->resource); struct impl *impl = d->impl;
if (impl->pending == 0 || d->pong_seq != 0)
pw_metadata_resource_property(d->resource, subject, key, type, value); pw_metadata_resource_property(d->resource, subject, key, type, value);
return 0; return 0;
} }
@ -96,11 +71,40 @@ static const struct pw_metadata_events metadata_events = {
.property = metadata_property, .property = metadata_property,
}; };
static int metadata_set_property(void *object,
uint32_t subject,
const char *key,
const char *type,
const char *value)
{
struct resource_data *d = object;
struct impl *impl = d->impl;
pw_metadata_set_property(impl->metadata, subject, key, type, value);
return 0;
}
static int metadata_clear(void *object)
{
struct resource_data *d = object;
struct impl *impl = d->impl;
pw_metadata_clear(impl->metadata);
return 0;
}
static const struct pw_metadata_methods metadata_methods = {
PW_VERSION_METADATA_METHODS,
.set_property = metadata_set_property,
.clear = metadata_clear,
};
static void global_unbind(void *data) static void global_unbind(void *data)
{ {
struct resource_data *d = data; struct resource_data *d = data;
if (d->resource) if (d->resource) {
spa_hook_remove(&d->metadata_listener); spa_hook_remove(&d->metadata_listener);
spa_hook_remove(&d->impl_resource_listener);
}
} }
static const struct pw_resource_events resource_events = { static const struct pw_resource_events resource_events = {
@ -108,6 +112,22 @@ static const struct pw_resource_events resource_events = {
.destroy = global_unbind, .destroy = global_unbind,
}; };
static void impl_resource_pong(void *data, int seq)
{
struct resource_data *d = data;
if (d->pong_seq == seq) {
pw_impl_client_set_busy(pw_resource_get_client(d->resource), false);
d->pong_seq = 0;
d->impl->pending--;
}
}
static const struct pw_resource_events impl_resource_events = {
PW_VERSION_RESOURCE_EVENTS,
.pong = impl_resource_pong,
};
static int static int
global_bind(void *_data, struct pw_impl_client *client, uint32_t permissions, global_bind(void *_data, struct pw_impl_client *client, uint32_t permissions,
uint32_t version, uint32_t id) uint32_t version, uint32_t id)
@ -135,11 +155,21 @@ global_bind(void *_data, struct pw_impl_client *client, uint32_t permissions,
pw_resource_add_object_listener(resource, pw_resource_add_object_listener(resource,
&data->object_listener, &data->object_listener,
&metadata_methods, data); &metadata_methods, data);
pw_impl_client_set_busy(client, true);
/* implementation events -> resource */ /* implementation events -> resource */
pw_metadata_add_listener(impl->metadata, pw_metadata_add_listener(impl->metadata,
&data->metadata_listener, &data->metadata_listener,
&metadata_events, data); &metadata_events, data);
pw_resource_add_listener(impl->resource,
&data->impl_resource_listener,
&impl_resource_events, data);
data->pong_seq = pw_resource_ping(impl->resource, data->pong_seq);
impl->pending++;
return 0; return 0;
} }

31
src/modules/module-metadata/protocol-native.c
View file

@ -39,8 +39,12 @@ static int metadata_resource_marshal_add_listener(void *object,
void *data) void *data)
{ {
struct pw_resource *resource = object; struct pw_resource *resource = object;
struct spa_pod_builder *b;
pw_resource_add_object_listener(resource, listener, events, data); pw_resource_add_object_listener(resource, listener, events, data);
return 0;
b = pw_protocol_native_begin_resource(resource, PW_METADATA_METHOD_ADD_LISTENER, NULL);
return pw_protocol_native_end_resource(resource, b);
} }
static int metadata_proxy_marshal_add_listener(void *object, static int metadata_proxy_marshal_add_listener(void *object,
@ -53,12 +57,29 @@ static int metadata_proxy_marshal_add_listener(void *object,
return 0; return 0;
} }
static int metadata_demarshal_add_listener(void *object, static int metadata_resource_demarshal_add_listener(void *object,
const struct pw_protocol_native_message *msg) const struct pw_protocol_native_message *msg)
{ {
return -ENOTSUP; return -ENOTSUP;
} }
static const struct pw_metadata_events pw_protocol_native_metadata_client_event_marshal;
static int metadata_proxy_demarshal_add_listener(void *object,
const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct spa_hook listener;
int res;
spa_zero(listener);
res = pw_proxy_notify(proxy, struct pw_metadata_methods, add_listener, 0,
&listener, &pw_protocol_native_metadata_client_event_marshal, object);
spa_hook_remove(&listener);
return res;
}
static void metadata_marshal_set_property(struct spa_pod_builder *b, uint32_t subject, static void metadata_marshal_set_property(struct spa_pod_builder *b, uint32_t subject,
const char *key, const char *type, const char *value) const char *key, const char *type, const char *value)
{ {
@ -187,7 +208,6 @@ static int metadata_proxy_marshal_property(void *object, uint32_t subject,
{ {
struct pw_proxy *proxy = object; struct pw_proxy *proxy = object;
struct spa_pod_builder *b; struct spa_pod_builder *b;
pw_log_debug(".");
b = pw_protocol_native_begin_proxy(proxy, PW_METADATA_EVENT_PROPERTY, NULL); b = pw_protocol_native_begin_proxy(proxy, PW_METADATA_EVENT_PROPERTY, NULL);
metadata_marshal_property(b, subject, key, type, value); metadata_marshal_property(b, subject, key, type, value);
return pw_protocol_native_end_proxy(proxy, b); return pw_protocol_native_end_proxy(proxy, b);
@ -198,7 +218,6 @@ static int metadata_resource_marshal_property(void *object, uint32_t subject,
{ {
struct pw_resource *resource = object; struct pw_resource *resource = object;
struct spa_pod_builder *b; struct spa_pod_builder *b;
pw_log_debug(".");
b = pw_protocol_native_begin_resource(resource, PW_METADATA_EVENT_PROPERTY, NULL); b = pw_protocol_native_begin_resource(resource, PW_METADATA_EVENT_PROPERTY, NULL);
metadata_marshal_property(b, subject, key, type, value); metadata_marshal_property(b, subject, key, type, value);
return pw_protocol_native_end_resource(resource, b); return pw_protocol_native_end_resource(resource, b);
@ -262,7 +281,7 @@ static const struct pw_metadata_methods pw_protocol_native_metadata_server_metho
static const struct pw_protocol_native_demarshal static const struct pw_protocol_native_demarshal
pw_protocol_native_metadata_client_method_demarshal[PW_METADATA_METHOD_NUM] = pw_protocol_native_metadata_client_method_demarshal[PW_METADATA_METHOD_NUM] =
{ {
[PW_METADATA_METHOD_ADD_LISTENER] = { &metadata_demarshal_add_listener, 0 }, [PW_METADATA_METHOD_ADD_LISTENER] = { &metadata_proxy_demarshal_add_listener, 0 },
[PW_METADATA_METHOD_SET_PROPERTY] = { &metadata_proxy_demarshal_set_property, 0 }, [PW_METADATA_METHOD_SET_PROPERTY] = { &metadata_proxy_demarshal_set_property, 0 },
[PW_METADATA_METHOD_CLEAR] = { &metadata_proxy_demarshal_clear, 0 }, [PW_METADATA_METHOD_CLEAR] = { &metadata_proxy_demarshal_clear, 0 },
}; };
@ -270,7 +289,7 @@ pw_protocol_native_metadata_client_method_demarshal[PW_METADATA_METHOD_NUM] =
static const struct pw_protocol_native_demarshal static const struct pw_protocol_native_demarshal
pw_protocol_native_metadata_server_method_demarshal[PW_METADATA_METHOD_NUM] = pw_protocol_native_metadata_server_method_demarshal[PW_METADATA_METHOD_NUM] =
{ {
[PW_METADATA_METHOD_ADD_LISTENER] = { &metadata_demarshal_add_listener, 0 }, [PW_METADATA_METHOD_ADD_LISTENER] = { &metadata_resource_demarshal_add_listener, 0 },
[PW_METADATA_METHOD_SET_PROPERTY] = { &metadata_resource_demarshal_set_property, 0 }, [PW_METADATA_METHOD_SET_PROPERTY] = { &metadata_resource_demarshal_set_property, 0 },
[PW_METADATA_METHOD_CLEAR] = { &metadata_resource_demarshal_clear, 0 }, [PW_METADATA_METHOD_CLEAR] = { &metadata_resource_demarshal_clear, 0 },
}; };