Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-01 18:50:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(bt): Fix compatibility with A2DP API legacy usage methods

Browse Source 
- Modify the timing of API calls in the A2DP example
- Closes https://github.com/espressif/esp-idf/issues/18786
This commit is contained in:
yangfeng
2026-08-13 08:55:01 +08:00
committed by BOT
parent 80e79f901e
commit 88f7f55ff1
8 changed files with 158 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/bluetooth/bluedroid/classic_bt/a2dp_sink_stream/main/main.c
+27 -3
View File
@@ -59,10 +59,36 @@ static void bt_app_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *pa
bredr_app_gap_evt_def_hdl(event, param);
}
static void bt_app_a2d_evt_hdl(uint16_t event, void *param)
{
esp_a2d_cb_param_t *a2d = (esp_a2d_cb_param_t *)(param);
switch (event) {
/* when a2dp init or deinit completed, this event comes */
case ESP_A2D_PROF_STATE_EVT: {
if (ESP_A2D_INIT_SUCCESS == a2d->a2d_prof_stat.init_state) {
ESP_LOGI(BT_AV_TAG, "A2DP PROF STATE: Init Complete");
/* Get the default value of the delay value */
esp_a2d_sink_get_delay_value();
} else {
ESP_LOGI(BT_AV_TAG, "A2DP PROF STATE: Deinit Complete");
}
break;
}
/* others */
default:
ESP_LOGE(BT_AV_TAG, "%s unhandled event: %d", __func__, event);
break;
}
}
static void bt_app_a2d_cb(esp_a2d_cb_event_t event, esp_a2d_cb_param_t *param)
{
switch (event) {
case ESP_A2D_PROF_STATE_EVT:
case ESP_A2D_PROF_STATE_EVT: {
bt_app_work_dispatch(bt_app_a2d_evt_hdl, event, param, sizeof(esp_a2d_cb_param_t), NULL, NULL);
break;
}
case ESP_A2D_SNK_PSC_CFG_EVT:
case ESP_A2D_SNK_SET_DELAY_VALUE_EVT:
case ESP_A2D_SNK_GET_DELAY_VALUE_EVT: {
@@ -102,8 +128,6 @@ static void bt_av_hdl_stack_evt(uint16_t event, void *p_param)
esp_a2d_sink_register_data_callback(bt_app_a2d_data_cb);
/* Get the default value of the delay value */
esp_a2d_sink_get_delay_value();
/* Get local device name */
esp_bt_gap_get_device_name();
examples/bluetooth/bluedroid/classic_bt/avrcp_absolute_volume/main/main.c
+28 -3
View File
@@ -43,6 +43,7 @@ static void bt_app_dev_cb(esp_bt_dev_cb_event_t event, esp_bt_dev_cb_param_t *pa
static void bt_app_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *param);
/* callback function for A2DP sink */
static void bt_app_a2d_evt_hdl(uint16_t event, void *param);
static void bt_app_a2d_cb(esp_a2d_cb_event_t event, esp_a2d_cb_param_t *param);
#if CONFIG_EXAMPLE_A2DP_SINK_STREAM_ENABLE
@@ -73,10 +74,36 @@ static void bt_app_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *pa
bredr_app_gap_evt_def_hdl(event, param);
}
static void bt_app_a2d_evt_hdl(uint16_t event, void *param)
{
esp_a2d_cb_param_t *a2d = (esp_a2d_cb_param_t *)(param);
switch (event) {
/* when a2dp init or deinit completed, this event comes */
case ESP_A2D_PROF_STATE_EVT: {
if (ESP_A2D_INIT_SUCCESS == a2d->a2d_prof_stat.init_state) {
ESP_LOGI(BT_AV_TAG, "A2DP PROF STATE: Init Complete");
/* Get the default value of the delay value */
esp_a2d_sink_get_delay_value();
} else {
ESP_LOGI(BT_AV_TAG, "A2DP PROF STATE: Deinit Complete");
}
break;
}
/* others */
default:
ESP_LOGE(BT_AV_TAG, "%s unhandled event: %d", __func__, event);
break;
}
}
static void bt_app_a2d_cb(esp_a2d_cb_event_t event, esp_a2d_cb_param_t *param)
{
switch (event) {
case ESP_A2D_PROF_STATE_EVT:
case ESP_A2D_PROF_STATE_EVT: {
bt_app_work_dispatch(bt_app_a2d_evt_hdl, event, param, sizeof(esp_a2d_cb_param_t), NULL, NULL);
break;
}
case ESP_A2D_SNK_PSC_CFG_EVT:
case ESP_A2D_SNK_SET_DELAY_VALUE_EVT:
case ESP_A2D_SNK_GET_DELAY_VALUE_EVT: {
@@ -173,8 +200,6 @@ static void bt_av_hdl_stack_evt(uint16_t event, void *p_param)
esp_a2d_sink_register_data_callback(bt_app_a2d_data_cb);
#endif
/* Get the default value of the delay value */
esp_a2d_sink_get_delay_value();
/* Get local device name */
esp_bt_gap_get_device_name();
examples/bluetooth/bluedroid/classic_bt/avrcp_ct_cover_art/main/bt_app_av.c
+28 -1
View File
@@ -13,6 +13,7 @@
#include "esp_log.h"
#include "esp_bt_device.h"
#include "esp_gap_bt_api.h"
#include "esp_a2dp_api.h"
#include "esp_avrc_api.h"
#include "freertos/FreeRTOS.h"
@@ -104,10 +105,36 @@ static void bt_app_avrc_ct_evt_hdl(uint16_t event, void *param)
* EXTERNAL FUNCTION DEFINITIONS
*******************************/
static void bt_app_a2d_evt_hdl(uint16_t event, void *param)
{
esp_a2d_cb_param_t *a2d = (esp_a2d_cb_param_t *)(param);
switch (event) {
/* when a2dp init or deinit completed, this event comes */
case ESP_A2D_PROF_STATE_EVT: {
if (ESP_A2D_INIT_SUCCESS == a2d->a2d_prof_stat.init_state) {
ESP_LOGI(BT_AV_TAG, "A2DP PROF STATE: Init Complete");
/* Get the default value of the delay value */
esp_a2d_sink_get_delay_value();
} else {
ESP_LOGI(BT_AV_TAG, "A2DP PROF STATE: Deinit Complete");
}
break;
}
/* others */
default:
ESP_LOGE(BT_AV_TAG, "%s unhandled event: %d", __func__, event);
break;
}
}
void bt_app_a2d_cb(esp_a2d_cb_event_t event, esp_a2d_cb_param_t *param)
{
switch (event) {
case ESP_A2D_PROF_STATE_EVT:
case ESP_A2D_PROF_STATE_EVT: {
bt_app_work_dispatch(bt_app_a2d_evt_hdl, event, param, sizeof(esp_a2d_cb_param_t), NULL, NULL);
break;
}
case ESP_A2D_SNK_PSC_CFG_EVT:
case ESP_A2D_SNK_SET_DELAY_VALUE_EVT:
case ESP_A2D_SNK_GET_DELAY_VALUE_EVT: {
examples/bluetooth/bluedroid/classic_bt/avrcp_ct_cover_art/main/main.c
+1 -3
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2025-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
@@ -79,8 +79,6 @@ static void bt_av_hdl_stack_evt(uint16_t event, void *p_param)
esp_a2d_sink_register_data_callback(bt_app_a2d_data_cb);
#endif
/* Get the default value of the delay value */
esp_a2d_sink_get_delay_value();
/* Get local device name */
esp_bt_gap_get_device_name();
examples/bluetooth/bluedroid/classic_bt/avrcp_ct_metadata/main/main.c
+28 -3
View File
@@ -43,6 +43,7 @@ static void bt_app_dev_cb(esp_bt_dev_cb_event_t event, esp_bt_dev_cb_param_t *pa
static void bt_app_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *param);
/* callback function for A2DP sink */
static void bt_app_a2d_evt_hdl(uint16_t event, void *param);
static void bt_app_a2d_cb(esp_a2d_cb_event_t event, esp_a2d_cb_param_t *param);
#if CONFIG_EXAMPLE_A2DP_SINK_STREAM_ENABLE
@@ -76,10 +77,36 @@ static void bt_app_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *pa
bredr_app_gap_evt_def_hdl(event, param);
}
static void bt_app_a2d_evt_hdl(uint16_t event, void *param)
{
esp_a2d_cb_param_t *a2d = (esp_a2d_cb_param_t *)(param);
switch (event) {
/* when a2dp init or deinit completed, this event comes */
case ESP_A2D_PROF_STATE_EVT: {
if (ESP_A2D_INIT_SUCCESS == a2d->a2d_prof_stat.init_state) {
ESP_LOGI(BT_AV_TAG, "A2DP PROF STATE: Init Complete");
/* Get the default value of the delay value */
esp_a2d_sink_get_delay_value();
} else {
ESP_LOGI(BT_AV_TAG, "A2DP PROF STATE: Deinit Complete");
}
break;
}
/* others */
default:
ESP_LOGE(BT_AV_TAG, "%s unhandled event: %d", __func__, event);
break;
}
}
static void bt_app_a2d_cb(esp_a2d_cb_event_t event, esp_a2d_cb_param_t *param)
{
switch (event) {
case ESP_A2D_PROF_STATE_EVT:
case ESP_A2D_PROF_STATE_EVT: {
bt_app_work_dispatch(bt_app_a2d_evt_hdl, event, param, sizeof(esp_a2d_cb_param_t), NULL, NULL);
break;
}
case ESP_A2D_SNK_PSC_CFG_EVT:
case ESP_A2D_SNK_SET_DELAY_VALUE_EVT:
case ESP_A2D_SNK_GET_DELAY_VALUE_EVT: {
@@ -227,8 +254,6 @@ static void bt_av_hdl_stack_evt(uint16_t event, void *p_param)
esp_a2d_sink_register_data_callback(bt_app_a2d_data_cb);
#endif
/* Get the default value of the delay value */
esp_a2d_sink_get_delay_value();
/* Get local device name */
esp_bt_gap_get_device_name();
examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/main/bt_app_av.c
+28 -1
View File
@@ -82,6 +82,30 @@ static void bt_app_avrc_ct_evt_hdl(uint16_t event, void *param)
}
}
/* handler for A2DP callback events */
static void bt_app_a2d_evt_hdl(uint16_t event, void *param)
{
esp_a2d_cb_param_t *a2d = (esp_a2d_cb_param_t *)(param);
switch (event) {
/* when a2dp init or deinit completed, this event comes */
case ESP_A2D_PROF_STATE_EVT: {
if (ESP_A2D_INIT_SUCCESS == a2d->a2d_prof_stat.init_state) {
ESP_LOGI(BT_AV_TAG, "A2DP PROF STATE: Init Complete");
/* Get the default value of the delay value */
esp_a2d_sink_get_delay_value();
} else {
ESP_LOGI(BT_AV_TAG, "A2DP PROF STATE: Deinit Complete");
}
break;
}
/* others */
default:
ESP_LOGE(BT_AV_TAG, "%s unhandled event: %d", __func__, event);
break;
}
}
/********************************
* EXTERNAL FUNCTION DEFINITIONS
*******************************/
@@ -89,13 +113,16 @@ static void bt_app_avrc_ct_evt_hdl(uint16_t event, void *param)
void bt_app_a2d_cb(esp_a2d_cb_event_t event, esp_a2d_cb_param_t *param)
{
switch (event) {
case ESP_A2D_PROF_STATE_EVT: {
bt_app_work_dispatch(bt_app_a2d_evt_hdl, event, param, sizeof(esp_a2d_cb_param_t), NULL, NULL);
break;
}
case ESP_A2D_CONNECTION_STATE_EVT:
case ESP_A2D_AUDIO_STATE_EVT:
case ESP_A2D_AUDIO_CFG_EVT: {
bt_app_work_dispatch(bt_a2d_evt_int_codec_hdl, event, param, sizeof(esp_a2d_cb_param_t), NULL, NULL);
break;
}
case ESP_A2D_PROF_STATE_EVT:
case ESP_A2D_SNK_PSC_CFG_EVT:
case ESP_A2D_SNK_SET_DELAY_VALUE_EVT:
case ESP_A2D_SNK_GET_DELAY_VALUE_EVT: {
examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/main/main.c
-3
View File
@@ -644,9 +644,6 @@ static void bt_av_hdl_stack_evt(uint16_t event, void *p_param)
esp_a2d_register_callback(&bt_app_a2d_cb);
esp_a2d_sink_register_data_callback(bt_app_a2d_data_cb);
/* Get the default value of the delay value */
esp_a2d_sink_get_delay_value();
/* set discoverable and connectable mode, wait to be connected */
esp_bt_gap_set_scan_mode(ESP_BT_CONNECTABLE, ESP_BT_GENERAL_DISCOVERABLE);
break;