github/deepface
1
1
Fork 0
mirror of https://github.com/serengil/deepface.git synced 2025-07-29 14:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Combine FaceDetector.detect_face function with functions.detect_face

Browse Source 
Pulling up the decision to select faces[0] by default
This commit is contained in:
Roelof Ruis 2021-08-24 13:37:39 +02:00
parent aa220a3f94
commit f3b0b76976
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deepface/commons/functions.py
View File

@ -87,7 +87,7 @@ def load_image(img):
return img
def detect_face(img, detector_backend = 'opencv', enforce_detection = True, align = True):
img_region = [0, 0, img.shape[0], img.shape[1]]
detected_face, img_region = None, [0, 0, img.shape[0], img.shape[1]] # Assume by default that nothing is detected.
# ----------------------------------------------
# people would like to skip detection and alignment if they already have pre-processed images
@ -101,9 +101,12 @@ def detect_face(img, detector_backend = 'opencv', enforce_detection = True, alig
face_detector = FaceDetector.build_model(detector_backend)
try:
detected_face, img_region = FaceDetector.detect_face(face_detector, detector_backend, img, align)
faces = FaceDetector.detect_faces(face_detector, detector_backend, img, align)
if len(faces) > 0:
detected_face, img_region = faces[0]
except: # if detected face shape is (0, 0) and alignment cannot be performed, this block will be run
detected_face = None
pass
if isinstance(detected_face, np.ndarray):
return detected_face, img_region

12
deepface/detectors/FaceDetector.py
View File

@ -31,18 +31,6 @@ def build_model(detector_backend):
return face_detector_obj[detector_backend]
def detect_face(face_detector, detector_backend, img, align = True):
obj = detect_faces(face_detector, detector_backend, img, align)
if len(obj) > 0:
face, region = obj[0] #discard multiple faces
else: #len(obj) == 0
face = None
region = [0, 0, img.shape[0], img.shape[1]]
return face, region
def detect_faces(face_detector, detector_backend, img, align = True):
backends = {