mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: filter out iec958 PCM formats

Browse source 
Convert the iec958 PCM formats differently when enumerating the sink
formats. This way we can still convert the param to a format_info.
This commit is contained in:
Wim Taymans 2021-09-01 13:11:08 +02:00
parent 93e9efc1e4
commit a25396c1eb
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/module-protocol-pulse/format.c
View file

@ -389,7 +389,7 @@ struct encoding_info {
static const struct encoding_info encoding_names[] = { static const struct encoding_info encoding_names[] = {
[ENCODING_ANY] = { "ANY", 0 }, [ENCODING_ANY] = { "ANY", 0 },
[ENCODING_PCM] = { "PCM", 0 }, [ENCODING_PCM] = { "PCM", SPA_AUDIO_IEC958_CODEC_PCM },
[ENCODING_AC3_IEC61937] = { "AC3-IEC61937", SPA_AUDIO_IEC958_CODEC_AC3 }, [ENCODING_AC3_IEC61937] = { "AC3-IEC61937", SPA_AUDIO_IEC958_CODEC_AC3 },
[ENCODING_EAC3_IEC61937] = { "EAC3-IEC61937", SPA_AUDIO_IEC958_CODEC_EAC3 }, [ENCODING_EAC3_IEC61937] = { "EAC3-IEC61937", SPA_AUDIO_IEC958_CODEC_EAC3 },
[ENCODING_MPEG_IEC61937] = { "MPEG-IEC61937", SPA_AUDIO_IEC958_CODEC_MPEG }, [ENCODING_MPEG_IEC61937] = { "MPEG-IEC61937", SPA_AUDIO_IEC958_CODEC_MPEG },

6
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -3578,8 +3578,11 @@ static int fill_sink_info(struct client *client, struct message *m,
spa_zero(info[n_info]); spa_zero(info[n_info]);
if (format_info_from_param(&info[n_info], p->param, index++) < 0) if (format_info_from_param(&info[n_info], p->param, index++) < 0)
break; break;
if (info[n_info].encoding == ENCODING_ANY) if (info[n_info].encoding == ENCODING_ANY ||
(info[n_info].encoding == ENCODING_PCM && info[n_info].props != NULL)) {
format_info_clear(&info[n_info]);
continue; continue;
}
n_info++; n_info++;
} }
} }
@ -3590,6 +3593,7 @@ static int fill_sink_info(struct client *client, struct message *m,
message_put(m, message_put(m,
TAG_FORMAT_INFO, &info[i], TAG_FORMAT_INFO, &info[i],
TAG_INVALID); TAG_INVALID);
format_info_clear(&info[i]);
} }
} }
return 0; return 0;