administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-10-24 23:44:43 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Apply data check to all cases when validating a segment (#24515)
CI / AMD64 Build (push) Canceled after 0s
Details
CI / ARM Build (push) Canceled after 0s
Details
CI / Jetson Jetpack 6 (push) Canceled after 0s
Details
CI / AMD64 Extra Build (push) Canceled after 0s
Details
CI / ARM Extra Build (push) Canceled after 0s
Details
CI / Synaptics Build (push) Canceled after 0s
Details
CI / Assemble and push default build (push) Canceled after 0s
Details

Browse Source
This commit is contained in:
Nicolas Mowen
2026-09-30 08:29:45 -05:00
committed by GitHub
parent e37041c879
commit b749b0bbc5
2 changed files with 95 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frigate/record/maintainer.py
+29 -32
View File
@@ -388,6 +388,22 @@ class RecordingMaintainer(threading.Thread):
RecordingsDataTypeEnum.valid.value,
)
# assume that empty means the relevant recording info has not been received yet
camera_info = self.object_recordings_info[camera]
most_recently_processed_frame_time = (
camera_info[-1][0] if len(camera_info) > 0 else 0
)
# ensure delayed segment info does not lead to lost segments, every
# retention decision below depends on complete stats for the segment
if (
datetime.datetime.fromtimestamp(
most_recently_processed_frame_time
).astimezone(datetime.UTC)
< end_time
):
return None
record_config = self.config.cameras[camera].record
segment_stats: SegmentInfo | None = None
highest = None
@@ -401,37 +417,22 @@ class RecordingMaintainer(threading.Thread):
# we should first just check if this segment matches that
# and avoid any DB calls
if highest is not None:
# assume that empty means the relevant recording info has not been received yet
camera_info = self.object_recordings_info[camera]
most_recently_processed_frame_time = (
camera_info[-1][0] if len(camera_info) > 0 else 0
record_mode = (
RetainModeEnum.all if highest == "continuous" else RetainModeEnum.motion
)
segment_stats = self.segment_stats(camera, start_time, end_time)
# ensure delayed segment info does not lead to lost segments
if (
datetime.datetime.fromtimestamp(
most_recently_processed_frame_time
).astimezone(datetime.UTC)
>= end_time
):
record_mode = (
RetainModeEnum.all
if highest == "continuous"
else RetainModeEnum.motion
# Here we only check if we should move the segment based on non-object recording retention
# we will always want to check for overlapping review items below before dropping the segment
if not segment_stats.should_discard_segment(record_mode):
return await self.move_segment(
camera,
start_time,
end_time,
duration,
cache_path,
segment_stats,
)
segment_stats = self.segment_stats(camera, start_time, end_time)
# Here we only check if we should move the segment based on non-object recording retention
# we will always want to check for overlapping review items below before dropping the segment
if not segment_stats.should_discard_segment(record_mode):
return await self.move_segment(
camera,
start_time,
end_time,
duration,
cache_path,
segment_stats,
)
# we fell through the continuous / motion check, so we need to check the review items
# if the cached segment overlaps with the review items:
@@ -487,10 +488,6 @@ class RecordingMaintainer(threading.Thread):
# continuous/motion retention (either disabled or segment_stats said
# discard), so waiting longer just fills the cache.
else:
camera_info = self.object_recordings_info[camera]
most_recently_processed_frame_time = (
camera_info[-1][0] if len(camera_info) > 0 else 0
)
retain_cutoff = datetime.datetime.fromtimestamp(
most_recently_processed_frame_time - record_config.event_pre_capture
).astimezone(datetime.UTC)