diff --git a/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/main/bt_app_av.c b/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/main/bt_app_av.c index d087c992d1..eaf6f3d47b 100644 --- a/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/main/bt_app_av.c +++ b/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/main/bt_app_av.c @@ -31,6 +31,9 @@ #define APP_RC_CT_TL_RN_PLAYBACK_CHANGE (3) #define APP_RC_CT_TL_RN_PLAY_POS_CHANGE (4) +/* Application layer causes delay value */ +#define APP_DELAY_VALUE 50 // 5ms + /******************************* * STATIC FUNCTION DECLARATIONS ******************************/ @@ -304,10 +307,11 @@ static void bt_av_hdl_a2d_evt(uint16_t event, void *p_param) } break; } - /* When the bottom layer knows whether the peer device support delay reporting, this event comes */ - case ESP_A2D_SUPPORT_DELAY_RPT_EVT: { + /* When protocol service capabilities configured, this event comes */ + case ESP_A2D_SNK_PSC_CFG_EVT: { a2d = (esp_a2d_cb_param_t *)(p_param); - if (a2d->a2d_support_delay_rpt_stat.is_support_delay_rpt) { + ESP_LOGI(BT_AV_TAG, "protocol service capabilities configured: 0x%x ", a2d->a2d_psc_cfg_stat.psc_mask); + if (a2d->a2d_psc_cfg_stat.psc_mask & ESP_A2D_PSC_DELAY_RPT) { ESP_LOGI(BT_AV_TAG, "Peer device support delay reporting"); } else { ESP_LOGI(BT_AV_TAG, "Peer device unsupport delay reporting"); @@ -320,14 +324,14 @@ static void bt_av_hdl_a2d_evt(uint16_t event, void *p_param) if (ESP_A2D_SET_INVALID_PARAMS == a2d->a2d_set_delay_value_stat.set_state) { ESP_LOGI(BT_AV_TAG, "Set delay report value: fail"); } else { - ESP_LOGI(BT_AV_TAG, "Set delay report value: success, delay_value:0x%x * 1/10 ms\n", a2d->a2d_set_delay_value_stat.delay_value); + ESP_LOGI(BT_AV_TAG, "Set delay report value: success, delay_value: %u * 1/10 ms", a2d->a2d_set_delay_value_stat.delay_value); } break; } /* when get delay value completed, this event comes */ case ESP_A2D_SNK_GET_DELAY_VALUE_EVT: { a2d = (esp_a2d_cb_param_t *)(p_param); - ESP_LOGI(BT_AV_TAG, "Get delay report value: delay_value:0x%x * 1/10 ms\n", a2d->a2d_get_delay_value_stat.delay_value); + ESP_LOGI(BT_AV_TAG, "Get delay report value: delay_value: %u * 1/10 ms", a2d->a2d_get_delay_value_stat.delay_value); /* Default delay value plus delay caused by application layer */ esp_a2d_sink_set_delay_value(a2d->a2d_get_delay_value_stat.delay_value + APP_DELAY_VALUE); break; @@ -466,7 +470,7 @@ void bt_app_a2d_cb(esp_a2d_cb_event_t event, esp_a2d_cb_param_t *param) case ESP_A2D_AUDIO_STATE_EVT: case ESP_A2D_AUDIO_CFG_EVT: case ESP_A2D_PROF_STATE_EVT: - case ESP_A2D_SUPPORT_DELAY_RPT_EVT: + case ESP_A2D_SNK_PSC_CFG_EVT: case ESP_A2D_SNK_SET_DELAY_VALUE_EVT: case ESP_A2D_SNK_GET_DELAY_VALUE_EVT: { bt_app_work_dispatch(bt_av_hdl_a2d_evt, event, param, sizeof(esp_a2d_cb_param_t), NULL); diff --git a/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/main/main.c b/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/main/main.c index 78e4a0a5b4..b0b1efb7cf 100644 --- a/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/main/main.c +++ b/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/main/main.c @@ -111,6 +111,9 @@ 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; diff --git a/examples/bluetooth/bluedroid/classic_bt/a2dp_source/main/main.c b/examples/bluetooth/bluedroid/classic_bt/a2dp_source/main/main.c index d43179b55f..0ceed1d01f 100644 --- a/examples/bluetooth/bluedroid/classic_bt/a2dp_source/main/main.c +++ b/examples/bluetooth/bluedroid/classic_bt/a2dp_source/main/main.c @@ -393,6 +393,7 @@ static void bt_app_av_sm_hdlr(uint16_t event, void *param) static void bt_app_av_state_unconnected_hdlr(uint16_t event, void *param) { + esp_a2d_cb_param_t *a2d = NULL; /* handle the events of intrest in unconnected state */ switch (event) { case ESP_A2D_CONNECTION_STATE_EVT: @@ -409,6 +410,11 @@ static void bt_app_av_state_unconnected_hdlr(uint16_t event, void *param) s_connecting_intv = 0; break; } + case ESP_A2D_REPORT_SNK_DELAY_VALUE_EVT: { + a2d = (esp_a2d_cb_param_t *)(param); + ESP_LOGI(BT_AV_TAG, "%s, delay value: %u * 1/10 ms", __func__, a2d->a2d_report_delay_value_stat.delay_value); + break; + } default: { ESP_LOGE(BT_AV_TAG, "%s unhandled event: %d", __func__, event); break; @@ -448,6 +454,11 @@ static void bt_app_av_state_connecting_hdlr(uint16_t event, void *param) s_connecting_intv = 0; } break; + case ESP_A2D_REPORT_SNK_DELAY_VALUE_EVT: { + a2d = (esp_a2d_cb_param_t *)(param); + ESP_LOGI(BT_AV_TAG, "%s, delay value: %u * 1/10 ms", __func__, a2d->a2d_report_delay_value_stat.delay_value); + break; + } default: ESP_LOGE(BT_AV_TAG, "%s unhandled event: %d", __func__, event); break; @@ -554,6 +565,11 @@ static void bt_app_av_state_connected_hdlr(uint16_t event, void *param) bt_app_av_media_proc(event, param); break; } + case ESP_A2D_REPORT_SNK_DELAY_VALUE_EVT: { + a2d = (esp_a2d_cb_param_t *)(param); + ESP_LOGI(BT_AV_TAG, "%s, delay value: %u * 1/10 ms", __func__, a2d->a2d_report_delay_value_stat.delay_value); + break; + } default: { ESP_LOGE(BT_AV_TAG, "%s unhandled event: %d", __func__, event); break; @@ -581,6 +597,11 @@ static void bt_app_av_state_disconnecting_hdlr(uint16_t event, void *param) case ESP_A2D_MEDIA_CTRL_ACK_EVT: case BT_APP_HEART_BEAT_EVT: break; + case ESP_A2D_REPORT_SNK_DELAY_VALUE_EVT: { + a2d = (esp_a2d_cb_param_t *)(param); + ESP_LOGI(BT_AV_TAG, "%s, delay value: 0x%u * 1/10 ms", __func__, a2d->a2d_report_delay_value_stat.delay_value); + break; + } default: { ESP_LOGE(BT_AV_TAG, "%s unhandled event: %d", __func__, event); break;