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

copy obj so crop doesnt change

Browse Source
This commit is contained in:
Blake Blackshear 2020-09-13 11:39:03 -05:00
parent 5fe201da25
commit adcc3e9b98
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frigate/events.py
View File

@ -130,7 +130,7 @@ class EventProcessor(threading.Thread):
return return
with open(f"{os.path.join(self.clip_dir, clip_name)}.json", 'w') as outfile: with open(f"{os.path.join(self.clip_dir, clip_name)}.json", 'w') as outfile:
json.dump({x: event_data[x] for x in event_data if x not in ['frame']}, outfile) json.dump(event_data, outfile)
def run(self): def run(self):
while True: while True:

18
frigate/object_processing.py
View File

@ -6,6 +6,7 @@ import copy
import cv2 import cv2
import threading import threading
import queue import queue
import copy
import numpy as np import numpy as np
from collections import Counter, defaultdict from collections import Counter, defaultdict
import itertools import itertools
@ -187,19 +188,20 @@ class CameraState():
# if the object wasn't seen on the current frame, skip it # if the object wasn't seen on the current frame, skip it
if obj['frame_time'] != self.current_frame_time or obj['false_positive']: if obj['frame_time'] != self.current_frame_time or obj['false_positive']:
continue continue
obj_copy = copy.deepcopy(obj)
if object_type in self.best_objects: if object_type in self.best_objects:
current_best = self.best_objects[object_type] current_best = self.best_objects[object_type]
now = datetime.datetime.now().timestamp() now = datetime.datetime.now().timestamp()
# if the object is a higher score than the current best score # if the object is a higher score than the current best score
# or the current object is more than 1 minute old, use the new object # or the current object is more than 1 minute old, use the new object
if obj['score'] > current_best['score'] or (now - current_best['frame_time']) > 60: if obj_copy['score'] > current_best['score'] or (now - current_best['frame_time']) > 60:
obj['frame'] = np.copy(self.current_frame) obj_copy['frame'] = np.copy(self.current_frame)
self.best_objects[object_type] = obj self.best_objects[object_type] = obj_copy
for c in self.callbacks['snapshot']: for c in self.callbacks['snapshot']:
c(self.name, self.best_objects[object_type]) c(self.name, self.best_objects[object_type])
else: else:
obj['frame'] = np.copy(self.current_frame) obj_copy['frame'] = np.copy(self.current_frame)
self.best_objects[object_type] = obj self.best_objects[object_type] = obj_copy
for c in self.callbacks['snapshot']: for c in self.callbacks['snapshot']:
c(self.name, self.best_objects[object_type]) c(self.name, self.best_objects[object_type])
@ -242,17 +244,19 @@ class TrackedObjectProcessor(threading.Thread):
def start(camera, obj): def start(camera, obj):
# publish events to mqtt # publish events to mqtt
self.client.publish(f"{self.topic_prefix}/{camera}/events/start", json.dumps({x: obj[x] for x in obj if x not in ['frame']}), retain=False) self.client.publish(f"{self.topic_prefix}/{camera}/events/start", json.dumps(obj), retain=False)
self.event_queue.put(('start', camera, obj)) self.event_queue.put(('start', camera, obj))
def update(camera, obj): def update(camera, obj):
pass pass
def end(camera, obj): def end(camera, obj):
self.client.publish(f"{self.topic_prefix}/{camera}/events/end", json.dumps({x: obj[x] for x in obj if x not in ['frame']}), retain=False) self.client.publish(f"{self.topic_prefix}/{camera}/events/end", json.dumps(obj), retain=False)
self.event_queue.put(('end', camera, obj)) self.event_queue.put(('end', camera, obj))
def snapshot(camera, obj): def snapshot(camera, obj):
if not 'frame' in obj:
return
best_frame = cv2.cvtColor(obj['frame'], cv2.COLOR_RGB2BGR) best_frame = cv2.cvtColor(obj['frame'], cv2.COLOR_RGB2BGR)
mqtt_config = self.camera_config[camera].get('mqtt', {'crop_to_region': False}) mqtt_config = self.camera_config[camera].get('mqtt', {'crop_to_region': False})
if mqtt_config.get('crop_to_region'): if mqtt_config.get('crop_to_region'):