@sbhjt-gr/react-native-webrtc 124.0.2 → 124.0.4

package/ios/RCTWebRTC/SampleBufferVideoCallView.h

@@ -1,12 +1,12 @@
-#import <AVKit/AVKit.h>
-#import <Foundation/Foundation.h>
-#import <React/RCTViewManager.h>
-#import <WebRTC/RTCVideoRenderer.h>
-
-@interface SampleBufferVideoCallView : UIView<RTCVideoRenderer>
-
-@property(nonnull, nonatomic, readonly) AVSampleBufferDisplayLayer *sampleBufferLayer;
-@property(nonatomic, assign) BOOL shouldRender;
-
-- (void)requestScaleRecalculation;
-@end
+#import <AVKit/AVKit.h>
+#import <Foundation/Foundation.h>
+#import <React/RCTViewManager.h>
+#import <WebRTC/RTCVideoRenderer.h>
+
+@interface SampleBufferVideoCallView : UIView<RTCVideoRenderer>
+
+@property(nonnull, nonatomic, readonly) AVSampleBufferDisplayLayer *sampleBufferLayer;
+@property(nonatomic, assign) BOOL shouldRender;
+
+- (void)requestScaleRecalculation;
+@end

package/ios/RCTWebRTC/SampleBufferVideoCallView.m

