CR: make members private where possible

add missing weak capture

// FREEBIE
pull/1/head
Michael Kirk 7 years ago
parent 3e4603920f
commit b5b51eba24

@ -387,7 +387,7 @@ class PeerConnectionClient: NSObject, RTCPeerConnectionDelegate, RTCDataChannelD
return nil return nil
} }
return captureController.capturer.captureSession return captureController.captureSession
}() }()
strongDelegate.peerConnectionClient(strongSelf, didUpdateLocalVideoCaptureSession: captureSession) strongDelegate.peerConnectionClient(strongSelf, didUpdateLocalVideoCaptureSession: captureSession)
@ -1116,15 +1116,13 @@ protocol VideoCaptureSettingsDelegate: class {
class VideoCaptureController { class VideoCaptureController {
let serialQueue = DispatchQueue(label: "org.signal.videoCaptureController") private let capturer: RTCCameraVideoCapturer
let capturer: RTCCameraVideoCapturer private weak var settingsDelegate: VideoCaptureSettingsDelegate?
weak var settingsDelegate: VideoCaptureSettingsDelegate? private let serialQueue = DispatchQueue(label: "org.signal.videoCaptureController")
var isUsingFrontCamera: Bool = true private var isUsingFrontCamera: Bool = true
func assertIsOnSerialQueue() { public var captureSession: AVCaptureSession {
if _isDebugAssertConfiguration(), #available(iOS 10.0, *) { return capturer.captureSession
assertOnQueue(serialQueue)
}
} }
public init(capturer: RTCCameraVideoCapturer, settingsDelegate: VideoCaptureSettingsDelegate) { public init(capturer: RTCCameraVideoCapturer, settingsDelegate: VideoCaptureSettingsDelegate) {
@ -1142,6 +1140,33 @@ class VideoCaptureController {
} }
} }
public func stopCapture() {
serialQueue.sync { [weak self] in
guard let strongSelf = self else {
return
}
strongSelf.capturer.stopCapture()
}
}
public func switchCamera(isUsingFrontCamera: Bool) {
serialQueue.sync { [weak self] in
guard let strongSelf = self else {
return
}
strongSelf.isUsingFrontCamera = isUsingFrontCamera
strongSelf.startCaptureSync()
}
}
private func assertIsOnSerialQueue() {
if _isDebugAssertConfiguration(), #available(iOS 10.0, *) {
assertOnQueue(serialQueue)
}
}
private func startCaptureSync() { private func startCaptureSync() {
assertIsOnSerialQueue() assertIsOnSerialQueue()
@ -1160,23 +1185,6 @@ class VideoCaptureController {
capturer.startCapture(with: device, format: format, fps: fps) capturer.startCapture(with: device, format: format, fps: fps)
} }
public func stopCapture() {
serialQueue.sync { [weak self] in
guard let strongSelf = self else {
return
}
strongSelf.capturer.stopCapture()
}
}
public func switchCamera(isUsingFrontCamera: Bool) {
serialQueue.sync {
self.isUsingFrontCamera = isUsingFrontCamera
self.startCaptureSync()
}
}
private func device(position: AVCaptureDevice.Position) -> AVCaptureDevice? { private func device(position: AVCaptureDevice.Position) -> AVCaptureDevice? {
let captureDevices = RTCCameraVideoCapturer.captureDevices() let captureDevices = RTCCameraVideoCapturer.captureDevices()
guard let device = (captureDevices.first { $0.position == position }) else { guard let device = (captureDevices.first { $0.position == position }) else {

Loading…
Cancel
Save