commit c522e758f6a364c23e7232d4f402713601f0b35e
author sakal <sakal@webrtc.org> Wed Apr 05 12:17:48 2017 -0700
committer Commit bot <commit-bot@chromium.org> Wed Apr 05 19:17:48 2017 +0000
tree ea1580eb2174f01e045258a6d45d2772ce53e73f
parent 1ba21eb06339be822ab2074285efb6f2fdd6e2e9

Use new RTCCameraVideoCapturer in AppRTCMobile.

Because the new API doesn't use constraints, refactors settings to instead have a
video resolution setting.

BUG=webrtc:7177

Review-Url: https://codereview.webrtc.org/2778163005
Cr-Commit-Position: refs/heads/master@{#17545}

webrtc/examples/objc/AppRTCMobile/ARDSettingsModel.m

diff --git a/webrtc/examples/objc/AppRTCMobile/ARDSettingsModel.m b/webrtc/examples/objc/AppRTCMobile/ARDSettingsModel.m
index 7514689..ecb6ab3 100644
--- a/webrtc/examples/objc/AppRTCMobile/ARDSettingsModel.m
+++ b/webrtc/examples/objc/AppRTCMobile/ARDSettingsModel.m
@@ -28,25 +28,25 @@
 
 @implementation ARDSettingsModel
 
-- (NSArray<NSString *> *)availableVideoResoultionsMediaConstraints {
+- (NSArray<NSString *> *)availableVideoResolutions {
   return videoResolutionsStaticValues();
 }
 
-- (NSString *)currentVideoResoultionConstraintFromStore {
-  NSString *constraint = [[self settingsStore] videoResolutionConstraints];
-  if (!constraint) {
-    constraint = [self defaultVideoResolutionMediaConstraint];
+- (NSString *)currentVideoResolutionSettingFromStore {
+  NSString *resolution = [[self settingsStore] videoResolution];
+  if (!resolution) {
+    resolution = [self defaultVideoResolutionSetting];
     // To ensure consistency add the default to the store.
-    [[self settingsStore] setVideoResolutionConstraints:constraint];
+    [[self settingsStore] setVideoResolution:resolution];
   }
-  return constraint;
+  return resolution;
 }
 
-- (BOOL)storeVideoResoultionConstraint:(NSString *)constraint {
-  if (![[self availableVideoResoultionsMediaConstraints] containsObject:constraint]) {
+- (BOOL)storeVideoResolutionSetting:(NSString *)resolution {
+  if (![[self availableVideoResolutions] containsObject:resolution]) {
     return NO;
   }
-  [[self settingsStore] setVideoResolutionConstraints:constraint];
+  [[self settingsStore] setVideoResolution:resolution];
   return YES;
 }
 
@@ -88,54 +88,37 @@
   return _settingsStore;
 }
 
-- (nullable NSString *)currentVideoResolutionWidthFromStore {
-  NSString *mediaConstraintFromStore = [self currentVideoResoultionConstraintFromStore];
+- (int)currentVideoResolutionWidthFromStore {
+  NSString *resolution = [self currentVideoResolutionSettingFromStore];
 
-  return [self videoResolutionComponentAtIndex:0 inConstraintsString:mediaConstraintFromStore];
+  return [self videoResolutionComponentAtIndex:0 inString:resolution];
 }
 
-- (nullable NSString *)currentVideoResolutionHeightFromStore {
-  NSString *mediaConstraintFromStore = [self currentVideoResoultionConstraintFromStore];
-  return [self videoResolutionComponentAtIndex:1 inConstraintsString:mediaConstraintFromStore];
+- (int)currentVideoResolutionHeightFromStore {
+  NSString *resolution = [self currentVideoResolutionSettingFromStore];
+  return [self videoResolutionComponentAtIndex:1 inString:resolution];
 }
 
 #pragma mark -
 
-- (NSString *)defaultVideoResolutionMediaConstraint {
+- (NSString *)defaultVideoResolutionSetting {
   return videoResolutionsStaticValues()[0];
 }
 
-- (nullable NSString *)videoResolutionComponentAtIndex:(int)index
-                                   inConstraintsString:(NSString *)constraint {
+- (int)videoResolutionComponentAtIndex:(int)index inString:(NSString *)resolution {
   if (index != 0 && index != 1) {
-    return nil;
+    return 0;
   }
-  NSArray *components = [constraint componentsSeparatedByString:@"x"];
+  NSArray<NSString *> *components = [resolution componentsSeparatedByString:@"x"];
   if (components.count != 2) {
-    return nil;
+    return 0;
   }
-  return components[index];
+  return components[index].intValue;
 }
 
 - (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