administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-07 11:45:24 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

remove debugging

Browse Source
This commit is contained in:
Josh Hawkins 2023-10-24 07:44:34 -05:00
parent d48b1fbeea
commit 96c0db5018
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frigate/motion/improved_motion.py
View File

@ -42,7 +42,7 @@ class ImprovedMotionDetector(MotionDetector):
interpolation=cv2.INTER_AREA, interpolation=cv2.INTER_AREA,
) )
self.mask = np.where(resized_mask == [0]) self.mask = np.where(resized_mask == [0])
self.save_images = True self.save_images = False
self.calibrating = True self.calibrating = True
self.improve_contrast = improve_contrast self.improve_contrast = improve_contrast
self.threshold = threshold self.threshold = threshold
@ -128,9 +128,6 @@ class ImprovedMotionDetector(MotionDetector):
contour_area = cv2.contourArea(c) contour_area = cv2.contourArea(c)
total_contour_area += contour_area total_contour_area += contour_area
if contour_area > self.contour_area.value: if contour_area > self.contour_area.value:
logger.info(
f"FRAME #{self.frame_counter} - counted contour area {contour_area}"
)
x, y, w, h = cv2.boundingRect(c) x, y, w, h = cv2.boundingRect(c)
motion_boxes.append( motion_boxes.append(
( (
@ -153,10 +150,6 @@ class ImprovedMotionDetector(MotionDetector):
if self.calibrating or pct_motion > self.config.lightning_threshold: if self.calibrating or pct_motion > self.config.lightning_threshold:
self.calibrating = True self.calibrating = True
logger.info(
f"FRAME #{self.frame_counter} - pct_motion: {pct_motion}, number of motion boxes: {len(motion_boxes)}, calibrating: {self.calibrating}"
)
if self.save_images: if self.save_images:
thresh_dilated = cv2.cvtColor(thresh_dilated, cv2.COLOR_GRAY2BGR) thresh_dilated = cv2.cvtColor(thresh_dilated, cv2.COLOR_GRAY2BGR)
for b in motion_boxes: for b in motion_boxes:
@ -167,19 +160,6 @@ class ImprovedMotionDetector(MotionDetector):
(0, 0, 255), (0, 0, 255),
2, 2,
) )
display_text = "{}, {}, {}".format(
round(pct_motion, 2), len(motion_boxes), self.calibrating
)
cv2.rectangle(thresh_dilated, (8, 8), (130, 22), (0, 128, 255), cv2.FILLED)
cv2.putText(
thresh_dilated,
display_text,
(10, 20),
cv2.FONT_HERSHEY_SIMPLEX,
fontScale=0.5,
color=(0, 0, 0),
thickness=2,
)
frames = [ frames = [
cv2.cvtColor(resized_saved, cv2.COLOR_GRAY2BGR), cv2.cvtColor(resized_saved, cv2.COLOR_GRAY2BGR),
cv2.cvtColor(contrasted_saved, cv2.COLOR_GRAY2BGR), cv2.cvtColor(contrasted_saved, cv2.COLOR_GRAY2BGR),

6
frigate/video.py
View File

@ -576,10 +576,6 @@ def process_frames(
# look for motion if enabled # look for motion if enabled
motion_boxes = motion_detector.detect(frame) if motion_enabled.value else [] motion_boxes = motion_detector.detect(frame) if motion_enabled.value else []
logger.info(
f'{camera_name}: calibrating: {motion_detector.is_calibrating()}, frame time: {frame_time}'
)
regions = [] regions = []
consolidated_detections = [] consolidated_detections = []
@ -632,7 +628,7 @@ def process_frames(
) )
] ]
# only add in the motion boxes when not calibrating # only add in the motion boxes when not calibrating and a ptz is not moving via autotracking
if not motion_detector.is_calibrating() and not ptz_moving_at_frame_time( if not motion_detector.is_calibrating() and not ptz_moving_at_frame_time(
frame_time, frame_time,
ptz_metrics["ptz_start_time"].value, ptz_metrics["ptz_start_time"].value,