internal renaming

hiroshihorie · hiroshihorie · commit bc4f9e7ea615 · 2024-06-08T16:39:59.000+09:00
diff --git a/Sources/LiveKit/Broadcast/BroadcastScreenCapturer.swift b/Sources/LiveKit/Broadcast/BroadcastScreenCapturer.swift
@@ -95,7 +95,7 @@ public extension LocalVideoTrack {
                                                    options: ScreenShareCaptureOptions = ScreenShareCaptureOptions(),
                                                    reportStatistics: Bool = false) -> LocalVideoTrack
     {
-        let videoSource = Engine.createVideoSource(forScreenShare: true)
+        let videoSource = RTC.createVideoSource(forScreenShare: true)
         let capturer = BroadcastScreenCapturer(delegate: videoSource, options: BufferCaptureOptions(from: options))
         return LocalVideoTrack(
             name: name,
diff --git a/Sources/LiveKit/Core/DataChannelPairActor.swift b/Sources/LiveKit/Core/DataChannelPairActor.swift
@@ -85,7 +85,7 @@ actor DataChannelPairActor: NSObject, Loggable {
         }
 
         let serializedData = try packet.serializedData()
-        let rtcData = Engine.createDataBuffer(data: serializedData)
+        let rtcData = RTC.createDataBuffer(data: serializedData)
 
         let channel = (kind == .reliable) ? _reliableChannel : _lossyChannel
         guard let sendDataResult = channel?.sendData(rtcData), sendDataResult else {
diff --git a/Sources/LiveKit/Core/Engine.swift b/Sources/LiveKit/Core/Engine.swift
@@ -295,10 +295,10 @@ extension Engine {
             // data over pub channel for backwards compatibility
 
             let reliableDataChannel = await publisher.dataChannel(for: LKRTCDataChannel.labels.reliable,
-                                                                  configuration: Engine.createDataChannelConfiguration())
+                                                                  configuration: RTC.createDataChannelConfiguration())
 
             let lossyDataChannel = await publisher.dataChannel(for: LKRTCDataChannel.labels.lossy,
-                                                               configuration: Engine.createDataChannelConfiguration(maxRetransmits: 0))
+                                                               configuration: RTC.createDataChannelConfiguration(maxRetransmits: 0))
 
             await publisherDataChannel.set(reliable: reliableDataChannel)
             await publisherDataChannel.set(lossy: lossyDataChannel)
diff --git a/Sources/LiveKit/Core/RTC.swift b/Sources/LiveKit/Core/RTC.swift
@@ -21,7 +21,7 @@ import Foundation
 private extension Array where Element: LKRTCVideoCodecInfo {
     func rewriteCodecsIfNeeded() -> [LKRTCVideoCodecInfo] {
         // rewrite H264's profileLevelId to 42e032
-        let codecs = map { $0.name == kRTCVideoCodecH264Name ? Engine.h264BaselineLevel5CodecInfo : $0 }
+        let codecs = map { $0.name == kRTCVideoCodecH264Name ? RTC.h264BaselineLevel5CodecInfo : $0 }
         // logger.log("supportedCodecs: \(codecs.map({ "\($0.name) - \($0.parameters)" }).joined(separator: ", "))", type: Engine.self)
         return codecs
     }
@@ -45,7 +45,7 @@ private class VideoEncoderFactorySimulcast: LKRTCVideoEncoderFactorySimulcast {
     }
 }
 
-extension Engine {
+class RTC {
     static var bypassVoiceProcessing: Bool = false
 
     static let h264BaselineLevel5CodecInfo: LKRTCVideoCodecInfo = {
diff --git a/Sources/LiveKit/Core/Room.swift b/Sources/LiveKit/Core/Room.swift
@@ -416,7 +416,7 @@ public extension Room {
     /// Must be set before RTCPeerConnectionFactory gets initialized.
     @objc
     static var bypassVoiceProcessing: Bool {
-        get { Engine.bypassVoiceProcessing }
-        set { Engine.bypassVoiceProcessing = newValue }
+        get { RTC.bypassVoiceProcessing }
+        set { RTC.bypassVoiceProcessing = newValue }
     }
 }
diff --git a/Sources/LiveKit/Core/SignalClient.swift b/Sources/LiveKit/Core/SignalClient.swift
@@ -285,7 +285,7 @@ private extension SignalClient {
             _delegate.notifyDetached { await $0.signalClient(self, didReceiveOffer: sd.toRTCType()) }
 
         case let .trickle(trickle):
-            guard let rtcCandidate = try? Engine.createIceCandidate(fromJsonString: trickle.candidateInit) else {
+            guard let rtcCandidate = try? RTC.createIceCandidate(fromJsonString: trickle.candidateInit) else {
                 return
             }
 
diff --git a/Sources/LiveKit/Core/Transport.swift b/Sources/LiveKit/Core/Transport.swift
@@ -76,9 +76,7 @@ actor Transport: NSObject, Loggable {
          delegate: TransportDelegate) throws
     {
         // try create peerConnection
-        guard let pc = Engine.createPeerConnection(config,
-                                                   constraints: .defaultPCConstraints)
-        else {
+        guard let pc = RTC.createPeerConnection(config, constraints: .defaultPCConstraints) else {
             // log("[WebRTC] Failed to create PeerConnection", .error)
             throw LiveKitError(.webRTC, message: "Failed to create PeerConnection")
         }
diff --git a/Sources/LiveKit/E2EE/E2EEManager.swift b/Sources/LiveKit/E2EE/E2EEManager.swift
@@ -110,7 +110,7 @@ public class E2EEManager: NSObject, ObservableObject, Loggable {
         }
 
         guard let frameCryptor = DispatchQueue.liveKitWebRTC.sync(execute: {
-            LKRTCFrameCryptor(factory: Engine.peerConnectionFactory,
+            LKRTCFrameCryptor(factory: RTC.peerConnectionFactory,
                               rtpSender: sender,
                               participantId: participantIdentity.stringValue,
                               algorithm: .aesGcm,
@@ -141,7 +141,7 @@ public class E2EEManager: NSObject, ObservableObject, Loggable {
         }
 
         guard let frameCryptor = DispatchQueue.liveKitWebRTC.sync(execute: {
-            LKRTCFrameCryptor(factory: Engine.peerConnectionFactory,
+            LKRTCFrameCryptor(factory: RTC.peerConnectionFactory,
                               rtpReceiver: receiver,
                               participantId: participantIdentity.stringValue,
                               algorithm: .aesGcm,
diff --git a/Sources/LiveKit/Extensions/RTCRtpTransceiver.swift b/Sources/LiveKit/Extensions/RTCRtpTransceiver.swift
@@ -22,7 +22,7 @@ extension LKRTCRtpTransceiver: Loggable {
     /// Attempts to set preferred video codec.
     func set(preferredVideoCodec codec: VideoCodec, exceptCodec: VideoCodec? = nil) {
         // Get list of supported codecs...
-        let allVideoCodecs = Engine.videoSenderCapabilities.codecs
+        let allVideoCodecs = RTC.videoSenderCapabilities.codecs
 
         // Get the RTCRtpCodecCapability of the preferred codec
         let preferredCodecCapability = allVideoCodecs.first { $0.name.lowercased() == codec.id }
diff --git a/Sources/LiveKit/Participant/LocalParticipant.swift b/Sources/LiveKit/Participant/LocalParticipant.swift
@@ -534,7 +534,7 @@ private extension LocalParticipant {
                     self.log("[publish] maxBitrate: \(encoding.maxBitrate)")
 
                     transInit.sendEncodings = [
-                        Engine.createRtpEncodingParameters(encoding: encoding),
+                        RTC.createRtpEncodingParameters(encoding: encoding),
                     ]
                 }
 
diff --git a/Sources/LiveKit/Support/Utils.swift b/Sources/LiveKit/Support/Utils.swift
@@ -212,11 +212,11 @@ class Utils {
         if let videoCodec, videoCodec.isSVC {
             // SVC mode
             logger.log("Using SVC mode", type: Utils.self)
-            return [Engine.createRtpEncodingParameters(encoding: encoding, scalabilityMode: .L3T3_KEY)]
+            return [RTC.createRtpEncodingParameters(encoding: encoding, scalabilityMode: .L3T3_KEY)]
         } else if !publishOptions.simulcast {
             // Not-simulcast mode
             logger.log("Simulcast not enabled", type: Utils.self)
-            return [Engine.createRtpEncodingParameters(encoding: encoding)]
+            return [RTC.createRtpEncodingParameters(encoding: encoding)]
         }
 
         // Continue to simulcast encoding computation...
diff --git a/Sources/LiveKit/Track/AudioManager.swift b/Sources/LiveKit/Track/AudioManager.swift
@@ -156,13 +156,13 @@ public class AudioManager: Loggable {
 
     private lazy var capturePostProcessingDelegateAdapter: AudioCustomProcessingDelegateAdapter = {
         let adapter = AudioCustomProcessingDelegateAdapter(target: nil)
-        Engine.audioProcessingModule.capturePostProcessingDelegate = adapter
+        RTC.audioProcessingModule.capturePostProcessingDelegate = adapter
         return adapter
     }()
 
     private lazy var renderPreProcessingDelegateAdapter: AudioCustomProcessingDelegateAdapter = {
         let adapter = AudioCustomProcessingDelegateAdapter(target: nil)
-        Engine.audioProcessingModule.renderPreProcessingDelegate = adapter
+        RTC.audioProcessingModule.renderPreProcessingDelegate = adapter
         return adapter
     }()
 
@@ -183,26 +183,26 @@ public class AudioManager: Loggable {
     public let defaultInputDevice = AudioDevice(ioDevice: LKRTCIODevice.defaultDevice(with: .input))
 
     public var outputDevices: [AudioDevice] {
-        Engine.audioDeviceModule.outputDevices.map { AudioDevice(ioDevice: $0) }
+        RTC.audioDeviceModule.outputDevices.map { AudioDevice(ioDevice: $0) }
     }
 
     public var inputDevices: [AudioDevice] {
-        Engine.audioDeviceModule.inputDevices.map { AudioDevice(ioDevice: $0) }
+        RTC.audioDeviceModule.inputDevices.map { AudioDevice(ioDevice: $0) }
     }
 
     public var outputDevice: AudioDevice {
-        get { AudioDevice(ioDevice: Engine.audioDeviceModule.outputDevice) }
-        set { Engine.audioDeviceModule.outputDevice = newValue._ioDevice }
+        get { AudioDevice(ioDevice: RTC.audioDeviceModule.outputDevice) }
+        set { RTC.audioDeviceModule.outputDevice = newValue._ioDevice }
     }
 
     public var inputDevice: AudioDevice {
-        get { AudioDevice(ioDevice: Engine.audioDeviceModule.inputDevice) }
-        set { Engine.audioDeviceModule.inputDevice = newValue._ioDevice }
+        get { AudioDevice(ioDevice: RTC.audioDeviceModule.inputDevice) }
+        set { RTC.audioDeviceModule.inputDevice = newValue._ioDevice }
     }
 
     public var onDeviceUpdate: DeviceUpdateFunc? {
         didSet {
-            Engine.audioDeviceModule.setDevicesUpdatedHandler { [weak self] in
+            RTC.audioDeviceModule.setDevicesUpdatedHandler { [weak self] in
                 guard let self else { return }
                 self.onDeviceUpdate?(self)
             }
diff --git a/Sources/LiveKit/Track/Capturers/BufferCapturer.swift b/Sources/LiveKit/Track/Capturers/BufferCapturer.swift
@@ -29,7 +29,7 @@ import Foundation
 /// since dimensions must be resolved at the time of publishing (to compute video parameters).
 ///
 public class BufferCapturer: VideoCapturer {
-    private let capturer = Engine.createVideoCapturer()
+    private let capturer = RTC.createVideoCapturer()
 
     /// The ``BufferCaptureOptions`` used for this capturer.
     public let options: BufferCaptureOptions
@@ -57,7 +57,7 @@ public extension LocalVideoTrack {
                                   options: BufferCaptureOptions = BufferCaptureOptions(),
                                   reportStatistics: Bool = false) -> LocalVideoTrack
     {
-        let videoSource = Engine.createVideoSource(forScreenShare: source == .screenShareVideo)
+        let videoSource = RTC.createVideoSource(forScreenShare: source == .screenShareVideo)
         let capturer = BufferCapturer(delegate: videoSource, options: options)
         return LocalVideoTrack(name: name,
                                source: source,
diff --git a/Sources/LiveKit/Track/Capturers/CameraCapturer.swift b/Sources/LiveKit/Track/Capturers/CameraCapturer.swift
@@ -257,7 +257,7 @@ public extension LocalVideoTrack {
                                   options: CameraCaptureOptions? = nil,
                                   reportStatistics: Bool = false) -> LocalVideoTrack
     {
-        let videoSource = Engine.createVideoSource(forScreenShare: false)
+        let videoSource = RTC.createVideoSource(forScreenShare: false)
         let capturer = CameraCapturer(delegate: videoSource, options: options ?? CameraCaptureOptions())
         return LocalVideoTrack(name: name ?? Track.cameraName,
                                source: .camera,
diff --git a/Sources/LiveKit/Track/Capturers/InAppCapturer.swift b/Sources/LiveKit/Track/Capturers/InAppCapturer.swift
@@ -24,7 +24,7 @@ import ReplayKit
 
 @available(macOS 11.0, iOS 11.0, *)
 public class InAppScreenCapturer: VideoCapturer {
-    private let capturer = Engine.createVideoCapturer()
+    private let capturer = RTC.createVideoCapturer()
     private let options: ScreenShareCaptureOptions
 
     init(delegate: LKRTCVideoCapturerDelegate, options: ScreenShareCaptureOptions) {
@@ -69,7 +69,7 @@ public extension LocalVideoTrack {
                                             options: ScreenShareCaptureOptions = ScreenShareCaptureOptions(),
                                             reportStatistics: Bool = false) -> LocalVideoTrack
     {
-        let videoSource = Engine.createVideoSource(forScreenShare: true)
+        let videoSource = RTC.createVideoSource(forScreenShare: true)
         let capturer = InAppScreenCapturer(delegate: videoSource, options: options)
         return LocalVideoTrack(name: name,
                                source: .screenShareVideo,
diff --git a/Sources/LiveKit/Track/Capturers/MacOSScreenCapturer.swift b/Sources/LiveKit/Track/Capturers/MacOSScreenCapturer.swift
@@ -27,7 +27,7 @@ import ScreenCaptureKit
 
 @available(macOS 12.3, *)
 public class MacOSScreenCapturer: VideoCapturer {
-    private let capturer = Engine.createVideoCapturer()
+    private let capturer = RTC.createVideoCapturer()
 
     // TODO: Make it possible to change dynamically
     public let captureSource: MacOSScreenCaptureSource?
@@ -254,7 +254,7 @@ public extension LocalVideoTrack {
                                             options: ScreenShareCaptureOptions = ScreenShareCaptureOptions(),
                                             reportStatistics: Bool = false) -> LocalVideoTrack
     {
-        let videoSource = Engine.createVideoSource(forScreenShare: true)
+        let videoSource = RTC.createVideoSource(forScreenShare: true)
         let capturer = MacOSScreenCapturer(delegate: videoSource, captureSource: source, options: options)
         return LocalVideoTrack(name: name,
                                source: .screenShareVideo,
diff --git a/Sources/LiveKit/Track/Local/LocalAudioTrack.swift b/Sources/LiveKit/Track/Local/LocalAudioTrack.swift
@@ -51,8 +51,8 @@ public class LocalAudioTrack: Track, LocalTrack, AudioTrack {
         let audioConstraints = DispatchQueue.liveKitWebRTC.sync { LKRTCMediaConstraints(mandatoryConstraints: nil,
                                                                                         optionalConstraints: constraints) }
 
-        let audioSource = Engine.createAudioSource(audioConstraints)
-        let rtcTrack = Engine.createAudioTrack(source: audioSource)
+        let audioSource = RTC.createAudioSource(audioConstraints)
+        let rtcTrack = RTC.createAudioTrack(source: audioSource)
         rtcTrack.isEnabled = true
 
         return LocalAudioTrack(name: name,
diff --git a/Sources/LiveKit/Track/Local/LocalVideoTrack.swift b/Sources/LiveKit/Track/Local/LocalVideoTrack.swift
@@ -31,7 +31,7 @@ public class LocalVideoTrack: Track, LocalTrack, VideoTrack {
          videoSource: LKRTCVideoSource,
          reportStatistics: Bool)
     {
-        let rtcTrack = Engine.createVideoTrack(source: videoSource)
+        let rtcTrack = RTC.createVideoTrack(source: videoSource)
         rtcTrack.isEnabled = true
 
         self.capturer = capturer
diff --git a/Sources/LiveKit/Types/Dimensions.swift b/Sources/LiveKit/Types/Dimensions.swift
@@ -142,7 +142,7 @@ extension Dimensions {
                 continue
             }
 
-            let parameters = Engine.createRtpEncodingParameters(
+            let parameters = RTC.createRtpEncodingParameters(
                 rid: rid,
                 encoding: preset.encoding,
                 scaleDownBy: Double(max) / Double(preset.dimensions.max)
diff --git a/Sources/LiveKit/Types/SessionDescription.swift b/Sources/LiveKit/Types/SessionDescription.swift
@@ -44,6 +44,6 @@ extension Livekit_SessionDescription {
         default: fatalError("Unknown state \(type)") // This should never happen
         }
 
-        return Engine.createSessionDescription(type: sdpType, sdp: sdp)
+        return RTC.createSessionDescription(type: sdpType, sdp: sdp)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public extension LocalVideoTrack {`
`95`	`95`	`options: ScreenShareCaptureOptions = ScreenShareCaptureOptions(),`
`96`	`96`	`reportStatistics: Bool = false) -> LocalVideoTrack`
`97`	`97`	`{`
`98`		`- let videoSource = Engine.createVideoSource(forScreenShare: true)`
	`98`	`+ let videoSource = RTC.createVideoSource(forScreenShare: true)`
`99`	`99`	`let capturer = BroadcastScreenCapturer(delegate: videoSource, options: BufferCaptureOptions(from: options))`
`100`	`100`	`return LocalVideoTrack(`
`101`	`101`	`name: name,`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ actor DataChannelPairActor: NSObject, Loggable {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`let serializedData = try packet.serializedData()`
`88`		`- let rtcData = Engine.createDataBuffer(data: serializedData)`
	`88`	`+ let rtcData = RTC.createDataBuffer(data: serializedData)`
`89`	`89`
`90`	`90`	`let channel = (kind == .reliable) ? _reliableChannel : _lossyChannel`
`91`	`91`	`guard let sendDataResult = channel?.sendData(rtcData), sendDataResult else {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import Foundation`
`21`	`21`	`private extension Array where Element: LKRTCVideoCodecInfo {`
`22`	`22`	`func rewriteCodecsIfNeeded() -> [LKRTCVideoCodecInfo] {`
`23`	`23`	`// rewrite H264's profileLevelId to 42e032`
`24`		`- let codecs = map { $0.name == kRTCVideoCodecH264Name ? Engine.h264BaselineLevel5CodecInfo : $0 }`
	`24`	`+ let codecs = map { $0.name == kRTCVideoCodecH264Name ? RTC.h264BaselineLevel5CodecInfo : $0 }`
`25`	`25`	`// logger.log("supportedCodecs: \(codecs.map({ "\($0.name) - \($0.parameters)" }).joined(separator: ", "))", type: Engine.self)`
`26`	`26`	`return codecs`
`27`	`27`	`}`
`@@ -45,7 +45,7 @@ private class VideoEncoderFactorySimulcast: LKRTCVideoEncoderFactorySimulcast {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`-extension Engine {`
	`48`	`+class RTC {`
`49`	`49`	`static var bypassVoiceProcessing: Bool = false`
`50`	`50`
`51`	`51`	`static let h264BaselineLevel5CodecInfo: LKRTCVideoCodecInfo = {`
Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,7 @@ public extension Room {`
`416`	`416`	`/// Must be set before RTCPeerConnectionFactory gets initialized.`
`417`	`417`	`@objc`
`418`	`418`	`static var bypassVoiceProcessing: Bool {`
`419`		`- get { Engine.bypassVoiceProcessing }`
`420`		`- set { Engine.bypassVoiceProcessing = newValue }`
	`419`	`+ get { RTC.bypassVoiceProcessing }`
	`420`	`+ set { RTC.bypassVoiceProcessing = newValue }`
`421`	`421`	`}`
`422`	`422`	`}`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ private extension SignalClient {`
`285`	`285`	`_delegate.notifyDetached { await $0.signalClient(self, didReceiveOffer: sd.toRTCType()) }`
`286`	`286`
`287`	`287`	`case let .trickle(trickle):`
`288`		`- guard let rtcCandidate = try? Engine.createIceCandidate(fromJsonString: trickle.candidateInit) else {`
	`288`	`+ guard let rtcCandidate = try? RTC.createIceCandidate(fromJsonString: trickle.candidateInit) else {`
`289`	`289`	`return`
`290`	`290`	`}`
`291`	`291`
Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,7 @@ actor Transport: NSObject, Loggable {`
`76`	`76`	`delegate: TransportDelegate) throws`
`77`	`77`	`{`
`78`	`78`	`// try create peerConnection`
`79`		`- guard let pc = Engine.createPeerConnection(config,`
`80`		`- constraints: .defaultPCConstraints)`
`81`		`- else {`
	`79`	`+ guard let pc = RTC.createPeerConnection(config, constraints: .defaultPCConstraints) else {`
`82`	`80`	`// log("[WebRTC] Failed to create PeerConnection", .error)`
`83`	`81`	`throw LiveKitError(.webRTC, message: "Failed to create PeerConnection")`
`84`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -534,7 +534,7 @@ private extension LocalParticipant {`
`534`	`534`	`self.log("[publish] maxBitrate: \(encoding.maxBitrate)")`
`535`	`535`
`536`	`536`	`transInit.sendEncodings = [`
`537`		`- Engine.createRtpEncodingParameters(encoding: encoding),`
	`537`	`+ RTC.createRtpEncodingParameters(encoding: encoding),`
`538`	`538`	`]`
`539`	`539`	`}`
`540`	`540`
Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ public extension LocalVideoTrack {`
`257`	`257`	`options: CameraCaptureOptions? = nil,`
`258`	`258`	`reportStatistics: Bool = false) -> LocalVideoTrack`
`259`	`259`	`{`
`260`		`- let videoSource = Engine.createVideoSource(forScreenShare: false)`
	`260`	`+ let videoSource = RTC.createVideoSource(forScreenShare: false)`
`261`	`261`	`let capturer = CameraCapturer(delegate: videoSource, options: options ?? CameraCaptureOptions())`
`262`	`262`	`return LocalVideoTrack(name: name ?? Track.cameraName,`
`263`	`263`	`source: .camera,`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public class LocalVideoTrack: Track, LocalTrack, VideoTrack {`
`31`	`31`	`videoSource: LKRTCVideoSource,`
`32`	`32`	`reportStatistics: Bool)`
`33`	`33`	`{`
`34`		`- let rtcTrack = Engine.createVideoTrack(source: videoSource)`
	`34`	`+ let rtcTrack = RTC.createVideoTrack(source: videoSource)`
`35`	`35`	`rtcTrack.isEnabled = true`
`36`	`36`
`37`	`37`	`self.capturer = capturer`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ extension Dimensions {`
`142`	`142`	`continue`
`143`	`143`	`}`
`144`	`144`
`145`		`- let parameters = Engine.createRtpEncodingParameters(`
	`145`	`+ let parameters = RTC.createRtpEncodingParameters(`
`146`	`146`	`rid: rid,`
`147`	`147`	`encoding: preset.encoding,`
`148`	`148`	`scaleDownBy: Double(max) / Double(preset.dimensions.max)`