bluetooth: a2dp: implement the get_all_capabilities

MarkWangChinese · kartben · commit 354454635695 · 2025-08-25T13:31:55.000+02:00
From avdtp spec, the get_all_capablities should be used if the avdtp
version is v1.3, otherwise the get_capabilities should be used.

Signed-off-by: Mark Wang &lt;yichang.wang@nxp.com&gt;
diff --git a/include/zephyr/bluetooth/classic/a2dp.h b/include/zephyr/bluetooth/classic/a2dp.h
@@ -391,6 +391,15 @@ struct bt_a2dp_discover_param {
 	 *  it save endpoint info internally.
 	 */
 	struct bt_avdtp_sep_info *seps_info;
+	/** The AVDTP version of the peer's A2DP sdp service.
+	 *  Stack uses it to determine using get_all_cap or get_cap cmd. When both
+	 *  versions are v1.3 or bigger version, get_all_cap is used, otherwise
+	 *  get_cap is used.
+	 *  It is the same value of the avdtp sepcificaiton's version value.
+	 *  For example: 0x0103 means version 1.3
+	 *  If the value is 0 (unknown), stack process it as less than v1.3
+	 */
+	uint16_t avdtp_version;
 	/** The max count of seps (stream endpoint) that can be got in this call route */
 	uint8_t sep_count;
 };
diff --git a/include/zephyr/bluetooth/classic/avdtp.h b/include/zephyr/bluetooth/classic/avdtp.h
@@ -15,6 +15,10 @@
 extern "C" {
 #endif
 
+#define AVDTP_VERSION_1_3 0x0103 /**< AVDTP version 1.3 value */
+
+#define AVDTP_VERSION AVDTP_VERSION_1_3 /**< AVDTP version used by Zephyr */
+
 /**
  * @brief AVDTP error code
  */
diff --git a/subsys/bluetooth/host/classic/a2dp.c b/subsys/bluetooth/host/classic/a2dp.c
@@ -125,8 +125,13 @@ static int a2dp_discovery_ind(struct bt_avdtp *session, uint8_t *errcode)
 }
 
 static int a2dp_get_capabilities_ind(struct bt_avdtp *session, struct bt_avdtp_sep *sep,
-				     struct net_buf *rsp_buf, uint8_t *errcode)
+				     struct net_buf *rsp_buf, bool get_all_caps, uint8_t *errcode)
 {
+	/* The Reporting, Recovery, Content Protection, Header Compression, Multiplexing and
+	 * Delay Reporting services are not supported, so the same response is replied as
+	 * get_capabilities.
+	 */
+	ARG_UNUSED(get_all_caps);
 	struct bt_a2dp_ep *ep;
 
 	__ASSERT(sep, "Invalid sep");
@@ -613,6 +618,17 @@ static int bt_a2dp_get_sep_caps(struct bt_a2dp *a2dp)
 			a2dp->get_capabilities_param.req.func = bt_a2dp_get_capabilities_cb;
 			a2dp->get_capabilities_param.stream_endpoint_id =
 				a2dp->discover_cb_param->seps_info[a2dp->get_cap_index].id;
+
+			/* The legacy Get Capabilities procedure is deprecated in cases
+			 * where backwards compatibility with AVDTP 1.2 and earlier is irrelevant.
+			 */
+			if (AVDTP_VERSION >= AVDTP_VERSION_1_3 &&
+			    a2dp->discover_cb_param->avdtp_version >= AVDTP_VERSION_1_3) {
+				a2dp->get_capabilities_param.get_all_caps = true;
+			} else {
+				a2dp->get_capabilities_param.get_all_caps = false;
+			}
+
 			err = bt_avdtp_get_capabilities(&a2dp->session,
 							&a2dp->get_capabilities_param);
 
@@ -699,7 +715,6 @@ int bt_a2dp_discover(struct bt_a2dp *a2dp, struct bt_a2dp_discover_param *param)
 		return -EBUSY;
 	}
 
-	memset(&a2dp->discover_cb_param, 0U, sizeof(a2dp->discover_cb_param));
 	a2dp->discover_cb_param = param;
 	a2dp->discover_param.req.func = bt_a2dp_discover_cb;
 
diff --git a/subsys/bluetooth/host/classic/avdtp.c b/subsys/bluetooth/host/classic/avdtp.c
@@ -356,7 +356,8 @@ static struct bt_avdtp_sep *avdtp_get_cmd_sep(struct net_buf *buf, uint8_t *erro
 	return sep;
 }
 
-static void avdtp_get_capabilities_cmd(struct bt_avdtp *session, struct net_buf *buf, uint8_t tid)
+static void avdtp_get_caps_cmd_internal(struct bt_avdtp *session, struct net_buf *buf, uint8_t tid,
+					bool get_all_caps)
 {
 	int err = 0;
 	struct net_buf *rsp_buf;
@@ -369,19 +370,22 @@ static void avdtp_get_capabilities_cmd(struct bt_avdtp *session, struct net_buf
 		err = -ENOTSUP;
 	} else {
 		rsp_buf = avdtp_create_reply_pdu(BT_AVDTP_ACCEPT, BT_AVDTP_PACKET_TYPE_SINGLE,
+						 get_all_caps ? BT_AVDTP_GET_ALL_CAPABILITIES :
 						 BT_AVDTP_GET_CAPABILITIES, tid);
 		if (!rsp_buf) {
 			return;
 		}
 
-		err = session->ops->get_capabilities_ind(session, sep, rsp_buf, &error_code);
+		err = session->ops->get_capabilities_ind(session, sep, rsp_buf, get_all_caps,
+							 &error_code);
 		if (err) {
 			net_buf_unref(rsp_buf);
 		}
 	}
 
 	if (err) {
 		rsp_buf = avdtp_create_reply_pdu(BT_AVDTP_REJECT, BT_AVDTP_PACKET_TYPE_SINGLE,
+						 get_all_caps ? BT_AVDTP_GET_ALL_CAPABILITIES :
 						 BT_AVDTP_GET_CAPABILITIES, tid);
 		if (!rsp_buf) {
 			return;
@@ -403,6 +407,17 @@ static void avdtp_get_capabilities_cmd(struct bt_avdtp *session, struct net_buf
 	}
 }
 
+static void avdtp_get_capabilities_cmd(struct bt_avdtp *session, struct net_buf *buf, uint8_t tid)
+{
+	avdtp_get_caps_cmd_internal(session, buf, tid, false);
+}
+
+static void avdtp_get_all_capabilities_cmd(struct bt_avdtp *session,
+					   struct net_buf *buf, uint8_t tid)
+{
+	avdtp_get_caps_cmd_internal(session, buf, tid, true);
+}
+
 static void avdtp_get_capabilities_rsp(struct bt_avdtp *session, struct net_buf *buf,
 				       uint8_t msg_type)
 {
@@ -1103,19 +1118,19 @@ void bt_avdtp_l2cap_disconnected(struct bt_l2cap_chan *chan)
 }
 
 void (*cmd_handler[])(struct bt_avdtp *session, struct net_buf *buf, uint8_t tid) = {
-	avdtp_discover_cmd,          /* BT_AVDTP_DISCOVER */
-	avdtp_get_capabilities_cmd,  /* BT_AVDTP_GET_CAPABILITIES */
-	avdtp_set_configuration_cmd, /* BT_AVDTP_SET_CONFIGURATION */
-	NULL,                        /* BT_AVDTP_GET_CONFIGURATION */
-	avdtp_re_configure_cmd,      /* BT_AVDTP_RECONFIGURE */
-	avdtp_open_cmd,              /* BT_AVDTP_OPEN */
-	avdtp_start_cmd,             /* BT_AVDTP_START */
-	avdtp_close_cmd,             /* BT_AVDTP_CLOSE */
-	avdtp_suspend_cmd,           /* BT_AVDTP_SUSPEND */
-	avdtp_abort_cmd,             /* BT_AVDTP_ABORT */
-	NULL,                        /* BT_AVDTP_SECURITY_CONTROL */
-	NULL,                        /* BT_AVDTP_GET_ALL_CAPABILITIES */
-	NULL,                        /* BT_AVDTP_DELAYREPORT */
+	avdtp_discover_cmd,              /* BT_AVDTP_DISCOVER */
+	avdtp_get_capabilities_cmd,      /* BT_AVDTP_GET_CAPABILITIES */
+	avdtp_set_configuration_cmd,     /* BT_AVDTP_SET_CONFIGURATION */
+	NULL,                            /* BT_AVDTP_GET_CONFIGURATION */
+	avdtp_re_configure_cmd,          /* BT_AVDTP_RECONFIGURE */
+	avdtp_open_cmd,                  /* BT_AVDTP_OPEN */
+	avdtp_start_cmd,                 /* BT_AVDTP_START */
+	avdtp_close_cmd,                 /* BT_AVDTP_CLOSE */
+	avdtp_suspend_cmd,               /* BT_AVDTP_SUSPEND */
+	avdtp_abort_cmd,                 /* BT_AVDTP_ABORT */
+	NULL,                            /* BT_AVDTP_SECURITY_CONTROL */
+	avdtp_get_all_capabilities_cmd,  /* BT_AVDTP_GET_ALL_CAPABILITIES */
+	NULL,                            /* BT_AVDTP_DELAYREPORT */
 };
 
 void (*rsp_handler[])(struct bt_avdtp *session, struct net_buf *buf, uint8_t msg_type) = {
@@ -1130,7 +1145,7 @@ void (*rsp_handler[])(struct bt_avdtp *session, struct net_buf *buf, uint8_t msg
 	avdtp_suspend_rsp,           /* BT_AVDTP_SUSPEND */
 	avdtp_abort_rsp,             /* BT_AVDTP_ABORT */
 	NULL,                        /* BT_AVDTP_SECURITY_CONTROL */
-	NULL,                        /* BT_AVDTP_GET_ALL_CAPABILITIES */
+	avdtp_get_capabilities_rsp,  /* BT_AVDTP_GET_ALL_CAPABILITIES */
 	NULL,                        /* BT_AVDTP_DELAYREPORT */
 };
 
@@ -1436,6 +1451,7 @@ int bt_avdtp_get_capabilities(struct bt_avdtp *session,
 	}
 
 	buf = avdtp_create_pdu(BT_AVDTP_CMD, BT_AVDTP_PACKET_TYPE_SINGLE,
+			       param->get_all_caps ? BT_AVDTP_GET_ALL_CAPABILITIES :
 			       BT_AVDTP_GET_CAPABILITIES);
 	if (!buf) {
 		LOG_ERR("Error: No Buff available");
diff --git a/subsys/bluetooth/host/classic/avdtp_internal.h b/subsys/bluetooth/host/classic/avdtp_internal.h
@@ -153,6 +153,7 @@ struct bt_avdtp_discover_params {
 struct bt_avdtp_get_capabilities_params {
 	struct bt_avdtp_req req;
 	uint8_t stream_endpoint_id;
+	bool get_all_caps;
 };
 
 struct bt_avdtp_set_configuration_params {
@@ -183,7 +184,7 @@ struct bt_avdtp_ops_cb {
 	int (*discovery_ind)(struct bt_avdtp *session, uint8_t *errcode);
 
 	int (*get_capabilities_ind)(struct bt_avdtp *session, struct bt_avdtp_sep *sep,
-				    struct net_buf *rsp_buf, uint8_t *errcode);
+				    struct net_buf *rsp_buf, bool get_all_caps, uint8_t *errcode);
 
 	int (*set_configuration_ind)(struct bt_avdtp *session, struct bt_avdtp_sep *sep,
 				     uint8_t int_seid, struct net_buf *buf, uint8_t *errcode);
diff --git a/subsys/bluetooth/host/classic/shell/a2dp.c b/subsys/bluetooth/host/classic/shell/a2dp.c
@@ -99,7 +99,7 @@ static struct bt_sdp_attribute a2dp_sink_attrs[] = {
 			},
 			{
 				BT_SDP_TYPE_SIZE(BT_SDP_UINT16), /* 09 */
-				BT_SDP_ARRAY_16(0x0100U) /* AVDTP version: 01 00 */
+				BT_SDP_ARRAY_16(AVDTP_VERSION) /* AVDTP version: 01 03 */
 			},
 			)
 		},
@@ -168,7 +168,7 @@ static struct bt_sdp_attribute a2dp_source_attrs[] = {
 			},
 			{
 				BT_SDP_TYPE_SIZE(BT_SDP_UINT16),
-				BT_SDP_ARRAY_16(0x0100U)
+				BT_SDP_ARRAY_16(AVDTP_VERSION)
 			},
 			)
 		},
@@ -193,7 +193,7 @@ static struct bt_sdp_attribute a2dp_source_attrs[] = {
 		},
 		)
 	),
