Various fixes (#17342)

* Remove imutils

* Ensure that state is maintained when setting search params

* Change script for version of setuptools

* Fix

* Fix
This commit is contained in:
Nicolas Mowen
2025-03-24 12:25:36 -05:00
committed by GitHub
parent 05d39f79b0
commit eabc316c7b
9 changed files with 29 additions and 12 deletions
+2 -2
View File
@@ -1,9 +1,9 @@
import cv2
import imutils
import numpy as np
from frigate.config import MotionConfig
from frigate.motion import MotionDetector
from frigate.util.image import grab_cv2_contours
class FrigateMotionDetector(MotionDetector):
@@ -103,7 +103,7 @@ class FrigateMotionDetector(MotionDetector):
contours = cv2.findContours(
thresh_dilated, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE
)
contours = imutils.grab_contours(contours)
contours = grab_cv2_contours(contours)
# loop over the contours
for c in contours:
+2 -2
View File
@@ -1,7 +1,6 @@
import logging
import cv2
import imutils
import numpy as np
from scipy.ndimage import gaussian_filter
@@ -9,6 +8,7 @@ from frigate.camera import PTZMetrics
from frigate.comms.config_updater import ConfigSubscriber
from frigate.config import MotionConfig
from frigate.motion import MotionDetector
from frigate.util.image import grab_cv2_contours
logger = logging.getLogger(__name__)
@@ -147,7 +147,7 @@ class ImprovedMotionDetector(MotionDetector):
contours = cv2.findContours(
thresh_dilated, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE
)
contours = imutils.grab_contours(contours)
contours = grab_cv2_contours(contours)
# loop over the contours
total_contour_area = 0