Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-07-30 13:48:07 +02:00
Code Issues Projects Releases Wiki Activity

Catch case where frame time is between end and rounded start (#17438)

Browse Source
This commit is contained in:
Nicolas Mowen 2025-03-28 20:37:11 -06:00 committed by GitHub
parent c1b06d63b6
commit 4aa493b96c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
frigate/api/media.py
View File

@ -240,25 +240,50 @@ def get_snapshot_from_recording(
content={"success": False, "message": "Camera not found"}, content={"success": False, "message": "Camera not found"},
status_code=404, status_code=404,
) )
recording: Recordings | None = None
recording_query = (
Recordings.select(
Recordings.path,
Recordings.start_time,
)
.where(
(
(frame_time >= Recordings.start_time)
& (frame_time <= Recordings.end_time)
)
)
.where(Recordings.camera == camera_name)
.order_by(Recordings.start_time.desc())
.limit(1)
)
try: try:
recording: Recordings = recording_query.get() recording = (
Recordings.select(
Recordings.path,
Recordings.start_time,
)
.where(
(
(frame_time >= Recordings.start_time)
& (frame_time <= Recordings.end_time)
)
)
.where(Recordings.camera == camera_name)
.order_by(Recordings.start_time.desc())
.limit(1)
.get()
)
except DoesNotExist:
# try again with a rounded frame time as it may be between
# the rounded segment start time
frame_time = round(frame_time)
try:
recording = (
Recordings.select(
Recordings.path,
Recordings.start_time,
)
.where(
(
(frame_time >= Recordings.start_time)
& (frame_time <= Recordings.end_time)
)
)
.where(Recordings.camera == camera_name)
.order_by(Recordings.start_time.desc())
.limit(1)
.get()
)
except DoesNotExist:
pass
if recording is not None:
time_in_segment = frame_time - recording.start_time time_in_segment = frame_time - recording.start_time
codec = "png" if format == "png" else "mjpeg" codec = "png" if format == "png" else "mjpeg"
mime_type = "png" if format == "png" else "jpeg" mime_type = "png" if format == "png" else "jpeg"
@ -279,7 +304,7 @@ def get_snapshot_from_recording(
status_code=404, status_code=404,
) )
return Response(image_data, headers={"Content-Type": f"image/{mime_type}"}) return Response(image_data, headers={"Content-Type": f"image/{mime_type}"})
except DoesNotExist: else:
return JSONResponse( return JSONResponse(
content={ content={
"success": False, "success": False,