Skip to content

Commit 09ec1c3

Browse files
deanylevdeanylev
committed
Get building for tvOS with newer WebRTC SDK
1 parent 400f77e commit 09ec1c3

File tree

10 files changed

+315
-30
lines changed

10 files changed

+315
-30
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ xcuserdata/
77
timeline.xctimeline
88
playground.xcworkspace
99
.build/
10+
.swiftpm/
1011
build/
1112
Pods/

‎Mediasoup-Client-Swift.podspec‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ Pod::Spec.new do |spec|
66
spec.author = {
77
"Alexander Gorbunov" => "gorbunov.a@vlprojects.pro"
88
}
9-
9+
1010
spec.name = "Mediasoup-Client-Swift"
1111
spec.version = "0.8.0"
12-
spec.platform = :ios, "14.0"
1312
spec.module_name = "Mediasoup"
1413
spec.module_map = "Mediasoup/Mediasoup.modulemap"
1514

‎Mediasoup.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@
480480
);
481481
runOnlyForDeploymentPostprocessing = 0;
482482
shellPath = /bin/sh;
483-
shellScript = "set -e\n\nFRAMEWORK_NAME=\"Mediasoup\"\nBUILD_DIR=\"${SRCROOT}/build/Mediasoup\"\nOUTPUT_DIR=\"${SRCROOT}/bin\"\n\n# Remove build directory if it exists\nif [ -d \"${BUILD_DIR}\" ]; then\n\trm -rf \"${BUILD_DIR}\"\nfi\n\n# Build the framework for both device and simulator\nxcodebuild -project \"${PROJECT_NAME}.xcodeproj\" \\\n -scheme \"${FRAMEWORK_NAME}\" \\\n -configuration Release \\\n -arch arm64 only_active_arch=no \\\n -sdk \"iphoneos\" \\\n -derivedDataPath \"${BUILD_DIR}\"\n\nxcodebuild -project \"${PROJECT_NAME}.xcodeproj\" \\\n -scheme \"${FRAMEWORK_NAME}\" \\\n -configuration Release \\\n -arch x86_64 -arch arm64 only_active_arch=no \\\n -sdk \"iphonesimulator\" \\\n -derivedDataPath \"${BUILD_DIR}\"\n\n# Prepare output directory\nmkdir -p ${OUTPUT_DIR}\nif [ -d \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.xcframework\" ]; then\n\trm -rf \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.xcframework\"\nfi\n\nxcodebuild -create-xcframework \\\n\t-framework ${BUILD_DIR}/Build/Products/Release-iphoneos/${FRAMEWORK_NAME}.framework \\\n\t-framework ${BUILD_DIR}/Build/Products/Release-iphonesimulator/${FRAMEWORK_NAME}.framework \\\n\t-output $OUTPUT_DIR/${FRAMEWORK_NAME}.xcframework\n";
483+
shellScript = "set -e\n\nFRAMEWORK_NAME=\"Mediasoup\"\nBUILD_DIR=\"${SRCROOT}/build/Mediasoup\"\nOUTPUT_DIR=\"${SRCROOT}/bin\"\n\n# Remove build directory if it exists\nif [ -d \"${BUILD_DIR}\" ]; then\n\trm -rf \"${BUILD_DIR}\"\nfi\n\n# Build the framework for both device and simulator\nxcodebuild -project \"${PROJECT_NAME}.xcodeproj\" \\\n -scheme \"${FRAMEWORK_NAME}\" \\\n -configuration Release \\\n -arch arm64 only_active_arch=no \\\n -sdk \"iphoneos\" \\\n -derivedDataPath \"${BUILD_DIR}\"\n\nxcodebuild -project \"${PROJECT_NAME}.xcodeproj\" \\\n -scheme \"${FRAMEWORK_NAME}\" \\\n -configuration Release \\\n -arch x86_64 -arch arm64 only_active_arch=no \\\n -sdk \"iphonesimulator\" \\\n -derivedDataPath \"${BUILD_DIR}\"\n \nxcodebuild -project \"${PROJECT_NAME}.xcodeproj\" \\\n -scheme \"${FRAMEWORK_NAME}\" \\\n -configuration Release \\\n -arch arm64 only_active_arch=no \\\n -sdk \"appletvos\" \\\n -derivedDataPath \"${BUILD_DIR}\"\n \nxcodebuild -project \"${PROJECT_NAME}.xcodeproj\" \\\n -scheme \"${FRAMEWORK_NAME}\" \\\n -configuration Release \\\n -arch arm64 only_active_arch=no \\\n -sdk \"appletvsimulator\" \\\n -derivedDataPath \"${BUILD_DIR}\"\n \n# xcodebuild -project \"${PROJECT_NAME}.xcodeproj\" \\\n# -scheme \"${FRAMEWORK_NAME}\" \\\n# -configuration Release \\\n# -arch x86_64 -arch arm64 only_active_arch=no \\\n# -sdk \"appletvsimulator\" \\\n# -derivedDataPath \"${BUILD_DIR}\"\n \n# Prepare output directory\nmkdir -p ${OUTPUT_DIR}\nif [ -d \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.xcframework\" ]; then\n\trm -rf \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.xcframework\"\nfi\n\nxcodebuild -create-xcframework \\\n\t-framework ${BUILD_DIR}/Build/Products/Release-appletvos/${FRAMEWORK_NAME}.framework \\\n\t-output $OUTPUT_DIR/${FRAMEWORK_NAME}.xcframework\n";
484484
};
485485
/* End PBXShellScriptBuildPhase section */
486486

