In a2dp offload use case, controller needs to be sent MSFT avdtp command after opening media transport channel --- lib/bluetooth.h | 7 +++++++ profiles/audio/avdtp.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/lib/bluetooth.h b/lib/bluetooth.h index 0fcf412c6c6b..b4bbe1373403 100644 --- a/lib/bluetooth.h +++ b/lib/bluetooth.h @@ -158,6 +158,13 @@ struct bt_codecs { struct bt_codec codecs[]; } __attribute__((packed)); +#define BT_MSFT 20 +struct bt_msft { + uint8_t sub_opcode; + uint8_t len; + uint8_t data[]; +} __attribute__((packed)); + /* Connection and socket states */ enum { BT_CONNECTED = 1, /* Equal to TCP_ESTABLISHED to make net code happy */ diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c index 58d419fb3148..6a56bd4507c4 100644 --- a/profiles/audio/avdtp.c +++ b/profiles/audio/avdtp.c @@ -2352,6 +2352,47 @@ static uint16_t get_version(struct avdtp *session) return ver; } +static gboolean msft_avdtp_open(struct avdtp_stream *stream) +{ + int sock; + struct avdtp_service_capability *caps = NULL; + struct bt_msft *cmd; + GSList *l; + + if (!stream->io) + return FALSE; + + sock = g_io_channel_unix_get_fd(stream->io); + + for (l = stream->caps; l ; l = g_slist_next(l)) { + caps = l->data; + + if (caps->category != AVDTP_MEDIA_CODEC) { + caps = NULL; + continue; + } + break; + } + + if (!caps) + return FALSE; + + cmd = g_malloc0(sizeof(*cmd) + sizeof(*caps) + caps->length); + cmd->sub_opcode = 0x08; + cmd->len = sizeof(*caps) + caps->length; + memcpy(cmd->data, caps, cmd->len); + + if (setsockopt(sock, SOL_BLUETOOTH, BT_MSFT, cmd, + sizeof(*cmd) + cmd->len)) { + g_free(cmd); + return FALSE; + } + + g_free(cmd); + + return TRUE; +} + static void avdtp_connect_cb(GIOChannel *chan, GError *err, gpointer user_data) { struct avdtp *session = user_data; @@ -2385,6 +2426,11 @@ static void avdtp_connect_cb(GIOChannel *chan, GError *err, gpointer user_data) session->pending_open ? "transport" : "signaling", address); + if (session->pending_open && session->use_offload) { + if (!msft_avdtp_open(session->pending_open)) + goto failed; + } + if (session->state == AVDTP_SESSION_STATE_CONNECTING) { DBG("AVDTP imtu=%u, omtu=%u", session->imtu, session->omtu); -- 2.17.1