|
@@ -319,7 +319,7 @@ class CameraState:
|
|
def __init__(self, name, config, frame_manager):
|
|
def __init__(self, name, config, frame_manager):
|
|
self.name = name
|
|
self.name = name
|
|
self.config = config
|
|
self.config = config
|
|
- self.camera_config: CameraConfig = config.cameras[name]
|
|
|
|
|
|
+ self.camera_config = config.cameras[name]
|
|
self.frame_manager = frame_manager
|
|
self.frame_manager = frame_manager
|
|
self.best_objects: Dict[str, TrackedObject] = {}
|
|
self.best_objects: Dict[str, TrackedObject] = {}
|
|
self.object_counts = defaultdict(int)
|
|
self.object_counts = defaultdict(int)
|
|
@@ -329,7 +329,6 @@ class CameraState:
|
|
self._current_frame = np.zeros(self.camera_config.frame_shape_yuv, np.uint8)
|
|
self._current_frame = np.zeros(self.camera_config.frame_shape_yuv, np.uint8)
|
|
self.current_frame_lock = threading.Lock()
|
|
self.current_frame_lock = threading.Lock()
|
|
self.current_frame_time = 0.0
|
|
self.current_frame_time = 0.0
|
|
- self.motion_mask = self.camera_config.motion.mask
|
|
|
|
self.motion_boxes = []
|
|
self.motion_boxes = []
|
|
self.regions = []
|
|
self.regions = []
|
|
self.previous_frame_id = None
|
|
self.previous_frame_id = None
|
|
@@ -391,7 +390,7 @@ class CameraState:
|
|
cv2.drawContours(frame_copy, [zone.contour], -1, zone.color, thickness)
|
|
cv2.drawContours(frame_copy, [zone.contour], -1, zone.color, thickness)
|
|
|
|
|
|
if draw_options.get("mask"):
|
|
if draw_options.get("mask"):
|
|
- mask_overlay = np.where(self.motion_mask == [0])
|
|
|
|
|
|
+ mask_overlay = np.where(self.camera_config.motion_mask == [0])
|
|
frame_copy[mask_overlay] = [0, 0, 0]
|
|
frame_copy[mask_overlay] = [0, 0, 0]
|
|
|
|
|
|
if draw_options.get("motion_boxes"):
|
|
if draw_options.get("motion_boxes"):
|