gmf_ai_audio: Fixed build issue and update gmf_ai_audio to 0.6.1

Author: JosephTang

README.md

@@ -11,7 +11,7 @@ ESP-GMF consists of three modules: **GMF-Core**, **GMF-Elements**, and **GMF-Exa
 
 # ESP-GMF Component Overview
 
-Each ESP-GMF functional module exists as a component, currently including [GMF-Core](./gmf_core/README.md), [GMF-Audio](./gmf_elements/gmf_audio/README.md),  [GMF-Misc](./gmf_elements/gmf_misc/README.md), [GMF-IO](./gmf_elements/gmf_io/README.md), and [GMF-AI-Audio](./gmf_elements/gmf_ai_audio/README.md).
+Each ESP-GMF functional module exists as a component, currently including [GMF-Core](./gmf_core/README.md), [GMF-Audio](./gmf_elements/gmf_audio/README.md), [GMF-Misc](./gmf_elements/gmf_misc/README.md), [GMF-IO](./gmf_elements/gmf_io/README.md), and [GMF-AI-Audio](./gmf_elements/gmf_ai_audio/README.md).
 
 | Component Name | Function | Dependent Components |
 | :------------: | :------------: | :------------ |

examples/basic_examples/pipeline_play_embed_music/main/idf_component.yml

@@ -5,6 +5,8 @@ dependencies:
     override_path: ../../../../gmf_elements/gmf_io
   espressif/gmf_misc:
     override_path: ../../../../gmf_elements/gmf_misc
+  espressif/gmf_core:
+    override_path: ../../../../gmf_core
   espressif/esp_wifi_remote:
     version: '*'
     rules:

examples/basic_examples/pipeline_play_sdcard_music/main/idf_component.yml

@@ -5,6 +5,8 @@ dependencies:
     override_path: ../../../../gmf_elements/gmf_io
   espressif/gmf_misc:
     override_path: ../../../../gmf_elements/gmf_misc
+  espressif/gmf_core:
+    override_path: ../../../../gmf_core
   espressif/esp_wifi_remote:
     version: '*'
     rules:

examples/basic_examples/pipeline_record_sdcard/main/idf_component.yml

@@ -5,6 +5,8 @@ dependencies:
     override_path: ../../../../gmf_elements/gmf_io
   espressif/gmf_misc:
     override_path: ../../../../gmf_elements/gmf_misc
+  espressif/gmf_core:
+    override_path: ../../../../gmf_core
   espressif/esp_wifi_remote:
     version: '*'
     rules:

gmf_elements/gmf_ai_audio/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.6.1
+
+### Bug Fixes
+
+- Fixed a build issue caused by a variable type mismatch
+
 ## v0.6.0
 
 ### Features

gmf_elements/gmf_ai_audio/examples/wwe/main/main.c

@@ -192,7 +192,7 @@ void app_main(void)
         .port_num = ADC_I2S_PORT,
     };
     void *record_dev = NULL;
-    ret = esp_gmf_setup_periph_codec(&audio_info, &audio_info, NULL, &record_dev);
+    ret = esp_gmf_setup_periph_codec(NULL, &audio_info, NULL, &record_dev);
     ESP_GMF_RET_ON_NOT_OK(TAG, ret, { return;}, "Failed to setup audio codec");
     g_event_group = xEventGroupCreate();
 

gmf_elements/gmf_ai_audio/idf_component.yml

@@ -1,4 +1,4 @@
-version: "0.6.0"
+version: "0.6.1"
 description: Espressif GMF AI Audio Elements Module
 url: https://github.com/espressif/esp-gmf/tree/main/gmf_elements/gmf_ai_audio
 documentation: "https://github.com/espressif/esp-gmf/blob/main/gmf_elements/gmf_ai_audio/README.md"

gmf_elements/gmf_ai_audio/src/esp_gmf_afe.c

