administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-17 16:44:29 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix embeddings reading frames

Browse Source
This commit is contained in:
Nicolas Mowen 2024-11-19 08:39:10 -07:00
parent 26c3f9f914
commit f1b11afbc5
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frigate/comms/events_updater.py
View File

@ -14,7 +14,7 @@ class EventUpdatePublisher(Publisher):
super().__init__("update") super().__init__("update")
def publish( def publish(
self, payload: tuple[EventTypeEnum, EventStateEnum, str, dict[str, any]] self, payload: tuple[EventTypeEnum, EventStateEnum, str, str, dict[str, any]]
) -> None: ) -> None:
super().publish(payload) super().publish(payload)

7
frigate/embeddings/maintainer.py
View File

@ -113,7 +113,7 @@ class EmbeddingMaintainer(threading.Thread):
if update is None: if update is None:
return return
source_type, _, camera, data = update source_type, _, camera, frame_name, data = update
if not camera or source_type != EventTypeEnum.tracked_object: if not camera or source_type != EventTypeEnum.tracked_object:
return return
@ -133,8 +133,7 @@ class EmbeddingMaintainer(threading.Thread):
# Create our own thumbnail based on the bounding box and the frame time # Create our own thumbnail based on the bounding box and the frame time
try: try:
frame_id = f"{camera}{data['frame_time']}" yuv_frame = self.frame_manager.get(frame_name, camera_config.frame_shape_yuv)
yuv_frame = self.frame_manager.get(frame_id, camera_config.frame_shape_yuv)
if yuv_frame is not None: if yuv_frame is not None:
data["thumbnail"] = self._create_thumbnail(yuv_frame, data["box"]) data["thumbnail"] = self._create_thumbnail(yuv_frame, data["box"])
@ -146,7 +145,7 @@ class EmbeddingMaintainer(threading.Thread):
self.tracked_events[data["id"]].append(data) self.tracked_events[data["id"]].append(data)
self.frame_manager.close(frame_id) self.frame_manager.close(frame_name)
except FileNotFoundError: except FileNotFoundError:
pass pass

27
frigate/object_processing.py
View File

