eaw/esp-idf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

component/bt: clean up AVRCP API and example code

Browse Source
This commit is contained in:
wangmengyang
2017-01-19 15:23:46 +08:00
parent 49b68c38fa
commit 36a74daa0a
4 changed files with 254 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
examples/09_a2dp/components/bluedroid_demos/app_project/SampleAV.c
View File

@@ -15,77 +15,24 @@
#include "esp_bt_stack_manager.h"
#include "esp_gap_bt_api.h"
#include "esp_a2dp_api.h"
#include "bt_rc.h"
#include "esp_avrc_api.h"
typedef enum {
BT_APP_EVT_STACK_ON = 0xa0,
BT_APP_EVT_MAX
} bt_app_evt_t;
typedef struct {
bool state;
bt_bdaddr_t bd_addr;
} esp_avrc_conn_state_t;
typedef struct {
int id;
int key_state;
} esp_avrc_passthrough_rsp_t;
typedef struct {
int id;
int key_state;
} esp_avrc_key_state_t;
typedef union {
esp_a2d_cb_param_t a2d;
esp_avrc_conn_state_t avrc_state;
esp_avrc_passthrough_rsp_t avrc_passthrough_rsp;
esp_avrc_key_state_t avrc_key;
esp_avrc_ct_cb_event_t rc;
} bt_app_evt_arg;
/// AVRC callback events
typedef enum {
ESP_AVRC_CONNECTION_STATE_EVT = 5, /*!< connection state changed event */
ESP_AVRC_PASSTHROUGH_RSP_EVT, /*!< AVRC PASSTHROUGH commands */
ESP_AVRC_KEY_STATE_TO
} esp_avrc_cb_event_t;
static esp_a2d_audio_state_t m_audio_state = ESP_A2D_AUDIO_STATE_STOPPED;
static TimerHandle_t m_key_tmr = 0;
static int m_key_state = 1; // 0 for pressed, 1 for released
static xTaskHandle xKeyTaskHandle = 0;
static void bt_app_handle_evt(uint16_t event, void *p_param);
static void key_press_task_handler(void *arg)
{
int key_id = 0x48; // rewind
for(;;) {
if (m_audio_state != ESP_A2D_AUDIO_STATE_STARTED) {
BT_APP_TRACE_EVENT("-----key_tmr_hdlr, return, audio state: %d\n", m_audio_state);
vTaskDelay(5000 / portTICK_PERIOD_MS);
continue;
}
bt_app_evt_arg param;
memset(&param, 0, sizeof(bt_app_evt_arg));
if (m_key_state == 1) {
param.avrc_key.key_state = 1;
m_key_state = 0;
vTaskDelay(5000 / portTICK_PERIOD_MS);
} else {
param.avrc_key.key_state = 0;
m_key_state = 1;
vTaskDelay(30 / portTICK_PERIOD_MS);
}
param.avrc_key.id = key_id; // 0x41 volume up, 0x4b FORWARD
BT_APP_TRACE_EVENT("-----key_task_hdlr: %d, key_id %d---\n", m_key_state, param.avrc_key.id);
bt_app_transfer_context(bt_app_handle_evt, ESP_AVRC_KEY_STATE_TO, &param, sizeof(bt_app_evt_arg), NULL);
}
}
static void bt_app_handle_rc_evt(uint16_t event, void *p_param);
static void bt_app_a2d_cb(esp_a2d_cb_event_t event, esp_a2d_cb_param_t *param)
{
@@ -103,35 +50,25 @@ static void bt_app_a2d_cb(esp_a2d_cb_event_t event, esp_a2d_cb_param_t *param)
}
}
static void btrc_passthrough_rsp_cb(int id, int key_state)
{
bt_app_evt_arg param;
memset(&param, 0, sizeof(bt_app_evt_arg));
param.avrc_passthrough_rsp.id = id;
param.avrc_passthrough_rsp.key_state = key_state;
bt_app_transfer_context(bt_app_handle_evt, ESP_AVRC_PASSTHROUGH_RSP_EVT, &param, sizeof(bt_app_evt_arg), NULL);
}
static void btrc_conn_state_cb(bool state, bt_bdaddr_t *bd_addr)
{
bt_app_evt_arg param;
memset(&param, 0, sizeof(bt_app_evt_arg));
param.avrc_state.state = state;
memcpy(&param.avrc_state.bd_addr, bd_addr, sizeof(bt_bdaddr_t));
bt_app_transfer_context(bt_app_handle_evt, ESP_AVRC_CONNECTION_STATE_EVT, &param, sizeof(bt_app_evt_arg), NULL);
}
static btrc_ctrl_callbacks_t btrc_ctrl_cb = {
sizeof(btrc_ctrl_callbacks_t),
btrc_passthrough_rsp_cb,
btrc_conn_state_cb
};
static void bt_app_a2d_data_cb(const uint8_t *data, uint32_t len)
{
// EspAudioPlayerStreamWrite((uint8_t *)data, len, 10);
}
static void bt_app_rc_ct_cb(esp_avrc_ct_cb_event_t event, esp_avrc_ct_cb_param_t *param)
{
switch (event) {
case ESP_AVRC_CT_CONNECTION_STATE_EVT:
case ESP_AVRC_CT_PASSTHROUGH_RSP_EVT: {
bt_app_transfer_context(bt_app_handle_rc_evt, event, param, sizeof(bt_app_evt_arg), NULL);
break;
}
default:
BT_APP_TRACE_ERROR("===a2dp invalid cb event: %d\n", event);
break;
}
}
static void bt_app_handle_evt(uint16_t event, void *p_param)
{
BT_APP_TRACE_DEBUG("bt_app_handle_evt 0x%x\n", event);
@@ -145,8 +82,10 @@ static void bt_app_handle_evt(uint16_t event, void *p_param)
esp_a2d_register_data_callback(bt_app_a2d_data_cb);
esp_a2d_sink_init();
btrc_ctrl_init(&btrc_ctrl_cb);
esp_avrc_ct_init();
esp_avrc_ct_register_callback(bt_app_rc_ct_cb);
esp_bt_gap_set_scan_mode(BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE);
break;
}
@@ -157,13 +96,8 @@ static void bt_app_handle_evt(uint16_t event, void *p_param)
}
case ESP_A2D_AUDIO_STATE_EVT: {
a2d = (esp_a2d_cb_param_t *)(p_param);
BT_APP_TRACE_EVENT("===a2dp audio_state_cb %d, %d===\n", a2d->audio_stat.state, (int)m_key_tmr);
BT_APP_TRACE_EVENT("===a2dp audio_state_cb %d===\n", a2d->audio_stat.state);
m_audio_state = a2d->audio_stat.state;
if (m_audio_state == ESP_A2D_AUDIO_STATE_STARTED &&
m_key_tmr == 0) {
BT_APP_TRACE_EVENT("mm1\n");
xTaskCreate(key_press_task_handler, "keyT", 2048, NULL, 10, &xKeyTaskHandle);
}
break;
}
case ESP_A2D_AUDIO_CFG_EVT: {
@@ -178,27 +112,32 @@ static void bt_app_handle_evt(uint16_t event, void *p_param)
}
break;
}
case ESP_AVRC_CONNECTION_STATE_EVT: {
esp_avrc_conn_state_t *conn_state = (esp_avrc_conn_state_t *)(p_param);
BT_APP_TRACE_EVENT("===avrc conn_state evt %d ===\n", conn_state->state);
default:
BT_APP_TRACE_ERROR("===application invalid event: %d\n", event);
break;
}
case ESP_AVRC_PASSTHROUGH_RSP_EVT: {
esp_avrc_passthrough_rsp_t *passthrough_rsp = (esp_avrc_passthrough_rsp_t *)(p_param);
BT_APP_TRACE_EVENT("===avrc passthrough evt id 0x%x, key_state %d===\n", passthrough_rsp->id, passthrough_rsp->key_state);
}
void bt_app_handle_rc_evt(uint16_t event, void *p_param)
{
BT_APP_TRACE_DEBUG("bt_app_handle_avrc_evt 0x%x\n", event);
esp_avrc_ct_cb_param_t *rc = (esp_avrc_ct_cb_param_t *)(p_param);
switch (event) {
case ESP_AVRC_CT_CONNECTION_STATE_EVT: {
uint8_t *bda = rc->conn_stat.remote_bda;
BT_APP_TRACE_EVENT("===avrc conn_state evt: state %d, feature 0x%x, [%02x:%02x:%02x:%02x:%02x:%02x]===\n",
rc->conn_stat.connected, rc->conn_stat.feat_mask, bda[0], bda[1], bda[2], bda[3], bda[4], bda[5]);
break;
}
case ESP_AVRC_KEY_STATE_TO: {
esp_avrc_key_state_t *key_s = (esp_avrc_key_state_t *)(p_param);
BT_APP_TRACE_EVENT("===avrc send key id 0x%x, state %d\n", key_s->id, key_s->key_state);
btrc_ctrl_send_passthrough_cmd(NULL, key_s->id, key_s->key_state);
case ESP_AVRC_CT_PASSTHROUGH_RSP_EVT: {
BT_APP_TRACE_EVENT("===avrc passthrough rsp: key_code 0x%x, key_state %d===\n", rc->psth_rsp.key_code, rc->psth_rsp.key_state);
break;
}
default:
BT_APP_TRACE_ERROR("===application invalid event: %d\n", event);
break;
}
}
void app_main_entry(void)