Merge branch 'feature/bt_support_external_codec' into 'master'

feat(bt/bluedroid): Support external codec in Bluedroid HFP and A2DP

Closes BT-3937

See merge request espressif/esp-idf!36607

Author: Jiang Jiang Jian

components/bt/CMakeLists.txt

@@ -288,7 +288,9 @@ if(CONFIG_BT_ENABLED)
                    "host/bluedroid/btc/profile/std/a2dp/btc_a2dp.c"
                    "host/bluedroid/btc/profile/std/a2dp/btc_a2dp_control.c"
                    "host/bluedroid/btc/profile/std/a2dp/btc_a2dp_sink.c"
+                   "host/bluedroid/btc/profile/std/a2dp/btc_a2dp_sink_ext_coedc.c"
                    "host/bluedroid/btc/profile/std/a2dp/btc_a2dp_source.c"
+                   "host/bluedroid/btc/profile/std/a2dp/btc_a2dp_source_ext_codec.c"
                    "host/bluedroid/btc/profile/std/a2dp/btc_av.c"
                    "host/bluedroid/btc/profile/std/avrc/btc_avrc.c"
                    "host/bluedroid/btc/profile/std/avrc/bta_avrc_co.c"

components/bt/host/bluedroid/Kconfig.in

@@ -89,6 +89,15 @@ config BT_A2DP_ENABLE
     help
         Advanced Audio Distribution Profile
 
+config BT_A2DP_USE_EXTERNAL_CODEC
+    bool "Use External Codec for A2DP"
+    depends on BT_A2DP_ENABLE
+    default n
+    help
+        If enable, user shall register audio codec capability to A2DP and encode/decode
+        audio data in application layer. The internal codec in A2DP will be remove in
+        the future, it is recommend to use external codec for new design.
+
 config BT_AVRCP_ENABLED
     bool
     depends on BT_A2DP_ENABLE
@@ -184,6 +193,15 @@ choice BT_HFP_AUDIO_DATA_PATH
         bool "HCI"
 endchoice
 
+config BT_HFP_USE_EXTERNAL_CODEC
+    bool "Use External Codec for HFP"
+    depends on BT_HFP_ENABLE && BT_HFP_AUDIO_DATA_PATH_HCI
+    default n
+    help
+        If enable, user shall encode/decode audio data in application layer. The internal
+        codec in HFP will be remove in the future, it is recommend to use external codec
+        for new design.
+
 config BT_HFP_WBS_ENABLE
     bool "Wide Band Speech"
     depends on BT_HFP_ENABLE && BT_HFP_AUDIO_DATA_PATH_HCI

components/bt/host/bluedroid/api/esp_a2dp_api.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -14,6 +14,37 @@
 
 #if BTC_AV_INCLUDED
 
