mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: Register an endpoint according to encode or decode support

Browse source 
As we now support codecs other than SBC, we might have codec which does
not have an encode or a decode capability. Specifically, in the case of
LDAC there isn't a known decoder implementation available. For such a
case, we should not register the corresponding endpoint.

In case of LDAC, as decoding cannot be supported, we should not register
a sink endpoint or vice versa in the other scenario.

To do this, we check if encode_buffer or decode_buffer entry for a codec
has been set in pa_a2dp_codec and accordingly prevent or allow it's
registration.

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/440>
This commit is contained in:
Sanchayan Maity 2021-01-07 17:52:22 +05:30
parent 366bd5615c
commit ed44fa1856
3 changed files with 54 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/modules/bluetooth/a2dp-codec-util.c
View file

@ -88,3 +88,17 @@ void pa_bluetooth_a2dp_codec_gst_init(void) {
pa_log_info("GStreamer initialisation done"); pa_log_info("GStreamer initialisation done");
#endif #endif
} }
bool pa_bluetooth_a2dp_codec_is_codec_available(const pa_a2dp_codec_id *id, bool is_a2dp_sink) {
unsigned int i;
unsigned int count = pa_bluetooth_a2dp_codec_count();
for (i = 0; i < count; i++) {
if (memcmp(id, &pa_a2dp_codecs[i]->id, sizeof(pa_a2dp_codec_id)) == 0) {
return (is_a2dp_sink && pa_a2dp_codecs[i]->encode_buffer != NULL)
|| (!is_a2dp_sink && pa_a2dp_codecs[i]->decode_buffer != NULL);
}
}
return false;
}

3
src/modules/bluetooth/a2dp-codec-util.h
View file

@ -31,6 +31,9 @@ const pa_a2dp_codec *pa_bluetooth_a2dp_codec_iter(unsigned int i);
/* Get codec by name */ /* Get codec by name */
const pa_a2dp_codec *pa_bluetooth_get_a2dp_codec(const char *name); const pa_a2dp_codec *pa_bluetooth_get_a2dp_codec(const char *name);
/* Check if the given codec can be supported in A2DP_SINK or A2DP_SOURCE */
bool pa_bluetooth_a2dp_codec_is_codec_available(const pa_a2dp_codec_id *id, bool is_a2dp_sink);
/* Initialise GStreamer */ /* Initialise GStreamer */
void pa_bluetooth_a2dp_codec_gst_init(void); void pa_bluetooth_a2dp_codec_gst_init(void);

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

