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

avdp_util: add helper functions for MPEG-D USAC codec

Browse Source
This commit is contained in:
Milanka Ringwald 2024-11-21 13:33:40 +01:00 committed by Matthias Ringwald
parent 0737c3bfb7
commit 24d5fe847f
3 changed files with 177 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/classic/avdtp.h
View File

@ -175,6 +175,11 @@ typedef enum {
AVDTP_CODEC_NON_A2DP = 0xFF AVDTP_CODEC_NON_A2DP = 0xFF
} avdtp_media_codec_type_t; } avdtp_media_codec_type_t;
typedef enum {
AVDTP_USAC_OBJECT_TYPE_MPEG_D_DRC = 0x00,
AVDTP_USAC_OBJECT_TYPE_RFU
} avdtp_usac_object_type_t;
typedef enum { typedef enum {
AVDTP_CONTENT_PROTECTION_DTCP = 0x0001, AVDTP_CONTENT_PROTECTION_DTCP = 0x0001,
AVDTP_CONTENT_PROTECTION_SCMS_T = 0x0002 AVDTP_CONTENT_PROTECTION_SCMS_T = 0x0002
@ -344,6 +349,14 @@ typedef struct {
bool drc; bool drc;
} avdtp_configuration_mpeg_aac_t; } avdtp_configuration_mpeg_aac_t;
typedef struct {
avdtp_usac_object_type_t object_type;
uint32_t sampling_frequency;
uint8_t channels;
uint32_t bit_rate;
uint8_t vbr;
} avdtp_configuration_mpegd_usac_t;
typedef struct { typedef struct {
avdtp_atrac_version_t version; avdtp_atrac_version_t version;
avdtp_channel_mode_t channel_mode; avdtp_channel_mode_t channel_mode;

161
src/classic/avdtp_util.c
View File

@ -725,6 +725,41 @@ static void avdtp_signaling_emit_media_codec_atrac_capability(uint16_t avdtp_cid
avdtp_emit_sink_and_source(event, pos); avdtp_emit_sink_and_source(event, pos);
} }
static void avdtp_signaling_emit_media_codec_mpeg_d_usac_capability(uint16_t avdtp_cid, uint8_t remote_seid, adtvp_media_codec_capabilities_t media_codec) {
const uint8_t * media_codec_information = media_codec.media_codec_information;
uint8_t event[18];
int pos = 0;
event[pos++] = HCI_EVENT_AVDTP_META;
pos++; // set later
event[pos++] = AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_D_USAC_CAPABILITY;
little_endian_store_16(event, pos, avdtp_cid);
pos += 2;
event[pos++] = remote_seid;
event[pos++] = media_codec.media_type;
uint32_t sampling_frequency_bitmap = ((media_codec_information[0] & 0x3F) << 20) |
(media_codec_information[1] << 12) |
(media_codec_information[2] << 4) |
(media_codec_information[3] >> 4);
uint8_t channels_bitmap = (media_codec_information[3] >> 2) & 0x03;
uint8_t vbr = (media_codec_information[4] >> 7) & 0x01;
uint16_t bit_rate_index_bitmap = ((media_codec_information[4]) & 0xEF) << 16 | (media_codec_information[5] << 8) | media_codec_information[6];
event[pos++] = media_codec_information[0] >> 6;
little_endian_store_32(event, pos, sampling_frequency_bitmap);
pos += 4;
event[pos++] = channels_bitmap;
event[pos++] = sampling_frequency_bitmap;
event[pos++] = vbr;
little_endian_store_24(event, pos, bit_rate_index_bitmap);
pos += 3;
event[1] = pos - 2;
avdtp_emit_sink_and_source(event, pos);
}
static void avdtp_signaling_emit_media_codec_other_capability(uint16_t avdtp_cid, uint8_t remote_seid, adtvp_media_codec_capabilities_t media_codec) { static void avdtp_signaling_emit_media_codec_other_capability(uint16_t avdtp_cid, uint8_t remote_seid, adtvp_media_codec_capabilities_t media_codec) {
uint8_t event[AVDTP_MAX_MEDIA_CODEC_INFORMATION_LENGTH + 11]; uint8_t event[AVDTP_MAX_MEDIA_CODEC_INFORMATION_LENGTH + 11];
int pos = 0; int pos = 0;
@ -873,6 +908,9 @@ static void avdtp_signaling_emit_media_codec_capability(uint16_t avdtp_cid, uint
case AVDTP_CODEC_ATRAC_FAMILY: case AVDTP_CODEC_ATRAC_FAMILY:
avdtp_signaling_emit_media_codec_atrac_capability(avdtp_cid, remote_seid, media_codec); avdtp_signaling_emit_media_codec_atrac_capability(avdtp_cid, remote_seid, media_codec);
break; break;
case AVDTP_CODEC_MPEG_D_USAC:
avdtp_signaling_emit_media_codec_mpeg_d_usac_capability(avdtp_cid, remote_seid, media_codec);
break;
default: default:
avdtp_signaling_emit_media_codec_other_capability(avdtp_cid, remote_seid, media_codec); avdtp_signaling_emit_media_codec_other_capability(avdtp_cid, remote_seid, media_codec);
break; break;
@ -1103,7 +1141,7 @@ avdtp_signaling_setup_media_codec_mpec_aac_config_event(uint8_t *event, uint16_t
uint16_t avdtp_cid, uint8_t reconfigure, uint16_t avdtp_cid, uint8_t reconfigure,
const uint8_t *media_codec_information) { const uint8_t *media_codec_information) {
btstack_assert(size >= AVDTP_MEDIA_CONFIG_MPEG_AUDIO_EVENT_LEN); btstack_assert(size >= AVDTP_MEDIA_CONFIG_MPEG_AAC_EVENT_LEN);
uint8_t local_seid = avdtp_local_seid(stream_endpoint); uint8_t local_seid = avdtp_local_seid(stream_endpoint);
uint8_t remote_seid = avdtp_remote_seid(stream_endpoint); uint8_t remote_seid = avdtp_remote_seid(stream_endpoint);
@ -1168,6 +1206,82 @@ avdtp_signaling_setup_media_codec_mpec_aac_config_event(uint8_t *event, uint16_t
return pos; return pos;
} }
static uint16_t
avdtp_signaling_setup_media_codec_mpegd_config_event(uint8_t *event, uint16_t size,
const avdtp_stream_endpoint_t *stream_endpoint,
uint16_t avdtp_cid, uint8_t reconfigure,
const uint8_t *media_codec_information) {
btstack_assert(size >= AVDTP_MEDIA_CONFIG_MPEG_D_USAC_EVENT_LEN);
uint8_t local_seid = avdtp_local_seid(stream_endpoint);
uint8_t remote_seid = avdtp_remote_seid(stream_endpoint);
uint16_t pos = 0;
event[pos++] = HCI_EVENT_AVDTP_META;
event[pos++] = AVDTP_MEDIA_CONFIG_MPEG_D_USAC_EVENT_LEN - 2;
event[pos++] = AVDTP_SUBEVENT_SIGNALING_MEDIA_CODEC_MPEG_D_USAC_CONFIGURATION;
little_endian_store_16(event, pos, avdtp_cid);
pos += 2;
event[pos++] = local_seid;
event[pos++] = remote_seid;
event[pos++] = reconfigure;
event[pos++] = AVDTP_CODEC_MPEG_D_USAC;
uint8_t object_type_bitmap = media_codec_information[0] >> 6;
uint32_t sampling_frequency_bitmap = ((media_codec_information[0] & 0x3F) << 20) |
(media_codec_information[1] << 12) |
(media_codec_information[2] << 4) |
(media_codec_information[3] >> 4);
uint8_t channels_bitmap = (media_codec_information[3] >> 2) & 0x03;
uint8_t vbr = (media_codec_information[4] >> 7) & 0x01;
uint32_t bit_rate = ((media_codec_information[3] & 0x7f) << 16) | (media_codec_information[4] << 8) | media_codec_information[5];
uint8_t object_type = 0;
if (object_type_bitmap & 0x10){
object_type = AVDTP_USAC_OBJECT_TYPE_MPEG_D_DRC;
} else {
object_type = AVDTP_USAC_OBJECT_TYPE_RFU;
}
uint32_t sampling_frequency = 0;
uint8_t i;
const uint32_t usac_sampling_frequency_table[] = {
96000, 88200, 76800, 70560,
64000, 58800, 48000, 44100, 38400, 35280, 32000, 29400,
24000, 22050, 19200, 17640, 16000, 14700, 12800, 12000,
11760, 11025, 9600, 8820, 8000, 7350
};
for (i=0;i<26;i++){
if (sampling_frequency_bitmap & (1U << i)) {
sampling_frequency = usac_sampling_frequency_table[i];
}
}
uint8_t num_channels = 0;
if (channels_bitmap & 0x02){
num_channels = 1;
} else if (channels_bitmap & 0x01){
num_channels = 2;
}
event[pos++] = object_type;
little_endian_store_24(event, pos, sampling_frequency);
pos += 3;
event[pos++] = num_channels;
event[pos++] = vbr;
little_endian_store_24(event, pos, bit_rate);
pos += 3;
btstack_assert(AVDTP_MEDIA_CONFIG_MPEG_D_USAC_EVENT_LEN == pos);
return pos;
}
static uint16_t avdtp_signaling_setup_media_codec_atrac_config_event(uint8_t *event, uint16_t size, static uint16_t avdtp_signaling_setup_media_codec_atrac_config_event(uint8_t *event, uint16_t size,
const avdtp_stream_endpoint_t *stream_endpoint, const avdtp_stream_endpoint_t *stream_endpoint,
uint16_t avdtp_cid, uint8_t reconfigure, uint16_t avdtp_cid, uint8_t reconfigure,
@ -1302,6 +1416,9 @@ uint16_t avdtp_setup_media_codec_config_event(uint8_t *event, uint16_t size, con
case AVDTP_CODEC_ATRAC_FAMILY: case AVDTP_CODEC_ATRAC_FAMILY:
return avdtp_signaling_setup_media_codec_atrac_config_event(event, size, stream_endpoint, avdtp_cid, reconfigure, return avdtp_signaling_setup_media_codec_atrac_config_event(event, size, stream_endpoint, avdtp_cid, reconfigure,
media_codec->media_codec_information); media_codec->media_codec_information);
case AVDTP_CODEC_MPEG_D_USAC:
return avdtp_signaling_setup_media_codec_mpegd_config_event(event, size, stream_endpoint, avdtp_cid, reconfigure,
media_codec->media_codec_information);
default: default:
return avdtp_signaling_setup_media_codec_other_config_event(event, size, stream_endpoint, avdtp_cid, reconfigure, return avdtp_signaling_setup_media_codec_other_config_event(event, size, stream_endpoint, avdtp_cid, reconfigure,
media_codec); media_codec);
@ -1560,3 +1677,45 @@ void avdtp_config_atrac_store(uint8_t * config, const avdtp_configuration_atrac_
config[6] = 0; config[6] = 0;
avdtp_config_atrac_set_sampling_frequency(config, configuration->sampling_frequency); avdtp_config_atrac_set_sampling_frequency(config, configuration->sampling_frequency);
} }
void avdtp_config_mpegd_usac_set_sampling_frequency(uint8_t * config, uint16_t sampling_frequency_hz) {
uint16_t sampling_frequency_bitmap = 0;
uint8_t i;
const uint32_t usac_sampling_frequency_table[] = {
96000, 88200, 76800, 70560,
64000, 58800, 48000, 44100, 38400, 35280, 32000, 29400,
24000, 22050, 19200, 17640, 16000, 14700, 12800, 12000,
11760, 11025, 9600, 8820, 8000, 7350
};
for (i=0;i<26;i++){
if (sampling_frequency_hz == usac_sampling_frequency_table[i]){
sampling_frequency_bitmap = 1 << i;
break;
}
}
config[0] = (config[0] & 0xC0) | sampling_frequency_bitmap >> 20;
config[1] = sampling_frequency_bitmap >> 12;
config[2] = sampling_frequency_bitmap >> 4;
config[3] = (sampling_frequency_bitmap & 0x0f) << 4;
}
void avdtp_config_mpegd_usac_store(uint8_t * config, const avdtp_configuration_mpegd_usac_t * configuration) {
config[0] = 1 << (7 -(configuration->object_type - AVDTP_USAC_OBJECT_TYPE_MPEG_D_DRC)) & 0xC0;
avdtp_config_mpegd_usac_set_sampling_frequency(config, configuration->sampling_frequency);
uint8_t channels_bitmap = 0;
switch (configuration->channels){
case 1:
channels_bitmap = 0x08;
break;
case 2:
channels_bitmap = 0x04;
break;
default:
break;
}
config[3] = config[3] | channels_bitmap;
config[4] = ((configuration->vbr & 0x01) << 7) | ((configuration->bit_rate >> 16) & 0x7f);
config[5] = (configuration->bit_rate >> 8) & 0xff;
config[6] = configuration->bit_rate & 0xff;
}

4
src/classic/avdtp_util.h
View File

@ -57,6 +57,8 @@ extern "C" {
#define AVDTP_MEDIA_CONFIG_MPEG_AUDIO_EVENT_LEN 18 #define AVDTP_MEDIA_CONFIG_MPEG_AUDIO_EVENT_LEN 18
#define AVDTP_MEDIA_CONFIG_MPEG_AAC_EVENT_LEN 18 #define AVDTP_MEDIA_CONFIG_MPEG_AAC_EVENT_LEN 18
#define AVDTP_MEDIA_CONFIG_ATRAC_EVENT_LEN 18 #define AVDTP_MEDIA_CONFIG_ATRAC_EVENT_LEN 18
#define AVDTP_MEDIA_CONFIG_MPEG_D_USAC_EVENT_LEN 18
#define AVDTP_MEDIA_CONFIG_OTHER_EVENT_LEN (13 + AVDTP_MAX_MEDIA_CODEC_INFORMATION_LENGTH) #define AVDTP_MEDIA_CONFIG_OTHER_EVENT_LEN (13 + AVDTP_MAX_MEDIA_CODEC_INFORMATION_LENGTH)
static inline uint8_t avdtp_header(uint8_t tr_label, avdtp_packet_type_t packet_type, avdtp_message_type_t msg_type){ static inline uint8_t avdtp_header(uint8_t tr_label, avdtp_packet_type_t packet_type, avdtp_message_type_t msg_type){
@ -133,6 +135,8 @@ void avdtp_config_mpeg_aac_set_sampling_frequency(uint8_t * config, uint16_t sam
void avdtp_config_mpeg_aac_store(uint8_t * config, const avdtp_configuration_mpeg_aac_t * configuration); void avdtp_config_mpeg_aac_store(uint8_t * config, const avdtp_configuration_mpeg_aac_t * configuration);
void avdtp_config_atrac_set_sampling_frequency(uint8_t * config, uint16_t sampling_frequency_hz); void avdtp_config_atrac_set_sampling_frequency(uint8_t * config, uint16_t sampling_frequency_hz);
void avdtp_config_atrac_store(uint8_t * config, const avdtp_configuration_atrac_t * configuration); void avdtp_config_atrac_store(uint8_t * config, const avdtp_configuration_atrac_t * configuration);
void avdtp_config_mpegd_usac_set_sampling_frequency(uint8_t * config, uint16_t sampling_frequency_hz);
void avdtp_config_mpegd_usac_store(uint8_t * config, const avdtp_configuration_mpegd_usac_t * configuration);
#if defined __cplusplus #if defined __cplusplus
} }