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

移除未使用的total_duration返回值

Browse Source
This commit is contained in:
Chingfeng Li
2025-08-04 13:49:12 +08:00
parent 5fe91a80fa
commit 8b81b918cc
5 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/xiaozhi-server/core/utils/p3.py
+2 -15
View File
@@ -5,10 +5,6 @@ def decode_opus_from_file(input_file):
从p3文件中解码 Opus 数据，并返回一个 Opus 数据包的列表以及总时长。
"""
opus_datas = []
total_frames = 0
sample_rate = 16000 # 文件采样率
frame_duration_ms = 60 # 帧时长
frame_size = int(sample_rate * frame_duration_ms / 1000)
with open(input_file, 'rb') as f:
while True:
@@ -26,11 +22,8 @@ def decode_opus_from_file(input_file):
raise ValueError(f"Data length({len(opus_data)}) mismatch({data_len}) in the file.")
opus_datas.append(opus_data)
total_frames += 1
# 计算总时长
total_duration = (total_frames * frame_duration_ms) / 1000.0
return opus_datas, total_duration
return opus_datas
def decode_opus_from_bytes(input_bytes):
"""
@@ -38,10 +31,6 @@ def decode_opus_from_bytes(input_bytes):
"""
import io
opus_datas = []
total_frames = 0
sample_rate = 16000 # 文件采样率
frame_duration_ms = 60 # 帧时长
frame_size = int(sample_rate * frame_duration_ms / 1000)
f = io.BytesIO(input_bytes)
while True:
@@ -53,7 +42,5 @@ def decode_opus_from_bytes(input_bytes):
if len(opus_data) != data_len:
raise ValueError(f"Data length({len(opus_data)}) mismatch({data_len}) in the bytes.")
opus_datas.append(opus_data)
total_frames += 1
total_duration = (total_frames * frame_duration_ms) / 1000.0
return opus_datas, total_duration
return opus_datas
main/xiaozhi-server/core/utils/util.py
+2 -6
View File
@@ -224,12 +224,9 @@ def audio_to_data(audio_file_path, is_opus=True):
# 转换为单声道/16kHz采样率/16位小端编码（确保与编码器匹配）
audio = audio.set_channels(1).set_frame_rate(16000).set_sample_width(2)
# 音频时长(秒)
duration = len(audio) / 1000.0
# 获取原始PCM数据（16位小端）
raw_data = audio.raw_data
return pcm_to_data(raw_data, is_opus), duration
return pcm_to_data(raw_data, is_opus)
def audio_bytes_to_data(audio_bytes, file_type, is_opus=True):
@@ -245,9 +242,8 @@ def audio_bytes_to_data(audio_bytes, file_type, is_opus=True):
BytesIO(audio_bytes), format=file_type, parameters=["-nostdin"]
)
audio = audio.set_channels(1).set_frame_rate(16000).set_sample_width(2)
duration = len(audio) / 1000.0
raw_data = audio.raw_data
return pcm_to_data(raw_data, is_opus), duration
return pcm_to_data(raw_data, is_opus)
def pcm_to_data(raw_data, is_opus=True):