Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 30 additions & 21 deletions Sources/VideoIO/Camera.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public class Camera {
case cannotAddInput
case cannotAddOutput
case metadataObjectTypeNotAvailable
case noRequiredMediaTypeFoundOnDevice
}

public struct Configurator {
Expand Down Expand Up @@ -125,32 +126,40 @@ public class Camera {
}
let discoverySession = AVCaptureDevice.DiscoverySession(deviceTypes: deviceTypes, mediaType: .video, position: position)
if let device = discoverySession.devices.first {
let newVideoDeviceInput = try AVCaptureDeviceInput(device: device)
self.captureSession.beginConfiguration()
if let currentVideoDeviceInput = self.videoDeviceInput {
self.captureSession.removeInput(currentVideoDeviceInput)
}
if self.captureSession.canAddInput(newVideoDeviceInput) {
self.captureSession.addInput(newVideoDeviceInput)
self.videoDeviceInput = newVideoDeviceInput
} else {
self.captureSession.commitConfiguration()
throw Error.cannotAddInput
}

if let connection = self.videoCaptureConnection {
self.configurator.videoConnectionConfigurator(self, connection)
}
self.captureSession.commitConfiguration()

try device.lockForConfiguration()
self.configurator.videoDeviceConfigurator(self, device)
device.unlockForConfiguration()
try self.switchToVideoCaptureDevice(device)
} else {
throw Error.noDeviceFound
}
}

public func switchToVideoCaptureDevice(_ device: AVCaptureDevice) throws {
guard device.hasMediaType(.video) else {
throw Error.noRequiredMediaTypeFoundOnDevice
}

let newVideoDeviceInput = try AVCaptureDeviceInput(device: device)
self.captureSession.beginConfiguration()
if let currentVideoDeviceInput = self.videoDeviceInput {
self.captureSession.removeInput(currentVideoDeviceInput)
}
if self.captureSession.canAddInput(newVideoDeviceInput) {
self.captureSession.addInput(newVideoDeviceInput)
self.videoDeviceInput = newVideoDeviceInput
} else {
self.captureSession.commitConfiguration()
throw Error.cannotAddInput
}

if let connection = self.videoCaptureConnection {
self.configurator.videoConnectionConfigurator(self, connection)
}
self.captureSession.commitConfiguration()

try device.lockForConfiguration()
self.configurator.videoDeviceConfigurator(self, device)
device.unlockForConfiguration()
}

public var videoCaptureConnection: AVCaptureConnection? {
return self.videoDataOutput?.connection(with: .video)
}
Expand Down