diff --git a/facefusion/choices.py b/facefusion/choices.py index 43d05968..87543298 100755 --- a/facefusion/choices.py +++ b/facefusion/choices.py @@ -6,7 +6,7 @@ from facefusion.common_helper import create_int_range, create_float_range video_memory_strategies : List[VideoMemoryStrategy] = [ 'strict', 'moderate', 'tolerant' ] face_analyser_orders : List[FaceAnalyserOrder] = [ 'left-right', 'right-left', 'top-bottom', 'bottom-top', 'small-large', 'large-small', 'best-worst', 'worst-best' ] face_analyser_ages : List[FaceAnalyserAge] = [ 'child', 'teen', 'adult', 'senior' ] -face_analyser_genders : List[FaceAnalyserGender] = [ 'male', 'female' ] +face_analyser_genders : List[FaceAnalyserGender] = [ 'female', 'male' ] face_detector_models : List[FaceDetectorModel] = [ 'retinaface', 'yoloface', 'yunet' ] face_detector_sizes : List[str] = [ '160x160', '320x320', '480x480', '512x512', '640x640', '768x768', '960x960', '1024x1024' ] face_selector_modes : List[FaceSelectorMode] = [ 'reference', 'one', 'many' ] diff --git a/facefusion/processors/frame/modules/face_debugger.py b/facefusion/processors/frame/modules/face_debugger.py index 1d30aadc..6cc1a14b 100755 --- a/facefusion/processors/frame/modules/face_debugger.py +++ b/facefusion/processors/frame/modules/face_debugger.py @@ -98,7 +98,7 @@ def debug_face(source_face : Face, target_face : Face, reference_faces : FaceSet cv2.circle(temp_frame, (kps[index][0], kps[index][1]), 3, primary_color, -1) if 'score' in frame_processors_globals.face_debugger_items: face_score_text = str(round(target_face.score, 2)) - face_score_position = (bounding_box[0] + 10, bounding_box[1] + 20) + face_score_position = (bounding_box[0] + 20, bounding_box[1] + 20) cv2.putText(temp_frame, face_score_text, face_score_position, cv2.FONT_HERSHEY_SIMPLEX, 0.5, secondary_color, 2) return temp_frame diff --git a/facefusion/processors/frame/typings.py b/facefusion/processors/frame/typings.py index fae31fd5..d4193a0f 100644 --- a/facefusion/processors/frame/typings.py +++ b/facefusion/processors/frame/typings.py @@ -1,6 +1,6 @@ from typing import Literal -FaceDebuggerItem = Literal['bbox', 'kps', 'face-mask', 'score', 'distance'] +FaceDebuggerItem = Literal['bbox', 'kps', 'face-mask', 'score'] FaceEnhancerModel = Literal['codeformer', 'gfpgan_1.2', 'gfpgan_1.3', 'gfpgan_1.4', 'gpen_bfr_256', 'gpen_bfr_512', 'restoreformer_plus_plus'] FaceSwapperModel = Literal['blendswap_256', 'inswapper_128', 'inswapper_128_fp16', 'simswap_256', 'simswap_512_unofficial'] FrameEnhancerModel = Literal['real_esrgan_x2plus', 'real_esrgan_x4plus', 'real_esrnet_x4plus'] diff --git a/facefusion/typing.py b/facefusion/typing.py index 95b75aef..932cc718 100755 --- a/facefusion/typing.py +++ b/facefusion/typing.py @@ -46,7 +46,7 @@ VideoMemoryStrategy = Literal['strict', 'moderate', 'tolerant'] FaceSelectorMode = Literal['reference', 'one', 'many'] FaceAnalyserOrder = Literal['left-right', 'right-left', 'top-bottom', 'bottom-top', 'small-large', 'large-small', 'best-worst', 'worst-best'] FaceAnalyserAge = Literal['child', 'teen', 'adult', 'senior'] -FaceAnalyserGender = Literal['male', 'female'] +FaceAnalyserGender = Literal['female', 'male'] FaceDetectorModel = Literal['retinaface', 'yoloface', 'yunet'] FaceRecognizerModel = Literal['arcface_blendswap', 'arcface_inswapper', 'arcface_simswap'] FaceMaskType = Literal['box', 'occlusion', 'region']