fix: Move minExposure
/maxExposure
from format into device (#2211)
* fix: Move `minExposure`/`maxExposure` into `device` * Update docs * chore: Remove unneeded dependency * chore: Update code
This commit is contained in:
@@ -22,9 +22,6 @@ struct CameraDeviceFormat: Equatable, CustomStringConvertible {
|
||||
let minFps: Double
|
||||
let maxFps: Double
|
||||
|
||||
let minExposure: Float
|
||||
let maxExposure: Float
|
||||
|
||||
let minISO: Float
|
||||
let maxISO: Float
|
||||
|
||||
@@ -41,15 +38,13 @@ struct CameraDeviceFormat: Equatable, CustomStringConvertible {
|
||||
|
||||
let supportsDepthCapture: Bool
|
||||
|
||||
init(fromFormat format: AVCaptureDevice.Format, forDevice device: AVCaptureDevice) {
|
||||
init(fromFormat format: AVCaptureDevice.Format) {
|
||||
videoWidth = Int(format.videoDimensions.width)
|
||||
videoHeight = Int(format.videoDimensions.height)
|
||||
photoWidth = Int(format.photoDimensions.width)
|
||||
photoHeight = Int(format.photoDimensions.height)
|
||||
minFps = format.minFps
|
||||
maxFps = format.maxFps
|
||||
minExposure = device.minExposureTargetBias
|
||||
maxExposure = device.maxExposureTargetBias
|
||||
minISO = format.minISO
|
||||
maxISO = format.maxISO
|
||||
fieldOfView = format.videoFieldOfView
|
||||
@@ -72,8 +67,6 @@ struct CameraDeviceFormat: Equatable, CustomStringConvertible {
|
||||
maxFps = jsValue["maxFps"] as! Double
|
||||
minISO = jsValue["minISO"] as! Float
|
||||
maxISO = jsValue["maxISO"] as! Float
|
||||
minExposure = jsValue["minExposure"] as! Float
|
||||
maxExposure = jsValue["maxExposure"] as! Float
|
||||
fieldOfView = jsValue["fieldOfView"] as! Float
|
||||
maxZoom = jsValue["maxZoom"] as! Double
|
||||
let jsVideoStabilizationModes = jsValue["videoStabilizationModes"] as! [String]
|
||||
@@ -88,8 +81,8 @@ struct CameraDeviceFormat: Equatable, CustomStringConvertible {
|
||||
// swiftlint:enable force_cast
|
||||
}
|
||||
|
||||
func isEqualTo(format other: AVCaptureDevice.Format, device otherDevice: AVCaptureDevice) -> Bool {
|
||||
let other = CameraDeviceFormat(fromFormat: other, forDevice: otherDevice)
|
||||
func isEqualTo(format other: AVCaptureDevice.Format) -> Bool {
|
||||
let other = CameraDeviceFormat(fromFormat: other)
|
||||
return self == other
|
||||
}
|
||||
|
||||
@@ -103,8 +96,6 @@ struct CameraDeviceFormat: Equatable, CustomStringConvertible {
|
||||
"videoWidth": videoWidth,
|
||||
"minISO": minISO,
|
||||
"maxISO": maxISO,
|
||||
"minExposure": minExposure,
|
||||
"maxExposure": maxExposure,
|
||||
"fieldOfView": fieldOfView,
|
||||
"maxZoom": maxZoom,
|
||||
"supportsVideoHdr": supportsVideoHdr,
|
||||
|
Reference in New Issue
Block a user