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

filter: Initialize info before adding params

Browse source 
First initialize the port and node info, then add the params so that
the param_info flags are updated correctly. Otherwise, adding the
params would make the param readable but the init of the param_info
later would reset it back to 0 and the param would not be visible.
This commit is contained in:
Wim Taymans 2021-06-22 09:21:04 +02:00
parent 83b198215d
commit 368a12b6e9
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/pipewire/filter.c
View file

@ -1492,6 +1492,23 @@ void *pw_filter_add_port(struct pw_filter *filter,
p->props = props; p->props = props;
p->flags = flags; p->flags = flags;
p->change_mask_all = SPA_PORT_CHANGE_MASK_FLAGS |
SPA_PORT_CHANGE_MASK_PROPS;
p->info = SPA_PORT_INFO_INIT();
p->info.flags = 0;
if (SPA_FLAG_IS_SET(flags, PW_FILTER_PORT_FLAG_ALLOC_BUFFERS))
p->info.flags |= SPA_PORT_FLAG_CAN_ALLOC_BUFFERS;
p->info.props = &p->props->dict;
p->change_mask_all |= SPA_PORT_CHANGE_MASK_PARAMS;
p->params[IDX_EnumFormat] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, 0);
p->params[IDX_Meta] = SPA_PARAM_INFO(SPA_PARAM_Meta, 0);
p->params[IDX_IO] = SPA_PARAM_INFO(SPA_PARAM_IO, 0);
p->params[IDX_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
p->params[IDX_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
p->params[IDX_Latency] = SPA_PARAM_INFO(SPA_PARAM_Latency, SPA_PARAM_INFO_WRITE);
p->info.params = p->params;
p->info.n_params = N_PORT_PARAMS;
/* first configure default params */ /* first configure default params */
add_port_params(impl, p); add_port_params(impl, p);
if ((str = pw_properties_get(props, PW_KEY_FORMAT_DSP)) != NULL) { if ((str = pw_properties_get(props, PW_KEY_FORMAT_DSP)) != NULL) {
@ -1507,23 +1524,6 @@ void *pw_filter_add_port(struct pw_filter *filter,
if (update_params(impl, p, SPA_ID_INVALID, params, n_params) < 0) if (update_params(impl, p, SPA_ID_INVALID, params, n_params) < 0)
goto error_free; goto error_free;
p->change_mask_all = SPA_PORT_CHANGE_MASK_FLAGS |
SPA_PORT_CHANGE_MASK_PROPS;
p->info = SPA_PORT_INFO_INIT();
p->info.flags = 0;
if (SPA_FLAG_IS_SET(flags, PW_FILTER_PORT_FLAG_ALLOC_BUFFERS))
p->info.flags |= SPA_PORT_FLAG_CAN_ALLOC_BUFFERS;
p->info.props = &p->props->dict;
p->change_mask_all |= SPA_PORT_CHANGE_MASK_PARAMS;
p->params[IDX_EnumFormat] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
p->params[IDX_Meta] = SPA_PARAM_INFO(SPA_PARAM_Meta, 0);
p->params[IDX_IO] = SPA_PARAM_INFO(SPA_PARAM_IO, 0);
p->params[IDX_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
p->params[IDX_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
p->params[IDX_Latency] = SPA_PARAM_INFO(SPA_PARAM_Latency, SPA_PARAM_INFO_WRITE);
p->info.params = p->params;
p->info.n_params = N_PORT_PARAMS;
emit_port_info(impl, p, true); emit_port_info(impl, p, true);
return p->user_data; return p->user_data;