administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-05 18:55:23 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Store full frame for thumbnail

Browse Source
This commit is contained in:
Nick Mowen 2023-05-18 11:20:14 -06:00
parent 82a173b920
commit 48f13a5f36
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frigate/events/external.py
View File

@ -34,6 +34,7 @@ class ExternalEventProcessor:
sub_label: Optional[str], sub_label: Optional[str],
duration: Optional[int], duration: Optional[int],
include_recording: bool, include_recording: bool,
draw: dict[str, any],
snapshot_frame: any, snapshot_frame: any,
) -> str: ) -> str:
now = datetime.datetime.now().timestamp() now = datetime.datetime.now().timestamp()
@ -43,10 +44,7 @@ class ExternalEventProcessor:
rand_id = "".join(random.choices(string.ascii_lowercase + string.digits, k=6)) rand_id = "".join(random.choices(string.ascii_lowercase + string.digits, k=6))
event_id = f"{now}-{rand_id}" event_id = f"{now}-{rand_id}"
self._write_snapshots(camera_config, label, event_id, snapshot_frame) thumbnail = self._write_images(camera_config, label, event_id, draw, snapshot_frame)
if not self.default_thumbnail:
self._calculate_thumbnail_bytes()
self.queue.put( self.queue.put(
( (
@ -60,7 +58,7 @@ class ExternalEventProcessor:
"camera": camera, "camera": camera,
"start_time": now, "start_time": now,
"end_time": now + duration if duration is not None else None, "end_time": now + duration if duration is not None else None,
"thumbnail": self.default_thumbnail, "thumbnail": thumbnail,
"has_clip": camera_config.record.enabled and include_recording, "has_clip": camera_config.record.enabled and include_recording,
"has_snapshot": True, "has_snapshot": True,
}, },
@ -76,22 +74,14 @@ class ExternalEventProcessor:
(EventTypeEnum.api, "end", None, {"id": event_id, "end_time": now}) (EventTypeEnum.api, "end", None, {"id": event_id, "end_time": now})
) )
def _calculate_thumbnail_bytes(self) -> None: def _write_images(
thumbnail = glob.glob("/opt/frigate/frigate/images/external-event.png")
if len(thumbnail) > 0:
with open("/opt/frigate/frigate/images/external-event.png", "rb") as img:
img_bytes = img.read()
self.default_thumbnail = base64.b64encode(img_bytes).decode("utf-8")
def _write_snapshots(
self, self,
camera_config: CameraConfig, camera_config: CameraConfig,
label: str, label: str,
event_id: str, event_id: str,
draw: dict[str, any], draw: dict[str, any],
img_bytes: any, img_bytes: any,
) -> None: ) -> str:
# write clean snapshot if enabled # write clean snapshot if enabled
if camera_config.snapshots.clean_copy: if camera_config.snapshots.clean_copy:
ret, png = cv2.imencode(".png", img_bytes) ret, png = cv2.imencode(".png", img_bytes)
@ -132,3 +122,5 @@ class ExternalEventProcessor:
"wb", "wb",
) as j: ) as j:
j.write(jpg.tobytes()) j.write(jpg.tobytes())
return base64.b64encode(jpg.tobytes()).decode("utf-8")

BIN
frigate/images/external-event.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB