Fix visionOS & tvOS CI (#473)

Correct simulator was not being selected and tests were passing.
livekit · Sep 3, 2024 · 949b584 · 949b584
1 parent dfb8b2e
commit 949b584
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/.github/workflows/testing-matrix.yaml b/.github/workflows/testing-matrix.yaml
@@ -42,10 +42,10 @@ jobs:
             platform: "macOS,variant=Mac Catalyst"
           - os: macos-14
             xcode: 15.4
-            platform: "visionOS Simulator" # visionOS 1.2
+            platform: "visionOS Simulator,name=Apple Vision Pro" # visionOS 1.2
           - os: macos-14
             xcode: 15.4
-            platform: "tvOS"
+            platform: "tvOS Simulator,name=Apple TV"
           # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
           - os: macos-14
             xcode: 16.1-beta

diff --git a/Sources/LiveKit/Track/Capturers/CameraCapturer.swift b/Sources/LiveKit/Track/Capturers/CameraCapturer.swift
@@ -169,10 +169,12 @@ public class CameraCapturer: VideoCapturer {
             var devices = try await CameraCapturer.captureDevices()
             #endif
 
+            #if !os(visionOS)
             // Filter by deviceType if specified in options.
             if let deviceType = options.deviceType {
                 devices = devices.filter { $0.deviceType == deviceType }
             }
+            #endif
 
             device = devices.first { $0.position == self.options.position } ?? devices.first
         }

diff --git a/Sources/LiveKit/Types/Options/CameraCaptureOptions.swift b/Sources/LiveKit/Types/Options/CameraCaptureOptions.swift
@@ -19,9 +19,11 @@ import Foundation
 
 @objc
 public class CameraCaptureOptions: NSObject, VideoCaptureOptions {
-    /// Preferred deviceType to use. If ``device`` is specified, it will be used instead.
+    #if !os(visionOS)
+    /// Preferred deviceType to use. If ``device`` is specified, it will be used instead. This is currently ignored for visionOS.
     @objc
     public let deviceType: AVCaptureDevice.DeviceType?
+    #endif
 
     /// Exact devce to use.
     @objc
@@ -44,14 +46,17 @@ public class CameraCaptureOptions: NSObject, VideoCaptureOptions {
 
     @objc
     override public init() {
+        #if !os(visionOS)
         deviceType = nil
-        position = .unspecified
+        #endif
         device = nil
+        position = .unspecified
         preferredFormat = nil
         dimensions = .h720_169
         fps = 30
     }
 
+    #if !os(visionOS)
     @objc
     public init(deviceType: AVCaptureDevice.DeviceType? = nil,
                 device: AVCaptureDevice? = nil,
@@ -67,22 +72,45 @@ public class CameraCaptureOptions: NSObject, VideoCaptureOptions {
         self.dimensions = dimensions
         self.fps = fps
     }
+    #else
+    @objc
+    public init(device: AVCaptureDevice? = nil,
+                position: AVCaptureDevice.Position = .unspecified,
+                preferredFormat: AVCaptureDevice.Format? = nil,
+                dimensions: Dimensions = .h720_169,
+                fps: Int = 30)
+    {
+        self.device = device
+        self.position = position
+        self.preferredFormat = preferredFormat
+        self.dimensions = dimensions
+        self.fps = fps
+    }
+    #endif
 
     // MARK: - Equal
 
     override public func isEqual(_ object: Any?) -> Bool {
         guard let other = object as? Self else { return false }
-        return deviceType == other.deviceType &&
+        let isCommonEqual =
             device == other.device &&
             position == other.position &&
             preferredFormat == other.preferredFormat &&
             dimensions == other.dimensions &&
             fps == other.fps
+
+        #if !os(visionOS)
+        return deviceType == other.deviceType && isCommonEqual
+        #else
+        return isCommonEqual
+        #endif
     }
 
     override public var hash: Int {
         var hasher = Hasher()
+        #if !os(visionOS)
         hasher.combine(deviceType)
+        #endif
         hasher.combine(device)
         hasher.combine(position)
         hasher.combine(preferredFormat)
@@ -95,7 +123,6 @@ public class CameraCaptureOptions: NSObject, VideoCaptureOptions {
 
     override public var description: String {
         "CameraCaptureOptions(" +
-            "deviceType: \(String(describing: deviceType)), " +
             "device: \(String(describing: device)), " +
             "position: \(String(describing: position))" +
             ")"