Skip to content

Commit 7b987ee

Browse files
committed
Merge branch 'feature/update_volcRTC_libs' into 'master'
feat(volc_rtc): update volcrtc See merge request adf/esp-adf-internal!1389
2 parents 825313d + cd10f39 commit 7b987ee

File tree

24 files changed

+398
-195
lines changed

24 files changed

+398
-195
lines changed

components/audio_recorder/recorder_sr.c

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -151,27 +151,29 @@ static esp_err_t recorder_mn_detect(recorder_sr_t *recorder_sr, afe_fetch_result
151151
detect_flag = 1;
152152
}
153153
if (detect_flag == 1) {
154-
esp_mn_state_t mn_state = multinet->detect(recorder_sr->mn_handle, afe_result->data);
154+
if (recorder_sr->mn_handle) {
155+
esp_mn_state_t mn_state = multinet->detect(recorder_sr->mn_handle, afe_result->data);
155156

156-
if (mn_state == ESP_MN_STATE_DETECTING) {
157-
return ESP_OK;
158-
}
159-
if (mn_state == ESP_MN_STATE_DETECTED) {
160-
esp_mn_results_t *mn_result = multinet->get_results(recorder_sr->mn_handle);
161-
if (recorder_sr->mn_monitor) {
162-
recorder_sr_result_t sr_result = { 0 };
163-
sr_result.type = mn_result->command_id[0];
164-
sr_result.info.mn_info.phrase_id = mn_result->phrase_id[0];
165-
sr_result.info.mn_info.prob = mn_result->prob[0];
166-
memcpy(sr_result.info.mn_info.str, mn_result->string, RECORDER_SR_MN_STRING_MAX_LEN);
167-
recorder_sr->mn_monitor(&sr_result, recorder_sr->mn_monitor_ctx);
157+
if (mn_state == ESP_MN_STATE_DETECTING) {
158+
return ESP_OK;
159+
}
160+
if (mn_state == ESP_MN_STATE_DETECTED) {
161+
esp_mn_results_t *mn_result = multinet->get_results(recorder_sr->mn_handle);
162+
if (recorder_sr->mn_monitor) {
163+
recorder_sr_result_t sr_result = { 0 };
164+
sr_result.type = mn_result->command_id[0];
165+
sr_result.info.mn_info.phrase_id = mn_result->phrase_id[0];
166+
sr_result.info.mn_info.prob = mn_result->prob[0];
167+
memcpy(sr_result.info.mn_info.str, mn_result->string, RECORDER_SR_MN_STRING_MAX_LEN);
168+
recorder_sr->mn_monitor(&sr_result, recorder_sr->mn_monitor_ctx);
169+
}
170+
detect_flag = 0;
168171
}
169-
detect_flag = 0;
170-
}
171172

172-
if (mn_state == ESP_MN_STATE_TIMEOUT) {
173-
detect_flag = 0;
174-
ESP_LOGI(TAG, "MN dect quit");
173+
if (mn_state == ESP_MN_STATE_TIMEOUT) {
174+
detect_flag = 0;
175+
ESP_LOGI(TAG, "MN dect quit");
176+
}
175177
}
176178
}
177179
return ESP_OK;

components/clouds/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ register_component()
1212

1313
target_link_libraries(${COMPONENT_TARGET} INTERFACE "-L${CMAKE_CURRENT_LIST_DIR}/dueros/lightduer/${CONFIG_IDF_TARGET}")
1414

15-
IF ((CONFIG_IDF_TARGET STREQUAL "esp32s3") OR (CONFIG_IDF_TARGET STREQUAL "esp32") OR (CONFIG_IDF_TARGET STREQUAL "esp32c5"))
15+
IF ((CONFIG_IDF_TARGET STREQUAL "esp32s3") OR (CONFIG_IDF_TARGET STREQUAL "esp32") OR (CONFIG_IDF_TARGET STREQUAL "esp32c5") OR (CONFIG_IDF_TARGET STREQUAL "esp32p4"))
1616
IF (IDF_VERSION_MAJOR EQUAL 5)
1717
add_prebuilt_library(VolcEngineRTCLite "${CMAKE_CURRENT_LIST_DIR}/volc_engine_rtc/libs/${CONFIG_IDF_TARGET}/libVolcEngineRTCLite.a"
1818
REQUIRES mbedtls espressif__zlib json lwip)

0 commit comments

Comments
 (0)