+esp_a2d_audio_buff_t *esp_a2d_audio_buff_alloc(uint16_t size)
+{
+    if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) {
+        return NULL;
+    }
+
+    if (size == 0) {
+        return NULL;
+    }
+
+    uint8_t *p_buf = NULL, *p_data;
+    btc_av_audio_buff_alloc(size, &p_buf, &p_data);
+    if (p_buf == NULL) {
+        return NULL;
+    }
+
+    esp_a2d_audio_buff_t *audio_buf = (esp_a2d_audio_buff_t *)p_buf;
+    audio_buf->buff_size = size;
+    audio_buf->data_len = 0;
+    audio_buf->data = p_data;
+    return audio_buf;
+}
+
+void esp_a2d_audio_buff_free(esp_a2d_audio_buff_t *audio_buf)
+{
+    if (audio_buf == NULL) {
+        return;
+    }
+    btc_av_audio_buff_free((uint8_t *)audio_buf);
+}
+
 #if BTC_AV_SINK_INCLUDED
 esp_err_t esp_a2d_sink_init(void)
 {
@@ -36,6 +67,35 @@ esp_err_t esp_a2d_sink_init(void)
     return (stat == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL;
 }
 
+esp_err_t esp_a2d_sink_register_stream_endpoint(uint8_t seid, const esp_a2d_mcc_t *mcc)
+{
+    if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) {
+        return ESP_ERR_INVALID_STATE;
+    }
+
+    if (g_a2dp_on_deinit || g_a2dp_sink_ongoing_deinit) {
+        return ESP_ERR_INVALID_STATE;
+    }
+
+    if (seid >= ESP_A2D_MAX_SEPS) {
+        return ESP_ERR_INVALID_ARG;
+    }
+
+    btc_msg_t msg;
+    msg.sig = BTC_SIG_API_CALL;
+    msg.pid = BTC_PID_A2DP;
+    msg.act = BTC_AV_SINK_API_REG_SEP_EVT;
+
+    btc_av_args_t arg;
+    memset(&arg, 0, sizeof(btc_av_args_t));
+    arg.reg_sep.seid = seid;
+    memcpy(&arg.reg_sep.mcc, mcc, sizeof(esp_a2d_mcc_t));
+
+    /* Switch to BTC context */
+    bt_status_t stat = btc_transfer_context(&msg, &arg, sizeof(btc_av_args_t), NULL, NULL);
+    return (stat == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL;
+}
+
 esp_err_t esp_a2d_sink_deinit(void)
 {
     if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) {
@@ -81,6 +141,30 @@ esp_err_t esp_a2d_sink_register_data_callback(esp_a2d_sink_data_cb_t callback)
     return (stat == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL;
 }
 
+esp_err_t esp_a2d_sink_register_audio_data_callback(esp_a2d_sink_audio_data_cb_t callback)
+{
+    if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) {
+        return ESP_ERR_INVALID_STATE;
+    }
+
+    if (g_a2dp_sink_ongoing_deinit) {
+        return ESP_ERR_INVALID_STATE;
+    }
+
+    btc_msg_t msg;
+    msg.sig = BTC_SIG_API_CALL;
+    msg.pid = BTC_PID_A2DP;
+    msg.act = BTC_AV_SINK_API_REG_AUDIO_DATA_CB_EVT;
+
+    btc_av_args_t arg;
+    memset(&arg, 0, sizeof(btc_av_args_t));
+    arg.audio_data_cb = callback;
+
+    /* Switch to BTC context */
+    bt_status_t stat = btc_transfer_context(&msg, &arg, sizeof(btc_av_args_t), NULL, NULL);
+    return (stat == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL;
+}
+
 esp_err_t esp_a2d_sink_connect(esp_bd_addr_t remote_bda)
 {
     if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) {
@@ -251,6 +335,35 @@ esp_err_t esp_a2d_source_init(void)
     return (stat == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL;
 }
 
+esp_err_t esp_a2d_source_register_stream_endpoint(uint8_t seid, const esp_a2d_mcc_t *mcc)
+{
+    if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) {
+        return ESP_ERR_INVALID_STATE;
+    }
+
+    if (g_a2dp_on_deinit || g_a2dp_sink_ongoing_deinit) {
+        return ESP_ERR_INVALID_STATE;
+    }
+
+    if (seid >= ESP_A2D_MAX_SEPS) {
+        return ESP_ERR_INVALID_ARG;
+    }
+
+    btc_msg_t msg;
+    msg.sig = BTC_SIG_API_CALL;
+    msg.pid = BTC_PID_A2DP;
+    msg.act = BTC_AV_SRC_API_REG_SEP_EVT;
+
+    btc_av_args_t arg;
+    memset(&arg, 0, sizeof(btc_av_args_t));
+    arg.reg_sep.seid = seid;
+    memcpy(&arg.reg_sep.mcc, mcc, sizeof(esp_a2d_mcc_t));
+
+    /* Switch to BTC context */
+    bt_status_t stat = btc_transfer_context(&msg, &arg, sizeof(btc_av_args_t), NULL, NULL);
+    return (stat == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL;
+}
+
 esp_err_t esp_a2d_source_deinit(void)
 {
     if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) {
@@ -348,6 +461,26 @@ esp_err_t esp_a2d_source_register_data_callback(esp_a2d_source_data_cb_t callbac
     return (stat == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL;
 }
 
+esp_err_t esp_a2d_source_audio_data_send(esp_a2d_conn_hdl_t conn_hdl, esp_a2d_audio_buff_t *audio_buf)
+{
+    if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED || !btc_av_is_started()) {
+        return ESP_ERR_INVALID_STATE;
+    }
+
+    if (audio_buf == NULL || audio_buf->data_len == 0 || conn_hdl == 0) {
+        return ESP_ERR_INVALID_ARG;
+    }
+
+    if (!btc_a2d_src_audio_mtu_check(audio_buf->data_len)) {
+        return ESP_ERR_INVALID_SIZE;
+    }
+
+    if (btc_a2d_src_audio_data_send(conn_hdl, audio_buf) != BT_STATUS_SUCCESS) {
+        return ESP_FAIL;
+    }
+    return ESP_OK;
+}
+
 #endif /* BTC_AV_SRC_INCLUDED */
 
 #endif /* #if BTC_AV_INCLUDED */

components/bt/host/bluedroid/api/esp_hf_ag_api.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -528,6 +528,8 @@ esp_err_t esp_hf_ag_out_call(esp_bd_addr_t remote_addr, int num_active, int num_
     return (status == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL;
 }
 
+#if (BTM_SCO_HCI_INCLUDED == TRUE)
+
 esp_err_t esp_hf_ag_register_data_callback(esp_hf_incoming_data_cb_t recv, esp_hf_outgoing_data_cb_t send)
 {
     if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) {
@@ -548,7 +550,73 @@ esp_err_t esp_hf_ag_register_data_callback(esp_hf_incoming_data_cb_t recv, esp_h
     return (status == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL;
 }
 
-#if (BTM_SCO_HCI_INCLUDED == TRUE)
+esp_err_t esp_hf_ag_register_audio_data_callback(esp_hf_ag_audio_data_cb_t callback)
+{
+    if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) {
+        return ESP_ERR_INVALID_STATE;
+    }
+
+    btc_msg_t msg;
+    msg.sig = BTC_SIG_API_CALL;
+    msg.pid = BTC_PID_HF;
+    msg.act = BTC_HF_REGISTER_AUDIO_DATA_CALLBACK_EVT;
+
+    btc_hf_args_t arg;
+    memset(&arg, 0, sizeof(btc_hf_args_t));
+    arg.reg_audio_data_cb.callback = callback;
+
+    /* Switch to BTC context */
+    bt_status_t status = btc_transfer_context(&msg, &arg, sizeof(btc_hf_args_t), NULL, NULL);
+    return (status == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL;
+}
+
+esp_hf_audio_buff_t *esp_hf_ag_audio_buff_alloc(uint16_t size)
+{
+    if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) {
+        return NULL;
+    }
+
+    if (size == 0) {
+        return NULL;
+    }
+
+    uint8_t *p_buf = NULL, *p_data;
+    BTA_AgAudioBuffAlloc(size, &p_buf, &p_data);
+    if (p_buf == NULL) {
+        return NULL;
+    }
+
+    esp_hf_audio_buff_t *audio_buf = (esp_hf_audio_buff_t *)p_buf;
+    audio_buf->buff_size = size;
+    audio_buf->data_len = 0;
+    audio_buf->data = p_data;
+    return audio_buf;
+}
+
+void esp_hf_ag_audio_buff_free(esp_hf_audio_buff_t *audio_buf)
+{
+    if (audio_buf == NULL) {
+        return;
+    }
+    BTA_AgAudioBuffFree((UINT8 *)audio_buf);
+}
+
+esp_err_t esp_hf_ag_audio_data_send(esp_hf_sync_conn_hdl_t sync_conn_hdl, esp_hf_audio_buff_t *audio_buf)
+{
+    if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) {
+        return ESP_ERR_INVALID_STATE;
+    }
+
+    if (audio_buf == NULL || audio_buf->data_len == 0) {
+        return ESP_ERR_INVALID_ARG;
+    }
+
+    if (btc_hf_ag_audio_data_send(sync_conn_hdl, (uint8_t *)audio_buf, audio_buf->data, audio_buf->data_len)) {
+        return ESP_OK;
+    }
+    return ESP_FAIL;
+}
+
 esp_err_t esp_hf_ag_pkt_stat_nums_get(uint16_t sync_conn_handle)
 {
     if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) {

components/bt/host/bluedroid/api/esp_hf_client_api.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -541,6 +541,71 @@ void esp_hf_client_outgoing_data_ready(void)
     BTA_HfClientCiData();
 }
 
+esp_err_t esp_hf_client_register_audio_data_callback(esp_hf_client_audio_data_cb_t callback)
+{
+    if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) {
+        return ESP_ERR_INVALID_STATE;
+    }
+
+    btc_msg_t msg;
+    msg.sig = BTC_SIG_API_CALL;
+    msg.pid = BTC_PID_HF_CLIENT;
+    msg.act = BTC_HF_CLIENT_REGISTER_AUDIO_DATA_CALLBACK_EVT;
+
+    btc_hf_client_args_t arg;
+    memset(&arg, 0, sizeof(btc_hf_client_args_t));
+    arg.reg_audio_data_cb.callback = callback;
+
+    /* Switch to BTC context */
+    bt_status_t stat = btc_transfer_context(&msg, &arg, sizeof(btc_hf_client_args_t), NULL, NULL);
+    return (stat == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL;
+}
+
+esp_hf_audio_buff_t *esp_hf_client_audio_buff_alloc(uint16_t size)
+{
+    if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) {
+        return NULL;
+    }
+
+    if (size == 0) {
+        return NULL;
+    }
+
+    uint8_t *p_buf = NULL, *p_data;
+    BTA_HfClientAudioBuffAlloc(size, &p_buf, &p_data);
+    if (p_buf == NULL) {
+        return NULL;
+    }
+
+    esp_hf_audio_buff_t *audio_buf = (esp_hf_audio_buff_t *)p_buf;
+    audio_buf->buff_size = size;
+    audio_buf->data_len = 0;
+    audio_buf->data = p_data;
+    return audio_buf;
+}
+
+void esp_hf_client_audio_buff_free(esp_hf_audio_buff_t *audio_buf)
+{
+    if (audio_buf == NULL) {
+        return;
+    }
+    BTA_HfClientAudioBuffFree((UINT8 *)audio_buf);
+}
+
+esp_err_t esp_hf_client_audio_data_send(esp_hf_sync_conn_hdl_t sync_conn_hdl, esp_hf_audio_buff_t *audio_buf)
+{
+    if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) {
+        return ESP_ERR_INVALID_STATE;
+    }
+
+    if (audio_buf == NULL || audio_buf->data_len == 0) {
+        return ESP_ERR_INVALID_ARG;
+    }
+
+    BTA_HfClientAudioDataSend(sync_conn_hdl, (uint8_t *)audio_buf, audio_buf->data, audio_buf->data_len);
+    return ESP_OK;
+}
+
 void esp_hf_client_pcm_resample_init(uint32_t src_sps, uint32_t bits, uint32_t channels)
 {
     BTA_DmPcmInitSamples(src_sps, bits, channels);