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

Simplify and strengthen rotate_facial_area

Browse Source
This commit is contained in:
Andrea Lanfranchi 2024-02-27 10:02:38 +01:00
parent 5c420c53bb
commit 001e609a82
No known key found for this signature in database
GPG Key ID: 2D623A60BB279915
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
deepface/detectors/DetectorWrapper.py
View File

@ -123,10 +123,12 @@ def detect_faces(
aligned_img, angle = detection.align_face( aligned_img, angle = detection.align_face(
img=img, left_eye=left_eye, right_eye=right_eye img=img, left_eye=left_eye, right_eye=right_eye
) )
x1_new, y1_new, x2_new, y2_new = rotate_facial_area( rotated_x1, rotated_y1, rotated_x2, rotated_y2 = rotate_facial_area(
facial_area=(x2, y2, x2 + w2, y2 + h2), angle=angle, direction=1, size=img.shape facial_area=(x, y, x + w, y + h),
angle=angle,
size=(img.shape[0], img.shape[1])
) )
detected_face = aligned_img[int(y1_new) : int(y2_new), int(x1_new) : int(x2_new)] detected_face = aligned_img[int(rotated_y1) : int(rotated_y2), int(rotated_x1) : int(rotated_x2)]
result = DetectedFace( result = DetectedFace(
img=detected_face, img=detected_face,
@ -140,7 +142,9 @@ def detect_faces(
def rotate_facial_area( def rotate_facial_area(
facial_area: Tuple[int, int, int, int], angle: float, direction: int, size: Tuple[int, int] facial_area: Tuple[int, int, int, int],
angle: float, # in degrees. The sign determines the direction of rotation
size: Tuple[int, int] # (width, height)
) -> Tuple[int, int, int, int]: ) -> Tuple[int, int, int, int]:
""" """
Rotate the facial area around its center. Rotate the facial area around its center.
@ -149,14 +153,22 @@ def rotate_facial_area(
Args: Args:
facial_area (tuple of int): Representing the (x1, y1, x2, y2) of the facial area. facial_area (tuple of int): Representing the (x1, y1, x2, y2) of the facial area.
x2 is equal to x1 + w1, and y2 is equal to y1 + h1 x2 is equal to x1 + w1, and y2 is equal to y1 + h1
angle (float): Angle of rotation in degrees. angle (float): Angle of rotation in degrees. Its sign determines the direction of rotation.
direction (int): Direction of rotation (-1 for clockwise, 1 for counterclockwise). Note that angles > 360 degrees are normalized to the range [0, 360).
size (tuple of int): Tuple representing the size of the image (width, height). size (tuple of int): Tuple representing the size of the image (width, height).
Returns: Returns:
rotated_coordinates (tuple of int): Representing the new coordinates rotated_coordinates (tuple of int): Representing the new coordinates
(x1, y1, x2, y2) or (x1, y1, x1+w1, y1+h1) of the rotated facial area. (x1, y1, x2, y2) or (x1, y1, x1+w1, y1+h1) of the rotated facial area.
""" """
# Normalize the witdh of the angle so we don't have to
# worry about rotations greater than 360 degrees
angle = angle % 360
if angle == 0:
return facial_area # No rotation needed
direction = 1 if angle > 0 else -1
# Angle in radians # Angle in radians
angle = angle * np.pi / 180 angle = angle * np.pi / 180