Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-08-04 13:47:37 +02:00
Code Issues Projects Releases Wiki Activity

Improve ffmpeg frame handling (#19110)

Browse Source 
* Improve handling of ffmpeg process depending on error

* Simplify code and make it more clear
This commit is contained in:
Nicolas Mowen 2025-07-11 13:19:43 -06:00 committed by GitHub
parent 5cf98824f5
commit f75e55ee74
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
frigate/video.py
View File

@ -208,7 +208,35 @@ class CameraWatchdog(threading.Thread):
return self.config.enabled return self.config.enabled
def run(self): def reset_capture_thread(
self, terminate: bool = True, drain_output: bool = True
) -> None:
if terminate:
self.ffmpeg_detect_process.terminate()
try:
self.logger.info("Waiting for ffmpeg to exit gracefully...")
if drain_output:
self.ffmpeg_detect_process.communicate(timeout=30)
else:
self.ffmpeg_detect_process.wait(timeout=30)
except sp.TimeoutExpired:
self.logger.info("FFmpeg did not exit. Force killing...")
self.ffmpeg_detect_process.kill()
if drain_output:
self.ffmpeg_detect_process.communicate()
else:
self.ffmpeg_detect_process.wait()
self.logger.error(
"The following ffmpeg logs include the last 100 lines prior to exit."
)
self.logpipe.dump()
self.logger.info("Restarting ffmpeg...")
self.start_ffmpeg_detect()
def run(self) -> None:
if self._update_enabled_state(): if self._update_enabled_state():
self.start_all_ffmpeg() self.start_all_ffmpeg()
@ -235,24 +263,7 @@ class CameraWatchdog(threading.Thread):
self.logger.error( self.logger.error(
f"Ffmpeg process crashed unexpectedly for {self.camera_name}." f"Ffmpeg process crashed unexpectedly for {self.camera_name}."
) )
self.logger.error( self.reset_capture_thread(terminate=False)
"The following ffmpeg logs include the last 100 lines prior to exit."
)
self.logpipe.dump()
self.start_ffmpeg_detect()
elif now - self.capture_thread.current_frame.value > 20:
self.camera_fps.value = 0
self.logger.info(
f"No frames received from {self.camera_name} in 20 seconds. Exiting ffmpeg..."
)
self.ffmpeg_detect_process.terminate()
try:
self.logger.info("Waiting for ffmpeg to exit gracefully...")
self.ffmpeg_detect_process.communicate(timeout=30)
except sp.TimeoutExpired:
self.logger.info("FFmpeg did not exit. Force killing...")
self.ffmpeg_detect_process.kill()
self.ffmpeg_detect_process.communicate()
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
@ -262,14 +273,13 @@ class CameraWatchdog(threading.Thread):
self.logger.info( self.logger.info(
f"{self.camera_name} exceeded fps limit. Exiting ffmpeg..." f"{self.camera_name} exceeded fps limit. Exiting ffmpeg..."
) )
self.ffmpeg_detect_process.terminate() self.reset_capture_thread(drain_output=False)
try: elif now - self.capture_thread.current_frame.value > 20:
self.logger.info("Waiting for ffmpeg to exit gracefully...") self.camera_fps.value = 0
self.ffmpeg_detect_process.communicate(timeout=30) self.logger.info(
except sp.TimeoutExpired: f"No frames received from {self.camera_name} in 20 seconds. Exiting ffmpeg..."
self.logger.info("FFmpeg did not exit. Force killing...") )
self.ffmpeg_detect_process.kill() self.reset_capture_thread()
self.ffmpeg_detect_process.communicate()
else: else:
# process is running normally # process is running normally
self.fps_overflow_count = 0 self.fps_overflow_count = 0