administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-01-25 05:28:29 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

change watchdog to 1s and separately track time for ffmpeg retry_interval

Browse Source
This commit is contained in:
Josh Hawkins 2025-12-15 13:24:43 -06:00
parent 43dff9bb9f
commit b2b884c5a6
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frigate/video.py
View File

@ -282,7 +282,10 @@ class CameraWatchdog(threading.Thread):
self.start_all_ffmpeg() self.start_all_ffmpeg()
time.sleep(self.sleeptime) time.sleep(self.sleeptime)
while not self.stop_event.wait(self.sleeptime): last_restart_time = datetime.now().timestamp()
# 1 second watchdog loop
while not self.stop_event.wait(1):
enabled = self._update_enabled_state() enabled = self._update_enabled_state()
if enabled != self.was_enabled: if enabled != self.was_enabled:
if enabled: if enabled:
@ -342,13 +345,19 @@ class CameraWatchdog(threading.Thread):
now = datetime.now().timestamp() now = datetime.now().timestamp()
# Check if enough time has passed to allow ffmpeg restart (backoff pacing)
time_since_last_restart = now - last_restart_time
can_restart = time_since_last_restart >= self.sleeptime
if not self.capture_thread.is_alive(): if not self.capture_thread.is_alive():
self.requestor.send_data(f"{self.config.name}/status/detect", "offline") self.requestor.send_data(f"{self.config.name}/status/detect", "offline")
self.camera_fps.value = 0 self.camera_fps.value = 0
self.logger.error( self.logger.error(
f"Ffmpeg process crashed unexpectedly for {self.config.name}." f"Ffmpeg process crashed unexpectedly for {self.config.name}."
) )
self.reset_capture_thread(terminate=False) if can_restart:
self.reset_capture_thread(terminate=False)
last_restart_time = now
elif self.camera_fps.value >= (self.config.detect.fps + 10): elif self.camera_fps.value >= (self.config.detect.fps + 10):
self.fps_overflow_count += 1 self.fps_overflow_count += 1
@ -361,14 +370,18 @@ class CameraWatchdog(threading.Thread):
self.logger.info( self.logger.info(
f"{self.config.name} exceeded fps limit. Exiting ffmpeg..." f"{self.config.name} exceeded fps limit. Exiting ffmpeg..."
) )
self.reset_capture_thread(drain_output=False) if can_restart:
self.reset_capture_thread(drain_output=False)
last_restart_time = now
elif now - self.capture_thread.current_frame.value > 20: elif now - self.capture_thread.current_frame.value > 20:
self.requestor.send_data(f"{self.config.name}/status/detect", "offline") self.requestor.send_data(f"{self.config.name}/status/detect", "offline")
self.camera_fps.value = 0 self.camera_fps.value = 0
self.logger.info( self.logger.info(
f"No frames received from {self.config.name} in 20 seconds. Exiting ffmpeg..." f"No frames received from {self.config.name} in 20 seconds. Exiting ffmpeg..."
) )
self.reset_capture_thread() if can_restart:
self.reset_capture_thread()
last_restart_time = now
else: else:
# process is running normally # process is running normally
self.requestor.send_data(f"{self.config.name}/status/detect", "online") self.requestor.send_data(f"{self.config.name}/status/detect", "online")