yipai-tech/SupervisorAI
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化帧等待，帧追赶算法，较稳定

Browse Source
This commit is contained in:
zqc
2026-02-05 15:58:28 +08:00
parent 81e186859c
commit be753244af
1 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
hls_service_ws_kadian.py
View File

@@ -129,34 +129,33 @@ class HLSFrameProcessor(threading.Thread):
current_time = time.time() current_time = time.time()
# 计算时间差 # 计算时间差
time_diff = current_time - expected_play_time wait_time = expected_play_time - current_time
# 打印距离上次处理过去的时间 # # 打印距离上次处理过去的时间
current_time = time.time() # current_time = time.time()
if self.last_process_time is not None: # if self.last_process_time is not None:
time_since_last = (current_time - self.last_process_time) * 1000 # 转换为毫秒 # time_since_last = (current_time - self.last_process_time) * 1000 # 转换为毫秒
self.pts_diff = frame_pts - self.last_frame_pts # 与上一帧的PTS差 # self.pts_diff = frame_pts - self.last_frame_pts # 与上一帧的PTS差
# logger.info(f"[INFO] Time since last frame: {time_since_last:.1f}ms, pts: {frame_pts} ms, pts_diff: {self.pts_diff}ms") # # logger.info(f"[INFO] Time since last frame: {time_since_last:.1f}ms, pts: {frame_pts} ms, pts_diff: {self.pts_diff}ms")
self.last_process_time = current_time # self.last_process_time = current_time
self.last_frame_pts = frame_pts # self.last_frame_pts = frame_pts
# 时间同步策略 if wait_time > 0:
if time_diff > 0.06: # 超过60ms，播放落后 （3帧） if wait_time > 1: # 如果等待时间过长，重置时间基准
# 跳过这一帧追赶
logger.info(f"[DEBUG] Lagging behind by {time_diff*1000:.1f}ms, skipping frame")
return False
elif time_diff < -0.06: # 超前60ms，需要等待 （3帧）
# 等待到正确的时间点
wait_time = -time_diff
if wait_time > 5: # 如果等待时间过长，重置时间基准
logger.info(f"[WARN] Too far ahead, resetting time base") logger.info(f"[WARN] Too far ahead, resetting time base")
self.start_time = current_time self.start_time = current_time
self.base_pts = frame_pts self.base_pts = frame_pts
else: else:
time.sleep(wait_time) time.sleep(wait_time)
logger.info(f"[DEBUG] Waiting for {wait_time*1000:.1f}ms") # logger.info(f"[DEBUG] Frame Waiting for {wait_time*1000:.1f}ms")
else :
if wait_time < -1:
logger.info(f"[WARN] Too far behind, resetting time base")
self.start_time = current_time
self.base_pts = frame_pts
# else:
# logger.info(f"[WARN] frame ahead, no waiting")
# 时间同步良好，放入raw_queue
item = { item = {
"camera_id": self.camera_cfg.id, "camera_id": self.camera_cfg.id,
"camera_name": self.camera_cfg.name, "camera_name": self.camera_cfg.name,
@@ -174,8 +173,6 @@ class HLSFrameProcessor(threading.Thread):
pass pass
self.raw_queue.put(item, timeout=0.5) self.raw_queue.put(item, timeout=0.5)
time.sleep(0.02)
# if self.pts_diff > 0: # if self.pts_diff > 0:
# time.sleep(self.pts_diff/1000) # time.sleep(self.pts_diff/1000)
return True return True