Merge branch 'feat/nsnet2' into 'master'

feat(esp32p4): Support nsnet2 for esp32p4

See merge request speech-recognition-framework/esp-sr!107

CMakeLists.txt

@@ -156,6 +156,7 @@ elseif(${IDF_TARGET} STREQUAL "esp32p4")
     add_prebuilt_library(multinet "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32p4/libmultinet.a" PRIV_REQUIRES ${COMPONENT_NAME})
     add_prebuilt_library(esp_audio_front_end "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32p4/libesp_audio_front_end.a" PRIV_REQUIRES ${COMPONENT_NAME})
     add_prebuilt_library(hufzip "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32p4/libhufzip.a" PRIV_REQUIRES ${COMPONENT_NAME})
+    add_prebuilt_library(nsnet "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32p4/libnsnet.a" PRIV_REQUIRES ${COMPONENT_NAME})
 
     idf_component_get_property(esp_dsp_lib espressif__esp-dsp COMPONENT_LIB)
 
@@ -172,6 +173,7 @@ elseif(${IDF_TARGET} STREQUAL "esp32p4")
         esp_tts_chinese
         voice_set_xiaole
         wakenet
+        nsnet
         "-Wl,--end-group")
 
     set(MVMODEL_EXE ${COMPONENT_PATH}/model/movemodel.py)

Kconfig.projbuild

@@ -48,7 +48,7 @@ choice SR_NSN_MODEL_LOAD
         depends on IDF_TARGET_ESP32S3
     config SR_NSN_NSNET2
         bool "Deep noise suppression v2 (nsnet2)"
-	depends on IDF_TARGET_ESP32S3
+	depends on IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32P4
 endchoice
 
 config USE_WAKENET

idf_component.yml

@@ -3,7 +3,7 @@ description: esp_sr provides basic algorithms for Speech Recognition application
 url: https://github.com/espressif/esp-sr
 dependencies:
   idf: ">=4.4"
-  espressif/esp-dsp: "^1.2.1"
+  espressif/esp-dsp: "<=1.5.0"
 files:
   exclude:
     - ".github"

include/esp32p4/esp_afe_config.h

@@ -137,7 +137,7 @@ typedef struct {
     .vad_mode = VAD_MODE_3, \
     .wakenet_model_name = NULL, \
     .wakenet_model_name_2 = NULL, \
-    .wakenet_mode = DET_MODE_3CH_90, \
+    .wakenet_mode = DET_MODE_90, \
     .afe_mode = SR_MODE_LOW_COST, \
     .afe_perferred_core = 0, \
     .afe_perferred_priority = 5, \
@@ -145,8 +145,8 @@ typedef struct {
     .memory_alloc_mode = AFE_MEMORY_ALLOC_MORE_PSRAM, \
     .afe_linear_gain = 1.0, \
     .agc_mode = AFE_MN_PEAK_AGC_MODE_2, \
-    .pcm_config.total_ch_num = 3, \
-    .pcm_config.mic_num = 2, \
+    .pcm_config.total_ch_num = 2, \
+    .pcm_config.mic_num = 1, \
     .pcm_config.ref_num = 1, \
     .pcm_config.sample_rate = 16000, \
     .debug_init = false, \