Merge pull request #293 from vic4key/experimental
To fix bugs and support more options for the Live function (see details in Commits tab)pull/329/head
commit
137ac597ef
|
@ -158,6 +158,8 @@ options:
|
||||||
--many-faces process every face
|
--many-faces process every face
|
||||||
--video-encoder {libx264,libx265,libvpx-vp9} adjust output video encoder
|
--video-encoder {libx264,libx265,libvpx-vp9} adjust output video encoder
|
||||||
--video-quality [0-51] adjust output video quality
|
--video-quality [0-51] adjust output video quality
|
||||||
|
--live-mirror the live camera display as you see it in the front-facing camera frame
|
||||||
|
--live-resizable the live camera frame is resizable
|
||||||
--max-memory MAX_MEMORY maximum amount of RAM in GB
|
--max-memory MAX_MEMORY maximum amount of RAM in GB
|
||||||
--execution-provider {cpu} [{cpu} ...] available execution provider (choices: cpu, ...)
|
--execution-provider {cpu} [{cpu} ...] available execution provider (choices: cpu, ...)
|
||||||
--execution-threads EXECUTION_THREADS number of execution threads
|
--execution-threads EXECUTION_THREADS number of execution threads
|
||||||
|
|
|
@ -60,6 +60,10 @@ def parse_args() -> None:
|
||||||
choices=['libx264', 'libx265', 'libvpx-vp9'])
|
choices=['libx264', 'libx265', 'libvpx-vp9'])
|
||||||
program.add_argument('--video-quality', help='Adjust output video quality', dest='video_quality', type=int, default=18,
|
program.add_argument('--video-quality', help='Adjust output video quality', dest='video_quality', type=int, default=18,
|
||||||
choices=range(52), metavar='[0-51]')
|
choices=range(52), metavar='[0-51]')
|
||||||
|
program.add_argument('--live-mirror', help='The live camera display as you see it in the front-facing camera frame',
|
||||||
|
dest='live_mirror', action='store_true', default=False)
|
||||||
|
program.add_argument('--live-resizable', help='The live camera frame is resizable',
|
||||||
|
dest='live_resizable', action='store_true', default=False)
|
||||||
program.add_argument('--max-memory', help='Maximum amount of RAM in GB', dest='max_memory', type=int,
|
program.add_argument('--max-memory', help='Maximum amount of RAM in GB', dest='max_memory', type=int,
|
||||||
default=suggest_max_memory())
|
default=suggest_max_memory())
|
||||||
program.add_argument('--execution-provider', help='Execution provider', dest='execution_provider', default=['cpu'],
|
program.add_argument('--execution-provider', help='Execution provider', dest='execution_provider', default=['cpu'],
|
||||||
|
@ -89,6 +93,8 @@ def parse_args() -> None:
|
||||||
modules.globals.many_faces = args.many_faces
|
modules.globals.many_faces = args.many_faces
|
||||||
modules.globals.video_encoder = args.video_encoder
|
modules.globals.video_encoder = args.video_encoder
|
||||||
modules.globals.video_quality = args.video_quality
|
modules.globals.video_quality = args.video_quality
|
||||||
|
modules.globals.live_mirror = args.live_mirror
|
||||||
|
modules.globals.live_resizable = args.live_resizable
|
||||||
modules.globals.max_memory = args.max_memory
|
modules.globals.max_memory = args.max_memory
|
||||||
modules.globals.execution_providers = decode_execution_providers(args.execution_provider)
|
modules.globals.execution_providers = decode_execution_providers(args.execution_provider)
|
||||||
modules.globals.execution_threads = args.execution_threads
|
modules.globals.execution_threads = args.execution_threads
|
||||||
|
|
|
@ -19,6 +19,8 @@ keep_frames = None
|
||||||
many_faces = None
|
many_faces = None
|
||||||
video_encoder = None
|
video_encoder = None
|
||||||
video_quality = None
|
video_quality = None
|
||||||
|
live_mirror = None
|
||||||
|
live_resizable = None
|
||||||
max_memory = None
|
max_memory = None
|
||||||
execution_providers: List[str] = []
|
execution_providers: List[str] = []
|
||||||
execution_threads = None
|
execution_threads = None
|
||||||
|
|
|
@ -26,6 +26,8 @@ ROOT_WIDTH = 600
|
||||||
PREVIEW = None
|
PREVIEW = None
|
||||||
PREVIEW_MAX_HEIGHT = 700
|
PREVIEW_MAX_HEIGHT = 700
|
||||||
PREVIEW_MAX_WIDTH = 1200
|
PREVIEW_MAX_WIDTH = 1200
|
||||||
|
PREVIEW_DEFAULT_WIDTH = 960
|
||||||
|
PREVIEW_DEFAULT_HEIGHT = 540
|
||||||
|
|
||||||
RECENT_DIRECTORY_SOURCE = None
|
RECENT_DIRECTORY_SOURCE = None
|
||||||
RECENT_DIRECTORY_TARGET = None
|
RECENT_DIRECTORY_TARGET = None
|
||||||
|
@ -39,6 +41,7 @@ status_label = None
|
||||||
|
|
||||||
img_ft, vid_ft = modules.globals.file_types
|
img_ft, vid_ft = modules.globals.file_types
|
||||||
|
|
||||||
|
camera = None
|
||||||
|
|
||||||
def check_camera_permissions():
|
def check_camera_permissions():
|
||||||
"""Check and request camera access permission on macOS."""
|
"""Check and request camera access permission on macOS."""
|
||||||
|
@ -177,7 +180,7 @@ def create_preview(parent: ctk.CTk) -> ctk.CTkToplevel:
|
||||||
preview.withdraw()
|
preview.withdraw()
|
||||||
preview.title('Preview')
|
preview.title('Preview')
|
||||||
preview.protocol('WM_DELETE_WINDOW', toggle_preview)
|
preview.protocol('WM_DELETE_WINDOW', toggle_preview)
|
||||||
preview.resizable(width=False, height=False)
|
preview.resizable(width=True, height=True)
|
||||||
|
|
||||||
preview_label = ctk.CTkLabel(preview, text=None)
|
preview_label = ctk.CTkLabel(preview, text=None)
|
||||||
preview_label.pack(fill='both', expand=True)
|
preview_label.pack(fill='both', expand=True)
|
||||||
|
@ -274,6 +277,11 @@ def toggle_preview() -> None:
|
||||||
init_preview()
|
init_preview()
|
||||||
update_preview()
|
update_preview()
|
||||||
PREVIEW.deiconify()
|
PREVIEW.deiconify()
|
||||||
|
global camera
|
||||||
|
if PREVIEW.state() == 'withdrawn':
|
||||||
|
if camera and camera.isOpened():
|
||||||
|
camera.release()
|
||||||
|
camera = None
|
||||||
|
|
||||||
|
|
||||||
def init_preview() -> None:
|
def init_preview() -> None:
|
||||||
|
@ -304,6 +312,20 @@ def update_preview(frame_number: int = 0) -> None:
|
||||||
preview_label.configure(image=image)
|
preview_label.configure(image=image)
|
||||||
|
|
||||||
|
|
||||||
|
def fit_image_to_size(image, width: int, height: int):
|
||||||
|
if width is None and height is None:
|
||||||
|
return image
|
||||||
|
h, w, _ = image.shape
|
||||||
|
ratio_h = 0.0
|
||||||
|
ratio_w = 0.0
|
||||||
|
if width > height:
|
||||||
|
ratio_h = height / h
|
||||||
|
else:
|
||||||
|
ratio_w = width / w
|
||||||
|
ratio = max(ratio_w, ratio_h)
|
||||||
|
new_size = (int(ratio * w), int(ratio * h))
|
||||||
|
return cv2.resize(image, dsize=new_size)
|
||||||
|
|
||||||
def webcam_preview(camera_name: str):
|
def webcam_preview(camera_name: str):
|
||||||
if modules.globals.source_path is None:
|
if modules.globals.source_path is None:
|
||||||
return
|
return
|
||||||
|
@ -319,43 +341,47 @@ def webcam_preview(camera_name: str):
|
||||||
# Use OpenCV's camera index for cross-platform compatibility
|
# Use OpenCV's camera index for cross-platform compatibility
|
||||||
camera_index = get_camera_index_by_name(camera_name)
|
camera_index = get_camera_index_by_name(camera_name)
|
||||||
|
|
||||||
cap = cv2.VideoCapture(camera_index)
|
global camera
|
||||||
|
camera = cv2.VideoCapture(camera_index)
|
||||||
|
|
||||||
if not cap.isOpened():
|
if not camera.isOpened():
|
||||||
update_status(f"Error: Could not open camera {camera_name}")
|
update_status(f"Error: Could not open camera {camera_name}")
|
||||||
return
|
return
|
||||||
|
|
||||||
cap.set(cv2.CAP_PROP_FRAME_WIDTH, 960)
|
camera.set(cv2.CAP_PROP_FRAME_WIDTH, 960)
|
||||||
cap.set(cv2.CAP_PROP_FRAME_HEIGHT, 540)
|
camera.set(cv2.CAP_PROP_FRAME_HEIGHT, 540)
|
||||||
cap.set(cv2.CAP_PROP_FPS, 60)
|
camera.set(cv2.CAP_PROP_FPS, 60)
|
||||||
|
|
||||||
PREVIEW_MAX_WIDTH = 960
|
preview_label.configure(width=PREVIEW_DEFAULT_WIDTH, height=PREVIEW_DEFAULT_HEIGHT)
|
||||||
PREVIEW_MAX_HEIGHT = 540
|
|
||||||
|
|
||||||
preview_label.configure(image=None)
|
|
||||||
PREVIEW.deiconify()
|
PREVIEW.deiconify()
|
||||||
|
|
||||||
frame_processors = get_frame_processors_modules(modules.globals.frame_processors)
|
frame_processors = get_frame_processors_modules(modules.globals.frame_processors)
|
||||||
source_image = get_one_face(cv2.imread(modules.globals.source_path))
|
source_image = get_one_face(cv2.imread(modules.globals.source_path))
|
||||||
|
|
||||||
while True:
|
while camera:
|
||||||
ret, frame = cap.read()
|
ret, frame = camera.read()
|
||||||
if not ret:
|
if not ret:
|
||||||
update_status(f"Error: Frame not received from camera.")
|
update_status(f"Error: Frame not received from camera.")
|
||||||
break
|
break
|
||||||
|
|
||||||
temp_frame = frame.copy()
|
temp_frame = frame.copy()
|
||||||
|
|
||||||
|
if modules.globals.live_mirror:
|
||||||
|
temp_frame = cv2.flip(temp_frame, 1) # horizontal flipping
|
||||||
|
|
||||||
|
if modules.globals.live_resizable:
|
||||||
|
temp_frame = fit_image_to_size(temp_frame, PREVIEW.winfo_width(), PREVIEW.winfo_height())
|
||||||
|
|
||||||
for frame_processor in frame_processors:
|
for frame_processor in frame_processors:
|
||||||
temp_frame = frame_processor.process_frame(source_image, temp_frame)
|
temp_frame = frame_processor.process_frame(source_image, temp_frame)
|
||||||
|
|
||||||
image = Image.fromarray(cv2.cvtColor(temp_frame, cv2.COLOR_BGR2RGB))
|
image = Image.fromarray(cv2.cvtColor(temp_frame, cv2.COLOR_BGR2RGB))
|
||||||
image = ImageOps.contain(image, (PREVIEW_MAX_WIDTH, PREVIEW_MAX_HEIGHT), Image.LANCZOS)
|
image = ImageOps.contain(image, (temp_frame.shape[1], temp_frame.shape[0]), Image.LANCZOS)
|
||||||
image = ctk.CTkImage(image, size=image.size)
|
image = ctk.CTkImage(image, size=image.size)
|
||||||
preview_label.configure(image=image)
|
preview_label.configure(image=image)
|
||||||
ROOT.update()
|
ROOT.update()
|
||||||
|
|
||||||
cap.release()
|
if camera: camera.release()
|
||||||
PREVIEW.withdraw()
|
PREVIEW.withdraw()
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue