le_audio/base_builder: add le_audio prefix to struct

This commit is contained in:
Matthias Ringwald 2022-10-03 16:44:59 +02:00
parent 4a06e23f2e
commit 0f7e8cae03
4 changed files with 18 additions and 16 deletions

View File

@ -29,7 +29,7 @@
*
*/
#define BTSTACK_FILE__ "base_builder.c"
#define BTSTACK_FILE__ "le_audio_base_builder.c"
/**
* @title Broadcast Audio Source Endpoint AD Builder
@ -44,10 +44,10 @@
#include "btstack_debug.h"
#include "le-audio/le_audio_base_builder.h"
void le_audio_base_builder_init(base_builder_t * builder, uint8_t * buffer, uint16_t size, uint32_t presentation_delay_us){
void le_audio_base_builder_init(le_audio_base_builder_t * builder, uint8_t * buffer, uint16_t size, uint32_t presentation_delay_us){
btstack_assert(size >= 8);
// default init
memset(builder, 0, sizeof(base_builder_t));
memset(builder, 0, sizeof(le_audio_base_builder_t));
builder->buffer = buffer;
builder->size = size;
builder->len = 0;
@ -61,7 +61,7 @@ void le_audio_base_builder_init(base_builder_t * builder, uint8_t * buffer, uin
builder->subgroup_offset = builder->len;
}
void le_audio_base_builder_add_subgroup(base_builder_t * builder,
void le_audio_base_builder_add_subgroup(le_audio_base_builder_t * builder,
const uint8_t * codec_id,
uint8_t codec_specific_configuration_length, const uint8_t * codec_specific_configuration,
uint8_t metadata_length, const uint8_t * metadata){
@ -94,7 +94,7 @@ void le_audio_base_builder_add_subgroup(base_builder_t * builder,
* @param codec_specific_configuration_length
* @param codec_specific_configuration
*/
void le_audio_base_builder_add_bis(base_builder_t * builder,
void le_audio_base_builder_add_bis(le_audio_base_builder_t * builder,
uint8_t bis_index,
uint8_t codec_specific_configuration_length,
const uint8_t * codec_specific_configuration){
@ -115,6 +115,6 @@ void le_audio_base_builder_add_bis(base_builder_t * builder,
builder->buffer[0] = builder->len - 1;
}
uint16_t le_audio_base_builder_get_ad_data_size(const base_builder_t * builder){
uint16_t le_audio_base_builder_get_ad_data_size(const le_audio_base_builder_t * builder){
return builder->len;
}

View File

@ -33,11 +33,10 @@
* @title Broadcast Audio Source Endpoint AD Builder
*/
#ifndef BASE_BUILDER_H
#define BASE_BUILDER_H
#ifndef LE_AUDIO_BASE_BUILDER_H
#define LE_AUDIO_BASE_BUILDER_H
#include <stdint.h>
#include "btstack_lc3.h"
#if defined __cplusplus
extern "C" {
@ -49,7 +48,7 @@ typedef struct {
uint16_t len;
uint16_t subgroup_offset;
uint16_t bis_offset;
} base_builder_t;
} le_audio_base_builder_t;
/**
* Initialize BASE
@ -58,7 +57,7 @@ typedef struct {
* @param size of buffer
* @param presentation_delay_us
*/
void le_audio_base_builder_init(base_builder_t * builder, uint8_t * buffer, uint16_t size, uint32_t presentation_delay_us);
void le_audio_base_builder_init(le_audio_base_builder_t * builder, uint8_t * buffer, uint16_t size, uint32_t presentation_delay_us);
/**
* Add subgroup to current BASE
@ -69,7 +68,7 @@ void le_audio_base_builder_init(base_builder_t * builder, uint8_t * buffer, uint
* @param metadata_length
* @param metadata
*/
void le_audio_base_builder_add_subgroup(base_builder_t * builder,
void le_audio_base_builder_add_subgroup(le_audio_base_builder_t * builder,
const uint8_t * codec_id,
uint8_t codec_specific_configuration_length, const uint8_t * codec_specific_configuration,
uint8_t metadata_length, const uint8_t * metadata);
@ -81,7 +80,7 @@ void le_audio_base_builder_add_subgroup(base_builder_t * builder,
* @param codec_specific_configuration_length
* @param codec_specific_configuration
*/
void le_audio_base_builder_add_bis(base_builder_t * builder,
void le_audio_base_builder_add_bis(le_audio_base_builder_t * builder,
uint8_t bis_index,
uint8_t codec_specific_configuration_length,
const uint8_t * codec_specific_configuration);
@ -91,10 +90,10 @@ void le_audio_base_builder_add_bis(base_builder_t * builder,
* @param builder
* @return
*/
uint16_t le_audio_base_builder_get_ad_data_size(const base_builder_t * builder);
uint16_t le_audio_base_builder_get_ad_data_size(const le_audio_base_builder_t * builder);
#if defined __cplusplus
}
#endif
#endif // BASE_BUILDER_H
#endif // LE_AUDIO_BASE_BUILDER_H

View File

@ -0,0 +1,3 @@
//
// Created by Matthias Ringwald on 03.10.22.
//

View File

@ -485,7 +485,7 @@ static void start_broadcast() {// use values from table
uint8_t bis_codec_specific_configuration_2[] = {
0x05, 0x03, 0x02, 0x00, 0x00, 0x00
};
base_builder_t builder;
le_audio_base_builder_t builder;
le_audio_base_builder_init(&builder, period_adv_data, sizeof(period_adv_data), 40);
le_audio_base_builder_add_subgroup(&builder, codec_id,
sizeof(subgroup_codec_specific_configuration),