mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: deal with too small Supported_Max_Codec_Frames_Per_SDU

Browse source 
Some devices appear to set Supported_Max_Codec_Frames_Per_SDU == 1 while
claiming they support two channels per stream, which is then not
possible.

In this case, limit the number of channels by the number of frames per
SDU when selecting.

Also adjust PAC sorting.
This commit is contained in:
Pauli Virtanen 2023-11-22 22:55:31 +02:00 • committed by Wim Taymans
parent f327ed845f
commit f14572648a
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
spa/plugins/bluez5/bap-codec-lc3.c
View file

@ -204,13 +204,13 @@ static uint8_t get_num_channels(uint32_t channels)
return num;
}
static int select_channels(uint8_t channels, uint32_t locations, uint32_t *mapping)
static int select_channels(uint8_t channels, uint32_t locations, uint32_t *mapping, unsigned int max_channels)
{
unsigned int i, num;
unsigned int i, num = 0;
if (channels & LC3_CHAN_2)
if ((channels & LC3_CHAN_2) && max_channels >= 2)
num = 2;
else if (channels & LC3_CHAN_1)
else if ((channels & LC3_CHAN_1) && max_channels >= 1)
num = 1;
else
return -1;
@ -234,12 +234,13 @@ static int select_channels(uint8_t channels, uint32_t locations, uint32_t *mappi
return 0;
}
static bool select_config(bap_lc3_t *conf, const struct pac_data *pac)
static bool select_config(bap_lc3_t *conf, const struct pac_data *pac, struct spa_debug_context *debug_ctx)
{
const uint8_t *data = pac->data;
size_t data_size = pac->size;
uint16_t framelen_min = 0, framelen_max = 0;
int max_frames = -1;
uint8_t channels = 0;
if (!data_size)
return false;
@ -294,10 +295,7 @@ static bool select_config(bap_lc3_t *conf, const struct pac_data *pac)
case LC3_TYPE_CHAN:
spa_return_val_if_fail(ltv->len == 2, false);
{
uint8_t channels = ltv->value[0];
if (select_channels(channels, pac->locations, &conf->channels) < 0)
return false;
channels = ltv->value[0];
}
break;
case LC3_TYPE_FRAMELEN:
@ -317,6 +315,12 @@ static bool select_config(bap_lc3_t *conf, const struct pac_data *pac)
data += ltv->len + 1;
}
if (select_channels(channels, pac->locations, &conf->channels, max_frames) < 0) {
spa_debugc(debug_ctx, "invalid channel configuration: 0x%02x %u",
channels, max_frames);
return false;
}
/* Default: 1 per channel (BAP v1.0.1 Sec 4.3.1) */
if (max_frames < 0)
max_frames = get_num_channels(conf->channels);
@ -446,8 +450,12 @@ static int conf_cmp(const bap_lc3_t *conf1, int res1, const bap_lc3_t *conf2, in
return b - a;
PREFER_BOOL(conf->channels & LC3_CHAN_2);
PREFER_BOOL(conf->channels & LC3_CHAN_1);
PREFER_BOOL(conf->rate & (LC3_CONFIG_FREQ_48KHZ | LC3_CONFIG_FREQ_24KHZ | LC3_CONFIG_FREQ_16KHZ | LC3_CONFIG_FREQ_8KHZ));
PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_48KHZ);
PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_24KHZ);
PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_16KHZ);
PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_8KHZ);
return 0;