Add CameraFeed support for iOS

Co-authored-by: KOGA Mitsuhiro <[email protected]>

Author: penninghlhd

modules/camera/SCsub

@@ -6,13 +6,13 @@ Import("env_modules")
 
 env_camera = env_modules.Clone()
 
-if env["platform"] in ["windows", "macos", "linuxbsd", "android"]:
+if env["platform"] in ["windows", "macos", "linuxbsd", "android", "ios"]:
     env_camera.add_source_files(env.modules_sources, "register_types.cpp")
 
 if env["platform"] == "windows":
     env_camera.add_source_files(env.modules_sources, "camera_win.cpp")
 
-elif env["platform"] == "macos":
+elif env["platform"] in ["macos", "ios"]:
     env_camera.add_source_files(env.modules_sources, "camera_macos.mm")
 
 elif env["platform"] == "android":

modules/camera/camera_macos.mm

@@ -314,10 +314,14 @@ - (void)dealloc {
 	if (@available(macOS 10.15, *)) {
 #endif
 		AVCaptureDeviceDiscoverySession *session;
-		if (@available(macOS 14.0, *)) {
+		if (@available(macOS 14.0, iOS 17.0, *)) {
 			session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:[NSArray arrayWithObjects:AVCaptureDeviceTypeExternal, AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeContinuityCamera, nil] mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionUnspecified];
 		} else {
-			session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:[NSArray arrayWithObjects:AVCaptureDeviceTypeExternalUnknown, AVCaptureDeviceTypeBuiltInWideAngleCamera, nil] mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionUnspecified];
+#if TARGET_OS_IPHONE || TARGET_OS_MACCATALYST
+			session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:[NSArray arrayWithObjects:AVCaptureDeviceTypeBuiltInWideAngleCamera, nil] mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionUnspecified];
+#else
+		session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:[NSArray arrayWithObjects:AVCaptureDeviceTypeExternalUnknown, AVCaptureDeviceTypeBuiltInWideAngleCamera, nil] mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionUnspecified];
+#endif
 		}
 		devices = session.devices;
 #if defined(__x86_64__)

modules/camera/config.py

@@ -3,7 +3,7 @@ def can_build(env, platform):
 
     if sys.platform.startswith("freebsd"):
         return False
-    return platform == "macos" or platform == "windows" or platform == "linuxbsd" or platform == "android"
+    return platform in ["macos", "windows", "linuxbsd", "android", "ios"]
 
 
 def configure(env):

modules/camera/register_types.cpp

@@ -36,7 +36,7 @@
 #if defined(WINDOWS_ENABLED)
 #include "camera_win.h"
 #endif
-#if defined(MACOS_ENABLED)
+#if defined(MACOS_ENABLED) || defined(IOS_ENABLED)
 #include "camera_macos.h"
 #endif
 #if defined(ANDROID_ENABLED)
@@ -54,7 +54,7 @@ void initialize_camera_module(ModuleInitializationLevel p_level) {
 #if defined(WINDOWS_ENABLED)
 	CameraServer::make_default<CameraWindows>();
 #endif
-#if defined(MACOS_ENABLED)
+#if defined(MACOS_ENABLED) || defined(IOS_ENABLED)
 	CameraServer::make_default<CameraMacOS>();
 #endif
 #if defined(ANDROID_ENABLED)