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

Instead of checking for indefinite events on a camera before deciding if we should end the segment, only update last_detection_time and last_alert_time if frame_time is greater, which should have the same effect

Browse Source
This commit is contained in:
nulledy 2026-02-08 17:10:44 +00:00
parent a587f5bf40
commit d8038d02e4
1 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
frigate/review/maintainer.py
View File

@ -394,7 +394,8 @@ class ReviewSegmentMaintainer(threading.Thread):
if activity.has_activity_category(SeverityEnum.alert): if activity.has_activity_category(SeverityEnum.alert):
# update current time for last alert activity # update current time for last alert activity
segment.last_alert_time = frame_time if frame_time > segment.last_alert_time:
segment.last_alert_time = frame_time
if segment.severity != SeverityEnum.alert: if segment.severity != SeverityEnum.alert:
# if segment is not alert category but current activity is # if segment is not alert category but current activity is
@ -404,7 +405,8 @@ class ReviewSegmentMaintainer(threading.Thread):
should_update_image = True should_update_image = True
if activity.has_activity_category(SeverityEnum.detection): if activity.has_activity_category(SeverityEnum.detection):
segment.last_detection_time = frame_time if frame_time > segment.last_detection_time:
segment.last_detection_time = frame_time
for object in activity.get_all_objects(): for object in activity.get_all_objects():
# Alert-level objects should always be added (they extend/upgrade the segment) # Alert-level objects should always be added (they extend/upgrade the segment)
@ -484,57 +486,52 @@ class ReviewSegmentMaintainer(threading.Thread):
except FileNotFoundError: except FileNotFoundError:
return return
# indefinite (manual) events should extend the segment until they end if segment.severity == SeverityEnum.alert and frame_time > (
if ( segment.last_alert_time + camera_config.review.alerts.cutoff_time
segment.camera not in self.indefinite_events
or len(self.indefinite_events[segment.camera]) == 0
): ):
if segment.severity == SeverityEnum.alert and frame_time > ( needs_new_detection = (
segment.last_alert_time + camera_config.review.alerts.cutoff_time segment.last_detection_time > segment.last_alert_time
): and (
needs_new_detection = ( segment.last_detection_time
segment.last_detection_time > segment.last_alert_time + camera_config.review.detections.cutoff_time
and (
segment.last_detection_time
+ camera_config.review.detections.cutoff_time
)
> frame_time
) )
last_detection_time = segment.last_detection_time > frame_time
)
last_detection_time = segment.last_detection_time
end_time = self._publish_segment_end(segment, prev_data) end_time = self._publish_segment_end(segment, prev_data)
if needs_new_detection: if needs_new_detection:
new_detections: dict[str, str] = {} new_detections: dict[str, str] = {}
new_zones = set() new_zones = set()
for o in activity.categorized_objects["detections"]: for o in activity.categorized_objects["detections"]:
new_detections[o["id"]] = o["label"] new_detections[o["id"]] = o["label"]
new_zones.update(o["current_zones"]) new_zones.update(o["current_zones"])
if new_detections: if new_detections:
self.active_review_segments[activity.camera_config.name] = ( self.active_review_segments[activity.camera_config.name] = (
PendingReviewSegment( PendingReviewSegment(
activity.camera_config.name, activity.camera_config.name,
end_time, end_time,
SeverityEnum.detection, SeverityEnum.detection,
new_detections, new_detections,
sub_labels={}, sub_labels={},
audio=set(), audio=set(),
zones=list(new_zones), zones=list(new_zones),
)
) )
self._publish_segment_start( )
self.active_review_segments[activity.camera_config.name] self._publish_segment_start(
) self.active_review_segments[activity.camera_config.name]
self.active_review_segments[ )
activity.camera_config.name self.active_review_segments[
].last_detection_time = last_detection_time activity.camera_config.name
elif segment.severity == SeverityEnum.detection and frame_time > ( ].last_detection_time = last_detection_time
segment.last_detection_time elif segment.severity == SeverityEnum.detection and frame_time > (
+ camera_config.review.detections.cutoff_time segment.last_detection_time
): + camera_config.review.detections.cutoff_time
self._publish_segment_end(segment, prev_data) ):
self._publish_segment_end(segment, prev_data)
def check_if_new_segment( def check_if_new_segment(
self, self,