Increase iOS deployment target from 10 to 12.

TBR=kthelgason@webrtc.org

Bug: webrtc:12928
Change-Id: I50de09972bf012e78a9bc9f1d98d8d07aab4e180
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/224543
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34409}
This commit is contained in:
Björn Terelius 2021-07-02 16:19:32 +02:00 committed by WebRTC LUCI CQ
parent 94f2ef2e84
commit 02768ae4f8
5 changed files with 35 additions and 15 deletions

2
.gn
View file

@ -44,7 +44,7 @@ default_args = {
mac_sdk_min = "10.12"
ios_deployment_target = "10.0"
ios_deployment_target = "12.0"
# The SDK API level, in contrast, is set by build/android/AndroidManifest.xml.
android32_ndk_api_level = 16

View file

@ -77,16 +77,30 @@ NS_ASSUME_NONNULL_BEGIN
- (RTC_OBJC_TYPE(RTCVideoCodecInfo) *)currentVideoCodecSettingFromStore {
[self registerStoreDefaults];
NSData *codecData = [[self settingsStore] videoCodec];
return [NSKeyedUnarchiver unarchiveObjectWithData:codecData];
Class expectedClass = [RTC_OBJC_TYPE(RTCVideoCodecInfo) class];
NSError *error;
RTC_OBJC_TYPE(RTCVideoCodecInfo) *videoCodecSetting =
[NSKeyedUnarchiver unarchivedObjectOfClass:expectedClass fromData:codecData error:&error];
if (!error) {
return videoCodecSetting;
}
return nil;
}
- (BOOL)storeVideoCodecSetting:(RTC_OBJC_TYPE(RTCVideoCodecInfo) *)videoCodec {
if (![[self availableVideoCodecs] containsObject:videoCodec]) {
return NO;
}
NSData *codecData = [NSKeyedArchiver archivedDataWithRootObject:videoCodec];
NSError *error;
NSData *codecData = [NSKeyedArchiver archivedDataWithRootObject:videoCodec
requiringSecureCoding:NO
error:&error];
if (!error) {
[[self settingsStore] setVideoCodec:codecData];
return YES;
}
return NO;
}
- (nullable NSNumber *)currentMaxBitrateSettingFromStore {
@ -165,14 +179,18 @@ NS_ASSUME_NONNULL_BEGIN
}
- (void)registerStoreDefaults {
NSData *codecData = [NSKeyedArchiver archivedDataWithRootObject:[self defaultVideoCodecSetting]];
NSError *error;
NSData *codecData = [NSKeyedArchiver archivedDataWithRootObject:[self defaultVideoCodecSetting]
requiringSecureCoding:NO
error:&error];
if (!error) {
[ARDSettingsStore setDefaultsForVideoResolution:[self defaultVideoResolutionSetting]
videoCodec:codecData
bitrate:nil
audioOnly:NO
createAecDump:NO
useManualAudioConfig:YES];
}
}
@end
NS_ASSUME_NONNULL_END

View file

@ -462,6 +462,7 @@ if (is_ios || is_mac) {
"OpenGL.framework",
]
}
defines = [ "GLES_SILENCE_DEPRECATION" ]
deps = [
":base_objc",
@ -499,6 +500,7 @@ if (is_ios || is_mac) {
"objc/components/renderer/opengl/RTCEAGLVideoView.h",
"objc/components/renderer/opengl/RTCEAGLVideoView.m",
]
defines = [ "GLES_SILENCE_DEPRECATION" ]
}
if (is_mac) {
sources = [

View file

@ -230,7 +230,7 @@ OCMLocation *OCMMakeLocation(id testCase, const char *fileCString, int line){
__autoreleasing NSError **retError;
[invocation getArgument:&retError atIndex:4];
*retError = [NSError errorWithDomain:@"AVAudioSession"
code:AVAudioSessionErrorInsufficientPriority
code:AVAudioSessionErrorCodeCannotInterruptOthers
userInfo:nil];
BOOL failure = NO;
[invocation setReturnValue:&failure];

View file

@ -31,7 +31,7 @@ SDK_OUTPUT_DIR = os.path.join(SRC_DIR, 'out_ios_libs')
SDK_FRAMEWORK_NAME = 'WebRTC.framework'
DEFAULT_ARCHS = ENABLED_ARCHS = ['arm64', 'arm', 'x64', 'x86']
IOS_DEPLOYMENT_TARGET = '10.0'
IOS_DEPLOYMENT_TARGET = '12.0'
LIBVPX_BUILD_VP9 = False
sys.path.append(os.path.join(SCRIPT_DIR, '..', 'libs'))