mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2026-03-07 04:33:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: Allow switching from sink to source profile and vice versa

Browse source
This commit is contained in:
Marijn Suijten 2021-01-20 01:06:54 +01:00
parent 2fc7aea2dc
commit a10f0f3640
2 changed files with 39 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/bluetooth/bluez5-util.c
View file

@ -432,7 +432,7 @@ bool pa_bluetooth_device_switch_codec(pa_bluetooth_device *device, pa_bluetooth_
DBusMessageIter iter, dict; DBusMessageIter iter, dict;
DBusMessage *m; DBusMessage *m;
struct switch_codec_data *data; struct switch_codec_data *data;
pa_a2dp_codec_capabilities *capabilities; const pa_a2dp_codec_capabilities *capabilities;
uint8_t config[MAX_A2DP_CAPS_SIZE]; uint8_t config[MAX_A2DP_CAPS_SIZE];
uint8_t config_size; uint8_t config_size;
bool is_a2dp_sink; bool is_a2dp_sink;
@ -453,6 +453,8 @@ bool pa_bluetooth_device_switch_codec(pa_bluetooth_device *device, pa_bluetooth_
pa_assert_se(endpoint = endpoint_conf->choose_remote_endpoint(capabilities_hashmap, &device->discovery->core->default_sample_spec, is_a2dp_sink)); pa_assert_se(endpoint = endpoint_conf->choose_remote_endpoint(capabilities_hashmap, &device->discovery->core->default_sample_spec, is_a2dp_sink));
pa_assert_se(capabilities = pa_hashmap_get(capabilities_hashmap, endpoint)); pa_assert_se(capabilities = pa_hashmap_get(capabilities_hashmap, endpoint));
pa_log_info("Switching to codec %s @ %s", endpoint_conf->bt_codec.name, endpoint);
config_size = endpoint_conf->fill_preferred_configuration(&device->discovery->core->default_sample_spec, config_size = endpoint_conf->fill_preferred_configuration(&device->discovery->core->default_sample_spec,
capabilities->buffer, capabilities->size, config); capabilities->buffer, capabilities->size, config);
if (config_size == 0) if (config_size == 0)
@ -462,7 +464,7 @@ bool pa_bluetooth_device_switch_codec(pa_bluetooth_device *device, pa_bluetooth_
endpoint_conf->bt_codec.name); endpoint_conf->bt_codec.name);
pa_assert_se(m = dbus_message_new_method_call(BLUEZ_SERVICE, endpoint, pa_assert_se(m = dbus_message_new_method_call(BLUEZ_SERVICE, endpoint,
BLUEZ_MEDIA_ENDPOINT_INTERFACE, "SetConfiguration")); BLUEZ_MEDIA_ENDPOINT_INTERFACE, "SetConfiguration"));
dbus_message_iter_init_append(m, &iter); dbus_message_iter_init_append(m, &iter);
pa_assert_se(dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH, &pa_endpoint)); pa_assert_se(dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH, &pa_endpoint));

43
src/modules/bluetooth/module-bluez5-device.c
View file

@ -2082,29 +2082,56 @@ static pa_card_profile *create_card_profile(struct userdata *u, pa_bluetooth_pro
return cp; return cp;
} }
static void switch_codec_cb_handler(bool success, pa_bluetooth_profile_t profile, void *userdata);
/* Run from main thread */ /* Run from main thread */
static int set_profile_cb(pa_card *c, pa_card_profile *new_profile) { static int set_profile_cb(pa_card *c, pa_card_profile *new_profile) {
struct userdata *u; struct userdata *u;
pa_bluetooth_profile_t *p; pa_bluetooth_profile_t p;
pa_assert(c); pa_assert(c);
pa_assert(new_profile); pa_assert(new_profile);
pa_assert_se(u = c->userdata); pa_assert_se(u = c->userdata);
p = PA_CARD_PROFILE_DATA(new_profile); p = *(pa_bluetooth_profile_t *)PA_CARD_PROFILE_DATA(new_profile);
if (*p != PA_BLUETOOTH_PROFILE_OFF) { stop_thread(u);
if (p != PA_BLUETOOTH_PROFILE_OFF) {
const pa_bluetooth_device *d = u->device; const pa_bluetooth_device *d = u->device;
if (!d->transports[*p] || d->transports[*p]->state <= PA_BLUETOOTH_TRANSPORT_STATE_DISCONNECTED) { if (!d->transports[p] || d->transports[p]->state <= PA_BLUETOOTH_TRANSPORT_STATE_DISCONNECTED) {
pa_log_warn("Refused to switch profile to %s: Not connected", new_profile->name); if (p != PA_BLUETOOTH_PROFILE_A2DP_SINK && p != PA_BLUETOOTH_PROFILE_A2DP_SOURCE) {
pa_log_warn("Refused to switch profile to %s: Not connected", new_profile->name);
return -PA_ERR_IO;
}
bool is_a2dp_sink = p == PA_BLUETOOTH_PROFILE_A2DP_SINK;
for (int i = 0; i < pa_bluetooth_a2dp_endpoint_conf_count(); ++i) {
pa_hashmap *capabilities_hashmap;
const pa_a2dp_endpoint_conf *endpoint_conf = pa_bluetooth_a2dp_endpoint_conf_iter(i);
// Capabilities should already be filtered by this!
// if (!pa_bluetooth_a2dp_codec_is_codec_available(&endpoint_conf->id, is_a2dp_sink))
// continue;
capabilities_hashmap = pa_hashmap_get(is_a2dp_sink ? u->device->a2dp_sink_endpoints : u->device->a2dp_source_endpoints, &endpoint_conf->id);
if (!capabilities_hashmap)
continue;
if (!pa_bluetooth_device_switch_codec(u->device, p, capabilities_hashmap, endpoint_conf, switch_codec_cb_handler, u))
continue;
return PA_OK;
}
pa_log_warn("Refused to switch profile to %s: ", new_profile->name);
return -PA_ERR_IO; return -PA_ERR_IO;
} }
} }
stop_thread(u); u->profile = p;
u->profile = *p;
if (u->profile != PA_BLUETOOTH_PROFILE_OFF) if (u->profile != PA_BLUETOOTH_PROFILE_OFF)
if (init_profile(u) < 0) if (init_profile(u) < 0)