Skip to content

Commit

Permalink
client/player: Add presets from GMAP
Browse files Browse the repository at this point in the history 
This adds the following presets from GMAP:

16_1_gs
16_2_gs
32_1_gs
32_2_gs
48_1_gs
48_2_gs
32_1_gr
32_2_gr
48_1_gr
48_2_gr
48_3_gr
48_4_gr
32_1_gr_l+r
32_2_gr_l+r
48_1_gr_l+r
48_2_gr_l+r
48_3_gr_l+r
48_4_gr_l+r
  • Loading branch information
@Vudentz
Vudentz committed Nov 22, 2023
1 parent 506413d commit 813e1ce
Showing 1 changed file with 75 additions and 1 deletion.
76 changes: 75 additions & 1 deletion client/player.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1314,6 +1314,13 @@ static struct codec_preset sbc_presets[] = {
0x02, LC3_CONFIG_DURATION, _duration, \
0x03, LC3_CONFIG_FRAME_LEN, _len, _len >> 8)

#define LC3_PRESET_DATA_ALL(_freq, _duration, _alloc, _len) \
CODEC_DATA(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)

Expand All @@ -1332,18 +1339,24 @@ static struct codec_preset sbc_presets[] = {
#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, \
.data = _data, \
.qos = _qos, \
.latency = 0x01, \
.target_latency = 0x01, \
}

#define LC3_PRESET(_name, _data, _qos) \
Expand Down Expand Up @@ -1461,6 +1474,67 @@ static struct codec_preset lc3_presets[] = {
LC3_PRESET_HR("48_6_2",
LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 155u),
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_7_5_UNFRAMED(30u, 1u, 15u, 60000u)),
LC3_PRESET_LL("16_2_gs",
LC3_PRESET_16KHZ(LC3_CONFIG_DURATION_10, 40u),
LC3_10_UNFRAMED(40u, 1u, 20u, 60000u)),
LC3_PRESET_LL("32_1_gs",
LC3_PRESET_32KHZ(LC3_CONFIG_DURATION_7_5, 60u),
LC3_7_5_UNFRAMED(60u, 1u, 15u, 60000u)),
LC3_PRESET_LL("32_2_gs",
LC3_PRESET_32KHZ(LC3_CONFIG_DURATION_10, 80u),
LC3_10_UNFRAMED(80u, 1u, 20u, 60000u)),
LC3_PRESET_LL("48_1_gs",
LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 75u),
LC3_7_5_UNFRAMED(75u, 1u, 15u, 60000u)),
LC3_PRESET_LL("48_2_gs",
LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 100u),
LC3_10_UNFRAMED(100u, 1u, 20u, 60000u)),
LC3_PRESET_LL("32_1_gr",
LC3_PRESET_32KHZ(LC3_CONFIG_DURATION_7_5, 60u),
LC3_7_5_UNFRAMED(60u, 1u, 15u, 10000u)),
LC3_PRESET_LL("32_2_gr",
LC3_PRESET_32KHZ(LC3_CONFIG_DURATION_10, 80u),
LC3_10_UNFRAMED(80u, 1u, 20u, 10000u)),
LC3_PRESET_LL("48_1_gr",
LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 75u),
LC3_7_5_UNFRAMED(75u, 1u, 15u, 10000u)),
LC3_PRESET_LL("48_2_gr",
LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 100u),
LC3_10_UNFRAMED(100u, 1u, 20u, 10000u)),
LC3_PRESET_LL("48_3_gr",
LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_7_5, 90u),
LC3_7_5_UNFRAMED(90u, 1u, 15u, 10000u)),
LC3_PRESET_LL("48_4_gr",
LC3_PRESET_48KHZ(LC3_CONFIG_DURATION_10, 120u),
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_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_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_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_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_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_10_UNFRAMED(2 * 120u, 1u, 20u, 10000u)),
};

static void print_ltv(const char *str, void *user_data)
Expand Down

0 comments on commit 813e1ce

Please sign in to comment.