fi0r1/roop
1
0
Fork 0
mirror of https://github.com/s0md3v/roop.git synced 2025-12-06 18:08:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix get_frame_processors_modules()

Browse Source
This commit is contained in:
Moeblack 2023-06-13 22:40:47 +08:00 committed by henryruhs
parent 13d39b33db
commit 48f868f293
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
roop/core.py
View File

@ -25,7 +25,7 @@ import cv2
import roop.globals
import roop.ui as ui
from roop.processors.frame.core import get_frame_processor_modules
from roop.processors.frame.core import get_frame_processors_modules
from roop.utilities import has_image_extension, is_image, is_video, detect_fps, create_video, extract_frames, get_temp_frame_paths, restore_audio, create_temp, move_temp, clean_temp
from roop.face_analyser import get_one_face
@ -177,7 +177,7 @@ def start() -> None:
if has_image_extension(roop.globals.target_path):
if predict_image(roop.globals.target_path) > 0.85:
destroy()
for frame_processor in get_frame_processor_modules(roop.globals.frame_processors):
for frame_processor in get_frame_processors_modules(roop.globals.frame_processors):
update_status(f'{frame_processor} in progress...')
frame_processor.process_image(roop.globals.source_path, roop.globals.target_path, roop.globals.output_path)
release_resources()
@ -195,7 +195,7 @@ def start() -> None:
update_status('Extracting frames...')
extract_frames(roop.globals.target_path)
temp_frame_paths = get_temp_frame_paths(roop.globals.target_path)
for frame_processor in get_frame_processor_modules(roop.globals.frame_processors):
for frame_processor in get_frame_processors_modules(roop.globals.frame_processors):
update_status(f'{frame_processor} in progress...')
conditional_process_video(roop.globals.source_path, temp_frame_paths, frame_processor.process_video)
release_resources()
@ -231,7 +231,7 @@ def destroy() -> None:
def run() -> None:
parse_args()
pre_check()
for frame_processor in get_frame_processor_modules(roop.globals.frame_processors):
for frame_processor in get_frame_processors_modules(roop.globals.frame_processors):
frame_processor.pre_check()
limit_resources()
if roop.globals.headless:

5
roop/processors/frame/core.py
View File

@ -12,11 +12,12 @@ def load_processor_module(frame_processor: str)-> Any:
return frame_processor_module
def get_frame_processor_modules(frame_processors):
def get_frame_processors_modules(frame_processors):
global FRAME_PROCESSORS_MODULES
if FRAME_PROCESSORS_MODULES is None:
FRAME_PROCESSORS_MODULES = []
for frame_processor in frame_processors:
frame_processor_module = load_processor_module(frame_processor)
FRAME_PROCESSORS_MODULES.append(frame_processor_module)
return FRAME_PROCESSORS_MODULES
return FRAME_PROCESSORS_MODULES

4
roop/ui.py
View File

@ -8,7 +8,7 @@ from PIL import Image, ImageTk, ImageOps
import roop.globals
from roop.face_analyser import get_one_face
from roop.capturer import get_video_frame, get_video_frame_total
from roop.processors.frame.core import get_frame_processor_modules
from roop.processors.frame.core import get_frame_processors_modules
from roop.utilities import is_image, is_video, resolve_relative_path
WINDOW_HEIGHT = 700
@ -204,7 +204,7 @@ def init_preview() -> None:
def update_preview(frame_number: int = 0) -> None:
if roop.globals.source_path and roop.globals.target_path:
for frame_processor in get_frame_processor_modules(roop.globals.frame_processors):
for frame_processor in get_frame_processors_modules(roop.globals.frame_processors):
frame_processor.process_image(roop.globals.source_path, roop.globals.target_path, roop.globals.output_path)
video_frame = frame_processor.process_faces(
get_one_face(cv2.imread(roop.globals.source_path)),