diaojiaolou
/
Deep-Live-Cam
mirror of https://github.com/hacksider/Deep-Live-Cam.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Face Mapping fix

pull/741/head
KRSHH 2024-10-05 15:00:00 +05:30 committed by GitHub
parent e531f6f26e
commit a49d3fc6e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/ui.py
View File

@ -641,17 +641,17 @@ def update_preview(frame_number: int = 0) -> None:
PREVIEW.deiconify() PREVIEW.deiconify()
def webcam_preview(root: ctk.CTk, camera_index: int): # Added camera_index parameter def webcam_preview(root: ctk.CTk, camera_index: int):
if not modules.globals.map_faces: if not modules.globals.map_faces:
if modules.globals.source_path is None: if modules.globals.source_path is None:
# No image selected # No image selected
return return
create_webcam_preview( create_webcam_preview(camera_index)
camera_index
) # Pass camera_index to create_webcam_preview
else: else:
modules.globals.souce_target_map = [] modules.globals.souce_target_map = []
create_source_target_popup_for_webcam(root, modules.globals.souce_target_map) create_source_target_popup_for_webcam(
root, modules.globals.souce_target_map, camera_index
)
def get_available_cameras(): def get_available_cameras():
@ -668,10 +668,10 @@ def get_available_cameras():
return (camera_indices, camera_names) return (camera_indices, camera_names)
def create_webcam_preview(camera_index: int): # Added camera_index parameter def create_webcam_preview(camera_index: int):
global preview_label, PREVIEW global preview_label, PREVIEW
camera = cv2.VideoCapture(camera_index) # Use the provided camera index camera = cv2.VideoCapture(camera_index)
camera.set(cv2.CAP_PROP_FRAME_WIDTH, PREVIEW_DEFAULT_WIDTH) camera.set(cv2.CAP_PROP_FRAME_WIDTH, PREVIEW_DEFAULT_WIDTH)
camera.set(cv2.CAP_PROP_FRAME_HEIGHT, PREVIEW_DEFAULT_HEIGHT) camera.set(cv2.CAP_PROP_FRAME_HEIGHT, PREVIEW_DEFAULT_HEIGHT)
camera.set(cv2.CAP_PROP_FPS, 60) camera.set(cv2.CAP_PROP_FPS, 60)
@ -727,7 +727,9 @@ def create_webcam_preview(camera_index: int): # Added camera_index parameter
PREVIEW.withdraw() PREVIEW.withdraw()
def create_source_target_popup_for_webcam(root: ctk.CTk, map: list) -> None: def create_source_target_popup_for_webcam(
root: ctk.CTk, map: list, camera_index: int
) -> None:
global POPUP_LIVE, popup_status_label_live global POPUP_LIVE, popup_status_label_live
POPUP_LIVE = ctk.CTkToplevel(root) POPUP_LIVE = ctk.CTkToplevel(root)
@ -739,9 +741,9 @@ def create_source_target_popup_for_webcam(root: ctk.CTk, map: list) -> None:
if has_valid_map(): if has_valid_map():
POPUP_LIVE.destroy() POPUP_LIVE.destroy()
simplify_maps() simplify_maps()
create_webcam_preview() create_webcam_preview(camera_index)
else: else:
update_pop_live_status("Atleast 1 source with target is required!") update_pop_live_status("At least 1 source with target is required!")
def on_add_click(): def on_add_click():
add_blank_map() add_blank_map()