Skip to content

Commit 50ed586

Browse files
alexsvenrlubos
alexsven
authored and
rlubos
committed
applications: nrf5340_audio: Use context type unspecified
- Change all context types to be unspecified for unicast_client - Unicast_server will still support any context - OCT-3150 Signed-off-by: Alexander Svensen <[email protected]>
1 parent 3041232 commit 50ed586

File tree

2 files changed

+23
-17
lines changed

2 files changed

+23
-17
lines changed

‎applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_client.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,20 +93,20 @@ static struct bt_bap_unicast_group *unicast_group;
9393
static bool unicast_group_created;
9494

9595
static struct bt_bap_lc3_preset lc3_preset_sink = BT_BAP_LC3_UNICAST_PRESET_NRF5340_AUDIO_SINK;
96-
static struct bt_bap_lc3_preset lc3_preset_sink_48_4_1 =
97-
BT_BAP_LC3_UNICAST_PRESET_48_4_1(BT_AUDIO_LOCATION_ANY, (BT_AUDIO_CONTEXT_TYPE_ANY));
98-
static struct bt_bap_lc3_preset lc3_preset_sink_24_2_1 =
99-
BT_BAP_LC3_UNICAST_PRESET_24_2_1(BT_AUDIO_LOCATION_ANY, (BT_AUDIO_CONTEXT_TYPE_ANY));
100-
static struct bt_bap_lc3_preset lc3_preset_sink_16_2_1 =
101-
BT_BAP_LC3_UNICAST_PRESET_16_2_1(BT_AUDIO_LOCATION_ANY, (BT_AUDIO_CONTEXT_TYPE_ANY));
96+
static struct bt_bap_lc3_preset lc3_preset_sink_48_4_1 = BT_BAP_LC3_UNICAST_PRESET_48_4_1(
97+
BT_AUDIO_LOCATION_ANY, (BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED));
98+
static struct bt_bap_lc3_preset lc3_preset_sink_24_2_1 = BT_BAP_LC3_UNICAST_PRESET_24_2_1(
99+
BT_AUDIO_LOCATION_ANY, (BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED));
100+
static struct bt_bap_lc3_preset lc3_preset_sink_16_2_1 = BT_BAP_LC3_UNICAST_PRESET_16_2_1(
101+
BT_AUDIO_LOCATION_ANY, (BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED));
102102

103103
static struct bt_bap_lc3_preset lc3_preset_source = BT_BAP_LC3_UNICAST_PRESET_NRF5340_AUDIO_SOURCE;
104104
static struct bt_bap_lc3_preset lc3_preset_source_48_4_1 =
105-
BT_BAP_LC3_UNICAST_PRESET_48_4_1(BT_AUDIO_LOCATION_ANY, BT_AUDIO_CONTEXT_TYPE_ANY);
105+
BT_BAP_LC3_UNICAST_PRESET_48_4_1(BT_AUDIO_LOCATION_ANY, BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED);
106106
static struct bt_bap_lc3_preset lc3_preset_source_24_2_1 =
107-
BT_BAP_LC3_UNICAST_PRESET_24_2_1(BT_AUDIO_LOCATION_ANY, BT_AUDIO_CONTEXT_TYPE_ANY);
107+
BT_BAP_LC3_UNICAST_PRESET_24_2_1(BT_AUDIO_LOCATION_ANY, BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED);
108108
static struct bt_bap_lc3_preset lc3_preset_source_16_2_1 =
109-
BT_BAP_LC3_UNICAST_PRESET_16_2_1(BT_AUDIO_LOCATION_ANY, BT_AUDIO_CONTEXT_TYPE_ANY);
109+
BT_BAP_LC3_UNICAST_PRESET_16_2_1(BT_AUDIO_LOCATION_ANY, BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED);
110110

111111
static bool playing_state = true;
112112

‎applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_client.h‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,32 +20,38 @@ enum unicast_discover_dir {
2020

2121
#if CONFIG_BT_BAP_UNICAST_CONFIGURABLE
2222
#define BT_BAP_LC3_UNICAST_PRESET_NRF5340_AUDIO_SINK \
23-
BT_BAP_LC3_PRESET_CONFIGURABLE(BT_AUDIO_LOCATION_FRONT_LEFT, BT_AUDIO_CONTEXT_TYPE_MEDIA, \
23+
BT_BAP_LC3_PRESET_CONFIGURABLE(BT_AUDIO_LOCATION_FRONT_LEFT, \
24+
BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED, \
2425
CONFIG_BT_AUDIO_BITRATE_UNICAST_SINK)
2526

2627
#define BT_BAP_LC3_UNICAST_PRESET_NRF5340_AUDIO_SOURCE \
27-
BT_BAP_LC3_PRESET_CONFIGURABLE(BT_AUDIO_LOCATION_FRONT_LEFT, BT_AUDIO_CONTEXT_TYPE_MEDIA, \
28+
BT_BAP_LC3_PRESET_CONFIGURABLE(BT_AUDIO_LOCATION_FRONT_LEFT, \
29+
BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED, \
2830
CONFIG_BT_AUDIO_BITRATE_UNICAST_SRC)
2931

3032
#elif CONFIG_BT_BAP_UNICAST_16_2_1
3133
#define BT_BAP_LC3_UNICAST_PRESET_NRF5340_AUDIO_SINK \
32-
BT_BAP_LC3_UNICAST_PRESET_16_2_1(BT_AUDIO_LOCATION_FRONT_LEFT, BT_AUDIO_CONTEXT_TYPE_MEDIA)
34+
BT_BAP_LC3_UNICAST_PRESET_16_2_1(BT_AUDIO_LOCATION_FRONT_LEFT, \
35+
BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED)
3336

3437
#define BT_BAP_LC3_UNICAST_PRESET_NRF5340_AUDIO_SOURCE \
35-
BT_BAP_LC3_UNICAST_PRESET_16_2_1(BT_AUDIO_LOCATION_FRONT_LEFT, BT_AUDIO_CONTEXT_TYPE_MEDIA)
38+
BT_BAP_LC3_UNICAST_PRESET_16_2_1(BT_AUDIO_LOCATION_FRONT_LEFT, \
39+
BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED)
3640

3741
#elif CONFIG_BT_BAP_UNICAST_24_2_1
3842
#define BT_BAP_LC3_UNICAST_PRESET_NRF5340_AUDIO_SINK \
39-
BT_BAP_LC3_UNICAST_PRESET_24_2_1(BT_AUDIO_LOCATION_FRONT_LEFT, BT_AUDIO_CONTEXT_TYPE_MEDIA)
43+
BT_BAP_LC3_UNICAST_PRESET_24_2_1(BT_AUDIO_LOCATION_FRONT_LEFT, \
44+
BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED)
4045

4146
#define BT_BAP_LC3_UNICAST_PRESET_NRF5340_AUDIO_SOURCE \
42-
BT_BAP_LC3_UNICAST_PRESET_24_2_1(BT_AUDIO_LOCATION_FRONT_LEFT, BT_AUDIO_CONTEXT_TYPE_MEDIA)
47+
BT_BAP_LC3_UNICAST_PRESET_24_2_1(BT_AUDIO_LOCATION_FRONT_LEFT, \
48+
BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED)
4349
#elif CONFIG_BT_BAP_UNICAST_48_4_1
4450
#define BT_BAP_LC3_UNICAST_PRESET_NRF5340_AUDIO_SINK \
45-
BT_BAP_LC3_UNICAST_PRESET_48_4_1(BT_AUDIO_LOCATION_ANY, BT_AUDIO_CONTEXT_TYPE_MEDIA)
51+
BT_BAP_LC3_UNICAST_PRESET_48_4_1(BT_AUDIO_LOCATION_ANY, BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED)
4652

4753
#define BT_BAP_LC3_UNICAST_PRESET_NRF5340_AUDIO_SOURCE \
48-
BT_BAP_LC3_UNICAST_PRESET_48_4_1(BT_AUDIO_LOCATION_ANY, BT_AUDIO_CONTEXT_TYPE_MEDIA)
54+
BT_BAP_LC3_UNICAST_PRESET_48_4_1(BT_AUDIO_LOCATION_ANY, BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED)
4955
#else
5056
#error Unsupported LC3 codec preset for unicast
5157
#endif /* CONFIG_BT_BAP_UNICAST_CONFIGURABLE */

0 commit comments

Comments
 (0)