Merge branch 'LD-5063-update-dependencies'

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - Mediasoup-Client-Swift (0.4.4)
+  - Mediasoup-Client-Swift (0.5.0)
 
 DEPENDENCIES:
   - Mediasoup-Client-Swift (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Mediasoup-Client-Swift: 6e621515759a3d7f6d78919703634f0d807f69f9
+  Mediasoup-Client-Swift: 35b63dccce185c95b7959fbaa5da42b0c87e0e57
 
 PODFILE CHECKSUM: d4fe3294dd9c7fc46519b6a7b26527f1f545e8d3
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.13.0

Mediasoup-Client-Swift.podspec

@@ -8,7 +8,7 @@ Pod::Spec.new do |spec|
 	}
 
 	spec.name = "Mediasoup-Client-Swift"
-	spec.version = "0.4.4"
+	spec.version = "0.5.0"
 	spec.platform = :ios, "14.0"
 	spec.module_name = "Mediasoup"
 	spec.module_map = "Mediasoup/Mediasoup.modulemap"

README.md

@@ -20,7 +20,7 @@ Swift wrapper for libmediasoupclient with iOS support
    If you don't need to customize Mediasoup-Client-Swift itself or its dependencies, just add a line to your Podfile:
 
    ```Ruby
-   pod 'Mediasoup-Client-Swift', '0.4.4'
+   pod 'Mediasoup-Client-Swift', '0.5.0'
    ```
 
 3. **Ease of building from scratch**
@@ -142,7 +142,7 @@ Swift wrapper for libmediasoupclient with iOS support
 
 Mediasoup-Client-Swift has almost no logic, it's only a convenient wrapper for other nice libraries. 
 
