bugfix: Fix wrong format of multinet2 output

2025-09-15 15:28:44 +08:00 · 2023-11-21 19:45:37 +08:00 · 2023-11-21 19:45:37 +08:00 · a3e00ed3e6
commit a3e00ed3e6
parent c22423d2d4
9 changed files with 7 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -77,6 +77,7 @@ elseif(${IDF_TARGET} STREQUAL "esp32s3")
    add_prebuilt_library(multinet "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32s3/libmultinet.a" PRIV_REQUIRES ${COMPONENT_NAME})
    add_prebuilt_library(esp_audio_front_end "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32s3/libesp_audio_front_end.a" PRIV_REQUIRES ${COMPONENT_NAME})
    add_prebuilt_library(hufzip "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32s3/libhufzip.a" PRIV_REQUIRES ${COMPONENT_NAME})
+    add_prebuilt_library(nsnet "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32s3/libnsnet.a" PRIV_REQUIRES ${COMPONENT_NAME})

    idf_component_get_property(esp_dsp_lib espressif__esp-dsp COMPONENT_LIB)

@ -89,11 +90,11 @@ elseif(${IDF_TARGET} STREQUAL "esp32s3")
        esp_audio_front_end
        esp_audio_processor
        multinet
-	flite_g2p
+        flite_g2p
        esp_tts_chinese
        voice_set_xiaole
+        nsnet
        wakenet
-	nsnet
        "-Wl,--end-group")

    set(MVMODEL_EXE ${COMPONENT_PATH}/model/movemodel.py)
--- a/lib/esp32/libc_speech_features.a
+++ b/lib/esp32/libc_speech_features.a
--- a/lib/esp32/libdl_lib.a
+++ b/lib/esp32/libdl_lib.a
--- a/lib/esp32/libesp_audio_front_end.a
+++ b/lib/esp32/libesp_audio_front_end.a
--- a/lib/esp32/libesp_audio_processor.a
+++ b/lib/esp32/libesp_audio_processor.a
--- a/lib/esp32/libmultinet.a
+++ b/lib/esp32/libmultinet.a
--- a/lib/esp32/libwakenet.a
+++ b/lib/esp32/libwakenet.a
--- a/lib/esp32/libwakeword_model.a
+++ b/lib/esp32/libwakeword_model.a
--- a/src/esp_mn_speech_commands.c
+++ b/src/esp_mn_speech_commands.c
@ -15,7 +15,10 @@ static model_iface_data_t *esp_mn_model_data = NULL;
 void *_esp_mn_calloc_(int n, int size)
 {
 #ifdef ESP_PLATFORM
-    return heap_caps_calloc(n, size, MALLOC_CAP_SPIRAM);
+    void *data = heap_caps_calloc(n, size, MALLOC_CAP_SPIRAM);
+    if (data == NULL) 
+        data = calloc(n, size);
+    return data;
 #else
    return calloc(n, size);
 #endif