administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-05-04 04:27:42 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixes after merging.

Browse Source
This commit is contained in:
p-boon 2025-05-08 20:09:34 +02:00
parent ff64ed4ade
commit 181565b979
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
frigate/test/test_motion.py
View File

@ -14,7 +14,8 @@ from frigate.config.camera.motion import MotionConfig
from frigate.motion.improved_motion import ImprovedMotionDetector from frigate.motion.improved_motion import ImprovedMotionDetector
from frigate.util.image import create_mask from frigate.util.image import create_mask
logging.basicConfig(level=logging.DEBUG) logger = logging.getLogger(__name__)
logger.setLevel(logging.DEBUG)
class TestMotionVideo: class TestMotionVideo:
@ -97,10 +98,10 @@ class TestMotion(unittest.TestCase):
) )
if detectedMotionFrameCount == 0: if detectedMotionFrameCount == 0:
success = False success = False
logging.error( logger.error(
f"{test_clip.file_name} No motion detected in range {expected_motion_range[0]}-{expected_motion_range[1]}" f"{test_clip.file_name} No motion detected in range {expected_motion_range[0]}-{expected_motion_range[1]}"
) )
logging.debug( logger.debug(
f"{detectedMotionFrameCount} out of {expectedMotionFrameCount} motion frames detected ({100 if expectedMotionFrameCount == 0 else round(detectedMotionFrameCount / expectedMotionFrameCount * 100, 2)}%)" f"{detectedMotionFrameCount} out of {expectedMotionFrameCount} motion frames detected ({100 if expectedMotionFrameCount == 0 else round(detectedMotionFrameCount / expectedMotionFrameCount * 100, 2)}%)"
) )
@ -113,7 +114,7 @@ class TestMotion(unittest.TestCase):
for x in test_clip.motion_ranges for x in test_clip.motion_ranges
): ):
success = False success = False
logging.error( logger.error(
f"{test_clip.file_name} Invalid motion detected at frame {motion_frame}" f"{test_clip.file_name} Invalid motion detected at frame {motion_frame}"
) )
# When calculating accuracy, we take the exact expected motion ranges. For passing the test, we allow for motion to linger a few frames. # When calculating accuracy, we take the exact expected motion ranges. For passing the test, we allow for motion to linger a few frames.
@ -122,7 +123,7 @@ class TestMotion(unittest.TestCase):
for x in test_clip.motion_ranges for x in test_clip.motion_ranges
): ):
falsePositiveFrameCount += 1 falsePositiveFrameCount += 1
logging.debug( logger.debug(
f"{falsePositiveFrameCount} invalid motion frames detected ({round((total_frame_count - expectedMotionFrameCount - falsePositiveFrameCount) / (total_frame_count - expectedMotionFrameCount) * 100, 2)}%)" f"{falsePositiveFrameCount} invalid motion frames detected ({round((total_frame_count - expectedMotionFrameCount - falsePositiveFrameCount) / (total_frame_count - expectedMotionFrameCount) * 100, 2)}%)"
) )
@ -135,7 +136,7 @@ class TestMotion(unittest.TestCase):
motion_detector: ImprovedMotionDetector, motion_detector: ImprovedMotionDetector,
profile: cProfile.Profile, profile: cProfile.Profile,
): ):
logging.debug(f"file: {test_clip.file_name}") logger.debug(f"file: {test_clip.file_name}")
ret, frame = cap.read() ret, frame = cap.read()
frame_counter = 1 frame_counter = 1
motion_frames = [] motion_frames = []
@ -167,4 +168,4 @@ class TestMotion(unittest.TestCase):
pstats.Stats(profile, stream=s).strip_dirs().sort_stats( pstats.Stats(profile, stream=s).strip_dirs().sort_stats(
SortKey.CUMULATIVE SortKey.CUMULATIVE
).print_stats(r"\((?!\_).*\)$", 10) ).print_stats(r"\((?!\_).*\)$", 10)
logging.debug(s.getvalue()) logger.debug(s.getvalue())

2
migrations/029_add_is_calibrating.py → migrations/031_add_is_calibrating.py
View File

@ -1,4 +1,4 @@
"""Peewee migrations -- 029_add_is_calibrating.py. """Peewee migrations -- 031_add_is_calibrating.py.
Some examples (model - class or model name):: Some examples (model - class or model name)::

BIN
testdata/test_motion_video-3.mp4 vendored Normal file
View File

Binary file not shown.