mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-15 22:20:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

hfp_hf: use hfp_hf_de/activate_voice_recognition for both legacy and enhanced VRA

Browse Source
This commit is contained in:
Milanka Ringwald 2021-08-17 23:49:45 +02:00
parent 553a4a561f
commit acd11d4a99
3 changed files with 60 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
example/hfp_hf_demo.c
View File

@ -149,7 +149,6 @@ static void show_usage(void){
printf("k/K - deactivate/activate call waiting notification\n");
printf("l/L - deactivate/activate calling line notification\n");
printf("n/N - deactivate/activate voice recognition\n");
printf("z/Z - deactivate/activate enhanced voice recognition\n");
printf("h - start new audio enhanced voice recognition session\n");
printf("0123456789#*-+ - send DTMF dial tones\n");
@ -320,16 +319,6 @@ static void stdin_process(char c){
printf("Activate voice recognition %s\n", bd_addr_to_str(device_addr));
status = hfp_hf_activate_voice_recognition(acl_handle);
break;
case 'z':
log_info("USER:\'%c\'", cmd);
printf("Deactivate enhanced voice recognition\n");
status = hfp_hf_deactivate_enhanced_voice_recognition(acl_handle);
break;
case 'Z':
log_info("USER:\'%c\'", cmd);
printf("Activate enhanced voice recognition %s\n", bd_addr_to_str(device_addr));
status = hfp_hf_activate_enhanced_voice_recognition(acl_handle);
break;
case 'h':
log_info("USER:\'%c\'", cmd);
printf("Start new audio enhanced voice recognition session %s\n", bd_addr_to_str(device_addr));

121
src/classic/hfp_hf.c
View File

@ -1836,38 +1836,39 @@ uint8_t hfp_hf_deactivate_echo_canceling_and_noise_reduction(hci_con_handle_t ac
return ERROR_CODE_SUCCESS;
}
static bool hfp_hf_voice_recognition_supported(hfp_connection_t * hfp_connection, bool enhanced){
uint8_t hf_vra_flag = HFP_HFSF_VOICE_RECOGNITION_FUNCTION;
uint8_t ag_vra_flag = HFP_AGSF_VOICE_RECOGNITION_FUNCTION;
if (enhanced){
hf_vra_flag = HFP_HFSF_ENHANCED_VOICE_RECOGNITION_STATUS;
ag_vra_flag = HFP_AGSF_ENHANCED_VOICE_RECOGNITION_STATUS;
}
int ag = get_bit(hfp_connection->remote_supported_features, ag_vra_flag);
int hf = get_bit(hfp_hf_supported_features, hf_vra_flag);
static bool hfp_hf_vra_flag_supported(hfp_connection_t * hfp_connection){
int hf = get_bit(hfp_hf_supported_features, HFP_HFSF_VOICE_RECOGNITION_FUNCTION);
int ag = get_bit(hfp_connection->remote_supported_features, HFP_AGSF_VOICE_RECOGNITION_FUNCTION);
return hf && ag;
}
static uint8_t activate_voice_recognition(hci_con_handle_t acl_handle, bool enhanced){
hfp_connection_t * hfp_connection = get_hfp_hf_connection_context_for_acl_handle(acl_handle);
static bool hfp_hf_enhanced_vra_flag_supported(hfp_connection_t * hfp_connection){
int hf = get_bit(hfp_hf_supported_features, HFP_HFSF_ENHANCED_VOICE_RECOGNITION_STATUS);
int ag = get_bit(hfp_connection->remote_supported_features, HFP_AGSF_ENHANCED_VOICE_RECOGNITION_STATUS);
return hf && ag;
}
uint8_t hfp_hf_activate_voice_recognition(hci_con_handle_t acl_handle){
hfp_connection_t * hfp_connection = get_hfp_hf_connection_context_for_acl_handle(acl_handle);
if (!hfp_connection) {
return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER;
}
if (hfp_connection->state < HFP_SERVICE_LEVEL_CONNECTION_ESTABLISHED || hfp_connection->state > HFP_AUDIO_CONNECTION_ESTABLISHED){
return ERROR_CODE_COMMAND_DISALLOWED;
}
if (!hfp_hf_voice_recognition_supported(hfp_connection, enhanced)){
return ERROR_CODE_COMMAND_DISALLOWED;
bool enhanced_vra_supported = hfp_hf_enhanced_vra_flag_supported(hfp_connection);
bool legacy_vra_supported = hfp_hf_vra_flag_supported(hfp_connection);
if (!enhanced_vra_supported && !legacy_vra_supported){
return ERROR_CODE_UNSUPPORTED_FEATURE_OR_PARAMETER_VALUE;
}
switch (hfp_connection->vra_state){
case HFP_VRA_VOICE_RECOGNITION_OFF:
case HFP_VRA_W2_SEND_VOICE_RECOGNITION_OFF:
hfp_connection->command = HFP_CMD_HF_ACTIVATE_VOICE_RECOGNITION;
hfp_connection->vra_state_requested = HFP_VRA_W2_SEND_VOICE_RECOGNITION_ACTIVATED;
hfp_connection->enhanced_voice_recognition_enabled = enhanced;
hfp_connection->enhanced_voice_recognition_enabled = enhanced_vra_supported;
break;
case HFP_VRA_W4_VOICE_RECOGNITION_OFF:
hfp_connection->activate_voice_recognition = true;
@ -1880,18 +1881,52 @@ static uint8_t activate_voice_recognition(hci_con_handle_t acl_handle, bool enha
return ERROR_CODE_SUCCESS;
}
static uint8_t deactivate_voice_recognition(hci_con_handle_t acl_handle, bool enhanced){
uint8_t hfp_hf_enhanced_voice_recognition_report_ready_for_audio(hci_con_handle_t acl_handle){
hfp_connection_t * hfp_connection = get_hfp_hf_connection_context_for_acl_handle(acl_handle);
if (!hfp_connection) {
return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER;
}
if (hfp_connection->state < HFP_SERVICE_LEVEL_CONNECTION_ESTABLISHED || hfp_connection->state > HFP_AUDIO_CONNECTION_ESTABLISHED){
if (hfp_connection->state != HFP_AUDIO_CONNECTION_ESTABLISHED){
return ERROR_CODE_COMMAND_DISALLOWED;
}
if (!hfp_hf_voice_recognition_supported(hfp_connection, enhanced)){
bool enhanced_vra_supported = hfp_hf_enhanced_vra_flag_supported(hfp_connection);
if (!enhanced_vra_supported){
return ERROR_CODE_UNSUPPORTED_FEATURE_OR_PARAMETER_VALUE;
}
switch (hfp_connection->vra_state){
case HFP_VRA_VOICE_RECOGNITION_ACTIVATED:
case HFP_VRA_ENHANCED_VOICE_RECOGNITION_READY_FOR_AUDIO:
hfp_connection->command = HFP_CMD_HF_ACTIVATE_VOICE_RECOGNITION;
hfp_connection->vra_state_requested = HFP_VRA_W2_SEND_ENHANCED_VOICE_RECOGNITION_READY_FOR_AUDIO;
break;
default:
return ERROR_CODE_COMMAND_DISALLOWED;
}
hfp_hf_run_for_context(hfp_connection);
return ERROR_CODE_SUCCESS;
}
uint8_t hfp_hf_deactivate_voice_recognition(hci_con_handle_t acl_handle){
// return deactivate_voice_recognition(acl_handle, false);
hfp_connection_t * hfp_connection = get_hfp_hf_connection_context_for_acl_handle(acl_handle);
if (!hfp_connection) {
return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER;
}
if (hfp_connection->state < HFP_SERVICE_LEVEL_CONNECTION_ESTABLISHED ||
hfp_connection->state > HFP_AUDIO_CONNECTION_ESTABLISHED){
return ERROR_CODE_COMMAND_DISALLOWED;
}
bool enhanced_vra_supported = hfp_hf_enhanced_vra_flag_supported(hfp_connection);
bool legacy_vra_supported = hfp_hf_vra_flag_supported(hfp_connection);
if (!enhanced_vra_supported && !legacy_vra_supported){
return ERROR_CODE_UNSUPPORTED_FEATURE_OR_PARAMETER_VALUE;
}
switch (hfp_connection->vra_state){
case HFP_VRA_W2_SEND_VOICE_RECOGNITION_ACTIVATED:
@ -1918,50 +1953,6 @@ static uint8_t deactivate_voice_recognition(hci_con_handle_t acl_handle, bool en
return ERROR_CODE_SUCCESS;
}
uint8_t hfp_hf_activate_voice_recognition(hci_con_handle_t acl_handle){
return activate_voice_recognition(acl_handle, false);
}
uint8_t hfp_hf_activate_enhanced_voice_recognition(hci_con_handle_t acl_handle){
return activate_voice_recognition(acl_handle, true);
}
uint8_t hfp_hf_enhanced_voice_recognition_report_ready_for_audio(hci_con_handle_t acl_handle){
hfp_connection_t * hfp_connection = get_hfp_hf_connection_context_for_acl_handle(acl_handle);
if (!hfp_connection) {
return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER;
}
if (hfp_connection->state != HFP_AUDIO_CONNECTION_ESTABLISHED){
return ERROR_CODE_COMMAND_DISALLOWED;
}
if (!hfp_hf_voice_recognition_supported(hfp_connection, true)){
return ERROR_CODE_COMMAND_DISALLOWED;
}
switch (hfp_connection->vra_state){
case HFP_VRA_VOICE_RECOGNITION_ACTIVATED:
case HFP_VRA_ENHANCED_VOICE_RECOGNITION_READY_FOR_AUDIO:
hfp_connection->command = HFP_CMD_HF_ACTIVATE_VOICE_RECOGNITION;
hfp_connection->vra_state_requested = HFP_VRA_W2_SEND_ENHANCED_VOICE_RECOGNITION_READY_FOR_AUDIO;
break;
default:
return ERROR_CODE_COMMAND_DISALLOWED;
}
hfp_hf_run_for_context(hfp_connection);
return ERROR_CODE_SUCCESS;
}
uint8_t hfp_hf_deactivate_voice_recognition(hci_con_handle_t acl_handle){
return deactivate_voice_recognition(acl_handle, false);
}
uint8_t hfp_hf_deactivate_enhanced_voice_recognition(hci_con_handle_t acl_handle){
return deactivate_voice_recognition(acl_handle, true);
}
uint8_t hfp_hf_set_microphone_gain(hci_con_handle_t acl_handle, int gain){
hfp_connection_t * hfp_connection = get_hfp_hf_connection_context_for_acl_handle(acl_handle);
if (!hfp_connection) {

31
src/classic/hfp_hf.h
View File

@ -357,9 +357,8 @@ uint8_t hfp_hf_deactivate_calling_line_notification(hci_con_handle_t acl_handle)
uint8_t hfp_hf_deactivate_echo_canceling_and_noise_reduction(hci_con_handle_t acl_handle);
/**
* @brief Activate voice recognition and emit HFP_SUBEVENT_VOICE_RECOGNITION_STATUS event with status ERROR_CODE_SUCCESS
* if successful, otherwise ERROR_CODE_COMMAND_DISALLOWED. The state field of this event is set to the current voice
* recognition state: 1 for activated, 0 otherwise. Prerequisite is established SLC.
* @brief Activate voice recognition and emit HFP_SUBEVENT_VOICE_RECOGNITION_ENABLED event with status ERROR_CODE_SUCCESS
* if successful, otherwise ERROR_CODE_COMMAND_DISALLOWED. Prerequisite is established SLC.
*
* @param acl_handle
* @return status ERROR_CODE_SUCCESS if successful, otherwise:
@ -369,9 +368,8 @@ uint8_t hfp_hf_deactivate_echo_canceling_and_noise_reduction(hci_con_handle_t ac
uint8_t hfp_hf_activate_voice_recognition(hci_con_handle_t acl_handle);
/**
* @brief Dectivate voice recognition and emit HFP_SUBEVENT_VOICE_RECOGNITION_STATUS event with status ERROR_CODE_SUCCESS
* if successful, otherwise ERROR_CODE_COMMAND_DISALLOWED. The state field of this event is set to the current voice
* recognition state: 1 for activated, 0 otherwise. Prerequisite is established SLC.
* @brief Dectivate voice recognition and emit HFP_SUBEVENT_VOICE_RECOGNITION_DISABLED event with status ERROR_CODE_SUCCESS
* if successful, otherwise ERROR_CODE_COMMAND_DISALLOWED. Prerequisite is established SLC.
*
* @param acl_handle
* @return status ERROR_CODE_SUCCESS if successful, otherwise:
@ -380,17 +378,6 @@ uint8_t hfp_hf_activate_voice_recognition(hci_con_handle_t acl_handle);
*/
uint8_t hfp_hf_deactivate_voice_recognition(hci_con_handle_t acl_handle);
/**
* @brief Activate enhanced voice recognition (EVR) and emit HFP_SUBEVENT_VOICE_RECOGNITION_STATUS event with status ERROR_CODE_SUCCESS
* if successful, otherwise ERROR_CODE_COMMAND_DISALLOWED. The state field of this event is to the current state of EVR: 1 if activated, otherwise 0.
* Prerequisite is established SLC.
*
* @param acl_handle
* @return status ERROR_CODE_SUCCESS if successful, otherwise:
* - ERROR_CODE_COMMAND_DISALLOWED if feature HFP_(HF/AG)SF_ENHANCED_VOICE_RECOGNITION_STATUS is not supported by HF and AG, or wrong VRA status
*/
uint8_t hfp_hf_activate_enhanced_voice_recognition(hci_con_handle_t acl_handle);
/**
* @brief Indicate that the HF is ready to accept audio. Prerequisite is established voice recognition session.
@ -403,16 +390,6 @@ uint8_t hfp_hf_activate_enhanced_voice_recognition(hci_con_handle_t acl_handle);
*/
uint8_t hfp_hf_enhanced_voice_recognition_report_ready_for_audio(hci_con_handle_t acl_handle);
/**
* @brief Deactivate enhanced voice recognition (EVR) and emit HFP_SUBEVENT_VOICE_RECOGNITION_STATUS event with status ERROR_CODE_SUCCESS
* if successful, otherwise ERROR_CODE_COMMAND_DISALLOWED. The state field of this event is to the current state of EVR: 1 if activated, otherwise 0.
* Prerequisite is established SLC.
*
* @param acl_handle
* @return status ERROR_CODE_SUCCESS if successful, otherwise:
* - ERROR_CODE_COMMAND_DISALLOWED if feature HFP_(HF/AG)SF_ENHANCED_VOICE_RECOGNITION_STATUS is not supported by HF and AG, or wrong VRA status
*/
uint8_t hfp_hf_deactivate_enhanced_voice_recognition(hci_con_handle_t acl_handle);
/*
* @brief Set microphone gain.