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

bluez5: reduce the number of registered Opus endpoints

Browse source 
The different source modes can share the same endpoint.
This commit is contained in:
Pauli Virtanen 2022-10-23 14:21:45 +03:00
parent d94832942e
commit d0d783541d
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
spa/plugins/bluez5/a2dp-codec-opus.c
View file

@ -1360,7 +1360,6 @@ static void codec_set_log(struct spa_log *global_log)
.codec_id = A2DP_CODEC_VENDOR, \ .codec_id = A2DP_CODEC_VENDOR, \
.vendor = { .vendor_id = OPUS_05_VENDOR_ID, \ .vendor = { .vendor_id = OPUS_05_VENDOR_ID, \
.codec_id = OPUS_05_CODEC_ID }, \ .codec_id = OPUS_05_CODEC_ID }, \
.fill_caps = codec_fill_caps, \
.select_config = codec_select_config, \ .select_config = codec_select_config, \
.enum_config = codec_enum_config, \ .enum_config = codec_enum_config, \
.validate_config = codec_validate_config, \ .validate_config = codec_validate_config, \
@ -1385,6 +1384,7 @@ const struct media_codec a2dp_codec_opus_05 = {
.id = SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05, .id = SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05,
.name = "opus_05", .name = "opus_05",
.description = "Opus", .description = "Opus",
.fill_caps = codec_fill_caps,
}; };
const struct media_codec a2dp_codec_opus_05_51 = { const struct media_codec a2dp_codec_opus_05_51 = {
@ -1392,6 +1392,8 @@ const struct media_codec a2dp_codec_opus_05_51 = {
.id = SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_51, .id = SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_51,
.name = "opus_05_51", .name = "opus_05_51",
.description = "Opus 5.1 Surround", .description = "Opus 5.1 Surround",
.endpoint_name = "opus_05",
.fill_caps = NULL,
}; };
const struct media_codec a2dp_codec_opus_05_71 = { const struct media_codec a2dp_codec_opus_05_71 = {
@ -1399,6 +1401,8 @@ const struct media_codec a2dp_codec_opus_05_71 = {
.id = SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_71, .id = SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_71,
.name = "opus_05_71", .name = "opus_05_71",
.description = "Opus 7.1 Surround", .description = "Opus 7.1 Surround",
.endpoint_name = "opus_05",
.fill_caps = NULL,
}; };
/* Bidi return channel codec: doesn't have endpoints */ /* Bidi return channel codec: doesn't have endpoints */
@ -1415,6 +1419,7 @@ const struct media_codec a2dp_codec_opus_05_duplex = {
.name = "opus_05_duplex", .name = "opus_05_duplex",
.description = "Opus Duplex", .description = "Opus Duplex",
.duplex_codec = &a2dp_codec_opus_05_return, .duplex_codec = &a2dp_codec_opus_05_return,
.fill_caps = codec_fill_caps,
}; };
const struct media_codec a2dp_codec_opus_05_pro = { const struct media_codec a2dp_codec_opus_05_pro = {
@ -1425,6 +1430,8 @@ const struct media_codec a2dp_codec_opus_05_pro = {
.init_props = codec_init_props, .init_props = codec_init_props,
.clear_props = codec_clear_props, .clear_props = codec_clear_props,
.duplex_codec = &a2dp_codec_opus_05_return, .duplex_codec = &a2dp_codec_opus_05_return,
.endpoint_name = "opus_05_duplex",
.fill_caps = NULL,
}; };
MEDIA_CODEC_EXPORT_DEF( MEDIA_CODEC_EXPORT_DEF(