Skip to content

Commit 501b9a4

Browse files
fedulvtubudulfedulvtubudul
committed
Merge branch 'LD-2871-update-libmediasoupclient'
2 parents 70725ad + 96c33c1 commit 501b9a4

23 files changed

+103
-45
lines changed

‎Example/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- Mediasoup-Client-Swift (0.2.0)
2+
- Mediasoup-Client-Swift (0.2.1)
33

44
DEPENDENCIES:
55
- Mediasoup-Client-Swift (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
99
:path: "../"
1010

1111
SPEC CHECKSUMS:
12-
Mediasoup-Client-Swift: d72f2ee6a6caae3270f5033464745213d95bc274
12+
Mediasoup-Client-Swift: 265ab6278c4b2568021a2cff8dcf431467fd338b
1313

1414
PODFILE CHECKSUM: d4fe3294dd9c7fc46519b6a7b26527f1f545e8d3
1515

‎Mediasoup-Client-Swift.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Pod::Spec.new do |spec|
88
}
99

1010
spec.name = "Mediasoup-Client-Swift"
11-
spec.version = "0.2.0"
11+
spec.version = "0.2.1"
1212
spec.platform = :ios, "14.0"
1313
spec.module_name = "Mediasoup"
1414
spec.module_map = "Mediasoup/Mediasoup.modulemap"

‎Mediasoup/SendTransport.swift

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,21 @@ public class SendTransport {
1717
print("SendTransport deallocated")
1818
}
1919

20-
public func createProducer(for track: RTCMediaStreamTrack, encodings: [RTCRtpEncodingParameters]?,
21-
codecOptions: String?, appData: String?) throws -> Producer {
20+
public func createProducer(
21+
for track: RTCMediaStreamTrack,
22+
encodings: [RTCRtpEncodingParameters]?,
23+
codecOptions: String?,
24+
codec: String?,
25+
appData: String?
26+
) throws -> Producer {
2227

2328
guard let mediaKind = MediaKind(stringValue: track.kind) else {
2429
throw MediasoupError.invalidParameters("Unknown media kind")
2530
}
2631

2732
return try convertMediasoupErrors {
2833
let producer = try self.transport.createProducer(for: track, encodings: encodings,
29-
codecOptions: codecOptions, appData: appData)
34+
codecOptions: codecOptions, codec: codec, appData: appData)
3035
return Producer(producer: producer, mediaKind: mediaKind)
3136
}
3237
}

‎Mediasoup_Private/Transport/SendTransportWrapper.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ typedef NS_ENUM(NSInteger, RTCIceTransportPolicy);
4747
- (ProducerWrapper *_Nullable)createProducerForTrack:(RTCMediaStreamTrack *_Nonnull)mediaTrack
4848
encodings:(NSArray<RTCRtpEncodingParameters *> *_Nullable)encodings
4949
codecOptions:(NSString *_Nullable)codecOptions
50+
codec:(NSString *_Nullable)codec
5051
appData:(NSString *_Nullable)appData
5152
error:(out NSError *__autoreleasing _Nullable *_Nullable)error;
5253

