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

channelmix: fix enum_params

Browse source 
0 should be returned when enum is done or else we loop forever.
This commit is contained in:
Wim Taymans 2020-05-13 15:38:56 +02:00
parent b4112968cf
commit 498cb91750
1 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

47
spa/plugins/audioconvert/channelmix.c
View file

@ -497,36 +497,40 @@ static int port_enum_formats(void *object,
struct spa_pod_builder *builder) struct spa_pod_builder *builder)
{ {
struct impl *this = object; struct impl *this = object;
struct port *other;
if (IS_CONTROL_PORT(this, direction, port_id)) {
*param = spa_pod_builder_add_object(builder,
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));
return 1;
}
other = GET_PORT(this, SPA_DIRECTION_REVERSE(direction), 0);
switch (index) { switch (index) {
case 0: case 0:
if (other->have_format) { if (IS_CONTROL_PORT(this, direction, port_id)) {
*param = spa_pod_builder_add_object(builder, *param = spa_pod_builder_add_object(builder,
SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_audio), SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_application),
SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw), SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_control));
SPA_FORMAT_AUDIO_format, SPA_POD_Id(SPA_AUDIO_FORMAT_F32P),
SPA_FORMAT_AUDIO_rate, SPA_POD_Int(other->format.info.raw.rate),
SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(DEFAULT_CHANNELS, 1, INT32_MAX));
} else { } else {
*param = spa_pod_builder_add_object(builder, struct spa_pod_frame f;
SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat, struct port *other;
other = GET_PORT(this, SPA_DIRECTION_REVERSE(direction), 0);
spa_pod_builder_push_object(builder, &f,
SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat);
spa_pod_builder_add(builder,
SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_audio), SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_audio),
SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw), SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
SPA_FORMAT_AUDIO_format, SPA_POD_Id(SPA_AUDIO_FORMAT_F32P), SPA_FORMAT_AUDIO_format, SPA_POD_Id(SPA_AUDIO_FORMAT_F32P),
SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_RANGE_Int(DEFAULT_RATE, 1, INT32_MAX), 0);
SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(DEFAULT_CHANNELS, 1, INT32_MAX)); if (other->have_format) {
spa_pod_builder_add(builder,
SPA_FORMAT_AUDIO_rate, SPA_POD_Int(other->format.info.raw.rate),
0);
} else {
spa_pod_builder_add(builder,
SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_RANGE_Int(DEFAULT_RATE, 1, INT32_MAX),
0);
}
spa_pod_builder_add(builder,
SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int(DEFAULT_CHANNELS, 1, INT32_MAX),
0);
*param = spa_pod_builder_pop(builder, &f);
} }
break; break;
default: default:
@ -954,6 +958,7 @@ static int channelmix_process_control(struct impl *this, struct port *ctrlport,
spa_log_trace_fp(this->log, NAME " %p: remain %d", this, avail_samples); spa_log_trace_fp(this->log, NAME " %p: remain %d", this, avail_samples);
if (avail_samples > 0) if (avail_samples > 0)
channelmix_process(&this->mix, n_dst, dst, n_src, src, avail_samples); channelmix_process(&this->mix, n_dst, dst, n_src, src, avail_samples);
return 1; return 1;
} }