diff --git a/CMakeLists.txt b/CMakeLists.txt index 30c9c41..c405182 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/Kconfig.projbuild b/Kconfig.projbuild index 78abfa2..ac41be8 100644 --- a/Kconfig.projbuild +++ b/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 diff --git a/include/esp32p4/esp_afe_config.h b/include/esp32p4/esp_afe_config.h index 9653f74..ff04665 100644 --- a/include/esp32p4/esp_afe_config.h +++ b/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, \ diff --git a/lib/esp32p4/libc_speech_features.a b/lib/esp32p4/libc_speech_features.a index 76a9c69..9ca211d 100644 Binary files a/lib/esp32p4/libc_speech_features.a and b/lib/esp32p4/libc_speech_features.a differ diff --git a/lib/esp32p4/libdl_lib.a b/lib/esp32p4/libdl_lib.a index 2dc42df..3e04623 100644 Binary files a/lib/esp32p4/libdl_lib.a and b/lib/esp32p4/libdl_lib.a differ diff --git a/lib/esp32p4/libesp_audio_front_end.a b/lib/esp32p4/libesp_audio_front_end.a index e7ac339..ed55258 100644 Binary files a/lib/esp32p4/libesp_audio_front_end.a and b/lib/esp32p4/libesp_audio_front_end.a differ diff --git a/lib/esp32p4/libesp_audio_processor.a b/lib/esp32p4/libesp_audio_processor.a index 6bf5dfd..f64f2fd 100644 Binary files a/lib/esp32p4/libesp_audio_processor.a and b/lib/esp32p4/libesp_audio_processor.a differ diff --git a/lib/esp32p4/libmultinet.a b/lib/esp32p4/libmultinet.a index 64de3ff..8463c14 100644 Binary files a/lib/esp32p4/libmultinet.a and b/lib/esp32p4/libmultinet.a differ diff --git a/lib/esp32p4/libnsnet.a b/lib/esp32p4/libnsnet.a new file mode 100644 index 0000000..7aabeda Binary files /dev/null and b/lib/esp32p4/libnsnet.a differ diff --git a/lib/esp32p4/libwakenet.a b/lib/esp32p4/libwakenet.a index 4ad1380..c673904 100644 Binary files a/lib/esp32p4/libwakenet.a and b/lib/esp32p4/libwakenet.a differ