|
@@ -18,7 +18,7 @@ import logging
|
|
from flask import Flask, Response, make_response, jsonify, request
|
|
from flask import Flask, Response, make_response, jsonify, request
|
|
import paho.mqtt.client as mqtt
|
|
import paho.mqtt.client as mqtt
|
|
|
|
|
|
-from frigate.video import track_camera, get_ffmpeg_input, get_frame_shape, CameraCapture, start_or_restart_ffmpeg
|
|
|
|
|
|
+from frigate.video import capture_camera, track_camera, get_ffmpeg_input, get_frame_shape, CameraCapture, start_or_restart_ffmpeg
|
|
from frigate.object_processing import TrackedObjectProcessor
|
|
from frigate.object_processing import TrackedObjectProcessor
|
|
from frigate.events import EventProcessor
|
|
from frigate.events import EventProcessor
|
|
from frigate.util import EventsPerSecond
|
|
from frigate.util import EventsPerSecond
|
|
@@ -78,13 +78,14 @@ GLOBAL_OBJECT_CONFIG = CONFIG.get('objects', {})
|
|
WEB_PORT = CONFIG.get('web_port', 5000)
|
|
WEB_PORT = CONFIG.get('web_port', 5000)
|
|
DETECTORS = CONFIG.get('detectors', {'coral': {'type': 'edgetpu', 'device': 'usb'}})
|
|
DETECTORS = CONFIG.get('detectors', {'coral': {'type': 'edgetpu', 'device': 'usb'}})
|
|
|
|
|
|
-class CameraWatchdog(threading.Thread):
|
|
|
|
- def __init__(self, camera_processes, config, detectors, detection_queue, tracked_objects_queue, stop_event):
|
|
|
|
|
|
+class FrigateWatchdog(threading.Thread):
|
|
|
|
+ def __init__(self, camera_processes, config, detectors, detection_queue, out_events, tracked_objects_queue, stop_event):
|
|
threading.Thread.__init__(self)
|
|
threading.Thread.__init__(self)
|
|
self.camera_processes = camera_processes
|
|
self.camera_processes = camera_processes
|
|
self.config = config
|
|
self.config = config
|
|
self.detectors = detectors
|
|
self.detectors = detectors
|
|
self.detection_queue = detection_queue
|
|
self.detection_queue = detection_queue
|
|
|
|
+ self.out_events = out_events
|
|
self.tracked_objects_queue = tracked_objects_queue
|
|
self.tracked_objects_queue = tracked_objects_queue
|
|
self.stop_event = stop_event
|
|
self.stop_event = stop_event
|
|
|
|
|
|
@@ -116,38 +117,16 @@ class CameraWatchdog(threading.Thread):
|
|
process = camera_process['process']
|
|
process = camera_process['process']
|
|
if not process.is_alive():
|
|
if not process.is_alive():
|
|
print(f"Track process for {name} is not alive. Starting again...")
|
|
print(f"Track process for {name} is not alive. Starting again...")
|
|
|
|
+ camera_process['camera_fps'].value = 0.0
|
|
camera_process['process_fps'].value = 0.0
|
|
camera_process['process_fps'].value = 0.0
|
|
camera_process['detection_fps'].value = 0.0
|
|
camera_process['detection_fps'].value = 0.0
|
|
camera_process['read_start'].value = 0.0
|
|
camera_process['read_start'].value = 0.0
|
|
- process = mp.Process(target=track_camera, args=(name, self.config[name], camera_process['frame_queue'],
|
|
|
|
- camera_process['frame_shape'], self.detection_queue, self.tracked_objects_queue,
|
|
|
|
- camera_process['process_fps'], camera_process['detection_fps'],
|
|
|
|
- camera_process['read_start'], self.stop_event))
|
|
|
|
|
|
+ process = mp.Process(target=track_camera, args=(name, self.config,
|
|
|
|
+ self.detection_queue, self.out_events[name], self.tracked_objects_queue, camera_process, self.stop_event))
|
|
process.daemon = True
|
|
process.daemon = True
|
|
camera_process['process'] = process
|
|
camera_process['process'] = process
|
|
process.start()
|
|
process.start()
|
|
print(f"Track process started for {name}: {process.pid}")
|
|
print(f"Track process started for {name}: {process.pid}")
|
|
-
|
|
|
|
- if not camera_process['capture_thread'].is_alive():
|
|
|
|
- frame_shape = camera_process['frame_shape']
|
|
|
|
- frame_size = frame_shape[0] * frame_shape[1] * frame_shape[2]
|
|
|
|
- ffmpeg_process = start_or_restart_ffmpeg(camera_process['ffmpeg_cmd'], frame_size)
|
|
|
|
- camera_capture = CameraCapture(name, ffmpeg_process, frame_shape, camera_process['frame_queue'],
|
|
|
|
- camera_process['take_frame'], camera_process['camera_fps'], self.stop_event)
|
|
|
|
- camera_capture.start()
|
|
|
|
- camera_process['ffmpeg_process'] = ffmpeg_process
|
|
|
|
- camera_process['capture_thread'] = camera_capture
|
|
|
|
- elif now - camera_process['capture_thread'].current_frame.value > 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():
|
|
stop_event = threading.Event()
|
|
stop_event = threading.Event()
|
|
@@ -210,7 +189,7 @@ def main():
|
|
detectors[name] = EdgeTPUProcess(detection_queue, out_events=out_events, tf_device=detector['device'])
|
|
detectors[name] = EdgeTPUProcess(detection_queue, out_events=out_events, tf_device=detector['device'])
|
|
|
|
|
|
# create the camera processes
|
|
# create the camera processes
|
|
- camera_processes = {}
|
|
|
|
|
|
+ camera_process_info = {}
|
|
for name, config in CONFIG['cameras'].items():
|
|
for name, config in CONFIG['cameras'].items():
|
|
# Merge the ffmpeg config with the global config
|
|
# Merge the ffmpeg config with the global config
|
|
ffmpeg = config.get('ffmpeg', {})
|
|
ffmpeg = config.get('ffmpeg', {})
|
|
@@ -248,37 +227,24 @@ def main():
|
|
ffmpeg_output_args +
|
|
ffmpeg_output_args +
|
|
['pipe:'])
|
|
['pipe:'])
|
|
|
|
|
|
|
|
+ config['ffmpeg_cmd'] = ffmpeg_cmd
|
|
|
|
+
|
|
if 'width' in config and 'height' in config:
|
|
if 'width' in config and 'height' in config:
|
|
frame_shape = (config['height'], config['width'], 3)
|
|
frame_shape = (config['height'], config['width'], 3)
|
|
else:
|
|
else:
|
|
frame_shape = get_frame_shape(ffmpeg_input)
|
|
frame_shape = get_frame_shape(ffmpeg_input)
|
|
|
|
|
|
config['frame_shape'] = frame_shape
|
|
config['frame_shape'] = frame_shape
|
|
|
|
+ config['take_frame'] = config.get('take_frame', 1)
|
|
|
|
|
|
- frame_size = frame_shape[0] * frame_shape[1] * frame_shape[2]
|
|
|
|
- take_frame = config.get('take_frame', 1)
|
|
|
|
-
|
|
|
|
- detection_frame = mp.Value('d', 0.0)
|
|
|
|
-
|
|
|
|
- ffmpeg_process = start_or_restart_ffmpeg(ffmpeg_cmd, frame_size)
|
|
|
|
- frame_queue = mp.Queue(maxsize=2)
|
|
|
|
- camera_fps = EventsPerSecond()
|
|
|
|
- camera_fps.start()
|
|
|
|
- camera_capture = CameraCapture(name, ffmpeg_process, frame_shape, frame_queue, take_frame, camera_fps, stop_event)
|
|
|
|
- camera_capture.start()
|
|
|
|
-
|
|
|
|
- camera_processes[name] = {
|
|
|
|
- 'camera_fps': camera_fps,
|
|
|
|
- 'take_frame': take_frame,
|
|
|
|
|
|
+ camera_process_info[name] = {
|
|
|
|
+ 'camera_fps': mp.Value('d', 0.0),
|
|
|
|
+ 'skipped_fps': mp.Value('d', 0.0),
|
|
'process_fps': mp.Value('d', 0.0),
|
|
'process_fps': mp.Value('d', 0.0),
|
|
'detection_fps': mp.Value('d', 0.0),
|
|
'detection_fps': mp.Value('d', 0.0),
|
|
- 'detection_frame': detection_frame,
|
|
|
|
|
|
+ 'detection_frame': mp.Value('d', 0.0),
|
|
'read_start': mp.Value('d', 0.0),
|
|
'read_start': mp.Value('d', 0.0),
|
|
- 'ffmpeg_process': ffmpeg_process,
|
|
|
|
- 'ffmpeg_cmd': ffmpeg_cmd,
|
|
|
|
- 'frame_queue': frame_queue,
|
|
|
|
- 'frame_shape': frame_shape,
|
|
|
|
- 'capture_thread': camera_capture
|
|
|
|
|
|
+ 'frame_queue': mp.Queue(maxsize=2)
|
|
}
|
|
}
|
|
|
|
|
|
# merge global object config into camera object config
|
|
# merge global object config into camera object config
|
|
@@ -292,41 +258,38 @@ def main():
|
|
'filters': object_filters
|
|
'filters': object_filters
|
|
}
|
|
}
|
|
|
|
|
|
- camera_process = mp.Process(target=track_camera, args=(name, config, frame_queue, frame_shape,
|
|
|
|
- detection_queue, out_events[name], tracked_objects_queue, camera_processes[name]['process_fps'],
|
|
|
|
- camera_processes[name]['detection_fps'],
|
|
|
|
- camera_processes[name]['read_start'], camera_processes[name]['detection_frame'], stop_event))
|
|
|
|
|
|
+ capture_process = mp.Process(target=capture_camera, args=(name, config,
|
|
|
|
+ camera_process_info[name], stop_event))
|
|
|
|
+ capture_process.daemon = True
|
|
|
|
+ camera_process_info[name]['capture_process'] = capture_process
|
|
|
|
+
|
|
|
|
+ camera_process = mp.Process(target=track_camera, args=(name, config,
|
|
|
|
+ detection_queue, out_events[name], tracked_objects_queue, camera_process_info[name], stop_event))
|
|
camera_process.daemon = True
|
|
camera_process.daemon = True
|
|
- camera_processes[name]['process'] = camera_process
|
|
|
|
|
|
+ camera_process_info[name]['process'] = camera_process
|
|
|
|
|
|
# start the camera_processes
|
|
# start the camera_processes
|
|
- for name, camera_process in camera_processes.items():
|
|
|
|
|
|
+ for name, camera_process in camera_process_info.items():
|
|
|
|
+ camera_process['capture_process'].start()
|
|
|
|
+ print(f"Camera capture process started for {name}: {camera_process['capture_process'].pid}")
|
|
camera_process['process'].start()
|
|
camera_process['process'].start()
|
|
- print(f"Camera_process started for {name}: {camera_process['process'].pid}")
|
|
|
|
|
|
+ print(f"Camera process started for {name}: {camera_process['process'].pid}")
|
|
|
|
|
|
- event_processor = EventProcessor(CONFIG, camera_processes, CACHE_DIR, CLIPS_DIR, event_queue, stop_event)
|
|
|
|
|
|
+ event_processor = EventProcessor(CONFIG, camera_process_info, CACHE_DIR, CLIPS_DIR, event_queue, stop_event)
|
|
event_processor.start()
|
|
event_processor.start()
|
|
|
|
|
|
object_processor = TrackedObjectProcessor(CONFIG['cameras'], client, MQTT_TOPIC_PREFIX, tracked_objects_queue, event_queue, stop_event)
|
|
object_processor = TrackedObjectProcessor(CONFIG['cameras'], client, MQTT_TOPIC_PREFIX, tracked_objects_queue, event_queue, stop_event)
|
|
object_processor.start()
|
|
object_processor.start()
|
|
|
|
|
|
- camera_watchdog = CameraWatchdog(camera_processes, CONFIG['cameras'], detectors, detection_queue, tracked_objects_queue, stop_event)
|
|
|
|
- camera_watchdog.start()
|
|
|
|
|
|
+ frigate_watchdog = FrigateWatchdog(camera_process_info, CONFIG['cameras'], detectors, detection_queue, out_events, tracked_objects_queue, stop_event)
|
|
|
|
+ frigate_watchdog.start()
|
|
|
|
|
|
def receiveSignal(signalNumber, frame):
|
|
def receiveSignal(signalNumber, frame):
|
|
print('Received:', signalNumber)
|
|
print('Received:', signalNumber)
|
|
stop_event.set()
|
|
stop_event.set()
|
|
event_processor.join()
|
|
event_processor.join()
|
|
object_processor.join()
|
|
object_processor.join()
|
|
- camera_watchdog.join()
|
|
|
|
- for camera_name, camera_process in camera_processes.items():
|
|
|
|
- camera_process['capture_thread'].join()
|
|
|
|
- # cleanup the frame queue
|
|
|
|
- while not camera_process['frame_queue'].empty():
|
|
|
|
- frame_time = camera_process['frame_queue'].get()
|
|
|
|
- shm = mp.shared_memory.SharedMemory(name=f"{camera_name}{frame_time}")
|
|
|
|
- shm.close()
|
|
|
|
- shm.unlink()
|
|
|
|
|
|
+ frigate_watchdog.join()
|
|
|
|
|
|
for detector in detectors.values():
|
|
for detector in detectors.values():
|
|
detector.stop()
|
|
detector.stop()
|
|
@@ -371,19 +334,16 @@ def main():
|
|
|
|
|
|
total_detection_fps = 0
|
|
total_detection_fps = 0
|
|
|
|
|
|
- for name, camera_stats in camera_processes.items():
|
|
|
|
|
|
+ for name, camera_stats in camera_process_info.items():
|
|
total_detection_fps += camera_stats['detection_fps'].value
|
|
total_detection_fps += camera_stats['detection_fps'].value
|
|
- capture_thread = camera_stats['capture_thread']
|
|
|
|
stats[name] = {
|
|
stats[name] = {
|
|
- 'camera_fps': round(capture_thread.fps.eps(), 2),
|
|
|
|
|
|
+ 'camera_fps': round(camera_stats['camera_fps'].value, 2),
|
|
'process_fps': round(camera_stats['process_fps'].value, 2),
|
|
'process_fps': round(camera_stats['process_fps'].value, 2),
|
|
- 'skipped_fps': round(capture_thread.skipped_fps.eps(), 2),
|
|
|
|
|
|
+ 'skipped_fps': round(camera_stats['skipped_fps'].value, 2),
|
|
'detection_fps': round(camera_stats['detection_fps'].value, 2),
|
|
'detection_fps': round(camera_stats['detection_fps'].value, 2),
|
|
- 'read_start': camera_stats['read_start'].value,
|
|
|
|
'pid': camera_stats['process'].pid,
|
|
'pid': camera_stats['process'].pid,
|
|
- 'ffmpeg_pid': camera_stats['ffmpeg_process'].pid,
|
|
|
|
|
|
+ 'capture_pid': camera_stats['capture_process'].pid,
|
|
'frame_info': {
|
|
'frame_info': {
|
|
- 'read': capture_thread.current_frame.value,
|
|
|
|
'detect': camera_stats['detection_frame'].value,
|
|
'detect': camera_stats['detection_frame'].value,
|
|
'process': object_processor.camera_data[name]['current_frame_time']
|
|
'process': object_processor.camera_data[name]['current_frame_time']
|
|
}
|
|
}
|