From 5bd432c009fdd841f6e2f0c45a9e8ba20629e983 Mon Sep 17 00:00:00 2001 From: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu, 14 Dec 2023 03:01:02 +0900 Subject: [PATCH] fix ObjC RoomOptions --- Sources/LiveKit/E2EE/Options.swift | 10 +++++++--- .../LiveKit/Types/Options/RoomOptions.swift | 20 +++++++++++++++++-- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Sources/LiveKit/E2EE/Options.swift b/Sources/LiveKit/E2EE/Options.swift index c3ca39747..7bc0b073b 100644 --- a/Sources/LiveKit/E2EE/Options.swift +++ b/Sources/LiveKit/E2EE/Options.swift @@ -45,9 +45,13 @@ extension Livekit_Encryption.TypeEnum { } } -public class E2EEOptions { - var keyProvider: BaseKeyProvider - var encryptionType: EncryptionType = .gcm +@objc +public class E2EEOptions: NSObject { + let keyProvider: BaseKeyProvider + + @objc + let encryptionType: EncryptionType = .gcm + public init(keyProvider: BaseKeyProvider) { self.keyProvider = keyProvider } diff --git a/Sources/LiveKit/Types/Options/RoomOptions.swift b/Sources/LiveKit/Types/Options/RoomOptions.swift index d40d62d4b..03ba0d969 100644 --- a/Sources/LiveKit/Types/Options/RoomOptions.swift +++ b/Sources/LiveKit/Types/Options/RoomOptions.swift @@ -69,6 +69,22 @@ public class RoomOptions: NSObject { @objc public let reportRemoteTrackStatistics: Bool + override public init() { + defaultCameraCaptureOptions = CameraCaptureOptions() + defaultScreenShareCaptureOptions = ScreenShareCaptureOptions() + defaultAudioCaptureOptions = AudioCaptureOptions() + defaultVideoPublishOptions = VideoPublishOptions() + defaultAudioPublishOptions = AudioPublishOptions() + defaultDataPublishOptions = DataPublishOptions() + adaptiveStream = false + dynacast = false + stopLocalTrackOnUnpublish = true + suspendLocalVideoTracksInBackground = true + e2eeOptions = nil + reportRemoteTrackStatistics = false + } + + @objc public init(defaultCameraCaptureOptions: CameraCaptureOptions = CameraCaptureOptions(), defaultScreenShareCaptureOptions: ScreenShareCaptureOptions = ScreenShareCaptureOptions(), defaultAudioCaptureOptions: AudioCaptureOptions = AudioCaptureOptions(), @@ -80,7 +96,7 @@ public class RoomOptions: NSObject { stopLocalTrackOnUnpublish: Bool = true, suspendLocalVideoTracksInBackground: Bool = true, e2eeOptions: E2EEOptions? = nil, - reportTrackStatistics: Bool = false) + reportRemoteTrackStatistics: Bool = false) { self.defaultCameraCaptureOptions = defaultCameraCaptureOptions self.defaultScreenShareCaptureOptions = defaultScreenShareCaptureOptions @@ -93,7 +109,7 @@ public class RoomOptions: NSObject { self.stopLocalTrackOnUnpublish = stopLocalTrackOnUnpublish self.suspendLocalVideoTracksInBackground = suspendLocalVideoTracksInBackground self.e2eeOptions = e2eeOptions - reportRemoteTrackStatistics = reportTrackStatistics + self.reportRemoteTrackStatistics = reportRemoteTrackStatistics } // MARK: - Equal