michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Audio: Refactor codec_cfg_get_frame_duration_us

Browse source 
Refactor the codec_cfg_get_frame_duration function to return the
assigned numbers value, instead of a converted value, but with
support for converting the value.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2023-09-27 11:27:01 +02:00 • committed by Carles Cufí
commit 9c47eb924f
10 changed files with 185 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
samples/bluetooth/hap_ha/src/bap_unicast_sr.c
View file

@ -87,8 +87,12 @@ static void print_codec_cfg(const struct bt_audio_codec_cfg *codec_cfg)
printk(" Frequency: %d Hz\n", bt_audio_codec_cfg_freq_to_freq_hz(ret));
}
printk(" Frame Duration: %d us\n",
bt_audio_codec_cfg_get_frame_duration_us(codec_cfg));
ret = bt_audio_codec_cfg_get_frame_dur(codec_cfg);
if (ret > 0) {
printk(" Frame Duration: %d us\n",
bt_audio_codec_cfg_frame_dur_to_frame_dur_us(ret));
}
if (bt_audio_codec_cfg_get_chan_allocation(codec_cfg, &chan_allocation) == 0) {
printk(" Channel allocation: 0x%x\n", chan_allocation);
}

8
samples/bluetooth/tmap_peripheral/src/bap_unicast_sr.c
View file

@ -76,8 +76,12 @@ static void print_codec_cfg(const struct bt_audio_codec_cfg *codec_cfg)
printk(" Frequency: %d Hz\n", bt_audio_codec_cfg_freq_to_freq_hz(ret));
}
printk(" Frame Duration: %d us\n",
bt_audio_codec_cfg_get_frame_duration_us(codec_cfg));
ret = bt_audio_codec_cfg_get_frame_dur(codec_cfg);
if (ret > 0) {
printk(" Frame Duration: %d us\n",
bt_audio_codec_cfg_frame_dur_to_frame_dur_us(ret));
}
if (bt_audio_codec_cfg_get_chan_allocation(codec_cfg, &chan_allocation) == 0) {
printk(" Channel allocation: 0x%x\n", chan_allocation);
}

6
samples/bluetooth/unicast_audio_client/src/main.c
View file

@ -234,7 +234,11 @@ static int init_lc3(void)
return ret;
}
frame_duration_us = bt_audio_codec_cfg_get_frame_duration_us(codec_cfg);
ret = bt_audio_codec_cfg_get_frame_dur(codec_cfg);
if (ret > 0) {
frame_duration_us = bt_audio_codec_cfg_frame_dur_to_frame_dur_us(ret);
}
octets_per_frame = bt_audio_codec_cfg_get_octets_per_frame(codec_cfg);
frames_per_sdu = bt_audio_codec_cfg_get_frame_blocks_per_sdu(codec_cfg, true);
octets_per_frame = bt_audio_codec_cfg_get_octets_per_frame(codec_cfg);

18
samples/bluetooth/unicast_audio_server/src/main.c
View file

@ -147,8 +147,12 @@ static void print_codec_cfg(const struct bt_audio_codec_cfg *codec_cfg)
printk(" Frequency: %d Hz\n", bt_audio_codec_cfg_freq_to_freq_hz(ret));
}
printk(" Frame Duration: %d us\n",
bt_audio_codec_cfg_get_frame_duration_us(codec_cfg));
ret = bt_audio_codec_cfg_get_frame_dur(codec_cfg);
if (ret > 0) {
printk(" Frame Duration: %d us\n",
bt_audio_codec_cfg_frame_dur_to_frame_dur_us(ret));
}
if (bt_audio_codec_cfg_get_chan_allocation(codec_cfg, &chan_allocation) == 0) {
printk(" Channel allocation: 0x%x\n", chan_allocation);
}
@ -354,8 +358,7 @@ static int lc3_enable(struct bt_bap_stream *stream, const uint8_t meta[], size_t
#if defined(CONFIG_LIBLC3)
{
const int frame_duration_us =
bt_audio_codec_cfg_get_frame_duration_us(stream->codec_cfg);
int frame_duration_us;
int freq;
int ret;
@ -369,11 +372,14 @@ static int lc3_enable(struct bt_bap_stream *stream, const uint8_t meta[], size_t
return ret;
}
if (frame_duration_us < 0) {
ret = bt_audio_codec_cfg_get_frame_dur(codec_cfg);
if (ret > 0) {
frame_duration_us = bt_audio_codec_cfg_frame_dur_to_frame_dur_us(ret);
} else {
printk("Error: Frame duration not set, cannot start codec.");
*rsp = BT_BAP_ASCS_RSP(BT_BAP_ASCS_RSP_CODE_CONF_INVALID,
BT_BAP_ASCS_REASON_CODEC_DATA);
return -1;
return ret;
}
frames_per_sdu =