Merge branch 'feature/update_sr_to_v1.9.2' into 'master'

esp-sr: Update esp-sr to v1.9.2 See merge request adf/esp-adf-internal!1331
espressif · Sep 5, 2024 · 0e1d257 · 0e1d257
2 parents c601c04 + 749db41
commit 0e1d257
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/components/esp-sr b/components/esp-sr
diff --git a/examples/advanced_examples/algorithm/main/algorithm_examples.c b/examples/advanced_examples/algorithm/main/algorithm_examples.c
@@ -126,7 +126,7 @@ void app_main()
 
     audio_board_handle_t board_handle = audio_board_init();
     audio_hal_ctrl_codec(board_handle->audio_hal, AUDIO_HAL_CODEC_MODE_BOTH, AUDIO_HAL_CTRL_START);
-    audio_hal_set_volume(board_handle->audio_hal, 60);
+    audio_hal_set_volume(board_handle->audio_hal, 80);
 #if CONFIG_ESP32_S3_KORVO2_V3_BOARD
     es7210_adc_set_gain(ES7210_INPUT_MIC3, GAIN_0DB);
 #endif  /* CONFIG_ESP32_S3_KORVO2_V3_BOARD */

diff --git a/examples/advanced_examples/algorithm/sdkconfig.defaults.esp32s3 b/examples/advanced_examples/algorithm/sdkconfig.defaults.esp32s3
@@ -51,6 +51,8 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 CONFIG_MODEL_IN_FLASH=y
 CONFIG_USE_AFE=y
 CONFIG_AFE_INTERFACE_V1=y
+CONFIG_USE_NSNET=y
+CONFIG_SR_NSN_NSNET2=y
 CONFIG_USE_WAKENET=y
 CONFIG_SR_WN_WN9_HILEXIN=y
 CONFIG_USE_MULTINET=y

diff --git a/examples/cli/pytest_cli.py b/examples/cli/pytest_cli.py
@@ -10,13 +10,15 @@
 '''
 
 import os
+import time
 import pytest
 from pytest_embedded import Dut
 
 @pytest.mark.esp32
 @pytest.mark.esp32s2
 @pytest.mark.esp32s3
 @pytest.mark.ADF_EXAMPLE_GENERIC
+@pytest.mark.flaky(reruns=1, reruns_delay=5)
 def test_cli(dut: Dut)-> None:
     dut.expect(r'ESP_AUDIO_CTRL', timeout=5)
 
@@ -41,8 +43,10 @@ def test_cli(dut: Dut)-> None:
     dut.write('play https://audiofile.espressif.cn/103_44100_2_320138_188.mp3')
     dut.expect(r'ESP_AUDIO status is AEL_STATUS_STATE_RUNNING, 0, src:0, is_stopping:0', timeout=100)
 
+    time.sleep(2)
     dut.write('pause')
     dut.expect(r'esp_auido status:2,err:0')
 
+    time.sleep(2)
     dut.write('resume')
     dut.expect(r'esp_auido status:1,err:0')
+7 −0		CHANGELOG.md
+1 −1		README.md
+27 −0		docs/en/benchmark/README.rst
+27 −0		docs/zh_CN/benchmark/README.rst
+1 −1		idf_component.yml
+5 −5		include/esp32s3/esp_afe_config.h
+ −		lib/esp32p4/libc_speech_features.a
+ −		lib/esp32p4/libdl_lib.a
+ −		lib/esp32p4/libesp_audio_front_end.a
+ −		lib/esp32p4/libesp_audio_processor.a
+ −		lib/esp32p4/libmultinet.a
+ −		lib/esp32p4/libnsnet.a
+ −		lib/esp32p4/libwakenet.a
+ −		lib/esp32s3/libc_speech_features.a
+ −		lib/esp32s3/libdl_lib.a
+ −		lib/esp32s3/libesp_audio_front_end.a
+ −		lib/esp32s3/libesp_audio_processor.a
+ −		lib/esp32s3/libflite_g2p.a
+ −		lib/esp32s3/libfst.a
+ −		lib/esp32s3/libhufzip.a
+ −		lib/esp32s3/libmultinet.a
+ −		lib/esp32s3/libnsnet.a
+ −		lib/esp32s3/libwakenet.a
+9 −0		src/include/model_path.h
+48 −34		src/model_path.c