@ -262,7 +262,7 @@ class CameraState:
# call event handlers # call event handlers
for c in self.callbacks["start"]: for c in self.callbacks["start"]:
c(self.name, new_obj, frame_time) c(self.name, new_obj, frame_name)
for id in updated_ids: for id in updated_ids:
updated_obj = tracked_objects[id] updated_obj = tracked_objects[id]
@ -272,7 +272,7 @@ class CameraState:
if autotracker_update or significant_update: if autotracker_update or significant_update:
for c in self.callbacks["autotrack"]: for c in self.callbacks["autotrack"]:
c(self.name, updated_obj, frame_time) c(self.name, updated_obj, frame_name)
if thumb_update and current_frame is not None: if thumb_update and current_frame is not None:
# ensure this frame is stored in the cache # ensure this frame is stored in the cache
@ -293,7 +293,7 @@ class CameraState:
) or significant_update: ) or significant_update:
# call event handlers # call event handlers
for c in self.callbacks["update"]: for c in self.callbacks["update"]:
c(self.name, updated_obj, frame_time) c(self.name, updated_obj, frame_name)
updated_obj.last_published = frame_time updated_obj.last_published = frame_time
for id in removed_ids: for id in removed_ids:
@ -302,7 +302,7 @@ class CameraState:
if "end_time" not in removed_obj.obj_data: if "end_time" not in removed_obj.obj_data:
removed_obj.obj_data["end_time"] = frame_time removed_obj.obj_data["end_time"] = frame_time
for c in self.callbacks["end"]: for c in self.callbacks["end"]:
c(self.name, removed_obj, frame_time) c(self.name, removed_obj, frame_name)
# TODO: can i switch to looking this up and only changing when an event ends? # TODO: can i switch to looking this up and only changing when an event ends?
# maintain best objects # maintain best objects
@ -368,11 +368,11 @@ class CameraState:
): ):
self.best_objects[object_type] = obj self.best_objects[object_type] = obj
for c in self.callbacks["snapshot"]: for c in self.callbacks["snapshot"]:
c(self.name, self.best_objects[object_type], frame_time) c(self.name, self.best_objects[object_type], frame_name)
else: else:
self.best_objects[object_type] = obj self.best_objects[object_type] = obj
for c in self.callbacks["snapshot"]: for c in self.callbacks["snapshot"]:
c(self.name, self.best_objects[object_type], frame_time) c(self.name, self.best_objects[object_type], frame_name)
for c in self.callbacks["camera_activity"]: for c in self.callbacks["camera_activity"]:
c(self.name, camera_activity) c(self.name, camera_activity)
@ -447,7 +447,7 @@ class CameraState:
c(self.name, obj_name, 0) c(self.name, obj_name, 0)
self.active_object_counts[obj_name] = 0 self.active_object_counts[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_name)
# cleanup thumbnail frame cache # cleanup thumbnail frame cache
current_thumb_frames = { current_thumb_frames = {
@ -518,17 +518,18 @@ class TrackedObjectProcessor(threading.Thread):
self.zone_data = defaultdict(lambda: defaultdict(dict)) self.zone_data = defaultdict(lambda: defaultdict(dict))
self.active_zone_data = defaultdict(lambda: defaultdict(dict)) self.active_zone_data = defaultdict(lambda: defaultdict(dict))
def start(camera, obj: TrackedObject, current_frame_time): def start(camera: str, obj: TrackedObject, frame_name: str):
self.event_sender.publish( self.event_sender.publish(
( (
EventTypeEnum.tracked_object, EventTypeEnum.tracked_object,
EventStateEnum.start, EventStateEnum.start,
camera, camera,
frame_name,
obj.to_dict(), obj.to_dict(),
) )
) )
def update(camera, obj: TrackedObject, current_frame_time): def update(camera: str, obj: TrackedObject, frame_name: str):
obj.has_snapshot = self.should_save_snapshot(camera, obj) obj.has_snapshot = self.should_save_snapshot(camera, obj)
obj.has_clip = self.should_retain_recording(camera, obj) obj.has_clip = self.should_retain_recording(camera, obj)
after = obj.to_dict() after = obj.to_dict()
@ -544,14 +545,15 @@ class TrackedObjectProcessor(threading.Thread):
EventTypeEnum.tracked_object, EventTypeEnum.tracked_object,
EventStateEnum.update, EventStateEnum.update,
camera, camera,
frame_name,
obj.to_dict(include_thumbnail=True), obj.to_dict(include_thumbnail=True),
) )
) )
def autotrack(camera, obj: TrackedObject, current_frame_time): def autotrack(camera: str, obj: TrackedObject, frame_name: str):
self.ptz_autotracker_thread.ptz_autotracker.autotrack_object(camera, obj) self.ptz_autotracker_thread.ptz_autotracker.autotrack_object(camera, obj)
def end(camera, obj: TrackedObject, current_frame_time): def end(camera: str, obj: TrackedObject, frame_name: str):
# populate has_snapshot # populate has_snapshot
obj.has_snapshot = self.should_save_snapshot(camera, obj) obj.has_snapshot = self.should_save_snapshot(camera, obj)
obj.has_clip = self.should_retain_recording(camera, obj) obj.has_clip = self.should_retain_recording(camera, obj)
@ -606,11 +608,12 @@ class TrackedObjectProcessor(threading.Thread):
EventTypeEnum.tracked_object, EventTypeEnum.tracked_object,
EventStateEnum.end, EventStateEnum.end,
camera, camera,
frame_name,
obj.to_dict(include_thumbnail=True), obj.to_dict(include_thumbnail=True),
) )
) )
def snapshot(camera, obj: TrackedObject, current_frame_time): def snapshot(camera, obj: TrackedObject, frame_name: str):
mqtt_config: MqttConfig = self.config.cameras[camera].mqtt mqtt_config: MqttConfig = self.config.cameras[camera].mqtt
if mqtt_config.enabled and self.should_mqtt_snapshot(camera, obj): if mqtt_config.enabled and self.should_mqtt_snapshot(camera, obj):
jpg_bytes = obj.get_jpg_bytes( jpg_bytes = obj.get_jpg_bytes(