Skip to content

Commit ffbb6f4

Browse files
committed
Merge branch 'LD-2871-update-libmediasoupclient'
2 parents bb9292c + af8696d commit ffbb6f4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+961
-309
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.2)
2+
- Mediasoup-Client-Swift (0.3.0)
33

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

1111
SPEC CHECKSUMS:
12-
Mediasoup-Client-Swift: 264f4b5b79a9c9f9aa79fea8c6e4d41bc55cabec
12+
Mediasoup-Client-Swift: 03b57ba84daecccc750b592a05a77c1fb337adf7
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.2"
11+
spec.version = "0.3.0"
1212
spec.platform = :ios, "14.0"
1313
spec.module_name = "Mediasoup"
1414
spec.module_map = "Mediasoup/Mediasoup.modulemap"

Mediasoup.xcodeproj/project.pbxproj

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@
478478
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
479479
CLANG_ANALYZER_NONNULL = YES;
480480
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
481-
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
481+
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
482482
CLANG_CXX_LIBRARY = "libc++";
483483
CLANG_ENABLE_MODULES = YES;
484484
CLANG_ENABLE_OBJC_ARC = YES;
@@ -520,8 +520,10 @@
520520
GCC_NO_COMMON_BLOCKS = YES;
521521
GCC_OPTIMIZATION_LEVEL = 0;
522522
GCC_PREPROCESSOR_DEFINITIONS = (
523-
"DEBUG=1",
524-
"$(inherited)",
523+
WEBRTC_POSIX,
524+
WEBRTC_IOS,
525+
WEBRTC_MAC,
526+
DEBUG,
525527
);
526528
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
527529
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -576,7 +578,7 @@
576578
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
577579
CLANG_ANALYZER_NONNULL = YES;
578580
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
579-
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
581+
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
580582
CLANG_CXX_LIBRARY = "libc++";
581583
CLANG_ENABLE_MODULES = YES;
582584
CLANG_ENABLE_OBJC_ARC = YES;
@@ -616,6 +618,11 @@
616618
GCC_C_LANGUAGE_STANDARD = gnu11;
617619
GCC_NO_COMMON_BLOCKS = YES;
618620
GCC_OPTIMIZATION_LEVEL = 0;
621+
GCC_PREPROCESSOR_DEFINITIONS = (
622+
WEBRTC_POSIX,
623+
WEBRTC_IOS,
624+
WEBRTC_MAC,
625+
);
619626
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
620627
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
621628
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

Mediasoup/dependencies/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
66
project(Project)
77

88
# C++ requirements
9-
set(CMAKE_CXX_STANDARD 14)
9+
set(CMAKE_CXX_STANDARD 17)
1010
set(CMAKE_CXX_STANDARD REQUIRED ON)
1111

1212
# build for iphone or simulator
@@ -39,10 +39,6 @@ set(LIBSDPTRANSFORM_BUILD_READMEHELPER OFF)
3939
set(IPHONE_SDKVER "14.0")
4040
set(IPHONE_VERSION_MIN "14.0")
4141

42-
# enable bitcode
43-
add_definitions(-DENABLE_BITCODE)
44-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fembed-bitcode")
45-
4642
message(STATUS "\n========== libmediasoupclient iOS Build Configuration ==========\n")
4743
message(STATUS "CMAKE_OSX_SYSROOT = " ${CMAKE_OSX_SYSROOT})
4844
message(STATUS "CMAKE_OSX_ARCHITECTURES = " ${CMAKE_OSX_ARCHITECTURES})

Mediasoup_Private/Device/DeviceWrapper.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ - (instancetype)init {
5050

5151
self.pcFactory = [pcFactoryBuilder createPeerConnectionFactory];
5252
_pcOptions = new mediasoupclient::PeerConnection::Options();
53-
_pcOptions->factory = self.pcFactory.nativeFactory;
53+
_pcOptions->factory = self.pcFactory.nativeFactory.get();
5454
}
5555
return self;
5656
}

README.md

