stop creating a config subscriber per capture thread (#24002)

* Guard object processor queue handlers against unknown cameras

* Skip embeddings post processing for removed cameras

* End review segments for removed cameras

* Drop queued autotracker moves for removed cameras

* Release tracked event thumbnails when skipping a removed camera

* Add locked accessors for camera states

* Read camera states through the processor accessors

* Guard output and recording paths against cameras not yet known

* Resolve camera state once in ONVIF, notification, and transcription paths

Makefile

@@ -1,7 +1,7 @@
 default_target: local
 
 COMMIT_HASH := $(shell git log -1 --pretty=format:"%h"|tail -1)
-VERSION = 0.18.0
+VERSION = 0.19.0
 IMAGE_REPO ?= ghcr.io/blakeblackshear/frigate
 GITHUB_REF_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 BOARDS= #Initialized empty

docs/docs/configuration/advanced/reference.md

@@ -251,11 +251,17 @@ birdseye:
   # Optional: Encoding quality of the mpeg1 feed (default: shown below)
   # 1 is the highest quality, and 31 is the lowest. Lower quality feeds utilize less CPU resources.
   quality: 8
-  # Optional: Mode of the view. Available options are: objects, motion, and continuous
+  # Optional: Activity types that include cameras in Birdseye (default: shown below)
-  #   objects - cameras are included if they have had a tracked object within the last 30 seconds
+  # Multiple activity types can be enabled at the same time.
-  #   motion - cameras are included if motion was detected in the last 30 seconds
+  mode:
-  #   continuous - all cameras are included always
+    # Optional: All cameras are included always (default: shown below)
-  mode: objects
+    continuous: False
+    # Optional: Cameras are included if motion was detected in the last 30 seconds (default: shown below)
+    motion: False
+    # Optional: Cameras are included if they have had an active tracked object within the last 30 seconds (default: shown below)
+    objects: True
+    # Optional: Cameras are included while they have a stationary tracked object (default: shown below)
+    stationary_objects: False
   # Optional: Threshold for camera activity to stop showing camera (default: shown below)
   inactivity_threshold: 30
   # Optional: Configure the birdseye layout

docs/docs/configuration/birdseye.md

@@ -18,13 +18,14 @@ Each camera tile in Birdseye is composed from the frames of the stream assigned
 
 ## Birdseye Behavior
 
-### Birdseye Modes
+### Birdseye Activity Types
 
-Birdseye offers different modes to customize which cameras show under which circumstances.
+Birdseye offers independent activity types that control when cameras are shown. Multiple activity types can be enabled together.
 
-- **continuous:** All cameras are always included
+- **continuous:** The camera is always included
-- **motion:** Cameras that have detected motion within the last 30 seconds are included
+- **motion:** The camera is included when motion was detected within the last 30 seconds
-- **objects:** Cameras that have tracked an active object within the last 30 seconds are included
+- **objects:** The camera is included when an active object was tracked within the last 30 seconds
+- **stationary_objects:** The camera is included while a stationary object is tracked
 
 ### Custom Birdseye Icon
 
@@ -39,27 +40,30 @@ To include a camera in Birdseye view only for specific circumstances, or exclude
 
 **Global settings:** Navigate to <NavPath path="Settings > System > Birdseye" /> to configure the default Birdseye behavior for all cameras.
 
-**Per-camera overrides:** Navigate to <NavPath path="Settings > Camera configuration > Birdseye" /> to override the mode or disable Birdseye for a specific camera.
+**Per-camera overrides:** Navigate to <NavPath path="Settings > Camera configuration > Birdseye" /> to override the activity types or disable Birdseye for a specific camera.
 
-| Field               | Description                                                   |
+| Field                  | Description                                                |
-| ------------------- | ------------------------------------------------------------- |
+| ---------------------- | ---------------------------------------------------------- |
-| **Enable Birdseye** | Whether this camera appears in Birdseye view                  |
+| **Enable Birdseye**    | Whether this camera appears in Birdseye view               |
-| **Tracking mode**   | When to show the camera: `continuous`, `motion`, or `objects` |
+| **Activity types**     | Conditions that determine when to show the camera          |
 
 </TabItem>
 <TabItem value="yaml">
 
-```yaml {8-10,12-14}
+```yaml {8-11,13-15}
 # Include all cameras by default in Birdseye view
 birdseye:
   enabled: True
-  mode: continuous
+  mode:
+    continuous: True
 
 cameras:
   front:
     # Only include the "front" camera in Birdseye view when objects are detected
     birdseye:
-      mode: objects
+      mode:
+        continuous: False
+        objects: True
   back:
     # Exclude the "back" camera from Birdseye view
     birdseye:

docs/docs/integrations/mqtt.md

@@ -555,20 +555,21 @@ Topic with current state of Birdseye for a camera. Published values are `ON` and
 
 ### `frigate/<camera_name>/birdseye_mode/set`
 
-Topic to set Birdseye mode for a camera. Birdseye offers different modes to customize under which circumstances the camera is shown.
+Topic to set the Birdseye activity types for a camera. Send one uppercase activity type or combine multiple types with commas, for example `MOTION,OBJECTS,STATIONARY_OBJECTS`.
 
-_Note: Changing the value from `CONTINUOUS` -> `MOTION | OBJECTS` will take up to 30 seconds for
+_Note: Changing the value from `CONTINUOUS` to non-continuous activity types will take up to 30 seconds for
 the camera to be removed from the view._
 
-| Command      | Description                                                       |
+| Command              | Description                                                      |
-| ------------ | ----------------------------------------------------------------- |
+| -------------------- | ---------------------------------------------------------------- |
-| `CONTINUOUS` | Always included                                                   |
+| `CONTINUOUS`         | Always included                                                  |
-| `MOTION`     | Show when detected motion within the last 30 seconds are included |
+| `MOTION`             | Shown if motion was detected within the last 30 seconds          |
-| `OBJECTS`    | Shown if an active object tracked within the last 30 seconds      |
+| `OBJECTS`            | Shown if an active object was tracked within the last 30 seconds |
+| `STATIONARY_OBJECTS` | Shown while a stationary object is tracked                       |
 
 ### `frigate/<camera_name>/birdseye_mode/state`
 
-Topic with current state of the Birdseye mode for a camera. Published values are `CONTINUOUS`, `MOTION`, `OBJECTS`.
+Topic with the current Birdseye activity types for a camera. Multiple enabled types are published as a comma-separated value in the order `OBJECTS`, `MOTION`, `STATIONARY_OBJECTS`, `CONTINUOUS`.
 
 ### `frigate/<camera_name>/notifications/set`
 

docs/static/frigate-api.yaml

@@ -2946,6 +2946,44 @@ paths:
         - frigateUserAuth: []
       x-required-role: any
       description: '**Access:** Any authenticated user.'
+  /categorized_object_names:
+    get:
+      tags:
+        - App
+      summary: Get known object names by object type
+      description: |-
+        **Access:** Any authenticated user.
+
+        Returns the sub labels and attributes this install can attach,
+            grouped by object type. Unlike /sub_labels, which reflects what has already been
+            detected, this reads the config and model files, so it covers recognized face
+            names, named license plates, custom object classification categories, and the
+            detector attributes of tracked objects.
+      operationId: categorized_object_names_categorized_object_names_get
+      parameters:
+        - name: object_type
+          in: query
+          required: false
+          schema:
+            anyOf:
+              - type: string
+              - type: 'null'
+            title: Object Type
+      responses:
+        '200':
+          description: Successful Response
+          content:
+            application/json:
+              schema: {}
+        '422':
+          description: Validation Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/HTTPValidationError'
+      security:
+        - frigateUserAuth: []
+      x-required-role: any
   /audio_labels:
     get:
       tags:

frigate/api/app.py

@@ -71,6 +71,7 @@ from frigate.util.config import (
     find_config_file,
     redact_credential,
 )
+from frigate.util.object_names import get_categorized_object_names
 from frigate.util.schema import get_config_schema
 from frigate.util.services import (
     get_nvidia_driver_info,
@@ -1313,6 +1314,28 @@ def get_sub_labels(
     return JSONResponse(content=sub_labels)
 
 
+@router.get(
+    "/categorized_object_names",
+    dependencies=[Depends(allow_any_authenticated())],
+    summary="Get known object names by object type",
+    description="""Returns the sub labels and attributes this install can attach,
+    grouped by object type. Unlike /sub_labels, which reflects what has already been
+    detected, this reads the config and model files, so it covers recognized face
+    names, named license plates, custom object classification categories, and the
+    detector attributes of tracked objects.""",
+)
+def categorized_object_names(
+    request: Request,
+    object_type: str | None = None,
+    allowed_cameras: list[str] = Depends(get_allowed_cameras_for_filter),
+):
+    return JSONResponse(
+        content=get_categorized_object_names(
+            request.app.frigate_config, allowed_cameras, object_type
+        )
+    )
+
+
 @router.get("/audio_labels", dependencies=[Depends(allow_any_authenticated())])
 def get_audio_labels():
     labels = load_labels("/audio-labelmap.txt", prefill=521)

frigate/api/auth.py

@@ -83,6 +83,7 @@ def require_admin_by_default():
         "/nvinfo",
         "/labels",
         "/sub_labels",
+        "/categorized_object_names",
         "/plus/models",
         "/recognized_license_plates",
         "/timeline",

frigate/api/chat.py

@@ -50,6 +50,7 @@ from frigate.jobs.vlm_watch import (
     stop_vlm_watch_job,
 )
 from frigate.models import Event
+from frigate.util.object_names import get_categorized_object_names
 
 logger = logging.getLogger(__name__)
 
@@ -539,6 +540,11 @@ async def execute_tool(
     if tool_name == "search_objects":
         return await _execute_search_objects(request, arguments, allowed_cameras)
 
+    if tool_name == "get_categorized_object_names":
+        return JSONResponse(
+            content=_execute_get_categorized_object_names(request, allowed_cameras)
+        )
+
     if tool_name == "find_similar_objects":
         result = await _execute_find_similar_objects(
             request, arguments, allowed_cameras
@@ -591,7 +597,7 @@ async def _execute_get_live_context(
 
     try:
         frame_processor = request.app.detected_frames_processor
-        camera_state = frame_processor.camera_states.get(camera)
+        camera_state = frame_processor.get_camera_state(camera)
 
         if camera_state is None:
             return {
@@ -655,7 +661,7 @@ async def _get_live_frame_image_url(
         return None
     try:
         frame_processor = request.app.detected_frames_processor
-        if camera not in frame_processor.camera_states:
+        if frame_processor.get_camera_state(camera) is None:
             return None
         frame = frame_processor.get_current_frame(camera, {})
         if frame is None:
@@ -717,6 +723,21 @@ async def _execute_set_camera_state(
     return {"success": True, "camera": camera, "feature": feature, "value": value}
 
 
+def _execute_get_categorized_object_names(
+    request: Request,
+    allowed_cameras: list[str],
+) -> dict[str, Any]:
+    names = get_categorized_object_names(request.app.frigate_config, allowed_cameras)
+
+    if not names:
+        return {
+            "names": {},
+            "message": "No names configured; search by label or semantic_query.",
+        }
+
+    return {"names": names}
+
+
 async def _execute_tool_internal(
     tool_name: str,
     arguments: dict[str, Any],
@@ -741,6 +762,8 @@ async def _execute_tool_internal(
         except (json.JSONDecodeError, AttributeError) as e:
             logger.warning(f"Failed to extract tool result: {e}")
             return {"error": "Failed to parse tool result"}
+    elif tool_name == "get_categorized_object_names":
+        return _execute_get_categorized_object_names(request, allowed_cameras)
     elif tool_name == "find_similar_objects":
         return await _execute_find_similar_objects(request, arguments, allowed_cameras)
     elif tool_name == "set_camera_state":
@@ -773,8 +796,8 @@ async def _execute_tool_internal(
     else:
         logger.error(
             "Tool call failed: unknown tool %r. Expected one of: search_objects, find_similar_objects, "
-            "get_live_context, start_camera_watch, stop_camera_watch, get_profile_status, get_recap. "
+            "get_categorized_object_names, get_live_context, start_camera_watch, stop_camera_watch, "
-            "Arguments received: %s",
+            "get_profile_status, get_recap. Arguments received: %s",
             tool_name,
             json.dumps(arguments),
         )

frigate/api/event.py

@@ -1313,7 +1313,7 @@ async def set_sub_label(
     if request.app.detected_frames_processor:
         tracked_obj: TrackedObject = None
 
-        for state in request.app.detected_frames_processor.camera_states.values():
+        for state in request.app.detected_frames_processor.get_camera_states():
             tracked_obj = state.tracked_objects.get(event_id)
 
             if tracked_obj is not None:
@@ -1372,7 +1372,7 @@ async def set_plate(
     if request.app.detected_frames_processor:
         tracked_obj: TrackedObject = None
 
-        for state in request.app.detected_frames_processor.camera_states.values():
+        for state in request.app.detected_frames_processor.get_camera_states():
             tracked_obj = state.tracked_objects.get(event_id)
 
             if tracked_obj is not None:

frigate/api/media.py

@@ -575,11 +575,11 @@ async def vod_ts(
             Recordings.start_time,
         )
         .where(
-            Recordings.start_time.between(start_ts, end_ts)
+            Recordings.camera == camera_name,
-            | Recordings.end_time.between(start_ts, end_ts)
+            Recordings.start_time >= start_ts - MAX_SEGMENT_DURATION,
-            | ((start_ts > Recordings.start_time) & (end_ts < Recordings.end_time))
+            Recordings.start_time <= end_ts,
+            Recordings.end_time >= start_ts,
         )
-        .where(Recordings.camera == camera_name)
         .order_by(Recordings.start_time.asc())
         .iterator()
     )
@@ -820,7 +820,7 @@ async def event_snapshot(
         # see if the object is currently being tracked
         try:
             camera_states: list[CameraState] = (
-                request.app.detected_frames_processor.camera_states.values()
+                request.app.detected_frames_processor.get_camera_states()
             )
             for camera_state in camera_states:
                 if event_id in camera_state.tracked_objects:
@@ -898,7 +898,7 @@ async def event_thumbnail(
     if thumbnail_bytes is None:
         # see if the object is currently being tracked
         try:
-            camera_states = request.app.detected_frames_processor.camera_states.values()
+            camera_states = request.app.detected_frames_processor.get_camera_states()
             for camera_state in camera_states:
                 if event_id in camera_state.tracked_objects:
                     tracked_obj = camera_state.tracked_objects.get(event_id)
@@ -1127,7 +1127,7 @@ async def event_snapshot_clean(request: Request, event_id: str, download: bool =
             # see if the object is currently being tracked
             try:
                 camera_states = (
-                    request.app.detected_frames_processor.camera_states.values()
+                    request.app.detected_frames_processor.get_camera_states()
                 )
                 for camera_state in camera_states:
                     if event_id in camera_state.tracked_objects:

frigate/api/record.py

@@ -25,7 +25,7 @@ from frigate.api.defs.query.recordings_query_parameters import (
 )
 from frigate.api.defs.response.generic_response import GenericResponse
 from frigate.api.defs.tags import Tags
-from frigate.const import RECORD_DIR
+from frigate.const import MAX_SEGMENT_DURATION, RECORD_DIR
 from frigate.models import Event, Recordings
 from frigate.util.time import get_dst_transitions
 
@@ -243,6 +243,7 @@ async def recordings(
         )
         .where(
             Recordings.camera == camera_name,
+            Recordings.start_time >= after - MAX_SEGMENT_DURATION,
             Recordings.end_time >= after,
             Recordings.start_time <= before,
         )

frigate/comms/dispatcher.py

@@ -11,7 +11,7 @@ from frigate.camera.activity_manager import AudioActivityManager, CameraActivity
 from frigate.comms.base_communicator import Communicator
 from frigate.comms.runtime_state import RuntimeStatePersistence
 from frigate.comms.webpush import WebPushClient
-from frigate.config import BirdseyeModeEnum, FrigateConfig
+from frigate.config import BirdseyeModeConfig, FrigateConfig
 from frigate.config.camera.updater import (
     CameraConfigUpdateEnum,
     CameraConfigUpdatePublisher,
@@ -882,8 +882,9 @@ class Dispatcher:
     def _on_birdseye_mode_command(self, camera_name: str, payload: str) -> None:
         """Callback for birdseye mode topic."""
 
-        if payload not in ["CONTINUOUS", "MOTION", "OBJECTS"]:
+        mode = BirdseyeModeConfig.from_mqtt_payload(payload)
-            logger.info(f"Invalid birdseye_mode command: {payload}")
+        if mode is None:
+            logger.info("Invalid birdseye_mode command: %s", payload)
             return
 
         birdseye_settings = self.config.cameras[camera_name].birdseye
@@ -892,7 +893,7 @@ class Dispatcher:
             logger.info(f"Birdseye mode not enabled for {camera_name}")
             return
 
-        birdseye_settings.mode = BirdseyeModeEnum(payload.lower())
+        birdseye_settings.mode = mode
         logger.info(
             f"Setting birdseye mode for {camera_name} to {birdseye_settings.mode}"
         )
@@ -901,7 +902,9 @@ class Dispatcher:
             CameraConfigUpdateTopic(CameraConfigUpdateEnum.birdseye, camera_name),
             birdseye_settings,
         )
-        self.publish(f"{camera_name}/birdseye_mode/state", payload, retain=True)
+        self.publish(
+            f"{camera_name}/birdseye_mode/state", mode.to_mqtt_payload(), retain=True
+        )
 
     def _on_camera_notification_command(self, camera_name: str, payload: str) -> None:
         """Callback for camera level notifications topic."""

frigate/comms/mqtt.py

@@ -125,7 +125,7 @@ class MqttClient(Communicator):
             self.publish(
                 f"{camera_name}/birdseye_mode/state",
                 (
-                    camera.birdseye.mode.value.upper()
+                    camera.birdseye.mode.to_mqtt_payload()
                     if camera.birdseye.enabled
                     else "OFF"
                 ),

frigate/comms/webpush.py

@@ -216,7 +216,9 @@ class WebPushClient(Communicator):
         if topic == "reviews":
             decoded = json.loads(payload)
             camera = decoded["before"]["camera"]
-            if not self.config.cameras[camera].notifications.enabled:
+            camera_config = self.config.cameras.get(camera)
+
+            if camera_config is None or not camera_config.notifications.enabled:
                 return
             if self.is_camera_suspended(camera):
                 logger.debug(f"Notifications for {camera} are currently suspended.")
@@ -230,13 +232,14 @@ class WebPushClient(Communicator):
 
             # ensure notifications are enabled and the specific trigger has
             # notification action enabled
+            camera_config = self.config.cameras.get(camera)
+
             if (
-                not self.config.cameras[camera].notifications.enabled
+                camera_config is None
-                or name not in self.config.cameras[camera].semantic_search.triggers
+                or not camera_config.notifications.enabled
+                or name not in camera_config.semantic_search.triggers
                 or "notification"
-                not in self.config.cameras[camera]
+                not in camera_config.semantic_search.triggers[name].actions
-                .semantic_search.triggers[name]
-                .actions
             ):
                 return
 
@@ -247,7 +250,9 @@ class WebPushClient(Communicator):
         elif topic == "camera_monitoring":
             decoded = json.loads(payload)
             camera = decoded["camera"]
-            if not self.config.cameras[camera].notifications.enabled:
+            camera_config = self.config.cameras.get(camera)
+
+            if camera_config is None or not camera_config.notifications.enabled:
                 return
             if self.is_camera_suspended(camera):
                 logger.debug(f"Notifications for {camera} are currently suspended.")

frigate/config/camera/birdseye.py

@@ -1,5 +1,3 @@
-from enum import Enum
-
 from pydantic import BaseModel, Field
 
 from ..base import FrigateBaseModel
@@ -8,22 +6,78 @@ __all__ = [
     "BirdseyeCameraConfig",
     "BirdseyeConfig",
     "BirdseyeLayoutConfig",
-    "BirdseyeModeEnum",
+    "BirdseyeModeConfig",
 ]
 
+BIRDSEYE_ACTIVITY_TYPES = (
+    "objects",
+    "motion",
+    "stationary_objects",
+    "continuous",
+)
 
-class BirdseyeModeEnum(str, Enum):
+
-    objects = "objects"
+class BirdseyeModeConfig(FrigateBaseModel):
-    motion = "motion"
+    continuous: bool = Field(
-    continuous = "continuous"
+        default=False,
+        title="Continuous",
+        description="Always include the camera in Birdseye.",
+    )
+    motion: bool = Field(
+        default=False,
+        title="Motion",
+        description="Include the camera in Birdseye when motion is detected.",
+    )
+    objects: bool = Field(
+        default=False,
+        title="Active objects",
+        description="Include the camera in Birdseye while an active object is tracked.",
+    )
+    stationary_objects: bool = Field(
+        default=False,
+        title="Stationary objects",
+        description="Include the camera in Birdseye while a stationary object is tracked.",
+    )
 
     @classmethod
-    def get_index(cls, type):
+    def from_mqtt_payload(cls, payload: str) -> "BirdseyeModeConfig | None":
-        return list(cls).index(type)
+        """Create mode options from an uppercase MQTT payload."""
+        raw_modes = payload.split(",")
+        if not raw_modes or any(not mode for mode in raw_modes):
+            return None
 
-    @classmethod
+        modes = [mode.lower() for mode in raw_modes]
-    def get(cls, index):
+        if any(
-        return list(cls)[index]
+            raw_mode != mode.upper() or mode not in BIRDSEYE_ACTIVITY_TYPES
+            for raw_mode, mode in zip(raw_modes, modes)
+        ):
+            return None
+
+        if len(modes) != len(set(modes)):
+            return None
+
+        return cls(**{mode: True for mode in modes})
+
+    def has_enabled_activity(self) -> bool:
+        """Return whether at least one activity type is enabled."""
+        return any(getattr(self, activity) for activity in BIRDSEYE_ACTIVITY_TYPES)
+
+    def to_mqtt_payload(self) -> str:
+        """Serialize enabled mode options for MQTT state topics."""
+        payload = ",".join(
+            activity.upper()
+            for activity in BIRDSEYE_ACTIVITY_TYPES
+            if getattr(self, activity)
+        )
+        if not payload:
+            raise ValueError("At least one Birdseye activity type must be enabled")
+
+        return payload
+
+
+def default_birdseye_mode() -> BirdseyeModeConfig:
+    """Return the default Birdseye mode configuration."""
+    return BirdseyeModeConfig(objects=True)
 
 
 class BirdseyeLayoutConfig(FrigateBaseModel):
@@ -47,10 +101,10 @@ class BirdseyeConfig(FrigateBaseModel):
         title="Enable Birdseye",
         description="Enable or disable the Birdseye view feature.",
     )
-    mode: BirdseyeModeEnum = Field(
+    mode: BirdseyeModeConfig = Field(
-        default=BirdseyeModeEnum.objects,
+        default_factory=default_birdseye_mode,
-        title="Tracking mode",
+        title="Activity types",
-        description="Mode for including cameras in Birdseye: 'objects', 'motion', or 'continuous'.",
+        description="Activity types that include cameras in Birdseye.",
     )
 
     restream: bool = Field(
@@ -102,10 +156,10 @@ class BirdseyeCameraConfig(BaseModel):
         title="Enable Birdseye",
         description="Enable or disable the Birdseye view feature.",
     )
-    mode: BirdseyeModeEnum = Field(
+    mode: BirdseyeModeConfig = Field(
-        default=BirdseyeModeEnum.objects,
+        default_factory=default_birdseye_mode,
-        title="Tracking mode",
+        title="Activity types",
-        description="Mode for including cameras in Birdseye: 'objects', 'motion', or 'continuous'.",
+        description="Activity types that include cameras in Birdseye.",
     )
 
     order: int = Field(

frigate/config/config.py

@@ -41,7 +41,7 @@ from .auth import AuthConfig
 from .base import FrigateBaseModel
 from .camera import CameraConfig, CameraLiveConfig
 from .camera.audio import AudioConfig, AudioFilterConfig
-from .camera.birdseye import BirdseyeConfig
+from .camera.birdseye import BirdseyeConfig, BirdseyeModeConfig
 from .camera.detect import DetectConfig
 from .camera.ffmpeg import FfmpegConfig
 from .camera.genai import GenAIConfig, GenAIRoleEnum
@@ -326,8 +326,20 @@ def verify_required_zones_exist(camera_config: CameraConfig) -> None:
 
 
 def verify_profile_overrides_match_base(camera_config: CameraConfig) -> None:
-    """Verify that profile zone and mask IDs reference entries defined on the base camera."""
+    """Verify profile overrides against the resolved base camera configuration."""
     for profile_name, profile in camera_config.profiles.items():
+        if profile.birdseye is not None:
+            overrides = profile.birdseye.mode.model_dump(exclude_unset=True)
+            base_mode = camera_config.birdseye.mode.model_dump()
+            resolved_mode = BirdseyeModeConfig.model_validate(
+                deep_merge(overrides, base_mode)
+            )
+            if not resolved_mode.has_enabled_activity():
+                raise ValueError(
+                    f"Camera '{camera_config.name}' profile '{profile_name}' must "
+                    "enable at least one Birdseye activity type"
+                )
+
         if profile.zones:
             for zone_name in profile.zones:
                 if zone_name not in camera_config.zones:
@@ -998,6 +1010,10 @@ class FrigateConfig(FrigateBaseModel):
             self.cameras[name] = camera_config
 
             verify_config_roles(camera_config)
+            if not camera_config.birdseye.mode.has_enabled_activity():
+                raise ValueError(
+                    f"Camera '{name}' must enable at least one Birdseye activity type"
+                )
             verify_valid_live_stream_names(self, camera_config)
             verify_recording_segments_setup_with_reasonable_time(camera_config)
             verify_zone_objects_are_tracked(camera_config)

frigate/config/profile_manager.py

@@ -43,7 +43,9 @@ SECTION_STATE_TOPICS: dict[str, list[tuple[str, Callable[[Any], Any]]]] = {
         ("birdseye", lambda c: "ON" if c.birdseye.enabled else "OFF"),
         (
             "birdseye_mode",
-            lambda c: c.birdseye.mode.value.upper() if c.birdseye.enabled else "OFF",
+            lambda c: (
+                c.birdseye.mode.to_mqtt_payload() if c.birdseye.enabled else "OFF"
+            ),
         ),
     ],
     "detect": [("detect", lambda c: "ON" if c.detect.enabled else "OFF")],

frigate/data_processing/post/audio_transcription.py

@@ -83,6 +83,10 @@ class AudioTranscriptionPostProcessor(PostProcessorApi):
         """
         event_id = data["event_id"]
         camera_name = data["camera"]
+        camera_config = self.config.cameras.get(camera_name)
+
+        if camera_config is None:
+            return
 
         if data_type == PostProcessDataEnum.recording:
             start_ts = data["frame_time"]
@@ -104,7 +108,7 @@ class AudioTranscriptionPostProcessor(PostProcessorApi):
 
         try:
             audio_data = get_audio_from_recording(
-                self.config.cameras[camera_name].ffmpeg,
+                camera_config.ffmpeg,
                 camera_name,
                 start_ts,
                 end_ts,

frigate/data_processing/post/object_descriptions.py

@@ -151,7 +151,12 @@ class ObjectDescriptionProcessor(PostProcessorApi):
             logger.error(f"Event {event_id} not found for description regeneration")
             return
 
-        camera_config = self.config.cameras[str(event.camera)]
+        camera_config = self.config.cameras.get(str(event.camera))
+
+        if camera_config is None:
+            logger.error("Camera %s no longer exists", event.camera)
+            return
+
         if not camera_config.objects.genai.enabled and not force:
             logger.error(f"GenAI not enabled for camera {event.camera}")
             return

frigate/data_processing/post/review_descriptions.py

@@ -137,7 +137,10 @@ class ReviewDescriptionProcessor(PostProcessorApi):
             return
 
         camera = data["after"]["camera"]
-        camera_config = self.config.cameras[camera]
+        camera_config = self.config.cameras.get(camera)
+
+        if camera_config is None:
+            return
 
         if not camera_config.review.genai.enabled:
             return

frigate/embeddings/maintainer.py

@@ -609,6 +609,18 @@ class EmbeddingMaintainer(threading.Thread):
                 # Embed the thumbnail
                 self._embed_thumbnail(event_id, thumbnail)
 
+            # every post processor below reads config.cameras[camera], but
+            # tracked_events still has to be released or the thumbnails held
+            # for this event leak, same as the two exits above
+            if camera not in self.config.cameras:
+                logger.debug("Skipping post processing for removed camera %s", camera)
+
+                for processor in self.post_processors:
+                    if isinstance(processor, ObjectDescriptionProcessor):
+                        processor.cleanup_event(event_id)
+
+                continue
+
             # call any defined post processors
             for processor in self.post_processors:
                 if isinstance(processor, LicensePlatePostProcessor):
@@ -666,11 +678,18 @@ class EmbeddingMaintainer(threading.Thread):
         to_remove = []
 
         for id, data in self.detected_license_plates.items():
+            camera_config = self.config.cameras.get(data["camera"])
+
+            if camera_config is None:
+                # camera was removed, drop the entry rather than expiring it
+                to_remove.append(id)
+                continue
+
             last_seen = data.get("last_seen", 0)
             if not last_seen:
                 continue
 
-            if now - last_seen > self.config.cameras[data["camera"]].lpr.expire_time:
+            if now - last_seen > camera_config.lpr.expire_time:
                 to_remove.append(id)
         for id in to_remove:
             self.event_metadata_publisher.publish(

frigate/genai/prompts.py

@@ -262,6 +262,10 @@ def get_tool_definitions(
     `attribute` parameter is exposed for filtering by their labels. When the
     embeddings model only understands English (JinaV1), the `semantic_query`
     description instructs the model to write the query in English.
+
+    Descriptions here stay mechanical: which tool to reach for, and how the
+    filters relate to each other, is stated once in the system prompt so the
+    guidance is not paid for twice on every request.
     """
     search_objects_properties: dict[str, Any] = {
         "camera": {
@@ -270,26 +274,13 @@ def get_tool_definitions(
         },
         "label": {
             "type": "string",
-            "description": (
+            "description": "Tracked object class to filter by.",
-                "Generic object class to filter by — one of the tracked detector "
-                "labels such as 'person', 'package', 'car', 'dog', 'bird'. Use "
-                "this for broad queries like 'show me all cars today'. Combine "
-                "with semantic_query when the user also describes appearance or "
-                "behavior (e.g. label='person', semantic_query='riding a lawn "
-                "mower')."
-            ),
         },
         "sub_label": {
             "type": "string",
             "description": (
-                "Filter by a DISCRETE NAMED entity recognized in the detection. "
+                "Name recognized in the detection: a person, delivery company, "
-                "Use this for: a known person's name ('John'), a delivery "
+                "animal species or breed, or license plate."
-                "company ('Amazon', 'UPS'), a recognized animal species or "
-                "breed ('blue jay', 'cardinal', 'golden retriever'), or a "
-                "license plate string. When filtering by a specific name, set "
-                "only sub_label and leave label unset. Do NOT use sub_label "
-                "for descriptions of appearance, clothing, or actions — those "
-                "belong in semantic_query."
             ),
         },
         "after": {
@@ -313,20 +304,11 @@ def get_tool_definitions(
     }
 
     if attribute_classifications:
-        model_outline = "; ".join(
-            f"{m['name']} (applies to {', '.join(m['objects']) or 'any object'})"
-            for m in attribute_classifications
-        )
         search_objects_properties["attribute"] = {
             "type": "string",
             "description": (
-                "Filter by a classification attribute label produced by a "
+                "Attribute label produced by a configured classification model "
-                "configured attribute classification model. Use this INSTEAD "
+                "(case-sensitive)."
-                "of semantic_query when the user's request matches one of "
-                "these classifications. Configured models: "
-                f"{model_outline}. "
-                "Set the value to the attribute label that matches the user's "
-                "phrasing (case-sensitive)."
             ),
         }
 
@@ -334,29 +316,12 @@ def get_tool_definitions(
         search_objects_properties["semantic_query"] = {
             "type": "string",
             "description": (
-                "Optional natural-language description of a PHYSICAL "
+                "Description of an appearance or activity, used to semantically "
-                "CHARACTERISTIC, APPEARANCE, or ACTIVITY the user mentioned, "
+                "narrow results."
-                "used to semantically narrow results. Only set this when the "
-                "user describes something beyond what label and sub_label can "
-                "express on their own.\n"
-                "USE for descriptive phrases like: 'riding a lawn mower', "
-                "'wearing a red jacket', 'carrying a package', 'walking a "
-                "dog', 'on a bicycle', 'holding an umbrella'.\n"
-                "DO NOT USE for:\n"
-                "- specific named people, pets, or delivery companies → use sub_label\n"
-                "- animal species or breed names like 'blue jay', 'cardinal', "
-                "'golden retriever' → use sub_label\n"
-                "- license plate strings → use sub_label\n"
-                "- generic object queries like 'all cars today' or 'every "
-                "person' → use label alone with no semantic_query\n"
-                "When set, combine with label/time/camera/zone filters as "
-                "usual (e.g. label='person', semantic_query='riding a lawn "
-                "mower', after='2024-05-01T00:00:00Z')."
                 + (
-                    " The configured embeddings model only understands "
+                    " The configured embeddings model only understands English, so "
-                    "English, so always write semantic_query in English, "
+                    "always write this in English, translating the user's "
-                    "translating the user's description if they phrased it "
+                    "description if they phrased it in another language."
-                    "in another language."
                     if embeddings_language == "english"
                     else ""
                 )
@@ -364,26 +329,10 @@ def get_tool_definitions(
         }
 
     search_objects_description = (
-        "Search the historical record of detected objects in Frigate. "
+        "Search the historical record of tracked detections. Use this ONLY for "
-        "Use this ONLY for questions about the PAST — e.g. 'did anyone come by today?', "
+        "questions about the PAST, e.g. 'did anyone come by today?', 'when was the "
-        "'when was the last car?', 'show me detections from yesterday'. "
+        "last car?'. For alerting on future events use start_camera_watch instead."
-        "Do NOT use this for monitoring or alerting requests about future events — "
-        "use start_camera_watch instead for those. "
-        "An 'object' in Frigate represents a tracked detection (e.g., a person, package, car).\n\n"
-        "Choose filters based on what the user is asking for:\n"
-        "- Generic class query ('show me all cars today'): set `label` only.\n"
-        "- Specific NAMED entity (known person, delivery company, animal "
-        "species/breed like 'blue jay' or 'golden retriever', license "
-        "plate): set `sub_label` only and leave `label` unset.\n"
     )
-    if semantic_search_enabled:
-        search_objects_description += (
-            "- Physical CHARACTERISTIC, APPEARANCE, or ACTIVITY that is not a "
-            "discrete name ('person riding a lawn mower', 'someone in a red "
-            "jacket', 'person carrying a package'): set `semantic_query` with "
-            "the descriptive phrase, optionally alongside `label` for the "
-            "object class. Do NOT put descriptive phrases in sub_label."
-        )
 
     return [
         {
@@ -398,20 +347,30 @@ def get_tool_definitions(
                 "required": [],
             },
         },
+        {
+            "type": "function",
+            "function": {
+                "name": "get_categorized_object_names",
+                "description": (
+                    "Every name that can be attached as a sub_label, grouped by object "
+                    "type: recognized faces, named license plates, classification "
+                    "categories, and delivery logos. Takes no arguments and always "
+                    "returns the complete map."
+                ),
+                "parameters": {
+                    "type": "object",
+                    "properties": {},
+                    "required": [],
+                },
+            },
+        },
         {
             "type": "function",
             "function": {
                 "name": "find_similar_objects",
                 "description": (
-                    "Find tracked objects that are visually and semantically similar "
+                    "Find tracked objects visually and semantically similar to a "
-                    "to a specific past event. Use this when the user references a "
+                    "specific past event. Requires semantic search to be enabled."
-                    "particular object they have seen and wants to find other "
-                    "sightings of the same or similar one ('that green car', 'the "
-                    "person in the red jacket', 'the package that was delivered'). "
-                    "Prefer this over search_objects whenever the user's intent is "
-                    "'find more like this specific one.' Use search_objects first "
-                    "only if you need to locate the anchor event. Requires semantic "
-                    "search to be enabled."
                 ),
                 "parameters": {
                     "type": "object",
@@ -473,9 +432,8 @@ def get_tool_definitions(
             "function": {
                 "name": "set_camera_state",
                 "description": (
-                    "Change a camera's feature state (e.g., turn detection on/off, enable/disable recordings). "
+                    "Change a camera's feature state, e.g. turn detection on or off. "
-                    "Use camera='*' to apply to all cameras at once. "
+                    "Only call this when the user explicitly asks to change a setting. "
-                    "Only call this tool when the user explicitly asks to change a camera setting. "
                     "Requires admin privileges."
                 ),
                 "parameters": {
@@ -510,14 +468,14 @@ def get_tool_definitions(
                             ],
                             "description": (
                                 "The feature to change. Most features accept ON or OFF. "
-                                "birdseye_mode accepts CONTINUOUS, MOTION, or OBJECTS. "
+                                "birdseye_mode accepts CONTINUOUS, MOTION, OBJECTS, STATIONARY_OBJECTS, or a comma-separated combination. "
                                 "motion_contour_area and motion_threshold accept a number. "
                                 "profile accepts a profile name or 'none' to deactivate (requires camera='*')."
                             ),
                         },
                         "value": {
                             "type": "string",
-                            "description": "The value to set. ON or OFF for toggles, a number for thresholds, a profile name or 'none' for profile.",
+                            "description": "The value to set, as accepted by the chosen feature.",
                         },
                     },
                     "required": ["camera", "feature", "value"],
@@ -529,11 +487,9 @@ def get_tool_definitions(
             "function": {
                 "name": "get_live_context",
                 "description": (
-                    "Get the current live image and detection information for a single camera: objects being tracked, "
+                    "Current live image and detections (tracked objects, zones, "
-                    "zones, timestamps. Use this to understand what is visible in the live view. "
+                    "timestamps) for one camera. Use this for questions about what is "
-                    "Call this when answering questions about what is happening right now on a specific camera. "
+                    "happening right now. Call it again for each additional camera."
-                    "Operates on one camera at a time; call the tool again for each additional camera. "
-                    "Wildcards and empty values are not accepted."
                 ),
                 "parameters": {
                     "type": "object",
@@ -541,8 +497,8 @@ def get_tool_definitions(
                         "camera": {
                             "type": "string",
                             "description": (
-                                "Exact name of a single camera to get live context for. "
+                                "Exact name of a single camera. Wildcards (e.g. '*', "
-                                "Wildcards (e.g. '*', 'all') and empty strings are not accepted."
+                                "'all') and empty strings are not accepted."
                             ),
                         },
                     },
@@ -555,10 +511,9 @@ def get_tool_definitions(
             "function": {
                 "name": "start_camera_watch",
                 "description": (
-                    "Start a continuous VLM watch job that monitors a camera and sends a notification "
+                    "Start a continuous watch job that monitors a camera and notifies "
-                    "when a specified condition is met. Use this when the user wants to be alerted about "
+                    "the user when a condition is met, e.g. 'tell me when guests "
-                    "a future event, e.g. 'tell me when guests arrive' or 'notify me when the package is picked up'. "
+                    "arrive'. Only one watch job can run at a time. Returns a job ID."
-                    "Only one watch job can run at a time. Returns a job ID."
                 ),
                 "parameters": {
                     "type": "object",
@@ -598,10 +553,7 @@ def get_tool_definitions(
             "type": "function",
             "function": {
                 "name": "stop_camera_watch",
-                "description": (
+                "description": "Cancel the currently running watch job.",
-                    "Cancel the currently running VLM watch job. Use this when the user wants to "
-                    "stop a previously started watch, e.g. 'stop watching the front door'."
-                ),
                 "parameters": {
                     "type": "object",
                     "properties": {},
@@ -614,11 +566,9 @@ def get_tool_definitions(
             "function": {
                 "name": "get_profile_status",
                 "description": (
-                    "Get the current profile status including the active profile and "
+                    "Get the active profile and when each profile was last activated. "
-                    "timestamps of when each profile was last activated. Use this to "
+                    "Call this before get_recap to derive the time window for requests "
-                    "determine time periods for recap requests — e.g. when the user asks "
+                    "like 'what happened while I was away?'."
-                    "'what happened while I was away?', call this first to find the relevant "
-                    "time window based on profile activation history."
                 ),
                 "parameters": {
                     "type": "object",
@@ -632,11 +582,9 @@ def get_tool_definitions(
             "function": {
                 "name": "get_recap",
                 "description": (
-                    "Get a recap of all activity (alerts and detections) for a given time period. "
+                    "Get all activity (alerts and detections) for a time period, as a "
-                    "Use this after calling get_profile_status to retrieve what happened during "
+                    "chronological list with camera, objects, zones, and descriptions "
-                    "a specific window — e.g. 'what happened while I was away?'. Returns a "
+                    "when available. Summarize the results for the user."
-                    "chronological list of activity with camera, objects, zones, and GenAI-generated "
-                    "descriptions when available. Summarize the results for the user."
                 ),
                 "parameters": {
                     "type": "object",
@@ -723,14 +671,13 @@ def build_chat_system_prompt(
         )
         speed_units_section = f"\n\nReport object speeds to the user in {speed_unit}."
 
-    semantic_search_section = ""
+    filter_routing_section = (
+        "\n\nWhen routing a search_objects call, pick filters by the shape of the user's request:\n"
+        "- Generic class ('show me all cars today'): set `label` only.\n"
+        "- Specific named entity — a known person ('John'), delivery company ('Amazon'), animal species/breed ('blue jay', 'golden retriever'), or license plate: set `sub_label` only and leave `label` unset. Call get_categorized_object_names first and use the exact spelling it returns; a guessed spelling matches nothing. If the name is absent, say it is not configured rather than searching for it."
+    )
     if semantic_search_enabled:
-        semantic_search_section = (
+        filter_routing_section += "\n- Physical characteristic, appearance, or activity that is NOT a discrete name ('riding a lawn mower', 'someone in a red jacket'): set `semantic_query` with the descriptive phrase, optionally combined with `label`. Never put descriptive phrases in `sub_label`."
-            "\n\nWhen routing a search_objects call, pick filters by the shape of the user's request:\n"
-            "- Generic class ('show me all cars today'): set `label` only.\n"
-            "- Specific named entity — a known person ('John'), delivery company ('Amazon'), animal species/breed ('blue jay', 'cardinal', 'golden retriever'), or license plate: set `sub_label` only and leave `label` unset.\n"
-            "- Physical characteristic, appearance, or activity that is NOT a discrete name ('find me people riding a lawn mower', 'someone in a red jacket', 'a person carrying a package'): set `semantic_query` with the descriptive phrase, optionally combined with `label` for the object class. Never put descriptive phrases in `sub_label`."
-        )
 
     attribute_classification_section = ""
     if attribute_classifications:
@@ -739,9 +686,9 @@ def build_chat_system_prompt(
             for m in attribute_classifications
         )
         attribute_classification_section = (
-            "\n\nAttribute classification models are configured for the following object types:\n"
+            "\n\nConfigured attribute classification models:\n"
             f"{model_lines}\n"
-            "When the user's request matches one of these classifications, set the search_objects `attribute` field to the matching label rather than using `semantic_query`. Reserve `semantic_query` for descriptive phrases that fall outside the configured attribute labels."
+            "When the user's request matches one of these classifications, set the search_objects `attribute` field to the matching label (case-sensitive) rather than using `semantic_query`. Reserve `semantic_query` for descriptive phrases outside the configured attribute labels."
         )
 
     return f"""You are a helpful assistant for Frigate, a security camera NVR system. You help users answer questions about their cameras, detected objects, and events.
@@ -750,9 +697,6 @@ Current server local date and time: {current_date_str} at {current_time_str}
 
 Do not start your response with phrases like "I will check...", "Let me see...", or "Let me look...". Answer directly.
 
-Always present times to the user in the server's local timezone. When tool results include start_time_local and end_time_local, use those exact strings when listing or describing detection times—do not convert or invent timestamps. Do not use UTC or ISO format with Z for the user-facing answer unless the tool result only provides Unix timestamps without local time fields.
+Always present times in the server's local timezone. When tool results include start_time_local and end_time_local, quote those strings exactly; never convert or invent timestamps, and fall back to UTC or ISO format only when a result has no local time fields. Resolve relative dates like "today" or "this week" against the current date above, and pass dates to tools in ISO 8601 (e.g. {current_date_str}T00:00:00Z for the start of today).
-When users ask about "today", "yesterday", "this week", etc., use the current date above as reference.
-When searching for objects or events, use ISO 8601 format for dates (e.g., {current_date_str}T00:00:00Z for the start of today).
-Always be accurate with time calculations based on the current date provided.
 
-When a user refers to a specific object they have seen or describe with identifying details ("that green car", "the person in the red jacket", "a package left today"), prefer the find_similar_objects tool over search_objects. Use search_objects first only to locate the anchor event, then pass its id to find_similar_objects. For generic queries like "show me all cars today", keep using search_objects. If a user message begins with [attached_event:<id>], treat that event id as the anchor for any similarity or "tell me more" request in the same message and call find_similar_objects with that id.{semantic_search_section}{attribute_classification_section}{cameras_section}{speed_units_section}"""
+When the user refers to a specific object they have seen ("that green car", "the person in the red jacket", "a package left today"), prefer find_similar_objects over search_objects, using search_objects only to locate the anchor event and passing its id along. Keep search_objects for generic queries like "show me all cars today". If a user message begins with [attached_event:<id>], treat that id as the anchor for any similarity or "tell me more" request in the same message.{filter_routing_section}{attribute_classification_section}{cameras_section}{speed_units_section}"""

frigate/output/birdseye.py

@@ -9,6 +9,7 @@ import queue
 import subprocess as sp
 import threading
 import traceback
+from dataclasses import dataclass
 from multiprocessing.synchronize import Event as MpEvent
 from typing import Any
 
@@ -16,7 +17,7 @@ import cv2
 import numpy as np
 
 from frigate.comms.inter_process import InterProcessRequestor
-from frigate.config import BirdseyeModeEnum, FfmpegConfig, FrigateConfig
+from frigate.config import BirdseyeModeConfig, FfmpegConfig, FrigateConfig
 from frigate.const import BASE_DIR, BIRDSEYE_PIPE, INSTALL_DIR, UPDATE_BIRDSEYE_LAYOUT
 from frigate.output.ws_auth import ws_has_camera_access
 from frigate.util.image import (
@@ -28,6 +29,15 @@ from frigate.util.image import (
 logger = logging.getLogger(__name__)
 
 
+@dataclass(frozen=True, slots=True)
+class BirdseyeActivity:
+    """Activity signals used to decide whether a camera is shown in Birdseye."""
+
+    has_active_object: bool
+    has_stationary_object: bool
+    has_motion: bool
+
+
 def get_standard_aspect_ratio(width: int, height: int) -> tuple[int, int]:
     """Ensure that only standard aspect ratios are used."""
     # it is important that all ratios have the same scale
@@ -409,18 +419,16 @@ class BirdsEyeFrameManager:
         )
 
     def camera_active(
-        self, mode: Any, object_box_count: int, motion_box_count: int
+        self,
+        mode: BirdseyeModeConfig,
+        activity: BirdseyeActivity,
     ) -> bool:
-        if mode == BirdseyeModeEnum.continuous:
+        return (
-            return True
+            mode.continuous
-
+            or (mode.motion and activity.has_motion)
-        if mode == BirdseyeModeEnum.motion and motion_box_count > 0:
+            or (mode.objects and activity.has_active_object)
-            return True
+            or (mode.stationary_objects and activity.has_stationary_object)
-
+        )
-        if mode == BirdseyeModeEnum.objects and object_box_count > 0:
-            return True
-
-        return False
 
     def get_camera_coordinates(self) -> dict[str, dict[str, int]]:
         """Return the coordinates of each camera in the current layout."""
@@ -604,112 +612,92 @@ class BirdsEyeFrameManager:
     ) -> list[list[Any]] | None:
         """Calculate the optimal layout for 2+ cameras."""
 
-        def map_layout(
+        def find_available_x(
-            camera_layout: list[list[Any]], row_height: int
+            current_x: int,
-        ) -> tuple[int, int, list[list[Any]] | None]:
+            width: int,
-            """Map the calculated layout."""
+            reserved_ranges: list[tuple[int, int]],
-            candidate_layout = []
+            max_width: int,
-            starting_x = 0
+        ) -> int | None:
-            x = 0
+            """Find the first horizontal slot that does not collide with reservations."""
-            max_width = 0
+            x = current_x
-            y = 0
 
-            for row in camera_layout:
+            for reserved_start, reserved_end in sorted(reserved_ranges):
-                final_row = []
+                if x >= reserved_end:
-                max_width = max(max_width, x)
+                    continue
-                x = starting_x
-                for cameras in row:
-                    camera_dims = self.cameras[cameras[0]]["dimensions"].copy()
-                    camera_aspect = cameras[1]
 
-                    if camera_dims[1] > camera_dims[0]:
+                if x + width <= reserved_start:
-                        scaled_height = int(row_height * 2)
+                    return x
-                        scaled_width = int(scaled_height * camera_aspect)
-                        starting_x = scaled_width
-                    else:
-                        scaled_height = row_height
-                        scaled_width = int(scaled_height * camera_aspect)
 
-                    # layout is too large
+                x = max(x, reserved_end)
-                    if (
-                        x + scaled_width > self.canvas.width
-                        or y + scaled_height > self.canvas.height
-                    ):
-                        return x + scaled_width, y + scaled_height, None
 
-                    final_row.append((cameras[0], (x, y, scaled_width, scaled_height)))
+            if x + width <= max_width:
-                    x += scaled_width
+                return x
 
-                y += row_height
-                candidate_layout.append(final_row)
-
-            if max_width == 0:
-                max_width = x
-
-            return max_width, y, candidate_layout
-
-        canvas_aspect_x, canvas_aspect_y = self.canvas.get_aspect(coefficient)
-        camera_layout: list[list[Any]] = []
-        camera_layout.append([])
-        starting_x = 0
-        x = starting_x
-        y = 0
-        y_i = 0
-        max_y = 0
-        for camera in cameras_to_add:
-            camera_dims = self.cameras[camera]["dimensions"].copy()
-            camera_aspect_x, camera_aspect_y = self.canvas.get_camera_aspect(
-                camera, camera_dims[0], camera_dims[1]
-            )
-
-            if camera_dims[1] > camera_dims[0]:
-                portrait = True
-            else:
-                portrait = False
-
-            if (x + camera_aspect_x) <= canvas_aspect_x:
-                # insert if camera can fit on current row
-                camera_layout[y_i].append(
-                    (
-                        camera,
-                        camera_aspect_x / camera_aspect_y,
-                    )
-                )
-
-                if portrait:
-                    starting_x = camera_aspect_x
-                else:
-                    max_y = max(
-                        max_y,
-                        camera_aspect_y,
-                    )
-
-                x += camera_aspect_x
-            else:
-                # move on to the next row and insert
-                y += max_y
-                y_i += 1
-                camera_layout.append([])
-                x = starting_x
-
-                if x + camera_aspect_x > canvas_aspect_x:
-                    return None
-
-                camera_layout[y_i].append(
-                    (
-                        camera,
-                        camera_aspect_x / camera_aspect_y,
-                    )
-                )
-                x += camera_aspect_x
-
-        if y + max_y > canvas_aspect_y:
             return None
 
-        row_height = int(self.canvas.height / coefficient)
+        def map_layout(row_height: int) -> tuple[int, int, list[list[Any]] | None]:
-        total_width, total_height, standard_candidate_layout = map_layout(
+            """Lay out cameras row by row while reserving portrait spans for the next row."""
-            camera_layout, row_height
+            candidate_layout: list[list[Any]] = []
-        )
+            reserved_ranges: dict[int, list[tuple[int, int]]] = {}
+            current_row: list[Any] = []
+            row_index = 0
+            row_y = 0
+            row_x = 0
+            max_width = 0
+            max_height = 0
+
+            for camera in cameras_to_add:
+                camera_dims = self.cameras[camera]["dimensions"].copy()
+                camera_aspect_x, camera_aspect_y = self.canvas.get_camera_aspect(
+                    camera, camera_dims[0], camera_dims[1]
+                )
+                portrait = camera_dims[1] > camera_dims[0]
+                scaled_height = row_height * 2 if portrait else row_height
+                scaled_width = int(scaled_height * (camera_aspect_x / camera_aspect_y))
+
+                while True:
+                    x = find_available_x(
+                        row_x,
+                        scaled_width,
+                        reserved_ranges.get(row_index, []),
+                        self.canvas.width,
+                    )
+
+                    if x is not None and row_y + scaled_height <= self.canvas.height:
+                        current_row.append(
+                            (camera, (x, row_y, scaled_width, scaled_height))
+                        )
+                        row_x = x + scaled_width
+                        max_width = max(max_width, row_x)
+                        max_height = max(max_height, row_y + scaled_height)
+
+                        if portrait:
+                            reserved_ranges.setdefault(row_index + 1, []).append(
+                                (x, row_x)
+                            )
+
+                        break
+
+                    if current_row:
+                        candidate_layout.append(current_row)
+                        current_row = []
+
+                    row_index += 1
+                    row_y = row_index * row_height
+                    row_x = 0
+
+                    if row_y + scaled_height > self.canvas.height:
+                        overflow_width = max(max_width, scaled_width)
+                        overflow_height = row_y + scaled_height
+                        return overflow_width, overflow_height, None
+
+            if current_row:
+                candidate_layout.append(current_row)
+
+            return max_width, max_height, candidate_layout
+
+        row_height = max(1, int(self.canvas.height / coefficient))
+        total_width, total_height, standard_candidate_layout = map_layout(row_height)
 
         if not standard_candidate_layout:
             # if standard layout didn't work
@@ -718,9 +706,9 @@ class BirdsEyeFrameManager:
                 total_width / self.canvas.width,
                 total_height / self.canvas.height,
             )
-            row_height = int(row_height / scale_down_percent)
+            row_height = max(1, int(row_height / scale_down_percent))
             total_width, total_height, standard_candidate_layout = map_layout(
-                camera_layout, row_height
+                row_height
             )
 
             if not standard_candidate_layout:
@@ -734,8 +722,8 @@ class BirdsEyeFrameManager:
             1 / (total_width / self.canvas.width),
             1 / (total_height / self.canvas.height),
         )
-        row_height = int(row_height * scale_up_percent)
+        row_height = max(1, int(row_height * scale_up_percent))
-        _, _, scaled_layout = map_layout(camera_layout, row_height)
+        _, _, scaled_layout = map_layout(row_height)
 
         if scaled_layout:
             return scaled_layout
@@ -745,8 +733,7 @@ class BirdsEyeFrameManager:
     def update(
         self,
         camera: str,
-        object_count: int,
+        activity: BirdseyeActivity,
-        motion_count: int,
         frame_time: float,
         frame: np.ndarray,
     ) -> tuple[bool, bool]:
@@ -760,22 +747,29 @@ class BirdsEyeFrameManager:
             return False, False
 
         force_update = False
+        camera_state = self.cameras.get(camera)
+
+        if camera_state is None:
+            return False, False
 
         # disabling birdseye is a little tricky
         if not camera_config.birdseye.enabled or not camera_config.enabled:
             # if we've rendered a frame (we have a value for last_active_frame)
             # then we need to set it to zero
-            if self.cameras[camera]["last_active_frame"] > 0:
+            if camera_state["last_active_frame"] > 0:
-                self.cameras[camera]["last_active_frame"] = 0
+                camera_state["last_active_frame"] = 0
                 force_update = True
             else:
                 return False, False
 
         # update the last active frame for the camera
-        self.cameras[camera]["current_frame"] = frame.copy()
+        camera_state["current_frame"] = frame.copy()
-        self.cameras[camera]["current_frame_time"] = frame_time
+        camera_state["current_frame_time"] = frame_time
-        if self.camera_active(camera_config.birdseye.mode, object_count, motion_count):
+        if self.camera_active(
-            self.cameras[camera]["last_active_frame"] = frame_time
+            camera_config.birdseye.mode,
+            activity,
+        ):
+            camera_state["last_active_frame"] = frame_time
 
         now = datetime.datetime.now().timestamp()
 
@@ -882,10 +876,29 @@ class Birdseye:
         frame_time: float,
         frame: np.ndarray,
     ) -> None:
+        has_active_object = False
+        has_stationary_object = False
+        for tracked_object in current_tracked_objects:
+            if tracked_object["stationary"]:
+                if not tracked_object["false_positive"]:
+                    has_stationary_object = True
+            else:
+                # Preserve the existing objects activity behavior, which includes
+                # non-stationary trackers before they are confirmed.
+                has_active_object = True
+
+            if has_active_object and has_stationary_object:
+                break
+
+        activity = BirdseyeActivity(
+            has_active_object=has_active_object,
+            has_stationary_object=has_stationary_object,
+            has_motion=bool(motion_boxes),
+        )
+
         frame_changed, frame_layout_changed = self.birdseye_manager.update(
             camera,
-            len([o for o in current_tracked_objects if not o["stationary"]]),
+            activity,
-            len(motion_boxes),
             frame_time,
             frame,
         )

frigate/output/output.py

@@ -51,8 +51,12 @@ def check_disabled_camera_update(
 
     for camera, last_update in write_times.items():
         offline_time = now - last_update
+        camera_config = config.cameras.get(camera)
 
-        if config.cameras[camera].enabled:
+        if camera_config is None:
+            continue
+
+        if camera_config.enabled:
             has_enabled_camera = True
         else:
             # flag camera as offline when it is disabled
@@ -62,8 +66,8 @@ def check_disabled_camera_update(
             # last camera update was more than 1 second ago
             # need to send empty data to birdseye because current
             # frame is now out of date
-            cam_width = config.cameras[camera].detect.width
+            cam_width = camera_config.detect.width
-            cam_height = config.cameras[camera].detect.height
+            cam_height = camera_config.detect.height
 
             if cam_width is None or cam_height is None:
                 raise ValueError(f"Camera {camera} detect dimensions not configured")
@@ -309,10 +313,11 @@ class OutputProcess(FrigateProcess):
                 regions,
             ) = data
 
-            frame = frame_manager.get(
+            camera_config = self.config.cameras.get(camera)
-                frame_name, self.config.cameras[camera].frame_shape_yuv
+
-            )
+            if camera_config is not None:
-            frame_manager.close(frame_name)
+                frame_manager.get(frame_name, camera_config.frame_shape_yuv)
+                frame_manager.close(frame_name)
 
         detection_subscriber.stop()
 

frigate/ptz/autotrack.py

@@ -799,14 +799,24 @@ class PtzAutoTracker:
             except TimeoutError:
                 continue
 
+            # both are popped when the camera is deleted, so resolve them once
+            # here and use the locals for the rest of the move; a move already
+            # in flight then finishes against valid objects
+            metrics = self.ptz_metrics.get(camera)
+            camera_config = self.config.cameras.get(camera)
+
+            if metrics is None or camera_config is None:
+                logger.debug("%s: Dropping queued move, camera was removed", camera)
+                continue
+
             async with self.move_queue_locks[camera]:
                 frame_time, pan, tilt, zoom = move_data
 
                 # if we're receiving move requests during a PTZ move, ignore them
                 if ptz_moving_at_frame_time(
                     frame_time,
-                    self.ptz_metrics[camera].start_time.value,
+                    metrics.start_time.value,
-                    self.ptz_metrics[camera].stop_time.value,
+                    metrics.stop_time.value,
                 ):
                     logger.debug(
                         f"{camera}: Move queue: PTZ moving, dequeueing move request - frame time: {frame_time}, final pan: {pan}, final tilt: {tilt}, final zoom: {zoom}"
@@ -815,7 +825,7 @@ class PtzAutoTracker:
 
                 else:
                     if (
-                        self.config.cameras[camera].onvif.autotracking.zooming
+                        camera_config.onvif.autotracking.zooming
                         == ZoomingModeEnum.relative
                     ):
                         await self.onvif._move_relative(camera, pan, tilt, zoom, 1)
@@ -824,25 +834,22 @@ class PtzAutoTracker:
                             await self.onvif._move_relative(camera, pan, tilt, 0, 1)
 
                             # Wait until the camera finishes moving
-                            while not self.ptz_metrics[camera].motor_stopped.is_set():
+                            while not metrics.motor_stopped.is_set():
                                 await self.onvif.get_camera_status(camera)
 
-                        if (
+                        if zoom > 0 and metrics.zoom_level.value != zoom:
-                            zoom > 0
-                            and self.ptz_metrics[camera].zoom_level.value != zoom
-                        ):
                             await self.onvif._zoom_absolute(camera, zoom, 1)
 
                     # Wait until the camera finishes moving
-                    while not self.ptz_metrics[camera].motor_stopped.is_set():
+                    while not metrics.motor_stopped.is_set():
                         await self.onvif.get_camera_status(camera)
 
-                    if self.config.cameras[camera].onvif.autotracking.movement_weights:
+                    if camera_config.onvif.autotracking.movement_weights:
                         logger.debug(
                             f"{camera}: Predicted movement time: {self._predict_movement_time(camera, pan, tilt)}"
                         )
                         logger.debug(
-                            f"{camera}: Actual movement time: {self.ptz_metrics[camera].stop_time.value - self.ptz_metrics[camera].start_time.value}"
+                            f"{camera}: Actual movement time: {metrics.stop_time.value - metrics.start_time.value}"
                         )
 
                     # save metrics for better estimate calculations
@@ -851,21 +858,15 @@ class PtzAutoTracker:
                         and len(self.move_metrics[camera])
                         < AUTOTRACKING_MAX_MOVE_METRICS
                         and (pan != 0 or tilt != 0)
-                        and self.config.cameras[
+                        and camera_config.onvif.autotracking.calibrate_on_startup
-                            camera
-                        ].onvif.autotracking.calibrate_on_startup
                     ):
                         logger.debug(f"{camera}: Adding new values to move metrics")
                         self.move_metrics[camera].append(
                             {
                                 "pan": pan,
                                 "tilt": tilt,
-                                "start_timestamp": self.ptz_metrics[
+                                "start_timestamp": metrics.start_time.value,
-                                    camera
+                                "end_timestamp": metrics.stop_time.value,
-                                ].start_time.value,
-                                "end_timestamp": self.ptz_metrics[
-                                    camera
-                                ].stop_time.value,
                             }
                         )
 

frigate/ptz/onvif.py

@@ -180,6 +180,11 @@ class OnvifController:
             return False
 
     async def _init_onvif(self, camera_name: str) -> bool:
+        camera_config = self.config.cameras.get(camera_name)
+
+        if camera_config is None:
+            return False
+
         onvif: ONVIFCamera = self.cams[camera_name]["onvif"]
         try:
             await onvif.update_xaddrs()
@@ -235,7 +240,7 @@ class OnvifController:
                 p.token,
             )
 
-        configured_profile = self.config.cameras[camera_name].onvif.profile
+        configured_profile = camera_config.onvif.profile
         profile = None
 
         if configured_profile is not None:
@@ -339,7 +344,7 @@ class OnvifController:
             except (AttributeError, TypeError):
                 fov_space_id = None
 
-        autotracking_config = self.config.cameras[camera_name].onvif.autotracking
+        autotracking_config = camera_config.onvif.autotracking
         autotracking_enabled = (
             autotracking_config.enabled_in_config and autotracking_config.enabled
         )
@@ -614,6 +619,11 @@ class OnvifController:
             logger.error(f"{camera_name} does not support ONVIF RelativeMove (FOV).")
             return
 
+        metrics = self.ptz_metrics.get(camera_name)
+
+        if metrics is None:
+            return
+
         logger.debug(
             f"{camera_name} called RelativeMove: pan: {pan} tilt: {tilt} zoom: {zoom}"
         )
@@ -627,15 +637,11 @@ class OnvifController:
         self.cams[camera_name]["active"] = True
 
         # only track start_time for autotracking
-        if self.ptz_metrics[camera_name].autotracker_enabled.value:
+        if metrics.autotracker_enabled.value:
-            self.ptz_metrics[camera_name].motor_stopped.clear()
+            metrics.motor_stopped.clear()
-            logger.debug(
+            logger.debug(f"{camera_name}: PTZ start time: {metrics.frame_time.value}")
-                f"{camera_name}: PTZ start time: {self.ptz_metrics[camera_name].frame_time.value}"
+            metrics.start_time.value = metrics.frame_time.value
-            )
+            metrics.stop_time.value = 0
-            self.ptz_metrics[camera_name].start_time.value = self.ptz_metrics[
-                camera_name
-            ].frame_time.value
-            self.ptz_metrics[camera_name].stop_time.value = 0
 
         move_request = self.cams[camera_name]["relative_move_request"]
 
@@ -697,9 +703,14 @@ class OnvifController:
             logger.error(f"{preset} is not a valid preset for {camera_name}")
             return
 
+        metrics = self.ptz_metrics.get(camera_name)
+
+        if metrics is None:
+            return
+
         self.cams[camera_name]["active"] = True
-        self.ptz_metrics[camera_name].start_time.value = 0
+        metrics.start_time.value = 0
-        self.ptz_metrics[camera_name].stop_time.value = 0
+        metrics.stop_time.value = 0
         move_request = self.cams[camera_name]["move_request"]
         preset_token = self.cams[camera_name]["presets"][preset]
 
@@ -738,6 +749,11 @@ class OnvifController:
             logger.error(f"{camera_name} does not support ONVIF AbsoluteMove zooming.")
             return
 
+        metrics = self.ptz_metrics.get(camera_name)
+
+        if metrics is None:
+            return
+
         logger.debug(f"{camera_name} called AbsoluteMove: zoom: {zoom}")
 
         if self.cams[camera_name]["active"]:
@@ -747,14 +763,10 @@ class OnvifController:
             return
 
         self.cams[camera_name]["active"] = True
-        self.ptz_metrics[camera_name].motor_stopped.clear()
+        metrics.motor_stopped.clear()
-        logger.debug(
+        logger.debug(f"{camera_name}: PTZ start time: {metrics.frame_time.value}")
-            f"{camera_name}: PTZ start time: {self.ptz_metrics[camera_name].frame_time.value}"
+        metrics.start_time.value = metrics.frame_time.value
-        )
+        metrics.stop_time.value = 0
-        self.ptz_metrics[camera_name].start_time.value = self.ptz_metrics[
-            camera_name
-        ].frame_time.value
-        self.ptz_metrics[camera_name].stop_time.value = 0
         move_request = self.cams[camera_name]["absolute_move_request"]
 
         # function takes in 0 to 1 for zoom, interpolate to the values of the camera.
@@ -875,16 +887,18 @@ class OnvifController:
 
         Returns camera details including features and presets if available.
         """
-        if not self.config.cameras[camera_name].enabled:
+        camera_config = self.config.cameras.get(camera_name)
+
+        if camera_config is None:
+            return {}
+
+        if not camera_config.enabled:
             logger.debug(
                 f"Camera {camera_name} disabled, won't try to initialize ONVIF"
             )
             return {}
 
-        if camera_name not in self.cams.keys() and (
+        if camera_name not in self.cams.keys() and (not camera_config.onvif.host):
-            camera_name not in self.config.cameras
-            or not self.config.cameras[camera_name].onvif.host
-        ):
             logger.debug(f"ONVIF is not configured for {camera_name}")
             return {}
 
@@ -985,6 +999,12 @@ class OnvifController:
                 logger.error(f"ONVIF is not configured for {camera_name}")
                 return
 
+            metrics = self.ptz_metrics.get(camera_name)
+            camera_config = self.config.cameras.get(camera_name)
+
+            if metrics is None or camera_config is None:
+                return
+
             if not self.cams[camera_name]["init"]:
                 if not await self._init_onvif(camera_name):
                     return
@@ -1023,36 +1043,29 @@ class OnvifController:
                 zoom_status is None or zoom_status == "IDLE"
             ):
                 self.cams[camera_name]["active"] = False
-                if not self.ptz_metrics[camera_name].motor_stopped.is_set():
+                if not metrics.motor_stopped.is_set():
-                    self.ptz_metrics[camera_name].motor_stopped.set()
+                    metrics.motor_stopped.set()
 
                     logger.debug(
-                        f"{camera_name}: PTZ stop time: {self.ptz_metrics[camera_name].frame_time.value}"
+                        f"{camera_name}: PTZ stop time: {metrics.frame_time.value}"
                     )
 
-                    self.ptz_metrics[camera_name].stop_time.value = self.ptz_metrics[
+                    metrics.stop_time.value = metrics.frame_time.value
-                        camera_name
-                    ].frame_time.value
             else:
                 self.cams[camera_name]["active"] = True
-                if self.ptz_metrics[camera_name].motor_stopped.is_set():
+                if metrics.motor_stopped.is_set():
-                    self.ptz_metrics[camera_name].motor_stopped.clear()
+                    metrics.motor_stopped.clear()
 
                     logger.debug(
-                        f"{camera_name}: PTZ start time: {self.ptz_metrics[camera_name].frame_time.value}"
+                        f"{camera_name}: PTZ start time: {metrics.frame_time.value}"
                     )
 
-                    self.ptz_metrics[camera_name].start_time.value = self.ptz_metrics[
+                    metrics.start_time.value = metrics.frame_time.value
-                        camera_name
+                    metrics.stop_time.value = 0
-                    ].frame_time.value
-                    self.ptz_metrics[camera_name].stop_time.value = 0
 
-            if (
+            if camera_config.onvif.autotracking.zooming != ZoomingModeEnum.disabled:
-                self.config.cameras[camera_name].onvif.autotracking.zooming
-                != ZoomingModeEnum.disabled
-            ):
                 # store absolute zoom level as 0 to 1 interpolated from the values of the camera
-                self.ptz_metrics[camera_name].zoom_level.value = numpy.interp(
+                metrics.zoom_level.value = numpy.interp(
                     round(status.Position.Zoom.x, 2),
                     [
                         self.cams[camera_name]["absolute_zoom_range"]["XRange"]["Min"],
@@ -1061,25 +1074,22 @@ class OnvifController:
                     [0, 1],
                 )
                 logger.debug(
-                    f"{camera_name}: Camera zoom level: {self.ptz_metrics[camera_name].zoom_level.value}"
+                    f"{camera_name}: Camera zoom level: {metrics.zoom_level.value}"
                 )
 
             # some hikvision cams won't update MoveStatus, so warn if it hasn't changed
             if (
-                not self.ptz_metrics[camera_name].motor_stopped.is_set()
+                not metrics.motor_stopped.is_set()
-                and not self.ptz_metrics[camera_name].reset.is_set()
+                and not metrics.reset.is_set()
-                and self.ptz_metrics[camera_name].start_time.value != 0
+                and metrics.start_time.value != 0
-                and self.ptz_metrics[camera_name].frame_time.value
+                and metrics.frame_time.value > (metrics.start_time.value + 10)
-                > (self.ptz_metrics[camera_name].start_time.value + 10)
+                and metrics.stop_time.value == 0
-                and self.ptz_metrics[camera_name].stop_time.value == 0
             ):
                 logger.debug(
-                    f"Start time: {self.ptz_metrics[camera_name].start_time.value}, Stop time: {self.ptz_metrics[camera_name].stop_time.value}, Frame time: {self.ptz_metrics[camera_name].frame_time.value}"
+                    f"Start time: {metrics.start_time.value}, Stop time: {metrics.stop_time.value}, Frame time: {metrics.frame_time.value}"
                 )
                 # set the stop time so we don't come back into this again and spam the logs
-                self.ptz_metrics[camera_name].stop_time.value = self.ptz_metrics[
+                metrics.stop_time.value = metrics.frame_time.value
-                    camera_name
-                ].frame_time.value
                 logger.warning(
                     f"Camera {camera_name} is still in ONVIF 'MOVING' status."
                 )

frigate/record/maintainer.py

@@ -745,7 +745,9 @@ class RecordingMaintainer(threading.Thread):
                         regions,
                     ) = data
 
-                    if self.config.cameras[camera].record.enabled:
+                    camera_config = self.config.cameras.get(camera)
+
+                    if camera_config is not None and camera_config.record.enabled:
                         self.object_recordings_info[camera].append(
                             (
                                 frame_time,
@@ -762,7 +764,9 @@ class RecordingMaintainer(threading.Thread):
                         audio_detections,
                     ) = data
 
-                    if self.config.cameras[camera].record.enabled:
+                    camera_config = self.config.cameras.get(camera)
+
+                    if camera_config is not None and camera_config.record.enabled:
                         self.audio_recordings_info[camera].append(
                             (
                                 frame_time,

frigate/review/maintainer.py

@@ -418,6 +418,11 @@ class ReviewSegmentMaintainer(threading.Thread):
 
         return None
 
+    def _handle_camera_removed(self, camera: str) -> None:
+        """Close out a deleted camera's segment so a reused name cannot inherit it."""
+        self.forcibly_end_segment(camera)
+        self.indefinite_events.pop(camera, None)
+
     def update_existing_segment(
         self,
         segment: PendingReviewSegment,
@@ -666,6 +671,10 @@ class ReviewSegmentMaintainer(threading.Thread):
                 for camera in updated_topics["enabled"]:
                     self.forcibly_end_segment(camera)
 
+            if "remove" in updated_topics:
+                for camera in updated_topics["remove"]:
+                    self._handle_camera_removed(camera)
+
             result = self.detection_subscriber.check_for_update(timeout=1)
 
             if not result:

frigate/test/http_api/test_http_config_set.py

@@ -386,9 +386,19 @@ class TestConfigSetWildcardPropagation(BaseTestHttp):
         guess (mode still equals the previous global) wrongly claims a camera
         whose explicit yaml mode happens to match.
         """
-        self.minimal_config["birdseye"] = {"enabled": True, "mode": "motion"}
+        self.minimal_config["birdseye"] = {
+            "enabled": True,
+            "mode": {"motion": True},
+        }
         # explicit override that matches the global value being replaced
-        self.minimal_config["cameras"]["front_door"]["birdseye"] = {"mode": "motion"}
+        self.minimal_config["cameras"]["front_door"]["birdseye"] = {
+            "mode": {
+                "continuous": False,
+                "motion": True,
+                "objects": False,
+                "stationary_objects": False,
+            }
+        }
 
         config_path = self._write_config_file()
         mock_find_config.return_value = config_path
@@ -399,7 +409,16 @@ class TestConfigSetWildcardPropagation(BaseTestHttp):
                 resp = client.put(
                     "/config/set",
                     json={
-                        "config_data": {"birdseye": {"mode": "continuous"}},
+                        "config_data": {
+                            "birdseye": {
+                                "mode": {
+                                    "continuous": True,
+                                    "motion": False,
+                                    "objects": False,
+                                    "stationary_objects": False,
+                                }
+                            }
+                        },
                         "update_topic": "config/birdseye",
                         "requires_restart": 0,
                     },
@@ -411,7 +430,7 @@ class TestConfigSetWildcardPropagation(BaseTestHttp):
                 mock_publisher.publisher.publish.assert_called_once()
                 topic, settings = mock_publisher.publisher.publish.call_args[0]
                 self.assertEqual(topic, "config/birdseye")
-                self.assertEqual(settings.mode.value, "continuous")
+                self.assertEqual(settings.mode.to_mqtt_payload(), "CONTINUOUS")
 
                 published = {
                     call[0][0].camera: call[0][1]
@@ -425,8 +444,12 @@ class TestConfigSetWildcardPropagation(BaseTestHttp):
                     )
 
                 # the override survives, the inheriting camera follows global
-                self.assertEqual(published["front_door"].mode.value, "motion")
+                self.assertEqual(
-                self.assertEqual(published["back_yard"].mode.value, "continuous")
+                    published["front_door"].mode.to_mqtt_payload(), "MOTION"
+                )
+                self.assertEqual(
+                    published["back_yard"].mode.to_mqtt_payload(), "CONTINUOUS"
+                )
         finally:
             os.unlink(config_path)
 

frigate/test/http_api/test_http_media.py

@@ -1,15 +1,73 @@
 """Unit tests for recordings/media API endpoints."""
 
+from dataclasses import dataclass
 from datetime import UTC, datetime
+from unittest.mock import patch
 
 import pytz
 from fastapi import Request
 
 from frigate.api.auth import get_allowed_cameras_for_filter, get_current_user
+from frigate.const import MAX_SEGMENT_DURATION
 from frigate.models import Recordings
 from frigate.test.http_api.base_http_test import AuthTestClient, BaseTestHttp
 
 
+@dataclass(frozen=True)
+class RangeCase:
+    """Expected behavior for one segment relative to the requested range.
+
+    Offsets are seconds from REQUEST_START; the request ends at +100 seconds.
+    """
+
+    name: str
+    start_offset: float
+    end_offset: float
+    included_in_recordings: bool
+    vod_clip_from_ms: int | None = None
+    vod_duration_ms: int | None = None
+
+
+REQUEST_START = 1000
+REQUEST_END = 1100
+RANGE_CASES = (
+    RangeCase("before", -MAX_SEGMENT_DURATION + 1, -1, False),
+    RangeCase("meets_start", -10, 0, True),
+    RangeCase(
+        "overlaps_start",
+        -MAX_SEGMENT_DURATION + 0.5,
+        0.25,
+        True,
+        vod_clip_from_ms=599500,
+        vod_duration_ms=250,
+    ),
+    RangeCase("starts_at_start", 0, 10, True, vod_duration_ms=10000),
+    RangeCase("inside", 20, 80, True, vod_duration_ms=60000),
+    RangeCase("ends_at_end", 90, 100, True, vod_duration_ms=10000),
+    RangeCase("matches_range", 0, 100, True, vod_duration_ms=100000),
+    RangeCase("starts_with_range", 0, 110, True, vod_duration_ms=100000),
+    RangeCase(
+        "covers_range",
+        -20,
+        120,
+        True,
+        vod_clip_from_ms=20000,
+        vod_duration_ms=100000,
+    ),
+    RangeCase(
+        "ends_with_range",
+        -10,
+        100,
+        True,
+        vod_clip_from_ms=10000,
+        vod_duration_ms=100000,
+    ),
+    RangeCase("overlaps_end", 95, 105, True, vod_duration_ms=5000),
+    RangeCase("starts_at_end", 100, 110, True),
+    RangeCase("after", 101, 110, False),
+)
+
+
 class TestHttpMedia(BaseTestHttp):
     """Test media API endpoints, particularly recordings with DST handling."""
 
@@ -44,6 +102,26 @@ class TestHttpMedia(BaseTestHttp):
         self.app.dependency_overrides.clear()
         super().tearDown()
 
+    def _assert_vod_response(
+        self,
+        response,
+        expected_clips: list[tuple[str, int | None, int]],
+    ) -> None:
+        """Assert VOD clip metadata and its derived duration fields."""
+        assert response.status_code == 200
+        vod = response.json()
+        assert [
+            (
+                clip["path"],
+                clip.get("clipFrom"),
+                clip["keyFrameDurations"][0],
+            )
+            for clip in vod["sequences"][0]["clips"]
+        ] == expected_clips
+        expected_durations = [clip[2] for clip in expected_clips]
+        assert vod["durations"] == expected_durations
+        assert vod["segment_duration"] == max(expected_durations)
+
     def test_recordings_summary_across_dst_spring_forward(self):
         """
         Test recordings summary across spring DST transition (spring forward).
@@ -404,6 +482,102 @@ class TestHttpMedia(BaseTestHttp):
             assert "2024-03-10" in summary
             assert summary["2024-03-10"] is True
 
+    def test_recordings_handles_all_range_relations(self):
+        """Recordings return every interval relation that touches the range."""
+        with AuthTestClient(self.app) as client:
+            for case in RANGE_CASES:
+                with self.subTest(case=case.name):
+                    Recordings.delete().execute()
+                    super().insert_mock_recording(
+                        case.name,
+                        REQUEST_START + case.start_offset,
+                        REQUEST_START + case.end_offset,
+                    )
+
+                    response = client.get(
+                        "/front_door/recordings",
+                        params={"after": REQUEST_START, "before": REQUEST_END},
+                    )
+
+                    assert response.status_code == 200
+                    expected_ids = [case.name] if case.included_in_recordings else []
+                    assert [
+                        recording["id"] for recording in response.json()
+                    ] == expected_ids
+
+    def test_vod_handles_all_range_relations(self):
+        """VOD clips every interval relation with positive playback duration."""
+        with (
+            AuthTestClient(self.app) as client,
+            patch(
+                "frigate.api.media.get_keyframe_before",
+                side_effect=lambda _path, offset: offset,
+            ),
+        ):
+            for case in RANGE_CASES:
+                with self.subTest(case=case.name):
+                    Recordings.delete().execute()
+                    super().insert_mock_recording(
+                        case.name,
+                        REQUEST_START + case.start_offset,
+                        REQUEST_START + case.end_offset,
+                    )
+
+                    response = client.get(
+                        f"/vod/front_door/start/{REQUEST_START}/end/{REQUEST_END}"
+                    )
+
+                    if case.vod_duration_ms is None:
+                        assert response.status_code == 404
+                        continue
+
+                    self._assert_vod_response(
+                        response,
+                        [
+                            (
+                                case.name,
+                                case.vod_clip_from_ms,
+                                case.vod_duration_ms,
+                            )
+                        ],
+                    )
+
+    def test_vod_handles_segment_ending_at_start_with_keyframe_fallbacks(self):
+        """VOD keeps a boundary segment when keyframe lookup extends it."""
+
+        def keyframe_before(path: str, offset: int) -> int | None:
+            return offset - 1000 if path == "previous_keyframe" else None
+
+        with (
+            AuthTestClient(self.app) as client,
+            patch(
+                "frigate.api.media.get_keyframe_before",
+                side_effect=keyframe_before,
+            ),
+        ):
+            super().insert_mock_recording(
+                "previous_keyframe",
+                REQUEST_START - 10,
+                REQUEST_START,
+            )
+            super().insert_mock_recording(
+                "missing_keyframe",
+                REQUEST_START - 5,
+                REQUEST_START,
+            )
+
+            response = client.get(
+                f"/vod/front_door/start/{REQUEST_START}/end/{REQUEST_END}"
+            )
+
+            self._assert_vod_response(
+                response,
+                [
+                    ("previous_keyframe", 9000, 1000),
+                    ("missing_keyframe", None, 5000),
+                ],
+            )
+
     def test_recordings_unavailable_reports_gap_between_recordings(self):
         """A gap between two recordings is reported as an unavailable segment."""
         with AuthTestClient(self.app) as client:

frigate/test/test_birdseye.py

@@ -1,13 +1,70 @@
-"""Test camera user and password cleanup."""
+"""Tests for Birdseye canvas sizing and layout behavior."""
 
 import multiprocessing as mp
 import unittest
+from unittest.mock import Mock
 
-from frigate.config import FrigateConfig
+from frigate.config import BirdseyeModeConfig, FrigateConfig
-from frigate.output.birdseye import BirdsEyeFrameManager, get_canvas_shape
+from frigate.output.birdseye import (
+    Birdseye,
+    BirdseyeActivity,
+    BirdsEyeFrameManager,
+    get_canvas_shape,
+)
 
 
 class TestBirdseye(unittest.TestCase):
+    def _build_manager(
+        self, camera_dimensions: dict[str, tuple[int, int]]
+    ) -> BirdsEyeFrameManager:
+        config = {
+            "mqtt": {"host": "mqtt"},
+            "birdseye": {"width": 1280, "height": 720},
+            "cameras": {},
+        }
+
+        for order, (camera, dimensions) in enumerate(
+            camera_dimensions.items(), start=1
+        ):
+            config["cameras"][camera] = {
+                "ffmpeg": {
+                    "inputs": [
+                        {
+                            "path": f"rtsp://10.0.0.1:554/{camera}",
+                            "roles": ["detect"],
+                        }
+                    ]
+                },
+                "detect": {
+                    "width": dimensions[0],
+                    "height": dimensions[1],
+                    "fps": 5,
+                },
+                "birdseye": {"order": order},
+            }
+
+        return BirdsEyeFrameManager(FrigateConfig(**config), mp.Event())
+
+    def _assert_no_overlaps(
+        self, layout: list[list[tuple[str, tuple[int, int, int, int]]]]
+    ):
+        rectangles = [position for row in layout for _, position in row]
+
+        for index, rect in enumerate(rectangles):
+            x1, y1, width1, height1 = rect
+            for other in rectangles[index + 1 :]:
+                x2, y2, width2, height2 = other
+                overlap = (
+                    x1 < x2 + width2
+                    and x2 < x1 + width1
+                    and y1 < y2 + height2
+                    and y2 < y1 + height1
+                )
+                self.assertFalse(
+                    overlap,
+                    msg=f"Overlapping rectangles found: {rect} and {other}",
+                )
+
     def test_16x9(self):
         """Test 16x9 aspect ratio works as expected for birdseye."""
         width = 1280
@@ -48,6 +105,212 @@ class TestBirdseye(unittest.TestCase):
         assert canvas_width == width  # width will be the same
         assert canvas_height != height
 
+    def test_portrait_camera_does_not_overlap_next_row(self):
+        """Portrait cameras should reserve their real horizontal position on the next row."""
+        manager = self._build_manager(
+            {
+                "cam_a": (1280, 720),
+                "cam_p": (360, 640),
+                "cam_b": (1280, 720),
+                "cam_c": (640, 480),
+            }
+        )
+
+        layout = manager.calculate_layout(["cam_a", "cam_p", "cam_b", "cam_c"], 3)
+
+        self.assertIsNotNone(layout)
+        assert layout is not None
+        self._assert_no_overlaps(layout)
+
+        cam_c = [
+            position for row in layout for camera, position in row if camera == "cam_c"
+        ][0]
+        self.assertEqual(cam_c[0], 0)
+
+    def test_portrait_reservation_only_applies_to_next_row(self):
+        """Portrait reservations should not push later rows after the span ends."""
+        manager = self._build_manager(
+            {
+                "cam_a": (1280, 720),
+                "cam_p": (360, 640),
+                "cam_b": (1280, 720),
+                "cam_c": (1280, 720),
+                "cam_d": (1280, 720),
+                "cam_e": (1280, 720),
+            }
+        )
+
+        layout = manager.calculate_layout(
+            ["cam_a", "cam_p", "cam_b", "cam_c", "cam_d", "cam_e"],
+            3,
+        )
+
+        self.assertIsNotNone(layout)
+        assert layout is not None
+        self._assert_no_overlaps(layout)
+
+        cam_e = [
+            position for row in layout for camera, position in row if camera == "cam_e"
+        ][0]
+        self.assertEqual(cam_e[0], 0)
+
+    def test_multiple_portraits_reserve_distinct_ranges(self):
+        """Multiple portrait cameras in one row should reserve separate spans below them."""
+        manager = self._build_manager(
+            {
+                "cam_a": (640, 480),
+                "cam_p1": (360, 640),
+                "cam_p2": (360, 640),
+                "cam_b": (640, 480),
+                "cam_c": (1280, 720),
+                "cam_d": (640, 480),
+            }
+        )
+
+        layout = manager.calculate_layout(
+            ["cam_a", "cam_p1", "cam_p2", "cam_b", "cam_c", "cam_d"],
+            4,
+        )
+
+        self.assertIsNotNone(layout)
+        assert layout is not None
+        self._assert_no_overlaps(layout)
+
+    def test_two_landscapes_then_portrait_then_two_landscapes(self):
+        """A portrait after two landscapes should reserve only its own tail span."""
+        manager = self._build_manager(
+            {
+                "cam_a": (1280, 720),
+                "cam_b": (1280, 720),
+                "cam_p": (360, 640),
+                "cam_c": (1280, 720),
+                "cam_d": (1280, 720),
+            }
+        )
+
+        layout = manager.calculate_layout(
+            ["cam_a", "cam_b", "cam_p", "cam_c", "cam_d"],
+            3,
+        )
+
+        self.assertIsNotNone(layout)
+        assert layout is not None
+        self._assert_no_overlaps(layout)
+
+        cam_c = [
+            position for row in layout for camera, position in row if camera == "cam_c"
+        ][0]
+        cam_d = [
+            position for row in layout for camera, position in row if camera == "cam_d"
+        ][0]
+        self.assertEqual(cam_c[0], 0)
+        self.assertEqual(cam_d[0], cam_c[0] + cam_c[2])
+
+
+class TestBirdseyeActivity(unittest.TestCase):
+    """Test which camera activity is included in each Birdseye mode."""
+
+    def setUp(self):
+        config = {
+            "mqtt": {"enabled": False},
+            "birdseye": {
+                "enabled": True,
+                "mode": {
+                    "motion": True,
+                    "objects": True,
+                    "stationary_objects": True,
+                },
+            },
+            "cameras": {
+                "front": {
+                    "ffmpeg": {
+                        "inputs": [
+                            {"path": "rtsp://10.0.0.1:554/video", "roles": ["detect"]}
+                        ]
+                    },
+                    "detect": {"height": 1080, "width": 1920, "fps": 5},
+                }
+            },
+        }
+        self.manager = BirdsEyeFrameManager(FrigateConfig(**config), mp.Event())
+
+    def test_existing_modes_keep_their_activity_rules(self):
+        continuous = BirdseyeModeConfig(continuous=True)
+        motion = BirdseyeModeConfig(motion=True)
+        objects = BirdseyeModeConfig(objects=True)
+
+        no_activity = BirdseyeActivity(False, False, False)
+        motion_activity = BirdseyeActivity(False, False, True)
+        stationary_activity = BirdseyeActivity(False, True, False)
+        active_object_activity = BirdseyeActivity(True, False, False)
+
+        assert self.manager.camera_active(continuous, no_activity)
+        assert self.manager.camera_active(motion, motion_activity)
+        assert not self.manager.camera_active(motion, stationary_activity)
+        assert self.manager.camera_active(objects, active_object_activity)
+        assert not self.manager.camera_active(objects, stationary_activity)
+
+    def test_modes_can_be_combined(self):
+        mode = BirdseyeModeConfig(motion=True, stationary_objects=True)
+
+        assert self.manager.camera_active(mode, BirdseyeActivity(False, False, True))
+        assert self.manager.camera_active(mode, BirdseyeActivity(False, True, False))
+        assert not self.manager.camera_active(
+            mode, BirdseyeActivity(False, False, False)
+        )
+
+    def test_stationary_objects_are_independent_from_active_objects(self):
+        stationary_objects = BirdseyeModeConfig(stationary_objects=True)
+
+        assert self.manager.camera_active(
+            stationary_objects, BirdseyeActivity(False, True, False)
+        )
+        assert not self.manager.camera_active(
+            stationary_objects, BirdseyeActivity(True, False, False)
+        )
+
+    def test_write_data_preserves_active_and_confirms_stationary_activity(self):
+        birdseye = Birdseye.__new__(Birdseye)
+        birdseye.birdseye_manager = Mock()
+        birdseye.birdseye_manager.update.return_value = (False, False)
+        birdseye._idle_interval = None
+        frame = Mock()
+
+        birdseye.write_data(
+            "front",
+            [
+                {"stationary": True, "false_positive": True},
+                {"stationary": False, "false_positive": True},
+                {"stationary": True, "false_positive": False},
+            ],
+            [[0, 0, 10, 10]],
+            1.0,
+            frame,
+        )
+
+        birdseye.birdseye_manager.update.assert_called_once_with(
+            "front", BirdseyeActivity(True, True, True), 1.0, frame
+        )
+
+    def test_stationary_false_positive_does_not_activate_birdseye(self):
+        birdseye = Birdseye.__new__(Birdseye)
+        birdseye.birdseye_manager = Mock()
+        birdseye.birdseye_manager.update.return_value = (False, False)
+        birdseye._idle_interval = None
+        frame = Mock()
+
+        birdseye.write_data(
+            "front",
+            [{"stationary": True, "false_positive": True}],
+            [],
+            1.0,
+            frame,
+        )
+
+        birdseye.birdseye_manager.update.assert_called_once_with(
+            "front", BirdseyeActivity(False, False, False), 1.0, frame
+        )
+
 
 class TestBirdseyeCameraOrder(unittest.TestCase):
     """Test that birdseye reacts to camera order changes without a restart."""
@@ -55,7 +318,7 @@ class TestBirdseyeCameraOrder(unittest.TestCase):
     def setUp(self):
         config = {
             "mqtt": {"enabled": False},
-            "birdseye": {"enabled": True, "mode": "continuous"},
+            "birdseye": {"enabled": True, "mode": {"continuous": True}},
             "cameras": {
                 camera: {
                     "ffmpeg": {

frigate/test/test_camera_lifecycle.py

@@ -0,0 +1,227 @@
+"""Regression tests for runtime camera add and delete handling."""
+
+import asyncio
+import threading
+import unittest
+from types import SimpleNamespace
+from unittest.mock import MagicMock
+
+# LicensePlatePostProcessor is imported via the maintainer rather than from
+# data_processing.post.license_plate, which circularly imports back through
+# frigate.embeddings before that package finishes initializing
+from frigate.embeddings.maintainer import (
+    EmbeddingMaintainer,
+    LicensePlatePostProcessor,
+)
+from frigate.ptz.autotrack import PtzAutoTracker
+from frigate.review.maintainer import ReviewSegmentMaintainer
+from frigate.track.object_processing import TrackedObjectProcessor
+
+
+def _make_processor() -> TrackedObjectProcessor:
+    """Build a processor with no cameras, bypassing __init__."""
+    processor = TrackedObjectProcessor.__new__(TrackedObjectProcessor)
+    processor.camera_states = {}
+    processor.camera_states_lock = threading.Lock()
+    processor.config = SimpleNamespace(cameras={})
+    processor.event_sender = MagicMock()
+    processor.detection_publisher = MagicMock()
+    processor.ongoing_manual_events = {}
+    return processor
+
+
+class TestObjectProcessorUnknownCamera(unittest.TestCase):
+    def test_save_lpr_snapshot_ignores_unknown_camera(self):
+        processor = _make_processor()
+
+        # 1x1 png, base64; decoding must not be what fails
+        payload = (
+            "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwAEhQGAhKmMIQAAAABJRU5ErkJggg==",
+            "1234.5-abcdef",
+            "deleted_cam",
+        )
+
+        processor.save_lpr_snapshot(payload)
+
+        processor.event_sender.publish.assert_not_called()
+
+    def test_create_manual_event_ignores_unknown_camera(self):
+        processor = _make_processor()
+
+        payload = (
+            1234.5,
+            "deleted_cam",
+            "person",
+            "1234.5-abcdef",
+            True,
+            0.9,
+            None,
+            None,
+            "api",
+            False,
+            None,
+        )
+
+        processor.create_manual_event(payload)
+
+        processor.event_sender.publish.assert_not_called()
+        self.assertEqual(processor.ongoing_manual_events, {})
+
+    def test_create_lpr_event_ignores_unknown_camera(self):
+        processor = _make_processor()
+
+        payload = (
+            1234.5,
+            "deleted_cam",
+            "license_plate",
+            "1234.5-abcdef",
+            True,
+            0.9,
+            None,
+            "ABC123",
+        )
+
+        processor.create_lpr_event(payload)
+
+        processor.event_sender.publish.assert_not_called()
+        self.assertEqual(processor.ongoing_manual_events, {})
+
+    def test_create_manual_event_ignores_camera_added_but_not_yet_drained(self):
+        """The add window: present in config.cameras, absent from camera_states.
+
+        debug_replay writes the camera into the shared config before publishing
+        add, so a guard on config.cameras passes here and falls through to
+        camera_states. This test fails against such a guard.
+        """
+        processor = _make_processor()
+        processor.config = SimpleNamespace(
+            cameras={
+                "new_cam": SimpleNamespace(
+                    record=SimpleNamespace(event_pre_capture=5, enabled=True)
+                )
+            }
+        )
+
+        payload = (
+            1234.5,
+            "new_cam",
+            "person",
+            "1234.5-abcdef",
+            True,
+            0.9,
+            None,
+            None,
+            "api",
+            False,
+            None,
+        )
+
+        processor.create_manual_event(payload)
+
+        processor.event_sender.publish.assert_not_called()
+
+
+class TestEmbeddingsUnknownCamera(unittest.TestCase):
+    def _make_maintainer(self) -> EmbeddingMaintainer:
+        maintainer = EmbeddingMaintainer.__new__(EmbeddingMaintainer)
+        maintainer.config = SimpleNamespace(cameras={})
+        maintainer.event_end_subscriber = MagicMock()
+        maintainer.realtime_processors = [MagicMock()]
+        # spec is required: the dispatch loop is a chain of isinstance checks,
+        # and a bare MagicMock matches none of them, so the crashing branch
+        # would never run and the test would pass against unfixed code
+        maintainer.post_processors = [MagicMock(spec=LicensePlatePostProcessor)]
+        maintainer.detected_license_plates = {"1234.5-abcdef": {"obj_data": {}}}
+        maintainer.recordings_available_through = {"deleted_cam": 1234.5}
+        maintainer.event_metadata_publisher = MagicMock()
+        return maintainer
+
+    def test_process_finalized_skips_unknown_camera(self):
+        maintainer = self._make_maintainer()
+        # updated_db=False bypasses the Event.get branch, which would hit the
+        # database and mask the KeyError this test is about
+        maintainer.event_end_subscriber.check_for_update.side_effect = [
+            ("1234.5-abcdef", "deleted_cam", False),
+            None,
+        ]
+
+        maintainer._process_finalized()
+
+        maintainer.post_processors[0].process_data.assert_not_called()
+
+    def test_process_finalized_still_expires_realtime_state(self):
+        """The guard must not skip per-event cleanup, only post processing."""
+        maintainer = self._make_maintainer()
+        maintainer.event_end_subscriber.check_for_update.side_effect = [
+            ("1234.5-abcdef", "deleted_cam", False),
+            None,
+        ]
+
+        maintainer._process_finalized()
+
+        maintainer.realtime_processors[0].expire_object.assert_called_once_with(
+            "1234.5-abcdef", "deleted_cam"
+        )
+
+    def test_expire_dedicated_lpr_drops_entry_for_unknown_camera(self):
+        maintainer = self._make_maintainer()
+        maintainer.detected_license_plates = {
+            "1234.5-abcdef": {"camera": "deleted_cam", "last_seen": 1.0}
+        }
+
+        maintainer._expire_dedicated_lpr()
+
+        self.assertEqual(maintainer.detected_license_plates, {})
+
+
+class TestReviewMaintainerRemoval(unittest.TestCase):
+    def test_camera_removal_ends_segment_and_clears_state(self):
+        maintainer = ReviewSegmentMaintainer.__new__(ReviewSegmentMaintainer)
+        maintainer.active_review_segments = {"deleted_cam": MagicMock()}
+        maintainer.indefinite_events = {"deleted_cam": {"1234.5-abcdef": 1.0}}
+        maintainer.forcibly_end_segment = MagicMock()
+
+        maintainer._handle_camera_removed("deleted_cam")
+
+        maintainer.forcibly_end_segment.assert_called_once_with("deleted_cam")
+        self.assertNotIn("deleted_cam", maintainer.indefinite_events)
+
+
+class TestAutotrackerMoveQueue(unittest.TestCase):
+    def test_move_queue_drops_move_for_removed_camera(self):
+        tracker = PtzAutoTracker.__new__(PtzAutoTracker)
+        tracker.stop_event = MagicMock()
+        # one pass through the loop, then stop
+        tracker.stop_event.is_set.side_effect = [False, True]
+        tracker.ptz_metrics = {}
+        tracker.move_queues = {"deleted_cam": asyncio.Queue()}
+        tracker.move_queue_locks = {"deleted_cam": asyncio.Lock()}
+        tracker.onvif = MagicMock()
+        tracker.config = SimpleNamespace(cameras={})
+        tracker.move_queues["deleted_cam"].put_nowait((1234.5, 0.1, 0.1, 0.0))
+
+        asyncio.run(tracker._process_move_queue("deleted_cam"))
+
+        tracker.onvif._move_relative.assert_not_called()
+
+
+class TestCameraStateAccessors(unittest.TestCase):
+    def test_get_camera_state_returns_none_for_unknown_camera(self):
+        processor = _make_processor()
+
+        self.assertIsNone(processor.get_camera_state("deleted_cam"))
+
+    def test_get_camera_states_returns_a_snapshot_not_a_view(self):
+        """A live values() view raises RuntimeError if the writer pops mid-iteration."""
+        processor = _make_processor()
+        processor.camera_states = {"one": MagicMock(), "two": MagicMock()}
+
+        states = processor.get_camera_states()
+        processor.camera_states.pop("one")
+
+        self.assertEqual(len(states), 2)
+
+    def test_get_current_frame_time_is_zero_for_unknown_camera(self):
+        processor = _make_processor()
+
+        self.assertEqual(processor.get_current_frame_time("deleted_cam"), 0.0)

frigate/test/test_config.py

@@ -7,7 +7,7 @@ import numpy as np
 from pydantic import ValidationError
 from ruamel.yaml.constructor import DuplicateKeyError
 
-from frigate.config import BirdseyeModeEnum, FrigateConfig
+from frigate.config import FrigateConfig
 from frigate.const import MODEL_CACHE_DIR
 from frigate.detectors import DetectorTypeEnum
 from frigate.util.builtin import deep_merge
@@ -170,7 +170,7 @@ class TestConfig(unittest.TestCase):
     def test_override_birdseye(self):
         config = {
             "mqtt": {"host": "mqtt"},
-            "birdseye": {"enabled": True, "mode": "continuous"},
+            "birdseye": {"enabled": True, "mode": {"continuous": True}},
             "cameras": {
                 "back": {
                     "ffmpeg": {
@@ -183,19 +183,30 @@ class TestConfig(unittest.TestCase):
                         "width": 1920,
                         "fps": 5,
                     },
-                    "birdseye": {"enabled": False, "mode": "motion"},
+                    "birdseye": {
+                        "enabled": False,
+                        "mode": {"continuous": False, "motion": True},
+                    },
                 }
             },
         }
 
         frigate_config = FrigateConfig(**config)
         assert not frigate_config.cameras["back"].birdseye.enabled
-        assert frigate_config.cameras["back"].birdseye.mode is BirdseyeModeEnum.motion
+        mode = frigate_config.cameras["back"].birdseye.mode
+        assert mode.motion
+        assert not mode.continuous
+        assert not mode.objects
+        assert not mode.stationary_objects
 
     def test_override_birdseye_non_inheritable(self):
         config = {
             "mqtt": {"host": "mqtt"},
-            "birdseye": {"enabled": True, "mode": "continuous", "height": 1920},
+            "birdseye": {
+                "enabled": True,
+                "mode": {"continuous": True},
+                "height": 1920,
+            },
             "cameras": {
                 "back": {
                     "ffmpeg": {
@@ -218,7 +229,7 @@ class TestConfig(unittest.TestCase):
     def test_inherit_birdseye(self):
         config = {
             "mqtt": {"host": "mqtt"},
-            "birdseye": {"enabled": True, "mode": "continuous"},
+            "birdseye": {"enabled": True, "mode": {"continuous": True}},
             "cameras": {
                 "back": {
                     "ffmpeg": {
@@ -237,9 +248,89 @@ class TestConfig(unittest.TestCase):
 
         frigate_config = FrigateConfig(**config)
         assert frigate_config.cameras["back"].birdseye.enabled
-        assert (
+        mode = frigate_config.cameras["back"].birdseye.mode
-            frigate_config.cameras["back"].birdseye.mode is BirdseyeModeEnum.continuous
+        assert mode.continuous
-        )
+        assert not mode.motion
+        assert not mode.objects
+        assert not mode.stationary_objects
+
+    def test_combine_birdseye_activity_types(self):
+        config = {
+            **self.minimal,
+            "birdseye": {
+                "mode": {
+                    "motion": True,
+                    "stationary_objects": True,
+                }
+            },
+        }
+
+        frigate_config = FrigateConfig(**config)
+        mode = frigate_config.cameras["back"].birdseye.mode
+        assert mode.motion
+        assert mode.stationary_objects
+        assert not mode.continuous
+        assert not mode.objects
+
+    def test_birdseye_requires_an_activity_type(self):
+        config = {
+            **self.minimal,
+            "birdseye": {
+                "mode": {
+                    "continuous": False,
+                    "motion": False,
+                    "objects": False,
+                    "stationary_objects": False,
+                }
+            },
+        }
+
+        with self.assertRaisesRegex(
+            ValidationError, "must enable at least one Birdseye activity type"
+        ):
+            FrigateConfig(**config)
+
+    def test_camera_can_disable_an_inherited_activity_type(self):
+        config = {
+            **self.minimal,
+            "birdseye": {"mode": {"motion": True, "objects": True}},
+        }
+        config["cameras"]["back"]["birdseye"] = {"mode": {"motion": False}}
+
+        frigate_config = FrigateConfig(**config)
+        mode = frigate_config.cameras["back"].birdseye.mode
+        assert not mode.motion
+        assert mode.objects
+
+    def test_profile_must_leave_an_activity_type_enabled(self):
+        config = {
+            **self.minimal,
+            "profiles": {"away": {"friendly_name": "Away"}},
+            "birdseye": {"mode": {"objects": True}},
+        }
+        config["cameras"]["back"]["profiles"] = {
+            "away": {"birdseye": {"mode": {"objects": False}}}
+        }
+
+        with self.assertRaisesRegex(
+            ValidationError, "must enable at least one Birdseye activity type"
+        ):
+            FrigateConfig(**config)
+
+    def test_camera_birdseye_activity_types_override_global_values(self):
+        config = {
+            **self.minimal,
+            "birdseye": {"mode": {"motion": True, "objects": True}},
+        }
+        config["cameras"]["back"]["birdseye"] = {
+            "mode": {"motion": False, "stationary_objects": True}
+        }
+
+        frigate_config = FrigateConfig(**config)
+        mode = frigate_config.cameras["back"].birdseye.mode
+        assert not mode.motion
+        assert mode.objects
+        assert mode.stationary_objects
 
     def test_override_tracked_objects(self):
         config = {

frigate/test/test_dispatcher_runtime_state.py

@@ -8,6 +8,7 @@ from unittest.mock import MagicMock, patch
 from frigate.app import FrigateApp
 from frigate.comms.dispatcher import Dispatcher
 from frigate.comms.runtime_state import RuntimeStatePersistence
+from frigate.config import BirdseyeModeConfig
 
 
 def _make_camera_mock(
@@ -51,6 +52,58 @@ def _build_dispatcher(cameras: dict[str, MagicMock]) -> Dispatcher:
         return Dispatcher(config, config_updater, onvif, ptz_metrics, communicators)
 
 
+class TestBirdseyeModeCommands(unittest.TestCase):
+    """Verify Birdseye mode commands use the boolean mode contract."""
+
+    def setUp(self) -> None:
+        self.camera = _make_camera_mock()
+        self.camera.birdseye.enabled = True
+        self.dispatcher = _build_dispatcher({"front_door": self.camera})
+        self.dispatcher.publish = MagicMock()
+
+    def test_combined_modes_are_accepted(self) -> None:
+        self.dispatcher._on_birdseye_mode_command(
+            "front_door", "STATIONARY_OBJECTS,MOTION"
+        )
+
+        self.assertEqual(
+            self.camera.birdseye.mode,
+            BirdseyeModeConfig(motion=True, stationary_objects=True),
+        )
+        self.dispatcher.config_updater.publish_update.assert_called_once()
+        self.dispatcher.publish.assert_called_once_with(
+            "front_door/birdseye_mode/state",
+            "MOTION,STATIONARY_OBJECTS",
+            retain=True,
+        )
+
+    def test_single_activity_type_is_accepted(self) -> None:
+        self.dispatcher._on_birdseye_mode_command("front_door", "OBJECTS")
+
+        self.assertEqual(
+            self.camera.birdseye.mode,
+            BirdseyeModeConfig(objects=True),
+        )
+        self.dispatcher.publish.assert_called_once_with(
+            "front_door/birdseye_mode/state", "OBJECTS", retain=True
+        )
+
+    def test_unknown_mode_is_rejected(self) -> None:
+        for payload in (
+            "UNKNOWN",
+            "motion",
+            "MOTION_OBJECTS",
+            "NONE",
+            "NONE,MOTION",
+            "MOTION,MOTION",
+            "MOTION,",
+        ):
+            with self.subTest(payload=payload):
+                self.dispatcher._on_birdseye_mode_command("front_door", payload)
+
+        self.dispatcher.config_updater.publish_update.assert_not_called()
+
+
 class TestRestoreRuntimeState(unittest.TestCase):
     """Verify replay routes through handlers and tolerates missing entries."""
 

frigate/test/test_gpu_stats.py

@@ -1,7 +1,12 @@
 import unittest
+from io import StringIO
 from unittest.mock import MagicMock, patch
 
-from frigate.util.services import get_amd_gpu_stats, get_intel_gpu_stats
+from frigate.util.services import (
+    get_amd_gpu_stats,
+    get_intel_gpu_stats,
+    get_openvino_npu_stats,
+)
 
 
 class TestGpuStats(unittest.TestCase):
@@ -17,6 +22,88 @@ class TestGpuStats(unittest.TestCase):
         amd_stats = get_amd_gpu_stats()
         assert amd_stats == {"gpu": "4.17%", "mem": "60.37%"}
 
+    @patch("frigate.util.services.time.sleep")
+    @patch("frigate.util.services.time.time", side_effect=[0.0, 1.0])
+    @patch(
+        "frigate.util.services.os.readlink",
+        return_value="/sys/bus/pci/drivers/intel_vpu",
+    )
+    @patch(
+        "frigate.util.services.glob.glob",
+        return_value=["/sys/class/accel/accel0"],
+    )
+    @patch(
+        "builtins.open",
+        side_effect=[StringIO("1000"), StringIO("1250")],
+    )
+    def test_openvino_npu_stats_discovers_accel0(
+        self, open_file, glob, readlink, time, sleep
+    ):
+        assert get_openvino_npu_stats() == {"npu": "25.0", "mem": "-%"}
+
+        open_file.assert_any_call(
+            "/sys/class/accel/accel0/device/power/runtime_active_time"
+        )
+
+    @patch("frigate.util.services.time.sleep")
+    @patch("frigate.util.services.time.time", side_effect=[0.0, 1.0])
+    @patch(
+        "frigate.util.services.os.readlink",
+        side_effect=[
+            "/sys/bus/pci/drivers/other",
+            "/sys/bus/pci/drivers/intel_vpu",
+        ],
+    )
+    @patch(
+        "frigate.util.services.glob.glob",
+        return_value=[
+            "/sys/class/accel/accel0",
+            "/sys/class/accel/accel1",
+        ],
+    )
+    @patch(
+        "builtins.open",
+        side_effect=[StringIO("1000"), StringIO("1250")],
+    )
+    def test_openvino_npu_stats_skips_non_intel_accelerator(
+        self, open_file, glob, readlink, time, sleep
+    ):
+        assert get_openvino_npu_stats() == {"npu": "25.0", "mem": "-%"}
+
+        open_file.assert_any_call(
+            "/sys/class/accel/accel1/device/power/runtime_active_time"
+        )
+
+    @patch(
+        "frigate.util.services.os.readlink",
+        return_value="/sys/bus/pci/drivers/other",
+    )
+    @patch(
+        "frigate.util.services.glob.glob",
+        return_value=["/sys/class/accel/accel0"],
+    )
+    @patch("builtins.open")
+    def test_openvino_npu_stats_no_intel_accelerator(self, open_file, glob, readlink):
+        assert get_openvino_npu_stats() is None
+        open_file.assert_not_called()
+
+    @patch(
+        "frigate.util.services.os.readlink",
+        return_value="/sys/bus/pci/drivers/intel_vpu",
+    )
+    @patch(
+        "frigate.util.services.glob.glob",
+        return_value=["/sys/class/accel/accel0"],
+    )
+    @patch("builtins.open", side_effect=FileNotFoundError)
+    def test_openvino_npu_stats_runtime_counter_unavailable(
+        self, open_file, glob, readlink
+    ):
+        assert get_openvino_npu_stats() is None
+        open_file.assert_called_once_with(
+            "/sys/class/accel/accel0/device/power/runtime_active_time"
+        )
+
     @patch("frigate.stats.intel_gpu_info.intel_gpu_name_resolver.get_names")
     @patch("frigate.util.services.time.sleep")
     @patch("frigate.util.services.time.monotonic")

frigate/test/test_profiles.py

@@ -560,6 +560,25 @@ class TestProfileManager(unittest.TestCase):
         assert err is None
         assert self.config.cameras["front"].enabled is False
 
+    @patch.object(ProfileManager, "_persist_active_profile")
+    def test_profile_can_disable_inherited_birdseye_activity(self, mock_persist):
+        """A false-only mode override inherits the other base activity types."""
+        self.config.profiles["away"] = ProfileDefinitionConfig(friendly_name="Away")
+        base_mode = self.config.cameras["front"].birdseye.mode
+        base_mode.motion = True
+        base_mode.objects = True
+        self.config.cameras["front"].profiles["away"] = CameraProfileConfig(
+            birdseye={"mode": {"motion": False}}
+        )
+        self.manager = ProfileManager(self.config, self.mock_updater)
+
+        err = self.manager.activate_profile("away")
+
+        assert err is None
+        mode = self.config.cameras["front"].birdseye.mode
+        assert not mode.motion
+        assert mode.objects
+
     @patch.object(ProfileManager, "_persist_active_profile")
     def test_deactivate_restores_enabled(self, mock_persist):
         """Deactivating a profile restores the camera's base enabled state."""

frigate/track/object_processing.py

@@ -68,6 +68,7 @@ class TrackedObjectProcessor(threading.Thread):
         self.tracked_objects_queue = tracked_objects_queue
         self.stop_event: MpEvent = stop_event
         self.camera_states: dict[str, CameraState] = {}
+        self.camera_states_lock = threading.Lock()
         self.frame_manager = SharedMemoryFrameManager()
         self.last_motion_detected: dict[str, float] = {}
         self.ptz_autotracker_thread = ptz_autotracker_thread
@@ -236,7 +237,9 @@ class TrackedObjectProcessor(threading.Thread):
         camera_state.on("end", end)
         camera_state.on("snapshot", snapshot)
         camera_state.on("camera_activity", camera_activity)
-        self.camera_states[camera] = camera_state
+
+        with self.camera_states_lock:
+            self.camera_states[camera] = camera_state
 
     def should_save_snapshot(self, camera: str, obj: TrackedObject) -> bool:
         if obj.false_positive:
@@ -324,9 +327,22 @@ class TrackedObjectProcessor(threading.Thread):
                 # reset the last_motion so redundant `off` commands aren't sent
                 self.last_motion_detected[camera] = 0
 
+    def get_camera_state(self, camera: str) -> CameraState | None:
+        """Returns the state for a camera, or None if it does not exist."""
+        with self.camera_states_lock:
+            return self.camera_states.get(camera)
+
+    def get_camera_states(self) -> list[CameraState]:
+        """Returns a snapshot of camera states that is safe to iterate."""
+        with self.camera_states_lock:
+            return list(self.camera_states.values())
+
     def get_best(self, camera: str, label: str) -> dict[str, Any]:
-        # TODO: need a lock here
+        camera_state = self.get_camera_state(camera)
-        camera_state = self.camera_states[camera]
+
+        if camera_state is None:
+            return {}
+
         if label in camera_state.best_objects:
             best_obj = camera_state.best_objects[label]
 
@@ -350,17 +366,21 @@ class TrackedObjectProcessor(threading.Thread):
                 (self.config.birdseye.height * 3 // 2, self.config.birdseye.width),
             )
 
-        if camera not in self.camera_states:
+        camera_state = self.get_camera_state(camera)
+
+        if camera_state is None:
             return None
 
-        return self.camera_states[camera].get_current_frame(draw_options)
+        return camera_state.get_current_frame(draw_options)
 
     def get_current_frame_time(self, camera: str) -> float:
         """Returns the latest frame time for a given camera."""
-        if camera not in self.camera_states:
+        camera_state = self.get_camera_state(camera)
+
+        if camera_state is None:
             return 0.0
 
-        return self.camera_states[camera].current_frame_time
+        return camera_state.current_frame_time
 
     def set_sub_label(
         self, event_id: str, sub_label: str | None, score: float | None
@@ -498,14 +518,18 @@ class TrackedObjectProcessor(threading.Thread):
         # save the snapshot image
         (frame, event_id, camera) = payload
 
+        camera_state = self.camera_states.get(camera)
+
+        if camera_state is None:
+            logger.debug("Discarding LPR snapshot for unknown camera %s", camera)
+            return
+
         img = cv2.imdecode(
             np.frombuffer(base64.b64decode(frame), dtype=np.uint8),
             cv2.IMREAD_COLOR,
         )
 
-        self.camera_states[camera].save_manual_event_image(
+        camera_state.save_manual_event_image(img, event_id, "license_plate", {})
-            img, event_id, "license_plate", {}
-        )
 
     def create_manual_event(self, payload: tuple) -> None:
         (
@@ -522,13 +546,17 @@ class TrackedObjectProcessor(threading.Thread):
             pre_capture,
         ) = payload
 
+        camera_state = self.camera_states.get(camera_name)
+
+        if camera_state is None:
+            logger.debug("Discarding manual event for unknown camera %s", camera_name)
+            return
+
         # save the snapshot image
-        self.camera_states[camera_name].save_manual_event_image(
+        camera_state.save_manual_event_image(None, event_id, label, draw)
-            None, event_id, label, draw
-        )
         end_time = frame_time + duration if duration is not None else None
         start_time = (
-            frame_time - self.config.cameras[camera_name].record.event_pre_capture
+            frame_time - camera_state.camera_config.record.event_pre_capture
             if pre_capture is None
             else frame_time - pre_capture
         )
@@ -548,7 +576,7 @@ class TrackedObjectProcessor(threading.Thread):
                     "camera": camera_name,
                     "start_time": start_time,
                     "end_time": end_time,
-                    "has_clip": self.config.cameras[camera_name].record.enabled
+                    "has_clip": camera_state.camera_config.record.enabled
                     and include_recording,
                     "has_snapshot": True,
                     "snapshot_clean": True,
@@ -591,6 +619,12 @@ class TrackedObjectProcessor(threading.Thread):
             plate,
         ) = payload
 
+        camera_state = self.camera_states.get(camera_name)
+
+        if camera_state is None:
+            logger.debug("Discarding LPR event for unknown camera %s", camera_name)
+            return
+
         # send event to event maintainer
         self.event_sender.publish(
             (
@@ -605,9 +639,9 @@ class TrackedObjectProcessor(threading.Thread):
                     "score": score,
                     "camera": camera_name,
                     "start_time": frame_time
-                    - self.config.cameras[camera_name].record.event_pre_capture,
+                    - camera_state.camera_config.record.event_pre_capture,
                     "end_time": None,
-                    "has_clip": self.config.cameras[camera_name].record.enabled
+                    "has_clip": camera_state.camera_config.record.enabled
                     and include_recording,
                     "has_snapshot": True,
                     "snapshot_clean": True,
@@ -699,7 +733,10 @@ class TrackedObjectProcessor(threading.Thread):
                         continue
 
                     camera_state.shutdown()
-                    self.camera_states.pop(camera)
+
+                    with self.camera_states_lock:
+                        self.camera_states.pop(camera)
+
                     self.camera_activity.pop(camera, None)
                     self.last_motion_detected.pop(camera, None)
 
@@ -715,8 +752,6 @@ class TrackedObjectProcessor(threading.Thread):
                 if camera_state is None:
                     continue
 
-                camera_state = self.camera_states[camera]
-
                 if camera_state.prev_enabled and not current_enabled:
                     logger.debug(f"Not processing objects for disabled camera {camera}")
                     self.force_end_all_events(camera, camera_state)
@@ -812,7 +847,11 @@ class TrackedObjectProcessor(threading.Thread):
                     break
 
                 event_id, camera, _ = update
-                self.camera_states[camera].finished(event_id)
+                camera_state = self.camera_states.get(camera)
+
+                # the camera may have been removed while its event was pending
+                if camera_state is not None:
+                    camera_state.finished(event_id)
 
         # shut down camera states
         for state in self.camera_states.values():

frigate/util/config.py

@@ -20,7 +20,7 @@ from frigate.util.services import get_video_properties
 
 logger = logging.getLogger(__name__)
 
-CURRENT_CONFIG_VERSION = "0.18-0"
+CURRENT_CONFIG_VERSION = "0.19-0"
 DEFAULT_CONFIG_FILE = os.path.join(CONFIG_DIR, "config.yml")
 
 
@@ -93,6 +93,7 @@ def migrate_frigate_config(config_file: str):
 
     logger.info("copying config as backup...")
     shutil.copy(config_file, os.path.join(CONFIG_DIR, "backup_config.yaml"))
+    new_config = config
 
     if previous_version < "0.14":
         logger.info(f"Migrating frigate config from {previous_version} to 0.14...")
@@ -147,6 +148,13 @@ def migrate_frigate_config(config_file: str):
             yaml.dump(new_config, f)
         previous_version = "0.18-0"
 
+    if previous_version < "0.19-0":
+        logger.info(f"Migrating frigate config from {previous_version} to 0.19-0...")
+        new_config = migrate_019_0(new_config)
+        with open(config_file, "w") as f:
+            yaml.dump(new_config, f)
+        previous_version = "0.19-0"
+
     logger.info("Finished frigate config migration...")
 
 
@@ -525,6 +533,21 @@ def _convert_legacy_mask_to_dict(
     return result
 
 
+def _migrate_birdseye_mode(birdseye: dict[str, Any] | None) -> None:
+    """Convert a scalar Birdseye mode to composable activity types."""
+    if not birdseye or not isinstance(birdseye.get("mode"), str):
+        return
+
+    legacy_mode = birdseye["mode"]
+    activity_types = ("continuous", "motion", "objects", "stationary_objects")
+    if legacy_mode not in activity_types:
+        return
+
+    birdseye["mode"] = {
+        activity_type: activity_type == legacy_mode for activity_type in activity_types
+    }
+
+
 def migrate_018_0(config: dict[str, dict[str, Any]]) -> dict[str, dict[str, Any]]:
     """Handle migrating frigate config to 0.18-0"""
     new_config = config.copy()
@@ -658,6 +681,26 @@ def migrate_018_0(config: dict[str, dict[str, Any]]) -> dict[str, dict[str, Any]
     return new_config
 
 
+def migrate_019_0(config: dict[str, dict[str, Any]]) -> dict[str, dict[str, Any]]:
+    """Handle migrating Frigate config to 0.19-0."""
+    new_config = config.copy()
+
+    _migrate_birdseye_mode(new_config.get("birdseye"))
+
+    for name, camera in new_config.get("cameras", {}).items():
+        camera_config: dict[str, dict[str, Any]] = camera.copy()
+        _migrate_birdseye_mode(camera_config.get("birdseye"))
+
+        for profile in camera_config.get("profiles", {}).values():
+            if isinstance(profile, dict):
+                _migrate_birdseye_mode(profile.get("birdseye"))
+
+        new_config["cameras"][name] = camera_config
+
+    new_config["version"] = "0.19-0"
+    return new_config
+
+
 def get_relative_coordinates(
     mask: str | list | None,
     frame_shape: tuple[int, int],

frigate/util/object_names.py

@@ -0,0 +1,209 @@
+"""Aggregation of the known sub label names an object can be tagged with."""
+
+import logging
+import os
+
+from pathvalidate import sanitize_filename
+
+from frigate.config import FrigateConfig
+from frigate.config.classification import ObjectClassificationType
+from frigate.const import CLIPS_DIR, FACE_DIR, MODEL_CACHE_DIR
+from frigate.util.builtin import load_labels
+
+logger = logging.getLogger(__name__)
+
+# subdirectory of FACE_DIR holding unassigned training images, not a face name
+FACE_TRAIN_DIR = "train"
+
+# category used by classification models for "no match", never attached to an object
+CLASSIFICATION_NONE_CATEGORY = "none"
+
+
+def get_categorized_object_names(
+    config: FrigateConfig,
+    allowed_cameras: list[str],
+    object_type: str | None = None,
+) -> dict[str, list[str]]:
+    """Collect every sub label name this install can attach, by object type.
+
+    Unlike the database-backed /sub_labels endpoint, this reads the config and
+    model files, so it also covers names that are configured but have not been
+    detected yet. Names come from the detector's logo attributes (limited to
+    objects the allowed cameras actually track), LPR known plate names,
+    registered face names, and custom object classification categories.
+
+    Structural attributes such as `face` and `license_plate` are excluded: they
+    describe a part of an object rather than naming it, and are never attached
+    as a sub label.
+
+    Args:
+        config: The running Frigate config
+        allowed_cameras: Cameras the requesting user may see
+        object_type: Optional object label to restrict the result to
+
+    Returns:
+        Mapping of object label to its known sub label names, sorted and
+        deduplicated. Object types with no known names are omitted.
+    """
+    tracked_objects = _get_tracked_objects(config, allowed_cameras)
+    names: dict[str, set[str]] = {}
+    logos = set(config.model.all_attribute_logos)
+
+    # 1. detector logo attributes, only for objects that are actually tracked
+    for label, label_attributes in config.model.attributes_map.items():
+        if label not in tracked_objects:
+            continue
+
+        label_logos = logos.intersection(label_attributes)
+
+        if label_logos:
+            names.setdefault(label, set()).update(label_logos)
+
+    # 2. LPR known plate names, for objects that can carry a plate
+    if config.lpr.known_plates and _lpr_enabled(config, allowed_cameras):
+        known_plates = set(config.lpr.known_plates)
+
+        for label in _objects_with_attribute(config, tracked_objects, "license_plate"):
+            names.setdefault(label, set()).update(known_plates)
+
+    # 3. registered face names, for objects that can carry a face
+    if _face_recognition_enabled(config, allowed_cameras):
+        face_names = _get_face_names()
+
+        if face_names:
+            for label in _objects_with_attribute(config, tracked_objects, "face"):
+                names.setdefault(label, set()).update(face_names)
+
+    # 4. custom object classification categories
+    for model_key, model_config in config.classification.custom.items():
+        if not model_config.enabled or model_config.object_config is None:
+            continue
+
+        if (
+            model_config.object_config.classification_type
+            != ObjectClassificationType.sub_label
+        ):
+            continue
+
+        categories = _get_classification_categories(model_key)
+
+        if not categories:
+            continue
+
+        for label in model_config.object_config.objects:
+            names.setdefault(label, set()).update(categories)
+
+    return {
+        label: sorted(label_names)
+        for label, label_names in sorted(names.items())
+        if label_names and (object_type is None or label == object_type)
+    }
+
+
+def _get_tracked_objects(config: FrigateConfig, allowed_cameras: list[str]) -> set[str]:
+    """Get the union of objects tracked by the cameras the user can see."""
+    tracked: set[str] = set()
+
+    for camera_name in allowed_cameras:
+        camera_config = config.cameras.get(camera_name)
+
+        if camera_config is None:
+            continue
+
+        tracked.update(camera_config.objects.track)
+
+    return tracked
+
+
+def _objects_with_attribute(
+    config: FrigateConfig, tracked_objects: set[str], attribute: str
+) -> set[str]:
+    """Get the tracked objects that a given attribute can be recognized on.
+
+    The attribute may also be tracked as an object in its own right, as
+    `license_plate` is on a dedicated LPR camera, in which case the name is
+    attached to that object directly.
+    """
+    objects = {
+        label
+        for label, label_attributes in config.model.attributes_map.items()
+        if attribute in label_attributes and label in tracked_objects
+    }
+
+    if attribute in tracked_objects:
+        objects.add(attribute)
+
+    return objects
+
+
+def _lpr_enabled(config: FrigateConfig, allowed_cameras: list[str]) -> bool:
+    return any(
+        config.cameras[camera_name].lpr.enabled
+        for camera_name in allowed_cameras
+        if camera_name in config.cameras
+    )
+
+
+def _face_recognition_enabled(
+    config: FrigateConfig, allowed_cameras: list[str]
+) -> bool:
+    return any(
+        config.cameras[camera_name].face_recognition.enabled
+        for camera_name in allowed_cameras
+        if camera_name in config.cameras
+    )
+
+
+def _get_face_names() -> set[str]:
+    """Get the names of every registered face collection."""
+    if not os.path.exists(FACE_DIR):
+        return set()
+
+    try:
+        entries = os.listdir(FACE_DIR)
+    except OSError:
+        logger.debug("Failed to read face directory %s", FACE_DIR)
+        return set()
+
+    return {
+        name
+        for name in entries
+        if name != FACE_TRAIN_DIR and os.path.isdir(os.path.join(FACE_DIR, name))
+    }
+
+
+def _get_classification_categories(model_key: str) -> set[str]:
+    """Get the categories a custom classification model can output.
+
+    The trained labelmap is authoritative, but it only exists once the model
+    has been trained, so fall back to the dataset directories that will become
+    the labelmap on the next training run.
+    """
+    safe_key = sanitize_filename(model_key)
+    categories: set[str] = set()
+    labelmap_path = os.path.join(MODEL_CACHE_DIR, safe_key, "labelmap.txt")
+
+    if os.path.exists(labelmap_path):
+        try:
+            labelmap = load_labels(labelmap_path, prefill=0, indexed=False)
+        except OSError:
+            logger.debug("Failed to read labelmap %s", labelmap_path)
+            labelmap = {}
+
+        categories.update(label for label in labelmap.values() if label)
+
+    dataset_dir = os.path.join(CLIPS_DIR, safe_key, "dataset")
+
+    if os.path.exists(dataset_dir):
+        try:
+            entries = os.listdir(dataset_dir)
+        except OSError:
+            logger.debug("Failed to read dataset directory %s", dataset_dir)
+            entries = []
+
+        categories.update(
+            name for name in entries if os.path.isdir(os.path.join(dataset_dir, name))
+        )
+
+    categories.discard(CLASSIFICATION_NONE_CATEGORY)
+    return categories

frigate/util/services.py

@@ -1,6 +1,7 @@
 """Utilities for services."""
 
 import asyncio
+import glob
 import json
 import logging
 import os
@@ -670,19 +671,33 @@ def get_intel_gpu_stats(
 
 def get_openvino_npu_stats() -> dict[str, str] | None:
     """Get NPU stats using openvino."""
-    NPU_RUNTIME_PATH = "/sys/devices/pci0000:00/0000:00:0b.0/power/runtime_active_time"
+    for accel_path in sorted(glob.glob("/sys/class/accel/accel*")):
+        try:
+            driver = os.path.basename(os.readlink(f"{accel_path}/device/driver"))
+        except OSError:
+            continue
+
+        if driver != "intel_vpu":
+            continue
+
+        try:
+            runtime_path = f"{accel_path}/device/power/runtime_active_time"
+            with open(runtime_path) as f:
+                initial_runtime = float(f.read().strip())
+            break
+        except (FileNotFoundError, PermissionError, ValueError):
+            continue
+    else:
+        return None
 
     try:
-        with open(NPU_RUNTIME_PATH) as f:
-            initial_runtime = float(f.read().strip())
-
         initial_time = time.time()
 
         # Sleep for 1 second to get an accurate reading
         time.sleep(1.0)
 
         # Read runtime value again
-        with open(NPU_RUNTIME_PATH) as f:
+        with open(runtime_path) as f:
             current_runtime = float(f.read().strip())
 
         current_time = time.time()

frigate/video/ffmpeg.py

@@ -54,59 +54,48 @@ def capture_frames(
     skipped_eps = EventsPerSecond()
     skipped_eps.start()
 
-    config_subscriber = CameraConfigUpdateSubscriber(
+    while not stop_event.is_set():
-        None, {config.name: config}, [CameraConfigUpdateEnum.enabled]
+        # CameraWatchdog applies enabled updates onto this same CameraConfig
-    )
+        # before it stops ffmpeg. Do not subscribe here: it would be rebuilt per
+        # ffmpeg restart and strand a pipe in the idle main process config PUB.
+        if not config.enabled:
+            logger.debug(f"Stopping capture thread for disabled {config.name}")
+            break
 
-    def get_enabled_state():
+        fps.value = frame_rate.eps()
-        """Fetch the latest enabled state from ZMQ."""
+        skipped_fps.value = skipped_eps.eps()
-        config_subscriber.check_for_updates()
+        current_frame.value = datetime.now().timestamp()
-        return config.enabled
+        frame_name = f"{config.name}_frame{frame_index}"
-
+        frame_buffer = frame_manager.write(frame_name)
-    try:
+        try:
-        while not stop_event.is_set():
+            frame_buffer[:] = ffmpeg_process.stdout.read(frame_size)
-            if not get_enabled_state():
+        except Exception:
-                logger.debug(f"Stopping capture thread for disabled {config.name}")
+            # shutdown has been initiated
+            if stop_event.is_set():
                 break
 
-            fps.value = frame_rate.eps()
+            logger.error(f"{config.name}: Unable to read frames from ffmpeg process.")
-            skipped_fps.value = skipped_eps.eps()
-            current_frame.value = datetime.now().timestamp()
-            frame_name = f"{config.name}_frame{frame_index}"
-            frame_buffer = frame_manager.write(frame_name)
-            try:
-                frame_buffer[:] = ffmpeg_process.stdout.read(frame_size)
-            except Exception:
-                # shutdown has been initiated
-                if stop_event.is_set():
-                    break
 
+            if ffmpeg_process.poll() is not None:
                 logger.error(
-                    f"{config.name}: Unable to read frames from ffmpeg process."
+                    f"{config.name}: ffmpeg process is not running. exiting capture thread..."
                 )
+                break
 
-                if ffmpeg_process.poll() is not None:
+            continue
-                    logger.error(
-                        f"{config.name}: ffmpeg process is not running. exiting capture thread..."
-                    )
-                    break
 
-                continue
+        frame_rate.update()
 
-            frame_rate.update()
+        # don't lock the queue to check, just try since it should rarely be full
+        try:
+            # add to the queue
+            frame_queue.put((frame_name, current_frame.value), False)
+            frame_manager.close(frame_name)
+        except queue.Full:
+            # if the queue is full, skip this frame
+            skipped_eps.update()
 
-            # don't lock the queue to check, just try since it should rarely be full
+        frame_index = 0 if frame_index == shm_frame_count - 1 else frame_index + 1
-            try:
-                # add to the queue
-                frame_queue.put((frame_name, current_frame.value), False)
-                frame_manager.close(frame_name)
-            except queue.Full:
-                # if the queue is full, skip this frame
-                skipped_eps.update()
-
-            frame_index = 0 if frame_index == shm_frame_count - 1 else frame_index + 1
-    finally:
-        config_subscriber.stop()
 
 
 class CameraWatchdog(threading.Thread):

web/public/locales/en/config/cameras.json

@@ -71,8 +71,24 @@
       "description": "Enable or disable the Birdseye view feature."
     },
     "mode": {
-      "label": "Tracking mode",
+      "label": "Activity types",
-      "description": "Mode for including cameras in Birdseye: 'objects', 'motion', or 'continuous'."
+      "description": "Activity types that include cameras in Birdseye.",
+      "continuous": {
+        "label": "Continuous",
+        "description": "Always include the camera in Birdseye."
+      },
+      "motion": {
+        "label": "Motion",
+        "description": "Include the camera in Birdseye when motion is detected."
+      },
+      "objects": {
+        "label": "Active objects",
+        "description": "Include the camera in Birdseye while an active object is tracked."
+      },
+      "stationary_objects": {
+        "label": "Stationary objects",
+        "description": "Include the camera in Birdseye while a stationary object is tracked."
+      }
     },
     "order": {
       "label": "Position",

web/public/locales/en/config/global.json

@@ -558,8 +558,24 @@
       "description": "Enable or disable the Birdseye view feature."
     },
     "mode": {
-      "label": "Tracking mode",
+      "label": "Activity types",
-      "description": "Mode for including cameras in Birdseye: 'objects', 'motion', or 'continuous'."
+      "description": "Activity types that include cameras in Birdseye.",
+      "continuous": {
+        "label": "Continuous",
+        "description": "Always include the camera in Birdseye."
+      },
+      "motion": {
+        "label": "Motion",
+        "description": "Include the camera in Birdseye when motion is detected."
+      },
+      "objects": {
+        "label": "Active objects",
+        "description": "Include the camera in Birdseye while an active object is tracked."
+      },
+      "stationary_objects": {
+        "label": "Stationary objects",
+        "description": "Include the camera in Birdseye while a stationary object is tracked."
+      }
     },
     "restream": {
       "label": "Restream RTSP",

web/public/locales/en/views/settings.json

@@ -1955,7 +1955,7 @@
       "noRecordRole": "No streams have the record role defined. Recording will not function."
     },
     "birdseye": {
-      "objectsModeDetectDisabled": "Birdseye is set to 'objects' mode, but object detection is disabled for this camera. The camera will not appear in Birdseye."
+      "objectTrackingDetectDisabled": "Birdseye includes tracked objects, but object detection is disabled for this camera. The camera will not appear in Birdseye."
     },
     "snapshots": {
       "detectDisabled": "Object detection is disabled. Snapshots are generated from tracked objects and will not be created."

web/src/components/config-form/section-configs/birdseye.ts

@@ -5,13 +5,18 @@ const birdseye: SectionConfigOverrides = {
     sectionDocs: "/configuration/birdseye",
     messages: [
       {
-        key: "objects-mode-detect-disabled",
+        key: "object-tracking-detect-disabled",
-        messageKey: "configMessages.birdseye.objectsModeDetectDisabled",
+        messageKey: "configMessages.birdseye.objectTrackingDetectDisabled",
         severity: "info",
         condition: (ctx) => {
           if (ctx.level !== "camera" || !ctx.fullCameraConfig) return false;
+          const mode = ctx.formData?.mode;
+          if (!mode || typeof mode !== "object" || Array.isArray(mode)) {
+            return false;
+          }
+
           return (
-            ctx.formData?.mode === "objects" &&
+            (mode.objects === true || mode.stationary_objects === true) &&
             ctx.fullCameraConfig.detect?.enabled === false
           );
         },
@@ -24,10 +29,10 @@ const birdseye: SectionConfigOverrides = {
     overrideFields: ["enabled", "mode"],
     uiSchema: {
       mode: {
-        "ui:size": "xs",
+        continuous: { "ui:size": "xs" },
-        "ui:options": {
+        motion: { "ui:size": "xs" },
-          enumI18nPrefix: "birdseye.trackingMode",
+        objects: { "ui:size": "xs" },
-        },
+        stationary_objects: { "ui:size": "xs" },
       },
     },
   },
@@ -55,7 +60,6 @@ const birdseye: SectionConfigOverrides = {
     ],
     uiSchema: {
       mode: {
-        "ui:size": "xs",
         "ui:after": { render: "BirdseyeCameraReorder" },
       },
     },

web/src/types/frigateConfig.ts

@@ -13,12 +13,19 @@ export interface UiConfig {
 export interface BirdseyeConfig {
   enabled: boolean;
   height: number;
-  mode: "objects" | "continuous" | "motion";
+  mode: BirdseyeModeConfig;
   quality: number;
   restream: boolean;
   width: number;
 }
 
+export interface BirdseyeModeConfig {
+  continuous: boolean;
+  motion: boolean;
+  objects: boolean;
+  stationary_objects: boolean;
+}
+
 export interface FaceRecognitionConfig {
   enabled: boolean;
   model_size: SearchModelSize;
@@ -49,7 +56,7 @@ export interface CameraConfig {
   best_image_timeout: number;
   birdseye: {
     enabled: boolean;
-    mode: "objects" | "continuous" | "motion";
+    mode: BirdseyeModeConfig;
     order: number;
   };
   detect: {