michaelh/zephyr
1
0
Fork 0
Code Releases Activity

bluetooth: tester: audio: Add verification for bis stopping

Browse source 
Adds a semaphor to make sure the stream has properly been stopped by the
controller before returning from btp_bap_broadcast_source_stop.

Signed-off-by: Frode van der Meeren <frode.vandermeeren@nordicsemi.no>
This commit is contained in:
Frode van der Meeren 2024-10-03 12:33:51 +02:00 • committed by Carles Cufí
commit 29b78abd16
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
View file

@ -23,6 +23,8 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
#include "btp_bap_audio_stream.h"
#include "btp_bap_broadcast.h"
static K_SEM_DEFINE(sem_stream_stopped, 0U, CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT);
static struct btp_bap_broadcast_remote_source remote_broadcast_sources[1];
static struct btp_bap_broadcast_local_source local_source;
/* Only one PA sync supported for now. */
@ -132,8 +134,9 @@ static void stream_stopped(struct bt_bap_stream *stream, uint8_t reason)
LOG_DBG("Stopped stream %p with reason 0x%02X", stream, reason);
btp_bap_audio_stream_stopped(&b_stream->audio_stream);
b_stream->bis_synced = false;
k_sem_give(&sem_stream_stopped);
}
static void send_bis_stream_received_ev(const bt_addr_le_t *address, uint32_t broadcast_id,
@ -327,6 +330,8 @@ uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
source->qos.pd = sys_get_le24(cp->presentation_delay);
source->qos.sdu = sys_le16_to_cpu(cp->max_sdu);
source->stream_count = cp->subgroups * cp->streams_per_subgroup;
err = setup_broadcast_source(cp->streams_per_subgroup, cp->subgroups, source, &codec_cfg);
if (err != 0) {
LOG_DBG("Unable to setup broadcast source: %d", err);
@ -484,6 +489,8 @@ uint8_t btp_bap_broadcast_source_stop(const void *cmd, uint16_t cmd_len,
LOG_DBG("");
k_sem_reset(&sem_stream_stopped);
err = bt_bap_broadcast_source_stop(source->bap_broadcast);
if (err != 0) {
LOG_DBG("Unable to stop broadcast source: %d", err);
@ -491,6 +498,15 @@ uint8_t btp_bap_broadcast_source_stop(const void *cmd, uint16_t cmd_len,
return BTP_STATUS_FAILED;
}
for (int i = 0; i < source->stream_count; i++) {
err = k_sem_take(&sem_stream_stopped, K_MSEC(1000));
if (err != 0) {
LOG_DBG("Timed out waiting for stream nr %d to stop", i);
return BTP_STATUS_FAILED;
}
}
return BTP_STATUS_SUCCESS;
}

1
tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
View file

@ -45,6 +45,7 @@ struct btp_bap_broadcast_local_source {
struct bt_bap_qos_cfg qos;
struct btp_bap_broadcast_stream streams[CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT];
struct bt_audio_codec_cfg subgroup_codec_cfg[CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT];
uint8_t stream_count;
/* Only for BTP BAP commands */
struct bt_bap_broadcast_source *bap_broadcast;
/* Only for BTP CAP commands */