Support macOS camera access

yushulx · Dec 24, 2024 · e0a9cad · e0a9cad
1 parent 9610fda
commit e0a9cad
Show file tree

Hide file tree

Showing 5 changed files with 330 additions and 11 deletions.
diff --git a/litecam/CMakeLists.txt b/litecam/CMakeLists.txt
@@ -22,10 +22,15 @@ elseif (UNIX AND NOT APPLE)
         src/CameraPreviewLinux.cpp
     )
 elseif (APPLE)
+    # Ensure that Objective-C++ source files are compiled as Objective-C++
     set(LIBRARY_SOURCES
         src/CameraMacOS.mm
         src/CameraPreviewMacOS.mm
     )
+    set_source_files_properties(src/CameraMacOS.mm src/CameraPreviewMacOS.mm PROPERTIES COMPILE_FLAGS "-x objective-c++")
+
+    # Set main.cpp to be treated as Objective-C++
+    set_source_files_properties(src/main.cpp PROPERTIES COMPILE_FLAGS "-x objective-c++")
 endif()
 
 # Define source files for the executable
@@ -50,9 +55,19 @@ if (UNIX AND NOT APPLE)
         target_link_libraries(litecam PRIVATE ${X11_LIBRARIES} pthread)
     endif()
 elseif (APPLE)
-    find_library(COCOA_LIBRARY Cocoa)
-    find_library(AVFOUNDATION_LIBRARY AVFoundation)
-    target_link_libraries(litecam PRIVATE ${AVFOUNDATION_LIBRARY})
+    find_library(COCOA_LIBRARY Cocoa REQUIRED)
+    find_library(AVFOUNDATION_LIBRARY AVFoundation REQUIRED)
+    find_library(COREMEDIA_LIBRARY CoreMedia REQUIRED)
+    find_library(COREVIDEO_LIBRARY CoreVideo REQUIRED)
+    find_library(OBJC_LIBRARY objc REQUIRED)  # Add the Objective-C runtime library
+
+    target_link_libraries(litecam PRIVATE 
+        ${COCOA_LIBRARY} 
+        ${AVFOUNDATION_LIBRARY} 
+        ${COREMEDIA_LIBRARY} 
+        ${COREVIDEO_LIBRARY} 
+        ${OBJC_LIBRARY}  # Link the Objective-C runtime
+    )
 elseif (WIN32)
     target_link_libraries(litecam PRIVATE ole32 uuid mfplat mf mfreadwrite mfuuid)
 endif()
@@ -65,3 +80,14 @@ target_link_libraries(camera_capture PRIVATE litecam)
 
 # Include the shared library's headers in the executable
 target_include_directories(camera_capture PRIVATE ${INCLUDE_DIR})
+
+# For macOS, link against the Cocoa framework
+if (APPLE)
+    target_link_libraries(camera_capture PRIVATE 
+        ${COCOA_LIBRARY} 
+        ${AVFOUNDATION_LIBRARY} 
+        ${COREMEDIA_LIBRARY} 
+        ${COREVIDEO_LIBRARY} 
+        ${OBJC_LIBRARY}  # Link the Objective-C runtime
+    )
+endif()
diff --git a/litecam/dist/include/Camera.h b/litecam/dist/include/Camera.h
@@ -41,9 +41,6 @@ struct Buffer
     void *start;
     size_t length;
 };
-
-#elif __APPLE__
-#include <AVFoundation/AVFoundation.h>
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -163,6 +160,9 @@ class CAMERA_API Camera
 #elif __linux__
     Camera() : fd(-1), frameWidth(640), frameHeight(480), buffers(nullptr), bufferCount(0) {}
     ~Camera() { Release(); }
+#elif __APPLE__
+    Camera() noexcept; // Add noexcept to match the implementation
+    ~Camera();
 #endif
 
     bool Open(int cameraIndex);
@@ -197,6 +197,7 @@ class CAMERA_API Camera
 
 #ifdef __APPLE__
     void *captureSession; // AVFoundation session object
+    void *videoOutput;
 #endif
 };
 

diff --git a/litecam/include/Camera.h b/litecam/include/Camera.h
@@ -41,9 +41,6 @@ struct Buffer
     void *start;
     size_t length;
 };
-
-#elif __APPLE__
-#include <AVFoundation/AVFoundation.h>
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -163,6 +160,9 @@ class CAMERA_API Camera
 #elif __linux__
     Camera() : fd(-1), frameWidth(640), frameHeight(480), buffers(nullptr), bufferCount(0) {}
     ~Camera() { Release(); }
+#elif __APPLE__
+    Camera() noexcept; // Add noexcept to match the implementation
+    ~Camera();
 #endif
 
     bool Open(int cameraIndex);
@@ -197,6 +197,7 @@ class CAMERA_API Camera
 
 #ifdef __APPLE__
     void *captureSession; // AVFoundation session object
+    void *videoOutput;
 #endif
 };