Mac Webcam Serial No. Management

hacksider · Dec 23, 2024 · b17e52d · b17e52d
2 parents 3a85884 + 77c19d1
commit b17e52d
Showing 1 changed file with 24 additions and 6 deletions.
diff --git a/modules/ui.py b/modules/ui.py
@@ -7,7 +7,6 @@
 from PIL import Image, ImageOps
 import time
 import json
-from pygrabber.dshow_graph import FilterGraph
 import modules.globals
 import modules.metadata
 from modules.face_analyser import (
@@ -29,6 +28,9 @@
 from modules.video_capture import VideoCapturer
 import platform
 
+if platform.system() == "Windows":
+    from pygrabber.dshow_graph import FilterGraph
+
 ROOT = None
 POPUP = None
 POPUP_LIVE = None
@@ -810,13 +812,29 @@ def get_available_cameras():
         camera_indices = []
         camera_names = []
 
-        # Test the first 10 indices
-        for i in range(10):
-            cap = cv2.VideoCapture(i)
+        if platform.system() == "Darwin":  # macOS specific handling
+            # Try to open the default FaceTime camera first
+            cap = cv2.VideoCapture(0)
             if cap.isOpened():
-                camera_indices.append(i)
-                camera_names.append(f"Camera {i}")
+                camera_indices.append(0)
+                camera_names.append("FaceTime Camera")
                 cap.release()
+
+            # On macOS, additional cameras typically use indices 1 and 2
+            for i in [1, 2]:
+                cap = cv2.VideoCapture(i)
+                if cap.isOpened():
+                    camera_indices.append(i)
+                    camera_names.append(f"Camera {i}")
+                    cap.release()
+        else:
+            # Linux camera detection - test first 10 indices
+            for i in range(10):
+                cap = cv2.VideoCapture(i)
+                if cap.isOpened():
+                    camera_indices.append(i)
+                    camera_names.append(f"Camera {i}")
+                    cap.release()
 
         if not camera_names:
             return [], ["No cameras found"]