Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 chenjintao
|
d24c8e186a |
@@ -5,6 +5,7 @@
|
||||
#include "ql_iic.h"
|
||||
#include "ql_gpio.h"
|
||||
#include "app_inc.h"
|
||||
#include "audio_prompt.h"
|
||||
#include "ql_fs.h"
|
||||
|
||||
#define DEFAULT_VOLUME 6
|
||||
@@ -14,7 +15,6 @@
|
||||
u8 g_cur_volume = 0;
|
||||
u8 g_pre_volume = 0;
|
||||
|
||||
extern const char *mp3_file[];
|
||||
extern int g_file_valid;
|
||||
|
||||
|
||||
|
||||
@@ -14,7 +14,9 @@
|
||||
#include "sockets.h"
|
||||
#include "layer3.h"
|
||||
#include "ql_uart.h"
|
||||
const char *mp3_file[] ={
|
||||
#include "audio_prompt.h"
|
||||
|
||||
const char *mp3_file[AUDIO_PROMPT_FILE_COUNT] ={
|
||||
"test.mp3",// 0
|
||||
"network_connect_zh.mp3",//1 系统启动中，正在等待网络连接
|
||||
"network_check.mp3",//2 网络不好 请检查网络
|
||||
@@ -31,9 +33,16 @@ const char *mp3_file[] ={
|
||||
"device_wake_up_zh.mp3",//13 设备已唤醒
|
||||
"low_power_zh.mp3",//14 电量低
|
||||
"low_power_off_zh.mp3",//15 电量严重不足，马上关机
|
||||
"volume_up_zh.mp3",//16
|
||||
"volume_down_zh.mp3",//17
|
||||
"volume_up_zh.mp3",//16
|
||||
"volume_down_zh.mp3",//17
|
||||
"ai_active_zh.mp3",//18
|
||||
/* 19~24：对话响应超时随机提示音，文件名与资源服务器保持一致 */
|
||||
"tts_error01.mp3",//19
|
||||
"tts_error02.mp3",//20
|
||||
"tts_error03.mp3",//21
|
||||
"tts_error04.mp3",//22
|
||||
"tts_error05.mp3",//23
|
||||
"tts_error06.mp3",//24
|
||||
};
|
||||
|
||||
//http://banban.api.talkingq.com:8080/assets/roles/banban/tts_error.mp3
|
||||
@@ -183,7 +192,8 @@ void app_file_check_download(void)
|
||||
char filename_buff[64]={0x00};
|
||||
int ret = 0, cnt = 0;
|
||||
|
||||
for(index=1;index<19;index++){
|
||||
/* 遍历完整资源表，新增提示音不存在时会在联网后自动补下载 */
|
||||
for(index=1;index<AUDIO_PROMPT_FILE_COUNT;index++){
|
||||
|
||||
if(index==4||index==5||index==6||index==7||index==8){
|
||||
continue;
|
||||
@@ -208,7 +218,7 @@ void app_file_check_del(void)
|
||||
int index = 1;
|
||||
char filename_buff[64]={0x00};
|
||||
|
||||
for(index=1;index<19;index++){
|
||||
for(index=1;index<AUDIO_PROMPT_FILE_COUNT;index++){
|
||||
|
||||
if(index==4||index==5||index==6||index==7||index==8){
|
||||
continue;
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
#ifndef _AUDIO_PROMPT_H_
|
||||
#define _AUDIO_PROMPT_H_
|
||||
|
||||
/*
|
||||
* 本地提示音索引约定。
|
||||
* 现有索引保持不变，新增的 6 条对话响应超时音频从 19 开始追加，
|
||||
* 避免影响项目中已经使用的其他提示音索引。
|
||||
*/
|
||||
#define AUDIO_PROMPT_TTS_ERROR_INDEX 9
|
||||
#define AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX 19
|
||||
#define AUDIO_PROMPT_TTS_ERROR_LAST_INDEX 24
|
||||
#define AUDIO_PROMPT_FILE_COUNT 25
|
||||
|
||||
extern const char *mp3_file[AUDIO_PROMPT_FILE_COUNT];
|
||||
|
||||
int app_play_tips_file(int index);
|
||||
int app_play_random_tts_error(void);
|
||||
|
||||
#endif
|
||||
@@ -21,17 +21,15 @@
|
||||
#include "ql_ping.h"
|
||||
#include "ql_nw.h"
|
||||
#include "ql_atcmd.h"
|
||||
#include "ql_platform.h"
|
||||
#include "layer3.h"
|
||||
#include "ql_uart.h"
|
||||
#include "hal_api.h"
|
||||
#include "fvad.h"
|
||||
#include "audio_prompt.h"
|
||||
|
||||
|
||||
|
||||
#define PCM_FRAME_LENGTH 1152
|
||||
#define CLOUD_TTS_ERROR_URL_FORMAT \
|
||||
"http://101.35.224.118:8080/assets/roles/banban/tts_error/tts_error%02u.mp3"
|
||||
|
||||
static int g_sim_ready = 0;
|
||||
|
||||
@@ -190,56 +188,6 @@ static void remove_underscores(char *str) {
|
||||
*dst = '\0'; // 添加字符串结束符
|
||||
}
|
||||
|
||||
/*
|
||||
* 将后台下发的任意角色对话超时音频 URL 改为 banban 角色的 HTTP 地址，
|
||||
* 并在 tts_error00~tts_error09 中随机选择一条。
|
||||
*/
|
||||
static int randomize_tts_error_url(char *url, size_t url_size)
|
||||
{
|
||||
static uint32_t random_sequence = 0;
|
||||
static unsigned int last_random_index = 10;
|
||||
char *file_name;
|
||||
uint32_t random_value;
|
||||
unsigned int random_index;
|
||||
int written;
|
||||
|
||||
if(url == NULL || url_size == 0){
|
||||
return 0;
|
||||
}
|
||||
|
||||
file_name = strrchr(url, '/');
|
||||
file_name = (file_name == NULL) ? url : file_name + 1;
|
||||
|
||||
if(strncmp(file_name, "tts_error", strlen("tts_error")) != 0 &&
|
||||
strncmp(file_name, "tts_err", strlen("tts_err")) != 0){
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* 某些设备上硬件随机接口可能持续返回 0，因此混合伪随机数、系统 tick
|
||||
* 和递增序列；若仍与上一次相同，则向后偏移，避免连续重复播放。
|
||||
*/
|
||||
random_sequence++;
|
||||
random_value = hal_os_get_rand();
|
||||
random_value ^= ql_pseudo_random_number();
|
||||
random_value ^= ql_rtos_get_systicks();
|
||||
random_value ^= random_sequence * 0x9E3779B9U;
|
||||
random_index = random_value % 10;
|
||||
if(random_index == last_random_index){
|
||||
random_index = (random_index + 1 + (random_sequence % 9)) % 10;
|
||||
}
|
||||
last_random_index = random_index;
|
||||
|
||||
written = snprintf(url, url_size, CLOUD_TTS_ERROR_URL_FORMAT, random_index);
|
||||
if(written < 0 || (size_t)written >= url_size){
|
||||
printf("random tts error url buffer too small\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
printf("random cloud tts error index:%02u, url:%s\n", random_index, url);
|
||||
return 1;
|
||||
}
|
||||
|
||||
void add_file_to_play_player_queue(char *path, int type)
|
||||
{
|
||||
ice_work_item *item = NULL;
|
||||
@@ -309,32 +257,14 @@ static void onmessage_text(rws_socket socket, const char *text, const unsigned i
|
||||
|
||||
}else{//TTS_URL:audio_url
|
||||
wss_connect_start = 0;
|
||||
char *ret_str1 = strstr(text, "https://");
|
||||
char *ret_str2 = NULL;
|
||||
size_t url_len = 0;
|
||||
int is_tts_error_url = 0;
|
||||
if(ret_str1 == NULL){
|
||||
ret_str1 = strstr(text, "http://");
|
||||
}
|
||||
if(ret_str1 != NULL){
|
||||
ret_str2 = strstr(ret_str1, ".mp3");
|
||||
}
|
||||
char *ret_str1= strstr(text, "http:");
|
||||
char *ret_str2= strstr(text, ".mp3");
|
||||
int len = 0;
|
||||
if(ret_str1!=NULL && ret_str2!=NULL){
|
||||
|
||||
/* 提取完整的 HTTP/HTTPS MP3 URL，结尾额外包含“.mp3”四个字符 */
|
||||
url_len = (size_t)(ret_str2 - ret_str1) + strlen(".mp3");
|
||||
if(url_len >= sizeof(url_buff)){
|
||||
printf("audio url too long:%d\n", (int)url_len);
|
||||
return;
|
||||
}
|
||||
memcpy(url_buff, ret_str1, url_len);
|
||||
url_buff[url_len] = '\0';
|
||||
|
||||
/* 两个角色统一使用 banban 的 HTTP 随机超时提示音 */
|
||||
is_tts_error_url = randomize_tts_error_url(url_buff, sizeof(url_buff));
|
||||
if(is_tts_error_url < 0){
|
||||
return;
|
||||
}
|
||||
|
||||
len = strlen(ret_str1)-strlen(ret_str2);
|
||||
strncpy(url_buff, ret_str1, len);
|
||||
sprintf(url_buff+len, "%s", ".mp3");
|
||||
|
||||
memcpy(url_buff_bak, url_buff, strlen(url_buff)+1);
|
||||
|
||||
@@ -353,7 +283,7 @@ static void onmessage_text(rws_socket socket, const char *text, const unsigned i
|
||||
tts_play_status = 2;
|
||||
}
|
||||
|
||||
if(is_tts_error_url == 1 || strstr(url_buff, "message_ok")!=NULL){
|
||||
if(strstr(url_buff, "tts_error")!=NULL || strstr(url_buff, "message_ok")!=NULL){
|
||||
printf("tts_error or message_ok\n");
|
||||
vad_set_speech_timeout_flag(1);
|
||||
}
|
||||
@@ -850,12 +780,16 @@ void sendRecordingAudioPacket(AudioPacket *packet) {
|
||||
}
|
||||
#endif
|
||||
|
||||
extern const char *mp3_file[];
|
||||
|
||||
int app_play_tips_file(int index)
|
||||
{
|
||||
int file_valid_check = 0;
|
||||
|
||||
|
||||
/* 防止提示音索引越界访问文件名数组 */
|
||||
if(index < 0 || index >= AUDIO_PROMPT_FILE_COUNT){
|
||||
printf("invalid prompt index:%d\n", index);
|
||||
return -3;
|
||||
}
|
||||
|
||||
printf("xiaoice_play_index:%d\n", index);
|
||||
|
||||
//正在录音过程中不允许播放
|
||||
@@ -891,6 +825,48 @@ int app_play_tips_file(int index)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* 随机播放一条对话响应超时提示音。
|
||||
* 只把 LittleFS 中实际存在的文件加入候选列表，新增音频尚未下载完成时，
|
||||
* 仍可回退播放原来的 tts_error.mp3，不会随机到不存在的文件。
|
||||
*/
|
||||
int app_play_random_tts_error(void)
|
||||
{
|
||||
static const int timeout_prompt_indices[] = {
|
||||
AUDIO_PROMPT_TTS_ERROR_INDEX,
|
||||
AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX,
|
||||
AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX + 1,
|
||||
AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX + 2,
|
||||
AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX + 3,
|
||||
AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX + 4,
|
||||
AUDIO_PROMPT_TTS_ERROR_LAST_INDEX
|
||||
};
|
||||
int valid_indices[sizeof(timeout_prompt_indices) / sizeof(timeout_prompt_indices[0])];
|
||||
int valid_count = 0;
|
||||
int selected_index;
|
||||
int i;
|
||||
char filename_buff[64] = {0x00};
|
||||
|
||||
for(i = 0; i < (int)(sizeof(timeout_prompt_indices) / sizeof(timeout_prompt_indices[0])); i++){
|
||||
int prompt_index = timeout_prompt_indices[i];
|
||||
sprintf(filename_buff, "U:/%s", mp3_file[prompt_index]);
|
||||
if(ql_access(filename_buff, 0) == 0){ //检查filename_buff指向的文件是否存在
|
||||
valid_indices[valid_count++] = prompt_index;
|
||||
}
|
||||
}
|
||||
|
||||
if(valid_count == 0){
|
||||
printf("no local tts error prompt file\n");
|
||||
return -2;
|
||||
}
|
||||
|
||||
selected_index = valid_indices[hal_os_get_rand() % valid_count];
|
||||
printf("random tts_error prompt index:%d, file:%s\n",
|
||||
selected_index, mp3_file[selected_index]);
|
||||
|
||||
return app_play_tips_file(selected_index);
|
||||
}
|
||||
|
||||
void app_player_thread(void *arvg)
|
||||
{
|
||||
ice_work_item *player_item=NULL;
|
||||
@@ -1094,7 +1070,8 @@ static void check_connect_thread_entry(void *parameter)
|
||||
printf("tts_error_set_speech1\n");
|
||||
vad_set_speech_timeout_flag(1);
|
||||
|
||||
app_play_tips_file(9);
|
||||
/* 对话响应超时后，从本地已有的 7 条提示音中随机播放一条 */
|
||||
app_play_random_tts_error();
|
||||
//talkingq_ws_send_text("REQUEST_PROMPT_SOUND:tts_error");
|
||||
//改为播放本地音频 听不清 请再说一遍
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user