Skip to content

Update multi-cam logic #464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hiroshihorie merged 3 commits into from
Aug 20, 2024
Merged

Update multi-cam logic #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61f732c
Update logic
hiroshihorie Aug 19, 2024
1b6e81d
Remove _multiCamSession
hiroshihorie Aug 19, 2024
6e8de00
Use 125.6422.06
hiroshihorie Aug 20, 2024
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
2 changes: 1 addition & 1 deletion LiveKitClient.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Pod::Spec.new do |spec|

spec.source_files = "Sources/**/*"

spec.dependency("LiveKitWebRTC", "= 125.6422.05")
spec.dependency("LiveKitWebRTC", "= 125.6422.06")
spec.dependency("SwiftProtobuf")
spec.dependency("Logging")

Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ let package = Package(
],
dependencies: [
// LK-Prefixed Dynamic WebRTC XCFramework
.package(url: "https://github.com/livekit/webrtc-xcframework.git", exact: "125.6422.05"),
.package(url: "https://github.com/livekit/webrtc-xcframework.git", exact: "125.6422.06"),
.package(url: "https://github.com/apple/swift-protobuf.git", from: "1.26.0"),
.package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"),
// Only used for DocC generation
Expand Down
2 changes: 1 addition & 1 deletion [email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ let package = Package(
],
dependencies: [
// LK-Prefixed Dynamic WebRTC XCFramework
.package(url: "https://github.com/livekit/webrtc-xcframework.git", exact: "125.6422.05"),
.package(url: "https://github.com/livekit/webrtc-xcframework.git", exact: "125.6422.06"),
.package(url: "https://github.com/apple/swift-protobuf.git", from: "1.26.0"),
.package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"),
// Only used for DocC generation
Expand Down
17 changes: 2 additions & 15 deletions Sources/LiveKit/Track/Capturers/CameraCapturer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,25 +89,12 @@ public class CameraCapturer: VideoCapturer {
// Used to hide LKRTCVideoCapturerDelegate symbol
private lazy var adapter: VideoCapturerDelegateAdapter = .init(cameraCapturer: self)

#if os(iOS)
// static let is lazy by default and AVCaptureMultiCamSession will only be initialized if used.
private static let _multiCamSession = AVCaptureMultiCamSession()
#endif

public var captureSession: AVCaptureSession {
#if os(iOS)
if AVCaptureMultiCamSession.isMultiCamSupported {
return Self._multiCamSession
} else {
return AVCaptureSession()
}
#else
return AVCaptureSession()
#endif
capturer.captureSession
}

// RTCCameraVideoCapturer used internally for now
private lazy var capturer: LKRTCCameraVideoCapturer = .init(delegate: adapter, captureSession: captureSession)
private lazy var capturer: LKRTCCameraVideoCapturer = .init(delegate: adapter)

init(delegate: LKRTCVideoCapturerDelegate, options: CameraCaptureOptions) {
_cameraCapturerState = StateSync(State(options: options))
Expand Down