@@ -434,7 +434,9 @@ static esp_gmf_job_err_t esp_gmf_afe_close(esp_gmf_audio_element_handle_t self,
 {
     esp_gmf_afe_t *gmf_afe = (esp_gmf_afe_t *)self;
     esp_gmf_afe_cfg_t *cfg = OBJ_GET_CFG(self);
-    vcmd_det_cancel(gmf_afe);
+    if (cfg->vcmd_detect_en) {
+        vcmd_det_cancel(gmf_afe);
+    }
     esp_gmf_afe_manager_set_read_cb(cfg->afe_manager, NULL, NULL);
     esp_gmf_afe_manager_set_result_cb(cfg->afe_manager, NULL, NULL);
 
@@ -622,8 +624,8 @@ esp_gmf_err_t esp_gmf_afe_init(void *config, esp_gmf_obj_handle_t *handle)
 static esp_gmf_err_t esp_gmf_afe_set_vcmd_detection(esp_gmf_element_handle_t handle, bool enable)
 {
     ESP_GMF_NULL_CHECK(TAG, handle, {return ESP_GMF_ERR_INVALID_ARG;});
-    esp_gmf_method_t *method_head = NULL;
-    esp_gmf_method_t *method = NULL;
+    const esp_gmf_method_t *method_head = NULL;
+    const esp_gmf_method_t *method = NULL;
     esp_gmf_element_get_method((esp_gmf_element_handle_t)handle, &method_head);
     esp_gmf_method_found(method_head, ESP_GMF_METHOD_AFE_START_VCMD_DET, &method);
     uint8_t buf[1] = { enable };

gmf_elements/test_apps/main/CMakeLists.txt

@@ -4,6 +4,6 @@ idf_component_register(SRCS "test_gmf_core_main.c" "elements/gmf_audio_play_com.
                             "elements/gmf_audio_rec_el_test.c"
                             "elements/gmf_ai_audio_test.c"
                        INCLUDE_DIRS "." "elements"
-                       REQUIRES unity gmf_core esp_codec_dev system_common test_utils
+                       REQUIRES unity esp_codec_dev system_common test_utils
                        EMBED_FILES "hi_lexin.pcm"
                        WHOLE_ARCHIVE)

gmf_elements/test_apps/main/elements/gmf_ai_audio_test.c

@@ -190,8 +190,9 @@ static int aec_acquire_write(void *handle, esp_gmf_payload_t *load, int wanted_s
 static int aec_release_write(void *handle, esp_gmf_payload_t *load, int block_ticks)
 {
     uint8_t *dest = (uint8_t *)handle;
+#ifdef CONFIG_IDF_TARGET_ESP32S3
     analyze_frequency((int16_t *)load->buf, load->valid_size / 2);
-
+#endif /* CONFIG_IDF_TARGET_ESP32S3 */
     if (out_count < SIGNAL_LEN * 2) {
         if (out_count + load->valid_size > SIGNAL_LEN * 2) {
             load->valid_size = SIGNAL_LEN * 2 - out_count;
@@ -241,12 +242,12 @@ TEST_CASE("Test gmf aec process", "[ESP_GMF_AEC]")
         .filter_len = 4,
         .type = AFE_TYPE_VC,
         .mode = AFE_MODE_HIGH_PERF,
-        .input_format = "RM",
+        .input_format = (char *)"RM",
     };
     esp_gmf_aec_init(&gmf_aec_cfg, &gmf_aec_handle);
     esp_gmf_cap_t *caps = NULL;
     esp_gmf_cap_t *out_caps = NULL;
-    TEST_ASSERT_EQUAL(ESP_GMF_ERR_OK, esp_gmf_element_get_caps(gmf_aec_handle, &caps));
+    TEST_ASSERT_EQUAL(ESP_GMF_ERR_OK, esp_gmf_element_get_caps(gmf_aec_handle, (const esp_gmf_cap_t **)&caps));
     TEST_ASSERT_EQUAL(ESP_GMF_ERR_OK, esp_gmf_cap_fetch_node(caps, ESP_GMF_CAPS_AUDIO_AEC, &out_caps));
 
     esp_gmf_element_register_in_port(gmf_aec_handle, in_port);
@@ -431,7 +432,7 @@ TEST_CASE("Test gmf afe process", "[ESP_GMF_AFE]")
     TEST_ASSERT_EQUAL(ESP_GMF_ERR_OK, esp_gmf_afe_init(&gmf_afe_cfg, &gmf_afe));
     esp_gmf_cap_t *caps = NULL;
     esp_gmf_cap_t *out_caps = {0};
-    TEST_ASSERT_EQUAL(ESP_GMF_ERR_OK, esp_gmf_element_get_caps(gmf_afe, &caps));
+    TEST_ASSERT_EQUAL(ESP_GMF_ERR_OK, esp_gmf_element_get_caps(gmf_afe, (const esp_gmf_cap_t **)&caps));
     TEST_ASSERT_EQUAL(ESP_GMF_ERR_OK, esp_gmf_cap_fetch_node(caps, ESP_GMF_CAPS_AUDIO_AEC, &out_caps));
     TEST_ASSERT_EQUAL(ESP_GMF_ERR_OK, esp_gmf_cap_fetch_node(caps, ESP_GMF_CAPS_AUDIO_NS, &out_caps));
     TEST_ASSERT_EQUAL(ESP_GMF_ERR_OK, esp_gmf_cap_fetch_node(caps, ESP_GMF_CAPS_AUDIO_AGC, &out_caps));