‎Mediasoup_Private/Transport/SendTransportWrapper.mm

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ - (void)updateICETransportPolicy:(RTCIceTransportPolicy)iceTransportPolicy
9797
- (ProducerWrapper *_Nullable)createProducerForTrack:(RTCMediaStreamTrack *_Nonnull)mediaTrack
9898
encodings:(NSArray<RTCRtpEncodingParameters *> *_Nullable)encodings
9999
codecOptions:(NSString *_Nullable)codecOptions
100+
codec:(NSString *_Nullable)codec
100101
appData:(NSString *_Nullable)appData
101102
error:(out NSError *__autoreleasing _Nullable *_Nullable)error {
102103

@@ -135,6 +136,12 @@ - (ProducerWrapper *_Nullable)createProducerForTrack:(RTCMediaStreamTrack *_Nonn
135136
codecOptionsJson = nlohmann::json::parse(std::string(codecOptions.UTF8String));
136137
}
137138

139+
nlohmann::json *codecJsonPtr = nullptr;
140+
if (codec != nullptr) {
141+
auto codecJson = nlohmann::json::parse(std::string(codec.UTF8String));
142+
codecJsonPtr = &codecJson;
143+
}
144+
138145
nlohmann::json appDataJson = nlohmann::json::object();
139146
if (appData != nullptr) {
140147
appDataJson = nlohmann::json::parse(std::string(appData.UTF8String));
@@ -148,7 +155,8 @@ - (ProducerWrapper *_Nullable)createProducerForTrack:(RTCMediaStreamTrack *_Nonn
148155
mediaStreamTrack,
149156
&encodingsVector,
150157
&codecOptionsJson,
151-
&appDataJson
158+
codecJsonPtr,
159+
appDataJson
152160
);
153161
return [[ProducerWrapper alloc] initWithProducer:producer mediaStreamTrack:mediaTrack listenerAdapter:listenerAdapter];
154162
}, ^ void {

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Swift wrapper for libmediasoupclient with iOS support
2020
If you don't need to customize Mediasoup-Client-Swift itself or its dependencies, just add a line to your Podfile:
2121

2222
```Ruby
23-
pod 'Mediasoup-Client-Swift', '0.2.0'
23+
pod 'Mediasoup-Client-Swift', '0.2.1'
2424
```
2525

2626
3. **Ease of building from scratch**

‎bin/Mediasoup.xcframework/ios-arm64/Mediasoup.framework/Mediasoup

-256 Bytes
Binary file not shown.

‎bin/Mediasoup.xcframework/ios-arm64/Mediasoup.framework/Modules/Mediasoup.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo

4 Bytes
Binary file not shown.

‎bin/Mediasoup.xcframework/ios-arm64/Mediasoup.framework/Modules/Mediasoup.swiftmodule/arm64-apple-ios.abi.json

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1801,7 +1801,7 @@
18011801
{
18021802
"kind": "Function",
18031803
"name": "createProducer",
1804-
"printedName": "createProducer(for:encodings:codecOptions:appData:)",
1804+
"printedName": "createProducer(for:encodings:codecOptions:codec:appData:)",
18051805
"children": [
18061806
{
18071807
"kind": "TypeNominal",
@@ -1851,6 +1851,20 @@
18511851
],
18521852
"usr": "s:Sq"
18531853
},
1854+
{
1855+
"kind": "TypeNominal",
1856+
"name": "Optional",
1857+
"printedName": "Swift.String?",
1858+
"children": [
1859+
{
1860+
"kind": "TypeNominal",
1861+
"name": "String",
1862+
"printedName": "Swift.String",
1863+
"usr": "s:SS"
1864+
}
1865+
],
1866+
"usr": "s:Sq"
1867+
},
18541868
{
18551869
"kind": "TypeNominal",
18561870
"name": "Optional",
@@ -1867,8 +1881,8 @@
18671881
}
18681882
],
18691883
"declKind": "Func",
1870-
"usr": "s:9Mediasoup13SendTransportC14createProducer3for9encodings12codecOptions7appDataAA0E0CSo19RTCMediaStreamTrackC_SaySo24RTCRtpEncodingParametersCGSgSSSgAQtKF",
1871-
"mangledName": "$s9Mediasoup13SendTransportC14createProducer3for9encodings12codecOptions7appDataAA0E0CSo19RTCMediaStreamTrackC_SaySo24RTCRtpEncodingParametersCGSgSSSgAQtKF",
1884+
"usr": "s:9Mediasoup13SendTransportC14createProducer3for9encodings12codecOptions0H07appDataAA0E0CSo19RTCMediaStreamTrackC_SaySo24RTCRtpEncodingParametersCGSgSSSgA2RtKF",
1885+
"mangledName": "$s9Mediasoup13SendTransportC14createProducer3for9encodings12codecOptions0H07appDataAA0E0CSo19RTCMediaStreamTrackC_SaySo24RTCRtpEncodingParametersCGSgSSSgA2RtKF",
18721886
"moduleName": "Mediasoup",
18731887
"declAttributes": [
18741888
"AccessControl"

‎bin/Mediasoup.xcframework/ios-arm64/Mediasoup.framework/Modules/Mediasoup.swiftmodule/arm64-apple-ios.private.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public enum TransportConnectionState {
8282
@_hasMissingDesignatedInitializers public class SendTransport {
8383
weak public var delegate: Mediasoup.SendTransportDelegate?
8484
@objc deinit
85-
public func createProducer(for track: WebRTC.RTCMediaStreamTrack, encodings: [WebRTC.RTCRtpEncodingParameters]?, codecOptions: Swift.String?, appData: Swift.String?) throws -> Mediasoup.Producer
85+
public func createProducer(for track: WebRTC.RTCMediaStreamTrack, encodings: [WebRTC.RTCRtpEncodingParameters]?, codecOptions: Swift.String?, codec: Swift.String?, appData: Swift.String?) throws -> Mediasoup.Producer
8686
}
8787
extension Mediasoup.SendTransport : Mediasoup.Transport {
8888
public var id: Swift.String {

‎bin/Mediasoup.xcframework/ios-arm64/Mediasoup.framework/Modules/Mediasoup.swiftmodule/arm64-apple-ios.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public enum TransportConnectionState {
8282
@_hasMissingDesignatedInitializers public class SendTransport {
8383
weak public var delegate: Mediasoup.SendTransportDelegate?
8484
@objc deinit
85-
public func createProducer(for track: WebRTC.RTCMediaStreamTrack, encodings: [WebRTC.RTCRtpEncodingParameters]?, codecOptions: Swift.String?, appData: Swift.String?) throws -> Mediasoup.Producer
85+
public func createProducer(for track: WebRTC.RTCMediaStreamTrack, encodings: [WebRTC.RTCRtpEncodingParameters]?, codecOptions: Swift.String?, codec: Swift.String?, appData: Swift.String?) throws -> Mediasoup.Producer
8686
}
8787
extension Mediasoup.SendTransport : Mediasoup.Transport {
8888
public var id: Swift.String {

‎bin/Mediasoup.xcframework/ios-arm64/Mediasoup.framework/PrivateHeaders/SendTransportWrapper.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ typedef NS_ENUM(NSInteger, RTCIceTransportPolicy);
4747
- (ProducerWrapper *_Nullable)createProducerForTrack:(RTCMediaStreamTrack *_Nonnull)mediaTrack
4848
encodings:(NSArray<RTCRtpEncodingParameters *> *_Nullable)encodings
4949
codecOptions:(NSString *_Nullable)codecOptions
50+
codec:(NSString *_Nullable)codec
5051
appData:(NSString *_Nullable)appData
5152
error:(out NSError *__autoreleasing _Nullable *_Nullable)error;
5253

‎bin/Mediasoup.xcframework/ios-arm64_x86_64-simulator/Mediasoup.framework/Mediasoup

-240 Bytes
Binary file not shown.

‎bin/Mediasoup.xcframework/ios-arm64_x86_64-simulator/Mediasoup.framework/Modules/Mediasoup.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo

4 Bytes
Binary file not shown.

‎bin/Mediasoup.xcframework/ios-arm64_x86_64-simulator/Mediasoup.framework/Modules/Mediasoup.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo

4 Bytes
Binary file not shown.

‎bin/Mediasoup.xcframework/ios-arm64_x86_64-simulator/Mediasoup.framework/Modules/Mediasoup.swiftmodule/arm64-apple-ios-simulator.abi.json

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1801,7 +1801,7 @@
18011801
{
18021802
"kind": "Function",
18031803
"name": "createProducer",
1804-
"printedName": "createProducer(for:encodings:codecOptions:appData:)",
1804+
"printedName": "createProducer(for:encodings:codecOptions:codec:appData:)",
18051805
"children": [
18061806
{
18071807
"kind": "TypeNominal",
@@ -1851,6 +1851,20 @@
18511851
],
18521852
"usr": "s:Sq"
18531853
},
1854+
{
1855+
"kind": "TypeNominal",
1856+
"name": "Optional",
1857+
"printedName": "Swift.String?",
1858+
"children": [
1859+
{
1860+
"kind": "TypeNominal",
1861+
"name": "String",
1862+
"printedName": "Swift.String",
1863+
"usr": "s:SS"
1864+
}
1865+
],
1866+
"usr": "s:Sq"
1867+
},
18541868
{
18551869
"kind": "TypeNominal",
18561870
"name": "Optional",
@@ -1867,8 +1881,8 @@
18671881
}
18681882
],
18691883
"declKind": "Func",
1870-
"usr": "s:9Mediasoup13SendTransportC14createProducer3for9encodings12codecOptions7appDataAA0E0CSo19RTCMediaStreamTrackC_SaySo24RTCRtpEncodingParametersCGSgSSSgAQtKF",
1871-
"mangledName": "$s9Mediasoup13SendTransportC14createProducer3for9encodings12codecOptions7appDataAA0E0CSo19RTCMediaStreamTrackC_SaySo24RTCRtpEncodingParametersCGSgSSSgAQtKF",
1884+
"usr": "s:9Mediasoup13SendTransportC14createProducer3for9encodings12codecOptions0H07appDataAA0E0CSo19RTCMediaStreamTrackC_SaySo24RTCRtpEncodingParametersCGSgSSSgA2RtKF",
1885+
"mangledName": "$s9Mediasoup13SendTransportC14createProducer3for9encodings12codecOptions0H07appDataAA0E0CSo19RTCMediaStreamTrackC_SaySo24RTCRtpEncodingParametersCGSgSSSgA2RtKF",
18721886
"moduleName": "Mediasoup",
18731887
"declAttributes": [
18741888
"AccessControl"

‎bin/Mediasoup.xcframework/ios-arm64_x86_64-simulator/Mediasoup.framework/Modules/Mediasoup.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public enum TransportConnectionState {
8282
@_hasMissingDesignatedInitializers public class SendTransport {
8383
weak public var delegate: Mediasoup.SendTransportDelegate?
8484
@objc deinit
85-
public func createProducer(for track: WebRTC.RTCMediaStreamTrack, encodings: [WebRTC.RTCRtpEncodingParameters]?, codecOptions: Swift.String?, appData: Swift.String?) throws -> Mediasoup.Producer
85+
public func createProducer(for track: WebRTC.RTCMediaStreamTrack, encodings: [WebRTC.RTCRtpEncodingParameters]?, codecOptions: Swift.String?, codec: Swift.String?, appData: Swift.String?) throws -> Mediasoup.Producer
8686
}
8787
extension Mediasoup.SendTransport : Mediasoup.Transport {
8888
public var id: Swift.String {

‎bin/Mediasoup.xcframework/ios-arm64_x86_64-simulator/Mediasoup.framework/Modules/Mediasoup.swiftmodule/arm64-apple-ios-simulator.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public enum TransportConnectionState {
8282
@_hasMissingDesignatedInitializers public class SendTransport {
8383
weak public var delegate: Mediasoup.SendTransportDelegate?
8484
@objc deinit
85-
public func createProducer(for track: WebRTC.RTCMediaStreamTrack, encodings: [WebRTC.RTCRtpEncodingParameters]?, codecOptions: Swift.String?, appData: Swift.String?) throws -> Mediasoup.Producer
85+
public func createProducer(for track: WebRTC.RTCMediaStreamTrack, encodings: [WebRTC.RTCRtpEncodingParameters]?, codecOptions: Swift.String?, codec: Swift.String?, appData: Swift.String?) throws -> Mediasoup.Producer
8686
}
8787
extension Mediasoup.SendTransport : Mediasoup.Transport {
8888
public var id: Swift.String {

‎bin/Mediasoup.xcframework/ios-arm64_x86_64-simulator/Mediasoup.framework/Modules/Mediasoup.swiftmodule/x86_64-apple-ios-simulator.abi.json

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1801,7 +1801,7 @@
18011801
{
18021802
"kind": "Function",
18031803
"name": "createProducer",
1804-
"printedName": "createProducer(for:encodings:codecOptions:appData:)",
1804+
"printedName": "createProducer(for:encodings:codecOptions:codec:appData:)",
18051805
"children": [
18061806
{
18071807
"kind": "TypeNominal",
@@ -1851,6 +1851,20 @@
18511851
],
18521852
"usr": "s:Sq"
18531853
},
1854+
{
1855+
"kind": "TypeNominal",
1856+
"name": "Optional",
1857+
"printedName": "Swift.String?",
1858+
"children": [
1859+
{
1860+
"kind": "TypeNominal",
1861+
"name": "String",
1862+
"printedName": "Swift.String",
1863+
"usr": "s:SS"
1864+
}
1865+
],
1866+
"usr": "s:Sq"
1867+
},
18541868
{
18551869
"kind": "TypeNominal",
18561870
"name": "Optional",
@@ -1867,8 +1881,8 @@
18671881
}
18681882
],
18691883
"declKind": "Func",
1870-
"usr": "s:9Mediasoup13SendTransportC14createProducer3for9encodings12codecOptions7appDataAA0E0CSo19RTCMediaStreamTrackC_SaySo24RTCRtpEncodingParametersCGSgSSSgAQtKF",
1871-
"mangledName": "$s9Mediasoup13SendTransportC14createProducer3for9encodings12codecOptions7appDataAA0E0CSo19RTCMediaStreamTrackC_SaySo24RTCRtpEncodingParametersCGSgSSSgAQtKF",
1884+
"usr": "s:9Mediasoup13SendTransportC14createProducer3for9encodings12codecOptions0H07appDataAA0E0CSo19RTCMediaStreamTrackC_SaySo24RTCRtpEncodingParametersCGSgSSSgA2RtKF",
1885+
"mangledName": "$s9Mediasoup13SendTransportC14createProducer3for9encodings12codecOptions0H07appDataAA0E0CSo19RTCMediaStreamTrackC_SaySo24RTCRtpEncodingParametersCGSgSSSgA2RtKF",
18721886
"moduleName": "Mediasoup",
18731887
"declAttributes": [
18741888
"AccessControl"

‎bin/Mediasoup.xcframework/ios-arm64_x86_64-simulator/Mediasoup.framework/Modules/Mediasoup.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public enum TransportConnectionState {
8282
@_hasMissingDesignatedInitializers public class SendTransport {
8383
weak public var delegate: Mediasoup.SendTransportDelegate?
8484
@objc deinit
85-
public func createProducer(for track: WebRTC.RTCMediaStreamTrack, encodings: [WebRTC.RTCRtpEncodingParameters]?, codecOptions: Swift.String?, appData: Swift.String?) throws -> Mediasoup.Producer
85+
public func createProducer(for track: WebRTC.RTCMediaStreamTrack, encodings: [WebRTC.RTCRtpEncodingParameters]?, codecOptions: Swift.String?, codec: Swift.String?, appData: Swift.String?) throws -> Mediasoup.Producer
8686
}
8787
extension Mediasoup.SendTransport : Mediasoup.Transport {
8888
public var id: Swift.String {

‎bin/Mediasoup.xcframework/ios-arm64_x86_64-simulator/Mediasoup.framework/Modules/Mediasoup.swiftmodule/x86_64-apple-ios-simulator.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public enum TransportConnectionState {
8282
@_hasMissingDesignatedInitializers public class SendTransport {
8383
weak public var delegate: Mediasoup.SendTransportDelegate?
8484
@objc deinit
85-
public func createProducer(for track: WebRTC.RTCMediaStreamTrack, encodings: [WebRTC.RTCRtpEncodingParameters]?, codecOptions: Swift.String?, appData: Swift.String?) throws -> Mediasoup.Producer
85+
public func createProducer(for track: WebRTC.RTCMediaStreamTrack, encodings: [WebRTC.RTCRtpEncodingParameters]?, codecOptions: Swift.String?, codec: Swift.String?, appData: Swift.String?) throws -> Mediasoup.Producer
8686
}
8787
extension Mediasoup.SendTransport : Mediasoup.Transport {
8888
public var id: Swift.String {

‎bin/Mediasoup.xcframework/ios-arm64_x86_64-simulator/Mediasoup.framework/PrivateHeaders/SendTransportWrapper.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ typedef NS_ENUM(NSInteger, RTCIceTransportPolicy);
4747
- (ProducerWrapper *_Nullable)createProducerForTrack:(RTCMediaStreamTrack *_Nonnull)mediaTrack
4848
encodings:(NSArray<RTCRtpEncodingParameters *> *_Nullable)encodings
4949
codecOptions:(NSString *_Nullable)codecOptions
50+
codec:(NSString *_Nullable)codec
5051
appData:(NSString *_Nullable)appData
5152
error:(out NSError *__autoreleasing _Nullable *_Nullable)error;
5253

0 commit comments

Comments
 (0)