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

local-v4l2: fix leaks

Browse source
This commit is contained in:
Wim Taymans 2020-06-05 12:16:05 +02:00
parent ee5d6b4451
commit ade5bcb58d
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/examples/local-v4l2.c
View file

@ -64,6 +64,8 @@ struct data {
struct spa_buffer *buffers[32]; struct spa_buffer *buffers[32];
int n_buffers; int n_buffers;
struct pw_proxy *out, *in, *link;
}; };
static void handle_events(struct data *data) static void handle_events(struct data *data)
@ -334,7 +336,6 @@ static const struct spa_node_methods impl_node = {
static int make_nodes(struct data *data) static int make_nodes(struct data *data)
{ {
struct pw_properties *props; struct pw_properties *props;
struct pw_proxy *out, *in;
data->impl_node.iface = SPA_INTERFACE_INIT( data->impl_node.iface = SPA_INTERFACE_INIT(
SPA_TYPE_INTERFACE_Node, SPA_TYPE_INTERFACE_Node,
@ -353,7 +354,7 @@ static int make_nodes(struct data *data)
data->info.params = data->params; data->info.params = data->params;
data->info.n_params = SPA_N_ELEMENTS(data->params); data->info.n_params = SPA_N_ELEMENTS(data->params);
in = pw_core_export(data->core, data->in = pw_core_export(data->core,
SPA_TYPE_INTERFACE_Node, SPA_TYPE_INTERFACE_Node,
NULL, NULL,
&data->impl_node, &data->impl_node,
@ -364,7 +365,7 @@ static int make_nodes(struct data *data)
SPA_KEY_FACTORY_NAME, SPA_NAME_API_V4L2_SOURCE, SPA_KEY_FACTORY_NAME, SPA_NAME_API_V4L2_SOURCE,
NULL); NULL);
out = pw_core_create_object(data->core, data->out = pw_core_create_object(data->core,
"spa-node-factory", "spa-node-factory",
PW_TYPE_INTERFACE_Node, PW_TYPE_INTERFACE_Node,
PW_VERSION_NODE, PW_VERSION_NODE,
@ -373,8 +374,8 @@ static int make_nodes(struct data *data)
while (true) { while (true) {
if (pw_proxy_get_bound_id(out) != SPA_ID_INVALID && if (pw_proxy_get_bound_id(data->out) != SPA_ID_INVALID &&
pw_proxy_get_bound_id(in) != SPA_ID_INVALID) pw_proxy_get_bound_id(data->in) != SPA_ID_INVALID)
break; break;
pw_loop_iterate(pw_main_loop_get_loop(data->loop), -1); pw_loop_iterate(pw_main_loop_get_loop(data->loop), -1);
@ -383,11 +384,11 @@ static int make_nodes(struct data *data)
pw_properties_clear(props); pw_properties_clear(props);
pw_properties_setf(props, pw_properties_setf(props,
PW_KEY_LINK_OUTPUT_NODE, "%d", pw_proxy_get_bound_id(out)); PW_KEY_LINK_OUTPUT_NODE, "%d", pw_proxy_get_bound_id(data->out));
pw_properties_setf(props, pw_properties_setf(props,
PW_KEY_LINK_INPUT_NODE, "%d", pw_proxy_get_bound_id(in)); PW_KEY_LINK_INPUT_NODE, "%d", pw_proxy_get_bound_id(data->in));
pw_core_create_object(data->core, data->link = pw_core_create_object(data->core,
"link-factory", "link-factory",
PW_TYPE_INTERFACE_Link, PW_TYPE_INTERFACE_Link,
PW_VERSION_LINK, PW_VERSION_LINK,
@ -437,8 +438,12 @@ int main(int argc, char *argv[])
pw_main_loop_run(data.loop); pw_main_loop_run(data.loop);
pw_proxy_destroy(data.link);
pw_proxy_destroy(data.in);
pw_proxy_destroy(data.out);
pw_context_destroy(data.context); pw_context_destroy(data.context);
pw_main_loop_destroy(data.loop); pw_main_loop_destroy(data.loop);
pw_deinit();
return 0; return 0;
} }