pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'change/bt_bluedroid_avrcp_version_v5.5' into 'release/v5.5'

Browse Source 
change(bt/bluedroid): Change AVRCP version according to feature enabled (v5.5)

See merge request espressif/esp-idf!44200
This commit is contained in:
Wang Meng Yang
2025-12-26 10:32:43 +08:00
parent 1e9f63183b d569b7df6b
commit 8c47552a4c
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/host/bluedroid/Kconfig.in
+3 -1
View File
@@ -114,7 +114,9 @@ menu "AVRCP Features"
default y
select BT_GOEPC_ENABLED
help
This enable Cover Art feature of AVRCP CT role
This enable Cover Art feature for AVRCP CT role, Cover Art requires AVRCP
version 1.6 or higher. Therefore, if the Cover Art feature is enabled,
AVRCP version will set to 1.6, otherwise, it will remain at 1.5
endmenu
components/bt/host/bluedroid/stack/avrc/avrc_sdp.c
+15 -5
View File
@@ -29,8 +29,14 @@
#if (defined(AVRC_INCLUDED) && AVRC_INCLUDED == TRUE)
#ifndef SDP_AVRCP_1_6
#if AVRC_CA_INCLUDED == TRUE
/* If Cover Art feature is enabled, set AVRCP version to 1.6 */
#define SDP_AVRCP_1_6 TRUE
#define SDP_AVRCP_1_5 FALSE
#else
/* Otherwise, set to 1.5 */
#define SDP_AVRCP_1_6 FALSE
#define SDP_AVRCP_1_5 TRUE
#endif
#ifndef SDP_AVCTP_1_4
@@ -52,7 +58,7 @@ const tSDP_PROTOCOL_ELEM avrc_proto_list [] = {
#if SDP_AVCTP_1_4 == TRUE
{UUID_PROTOCOL_AVCTP, 1, {AVCT_REV_1_4, 0} }
#else
#if SDP_AVRCP_1_6 == TRUE
#if (SDP_AVRCP_1_5 == TRUE || SDP_AVRCP_1_6 == TRUE)
{UUID_PROTOCOL_AVCTP, 1, {AVCT_REV_1_3, 0} }
#else
#if AVRC_METADATA_INCLUDED == TRUE
@@ -64,7 +70,7 @@ const tSDP_PROTOCOL_ELEM avrc_proto_list [] = {
#endif
};
#if SDP_AVRCP_1_6 == TRUE
#if (SDP_AVRCP_1_5 == TRUE || SDP_AVRCP_1_6 == TRUE)
const tSDP_PROTO_LIST_ELEM avrc_add_proto_list [] = {
{
AVRC_NUM_PROTO_ELEMS,
@@ -251,7 +257,7 @@ UINT16 AVRC_AddRecord(UINT16 service_uuid, char *p_service_name, char *p_provide
/* add service class id list */
class_list[0] = service_uuid;
#if (SDP_AVCTP_1_4 == TRUE || SDP_AVRCP_1_6 == TRUE)
#if (SDP_AVCTP_1_4 == TRUE || SDP_AVRCP_1_5 == TRUE || SDP_AVRCP_1_6 == TRUE)
if ( service_uuid == UUID_SERVCLASS_AV_REMOTE_CONTROL ) {
class_list[1] = UUID_SERVCLASS_AV_REM_CTRL_CONTROL;
count = 2;
@@ -263,7 +269,7 @@ UINT16 AVRC_AddRecord(UINT16 service_uuid, char *p_service_name, char *p_provide
result &= SDP_AddProtocolList(sdp_handle, AVRC_NUM_PROTO_ELEMS, (tSDP_PROTOCOL_ELEM *)avrc_proto_list);
/* add profile descriptor list */
#if SDP_AVRCP_1_6 == TRUE
#if (SDP_AVRCP_1_5 == TRUE || SDP_AVRCP_1_6 == TRUE)
if (browsing_en) {
add_additional_protocol_list = TRUE;
} else if (service_uuid == UUID_SERVCLASS_AV_REM_CTRL_TARGET &&
@@ -277,7 +283,11 @@ UINT16 AVRC_AddRecord(UINT16 service_uuid, char *p_service_name, char *p_provide
result &= SDP_AddAdditionProtoLists( sdp_handle, 1, (tSDP_PROTO_LIST_ELEM *)avrc_add_proto_list);
}
#if SDP_AVRCP_1_5 == TRUE
result &= SDP_AddProfileDescriptorList(sdp_handle, UUID_SERVCLASS_AV_REMOTE_CONTROL, AVRC_REV_1_5);
#elif SDP_AVRCP_1_6 == TRUE
result &= SDP_AddProfileDescriptorList(sdp_handle, UUID_SERVCLASS_AV_REMOTE_CONTROL, AVRC_REV_1_6);
#endif
#else
#if AVRC_METADATA_INCLUDED == TRUE
result &= SDP_AddProfileDescriptorList(sdp_handle, UUID_SERVCLASS_AV_REMOTE_CONTROL, AVRC_REV_1_3);