From: hcj <1224667075@qq.com> Date: Tue, 21 Apr 2026 02:58:00 +0000 (+0800) Subject: 雷鸟音频卡顿优化 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=5400c2d1184ce5c9ec49cd9dd1d85575795ed3c5;p=mirrors%2FFD230.git 雷鸟音频卡顿优化 --- diff --git a/code/sdk/zhihui/ai/media/ai_media_service_ext.cpp b/code/sdk/zhihui/ai/media/ai_media_service_ext.cpp index 1481f3fc9..e6550e4ed 100644 --- a/code/sdk/zhihui/ai/media/ai_media_service_ext.cpp +++ b/code/sdk/zhihui/ai/media/ai_media_service_ext.cpp @@ -50,10 +50,13 @@ extern "C" { #endif +// #define USE_SILENCE_AUDIO_288 // #define USE_SILENCE_AUDIO_288 // 静音音频数据定义 // 默认使用1100字节版本,定义 USE_SILENCE_AUDIO_288 可切换到288字节版本 #ifdef USE_SILENCE_AUDIO_288 +#define USE_SILENCE_AUDIO + // 288字节版本(纯MP3数据帧,无ID3标签) static const unsigned char silence_audio[288] = { 0xff, 0xf3, 0x88, 0xc4, 0x00, 0x44, 0xc0, 0x03, 0x48, 0x00, 0x00, 0x00, @@ -1898,7 +1901,7 @@ int32_t old_Start_AIVoice(AIVoiceDataCallback dataCallback, void* userData, task_cfg.create_queue_handle = CreateAIVoiceQueue; // 设置队列创建函数 task_cfg.attr.name = "AIVoiceThread"; - task_cfg.attr.priority = (osPriority_t)28; // 使用合适的优先级 + task_cfg.attr.priority = (osPriority_t)(28+2); // 使用合适的优先级 task_cfg.attr.stack_size = 0x2000; // 8KB栈空间 task_cfg.func = AIVoiceThread; task_cfg.use_mem = USE_EXTEND_MEM; @@ -2183,8 +2186,20 @@ int32_t AI_WriteAudioData(const uint8_t* data, uint32_t size) } MediaMutexUnLock(g_aiVoiceContextMutex); + // static uint32_t last_delay_us = 1; + int32_t ret=0; + #ifndef TIME_TICKS_TEST + ret = AudioStreamOutStreamWrite(data, size); + #else // 写入音频数据到输出流 - int32_t ret = AudioStreamOutStreamWrite(data, size); + uint32_t current_tick = osKernelGetTickCount(); + printf("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx AudioStreamOutStreamWrite current_tick: %u\n", current_tick); + ret = AudioStreamOutStreamWrite(data, size); + // printf("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx last_delay_us==1\r\n"); + current_tick = osKernelGetTickCount(); + printf("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx AudioStreamOutStreamWrite end current_tick: %u\n", current_tick); + // last_delay_us=0; + #endif if(g_aiVoiceContext->outputAudioFormat==MP3) { @@ -2192,8 +2207,14 @@ int32_t AI_WriteAudioData(const uint8_t* data, uint32_t size) // 延迟时间(微秒)= (数据大小(字节)* 8 * 1000000) / 比特率(bps) // 当比特率更高时,延迟时间更短 // 公式:延迟(微秒)= (size * 8 * 1000000) / bit_rate - uint32_t delay_us = (uint32_t)((uint64_t)(size-(size/10*5)) * 8 * 1000000ULL / g_tts_audio_bit_rate); + uint32_t delay_us = (uint32_t)((uint64_t)(size-(size/10*7)) * 8 * 1000000ULL / g_tts_audio_bit_rate); + #ifdef TIME_TICKS_TEST + printf("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx delay_ms %d\r\n",(uint32_t)((uint64_t)(size) * 8 * 1000000ULL / g_tts_audio_bit_rate)/1000); + MEDIA_DEBUG_LOG("delay_us %d\r\n",delay_us); + #endif + + // 确保延迟时间在合理范围内(最小10微秒) if (delay_us < 20) { @@ -2202,7 +2223,7 @@ int32_t AI_WriteAudioData(const uint8_t* data, uint32_t size) usleep(delay_us-20); if (ret != 0) { retry_count++; - // MEDIA_ERR_LOG("Failed to write audio data to output stream, ret=%d, retry %d/%d", ret, retry_count, MAX_RETRY_COUNT); + MEDIA_ERR_LOG("Failed to write audio data to output stream, ret=%d, retry %d/%d", ret, retry_count, MAX_RETRY_COUNT); usleep(delay_us*retry_count/10*5); goto AI_WRITE; } diff --git a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c index bbde5b2b0..b556d2b92 100644 --- a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c +++ b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c @@ -1199,9 +1199,9 @@ static void ai_binary_message_handler(const uint8_t *raw_data, uint32_t timestam return; } - const size_t CHUNK_SIZE = 1024; // 1K 分块大小 + const size_t CHUNK_SIZE = 1024*2; // 1K 分块大小 - if (data_len <= CHUNK_SIZE) { + if (data_len <= CHUNK_SIZE || g_audio_playback_active==false) { // 数据小于等于1K,直接发送 LN_WS_DEBUG("Sending data directly (size: %d bytes)\n", data_len); AI_SendAudioDataToQueue(raw_data, data_len); @@ -1223,32 +1223,30 @@ static void ai_binary_message_handler(const uint8_t *raw_data, uint32_t timestam remaining -= current_chunk_size; } + LN_WS_DEBUG("All %d chunks sent successfully\n", chunk_count); + } + // 更新最后一次音频写入tick // 如果音频播放从非活跃状态转为活跃状态,记录开始播放时间 - if (!g_audio_playback_active) { - g_audio_playback_start_tick = osKernelGetTickCount(); - LN_WS_INFO("Audio playback started at tick: %u\n", g_audio_playback_start_tick); - - // 触发音频播放开始事件 - if (g_ws_message_callback != NULL) { - g_ws_message_callback(NULL, WS_CMD_AUDIO_PLAYBACK_START); - } - extern bool a2dp_is_connect; - if(a2dp_is_connect) - { - int ret = a2dp_src_start_playing(ln_bt_get_last_conned_device_Addr()); // 设置耳机的状态为播放 + if (!g_audio_playback_active) { + g_audio_playback_start_tick = osKernelGetTickCount(); + LN_WS_INFO("Audio playback started at tick: %u\n", g_audio_playback_start_tick); + + // 触发音频播放开始事件 + if (g_ws_message_callback != NULL) { + g_ws_message_callback(NULL, WS_CMD_AUDIO_PLAYBACK_START); + } + extern bool a2dp_is_connect; + if(a2dp_is_connect) + { + int ret = a2dp_src_start_playing(ln_bt_get_last_conned_device_Addr()); // 设置耳机的状态为播放 + + LN_WS_DEBUG("a2dp_src_start_playing %d \n", ret); - LN_WS_DEBUG("a2dp_src_start_playing %d \n", ret); - - } - } g_audio_playback_active = true; - - - LN_WS_DEBUG("All %d chunks sent successfully\n", chunk_count); } }