From 769a4978963935b1170d76313ccf766fab99b7f3 Mon Sep 17 00:00:00 2001 From: Vincent STRAGIER Date: Tue, 23 May 2023 23:54:21 +0200 Subject: [PATCH 1/3] Correct laterality of the eyes landmarks. --- deepface/detectors/MediapipeWrapper.py | 44 ++++++++++++-------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/deepface/detectors/MediapipeWrapper.py b/deepface/detectors/MediapipeWrapper.py index 74cffff..5cf27da 100644 --- a/deepface/detectors/MediapipeWrapper.py +++ b/deepface/detectors/MediapipeWrapper.py @@ -19,35 +19,31 @@ def detect_face(face_detector, img, align=True): results = face_detector.process(img) - if results.detections: - for detection in results.detections: + for detection in results.detections: + (confidence,) = detection.score - (confidence,) = detection.score + bounding_box = detection.location_data.relative_bounding_box + landmarks = detection.location_data.relative_keypoints - bounding_box = detection.location_data.relative_bounding_box - landmarks = detection.location_data.relative_keypoints + x = int(bounding_box.xmin * img_width) + w = int(bounding_box.width * img_width) + y = int(bounding_box.ymin * img_height) + h = int(bounding_box.height * img_height) - x = int(bounding_box.xmin * img_width) - w = int(bounding_box.width * img_width) - y = int(bounding_box.ymin * img_height) - h = int(bounding_box.height * img_height) + left_eye = (int(landmarks[0].x * img_width), int(landmarks[0].y * img_height)) + right_eye = (int(landmarks[1].x * img_width), int(landmarks[1].y * img_height)) + # nose = (int(landmarks[2].x * img_width), int(landmarks[2].y * img_height)) + # mouth = (int(landmarks[3].x * img_width), int(landmarks[3].y * img_height)) + # right_ear = (int(landmarks[4].x * img_width), int(landmarks[4].y * img_height)) + # left_ear = (int(landmarks[5].x * img_width), int(landmarks[5].y * img_height)) - right_eye = (int(landmarks[0].x * img_width), int(landmarks[0].y * img_height)) - left_eye = (int(landmarks[1].x * img_width), int(landmarks[1].y * img_height)) - # nose = (int(landmarks[2].x * img_width), int(landmarks[2].y * img_height)) - # mouth = (int(landmarks[3].x * img_width), int(landmarks[3].y * img_height)) - # right_ear = (int(landmarks[4].x * img_width), int(landmarks[4].y * img_height)) - # left_ear = (int(landmarks[5].x * img_width), int(landmarks[5].y * img_height)) + if x > 0 and y > 0: + detected_face = img[y : y + h, x : x + w] + img_region = [x, y, w, h] - if x > 0 and y > 0: - detected_face = img[y : y + h, x : x + w] - img_region = [x, y, w, h] + if align: + detected_face = FaceDetector.alignment_procedure(detected_face, left_eye, right_eye) - if align: - detected_face = FaceDetector.alignment_procedure( - detected_face, left_eye, right_eye - ) - - resp.append((detected_face, img_region, confidence)) + resp.append((detected_face, img_region, confidence)) return resp From 907db28625f6bc06b38ec1569ed9170d181dc63d Mon Sep 17 00:00:00 2001 From: Vincent STRAGIER Date: Wed, 24 May 2023 20:50:49 +0200 Subject: [PATCH 2/3] Restore "no result" guard. --- deepface/detectors/MediapipeWrapper.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deepface/detectors/MediapipeWrapper.py b/deepface/detectors/MediapipeWrapper.py index 5cf27da..51abade 100644 --- a/deepface/detectors/MediapipeWrapper.py +++ b/deepface/detectors/MediapipeWrapper.py @@ -19,6 +19,10 @@ def detect_face(face_detector, img, align=True): results = face_detector.process(img) + # if no face have been detected, return an empty list + if results.detections is None: + return resp + for detection in results.detections: (confidence,) = detection.score From c96a2e445633d80278a0e85f86b6df79a39c1b29 Mon Sep 17 00:00:00 2001 From: Vincent STRAGIER Date: Mon, 5 Jun 2023 12:30:57 +0200 Subject: [PATCH 3/3] Add some comments. --- deepface/detectors/MediapipeWrapper.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deepface/detectors/MediapipeWrapper.py b/deepface/detectors/MediapipeWrapper.py index 51abade..5753485 100644 --- a/deepface/detectors/MediapipeWrapper.py +++ b/deepface/detectors/MediapipeWrapper.py @@ -19,10 +19,11 @@ def detect_face(face_detector, img, align=True): results = face_detector.process(img) - # if no face have been detected, return an empty list + # If no face has been detected, return an empty list if results.detections is None: return resp + # Extract the bounding box, the landmarks and the confidence score for detection in results.detections: (confidence,) = detection.score @@ -34,6 +35,7 @@ def detect_face(face_detector, img, align=True): y = int(bounding_box.ymin * img_height) h = int(bounding_box.height * img_height) + # Extract landmarks left_eye = (int(landmarks[0].x * img_width), int(landmarks[0].y * img_height)) right_eye = (int(landmarks[1].x * img_width), int(landmarks[1].y * img_height)) # nose = (int(landmarks[2].x * img_width), int(landmarks[2].y * img_height))