@@ -1,178 +1,178 @@
-#import "SampleBufferVideoCallView.h"
-#import <Accelerate/Accelerate.h>
-#import <WebRTC/WebRTC.h>
-#import "I420Converter.h"
-
-@protocol SampleBufferRendering<AVQueuedSampleBufferRendering>
-
-- (BOOL)requiresFlushToResumeDecoding;
-
-@end
-
-/** These classes already implement the required methods. */
-@interface AVSampleBufferDisplayLayer ()<SampleBufferRendering>
-@end
-@interface AVSampleBufferVideoRenderer ()<SampleBufferRendering>
-@end
-
-@interface SampleBufferVideoCallView ()
-
-@property(nonatomic, retain) I420Converter *i420Converter;
-@property(nonatomic, strong) id<SampleBufferRendering> renderer;
-@property(nonatomic, assign) NSInteger currentRotation;
-
-@end
-
-@implementation SampleBufferVideoCallView
-
-+ (Class)layerClass {
-    return [AVSampleBufferDisplayLayer class];
-}
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    if (self = [super initWithFrame:frame]) {
-        [[NSNotificationCenter defaultCenter] addObserver:self
-                                                 selector:@selector(layerFailedToDecode:)
-                                                     name:AVSampleBufferDisplayLayerFailedToDecodeNotification
-                                                   object:self.sampleBufferLayer];
-        if (@available(iOS 17.0, *)) {
-            _renderer = self.sampleBufferLayer.sampleBufferRenderer;
-        } else {
-            _renderer = self.sampleBufferLayer;
-        }
-    }
-    return self;
-}
-
-- (void)layerFailedToDecode:(NSNotification *)note {
-    NSError *error = [[note userInfo] valueForKey:AVSampleBufferDisplayLayerFailedToDecodeNotificationErrorKey];
-    NSLog(@"layerFailedToDecode, error: %@", [error localizedDescription]);
-}
-
-- (AVSampleBufferDisplayLayer *)sampleBufferLayer {
-    return (AVSampleBufferDisplayLayer *)self.layer;
-}
-
-- (void)requestScaleRecalculation {
-    _currentRotation = -1;
-}
-
-- (void)recalculateScale:(RTCVideoRotation)rotation {
-    if (self.currentRotation != rotation) {
-        self.currentRotation = rotation;
-
-        CGFloat scale = 1;
-        if (rotation == 90 || rotation == 270) {
-            CGSize size = self.bounds.size;
-            scale = size.height / size.width;
-        }
-
-        self.sampleBufferLayer.transform = CATransform3DConcat(
-            CATransform3DMakeRotation(rotation / 180.0 * M_PI, 0.0, 0.0, 1.0), CATransform3DMakeScale(scale, scale, 1));
-    }
-}
-
-/** The size of the video frame. */
-- (void)setSize:(CGSize)size {
-}
-
-/** The frame to be displayed. */
-- (void)renderFrame:(nullable RTC_OBJC_TYPE(RTCVideoFrame) *)frame {
-    if (!_shouldRender) {
-        return;
-    }
-
-    // Convert RTCVideoFrame to CMSampleBuffer
-    CMSampleBufferRef sampleBuffer = [self sampleBufferFrom:frame];
-    if (sampleBuffer == nil) {
-        return;
-    }
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        if (self.renderer.requiresFlushToResumeDecoding) {
-            [self.renderer flush];
-        }
-
-        if (!self.renderer.readyForMoreMediaData) {
-            return;
-        }
-
-        [self recalculateScale:frame.rotation];
-
-        // Display the CMSampleBuffer using AVSampleBufferDisplayLayer
-        [self.renderer enqueueSampleBuffer:sampleBuffer];
-        CFRelease(sampleBuffer);
-    });
-}
-
-- (CMSampleBufferRef)sampleBufferFrom:(RTCVideoFrame *)rtcVideoFrame {
-    // Convert RTCVideoFrame to CMSampleBuffer
-
-    // Assuming your RTCVideoFrame contains pixelBuffer
-    CVPixelBufferRef pixelBuffer = [self pixelBufferFrom:rtcVideoFrame];
-    if (!pixelBuffer) {
-        return nil;
-    }
-
-    // Create a CMVideoFormatDescription
-    CMVideoFormatDescriptionRef formatDescription;
-    CMVideoFormatDescriptionCreateForImageBuffer(kCFAllocatorDefault, pixelBuffer, &formatDescription);
-
-    // Create CMSampleTimingInfo
-    // Timescale is 90khz according to RTCVideoFrame.h
-    CMSampleTimingInfo timingInfo;
-    timingInfo.presentationTimeStamp = CMTimeMake(rtcVideoFrame.timeStamp, 90000);
-    timingInfo.decodeTimeStamp = CMTimeMake(rtcVideoFrame.timeStamp, 90000);
-
-    // Create CMSampleBuffer
-    CMSampleBufferRef sampleBuffer;
-    CMSampleBufferCreateForImageBuffer(
-        kCFAllocatorDefault, pixelBuffer, true, nil, nil, formatDescription, &timingInfo, &sampleBuffer);
-
-    CFArrayRef attachments = CMSampleBufferGetSampleAttachmentsArray(sampleBuffer, YES);
-    CFMutableDictionaryRef dict = (CFMutableDictionaryRef)CFArrayGetValueAtIndex(attachments, 0);
-
-    CFDictionarySetValue(dict, kCMSampleAttachmentKey_DisplayImmediately, kCFBooleanTrue);
-    CVPixelBufferRelease(pixelBuffer);
-    return sampleBuffer;
-}
-
-/**
- * The CVPixelBufferRef returned from this function must be released when finished using it.
- */
-- (CVPixelBufferRef)pixelBufferFrom:(RTCVideoFrame *)videoFrame {
-    if ([videoFrame.buffer isKindOfClass:[RTCCVPixelBuffer class]]) {
-        CVPixelBufferRef pixelBuffer = [((RTCCVPixelBuffer *)videoFrame.buffer) pixelBuffer];
-        CVPixelBufferRetain(pixelBuffer);
-        return [((RTCCVPixelBuffer *)videoFrame.buffer) pixelBuffer];
-    } else {
-        return [self pixelBufferFromI420:[videoFrame.buffer toI420]];
-    }
-}
-
-/**
- * The CVPixelBufferRef returned from this function must be released when finished using it.
- */
-- (CVPixelBufferRef)pixelBufferFromI420:(RTCI420Buffer *)i420Buffer {
-    if (_i420Converter == nil) {
-        I420Converter *converter = [[I420Converter alloc] init];
-        vImage_Error err = [converter prepareForAccelerateConversion];
-
-        if (err != kvImageNoError) {
-            NSLog(@"Error when preparing i420Converter: %ld", err);
-            return NULL;
-        }
-
-        _i420Converter = converter;
-    }
-
-    CVPixelBufferRef convertedPixelBuffer = [_i420Converter convertI420ToPixelBuffer:i420Buffer];
-
-    return convertedPixelBuffer;
-}
-
-- (void)dealloc {
-    [_i420Converter unprepareForAccelerateConversion];
-}
-
-@end
+#import "SampleBufferVideoCallView.h"
+#import <Accelerate/Accelerate.h>
+#import <WebRTC/WebRTC.h>
+#import "I420Converter.h"
+
+@protocol SampleBufferRendering<AVQueuedSampleBufferRendering>
+
+- (BOOL)requiresFlushToResumeDecoding;
+
+@end
+
+/** These classes already implement the required methods. */
+@interface AVSampleBufferDisplayLayer ()<SampleBufferRendering>
+@end
+@interface AVSampleBufferVideoRenderer ()<SampleBufferRendering>
+@end
+
+@interface SampleBufferVideoCallView ()
+
+@property(nonatomic, retain) I420Converter *i420Converter;
+@property(nonatomic, strong) id<SampleBufferRendering> renderer;
+@property(nonatomic, assign) NSInteger currentRotation;
+
+@end
+
+@implementation SampleBufferVideoCallView
+
++ (Class)layerClass {
+    return [AVSampleBufferDisplayLayer class];
+}
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    if (self = [super initWithFrame:frame]) {
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(layerFailedToDecode:)
+                                                     name:AVSampleBufferDisplayLayerFailedToDecodeNotification
+                                                   object:self.sampleBufferLayer];
+        if (@available(iOS 17.0, *)) {
+            _renderer = self.sampleBufferLayer.sampleBufferRenderer;
+        } else {
+            _renderer = self.sampleBufferLayer;
+        }
+    }
+    return self;
+}
+
+- (void)layerFailedToDecode:(NSNotification *)note {
+    NSError *error = [[note userInfo] valueForKey:AVSampleBufferDisplayLayerFailedToDecodeNotificationErrorKey];
+    NSLog(@"layerFailedToDecode, error: %@", [error localizedDescription]);
+}
+
+- (AVSampleBufferDisplayLayer *)sampleBufferLayer {
+    return (AVSampleBufferDisplayLayer *)self.layer;
+}
+
+- (void)requestScaleRecalculation {
+    _currentRotation = -1;
+}
+
+- (void)recalculateScale:(RTCVideoRotation)rotation {
+    if (self.currentRotation != rotation) {
+        self.currentRotation = rotation;
+
+        CGFloat scale = 1;
+        if (rotation == 90 || rotation == 270) {
+            CGSize size = self.bounds.size;
+            scale = size.height / size.width;
+        }
+
+        self.sampleBufferLayer.transform = CATransform3DConcat(
+            CATransform3DMakeRotation(rotation / 180.0 * M_PI, 0.0, 0.0, 1.0), CATransform3DMakeScale(scale, scale, 1));
+    }
+}
+
+/** The size of the video frame. */
+- (void)setSize:(CGSize)size {
+}
+
+/** The frame to be displayed. */
+- (void)renderFrame:(nullable RTC_OBJC_TYPE(RTCVideoFrame) *)frame {
+    if (!_shouldRender) {
+        return;
+    }
+
+    // Convert RTCVideoFrame to CMSampleBuffer
+    CMSampleBufferRef sampleBuffer = [self sampleBufferFrom:frame];
+    if (sampleBuffer == nil) {
+        return;
+    }
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (self.renderer.requiresFlushToResumeDecoding) {
+            [self.renderer flush];
+        }
+
+        if (!self.renderer.readyForMoreMediaData) {
+            return;
+        }
+
+        [self recalculateScale:frame.rotation];
+
+        // Display the CMSampleBuffer using AVSampleBufferDisplayLayer
+        [self.renderer enqueueSampleBuffer:sampleBuffer];
+        CFRelease(sampleBuffer);
+    });
+}
+
+- (CMSampleBufferRef)sampleBufferFrom:(RTCVideoFrame *)rtcVideoFrame {
+    // Convert RTCVideoFrame to CMSampleBuffer
+
+    // Assuming your RTCVideoFrame contains pixelBuffer
+    CVPixelBufferRef pixelBuffer = [self pixelBufferFrom:rtcVideoFrame];
+    if (!pixelBuffer) {
+        return nil;
+    }
+
+    // Create a CMVideoFormatDescription
+    CMVideoFormatDescriptionRef formatDescription;
+    CMVideoFormatDescriptionCreateForImageBuffer(kCFAllocatorDefault, pixelBuffer, &formatDescription);
+
+    // Create CMSampleTimingInfo
+    // Timescale is 90khz according to RTCVideoFrame.h
+    CMSampleTimingInfo timingInfo;
+    timingInfo.presentationTimeStamp = CMTimeMake(rtcVideoFrame.timeStamp, 90000);
+    timingInfo.decodeTimeStamp = CMTimeMake(rtcVideoFrame.timeStamp, 90000);
+
+    // Create CMSampleBuffer
+    CMSampleBufferRef sampleBuffer;
+    CMSampleBufferCreateForImageBuffer(
+        kCFAllocatorDefault, pixelBuffer, true, nil, nil, formatDescription, &timingInfo, &sampleBuffer);
+
+    CFArrayRef attachments = CMSampleBufferGetSampleAttachmentsArray(sampleBuffer, YES);
+    CFMutableDictionaryRef dict = (CFMutableDictionaryRef)CFArrayGetValueAtIndex(attachments, 0);
+
+    CFDictionarySetValue(dict, kCMSampleAttachmentKey_DisplayImmediately, kCFBooleanTrue);
+    CVPixelBufferRelease(pixelBuffer);
+    return sampleBuffer;
+}
+
+/**
+ * The CVPixelBufferRef returned from this function must be released when finished using it.
+ */
+- (CVPixelBufferRef)pixelBufferFrom:(RTCVideoFrame *)videoFrame {
+    if ([videoFrame.buffer isKindOfClass:[RTCCVPixelBuffer class]]) {
+        CVPixelBufferRef pixelBuffer = [((RTCCVPixelBuffer *)videoFrame.buffer) pixelBuffer];
+        CVPixelBufferRetain(pixelBuffer);
+        return [((RTCCVPixelBuffer *)videoFrame.buffer) pixelBuffer];
+    } else {
+        return [self pixelBufferFromI420:[videoFrame.buffer toI420]];
+    }
+}
+
+/**
+ * The CVPixelBufferRef returned from this function must be released when finished using it.
+ */
+- (CVPixelBufferRef)pixelBufferFromI420:(RTCI420Buffer *)i420Buffer {
+    if (_i420Converter == nil) {
+        I420Converter *converter = [[I420Converter alloc] init];
+        vImage_Error err = [converter prepareForAccelerateConversion];
+
+        if (err != kvImageNoError) {
+            NSLog(@"Error when preparing i420Converter: %ld", err);
+            return NULL;
+        }
+
+        _i420Converter = converter;
+    }
+
+    CVPixelBufferRef convertedPixelBuffer = [_i420Converter convertI420ToPixelBuffer:i420Buffer];
+
+    return convertedPixelBuffer;
+}
+
+- (void)dealloc {
+    [_i420Converter unprepareForAccelerateConversion];
+}
+
+@end

