component/bt: merge the three A2DP APIs into one

diff --git a/examples/09_a2dp/components/bluedroid_demos/app_project/SampleBtSdp.c b/examples/09_a2dp/components/bluedroid_demos/app_project/SampleBtSdp.c
index fd20efbc8e66a8a75c331ccb8dbf4a7a1db94784..123dc07cace871acd36836d5a817c2af903e8259 100644 (file)
--- a/examples/09_a2dp/components/bluedroid_demos/app_project/SampleBtSdp.c
+++ b/examples/09_a2dp/components/bluedroid_demos/app_project/SampleBtSdp.c
@@ -40,31 +40,24 @@ static bt_callbacks_t bt_callbacks = {
 
 osi_alarm_t *app_alarm = NULL;
 
-static void btav_conn_state_cb(esp_a2d_connection_state_t state,
-                               esp_bd_addr_t *bd_addr)
+static void esp_a2d_cb(uint32_t event, void *param)
 {
-    LOG_ERROR("===esp_a2dp_conn_state_cb %d ===\n", state);
-    (void) bd_addr;
-}
-
-static void btav_audio_state_cb(esp_a2d_audio_state_t state, esp_bd_addr_t *bd_addr)
-{
-    LOG_ERROR("===esp_a2dp_audio_state_cb %d ===\n", state);
-    (void) bd_addr;
-}
-
-static void btav_audio_cfg_cb(esp_bd_addr_t *bd_addr, uint32_t sample_rate, uint8_t channel_count)
-{
-    LOG_ERROR("===esp_a2dp_audio_cfg_cb %d %d===\n", sample_rate, channel_count);
-    (void) bd_addr;
+    esp_a2d_cb_param_t *p = (esp_a2d_cb_param_t *)param;
+    switch (event) {
+    case ESP_A2D_CONNECTION_STATE_EVT:
+       LOG_ERROR("===a2dp conn_state_cb %d ===\n", p->conn_stat.state);
+       break;
+    case ESP_A2D_AUDIO_STATE_EVT:
+       LOG_ERROR("===a2dp audio_state_cb %d ===\n", p->audio_stat.state);
+       break;
+    case ESP_A2D_AUDIO_CFG_EVT:
+        LOG_ERROR("===a2dp audio_cfg_cb type %d ===\n", p->audio_cfg.mcc.type);
+        break;
+    default:
+        LOG_ERROR("===a2dp invalid cb event: %d\n", event);
+    }
 }
 
-static esp_a2d_callbacks_t btav_cbs = {
-    btav_conn_state_cb,
-    btav_audio_state_cb,
-    btav_audio_cfg_cb
-};
-
 static void btav_open_to(void *context)
 {
     (void)(context);
@@ -92,8 +85,7 @@ static void bt_app_stack_evt(UINT16 event, char *p_param)
         btav_set_device_class();
         BTA_DmSetDeviceName(dev_name);
         esp_bt_gap_set_scan_mode(BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE);
-       esp_a2d_sink_init(&btav_cbs);
-        // btif_av_get_sink_interface()->init(&btav_cbs);
+        esp_a2d_sink_init(esp_a2d_cb);
 
         // app_alarm = osi_alarm_new("app_alarm", bt_sdp_add_record_to, NULL, 1000, false);
         app_alarm = osi_alarm_new("app_alarm", btav_open_to, NULL, 1000, false);

diff --git a/examples/09_a2dp/components/bluedroid_demos/btif/btif_avk.c b/examples/09_a2dp/components/bluedroid_demos/btif/btif_avk.c
index ed8b35e2e8b01edb9c8e4e59731926bcfa2dcefb..f4a0a2ea9dd5bbe6ef32972cd5a5e5d6affb12e1 100644 (file)
--- a/examples/09_a2dp/components/bluedroid_demos/btif/btif_avk.c
+++ b/examples/09_a2dp/components/bluedroid_demos/btif/btif_avk.c
@@ -33,6 +33,7 @@
 #include "bt_defs.h"
 // #include <system/audio.h>
 // #include "bt_av.h"
+#include "esp_bt_defs.h"
 #include "esp_a2dp_api.h"
 #include "allocator.h"
 
@@ -94,13 +95,20 @@ typedef struct {
 /*****************************************************************************
 **  Static variables
 ******************************************************************************/
-static esp_a2d_callbacks_t *bt_av_sink_callbacks = NULL;
+// static esp_a2d_callbacks_t *bt_av_sink_callbacks = NULL;
+static esp_profile_cb_t bt_av_sink_callback = NULL;
 
 static btif_av_cb_t btif_av_cb = {0};
 // static TIMER_LIST_ENT tle_av_open_on_rc;
 
+#define BTIF_A2D_CB_TO_APP(_event, _param)    do { \
+       if (bt_av_sink_callback) { \
+           bt_av_sink_callback(_event, _param); \
+       } \
+    } while (0)
+
 /* both interface and media task needs to be ready to alloc incoming request */
-#define CHECK_BTAV_INIT() if ((bt_av_sink_callbacks == NULL) \
+#define CHECK_BTAV_INIT() if ((bt_av_sink_callback == NULL) \
         || (btif_av_cb.sm_handle == NULL))\
 {\
      BTIF_TRACE_WARNING("%s: BTAV not initialized\n", __FUNCTION__);\
@@ -204,28 +212,26 @@ const char *dump_av_sm_event_name(btif_av_sm_event_t event)
 ******************************************************************************/
 static void btif_report_connection_state(esp_a2d_connection_state_t state, bt_bdaddr_t *bd_addr)
 {
-    if (bt_av_sink_callbacks != NULL) {
-        esp_bd_addr_t remote_bda;
-        if (bd_addr) {
-            memcpy(&remote_bda, bd_addr, sizeof(esp_bd_addr_t));
-        } else {
-            memset(&remote_bda, 0, sizeof(esp_bd_addr_t));
-        }
-        HAL_CBACK(bt_av_sink_callbacks, connection_state_cb, state, &remote_bda);
+    esp_a2d_cb_param_t param;
+    memset(&param, 0, sizeof(esp_a2d_cb_param_t));
+    
+    param.conn_stat.state = state;
+    if (bd_addr) {
+        memcpy(&param.conn_stat.remote_bda, bd_addr, sizeof(esp_bd_addr_t));
     }
+    BTIF_A2D_CB_TO_APP(ESP_A2D_CONNECTION_STATE_EVT, &param);
 }
 
 static void btif_report_audio_state(esp_a2d_audio_state_t state, bt_bdaddr_t *bd_addr)
 {
-    if (bt_av_sink_callbacks != NULL) {
-        esp_bd_addr_t remote_bda;
-        if (bd_addr) {
-            memcpy(&remote_bda, bd_addr, sizeof(esp_bd_addr_t));
-        } else {
-            memset(&remote_bda, 0, sizeof(esp_bd_addr_t));
-        }
-        HAL_CBACK(bt_av_sink_callbacks, audio_state_cb, state, &remote_bda);
+    esp_a2d_cb_param_t param;
+    memset(&param, 0, sizeof(esp_a2d_cb_param_t));
+
+    param.audio_stat.state = state;
+    if (bd_addr) {
+        memcpy(&param.audio_stat.remote_bda, bd_addr, sizeof(esp_bd_addr_t));
     }
+    BTIF_A2D_CB_TO_APP(ESP_A2D_AUDIO_STATE_EVT, &param);
 }
 
 /*****************************************************************************
@@ -368,14 +374,11 @@ static BOOLEAN btif_av_state_opening_handler(btif_sm_event_t event, void *p_data
     } break;
 
     case BTIF_AV_SINK_CONFIG_REQ_EVT: {
-        esp_a2d_mcc_t mcc;
-        // copy to avoid alignment problems
-        memcpy(&mcc, p_data, sizeof(mcc));
-        BTIF_TRACE_DEBUG("BTIF_AV_SINK_CONFIG_REQ_EVT SBC 0x%x %x %x %x\n", mcc.cie.sbc.oct[0], mcc.cie.sbc.oct[1], mcc.cie.sbc.oct[2], mcc.cie.sbc.oct[3]);
-        if (btif_av_cb.peer_sep == AVDT_TSEP_SRC && bt_av_sink_callbacks != NULL) {
-            esp_bd_addr_t remote_bda;
-            memcpy(&remote_bda, &btif_av_cb.peer_bda, sizeof(esp_bd_addr_t));
-            HAL_CBACK(bt_av_sink_callbacks, audio_config_cb, &remote_bda, &mcc);
+        if (btif_av_cb.peer_sep == AVDT_TSEP_SRC && bt_av_sink_callback != NULL) {
+            esp_a2d_cb_param_t param;
+            memcpy(&param.audio_cfg.remote_bda, &btif_av_cb.peer_bda, sizeof(esp_bd_addr_t));
+            memcpy(&param.audio_cfg.mcc, p_data, sizeof(esp_a2d_mcc_t));
+            BTIF_A2D_CB_TO_APP(ESP_A2D_AUDIO_CFG_EVT, &param);
         }
     } break;
 
@@ -978,14 +981,13 @@ static bt_status_t init_src(btav_callbacks_t *callbacks)
 ** Returns          bt_status_t
 **
 *******************************************************************************/
-esp_err_t esp_a2d_sink_init(esp_a2d_callbacks_t *callbacks)
-// static bt_status_t init_sink(btav_callbacks_t *callbacks)
+esp_err_t esp_a2d_sink_init(esp_profile_cb_t callback)
 {
     BTIF_TRACE_EVENT("%s()\n", __func__);
 
     bt_status_t status = btif_av_init();
     if (status == BT_STATUS_SUCCESS) {
-        bt_av_sink_callbacks = callbacks;
+        bt_av_sink_callback = callback;
     }
 
     return (status == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL;
@@ -1112,8 +1114,8 @@ void esp_a2d_sink_deinit(void)
 {
     BTIF_TRACE_EVENT("%s\n", __FUNCTION__);
 
-    if (bt_av_sink_callbacks) {
-        bt_av_sink_callbacks = NULL;
+    if (bt_av_sink_callback) {
+        bt_av_sink_callback = NULL;
         cleanup();
     }
 }

diff --git a/examples/09_a2dp/components/bluedroid_demos/include/esp_a2dp_api.h b/examples/09_a2dp/components/bluedroid_demos/include/esp_a2dp_api.h
index c8974512a2c2c08e5b57400e80825e875363d9ea..f8cf666e182406eaa9c476ecde2c04994ce1e6d6 100644 (file)
--- a/examples/09_a2dp/components/bluedroid_demos/include/esp_a2dp_api.h
+++ b/examples/09_a2dp/components/bluedroid_demos/include/esp_a2dp_api.h
@@ -60,31 +60,31 @@ typedef enum {
     ESP_A2D_AUDIO_STATE_STARTED,
 } esp_a2d_audio_state_t;
 
-/** Callback for connection state change.
- *  state will have one of the values from btav_connection_state_t
- */
-typedef void (* esp_a2d_connection_state_cb_t)(esp_a2d_connection_state_t state,
-    esp_bd_addr_t *remote_bda);
-
-/** Callback for audiopath state change.
- *  state will have one of the values from btav_audio_state_t
- */
-typedef void (* esp_a2d_audio_state_cb_t)(esp_a2d_audio_state_t state,
-    esp_bd_addr_t *remote_bda);
-
-/** Callback for audio configuration change.
- *  Used only for the A2DP sink interface.
- *  state will have one of the values from btav_audio_state_t
- */
-typedef void (* esp_a2d_audio_config_cb_t)(esp_bd_addr_t *remote_bda,
-    esp_a2d_mcc_t *mcc);
-
-/** BT-a2dp callback structure. */
-typedef struct {
-    esp_a2d_connection_state_cb_t connection_state_cb;
-    esp_a2d_audio_state_cb_t audio_state_cb;
-    esp_a2d_audio_config_cb_t audio_config_cb;
-} esp_a2d_callbacks_t;
+typedef enum {
+    ESP_A2D_CONNECTION_STATE_EVT = 0,           /*!< connection state changed */
+    ESP_A2D_AUDIO_STATE_EVT = 1,                /*!< audio stream state changed */
+    ESP_A2D_AUDIO_CFG_EVT = 2                   /*!< audio codec configuration received */
+} esp_a2d_cb_event_t;
+
+typedef union {
+    /*< ESP_A2D_CONNECTION_STATE_EVT */
+    struct a2d_conn_stat_param {
+        esp_a2d_connection_state_t state;       /*!< one of values from esp_a2d_connection_state_t */
+        esp_bd_addr_t remote_bda;
+    } conn_stat;
+    
+    /*< ESP_A2D_AUDIO_STATE_EVT */
+    struct a2d_audio_stat_param {
+        esp_a2d_audio_state_t state;            /*!< one of the values from esp_a2d_audio_state_t */
+        esp_bd_addr_t remote_bda;
+    } audio_stat;
+    
+    /*< ESP_A2D_AUDIO_CFG_EVT */
+    struct a2d_audio_cfg_param {
+        esp_bd_addr_t remote_bda;
+        esp_a2d_mcc_t mcc;
+    } audio_cfg;
+} esp_a2d_cb_param_t;
 
 /**
  * NOTE:
@@ -92,19 +92,10 @@ typedef struct {
  *    and the Bluetooth stack.
  */
 
-typedef struct {
-    int (* open)(void);
-    void (* close)(void);
-    int (* ioctl)(int cmd, void *param); // not used for now
-    uint32_t (* write)(uint8_t *buf, uint32_t len);
-} esp_a2d_sink_audio_hal_t;
-
-#define ESP_A2D_AUDIO_HAL_IOC_WRITE_FLUSH            (1)   // ioctl command, which is not used for now
-
-
-/** Represents the A2DP sink interface.
+/**
+ * Represents the A2DP sink interface.
  */
-esp_err_t esp_a2d_sink_init(esp_a2d_callbacks_t *callbacks);
+esp_err_t esp_a2d_sink_init(esp_profile_cb_t callback);
 
 esp_err_t esp_a2d_sink_connect(esp_bd_addr_t *remote_bda);