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

attempt to fix missing thumbs

Browse Source
This commit is contained in:
Blake Blackshear 2020-11-11 16:55:50 -06:00
parent 0ff682504a
commit 84bddad30e
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
frigate/object_processing.py
View File

@ -60,11 +60,11 @@ def is_better_thumbnail(current_thumb, new_obj, frame_shape) -> bool:
return False return False
class TrackedObject(): class TrackedObject():
def __init__(self, camera, camera_config: CameraConfig, thumbnail_frames, obj_data): def __init__(self, camera, camera_config: CameraConfig, frame_cache, obj_data):
self.obj_data = obj_data self.obj_data = obj_data
self.camera = camera self.camera = camera
self.camera_config = camera_config self.camera_config = camera_config
self.thumbnail_frames = thumbnail_frames self.frame_cache = frame_cache
self.current_zones = [] self.current_zones = []
self.entered_zones = set() self.entered_zones = set()
self.false_positive = True self.false_positive = True
@ -166,15 +166,15 @@ class TrackedObject():
if self._snapshot_jpg_time == self.thumbnail_data['frame_time']: if self._snapshot_jpg_time == self.thumbnail_data['frame_time']:
return self._snapshot_jpg return self._snapshot_jpg
if not self.thumbnail_data['frame_time'] in self.thumbnail_frames: if not self.thumbnail_data['frame_time'] in self.frame_cache:
logger.error(f"Unable to create thumbnail for {self.obj_data['id']}") logger.error(f"Unable to create thumbnail for {self.obj_data['id']}")
logger.error(f"Looking for frame_time of {self.thumbnail_data['frame_time']}") logger.error(f"Looking for frame_time of {self.thumbnail_data['frame_time']}")
logger.error(f"Thumbnail frames: {','.join([str(k) for k in self.thumbnail_frames.keys()])}") logger.error(f"Thumbnail frames: {','.join([str(k) for k in self.frame_cache.keys()])}")
return self._snapshot_jpg return self._snapshot_jpg
# TODO: crop first to avoid converting the entire frame? # TODO: crop first to avoid converting the entire frame?
snapshot_config = self.camera_config.snapshots snapshot_config = self.camera_config.snapshots
best_frame = cv2.cvtColor(self.thumbnail_frames[self.thumbnail_data['frame_time']], cv2.COLOR_YUV2BGR_I420) best_frame = cv2.cvtColor(self.frame_cache[self.thumbnail_data['frame_time']], cv2.COLOR_YUV2BGR_I420)
if snapshot_config.draw_bounding_boxes: if snapshot_config.draw_bounding_boxes:
thickness = 2 thickness = 2
@ -239,7 +239,7 @@ class CameraState():
self.best_objects: Dict[str, TrackedObject] = {} self.best_objects: Dict[str, TrackedObject] = {}
self.object_status = defaultdict(lambda: 'OFF') self.object_status = defaultdict(lambda: 'OFF')
self.tracked_objects: Dict[str, TrackedObject] = {} self.tracked_objects: Dict[str, TrackedObject] = {}
self.thumbnail_frames = {} self.frame_cache = {}
self.zone_objects = defaultdict(lambda: []) self.zone_objects = defaultdict(lambda: [])
self._current_frame = np.zeros(self.camera_config.frame_shape_yuv, np.uint8) self._current_frame = np.zeros(self.camera_config.frame_shape_yuv, np.uint8)
self.current_frame_lock = threading.Lock() self.current_frame_lock = threading.Lock()
@ -286,20 +286,20 @@ class CameraState():
def on(self, event_type: str, callback: Callable[[Dict], None]): def on(self, event_type: str, callback: Callable[[Dict], None]):
self.callbacks[event_type].append(callback) self.callbacks[event_type].append(callback)
def update(self, frame_time, tracked_objects): def update(self, frame_time, current_detections):
self.current_frame_time = frame_time self.current_frame_time = frame_time
# get the new frame # get the new frame
frame_id = f"{self.name}{frame_time}" frame_id = f"{self.name}{frame_time}"
current_frame = self.frame_manager.get(frame_id, self.camera_config.frame_shape_yuv) current_frame = self.frame_manager.get(frame_id, self.camera_config.frame_shape_yuv)
current_ids = tracked_objects.keys() current_ids = current_detections.keys()
previous_ids = self.tracked_objects.keys() previous_ids = self.tracked_objects.keys()
removed_ids = list(set(previous_ids).difference(current_ids)) removed_ids = list(set(previous_ids).difference(current_ids))
new_ids = list(set(current_ids).difference(previous_ids)) new_ids = list(set(current_ids).difference(previous_ids))
updated_ids = list(set(current_ids).intersection(previous_ids)) updated_ids = list(set(current_ids).intersection(previous_ids))
for id in new_ids: for id in new_ids:
new_obj = self.tracked_objects[id] = TrackedObject(self.name, self.camera_config, self.thumbnail_frames, tracked_objects[id]) new_obj = self.tracked_objects[id] = TrackedObject(self.name, self.camera_config, self.frame_cache, current_detections[id])
# call event handlers # call event handlers
for c in self.callbacks['start']: for c in self.callbacks['start']:
@ -307,12 +307,12 @@ class CameraState():
for id in updated_ids: for id in updated_ids:
updated_obj = self.tracked_objects[id] updated_obj = self.tracked_objects[id]
updated_obj.update(frame_time, tracked_objects[id]) updated_obj.update(frame_time, current_detections[id])
if (not updated_obj.false_positive if (not updated_obj.false_positive
and updated_obj.thumbnail_data['frame_time'] == frame_time and updated_obj.thumbnail_data['frame_time'] == frame_time
and frame_time not in self.thumbnail_frames): and frame_time not in self.frame_cache):
self.thumbnail_frames[frame_time] = np.copy(current_frame) self.frame_cache[frame_time] = np.copy(current_frame)
# call event handlers # call event handlers
for c in self.callbacks['update']: for c in self.callbacks['update']:
@ -374,10 +374,10 @@ class CameraState():
# cleanup thumbnail frame cache # cleanup thumbnail frame cache
current_thumb_frames = set([obj.thumbnail_data['frame_time'] for obj in self.tracked_objects.values() if not obj.false_positive]) current_thumb_frames = set([obj.thumbnail_data['frame_time'] for obj in self.tracked_objects.values() if not obj.false_positive])
current_best_frames = set(obj.thumbnail_data['frame_time'] for obj in self.best_objects.values()) current_best_frames = set([obj.thumbnail_data['frame_time'] for obj in self.best_objects.values()])
thumb_frames_to_delete = [t for t in self.thumbnail_frames.keys() if not t in current_thumb_frames and not t in current_best_frames] thumb_frames_to_delete = [t for t in self.frame_cache.keys() if not t in current_thumb_frames and not t in current_best_frames]
for t in thumb_frames_to_delete: for t in thumb_frames_to_delete:
del self.thumbnail_frames[t] del self.frame_cache[t]
with self.current_frame_lock: with self.current_frame_lock:
self._current_frame = current_frame self._current_frame = current_frame