@ -1335,6 +1335,11 @@ static void parse_remote_endpoint_properties(pa_bluetooth_discovery *y, const ch
a2dp_codec_id->vendor_codec_id = 0; a2dp_codec_id->vendor_codec_id = 0;
} }
if (!pa_bluetooth_a2dp_codec_is_codec_available(a2dp_codec_id, pa_streq(uuid, PA_BLUETOOTH_UUID_A2DP_SINK))) {
pa_xfree(a2dp_codec_id);
return;
}
a2dp_codec_capabilities = pa_xmalloc0(sizeof(*a2dp_codec_capabilities) + capabilities_size); a2dp_codec_capabilities = pa_xmalloc0(sizeof(*a2dp_codec_capabilities) + capabilities_size);
a2dp_codec_capabilities->size = capabilities_size; a2dp_codec_capabilities->size = capabilities_size;
memcpy(a2dp_codec_capabilities->buffer, capabilities, capabilities_size); memcpy(a2dp_codec_capabilities->buffer, capabilities, capabilities_size);
@ -2108,15 +2113,19 @@ static DBusHandlerResult object_manager_handler(DBusConnection *c, DBusMessage *
capabilities_size = a2dp_codec->fill_capabilities(capabilities); capabilities_size = a2dp_codec->fill_capabilities(capabilities);
pa_assert(capabilities_size != 0); pa_assert(capabilities_size != 0);
endpoint = pa_sprintf_malloc("%s/%s", A2DP_SINK_ENDPOINT, a2dp_codec->name); if (a2dp_codec->decode_buffer != NULL) {
append_a2dp_object(&array, endpoint, PA_BLUETOOTH_UUID_A2DP_SINK, codec_id, endpoint = pa_sprintf_malloc("%s/%s", A2DP_SINK_ENDPOINT, a2dp_codec->name);
capabilities, capabilities_size); append_a2dp_object(&array, endpoint, PA_BLUETOOTH_UUID_A2DP_SINK, codec_id,
pa_xfree(endpoint); capabilities, capabilities_size);
pa_xfree(endpoint);
}
endpoint = pa_sprintf_malloc("%s/%s", A2DP_SOURCE_ENDPOINT, a2dp_codec->name); if (a2dp_codec->encode_buffer != NULL) {
append_a2dp_object(&array, endpoint, PA_BLUETOOTH_UUID_A2DP_SOURCE, codec_id, endpoint = pa_sprintf_malloc("%s/%s", A2DP_SOURCE_ENDPOINT, a2dp_codec->name);
capabilities, capabilities_size); append_a2dp_object(&array, endpoint, PA_BLUETOOTH_UUID_A2DP_SOURCE, codec_id,
pa_xfree(endpoint); capabilities, capabilities_size);
pa_xfree(endpoint);
}
} }
dbus_message_iter_close_container(&iter, &array); dbus_message_iter_close_container(&iter, &array);
@ -2214,13 +2223,17 @@ pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *c, int headset_backe
if (!a2dp_codec->can_be_supported()) if (!a2dp_codec->can_be_supported())
continue; continue;
endpoint = pa_sprintf_malloc("%s/%s", A2DP_SINK_ENDPOINT, a2dp_codec->name); if (a2dp_codec->decode_buffer != NULL) {
endpoint_init(y, endpoint); endpoint = pa_sprintf_malloc("%s/%s", A2DP_SINK_ENDPOINT, a2dp_codec->name);
pa_xfree(endpoint); endpoint_init(y, endpoint);
pa_xfree(endpoint);
}
endpoint = pa_sprintf_malloc("%s/%s", A2DP_SOURCE_ENDPOINT, a2dp_codec->name); if (a2dp_codec->encode_buffer != NULL) {
endpoint_init(y, endpoint); endpoint = pa_sprintf_malloc("%s/%s", A2DP_SOURCE_ENDPOINT, a2dp_codec->name);
pa_xfree(endpoint); endpoint_init(y, endpoint);
pa_xfree(endpoint);
}
} }
get_managed_objects(y); get_managed_objects(y);
@ -2304,13 +2317,17 @@ void pa_bluetooth_discovery_unref(pa_bluetooth_discovery *y) {
if (!a2dp_codec->can_be_supported()) if (!a2dp_codec->can_be_supported())
continue; continue;
endpoint = pa_sprintf_malloc("%s/%s", A2DP_SINK_ENDPOINT, a2dp_codec->name); if (a2dp_codec->decode_buffer != NULL) {
endpoint_done(y, endpoint); endpoint = pa_sprintf_malloc("%s/%s", A2DP_SINK_ENDPOINT, a2dp_codec->name);
pa_xfree(endpoint); endpoint_done(y, endpoint);
pa_xfree(endpoint);
}
endpoint = pa_sprintf_malloc("%s/%s", A2DP_SOURCE_ENDPOINT, a2dp_codec->name); if (a2dp_codec->encode_buffer != NULL) {
endpoint_done(y, endpoint); endpoint = pa_sprintf_malloc("%s/%s", A2DP_SOURCE_ENDPOINT, a2dp_codec->name);
pa_xfree(endpoint); endpoint_done(y, endpoint);
pa_xfree(endpoint);
}
} }
pa_dbus_connection_unref(y->connection); pa_dbus_connection_unref(y->connection);