administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-03-12 19:37:35 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

refactor output logic

Browse Source
This commit is contained in:
Josh Hawkins 2026-03-04 09:35:44 -06:00
parent eb1fb8f984
commit b86d67166b
1 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
frigate/output/output.py
View File

@ -8,7 +8,6 @@ import threading
from multiprocessing.synchronize import Event as MpEvent from multiprocessing.synchronize import Event as MpEvent
from wsgiref.simple_server import make_server from wsgiref.simple_server import make_server
import cv2
from ws4py.server.wsgirefserver import ( from ws4py.server.wsgirefserver import (
WebSocketWSGIHandler, WebSocketWSGIHandler,
WebSocketWSGIRequestHandler, WebSocketWSGIRequestHandler,
@ -124,15 +123,17 @@ class OutputProcess(FrigateProcess):
move_preview_frames("cache") move_preview_frames("cache")
for camera, cam_config in self.config.cameras.items(): for camera, cam_config in self.config.cameras.items():
if not cam_config.enabled_in_config: if not cam_config.enabled_in_config or camera.startswith(
REPLAY_CAMERA_PREFIX
):
continue continue
jsmpeg_cameras[camera] = JsmpegCamera( jsmpeg_cameras[camera] = JsmpegCamera(
cam_config, self.stop_event, websocket_server cam_config, self.stop_event, websocket_server
) )
if not camera.startswith(REPLAY_CAMERA_PREFIX):
preview_recorders[camera] = PreviewRecorder(cam_config) preview_recorders[camera] = PreviewRecorder(cam_config)
preview_write_times[camera] = 0 preview_write_times[camera] = 0
if self.config.birdseye.enabled: if self.config.birdseye.enabled:
birdseye = Birdseye(self.config, self.stop_event, websocket_server) birdseye = Birdseye(self.config, self.stop_event, websocket_server)
@ -145,13 +146,15 @@ class OutputProcess(FrigateProcess):
if CameraConfigUpdateEnum.add in updates: if CameraConfigUpdateEnum.add in updates:
for camera in updates["add"]: for camera in updates["add"]:
if camera.startswith(REPLAY_CAMERA_PREFIX):
continue
camera_config = self.config.cameras[camera] camera_config = self.config.cameras[camera]
jsmpeg_cameras[camera] = JsmpegCamera( jsmpeg_cameras[camera] = JsmpegCamera(
camera_config, self.stop_event, websocket_server camera_config, self.stop_event, websocket_server
) )
if not camera.startswith(REPLAY_CAMERA_PREFIX): preview_recorders[camera] = PreviewRecorder(camera_config)
preview_recorders[camera] = PreviewRecorder(camera_config) preview_write_times[camera] = 0
preview_write_times[camera] = 0
if ( if (
self.config.birdseye.enabled self.config.birdseye.enabled
@ -184,6 +187,7 @@ class OutputProcess(FrigateProcess):
if ( if (
camera not in self.config.cameras camera not in self.config.cameras
or not self.config.cameras[camera].enabled or not self.config.cameras[camera].enabled
or camera.startswith(REPLAY_CAMERA_PREFIX)
): ):
continue continue
@ -208,22 +212,10 @@ class OutputProcess(FrigateProcess):
failed_frame_requests[camera] = 0 failed_frame_requests[camera] = 0
# send frames for low fps recording # send frames for low fps recording
preview_recorder = preview_recorders.get(camera) preview_recorders[camera].write_data(
current_tracked_objects, motion_boxes, frame_time, frame
if preview_recorder is not None: )
try: preview_write_times[camera] = frame_time
preview_recorder.write_data(
current_tracked_objects, motion_boxes, frame_time, frame
)
preview_write_times[camera] = frame_time
except cv2.error:
if camera.startswith(REPLAY_CAMERA_PREFIX):
logger.debug(
"Skipping preview frame write for replay camera %s",
camera,
)
else:
raise
# send camera frame to ffmpeg process if websockets are connected # send camera frame to ffmpeg process if websockets are connected
if any( if any(
@ -241,10 +233,6 @@ class OutputProcess(FrigateProcess):
for ws in websocket_server.manager for ws in websocket_server.manager
) )
): ):
if camera.startswith(REPLAY_CAMERA_PREFIX):
frame_manager.close(frame_name)
continue
birdseye.write_data( birdseye.write_data(
camera, camera,
current_tracked_objects, current_tracked_objects,