mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-09 21:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

hfp: rewrite ag codec connection; not tested

Browse Source
This commit is contained in:
Milanka Ringwald 2015-08-28 00:32:46 +02:00
parent 69de467120
commit 50512b8ac1
2 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/hfp.c
View File

@ -275,10 +275,10 @@ void hfp_reset_context_flags(hfp_connection_t * context){
// establish codecs connection // establish codecs connection
context->trigger_codec_connection_setup = 0; context->trigger_codec_connection_setup = 0;
context->remote_codec_received = 0; context->suggested_codec = 0;
context->establish_audio_connection = 0; context->establish_audio_connection = 0;
context->release_audio_connection = 0;
} }
static hfp_connection_t * create_hfp_connection_context(){ static hfp_connection_t * create_hfp_connection_context(){
@ -702,7 +702,11 @@ void process_command(hfp_connection_t * context){
} }
if (strncmp((char *)context->line_buffer+offset, HFP_CONFIRM_COMMON_CODEC, strlen(HFP_CONFIRM_COMMON_CODEC)) == 0){ if (strncmp((char *)context->line_buffer+offset, HFP_CONFIRM_COMMON_CODEC, strlen(HFP_CONFIRM_COMMON_CODEC)) == 0){
context->command = HFP_CMD_RECEIVED_COMMON_CODEC; if (isHandsFree){
context->command = HFP_CMD_HF_CONFIRMED_CODEC;
} else {
context->command = HFP_CMD_AG_SUGGESTED_CODEC;
}
return; return;
} }
@ -830,8 +834,11 @@ void hfp_parse(hfp_connection_t * context, uint8_t byte){
case HFP_PARSER_CMD_SEQUENCE: // parse comma separated sequence, ignore breacktes case HFP_PARSER_CMD_SEQUENCE: // parse comma separated sequence, ignore breacktes
switch (context->command){ switch (context->command){
case HFP_CMD_RECEIVED_COMMON_CODEC: case HFP_CMD_HF_CONFIRMED_CODEC:
context->remote_codec_received = atoi((char*)context->line_buffer); context->codec_confirmed = atoi((char*)context->line_buffer);
break;
case HFP_CMD_AG_SUGGESTED_CODEC:
context->suggested_codec = atoi((char*)context->line_buffer);
break; break;
case HFP_CMD_SUPPORTED_FEATURES: case HFP_CMD_SUPPORTED_FEATURES:
context->remote_supported_features = atoi((char*)context->line_buffer); context->remote_supported_features = atoi((char*)context->line_buffer);
@ -1050,9 +1057,36 @@ void hfp_release_service_level_connection(hfp_connection_t * context){
return; return;
} }
void hfp_establish_audio_connection(hfp_connection_t * context, uint8_t codec_negotiation_feature_enabled){ void hfp_negotiate_codecs(hfp_connection_t * connection){
if (!connection){
log_error("HFP HF: connection doesn't exist.");
return;
}
if (connection->state >= HFP_W2_DISCONNECT_SCO) return;
if (connection->state != HFP_SLE_W4_EXCHANGE_COMMON_CODEC){
connection->trigger_codec_connection_setup = 1;
}
} }
void hfp_release_audio_connection(hfp_connection_t * context){
void hfp_establish_audio_connection(hfp_connection_t * connection){
connection->establish_audio_connection = 0;
if (connection->state == HFP_AUDIO_CONNECTION_ESTABLISHED) return;
if (connection->state >= HFP_W2_DISCONNECT_SCO) return;
connection->establish_audio_connection = 1;
if (connection->state < HFP_SLE_W4_EXCHANGE_COMMON_CODEC){
connection->trigger_codec_connection_setup = 1;
}
} }
void hfp_release_audio_connection(hfp_connection_t * connection){
if (!connection) return;
if (connection->state >= HFP_W2_DISCONNECT_SCO) return;
connection->release_audio_connection = 1;
}

11
src/hfp.h
View File

@ -141,7 +141,8 @@ typedef enum {
HFP_CMD_ENABLE_EXTENDED_AUDIO_GATEWAY_ERROR, HFP_CMD_ENABLE_EXTENDED_AUDIO_GATEWAY_ERROR,
HFP_CMD_EXTENDED_AUDIO_GATEWAY_ERROR, HFP_CMD_EXTENDED_AUDIO_GATEWAY_ERROR,
HFP_CMD_TRIGGER_CODEC_CONNECTION_SETUP, HFP_CMD_TRIGGER_CODEC_CONNECTION_SETUP,
HFP_CMD_RECEIVED_COMMON_CODEC HFP_CMD_AG_SUGGESTED_CODEC,
HFP_CMD_HF_CONFIRMED_CODEC
} hfp_command_t; } hfp_command_t;
@ -362,7 +363,7 @@ typedef struct hfp_connection {
// establish codecs connection // establish codecs connection
uint8_t trigger_codec_connection_setup; uint8_t trigger_codec_connection_setup;
uint8_t ag_ready_for_codecs_connection_setup; uint8_t ag_ready_for_codecs_connection_setup;
uint8_t remote_codec_received; uint8_t suggested_codec;
uint8_t codec_confirmed; uint8_t codec_confirmed;
uint8_t establish_audio_connection; uint8_t establish_audio_connection;
@ -390,10 +391,12 @@ void hfp_parse(hfp_connection_t * context, uint8_t byte);
void hfp_init(uint16_t rfcomm_channel_nr); void hfp_init(uint16_t rfcomm_channel_nr);
void hfp_establish_service_level_connection(bd_addr_t bd_addr, uint16_t service_uuid); void hfp_establish_service_level_connection(bd_addr_t bd_addr, uint16_t service_uuid);
void hfp_release_service_level_connection(hfp_connection_t * connection); void hfp_release_service_level_connection(hfp_connection_t * connection);
void hfp_establish_audio_connection(hfp_connection_t * context, uint8_t codec_negotiation_feature_enabled);
void hfp_release_audio_connection(hfp_connection_t * context);
void hfp_reset_context_flags(hfp_connection_t * context); void hfp_reset_context_flags(hfp_connection_t * context);
void hfp_negotiate_codecs(hfp_connection_t * context);
void hfp_establish_audio_connection(hfp_connection_t * context);
void hfp_release_audio_connection(hfp_connection_t * context);
const char * hfp_hf_feature(int index); const char * hfp_hf_feature(int index);
const char * hfp_ag_feature(int index); const char * hfp_ag_feature(int index);