Merge branch 'LD-3322-explicitly-setting-producer-codec'

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - Mediasoup-Client-Swift (0.4.0)
+  - Mediasoup-Client-Swift (0.4.1)
 
 DEPENDENCIES:
   - Mediasoup-Client-Swift (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Mediasoup-Client-Swift: a8d229342746a17fb9d4ac61ccac1ec6d259603e
+  Mediasoup-Client-Swift: 3befcb3ec1d823d6e5cfb009ae9a6dedb809585e
 
 PODFILE CHECKSUM: d4fe3294dd9c7fc46519b6a7b26527f1f545e8d3
 

Mediasoup-Client-Swift.podspec

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

Mediasoup_Private/Transport/SendTransportWrapper.mm

@@ -137,8 +137,9 @@ - (ProducerWrapper *_Nullable)createProducerForTrack:(RTCMediaStreamTrack *_Nonn
 		}
 
 		nlohmann::json *codecJsonPtr = nullptr;
+		nlohmann::json codecJson = nlohmann::json::object();
 		if (codec != nullptr) {
-			auto codecJson = nlohmann::json::parse(std::string(codec.UTF8String));
+			codecJson = nlohmann::json::parse(std::string(codec.UTF8String));
 			codecJsonPtr = &codecJson;
 		}
 

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.0'
+   pod 'Mediasoup-Client-Swift', '0.4.1'
    ```
 
 3. **Ease of building from scratch**

bin/Mediasoup.xcframework/Info.plist

@@ -6,30 +6,30 @@
 	<array>
 		<dict>
 			<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>
 		<dict>
 			<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>
 	</array>
 	<key>CFBundlePackageType</key>

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

@@ -14,11 +14,11 @@
 		</data>
 		<key>Modules/Mediasoup.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		QVz9oOBa3PtclRP0+NUn+8V7lSk=
+		X/8/atSTuJ/E185Zq6HlJTiaTng=
 		</data>
 		<key>Modules/Mediasoup.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		3UyGlcOB801z5+6bBSNBxQbbQNE=
+		lUfD94UBDKby7Z8pB6SOSTbKNWw=
 		</data>
 		<key>Modules/Mediasoup.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
@@ -150,14 +150,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			0Uw1n7T1FaqL0jasKhQkxbShrCckQiH0VnN0PiZY//Q=
+			k0InDRFfp3csUOLUtG4YTrX0V5SLi9a/eiqwYm3fTpc=
 			</data>
 		</dict>
 		<key>Modules/Mediasoup.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			+R7TIyCXP7PZaFE/WFEkQiVgLxkCvZ8bwYvyN4pPCRs=
+			1K1DgyCw3Z4ITYBSb722TIVRogH6w25b9GyLNPMyZjk=
 			</data>
 		</dict>
 		<key>Modules/Mediasoup.swiftmodule/arm64-apple-ios-simulator.abi.json</key>

bin/sdptransform.xcframework/Info.plist

@@ -6,30 +6,30 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libsdptransform.a</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>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libsdptransform.a</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>

build.sh

@@ -83,7 +83,7 @@ function refetchLibmediasoupclient() {
 	echo 'Cloning libmediasoupclient'
 	cd $WORK_DIR
 	rm -rf libmediasoupclient
-	git clone -b vl-3.4.0.0 --depth 1 https://github.com/VLprojects/libmediasoupclient.git
+	git clone -b vl-m112.1 --depth 1 https://github.com/VLprojects/libmediasoupclient.git
 }
 
 if [ -d $WORK_DIR/libmediasoupclient ]
@@ -254,6 +254,7 @@ gn_arguments=(
 	'ios_deployment_target="14.0"'
 	'ios_enable_code_signing=false'
 	'is_component_build=false'
+	#'is_debug=true'
 	'is_debug=false'
 	'rtc_libvpx_build_vp9=true'
 	'use_goma=false'
@@ -266,6 +267,7 @@ gn_arguments=(
 	'rtc_include_pulse_audio=false'
 	'use_rtti=true'
 	'use_custom_libcxx=false'
+	'use_xcode_clang=true'
 	'enable_dsyms=true'
 	'enable_stripping=true'
 	'treat_warnings_as_errors=false'
@@ -312,11 +314,13 @@ function rebuildLMSC() {
 
 	lmsc_cmake_arguments=(
 		"-DLIBWEBRTC_INCLUDE_PATH=$WEBRTC_DIR"
-		'-DMEDIASOUP_LOG_TRACE=ON'
-		'-DMEDIASOUP_LOG_DEV=ON'
+		'-DMEDIASOUPCLIENT_LOG_TRACE=OFF'
+		'-DMEDIASOUPCLIENT_LOG_DEV=OFF'
 		'-DCMAKE_CXX_FLAGS="-fvisibility=hidden"'
 		'-DLIBSDPTRANSFORM_BUILD_TESTS=OFF'
+		'-DMEDIASOUPCLIENT_BUILD_TESTS=OFF'
 		'-DCMAKE_OSX_DEPLOYMENT_TARGET=14'
+		# '-DCMAKE_BUILD_TYPE=Debug'
 	)
 	for str in ${lmsc_cmake_arguments[@]}; do
 		lmsc_cmake_args+=" ${str}"