Code cleanup and re-org
Change-Id: Ifed47cfd5113be790eb57d92d4585b1427b56464
diff --git a/person_detection/person_detection.py b/person_detection/person_detection.py
index 92a5e4a..47a3fcf 100644
--- a/person_detection/person_detection.py
+++ b/person_detection/person_detection.py
@@ -17,15 +17,11 @@
from base_camera import BaseCamera
-import mqtt
+import action
Shape = namedtuple('Shape', ['n','c','h','w'])
class Camera(BaseCamera):
- model = None
- prob_threshold = 0.0
- input = None
- device = None
def __init__(self, device, args):
log.basicConfig(format="[ %(levelname)s ] %(message)s", level=log.INFO, stream=sys.stdout)
@@ -33,9 +29,7 @@
self.model_xml = args.model
self.input = args.input
self.prob_threshold = args.prob_threshold
-
self.is_async_mode = True
-
self.device = device
super(Camera, self).__init__(device, args.idle)
@@ -148,7 +142,7 @@
cv2.FONT_HERSHEY_COMPLEX, 0.6, black, 1)
if obj_count > 0:
- mqtt.person_detected(self.device, obj_count)
+ action.person_detected(self.device, obj_count)
yield cv2.imencode('.jpg', frame)[1].tobytes()