mirror of
https://github.com/blakeblackshear/frigate.git
synced 2024-11-21 19:07:46 +01:00
Fix preview generation for offline camera (#13449)
* Handle case where camera is offline when generating previews * Don't rely on slow system * Simplify checks to rely on other cameras * Formatting * Cleanup
This commit is contained in:
parent
6a0b5c3a3f
commit
921c9de241
@ -64,6 +64,7 @@ def output_frames(
|
|||||||
jsmpeg_cameras: dict[str, JsmpegCamera] = {}
|
jsmpeg_cameras: dict[str, JsmpegCamera] = {}
|
||||||
birdseye: Optional[Birdseye] = None
|
birdseye: Optional[Birdseye] = None
|
||||||
preview_recorders: dict[str, PreviewRecorder] = {}
|
preview_recorders: dict[str, PreviewRecorder] = {}
|
||||||
|
preview_write_times: dict[str, float] = {}
|
||||||
|
|
||||||
move_preview_frames("cache")
|
move_preview_frames("cache")
|
||||||
|
|
||||||
@ -73,6 +74,7 @@ def output_frames(
|
|||||||
|
|
||||||
jsmpeg_cameras[camera] = JsmpegCamera(cam_config, stop_event, websocket_server)
|
jsmpeg_cameras[camera] = JsmpegCamera(cam_config, stop_event, websocket_server)
|
||||||
preview_recorders[camera] = PreviewRecorder(cam_config)
|
preview_recorders[camera] = PreviewRecorder(cam_config)
|
||||||
|
preview_write_times[camera] = 0
|
||||||
|
|
||||||
if config.birdseye.enabled:
|
if config.birdseye.enabled:
|
||||||
birdseye = Birdseye(config, frame_manager, stop_event, websocket_server)
|
birdseye = Birdseye(config, frame_manager, stop_event, websocket_server)
|
||||||
@ -121,14 +123,24 @@ def output_frames(
|
|||||||
)
|
)
|
||||||
|
|
||||||
# send frames for low fps recording
|
# send frames for low fps recording
|
||||||
preview_recorders[camera].write_data(
|
generated_preview = preview_recorders[camera].write_data(
|
||||||
current_tracked_objects, motion_boxes, frame_time, frame
|
current_tracked_objects, motion_boxes, frame_time, frame
|
||||||
)
|
)
|
||||||
|
preview_write_times[camera] = frame_time
|
||||||
|
|
||||||
# delete frames after they have been used for output
|
# delete frames after they have been used for output
|
||||||
if camera in previous_frames:
|
if camera in previous_frames:
|
||||||
frame_manager.delete(f"{camera}{previous_frames[camera]}")
|
frame_manager.delete(f"{camera}{previous_frames[camera]}")
|
||||||
|
|
||||||
|
# if another camera generated a preview,
|
||||||
|
# check for any cameras that are currently offline
|
||||||
|
# and need to generate a preview
|
||||||
|
if generated_preview:
|
||||||
|
for camera, time in preview_write_times.copy().items():
|
||||||
|
if time != 0 and frame_time - time > 10:
|
||||||
|
preview_recorders[camera].flag_offline(frame_time)
|
||||||
|
preview_write_times[camera] = frame_time
|
||||||
|
|
||||||
previous_frames[camera] = frame_time
|
previous_frames[camera] = frame_time
|
||||||
|
|
||||||
move_preview_frames("clips")
|
move_preview_frames("clips")
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
import datetime
|
import datetime
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
|
import shutil
|
||||||
import subprocess as sp
|
import subprocess as sp
|
||||||
import threading
|
import threading
|
||||||
import time
|
import time
|
||||||
@ -298,13 +299,13 @@ class PreviewRecorder:
|
|||||||
motion_boxes: list[list[int]],
|
motion_boxes: list[list[int]],
|
||||||
frame_time: float,
|
frame_time: float,
|
||||||
frame,
|
frame,
|
||||||
) -> None:
|
) -> bool:
|
||||||
# always write the first frame
|
# always write the first frame
|
||||||
if self.start_time == 0:
|
if self.start_time == 0:
|
||||||
self.start_time = frame_time
|
self.start_time = frame_time
|
||||||
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)
|
||||||
return
|
return False
|
||||||
|
|
||||||
# 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.segment_end:
|
if frame_time >= self.segment_end:
|
||||||
@ -326,14 +327,47 @@ class PreviewRecorder:
|
|||||||
)
|
)
|
||||||
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: list[float] = []
|
||||||
|
|
||||||
# include first frame to ensure consistent duration
|
# include first 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)
|
||||||
|
return True
|
||||||
elif self.should_write_frame(current_tracked_objects, motion_boxes, frame_time):
|
elif self.should_write_frame(current_tracked_objects, motion_boxes, frame_time):
|
||||||
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)
|
||||||
|
return False
|
||||||
|
|
||||||
|
def flag_offline(self, frame_time: float) -> None:
|
||||||
|
# check if PREVIEW clip should be generated and cached frames reset
|
||||||
|
if frame_time >= self.segment_end:
|
||||||
|
if len(self.output_frames) == 0:
|
||||||
|
return
|
||||||
|
|
||||||
|
old_frame_path = get_cache_image_name(
|
||||||
|
self.config.name, self.output_frames[-1]
|
||||||
|
)
|
||||||
|
new_frame_path = get_cache_image_name(self.config.name, frame_time)
|
||||||
|
shutil.copy(old_frame_path, new_frame_path)
|
||||||
|
|
||||||
|
# save last frame to ensure consistent duration
|
||||||
|
self.output_frames.append(frame_time)
|
||||||
|
FFMpegConverter(
|
||||||
|
self.config,
|
||||||
|
self.output_frames,
|
||||||
|
self.requestor,
|
||||||
|
).start()
|
||||||
|
|
||||||
|
# reset frame cache
|
||||||
|
self.segment_end = (
|
||||||
|
(datetime.datetime.now() + datetime.timedelta(hours=1))
|
||||||
|
.astimezone(datetime.timezone.utc)
|
||||||
|
.replace(minute=0, second=0, microsecond=0)
|
||||||
|
.timestamp()
|
||||||
|
)
|
||||||
|
self.start_time = frame_time
|
||||||
|
self.last_output_time = frame_time
|
||||||
|
self.output_frames = []
|
||||||
|
|
||||||
def stop(self) -> None:
|
def stop(self) -> None:
|
||||||
self.requestor.stop()
|
self.requestor.stop()
|
||||||
|
Loading…
Reference in New Issue
Block a user