From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ v2 2/4] client/player: Use macros from lc3.h to define presets
Date: Wed, 13 Mar 2024 11:07:04 -0400 [thread overview]
Message-ID: <20240313150706.1279036-2-luiz.dentz@gmail.com> (raw)
In-Reply-To: <20240313150706.1279036-1-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This makes use of macros for for lc3.h to define preset configuration
and remove existing macros since they were just duplicates.
---
client/player.c | 294 ++++++++++++++----------------------------------
1 file changed, 82 insertions(+), 212 deletions(-)
diff --git a/client/player.c b/client/player.c
index cb771447bf4b..ab8cb7434cdc 100644
--- a/client/player.c
+++ b/client/player.c
@@ -1337,48 +1337,6 @@ static struct codec_preset sbc_presets[] = {
#define LC3_10_FRAMED(_sdu, _rtn, _latency, _delay) \
QOS_FRAMED_2M(10000u, _sdu, _rtn, _latency, _delay)
-#define LC3_PRESET_DATA(_freq, _duration, _len) \
- UTIL_IOV_INIT(0x02, LC3_CONFIG_FREQ, _freq, \
- 0x02, LC3_CONFIG_DURATION, _duration, \
- 0x03, LC3_CONFIG_FRAME_LEN, _len, _len >> 8)
-
-#define LC3_PRESET_DATA_ALL(_freq, _duration, _alloc, _len) \
- UTIL_IOV_INIT(0x02, LC3_CONFIG_FREQ, _freq, \
- 0x02, LC3_CONFIG_DURATION, _duration, \
- 0x05, LC3_CONFIG_CHAN_ALLOC, _alloc, _alloc >> 8, \
- _alloc >> 16, _alloc >> 24, \
- 0x03, LC3_CONFIG_FRAME_LEN, _len, _len >> 8)
-
-#define LC3_PRESET_8KHZ(_duration, _len) \
- LC3_PRESET_DATA(LC3_CONFIG_FREQ_8KHZ, _duration, _len)
-
-#define LC3_PRESET_11KHZ(_duration, _len) \
- LC3_PRESET_DATA(LC3_CONFIG_FREQ_11KHZ, _duration, _len)
-
-#define LC3_PRESET_16KHZ(_duration, _len) \
- LC3_PRESET_DATA(LC3_CONFIG_FREQ_16KHZ, _duration, _len)
-
-#define LC3_PRESET_22KHZ(_duration, _len) \
- LC3_PRESET_DATA(LC3_CONFIG_FREQ_22KHZ, _duration, _len)
-
-#define LC3_PRESET_24KHZ(_duration, _len) \
- LC3_PRESET_DATA(LC3_CONFIG_FREQ_24KHZ, _duration, _len)
-
-#define LC3_PRESET_32KHZ(_duration, _len) \
- LC3_PRESET_DATA(LC3_CONFIG_FREQ_32KHZ, _duration, _len)
-
-#define LC3_PRESET_32KHZ_ALL(_duration, _len, _alloc) \
- LC3_PRESET_DATA_ALL(LC3_CONFIG_FREQ_48KHZ, _duration, _alloc, _len)
-
-#define LC3_PRESET_44KHZ(_duration, _len) \
- LC3_PRESET_DATA(LC3_CONFIG_FREQ_44KHZ, _duration, _len)
-
-#define LC3_PRESET_48KHZ(_duration, _len) \
- LC3_PRESET_DATA(LC3_CONFIG_FREQ_48KHZ, _duration, _len)
-
-#define LC3_PRESET_48KHZ_ALL(_duration, _len, _alloc) \
- LC3_PRESET_DATA_ALL(LC3_CONFIG_FREQ_48KHZ, _duration, _alloc, _len)
-
#define LC3_PRESET_LL(_name, _data, _qos) \
{ \
.name = _name, \
@@ -1405,163 +1363,107 @@ static struct codec_preset sbc_presets[] = {
static struct codec_preset lc3_ucast_presets[] = {
/* Table 4.43: QoS configuration support setting requirements */
- LC3_PRESET("8_1_1",
- LC3_PRESET_8KHZ(LC3_CONFIG_DURATION_7_5, 26u),
+ LC3_PRESET("8_1_1", LC3_CONFIG_8_1,
LC3_7_5_UNFRAMED(26u, 2u, 8u, 40000u)),
- LC3_PRESET("8_2_1",
- LC3_PRESET_8KHZ(LC3_CONFIG_DURATION_10, 30u),
+ LC3_PRESET("8_2_1", LC3_CONFIG_8_2,
LC3_10_UNFRAMED(30u, 2u, 10u, 40000u)),
- LC3_PRESET("16_1_1",
- LC3_PRESET_16KHZ(LC3_CONFIG_DURATION_7_5, 30u),
+ LC3_PRESET("16_1_1", LC3_CONFIG_16_1,
LC3_7_5_UNFRAMED(30u, 2u, 8u, 40000u)),
- LC3_PRESET("16_2_1",
- LC3_PRESET_16KHZ(LC3_CONFIG_DURATION_10, 40u),
+ LC3_PRESET("16_2_1", LC3_CONFIG_16_2,
LC3_10_UNFRAMED(40u, 2u, 10u, 40000u)),
- LC3_PRESET("24_1_1",
- LC3_PRESET_24KHZ(LC3_CONFIG_DURATION_7_5, 45u),
+ LC3_PRESET("24_1_1", LC3_CONFIG_24_1,
LC3_7_5_UNFRAMED(45u, 2u, 8u, 40000u)),
- LC3_PRESET("24_2_1",
- LC3_PRESET_24KHZ(LC3_CONFIG_DURATION_10, 60u),
+ LC3_PRESET("24_2_1", LC3_CONFIG_24_2,
LC3_10_UNFRAMED(60u, 2u, 10u, 40000u)),
- LC3_PRESET("32_1_1",
- LC3_PRESET_32KHZ(LC3_CONFIG_DURATION_7_5, 60u),
+ LC3_PRESET("32_1_1", LC3_CONFIG_32_1,
LC3_7_5_UNFRAMED(60u, 2u, 8u, 40000u)),
- LC3_PRESET("32_2_1",
- LC3_PRESET_32KHZ(LC3_CONFIG_DURATION_10, 80u),
+ LC3_PRESET("32_2_1", LC3_CONFIG_32_2,
LC3_10_UNFRAMED(80u, 2u, 10u, 40000u)),
- LC3_PRESET("44_1_1",
- LC3_PRESET_44KHZ(LC3_CONFIG_DURATION_7_5, 98u),
+ LC3_PRESET("44_1_1", LC3_CONFIG_44_1,
QOS_FRAMED_2M(8163u, 98u, 5u, 24u, 40000u)),
- LC3_PRESET("44_2_1",
- LC3_PRESET_44KHZ(LC3_CONFIG_DURATION_10, 130u),
+ LC3_PRESET("44_2_1", LC3_CONFIG_44_2,
QOS_FRAMED_2M(10884u, 130u, 5u, 31u, 40000u)),
- LC3_PRESET("48_1_1",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 75u),
+ LC3_PRESET("48_1_1", LC3_CONFIG_48_1,
LC3_7_5_UNFRAMED(75u, 5u, 15u, 40000u)),
- LC3_PRESET("48_2_1",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 100u),
+ LC3_PRESET("48_2_1", LC3_CONFIG_48_2,
LC3_10_UNFRAMED(100u, 5u, 20u, 40000u)),
- LC3_PRESET("48_3_1",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 90u),
+ LC3_PRESET("48_3_1", LC3_CONFIG_48_3,
LC3_7_5_UNFRAMED(90u, 5u, 15u, 40000u)),
- LC3_PRESET("48_4_1",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 120u),
+ LC3_PRESET("48_4_1", LC3_CONFIG_48_4,
LC3_10_UNFRAMED(120u, 5u, 20u, 40000u)),
- LC3_PRESET("48_5_1",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 117u),
+ LC3_PRESET("48_5_1", LC3_CONFIG_48_5,
LC3_7_5_UNFRAMED(117u, 5u, 15u, 40000u)),
- LC3_PRESET("48_6_1",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 155u),
+ LC3_PRESET("48_6_1", LC3_CONFIG_48_6,
LC3_10_UNFRAMED(155u, 5u, 20u, 40000u)),
/* QoS Configuration settings for high reliability audio data */
- LC3_PRESET_HR("8_1_2",
- LC3_PRESET_8KHZ(LC3_CONFIG_DURATION_7_5, 26u),
+ LC3_PRESET_HR("8_1_2", LC3_CONFIG_8_1,
LC3_7_5_UNFRAMED(26u, 13u, 75u, 40000u)),
- LC3_PRESET_HR("8_2_2",
- LC3_PRESET_8KHZ(LC3_CONFIG_DURATION_10, 30u),
+ LC3_PRESET_HR("8_2_2", LC3_CONFIG_8_2,
LC3_10_UNFRAMED(30u, 13u, 95u, 40000u)),
- LC3_PRESET_HR("16_1_2",
- LC3_PRESET_16KHZ(LC3_CONFIG_DURATION_7_5, 30u),
+ LC3_PRESET_HR("16_1_2", LC3_CONFIG_16_1,
LC3_7_5_UNFRAMED(30u, 13u, 75u, 40000u)),
- LC3_PRESET_HR("16_2_2",
- LC3_PRESET_16KHZ(LC3_CONFIG_DURATION_10, 40u),
+ LC3_PRESET_HR("16_2_2", LC3_CONFIG_16_2,
LC3_10_UNFRAMED(40u, 13u, 95u, 40000u)),
- LC3_PRESET_HR("24_1_2",
- LC3_PRESET_24KHZ(LC3_CONFIG_DURATION_7_5, 45u),
+ LC3_PRESET_HR("24_1_2", LC3_CONFIG_24_1,
LC3_7_5_UNFRAMED(45u, 13u, 75u, 40000u)),
- LC3_PRESET_HR("24_2_2",
- LC3_PRESET_24KHZ(LC3_CONFIG_DURATION_10, 60u),
+ LC3_PRESET_HR("24_2_2", LC3_CONFIG_24_2,
LC3_10_UNFRAMED(60u, 13u, 95u, 40000u)),
- LC3_PRESET_HR("32_1_2",
- LC3_PRESET_32KHZ(LC3_CONFIG_DURATION_7_5, 60u),
+ LC3_PRESET_HR("32_1_2", LC3_CONFIG_32_1,
LC3_7_5_UNFRAMED(60u, 13u, 75u, 40000u)),
- LC3_PRESET_HR("32_2_2",
- LC3_PRESET_32KHZ(LC3_CONFIG_DURATION_10, 80u),
+ LC3_PRESET_HR("32_2_2", LC3_CONFIG_32_2,
LC3_10_UNFRAMED(80u, 13u, 95u, 40000u)),
- LC3_PRESET_HR("44_1_2",
- LC3_PRESET_44KHZ(LC3_CONFIG_DURATION_7_5, 98u),
+ LC3_PRESET_HR("44_1_2", LC3_CONFIG_44_1,
QOS_FRAMED_2M(8163u, 98u, 13u, 80u, 40000u)),
- LC3_PRESET_HR("44_2_2",
- LC3_PRESET_44KHZ(LC3_CONFIG_DURATION_10, 130u),
+ LC3_PRESET_HR("44_2_2", LC3_CONFIG_44_2,
QOS_FRAMED_2M(10884u, 130u, 13u, 85u, 40000u)),
- LC3_PRESET_HR("48_1_2",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 75u),
+ LC3_PRESET_HR("48_1_2", LC3_CONFIG_48_1,
LC3_7_5_UNFRAMED(75u, 13u, 75u, 40000u)),
- LC3_PRESET_HR("48_2_2",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 100u),
+ LC3_PRESET_HR("48_2_2", LC3_CONFIG_48_2,
LC3_10_UNFRAMED(100u, 13u, 95u, 40000u)),
- LC3_PRESET_HR("48_3_2",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 90u),
+ LC3_PRESET_HR("48_3_2", LC3_CONFIG_48_3,
LC3_7_5_UNFRAMED(90u, 13u, 75u, 40000u)),
- LC3_PRESET_HR("48_4_2",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 120u),
+ LC3_PRESET_HR("48_4_2", LC3_CONFIG_48_4,
LC3_10_UNFRAMED(120u, 13u, 100u, 40000u)),
- LC3_PRESET_HR("48_5_2",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 117u),
+ LC3_PRESET_HR("48_5_2", LC3_CONFIG_48_5,
LC3_7_5_UNFRAMED(117u, 13u, 75u, 40000u)),
- LC3_PRESET_HR("48_6_2",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 155u),
+ LC3_PRESET_HR("48_6_2", LC3_CONFIG_48_6,
LC3_10_UNFRAMED(155u, 13u, 100u, 40000u)),
/* QoS configuration support setting requirements for the UGG and UGT */
- LC3_PRESET_LL("16_1_gs",
- LC3_PRESET_16KHZ(LC3_CONFIG_DURATION_7_5, 30u),
+ LC3_PRESET_LL("16_1_gs", LC3_CONFIG_16_1,
LC3_7_5_UNFRAMED(30u, 1u, 15u, 60000u)),
- LC3_PRESET_LL("16_2_gs",
- LC3_PRESET_16KHZ(LC3_CONFIG_DURATION_10, 40u),
+ LC3_PRESET_LL("16_2_gs", LC3_CONFIG_16_2,
LC3_10_UNFRAMED(40u, 1u, 20u, 60000u)),
- LC3_PRESET_LL("32_1_gs",
- LC3_PRESET_32KHZ(LC3_CONFIG_DURATION_7_5, 60u),
+ LC3_PRESET_LL("32_1_gs", LC3_CONFIG_32_1,
LC3_7_5_UNFRAMED(60u, 1u, 15u, 60000u)),
- LC3_PRESET_LL("32_2_gs",
- LC3_PRESET_32KHZ(LC3_CONFIG_DURATION_10, 80u),
+ LC3_PRESET_LL("32_2_gs", LC3_CONFIG_32_2,
LC3_10_UNFRAMED(80u, 1u, 20u, 60000u)),
- LC3_PRESET_LL("48_1_gs",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 75u),
+ LC3_PRESET_LL("48_1_gs", LC3_CONFIG_48_1,
LC3_7_5_UNFRAMED(75u, 1u, 15u, 60000u)),
- LC3_PRESET_LL("48_2_gs",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 100u),
+ LC3_PRESET_LL("48_2_gs", LC3_CONFIG_48_2,
LC3_10_UNFRAMED(100u, 1u, 20u, 60000u)),
- LC3_PRESET_LL("32_1_gr",
- LC3_PRESET_32KHZ(LC3_CONFIG_DURATION_7_5, 60u),
+ LC3_PRESET_LL("32_1_gr", LC3_CONFIG_32_1,
LC3_7_5_UNFRAMED(60u, 1u, 15u, 10000u)),
- LC3_PRESET_LL("32_2_gr",
- LC3_PRESET_32KHZ(LC3_CONFIG_DURATION_10, 80u),
+ LC3_PRESET_LL("32_2_gr", LC3_CONFIG_32_2,
LC3_10_UNFRAMED(80u, 1u, 20u, 10000u)),
- LC3_PRESET_LL("48_1_gr",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 75u),
+ LC3_PRESET_LL("48_1_gr", LC3_CONFIG_48_1,
LC3_7_5_UNFRAMED(75u, 1u, 15u, 10000u)),
- LC3_PRESET_LL("48_2_gr",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 100u),
+ LC3_PRESET_LL("48_2_gr", LC3_CONFIG_48_2,
LC3_10_UNFRAMED(100u, 1u, 20u, 10000u)),
- LC3_PRESET_LL("48_3_gr",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 90u),
+ LC3_PRESET_LL("48_3_gr", LC3_CONFIG_48_3,
LC3_7_5_UNFRAMED(90u, 1u, 15u, 10000u)),
- LC3_PRESET_LL("48_4_gr",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 120u),
+ LC3_PRESET_LL("48_4_gr", LC3_CONFIG_48_4,
LC3_10_UNFRAMED(120u, 1u, 20u, 10000u)),
- LC3_PRESET_LL("32_1_gr_l+r",
- LC3_PRESET_32KHZ_ALL(LC3_CONFIG_DURATION_7_5, 60u,
- 0x00000003),
+ LC3_PRESET_LL("32_1_gr_l+r", LC3_CONFIG_32_1_AC(2),
LC3_7_5_UNFRAMED(2 * 60u, 1u, 15u, 10000u)),
- LC3_PRESET_LL("32_2_gr_l+r",
- LC3_PRESET_32KHZ_ALL(LC3_CONFIG_DURATION_10, 80u,
- 0x00000003),
+ LC3_PRESET_LL("32_2_gr_l+r", LC3_CONFIG_32_2_AC(2),
LC3_10_UNFRAMED(2 * 80u, 1u, 20u, 10000u)),
- LC3_PRESET_LL("48_1_gr_l+r",
- LC3_PRESET_48KHZ_ALL(LC3_CONFIG_DURATION_7_5, 75u,
- 0x00000003),
+ LC3_PRESET_LL("48_1_gr_l+r", LC3_CONFIG_48_1_AC(2),
LC3_7_5_UNFRAMED(2 * 75u, 1u, 15u, 10000u)),
- LC3_PRESET_LL("48_2_gr_l+r",
- LC3_PRESET_48KHZ_ALL(LC3_CONFIG_DURATION_10, 100u,
- 0x00000003),
+ LC3_PRESET_LL("48_2_gr_l+r", LC3_CONFIG_48_2_AC(2),
LC3_10_UNFRAMED(2 * 100u, 1u, 20u, 10000u)),
- LC3_PRESET_LL("48_3_gr_l+r",
- LC3_PRESET_48KHZ_ALL(LC3_CONFIG_DURATION_7_5, 90u,
- 0x00000003),
+ LC3_PRESET_LL("48_3_gr_l+r", LC3_CONFIG_48_3_AC(2),
LC3_7_5_UNFRAMED(2 * 90u, 1u, 15u, 10000u)),
- LC3_PRESET_LL("48_4_gr_l+r",
- LC3_PRESET_48KHZ_ALL(LC3_CONFIG_DURATION_10, 120u,
- 0x00000003),
+ LC3_PRESET_LL("48_4_gr_l+r", LC3_CONFIG_48_4_AC(2),
LC3_10_UNFRAMED(2 * 120u, 1u, 20u, 10000u)),
};
@@ -1569,104 +1471,72 @@ static struct codec_preset lc3_bcast_presets[] = {
/* Table 6.4: Broadcast Audio Stream configuration support requirements
* for the Broadcast Source and Broadcast Sink
*/
- LC3_PRESET("8_1_1",
- LC3_PRESET_8KHZ(LC3_CONFIG_DURATION_7_5, 26u),
+ LC3_PRESET("8_1_1", LC3_CONFIG_8_1,
LC3_7_5_UNFRAMED(26u, 2u, 8u, 40000u)),
- LC3_PRESET("8_2_1",
- LC3_PRESET_8KHZ(LC3_CONFIG_DURATION_10, 30u),
+ LC3_PRESET("8_2_1", LC3_CONFIG_8_2,
LC3_10_UNFRAMED(30u, 2u, 10u, 40000u)),
- LC3_PRESET("16_1_1",
- LC3_PRESET_16KHZ(LC3_CONFIG_DURATION_7_5, 30u),
+ LC3_PRESET("16_1_1", LC3_CONFIG_16_1,
LC3_7_5_UNFRAMED(30u, 2u, 8u, 40000u)),
- LC3_PRESET("16_2_1",
- LC3_PRESET_16KHZ(LC3_CONFIG_DURATION_10, 40u),
+ LC3_PRESET("16_2_1", LC3_CONFIG_16_2,
LC3_10_UNFRAMED(40u, 2u, 10u, 40000u)),
- LC3_PRESET("24_1_1",
- LC3_PRESET_24KHZ(LC3_CONFIG_DURATION_7_5, 45u),
+ LC3_PRESET("24_1_1", LC3_CONFIG_24_1,
LC3_7_5_UNFRAMED(45u, 2u, 8u, 40000u)),
- LC3_PRESET("24_2_1",
- LC3_PRESET_24KHZ(LC3_CONFIG_DURATION_10, 60u),
+ LC3_PRESET("24_2_1", LC3_CONFIG_24_2,
LC3_10_UNFRAMED(60u, 2u, 10u, 40000u)),
- LC3_PRESET("32_1_1",
- LC3_PRESET_32KHZ(LC3_CONFIG_DURATION_7_5, 60u),
+ LC3_PRESET("32_1_1", LC3_CONFIG_32_1,
LC3_7_5_UNFRAMED(60u, 2u, 8u, 40000u)),
- LC3_PRESET("32_2_1",
- LC3_PRESET_32KHZ(LC3_CONFIG_DURATION_10, 80u),
+ LC3_PRESET("32_2_1", LC3_CONFIG_32_2,
LC3_10_UNFRAMED(80u, 2u, 10u, 40000u)),
- LC3_PRESET("44_1_1",
- LC3_PRESET_44KHZ(LC3_CONFIG_DURATION_7_5, 98u),
+ LC3_PRESET("44_1_1", LC3_CONFIG_44_1,
QOS_FRAMED_2M(8163u, 98u, 4u, 24u, 40000u)),
- LC3_PRESET("44_2_1",
- LC3_PRESET_44KHZ(LC3_CONFIG_DURATION_10, 130u),
+ LC3_PRESET("44_2_1", LC3_CONFIG_44_2,
QOS_FRAMED_2M(10884u, 130u, 4u, 31u, 40000u)),
- LC3_PRESET("48_1_1",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 75u),
+ LC3_PRESET("48_1_1", LC3_CONFIG_48_1,
LC3_7_5_UNFRAMED(75u, 4u, 15u, 40000u)),
- LC3_PRESET("48_2_1",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 100u),
+ LC3_PRESET("48_2_1", LC3_CONFIG_48_2,
LC3_10_UNFRAMED(100u, 4u, 20u, 40000u)),
- LC3_PRESET("48_3_1",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 90u),
+ LC3_PRESET("48_3_1", LC3_CONFIG_48_3,
LC3_7_5_UNFRAMED(90u, 4u, 15u, 40000u)),
- LC3_PRESET("48_4_1",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 120u),
+ LC3_PRESET("48_4_1", LC3_CONFIG_48_4,
LC3_10_UNFRAMED(120u, 4u, 20u, 40000u)),
- LC3_PRESET("48_5_1",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 117u),
+ LC3_PRESET("48_5_1", LC3_CONFIG_48_5,
LC3_7_5_UNFRAMED(117u, 4u, 15u, 40000u)),
- LC3_PRESET("48_6_1",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 155u),
+ LC3_PRESET("48_6_1", LC3_CONFIG_48_6,
LC3_10_UNFRAMED(155u, 4u, 20u, 40000u)),
/* Broadcast Audio Stream configuration settings for high-reliability
* audio data.
*/
- LC3_PRESET_HR("8_1_2",
- LC3_PRESET_8KHZ(LC3_CONFIG_DURATION_7_5, 26u),
+ LC3_PRESET_HR("8_1_2", LC3_CONFIG_8_1,
LC3_7_5_UNFRAMED(26u, 4u, 45u, 40000u)),
- LC3_PRESET_HR("8_2_2",
- LC3_PRESET_8KHZ(LC3_CONFIG_DURATION_10, 30u),
+ LC3_PRESET_HR("8_2_2", LC3_CONFIG_8_2,
LC3_10_UNFRAMED(30u, 4u, 60u, 40000u)),
- LC3_PRESET_HR("16_1_2",
- LC3_PRESET_16KHZ(LC3_CONFIG_DURATION_7_5, 30u),
+ LC3_PRESET_HR("16_1_2", LC3_CONFIG_16_1,
LC3_7_5_UNFRAMED(30u, 4u, 45u, 40000u)),
- LC3_PRESET_HR("16_2_2",
- LC3_PRESET_16KHZ(LC3_CONFIG_DURATION_10, 40u),
+ LC3_PRESET_HR("16_2_2", LC3_CONFIG_16_2,
LC3_10_UNFRAMED(40u, 4u, 60u, 40000u)),
- LC3_PRESET_HR("24_1_2",
- LC3_PRESET_24KHZ(LC3_CONFIG_DURATION_7_5, 45u),
+ LC3_PRESET_HR("24_1_2", LC3_CONFIG_24_1,
LC3_7_5_UNFRAMED(45u, 4u, 45u, 40000u)),
- LC3_PRESET_HR("24_2_2",
- LC3_PRESET_24KHZ(LC3_CONFIG_DURATION_10, 60u),
+ LC3_PRESET_HR("24_2_2", LC3_CONFIG_24_2,
LC3_10_UNFRAMED(60u, 4u, 60u, 40000u)),
- LC3_PRESET_HR("32_1_2",
- LC3_PRESET_32KHZ(LC3_CONFIG_DURATION_7_5, 60u),
+ LC3_PRESET_HR("32_1_2", LC3_CONFIG_32_1,
LC3_7_5_UNFRAMED(60u, 4u, 45u, 40000u)),
- LC3_PRESET_HR("32_2_2",
- LC3_PRESET_32KHZ(LC3_CONFIG_DURATION_10, 80u),
+ LC3_PRESET_HR("32_2_2", LC3_CONFIG_32_2,
LC3_10_UNFRAMED(80u, 4u, 60u, 40000u)),
- LC3_PRESET_HR("44_1_2",
- LC3_PRESET_44KHZ(LC3_CONFIG_DURATION_7_5, 98u),
+ LC3_PRESET_HR("44_1_2", LC3_CONFIG_44_1,
QOS_FRAMED_2M(8163u, 4u, 13u, 54u, 40000u)),
- LC3_PRESET_HR("44_2_2",
- LC3_PRESET_44KHZ(LC3_CONFIG_DURATION_10, 130u),
+ LC3_PRESET_HR("44_2_2", LC3_CONFIG_44_2,
QOS_FRAMED_2M(10884u, 130u, 4u, 60u, 40000u)),
- LC3_PRESET_HR("48_1_2",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 75u),
+ LC3_PRESET_HR("48_1_2", LC3_CONFIG_48_1,
LC3_7_5_UNFRAMED(75u, 4u, 50u, 40000u)),
- LC3_PRESET_HR("48_2_2",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 100u),
+ LC3_PRESET_HR("48_2_2", LC3_CONFIG_48_2,
LC3_10_UNFRAMED(100u, 4u, 65u, 40000u)),
- LC3_PRESET_HR("48_3_2",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 90u),
+ LC3_PRESET_HR("48_3_2", LC3_CONFIG_48_3,
LC3_7_5_UNFRAMED(90u, 4u, 50u, 40000u)),
- LC3_PRESET_HR("48_4_2",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 120u),
+ LC3_PRESET_HR("48_4_2", LC3_CONFIG_48_4,
LC3_10_UNFRAMED(120u, 4u, 65u, 40000u)),
- LC3_PRESET_HR("48_5_2",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 117u),
+ LC3_PRESET_HR("48_5_2", LC3_CONFIG_48_5,
LC3_7_5_UNFRAMED(117u, 4u, 50u, 40000u)),
- LC3_PRESET_HR("48_6_2",
- LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 155u),
+ LC3_PRESET_HR("48_6_2", LC3_CONFIG_48_6,
LC3_10_UNFRAMED(155u, 4u, 65u, 40000u)),
};
--
2.43.0
next prev parent reply other threads:[~2024-03-13 15:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-13 15:07 [PATCH BlueZ v2 1/4] client/player: Split unicast and broadcast presets Luiz Augusto von Dentz
2024-03-13 15:07 ` Luiz Augusto von Dentz [this message]
2024-03-13 15:07 ` [PATCH BlueZ v2 3/4] shared/lc3: Add definition for broadcast configurations Luiz Augusto von Dentz
2024-03-13 15:07 ` [PATCH BlueZ v2 4/4] client/player: Use QOS macros from lc3.h to define presets Luiz Augusto von Dentz
2024-03-13 18:23 ` [BlueZ,v2,1/4] client/player: Split unicast and broadcast presets bluez.test.bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240313150706.1279036-2-luiz.dentz@gmail.com \
--to=luiz.dentz@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.