@sbhjt-gr/react-native-webrtc 124.0.0 → 124.0.1

package/ios/RCTWebRTC/VideoCaptureController.m

@@ -1,328 +1,328 @@
-#if !TARGET_OS_TV
-
-#import "VideoCaptureController.h"
-
-#import <React/RCTLog.h>
-
-@interface VideoCaptureController ()
-
-@property(nonatomic, strong) RTCCameraVideoCapturer *capturer;
-@property(nonatomic, strong) AVCaptureDeviceFormat *selectedFormat;
-@property(nonatomic, strong) AVCaptureDevice *device;
-@property(nonatomic, assign) BOOL running;
-@property(nonatomic, assign) BOOL usingFrontCamera;
-@property(nonatomic, assign) int width;
-@property(nonatomic, assign) int height;
-@property(nonatomic, assign) int frameRate;
-
-@end
-
-@implementation VideoCaptureController
-
-- (instancetype)initWithCapturer:(RTCCameraVideoCapturer *)capturer andConstraints:(NSDictionary *)constraints {
-    self = [super init];
-    if (self) {
-        self.capturer = capturer;
-        self.running = NO;
-        [self determineDevice:constraints];
-        [self applyConstraints:constraints error:nil];
-    }
-
-    return self;
-}
-
-- (void)dealloc {
-    self.device = NULL;
-}
-
-- (void)startCapture {
-    if (self.deviceId) {
-        self.device = [AVCaptureDevice deviceWithUniqueID:self.deviceId];
-    }
-    if (!self.device) {
-        AVCaptureDevicePosition position =
-            self.usingFrontCamera ? AVCaptureDevicePositionFront : AVCaptureDevicePositionBack;
-        self.device = [self findDeviceForPosition:position];
-        self.deviceId = self.device.uniqueID;
-    }
-
-    if (!self.device) {
-        RCTLogWarn(@"[VideoCaptureController] No capture devices found!");
-
-        return;
-    }
-
-    AVCaptureDeviceFormat *format = [self selectFormatForDevice:self.device
-                                                withTargetWidth:self.width
-                                               withTargetHeight:self.height];
-    if (!format) {
-        RCTLogWarn(@"[VideoCaptureController] No valid formats for device %@", self.device);
-
-        return;
-    }
-
-    self.selectedFormat = format;
-
-    AVCaptureSession *session = self.capturer.captureSession;
-    if (@available(iOS 16.0, *)) {
-        BOOL enable = self.enableMultitaskingCameraAccess;
-        BOOL shouldChange = session.multitaskingCameraAccessEnabled != enable;
-        BOOL canChange = !enable || (enable && session.isMultitaskingCameraAccessSupported);
-
-        if (shouldChange && canChange) {
-            [session beginConfiguration];
-            [session setMultitaskingCameraAccessEnabled:enable];
-            [session commitConfiguration];
-        }
-    }
-
-    RCTLog(@"[VideoCaptureController] Capture will start");
-
-    // Starting the capture happens on another thread. Wait for it.
-    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-
-    __weak VideoCaptureController *weakSelf = self;
-    [self.capturer startCaptureWithDevice:self.device
-                                   format:format
-                                      fps:self.frameRate
-                        completionHandler:^(NSError *err) {
-                            if (err) {
-                                RCTLogError(@"[VideoCaptureController] Error starting capture: %@", err);
-                            } else {
-                                RCTLog(@"[VideoCaptureController] Capture started");
-                                weakSelf.running = YES;
-                            }
-                            dispatch_semaphore_signal(semaphore);
-                        }];
-
-    dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
-}
-
-- (void)stopCapture {
-    if (!self.running)
-        return;
-
-    RCTLog(@"[VideoCaptureController] Capture will stop");
-    // Stopping the capture happens on another thread. Wait for it.
-    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-
-    __weak VideoCaptureController *weakSelf = self;
-    [self.capturer stopCaptureWithCompletionHandler:^{
-        RCTLog(@"[VideoCaptureController] Capture stopped");
-        weakSelf.running = NO;
-        weakSelf.device = nil;
-
-        dispatch_semaphore_signal(semaphore);
-    }];
-
-    dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
-}
-
-- (void)determineDevice:(NSDictionary *)constraints {
-    // Clear device to prepare for starting camera with new constraints.
-    self.device = nil;
-    NSString *deviceId = constraints[@"deviceId"];
-    id facingMode = constraints[@"facingMode"];
-
-    if (!facingMode && !deviceId) {
-        // Default to front camera.
-        facingMode = @"user";
-    }
-
-    if (facingMode && [facingMode isKindOfClass:[NSString class]]) {
-        AVCaptureDevicePosition position;
-        if ([facingMode isEqualToString:@"environment"]) {
-            position = AVCaptureDevicePositionBack;
-        } else if ([facingMode isEqualToString:@"user"]) {
-            position = AVCaptureDevicePositionFront;
-        } else {
-            // If the specified facingMode value is not supported, fall back
-            // to the front camera.
-            position = AVCaptureDevicePositionFront;
-        }
-
-        BOOL usingFrontCamera = position == AVCaptureDevicePositionFront;
-        if (self.usingFrontCamera != usingFrontCamera) {
-            self.usingFrontCamera = usingFrontCamera;
-        }
-    }
-
-    if (!deviceId) {
-        AVCaptureDevicePosition position =
-            self.usingFrontCamera ? AVCaptureDevicePositionFront : AVCaptureDevicePositionBack;
-        deviceId = [self findDeviceForPosition:position].uniqueID;
-    }
-
-    if (self.deviceId != deviceId && ![self.deviceId isEqualToString:deviceId]) {
-        self.deviceId = deviceId;
-    }
-}
-
-- (void)applyConstraints:(NSDictionary *)constraints error:(NSError **)outError {
-    BOOL hasChanged = NO;
-
-    int width = [constraints[@"width"] intValue];
-    int height = [constraints[@"height"] intValue];
-    int frameRate = [constraints[@"frameRate"] intValue];
-
-    if (self.width != width) {
-        hasChanged = YES;
-        self.width = width;
-    }
-
-    if (self.height != height) {
-        hasChanged = YES;
-        self.height = height;
-    }
-
-    if (self.frameRate != frameRate) {
-        hasChanged = YES;
-        self.frameRate = frameRate;
-    }
-
-    if (self.running && hasChanged) {
-        [self stopCapture];
-        [self startCapture];
-    }
-}
-
-- (NSDictionary *)getSettings {
-    AVCaptureDeviceFormat *format = self.selectedFormat;
-    CMVideoDimensions dimensions = CMVideoFormatDescriptionGetDimensions(format.formatDescription);
-    NSMutableDictionary *settings = [[NSMutableDictionary alloc] initWithDictionary:@{
-        @"groupId" : @"",
-        @"height" : @(dimensions.height),
-        @"width" : @(dimensions.width),
-        @"frameRate" : @(30),
-        @"facingMode" : self.usingFrontCamera ? @"user" : @"environment"
-    }];
-
-    if (self.deviceId) {
-        settings[@"deviceId"] = self.deviceId;
-    }
-    return settings;
-}
-#pragma mark NSKeyValueObserving
-
-- (void)observeValueForKeyPath:(NSString *)keyPath
-                      ofObject:(id)object
-                        change:(NSDictionary<NSKeyValueChangeKey, id> *)change
-                       context:(void *)context {
-    if (@available(iOS 11.1, *)) {
-        if ([object isKindOfClass:[AVCaptureDevice class]] && [keyPath isEqualToString:@"systemPressureState"]) {
-            AVCaptureDevice *device = (AVCaptureDevice *)object;
-            AVCaptureSystemPressureLevel pressureLevel =
-                ((AVCaptureSystemPressureState *)change[NSKeyValueChangeNewKey]).level;
-            if (pressureLevel == AVCaptureSystemPressureLevelSerious ||
-                pressureLevel == AVCaptureSystemPressureLevelCritical) {
-                RCTLogWarn(
-                    @"[VideoCaptureController] Reached elevated system pressure level: %@. Throttling frame rate.",
-                    pressureLevel);
-                [self throttleFrameRateForDevice:device];
-            } else if (pressureLevel == AVCaptureSystemPressureLevelNominal) {
-                RCTLogWarn(@"[VideoCaptureController] Restored normal system pressure level. Resetting frame rate to "
-                           @"default.");
-                [self resetFrameRateForDevice:device];
-            }
-        }
-    }
-}
-
-- (void)registerSystemPressureStateObserverForDevice:(AVCaptureDevice *)device {
-    if (@available(iOS 11.1, *)) {
-        [device addObserver:self forKeyPath:@"systemPressureState" options:NSKeyValueObservingOptionNew context:nil];
-    }
-}
-
-- (void)removeObserverForDevice:(AVCaptureDevice *)device {
-    if (@available(iOS 11.1, *)) {
-        [device removeObserver:self forKeyPath:@"systemPressureState"];
-    }
-}
-
-#pragma mark Private
-
-- (void)setDevice:(AVCaptureDevice *)device {
-    if (_device) {
-        [self removeObserverForDevice:_device];
-    }
-    if (device) {
-        [self registerSystemPressureStateObserverForDevice:device];
-    }
-
-    _device = device;
-}
-
-- (AVCaptureDevice *)findDeviceForPosition:(AVCaptureDevicePosition)position {
-    NSArray<AVCaptureDevice *> *captureDevices = [RTCCameraVideoCapturer captureDevices];
-    for (AVCaptureDevice *device in captureDevices) {
-        if (device.position == position) {
-            return device;
-        }
-    }
-
-    return [captureDevices firstObject];
-}
-
-- (AVCaptureDeviceFormat *)selectFormatForDevice:(AVCaptureDevice *)device
-                                 withTargetWidth:(int)targetWidth
-                                withTargetHeight:(int)targetHeight {
-    NSArray<AVCaptureDeviceFormat *> *formats = [RTCCameraVideoCapturer supportedFormatsForDevice:device];
-    AVCaptureDeviceFormat *selectedFormat = nil;
-    int currentDiff = INT_MAX;
-
-    for (AVCaptureDeviceFormat *format in formats) {
-        // Only use multi cam formats when on multi cam supported devices.
-        if (@available(iOS 13.0, macOS 14.0, tvOS 17.0, *)) {
-            if (AVCaptureMultiCamSession.multiCamSupported && !format.multiCamSupported) {
-                continue;
-            }
-        }
-
-        CMVideoDimensions dimension = CMVideoFormatDescriptionGetDimensions(format.formatDescription);
-        FourCharCode pixelFormat = CMFormatDescriptionGetMediaSubType(format.formatDescription);
-        int diff = abs(targetWidth - dimension.width) + abs(targetHeight - dimension.height);
-        if (diff < currentDiff) {
-            selectedFormat = format;
-            currentDiff = diff;
-        } else if (diff == currentDiff && pixelFormat == [_capturer preferredOutputPixelFormat]) {
-            selectedFormat = format;
-        }
-    }
-
-    return selectedFormat;
-}
-
-- (void)throttleFrameRateForDevice:(AVCaptureDevice *)device {
-    NSError *error = nil;
-
-    [device lockForConfiguration:&error];
-    if (error) {
-        RCTLog(@"[VideoCaptureController] Could not lock device for configuration: %@", error);
-        return;
-    }
-
-    device.activeVideoMinFrameDuration = CMTimeMake(1, 20);
-    device.activeVideoMaxFrameDuration = CMTimeMake(1, 15);
-
-    [device unlockForConfiguration];
-}
-
-- (void)resetFrameRateForDevice:(AVCaptureDevice *)device {
-    NSError *error = nil;
-
-    [device lockForConfiguration:&error];
-    if (error) {
-        RCTLog(@"[VideoCaptureController] Could not lock device for configuration: %@", error);
-        return;
-    }
-
-    device.activeVideoMinFrameDuration = kCMTimeInvalid;
-    device.activeVideoMaxFrameDuration = kCMTimeInvalid;
-
-    [device unlockForConfiguration];
-}
-
-@end
-
-#endif
+#if !TARGET_OS_TV
+
+#import "VideoCaptureController.h"
+
+#import <React/RCTLog.h>
+
+@interface VideoCaptureController ()
+
+@property(nonatomic, strong) RTCCameraVideoCapturer *capturer;
+@property(nonatomic, strong) AVCaptureDeviceFormat *selectedFormat;
+@property(nonatomic, strong) AVCaptureDevice *device;
+@property(nonatomic, assign) BOOL running;
+@property(nonatomic, assign) BOOL usingFrontCamera;
+@property(nonatomic, assign) int width;
+@property(nonatomic, assign) int height;
+@property(nonatomic, assign) int frameRate;
+
+@end
+
+@implementation VideoCaptureController
+
+- (instancetype)initWithCapturer:(RTCCameraVideoCapturer *)capturer andConstraints:(NSDictionary *)constraints {
+    self = [super init];
+    if (self) {
+        self.capturer = capturer;
+        self.running = NO;
+        [self determineDevice:constraints];
+        [self applyConstraints:constraints error:nil];
+    }
+
+    return self;
+}
+
+- (void)dealloc {
+    self.device = NULL;
+}
+
+- (void)startCapture {
+    if (self.deviceId) {
+        self.device = [AVCaptureDevice deviceWithUniqueID:self.deviceId];
+    }
+    if (!self.device) {
+        AVCaptureDevicePosition position =
+            self.usingFrontCamera ? AVCaptureDevicePositionFront : AVCaptureDevicePositionBack;
+        self.device = [self findDeviceForPosition:position];
+        self.deviceId = self.device.uniqueID;
+    }
+
+    if (!self.device) {
+        RCTLogWarn(@"[VideoCaptureController] No capture devices found!");
+
+        return;
+    }
+
+    AVCaptureDeviceFormat *format = [self selectFormatForDevice:self.device
+                                                withTargetWidth:self.width
+                                               withTargetHeight:self.height];
+    if (!format) {
+        RCTLogWarn(@"[VideoCaptureController] No valid formats for device %@", self.device);
+
+        return;
+    }
+
+    self.selectedFormat = format;
+
+    AVCaptureSession *session = self.capturer.captureSession;
+    if (@available(iOS 16.0, *)) {
+        BOOL enable = self.enableMultitaskingCameraAccess;
+        BOOL shouldChange = session.multitaskingCameraAccessEnabled != enable;
+        BOOL canChange = !enable || (enable && session.isMultitaskingCameraAccessSupported);
+
+        if (shouldChange && canChange) {
+            [session beginConfiguration];
+            [session setMultitaskingCameraAccessEnabled:enable];
+            [session commitConfiguration];
+        }
+    }
+
+    RCTLog(@"[VideoCaptureController] Capture will start");
+
+    // Starting the capture happens on another thread. Wait for it.
+    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+
+    __weak VideoCaptureController *weakSelf = self;
+    [self.capturer startCaptureWithDevice:self.device
+                                   format:format
+                                      fps:self.frameRate
+                        completionHandler:^(NSError *err) {
+                            if (err) {
+                                RCTLogError(@"[VideoCaptureController] Error starting capture: %@", err);
+                            } else {
+                                RCTLog(@"[VideoCaptureController] Capture started");
+                                weakSelf.running = YES;
+                            }
+                            dispatch_semaphore_signal(semaphore);
+                        }];
+
+    dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+}
+
+- (void)stopCapture {
+    if (!self.running)
+        return;
+
+    RCTLog(@"[VideoCaptureController] Capture will stop");
+    // Stopping the capture happens on another thread. Wait for it.
+    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+
+    __weak VideoCaptureController *weakSelf = self;
+    [self.capturer stopCaptureWithCompletionHandler:^{
+        RCTLog(@"[VideoCaptureController] Capture stopped");
+        weakSelf.running = NO;
+        weakSelf.device = nil;
+
+        dispatch_semaphore_signal(semaphore);
+    }];
+
+    dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+}
+
+- (void)determineDevice:(NSDictionary *)constraints {
+    // Clear device to prepare for starting camera with new constraints.
+    self.device = nil;
+    NSString *deviceId = constraints[@"deviceId"];
+    id facingMode = constraints[@"facingMode"];
+
+    if (!facingMode && !deviceId) {
+        // Default to front camera.
+        facingMode = @"user";
+    }
+
+    if (facingMode && [facingMode isKindOfClass:[NSString class]]) {
+        AVCaptureDevicePosition position;
+        if ([facingMode isEqualToString:@"environment"]) {
+            position = AVCaptureDevicePositionBack;
+        } else if ([facingMode isEqualToString:@"user"]) {
+            position = AVCaptureDevicePositionFront;
+        } else {
+            // If the specified facingMode value is not supported, fall back
+            // to the front camera.
+            position = AVCaptureDevicePositionFront;
+        }
+
+        BOOL usingFrontCamera = position == AVCaptureDevicePositionFront;
+        if (self.usingFrontCamera != usingFrontCamera) {
+            self.usingFrontCamera = usingFrontCamera;
+        }
+    }
+
+    if (!deviceId) {
+        AVCaptureDevicePosition position =
+            self.usingFrontCamera ? AVCaptureDevicePositionFront : AVCaptureDevicePositionBack;
+        deviceId = [self findDeviceForPosition:position].uniqueID;
+    }
+
+    if (self.deviceId != deviceId && ![self.deviceId isEqualToString:deviceId]) {
+        self.deviceId = deviceId;
+    }
+}
+
+- (void)applyConstraints:(NSDictionary *)constraints error:(NSError **)outError {
+    BOOL hasChanged = NO;
+
+    int width = [constraints[@"width"] intValue];
+    int height = [constraints[@"height"] intValue];
+    int frameRate = [constraints[@"frameRate"] intValue];
+
+    if (self.width != width) {
+        hasChanged = YES;
+        self.width = width;
+    }
+
+    if (self.height != height) {
+        hasChanged = YES;
+        self.height = height;
+    }
+
+    if (self.frameRate != frameRate) {
+        hasChanged = YES;
+        self.frameRate = frameRate;
+    }
+
+    if (self.running && hasChanged) {
+        [self stopCapture];
+        [self startCapture];
+    }
+}
+
+- (NSDictionary *)getSettings {
+    AVCaptureDeviceFormat *format = self.selectedFormat;
+    CMVideoDimensions dimensions = CMVideoFormatDescriptionGetDimensions(format.formatDescription);
+    NSMutableDictionary *settings = [[NSMutableDictionary alloc] initWithDictionary:@{
+        @"groupId" : @"",
+        @"height" : @(dimensions.height),
+        @"width" : @(dimensions.width),
+        @"frameRate" : @(30),
+        @"facingMode" : self.usingFrontCamera ? @"user" : @"environment"
+    }];
+
+    if (self.deviceId) {
+        settings[@"deviceId"] = self.deviceId;
+    }
+    return settings;
+}
+#pragma mark NSKeyValueObserving
+
+- (void)observeValueForKeyPath:(NSString *)keyPath
+                      ofObject:(id)object
+                        change:(NSDictionary<NSKeyValueChangeKey, id> *)change
+                       context:(void *)context {
+    if (@available(iOS 11.1, *)) {
+        if ([object isKindOfClass:[AVCaptureDevice class]] && [keyPath isEqualToString:@"systemPressureState"]) {
+            AVCaptureDevice *device = (AVCaptureDevice *)object;
+            AVCaptureSystemPressureLevel pressureLevel =
+                ((AVCaptureSystemPressureState *)change[NSKeyValueChangeNewKey]).level;
+            if (pressureLevel == AVCaptureSystemPressureLevelSerious ||
+                pressureLevel == AVCaptureSystemPressureLevelCritical) {
+                RCTLogWarn(
+                    @"[VideoCaptureController] Reached elevated system pressure level: %@. Throttling frame rate.",
+                    pressureLevel);
+                [self throttleFrameRateForDevice:device];
+            } else if (pressureLevel == AVCaptureSystemPressureLevelNominal) {
+                RCTLogWarn(@"[VideoCaptureController] Restored normal system pressure level. Resetting frame rate to "
+                           @"default.");
+                [self resetFrameRateForDevice:device];
+            }
+        }
+    }
+}
+
+- (void)registerSystemPressureStateObserverForDevice:(AVCaptureDevice *)device {
+    if (@available(iOS 11.1, *)) {
+        [device addObserver:self forKeyPath:@"systemPressureState" options:NSKeyValueObservingOptionNew context:nil];
+    }
+}
+
+- (void)removeObserverForDevice:(AVCaptureDevice *)device {
+    if (@available(iOS 11.1, *)) {
+        [device removeObserver:self forKeyPath:@"systemPressureState"];
+    }
+}
+
+#pragma mark Private
+
+- (void)setDevice:(AVCaptureDevice *)device {
+    if (_device) {
+        [self removeObserverForDevice:_device];
+    }
+    if (device) {
+        [self registerSystemPressureStateObserverForDevice:device];
+    }
+
+    _device = device;
+}
+
+- (AVCaptureDevice *)findDeviceForPosition:(AVCaptureDevicePosition)position {
+    NSArray<AVCaptureDevice *> *captureDevices = [RTCCameraVideoCapturer captureDevices];
+    for (AVCaptureDevice *device in captureDevices) {
+        if (device.position == position) {
+            return device;
+        }
+    }
+
+    return [captureDevices firstObject];
+}
+
+- (AVCaptureDeviceFormat *)selectFormatForDevice:(AVCaptureDevice *)device
+                                 withTargetWidth:(int)targetWidth
+                                withTargetHeight:(int)targetHeight {
+    NSArray<AVCaptureDeviceFormat *> *formats = [RTCCameraVideoCapturer supportedFormatsForDevice:device];
+    AVCaptureDeviceFormat *selectedFormat = nil;
+    int currentDiff = INT_MAX;
+
+    for (AVCaptureDeviceFormat *format in formats) {
+        // Only use multi cam formats when on multi cam supported devices.
+        if (@available(iOS 13.0, macOS 14.0, tvOS 17.0, *)) {
+            if (AVCaptureMultiCamSession.multiCamSupported && !format.multiCamSupported) {
+                continue;
+            }
+        }
+
+        CMVideoDimensions dimension = CMVideoFormatDescriptionGetDimensions(format.formatDescription);
+        FourCharCode pixelFormat = CMFormatDescriptionGetMediaSubType(format.formatDescription);
+        int diff = abs(targetWidth - dimension.width) + abs(targetHeight - dimension.height);
+        if (diff < currentDiff) {
+            selectedFormat = format;
+            currentDiff = diff;
+        } else if (diff == currentDiff && pixelFormat == [_capturer preferredOutputPixelFormat]) {
+            selectedFormat = format;
+        }
+    }
+
+    return selectedFormat;
+}
+
+- (void)throttleFrameRateForDevice:(AVCaptureDevice *)device {
+    NSError *error = nil;
+
+    [device lockForConfiguration:&error];
+    if (error) {
+        RCTLog(@"[VideoCaptureController] Could not lock device for configuration: %@", error);
+        return;
+    }
+
+    device.activeVideoMinFrameDuration = CMTimeMake(1, 20);
+    device.activeVideoMaxFrameDuration = CMTimeMake(1, 15);
+
+    [device unlockForConfiguration];
+}
+
+- (void)resetFrameRateForDevice:(AVCaptureDevice *)device {
+    NSError *error = nil;
+
+    [device lockForConfiguration:&error];
+    if (error) {
+        RCTLog(@"[VideoCaptureController] Could not lock device for configuration: %@", error);
+        return;
+    }
+
+    device.activeVideoMinFrameDuration = kCMTimeInvalid;
+    device.activeVideoMaxFrameDuration = kCMTimeInvalid;
+
+    [device unlockForConfiguration];
+}
+
+@end
+
+#endif

package/ios/RCTWebRTC/WebRTCModule+Palabra.h

@@ -1,4 +1,4 @@
-#import "WebRTCModule.h"
-
-@interface WebRTCModule (Palabra)
-@end
+#import "WebRTCModule.h"
+
+@interface WebRTCModule (Palabra)
+@end