Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-22 07:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
Sakura-RanChen
2025-12-15 16:34:50 +08:00
parent fb91e6b1dd
commit 33b4794e83
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/xiaozhi-server/core/utils/audioRateController.py
+24 -14
View File
@@ -1,5 +1,6 @@
import time
import asyncio
from collections import deque
from config.logger import setup_logging
TAG = __name__
@@ -18,13 +19,14 @@ class AudioRateController:
frame_duration: 单个音频帧时长（毫秒），默认60ms
"""
self.frame_duration = frame_duration
self.queue = []
self.queue = deque()
self.play_position = 0 # 虚拟播放位置（毫秒）
self.start_timestamp = None # 开始时间戳（只读，不修改）
self.pending_send_task = None
self.logger = logger
self.queue_empty_event = asyncio.Event() # 队列清空事件
self.queue_empty_event.set() # 初始为空状态
self.queue_has_data_event = asyncio.Event() # 队列数据事件
def reset(self):
"""重置控制器状态"""
@@ -34,13 +36,17 @@ class AudioRateController:
self.queue.clear()
self.play_position = 0
self.start_timestamp = time.time()
self.queue_empty_event.set() # 队列已清空
self.start_timestamp = None # 由首个音频包设置
# 相关事件处理
self.queue_empty_event.set()
self.queue_has_data_event.clear()
def add_audio(self, opus_packet):
"""添加音频包到队列"""
self.queue.append(("audio", opus_packet))
self.queue_empty_event.clear() # 队列非空，清除事件
# 相关事件处理
self.queue_empty_event.clear()
self.queue_has_data_event.set()
def add_message(self, message_callback):
"""
@@ -50,13 +56,15 @@ class AudioRateController:
message_callback: 消息发送回调函数 async def()
"""
self.queue.append(("message", message_callback))
self.queue_empty_event.clear() # 队列非空，清除事件
# 相关事件处理
self.queue_empty_event.clear()
self.queue_has_data_event.set()
def _get_elapsed_ms(self):
"""获取已经过的时间（毫秒）"""
if self.start_timestamp is None:
return 0
return (time.time() - self.start_timestamp) * 1000
return (time.monotonic() - self.start_timestamp) * 1000
async def check_queue(self, send_audio_callback):
"""
@@ -65,9 +73,6 @@ class AudioRateController:
Args:
send_audio_callback: 发送音频的回调函数 async def(opus_packet)
"""
if self.start_timestamp is None:
self.start_timestamp = time.time()
while self.queue:
item = self.queue[0]
item_type = item[0]
@@ -75,7 +80,7 @@ class AudioRateController:
if item_type == "message":
# 消息类型：立即发送，不占用播放时间
_, message_callback = item
self.queue.pop(0)
self.queue.popleft()
try:
await message_callback()
except Exception as e:
@@ -83,6 +88,9 @@ class AudioRateController:
raise
elif item_type == "audio":
if self.start_timestamp is None:
self.start_timestamp = time.monotonic()
_, opus_packet = item
# 循环等待直到时间到达
@@ -107,16 +115,17 @@ class AudioRateController:
break
# 时间已到，从队列移除并发送
self.queue.pop(0)
self.queue.popleft()
self.play_position += self.frame_duration
try:
await send_audio_callback(opus_packet)
except Exception as e:
self.logger.bind(tag=TAG).error(f"发送音频失败: {e}")
raise
# 队列处理完后清除事件
self.queue_empty_event.set()
self.queue_has_data_event.clear()
def start_sending(self, send_audio_callback):
"""
@@ -132,9 +141,10 @@ class AudioRateController:
async def _send_loop():
try:
while True:
# 等待队列数据事件，不轮询等待占用CPU
await self.queue_has_data_event.wait()
await self.check_queue(send_audio_callback)
# 如果队列空了，短暂等待后再检查（避免 busy loop）
await asyncio.sleep(0.01)
except asyncio.CancelledError:
self.logger.bind(tag=TAG).debug("音频发送循环已停止")
except Exception as e: