From 7b48b85c99cff8c8f5075463b8c52477faf9cee8 Mon Sep 17 00:00:00 2001 From: hcj <1224667075@qq.com> Date: Thu, 3 Jul 2025 15:40:41 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9ws=E4=BB=A3=E7=A0=81=20?= =?utf8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86=E4=B8=8D=E5=BF=85=E8=A6=81?= =?utf8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../peripheral/slip/cat1Service/cat1_ws.cpp | 76 +++---------------- .../voice_call_volte_sample_wrapper.cpp | 14 ++-- 2 files changed, 19 insertions(+), 71 deletions(-) diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.cpp index 318ac829f..6f8270bff 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.cpp +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.cpp @@ -1227,8 +1227,6 @@ errcode_t chat_server_init(void) //查询是否可以对话 void uapi_start_asr(void) { -// bool state = true; -// SendMsgToUIService(UI_AI_JUMP_TO_LISTENING_VIEW, 0, &state, sizeof(bool)); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"查询uapi_start_asr是否可用\n"); char *jsonString = "{\"header\":{\"event\":\"StartTranscription\",\"trace_id\": \ @@ -1239,12 +1237,8 @@ void uapi_start_asr(void) else { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"send_websocket_message erro\n"); - // lwip_close_websocket_client(asr_client); - // asr_client=NULL; - // disconnect_server=1; } - // uapi_tts_paly_stop(); } void uapi_start_asr_task(void) @@ -1252,18 +1246,6 @@ void uapi_start_asr_task(void) do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_AI_SEND_TEST, nullptr, 0); - // char *jsonString = "{\"header\":{\"event\":\"StartTranscription\",\"trace_id\": \ - // \"3fa6b9e6a30b407ea38ad7ae69e6c291\"},\"payload\":{\"format\":\"MP3\",\"sample_rate\":16000}}"; - - // if (send_websocket_message(asr_client,( const unsigned char *)jsonString,strlen(jsonString),WS_TEXT)==0) - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"send_websocket_message succ 0\n"); - // else - // { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"send_websocket_message erro\n"); - // // lwip_close_websocket_client(asr_client); - // // asr_client=NULL; - // // disconnect_server=1; - // } } @@ -1273,17 +1255,11 @@ void uapi_stop_asr(void) { char *jsonString ="{\"header\":{\"event\":\"StopTranscription\",\"trace_id\":\"3fa6b9e6a30b407ea38ad7ae69e6c291\"}}"; - // uapi_tts_paly_init(); - if (send_websocket_message(asr_client,( uint8_t *)jsonString,strlen(jsonString),WS_TEXT)==0) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"send_websocket_message succ 0\n"); else { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"send_websocket_message erro\n"); - // lwip_close_websocket_client(asr_client); - // asr_client=NULL; - - // disconnect_server=1; } } @@ -1302,7 +1278,7 @@ void send_ai_bin(uint8_t *buf,uint32_t len) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"send_websocket_message fail 0\n"); } - // + } void record_test(void) @@ -1327,8 +1303,6 @@ void record_test(void) if(read_size!=0) { send_msg_data_into_Ai_msg_queue((void *)buf,(uint16_t)read_size,0); - // send_ai_bin(buf,read_size); - // bk_sleep(100); read_size_num+=read_size; } @@ -1407,57 +1381,27 @@ bool aer_result_analysis(char *buf) memset_s(result_str_asr,256,0,256); memcpy_s(result_str_asr,256,result_str,strlen(result_str)); SendMsgToUIService(UI_AI_JUMP_TO_RESULT_VIEW, 0, nullptr, 0);//先跳转到结果界面 - ble_set_ai_Question_str(result_str_asr); + ble_set_ai_Question_str(result_str_asr); stop_AudioCaptureProcess_AI(); - // uapi_stop_asr(); send_ai_txt(0,result_str_asr); - // uapi_stop_asr(); - // stop_AudioCaptureProcess_AI(); } if(strcmp(event_str,"TranscriptionStarted")==0) //可以对话了，切换到聆听界面 { //查询结果 - // streamingRecordAndSend_AI(0); startAudioCaptureTask(); -// do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_AI_SEND_TEST, nullptr, 0); - - if(asr_is_start==0) - { - asr_is_start=1; - - bool state = true; - SendMsgToUIService(UI_AI_JUMP_TO_LISTENING_VIEW, 0, &state, sizeof(bool)); + bool state = true; + SendMsgToUIService(UI_AI_JUMP_TO_LISTENING_VIEW, 0, &state, sizeof(bool)); - // do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_AI_SEND_TEST, nullptr, 0); - - } - else - { - // uapi_stop_asr(); - } - } - if(strcmp(event_str,"TranscriptionCompleted")==0) //可以对话了，切换到聆听界面 + if(strcmp(event_str,"TranscriptionCompleted")==0) //asr 结束 { - //查询结果 - // streamingRecordAndSend_AI(0); - // startAudioCaptureTask(); - { - asr_is_start=0; - } return false; - } if(strcmp(event_str,"Failed")==0) { stop_AudioCaptureProcess_AI(); - asr_is_start=0; - - // bool state = false; - // SendMsgToUIService(UI_AI_JUMP_TO_LISTENING_VIEW, 0, &state, sizeof(bool)); - // uapi_stop_asr(); return false; } @@ -1860,7 +1804,7 @@ void bk_websocket_tts(void *data) { while (client_count) { - tts_client = init_websocket_client("ws://118.145.158.207:22080/tts/stream?audio_buffer_size=8192",NULL,0); + tts_client = init_websocket_client("ws://118.145.158.207:22080/tts/stream?audio_buffer_size=4096",NULL,0); if (tts_client== NULL) { @@ -1897,8 +1841,8 @@ void bk_websocket_tts(void *data) { { - memset_s(tts_recv_buf,1024*8,0,1024*8); - int len=receive_websocket_message(tts_client,(unsigned char *)tts_recv_buf,1024*8,&type); + memset_s(tts_recv_buf,1024*4,0,1024*4); + int len=receive_websocket_message(tts_client,(unsigned char *)tts_recv_buf,1024*4,&type); // if(type==WS_CONT || if( type==WS_CLOSE || len==-1)//|| type==WS_CONT ) { @@ -1915,10 +1859,10 @@ void bk_websocket_tts(void *data) { // tts_cache_file((uint8_t *)tts_recv_buf,len);—— // AIStreamWrite((uint8_t *)tts_recv_buf,len); send_msg_data_into_Ai_msg_queue((uint8_t *)tts_recv_buf,len,200); - + printf("bk_websocket_demo tts %d\n",len); // bk_sleep(1); - printf("bk_websocket_demo %d\n",len); + } else if(type==WS_TEXT) { diff --git a/code/sdk/middleware/services/media/foundation/sample/wrapper/voice_call_volte_sample_wrapper.cpp b/code/sdk/middleware/services/media/foundation/sample/wrapper/voice_call_volte_sample_wrapper.cpp index 730668c59..ca8094ec2 100755 --- a/code/sdk/middleware/services/media/foundation/sample/wrapper/voice_call_volte_sample_wrapper.cpp +++ b/code/sdk/middleware/services/media/foundation/sample/wrapper/voice_call_volte_sample_wrapper.cpp @@ -1374,11 +1374,15 @@ void startAudioCaptureTask(void) int32_t AIStreamWrite(uint8_t *buf,uint32_t size) { - int32_t ret; - - uint64_t writeLen = 0; - AudioRendererConfig renderConfig; - ret = g_stream_out_downink->StreamWrite(buf,size, writeLen, renderConfig); + // MEDIA_ERR_LOG("AIStreamWrite"); + int32_t ret=-1; + if(g_stream_out_downink) + { + uint64_t writeLen = 0; + AudioRendererConfig renderConfig; + ret = g_stream_out_downink->StreamWrite(buf,size, writeLen, renderConfig); + } + return ret; } -- 2.17.1