@sbhjt-gr/react-native-webrtc 124.0.3 → 124.0.5

package/ios/RCTWebRTC/WebRTCModule+VideoTrackAdapter.m

@@ -1,166 +1,166 @@
-
-#import <Foundation/Foundation.h>
-#include <libkern/OSAtomic.h>
-#import <objc/runtime.h>
-#import <stdatomic.h>
-
-#import <React/RCTBridge.h>
-#import <React/RCTEventDispatcher.h>
-#import <React/RCTLog.h>
-
-#import <WebRTC/RTCVideoRenderer.h>
-#import <WebRTC/RTCVideoTrack.h>
-
-#import "WebRTCModule+RTCPeerConnection.h"
-#import "WebRTCModule+VideoTrackAdapter.h"
-#import "WebRTCModule.h"
-
-/* Mute detection timer intervals. The initial timeout will be longer to
- * accommodate for source startup.
- */
-static const NSTimeInterval INITIAL_MUTE_DELAY = 3;
-static const NSTimeInterval MUTE_DELAY = 1.5;
-
-/* Entity responsible for detecting track mute / unmute events. It's implemented
- * as a video renderer, which counts the number of frames, and if it sees them
- * stalled for the default interval it will emit a mute event. If frames keep
- * being received, the track unmute event will be emitted.
- */
-@interface TrackMuteDetector : NSObject<RTCVideoRenderer>
-
-@property(copy, nonatomic) NSNumber *peerConnectionId;
-@property(copy, nonatomic) NSString *trackId;
-@property(weak, nonatomic) WebRTCModule *module;
-
-@end
-
-@implementation TrackMuteDetector {
-    BOOL _disposed;
-    atomic_ullong _frameCount;
-    BOOL _muted;
-    dispatch_source_t _timer;
-}
-
-- (instancetype)initWith:(NSNumber *)peerConnectionId trackId:(NSString *)trackId webRTCModule:(WebRTCModule *)module {
-    self = [super init];
-    if (self) {
-        self.peerConnectionId = peerConnectionId;
-        self.trackId = trackId;
-        self.module = module;
-
-        _disposed = NO;
-        _frameCount = 0;
-        _muted = NO;
-        _timer = nil;
-    }
-
-    return self;
-}
-
-- (void)dispose {
-    _disposed = YES;
-    if (_timer != nil) {
-        dispatch_source_cancel(_timer);
-        _timer = nil;
-    }
-}
-
-- (void)emitMuteEvent:(BOOL)muted {
-    [self.module sendEventWithName:kEventMediaStreamTrackMuteChanged
-                              body:@{@"pcId" : self.peerConnectionId, @"trackId" : self.trackId, @"muted" : @(muted)}];
-    RCTLog(@"[VideoTrackAdapter] %@ event for pc %@ track %@",
-           muted ? @"Mute" : @"Unmute",
-           self.peerConnectionId,
-           self.trackId);
-}
-
-- (void)start {
-    if (_disposed) {
-        return;
-    }
-
-    if (_timer != nil) {
-        dispatch_source_cancel(_timer);
-    }
-
-    // Create a timer using GCD, since NSTimer requires a runloop to be present
-    // on the calling thread.
-    _timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_main_queue());
-
-    // Schedule the timer with a larger initial delay than the interval.
-    dispatch_source_set_timer(_timer,
-                              dispatch_time(DISPATCH_TIME_NOW, INITIAL_MUTE_DELAY * NSEC_PER_SEC),
-                              MUTE_DELAY * NSEC_PER_SEC,
-                              (1ull * NSEC_PER_SEC) / 10);
-
-    __block unsigned long long lastFrameCount = _frameCount;
-    dispatch_source_set_event_handler(_timer, ^() {
-        if (self->_disposed) {
-            return;
-        }
-
-        BOOL isMuted = lastFrameCount == self->_frameCount;
-        if (isMuted != self->_muted) {
-            self->_muted = isMuted;
-            [self emitMuteEvent:isMuted];
-        }
-
-        lastFrameCount = self->_frameCount;
-    });
-
-    dispatch_resume(_timer);
-}
-
-- (void)renderFrame:(nullable RTCVideoFrame *)frame {
-    atomic_fetch_add(&_frameCount, 1);
-}
-
-- (void)setSize:(CGSize)size {
-    // XXX unneeded for our purposes, but part of RTCVideoRenderer.
-}
-
-@end
-
-@implementation RTCPeerConnection (VideoTrackAdapter)
-
-- (NSMutableDictionary<NSString *, id> *)videoTrackAdapters {
-    return objc_getAssociatedObject(self, _cmd);
-}
-
-- (void)setVideoTrackAdapters:(NSMutableDictionary<NSString *, id> *)videoTrackAdapters {
-    objc_setAssociatedObject(
-        self, @selector(videoTrackAdapters), videoTrackAdapters, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (void)addVideoTrackAdapter:(RTCVideoTrack *)track {
-    NSString *trackId = track.trackId;
-    if ([self.videoTrackAdapters objectForKey:trackId] != nil) {
-        RCTLogWarn(@"[VideoTrackAdapter] Adapter already exists for track %@", trackId);
-        return;
-    }
-
-    TrackMuteDetector *muteDetector = [[TrackMuteDetector alloc] initWith:self.reactTag
-                                                                  trackId:trackId
-                                                             webRTCModule:self.webRTCModule];
-    [self.videoTrackAdapters setObject:muteDetector forKey:trackId];
-    [track addRenderer:muteDetector];
-    [muteDetector start];
-
-    RCTLogTrace(@"[VideoTrackAdapter] Adapter created for track %@", trackId);
-}
-
-- (void)removeVideoTrackAdapter:(RTCVideoTrack *)track {
-    NSString *trackId = track.trackId;
-    TrackMuteDetector *muteDetector = [self.videoTrackAdapters objectForKey:trackId];
-    if (muteDetector == nil) {
-        RCTLogWarn(@"[VideoTrackAdapter] Adapter doesn't exist for track %@", trackId);
-        return;
-    }
-
-    [track removeRenderer:muteDetector];
-    [muteDetector dispose];
-    [self.videoTrackAdapters removeObjectForKey:trackId];
-    RCTLogTrace(@"[VideoTrackAdapter] Adapter removed for track %@", trackId);
-}
-
-@end
+
+#import <Foundation/Foundation.h>
+#include <libkern/OSAtomic.h>
+#import <objc/runtime.h>
+#import <stdatomic.h>
+
+#import <React/RCTBridge.h>
+#import <React/RCTEventDispatcher.h>
+#import <React/RCTLog.h>
+
+#import <WebRTC/RTCVideoRenderer.h>
+#import <WebRTC/RTCVideoTrack.h>
+
+#import "WebRTCModule+RTCPeerConnection.h"
+#import "WebRTCModule+VideoTrackAdapter.h"
+#import "WebRTCModule.h"
+
+/* Mute detection timer intervals. The initial timeout will be longer to
+ * accommodate for source startup.
+ */
+static const NSTimeInterval INITIAL_MUTE_DELAY = 3;
+static const NSTimeInterval MUTE_DELAY = 1.5;
+
+/* Entity responsible for detecting track mute / unmute events. It's implemented
+ * as a video renderer, which counts the number of frames, and if it sees them
+ * stalled for the default interval it will emit a mute event. If frames keep
+ * being received, the track unmute event will be emitted.
+ */
+@interface TrackMuteDetector : NSObject<RTCVideoRenderer>
+
+@property(copy, nonatomic) NSNumber *peerConnectionId;
+@property(copy, nonatomic) NSString *trackId;
+@property(weak, nonatomic) WebRTCModule *module;
+
+@end
+
+@implementation TrackMuteDetector {
+    BOOL _disposed;
+    atomic_ullong _frameCount;
+    BOOL _muted;
+    dispatch_source_t _timer;
+}
+
+- (instancetype)initWith:(NSNumber *)peerConnectionId trackId:(NSString *)trackId webRTCModule:(WebRTCModule *)module {
+    self = [super init];
+    if (self) {
+        self.peerConnectionId = peerConnectionId;
+        self.trackId = trackId;
+        self.module = module;
+
+        _disposed = NO;
+        _frameCount = 0;
+        _muted = NO;
+        _timer = nil;
+    }
+
+    return self;
+}
+
+- (void)dispose {
+    _disposed = YES;
+    if (_timer != nil) {
+        dispatch_source_cancel(_timer);
+        _timer = nil;
+    }
+}
+
+- (void)emitMuteEvent:(BOOL)muted {
+    [self.module sendEventWithName:kEventMediaStreamTrackMuteChanged
+                              body:@{@"pcId" : self.peerConnectionId, @"trackId" : self.trackId, @"muted" : @(muted)}];
+    RCTLog(@"[VideoTrackAdapter] %@ event for pc %@ track %@",
+           muted ? @"Mute" : @"Unmute",
+           self.peerConnectionId,
+           self.trackId);
+}
+
+- (void)start {
+    if (_disposed) {
+        return;
+    }
+
+    if (_timer != nil) {
+        dispatch_source_cancel(_timer);
+    }
+
+    // Create a timer using GCD, since NSTimer requires a runloop to be present
+    // on the calling thread.
+    _timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_main_queue());
+
+    // Schedule the timer with a larger initial delay than the interval.
+    dispatch_source_set_timer(_timer,
+                              dispatch_time(DISPATCH_TIME_NOW, INITIAL_MUTE_DELAY * NSEC_PER_SEC),
+                              MUTE_DELAY * NSEC_PER_SEC,
+                              (1ull * NSEC_PER_SEC) / 10);
+
+    __block unsigned long long lastFrameCount = _frameCount;
+    dispatch_source_set_event_handler(_timer, ^() {
+        if (self->_disposed) {
+            return;
+        }
+
+        BOOL isMuted = lastFrameCount == self->_frameCount;
+        if (isMuted != self->_muted) {
+            self->_muted = isMuted;
+            [self emitMuteEvent:isMuted];
+        }
+
+        lastFrameCount = self->_frameCount;
+    });
+
+    dispatch_resume(_timer);
+}
+
+- (void)renderFrame:(nullable RTCVideoFrame *)frame {
+    atomic_fetch_add(&_frameCount, 1);
+}
+
+- (void)setSize:(CGSize)size {
+    // XXX unneeded for our purposes, but part of RTCVideoRenderer.
+}
+
+@end
+
+@implementation RTCPeerConnection (VideoTrackAdapter)
+
+- (NSMutableDictionary<NSString *, id> *)videoTrackAdapters {
+    return objc_getAssociatedObject(self, _cmd);
+}
+
+- (void)setVideoTrackAdapters:(NSMutableDictionary<NSString *, id> *)videoTrackAdapters {
+    objc_setAssociatedObject(
+        self, @selector(videoTrackAdapters), videoTrackAdapters, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+- (void)addVideoTrackAdapter:(RTCVideoTrack *)track {
+    NSString *trackId = track.trackId;
+    if ([self.videoTrackAdapters objectForKey:trackId] != nil) {
+        RCTLogWarn(@"[VideoTrackAdapter] Adapter already exists for track %@", trackId);
+        return;
+    }
+
+    TrackMuteDetector *muteDetector = [[TrackMuteDetector alloc] initWith:self.reactTag
+                                                                  trackId:trackId
+                                                             webRTCModule:self.webRTCModule];
+    [self.videoTrackAdapters setObject:muteDetector forKey:trackId];
+    [track addRenderer:muteDetector];
+    [muteDetector start];
+
+    RCTLogTrace(@"[VideoTrackAdapter] Adapter created for track %@", trackId);
+}
+
+- (void)removeVideoTrackAdapter:(RTCVideoTrack *)track {
+    NSString *trackId = track.trackId;
+    TrackMuteDetector *muteDetector = [self.videoTrackAdapters objectForKey:trackId];
+    if (muteDetector == nil) {
+        RCTLogWarn(@"[VideoTrackAdapter] Adapter doesn't exist for track %@", trackId);
+        return;
+    }
+
+    [track removeRenderer:muteDetector];
+    [muteDetector dispose];
+    [self.videoTrackAdapters removeObjectForKey:trackId];
+    RCTLogTrace(@"[VideoTrackAdapter] Adapter removed for track %@", trackId);
+}
+
+@end

package/ios/RCTWebRTC/WebRTCModule.h

@@ -1,58 +1,58 @@
-#import <AVFoundation/AVFoundation.h>
-#import <Foundation/Foundation.h>
-
-#import <React/RCTBridgeModule.h>
-#import <React/RCTConvert.h>
-#import <React/RCTEventEmitter.h>
-
-#import <WebRTC/WebRTC.h>
-
-@class PalabraClient;
-@class WLVAudioDevice;
-
-static NSString *const kEventPeerConnectionSignalingStateChanged = @"peerConnectionSignalingStateChanged";
-static NSString *const kEventPeerConnectionStateChanged = @"peerConnectionStateChanged";
-static NSString *const kEventPeerConnectionOnRenegotiationNeeded = @"peerConnectionOnRenegotiationNeeded";
-static NSString *const kEventPeerConnectionIceConnectionChanged = @"peerConnectionIceConnectionChanged";
-static NSString *const kEventPeerConnectionIceGatheringChanged = @"peerConnectionIceGatheringChanged";
-static NSString *const kEventPeerConnectionGotICECandidate = @"peerConnectionGotICECandidate";
-static NSString *const kEventPeerConnectionDidOpenDataChannel = @"peerConnectionDidOpenDataChannel";
-static NSString *const kEventDataChannelDidChangeBufferedAmount = @"dataChannelDidChangeBufferedAmount";
-static NSString *const kEventDataChannelStateChanged = @"dataChannelStateChanged";
-static NSString *const kEventDataChannelReceiveMessage = @"dataChannelReceiveMessage";
-static NSString *const kEventMediaStreamTrackMuteChanged = @"mediaStreamTrackMuteChanged";
-static NSString *const kEventMediaStreamTrackEnded = @"mediaStreamTrackEnded";
-static NSString *const kEventPeerConnectionOnRemoveTrack = @"peerConnectionOnRemoveTrack";
-static NSString *const kEventPeerConnectionOnTrack = @"peerConnectionOnTrack";
-static NSString *const kEventFrameCryptionStateChanged = @"frameCryptionStateChanged";
-static NSString *const kEventPalabraTranscription = @"palabraTranscription";
-static NSString *const kEventPalabraConnectionState = @"palabraConnectionState";
-static NSString *const kEventPalabraError = @"palabraError";
-static NSString *const kEventAudioSamples = @"audioSamples";
-
-@interface WebRTCModule : RCTEventEmitter<RCTBridgeModule>
-
-@property(nonatomic, strong) dispatch_queue_t workerQueue;
-
-@property(nonatomic, strong) RTCPeerConnectionFactory *peerConnectionFactory;
-@property(nonatomic, strong) id<RTCVideoDecoderFactory> decoderFactory;
-@property(nonatomic, strong) id<RTCVideoEncoderFactory> encoderFactory;
-
-@property(nonatomic, strong) NSMutableDictionary<NSNumber *, RTCPeerConnection *> *peerConnections;
-@property(nonatomic, strong) NSMutableDictionary<NSString *, RTCMediaStream *> *localStreams;
-@property(nonatomic, strong) NSMutableDictionary<NSString *, RTCMediaStreamTrack *> *localTracks;
-
-@property(nonatomic, strong) NSMutableDictionary<NSString *, RTCFrameCryptor *> *frameCryptors;
-@property(nonatomic, strong) NSMutableDictionary<NSString *, RTCFrameCryptorKeyProvider *> *keyProviders;
-@property(nonatomic, strong) NSMutableDictionary<NSString *, RTCDataPacketCryptor *> *dataPacketCryptors;
-
-@property(nonatomic, strong) NSMutableDictionary<NSString *, id<RTCAudioRenderer>> *audioRenderers;
-
-@property(nonatomic, strong) WLVAudioDevice *virtualAudioDevice;
-
-@property(nonatomic, strong) PalabraClient *palabraClient;
-
-- (RTCMediaStream *)streamForReactTag:(NSString *)reactTag;
-- (RTCPeerConnectionFactory *)virtualFactory;
-
-@end
+#import <AVFoundation/AVFoundation.h>
+#import <Foundation/Foundation.h>
+
+#import <React/RCTBridgeModule.h>
+#import <React/RCTConvert.h>
+#import <React/RCTEventEmitter.h>
+
+#import <WebRTC/WebRTC.h>
+
+@class PalabraClient;
+@class WLVAudioDevice;
+
+static NSString *const kEventPeerConnectionSignalingStateChanged = @"peerConnectionSignalingStateChanged";
+static NSString *const kEventPeerConnectionStateChanged = @"peerConnectionStateChanged";
+static NSString *const kEventPeerConnectionOnRenegotiationNeeded = @"peerConnectionOnRenegotiationNeeded";
+static NSString *const kEventPeerConnectionIceConnectionChanged = @"peerConnectionIceConnectionChanged";
+static NSString *const kEventPeerConnectionIceGatheringChanged = @"peerConnectionIceGatheringChanged";
+static NSString *const kEventPeerConnectionGotICECandidate = @"peerConnectionGotICECandidate";
+static NSString *const kEventPeerConnectionDidOpenDataChannel = @"peerConnectionDidOpenDataChannel";
+static NSString *const kEventDataChannelDidChangeBufferedAmount = @"dataChannelDidChangeBufferedAmount";
+static NSString *const kEventDataChannelStateChanged = @"dataChannelStateChanged";
+static NSString *const kEventDataChannelReceiveMessage = @"dataChannelReceiveMessage";
+static NSString *const kEventMediaStreamTrackMuteChanged = @"mediaStreamTrackMuteChanged";
+static NSString *const kEventMediaStreamTrackEnded = @"mediaStreamTrackEnded";
+static NSString *const kEventPeerConnectionOnRemoveTrack = @"peerConnectionOnRemoveTrack";
+static NSString *const kEventPeerConnectionOnTrack = @"peerConnectionOnTrack";
+static NSString *const kEventFrameCryptionStateChanged = @"frameCryptionStateChanged";
+static NSString *const kEventPalabraTranscription = @"palabraTranscription";
+static NSString *const kEventPalabraConnectionState = @"palabraConnectionState";
+static NSString *const kEventPalabraError = @"palabraError";
+static NSString *const kEventAudioSamples = @"audioSamples";
+
+@interface WebRTCModule : RCTEventEmitter<RCTBridgeModule>
+
+@property(nonatomic, strong) dispatch_queue_t workerQueue;
+
+@property(nonatomic, strong) RTCPeerConnectionFactory *peerConnectionFactory;
+@property(nonatomic, strong) id<RTCVideoDecoderFactory> decoderFactory;
+@property(nonatomic, strong) id<RTCVideoEncoderFactory> encoderFactory;
+
+@property(nonatomic, strong) NSMutableDictionary<NSNumber *, RTCPeerConnection *> *peerConnections;
+@property(nonatomic, strong) NSMutableDictionary<NSString *, RTCMediaStream *> *localStreams;
+@property(nonatomic, strong) NSMutableDictionary<NSString *, RTCMediaStreamTrack *> *localTracks;
+
+@property(nonatomic, strong) NSMutableDictionary<NSString *, RTCFrameCryptor *> *frameCryptors;
+@property(nonatomic, strong) NSMutableDictionary<NSString *, RTCFrameCryptorKeyProvider *> *keyProviders;
+@property(nonatomic, strong) NSMutableDictionary<NSString *, RTCDataPacketCryptor *> *dataPacketCryptors;
+
+@property(nonatomic, strong) NSMutableDictionary<NSString *, id<RTCAudioRenderer>> *audioRenderers;
+
+@property(nonatomic, strong) WLVAudioDevice *virtualAudioDevice;
+
+@property(nonatomic, strong) PalabraClient *palabraClient;
+
+- (RTCMediaStream *)streamForReactTag:(NSString *)reactTag;
+- (RTCPeerConnectionFactory *)virtualFactory;
+
+@end