move init to function for consistency

frigate/app.py

@@ -143,6 +143,9 @@ class FrigateApp:
             else:
                 logger.debug(f"Skipping directory: {d}")
 
+    def init_debug_replay_manager(self) -> None:
+        self.replay_manager = DebugReplayManager()
+
     def init_camera_metrics(self) -> None:
         # create camera_metrics
         for camera_name in self.config.cameras.keys():
@@ -535,8 +538,7 @@ class FrigateApp:
         set_file_limit()
 
         # Start frigate services.
-        self.replay_manager = DebugReplayManager()
-
+        self.init_debug_replay_manager()
         self.init_camera_metrics()
         self.init_queues()
         self.init_database()

frigate/output/output.py

@@ -8,7 +8,6 @@ import threading
 from multiprocessing.synchronize import Event as MpEvent
 from wsgiref.simple_server import make_server
 
-import cv2
 from ws4py.server.wsgirefserver import (
     WebSocketWSGIHandler,
     WebSocketWSGIRequestHandler,
@@ -85,6 +84,32 @@ class OutputProcess(FrigateProcess):
         )
         self.config = config
 
+    def is_debug_replay_camera(self, camera: str) -> bool:
+        return camera.startswith(REPLAY_CAMERA_PREFIX)
+
+    def add_camera(
+        self,
+        camera: str,
+        websocket_server: WSGIServer,
+        jsmpeg_cameras: dict[str, JsmpegCamera],
+        preview_recorders: dict[str, PreviewRecorder],
+        preview_write_times: dict[str, float],
+        birdseye: Birdseye | None,
+    ) -> None:
+        camera_config = self.config.cameras[camera]
+        jsmpeg_cameras[camera] = JsmpegCamera(
+            camera_config, self.stop_event, websocket_server
+        )
+        preview_recorders[camera] = PreviewRecorder(camera_config)
+        preview_write_times[camera] = 0
+
+        if (
+            birdseye is not None
+            and self.config.birdseye.enabled
+            and camera_config.birdseye.enabled
+        ):
+            birdseye.add_camera(camera)
+
     def run(self) -> None:
         self.pre_run_setup(self.config.logger)
 
@@ -124,15 +149,17 @@ class OutputProcess(FrigateProcess):
         move_preview_frames("cache")
 
         for camera, cam_config in self.config.cameras.items():
-            if not cam_config.enabled_in_config:
+            if not cam_config.enabled_in_config or self.is_debug_replay_camera(camera):
                 continue
 
-            jsmpeg_cameras[camera] = JsmpegCamera(
-                cam_config, self.stop_event, websocket_server
+            self.add_camera(
+                camera,
+                websocket_server,
+                jsmpeg_cameras,
+                preview_recorders,
+                preview_write_times,
+                birdseye,
             )
-            if not camera.startswith(REPLAY_CAMERA_PREFIX):
-                preview_recorders[camera] = PreviewRecorder(cam_config)
-                preview_write_times[camera] = 0
 
         if self.config.birdseye.enabled:
             birdseye = Birdseye(self.config, self.stop_event, websocket_server)
@@ -145,19 +172,15 @@ class OutputProcess(FrigateProcess):
 
             if CameraConfigUpdateEnum.add in updates:
                 for camera in updates["add"]:
-                    camera_config = self.config.cameras[camera]
-                    jsmpeg_cameras[camera] = JsmpegCamera(
-                        camera_config, self.stop_event, websocket_server
-                    )
-                    if not camera.startswith(REPLAY_CAMERA_PREFIX):
-                        preview_recorders[camera] = PreviewRecorder(camera_config)
-                        preview_write_times[camera] = 0
-
-                    if (
-                        self.config.birdseye.enabled
-                        and self.config.cameras[camera].birdseye.enabled
-                    ):
-                        birdseye.add_camera(camera)
+                    if not self.is_debug_replay_camera(camera):
+                        self.add_camera(
+                            camera,
+                            websocket_server,
+                            jsmpeg_cameras,
+                            preview_recorders,
+                            preview_write_times,
+                            birdseye,
+                        )
 
             (topic, data) = detection_subscriber.check_for_update(timeout=1)
             now = datetime.datetime.now().timestamp()
@@ -184,6 +207,7 @@ class OutputProcess(FrigateProcess):
             if (
                 camera not in self.config.cameras
                 or not self.config.cameras[camera].enabled
+                or self.is_debug_replay_camera(camera)
             ):
                 continue
 
@@ -208,22 +232,10 @@ class OutputProcess(FrigateProcess):
                 failed_frame_requests[camera] = 0
 
             # send frames for low fps recording
-            preview_recorder = preview_recorders.get(camera)
-
-            if preview_recorder is not None:
-                try:
-                    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
+            preview_recorders[camera].write_data(
+                current_tracked_objects, motion_boxes, frame_time, frame
+            )
+            preview_write_times[camera] = frame_time
 
             # send camera frame to ffmpeg process if websockets are connected
             if any(
@@ -241,10 +253,6 @@ class OutputProcess(FrigateProcess):
                     for ws in websocket_server.manager
                 )
             ):
-                if camera.startswith(REPLAY_CAMERA_PREFIX):
-                    frame_manager.close(frame_name)
-                    continue
-
                 birdseye.write_data(
                     camera,
                     current_tracked_objects,