Merge branch 'feature/wwe_add_p4_func_ev_support' into 'main'

feat(esp_ai_audio): Add esp32p4 function ev board support to example `wwe`

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

Author: jason-mao

elements/gmf_ai_audio/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v0.7.3
+
+### Features
+
+- Added default sdkconfig for esp32p4 in wwe example
+
+### Bug Fixes
+
+- Fixed build error for esp32p4
+
 ## v0.7.2
 
 ### Features

elements/gmf_ai_audio/examples/wwe/main/main.c

@@ -42,6 +42,7 @@
 #define BOARD_KORVO_2    (1)
 #define BOARD_XD_AIOT_C3 (2)
 #define BOARD_ESP_SPOT   (3)
+#define BOARD_P4_FUN_EV  (4)
 
 #if defined CONFIG_IDF_TARGET_ESP32S3
 #define WITH_AFE    (true)
@@ -55,6 +56,9 @@
 #elif defined CONFIG_IDF_TARGET_ESP32C5
 #define WITH_AFE    (false)
 #define AUDIO_BOARD (BOARD_ESP_SPOT)
+#elif defined CONFIG_IDF_TARGET_ESP32P4
+#define WITH_AFE    (true)
+#define AUDIO_BOARD (BOARD_P4_FUN_EV)
 #endif  /* defined CONFIG_IDF_TARGET_ESP32S3 */
 
 #if AUDIO_BOARD == BOARD_KORVO_2
@@ -78,6 +82,11 @@
 #define ADC_I2S_BITS        (16)
 #define INPUT_CH_NUM        (ADC_I2S_CH)
 #define INPUT_CH_BITS       (ADC_I2S_BITS)
+#elif AUDIO_BOARD == BOARD_P4_FUN_EV
+#define ADC_I2S_CH          (2)
+#define ADC_I2S_BITS        (16)
+#define INPUT_CH_NUM        (ADC_I2S_CH)
+#define INPUT_CH_BITS       (ADC_I2S_BITS)
 #endif  /* AUDIO_BOARD == BOARD_KORVO_2 */
 
 #if WITH_AFE == true

elements/gmf_ai_audio/examples/wwe/sdkconfig.defaults.esp32p4

@@ -0,0 +1,59 @@
+
+CONFIG_IDF_TARGET="esp32p4"
+CONFIG_IDF_TARGET_ESP32P4=y
+
+CONFIG_IDF_EXPERIMENTAL_FEATURES=y
+
+#
+# Partition Table
+#
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
+# end of Partition Table
+
+#
+# ESP Speech Recognition
+#
+CONFIG_MODEL_IN_FLASH=y
+CONFIG_AFE_INTERFACE_V1=y
+CONFIG_SR_NSN_WEBRTC=y
+CONFIG_SR_VADN_WEBRTC=y
+CONFIG_SR_WN_WN9S_HILEXIN=y
+CONFIG_SR_MN_CN_MULTINET7_QUANT=y
+CONFIG_SR_MN_EN_NONE=y
+# end of ESP Speech Recognition
+
+#
+# ESP PSRAM
+#
+CONFIG_SPIRAM=y
+
+#
+# PSRAM config
+#
+CONFIG_SPIRAM_MODE_HEX=y
+CONFIG_SPIRAM_SPEED_200M=y
+CONFIG_SPIRAM_SPEED=200
+CONFIG_SPIRAM_BOOT_INIT=y
+CONFIG_SPIRAM_USE_MALLOC=y
+CONFIG_SPIRAM_MEMTEST=y
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
+CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
+
+#
+# GMF AI Audio
+#
+CONFIG_GMF_AI_AUDIO_INIT_AEC=y
+CONFIG_GMF_AI_AUDIO_INIT_AFE=y
+
+CONFIG_GMF_AI_AUDIO_AFE_VAD_ENABLE=y
+CONFIG_GMF_AI_AUDIO_AFE_AEC_ENABLE=y
+CONFIG_GMF_AI_AUDIO_AEC_CH_ALLOCATION="MR"
+CONFIG_GMF_AI_AUDIO_AFE_CH_ALLOCATION="MR"
+
+CONFIG_GMF_AI_AUDIO_WAKEUP_ENABLE=y
+CONFIG_GMF_AI_AUDIO_VOICE_COMMAND_ENABLE=y
+# end of GMF AI Audio
+
+CONFIG_AUDIO_BOARD="ESP32_P4_DEV_V14"

elements/gmf_ai_audio/idf_component.yml

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

elements/gmf_ai_audio/src/esp_gmf_afe.c

@@ -361,9 +361,7 @@ static void mn_afe_monitor(afe_fetch_result_t *result, void *user_ctx)
                 esp_gmf_afe_vcmd_info_t vcmd_info = {
                     .phrase_id = mn_result->phrase_id[0],
                     .prob = mn_result->prob[0]};
-                size_t max_copy = ESP_GMF_AFE_VCMD_MAX_LEN - 1;
-                strncpy(vcmd_info.str, mn_result->string, max_copy);
-                vcmd_info.str[max_copy] = '\0';
+                strlcpy(vcmd_info.str, mn_result->string, sizeof(vcmd_info.str));
                 event_2_user(gmf_afe, vcmd_info.phrase_id, &vcmd_info, sizeof(esp_gmf_afe_vcmd_info_t));
 
                 break;