sjs/SwiftyCam
1
0
Fork 0
mirror of https://github.com/samsonjs/SwiftyCam.git synced 2026-03-25 09:05:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed optional checking for audio and video device (e.g. prevent crashing on the simulator)

Browse source
This commit is contained in:
Michael Prummer 2018-05-03 10:43:39 +02:00
parent 85d713d643
commit c88e8f3d03
1 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
Source/SwiftyCamViewController.swift
View file

@ -712,18 +712,20 @@ open class SwiftyCamViewController: UIViewController {
}
do {
let videoDeviceInput = try AVCaptureDeviceInput(device: videoDevice!)
if session.canAddInput(videoDeviceInput) {
session.addInput(videoDeviceInput)
self.videoDeviceInput = videoDeviceInput
} else {
print("[SwiftyCam]: Could not add video device input to the session")
print(session.canSetSessionPreset(AVCaptureSession.Preset(rawValue: videoInputPresetFromVideoQuality(quality: videoQuality))))
setupResult = .configurationFailed
session.commitConfiguration()
return
}
if let videoDevice = videoDevice {
let videoDeviceInput = try AVCaptureDeviceInput(device: videoDevice)
if session.canAddInput(videoDeviceInput) {
session.addInput(videoDeviceInput)
self.videoDeviceInput = videoDeviceInput
} else {
print("[SwiftyCam]: Could not add video device input to the session")
print(session.canSetSessionPreset(AVCaptureSession.Preset(rawValue: videoInputPresetFromVideoQuality(quality: videoQuality))))
setupResult = .configurationFailed
session.commitConfiguration()
return
}
}
} catch {
print("[SwiftyCam]: Could not create video device input: \(error)")
setupResult = .configurationFailed
@ -738,17 +740,19 @@ open class SwiftyCamViewController: UIViewController {
return
}
do {
let audioDevice = AVCaptureDevice.default(for: AVMediaType.audio)
let audioDeviceInput = try AVCaptureDeviceInput(device: audioDevice!)
if session.canAddInput(audioDeviceInput) {
session.addInput(audioDeviceInput)
}
else {
print("[SwiftyCam]: Could not add audio device input to the session")
}
}
catch {
if let audioDevice = AVCaptureDevice.default(for: AVMediaType.audio){
let audioDeviceInput = try AVCaptureDeviceInput(device: audioDevice)
if session.canAddInput(audioDeviceInput) {
session.addInput(audioDeviceInput)
} else {
print("[SwiftyCam]: Could not add audio device input to the session")
}
} else {
print("[SwiftyCam]: Could not find an audio device")
}
} catch {
print("[SwiftyCam]: Could not create audio device input: \(error)")
}
}