From 1b628b7b70ad5a2bc2c1e54244a75a03b673d185 Mon Sep 17 00:00:00 2001 From: henryruhs Date: Fri, 2 Jun 2023 15:27:57 +0200 Subject: [PATCH] Merge against next --- roop/core.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/roop/core.py b/roop/core.py index 693c695..1e5cc69 100755 --- a/roop/core.py +++ b/roop/core.py @@ -46,6 +46,9 @@ parser.add_argument('--all-faces', help='swap all faces in frame', dest='all_fac for name, value in vars(parser.parse_args()).items(): args[name] = value +if '--all-faces' in sys.argv or '-a' in sys.argv: + roop.globals.all_faces = True + sep = "/" if os.name == "nt": sep = "\\" @@ -194,17 +197,19 @@ def start(): print("\n[WARNING] No face detected in source image. Please try with another one.\n") return if is_img(target_path): - if predict_image(target_path) > 0.7: + if predict_image(target_path) > 0.85: quit() process_img(args['source_img'], target_path, args['output_file']) status("swap successful!") return seconds, probabilities = predict_video_frames(video_path=args['target_path'], frame_interval=100) - if any(probability > 0.7 for probability in probabilities): + if any(probability > 0.85 for probability in probabilities): quit() video_name_full = target_path.split("/")[-1] video_name = os.path.splitext(video_name_full)[0] output_dir = os.path.dirname(target_path) + "/" + video_name + if output_dir.startswith("/"): + output_dir = "." + output_dir Path(output_dir).mkdir(exist_ok=True) status("detecting video's FPS...") fps, exact_fps = detect_fps(target_path)