Merge branch 'feat/add_avrcp_init_state_event_v5.4' into 'release/v5.4'

feat(bt/bluedroid): Add events to indicate the initialization states of AVRCP(v5.4)

See merge request espressif/esp-idf!39535
This commit is contained in:
Wang Meng Yang
2025-06-30 11:57:50 +08:00
4 changed files with 178 additions and 88 deletions
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
@@ -518,6 +518,17 @@ static void bt_av_hdl_avrc_ct_evt(uint16_t event, void *p_param)
#endif
break;
}
/* when avrcp controller init or deinit completed, this event comes */
case ESP_AVRC_CT_PROF_STATE_EVT: {
if (ESP_AVRC_INIT_SUCCESS == rc->avrc_ct_init_stat.state) {
ESP_LOGI(BT_RC_CT_TAG, "AVRCP CT STATE: Init Complete");
} else if (ESP_AVRC_DEINIT_SUCCESS == rc->avrc_ct_init_stat.state) {
ESP_LOGI(BT_RC_CT_TAG, "AVRCP CT STATE: Deinit Complete");
} else {
ESP_LOGE(BT_RC_CT_TAG, "AVRCP CT STATE error: %d", rc->avrc_ct_init_stat.state);
}
break;
}
/* others */
default:
ESP_LOGE(BT_RC_CT_TAG, "%s unhandled event: %d", __func__, event);
@@ -573,6 +584,17 @@ static void bt_av_hdl_avrc_tg_evt(uint16_t event, void *p_param)
ESP_LOGI(BT_RC_TG_TAG, "AVRC remote features: %"PRIx32", CT features: %x", rc->rmt_feats.feat_mask, rc->rmt_feats.ct_feat_flag);
break;
}
/* when avrcp target init or deinit completed, this event comes */
case ESP_AVRC_TG_PROF_STATE_EVT: {
if (ESP_AVRC_INIT_SUCCESS == rc->avrc_tg_init_stat.state) {
ESP_LOGI(BT_RC_CT_TAG, "AVRCP TG STATE: Init Complete");
} else if (ESP_AVRC_DEINIT_SUCCESS == rc->avrc_tg_init_stat.state) {
ESP_LOGI(BT_RC_CT_TAG, "AVRCP TG STATE: Deinit Complete");
} else {
ESP_LOGE(BT_RC_CT_TAG, "AVRCP TG STATE error: %d", rc->avrc_tg_init_stat.state);
}
break;
}
/* others */
default:
ESP_LOGE(BT_RC_TG_TAG, "%s unhandled event: %d", __func__, event);
@@ -633,7 +655,8 @@ void bt_app_rc_ct_cb(esp_avrc_ct_cb_event_t event, esp_avrc_ct_cb_param_t *param
case ESP_AVRC_CT_REMOTE_FEATURES_EVT:
case ESP_AVRC_CT_GET_RN_CAPABILITIES_RSP_EVT:
case ESP_AVRC_CT_COVER_ART_STATE_EVT:
case ESP_AVRC_CT_COVER_ART_DATA_EVT: {
case ESP_AVRC_CT_COVER_ART_DATA_EVT:
case ESP_AVRC_CT_PROF_STATE_EVT: {
bt_app_work_dispatch(bt_av_hdl_avrc_ct_evt, event, param, sizeof(esp_avrc_ct_cb_param_t), NULL);
break;
}
@@ -652,6 +675,7 @@ void bt_app_rc_tg_cb(esp_avrc_tg_cb_event_t event, esp_avrc_tg_cb_param_t *param
case ESP_AVRC_TG_SET_ABSOLUTE_VOLUME_CMD_EVT:
case ESP_AVRC_TG_REGISTER_NOTIFICATION_EVT:
case ESP_AVRC_TG_SET_PLAYER_APP_VALUE_EVT:
case ESP_AVRC_TG_PROF_STATE_EVT:
bt_app_work_dispatch(bt_av_hdl_avrc_tg_evt, event, param, sizeof(esp_avrc_tg_cb_param_t), NULL);
break;
default:
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
@@ -153,17 +153,17 @@ static void bt_av_hdl_stack_evt(uint16_t event, void *p_param)
esp_bt_dev_register_callback(bt_app_dev_cb);
esp_bt_gap_register_callback(bt_app_gap_cb);
assert(esp_avrc_ct_init() == ESP_OK);
esp_avrc_ct_register_callback(bt_app_rc_ct_cb);
assert(esp_avrc_tg_init() == ESP_OK);
assert(esp_avrc_ct_init() == ESP_OK);
esp_avrc_tg_register_callback(bt_app_rc_tg_cb);
assert(esp_avrc_tg_init() == ESP_OK);
esp_avrc_rn_evt_cap_mask_t evt_set = {0};
esp_avrc_rn_evt_bit_mask_operation(ESP_AVRC_BIT_MASK_OP_SET, &evt_set, ESP_AVRC_RN_VOLUME_CHANGE);
assert(esp_avrc_tg_set_rn_evt_cap(&evt_set) == ESP_OK);
assert(esp_a2d_sink_init() == ESP_OK);
esp_a2d_register_callback(&bt_app_a2d_cb);
assert(esp_a2d_sink_init() == ESP_OK);
esp_a2d_sink_register_data_callback(bt_app_a2d_data_cb);
/* Get the default value of the delay value */