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

publish object counts rather than on/off

Browse Source
This commit is contained in:
Blake Blackshear 2020-12-01 08:07:17 -06:00
parent 735cc3962b
commit 257de89ce4
1 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
frigate/object_processing.py
View File

@ -240,7 +240,7 @@ class CameraState():
self.camera_config = config.cameras[name] self.camera_config = config.cameras[name]
self.frame_manager = frame_manager self.frame_manager = frame_manager
self.best_objects: Dict[str, TrackedObject] = {} self.best_objects: Dict[str, TrackedObject] = {}
self.object_status = defaultdict(lambda: 'OFF') self.object_counts = defaultdict(lambda: 0)
self.tracked_objects: Dict[str, TrackedObject] = {} self.tracked_objects: Dict[str, TrackedObject] = {}
self.frame_cache = {} self.frame_cache = {}
self.zone_objects = defaultdict(lambda: []) self.zone_objects = defaultdict(lambda: [])
@ -363,18 +363,17 @@ class CameraState():
# report on detected objects # report on detected objects
for obj_name, count in obj_counter.items(): for obj_name, count in obj_counter.items():
new_status = 'ON' if count > 0 else 'OFF' if count != self.object_counts[obj_name]:
if new_status != self.object_status[obj_name]: self.object_counts[obj_name] = count
self.object_status[obj_name] = new_status
for c in self.callbacks['object_status']: for c in self.callbacks['object_status']:
c(self.name, obj_name, new_status) c(self.name, obj_name, count)
# expire any objects that are ON and no longer detected # expire any objects that are >0 and no longer detected
expired_objects = [obj_name for obj_name, status in self.object_status.items() if status == 'ON' and not obj_name in obj_counter] expired_objects = [obj_name for obj_name, count in self.object_counts.items() if count > 0 and not obj_name in obj_counter]
for obj_name in expired_objects: for obj_name in expired_objects:
self.object_status[obj_name] = 'OFF' self.object_counts[obj_name] = 0
for c in self.callbacks['object_status']: for c in self.callbacks['object_status']:
c(self.name, obj_name, 'OFF') c(self.name, obj_name, 0)
for c in self.callbacks['snapshot']: for c in self.callbacks['snapshot']:
c(self.name, self.best_objects[obj_name], frame_time) c(self.name, self.best_objects[obj_name], frame_time)
@ -440,10 +439,13 @@ class TrackedObjectProcessor(threading.Thread):
# { # {
# 'zone_name': { # 'zone_name': {
# 'person': ['camera_1', 'camera_2'] # 'person': {
# 'camera_1': 2,
# 'camera_2': 1
# }
# } # }
# } # }
self.zone_data = defaultdict(lambda: defaultdict(lambda: set())) self.zone_data = defaultdict(lambda: defaultdict(lambda: {}))
def get_best(self, camera, label): def get_best(self, camera, label):
# TODO: need a lock here # TODO: need a lock here
@ -474,26 +476,30 @@ class TrackedObjectProcessor(threading.Thread):
camera_state.update(frame_time, current_tracked_objects) camera_state.update(frame_time, current_tracked_objects)
# update zone status for each label # update zone counts for each label
# for each zone in the current camera
for zone in self.config.cameras[camera].zones.keys(): for zone in self.config.cameras[camera].zones.keys():
# get labels for current camera and all labels in current zone # count labels for the camera in the zone
labels_for_camera = set([obj.obj_data['label'] for obj in camera_state.tracked_objects.values() if zone in obj.current_zones and not obj.false_positive]) obj_counter = Counter()
labels_to_check = labels_for_camera | set(self.zone_data[zone].keys()) for obj in camera_state.tracked_objects.values():
# for each label in zone if zone in obj.current_zones and not obj.false_positive:
for label in labels_to_check: obj_counter[obj.obj_data['label']] += 1
camera_list = self.zone_data[zone][label]
# remove or add the camera to the list for the current label # update counts and publish status
previous_state = len(camera_list) > 0 for label in set(list(self.zone_data[zone].keys()) + list(obj_counter.keys())):
if label in labels_for_camera: # if we have previously published a count for this zone/label
camera_list.add(camera_state.name) zone_label = self.zone_data[zone][label]
elif camera_state.name in camera_list: if camera in zone_label:
camera_list.remove(camera_state.name) current_count = sum(zone_label.values())
new_state = len(camera_list) > 0 zone_label[camera] = obj_counter[label] if label in obj_counter else 0
# if the value is changing, send over MQTT new_count = sum(zone_label.values())
if previous_state == False and new_state == True: if new_count != current_count:
self.client.publish(f"{self.topic_prefix}/{zone}/{label}", 'ON', retain=False) self.client.publish(f"{self.topic_prefix}/{zone}/{label}", new_count, retain=False)
elif previous_state == True and new_state == False: # if this is a new zone/label combo for this camera
self.client.publish(f"{self.topic_prefix}/{zone}/{label}", 'OFF', retain=False) else:
if label in obj_counter:
zone_label[camera] = obj_counter[label]
self.client.publish(f"{self.topic_prefix}/{zone}/{label}", obj_counter[label], retain=False)
# cleanup event finished queue # cleanup event finished queue
while not self.event_processed_queue.empty(): while not self.event_processed_queue.empty():