administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-07 11:45:24 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Make sure previews end on the hour

Browse Source
This commit is contained in:
Nick Mowen 2023-11-28 15:25:24 -07:00
parent 354b768f21
commit 186403cd3e
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
frigate/output/preview.py
View File

@ -1,5 +1,6 @@
"""Handle outputting low res / fps preview segments from decoded frames.""" """Handle outputting low res / fps preview segments from decoded frames."""
import datetime
import logging import logging
import multiprocessing as mp import multiprocessing as mp
import os import os
@ -144,6 +145,13 @@ class PreviewRecorder:
"v2": v2, "v2": v2,
} }
# end segment at end of hour
self.segment_end = (
(datetime.datetime.now() + datetime.timedelta(hours=1))
.replace(minute=0, second=0, microsecond=0)
.timestamp()
)
Path(os.path.join(CACHE_DIR, "preview_frames")).mkdir(exist_ok=True) Path(os.path.join(CACHE_DIR, "preview_frames")).mkdir(exist_ok=True)
Path(os.path.join(CLIPS_DIR, f"previews/{config.name}")).mkdir( Path(os.path.join(CLIPS_DIR, f"previews/{config.name}")).mkdir(
parents=True, exist_ok=True parents=True, exist_ok=True
@ -216,7 +224,7 @@ class PreviewRecorder:
self.write_frame_to_cache(frame_time, frame) self.write_frame_to_cache(frame_time, frame)
# check if PREVIEW clip should be generated and cached frames reset # check if PREVIEW clip should be generated and cached frames reset
if frame_time - self.start_time >= PREVIEW_SEGMENT_DURATION: if frame_time >= self.segment_end:
# save last frame to ensure consistent duration # save last frame to ensure consistent duration
self.output_frames.append(frame_time) self.output_frames.append(frame_time)
self.write_frame_to_cache(frame_time, frame) self.write_frame_to_cache(frame_time, frame)
@ -227,6 +235,11 @@ class PreviewRecorder:
).start() ).start()
# reset frame cache # reset frame cache
self.segment_end = (
(datetime.datetime.now() + datetime.timedelta(hours=1))
.replace(minute=0, second=0, microsecond=0)
.timestamp()
)
self.start_time = frame_time self.start_time = frame_time
self.last_output_time = frame_time self.last_output_time = frame_time
self.output_frames = [] self.output_frames = []

14
frigate/util/image.py
View File

@ -312,14 +312,17 @@ def yuv_crop_and_resize(frame, region, height=None):
# copy u2 # copy u2
yuv_cropped_frame[ yuv_cropped_frame[
size + uv_channel_y_offset : size + uv_channel_y_offset + uv_crop_height, size + uv_channel_y_offset : size + uv_channel_y_offset + uv_crop_height,
size // 2 + uv_channel_x_offset : size // 2 size // 2
+ uv_channel_x_offset : size // 2
+ uv_channel_x_offset + uv_channel_x_offset
+ uv_crop_width, + uv_crop_width,
] = frame[u2[1] : u2[3], u2[0] : u2[2]] ] = frame[u2[1] : u2[3], u2[0] : u2[2]]
# copy v1 # copy v1
yuv_cropped_frame[ yuv_cropped_frame[
size + size // 4 + uv_channel_y_offset : size size
+ size // 4
+ uv_channel_y_offset : size
+ size // 4 + size // 4
+ uv_channel_y_offset + uv_channel_y_offset
+ uv_crop_height, + uv_crop_height,
@ -328,11 +331,14 @@ def yuv_crop_and_resize(frame, region, height=None):
# copy v2 # copy v2
yuv_cropped_frame[ yuv_cropped_frame[
size + size // 4 + uv_channel_y_offset : size size
+ size // 4
+ uv_channel_y_offset : size
+ size // 4 + size // 4
+ uv_channel_y_offset + uv_channel_y_offset
+ uv_crop_height, + uv_crop_height,
size // 2 + uv_channel_x_offset : size // 2 size // 2
+ uv_channel_x_offset : size // 2
+ uv_channel_x_offset + uv_channel_x_offset
+ uv_crop_width, + uv_crop_width,
] = frame[v2[1] : v2[3], v2[0] : v2[2]] ] = frame[v2[1] : v2[3], v2[0] : v2[2]]