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

bluetooth/a2dp: Validate capabilities in list_codecs

Browse source 
All codecs in the capabilities list are already filtered during
registration; there is no need to check can_be_supported again.

However, they are not filtered against capability support yet, that
should still be performed.
This commit is contained in:
Marijn Suijten 2021-01-18 11:38:35 +01:00
parent 7ca50bab2f
commit 173c3e6100
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2455,13 +2455,14 @@ off:
} }
static char *list_codecs(struct userdata *u) { static char *list_codecs(struct userdata *u) {
const pa_a2dp_codec_capabilities *a2dp_capabilities; const pa_a2dp_codec_capabilities *a2dp_capability;
const pa_a2dp_codec_id *key; const pa_a2dp_codec_id *key;
pa_hashmap *a2dp_endpoints; pa_hashmap *a2dp_endpoints;
pa_hashmap *a2dp_capabilities;
pa_json_encoder *encoder; pa_json_encoder *encoder;
unsigned int i; unsigned int i;
bool is_a2dp_sink; bool is_a2dp_sink;
void *state; void *state, *state2;
is_a2dp_sink = u->profile == PA_BLUETOOTH_PROFILE_A2DP_SINK; is_a2dp_sink = u->profile == PA_BLUETOOTH_PROFILE_A2DP_SINK;
@ -2478,13 +2479,17 @@ static char *list_codecs(struct userdata *u) {
a2dp_codec = pa_bluetooth_a2dp_codec_iter(i); a2dp_codec = pa_bluetooth_a2dp_codec_iter(i);
if (memcmp(key, &a2dp_codec->id, sizeof(pa_a2dp_codec_id)) == 0) { if (memcmp(key, &a2dp_codec->id, sizeof(pa_a2dp_codec_id)) == 0) {
if (a2dp_codec->can_be_supported(is_a2dp_sink)) { PA_HASHMAP_FOREACH(a2dp_capability, a2dp_capabilities, state2) {
pa_json_encoder_begin_element_object(encoder); if (a2dp_codec->can_accept_capabilities(a2dp_capability->buffer, a2dp_capability->size, /* For encoding */ is_a2dp_sink)) {
pa_json_encoder_begin_element_object(encoder);
pa_json_encoder_add_member_string(encoder, "name", a2dp_codec->name); pa_json_encoder_add_member_string(encoder, "name", a2dp_codec->name);
pa_json_encoder_add_member_string(encoder, "description", a2dp_codec->description); pa_json_encoder_add_member_string(encoder, "description", a2dp_codec->description);
pa_json_encoder_end_object(encoder); pa_json_encoder_end_object(encoder);
break;
}
} }
} }
} }