diff --git a/example/a2dp_source_demo.c b/example/a2dp_source_demo.c index 55a670ab3..0b8b2bd64 100644 --- a/example/a2dp_source_demo.c +++ b/example/a2dp_source_demo.c @@ -88,6 +88,7 @@ typedef enum { typedef struct { uint16_t a2dp_cid; uint8_t local_seid; + uint8_t remote_seid; uint8_t stream_opened; uint16_t avrcp_cid; @@ -543,6 +544,7 @@ static void a2dp_source_packet_handler(uint8_t packet_type, uint16_t channel, ui case A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_SBC_CONFIGURATION:{ cid = avdtp_subevent_signaling_media_codec_sbc_configuration_get_avdtp_cid(packet); if (cid != media_tracker.a2dp_cid) return; + media_tracker.remote_seid = a2dp_subevent_signaling_media_codec_sbc_configuration_get_acp_seid(packet); sbc_configuration.reconfigure = a2dp_subevent_signaling_media_codec_sbc_configuration_get_reconfigure(packet); sbc_configuration.num_channels = a2dp_subevent_signaling_media_codec_sbc_configuration_get_num_channels(packet); @@ -554,10 +556,11 @@ static void a2dp_source_packet_handler(uint8_t packet_type, uint16_t channel, ui sbc_configuration.min_bitpool_value = a2dp_subevent_signaling_media_codec_sbc_configuration_get_min_bitpool_value(packet); sbc_configuration.max_bitpool_value = a2dp_subevent_signaling_media_codec_sbc_configuration_get_max_bitpool_value(packet); sbc_configuration.frames_per_buffer = sbc_configuration.subbands * sbc_configuration.block_length; - printf("A2DP Source: Received SBC codec configuration, sampling frequency %u, a2dp_cid 0x%02x, initiator seid %d, acceptor seid %d .\n", + printf("A2DP Source: Received SBC codec configuration, sampling frequency %u, a2dp_cid 0x%02x, local seid %d (expected %d), remote seid %d .\n", sbc_configuration.sampling_frequency, cid, a2dp_subevent_signaling_media_codec_sbc_configuration_get_int_seid(packet), - a2dp_subevent_signaling_media_codec_sbc_configuration_get_acp_seid(packet)); + media_tracker.local_seid, + media_tracker.remote_seid); // Adapt Bluetooth spec definition to SBC Encoder expected input sbc_configuration.allocation_method -= 1; @@ -588,10 +591,12 @@ static void a2dp_source_packet_handler(uint8_t packet_type, uint16_t channel, ui } case A2DP_SUBEVENT_SIGNALING_DELAY_REPORTING_CAPABILITY: - printf("A2DP Source: remote supports delay report\n"); + printf("A2DP Source: remote supports delay report, remote seid %d\n", + avdtp_subevent_signaling_delay_reporting_capability_get_remote_seid(packet)); break; case A2DP_SUBEVENT_SIGNALING_CAPABILITIES_DONE: - printf("A2DP Source: All capabilities reported\n"); + printf("A2DP Source: All capabilities reported, remote seid %d\n", + avdtp_subevent_signaling_capabilities_done_get_remote_seid(packet)); break; case A2DP_SUBEVENT_SIGNALING_DELAY_REPORT: @@ -610,7 +615,10 @@ static void a2dp_source_packet_handler(uint8_t packet_type, uint16_t channel, ui local_seid = a2dp_subevent_stream_established_get_local_seid(packet); cid = a2dp_subevent_stream_established_get_a2dp_cid(packet); - printf("A2DP_SUBEVENT_STREAM_ESTABLISHED: a2dp_cid [expected 0x%02x, received 0x%02x], local_seid [expected %d, received %d]\n", media_tracker.a2dp_cid, cid, media_tracker.local_seid, local_seid); + printf("A2DP_SUBEVENT_STREAM_ESTABLISHED: a2dp_cid [expected 0x%02x, received 0x%02x], local_seid %d (expected %d), remote_seid %d (expected %d)\n", + media_tracker.a2dp_cid, cid, + local_seid, media_tracker.local_seid, + a2dp_subevent_stream_established_get_remote_seid(packet), media_tracker.remote_seid); if (local_seid != media_tracker.local_seid){ printf("A2DP Source: Stream failed, wrong local seid %d, expected %d.\n", local_seid, media_tracker.local_seid); diff --git a/src/classic/a2dp_source.c b/src/classic/a2dp_source.c index 0bf13911b..e5314903d 100644 --- a/src/classic/a2dp_source.c +++ b/src/classic/a2dp_source.c @@ -349,7 +349,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe sc.max_bitpool_value = avdtp_subevent_signaling_media_codec_sbc_configuration_get_max_bitpool_value(packet); sc.min_bitpool_value = avdtp_subevent_signaling_media_codec_sbc_configuration_get_min_bitpool_value(packet); // TODO: deal with reconfigure: avdtp_subevent_signaling_media_codec_sbc_configuration_get_reconfigure(packet); - log_info("A2DP received SBC Config: sample rate %u, max bitpool %u.", sc.sampling_frequency, sc.max_bitpool_value); + log_info("A2DP received SBC Config: sample rate %u, max bitpool %u., remote seid %d", sc.sampling_frequency, sc.max_bitpool_value, avdtp_subevent_signaling_media_codec_sbc_configuration_get_remote_seid(packet)); app_state = A2DP_W2_OPEN_STREAM_WITH_SEID; a2dp_signaling_emit_media_codec_sbc(a2dp_source_context.a2dp_callback, packet, size); break; @@ -358,7 +358,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe case AVDTP_SUBEVENT_STREAMING_CAN_SEND_MEDIA_PACKET_NOW: cid = avdtp_subevent_streaming_can_send_media_packet_now_get_avdtp_cid(packet); local_seid = avdtp_subevent_streaming_can_send_media_packet_now_get_avdtp_cid(packet); - log_info("AVDTP_SUBEVENT_STREAMING_CAN_SEND_MEDIA_PACKET_NOW cid 0x%02x, local_seid %d", cid, local_seid); + // log_info("A2DP STREAMING_CAN_SEND_MEDIA_PACKET_NOW cid 0x%02x, local_seid %d", cid, local_seid); a2dp_streaming_emit_can_send_media_packet_now(a2dp_source_context.a2dp_callback, cid, local_seid); break; @@ -369,11 +369,11 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe remote_seid = avdtp_subevent_streaming_connection_established_get_remote_seid(packet); local_seid = avdtp_subevent_streaming_connection_established_get_local_seid(packet); if (status != 0){ - log_info("AVDTP_SUBEVENT_STREAMING_CONNECTION could not be established, avdtp_cid 0x%02x, status 0x%02x ---", cid, status); + log_info("A2DP streaming connection could not be established, avdtp_cid 0x%02x, status 0x%02x ---", cid, status); a2dp_streaming_emit_connection_established(a2dp_source_context.a2dp_callback, cid, address, local_seid, remote_seid, status); break; } - log_info("AVDTP_SUBEVENT_STREAMING_CONNECTION_ESTABLISHED --- avdtp_cid 0x%02x, local seid %d, remote seid %d", cid, local_seid, remote_seid); + log_info("A2DP streaming connection established --- avdtp_cid 0x%02x, local seid %d, remote seid %d", cid, local_seid, remote_seid); app_state = A2DP_STREAMING_OPENED; a2dp_streaming_emit_connection_established(a2dp_source_context.a2dp_callback, cid, address, local_seid, remote_seid, 0); break; @@ -384,7 +384,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe sep.in_use = avdtp_subevent_signaling_sep_found_get_in_use(packet); sep.media_type = (avdtp_media_type_t) avdtp_subevent_signaling_sep_found_get_media_type(packet); sep.type = (avdtp_sep_type_t) avdtp_subevent_signaling_sep_found_get_sep_type(packet); - log_info("Found sep: seid %u, in_use %d, media type %d, sep type %d (1-SNK)", sep.seid, sep.in_use, sep.media_type, sep.type); + log_info("A2DP Found sep: remote seid %u, in_use %d, media type %d, sep type %d (1-SNK), index %d", sep.seid, sep.in_use, sep.media_type, sep.type, num_remote_seps); remote_seps[num_remote_seps++] = sep; break; } @@ -397,12 +397,13 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe // TODO check cid signal_identifier = avdtp_subevent_signaling_accept_get_signal_identifier(packet); cid = avdtp_subevent_signaling_accept_get_avdtp_cid(packet); - log_info("A2DP Accepted %d, state %d", signal_identifier, app_state); + log_info("A2DP cmd %s accepted , cid 0x%2x, local seid %d, active remote seid %d", avdtp_si2str(signal_identifier), app_state, cid, avdtp_subevent_signaling_accept_get_local_seid(packet), sc.active_remote_sep->seid); switch (app_state){ case A2DP_W2_GET_CAPABILITIES: if (sc.active_remote_sep_index < num_remote_seps){ sc.active_remote_sep = &remote_seps[sc.active_remote_sep_index++]; + log_info("A2DP get capabilities for remote seid %d", sc.active_remote_sep->seid); avdtp_source_get_capabilities(cid, sc.active_remote_sep->seid); } break; @@ -414,12 +415,12 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe break; } case A2DP_W2_RECONFIGURE_WITH_SEID: - log_info("A2DP reconfigured"); + log_info("A2DP reconfigured ... local seid %d, active remote seid %d", avdtp_stream_endpoint_seid(sc.local_stream_endpoint), sc.active_remote_sep->seid); a2dp_signaling_emit_reconfigured(a2dp_source_context.a2dp_callback, cid, avdtp_stream_endpoint_seid(sc.local_stream_endpoint), 0); app_state = A2DP_STREAMING_OPENED; break; case A2DP_W2_OPEN_STREAM_WITH_SEID:{ - log_info("A2DP open stream "); + log_info("A2DP open stream ... local seid %d, active remote seid %d", avdtp_stream_endpoint_seid(sc.local_stream_endpoint), sc.active_remote_sep->seid); app_state = A2DP_W4_OPEN_STREAM_WITH_SEID; avdtp_source_open_stream(cid, avdtp_stream_endpoint_seid(sc.local_stream_endpoint), sc.active_remote_sep->seid); break; diff --git a/src/classic/avdtp.h b/src/classic/avdtp.h index 589a688f3..344643085 100644 --- a/src/classic/avdtp.h +++ b/src/classic/avdtp.h @@ -427,10 +427,6 @@ typedef struct { avdtp_signal_identifier_t reject_signal_identifier; uint8_t error_code; - // store configurations with remote seps - // avdtp_sep_t remote_seps[AVDTP_MAX_NUM_SEPS]; - // uint8_t remote_seps_num; - // configuration state machine avtdp_configuration_state_t configuration_state; @@ -473,8 +469,8 @@ typedef struct avdtp_stream_endpoint { a2dp_state_t a2dp_state; // active connection avdtp_connection_t * connection; + // currently active remote seid - // uint8_t remote_sep_index; avdtp_capabilities_t remote_capabilities; uint16_t remote_capabilities_bitmap; diff --git a/src/classic/avdtp_acceptor.c b/src/classic/avdtp_acceptor.c index 2fbb8c701..7b7522900 100644 --- a/src/classic/avdtp_acceptor.c +++ b/src/classic/avdtp_acceptor.c @@ -239,17 +239,17 @@ void avdtp_acceptor_stream_config_subsm(avdtp_connection_t * connection, uint8_t case AVDTP_ACCEPTOR_STREAM_CONFIG_IDLE: switch (connection->acceptor_signaling_packet.signal_identifier){ case AVDTP_SI_DELAYREPORT: - log_info("ACP: AVDTP_ACCEPTOR_W2_ANSWER_DELAY_REPORT"); + log_info("ACP: AVDTP_ACCEPTOR_W2_ANSWER_DELAY_REPORT, local seid %d", connection->acceptor_local_seid); stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_ANSWER_DELAY_REPORT; avdtp_signaling_emit_delay(context->avdtp_callback, connection->avdtp_cid, connection->acceptor_local_seid, big_endian_read_16(packet, offset)); break; case AVDTP_SI_GET_ALL_CAPABILITIES: - log_info("ACP: AVDTP_SI_GET_ALL_CAPABILITIES"); + log_info("ACP: AVDTP_SI_GET_ALL_CAPABILITIES, local seid %d", connection->acceptor_local_seid); stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_ANSWER_GET_ALL_CAPABILITIES; break; case AVDTP_SI_GET_CAPABILITIES: - log_info("ACP: AVDTP_ACCEPTOR_W2_ANSWER_GET_CAPABILITIES"); + log_info("ACP: AVDTP_ACCEPTOR_W2_ANSWER_GET_CAPABILITIES, local seid %d", connection->acceptor_local_seid); stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_ANSWER_GET_CAPABILITIES; break; case AVDTP_SI_SET_CONFIGURATION:{ @@ -261,7 +261,7 @@ void avdtp_acceptor_stream_config_subsm(avdtp_connection_t * connection, uint8_t break; case AVDTP_CONFIGURATION_STATE_LOCAL_INITIATED: case AVDTP_CONFIGURATION_STATE_LOCAL_CONFIGURED: - log_info("ACP: Set configuration already initiated locally, reject cmd "); + log_info("ACP: Set configuration already initiated locally, reject cmd, local seid %d", connection->acceptor_local_seid); // fire configuration parsing errors connection->reject_signal_identifier = connection->acceptor_signaling_packet.signal_identifier; stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_REJECT_UNKNOWN_CMD; @@ -276,8 +276,7 @@ void avdtp_acceptor_stream_config_subsm(avdtp_connection_t * connection, uint8_t connection->reject_service_category = 0; avdtp_sep_t sep; - sep.seid = connection->acceptor_local_seid; - log_info("ACP: AVDTP_ACCEPTOR_W2_ANSWER_RECONFIGURE seid %d", sep.seid); + log_info("ACP: AVDTP_ACCEPTOR_W2_ANSWER_RECONFIGURE, local seid %d, remote seid %d", connection->acceptor_local_seid, stream_endpoint->remote_sep.seid); sep.configured_service_categories = avdtp_unpack_service_capabilities(connection, connection->acceptor_signaling_packet.signal_identifier, &sep.configuration, connection->acceptor_signaling_packet.command+offset, packet_size-offset); if (connection->error_code){ // fire configuration parsing errors @@ -294,8 +293,10 @@ void avdtp_acceptor_stream_config_subsm(avdtp_connection_t * connection, uint8_t connection->reject_signal_identifier = connection->acceptor_signaling_packet.signal_identifier; break; } - stream_endpoint->remote_sep = sep; - log_info("ACP: update seid %d, to %p", stream_endpoint->remote_sep.seid, stream_endpoint); + stream_endpoint->remote_sep.configured_service_categories = sep.configured_service_categories; + stream_endpoint->remote_sep.configuration = sep.configuration; + + log_info("ACP: update active remote seid %d", stream_endpoint->remote_sep.seid); avdtp_emit_configuration(context->avdtp_callback, connection->avdtp_cid, avdtp_local_seid(stream_endpoint), avdtp_remote_seid(stream_endpoint), &sep.configuration, sep.configured_service_categories); avdtp_signaling_emit_accept(context->avdtp_callback, connection->avdtp_cid, avdtp_local_seid(stream_endpoint), connection->acceptor_signaling_packet.signal_identifier);