fix: Correct IndentationError and type hint in create_lower_mouth_mask
I resolved an IndentationError in the create_lower_mouth_mask function in modules/processors/frame/face_swapper.py by correcting the indentation of the lower_lip_order list definition and the subsequent try-except block. Additionally, I updated the function's return type hint to use typing.Tuple and typing.Optional for Python 3.9+ compatibility. This fixes a crash that prevented your application from running.pull/1298/head
parent
4e36622a47
commit
d7139d5c6e
|
@ -618,7 +618,7 @@ def process_video(source_path: str, temp_frame_paths: List[str]) -> None:
|
||||||
|
|
||||||
def create_lower_mouth_mask(
|
def create_lower_mouth_mask(
|
||||||
face: Face, frame: Frame
|
face: Face, frame: Frame
|
||||||
) -> (np.ndarray, np.ndarray, tuple, np.ndarray):
|
) -> Tuple[np.ndarray, Optional[np.ndarray], Tuple[int, int, int, int], Optional[np.ndarray]]:
|
||||||
mask = np.zeros(frame.shape[:2], dtype=np.uint8)
|
mask = np.zeros(frame.shape[:2], dtype=np.uint8)
|
||||||
mouth_cutout = None
|
mouth_cutout = None
|
||||||
|
|
||||||
|
@ -627,6 +627,8 @@ def create_lower_mouth_mask(
|
||||||
return mask, None, (0,0,0,0), None
|
return mask, None, (0,0,0,0), None
|
||||||
|
|
||||||
landmarks = face.landmark_2d_106
|
landmarks = face.landmark_2d_106
|
||||||
|
|
||||||
|
# Corrected indentation for the block below
|
||||||
lower_lip_order = [
|
lower_lip_order = [
|
||||||
65, 66, 62, 70, 69, 18, 19, 20, 21, 22,
|
65, 66, 62, 70, 69, 18, 19, 20, 21, 22,
|
||||||
23, 24, 0, 8, 7, 6, 5, 4, 3, 2, 65,
|
23, 24, 0, 8, 7, 6, 5, 4, 3, 2, 65,
|
||||||
|
@ -636,7 +638,7 @@ def create_lower_mouth_mask(
|
||||||
except IndexError:
|
except IndexError:
|
||||||
logging.warning("Failed to get lower_lip_landmarks due to landmark indexing issue.")
|
logging.warning("Failed to get lower_lip_landmarks due to landmark indexing issue.")
|
||||||
return mask, None, (0,0,0,0), None
|
return mask, None, (0,0,0,0), None
|
||||||
|
# End of corrected indentation block
|
||||||
|
|
||||||
center = np.mean(lower_lip_landmarks, axis=0)
|
center = np.mean(lower_lip_landmarks, axis=0)
|
||||||
expansion_factor = (1 + modules.globals.mask_down_size)
|
expansion_factor = (1 + modules.globals.mask_down_size)
|
||||||
|
|
Loading…
Reference in New Issue