mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-23 11:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

avdtp_util: fix some events

Browse Source 
AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CAPABILITY,
AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_OTHER_CAPABILITY
AVDTP_SUBEVENT_SIGNALING_CONTENT_PROTECTION_CAPABILITY
AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_OTHER_CONFIGURATION
This commit is contained in:
Matthias Ringwald 2021-03-15 18:15:10 +01:00
parent 016e946421
commit 73048ce6fb
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/classic/avdtp_util.c
View File

@ -690,7 +690,6 @@ static void avdtp_signaling_emit_media_codec_mpeg_aac_capability(uint16_t avdtp_
little_endian_store_24(event, pos, bit_rate_bitmap); little_endian_store_24(event, pos, bit_rate_bitmap);
pos += 3; pos += 3;
event[pos++] = vbr; event[pos++] = vbr;
avdtp_emit_sink_and_source(event, pos); avdtp_emit_sink_and_source(event, pos);
} }
@ -699,6 +698,7 @@ static void avdtp_signaling_emit_media_codec_atrac_capability(uint16_t avdtp_cid
uint8_t event[16]; uint8_t event[16];
int pos = 0; int pos = 0;
event[pos++] = HCI_EVENT_AVDTP_META; event[pos++] = HCI_EVENT_AVDTP_META;
pos++; // set later
event[pos++] = sizeof(event) - 2; event[pos++] = sizeof(event) - 2;
event[pos++] = AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CAPABILITY; event[pos++] = AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CAPABILITY;
little_endian_store_16(event, pos, avdtp_cid); little_endian_store_16(event, pos, avdtp_cid);
@ -720,7 +720,8 @@ static void avdtp_signaling_emit_media_codec_atrac_capability(uint16_t avdtp_cid
little_endian_store_24(event, pos, bit_rate_index_bitmap); little_endian_store_24(event, pos, bit_rate_index_bitmap);
pos += 3; pos += 3;
little_endian_store_16(event, pos, maximum_sul); little_endian_store_16(event, pos, maximum_sul);
pos += 2;
event[1] = pos - 2;
avdtp_emit_sink_and_source(event, pos); avdtp_emit_sink_and_source(event, pos);
} }
@ -728,6 +729,7 @@ static void avdtp_signaling_emit_media_codec_other_capability(uint16_t avdtp_cid
uint8_t event[MAX_MEDIA_CODEC_INFORMATION_LENGTH + 11]; uint8_t event[MAX_MEDIA_CODEC_INFORMATION_LENGTH + 11];
int pos = 0; int pos = 0;
event[pos++] = HCI_EVENT_AVDTP_META; event[pos++] = HCI_EVENT_AVDTP_META;
pos++; // set later
event[pos++] = sizeof(event) - 2; event[pos++] = sizeof(event) - 2;
event[pos++] = AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_OTHER_CAPABILITY; event[pos++] = AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_OTHER_CAPABILITY;
little_endian_store_16(event, pos, avdtp_cid); little_endian_store_16(event, pos, avdtp_cid);
@ -741,6 +743,7 @@ static void avdtp_signaling_emit_media_codec_other_capability(uint16_t avdtp_cid
uint32_t media_codec_info_len = btstack_min(media_codec.media_codec_information_len, MAX_MEDIA_CODEC_INFORMATION_LENGTH); uint32_t media_codec_info_len = btstack_min(media_codec.media_codec_information_len, MAX_MEDIA_CODEC_INFORMATION_LENGTH);
(void)memcpy(event + pos, media_codec.media_codec_information, media_codec_info_len); (void)memcpy(event + pos, media_codec.media_codec_information, media_codec_info_len);
pos += media_codec_info_len; pos += media_codec_info_len;
event[1] = pos - 2;
avdtp_emit_sink_and_source(event, pos); avdtp_emit_sink_and_source(event, pos);
} }
@ -775,11 +778,13 @@ static void avdtp_signaling_emit_recovery_capability(uint16_t avdtp_cid, uint8_t
avdtp_emit_sink_and_source(event, pos); avdtp_emit_sink_and_source(event, pos);
} }
#define MAX_CONTENT_PROTECTION_VALUE_LEN 32
static void static void
avdtp_signaling_emit_content_protection_capability(uint16_t avdtp_cid, uint8_t remote_seid, adtvp_content_protection_t *content_protection) { avdtp_signaling_emit_content_protection_capability(uint16_t avdtp_cid, uint8_t remote_seid, adtvp_content_protection_t *content_protection) {
uint8_t event[21]; uint8_t event[10 + MAX_CONTENT_PROTECTION_VALUE_LEN];
int pos = 0; int pos = 0;
event[pos++] = HCI_EVENT_AVDTP_META; event[pos++] = HCI_EVENT_AVDTP_META;
pos++; // set later
event[pos++] = sizeof(event) - 2; event[pos++] = sizeof(event) - 2;
event[pos++] = AVDTP_SUBEVENT_SIGNALING_CONTENT_PROTECTION_CAPABILITY; event[pos++] = AVDTP_SUBEVENT_SIGNALING_CONTENT_PROTECTION_CAPABILITY;
little_endian_store_16(event, pos, avdtp_cid); little_endian_store_16(event, pos, avdtp_cid);
@ -788,14 +793,18 @@ avdtp_signaling_emit_content_protection_capability(uint16_t avdtp_cid, uint8_t r
little_endian_store_16(event, pos, content_protection->cp_type); little_endian_store_16(event, pos, content_protection->cp_type);
pos += 2; pos += 2;
// drop cp protection value if longer than expected
if (content_protection->cp_type_value_len <= MAX_CONTENT_PROTECTION_VALUE_LEN){
little_endian_store_16(event, pos, content_protection->cp_type_value_len); little_endian_store_16(event, pos, content_protection->cp_type_value_len);
pos += 2; pos += 2;
(void)memcpy(event + pos, content_protection->cp_type_value, content_protection->cp_type_value_len);
//TODO: reserve place for value pos += content_protection->cp_type_value_len;
if (content_protection->cp_type_value_len < 10){ } else {
(void)memcpy(event + pos, content_protection->cp_type_value, little_endian_store_16(event, pos, 0);
content_protection->cp_type_value_len); pos += 2;
} }
event[1] = pos - 2;
avdtp_emit_sink_and_source(event, pos); avdtp_emit_sink_and_source(event, pos);
} }
@ -1233,6 +1242,7 @@ static void avdtp_signaling_emit_media_codec_other_configuration(avdtp_stream_en
uint8_t event[MAX_MEDIA_CODEC_INFORMATION_LENGTH + 13]; uint8_t event[MAX_MEDIA_CODEC_INFORMATION_LENGTH + 13];
int pos = 0; int pos = 0;
event[pos++] = HCI_EVENT_AVDTP_META; event[pos++] = HCI_EVENT_AVDTP_META;
pos++; // set later
event[pos++] = sizeof(event) - 2; event[pos++] = sizeof(event) - 2;
event[pos++] = AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_OTHER_CONFIGURATION; event[pos++] = AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_OTHER_CONFIGURATION;
little_endian_store_16(event, pos, avdtp_cid); little_endian_store_16(event, pos, avdtp_cid);
@ -1245,11 +1255,11 @@ static void avdtp_signaling_emit_media_codec_other_configuration(avdtp_stream_en
pos += 2; pos += 2;
little_endian_store_16(event, pos, media_codec->media_codec_information_len); little_endian_store_16(event, pos, media_codec->media_codec_information_len);
pos += 2; pos += 2;
uint16_t media_codec_len = btstack_min(MAX_MEDIA_CODEC_INFORMATION_LENGTH, media_codec->media_codec_information_len);
int media_codec_len = btstack_min(MAX_MEDIA_CODEC_INFORMATION_LENGTH, media_codec->media_codec_information_len);
(void)memcpy(event + pos, media_codec->media_codec_information, media_codec_len); (void)memcpy(event + pos, media_codec->media_codec_information, media_codec_len);
pos += media_codec_len;
(*packet_handler)(HCI_EVENT_PACKET, 0, event, sizeof(event)); event[1] = pos - 2;
(*packet_handler)(HCI_EVENT_PACKET, 0, event, pos);
} }
void avdtp_signaling_emit_delay(uint16_t avdtp_cid, uint8_t local_seid, uint16_t delay) { void avdtp_signaling_emit_delay(uint16_t avdtp_cid, uint8_t local_seid, uint16_t delay) {