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

expose frame time at each step of processing

Browse Source
This commit is contained in:
Blake Blackshear 2020-04-19 07:49:23 -05:00
parent 918112a793
commit 15b4024715
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
detect_objects.py
View File

@ -206,6 +206,7 @@ def main():
'fps': mp.Value('d', float(config['fps'])), 'fps': mp.Value('d', float(config['fps'])),
'skipped_fps': mp.Value('d', 0.0), 'skipped_fps': mp.Value('d', 0.0),
'detection_fps': mp.Value('d', 0.0), 'detection_fps': mp.Value('d', 0.0),
'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_process': ffmpeg_process,
'ffmpeg_cmd': ffmpeg_cmd, 'ffmpeg_cmd': ffmpeg_cmd,
@ -217,7 +218,7 @@ def main():
camera_process = mp.Process(target=track_camera, args=(name, config, GLOBAL_OBJECT_CONFIG, frame_queue, frame_shape, camera_process = mp.Process(target=track_camera, args=(name, config, GLOBAL_OBJECT_CONFIG, frame_queue, frame_shape,
tflite_process.detection_queue, tracked_objects_queue, camera_processes[name]['fps'], tflite_process.detection_queue, tracked_objects_queue, camera_processes[name]['fps'],
camera_processes[name]['skipped_fps'], camera_processes[name]['detection_fps'], camera_processes[name]['skipped_fps'], camera_processes[name]['detection_fps'],
camera_processes[name]['read_start'])) camera_processes[name]['read_start'], camera_processes[name]['detection_frame']))
camera_process.daemon = True camera_process.daemon = True
camera_processes[name]['process'] = camera_process camera_processes[name]['process'] = camera_process
@ -272,7 +273,12 @@ def main():
'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, 'read_start': camera_stats['read_start'].value,
'pid': camera_stats['process'].pid, 'pid': camera_stats['process'].pid,
'ffmpeg_pid': camera_stats['ffmpeg_process'].pid 'ffmpeg_pid': camera_stats['ffmpeg_process'].pid,
'frame_info': {
'read': camera_stats['capture_thread'].current_frame,
'detect': camera_stats['detection_frame'].value,
'process': object_processor.camera_data[name]['current_frame_time']
}
} }
stats['coral'] = { stats['coral'] = {

2
frigate/object_processing.py
View File

@ -34,6 +34,7 @@ class TrackedObjectProcessor(threading.Thread):
'object_status': defaultdict(lambda: defaultdict(lambda: 'OFF')), 'object_status': defaultdict(lambda: defaultdict(lambda: 'OFF')),
'tracked_objects': {}, 'tracked_objects': {},
'current_frame': np.zeros((720,1280,3), np.uint8), 'current_frame': np.zeros((720,1280,3), np.uint8),
'current_frame_time': 0.0,
'object_id': None 'object_id': None
}) })
self.plasma_client = PlasmaManager() self.plasma_client = PlasmaManager()
@ -55,6 +56,7 @@ class TrackedObjectProcessor(threading.Thread):
best_objects = self.camera_data[camera]['best_objects'] best_objects = self.camera_data[camera]['best_objects']
current_object_status = self.camera_data[camera]['object_status'] current_object_status = self.camera_data[camera]['object_status']
self.camera_data[camera]['tracked_objects'] = tracked_objects self.camera_data[camera]['tracked_objects'] = tracked_objects
self.camera_data[camera]['current_frame_time'] = frame_time
### ###
# Draw tracked objects on the frame # Draw tracked objects on the frame

10
frigate/video.py
View File

@ -125,6 +125,7 @@ class CameraCapture(threading.Thread):
self.fps = fps self.fps = fps
self.plasma_client = PlasmaManager() self.plasma_client = PlasmaManager()
self.ffmpeg_process = ffmpeg_process self.ffmpeg_process = ffmpeg_process
self.current_frame = 0
def run(self): def run(self):
frame_num = 0 frame_num = 0
@ -134,7 +135,7 @@ class CameraCapture(threading.Thread):
break break
frame_bytes = self.ffmpeg_process.stdout.read(self.frame_size) frame_bytes = self.ffmpeg_process.stdout.read(self.frame_size)
frame_time = datetime.datetime.now().timestamp() self.current_frame = datetime.datetime.now().timestamp()
if len(frame_bytes) == 0: if len(frame_bytes) == 0:
print(f"{self.name}: ffmpeg didnt return a frame. something is wrong.") print(f"{self.name}: ffmpeg didnt return a frame. something is wrong.")
@ -145,17 +146,17 @@ class CameraCapture(threading.Thread):
continue continue
# put the frame in the plasma store # put the frame in the plasma store
self.plasma_client.put(f"{self.name}{frame_time}", self.plasma_client.put(f"{self.name}{self.current_frame}",
np np
.frombuffer(frame_bytes, np.uint8) .frombuffer(frame_bytes, np.uint8)
.reshape(self.frame_shape) .reshape(self.frame_shape)
) )
# add to the queue # add to the queue
self.frame_queue.put(frame_time) self.frame_queue.put(self.current_frame)
self.fps.update() self.fps.update()
def track_camera(name, config, global_objects_config, frame_queue, frame_shape, detection_queue, detected_objects_queue, fps, skipped_fps, detection_fps, read_start): def track_camera(name, config, global_objects_config, frame_queue, frame_shape, detection_queue, detected_objects_queue, fps, skipped_fps, detection_fps, read_start, detection_frame):
print(f"Starting process for {name}: {os.getpid()}") print(f"Starting process for {name}: {os.getpid()}")
listen() listen()
@ -204,6 +205,7 @@ def track_camera(name, config, global_objects_config, frame_queue, frame_shape,
duration = datetime.datetime.now().timestamp()-read_start.value duration = datetime.datetime.now().timestamp()-read_start.value
read_start.value = 0.0 read_start.value = 0.0
avg_wait = (avg_wait*99+duration)/100 avg_wait = (avg_wait*99+duration)/100
detection_frame.value = frame_time
fps_tracker.update() fps_tracker.update()
fps.value = fps_tracker.eps() fps.value = fps_tracker.eps()