brige/human
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 2 Wiki Activity

modify tts audio handle

Browse Source
This commit is contained in:
jiegeaiai 2024-10-18 08:15:48 +08:00
parent 48d0a7d05d
commit 6b5361d91a
3 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tts/tts_audio_handle.py
View File

@ -14,7 +14,7 @@ class TTSAudioHandle(AudioHandler):
def __init__(self, context, handler): def __init__(self, context, handler):
super().__init__(context, handler) super().__init__(context, handler)
self._sample_rate = 16000 self._sample_rate = 16000
self._index = 1 self._index = -1
@property @property
def sample_rate(self): def sample_rate(self):
@ -41,20 +41,33 @@ class TTSAudioSplitHandle(TTSAudioHandle):
self.sample_rate = self._context.sample_rate self.sample_rate = self._context.sample_rate
self._chunk = self.sample_rate // self._context.fps self._chunk = self.sample_rate // self._context.fps
self._priority_queue = [] self._priority_queue = []
self._current = 0
logger.info("TTSAudioSplitHandle init") logger.info("TTSAudioSplitHandle init")
def on_handle(self, stream, index): def on_handle(self, stream, index):
# heapq.heappush(self._priority_queue, (index, stream)) # heapq.heappush(self._priority_queue, (index, stream))
if stream is None: if stream is None:
heapq.heappush(self._priority_queue, (index, None)) heapq.heappush(self._priority_queue, (index, None))
else:
stream_len = stream.shape[0] stream_len = stream.shape[0]
idx = 0 idx = 0
chunks = []
while stream_len >= self._chunk: while stream_len >= self._chunk:
self.on_next_handle(stream[idx:idx + self._chunk], 0) # self.on_next_handle(stream[idx:idx + self._chunk], 0)
chunks.append(stream[idx:idx + self._chunk])
stream_len -= self._chunk stream_len -= self._chunk
idx += self._chunk idx += self._chunk
heapq.heappush(self._priority_queue, (index, chunks))
current = self._priority_queue[0][0]
print('TTSAudioSplitHandle::on_handle', index, current, self._current)
if current == self._current:
self._current = self._current + 1
chunks = heapq.heappop(self._priority_queue)[1]
if chunks is None:
pass
else:
for chunk in chunks:
self.on_next_handle(chunk, 0)
def stop(self): def stop(self):
pass pass

6
tts/tts_base.py
View File

@ -45,11 +45,15 @@ class TTSBase(NLPCallback):
self.message(txt) self.message(txt)
def message(self, txt): def message(self, txt):
txt = txt.strip()
if len(txt) == 0:
logger.info(f'message is empty')
return
logger.info(f'message:{txt}') logger.info(f'message:{txt}')
print(f'message:{txt}')
index = 0 index = 0
if self._handle is not None: if self._handle is not None:
index = self._handle.get_index() index = self._handle.get_index()
print(f'message txt-index:{txt}, index {index}')
self._message_queue.add_task(self._request, txt, index) self._message_queue.add_task(self._request, txt, index)
def stop(self): def stop(self):

5
ui.py
View File

@ -37,7 +37,7 @@ class App(customtkinter.CTk):
# configure window # configure window
self.title("TTS demo") self.title("TTS demo")
self.geometry(f"{1100}x{580}") self.geometry(f"{1150}x{580}")
self.grid_columnconfigure(1, weight=1) self.grid_columnconfigure(1, weight=1)
self.grid_rowconfigure((0, 1), weight=1) self.grid_rowconfigure((0, 1), weight=1)
@ -88,7 +88,7 @@ class App(customtkinter.CTk):
self._canvas.pack(fill=customtkinter.BOTH, expand=customtkinter.YES) self._canvas.pack(fill=customtkinter.BOTH, expand=customtkinter.YES)
def _render(self): def _render(self):
after_time = 29 after_time = 24
try: try:
image = self._queue.get(block=True, timeout=0.003) image = self._queue.get(block=True, timeout=0.003)
if image is None: if image is None:
@ -155,7 +155,6 @@ class App(customtkinter.CTk):
def on_render(self, image): def on_render(self, image):
self._queue.put(image) self._queue.put(image)
print('on_render', self._queue.qsize())
if __name__ == "__main__": if __name__ == "__main__":