-	BT_SDP_SERVICE_NAME("A2DPSink"),
+	BT_SDP_SERVICE_NAME("A2DPSource"),
 	BT_SDP_SUPPORTED_FEATURES(0x0001U),
 };
 
@@ -677,13 +677,22 @@ struct bt_a2dp_discover_param discover_param = {
 
 static int cmd_get_peer_eps(const struct shell *sh, int32_t argc, char *argv[])
 {
+	int err = 0;
+
 	if (a2dp_initied == 0) {
 		shell_print(sh, "need to register a2dp connection callbacks");
 		return -ENOEXEC;
 	}
 
 	if (default_a2dp != NULL) {
-		int err = bt_a2dp_discover(default_a2dp, &discover_param);
+		discover_param.avdtp_version = (uint16_t)shell_strtoul(argv[1], 0, &err);
+		if (err != 0) {
+			shell_error(sh, "failed to parse avdtp version: %d", err);
+
+			return -ENOEXEC;
+		}
+
+		err = bt_a2dp_discover(default_a2dp, &discover_param);
 
 		if (err) {
 			shell_error(sh, "discover fail");
@@ -798,7 +807,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(a2dp_cmds,
 			cmd_register_ep, 3, 0),
 	SHELL_CMD_ARG(connect, NULL, HELP_NONE, cmd_connect, 1, 0),
 	SHELL_CMD_ARG(disconnect, NULL, HELP_NONE, cmd_disconnect, 1, 0),
-	SHELL_CMD_ARG(discover_peer_eps, NULL, HELP_NONE, cmd_get_peer_eps, 1, 0),
+	SHELL_CMD_ARG(discover_peer_eps, NULL, "<avdtp version value>", cmd_get_peer_eps, 2, 0),
 	SHELL_CMD_ARG(configure, NULL, "\"configure/enable the stream\"", cmd_configure, 1, 0),
 	SHELL_CMD_ARG(establish, NULL, "\"establish the stream\"", cmd_establish, 1, 0),
 	SHELL_CMD_ARG(reconfigure, NULL, "\"reconfigure the stream\"", cmd_reconfigure, 1, 0),
diff --git a/subsys/bluetooth/host/classic/shell/bredr.c b/subsys/bluetooth/host/classic/shell/bredr.c