package/ios/RCTWebRTC/ScreenCaptureController.h

@@ -1,20 +1,20 @@
-#import <Foundation/Foundation.h>
-#import "CaptureController.h"
-#import "CapturerEventsDelegate.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-extern NSString *const kRTCScreensharingSocketFD;
-extern NSString *const kRTCAppGroupIdentifier;
-
-@class ScreenCapturer;
-
-@interface ScreenCaptureController : CaptureController
-
-- (instancetype)initWithCapturer:(nonnull ScreenCapturer *)capturer;
-- (void)startCapture;
-- (void)stopCapture;
-
-@end
-
-NS_ASSUME_NONNULL_END
+#import <Foundation/Foundation.h>
+#import "CaptureController.h"
+#import "CapturerEventsDelegate.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+extern NSString *const kRTCScreensharingSocketFD;
+extern NSString *const kRTCAppGroupIdentifier;
+
+@class ScreenCapturer;
+
+@interface ScreenCaptureController : CaptureController
+
+- (instancetype)initWithCapturer:(nonnull ScreenCapturer *)capturer;
+- (void)startCapture;
+- (void)stopCapture;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/RCTWebRTC/ScreenCaptureController.m

@@ -1,83 +1,83 @@
-#if TARGET_OS_IOS
-
-#import "ScreenCaptureController.h"
-#import "ScreenCapturer.h"
-#import "SocketConnection.h"
-
-NSString *const kRTCScreensharingSocketFD = @"rtc_SSFD";
-NSString *const kRTCAppGroupIdentifier = @"RTCAppGroupIdentifier";
-
-@interface ScreenCaptureController ()
-
-@property(nonatomic, retain) ScreenCapturer *capturer;
-
-@end
-
-@interface ScreenCaptureController (CapturerEventsDelegate)<CapturerEventsDelegate>
-- (void)capturerDidEnd:(RTCVideoCapturer *)capturer;
-@end
-
-@interface ScreenCaptureController (Private)
-
-@property(nonatomic, readonly) NSString *appGroupIdentifier;
-
-@end
-
-@implementation ScreenCaptureController
-
-- (instancetype)initWithCapturer:(nonnull ScreenCapturer *)capturer {
-    self = [super init];
-    if (self) {
-        self.capturer = capturer;
-        self.deviceId = @"screen-capture";
-    }
-
-    return self;
-}
-
-- (void)dealloc {
-    [self.capturer stopCapture];
-}
-
-- (void)startCapture {
-    if (!self.appGroupIdentifier) {
-        return;
-    }
-
-    self.capturer.eventsDelegate = self;
-    NSString *socketFilePath = [self filePathForApplicationGroupIdentifier:self.appGroupIdentifier];
-    SocketConnection *connection = [[SocketConnection alloc] initWithFilePath:socketFilePath];
-    [self.capturer startCaptureWithConnection:connection];
-}
-
-- (void)stopCapture {
-    [self.capturer stopCapture];
-}
-
-- (NSDictionary *)getSettings {
-    return @{@"deviceId" : self.deviceId, @"groupId" : @"", @"frameRate" : @(30)};
-}
-// MARK: CapturerEventsDelegate Methods
-
-- (void)capturerDidEnd:(RTCVideoCapturer *)capturer {
-    [self.eventsDelegate capturerDidEnd:capturer];
-}
-
-// MARK: Private Methods
-
-- (NSString *)appGroupIdentifier {
-    NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
-    return infoDictionary[kRTCAppGroupIdentifier];
-}
-
-- (NSString *)filePathForApplicationGroupIdentifier:(nonnull NSString *)identifier {
-    NSURL *sharedContainer =
-        [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:identifier];
-    NSString *socketFilePath = [[sharedContainer URLByAppendingPathComponent:kRTCScreensharingSocketFD] path];
-
-    return socketFilePath;
-}
-
-@end
-
+#if TARGET_OS_IOS
+
+#import "ScreenCaptureController.h"
+#import "ScreenCapturer.h"
+#import "SocketConnection.h"
+
+NSString *const kRTCScreensharingSocketFD = @"rtc_SSFD";
+NSString *const kRTCAppGroupIdentifier = @"RTCAppGroupIdentifier";
+
+@interface ScreenCaptureController ()
+
+@property(nonatomic, retain) ScreenCapturer *capturer;
+
+@end
+
+@interface ScreenCaptureController (CapturerEventsDelegate)<CapturerEventsDelegate>
+- (void)capturerDidEnd:(RTCVideoCapturer *)capturer;
+@end
+
+@interface ScreenCaptureController (Private)
+
+@property(nonatomic, readonly) NSString *appGroupIdentifier;
+
+@end
+
+@implementation ScreenCaptureController
+
+- (instancetype)initWithCapturer:(nonnull ScreenCapturer *)capturer {
+    self = [super init];
+    if (self) {
+        self.capturer = capturer;
+        self.deviceId = @"screen-capture";
+    }
+
+    return self;
+}
+
+- (void)dealloc {
+    [self.capturer stopCapture];
+}
+
+- (void)startCapture {
+    if (!self.appGroupIdentifier) {
+        return;
+    }
+
+    self.capturer.eventsDelegate = self;
+    NSString *socketFilePath = [self filePathForApplicationGroupIdentifier:self.appGroupIdentifier];
+    SocketConnection *connection = [[SocketConnection alloc] initWithFilePath:socketFilePath];
+    [self.capturer startCaptureWithConnection:connection];
+}
+
+- (void)stopCapture {
+    [self.capturer stopCapture];
+}
+
+- (NSDictionary *)getSettings {
+    return @{@"deviceId" : self.deviceId, @"groupId" : @"", @"frameRate" : @(30)};
+}
+// MARK: CapturerEventsDelegate Methods
+
+- (void)capturerDidEnd:(RTCVideoCapturer *)capturer {
+    [self.eventsDelegate capturerDidEnd:capturer];
+}
+
+// MARK: Private Methods
+
+- (NSString *)appGroupIdentifier {
+    NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
+    return infoDictionary[kRTCAppGroupIdentifier];
+}
+
+- (NSString *)filePathForApplicationGroupIdentifier:(nonnull NSString *)identifier {
+    NSURL *sharedContainer =
+        [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:identifier];
+    NSString *socketFilePath = [[sharedContainer URLByAppendingPathComponent:kRTCScreensharingSocketFD] path];
+
+    return socketFilePath;
+}
+
+@end
+
 #endif

package/ios/RCTWebRTC/ScreenCapturePickerViewManager.h

@@ -1,7 +1,7 @@
-#import <Foundation/Foundation.h>
-#import <React/RCTViewManager.h>
-
-API_AVAILABLE(ios(12))
-@interface ScreenCapturePickerViewManager : RCTViewManager
-
-@end
+#import <Foundation/Foundation.h>
+#import <React/RCTViewManager.h>
+
+API_AVAILABLE(ios(12))
+@interface ScreenCapturePickerViewManager : RCTViewManager
+
+@end