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

Merge branch 'bluez-auto-profile-priorities' into 'master'

Browse source 
bluez: Increase priority of A2DP quality and latency profiles

See merge request pipewire/pipewire!2759
This commit is contained in:
Julian Bouzas 2026-03-24 07:28:17 +00:00
commit c9af831cd8
1 changed files with 35 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

72
spa/plugins/bluez5/bluez5-device.c
View file

@ -230,29 +230,17 @@ static size_t get_media_codec_quality_priority (const struct media_codec *mc)
/* From lowest quality to highest quality */ /* From lowest quality to highest quality */
static const enum spa_bluetooth_audio_codec quality_priorities[] = { static const enum spa_bluetooth_audio_codec quality_priorities[] = {
SPA_BLUETOOTH_AUDIO_CODEC_START, SPA_BLUETOOTH_AUDIO_CODEC_START,
SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_DUPLEX,
SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05,
SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_51,
SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_71,
SPA_BLUETOOTH_AUDIO_CODEC_OPUS_G,
SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_PRO,
SPA_BLUETOOTH_AUDIO_CODEC_FASTSTREAM_DUPLEX,
SPA_BLUETOOTH_AUDIO_CODEC_FASTSTREAM,
SPA_BLUETOOTH_AUDIO_CODEC_MPEG,
SPA_BLUETOOTH_AUDIO_CODEC_APTX_LL_DUPLEX,
SPA_BLUETOOTH_AUDIO_CODEC_APTX_LL,
SPA_BLUETOOTH_AUDIO_CODEC_SBC, SPA_BLUETOOTH_AUDIO_CODEC_SBC,
SPA_BLUETOOTH_AUDIO_CODEC_APTX, SPA_BLUETOOTH_AUDIO_CODEC_APTX,
SPA_BLUETOOTH_AUDIO_CODEC_SBC_XQ,
SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD,
SPA_BLUETOOTH_AUDIO_CODEC_AAC, SPA_BLUETOOTH_AUDIO_CODEC_AAC,
SPA_BLUETOOTH_AUDIO_CODEC_OPUS_G,
SPA_BLUETOOTH_AUDIO_CODEC_LC3PLUS_HR, SPA_BLUETOOTH_AUDIO_CODEC_LC3PLUS_HR,
SPA_BLUETOOTH_AUDIO_CODEC_APTX_HD, SPA_BLUETOOTH_AUDIO_CODEC_APTX_HD,
SPA_BLUETOOTH_AUDIO_CODEC_LDAC SPA_BLUETOOTH_AUDIO_CODEC_LDAC,
}; };
size_t i; size_t i;
for (i = 0; SPA_N_ELEMENTS(quality_priorities); ++i) { for (i = 0; i < SPA_N_ELEMENTS(quality_priorities); ++i) {
if (quality_priorities[i] == mc->id) if (quality_priorities[i] == mc->id)
return i; return i;
} }
@ -265,21 +253,9 @@ static size_t get_media_codec_latency_priority (const struct media_codec *mc)
/* From highest latency to lowest latency */ /* From highest latency to lowest latency */
static const enum spa_bluetooth_audio_codec latency_priorities[] = { static const enum spa_bluetooth_audio_codec latency_priorities[] = {
SPA_BLUETOOTH_AUDIO_CODEC_START, SPA_BLUETOOTH_AUDIO_CODEC_START,
SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_71,
SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_51,
SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_PRO,
SPA_BLUETOOTH_AUDIO_CODEC_OPUS_G,
SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05,
SPA_BLUETOOTH_AUDIO_CODEC_OPUS_05_DUPLEX,
SPA_BLUETOOTH_AUDIO_CODEC_MPEG,
SPA_BLUETOOTH_AUDIO_CODEC_AAC,
SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD,
SPA_BLUETOOTH_AUDIO_CODEC_APTX_HD,
SPA_BLUETOOTH_AUDIO_CODEC_LDAC,
SPA_BLUETOOTH_AUDIO_CODEC_LC3PLUS_HR,
SPA_BLUETOOTH_AUDIO_CODEC_SBC, SPA_BLUETOOTH_AUDIO_CODEC_SBC,
SPA_BLUETOOTH_AUDIO_CODEC_APTX, SPA_BLUETOOTH_AUDIO_CODEC_APTX,
SPA_BLUETOOTH_AUDIO_CODEC_SBC_XQ, SPA_BLUETOOTH_AUDIO_CODEC_OPUS_G,
SPA_BLUETOOTH_AUDIO_CODEC_FASTSTREAM_DUPLEX, SPA_BLUETOOTH_AUDIO_CODEC_FASTSTREAM_DUPLEX,
SPA_BLUETOOTH_AUDIO_CODEC_FASTSTREAM, SPA_BLUETOOTH_AUDIO_CODEC_FASTSTREAM,
SPA_BLUETOOTH_AUDIO_CODEC_APTX_LL_DUPLEX, SPA_BLUETOOTH_AUDIO_CODEC_APTX_LL_DUPLEX,
@ -287,7 +263,7 @@ static size_t get_media_codec_latency_priority (const struct media_codec *mc)
}; };
size_t i; size_t i;
for (i = 0; SPA_N_ELEMENTS(latency_priorities); ++i) { for (i = 0; i < SPA_N_ELEMENTS(latency_priorities); ++i) {
if (latency_priorities[i] == mc->id) if (latency_priorities[i] == mc->id)
return i; return i;
} }
@ -2121,15 +2097,37 @@ static void set_initial_profile(struct impl *this)
t = find_transport(this, i); t = find_transport(this, i);
if (t) { if (t) {
if (i == SPA_BT_PROFILE_A2DP_SOURCE || i == SPA_BT_PROFILE_BAP_SOURCE) if (i == SPA_BT_PROFILE_A2DP_SOURCE || i == SPA_BT_PROFILE_BAP_SOURCE) {
this->profile = DEVICE_PROFILE_AG; this->profile = DEVICE_PROFILE_AG;
else if (i == SPA_BT_PROFILE_BAP_SINK) this->props.codec = t->media_codec->id;
} else if (i == SPA_BT_PROFILE_BAP_SINK) {
this->profile = DEVICE_PROFILE_BAP; this->profile = DEVICE_PROFILE_BAP;
else if (i == SPA_BT_PROFILE_ASHA_SINK) this->props.codec = t->media_codec->id;
} else if (i == SPA_BT_PROFILE_ASHA_SINK) {
this->profile = DEVICE_PROFILE_ASHA; this->profile = DEVICE_PROFILE_ASHA;
else this->props.codec = t->media_codec->id;
this->profile = DEVICE_PROFILE_A2DP; } else {
this->props.codec = t->media_codec->id; const struct media_codec *codecs[64];
const struct media_codec *quality_codec = NULL;
int j;
get_media_codecs(this, CODEC_ORDER_QUALITY, 0, codecs, SPA_N_ELEMENTS(codecs));
for (j = 0; codecs[j] != NULL; ++j) {
if (codecs[j]->kind == MEDIA_CODEC_A2DP) {
quality_codec = codecs[j];
break;
}
}
if (quality_codec) {
this->profile = DEVICE_PROFILE_A2DP_AUTO_PREFER_QUALITY;
this->props.codec = quality_codec->id;
} else {
this->profile = DEVICE_PROFILE_A2DP;
this->props.codec = t->media_codec->id;
}
}
spa_log_debug(this->log, "initial profile media profile:%d codec:%d", spa_log_debug(this->log, "initial profile media profile:%d codec:%d",
this->profile, this->props.codec); this->profile, this->props.codec);
return; return;
@ -2281,17 +2279,17 @@ static struct spa_pod *build_profile(struct impl *this, struct spa_pod_builder *
case DEVICE_PROFILE_A2DP_AUTO_PREFER_QUALITY: case DEVICE_PROFILE_A2DP_AUTO_PREFER_QUALITY:
name = "a2dp-auto-prefer-quality"; name = "a2dp-auto-prefer-quality";
desc = _("Auto: Prefer Quality (A2DP)"); desc = _("Auto: Prefer Quality (A2DP)");
priority = 255;
break; break;
case DEVICE_PROFILE_A2DP_AUTO_PREFER_LATENCY: case DEVICE_PROFILE_A2DP_AUTO_PREFER_LATENCY:
name = "a2dp-auto-prefer-latency"; name = "a2dp-auto-prefer-latency";
desc = _("Auto: Prefer Latency (A2DP)"); desc = _("Auto: Prefer Latency (A2DP)");
priority = 254;
break; break;
default: default:
return NULL; return NULL;
} }
priority = 0;
n_sink++; n_sink++;
if (this->autoswitch_routes && (device->connected_profiles & SPA_BT_PROFILE_HEADSET_HEAD_UNIT)) if (this->autoswitch_routes && (device->connected_profiles & SPA_BT_PROFILE_HEADSET_HEAD_UNIT))
n_source++; n_source++;