Revert "Merge pull request #556 from Highpressure/main"

This reverts commit fd07185043, reversing
changes made to f762b61a12.

modules/capturer.py

@@ -2,26 +2,9 @@ from typing import Any
 import cv2
 import modules.globals  # Import the globals to check the color correction toggle
 
-def list_available_cameras(max_tested: int = 10):
-    """ List all available camera indices. """
-    available_cameras = []
-    for i in range(max_tested):
-        cap = cv2.VideoCapture(i)
-        if cap.isOpened():
-            available_cameras.append(i)
-            cap.release()
-    return available_cameras
 
-def get_video_frame(video_source: Any, frame_number: int = 0, is_camera: bool = False) -> Any:
+def get_video_frame(video_path: str, frame_number: int = 0) -> Any:
-    """
+    capture = cv2.VideoCapture(video_path)
-    Capture a video frame from a camera or video file.
-    
-    :param video_source: The camera index or video file path.
-    :param frame_number: Frame number to retrieve (only applicable for video files).
-    :param is_camera: Flag to indicate if the source is a camera.
-    :return: The captured frame.
-    """
-    capture = cv2.VideoCapture(video_source)
 
     # Set MJPEG format to ensure correct color space handling
     capture.set(cv2.CAP_PROP_FOURCC, cv2.VideoWriter_fourcc(*'MJPG'))
@@ -30,10 +13,8 @@ def get_video_frame(video_source: Any, frame_number: int = 0, is_camera: bool =
     if modules.globals.color_correction:
         capture.set(cv2.CAP_PROP_CONVERT_RGB, 1)
     
-    if not is_camera:
     frame_total = capture.get(cv2.CAP_PROP_FRAME_COUNT)
     capture.set(cv2.CAP_PROP_POS_FRAMES, min(frame_total, frame_number - 1))
-
     has_frame, frame = capture.read()
 
     if has_frame and modules.globals.color_correction:
@@ -43,8 +24,8 @@ def get_video_frame(video_source: Any, frame_number: int = 0, is_camera: bool =
     capture.release()
     return frame if has_frame else None
 
+
 def get_video_frame_total(video_path: str) -> int:
-    """ Get total frame count of a video file. """
     capture = cv2.VideoCapture(video_path)
     video_frame_total = int(capture.get(cv2.CAP_PROP_FRAME_COUNT))
     capture.release()

modules/ui.py

@@ -43,16 +43,6 @@ def init(start: Callable[[], None], destroy: Callable[[], None]) -> ctk.CTk:
 
     return ROOT
 
-def list_available_cameras(max_tested: int = 10):
-    """ List all available camera indices. """
-    available_cameras = []
-    for i in range(max_tested):
-        cap = cv2.VideoCapture(i)
-        if cap.isOpened():
-            available_cameras.append(i)
-            cap.release()
-    return available_cameras
-
 
 def create_root(start: Callable[[], None], destroy: Callable[[], None]) -> ctk.CTk:
     global source_label, target_label, status_label
@@ -77,21 +67,11 @@ def create_root(start: Callable[[], None], destroy: Callable[[], None]) -> ctk.C
     select_face_button.place(relx=0.1, rely=0.4, relwidth=0.3, relheight=0.1)
 
     swap_faces_button = ctk.CTkButton(root, text='↔', cursor='hand2', command=lambda: swap_faces_paths())
-    swap_faces_button.place(relx=0.45, relwidth=0.1, relheight=0.1)
+    swap_faces_button.place(relx=0.45, rely=0.4, relwidth=0.1, relheight=0.1)
 
     select_target_button = ctk.CTkButton(root, text='Select a target', cursor='hand2', command=lambda: select_target_path())
     select_target_button.place(relx=0.6, rely=0.4, relwidth=0.3, relheight=0.1)
 
-    # Create dropdown for camera selection
-    available_cameras = list_available_cameras()
-    if available_cameras:
-        camera_var = ctk.StringVar(value=str(available_cameras[0]))  # Default to the first available camera
-        camera_dropdown = ctk.CTkOptionMenu(root, variable=camera_var, values=[str(i) for i in available_cameras])
-        camera_dropdown.place(relx=0.1, rely=0.55, relwidth=0.5, relheight=0.05)
-    else:
-        camera_var = ctk.StringVar(value="No cameras found")
-        camera_dropdown = ctk.CTkLabel(root, text="No cameras found")
-        camera_dropdown.place(relx=0.1, rely=0.55, relwidth=0.5, relheight=0.05)
     keep_fps_value = ctk.BooleanVar(value=modules.globals.keep_fps)
     keep_fps_checkbox = ctk.CTkSwitch(root, text='Keep fps', variable=keep_fps_value, cursor='hand2', command=lambda: setattr(modules.globals, 'keep_fps', not modules.globals.keep_fps))
     keep_fps_checkbox.place(relx=0.1, rely=0.6)
@@ -122,7 +102,6 @@ def create_root(start: Callable[[], None], destroy: Callable[[], None]) -> ctk.C
 #    nsfw_switch = ctk.CTkSwitch(root, text='NSFW filter', variable=nsfw_value, cursor='hand2', command=lambda: setattr(modules.globals, 'nsfw_filter', nsfw_value.get()))
 #    nsfw_switch.place(relx=0.6, rely=0.7)
 
-
     start_button = ctk.CTkButton(root, text='Start', cursor='hand2', command=lambda: select_output_path(start))
     start_button.place(relx=0.15, rely=0.80, relwidth=0.2, relheight=0.05)
 
@@ -132,7 +111,7 @@ def create_root(start: Callable[[], None], destroy: Callable[[], None]) -> ctk.C
     preview_button = ctk.CTkButton(root, text='Preview', cursor='hand2', command=lambda: toggle_preview())
     preview_button.place(relx=0.65, rely=0.80, relwidth=0.2, relheight=0.05)
 
-    live_button = ctk.CTkButton(root, text='Live', cursor='hand2', command=lambda: webcam_preview(int(camera_var.get())))
+    live_button = ctk.CTkButton(root, text='Live', cursor='hand2', command=lambda: webcam_preview())
     live_button.place(relx=0.40, rely=0.86, relwidth=0.2, relheight=0.05)
 
     status_label = ctk.CTkLabel(root, text=None, justify='center')
@@ -146,8 +125,6 @@ def create_root(start: Callable[[], None], destroy: Callable[[], None]) -> ctk.C
     return root
 
 
-
-
 def create_preview(parent: ctk.CTkToplevel) -> ctk.CTkToplevel:
     global preview_label, preview_slider
 
@@ -338,14 +315,14 @@ def update_preview(frame_number: int = 0) -> None:
         update_status('Processing succeed!')
         PREVIEW.deiconify()
 
-def webcam_preview(camera_index=0):
+def webcam_preview():
     if modules.globals.source_path is None:
         # No image selected
         return
 
     global preview_label, PREVIEW
 
-    camera = cv2.VideoCapture(camera_index)  # Use the selected camera index
+    camera = cv2.VideoCapture(0)                                    # Use index for the webcam (adjust the index accordingly if necessary)    
     camera.set(cv2.CAP_PROP_FRAME_WIDTH, PREVIEW_DEFAULT_WIDTH)     # Set the width of the resolution
     camera.set(cv2.CAP_PROP_FRAME_HEIGHT, PREVIEW_DEFAULT_HEIGHT)   # Set the height of the resolution
     camera.set(cv2.CAP_PROP_FPS, 60)                                # Set the frame rate of the webcam
@@ -370,7 +347,7 @@ def webcam_preview(camera_index=0):
         temp_frame = frame.copy()  #Create a copy of the frame
 
         if modules.globals.live_mirror:
-            temp_frame = cv2.flip(temp_frame, 1)  # Horizontal flipping
+            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())