From 33ad4b6f84d0a232a48f749fcfc2aecc79804d7e Mon Sep 17 00:00:00 2001 From: weitianhua Date: Tue, 4 Aug 2020 18:23:50 +0800 Subject: [PATCH] Add A2DP Init and Deinit Complete Evt --- .../bluedroid/api/include/api/esp_a2dp_api.h | 26 ++++++++++++++++--- .../bluedroid/btc/profile/std/a2dp/btc_av.c | 12 +++++++-- examples/bluetooth/a2dp_sink/main/bt_app_av.c | 12 ++++++++- 3 files changed, 43 insertions(+), 7 deletions(-) diff --git a/components/bt/bluedroid/api/include/api/esp_a2dp_api.h b/components/bt/bluedroid/api/include/api/esp_a2dp_api.h index 96aad492b5..c0c4395c34 100644 --- a/components/bt/bluedroid/api/include/api/esp_a2dp_api.h +++ b/components/bt/bluedroid/api/include/api/esp_a2dp_api.h @@ -46,6 +46,12 @@ typedef struct { } cie; /*!< A2DP codec information element */ } __attribute__((packed)) esp_a2d_mcc_t; +/// Bluetooth A2DP Initiation states +typedef enum { + ESP_A2D_DEINIT_SUCCESS = 0, /*!< A2DP profile deinit successful event */ + ESP_A2D_INIT_SUCCESS /*!< A2DP profile init successful event */ +} esp_a2d_init_state_t; + /// Bluetooth A2DP connection states typedef enum { ESP_A2D_CONNECTION_STATE_DISCONNECTED = 0, /*!< connection released */ @@ -89,6 +95,7 @@ typedef enum { ESP_A2D_AUDIO_STATE_EVT, /*!< audio stream transmission state changed event */ ESP_A2D_AUDIO_CFG_EVT, /*!< audio codec is configured, only used for A2DP SINK */ ESP_A2D_MEDIA_CTRL_ACK_EVT, /*!< acknowledge event in response to media control commands */ + ESP_A2D_PROF_STATE_EVT, /*!< indicate a2dp deinit complete */ } esp_a2d_cb_event_t; /// A2DP state callback parameters @@ -125,6 +132,13 @@ typedef union { esp_a2d_media_ctrl_t cmd; /*!< media control commands to acknowledge */ esp_a2d_media_ctrl_ack_t status; /*!< acknowledgement to media control commands */ } media_ctrl_stat; /*!< status in acknowledgement to media control commands */ + + /** + * @brief ESP_A2D_PROF_STATE_EVT + */ + struct a2d_prof_stat_param { + esp_a2d_init_state_t init_state; /*!< a2dp profile state param */ + } a2d_prof_stat; /*!< status to indicate a2d prof init or deinit */ } esp_a2d_cb_param_t; /** @@ -193,7 +207,8 @@ esp_err_t esp_a2d_sink_register_data_callback(esp_a2d_sink_data_cb_t callback); /** * * @brief Initialize the bluetooth A2DP sink module. This function should be called - * after esp_bluedroid_enable() completes successfully + * after esp_bluedroid_enable() completes successfully, and ESP_A2D_PROF_STATE_EVT + * with ESP_A2D_INIT_SUCCESS will reported to the APP layer * * @return * - ESP_OK: if the initialization request is sent successfully @@ -207,7 +222,8 @@ esp_err_t esp_a2d_sink_init(void); /** * * @brief De-initialize for A2DP sink module. This function - * should be called only after esp_bluedroid_enable() completes successfully + * should be called only after esp_bluedroid_enable() completes successfully, + * and ESP_A2D_PROF_STATE_EVT with ESP_A2D_DEINIT_SUCCESS will reported to APP layer. * * @return * - ESP_OK: success @@ -264,7 +280,8 @@ esp_err_t esp_a2d_media_ctrl(esp_a2d_media_ctrl_t ctrl); /** * * @brief Initialize the bluetooth A2DP source module. This function should be called - * after esp_bluedroid_enable() completes successfully + * after esp_bluedroid_enable() completes successfully, and ESP_A2D_PROF_STATE_EVT + * with ESP_A2D_INIT_SUCCESS will reported to the APP layer * * @return * - ESP_OK: if the initialization request is sent successfully @@ -278,7 +295,8 @@ esp_err_t esp_a2d_source_init(void); /** * * @brief De-initialize for A2DP source module. This function - * should be called only after esp_bluedroid_enable() completes successfully + * should be called only after esp_bluedroid_enable() completes successfully, + * and ESP_A2D_PROF_STATE_EVT with ESP_A2D_DEINIT_SUCCESS will reported to APP layer. * * @return * - ESP_OK: success diff --git a/components/bt/bluedroid/btc/profile/std/a2dp/btc_av.c b/components/bt/bluedroid/btc/profile/std/a2dp/btc_av.c index d99e01e060..2ed9c72665 100644 --- a/components/bt/bluedroid/btc/profile/std/a2dp/btc_av.c +++ b/components/bt/bluedroid/btc/profile/std/a2dp/btc_av.c @@ -981,9 +981,12 @@ static bt_status_t btc_av_init(int service_id) } else { btc_dm_enable_service(BTA_A2DP_SOURCE_SERVICE_ID); } - btc_a2dp_on_init(); + esp_a2d_cb_param_t param; + memset(¶m, 0, sizeof(esp_a2d_cb_param_t)); + param.a2d_prof_stat.init_state = ESP_A2D_INIT_SUCCESS; + btc_a2d_cb_to_app(ESP_A2D_PROF_STATE_EVT, ¶m); return BT_STATUS_SUCCESS; } @@ -1049,6 +1052,11 @@ static void clean_up(int service_id) btc_sm_shutdown(btc_av_cb.sm_handle); btc_av_cb.sm_handle = NULL; + esp_a2d_cb_param_t param; + memset(¶m, 0, sizeof(esp_a2d_cb_param_t)); + param.a2d_prof_stat.init_state = ESP_A2D_DEINIT_SUCCESS; + btc_a2d_cb_to_app(ESP_A2D_PROF_STATE_EVT, ¶m); + g_a2dp_on_init = false; g_a2dp_on_deinit = true; } @@ -1386,7 +1394,7 @@ void btc_a2dp_call_handler(btc_msg_t *msg) } case BTC_AV_SINK_API_DISCONNECT_EVT: { CHECK_BTAV_INIT(); - btc_av_disconn_req_t disconn_req; + btc_av_disconn_req_t disconn_req; memcpy(&disconn_req.target_bda, &arg->disconn, sizeof(bt_bdaddr_t)); btc_sm_dispatch(btc_av_cb.sm_handle, BTC_AV_DISCONNECT_REQ_EVT, &disconn_req); break; diff --git a/examples/bluetooth/a2dp_sink/main/bt_app_av.c b/examples/bluetooth/a2dp_sink/main/bt_app_av.c index 5c12fae46a..750bfab3d6 100644 --- a/examples/bluetooth/a2dp_sink/main/bt_app_av.c +++ b/examples/bluetooth/a2dp_sink/main/bt_app_av.c @@ -41,7 +41,8 @@ void bt_app_a2d_cb(esp_a2d_cb_event_t event, esp_a2d_cb_param_t *param) switch (event) { case ESP_A2D_CONNECTION_STATE_EVT: case ESP_A2D_AUDIO_STATE_EVT: - case ESP_A2D_AUDIO_CFG_EVT: { + case ESP_A2D_AUDIO_CFG_EVT: + case ESP_A2D_PROF_STATE_EVT: { bt_app_work_dispatch(bt_av_hdl_a2d_evt, event, param, sizeof(esp_a2d_cb_param_t), NULL); break; } @@ -140,6 +141,15 @@ static void bt_av_hdl_a2d_evt(uint16_t event, void *p_param) } break; } + case ESP_A2D_PROF_STATE_EVT: { + a2d = (esp_a2d_cb_param_t *)(p_param); + if (ESP_A2D_INIT_SUCCESS == a2d->a2d_prof_stat.init_state) { + ESP_LOGI(BT_AV_TAG,"A2DP PROF STATE: Init Compl\n"); + } else { + ESP_LOGI(BT_AV_TAG,"A2DP PROF STATE: Deinit Compl\n"); + } + break; + } default: ESP_LOGE(BT_AV_TAG, "%s unhandled evt %d", __func__, event); break;