signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'igor/PR/DualWideCameraFix'

Browse Source
This commit is contained in:
Igor Solomennikov 2022-03-08 20:17:05 -08:00
commit a429124ff6
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Signal/src/ViewControllers/Photos/PhotoCapture.swift
View File

@ -399,6 +399,7 @@ class PhotoCapture: NSObject {
enum CameraSystem {
case wide // Single-camera devices.
case dual // W + T
case dualWide // UW + W
case triple // UW + W + T
}
@ -426,8 +427,13 @@ class PhotoCapture: NSObject {
let avTypes = captureOutput.imageOutput.availableRearDeviceTypes
// No iOS 12 device can have a triple camera system.
if #available(iOS 13, *), avTypes.contains(.builtInTripleCamera) {
return .triple
if #available(iOS 13, *) {
if avTypes.contains(.builtInTripleCamera) {
return .triple
}
if avTypes.contains(.builtInUltraWideCamera) {
return .dualWide
}
}
if avTypes.contains(.builtInDualCamera) {
return .dual
@ -443,6 +449,12 @@ class PhotoCapture: NSObject {
case .dual:
return .builtInDualCamera
case .dualWide:
if #available(iOS 13, *) {
return .builtInDualWideCamera
}
fallthrough
case .triple:
if #available(iOS 13, *) {
return .builtInTripleCamera
@ -1330,7 +1342,7 @@ class PhotoCaptureOutputAdaptee: NSObject, ImageCaptureOutput {
return []
}
if let multiCameraDevice = deviceMap[.builtInTripleCamera] ?? deviceMap[.builtInDualCamera] {
if let multiCameraDevice = deviceMap[.builtInTripleCamera] ?? deviceMap[.builtInDualWideCamera] ?? deviceMap[.builtInDualCamera] {
return multiCameraDevice.virtualDeviceSwitchOverVideoZoomFactors.map { CGFloat(truncating: $0) }
}
return []
@ -1385,7 +1397,7 @@ class PhotoCaptureOutputAdaptee: NSObject, ImageCaptureOutput {
private func availableDevices(forPosition position: AVCaptureDevice.Position) -> [AVCaptureDevice.DeviceType: AVCaptureDevice] {
var queryDeviceTypes: [AVCaptureDevice.DeviceType] = [ .builtInWideAngleCamera, .builtInTelephotoCamera, .builtInDualCamera ]
if #available(iOS 13, *) {
queryDeviceTypes.append(contentsOf: [ .builtInUltraWideCamera, .builtInTripleCamera ])
queryDeviceTypes.append(contentsOf: [ .builtInUltraWideCamera, .builtInDualWideCamera, .builtInTripleCamera ])
}
let session = AVCaptureDevice.DiscoverySession(deviceTypes: queryDeviceTypes, mediaType: .video, position: position)
let deviceMap = session.devices.reduce(into: [AVCaptureDevice.DeviceType: AVCaptureDevice]()) { deviceMap, device in