diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b65bb86..fe6246b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -143,7 +143,7 @@ build_esp_sr: - .rules:build:test_esp_sr parallel: matrix: - - IMAGE: [espressif/idf:release-v5.3, espressif/idf:latest] + - IMAGE: [espressif/idf:release-v5.4, espressif/idf:latest] EXAMPLES_PATH: "test_apps/esp-sr" @@ -153,7 +153,7 @@ build_esp_tts: - .rules:build:test_esp_tts parallel: matrix: - - IMAGE: [espressif/idf:release-v5.3, espressif/idf:latest] + - IMAGE: [espressif/idf:release-v5.4, espressif/idf:latest] EXAMPLES_PATH: "test_apps/esp-tts" build_esp32c5: @@ -214,7 +214,7 @@ test_esp_sr: image: $DOCKER_TARGET_TEST_v5_3_ENV_IMAGE variables: TEST_FOLDER: './test_apps/esp-sr' - IDF_VERSION: "5.3" + IDF_VERSION: "5.4" test_esp_tts: extends: @@ -233,7 +233,7 @@ test_esp_tts: image: $DOCKER_TARGET_TEST_v5_3_ENV_IMAGE variables: TEST_FOLDER: './test_apps/esp-tts' - IDF_VERSION: "5.3" + IDF_VERSION: "5.4" .build_doc_template: stage: build_docs diff --git a/CMakeLists.txt b/CMakeLists.txt index cfba116..5b4ae22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,8 +93,8 @@ elseif((${IDF_TARGET} STREQUAL "esp32c5") OR (${IDF_TARGET} STREQUAL "esp32c3") ) component_compile_options(-ffast-math -O3 -Wno-error=format=-Wno-format) - add_prebuilt_library(esp_audio_processor "${CMAKE_CURRENT_SOURCE_DIR}/lib/${IDF_TARGET}/libesp_audio_processor.a") - add_prebuilt_library(esp_audio_front_end "${CMAKE_CURRENT_SOURCE_DIR}/lib/${IDF_TARGET}/libesp_audio_front_end.a") + add_prebuilt_library(esp_audio_processor "${CMAKE_CURRENT_SOURCE_DIR}/lib/${IDF_TARGET}/libesp_audio_processor.a" PRIV_REQUIRES ${COMPONENT_NAME}) + add_prebuilt_library(esp_audio_front_end "${CMAKE_CURRENT_SOURCE_DIR}/lib/${IDF_TARGET}/libesp_audio_front_end.a" PRIV_REQUIRES ${COMPONENT_NAME}) add_prebuilt_library(dl_lib "${CMAKE_CURRENT_SOURCE_DIR}/lib/${IDF_TARGET}/libdl_lib.a" PRIV_REQUIRES ${COMPONENT_NAME}) add_prebuilt_library(c_speech_features "${CMAKE_CURRENT_SOURCE_DIR}/lib/${IDF_TARGET}/libc_speech_features.a" PRIV_REQUIRES ${COMPONENT_NAME}) add_prebuilt_library(hufzip "${CMAKE_CURRENT_SOURCE_DIR}/lib/${IDF_TARGET}/libhufzip.a" PRIV_REQUIRES ${COMPONENT_NAME}) @@ -137,4 +137,4 @@ if(CONFIG_PARTITION_TABLE_CUSTOM) set(message "Failed to find model in partition table file" "Please add a line(Name=model) to the partition file if you want to use esp-sr models.") endif() -endif() \ No newline at end of file +endif() diff --git a/include/esp32/esp_afe_sr_iface.h b/include/esp32/esp_afe_sr_iface.h index b146a54..d25b9cd 100644 --- a/include/esp32/esp_afe_sr_iface.h +++ b/include/esp32/esp_afe_sr_iface.h @@ -46,6 +46,7 @@ typedef struct afe_fetch_result_t { int ret_value; // the return state of fetch function int16_t *raw_data; // the multi-channel output data of audio. int raw_data_channels; // the channel number of raw data + float ringbuff_free_pct; // the percent of ringbuff free size. if the value is larger than 0.5, it means the ringbuff is buzy. void *reserved; // reserved for future use } afe_fetch_result_t; diff --git a/include/esp32p4/esp_afe_sr_iface.h b/include/esp32p4/esp_afe_sr_iface.h index b146a54..d25b9cd 100644 --- a/include/esp32p4/esp_afe_sr_iface.h +++ b/include/esp32p4/esp_afe_sr_iface.h @@ -46,6 +46,7 @@ typedef struct afe_fetch_result_t { int ret_value; // the return state of fetch function int16_t *raw_data; // the multi-channel output data of audio. int raw_data_channels; // the channel number of raw data + float ringbuff_free_pct; // the percent of ringbuff free size. if the value is larger than 0.5, it means the ringbuff is buzy. void *reserved; // reserved for future use } afe_fetch_result_t; diff --git a/include/esp32s3/esp_afe_sr_iface.h b/include/esp32s3/esp_afe_sr_iface.h index b146a54..d25b9cd 100644 --- a/include/esp32s3/esp_afe_sr_iface.h +++ b/include/esp32s3/esp_afe_sr_iface.h @@ -46,6 +46,7 @@ typedef struct afe_fetch_result_t { int ret_value; // the return state of fetch function int16_t *raw_data; // the multi-channel output data of audio. int raw_data_channels; // the channel number of raw data + float ringbuff_free_pct; // the percent of ringbuff free size. if the value is larger than 0.5, it means the ringbuff is buzy. void *reserved; // reserved for future use } afe_fetch_result_t; diff --git a/lib/esp32/libdl_lib.a b/lib/esp32/libdl_lib.a index 5746337..bdf3276 100644 Binary files a/lib/esp32/libdl_lib.a and b/lib/esp32/libdl_lib.a differ diff --git a/lib/esp32/libesp_audio_front_end.a b/lib/esp32/libesp_audio_front_end.a index 197877e..b181843 100644 Binary files a/lib/esp32/libesp_audio_front_end.a and b/lib/esp32/libesp_audio_front_end.a differ diff --git a/lib/esp32/libesp_audio_processor.a b/lib/esp32/libesp_audio_processor.a index ffe4bf7..c2af281 100644 Binary files a/lib/esp32/libesp_audio_processor.a and b/lib/esp32/libesp_audio_processor.a differ diff --git a/lib/esp32/libmultinet.a b/lib/esp32/libmultinet.a index ed8f174..8debbf8 100644 Binary files a/lib/esp32/libmultinet.a and b/lib/esp32/libmultinet.a differ diff --git a/lib/esp32/libwakenet.a b/lib/esp32/libwakenet.a index 8dda950..e2d3f50 100644 Binary files a/lib/esp32/libwakenet.a and b/lib/esp32/libwakenet.a differ diff --git a/lib/esp32p4/libdl_lib.a b/lib/esp32p4/libdl_lib.a index adac76b..2da38c7 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 c2991b0..88c7b83 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 8e9c98f..1ce25be 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 249c502..def59f3 100644 Binary files a/lib/esp32p4/libmultinet.a and b/lib/esp32p4/libmultinet.a differ diff --git a/lib/esp32p4/libvadnet.a b/lib/esp32p4/libvadnet.a index 969867f..b9baca9 100644 Binary files a/lib/esp32p4/libvadnet.a and b/lib/esp32p4/libvadnet.a differ diff --git a/lib/esp32p4/libwakenet.a b/lib/esp32p4/libwakenet.a index 4a74fd8..a8a1d4b 100644 Binary files a/lib/esp32p4/libwakenet.a and b/lib/esp32p4/libwakenet.a differ diff --git a/lib/esp32s3/libdl_lib.a b/lib/esp32s3/libdl_lib.a index 4d8ddb2..9035c21 100644 Binary files a/lib/esp32s3/libdl_lib.a and b/lib/esp32s3/libdl_lib.a differ diff --git a/lib/esp32s3/libesp_audio_front_end.a b/lib/esp32s3/libesp_audio_front_end.a index 79d2523..62b1a61 100644 Binary files a/lib/esp32s3/libesp_audio_front_end.a and b/lib/esp32s3/libesp_audio_front_end.a differ diff --git a/lib/esp32s3/libesp_audio_processor.a b/lib/esp32s3/libesp_audio_processor.a index 7a173d8..8854026 100644 Binary files a/lib/esp32s3/libesp_audio_processor.a and b/lib/esp32s3/libesp_audio_processor.a differ diff --git a/lib/esp32s3/libmultinet.a b/lib/esp32s3/libmultinet.a index a0f73ea..c6475cc 100644 Binary files a/lib/esp32s3/libmultinet.a and b/lib/esp32s3/libmultinet.a differ diff --git a/lib/esp32s3/libnsnet.a b/lib/esp32s3/libnsnet.a index 713d6ac..a478164 100644 Binary files a/lib/esp32s3/libnsnet.a and b/lib/esp32s3/libnsnet.a differ diff --git a/lib/esp32s3/libvadnet.a b/lib/esp32s3/libvadnet.a index da31504..2218eee 100644 Binary files a/lib/esp32s3/libvadnet.a and b/lib/esp32s3/libvadnet.a differ diff --git a/lib/esp32s3/libwakenet.a b/lib/esp32s3/libwakenet.a index a06b735..8864f2e 100644 Binary files a/lib/esp32s3/libwakenet.a and b/lib/esp32s3/libwakenet.a differ