espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 19:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

component/bt: A2DP API modification

Browse Source 
1. add one API to register the A2DP callback functions
This commit is contained in:
wangmengyang
2016-12-01 21:30:05 +08:00
parent e17519e49b
commit 38cc22a85c
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/09_a2dp/components/bluedroid_demos/app_project/SampleBtSdp.c
View File

@@ -85,7 +85,8 @@ static void bt_app_stack_evt(UINT16 event, char *p_param)
btav_set_device_class(); btav_set_device_class();
BTA_DmSetDeviceName(dev_name); BTA_DmSetDeviceName(dev_name);
esp_bt_gap_set_scan_mode(BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE); esp_bt_gap_set_scan_mode(BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE);
esp_a2d_sink_init(esp_a2d_cb); esp_a2d_register_callback(esp_a2d_cb);
esp_a2d_sink_init();
// app_alarm = osi_alarm_new("app_alarm", bt_sdp_add_record_to, NULL, 1000, false); // 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); app_alarm = osi_alarm_new("app_alarm", btav_open_to, NULL, 1000, false);

28
examples/09_a2dp/components/bluedroid_demos/btif/btif_avk.c
View File

@@ -95,7 +95,7 @@ typedef struct {
/***************************************************************************** /*****************************************************************************
** Static variables ** Static variables
******************************************************************************/ ******************************************************************************/
// static esp_a2d_callbacks_t *bt_av_sink_callbacks = NULL;
static esp_profile_cb_t bt_av_sink_callback = NULL; static esp_profile_cb_t bt_av_sink_callback = NULL;
static btif_av_cb_t btif_av_cb = {0}; static btif_av_cb_t btif_av_cb = {0};
@@ -108,8 +108,7 @@ static btif_av_cb_t btif_av_cb = {0};
} while (0) } while (0)
/* both interface and media task needs to be ready to alloc incoming request */ /* both interface and media task needs to be ready to alloc incoming request */
#define CHECK_BTAV_INIT() if ((bt_av_sink_callback == NULL) \ #define CHECK_BTAV_INIT() if (btif_av_cb.sm_handle == NULL)\
|| (btif_av_cb.sm_handle == NULL))\
{\ {\
BTIF_TRACE_WARNING("%s: BTAV not initialized\n", __FUNCTION__);\ BTIF_TRACE_WARNING("%s: BTAV not initialized\n", __FUNCTION__);\
return ESP_ERR_INVALID_STATE;\ return ESP_ERR_INVALID_STATE;\
@@ -374,7 +373,7 @@ static BOOLEAN btif_av_state_opening_handler(btif_sm_event_t event, void *p_data
} break; } break;
case BTIF_AV_SINK_CONFIG_REQ_EVT: { case BTIF_AV_SINK_CONFIG_REQ_EVT: {
if (btif_av_cb.peer_sep == AVDT_TSEP_SRC && bt_av_sink_callback != NULL) { if (btif_av_cb.peer_sep == AVDT_TSEP_SRC) {
esp_a2d_cb_param_t param; 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.remote_bda, &btif_av_cb.peer_bda, sizeof(esp_bd_addr_t));
memcpy(&param.audio_cfg.mcc, p_data, sizeof(esp_a2d_mcc_t)); memcpy(&param.audio_cfg.mcc, p_data, sizeof(esp_a2d_mcc_t));
@@ -972,6 +971,22 @@ static bt_status_t init_src(btav_callbacks_t *callbacks)
} }
#endif #endif
/**
*
* Function register A2DP callback
*
* Description Initializes the AV interface for sink mode
*
* Returns bt_status_t
*
*/
esp_err_t esp_a2d_register_callback(esp_profile_cb_t callback)
{
// TODO: add concurrency protection
bt_av_sink_callback = callback;
}
/******************************************************************************* /*******************************************************************************
** **
** Function init_sink ** Function init_sink
@@ -981,14 +996,11 @@ static bt_status_t init_src(btav_callbacks_t *callbacks)
** Returns bt_status_t ** Returns bt_status_t
** **
*******************************************************************************/ *******************************************************************************/
esp_err_t esp_a2d_sink_init(esp_profile_cb_t callback) esp_err_t esp_a2d_sink_init(void)
{ {
BTIF_TRACE_EVENT("%s()\n", __func__); BTIF_TRACE_EVENT("%s()\n", __func__);
bt_status_t status = btif_av_init(); bt_status_t status = btif_av_init();
if (status == BT_STATUS_SUCCESS) {
bt_av_sink_callback = callback;
}
return (status == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL; return (status == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL;
} }

4
examples/09_a2dp/components/bluedroid_demos/include/esp_a2dp_api.h
View File

@@ -95,7 +95,9 @@ typedef union {
/** /**
* Represents the A2DP sink interface. * Represents the A2DP sink interface.
*/ */
esp_err_t esp_a2d_sink_init(esp_profile_cb_t callback); esp_err_t esp_a2d_register_callback(esp_profile_cb_t callback);
esp_err_t esp_a2d_sink_init(void);
esp_err_t esp_a2d_sink_connect(esp_bd_addr_t *remote_bda); esp_err_t esp_a2d_sink_connect(esp_bd_addr_t *remote_bda);