zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Increase iOS deployment target from 10 to 12.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

42
examples/objc/AppRTCMobile/ARDSettingsModel.m
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];
[[self settingsStore] setVideoCodec:codecData];
return YES;
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]];
[ARDSettingsStore setDefaultsForVideoResolution:[self defaultVideoResolutionSetting]
videoCodec:codecData
bitrate:nil
audioOnly:NO
createAecDump:NO
useManualAudioConfig:YES];
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