Merge branch 'feature/gmf_loader' into 'main'

gmf_loader: Add loader of gmf io & elements

See merge request adf/multimedia/esp-gmf!63

Author: jason-mao

README.md

@@ -41,6 +41,7 @@ Advanced components are encapsulation modules in ESP-GMF that target specific ap
 | Component Name | Function | Dependent Components |
 | :------------: | :------------: | :------------ |
 | [esp_audio_simple_player](./packages/esp_audio_simple_player) | Simple audio player | - `gmf_audio`<br>- `gmf_io` |
+| [gmf_loader](./packages/gmf_loader) | Set up the given GMF pool using the configuration selected via `Kconfig` | - `gmf_core`<br>- `gmf_io`<br>- `gmf_audio`<br>- `gmf_ai_audio`<br>- `esp_codec_dev`<br>- `esp_audio_codec` |
 
 # ESP-GMF Usage Guide
 

README_CN.md

@@ -41,6 +41,7 @@ ESP-GMF 各个模块以组件的形式存在，组件又按功能分为**原子
 |  组件名称 |  功能 | 依赖的组件  |
 | :------------: | :------------:|:------------ |
 |  [esp_audio_simple_player](./packages/esp_audio_simple_player) | 简单的音频播放器 | - `gmf_audio`<br>- `gmf_io` |
+|  [gmf_loader](./packages/gmf_loader) | 使用 `Kconfig` 选择的配置<br>设置给定的 GMF Pool | - `gmf_core`<br>- `gmf_io`<br>- `gmf_audio`<br>- `gmf_ai_audio`<br>- `esp_codec_dev`<br>- `esp_audio_codec` |
 
 # ESP-GMF 使用说明
 

elements/gmf_ai_audio/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## *Unreleased*
+
+### Features
+
+- Add API `esp_gmf_afe_set_event_cb` to set AFE element event callback
+
 ## v0.6.2
 
 ### Features
@@ -16,4 +22,4 @@
 
 ### Features
 
-- Initial version of GMF AI Audio Elements
+- Initial version of GMF AI Audio Elements

elements/gmf_ai_audio/examples/aec_rec/main/idf_component.yml

@@ -12,4 +12,5 @@ dependencies:
     version: "^0.6"
   espressif/gmf_ai_audio:
     override_path: ../../../../gmf_ai_audio
-
+  espressif/gmf_loader:
+    version: "^0.6"

elements/gmf_ai_audio/examples/aec_rec/main/main.c

@@ -7,25 +7,26 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "esp_err.h"
+#include "esp_log.h"
+
+#include "esp_codec_dev.h"
 #include "esp_gmf_err.h"
+#include "esp_gmf_io_codec_dev.h"
 #include "esp_gmf_obj.h"
 #include "esp_gmf_payload.h"
 #include "esp_gmf_port.h"
-
-#include "esp_err.h"
-#include "esp_log.h"
-
 #include "esp_gmf_aec.h"
 #include "esp_gmf_element.h"
 #include "esp_gmf_pipeline.h"
 #include "esp_gmf_pool.h"
 #include "esp_gmf_setup_peripheral.h"
-#include "esp_gmf_setup_pool.h"
 #include "esp_gmf_rate_cvt.h"
 #include "esp_gmf_bit_cvt.h"
 #include "esp_gmf_ch_cvt.h"
 #include "esp_gmf_audio_helper.h"
 #include "cli.h"
+#include "gmf_loader_setup_defaults.h"
 
 #define BOARD_LYRAT_MINI (0)
 #define BOARD_KORVO_2    (1)
@@ -127,20 +128,7 @@ void app_main(void)
 
     esp_gmf_pool_handle_t pool = NULL;
     esp_gmf_pool_init(&pool);
-    pool_register_io(pool);
-    pool_register_audio_codecs(pool);
-    pool_register_audio_effects(pool);
-    pool_register_codec_dev_io(pool, play_dev, record_dev);
-
-    esp_gmf_element_handle_t gmf_aec_handle = NULL;
-    esp_gmf_aec_cfg_t gmf_aec_cfg = {
-        .filter_len = 4,
-        .type = AFE_TYPE_VC,
-        .mode = AFE_MODE_HIGH_PERF,
-        .input_format = INPUT_CH_ALLOCATION,
-    };
-    esp_gmf_aec_init(&gmf_aec_cfg, &gmf_aec_handle);
-    esp_gmf_pool_register_element(pool, gmf_aec_handle, NULL);
+    gmf_loader_setup_all_defaults(pool);
 
     ESP_GMF_POOL_SHOW_ITEMS(pool);
     esp_gmf_pipeline_handle_t read_pipe = NULL;
@@ -155,6 +143,8 @@ void app_main(void)
         ESP_LOGE(TAG, "There is no pipeline");
         return;
     }
+    esp_gmf_io_codec_dev_set_dev(ESP_GMF_PIPELINE_GET_IN_INSTANCE(read_pipe), record_dev);
+
     esp_gmf_port_handle_t out_port = NEW_ESP_GMF_PORT_OUT_BYTE(pcm_buf_acq_write, pcm_buf_release_write, NULL, NULL, 1024, portMAX_DELAY);
     esp_gmf_element_register_out_port(read_pipe->last_el, out_port);
     esp_gmf_obj_handle_t rate_cvt = NULL;
@@ -188,6 +178,8 @@ void app_main(void)
         ESP_LOGE(TAG, "There is no play pipeline");
         return;
     }
+    esp_gmf_io_codec_dev_set_dev(ESP_GMF_PIPELINE_GET_OUT_INSTANCE(play_pipe), play_dev);
+
     esp_gmf_obj_handle_t bit_cvt = NULL;
     esp_gmf_pipeline_get_el_by_name(play_pipe, "bit_cvt", &bit_cvt);
     esp_gmf_bit_cvt_set_dest_bits(bit_cvt, DAC_I2S_BITS);
@@ -226,11 +218,11 @@ void app_main(void)
     }
     heap_caps_free(pcm_buffer);
 
-    pool_unregister_audio_codecs();
     esp_gmf_task_deinit(read_task);
     esp_gmf_task_deinit(play_task);
     esp_gmf_pipeline_destroy(read_pipe);
     esp_gmf_pipeline_destroy(play_pipe);
+    gmf_loader_teardown_all_defaults(pool);
     esp_gmf_pool_deinit(pool);
     esp_gmf_teardown_periph_codec(play_dev, record_dev);
     esp_gmf_teardown_periph_i2c(0);

elements/gmf_ai_audio/examples/common/gmf_setup/esp_gmf_setup_peripheral.c

@@ -7,7 +7,6 @@
 #include "esp_log.h"
 #include "driver/sdmmc_host.h"
 #include "vfs_fat_internal.h"
-#include "esp_wifi.h"
 #include "esp_event.h"
 #include "nvs_flash.h"
 #include "esp_gmf_oal_mem.h"
@@ -25,9 +24,11 @@
 #include "esp_codec_dev_defaults.h"
 #endif  /* USE_ESP_GMF_ESP_CODEC_DEV_IO */
 
-#define WIFI_CONNECTED_BIT     BIT0
-#define WIFI_FAIL_BIT          BIT1
-#define WIFI_RECONNECT_RETRIES 30
+typedef enum {
+    I2S_CREATE_MODE_TX_ONLY   = 0,
+    I2S_CREATE_MODE_RX_ONLY   = 1,
+    I2S_CREATE_MODE_TX_AND_RX = 2,
+} i2s_create_mode_t;
 
 #ifdef USE_ESP_GMF_ESP_CODEC_DEV_IO
 i2s_chan_handle_t            rx_handle   = NULL;
@@ -43,22 +44,8 @@ const audio_codec_if_t      *out_codec_if = NULL;
 const audio_codec_gpio_if_t *gpio_if = NULL;
 #endif  /* USE_ESP_GMF_ESP_CODEC_DEV_IO */
 
-#ifndef CONFIG_EXAMPLE_ESP_GMF_WIFI
-#define CONFIG_EXAMPLE_ESP_GMF_WIFI_SSID "****"
-#define CONFIG_EXAMPLE_ESP_GMF_WIFI_PASS "****"
-#endif  /* CONFIG_EXAMPLE_ESP_GMF_WIFI */
-
-typedef enum {
-    I2S_CREATE_MODE_TX_ONLY   = 0,
-    I2S_CREATE_MODE_RX_ONLY   = 1,
-    I2S_CREATE_MODE_TX_AND_RX = 2,
-} i2s_create_mode_t;
-
-static const char        *TAG = "SETUP_PERIPH";
-static esp_netif_t       *s_esp_gmf_setup_sta_netif;
-static EventGroupHandle_t s_wifi_event_group;
-static int                s_retry_num = 0;
-i2c_master_bus_handle_t   i2c_handle  = NULL;
+static const char      *TAG        = "SETUP_PERIPH";
+i2c_master_bus_handle_t i2c_handle = NULL;
 
 #ifdef USE_ESP_GMF_ESP_CODEC_DEV_IO
 static esp_err_t setup_periph_i2s_tx_init(esp_gmf_setup_periph_aud_info *aud_info)
@@ -342,92 +329,6 @@ void esp_gmf_teardown_periph_sdmmc(void *card)
     esp_vfs_fat_sdcard_unmount("/sdcard", card);
 }
 
-static void event_handler(void *arg, esp_event_base_t event_base,
-                          int32_t event_id, void *event_data)
-{
-    if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_START) {
-        esp_wifi_connect();
-    } else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED) {
-        if (s_retry_num < WIFI_RECONNECT_RETRIES) {
-            esp_wifi_connect();
-            s_retry_num++;
-            ESP_LOGI(TAG, "Retry to connect to the AP");
-        } else {
-            xEventGroupSetBits(s_wifi_event_group, WIFI_FAIL_BIT);
-        }
-        ESP_LOGI(TAG, "connect to the AP fail");
-    } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
-        ip_event_got_ip_t *event = (ip_event_got_ip_t *)event_data;
-        ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip));
-        s_retry_num = 0;
-        xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT);
-    }
-}
-
-void esp_gmf_setup_periph_wifi(void)
-{
-    esp_err_t ret = nvs_flash_init();
-    if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {
-        ESP_ERROR_CHECK(nvs_flash_erase());
-        ret = nvs_flash_init();
-    }
-    ESP_ERROR_CHECK(ret);
-    s_wifi_event_group = xEventGroupCreate();
-    ESP_ERROR_CHECK(esp_netif_init());
-    ESP_ERROR_CHECK(esp_event_loop_create_default());
-    s_esp_gmf_setup_sta_netif = esp_netif_create_default_wifi_sta();
-    wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
-    ESP_ERROR_CHECK(esp_wifi_init(&cfg));
-    esp_event_handler_instance_t instance_any_id;
-    esp_event_handler_instance_t instance_got_ip;
-    ESP_ERROR_CHECK(esp_event_handler_instance_register(WIFI_EVENT,
-                                                        ESP_EVENT_ANY_ID,
-                                                        &event_handler,
-                                                        NULL,
-                                                        &instance_any_id));
-    ESP_ERROR_CHECK(esp_event_handler_instance_register(IP_EVENT,
-                                                        IP_EVENT_STA_GOT_IP,
-                                                        &event_handler,
-                                                        NULL,
-                                                        &instance_got_ip));
-    wifi_config_t wifi_config = {
-        .sta = {
-            .ssid = CONFIG_EXAMPLE_ESP_GMF_WIFI_SSID,
-            .password = CONFIG_EXAMPLE_ESP_GMF_WIFI_PASS,
-        },
-    };
-    ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
-    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
-    ESP_ERROR_CHECK(esp_wifi_start());
-    ESP_LOGI(TAG, "wifi_init_sta finished.");
-    EventBits_t bits = xEventGroupWaitBits(s_wifi_event_group,
-                                           WIFI_CONNECTED_BIT | WIFI_FAIL_BIT, pdFALSE, pdFALSE, portMAX_DELAY);
-    if (bits & WIFI_CONNECTED_BIT) {
-        ESP_LOGI(TAG, "connected to ap SSID:%s password:%s",
-                 CONFIG_EXAMPLE_ESP_GMF_WIFI_SSID, CONFIG_EXAMPLE_ESP_GMF_WIFI_PASS);
-    } else if (bits & WIFI_FAIL_BIT) {
-        ESP_LOGI(TAG, "Failed to connect to SSID:%s, password:%s",
-                 CONFIG_EXAMPLE_ESP_GMF_WIFI_SSID, CONFIG_EXAMPLE_ESP_GMF_WIFI_PASS);
-    } else {
-        ESP_LOGE(TAG, "UNEXPECTED EVENT");
-    }
-}
-
-void esp_gmf_teardown_periph_wifi(void)
-{
-    esp_wifi_disconnect();
-    esp_err_t err = esp_wifi_stop();
-    if (err == ESP_ERR_WIFI_NOT_INIT) {
-        ESP_LOGE(TAG, "WIFI stop got an error");
-        return;
-    }
-    ESP_ERROR_CHECK(esp_wifi_deinit());
-    esp_event_loop_delete_default();
-    ESP_ERROR_CHECK(esp_wifi_clear_default_wifi_driver_and_handlers(s_esp_gmf_setup_sta_netif));
-    esp_netif_destroy(s_esp_gmf_setup_sta_netif);
-    s_esp_gmf_setup_sta_netif = NULL;
-}
-
 void esp_gmf_setup_periph_i2c(int port)
 {
     i2c_master_bus_config_t i2c_config = {