Add video codec setting to AppRTCMobile on iOS.

webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsViewController.m

 /*
  *  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 "ARDSettingsViewController.h"
 #import "ARDSettingsModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(int, ARDSettingsSections) {
   ARDSettingsSectionMediaConstraints = 0,
-  ARDSettingsSectionBitRate
+  ARDSettingsSectionVideoCodec,
+  ARDSettingsSectionBitRate,
 };
 
 @interface ARDSettingsViewController () <UITextFieldDelegate> {
   ARDSettingsModel *_settingsModel;
 }
 
 @end
 
 @implementation ARDSettingsViewController
 
 - (instancetype)initWithStyle:(UITableViewStyle)style
                 settingsModel:(ARDSettingsModel *)settingsModel {
   self = [super initWithStyle:style];
   if (self) {
     _settingsModel = settingsModel;
   }
   return self;
 }
 
 #pragma mark - View lifecycle
 
 - (void)viewDidLoad {
   [super viewDidLoad];
   self.title = @"Settings";
   [self addDoneBarButton];
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+  [super viewWillAppear:animated];
+  [self decorateCurrentlyStoredOrDefaultMediaConstraints];
+  [self decorateCurrentlyStoredOrDefaultVideoCodec];

[kthelgason, 2017/03/09 13:39:43]

Is this safe to do here? Why not in viewDidAppear?

[sakal, 2017/03/10 10:25:28]

I didn't notice any problems in my testing. If we do this in viewDidAppear, the
checkmarks appear after the view has animated to the place, which is ugly.

+}
+
 - (void)viewDidAppear:(BOOL)animated {
   [super viewDidAppear:animated];
-  [self selectCurrentlyStoredOrDefaultMediaConstraints];
 }
 
 #pragma mark - Data source
 
 - (NSArray<NSString *> *)mediaConstraintsArray {
   return _settingsModel.availableVideoResoultionsMediaConstraints;
 }
 
+- (NSArray<NSString *> *)videoCodecArray {
+  return _settingsModel.availableVideoCodecs;
+}
+
 #pragma mark -
 
 - (void)addDoneBarButton {
   UIBarButtonItem *barItem =
       [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone
                                                     target:self
                                                     action:@selector(dismissModally:)];
   self.navigationItem.leftBarButtonItem = barItem;
 }
 
-- (void)selectCurrentlyStoredOrDefaultMediaConstraints {
+- (void)decorateCurrentlyStoredOrDefaultMediaConstraints {
   NSString *currentSelection = [_settingsModel currentVideoResoultionConstraintFromStore];
 
   NSUInteger indexOfSelection = [[self mediaConstraintsArray] indexOfObject:currentSelection];
-  NSIndexPath *pathToBeSelected = [NSIndexPath indexPathForRow:indexOfSelection inSection:0];
-  [self.tableView selectRowAtIndexPath:pathToBeSelected
-                              animated:NO
-                        scrollPosition:UITableViewScrollPositionNone];
-  // Manully invoke the delegate method because the previous invocation will not.
-  [self tableView:self.tableView didSelectRowAtIndexPath:pathToBeSelected];
+  NSIndexPath *pathToBeDecorated = [NSIndexPath indexPathForRow:indexOfSelection
+                                                      inSection:ARDSettingsSectionMediaConstraints];
+  UITableViewCell *cell = [self.tableView cellForRowAtIndexPath:pathToBeDecorated];
+  cell.accessoryType = UITableViewCellAccessoryCheckmark;
+}
+
+- (void)decorateCurrentlyStoredOrDefaultVideoCodec {
+  NSString *currentSelection = [_settingsModel currentVideoCodecSettingFromStore];
+
+  NSUInteger indexOfSelection = [[self videoCodecArray] indexOfObject:currentSelection];
+  NSIndexPath *pathToBeDecorated = [NSIndexPath indexPathForRow:indexOfSelection
+                                                      inSection:ARDSettingsSectionVideoCodec];
+  UITableViewCell *cell = [self.tableView cellForRowAtIndexPath:pathToBeDecorated];
+  cell.accessoryType = UITableViewCellAccessoryCheckmark;
 }
 
 #pragma mark - Dismissal of view controller
 
 - (void)dismissModally:(id)sender {
   [self dismissViewControllerAnimated:YES completion:nil];
 }
 
 #pragma mark - Table view data source
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-  return 2;
+  return 3;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
   if ([self sectionIsMediaConstraints:section]) {
     return self.mediaConstraintsArray.count;
   }
+  if ([self sectionIsVideoCodec:section]) {
+    return self.videoCodecArray.count;
+  }

[kthelgason, 2017/03/09 13:39:43]

I'd prefer a switch-case on section here.

[sakal, 2017/03/10 10:25:28]

Done.

 
   return 1;
 }
 
 #pragma mark - Index path helpers
 
 - (BOOL)sectionIsMediaConstraints:(int)section {
   return section == ARDSettingsSectionMediaConstraints;
 }
 
+- (BOOL)sectionIsVideoCodec:(int)section {
+  return section == ARDSettingsSectionVideoCodec;
+}
+
 - (BOOL)sectionIsBitrate:(int)section {
   return section == ARDSettingsSectionBitRate;
 }
 
 - (BOOL)indexPathIsMediaConstraints:(NSIndexPath *)indexPath {
   return [self sectionIsMediaConstraints:indexPath.section];
 }
 
+- (BOOL)indexPathIsVideoCodec:(NSIndexPath *)indexPath {
+  return [self sectionIsVideoCodec:indexPath.section];
+}
+
 - (BOOL)indexPathIsBitrate:(NSIndexPath *)indexPath {
   return [self sectionIsBitrate:indexPath.section];
 }
 
+#pragma mark - Table view delegate helpers
+
+- (void)removeAllAccessories:(UITableView *)tableView
+                   inSection:(int)section
+{
+  for (int i = 0; i < [tableView numberOfRowsInSection:section]; i++) {
+    NSIndexPath *rowPath = [NSIndexPath indexPathForRow:i inSection:section];
+    UITableViewCell *cell = [tableView cellForRowAtIndexPath:rowPath];
+    cell.accessoryType = UITableViewCellAccessoryNone;
+  }
+}
+
 #pragma mark - Table view delegate
 
 - (nullable NSString *)tableView:(UITableView *)tableView
          titleForHeaderInSection:(NSInteger)section {
   if ([self sectionIsMediaConstraints:section]) {
     return @"Media constraints";
   }
 
   if ([self sectionIsBitrate:section]) {
     return @"Maximum bitrate";
   }
 
+  if ([self sectionIsVideoCodec:section]) {
+    return @"Video codec";
+  }
+
   return @"";
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView
          cellForRowAtIndexPath:(NSIndexPath *)indexPath {
   if ([self indexPathIsMediaConstraints:indexPath]) {

[kthelgason, 2017/03/09 13:39:43]

I'd also prefer a switch-case here, but up to you.

[sakal, 2017/03/10 10:25:28]

Done.

     return [self mediaConstraintsTableViewCellForTableView:tableView atIndexPath:indexPath];
   }
 
+  if ([self indexPathIsVideoCodec:indexPath]) {
+    return [self videoCodecTableViewCellForTableView:tableView atIndexPath:indexPath];
+  }
+
   if ([self indexPathIsBitrate:indexPath]) {
     return [self bitrateTableViewCellForTableView:tableView atIndexPath:indexPath];
   }
 
   return [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
                                 reuseIdentifier:@"identifier"];
 }
 
-- (nullable NSIndexPath *)tableView:(UITableView *)tableView
-           willSelectRowAtIndexPath:(nonnull NSIndexPath *)indexPath {
-  if ([self indexPathIsMediaConstraints:indexPath]) {
-    return [self tableView:tableView willDeselectMediaConstraintsRowAtIndexPath:indexPath];
-  }
-  return indexPath;
-}
-
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
   if ([self indexPathIsMediaConstraints:indexPath]) {
     [self tableView:tableView didSelectMediaConstraintsCellAtIndexPath:indexPath];
   }
+  if ([self indexPathIsVideoCodec:indexPath]) {
+    [self tableView:tableView didSelectVideoCodecCellAtIndexPath:indexPath];
+  }
 }
 
 #pragma mark - Table view delegate(Media Constraints)
 
 - (UITableViewCell *)mediaConstraintsTableViewCellForTableView:(UITableView *)tableView
                                                    atIndexPath:(NSIndexPath *)indexPath {
   NSString *dequeueIdentifier = @"ARDSettingsMediaConstraintsViewCellIdentifier";
   UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:dequeueIdentifier];
   if (!cell) {
     cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
                                   reuseIdentifier:dequeueIdentifier];
   }
   cell.textLabel.text = self.mediaConstraintsArray[indexPath.row];
   return cell;
 }
 
 - (void)tableView:(UITableView *)tableView
     didSelectMediaConstraintsCellAtIndexPath:(NSIndexPath *)indexPath {
+  [self removeAllAccessories:tableView inSection:ARDSettingsSectionMediaConstraints];
   UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
   cell.accessoryType = UITableViewCellAccessoryCheckmark;
 
   NSString *mediaConstraintsString = self.mediaConstraintsArray[indexPath.row];
   [_settingsModel storeVideoResoultionConstraint:mediaConstraintsString];
+
+  [tableView deselectRowAtIndexPath:indexPath animated:YES];
 }
 
-- (NSIndexPath *)tableView:(UITableView *)tableView
-    willDeselectMediaConstraintsRowAtIndexPath:(NSIndexPath *)indexPath {
-  NSIndexPath *oldSelection = [tableView indexPathForSelectedRow];
-  UITableViewCell *cell = [tableView cellForRowAtIndexPath:oldSelection];
-  cell.accessoryType = UITableViewCellAccessoryNone;
-  return indexPath;
+#pragma mark - Table view delegate(Video Codec)
+
+- (UITableViewCell *)videoCodecTableViewCellForTableView:(UITableView *)tableView
+                                             atIndexPath:(NSIndexPath *)indexPath {
+  NSString *dequeueIdentifier = @"ARDSettingsVideoCodecCellIdentifier";
+  UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:dequeueIdentifier];
+  if (!cell) {
+    cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
+                                  reuseIdentifier:dequeueIdentifier];
+  }
+  cell.textLabel.text = self.videoCodecArray[indexPath.row];
+
+  return cell;
+}

[kthelgason, 2017/03/09 13:39:43]

It seems to me that there is a lot of shared code with the Media Costraints.
Perhaps we can refactor this to reduce the duplication?

[sakal, 2017/03/10 10:25:28]

Done.

+
+- (void)tableView:(UITableView *)tableView
+    didSelectVideoCodecCellAtIndexPath:(NSIndexPath *)indexPath {
+  [self removeAllAccessories:tableView inSection:ARDSettingsSectionVideoCodec];
+  UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
+  cell.accessoryType = UITableViewCellAccessoryCheckmark;
+
+  NSString *videoCodec = self.videoCodecArray[indexPath.row];
+  [_settingsModel storeVideoCodecSetting:videoCodec];
+
+  [tableView deselectRowAtIndexPath:indexPath animated:YES];
 }
 
 #pragma mark - Table view delegate(Bitrate)
 
 - (UITableViewCell *)bitrateTableViewCellForTableView:(UITableView *)tableView
                                           atIndexPath:(NSIndexPath *)indexPath {
   NSString *dequeueIdentifier = @"ARDSettingsBitrateCellIdentifier";
   UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:dequeueIdentifier];
   if (!cell) {
     cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
@@ skipping 36 matching lines @@
 
   if (textField.text.length != 0) {
     bitrateNumber = [NSNumber numberWithInteger:textField.text.intValue];
   }
 
   [_settingsModel storeMaxBitrateSetting:bitrateNumber];
 }
 
 @end
 NS_ASSUME_NONNULL_END