From b9f0ca2140fd617c6acccb3cbf277f2992b7e19f Mon Sep 17 00:00:00 2001 From: Milanka Ringwald Date: Fri, 29 Nov 2024 12:20:21 +0100 Subject: [PATCH] btstack_defines: extend MPEG_AUDIO_CONFIGURATION event --- src/btstack_defines.h | 6 +++-- src/btstack_event.h | 58 ++++++++++++++++++++++++++++--------------- 2 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/btstack_defines.h b/src/btstack_defines.h index 1f4af8457..a1f24452f 100644 --- a/src/btstack_defines.h +++ b/src/btstack_defines.h @@ -2667,12 +2667,13 @@ typedef uint8_t sm_key_t[16]; #define AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CAPABILITY 0x08u /** - * @format 121112131 + * @format 1211112131 * @param subevent_code * @param avdtp_cid * @param remote_seid * @param media_type * @param object_type_bitmap + * @param drc * @param sampling_frequency_bitmap * @param channels_bitmap * @param bit_rate @@ -2835,7 +2836,7 @@ typedef uint8_t sm_key_t[16]; #define AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION 0x15u /** - * @format 12111113131 + * @format 121111113131 * @param subevent_code * @param avdtp_cid * @param local_seid @@ -2843,6 +2844,7 @@ typedef uint8_t sm_key_t[16]; * @param reconfigure * @param media_type * @param object_type + * @param drc * @param sampling_frequency * @param num_channels * @param bit_rate diff --git a/src/btstack_event.h b/src/btstack_event.h index f77fff532..4c74688e9 100644 --- a/src/btstack_event.h +++ b/src/btstack_event.h @@ -8405,6 +8405,15 @@ static inline uint8_t avdtp_subevent_signaling_media_codec_mpeg_aac_capability_g static inline uint8_t avdtp_subevent_signaling_media_codec_mpeg_aac_capability_get_object_type_bitmap(const uint8_t * event){ return event[7]; } +/** + * @brief Get field drc from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CAPABILITY + * @param event packet + * @return drc + * @note: btstack_type 1 + */ +static inline uint8_t avdtp_subevent_signaling_media_codec_mpeg_aac_capability_get_drc(const uint8_t * event){ + return event[8]; +} /** * @brief Get field sampling_frequency_bitmap from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CAPABILITY * @param event packet @@ -8412,7 +8421,7 @@ static inline uint8_t avdtp_subevent_signaling_media_codec_mpeg_aac_capability_g * @note: btstack_type 2 */ static inline uint16_t avdtp_subevent_signaling_media_codec_mpeg_aac_capability_get_sampling_frequency_bitmap(const uint8_t * event){ - return little_endian_read_16(event, 8); + return little_endian_read_16(event, 9); } /** * @brief Get field channels_bitmap from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CAPABILITY @@ -8421,7 +8430,7 @@ static inline uint16_t avdtp_subevent_signaling_media_codec_mpeg_aac_capability_ * @note: btstack_type 1 */ static inline uint8_t avdtp_subevent_signaling_media_codec_mpeg_aac_capability_get_channels_bitmap(const uint8_t * event){ - return event[10]; + return event[11]; } /** * @brief Get field bit_rate from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CAPABILITY @@ -8430,7 +8439,7 @@ static inline uint8_t avdtp_subevent_signaling_media_codec_mpeg_aac_capability_g * @note: btstack_type 3 */ static inline uint32_t avdtp_subevent_signaling_media_codec_mpeg_aac_capability_get_bit_rate(const uint8_t * event){ - return little_endian_read_24(event, 11); + return little_endian_read_24(event, 12); } /** * @brief Get field vbr from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CAPABILITY @@ -8439,7 +8448,7 @@ static inline uint32_t avdtp_subevent_signaling_media_codec_mpeg_aac_capability_ * @note: btstack_type 1 */ static inline uint8_t avdtp_subevent_signaling_media_codec_mpeg_aac_capability_get_vbr(const uint8_t * event){ - return event[14]; + return event[15]; } /** @@ -8939,9 +8948,9 @@ static inline uint16_t avdtp_subevent_signaling_media_codec_sbc_configuration_ge return little_endian_read_16(event, 9); } /** - * @brief Get field channel_mode from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_SBC_CONFIGURATION + * @brief Get field channels_num from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_SBC_CONFIGURATION * @param event packet - * @return channel_mode + * @return channels_num * @note: btstack_type 1 */ static inline uint8_t avdtp_subevent_signaling_media_codec_sbc_configuration_get_channel_mode(const uint8_t * event){ @@ -9066,9 +9075,9 @@ static inline uint8_t avdtp_subevent_signaling_media_codec_mpeg_audio_configurat return event[10]; } /** - * @brief Get field channel_mode from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION + * @brief Get field channels_num from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION * @param event packet - * @return channel_mode + * @return channels_num * @note: btstack_type 1 */ static inline uint8_t avdtp_subevent_signaling_media_codec_mpeg_audio_configuration_get_channel_mode(const uint8_t * event){ @@ -9174,6 +9183,15 @@ static inline uint8_t avdtp_subevent_signaling_media_codec_mpeg_aac_configuratio static inline uint8_t avdtp_subevent_signaling_media_codec_mpeg_aac_configuration_get_object_type(const uint8_t * event){ return event[9]; } +/** + * @brief Get field drc from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION + * @param event packet + * @return drc + * @note: btstack_type 1 + */ +static inline uint8_t avdtp_subevent_signaling_media_codec_mpeg_aac_configuration_get_drc(const uint8_t * event){ + return event[10]; +} /** * @brief Get field sampling_frequency from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION * @param event packet @@ -9181,7 +9199,7 @@ static inline uint8_t avdtp_subevent_signaling_media_codec_mpeg_aac_configuratio * @note: btstack_type 3 */ static inline uint32_t avdtp_subevent_signaling_media_codec_mpeg_aac_configuration_get_sampling_frequency(const uint8_t * event){ - return little_endian_read_24(event, 10); + return little_endian_read_24(event, 11); } /** * @brief Get field num_channels from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION @@ -9190,7 +9208,7 @@ static inline uint32_t avdtp_subevent_signaling_media_codec_mpeg_aac_configurati * @note: btstack_type 1 */ static inline uint8_t avdtp_subevent_signaling_media_codec_mpeg_aac_configuration_get_num_channels(const uint8_t * event){ - return event[13]; + return event[14]; } /** * @brief Get field bit_rate from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION @@ -9199,7 +9217,7 @@ static inline uint8_t avdtp_subevent_signaling_media_codec_mpeg_aac_configuratio * @note: btstack_type 3 */ static inline uint32_t avdtp_subevent_signaling_media_codec_mpeg_aac_configuration_get_bit_rate(const uint8_t * event){ - return little_endian_read_24(event, 14); + return little_endian_read_24(event, 15); } /** * @brief Get field vbr from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION @@ -9208,7 +9226,7 @@ static inline uint32_t avdtp_subevent_signaling_media_codec_mpeg_aac_configurati * @note: btstack_type 1 */ static inline uint8_t avdtp_subevent_signaling_media_codec_mpeg_aac_configuration_get_vbr(const uint8_t * event){ - return event[17]; + return event[18]; } /** @@ -9266,9 +9284,9 @@ static inline uint8_t avdtp_subevent_signaling_media_codec_atrac_configuration_g return event[9]; } /** - * @brief Get field channel_mode from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION + * @brief Get field channels_num from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION * @param event packet - * @return channel_mode + * @return channels_num * @note: btstack_type 1 */ static inline uint8_t avdtp_subevent_signaling_media_codec_atrac_configuration_get_channel_mode(const uint8_t * event){ @@ -9762,9 +9780,9 @@ static inline uint16_t a2dp_subevent_signaling_media_codec_sbc_configuration_get return little_endian_read_16(event, 9); } /** - * @brief Get field channel_mode from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_SBC_CONFIGURATION + * @brief Get field channels_num from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_SBC_CONFIGURATION * @param event packet - * @return channel_mode + * @return channels_num * @note: btstack_type 1 */ static inline uint8_t a2dp_subevent_signaling_media_codec_sbc_configuration_get_channel_mode(const uint8_t * event){ @@ -9889,9 +9907,9 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configurati return event[10]; } /** - * @brief Get field channel_mode from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION + * @brief Get field channels_num from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION * @param event packet - * @return channel_mode + * @return channels_num * @note: btstack_type 1 */ static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_audio_configuration_get_channel_mode(const uint8_t * event){ @@ -10089,9 +10107,9 @@ static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_ge return event[9]; } /** - * @brief Get field channel_mode from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION + * @brief Get field channels_num from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION * @param event packet - * @return channel_mode + * @return channels_num * @note: btstack_type 1 */ static inline uint8_t a2dp_subevent_signaling_media_codec_atrac_configuration_get_channel_mode(const uint8_t * event){