Skip to content

Fix camera position across full econnects #962

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

Draft
pblazej wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −2
Draft

Fix camera position across full econnects #962

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions Sources/LiveKit/Track/Capturers/CameraCapturer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class CameraCapturer: VideoCapturer, @unchecked Sendable {
public var device: AVCaptureDevice? { _cameraCapturerState.device }

/// Current position of the device
public var position: AVCaptureDevice.Position { _cameraCapturerState.device?.position ?? .unspecified }
public var position: AVCaptureDevice.Position { _cameraCapturerState.device?.position ?? _cameraCapturerState.options.position }

@objc
public var options: CameraCaptureOptions { _cameraCapturerState.options }
Expand Down Expand Up @@ -288,7 +288,13 @@ public class CameraCapturer: VideoCapturer, @unchecked Sendable {
try await capturer.startCapture(with: device, format: selectedFormat.format, fps: selectedFps)

// Update internal vars
_cameraCapturerState.mutate { $0.device = device }
_cameraCapturerState.mutate {
$0.device = device
// Persist the resolved position so reconnects re-select the same camera.
if device.position != .unspecified, $0.options.position != device.position {
$0.options = $0.options.copyWith(position: .value(device.position))
}
}

return true
}
Expand Down
Loading