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

Don't advertize formats we don't yet support

Browse source 
We don't handle the reverse endian formats yet so make sure we
don't advertize them.
This commit is contained in:
Wim Taymans 2021-02-05 12:12:44 +01:00
parent 4f28edd4f7
commit 972e740519
4 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pipewire-alsa/alsa-plugins/pcm_pipewire.c
View file

@ -808,16 +808,21 @@ static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw, int rate,
SND_PCM_ACCESS_RW_NONINTERLEAVED SND_PCM_ACCESS_RW_NONINTERLEAVED
}; };
unsigned int format_list[] = { unsigned int format_list[] = {
#if __BYTE_ORDER == __LITTLE_ENDIAN
SND_PCM_FORMAT_FLOAT_LE, SND_PCM_FORMAT_FLOAT_LE,
SND_PCM_FORMAT_FLOAT_BE,
SND_PCM_FORMAT_S32_LE, SND_PCM_FORMAT_S32_LE,
SND_PCM_FORMAT_S32_BE,
SND_PCM_FORMAT_S16_LE,
SND_PCM_FORMAT_S16_BE,
SND_PCM_FORMAT_S24_LE, SND_PCM_FORMAT_S24_LE,
SND_PCM_FORMAT_S24_3LE,
SND_PCM_FORMAT_S24_3BE,
SND_PCM_FORMAT_S16_LE,
#elif __BYTE_ORDER == __BIG_ENDIAN
SND_PCM_FORMAT_FLOAT_BE,
SND_PCM_FORMAT_S32_BE,
SND_PCM_FORMAT_S24_BE, SND_PCM_FORMAT_S24_BE,
SND_PCM_FORMAT_S24_3LE, SND_PCM_FORMAT_S24_3LE,
SND_PCM_FORMAT_S24_3BE, SND_PCM_FORMAT_S24_3BE,
SND_PCM_FORMAT_S16_BE,
#endif
SND_PCM_FORMAT_U8, SND_PCM_FORMAT_U8,
}; };
int min_rate; int min_rate;

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

@ -373,23 +373,19 @@ static int port_enum_formats(void *object,
info.info.raw.format == SPA_AUDIO_FORMAT_F32P || info.info.raw.format == SPA_AUDIO_FORMAT_F32P ||
info.info.raw.format == SPA_AUDIO_FORMAT_F32) { info.info.raw.format == SPA_AUDIO_FORMAT_F32) {
spa_pod_builder_add(builder, spa_pod_builder_add(builder,
SPA_FORMAT_AUDIO_format, SPA_POD_CHOICE_ENUM_Id(18, SPA_FORMAT_AUDIO_format, SPA_POD_CHOICE_ENUM_Id(14,
info.info.raw.format, info.info.raw.format,
SPA_AUDIO_FORMAT_F32P, SPA_AUDIO_FORMAT_F32P,
SPA_AUDIO_FORMAT_F32, SPA_AUDIO_FORMAT_F32,
SPA_AUDIO_FORMAT_F32_OE,
SPA_AUDIO_FORMAT_S32P, SPA_AUDIO_FORMAT_S32P,
SPA_AUDIO_FORMAT_S32, SPA_AUDIO_FORMAT_S32,
SPA_AUDIO_FORMAT_S32_OE,
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_S24P, SPA_AUDIO_FORMAT_S24P,
SPA_AUDIO_FORMAT_S24, SPA_AUDIO_FORMAT_S24,
SPA_AUDIO_FORMAT_S24_OE, SPA_AUDIO_FORMAT_S24_OE,
SPA_AUDIO_FORMAT_S16P, SPA_AUDIO_FORMAT_S16P,
SPA_AUDIO_FORMAT_S16, SPA_AUDIO_FORMAT_S16,
SPA_AUDIO_FORMAT_S16_OE,
SPA_AUDIO_FORMAT_U8P, SPA_AUDIO_FORMAT_U8P,
SPA_AUDIO_FORMAT_U8), SPA_AUDIO_FORMAT_U8),
0); 0);

6
spa/plugins/audioconvert/merger.c
View file

@ -446,23 +446,19 @@ static int port_enum_formats(void *object,
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_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(18, SPA_FORMAT_AUDIO_format, SPA_POD_CHOICE_ENUM_Id(14,
SPA_AUDIO_FORMAT_F32P, SPA_AUDIO_FORMAT_F32P,
SPA_AUDIO_FORMAT_F32P, SPA_AUDIO_FORMAT_F32P,
SPA_AUDIO_FORMAT_F32, SPA_AUDIO_FORMAT_F32,
SPA_AUDIO_FORMAT_F32_OE,
SPA_AUDIO_FORMAT_S32P, SPA_AUDIO_FORMAT_S32P,
SPA_AUDIO_FORMAT_S32, SPA_AUDIO_FORMAT_S32,
SPA_AUDIO_FORMAT_S32_OE,
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_S24P, SPA_AUDIO_FORMAT_S24P,
SPA_AUDIO_FORMAT_S24, SPA_AUDIO_FORMAT_S24,
SPA_AUDIO_FORMAT_S24_OE, SPA_AUDIO_FORMAT_S24_OE,
SPA_AUDIO_FORMAT_S16P, SPA_AUDIO_FORMAT_S16P,
SPA_AUDIO_FORMAT_S16, SPA_AUDIO_FORMAT_S16,
SPA_AUDIO_FORMAT_S16_OE,
SPA_AUDIO_FORMAT_U8, SPA_AUDIO_FORMAT_U8,
SPA_AUDIO_FORMAT_U8P), SPA_AUDIO_FORMAT_U8P),
SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_RANGE_Int( SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_RANGE_Int(

6
spa/plugins/audioconvert/splitter.c
View file

@ -427,23 +427,19 @@ static int port_enum_formats(void *object,
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_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(18, SPA_FORMAT_AUDIO_format, SPA_POD_CHOICE_ENUM_Id(14,
SPA_AUDIO_FORMAT_F32P, SPA_AUDIO_FORMAT_F32P,
SPA_AUDIO_FORMAT_F32P, SPA_AUDIO_FORMAT_F32P,
SPA_AUDIO_FORMAT_F32, SPA_AUDIO_FORMAT_F32,
SPA_AUDIO_FORMAT_F32_OE,
SPA_AUDIO_FORMAT_S32P, SPA_AUDIO_FORMAT_S32P,
SPA_AUDIO_FORMAT_S32, SPA_AUDIO_FORMAT_S32,
SPA_AUDIO_FORMAT_S32_OE,
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_S24P, SPA_AUDIO_FORMAT_S24P,
SPA_AUDIO_FORMAT_S24, SPA_AUDIO_FORMAT_S24,
SPA_AUDIO_FORMAT_S24_OE, SPA_AUDIO_FORMAT_S24_OE,
SPA_AUDIO_FORMAT_S16P, SPA_AUDIO_FORMAT_S16P,
SPA_AUDIO_FORMAT_S16, SPA_AUDIO_FORMAT_S16,
SPA_AUDIO_FORMAT_S16_OE,
SPA_AUDIO_FORMAT_U8P, SPA_AUDIO_FORMAT_U8P,
SPA_AUDIO_FORMAT_U8), SPA_AUDIO_FORMAT_U8),
SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_RANGE_Int( SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_RANGE_Int(