From: Luiz Augusto von Dentz <[email protected]>
This adds support for printing Capabilities and Configuration of A2DP
endpoints and transports:
bluetoothctl> endpoint.show /org/bluez/hci0/dev_94_DB_56_F7_F2_88/sep1
Endpoint /org/bluez/hci0/dev_94_DB_56_F7_F2_88/sep1
UUID: 0000110b-0000-1000-8000-00805f9b34fb
Codec: 0x00 (0)
Media Codec: SBC
Channel Modes: Mono DualChannel Stereo JointStereo
Frequencies: 44.1Khz 48Khz
Subbands: 4 8
Blocks: 4 8 12 16
Bitpool Range: 2-53
...
bluetoothctl> transport.show /org/bluez/hci0/dev_94_DB_56_F7_F2_88/sep1/fd7
Transport /org/bluez/hci0/dev_94_DB_56_F7_F2_88/sep1/fd7
UUID: 0000110a-0000-1000-8000-00805f9b34fb
Codec: 0x00 (0)
Media Codec: SBC
Channel Modes: JointStereo
Frequencies: 48Khz
Subbands: 8
Blocks: 16
Bitpool Range: 2-53
---
client/player.c | 548 +++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 538 insertions(+), 10 deletions(-)
diff --git a/client/player.c b/client/player.c
index dad243786a39..39d1be665c8f 100644
--- a/client/player.c
+++ b/client/player.c
@@ -72,6 +72,28 @@
#define EP_SNK_CTXT 0x0fff
#define EP_SUPPORTED_SNK_CTXT EP_SNK_CTXT
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+
+struct avdtp_media_codec_capability {
+ uint8_t rfa0:4;
+ uint8_t media_type:4;
+ uint8_t media_codec_type;
+ uint8_t data[0];
+} __attribute__ ((packed));
+
+#elif __BYTE_ORDER == __BIG_ENDIAN
+
+struct avdtp_media_codec_capability {
+ uint8_t media_type:4;
+ uint8_t rfa0:4;
+ uint8_t media_codec_type;
+ uint8_t data[0];
+} __attribute__ ((packed));
+
+#else
+#error "Unknown byte order"
+#endif
+
struct endpoint {
char *path;
char *uuid;
@@ -2298,23 +2320,506 @@ static struct endpoint *endpoint_find(const char *pattern)
return NULL;
}
+static void print_aptx_common(a2dp_aptx_t *aptx)
+{
+ bt_shell_printf("\n\t\tFrequencies: ");
+ if (aptx->frequency & APTX_SAMPLING_FREQ_16000)
+ bt_shell_printf("16kHz ");
+ if (aptx->frequency & APTX_SAMPLING_FREQ_32000)
+ bt_shell_printf("32kHz ");
+ if (aptx->frequency & APTX_SAMPLING_FREQ_44100)
+ bt_shell_printf("44.1kHz ");
+ if (aptx->frequency & APTX_SAMPLING_FREQ_48000)
+ bt_shell_printf("48kHz ");
+
+ bt_shell_printf("\n\t\tChannel modes: ");
+ if (aptx->channel_mode & APTX_CHANNEL_MODE_MONO)
+ bt_shell_printf("Mono ");
+ if (aptx->channel_mode & APTX_CHANNEL_MODE_STEREO)
+ bt_shell_printf("Stereo ");
+}
+
+static void print_aptx(a2dp_aptx_t *aptx, uint8_t size)
+{
+ bt_shell_printf("\t\tVendor Specific Value (aptX)");
+
+ if (size < sizeof(*aptx)) {
+ bt_shell_printf(" (broken)\n");
+ return;
+ }
+
+ print_aptx_common(aptx);
+
+ bt_shell_printf("\n");
+}
+
+static void print_faststream(a2dp_faststream_t *faststream, uint8_t size)
+{
+ bt_shell_printf("\t\tVendor Specific Value (FastStream)");
+
+ if (size < sizeof(*faststream)) {
+ bt_shell_printf(" (broken)\n");
+ return;
+ }
+
+ bt_shell_printf("\n\t\tDirections: ");
+ if (faststream->direction & FASTSTREAM_DIRECTION_SINK)
+ bt_shell_printf("sink ");
+ if (faststream->direction & FASTSTREAM_DIRECTION_SOURCE)
+ bt_shell_printf("source ");
+
+ if (faststream->direction & FASTSTREAM_DIRECTION_SINK) {
+ bt_shell_printf("\n\t\tSink Frequencies: ");
+ if (faststream->sink_frequency &
+ FASTSTREAM_SINK_SAMPLING_FREQ_44100)
+ bt_shell_printf("44.1kHz ");
+ if (faststream->sink_frequency &
+ FASTSTREAM_SINK_SAMPLING_FREQ_48000)
+ bt_shell_printf("48kHz ");
+ }
+
+ if (faststream->direction & FASTSTREAM_DIRECTION_SOURCE) {
+ bt_shell_printf("\n\t\tSource Frequencies: ");
+ if (faststream->source_frequency &
+ FASTSTREAM_SOURCE_SAMPLING_FREQ_16000)
+ bt_shell_printf("16kHz ");
+ }
+
+ bt_shell_printf("\n");
+}
+
+static void print_aptx_ll(a2dp_aptx_ll_t *aptx_ll, uint8_t size)
+{
+ a2dp_aptx_ll_new_caps_t *aptx_ll_new;
+
+ bt_shell_printf("\t\tVendor Specific Value (aptX Low Latency)");
+
+ if (size < sizeof(*aptx_ll)) {
+ bt_shell_printf(" (broken)\n");
+ return;
+ }
+
+ print_aptx_common(&aptx_ll->aptx);
+
+ bt_shell_printf("\n\tBidirectional link: %s",
+ aptx_ll->bidirect_link ? "Yes" : "No");
+
+ aptx_ll_new = &aptx_ll->new_caps[0];
+ if (aptx_ll->has_new_caps &&
+ size >= sizeof(*aptx_ll) + sizeof(*aptx_ll_new)) {
+ bt_shell_printf("\n\tTarget codec buffer level: %u",
+ (unsigned int)aptx_ll_new->target_level2 |
+ ((unsigned int)(aptx_ll_new->target_level1) << 8));
+ bt_shell_printf("\n\tInitial codec buffer level: %u",
+ (unsigned int)aptx_ll_new->initial_level2 |
+ ((unsigned int)(aptx_ll_new->initial_level1) << 8));
+ bt_shell_printf("\n\tSRA max rate: %g",
+ aptx_ll_new->sra_max_rate / 10000.0);
+ bt_shell_printf("\n\tSRA averaging time: %us",
+ (unsigned int)aptx_ll_new->sra_avg_time);
+ bt_shell_printf("\n\tGood working codec buffer level: %u",
+ (unsigned int)aptx_ll_new->good_working_level2 |
+ ((unsigned int)(aptx_ll_new->good_working_level1) << 8)
+ );
+ }
+
+ bt_shell_printf("\n");
+}
+
+static void print_aptx_hd(a2dp_aptx_hd_t *aptx_hd, uint8_t size)
+{
+ bt_shell_printf("\t\tVendor Specific Value (aptX HD)");
+
+ if (size < sizeof(*aptx_hd)) {
+ bt_shell_printf(" (broken)\n");
+ return;
+ }
+
+ print_aptx_common(&aptx_hd->aptx);
+
+ bt_shell_printf("\n");
+}
+
+static void print_ldac(a2dp_ldac_t *ldac, uint8_t size)
+{
+ bt_shell_printf("\t\tVendor Specific Value (LDAC)");
+
+ if (size < sizeof(*ldac)) {
+ bt_shell_printf(" (broken)\n");
+ return;
+ }
+
+ bt_shell_printf("\n\t\tFrequencies: ");
+ if (ldac->frequency & LDAC_SAMPLING_FREQ_44100)
+ bt_shell_printf("44.1kHz ");
+ if (ldac->frequency & LDAC_SAMPLING_FREQ_48000)
+ bt_shell_printf("48kHz ");
+ if (ldac->frequency & LDAC_SAMPLING_FREQ_88200)
+ bt_shell_printf("88.2kHz ");
+ if (ldac->frequency & LDAC_SAMPLING_FREQ_96000)
+ bt_shell_printf("96kHz ");
+ if (ldac->frequency & LDAC_SAMPLING_FREQ_176400)
+ bt_shell_printf("176.4kHz ");
+ if (ldac->frequency & LDAC_SAMPLING_FREQ_192000)
+ bt_shell_printf("192kHz ");
+
+ bt_shell_printf("\n\t\tChannel modes: ");
+ if (ldac->channel_mode & LDAC_CHANNEL_MODE_MONO)
+ bt_shell_printf("Mono ");
+ if (ldac->channel_mode & LDAC_CHANNEL_MODE_DUAL)
+ bt_shell_printf("Dual ");
+ if (ldac->channel_mode & LDAC_CHANNEL_MODE_STEREO)
+ bt_shell_printf("Stereo ");
+
+ bt_shell_printf("\n");
+}
+
+static void print_vendor(a2dp_vendor_codec_t *vendor, uint8_t size)
+{
+ uint32_t vendor_id;
+ uint16_t codec_id;
+ int i;
+
+ if (size < sizeof(*vendor)) {
+ bt_shell_printf("\tMedia Codec: Vendor Specific A2DP Codec "
+ "(broken)");
+ return;
+ }
+
+ vendor_id = A2DP_GET_VENDOR_ID(*vendor);
+ codec_id = A2DP_GET_CODEC_ID(*vendor);
+
+ bt_shell_printf("\tMedia Codec: Vendor Specific A2DP Codec");
+
+ bt_shell_printf("\n\tVendor ID 0x%08x", vendor_id);
+
+ bt_shell_printf("\n\tVendor Specific Codec ID 0x%04x", codec_id);
+
+ bt_shell_printf("\n\tVendor Specific Data:");
+ for (i = 6; i < size; ++i)
+ bt_shell_printf(" 0x%.02x", ((unsigned char *)vendor)[i]);
+ bt_shell_printf("\n");
+
+ if (vendor_id == APTX_VENDOR_ID && codec_id == APTX_CODEC_ID)
+ print_aptx((void *) vendor, size);
+ else if (vendor_id == FASTSTREAM_VENDOR_ID &&
+ codec_id == FASTSTREAM_CODEC_ID)
+ print_faststream((void *) vendor, size);
+ else if (vendor_id == APTX_LL_VENDOR_ID && codec_id == APTX_LL_CODEC_ID)
+ print_aptx_ll((void *) vendor, size);
+ else if (vendor_id == APTX_HD_VENDOR_ID && codec_id == APTX_HD_CODEC_ID)
+ print_aptx_hd((void *) vendor, size);
+ else if (vendor_id == LDAC_VENDOR_ID && codec_id == LDAC_CODEC_ID)
+ print_ldac((void *) vendor, size);
+}
+
+static void print_mpeg24(a2dp_aac_t *aac, uint8_t size)
+{
+ unsigned int freq, bitrate;
+
+ if (size < sizeof(*aac)) {
+ bt_shell_printf("\tMedia Codec: MPEG24 (broken)\n");
+ return;
+ }
+
+ freq = AAC_GET_FREQUENCY(*aac);
+ bitrate = AAC_GET_BITRATE(*aac);
+
+ bt_shell_printf("\tMedia Codec: MPEG24\n\tObject Types: ");
+
+ if (aac->object_type & AAC_OBJECT_TYPE_MPEG2_AAC_LC)
+ bt_shell_printf("MPEG-2 AAC LC ");
+ if (aac->object_type & AAC_OBJECT_TYPE_MPEG4_AAC_LC)
+ bt_shell_printf("MPEG-4 AAC LC ");
+ if (aac->object_type & AAC_OBJECT_TYPE_MPEG4_AAC_LTP)
+ bt_shell_printf("MPEG-4 AAC LTP ");
+ if (aac->object_type & AAC_OBJECT_TYPE_MPEG4_AAC_SCA)
+ bt_shell_printf("MPEG-4 AAC scalable ");
+
+ bt_shell_printf("\n\tFrequencies: ");
+ if (freq & AAC_SAMPLING_FREQ_8000)
+ bt_shell_printf("8kHz ");
+ if (freq & AAC_SAMPLING_FREQ_11025)
+ bt_shell_printf("11.025kHz ");
+ if (freq & AAC_SAMPLING_FREQ_12000)
+ bt_shell_printf("12kHz ");
+ if (freq & AAC_SAMPLING_FREQ_16000)
+ bt_shell_printf("16kHz ");
+ if (freq & AAC_SAMPLING_FREQ_22050)
+ bt_shell_printf("22.05kHz ");
+ if (freq & AAC_SAMPLING_FREQ_24000)
+ bt_shell_printf("24kHz ");
+ if (freq & AAC_SAMPLING_FREQ_32000)
+ bt_shell_printf("32kHz ");
+ if (freq & AAC_SAMPLING_FREQ_44100)
+ bt_shell_printf("44.1kHz ");
+ if (freq & AAC_SAMPLING_FREQ_48000)
+ bt_shell_printf("48kHz ");
+ if (freq & AAC_SAMPLING_FREQ_64000)
+ bt_shell_printf("64kHz ");
+ if (freq & AAC_SAMPLING_FREQ_88200)
+ bt_shell_printf("88.2kHz ");
+ if (freq & AAC_SAMPLING_FREQ_96000)
+ bt_shell_printf("96kHz ");
+
+ bt_shell_printf("\n\tChannels: ");
+ if (aac->channels & AAC_CHANNELS_1)
+ bt_shell_printf("1 ");
+ if (aac->channels & AAC_CHANNELS_2)
+ bt_shell_printf("2 ");
+
+ bt_shell_printf("\n\tBitrate: %u", bitrate);
+
+ bt_shell_printf("\n\tVBR: %s", aac->vbr ? "Yes\n" : "No\n");
+}
+
+static void print_mpeg12(a2dp_mpeg_t *mpeg, uint8_t size)
+{
+ uint16_t bitrate;
+
+ if (size < sizeof(*mpeg)) {
+ bt_shell_printf("\tMedia Codec: MPEG12 (broken)\n");
+ return;
+ }
+
+ bitrate = MPEG_GET_BITRATE(*mpeg);
+
+ bt_shell_printf("\tMedia Codec: MPEG12\n\tChannel Modes: ");
+
+ if (mpeg->channel_mode & MPEG_CHANNEL_MODE_MONO)
+ bt_shell_printf("Mono ");
+ if (mpeg->channel_mode & MPEG_CHANNEL_MODE_DUAL_CHANNEL)
+ bt_shell_printf("DualChannel ");
+ if (mpeg->channel_mode & MPEG_CHANNEL_MODE_STEREO)
+ bt_shell_printf("Stereo ");
+ if (mpeg->channel_mode & MPEG_CHANNEL_MODE_JOINT_STEREO)
+ bt_shell_printf("JointStereo");
+
+ bt_shell_printf("\n\tFrequencies: ");
+ if (mpeg->frequency & MPEG_SAMPLING_FREQ_16000)
+ bt_shell_printf("16Khz ");
+ if (mpeg->frequency & MPEG_SAMPLING_FREQ_22050)
+ bt_shell_printf("22.05Khz ");
+ if (mpeg->frequency & MPEG_SAMPLING_FREQ_24000)
+ bt_shell_printf("24Khz ");
+ if (mpeg->frequency & MPEG_SAMPLING_FREQ_32000)
+ bt_shell_printf("32Khz ");
+ if (mpeg->frequency & MPEG_SAMPLING_FREQ_44100)
+ bt_shell_printf("44.1Khz ");
+ if (mpeg->frequency & MPEG_SAMPLING_FREQ_48000)
+ bt_shell_printf("48Khz ");
+
+ bt_shell_printf("\n\tCRC: %s", mpeg->crc ? "Yes" : "No");
+
+ bt_shell_printf("\n\tLayer: ");
+ if (mpeg->layer & MPEG_LAYER_MP1)
+ bt_shell_printf("1 ");
+ if (mpeg->layer & MPEG_LAYER_MP2)
+ bt_shell_printf("2 ");
+ if (mpeg->layer & MPEG_LAYER_MP3)
+ bt_shell_printf("3 ");
+
+ if (bitrate & MPEG_BIT_RATE_FREE) {
+ bt_shell_printf("\n\tBit Rate: Free format");
+ } else {
+ if (mpeg->layer & MPEG_LAYER_MP1) {
+ bt_shell_printf("\n\tLayer 1 Bit Rate: ");
+ if (bitrate & MPEG_MP1_BIT_RATE_32000)
+ bt_shell_printf("32kbps ");
+ if (bitrate & MPEG_MP1_BIT_RATE_64000)
+ bt_shell_printf("64kbps ");
+ if (bitrate & MPEG_MP1_BIT_RATE_96000)
+ bt_shell_printf("96kbps ");
+ if (bitrate & MPEG_MP1_BIT_RATE_128000)
+ bt_shell_printf("128kbps ");
+ if (bitrate & MPEG_MP1_BIT_RATE_160000)
+ bt_shell_printf("160kbps ");
+ if (bitrate & MPEG_MP1_BIT_RATE_192000)
+ bt_shell_printf("192kbps ");
+ if (bitrate & MPEG_MP1_BIT_RATE_224000)
+ bt_shell_printf("224kbps ");
+ if (bitrate & MPEG_MP1_BIT_RATE_256000)
+ bt_shell_printf("256kbps ");
+ if (bitrate & MPEG_MP1_BIT_RATE_320000)
+ bt_shell_printf("320kbps ");
+ if (bitrate & MPEG_MP1_BIT_RATE_352000)
+ bt_shell_printf("352kbps ");
+ if (bitrate & MPEG_MP1_BIT_RATE_384000)
+ bt_shell_printf("384kbps ");
+ if (bitrate & MPEG_MP1_BIT_RATE_416000)
+ bt_shell_printf("416kbps ");
+ if (bitrate & MPEG_MP1_BIT_RATE_448000)
+ bt_shell_printf("448kbps ");
+ }
+
+ if (mpeg->layer & MPEG_LAYER_MP2) {
+ bt_shell_printf("\n\tLayer 2 Bit Rate: ");
+ if (bitrate & MPEG_MP2_BIT_RATE_32000)
+ bt_shell_printf("32kbps ");
+ if (bitrate & MPEG_MP2_BIT_RATE_48000)
+ bt_shell_printf("48kbps ");
+ if (bitrate & MPEG_MP2_BIT_RATE_56000)
+ bt_shell_printf("56kbps ");
+ if (bitrate & MPEG_MP2_BIT_RATE_64000)
+ bt_shell_printf("64kbps ");
+ if (bitrate & MPEG_MP2_BIT_RATE_80000)
+ bt_shell_printf("80kbps ");
+ if (bitrate & MPEG_MP2_BIT_RATE_96000)
+ bt_shell_printf("96kbps ");
+ if (bitrate & MPEG_MP2_BIT_RATE_112000)
+ bt_shell_printf("112kbps ");
+ if (bitrate & MPEG_MP2_BIT_RATE_128000)
+ bt_shell_printf("128kbps ");
+ if (bitrate & MPEG_MP2_BIT_RATE_160000)
+ bt_shell_printf("160kbps ");
+ if (bitrate & MPEG_MP2_BIT_RATE_192000)
+ bt_shell_printf("192kbps ");
+ if (bitrate & MPEG_MP2_BIT_RATE_224000)
+ bt_shell_printf("224kbps ");
+ if (bitrate & MPEG_MP2_BIT_RATE_256000)
+ bt_shell_printf("256kbps ");
+ if (bitrate & MPEG_MP2_BIT_RATE_320000)
+ bt_shell_printf("320kbps ");
+ if (bitrate & MPEG_MP2_BIT_RATE_384000)
+ bt_shell_printf("384kbps ");
+ }
+
+ if (mpeg->layer & MPEG_LAYER_MP3) {
+ bt_shell_printf("\n\tLayer 3 Bit Rate: ");
+ if (bitrate & MPEG_MP3_BIT_RATE_32000)
+ bt_shell_printf("32kbps ");
+ if (bitrate & MPEG_MP3_BIT_RATE_40000)
+ bt_shell_printf("40kbps ");
+ if (bitrate & MPEG_MP3_BIT_RATE_48000)
+ bt_shell_printf("48kbps ");
+ if (bitrate & MPEG_MP3_BIT_RATE_56000)
+ bt_shell_printf("56kbps ");
+ if (bitrate & MPEG_MP3_BIT_RATE_64000)
+ bt_shell_printf("64kbps ");
+ if (bitrate & MPEG_MP3_BIT_RATE_80000)
+ bt_shell_printf("80kbps ");
+ if (bitrate & MPEG_MP3_BIT_RATE_96000)
+ bt_shell_printf("96kbps ");
+ if (bitrate & MPEG_MP3_BIT_RATE_112000)
+ bt_shell_printf("112kbps ");
+ if (bitrate & MPEG_MP3_BIT_RATE_128000)
+ bt_shell_printf("128kbps ");
+ if (bitrate & MPEG_MP3_BIT_RATE_160000)
+ bt_shell_printf("160kbps ");
+ if (bitrate & MPEG_MP3_BIT_RATE_192000)
+ bt_shell_printf("192kbps ");
+ if (bitrate & MPEG_MP3_BIT_RATE_224000)
+ bt_shell_printf("224kbps ");
+ if (bitrate & MPEG_MP3_BIT_RATE_256000)
+ bt_shell_printf("256kbps ");
+ if (bitrate & MPEG_MP3_BIT_RATE_320000)
+ bt_shell_printf("320kbps ");
+ }
+ }
+
+ bt_shell_printf("\n\tVBR: %s", mpeg->vbr ? "Yes" : "No");
+
+ bt_shell_printf("\n\tPayload Format: ");
+ if (mpeg->mpf)
+ bt_shell_printf("RFC-2250 RFC-3119\n");
+ else
+ bt_shell_printf("RFC-2250\n");
+}
+
+static void print_sbc(a2dp_sbc_t *sbc, uint8_t size)
+{
+ if (size < sizeof(*sbc)) {
+ bt_shell_printf("\tMedia Codec: SBC (broken)\n");
+ return;
+ }
+
+ bt_shell_printf("\tMedia Codec: SBC\n\tChannel Modes: ");
+
+ if (sbc->channel_mode & SBC_CHANNEL_MODE_MONO)
+ bt_shell_printf("Mono ");
+ if (sbc->channel_mode & SBC_CHANNEL_MODE_DUAL_CHANNEL)
+ bt_shell_printf("DualChannel ");
+ if (sbc->channel_mode & SBC_CHANNEL_MODE_STEREO)
+ bt_shell_printf("Stereo ");
+ if (sbc->channel_mode & SBC_CHANNEL_MODE_JOINT_STEREO)
+ bt_shell_printf("JointStereo");
+
+ bt_shell_printf("\n\tFrequencies: ");
+ if (sbc->frequency & SBC_SAMPLING_FREQ_16000)
+ bt_shell_printf("16Khz ");
+ if (sbc->frequency & SBC_SAMPLING_FREQ_32000)
+ bt_shell_printf("32Khz ");
+ if (sbc->frequency & SBC_SAMPLING_FREQ_44100)
+ bt_shell_printf("44.1Khz ");
+ if (sbc->frequency & SBC_SAMPLING_FREQ_48000)
+ bt_shell_printf("48Khz ");
+
+ bt_shell_printf("\n\tSubbands: ");
+ if (sbc->allocation_method & SBC_SUBBANDS_4)
+ bt_shell_printf("4 ");
+ if (sbc->allocation_method & SBC_SUBBANDS_8)
+ bt_shell_printf("8");
+
+ bt_shell_printf("\n\tBlocks: ");
+ if (sbc->block_length & SBC_BLOCK_LENGTH_4)
+ bt_shell_printf("4 ");
+ if (sbc->block_length & SBC_BLOCK_LENGTH_8)
+ bt_shell_printf("8 ");
+ if (sbc->block_length & SBC_BLOCK_LENGTH_12)
+ bt_shell_printf("12 ");
+ if (sbc->block_length & SBC_BLOCK_LENGTH_16)
+ bt_shell_printf("16 ");
+
+ bt_shell_printf("\n\tBitpool Range: %d-%d\n",
+ sbc->min_bitpool, sbc->max_bitpool);
+}
+
+static int print_a2dp_codec(uint8_t codec, void *data, uint8_t size)
+{
+ int i;
+
+ switch (codec) {
+ case A2DP_CODEC_SBC:
+ print_sbc(data, size);
+ break;
+ case A2DP_CODEC_MPEG12:
+ print_mpeg12(data, size);
+ break;
+ case A2DP_CODEC_MPEG24:
+ print_mpeg24(data, size);
+ break;
+ case A2DP_CODEC_VENDOR:
+ print_vendor(data, size);
+ break;
+ default:
+ bt_shell_printf("\tMedia Codec: Unknown\n");
+ bt_shell_printf("\t\tCodec Data:");
+ for (i = 0; i < size - 2; ++i)
+ bt_shell_printf(" 0x%.02x", ((unsigned char *)data)[i]);
+ bt_shell_printf("\n");
+ }
+
+ return 0;
+}
+
static void print_capabilities(GDBusProxy *proxy)
{
DBusMessageIter iter, subiter;
+ const char *uuid;
uint8_t codec;
uint8_t *data;
int len;
+ if (!g_dbus_proxy_get_property(proxy, "UUID", &iter))
+ return;
+
+ dbus_message_iter_get_basic(&iter, &uuid);
+
if (!g_dbus_proxy_get_property(proxy, "Codec", &iter))
return;
dbus_message_iter_get_basic(&iter, &codec);
- if (codec != LC3_ID) {
- print_property(proxy, "Capabilities");
- return;
- }
-
if (!g_dbus_proxy_get_property(proxy, "Capabilities", &iter))
return;
@@ -2322,6 +2827,17 @@ static void print_capabilities(GDBusProxy *proxy)
dbus_message_iter_get_fixed_array(&subiter, &data, &len);
+ if (!strcasecmp(uuid, A2DP_SINK_UUID) ||
+ !strcasecmp(uuid, A2DP_SOURCE_UUID)) {
+ print_a2dp_codec(codec, data, len);
+ return;
+ }
+
+ if (codec != LC3_ID) {
+ print_property(proxy, "Capabilities");
+ return;
+ }
+
print_lc3_caps(data, len);
if (!g_dbus_proxy_get_property(proxy, "Metadata", &iter))
@@ -4179,20 +4695,21 @@ static void cmd_list_transport(int argc, char *argv[])
static void print_configuration(GDBusProxy *proxy)
{
DBusMessageIter iter, subiter;
+ const char *uuid;
uint8_t codec;
uint8_t *data;
int len;
+ if (!g_dbus_proxy_get_property(proxy, "UUID", &iter))
+ return;
+
+ dbus_message_iter_get_basic(&iter, &uuid);
+
if (!g_dbus_proxy_get_property(proxy, "Codec", &iter))
return;
dbus_message_iter_get_basic(&iter, &codec);
- if (codec != LC3_ID) {
- print_property(proxy, "Configuration");
- return;
- }
-
if (!g_dbus_proxy_get_property(proxy, "Configuration", &iter))
return;
@@ -4200,6 +4717,17 @@ static void print_configuration(GDBusProxy *proxy)
dbus_message_iter_get_fixed_array(&subiter, &data, &len);
+ if (!strcasecmp(uuid, A2DP_SINK_UUID) ||
+ !strcasecmp(uuid, A2DP_SOURCE_UUID)) {
+ print_a2dp_codec(codec, (void *)data, len);
+ return;
+ }
+
+ if (codec != LC3_ID) {
+ print_property(proxy, "Configuration");
+ return;
+ }
+
print_lc3_cfg(data, len);
if (!g_dbus_proxy_get_property(proxy, "Metadata", &iter))
--
2.43.0
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=817657
---Test result---
Test Summary:
CheckPatch FAIL 1.28 seconds
GitLint FAIL 0.72 seconds
BuildEll PASS 23.85 seconds
BluezMake PASS 714.32 seconds
MakeCheck PASS 11.90 seconds
MakeDistcheck PASS 160.73 seconds
CheckValgrind PASS 224.97 seconds
CheckSmatch PASS 326.77 seconds
bluezmakeextell PASS 107.48 seconds
IncrementalBuild PASS 1334.25 seconds
ScanBuild PASS 936.79 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[BlueZ,v1,1/2] client/player: Add support for printing A2DP codec details
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#139: FILE: client/player.c:82:
+} __attribute__ ((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#148: FILE: client/player.c:91:
+} __attribute__ ((packed));
/github/workspace/src/src/13522216.patch total: 0 errors, 2 warnings, 599 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/src/13522216.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
##############################
Test: GitLint - FAIL
Desc: Run gitlint
Output:
[BlueZ,v1,1/2] client/player: Add support for printing A2DP codec details
WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search
10: B3 Line contains hard tab characters (\t): " UUID: 0000110b-0000-1000-8000-00805f9b34fb"
11: B3 Line contains hard tab characters (\t): " Codec: 0x00 (0)"
12: B3 Line contains hard tab characters (\t): " Media Codec: SBC"
13: B3 Line contains hard tab characters (\t): " Channel Modes: Mono DualChannel Stereo JointStereo"
14: B3 Line contains hard tab characters (\t): " Frequencies: 44.1Khz 48Khz"
15: B3 Line contains hard tab characters (\t): " Subbands: 4 8"
16: B3 Line contains hard tab characters (\t): " Blocks: 4 8 12 16"
17: B3 Line contains hard tab characters (\t): " Bitpool Range: 2-53"
18: B3 Line contains hard tab characters (\t): " ..."
22: B3 Line contains hard tab characters (\t): " UUID: 0000110a-0000-1000-8000-00805f9b34fb"
23: B3 Line contains hard tab characters (\t): " Codec: 0x00 (0)"
24: B3 Line contains hard tab characters (\t): " Media Codec: SBC"
25: B3 Line contains hard tab characters (\t): " Channel Modes: JointStereo"
26: B3 Line contains hard tab characters (\t): " Frequencies: 48Khz"
27: B3 Line contains hard tab characters (\t): " Subbands: 8"
28: B3 Line contains hard tab characters (\t): " Blocks: 16"
29: B3 Line contains hard tab characters (\t): " Bitpool Range: 2-53"
---
Regards,
Linux Bluetooth
Hello:
This series was applied to bluetooth/bluez.git (master)
by Luiz Augusto von Dentz <[email protected]>:
On Wed, 17 Jan 2024 17:23:16 -0500 you wrote:
> From: Luiz Augusto von Dentz <[email protected]>
>
> This adds support for printing Capabilities and Configuration of A2DP
> endpoints and transports:
>
> bluetoothctl> endpoint.show /org/bluez/hci0/dev_94_DB_56_F7_F2_88/sep1
> Endpoint /org/bluez/hci0/dev_94_DB_56_F7_F2_88/sep1
> UUID: 0000110b-0000-1000-8000-00805f9b34fb
> Codec: 0x00 (0)
> Media Codec: SBC
> Channel Modes: Mono DualChannel Stereo JointStereo
> Frequencies: 44.1Khz 48Khz
> Subbands: 4 8
> Blocks: 4 8 12 16
> Bitpool Range: 2-53
> ...
>
> [...]
Here is the summary with links:
- [BlueZ,v1,1/2] client/player: Add support for printing A2DP codec details
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=62cf4a2ab52e
- [BlueZ,v1,2/2] transport: Print owner information when it exit or release
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=e108c744fa8d
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html