@@ -640,12 +640,12 @@
640640
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
641641
SDKROOT = iphoneos;
642642
SKIP_INSTALL = YES;
643-
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
643+
SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator";
644644
SUPPORTS_MACCATALYST = NO;
645645
SWIFT_EMIT_LOC_STRINGS = YES;
646646
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
647647
SWIFT_VERSION = 5.0;
648-
TARGETED_DEVICE_FAMILY = "1,2";
648+
TARGETED_DEVICE_FAMILY = "1,2,3";
649649
VERSIONING_SYSTEM = "apple-generic";
650650
VERSION_INFO_PREFIX = "";
651651
};
@@ -737,11 +737,11 @@
737737
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
738738
SDKROOT = iphoneos;
739739
SKIP_INSTALL = YES;
740-
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
740+
SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator";
741741
SUPPORTS_MACCATALYST = NO;
742742
SWIFT_EMIT_LOC_STRINGS = YES;
743743
SWIFT_VERSION = 5.0;
744-
TARGETED_DEVICE_FAMILY = "1,2";
744+
TARGETED_DEVICE_FAMILY = "1,2,3";
745745
VALIDATE_PRODUCT = YES;
746746
VERSIONING_SYSTEM = "apple-generic";
747747
VERSION_INFO_PREFIX = "";

‎Mediasoup/dependencies/CMakeLists.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,12 @@ if("${IOS_SDK}" STREQUAL "iphone")
2424
set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/")
2525
elseif("${IOS_SDK}" STREQUAL "iphonesimulator")
2626
set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk")
27+
elseif("${IOS_SDK}" STREQUAL "appletv")
28+
set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk")
29+
elseif("${IOS_SDK}" STREQUAL "appletvsimulator")
30+
set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk")
2731
else()
28-
message(FATAL_ERROR "IOS_SDK must be set to iphone/iphonesimulator")
32+
message(FATAL_ERROR "IOS_SDK must be set to iphone/iphonesimulator/appletv/appletvsimulator")
2933
endif()
3034

3135
# set the ios architectures

