mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

filter: Use the stream DSP format to negotiate control types

Browse source 
Add OSC and UMP control types and make sure the mixer converts to the
selected format.

Mostly useful for legacy filters that use the old MIDI format, placing
the Midi control type in the format will make the mixer convert to it.
This commit is contained in:
Wim Taymans 2024-07-26 15:13:40 +02:00
parent 0c4ea83b89
commit 7f38653589
2 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/pipewire/filter.c
View file

@ -1758,17 +1758,26 @@ static void add_video_dsp_port_params(struct filter *impl, struct port *port)
SPA_FORMAT_VIDEO_format, SPA_POD_Id(SPA_VIDEO_FORMAT_DSP_F32)));
}
static void add_control_dsp_port_params(struct filter *impl, struct port *port)
static void add_control_dsp_port_params(struct filter *impl, struct port *port, uint32_t types)
{
uint8_t buffer[4096];
struct spa_pod_builder b;
struct spa_pod_frame f[1];
spa_pod_builder_init(&b, buffer, sizeof(buffer));
spa_pod_builder_push_object(&b, &f[0],
SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat);
spa_pod_builder_add(&b,
SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_application),
SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_control),
0);
if (types != 0) {
spa_pod_builder_add(&b,
SPA_FORMAT_CONTROL_types, SPA_POD_CHOICE_FLAGS_Int(types),
0);
}
add_param(impl, port, SPA_PARAM_EnumFormat, PARAM_FLAG_LOCKED,
spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_application),
SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_control)));
spa_pod_builder_pop(&b, &f[0]));
}
SPA_EXPORT
@ -1824,9 +1833,12 @@ void *pw_filter_add_port(struct pw_filter *filter,
add_audio_dsp_port_params(impl, p);
else if (spa_streq(str, "32 bit float RGBA video"))
add_video_dsp_port_params(impl, p);
else if (spa_streq(str, "8 bit raw midi") ||
spa_streq(str, "8 bit raw control"))
add_control_dsp_port_params(impl, p);
else if (spa_streq(str, "8 bit raw midi"))
add_control_dsp_port_params(impl, p, 1u << SPA_CONTROL_Midi);
else if (spa_streq(str, "8 bit raw control"))
add_control_dsp_port_params(impl, p, 0);
else if (spa_streq(str, "32 bit raw UMP"))
add_control_dsp_port_params(impl, p, 1u << SPA_CONTROL_UMP);
}
/* then override with user provided if any */
if (update_params(impl, p, SPA_ID_INVALID, params, n_params) < 0)

2
src/pipewire/stream.c
View file

@ -1992,7 +1992,7 @@ pw_stream_connect(struct pw_stream *stream,
pw_properties_set(impl->port_props, PW_KEY_FORMAT_DSP, str);
else if (impl->media_type == SPA_MEDIA_TYPE_application &&
impl->media_subtype == SPA_MEDIA_SUBTYPE_control)
pw_properties_set(impl->port_props, PW_KEY_FORMAT_DSP, "8 bit raw midi");
pw_properties_set(impl->port_props, PW_KEY_FORMAT_DSP, "32 bit raw UMP");
if (pw_properties_get(impl->port_props, PW_KEY_PORT_GROUP) == NULL)
pw_properties_set(impl->port_props, PW_KEY_PORT_GROUP, "stream.0");