mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-06-26 22:31:54 +03:00
3a09d01bbe
Some checks are pending
CI / AMD64 Build (push) Waiting to run
CI / ARM Build (push) Waiting to run
CI / Jetson Jetpack 6 (push) Waiting to run
CI / AMD64 Extra Build (push) Blocked by required conditions
CI / ARM Extra Build (push) Blocked by required conditions
CI / Synaptics Build (push) Blocked by required conditions
CI / Assemble and push default build (push) Blocked by required conditions
* unlink shm frames when camera is removed * drop stale shm cache refs when cached segment is too small for requested shape * skip new-object frame cache write when current_frame is unavailable * add tests * use setdefault when adding a new camera Multiple subscribers in the same process each unpickle the ZMQ payload independently and would otherwise write divergent Python objects to the shared cameras dict — leaving long-lived references (e.g. CameraState.camera_config) pointing at a copy that subsequent in-place mutations like apply_section_update can never reach. setdefault collapses everyone onto the first writer's object so attribute mutations propagate to every consumer in this process. * rebuild ffmpeg commands on detect update Rebuild the cached ffmpeg cmd so the next process spawn picks up new resolution/fps. Running cameras keep their existing cmd (ffmpeg_cmds is only read at process startup); replay cameras are recycled by CameraMaintainer to pick up the rebuilt cmd * drop stale shm cache refs when cached segment size doesn't match requested shape The cached SharedMemoryFrameManager reference can point at a segment whose size no longer matches the requested shape — the segment was unlinked and recreated at a different size in a camera add/remove cycle. This catches both a resolution increase (cached too small) and a decrease (cached too large, pointing at an orphaned inode whose stale bytes would otherwise be misinterpreted at the new shape, producing distorted/miscolored YUV frames). After reopening, if the OS-level segment still doesn't match the requested shape we're in a transient mid-recreate state — either the maintainer hasn't allocated the new segment yet (size too small) or we opened a pre-recycle segment (size too big). Either way, skip the frame and don't cache the mismatched ref. * recycle replay camera on detect update * discard tracked-object state when detect resolution changes mid-session When detect resolution changes mid-session every tracked object we hold was localized against the old pixel grid. Their boxes no longer correspond to anything in the new frame, and the `end` callback that fires when their IDs disappear from the new detect process's detections publishes those stale boxes to consumers (LPR, snapshot crop) that slice the new frame and crash on empty arrays. Drop the tracked-object state on a shape change so no stale boxes ever cross the CameraState boundary. Belt-and-suspenders: also drop any incoming batch whose boxes exceed the current detect resolution. These are in-flight queue entries from the pre-recycle detect process that beat the new detect process to the queue; processing them would re-introduce stale-resolution tracked objects we just dropped above. The per-camera detect process clamps legitimate boxes to detect.width-1 / detect.height-1, so any coord beyond that is unambiguously stale. * rebuild motion and object filter masks on detect resolution change Apply the detect update first so frame_shape reflects the new resolution before we rebuild dependents. Motion's rasterized_mask is sized to frame_shape at construction. When detect resolution changes we must rebuild RuntimeMotionConfig so the mask matches the new frame size; otherwise consumers like the LPR processor and motion detector hit a shape mismatch when they index frames with the stale mask. Same story for per-object filter masks — rebuild RuntimeFilterConfig at the new frame_shape so the merged global+per-object masks they hold match what they'll be indexed against. * republish motion and objects on in-memory detect resize A detect resolution change also invalidates the rasterized masks on motion and per-object filters. apply_section_update has rebuilt them at the new frame_shape; publish them too so other processes replace their old values. * add test * frontend * add refresh topic for camera maintainer recycle action The maintainer's recycle branch is doing an action (recycle the camera) in response to a section-level signal. Introduce a CameraConfigUpdateEnum.refresh case as an explicit action signal — the maintainer subscribes to refresh instead of detect, parallel with add and remove. Publishers fire refresh alongside detect when a recycle is needed; section-level subscribers keep their existing topic. Since no main-process subscriber listens for detect anymore, the refresh handler calls recreate_ffmpeg_cmds() explicitly so the shared CameraConfig's ffmpeg_cmds is rebuilt before the new subprocesses spawn. * factor stale-resolution state drop into a CameraState method
80 lines
3.2 KiB
Python
80 lines
3.2 KiB
Python
"""Tests for CameraMaintainer SHM cleanup on camera remove.
|
|
|
|
Regression coverage for the case where a camera is removed and then a
|
|
new camera is added with the same name. Without unlinking the per-frame
|
|
YUV SHM slots, the maintainer's frame_manager.create call hits
|
|
FileExistsError and falls back to reopening the existing segment at the
|
|
*old* size, which the new ffmpeg process then writes mismatched-size
|
|
frames into.
|
|
"""
|
|
|
|
import unittest
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from frigate.camera.maintainer import CameraMaintainer
|
|
|
|
|
|
class TestMaintainerUnlinkFrameSlotsOnRemove(unittest.TestCase):
|
|
def _make_maintainer(self) -> CameraMaintainer:
|
|
"""Build a maintainer without invoking __init__ (avoids needing real
|
|
FrigateConfig, queues, multiprocessing manager, etc.). We're only
|
|
exercising the SHM-cleanup helper, so the surrounding init is
|
|
irrelevant."""
|
|
maintainer = CameraMaintainer.__new__(CameraMaintainer)
|
|
maintainer.frame_manager = MagicMock()
|
|
return maintainer
|
|
|
|
def test_unlinks_only_segments_with_matching_prefix(self) -> None:
|
|
maintainer = self._make_maintainer()
|
|
maintainer.frame_manager.shm_store = {
|
|
"front_frame0": object(),
|
|
"front_frame1": object(),
|
|
"front_frame2": object(),
|
|
# Different camera; must not be touched.
|
|
"side_frame0": object(),
|
|
# Detector input/output buffers are sized by the model and
|
|
# cached by the long-lived DetectorRunner — must not be
|
|
# touched even when their owning camera is removed.
|
|
"front": object(),
|
|
"out-front": object(),
|
|
}
|
|
|
|
# __name-mangled access from outside the class.
|
|
maintainer._CameraMaintainer__unlink_camera_frame_slots("front")
|
|
|
|
deleted = [c.args[0] for c in maintainer.frame_manager.delete.call_args_list]
|
|
self.assertEqual(
|
|
sorted(deleted),
|
|
["front_frame0", "front_frame1", "front_frame2"],
|
|
)
|
|
|
|
def test_handles_camera_with_no_slots(self) -> None:
|
|
"""Cameras that were removed before any frame slot was ever
|
|
created (e.g. cancelled during preparing_clip) should be a no-op."""
|
|
maintainer = self._make_maintainer()
|
|
maintainer.frame_manager.shm_store = {"other_frame0": object()}
|
|
|
|
maintainer._CameraMaintainer__unlink_camera_frame_slots("front")
|
|
|
|
maintainer.frame_manager.delete.assert_not_called()
|
|
|
|
def test_swallows_delete_errors(self) -> None:
|
|
"""Unlink failures shouldn't abort the remove loop — best-effort."""
|
|
maintainer = self._make_maintainer()
|
|
maintainer.frame_manager.shm_store = {
|
|
"front_frame0": object(),
|
|
"front_frame1": object(),
|
|
}
|
|
maintainer.frame_manager.delete.side_effect = OSError("simulated")
|
|
|
|
# Both slots are attempted; the OSError on the first doesn't
|
|
# prevent the second from being tried.
|
|
with patch("frigate.camera.maintainer.logger"):
|
|
maintainer._CameraMaintainer__unlink_camera_frame_slots("front")
|
|
|
|
self.assertEqual(maintainer.frame_manager.delete.call_count, 2)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|