Lines changed: 10 additions & 8 deletions
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.2'
23+
pod 'Mediasoup-Client-Swift', '0.3.0'
2424
```
2525

2626
3. **Ease of building from scratch**
@@ -142,20 +142,22 @@ Swift wrapper for libmediasoupclient with iOS support
142142

143143
Mediasoup-Client-Swift has almost no logic, it's only a convenient wrapper for other nice libraries.
144144

145-
* [WebRTC (version m94 with patches applied locally)](https://groups.google.com/g/discuss-webrtc/c/ws0_MYHIBOw)
145+
* [WebRTC (version m112 with patches applied locally)](https://groups.google.com/g/discuss-webrtc/c/ws0_MYHIBOw)
146146

147147
* [libmediasoupclient (version 3.4.0 patched fork)](https://github.com/VLprojects/libmediasoupclient)
148148

149149
## Roadmap
150150

151-
* Upgrade WebRTC and libmediasoupclient to latest versions
151+
- [x] Upgrade WebRTC and libmediasoupclient to latest versions
152152

153-
* Support integration via SPM
153+
- [ ] Support integration via SPM
154154

155-
* Add documentation for Mediasoup-Client-Swift public interface
155+
- [ ] Add documentation for Mediasoup-Client-Swift public interface
156156

157-
* Investigate and reduce the amount of WebRTC patches
157+
- [ ] Investigate and reduce the amount of WebRTC patches
158158

159-
* Make the dependencies build script more flexible: add parametrization for included codecs and other WebRTC modules, build architectures and so on
159+
- [ ] Make the dependencies build script more flexible: add parametrization for included codecs and other WebRTC modules, build architectures and so on
160160

161-
* Add data channel support
161+
- [ ] Add data channel support
162+
163+
- [ ] Implement example app compatible with https://v3demo.mediasoup.org
Binary file not shown.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</data>
3939
<key>Modules/Mediasoup.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
4040
<data>
41-
XJ6V1DVxenBWDCFayIL0MvzEVy8=
41+
fk32g6HUU4sqmGPhXOdp/myU/j0=
4242
</data>
4343
<key>Modules/Mediasoup.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
4444
<data>
@@ -58,7 +58,7 @@
5858
</data>
5959
<key>Modules/Mediasoup.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
6060
<data>
61-
ckvA8+8nTNkN31TGC37Y51Xzmak=
61+
ue/Lmvme2fA4zZsDPJ+SDROe64s=
6262
</data>
6363
<key>Modules/module.modulemap</key>
6464
<data>
@@ -184,7 +184,7 @@
184184
<dict>
185185
<key>hash2</key>
186186
<data>
187-
XSrcbn7QOeUF+mfWKY4TPYs7c1i0yca46KvMHheCwkE=
187+
pfqce5EPX+1+hCvsN9Z4su2WslD2cPFsnkGJleQnfeM=
188188
</data>
189189
</dict>
190190
<key>Modules/Mediasoup.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
@@ -219,7 +219,7 @@
219219
<dict>
220220
<key>hash2</key>
221221
<data>
222-
l2zzIohHei+9ALZyUlWLfDeyjnJDtNFeS3lfDnm4Ass=
222+
3asaTmqJZnTZnTJXaP4hrDfHTeNBoTLlrbuplddV+Xk=
223223
</data>
224224
</dict>
225225
<key>Modules/module.modulemap</key>

bin/WebRTC.xcframework/Info.plist

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,30 @@
66
<array>
77
<dict>
88
<key>LibraryIdentifier</key>
9-
<string>ios-arm64</string>
9+
<string>ios-arm64_x86_64-simulator</string>
1010
<key>LibraryPath</key>
1111
<string>WebRTC.framework</string>
1212
<key>SupportedArchitectures</key>
1313
<array>
1414
<string>arm64</string>
15+
<string>x86_64</string>
1516
</array>
1617
<key>SupportedPlatform</key>
1718
<string>ios</string>
19+
<key>SupportedPlatformVariant</key>
20+
<string>simulator</string>
1821
</dict>
1922
<dict>
2023
<key>LibraryIdentifier</key>
21-
<string>ios-arm64_x86_64-simulator</string>
24+
<string>ios-arm64</string>
2225
<key>LibraryPath</key>
2326
<string>WebRTC.framework</string>
2427
<key>SupportedArchitectures</key>
2528
<array>
2629
<string>arm64</string>
27-
<string>x86_64</string>
2830
</array>
2931
<key>SupportedPlatform</key>
3032
<string>ios</string>
31-
<key>SupportedPlatformVariant</key>
32-
<string>simulator</string>
3333
</dict>
3434
</array>
3535
<key>CFBundlePackageType</key>

0 commit comments

Comments
 (0)