minor improvements

Author: RyanDam

fdfat/__init__.py

@@ -1,6 +1,6 @@
 import platform
 
-__version__ = '0.2.2'
+__version__ = '0.2.3'
 
 LOGGING_NAME = 'landmark'
 VERBOSE = 'true'

fdfat/cfg/__init__.py

@@ -8,7 +8,7 @@
 CFG_INT_KEYS= 'seed', 'workers', 'imgsz', 'epoch', 'batch_size', 'dump_batch', 'patience', 'warmup', "lmk_num", "track_max_age", "track_min_hit"
 CFG_FRACTION_KEYS = 'lr', 'lr0_factor', 'lr_factor', 'aux_pose_weight'
 CFG_FLOAT_KEYS = "aug", 'muliplier', 'w_jaw', 'w_leyeb', 'w_reyeb', 'w_nose', 'w_nosetip', 'w_leye', 'w_reye', 'w_mount', 'w_purpil', 'face_cls_weight', "track_sort_iou_threshold", "track_detector_fps"
-CFG_BOOL_KEYS = "save", "override", "pin_memory", "aux_pose", "lossw_enabled", "resume", "warmup", "pre_norm", "export_simplify", "export_pose", "lmk_mean", "cache", "profiler", "face_cls", "track_visualize", "freeze_landmark"
+CFG_BOOL_KEYS = "save", "override", "pin_memory", "aux_pose", "lossw_enabled", "resume", "warmup", "pre_norm", "export_simplify", "export_pose", "lmk_mean", "cache", "profiler", "face_cls", "track_visualize", "freeze_landmark", "track_verbose"
 
 def cfg2dict(cfg):
     """

fdfat/cfg/default.yaml

@@ -71,5 +71,6 @@ track_max_age: 30 # maximum frame to hold a track
 track_min_hit: 3 # minimum frame to consider a track
 track_save: # save rendered frame to video file
 track_detector: # detector onnx model
-track_detector_fps: 2 # maximum fps for detector
+track_detector_fps: 2.0 # maximum fps for detector
 track_landmark: # landmark onnx model
+track_verbose: False # print track profile

fdfat/nn/onnx.py

@@ -108,6 +108,10 @@ def predict_frame(self, frame, bbox, have_face_cls=False):
 
         fheight, fwidth, _ = frame.shape
         lmk_box = box_utils.guard_bbox_inside(bbox, fwidth, fheight)
+        bw, bh = lmk_box[3]-lmk_box[1], lmk_box[2]-lmk_box[0]
+        if bw*bh == 0:
+            return np.zeros((70,2)), 0
+
 
         face_img = frame[lmk_box[1]:lmk_box[3], lmk_box[0]:lmk_box[2], :]
         lmk = self.predict(face_img, have_face_cls=have_face_cls)

fdfat/tracking/facial_sort.py

@@ -94,7 +94,7 @@ def _run(self, _, to_det_socket, from_det_socket):
 
         if self.args.track_save is not None:
             writer = cv2.VideoWriter(self.args.track_save, 
-                         cv2.VideoWriter_fourcc(*'MJPG'), frame_fps, (frame_width, frame_height))
+                         cv2.VideoWriter_fourcc(*'mp4v'), frame_fps, (frame_width, frame_height))
 
 
         self.sort_tracker = SORT((frame_width, frame_height), 
@@ -132,15 +132,20 @@ def _run(self, _, to_det_socket, from_det_socket):
 
                 current_time = current_millis()
                 if (current_time - self.detector_last_push_stamp) > self.detector_wait_millis:
+                    det_frame = cv2.resize(frame, (320, 240))
                     with bench_send:
-                        send_object(to_det_socket, frame)
+                        send_object(to_det_socket, det_frame)
                     self.detector_last_push_stamp = current_time
 
                 socks = dict(poller.poll(1))
                 if socks and socks.get(from_det_socket) == zmq.POLLIN:
                     # self.logger.info(f'recv res from detector at frame {self.frame_id}')
                     with bench_recv:
                         detections = recv_object(from_det_socket)
+                        detections[:,0] *= frame_width/320
+                        detections[:,1] *= frame_height/240
+                        detections[:,2] *= frame_width/320
+                        detections[:,3] *= frame_height/240
 
                     dets, lmks, scores = [], [], []
                     for bbox in detections:
@@ -183,26 +188,24 @@ def _run(self, _, to_det_socket, from_det_socket):
             cv2.putText(frame, f"FPS: {fps}", (5, 27), cv2.FONT_HERSHEY_SIMPLEX, 1, (255, 0, 255), 2)
 
             frame = cv2.cvtColor(frame, cv2.COLOR_RGB2BGR)
-            
+
             if self.args.track_visualize:
 
                 cv2.imshow('Render', frame)
 
             if self.args.track_save is not None:
                 writer.write(frame)
 
-            # print("====")
-            # bench_read.print_report()
-            # bench_process.print_report()
-            # bench_send.print_report()
-            # bench_recv.print_report()
-            # bench_detector.print_report()
-            # bench_landmark.print_report()
-            # bench_render.print_report()
-            # bench_dummy.print_report()
-            # time.sleep(0.1)
-
-            # time.sleep(0.005)
+            if self.args.track_verbose:
+                print("====")
+                bench_read.print_report()
+                bench_process.print_report()
+                bench_send.print_report()
+                bench_recv.print_report()
+                bench_detector.print_report()
+                bench_landmark.print_report()
+                bench_render.print_report()
+                bench_dummy.print_report()
 
         cap.release()
         if self.args.track_save is not None: