system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-09-20 00:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

bluez5: tolerate devices sending incorrect AAC caps

Browse source 
There is a report (#1342) of a device setting multiple bits for AAC
object type in SetConfiguration, although this appears to be forbidden.

It's not completely clear if this was due to e.g. some BlueZ bug, but it
should be safe to be lax and try to guess what is wanted in such case,
instead of being strict, in case it was due to device bug.
This commit is contained in:
Pauli Virtanen 2021-09-30 21:50:59 +03:00 committed by P V
parent 3092e4a7be
commit a86ff85444
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
spa/plugins/bluez5/a2dp-codec-aac.c
View file

@ -256,8 +256,14 @@ static int codec_validate_config(const struct a2dp_codec *codec, uint32_t flags,
info->media_subtype = SPA_MEDIA_SUBTYPE_raw;
info->info.raw.format = SPA_AUDIO_FORMAT_S16;
if (conf.object_type != AAC_OBJECT_TYPE_MPEG2_AAC_LC &&
conf.object_type != AAC_OBJECT_TYPE_MPEG4_AAC_LC)
/*
* A2DP v1.3.2, 4.5.2: only one bit shall be set in bitfields.
* However, there is a report (#1342) of device setting multiple
* bits for AAC object type. It's not clear if this was due to
* a BlueZ bug, but we can be lax here and below in codec_init.
*/
if (!(conf.object_type & (AAC_OBJECT_TYPE_MPEG2_AAC_LC |
AAC_OBJECT_TYPE_MPEG4_AAC_LC)))
return -EINVAL;
for (j = 0; j < SPA_N_ELEMENTS(aac_frequencies); ++j) {
@ -336,11 +342,12 @@ static void *codec_init(const struct a2dp_codec *codec, uint32_t flags,
if (res != AACENC_OK)
goto error;
if (conf->object_type != AAC_OBJECT_TYPE_MPEG2_AAC_LC &&
conf->object_type != AAC_OBJECT_TYPE_MPEG4_AAC_LC) {
if (!(conf->object_type & (AAC_OBJECT_TYPE_MPEG2_AAC_LC |
AAC_OBJECT_TYPE_MPEG4_AAC_LC))) {
res = -EINVAL;
goto error;
}
res = aacEncoder_SetParam(this->aacenc, AACENC_AOT, AOT_AAC_LC);
if (res != AACENC_OK)
goto error;