mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-10-03 13:26:48 +03:00
Josh HawkinsandGitHub
52f50a7396
CI / AMD64 Build (push) Canceled after 0s
CI / AMD64 Smoke Test (push) Canceled after 0s
CI / ARM Build (push) Canceled after 0s
CI / Jetson Jetpack 6 (push) Canceled after 0s
CI / AMD64 Extra Build (push) Canceled after 0s
CI / ARM Extra Build (push) Canceled after 0s
CI / Synaptics Build (push) Canceled after 0s
CI / Assemble and push default build (push) Canceled after 0s
* don't display audio transcription provider message as health notice * show remote provider for audio transcription in health pane * adjust trigger and notifications messages to be consistent with the rest of the settings UI * disable save buttons when there are no changes in config editor * fix audio manager crash when a camera is added at runtime The audio processor and the camera maintainer both poll the same `add` config update on their own one second timers, and the maintainer is what creates `camera_metrics[name]`. When the audio processor got there first it looked the new camera up before that entry existed, and the `KeyError` took down the whole `frigate.audio_manager` process. Whether it happens depends purely on which poll fires first, so cloning a camera from the UI fails or succeeds at random. `spawn_if_needed` now skips a camera whose metrics aren't there yet and picks it up on the next poll, the same way it already waits on a late ffmpeg update. `AudioEventMaintainer` holds the `CameraMetrics` object now instead of indexing the manager dict on every audio chunk, which drops the IPC round trips and means a removed camera can't `KeyError` out of `detect_audio` after the maintainer pops the entry. The audio process is also registered with the watchdog, since a crash there previously left audio detection dead for every camera until a full restart, and it now receives the shared `DataProcessorMetrics` so `AudioTranscriptionRealTimeProcessor` gets the same type as the other real time processors. * fix stationary max_frames dropping other tracked objects When `max_frames` was set for a label, deregistering one object rebuilt norfair's list with a filter that kept an object only if it was both not the target and already on its way out, so every other healthy object of that label was dropped along with it. Any car leaving the frame took the rest of the cars with it and they came back as new tracked objects a few frames later. The filter now removes only the target, and objects that are expiring are still reaped by norfair on the next update. * fix test * fix skip_motion_threshold permanently disabling motion detection The skip check returned before the two `accumulateWeighted` calls at the end of `detect`, so a skipped frame never made it into the background and setting `calibrating` there only picked a faster alpha for calls that never ran. `avg_frame` starts as an all zero image and a normally lit scene differs from black across nearly the whole frame, so the cameras I tested measure 0.84 to 0.98 against it. Any `skip_motion_threshold` below that number skips the first frame, leaves the background black, and skips every frame after it. Motion detection is dead for that camera until the setting is removed or Frigate restarts, with no motion boxes, no motion recordings, and no regions for the tracker since the detector stays calibrating. Startup isn't the only way in. `update_mask` zeroes the background on any motion config change, and once a camera has calibrated the first IR switch or PTZ move freezes the background on the old scene, so it can't transition to the new one, which is the case the option exists for. The frame is now blended in before the early return at the same 0.2 alpha the calibrating path uses elsewhere, so a large scene change is still suppressed while the background catches up, about a second on a 5 fps camera, and then motion comes back. * dump ffmpeg logs on every restart The record watchdog restarted ffmpeg without flushing its `LogPipe`, so a camera whose recording segments went stale never showed a single line of ffmpeg output. The dump now happens in `start_or_restart_ffmpeg` right after the stop, which covers the stale record path, the record crash path, and the audio restart. `reset_capture_thread` and the audio `log_and_restart` fallback keep their own dumps since both pass `ffmpeg_process=None`. * dump ffmpeg logs once per restart The audio restart path dumped the log pipe itself before calling the helper, so the restart dump printed a second "last 100 lines" heading over an already drained deque and split the tail that `stop_ffmpeg` flushed into its own section. The heading is now only printed when there's something under it, and the audio path leaves the dump to the restart so each failure produces one section. * keep all logpipe dumps consistent
121 lines
4.5 KiB
Python
121 lines
4.5 KiB
Python
import unittest
|
|
|
|
import numpy as np
|
|
|
|
from frigate.config.camera.motion import MotionConfig
|
|
from frigate.motion.improved_motion import ImprovedMotionDetector
|
|
|
|
|
|
class TestImprovedMotionDetector(unittest.TestCase):
|
|
def setUp(self):
|
|
# small frame for testing; actual frames are grayscale
|
|
self.frame_shape = (100, 100) # height, width
|
|
self.config = MotionConfig()
|
|
# motion detector assumes a rasterized_mask attribute exists on config
|
|
# when update_mask() is called; add one manually by bypassing pydantic.
|
|
object.__setattr__(
|
|
self.config,
|
|
"rasterized_mask",
|
|
np.ones((self.frame_shape[0], self.frame_shape[1]), dtype=np.uint8),
|
|
)
|
|
|
|
# create minimal PTZ metrics stub to satisfy detector checks
|
|
class _Stub:
|
|
def __init__(self, value=False):
|
|
self.value = value
|
|
|
|
def is_set(self):
|
|
return bool(self.value)
|
|
|
|
class DummyPTZ:
|
|
def __init__(self):
|
|
self.autotracker_enabled = _Stub(False)
|
|
self.motor_stopped = _Stub(False)
|
|
self.stop_time = _Stub(0)
|
|
|
|
self.detector = ImprovedMotionDetector(
|
|
self.frame_shape, self.config, fps=30, ptz_metrics=DummyPTZ()
|
|
)
|
|
|
|
# establish a baseline frame (all zeros)
|
|
base_frame = np.zeros(
|
|
(self.frame_shape[0], self.frame_shape[1]), dtype=np.uint8
|
|
)
|
|
self.detector.detect(base_frame)
|
|
|
|
def _half_change_frame(self) -> np.ndarray:
|
|
"""Produce a frame where roughly half of the pixels are different."""
|
|
frame = np.zeros((self.frame_shape[0], self.frame_shape[1]), dtype=np.uint8)
|
|
# flip the top half to white
|
|
frame[: self.frame_shape[0] // 2, :] = 255
|
|
return frame
|
|
|
|
def test_skip_motion_threshold_default(self):
|
|
"""With the default (None) setting, motion should always be reported."""
|
|
frame = self._half_change_frame()
|
|
boxes = self.detector.detect(frame)
|
|
self.assertTrue(
|
|
boxes, "Expected motion boxes when skip threshold is unset (disabled)"
|
|
)
|
|
|
|
def test_skip_motion_threshold_applied(self):
|
|
"""Setting a low skip threshold should prevent any boxes from being returned."""
|
|
# change the config and update the detector reference
|
|
self.config.skip_motion_threshold = 0.4
|
|
self.detector.config = self.config
|
|
self.detector.update_mask()
|
|
|
|
frame = self._half_change_frame()
|
|
boxes = self.detector.detect(frame)
|
|
self.assertEqual(
|
|
boxes,
|
|
[],
|
|
"Motion boxes should be empty when scene change exceeds skip threshold",
|
|
)
|
|
|
|
def _bright_frame(self, offset: int) -> np.ndarray:
|
|
"""Produce a bright frame with a small dark object that moves."""
|
|
frame = np.full((self.frame_shape[0], self.frame_shape[1]), 200, dtype=np.uint8)
|
|
x = 10 + (offset * 5) % 60
|
|
frame[40:60, x : x + 15] = 20
|
|
return frame
|
|
|
|
def test_skip_motion_threshold_recovers_after_skip(self):
|
|
"""Skipped frames must still be blended into the background.
|
|
|
|
A bright scene differs from the zeroed background across the whole
|
|
frame, so the first frames are skipped. The background has to catch up
|
|
anyway, otherwise motion detection never returns.
|
|
"""
|
|
self.config.skip_motion_threshold = 0.5
|
|
self.config.improve_contrast = False
|
|
self.detector.config = self.config
|
|
self.detector.update_mask()
|
|
|
|
boxes = [len(self.detector.detect(self._bright_frame(i))) for i in range(40)]
|
|
|
|
self.assertEqual(boxes[0], 0, "First frame should exceed the skip threshold")
|
|
self.assertGreater(
|
|
self.detector.avg_frame.max(),
|
|
0,
|
|
"Background was never updated while frames were skipped",
|
|
)
|
|
self.assertTrue(any(boxes), "Motion detection never recovered after a skip")
|
|
|
|
def test_skip_motion_threshold_does_not_affect_calibration(self):
|
|
"""Even when skipping, the detector should go into calibrating state."""
|
|
self.config.skip_motion_threshold = 0.4
|
|
self.detector.config = self.config
|
|
self.detector.update_mask()
|
|
|
|
frame = self._half_change_frame()
|
|
_ = self.detector.detect(frame)
|
|
self.assertTrue(
|
|
self.detector.calibrating,
|
|
"Detector should be in calibrating state after skip event",
|
|
)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|