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

fmtconvert: fix format enumeration

Browse source 
Rework the format enumeration so that it also return the other
rate/channels, even when using a canonical format.
This commit is contained in:
Wim Taymans 2019-05-10 11:39:51 +02:00
parent 1a7fcaf9c6
commit a70fd80c2d
1 changed files with 45 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

75
spa/plugins/audioconvert/fmtconvert.c
View file

@ -324,40 +324,28 @@ static int port_enum_formats(struct spa_node *node,
*param = spa_format_audio_raw_build(builder, *param = spa_format_audio_raw_build(builder,
SPA_PARAM_EnumFormat, &port->format.info.raw); SPA_PARAM_EnumFormat, &port->format.info.raw);
} }
else if (other->have_format && other->format.info.raw.format != SPA_AUDIO_FORMAT_F32P) { else {
struct spa_audio_info info;
struct spa_pod_frame f; struct spa_pod_frame f;
struct spa_audio_info info;
info = other->format;
qsort(info.info.raw.position, info.info.raw.channels, sizeof(uint32_t), int32_cmp);
spa_pod_builder_push_object(builder, &f, spa_pod_builder_push_object(builder, &f,
SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat); SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat);
spa_pod_builder_add(builder, 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_CHOICE_ENUM_Id(4,
info.info.raw.format,
info.info.raw.format,
SPA_AUDIO_FORMAT_F32,
SPA_AUDIO_FORMAT_F32P),
SPA_FORMAT_AUDIO_rate, SPA_POD_Int(info.info.raw.rate),
SPA_FORMAT_AUDIO_channels, SPA_POD_Int(info.info.raw.channels),
0); 0);
if (!SPA_FLAG_CHECK(info.info.raw.flags, SPA_AUDIO_FLAG_UNPOSITIONED)) {
spa_pod_builder_prop(builder, SPA_FORMAT_AUDIO_position, 0); if (other->have_format)
spa_pod_builder_array(builder, sizeof(uint32_t), SPA_TYPE_Id, info = other->format;
info.info.raw.channels, info.info.raw.position); else
} info.info.raw.format = SPA_AUDIO_FORMAT_S16;
*param = spa_pod_builder_pop(builder, &f);
} else { if (info.info.raw.format == SPA_AUDIO_FORMAT_F32P ||
*param = spa_pod_builder_add_object(builder, info.info.raw.format == SPA_AUDIO_FORMAT_F32) {
SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat, spa_pod_builder_add(builder,
SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_audio), SPA_FORMAT_AUDIO_format, SPA_POD_CHOICE_ENUM_Id(18,
SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw), info.info.raw.format,
SPA_FORMAT_AUDIO_format, SPA_POD_CHOICE_ENUM_Id(18,
SPA_AUDIO_FORMAT_S16,
SPA_AUDIO_FORMAT_U8P, SPA_AUDIO_FORMAT_U8P,
SPA_AUDIO_FORMAT_U8, SPA_AUDIO_FORMAT_U8,
SPA_AUDIO_FORMAT_S16P, SPA_AUDIO_FORMAT_S16P,
@ -375,10 +363,37 @@ static int port_enum_formats(struct spa_node *node,
SPA_AUDIO_FORMAT_S24_32P, SPA_AUDIO_FORMAT_S24_32P,
SPA_AUDIO_FORMAT_S24_32, SPA_AUDIO_FORMAT_S24_32,
SPA_AUDIO_FORMAT_S24_32_OE), SPA_AUDIO_FORMAT_S24_32_OE),
SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_RANGE_Int( 0);
DEFAULT_RATE, 1, INT32_MAX), } else {
SPA_FORMAT_AUDIO_channels, SPA_POD_CHOICE_RANGE_Int( spa_pod_builder_add(builder,
DEFAULT_CHANNELS, 1, INT32_MAX)); SPA_FORMAT_AUDIO_format, SPA_POD_CHOICE_ENUM_Id(4,
info.info.raw.format,
info.info.raw.format,
SPA_AUDIO_FORMAT_F32,
SPA_AUDIO_FORMAT_F32P),
0);
}
if (other->have_format) {
spa_pod_builder_add(builder,
SPA_FORMAT_AUDIO_rate, SPA_POD_Int(info.info.raw.rate),
SPA_FORMAT_AUDIO_channels, SPA_POD_Int(info.info.raw.channels),
0);
if (!SPA_FLAG_CHECK(info.info.raw.flags, SPA_AUDIO_FLAG_UNPOSITIONED)) {
qsort(info.info.raw.position, info.info.raw.channels,
sizeof(uint32_t), int32_cmp);
spa_pod_builder_prop(builder, SPA_FORMAT_AUDIO_position, 0);
spa_pod_builder_array(builder, sizeof(uint32_t), SPA_TYPE_Id,
info.info.raw.channels, info.info.raw.position);
}
} else {
spa_pod_builder_add(builder,
SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_RANGE_Int(
DEFAULT_RATE, 1, INT32_MAX),
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: