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

a2dp_sink: track a2dp_sink_outgoing_active in avdtp_connection_t

Browse Source
This commit is contained in:
Matthias Ringwald 2022-02-28 14:51:19 +01:00
parent 839d169487
commit 2e3fcb138f
2 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/classic/a2dp_sink.c
View File

@ -53,7 +53,6 @@ static const char * a2dp_sink_default_service_name = "BTstack A2DP Sink Service"
static const char * a2dp_sink_default_service_provider_name = "BTstack A2DP Sink Service Provider";
static uint16_t a2dp_sink_cid;
static bool a2dp_sink_outgoing_active = false;
static bool a2dp_sink_stream_endpoint_configured = false;
static btstack_packet_handler_t a2dp_sink_packet_handler_user;
@ -169,7 +168,6 @@ void a2dp_sink_deinit(void){
a2dp_sink_cid = 0;
a2dp_sink_packet_handler_user = NULL;
a2dp_sink_media_config_validator = NULL;
a2dp_sink_outgoing_active = false;
a2dp_sink_stream_endpoint_configured = false;
}
@ -202,9 +200,21 @@ uint8_t a2dp_sink_establish_stream(bd_addr_t bd_addr, uint8_t local_seid, uint16
log_info("No local_stream_endpoint for seid %d", local_seid);
return ERROR_CODE_COMMAND_DISALLOWED;
}
// remember to tell client
a2dp_sink_outgoing_active = true;
return avdtp_sink_connect(bd_addr, avdtp_cid);
uint16_t outgoing_cid;
uint8_t status = avdtp_sink_connect(bd_addr, &outgoing_cid);
if (status != ERROR_CODE_SUCCESS){
return status;
}
avdtp_connection_t * connection = avdtp_get_connection_for_avdtp_cid(outgoing_cid);
btstack_assert(connection != NULL);
// setup state
connection->a2dp_sink_outgoing_active = true;
*avdtp_cid = outgoing_cid;
return ERROR_CODE_SUCCESS;
}
#ifdef ENABLE_AVDTP_ACCEPTOR_EXPLICIT_START_STREAM_CONFIRMATION
@ -225,6 +235,8 @@ static void a2dp_sink_packet_handler_internal(uint8_t packet_type, uint16_t chan
UNUSED(channel);
UNUSED(size);
uint16_t cid;
avdtp_connection_t * connection;
uint8_t status;
uint8_t local_seid;
uint8_t signal_identifier;
@ -238,14 +250,18 @@ static void a2dp_sink_packet_handler_internal(uint8_t packet_type, uint16_t chan
case AVDTP_SUBEVENT_SIGNALING_CONNECTION_ESTABLISHED:
if (a2dp_sink_stream_endpoint_configured) return;
cid = avdtp_subevent_signaling_connection_established_get_avdtp_cid(packet);
connection = avdtp_get_connection_for_avdtp_cid(cid);
btstack_assert(connection != NULL);
status = avdtp_subevent_signaling_connection_established_get_status(packet);
if (status != ERROR_CODE_SUCCESS){
// only care for outgoing connections
if (!a2dp_sink_outgoing_active) break;
a2dp_sink_outgoing_active = false;
a2dp_replace_subevent_id_and_emit_cmd(a2dp_sink_packet_handler_user, packet, size, A2DP_SUBEVENT_SIGNALING_CONNECTION_ESTABLISHED);
log_info("A2DP sink signaling connection failed status %d", status);
break;
// notify about connection error only if we're initiator
if (connection->a2dp_sink_outgoing_active) {
log_info("A2DP sink signaling connection failed status %d", status);
connection->a2dp_sink_outgoing_active = false;
a2dp_replace_subevent_id_and_emit_cmd(a2dp_sink_packet_handler_user, packet, size, A2DP_SUBEVENT_SIGNALING_CONNECTION_ESTABLISHED);
}
}
a2dp_replace_subevent_id_and_emit_cmd(a2dp_sink_packet_handler_user, packet, size, A2DP_SUBEVENT_SIGNALING_CONNECTION_ESTABLISHED);
@ -269,9 +285,12 @@ static void a2dp_sink_packet_handler_internal(uint8_t packet_type, uint16_t chan
case AVDTP_SUBEVENT_STREAMING_CONNECTION_ESTABLISHED:
if (a2dp_sink_stream_endpoint_configured == false) break;
if (a2dp_sink_cid != avdtp_subevent_streaming_connection_established_get_avdtp_cid(packet)) break;
connection = avdtp_get_connection_for_avdtp_cid(a2dp_sink_cid);
btstack_assert(connection != NULL);
// about to notify client
a2dp_sink_outgoing_active = false;
connection->a2dp_sink_outgoing_active = false;
status = avdtp_subevent_streaming_connection_established_get_status(packet);
if (status != ERROR_CODE_SUCCESS){
log_info("A2DP sink streaming connection could not be established, avdtp_cid 0x%02x, status 0x%02x ---", a2dp_sink_cid, status);
@ -338,10 +357,15 @@ static void a2dp_sink_packet_handler_internal(uint8_t packet_type, uint16_t chan
break;
case AVDTP_SUBEVENT_SIGNALING_CONNECTION_RELEASED:
if (a2dp_sink_cid != avdtp_subevent_signaling_connection_released_get_avdtp_cid(packet)) break;
cid = avdtp_subevent_signaling_connection_released_get_avdtp_cid(packet);
connection = avdtp_get_connection_for_avdtp_cid(cid);
btstack_assert(connection != NULL);
connection->a2dp_sink_outgoing_active = false;
if (a2dp_sink_cid != cid) break;
a2dp_sink_stream_endpoint_configured = false;
a2dp_sink_outgoing_active = false;
a2dp_replace_subevent_id_and_emit_cmd(a2dp_sink_packet_handler_user, packet, size, A2DP_SUBEVENT_SIGNALING_CONNECTION_RELEASED);
break;

4
src/classic/avdtp.h
View File

@ -542,6 +542,7 @@ typedef struct {
bool incoming_declined;
btstack_timer_source_t retry_timer;
// A2DP SOURCE
bool a2dp_source_discover_seps;
bool a2dp_source_outgoing_active;
bool a2dp_source_have_config;
@ -549,6 +550,9 @@ typedef struct {
a2dp_state_t a2dp_source_state;
struct avdtp_stream_endpoint * a2dp_source_local_stream_endpoint;
// A2DP SINK
bool a2dp_sink_outgoing_active;
} avdtp_connection_t;