diff --git a/main/audio_processing/afe_audio_processor.cc b/main/audio_processing/afe_audio_processor.cc index 68f326a7..a19e589e 100644 --- a/main/audio_processing/afe_audio_processor.cc +++ b/main/audio_processing/afe_audio_processor.cc @@ -25,13 +25,18 @@ void AfeAudioProcessor::Initialize(AudioCodec* codec) { srmodel_list_t *models = esp_srmodel_init("model"); char* ns_model_name = esp_srmodel_filter(models, ESP_NSNET_PREFIX, NULL); - afe_config_t* afe_config = afe_config_init(input_format.c_str(), NULL, AFE_TYPE_VC, AFE_MODE_LOW_COST); - afe_config->aec_mode = AEC_MODE_VOIP_LOW_COST; + afe_config_t* afe_config = afe_config_init(input_format.c_str(), NULL, AFE_TYPE_VC, AFE_MODE_HIGH_PERF); + afe_config->aec_mode = AEC_MODE_VOIP_HIGH_PERF; afe_config->vad_mode = VAD_MODE_0; afe_config->vad_min_noise_ms = 100; - afe_config->ns_init = true; - afe_config->ns_model_name = ns_model_name; - afe_config->afe_ns_mode = AFE_NS_MODE_NET; + + if (ns_model_name != nullptr) { + afe_config->ns_init = true; + afe_config->ns_model_name = ns_model_name; + afe_config->afe_ns_mode = AFE_NS_MODE_NET; + } else { + afe_config->ns_init = false; + } afe_config->afe_perferred_core = 1; afe_config->afe_perferred_priority = 1; diff --git a/main/idf_component.yml b/main/idf_component.yml index 624e9b61..b356e482 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -66,6 +66,8 @@ dependencies: esp_jpeg_simd: git: https://github.com/Seeed-Studio/SenseCAP-Watcher-Firmware.git path: components/esp_jpeg_simd + rules: + - if: target not in [esp32p4] ## Required IDF version idf: diff --git a/sdkconfig.defaults.esp32p4 b/sdkconfig.defaults.esp32p4 index fa6e3503..63249d89 100644 --- a/sdkconfig.defaults.esp32p4 +++ b/sdkconfig.defaults.esp32p4 @@ -18,7 +18,6 @@ CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y CONFIG_SLAVE_IDF_TARGET_ESP32C6=y -CONFIG_SR_NSN_NSNET2=y CONFIG_SR_WN_WN9_NIHAOXIAOZHI_TTS=y CONFIG_IDF_EXPERIMENTAL_FEATURES=y diff --git a/sdkconfig.defaults.esp32s3 b/sdkconfig.defaults.esp32s3 index dc944855..c9bc1b68 100644 --- a/sdkconfig.defaults.esp32s3 +++ b/sdkconfig.defaults.esp32s3 @@ -16,7 +16,6 @@ CONFIG_ESP32S3_INSTRUCTION_CACHE_32KB=y CONFIG_ESP32S3_DATA_CACHE_64KB=y CONFIG_ESP32S3_DATA_CACHE_LINE_64B=y -CONFIG_SR_NSN_NSNET2=y CONFIG_SR_WN_WN9_NIHAOXIAOZHI_TTS=y CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096