Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Unified Diff: webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsModel.m

Issue 2770113004: Pass settings model to ARDAppClient instead of individual settings. (Closed)
Patch Set: Fix test. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsModel.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsModel.m b/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsModel.m
deleted file mode 100644
index 7514689add53b0d5ee747aeae930f0c27a977a13..0000000000000000000000000000000000000000
--- a/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsModel.m
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright 2016 The WebRTC Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#import "ARDSettingsModel+Private.h"
-#import "ARDSettingsStore.h"
-#import "WebRTC/RTCMediaConstraints.h"
-
-NS_ASSUME_NONNULL_BEGIN
-static NSArray<NSString *> *videoResolutionsStaticValues() {
- return @[ @"640x480", @"960x540", @"1280x720" ];
-}
-
-static NSArray<NSString *> *videoCodecsStaticValues() {
- return @[ @"H264", @"VP8", @"VP9" ];
-}
-
-@interface ARDSettingsModel () {
- ARDSettingsStore *_settingsStore;
-}
-@end
-
-@implementation ARDSettingsModel
-
-- (NSArray<NSString *> *)availableVideoResoultionsMediaConstraints {
- return videoResolutionsStaticValues();
-}
-
-- (NSString *)currentVideoResoultionConstraintFromStore {
- NSString *constraint = [[self settingsStore] videoResolutionConstraints];
- if (!constraint) {
- constraint = [self defaultVideoResolutionMediaConstraint];
- // To ensure consistency add the default to the store.
- [[self settingsStore] setVideoResolutionConstraints:constraint];
- }
- return constraint;
-}
-
-- (BOOL)storeVideoResoultionConstraint:(NSString *)constraint {
- if (![[self availableVideoResoultionsMediaConstraints] containsObject:constraint]) {
- return NO;
- }
- [[self settingsStore] setVideoResolutionConstraints:constraint];
- return YES;
-}
-
-- (NSArray<NSString *> *)availableVideoCodecs {
- return videoCodecsStaticValues();
-}
-
-- (NSString *)currentVideoCodecSettingFromStore {
- NSString *videoCodec = [[self settingsStore] videoCodec];
- if (!videoCodec) {
- videoCodec = [self defaultVideoCodecSetting];
- [[self settingsStore] setVideoCodec:videoCodec];
- }
- return videoCodec;
-}
-
-- (BOOL)storeVideoCodecSetting:(NSString *)videoCodec {
- if (![[self availableVideoCodecs] containsObject:videoCodec]) {
- return NO;
- }
- [[self settingsStore] setVideoCodec:videoCodec];
- return YES;
-}
-
-- (nullable NSNumber *)currentMaxBitrateSettingFromStore {
- return [[self settingsStore] maxBitrate];
-}
-
-- (void)storeMaxBitrateSetting:(nullable NSNumber *)bitrate {
- [[self settingsStore] setMaxBitrate:bitrate];
-}
-
-#pragma mark - Testable
-
-- (ARDSettingsStore *)settingsStore {
- if (!_settingsStore) {
- _settingsStore = [[ARDSettingsStore alloc] init];
- }
- return _settingsStore;
-}
-
-- (nullable NSString *)currentVideoResolutionWidthFromStore {
- NSString *mediaConstraintFromStore = [self currentVideoResoultionConstraintFromStore];
-
- return [self videoResolutionComponentAtIndex:0 inConstraintsString:mediaConstraintFromStore];
-}
-
-- (nullable NSString *)currentVideoResolutionHeightFromStore {
- NSString *mediaConstraintFromStore = [self currentVideoResoultionConstraintFromStore];
- return [self videoResolutionComponentAtIndex:1 inConstraintsString:mediaConstraintFromStore];
-}
-
-#pragma mark -
-
-- (NSString *)defaultVideoResolutionMediaConstraint {
- return videoResolutionsStaticValues()[0];
-}
-
-- (nullable NSString *)videoResolutionComponentAtIndex:(int)index
- inConstraintsString:(NSString *)constraint {
- if (index != 0 && index != 1) {
- return nil;
- }
- NSArray *components = [constraint componentsSeparatedByString:@"x"];
- if (components.count != 2) {
- return nil;
- }
- return components[index];
-}
-
-- (NSString *)defaultVideoCodecSetting {
- return videoCodecsStaticValues()[0];
-}
-
-#pragma mark - Conversion to RTCMediaConstraints
-
-- (nullable NSDictionary *)currentMediaConstraintFromStoreAsRTCDictionary {
- NSDictionary *mediaConstraintsDictionary = nil;
-
- NSString *widthConstraint = [self currentVideoResolutionWidthFromStore];
- NSString *heightConstraint = [self currentVideoResolutionHeightFromStore];
- if (widthConstraint && heightConstraint) {
- mediaConstraintsDictionary = @{
- kRTCMediaConstraintsMinWidth : widthConstraint,
- kRTCMediaConstraintsMinHeight : heightConstraint
- };
- }
- return mediaConstraintsDictionary;
-}
-
-@end
-NS_ASSUME_NONNULL_END

Powered by Google App Engine
This is Rietveld 408576698