‎Package.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ let webrtcChecksum = "d6f5f751ca3aad5ba9e74896ba6e5a4869b3a50ac6def2a069357277d9
1010
let package = Package(
1111
name: "Mediasoup-Client-Swift",
1212
platforms: [
13-
.iOS(.v14)
13+
.iOS(.v17),
14+
.tvOS(.v17)
1415
],
1516
products: [
1617
.library(

‎build.sh‎

Lines changed: 83 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,10 @@ function refetchLibmediasoupclient() {
8383
echo 'Cloning libmediasoupclient'
8484
cd $WORK_DIR
8585
rm -rf libmediasoupclient
86-
git clone -b vl-3.4.1 --depth 1 https://github.com/VLprojects/libmediasoupclient.git
86+
git clone -b vivi --depth 1 https://github.com/viviedu/libmediasoupclient
87+
pushd libmediasoupclient
88+
git checkout 050f3298324e5c9686753333550cce44ac012e07
89+
popd
8790
}
8891

8992
if [ -d $WORK_DIR/libmediasoupclient ]
@@ -165,6 +168,7 @@ function patchWebRTC() {
165168
patch -b -p0 -d $WORK_DIR < $PATCHES_DIR/objc_video_encoder_factory_mm.patch
166169
patch -b -p0 -d $WORK_DIR < $PATCHES_DIR/video_decoder_factory_h.patch
167170
patch -b -p0 -d $WORK_DIR < $PATCHES_DIR/video_encoder_factory_h.patch
171+
patch -b -p0 -d $WORK_DIR < $PATCHES_DIR/pc_BUILD.patch
168172
}
169173

170174
# WebRTC sources are downloaded by git client from Depot tools.
@@ -181,15 +185,15 @@ function refetchWebRTC() {
181185
gclient config --spec \
182186
'solutions = [{
183187
"name": "src",
184-
"url": "https://webrtc.googlesource.com/src.git",
188+
"url": "https://github.com/webrtc-sdk/webrtc.git",
185189
"deps_file": "DEPS",
186190
"managed": False,
187191
"custom_deps": {},
188192
}]
189193
target_os = ["ios"]'
190194

191-
# Fetch WebRTC m120 version.
192-
gclient sync --no-history --revision src@branch-heads/6099
195+
# Fetch WebRTC m125 version.
196+
gclient sync --no-history --revision src@844bafa06d0b9088fd7fa4244832abf8e70a1d3d
193197

194198
# Fetch all possible WebRTC versions so you can switch between them.
195199
# Takes longer time and more disk space.
@@ -216,7 +220,7 @@ target_os = ["ios"]'
216220
function resetWebRTC() {
217221
cd $WORK_DIR/webrtc/src
218222
git reset --hard
219-
223+
220224
cd $WORK_DIR/webrtc/src/third_party
221225
git reset --hard
222226
}
@@ -263,7 +267,7 @@ cd $WEBRTC_DIR
263267
# It contains all available configuration flags with comprehensive comments for each.
264268
gn_arguments=(
265269
'target_os="ios"'
266-
'ios_deployment_target="14.0"'
270+
'ios_deployment_target="17.0"'
267271
'ios_enable_code_signing=false'
268272
'is_component_build=false'
269273
#'is_debug=true'
@@ -286,21 +290,36 @@ gn_arguments=(
286290
for str in ${gn_arguments[@]}; do
287291
gn_args+=" ${str}"
288292
done
293+
294+
# iOS
289295
platform_args='target_environment="device" target_cpu="arm64"'
290296
gn gen $BUILD_DIR/WebRTC/device/arm64 --ide=xcode --args="${platform_args}${gn_args}"
297+
# tvOS
298+
platform_args='target_environment="appletv" target_cpu="arm64"'
299+
gn gen $BUILD_DIR/WebRTC/appletv/arm64 --ide=xcode --args="${platform_args}${gn_args}"
300+
# iOS Simulator
291301
platform_args='target_environment="simulator" target_cpu="x64"'
292302
gn gen $BUILD_DIR/WebRTC/simulator/x64 --ide=xcode --args="${platform_args}${gn_args}"
293303
platform_args='target_environment="simulator" target_cpu="arm64"'
294304
gn gen $BUILD_DIR/WebRTC/simulator/arm64 --ide=xcode --args="${platform_args}${gn_args}"
305+
# tvOS Simulator
306+
# FIXME x64 build fails at the ninja step below
307+
# platform_args='target_environment="appletvsimulator" target_cpu="x64"'
308+
# gn gen $BUILD_DIR/WebRTC/appletvsimulator/x64 --ide=xcode --args="${platform_args}${gn_args}"
309+
platform_args='target_environment="appletvsimulator" target_cpu="arm64"'
310+
gn gen $BUILD_DIR/WebRTC/appletvsimulator/arm64 --ide=xcode --args="${platform_args}${gn_args}"
295311

296312
# This command can be used to check which symbols will be included
297313
# in each target without waiting to perform actual build:
298314
# ninja -t browse webrtc
299315

300316
cd $BUILD_DIR/WebRTC
301317
ninja -C device/arm64 sdk
318+
ninja -C appletv/arm64 sdk
302319
ninja -C simulator/x64 sdk
303320
ninja -C simulator/arm64 sdk
321+
# ninja -C appletvsimulator/x64 sdk
322+
ninja -C appletvsimulator/arm64 sdk
304323

305324
cd $BUILD_DIR/WebRTC
306325
rm -rf simulator/WebRTC.framework
@@ -310,12 +329,24 @@ lipo -create \
310329
simulator/arm64/WebRTC.framework/WebRTC \
311330
simulator/x64/WebRTC.framework/WebRTC \
312331
-output simulator/WebRTC.framework/WebRTC
332+
rm -rf appletvsimulator/WebRTC.framework
333+
cp -R appletvsimulator/arm64/WebRTC.framework appletvsimulator/WebRTC.framework
334+
rm appletvsimulator/WebRTC.framework/WebRTC
335+
# lipo -create \
336+
# appletvsimulator/arm64/WebRTC.framework/WebRTC \
337+
# appletvsimulator/x64/WebRTC.framework/WebRTC \
338+
# -output appletvsimulator/WebRTC.framework/WebRTC
339+
lipo -create \
340+
appletvsimulator/arm64/WebRTC.framework/WebRTC \
341+
-output appletvsimulator/WebRTC.framework/WebRTC
313342

314343
cd $BUILD_DIR/WebRTC
315344
rm -rf $OUTPUT_DIR/WebRTC.xcframework
316345
xcodebuild -create-xcframework \
317346
-framework device/arm64/WebRTC.framework \
347+
-framework appletv/arm64/WebRTC.framework \
318348
-framework simulator/WebRTC.framework \
349+
-framework appletvsimulator/WebRTC.framework \
319350
-output $OUTPUT_DIR/WebRTC.xcframework
320351

321352
cd $WORK_DIR
@@ -350,6 +381,15 @@ function rebuildLMSC() {
350381
-DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
351382
make -C $BUILD_DIR/libmediasoupclient/device/arm64
352383

384+
cmake . -B $BUILD_DIR/libmediasoupclient/appletv/arm64 \
385+
${lmsc_cmake_args} \
386+
-DLIBWEBRTC_BINARY_PATH=$BUILD_DIR/WebRTC/appletv/arm64/WebRTC.framework/WebRTC \
387+
-DIOS_SDK=appletv \
388+
-DIOS_ARCHS="arm64" \
389+
-DPLATFORM=OS64 \
390+
-DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk"
391+
make -C $BUILD_DIR/libmediasoupclient/appletv/arm64
392+
353393
cmake . -B $BUILD_DIR/libmediasoupclient/simulator/x64 \
354394
${lmsc_cmake_args} \
355395
-DLIBWEBRTC_BINARY_PATH=$BUILD_DIR/WebRTC/simulator/x64/WebRTC.framework/WebRTC \
@@ -368,8 +408,27 @@ function rebuildLMSC() {
368408
-DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
369409
make -C $BUILD_DIR/libmediasoupclient/simulator/arm64
370410

411+
# cmake . -B $BUILD_DIR/libmediasoupclient/appletvsimulator/x64 \
412+
# ${lmsc_cmake_args} \
413+
# -DLIBWEBRTC_BINARY_PATH=$BUILD_DIR/WebRTC/appletvsimulator/x64/WebRTC.framework/WebRTC \
414+
# -DIOS_SDK=appletvsimulator \
415+
# -DIOS_ARCHS="x86_64" \
416+
# -DPLATFORM=SIMULATOR64 \
417+
# -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk"
418+
# make -C $BUILD_DIR/libmediasoupclient/appletvsimulator/x64
419+
420+
cmake . -B $BUILD_DIR/libmediasoupclient/appletvsimulator/arm64 \
421+
${lmsc_cmake_args} \
422+
-DLIBWEBRTC_BINARY_PATH=$BUILD_DIR/WebRTC/appletvsimulator/arm64/WebRTC.framework/WebRTC \
423+
-DIOS_SDK=appletvsimulator \
424+
-DIOS_ARCHS="arm64"\
425+
-DPLATFORM=SIMULATORARM64 \
426+
-DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk"
427+
make -C $BUILD_DIR/libmediasoupclient/appletvsimulator/arm64
428+
371429
# Create a FAT libmediasoup / libsdptransform library
372430
mkdir -p $BUILD_DIR/libmediasoupclient/simulator/fat
431+
mkdir -p $BUILD_DIR/libmediasoupclient/appletvsimulator/fat
373432
lipo -create \
374433
$BUILD_DIR/libmediasoupclient/simulator/x64/libmediasoupclient/libmediasoupclient.a \
375434
$BUILD_DIR/libmediasoupclient/simulator/arm64/libmediasoupclient/libmediasoupclient.a \
@@ -378,13 +437,31 @@ function rebuildLMSC() {
378437
$BUILD_DIR/libmediasoupclient/simulator/x64/_deps/libsdptransform-build/libsdptransform.a \
379438
$BUILD_DIR/libmediasoupclient/simulator/arm64/_deps/libsdptransform-build/libsdptransform.a \
380439
-output $BUILD_DIR/libmediasoupclient/simulator/fat/libsdptransform.a
440+
# lipo -create \
441+
# $BUILD_DIR/libmediasoupclient/appletvsimulator/x64/libmediasoupclient/libmediasoupclient.a \
442+
# $BUILD_DIR/libmediasoupclient/appletvsimulator/arm64/libmediasoupclient/libmediasoupclient.a \
443+
# -output $BUILD_DIR/libmediasoupclient/appletvsimulator/fat/libmediasoupclient.a
444+
lipo -create \
445+
$BUILD_DIR/libmediasoupclient/appletvsimulator/arm64/libmediasoupclient/libmediasoupclient.a \
446+
-output $BUILD_DIR/libmediasoupclient/appletvsimulator/fat/libmediasoupclient.a
447+
# lipo -create \
448+
# $BUILD_DIR/libmediasoupclient/appletvsimulator/x64/_deps/libsdptransform-build/libsdptransform.a \
449+
# $BUILD_DIR/libmediasoupclient/appletvsimulator/arm64/_deps/libsdptransform-build/libsdptransform.a \
450+
# -output $BUILD_DIR/libmediasoupclient/appletvsimulator/fat/libsdptransform.a
451+
lipo -create \
452+
$BUILD_DIR/libmediasoupclient/appletvsimulator/arm64/_deps/libsdptransform-build/libsdptransform.a \
453+
-output $BUILD_DIR/libmediasoupclient/appletvsimulator/fat/libsdptransform.a
381454
xcodebuild -create-xcframework \
382455
-library $BUILD_DIR/libmediasoupclient/device/arm64/libmediasoupclient/libmediasoupclient.a \
456+
-library $BUILD_DIR/libmediasoupclient/appletv/arm64/libmediasoupclient/libmediasoupclient.a \
383457
-library $BUILD_DIR/libmediasoupclient/simulator/fat/libmediasoupclient.a \
458+
-library $BUILD_DIR/libmediasoupclient/appletvsimulator/fat/libmediasoupclient.a \
384459
-output $OUTPUT_DIR/mediasoupclient.xcframework
385460
xcodebuild -create-xcframework \
386461
-library $BUILD_DIR/libmediasoupclient/device/arm64/_deps/libsdptransform-build/libsdptransform.a \
462+
-library $BUILD_DIR/libmediasoupclient/appletv/arm64/_deps/libsdptransform-build/libsdptransform.a \
387463
-library $BUILD_DIR/libmediasoupclient/simulator/fat/libsdptransform.a \
464+
-library $BUILD_DIR/libmediasoupclient/appletvsimulator/fat/libsdptransform.a \
388465
-output $OUTPUT_DIR/sdptransform.xcframework
389466
}
390467

‎patches/RTCPeerConnectionFactoryBuilder.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
--- webrtc/src/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryBuilder.h
22
+++ webrtc/src/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryBuilder.h
33
@@ -25,6 +25,7 @@ class AudioProcessing;
4-
4+
55
NS_ASSUME_NONNULL_BEGIN
6-
6+
77
+RTC_OBJC_EXPORT
8-
@interface RTCPeerConnectionFactoryBuilder : NSObject
9-
10-
+ (RTCPeerConnectionFactoryBuilder *)builder;
8+
@interface RTC_OBJC_TYPE(RTCPeerConnectionFactoryBuilder) : NSObject
9+
10+
+ (RTC_OBJC_TYPE(RTCPeerConnectionFactoryBuilder) *)builder;

‎patches/objc_video_encoder_factory_mm.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
#import "sdk/objc/api/peerconnection/RTCVideoCodecInfo+Private.h"
66
#import "sdk/objc/api/peerconnection/RTCVideoEncoderSettings+Private.h"
77
+#import "sdk/objc/api/peerconnection/RTCRtpCodecParameters.h"
8+
#import "sdk/objc/api/video_codec/RTCNativeVideoEncoderBuilder+Native.h"
89
#import "sdk/objc/api/video_codec/RTCVideoCodecConstants.h"
9-
#import "sdk/objc/api/video_codec/RTCWrappedNativeVideoEncoder.h"
1010
#import "sdk/objc/helpers/NSString+StdString.h"
11-
@@ -30,6 +31,7 @@
11+
@@ -31,6 +32,7 @@
1212
#include "modules/video_coding/include/video_error_codes.h"
1313
#include "rtc_base/logging.h"
1414
#include "sdk/objc/native/src/objc_video_frame.h"
1515
+#include "modules/video_coding/codecs/vp9/include/vp9.h"
16-
16+
1717
namespace webrtc {
18-
19-
@@ -164,8 +166,13 @@ void OnCurrentEncoder(const SdpVideoFormat &format) override {
18+
19+
@@ -165,8 +167,13 @@ id<RTC_OBJC_TYPE(RTCVideoEncoderFactory)> ObjCVideoEncoderFactory::wrapped_encod
2020
std::vector<SdpVideoFormat> ObjCVideoEncoderFactory::GetSupportedFormats() const {
2121
std::vector<SdpVideoFormat> supported_formats;
2222
for (RTC_OBJC_TYPE(RTCVideoCodecInfo) * supportedCodec in [encoder_factory_ supportedCodecs]) {
@@ -30,5 +30,5 @@
3030
+ supported_formats.push_back(format);
3131
+ }
3232
}
33-
33+
3434
return supported_formats;

0 commit comments

Comments
 (0)