mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix problems found in the review of the broadcast sink support.

Browse source
This commit is contained in:
Silviu Florian Barbulescu 2023-08-22 14:53:51 +03:00 • committed by Wim Taymans
parent 8660066af6
commit 32084ff3c6
3 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
spa/plugins/bluez5/bluez5-dbus.c
View file

@ -2273,7 +2273,7 @@ bool spa_bt_device_supports_media_codec(struct spa_bt_device *device, const stru
spa_list_for_each(ep, &device->remote_endpoint_list, device_link) { spa_list_for_each(ep, &device->remote_endpoint_list, device_link) {
enum spa_bt_profile profile = spa_bt_profile_from_uuid(ep->uuid); enum spa_bt_profile profile = spa_bt_profile_from_uuid(ep->uuid);
if (codec->bap) { if (codec->bap) {
if((profile == SPA_BT_PROFILE_BAP_BROADCAST_SINK) || (profile == SPA_BT_PROFILE_BAP_BROADCAST_SOURCE)) if ((profile == SPA_BT_PROFILE_BAP_BROADCAST_SINK) || (profile == SPA_BT_PROFILE_BAP_BROADCAST_SOURCE))
codec_profile = sink ? SPA_BT_PROFILE_BAP_BROADCAST_SINK : SPA_BT_PROFILE_BAP_BROADCAST_SOURCE; codec_profile = sink ? SPA_BT_PROFILE_BAP_BROADCAST_SINK : SPA_BT_PROFILE_BAP_BROADCAST_SOURCE;
else else
codec_profile = sink ? SPA_BT_PROFILE_BAP_SINK : SPA_BT_PROFILE_BAP_SOURCE; codec_profile = sink ? SPA_BT_PROFILE_BAP_SINK : SPA_BT_PROFILE_BAP_SOURCE;
@ -3389,7 +3389,7 @@ static int transport_create_iso_io(struct spa_bt_transport *transport)
struct spa_bt_transport *t; struct spa_bt_transport *t;
if (!(transport->profile & (SPA_BT_PROFILE_BAP_SINK | SPA_BT_PROFILE_BAP_SOURCE | if (!(transport->profile & (SPA_BT_PROFILE_BAP_SINK | SPA_BT_PROFILE_BAP_SOURCE |
SPA_BT_PROFILE_BAP_BROADCAST_SINK || SPA_BT_PROFILE_BAP_BROADCAST_SOURCE))) SPA_BT_PROFILE_BAP_BROADCAST_SINK | SPA_BT_PROFILE_BAP_BROADCAST_SOURCE)))
return 0; return 0;
if ((transport->profile == SPA_BT_PROFILE_BAP_BROADCAST_SINK) || if ((transport->profile == SPA_BT_PROFILE_BAP_BROADCAST_SINK) ||
@ -4741,8 +4741,7 @@ static DBusHandlerResult object_manager_handler(DBusConnection *c, DBusMessage *
} }
} }
if(codec->bap && register_bcast) if (codec->bap && register_bcast) {
{
if (endpoint_should_be_registered(monitor, codec, SPA_BT_MEDIA_SOURCE_BROADCAST)) { if (endpoint_should_be_registered(monitor, codec, SPA_BT_MEDIA_SOURCE_BROADCAST)) {
caps_size = codec->fill_caps(codec, 0, caps); caps_size = codec->fill_caps(codec, 0, caps);
if (caps_size < 0) if (caps_size < 0)
@ -4900,8 +4899,7 @@ static int register_media_application(struct spa_bt_monitor * monitor)
register_media_endpoint(monitor, codec, SPA_BT_MEDIA_SOURCE); register_media_endpoint(monitor, codec, SPA_BT_MEDIA_SOURCE);
register_media_endpoint(monitor, codec, SPA_BT_MEDIA_SINK); register_media_endpoint(monitor, codec, SPA_BT_MEDIA_SINK);
if(codec->bap) if (codec->bap) {
{
register_media_endpoint(monitor, codec, SPA_BT_MEDIA_SOURCE_BROADCAST); register_media_endpoint(monitor, codec, SPA_BT_MEDIA_SOURCE_BROADCAST);
register_media_endpoint(monitor, codec, SPA_BT_MEDIA_SINK_BROADCAST); register_media_endpoint(monitor, codec, SPA_BT_MEDIA_SINK_BROADCAST);
} }
@ -4937,8 +4935,7 @@ static void unregister_media_application(struct spa_bt_monitor * monitor)
unregister_media_endpoint(monitor, codec, SPA_BT_MEDIA_SOURCE); unregister_media_endpoint(monitor, codec, SPA_BT_MEDIA_SOURCE);
unregister_media_endpoint(monitor, codec, SPA_BT_MEDIA_SINK); unregister_media_endpoint(monitor, codec, SPA_BT_MEDIA_SINK);
if(codec->bap) if (codec->bap) {
{
unregister_media_endpoint(monitor, codec, SPA_BT_MEDIA_SOURCE_BROADCAST); unregister_media_endpoint(monitor, codec, SPA_BT_MEDIA_SOURCE_BROADCAST);
unregister_media_endpoint(monitor, codec, SPA_BT_MEDIA_SINK_BROADCAST); unregister_media_endpoint(monitor, codec, SPA_BT_MEDIA_SINK_BROADCAST);
} }

3
spa/plugins/bluez5/bluez5-device.c
View file

@ -1069,9 +1069,6 @@ static int emit_nodes(struct impl *this)
emit_dynamic_node(&this->dyn_media_source, this, t, emit_dynamic_node(&this->dyn_media_source, this, t,
DEVICE_ID_SOURCE, SPA_NAME_API_BLUEZ5_MEDIA_SOURCE, false); DEVICE_ID_SOURCE, SPA_NAME_API_BLUEZ5_MEDIA_SOURCE, false);
} }
if (this->device_set.leader && this->device_set.sources > 0)
emit_device_set_node(this, DEVICE_ID_SOURCE_SET);
} }
if (get_supported_media_codec(this, this->props.codec, NULL) == NULL) if (get_supported_media_codec(this, this->props.codec, NULL) == NULL)

2
spa/plugins/bluez5/iso-io.c
View file

@ -319,7 +319,7 @@ static struct stream *stream_create(struct spa_bt_transport *t, struct group *gr
if((t->profile == SPA_BT_PROFILE_BAP_SINK) || if((t->profile == SPA_BT_PROFILE_BAP_SINK) ||
(t->profile == SPA_BT_PROFILE_BAP_BROADCAST_SINK)) { (t->profile == SPA_BT_PROFILE_BAP_BROADCAST_SINK)) {
sink = true; sink = true;
} else{ } else {
sink = false; sink = false;
} }