Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-21 19:07:46 +01:00
Code Issues Projects Releases Wiki Activity

handle ffmpeg process hangs that dont exit ffmpeg

Browse Source
This commit is contained in:
Blake Blackshear 2020-05-01 06:59:15 -05:00
parent 7d33e03943
commit 8e77cf25d9
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
detect_objects.py
View File

@ -84,6 +84,8 @@ class CameraWatchdog(threading.Thread):
while True: while True:
# wait a bit before checking # wait a bit before checking
time.sleep(10) time.sleep(10)
now = datetime.datetime.now().timestamp()
# check the plasma process # check the plasma process
rc = self.plasma_process.poll() rc = self.plasma_process.poll()
@ -94,7 +96,7 @@ class CameraWatchdog(threading.Thread):
# check the detection process # check the detection process
detection_start = self.tflite_process.detection_start.value detection_start = self.tflite_process.detection_start.value
if (detection_start > 0.0 and if (detection_start > 0.0 and
datetime.datetime.now().timestamp() - detection_start > 10): now - detection_start > 10):
print("Detection appears to be stuck. Restarting detection process") print("Detection appears to be stuck. Restarting detection process")
self.tflite_process.start_or_restart() self.tflite_process.start_or_restart()
elif not self.tflite_process.detect_process.is_alive(): elif not self.tflite_process.detect_process.is_alive():
@ -127,6 +129,17 @@ class CameraWatchdog(threading.Thread):
camera_capture.start() camera_capture.start()
camera_process['ffmpeg_process'] = ffmpeg_process camera_process['ffmpeg_process'] = ffmpeg_process
camera_process['capture_thread'] = camera_capture camera_process['capture_thread'] = camera_capture
elif now - camera_process['capture_thread'].current_frame > 5:
print(f"No frames received from {name} in 5 seconds. Exiting ffmpeg...")
ffmpeg_process = camera_process['ffmpeg_process']
ffmpeg_process.terminate()
try:
print("Waiting for ffmpeg to exit gracefully...")
ffmpeg_process.communicate(timeout=30)
except sp.TimeoutExpired:
print("FFmpeg didnt exit. Force killing...")
ffmpeg_process.kill()
ffmpeg_process.communicate()
def main(): def main():
# connect to mqtt and setup last will # connect to mqtt and setup last will