-* [WebRTC (version m112 with patches applied locally)](https://groups.google.com/g/discuss-webrtc/c/ws0_MYHIBOw)
+* [WebRTC (version m120 with patches applied locally)](https://groups.google.com/g/discuss-webrtc/c/ws0_MYHIBOw)
 
 * [libmediasoupclient (version 3.4.0 patched fork)](https://github.com/VLprojects/libmediasoupclient) 
 

bin/Mediasoup.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>Mediasoup.framework/Mediasoup</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>Mediasoup.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>Mediasoup.framework/Mediasoup</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>Mediasoup.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

bin/Mediasoup.xcframework/ios-arm64_x86_64-simulator/Mediasoup.framework/_CodeSignature/CodeResources

@@ -10,7 +10,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		n4iBxtg58HZ+hry9ze72bK8CsYs=
+		nRi2EjqFnDODwy09IKFHivrl7DA=
 		</data>
 		<key>Modules/Mediasoup.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>

bin/WebRTC.xcframework/Info.plist

@@ -5,6 +5,8 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>WebRTC.framework/WebRTC</string>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64</string>
 			<key>LibraryPath</key>
@@ -17,6 +19,8 @@
 			<string>ios</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>WebRTC.framework/WebRTC</string>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>

bin/WebRTC.xcframework/ios-arm64/WebRTC.framework/Headers/RTCAudioSession.h

@@ -225,10 +225,14 @@ RTC_OBJC_EXPORT
 // AVAudioSession. `lockForConfiguration` must be called before using them
 // otherwise they will fail with kRTCAudioSessionErrorLockRequired.
 
-- (BOOL)setCategory:(NSString *)category
+- (BOOL)setCategory:(AVAudioSessionCategory)category
+               mode:(AVAudioSessionMode)mode
+            options:(AVAudioSessionCategoryOptions)options
+              error:(NSError **)outError;
+- (BOOL)setCategory:(AVAudioSessionCategory)category
         withOptions:(AVAudioSessionCategoryOptions)options
               error:(NSError **)outError;
-- (BOOL)setMode:(NSString *)mode error:(NSError **)outError;
+- (BOOL)setMode:(AVAudioSessionMode)mode error:(NSError **)outError;
 - (BOOL)setInputGain:(float)gain error:(NSError **)outError;
 - (BOOL)setPreferredSampleRate:(double)sampleRate error:(NSError **)outError;
 - (BOOL)setPreferredIOBufferDuration:(NSTimeInterval)duration error:(NSError **)outError;

bin/WebRTC.xcframework/ios-arm64/WebRTC.framework/Headers/RTCAudioSessionConfiguration.h

@@ -17,9 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 RTC_EXTERN const int kRTCAudioSessionPreferredNumberOfChannels;
 RTC_EXTERN const double kRTCAudioSessionHighPerformanceSampleRate;
-RTC_EXTERN const double kRTCAudioSessionLowComplexitySampleRate;
 RTC_EXTERN const double kRTCAudioSessionHighPerformanceIOBufferDuration;
-RTC_EXTERN const double kRTCAudioSessionLowComplexityIOBufferDuration;
 
 // Struct to hold configuration values.
 RTC_OBJC_EXPORT

bin/WebRTC.xcframework/ios-arm64/WebRTC.framework/Headers/RTCCallbackLogger.h

@@ -32,7 +32,7 @@ RTC_OBJC_EXPORT
 // to implement dispatching to some other queue.
 - (void)start:(nullable RTCCallbackLoggerMessageHandler)handler;
 - (void)startWithMessageAndSeverityHandler:
-        (nullable RTCCallbackLoggerMessageAndSeverityHandler)handler;
+    (nullable RTCCallbackLoggerMessageAndSeverityHandler)handler;
 
 - (void)stop;
 

bin/WebRTC.xcframework/ios-arm64/WebRTC.framework/Headers/RTCConfiguration.h

@@ -184,12 +184,6 @@ RTC_OBJC_EXPORT
  */
 @property(nonatomic, assign) BOOL activeResetSrtpParams;
 
-/** If the remote side support mid-stream codec switches then allow encoder
- *  switching to be performed.
- */
-
-@property(nonatomic, assign) BOOL allowCodecSwitching;
-
 /**
  * Defines advanced optional cryptographic settings related to SRTP and
  * frame encryption for native WebRTC. Setting this will overwrite any

bin/WebRTC.xcframework/ios-arm64/WebRTC.framework/Headers/RTCFieldTrials.h

@@ -14,14 +14,14 @@
 
 /** The only valid value for the following if set is kRTCFieldTrialEnabledValue. */
 RTC_EXTERN NSString *const kRTCFieldTrialAudioForceABWENoTWCCKey;
-RTC_EXTERN NSString * const kRTCFieldTrialFlexFec03AdvertisedKey;
-RTC_EXTERN NSString * const kRTCFieldTrialFlexFec03Key;
-RTC_EXTERN NSString * const kRTCFieldTrialH264HighProfileKey;
-RTC_EXTERN NSString * const kRTCFieldTrialMinimizeResamplingOnMobileKey;
+RTC_EXTERN NSString *const kRTCFieldTrialFlexFec03AdvertisedKey;
+RTC_EXTERN NSString *const kRTCFieldTrialFlexFec03Key;
+RTC_EXTERN NSString *const kRTCFieldTrialH264HighProfileKey;
+RTC_EXTERN NSString *const kRTCFieldTrialMinimizeResamplingOnMobileKey;
 RTC_EXTERN NSString *const kRTCFieldTrialUseNWPathMonitor;
 
 /** The valid value for field trials above. */
-RTC_EXTERN NSString * const kRTCFieldTrialEnabledValue;
+RTC_EXTERN NSString *const kRTCFieldTrialEnabledValue;
 
 /** Initialize field trials using a dictionary mapping field trial keys to their
  * values. See above for valid keys and values. Must be called before any other

bin/WebRTC.xcframework/ios-arm64/WebRTC.framework/Headers/RTCLogging.h

@@ -34,27 +34,26 @@ RTC_EXTERN NSString* RTCFileName(const char* filePath);
 
 // Some convenience macros.
 
-#define RTCLogString(format, ...)                                           \
-  [NSString stringWithFormat:@"(%@:%d %s): " format, RTCFileName(__FILE__), \
-                             __LINE__, __FUNCTION__, ##__VA_ARGS__]
+#define RTCLogString(format, ...)                    \
+  [NSString stringWithFormat:@"(%@:%d %s): " format, \
+                             RTCFileName(__FILE__),  \
+                             __LINE__,               \
+                             __FUNCTION__,           \
+                             ##__VA_ARGS__]
 
 #define RTCLogFormat(severity, format, ...)                     \
   do {                                                          \
     NSString* log_string = RTCLogString(format, ##__VA_ARGS__); \
     RTCLogEx(severity, log_string);                             \
   } while (false)
 
-#define RTCLogVerbose(format, ...) \
-  RTCLogFormat(RTCLoggingSeverityVerbose, format, ##__VA_ARGS__)
+#define RTCLogVerbose(format, ...) RTCLogFormat(RTCLoggingSeverityVerbose, format, ##__VA_ARGS__)
 
-#define RTCLogInfo(format, ...) \
-  RTCLogFormat(RTCLoggingSeverityInfo, format, ##__VA_ARGS__)
+#define RTCLogInfo(format, ...) RTCLogFormat(RTCLoggingSeverityInfo, format, ##__VA_ARGS__)
 
-#define RTCLogWarning(format, ...) \
-  RTCLogFormat(RTCLoggingSeverityWarning, format, ##__VA_ARGS__)
+#define RTCLogWarning(format, ...) RTCLogFormat(RTCLoggingSeverityWarning, format, ##__VA_ARGS__)
 
-#define RTCLogError(format, ...) \
-  RTCLogFormat(RTCLoggingSeverityError, format, ##__VA_ARGS__)
+#define RTCLogError(format, ...) RTCLogFormat(RTCLoggingSeverityError, format, ##__VA_ARGS__)
 
 #if !defined(NDEBUG)
 #define RTCLogDebug(format, ...) RTCLogInfo(format, ##__VA_ARGS__)

bin/WebRTC.xcframework/ios-arm64/WebRTC.framework/Headers/RTCMacros.h

@@ -36,9 +36,10 @@
 // WebRTC.framework with their own prefix in case symbol clashing is a
 // problem.
 //
-// This macro must only be defined here and not on via compiler flag to
-// ensure it has a unique value.
+// This macro must be defined uniformily across all the translation units.
+#ifndef RTC_OBJC_TYPE_PREFIX
 #define RTC_OBJC_TYPE_PREFIX
+#endif
 
 // RCT_OBJC_TYPE
 //

bin/WebRTC.xcframework/ios-arm64/WebRTC.framework/Headers/RTCPeerConnection.h

@@ -82,9 +82,8 @@ typedef NS_ENUM(NSInteger, RTCStatsOutputLevel) {
   RTCStatsOutputLevelDebug,
 };
 
-typedef void (^RTCCreateSessionDescriptionCompletionHandler)(RTC_OBJC_TYPE(RTCSessionDescription) *
-                                                                 _Nullable sdp,
-                                                             NSError *_Nullable error);
+typedef void (^RTCCreateSessionDescriptionCompletionHandler)(
+    RTC_OBJC_TYPE(RTCSessionDescription) *_Nullable sdp, NSError *_Nullable error);
 
 typedef void (^RTCSetSessionDescriptionCompletionHandler)(NSError *_Nullable error);
 

bin/WebRTC.xcframework/ios-arm64/WebRTC.framework/Headers/RTCRtpSender.h

@@ -21,8 +21,8 @@ RTC_OBJC_EXPORT
 @protocol RTC_OBJC_TYPE
 (RTCRtpSender)<NSObject>
 
-/** A unique identifier for this sender. */
-@property(nonatomic, readonly) NSString *senderId;
+    /** A unique identifier for this sender. */
+    @property(nonatomic, readonly) NSString *senderId;
 
 /** The currently active RTCRtpParameters, as defined in
  *  https://www.w3.org/TR/webrtc/#idl-def-RTCRtpParameters.

bin/WebRTC.xcframework/ios-arm64/WebRTC.framework/Headers/RTCVideoDecoder.h

@@ -29,6 +29,7 @@ RTC_OBJC_EXPORT
     - (void)setCallback : (RTCVideoDecoderCallback)callback;
 - (NSInteger)startDecodeWithNumberOfCores:(int)numberOfCores;
 - (NSInteger)releaseDecoder;
+// TODO(bugs.webrtc.org/15444): Remove obsolete missingFrames param.
 - (NSInteger)decode:(RTC_OBJC_TYPE(RTCEncodedImage) *)encodedImage
         missingFrames:(BOOL)missingFrames
     codecSpecificInfo:(nullable id<RTC_OBJC_TYPE(RTCCodecSpecificInfo)>)info

bin/WebRTC.xcframework/ios-arm64/WebRTC.framework/Headers/RTCVideoEncoder.h

@@ -28,7 +28,7 @@ RTC_OBJC_EXPORT
 @protocol RTC_OBJC_TYPE
 (RTCVideoEncoder)<NSObject>
 
-- (void)setCallback:(nullable RTCVideoEncoderCallback)callback;
+    - (void)setCallback : (nullable RTCVideoEncoderCallback)callback;
 - (NSInteger)startEncodeWithSettings:(RTC_OBJC_TYPE(RTCVideoEncoderSettings) *)settings
                        numberOfCores:(int)numberOfCores;
 - (NSInteger)releaseEncoder;

bin/WebRTC.xcframework/ios-arm64/WebRTC.framework/Headers/RTCVideoFrame.h

@@ -45,7 +45,7 @@ RTC_OBJC_EXPORT
 @property(nonatomic, readonly) id<RTC_OBJC_TYPE(RTCVideoFrameBuffer)> buffer;
 
 - (instancetype)init NS_UNAVAILABLE;
-- (instancetype) new NS_UNAVAILABLE;
+- (instancetype)new NS_UNAVAILABLE;
 
 /** Initialize an RTCVideoFrame from a pixel buffer, rotation, and timestamp.
  *  Deprecated - initialize with a RTCCVPixelBuffer instead

bin/WebRTC.xcframework/ios-arm64/WebRTC.framework/Headers/UIDevice+RTCDevice.h

@@ -10,102 +10,8 @@
 
 #import <UIKit/UIKit.h>
 
-typedef NS_ENUM(NSInteger, RTCDeviceType) {
-  RTCDeviceTypeUnknown,
-  RTCDeviceTypeIPhone1G,
-  RTCDeviceTypeIPhone3G,
-  RTCDeviceTypeIPhone3GS,
-  RTCDeviceTypeIPhone4,
-  RTCDeviceTypeIPhone4Verizon,
-  RTCDeviceTypeIPhone4S,
-  RTCDeviceTypeIPhone5GSM,
-  RTCDeviceTypeIPhone5GSM_CDMA,
-  RTCDeviceTypeIPhone5CGSM,
-  RTCDeviceTypeIPhone5CGSM_CDMA,
-  RTCDeviceTypeIPhone5SGSM,
-  RTCDeviceTypeIPhone5SGSM_CDMA,
-  RTCDeviceTypeIPhone6Plus,
-  RTCDeviceTypeIPhone6,
-  RTCDeviceTypeIPhone6S,
-  RTCDeviceTypeIPhone6SPlus,
-  RTCDeviceTypeIPhone7,
-  RTCDeviceTypeIPhone7Plus,
-  RTCDeviceTypeIPhoneSE,
-  RTCDeviceTypeIPhone8,
-  RTCDeviceTypeIPhone8Plus,
-  RTCDeviceTypeIPhoneX,
-  RTCDeviceTypeIPhoneXS,
-  RTCDeviceTypeIPhoneXSMax,
-  RTCDeviceTypeIPhoneXR,
-  RTCDeviceTypeIPhone11,
-  RTCDeviceTypeIPhone11Pro,
-  RTCDeviceTypeIPhone11ProMax,
-  RTCDeviceTypeIPhone12Mini,
-  RTCDeviceTypeIPhone12,
-  RTCDeviceTypeIPhone12Pro,
-  RTCDeviceTypeIPhone12ProMax,
-  RTCDeviceTypeIPhoneSE2Gen,
-  RTCDeviceTypeIPhone13,
-  RTCDeviceTypeIPhone13Mini,
-  RTCDeviceTypeIPhone13Pro,
-  RTCDeviceTypeIPhone13ProMax,
-
-  RTCDeviceTypeIPodTouch1G,
-  RTCDeviceTypeIPodTouch2G,
-  RTCDeviceTypeIPodTouch3G,
-  RTCDeviceTypeIPodTouch4G,
-  RTCDeviceTypeIPodTouch5G,
-  RTCDeviceTypeIPodTouch6G,
-  RTCDeviceTypeIPodTouch7G,
-  RTCDeviceTypeIPad,
-  RTCDeviceTypeIPad2Wifi,
-  RTCDeviceTypeIPad2GSM,
-  RTCDeviceTypeIPad2CDMA,
-  RTCDeviceTypeIPad2Wifi2,
-  RTCDeviceTypeIPadMiniWifi,
-  RTCDeviceTypeIPadMiniGSM,
-  RTCDeviceTypeIPadMiniGSM_CDMA,
-  RTCDeviceTypeIPad3Wifi,
-  RTCDeviceTypeIPad3GSM_CDMA,
-  RTCDeviceTypeIPad3GSM,
-  RTCDeviceTypeIPad4Wifi,
-  RTCDeviceTypeIPad4GSM,
-  RTCDeviceTypeIPad4GSM_CDMA,
-  RTCDeviceTypeIPad5,
-  RTCDeviceTypeIPad6,
-  RTCDeviceTypeIPadAirWifi,
-  RTCDeviceTypeIPadAirCellular,
-  RTCDeviceTypeIPadAirWifiCellular,
-  RTCDeviceTypeIPadAir2,
-  RTCDeviceTypeIPadMini2GWifi,
-  RTCDeviceTypeIPadMini2GCellular,
-  RTCDeviceTypeIPadMini2GWifiCellular,
-  RTCDeviceTypeIPadMini3,
-  RTCDeviceTypeIPadMini4,
-  RTCDeviceTypeIPadPro9Inch,
-  RTCDeviceTypeIPadPro12Inch,
-  RTCDeviceTypeIPadPro12Inch2,
-  RTCDeviceTypeIPadPro10Inch,
-  RTCDeviceTypeIPad7Gen10Inch,
-  RTCDeviceTypeIPadPro3Gen11Inch,
-  RTCDeviceTypeIPadPro3Gen12Inch,
-  RTCDeviceTypeIPadPro4Gen11Inch,
-  RTCDeviceTypeIPadPro4Gen12Inch,
-  RTCDeviceTypeIPadMini5Gen,
-  RTCDeviceTypeIPadAir3Gen,
-  RTCDeviceTypeIPad8,
-  RTCDeviceTypeIPad9,
-  RTCDeviceTypeIPadMini6,
-  RTCDeviceTypeIPadAir4Gen,
-  RTCDeviceTypeIPadPro5Gen11Inch,
-  RTCDeviceTypeIPadPro5Gen12Inch,
-  RTCDeviceTypeSimulatori386,
-  RTCDeviceTypeSimulatorx86_64,
-};
-
 @interface UIDevice (RTCDevice)
 
-+ (RTCDeviceType)deviceType;
-+ (BOOL)isIOS11OrLater;
++ (NSString *)machineName;
 
 @end

bin/WebRTC.xcframework/ios-arm64_x86_64-simulator/WebRTC.framework/Headers/RTCAudioSession.h

@@ -225,10 +225,14 @@ RTC_OBJC_EXPORT
 // AVAudioSession. `lockForConfiguration` must be called before using them
 // otherwise they will fail with kRTCAudioSessionErrorLockRequired.
 
-- (BOOL)setCategory:(NSString *)category
+- (BOOL)setCategory:(AVAudioSessionCategory)category
+               mode:(AVAudioSessionMode)mode
+            options:(AVAudioSessionCategoryOptions)options
+              error:(NSError **)outError;
+- (BOOL)setCategory:(AVAudioSessionCategory)category
         withOptions:(AVAudioSessionCategoryOptions)options
               error:(NSError **)outError;
-- (BOOL)setMode:(NSString *)mode error:(NSError **)outError;
+- (BOOL)setMode:(AVAudioSessionMode)mode error:(NSError **)outError;
 - (BOOL)setInputGain:(float)gain error:(NSError **)outError;
 - (BOOL)setPreferredSampleRate:(double)sampleRate error:(NSError **)outError;
 - (BOOL)setPreferredIOBufferDuration:(NSTimeInterval)duration error:(NSError **)outError;