feat(Project): fix retain

- fix retain
- lint project

Author: sreshetnyak

WebRTCiOSSDK/api/AntMediaClientDelegate.swift

@@ -16,11 +16,11 @@ public class StreamInformation {
    public let videoCodec: String
 
     init(json: [String: Any]!) {
-        self.streamWidth = json["streamWidth"] as! Int;
-        self.streamHeight = json["streamHeight"] as! Int;
-        self.videoBitrate = json["videoBitrate"] as! Int;
-        self.audioBitrate = json["audioBitrate"] as! Int;
-        self.videoCodec = json["videoCodec"] as! String;
+        self.streamWidth = json["streamWidth"] as! Int
+        self.streamHeight = json["streamHeight"] as! Int
+        self.videoBitrate = json["videoBitrate"] as! Int
+        self.audioBitrate = json["audioBitrate"] as! Int
+        self.videoCodec = json["videoCodec"] as! String
     }
 }
 public protocol AntMediaClientDelegate: AnyObject {
@@ -55,7 +55,6 @@ public protocol AntMediaClientDelegate: AnyObject {
      */
     func localStreamStarted(streamId: String)
 
-    
     /**
      Called when playing is started.
      Triggered by server.
@@ -121,7 +120,7 @@ public protocol AntMediaClientDelegate: AnyObject {
      - evenType: The type of the event
      */
     @available(*, deprecated, message: "Will be removed soon. Use eventHappened(streamId, eventType, payload)")
-    func eventHappened(streamId:String, eventType:String);
+    func eventHappened(streamId: String, eventType: String)
 
     /**
      It's called when there is an event happen such microphone is muted or unmuted for the specific streamId
@@ -130,17 +129,17 @@ public protocol AntMediaClientDelegate: AnyObject {
      - evenType: The type of the event
      - payload: The payload of the event
      */
-    func eventHappened(streamId:String, eventType:String, payload: [String:Any]?)
+    func eventHappened(streamId: String, eventType: String, payload: [String: Any]?)
 
     /**
      It's called when a new track is added to the stream. It works both on multirack streaming and conferencing
      */
-    func trackAdded(track:RTCMediaStreamTrack, stream:[RTCMediaStream])
+    func trackAdded(track: RTCMediaStreamTrack, stream: [RTCMediaStream])
 
     /**
      It's called when a tack is removed. It works both on multitrack streaming and conferencing
      */
-    func trackRemoved(track:RTCMediaStreamTrack)
+    func trackRemoved(track: RTCMediaStreamTrack)
 
     /**
      It's called when server responses to getBroadcastObject method in AntMediaClient.
@@ -150,28 +149,28 @@ public protocol AntMediaClientDelegate: AnyObject {
     /**
      It's called after`registerStatsListener`is `AntMediaClient` is called
      */
-    func onStats(streamId:String, statistics:RTCStatisticsReport);
+    func onStats(streamId: String, statistics: RTCStatisticsReport)
 
     /**
      It's called after join to the room.
      - streamId: the id of the stream tha can be used to publish stream.
         It's not an obligation to publish a stream. It changes according to the project
      */
-    func streamIdToPublish(streamId: String);
+    func streamIdToPublish(streamId: String)
 
     /**
       Called when new streams join to the room
      - streams:  stream id array of the streams that join to the room
      */
     @available(*, deprecated, message: "No need to use. New streams are added automatically. trackAdded is called automatically")
-    func newStreamsJoined(streams: [String]);
+    func newStreamsJoined(streams: [String])
 
     /**
      Called when some streams leaves from the room. So that players can be removed from the user interface
      - streams: stream id array of the stream that leaves from the room
      */
     @available(*, deprecated, message: "No need to use. New streams are removed automatically. trackRemoved is called automatically")
-    func streamsLeft(streams: [String]);
+    func streamsLeft(streams: [String])
 
     /**
      The delegate method that sends audio level of the microphone. , audioLeve is between 0 and 1.
@@ -196,14 +195,14 @@ public extension AntMediaClientDelegate {
     }
 
     func clientDidDisconnect(_ message: String) {
-        AntMediaClient.printf("Websocket is disconnected with this problem:\(message)");
+        AntMediaClient.printf("Websocket is disconnected with this problem:\(message)")
     }
 
-    func trackAdded(track:RTCMediaStreamTrack, stream:[RTCMediaStream]) {
+    func trackAdded(track: RTCMediaStreamTrack, stream: [RTCMediaStream]) {
         AntMediaClient.printf("Track is added with id:\(track.trackId) and kind:\(track.kind)")
     }
 
-    func trackRemoved(track:RTCMediaStreamTrack) {
+    func trackRemoved(track: RTCMediaStreamTrack) {
         AntMediaClient.printf("Track is removed with id:\(track.trackId) and kind:\(track.kind)")
     }
 
@@ -238,7 +237,7 @@ public extension AntMediaClientDelegate {
     func streamInformation(streamInfo: [StreamInformation]) {
         AntMediaClient.printf("Stream information has received")
         for result in streamInfo {
-            AntMediaClient.printf("resolution width:\(result.streamWidth) heigh:\(result.streamHeight) video " + "bitrate:\(result.videoBitrate) audio bitrate:\(result.audioBitrate) codec:\(result.videoCodec)");
+            AntMediaClient.printf("resolution width:\(result.streamWidth) heigh:\(result.streamHeight) video " + "bitrate:\(result.videoBitrate) audio bitrate:\(result.audioBitrate) codec:\(result.videoCodec)")
         }
     }
 
@@ -270,14 +269,13 @@ public extension AntMediaClientDelegate {
         AntMediaClient.printf("onLoadBroadcastObject is called for \(streamId) and incoming response: \(message)")
     }
 
-    func eventHappened(streamId:String, eventType:String, payload: [String:Any]?) {
+    func eventHappened(streamId: String, eventType: String, payload: [String: Any]?) {
         AntMediaClient.printf("\(streamId) \(eventType) with")
         AntMediaClient.printf(payload?.json ?? "")
     }
 
-    func onStats(streamId:String, statistics:RTCStatisticsReport) {
+    func onStats(streamId: String, statistics: RTCStatisticsReport) {
         AntMediaClient.printf("streamId: \(streamId) stats received")
     }
 
 }
-

WebRTCiOSSDK/api/AntMediaError.swift

@@ -15,7 +15,6 @@ class AntMediaError {
                 return "No stream exists on server."
             case "unauthorized_access":
                 return "Unauthorized access: Check your token"
-            
             default:
                 return "An error occured: " + message
         }

WebRTCiOSSDK/api/webrtc/RTCCustomFrameCapturer.swift

@@ -14,57 +14,52 @@ class RTCCustomFrameCapturer: RTCVideoCapturer {
 
     let kNanosecondsPerSecond: Float64 = 1000000000
     var nanoseconds: Float64 = 0
-    var lastSentFrameTimeStampNanoSeconds: Int64 = 0;
+    var lastSentFrameTimeStampNanoSeconds: Int64 = 0
     private var targetHeight: Int
 
-    private var videoEnabled: Bool = true;
-    private var audioEnabled: Bool = true;
+    private var videoEnabled: Bool = true
+    private var audioEnabled: Bool = true
 
-    private var webRTCClient: WebRTCClient?;
-    
-    private var frameRateIntervalNanoSeconds : Float64 = 0;
+    private var webRTCClient: WebRTCClient?
 
+    private var frameRateIntervalNanoSeconds: Float64 = 0
 
     // if externalCapture is true, it means that capture method is called from an external component.
     // externalComponent is the BroadcastExtension
-    private var externalCapture: Bool;
-    
-    private var fps: Int;
+    private var externalCapture: Bool
 
+    private var fps: Int
 
-    init(delegate: RTCVideoCapturerDelegate, height: Int, externalCapture: Bool = false, videoEnabled: Bool = true, audioEnabled: Bool = false, fps: Int = 30)
-    {
+    init(delegate: RTCVideoCapturerDelegate, height: Int, externalCapture: Bool = false, videoEnabled: Bool = true, audioEnabled: Bool = false, fps: Int = 30) {
         self.targetHeight = height
-        self.externalCapture = externalCapture;
+        self.externalCapture = externalCapture
 
         //if external capture is enabled videoEnabled and audioEnabled are ignored
-        self.videoEnabled = videoEnabled;
-        self.audioEnabled = audioEnabled;
-        self.frameRateIntervalNanoSeconds = kNanosecondsPerSecond/Double(fps);
-        self.fps = fps;
+        self.videoEnabled = videoEnabled
+        self.audioEnabled = audioEnabled
+        self.frameRateIntervalNanoSeconds = kNanosecondsPerSecond/Double(fps)
+        self.fps = fps
 
         super.init(delegate: delegate)
-        
     }
 
     public func setWebRTCClient(webRTCClient: WebRTCClient) {
         self.webRTCClient = webRTCClient
     }
 
-    public func capture(_ pixelBuffer: CVPixelBuffer, rotation:RTCVideoRotation, timeStampNs: Int64 )
-    {
+    public func capture(_ pixelBuffer: CVPixelBuffer, rotation: RTCVideoRotation, timeStampNs: Int64 ) {
         if ((Double(timeStampNs) - Double(lastSentFrameTimeStampNanoSeconds)) < frameRateIntervalNanoSeconds ) {
             AntMediaClient.verbose("Dropping frame because high fps than the configured fps: \(fps). Incoming timestampNs:\(timeStampNs) last sent timestampNs:\(lastSentFrameTimeStampNanoSeconds) frameRateIntervalNs:\(frameRateIntervalNanoSeconds)");
-            return;
-            
+            return
         }
 
         let width = Int32(CVPixelBufferGetWidth(pixelBuffer))
         let height = Int32(CVPixelBufferGetHeight(pixelBuffer))
 
-        var scaledWidth = (width * Int32(self.targetHeight)) / height;
-        if (scaledWidth % 2 == 1) {
-            scaledWidth+=1;
+        var scaledWidth = (width * Int32(self.targetHeight)) / height
+        
+        if scaledWidth % 2 == 1 {
+            scaledWidth += 1
         }
 
         let rtcPixelBuffer = RTCCVPixelBuffer(
@@ -74,7 +69,8 @@ class RTCCustomFrameCapturer: RTCVideoCapturer {
             cropWidth: width,
             cropHeight: height,
             cropX: 0,
-            cropY: 0)
+            cropY: 0
+        )
 
         let rtcVideoFrame = RTCVideoFrame(
                     buffer: rtcPixelBuffer,
@@ -83,10 +79,10 @@ class RTCCustomFrameCapturer: RTCVideoCapturer {
                 )
 
         self.delegate?.capturer(self, didCapture: rtcVideoFrame.newI420())
-        lastSentFrameTimeStampNanoSeconds = Int64(timeStampNs);
+        lastSentFrameTimeStampNanoSeconds = Int64(timeStampNs)
     }
 
-    public func capture(_ sampleBuffer: CMSampleBuffer, externalRotation:Int = -1) {
+    public func capture(_ sampleBuffer: CMSampleBuffer, externalRotation: Int = -1) {
 
         if (CMSampleBufferGetNumSamples(sampleBuffer) != 1 || !CMSampleBufferIsValid(sampleBuffer) ||
             !CMSampleBufferDataIsReady(sampleBuffer))
@@ -95,20 +91,16 @@ class RTCCustomFrameCapturer: RTCVideoCapturer {
             return;
         }
 
-        let timeStampNs = CMTimeGetSeconds(CMSampleBufferGetPresentationTimeStamp(sampleBuffer)) *
-            kNanosecondsPerSecond;
+        let timeStampNs = CMTimeGetSeconds(CMSampleBufferGetPresentationTimeStamp(sampleBuffer)) * kNanosecondsPerSecond
 
         if ((Double(timeStampNs) - Double(lastSentFrameTimeStampNanoSeconds)) < frameRateIntervalNanoSeconds ) {
             AntMediaClient.verbose("Dropping frame because high fps than the configured fps: \(fps). Incoming timestampNs:\(timeStampNs) last sent timestampNs:\(lastSentFrameTimeStampNanoSeconds) frameRateIntervalNs:\(frameRateIntervalNanoSeconds)");
-            return;
-            
+            return
         }
 
-        let _pixelBuffer:CVPixelBuffer? = CMSampleBufferGetImageBuffer(sampleBuffer);
+        let _pixelBuffer: CVPixelBuffer? = CMSampleBufferGetImageBuffer(sampleBuffer)
 
-        
-        if let pixelBuffer = _pixelBuffer
-        {
+        if let pixelBuffer = _pixelBuffer {
             //NSLog("Incoming frame width:\(width) height:\(height) adapted width:\(scaledWidth) height:\(self.targetHeight)")
 
             var rotation = RTCVideoRotation._0;
@@ -154,7 +146,6 @@ class RTCCustomFrameCapturer: RTCVideoCapturer {
         else {
             NSLog("Cannot get image buffer");
         }
-        
     }
 
     public func startCapture()
@@ -185,8 +176,7 @@ class RTCCustomFrameCapturer: RTCVideoCapturer {
         }
     }
 
-    public func stopCapture()
-    {
+    public func stopCapture() {
         if !externalCapture {
             let recorder = RPScreenRecorder.shared();
             if (recorder.isRecording) {
@@ -203,7 +193,4 @@ class RTCCustomFrameCapturer: RTCVideoCapturer {
              }
         }
     }
-    
-   
 }
-

WebRTCiOSSDK/api/webrtc/WebRTCClient.swift

@@ -8,33 +8,33 @@
 import Foundation
 import WebRTC
 
-internal protocol WebRTCClientDelegate {
+internal protocol WebRTCClientDelegate: AnyObject {
 
     func sendMessage(_ message: [String: Any])
 
     /**
      It's triggered when remote stream is added to the peer connection.
      */
-    func remoteStreamAdded(streamId:String)
+    func remoteStreamAdded(streamId: String)
 
     /**
      It's called when remote steram is removed from the peer connection
      */
-    func remoteStreamRemoved(streamId:String)
+    func remoteStreamRemoved(streamId: String)
 
     /**
      It's called when a new track is added to the stream
      */
-    func trackAdded(track:RTCMediaStreamTrack, stream:[RTCMediaStream])
+    func trackAdded(track: RTCMediaStreamTrack, stream: [RTCMediaStream])
 
     /**
      It's called when a tack is removed
      */
-    func trackRemoved(track:RTCMediaStreamTrack)
+    func trackRemoved(track: RTCMediaStreamTrack)
 
-    func addLocalStream(streamId:String)
+    func addLocalStream(streamId: String)
 
-    func connectionStateChanged(newState: RTCIceConnectionState, streamId:String);
+    func connectionStateChanged(newState: RTCIceConnectionState, streamId: String)
 
-    func dataReceivedFromDataChannel(didReceiveData data: RTCDataBuffer, streamId:String);
+    func dataReceivedFromDataChannel(didReceiveData data: RTCDataBuffer, streamId: String)
 }