mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-19 08:57:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: backend_native: Add mSBC support to HFP HF

Browse source
This commit is contained in:
Frédéric Danis 2021-02-16 12:11:56 +01:00
parent 38a7333608
commit 01b6dbfca6
1 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
spa/plugins/bluez5/backend-native.c
View file

@ -452,18 +452,38 @@ static bool rfcomm_hfp_hf(struct spa_source *source, char* buf)
if (((features & (SPA_BT_HFP_AG_FEATURE_CODEC_NEGOTIATION)) != 0) && if (((features & (SPA_BT_HFP_AG_FEATURE_CODEC_NEGOTIATION)) != 0) &&
rfcomm->msbc_supported_by_hfp) rfcomm->msbc_supported_by_hfp)
rfcomm->codec_negotiation_supported = true; rfcomm->codec_negotiation_supported = true;
} else if (strncmp(token, "+BCS", 4) == 0) { } else if (strncmp(token, "+BCS", 4) == 0 && rfcomm->codec_negotiation_supported) {
char *cmd; char *cmd;
/* get next token */ /* get next token */
token = strtok(NULL, separators); token = strtok(NULL, separators);
selected_codec = atoi(token); selected_codec = atoi(token);
if (selected_codec != HFP_AUDIO_CODEC_CVSD && selected_codec != HFP_AUDIO_CODEC_MSBC) {
spa_log_warn(backend->log, NAME": unsupported codec negociation: %d", selected_codec);
} else {
spa_log_debug(backend->log, NAME": RFCOMM selected_codec = %i", selected_codec);
/* send codec selection to AG */ /* send codec selection to AG */
cmd = spa_aprintf("AT+BCS=%u", selected_codec); cmd = spa_aprintf("AT+BCS=%u", selected_codec);
rfcomm_send_cmd(source, cmd); rfcomm_send_cmd(source, cmd);
free(cmd); free(cmd);
rfcomm->hf_state = hfp_hf_bcs; rfcomm->hf_state = hfp_hf_bcs;
if (!rfcomm->transport || (rfcomm->transport->codec != selected_codec) ) {
if (rfcomm->transport)
spa_bt_transport_free(rfcomm->transport);
rfcomm->transport = _transport_create(rfcomm);
if (rfcomm->transport == NULL) {
spa_log_warn(backend->log, NAME": can't create transport: %m");
// TODO: We should manage the missing transport
} else {
rfcomm->transport->codec = selected_codec;
spa_bt_device_connect_profile(rfcomm->device, rfcomm->profile);
}
}
}
} else if (strncmp(token, "+CIND", 5) == 0) { } else if (strncmp(token, "+CIND", 5) == 0) {
/* get next token and discard it */ /* get next token and discard it */
token = strtok(NULL, separators); token = strtok(NULL, separators);
@ -503,6 +523,7 @@ static bool rfcomm_hfp_hf(struct spa_source *source, char* buf)
case hfp_hf_cmer: case hfp_hf_cmer:
rfcomm->hf_state = hfp_hf_slc; rfcomm->hf_state = hfp_hf_slc;
rfcomm->slc_configured = true; rfcomm->slc_configured = true;
if (!rfcomm->codec_negotiation_supported) {
rfcomm->transport = _transport_create(rfcomm); rfcomm->transport = _transport_create(rfcomm);
if (rfcomm->transport == NULL) { if (rfcomm->transport == NULL) {
spa_log_warn(backend->log, NAME": can't create transport: %m"); spa_log_warn(backend->log, NAME": can't create transport: %m");
@ -510,6 +531,7 @@ static bool rfcomm_hfp_hf(struct spa_source *source, char* buf)
} }
rfcomm->transport->codec = HFP_AUDIO_CODEC_CVSD; rfcomm->transport->codec = HFP_AUDIO_CODEC_CVSD;
spa_bt_device_connect_profile(rfcomm->device, rfcomm->profile); spa_bt_device_connect_profile(rfcomm->device, rfcomm->profile);
}
break; break;
default: default:
break; break;