mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-05 00:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

btstack_defines: move drc field at the end of AVDTP MPEG AAC events definition and extend corresponding A2DP events with the same field

Browse Source
This commit is contained in:
Milanka Ringwald 2024-12-12 12:20:21 +01:00 committed by Matthias Ringwald
parent 48070a6f9a
commit 4aba847a6d
2 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/btstack_defines.h
View File

@ -2667,17 +2667,17 @@ typedef uint8_t sm_key_t[16];
#define AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CAPABILITY 0x08u
/**
* @format 1211112131
* @format 1211121311
* @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
* @param vbr
* @param drc
*/
#define AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CAPABILITY 0x09u
@ -2836,7 +2836,7 @@ typedef uint8_t sm_key_t[16];
#define AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION 0x15u
/**
* @format 121111113131
* @format 121111131311
* @param subevent_code
* @param avdtp_cid
* @param local_seid
@ -2844,11 +2844,11 @@ 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
* @param vbr
* @param drc
*/
#define AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION 0x16u
@ -3018,7 +3018,7 @@ typedef uint8_t sm_key_t[16];
#define A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CONFIGURATION 0x03u
/**
* @format 12111113131
* @format 121111131311
* @param subevent_code
* @param a2dp_cid
* @param local_seid
@ -3030,6 +3030,7 @@ typedef uint8_t sm_key_t[16];
* @param num_channels
* @param bit_rate
* @param vbr
* @param drc
*/
#define A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION 0x04u
@ -3194,7 +3195,7 @@ typedef uint8_t sm_key_t[16];
#define A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AUDIO_CAPABILITY 0x14u
/**
* @format 121112131
* @format 1211121311
* @param subevent_code
* @param a2dp_cid
* @param remote_seid
@ -3204,6 +3205,7 @@ typedef uint8_t sm_key_t[16];
* @param channels_bitmap
* @param bit_rate
* @param vbr
* @param drc
*/
#define A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CAPABILITY 0x15u

66
src/btstack_event.h
View File

@ -8405,15 +8405,6 @@ 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
@ -8421,7 +8412,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, 9);
return little_endian_read_16(event, 8);
}
/**
* @brief Get field channels_bitmap from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CAPABILITY
@ -8430,7 +8421,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[11];
return event[10];
}
/**
* @brief Get field bit_rate from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CAPABILITY
@ -8439,7 +8430,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, 12);
return little_endian_read_24(event, 11);
}
/**
* @brief Get field vbr from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CAPABILITY
@ -8448,6 +8439,15 @@ 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];
}
/**
* @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[15];
}
@ -9183,15 +9183,6 @@ 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
@ -9199,7 +9190,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, 11);
return little_endian_read_24(event, 10);
}
/**
* @brief Get field num_channels from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION
@ -9208,7 +9199,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[14];
return event[13];
}
/**
* @brief Get field bit_rate from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION
@ -9217,7 +9208,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, 15);
return little_endian_read_24(event, 14);
}
/**
* @brief Get field vbr from event AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION
@ -9226,6 +9217,15 @@ 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];
}
/**
* @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[18];
}
@ -10051,6 +10051,15 @@ static inline uint32_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuratio
static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration_get_vbr(const uint8_t * event){
return event[17];
}
/**
* @brief Get field drc from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CONFIGURATION
* @param event packet
* @return drc
* @note: btstack_type 1
*/
static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_configuration_get_drc(const uint8_t * event){
return event[18];
}
/**
* @brief Get field a2dp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CONFIGURATION
@ -10769,6 +10778,15 @@ static inline uint32_t a2dp_subevent_signaling_media_codec_mpeg_aac_capability_g
static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_capability_get_vbr(const uint8_t * event){
return event[14];
}
/**
* @brief Get field drc from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_AAC_CAPABILITY
* @param event packet
* @return drc
* @note: btstack_type 1
*/
static inline uint8_t a2dp_subevent_signaling_media_codec_mpeg_aac_capability_get_drc(const uint8_t * event){
return event[15];
}
/**
* @brief Get field a2dp_cid from event A2DP_SUBEVENT_SIGNALING_MEDIA_CODEC_ATRAC_CAPABILITY